Merge remote-tracking branch 'origin/master' into issue-5896-bad-recipient-hotfix

martgil · martgil · commit 68537f330d87 · 2025-01-14T13:47:37.000+08:00
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/chrome/popups/default.htm b/extension/chrome/popups/default.htm
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="/css/browser-popup.css" />
   </head>
 
-  <body style="zoom: reset">
+  <body style="zoom: 1">
     <div id="set_up_account" style="display: none; width: 156px; padding: 1px">
       <span class="button green action_set_up_account">Setup FlowCrypt</span>
     </div>
diff --git a/extension/css/cryptup.css b/extension/css/cryptup.css
@@ -3321,7 +3321,7 @@ body#select_account {
   width: 340px;
   padding: 0;
   font-size: 14px;
-  zoom: reset;
+  zoom: 1;
 }
 
 body#select_account #title {
@@ -3362,7 +3362,6 @@ body#select_account .emails li a {
   text-transform: none;
   color: #337ab7;
   transition: 0.5s;
-  letter-spacing: 0.35;
   font-weight: 600;
 }
 
diff --git a/extension/css/settings.css b/extension/css/settings.css
@@ -124,7 +124,6 @@ a.gray_link {
   cursor: pointer;
   height: auto;
   border: 1px solid #f3f3f3;
-  letter-spacing: 0.35;
 }
 
 #alt-accounts.accounts-row .row.alt-accounts .contains_email {
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) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -3321,7 +3321,7 @@ body#select_account {`
`3321`	`3321`	`width: 340px;`
`3322`	`3322`	`padding: 0;`
`3323`	`3323`	`font-size: 14px;`
`3324`		`- zoom: reset;`
	`3324`	`+ zoom: 1;`
`3325`	`3325`	`}`
`3326`	`3326`
`3327`	`3327`	`body#select_account #title {`
`@@ -3362,7 +3362,6 @@ body#select_account .emails li a {`
`3362`	`3362`	`text-transform: none;`
`3363`	`3363`	`color: #337ab7;`
`3364`	`3364`	`transition: 0.5s;`
`3365`		`- letter-spacing: 0.35;`
`3366`	`3365`	`font-weight: 600;`
`3367`	`3366`	`}`
`3368`	`3367`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@ a.gray_link {`
`124`	`124`	`cursor: pointer;`
`125`	`125`	`height: auto;`
`126`	`126`	`border: 1px solid #f3f3f3;`
`127`		`- letter-spacing: 0.35;`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`#alt-accounts.accounts-row .row.alt-accounts .contains_email {`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ export class Mime {`
`228`	`228`	`}`
`229`	`229`	`}`
`230`	`230`	`const headers = Mime.headerGetAddress(mimeContent, ['from', 'to', 'cc', 'bcc']);`
`231`		`- mimeContent.subject = String(mimeContent.subject \|\| mimeContent.headers.subject \|\| '');`
	`231`	`+ mimeContent.subject = mimeContent.subject \|\| (mimeContent.headers.subject as string) \|\| '';`
`232`	`232`	`mimeContent = Object.assign(mimeContent, headers);`
`233`	`233`	`resolve(mimeContent);`
`234`	`234`	`} catch (e) {`