Bumping notification id's to 18 & 19 (#18460)

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>

app/_locales/de/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Ethereum Merge ist da!"
   },
-  "notifications17ActionText": {
-    "message": "Sicherheits- und Datenschutzeinstellungen anzeigen"
-  },
-  "notifications17Title": {
-    "message": "Sicherheits- und Datenschutzeinstellungen"
-  },
   "notifications1Description": {
     "message": "Mobile MetaMask-Anwender können jetzt Token in ihren mobilen Wallets swappen. Scannen Sie den QR-Code, um die mobile App zu erhalten und mit dem Swapping zu beginnen.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/el/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Η συγχώνευση στο Ethereum είναι εδώ!"
   },
-  "notifications17ActionText": {
-    "message": "Εμφάνιση ρυθμίσεων Ασφάλειας & Απορρήτου"
-  },
-  "notifications17Title": {
-    "message": "Ρυθμίσεις Ασφάλειας & Απορρήτου"
-  },
   "notifications1Description": {
     "message": "Οι χρήστες του MetaMask Mobile μπορούν τώρα να ανταλλάξουν tokens μέσα στο κινητό τους πορτοφόλι. Σαρώστε τον κωδικό QR για να πάρετε την εφαρμογή για κινητά και να αρχίσετε να ανταλλάζετε.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/en/messages.json

@@ -2366,40 +2366,37 @@
   "notifications15Title": {
     "message": "The Ethereum Merge is here!"
   },
-  "notifications16ActionText": {
+  "notifications18ActionText": {
     "message": "Enable security alerts"
   },
-  "notifications16DescriptionOne": {
+  "notifications18DescriptionOne": {
     "message": "Get alerts from third parties when you may have received a malicious request.",
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
-  "notifications16DescriptionThree": {
+  "notifications18DescriptionThree": {
     "message": "Always be sure to do your own due diligence before approving any requests.",
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
-  "notifications16DescriptionTwo": {
+  "notifications18DescriptionTwo": {
     "message": "OpenSea is the first provider for this feature. More providers coming soon!",
     "description": "Description of a notification in the 'See What's New' popup. Describes Opensea Security Provider feature."
   },
-  "notifications16Title": {
+  "notifications19ActionText": {
-    "message": "Stay safe with security alerts"
-  },
-  "notifications17ActionText": {
     "message": "Enable NFT autodetection"
   },
-  "notifications17DescriptionOne": {
+  "notifications19DescriptionOne": {
     "message": "Two ways you can get started:",
     "description": "Description of a notification in the 'See What's New' popup. Describes NFT autodetection feature."
   },
-  "notifications17DescriptionThree": {
+  "notifications19DescriptionThree": {
     "message": "We only support ERC-721 at the moment.",
     "description": "Description of a notification in the 'See What's New' popup. Describes NFT autodetection feature."
   },
-  "notifications17DescriptionTwo": {
+  "notifications19DescriptionTwo": {
     "message": "Manually add your NFTs, or turn on NFT autodetection in Settings > Experimental.",
     "description": "Description of a notification in the 'See What's New' popup. Describes NFT autodetection feature."
   },
-  "notifications17Title": {
+  "notifications19Title": {
     "message": "See your NFTs like never before"
   },
   "notifications1Description": {

app/_locales/es/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "¡La Fusión de Ethereum está aquí!"
   },
-  "notifications17ActionText": {
-    "message": "Mostrar configuración de seguridad y privacidad"
-  },
-  "notifications17Title": {
-    "message": "Configuración de Seguridad y privacidad"
-  },
   "notifications1Description": {
     "message": "Los usuarios de la aplicación móvil de MetaMask ahora pueden canjear tokens en su cartera móvil. Escanee el código QR para obtener la aplicación móvil y comience a canjear.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/fr/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "La fusion Ethereum est en marche !"
   },
-  "notifications17ActionText": {
-    "message": "Afficher les paramètres de sécurité et de confidentialité"
-  },
-  "notifications17Title": {
-    "message": "Paramètres de sécurité et de confidentialité"
-  },
   "notifications1Description": {
     "message": "Les utilisateurs de MetaMask Mobile peuvent désormais échanger des jetons dans leur portefeuille mobile. Scannez le code QR pour obtenir l’application mobile et commencez à échanger.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/hi/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "इथेरियम मर्ज यहाँ है!"
   },
-  "notifications17ActionText": {
-    "message": "सुरक्षा और गोपनीयता सेटिंग्स को दिखाएं"
-  },
-  "notifications17Title": {
-    "message": "सुरक्षा और गोपनीयता सेटिंग्स"
-  },
   "notifications1Description": {
     "message": "MetaMask Mobile उपयोगकर्ता अब अपने मोबाइल वॉलेट के अंदर टोकन स्वैप कर सकते हैं। मोबाइल ऐप प्राप्त करने के लिए QR कोड को स्कैन करें और स्वैप करना शुरू करें।",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/id/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Penggabungan Ethereum telah tiba!"
   },
-  "notifications17ActionText": {
-    "message": "Tampilkan pengaturan Keamanan & Privasi"
-  },
-  "notifications17Title": {
-    "message": "Pengaturan Keamanan & Privasi"
-  },
   "notifications1Description": {
     "message": "Pengguna MetaMask Mobile kini bisa menukar token di dalam dompet seluler mereka. Pindai kode QR untuk mendapatkan aplikasi seluler dan mulai menukar.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/ja/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Ethereum のマージ (Merge) が完了しました！"
   },
-  "notifications17ActionText": {
-    "message": "セキュリティおよびプライバシー設定を表示"
-  },
-  "notifications17Title": {
-    "message": "セキュリティおよびプライバシー設定"
-  },
   "notifications1Description": {
     "message": "MetaMask Mobileのユーザーが、モバイルウォレット内でトークンを交換できるようになりました。QRコードをスキャンしてモバイルアプリを取得し、スワップを開始します。",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/ko/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "이더리움 머지가 완료되었습니다!"
   },
-  "notifications17ActionText": {
-    "message": "보안 및 개인정보 설정 표시"
-  },
-  "notifications17Title": {
-    "message": "보안 및 개인정보 설정 표시"
-  },
   "notifications1Description": {
     "message": "MetaMask 모바일 사용자는 이제 모바일 지갑에서 토큰을 스왑할 수 있습니다. QR 코드를 스캔하여 모바일 앱을 설치하고 스왑을 시작하세요.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/pt/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "A fusão do Ethereum chegou!"
   },
-  "notifications17ActionText": {
-    "message": "Mostrar configurações de segurança e privacidade"
-  },
-  "notifications17Title": {
-    "message": "Configurações de segurança e privacidade"
-  },
   "notifications1Description": {
     "message": "Usuários da MetaMask Mobile agora podem trocar tokens dentro de sua carteira mobile. Leia o QR code para obter o aplicativo para dispositivos móveis e comece a trocar.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/ru/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Ethereum Merge уже досутпно!"
   },
-  "notifications17ActionText": {
-    "message": "Показать настройки безопасности и конфиденциальности"
-  },
-  "notifications17Title": {
-    "message": "Настройки безопасности и конфиденциальности"
-  },
   "notifications1Description": {
     "message": "Теперь пользователи MetaMask Mobile могут обменивать токены в своем мобильном кошельке. Отсканируйте QR-код, чтобы скачать мобильное приложение и начать обмен.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/tl/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Narito na ang Ethereum Merge!"
   },
-  "notifications17ActionText": {
-    "message": "Ipakita ang mga setting ng Seguridad at Pagkapribado"
-  },
-  "notifications17Title": {
-    "message": "Mga Setting ng Seguridad at Pagkapribado"
-  },
   "notifications1Description": {
     "message": "Ang mga user ng MetaMask Mobile ay maaari na ngayong mag-swap ng mga token sa loob ng kanilang mobile wallet. I-scan ang QR code para makuha ang mobile app at magsimulang mag-swap.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/tr/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Ethereum Birleşmesi başladı!"
   },
-  "notifications17ActionText": {
-    "message": "Güvenlik ve Gizlilik ayarlarını göster"
-  },
-  "notifications17Title": {
-    "message": "Güvenlik ve Gizlilik Ayarları"
-  },
   "notifications1Description": {
     "message": "MetaMask Mobil kullanıcıları artık mobil cüzdanları içinde token takas edebilirler. Mobil uygulamayı edinmek ve takas yapmaya başlamak için QR kodunu tarayın.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/vi/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "Hợp nhất Ethereum đã được triển khai!"
   },
-  "notifications17ActionText": {
-    "message": "Hiển thị cài đặt Bảo mật và Quyền riêng tư"
-  },
-  "notifications17Title": {
-    "message": "Cài đặt Bảo mật và Quyền riêng tư"
-  },
   "notifications1Description": {
     "message": "Giờ đây, người dùng MetaMask trên điện thoại di động có thể hoán đổi token trong ví di động của họ. Quét mã QR để tải ứng dụng di động và bắt đầu hoán đổi.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

app/_locales/zh_CN/messages.json

@@ -2336,12 +2336,6 @@
   "notifications15Title": {
     "message": "以太坊合并来了！"
   },
-  "notifications17ActionText": {
-    "message": "显示安全和隐私设置"
-  },
-  "notifications17Title": {
-    "message": "安全和隐私设置"
-  },
   "notifications1Description": {
     "message": "MetaMask Mobile 用户现在可以在他们的移动钱包中交换代币。扫描二维码以获取移动应用程序并开始交换。",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

shared/notifications/index.js

@@ -81,13 +81,21 @@ export const UI_NOTIFICATIONS = {
   16: {
     id: 16,
     date: null,
+  },
+  17: {
+    id: 17,
+    date: null,
+  },
+  18: {
+    id: 18,
+    date: null,
     image: {
       src: 'images/open-sea-security-provider.svg',
       width: '100%',
     },
   },
-  17: {
+  19: {
-    id: 17,
+    id: 19,
     date: null,
     image: {
       src: 'images/nfts.svg',
@@ -240,34 +248,34 @@ export const getTranslatedUINotifications = (t, locale) => {
           )
         : '',
     },
-    16: {
+    18: {
-      ...UI_NOTIFICATIONS[16],
+      ...UI_NOTIFICATIONS[18],
-      title: t('notifications16Title'),
+      title: t('notifications18Title'),
       description: [
-        t('notifications16DescriptionOne'),
+        t('notifications18DescriptionOne'),
-        t('notifications16DescriptionTwo'),
+        t('notifications18DescriptionTwo'),
-        t('notifications16DescriptionThree'),
+        t('notifications18DescriptionThree'),
       ],
-      actionText: t('notifications16ActionText'),
+      actionText: t('notifications18ActionText'),
-      date: UI_NOTIFICATIONS[16].date
+      date: UI_NOTIFICATIONS[18].date
         ? new Intl.DateTimeFormat(formattedLocale).format(
-            new Date(UI_NOTIFICATIONS[16].date),
+            new Date(UI_NOTIFICATIONS[18].date),
           )
         : '',
     },
 
-    17: {
+    19: {
-      ...UI_NOTIFICATIONS[17],
+      ...UI_NOTIFICATIONS[19],
-      title: t('notifications17Title'),
+      title: t('notifications19Title'),
       description: [
-        t('notifications17DescriptionOne'),
+        t('notifications19DescriptionOne'),
-        t('notifications17DescriptionTwo'),
+        t('notifications19DescriptionTwo'),
-        t('notifications17DescriptionThree'),
+        t('notifications19DescriptionThree'),
       ],
-      actionText: t('notifications17ActionText'),
+      actionText: t('notifications19ActionText'),
-      date: UI_NOTIFICATIONS[17].date
+      date: UI_NOTIFICATIONS[19].date
         ? new Intl.DateTimeFormat(formattedLocale).format(
-            new Date(UI_NOTIFICATIONS[17].date),
+            new Date(UI_NOTIFICATIONS[19].date),
           )
         : '',
     },

test/e2e/fixture-builder.js

@@ -114,11 +114,21 @@ function defaultFixture() {
           16: {
             date: null,
             id: 16,
-            isShown: true,
+            isShown: false,
           },
           17: {
             date: null,
             id: 17,
+            isShown: false,
+          },
+          18: {
+            date: null,
+            id: 18,
+            isShown: true,
+          },
+          19: {
+            date: null,
+            id: 19,
             isShown: true,
           },
         },

ui/components/app/whats-new-popup/whats-new-popup.js

@@ -61,10 +61,16 @@ function getActionFunctionById(id, history) {
     },
     16: () => {
       updateViewedNotifications({ 16: true });
-      history.push(`${EXPERIMENTAL_ROUTE}#transaction-security-check`);
     },
     17: () => {
       updateViewedNotifications({ 17: true });
+    },
+    18: () => {
+      updateViewedNotifications({ 18: true });
+      history.push(`${EXPERIMENTAL_ROUTE}#transaction-security-check`);
+    },
+    19: () => {
+      updateViewedNotifications({ 19: true });
       history.push(`${EXPERIMENTAL_ROUTE}#autodetect-nfts`);
     },
   };
@@ -266,8 +272,8 @@ export default function WhatsNewPopup({ onClose }) {
           const notification = getTranslatedUINotifications(t, locale)[id];
           const isLast = index === notifications.length - 1;
           // Display the swaps notification with full image
-          // Displays the NFTs & OpenSea notifications 16,17 with full image
+          // Displays the NFTs & OpenSea notifications 18,19 with full image
-          return index === 0 || id === 1 || id === 16 || id === 17
+          return index === 0 || id === 1 || id === 18 || id === 19
             ? renderFirstNotification(notification, idRefMap, history, isLast)
             : renderSubsequentNotification(
                 notification,

ui/selectors/selectors.js

@@ -963,8 +963,10 @@ function getAllowedAnnouncementIds(state) {
     13: false,
     14: false,
     15: false,
-    16: true,
+    16: false,
-    17: true,
+    17: false,
+    18: true,
+    19: true,
   };
 }