Fixing up block all logic.

This commit is contained in:
warrickct 2021-11-23 11:00:11 +11:00
parent ac8dbb341b
commit 3602b51986
2 changed files with 9 additions and 7 deletions

View file

@ -291,12 +291,13 @@ export class LeftPaneMessageSection extends React.Component<Props, State> {
return;
}
_.forEach(conversationRequests, async convo => {
if (convo.isApproved !== true) {
await Promise.all(
conversationRequests.map(async convo => {
await BlockedNumberController.block(convo.id);
syncRequired = true;
}
});
})
);
if (syncRequired) {
await forceSyncConfigurationNowIfNeeded();
}

View file

@ -127,10 +127,11 @@ const handleContactReceived = async (
if (
window.lokiFeatureFlags.useMessageRequests === true &&
window.inboxStore?.getState().userConfig.messageRequests &&
contactReceived.isApproved === true
window.inboxStore?.getState().userConfig.messageRequests
) {
await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
if (contactReceived.isApproved === true) {
await contactConvo.setIsApproved(Boolean(contactReceived.isApproved));
}
if (contactReceived.isBlocked === true) {
await BlockedNumberController.block(contactConvo.id);