pr reviews: apply fix with appropriate approach

Author: martgil

extension/js/common/api/account-servers/external-service.ts

@@ -146,9 +146,9 @@ export class ExternalService extends Api {
         JSON.stringify({
           associateReplyToken,
           from,
-          to: (recipients.to || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
-          cc: (recipients.cc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
-          bcc: (recipients.bcc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis),
+          to: (recipients.to || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
+          cc: (recipients.cc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
+          bcc: (recipients.bcc || []).map(Str.formatEmailWithOptionalName).map(Xss.stripEmojis).map(Str.replaceAccentedChars),
         })
       ),
     });

extension/js/common/core/common.ts

@@ -121,6 +121,13 @@ export class Str {
     return str.replace(/[.~!$%^*=?]/gi, '');
   };
 
+  public static replaceAccentedChars = (str: string) => {
+    /*
+     * hotfix for issue https://github.com/FlowCrypt/enterprise-server/issues/6264
+     */
+    return str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+  };
+
   public static formatEmailWithOptionalName = (emailParts: EmailParts): string => {
     return Str.formatEmailWithOptionalNameEx(emailParts);
   };
@@ -281,14 +288,10 @@ export class Str {
   public static stripPgpOrGpgExtensionIfPresent = (filename: string) => {
     return filename.replace(/\.(pgp|gpg)$/i, '');
   };
+
   private static formatEmailWithOptionalNameEx = ({ email, name }: EmailParts, forceBrackets?: boolean): string => {
     if (name) {
-      /*
-       * hotfix for issue https://github.com/FlowCrypt/enterprise-server/issues/6264
-       * this replaces accented characters with their unaccented counterparts
-       */
-      const normalizedName = name.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
-      return `${Str.rmSpecialCharsKeepUtf(normalizedName, 'ALLOW-SOME')} <${email}>`;
+      return `${Str.rmSpecialCharsKeepUtf(name, 'ALLOW-SOME')} <${email}>`;
     }
     return forceBrackets ? `<${email}>` : email;
   };