Merge branch 'master' into issue-5668-add-thunderbird-attachments-support

Author: martgil

extension/changelog.txt

@@ -1,5 +1,7 @@
 <div class="lightboxed">
 
+version 8.5.8 on December 20, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/481?closed=1" target="_blank">Encryption keys generation, encrypted messages parsing improvements</a>
+
 version 8.5.7 on June 13, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/480?closed=1" target="_blank">Exception reports improvements</a>
 
 version 8.5.6 on June 3, 2024: <a href="https://github.com/FlowCrypt/flowcrypt-browser/milestone/479?closed=1" target="_blank">Manifest V3 fixes</a>

extension/chrome/dev/ci_unit_test.ts

@@ -55,4 +55,6 @@ for (const lib of libs) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
   (window as any)[(lib as any).name] = lib;
 }
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+(window as any).MOCK_PORT = '[TEST_REPLACEABLE_MOCK_PORT]';
 /* eslint-enable @typescript-eslint/no-explicit-any */

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'];

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

@@ -124,7 +124,7 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
       const pubkeyMsgData = {
         ...newMsg,
         recipients: pubkeyRecipients,
-        // brackets are required for test emails like '@test:8001'
+        // brackets are required for test emails like '@test'
         replyTo: replyToForMessageSentToPubkeyRecipients.length
           ? Str.formatEmailList([newMsg.from, ...replyToForMessageSentToPubkeyRecipients], true)
           : undefined,

extension/chrome/elements/pgp_block.ts

@@ -110,7 +110,8 @@ export class PgpBlockView extends View {
     if (data?.separateQuotedContentAndRenderText) {
       this.quoteModule.separateQuotedContentAndRenderText(
         data.separateQuotedContentAndRenderText.decryptedContent,
-        data.separateQuotedContentAndRenderText.isHtml
+        data.separateQuotedContentAndRenderText.isHtml,
+        data.separateQuotedContentAndRenderText.isChecksumInvalid
       );
     }
     if (data?.setFrameColor) {

extension/chrome/elements/pgp_block_modules/pgp-block-quote-module.ts

@@ -9,7 +9,7 @@ import { Xss } from '../../../js/common/platform/xss.js';
 export class PgpBlockViewQuoteModule {
   public constructor(private view: PgpBlockView) {}
 
-  public separateQuotedContentAndRenderText = (decryptedContent: string, isHtml: boolean) => {
+  public separateQuotedContentAndRenderText = (decryptedContent: string, isHtml: boolean, isChecksumInvalid: boolean) => {
     if (isHtml) {
       const message = $('<div>').html(Xss.htmlSanitizeKeepBasicTags(decryptedContent)); // xss-sanitized
       let htmlBlockQuoteExists = false;
@@ -32,10 +32,10 @@ export class PgpBlockViewQuoteModule {
           message[0].removeChild(shouldBeQuoted[i]);
           quotedHtml += shouldBeQuoted[i].outerHTML;
         }
-        this.view.renderModule.renderContent(message.html(), false);
+        this.view.renderModule.renderContent(message.html(), false, isChecksumInvalid);
         this.appendCollapsedQuotedContentButton(quotedHtml, true);
       } else {
-        this.view.renderModule.renderContent(decryptedContent, false);
+        this.view.renderModule.renderContent(decryptedContent, false, isChecksumInvalid);
       }
     } else {
       const lines = decryptedContent.split(/\r?\n/);
@@ -62,7 +62,7 @@ export class PgpBlockViewQuoteModule {
         // only got quoted part, no real text -> show everything as real text, without quoting
         lines.push(...linesQuotedPart.splice(0, linesQuotedPart.length));
       }
-      this.view.renderModule.renderContent(Str.escapeTextAsRenderableHtml(lines.join('\n')), false);
+      this.view.renderModule.renderContent(Str.escapeTextAsRenderableHtml(lines.join('\n')), false, isChecksumInvalid);
       if (linesQuotedPart.join('').trim()) {
         this.appendCollapsedQuotedContentButton(linesQuotedPart.join('\n'));
       }

extension/chrome/elements/pgp_block_modules/pgp-block-render-module.ts

@@ -46,9 +46,11 @@ export class PgpBlockViewRenderModule {
     });
   };
 
-  public renderContent = (htmlContent: string, isErr: boolean) => {
+  public renderContent = (htmlContent: string, isErr: boolean, isChecksumInvalid = false) => {
     let contentWithLink = linkifyHtml(htmlContent);
-
+    if (isChecksumInvalid) {
+      contentWithLink = `<div class="pgp-invalid-checksum">${Lang.pgpBlock.invalidCheckSum}</div>${contentWithLink}}`;
+    }
     // Temporary workaround for an issue where 'cryptup_reply' divs are not being hidden when replying to all
     // messages from the FES. The root cause is that FES currently returns the body of
     // password message replies as 'text/plain', which does not hide the divs as intended.

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>

extension/chrome/settings/modules/my_key.htm

@@ -32,7 +32,9 @@
               
         <a href="#" class="action_download_pubkey">Save public key to a file</a>
       </div>
-      <div class="line show_when_showing_public pubkey_link_container" style="display: none">Share your public key: <a href="" target="_blank"></a></div>
+      <div class="line show_when_showing_public pubkey_link_container" style="display: none" data-test="container-shareable-pubkey-link">
+        Share your public key: <a href="" target="_blank"></a>
+      </div>
       <div class="line key_status_contatiner"></div>
       <div class="line">Key creation: <span class="key_creation" data-test="content-key-creation"></span></div>
       <div class="line">Key expiration: <span class="key_expiration" data-test="content-key-expiration"></span></div>

extension/css/cryptup.css

@@ -1592,6 +1592,13 @@ td {
   align-items: center;
 }
 
+.pgp-invalid-checksum {
+  border-left: 3px solid #d18826;
+  color: #d18826;
+  margin: 10px 0;
+  padding-left: 5px;
+}
+
 .pgp_badge {
   opacity: 1;
   margin-bottom: 1em;
@@ -3314,7 +3321,7 @@ body#select_account {
   width: 340px;
   padding: 0;
   font-size: 14px;
-  zoom: reset;
+  zoom: 1;
 }
 
 body#select_account #title {
@@ -3355,7 +3362,6 @@ body#select_account .emails li a {
   text-transform: none;
   color: #337ab7;
   transition: 0.5s;
-  letter-spacing: 0.35;
   font-weight: 600;
 }