Fixing up block all logic.

pull/2000/head
warrickct 4 years ago
parent ac8dbb341b
commit 3602b51986

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

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

Loading…
Cancel
Save