Merge branch 'master' into 6087-support-for-password-protected-pdfs

Author: ioanatflowcrypt

extension/chrome/elements/compose-modules/compose-recipients-module.ts

@@ -313,7 +313,7 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
         }, 0);
       })();
     }
-    await Promise.all(recipientEls.map(r => r.evaluating));
+    await Promise.all(recipientEls.map(r => r.evaluating).filter(p => p !== undefined));
     if (triggerCallback) {
       for (const callback of this.onRecipientAddedCallbacks) {
         callback(recipientEls);
@@ -405,7 +405,7 @@ export class ComposeRecipientsModule extends ViewModule<ComposeView> {
     if (this.view.S.cached('input_addresses_container_outer').hasClass('invisible')) {
       return;
     }
-    await Promise.all(this.addedRecipients.map(r => r.evaluating)); // Wait until all recipients loaded.
+    await Promise.all(this.addedRecipients.map(r => r.evaluating).filter(p => p !== undefined)); // Wait until all recipients loaded.
     this.showHideCcAndBccInputsIfNeeded();
     this.view.S.cached('input_addresses_container_outer').addClass('invisible');
     this.view.S.cached('recipients_placeholder').css('display', 'flex');

extension/chrome/elements/compose-modules/compose-render-module.ts

@@ -476,12 +476,11 @@ export class ComposeRenderModule extends ViewModule<ComposeView> {
   };
 
   private loadRecipientsThenSetTestStateReady = async () => {
-    await Promise.all(
-      this.view.recipientsModule
-        .getRecipients()
-        .filter(r => r.evaluating)
-        .map(r => r.evaluating)
-    );
+    const evaluatingPromises = this.view.recipientsModule
+      .getRecipients()
+      .map(r => r.evaluating)
+      .filter(r => !!r);
+    await Promise.all(evaluatingPromises);
     document.querySelector('body')?.setAttribute('data-test-state', 'ready'); // set as ready so that automated tests can evaluate results
   };
 

extension/js/common/api/email-provider/gmail/gmail.ts

@@ -413,11 +413,9 @@ export class Gmail extends EmailProviderApi implements EmailProviderInterface {
       }
     }
     const rawValidEmails = rawParsedResults.filter(r => r.address && Str.isEmailValid(r.address));
-    const newValidResults: EmailProviderContact[] = await Promise.all(
-      rawValidEmails.map(a => {
-        return { email: a.address!, name: a.name }; // eslint-disable-line @typescript-eslint/no-non-null-assertion
-      })
-    );
+    const newValidResults: EmailProviderContact[] = rawValidEmails.map(a => {
+      return { email: a.address!, name: a.name }; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+    });
     const uniqueNewValidResults: EmailProviderContact[] = [];
     for (const newValidRes of newValidResults) {
       if (!allResults.map(c => c.email).includes(newValidRes.email)) {

extension/js/common/api/shared/api.ts

@@ -252,7 +252,7 @@ export class Api {
             }),
           };
         } else {
-          return { response, pipe: Value.noop }; // original response
+          return { response, pipe: async () => { /* no-op */ } }; // original response
         }
       };
 

extension/js/common/core/crypto/pgp/openpgp-key.ts

@@ -350,7 +350,9 @@ export class OpenPGPKey {
     result.set(`Primary key expiration?`, await KeyUtil.formatResultAsync(async () => OpenPGPKey.formatDate(await key.getExpirationTime())));
     result.set(`Primary key getBitSize?`, await KeyUtil.formatResultAsync(async () => key.getAlgorithmInfo().bits));
     const encryptResult = await OpenPGPKey.testEncryptDecrypt(key);
-    await Promise.all(encryptResult.map(msg => result.set(`Encrypt/Decrypt test: ${msg}`, '')));
+    for (const msg of encryptResult) {
+      result.set(`Encrypt/Decrypt test: ${msg}`, '');
+    }
     if (key.isPrivate()) {
       result.set(`Sign/Verify test`, await KeyUtil.formatResultAsync(async () => await OpenPGPKey.testSignVerify(key)));
     }