fix

FlowCrypt · Jan 13, 2025 · a50cd5d · a50cd5d
1 parent 8675877
commit a50cd5d
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 48 deletions.
diff --git a/extension/chrome/elements/compose-modules/compose-quote-module.ts b/extension/chrome/elements/compose-modules/compose-quote-module.ts
@@ -87,12 +87,12 @@ export class ComposeQuoteModule extends ViewModule<ComposeView> {
       const decoded = await Mime.decode(Buf.fromBase64UrlStr(raw));
       const headers = {
         subject: decoded.subject,
-        date: String(decoded.headers.date),
+        date: decoded.headers.date as string,
         from: decoded.from,
         to: decoded.to,
         cc: decoded.cc,
-        references: String(decoded.headers.references || ''),
-        'message-id': String(decoded.headers['message-id'] || ''),
+        references: (decoded.headers.references as string) || '',
+        'message-id': (decoded.headers['message-id'] as string) || '',
       };
       const message = decoded.rawSignedContent ? await Mime.process(Buf.fromUtfStr(decoded.rawSignedContent)) : Mime.processDecoded(decoded);
       const readableBlockTypes = ['encryptedMsg', 'plainText', 'plainHtml', 'signedMsg'];

diff --git a/extension/js/common/core/mime.ts b/extension/js/common/core/mime.ts
@@ -228,7 +228,7 @@ export class Mime {
               }
             }
             const headers = Mime.headerGetAddress(mimeContent, ['from', 'to', 'cc', 'bcc']);
-            mimeContent.subject = String(mimeContent.subject || mimeContent.headers.subject || '');
+            mimeContent.subject = mimeContent.subject || (mimeContent.headers.subject as string) || '';
             mimeContent = Object.assign(mimeContent, headers);
             resolve(mimeContent);
           } catch (e) {