From 0e4005b1e743339d8e35c97323ceaad2c7ebc1c1 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Tue, 16 Nov 2021 08:43:21 -0800
Subject: [PATCH] Fix manifest i18n substitutions for Beta and Flask (#12717)

---
 app/_locales/en/messages.json             | 8 ++++++++
 app/build-types/beta/manifest/_base.json  | 4 ++--
 app/build-types/flask/manifest/_base.json | 4 ++--
 development/verify-locale-strings.js      | 7 ++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 12b32d79e..5236d189e 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -173,6 +173,14 @@
     "message": "MetaMask",
     "description": "The name of the application"
   },
+  "appNameBeta": {
+    "message": "MetaMask Beta",
+    "description": "The name of the application (Beta)"
+  },
+  "appNameFlask": {
+    "message": "MetaMask Flask",
+    "description": "The name of the application (Flask)"
+  },
   "approvalAndAggregatorTxFeeCost": {
     "message": "Approval and aggregator network fee"
   },
diff --git a/app/build-types/beta/manifest/_base.json b/app/build-types/beta/manifest/_base.json
index 33a2da321..bfdb451ed 100644
--- a/app/build-types/beta/manifest/_base.json
+++ b/app/build-types/beta/manifest/_base.json
@@ -21,6 +21,6 @@
     "128": "images/icon-128.png",
     "512": "images/icon-512.png"
   },
-  "name": "__MSG_appName__ Beta",
-  "short_name": "__MSG_appName__ Beta"
+  "name": "__MSG_appNameBeta__",
+  "short_name": "__MSG_appNameBeta__"
 }
diff --git a/app/build-types/flask/manifest/_base.json b/app/build-types/flask/manifest/_base.json
index d9c8ec220..bc43d646a 100644
--- a/app/build-types/flask/manifest/_base.json
+++ b/app/build-types/flask/manifest/_base.json
@@ -21,6 +21,6 @@
     "128": "images/icon-128.png",
     "512": "images/icon-512.png"
   },
-  "name": "__MSG_appName__ Flask",
-  "short_name": "__MSG_appName__ Flask"
+  "name": "__MSG_appNameFlask__",
+  "short_name": "__MSG_appNameFlask__"
 }
diff --git a/development/verify-locale-strings.js b/development/verify-locale-strings.js
index a37a7936e..04d889de5 100644
--- a/development/verify-locale-strings.js
+++ b/development/verify-locale-strings.js
@@ -216,7 +216,12 @@ async function verifyEnglishLocale() {
   }
 
   // never consider these messages as unused
-  const messageExceptions = ['appName', 'appDescription'];
+  const messageExceptions = [
+    'appName',
+    'appNameBeta',
+    'appNameFlask',
+    'appDescription',
+  ];
 
   const englishMessages = Object.keys(englishLocale);
   const unusedMessages = englishMessages.filter(