Add notification about the merge (#15846)

app/_locales/en/messages.json

@@ -2360,6 +2360,13 @@
   "notifications14Title": {
     "message": "3Box Deprecation"
   },
+  "notifications15Description": {
+    "message": "There's no action required from you, so keep using your wallet as usual. Be aware of potential scams around the Merge.",
+    "description": "Description of a notification in the 'See What's New' popup. Advises users about the ethereum merge (https://ethereum.org/en/upgrades/merge/#main-content) and potential scams."
+  },
+  "notifications15Title": {
+    "message": "The Ethereum Merge is here!"
+  },
   "notifications1Description": {
     "message": "MetaMask Mobile users can now swap tokens inside their mobile wallet. Scan the QR code to get the mobile app and start swapping.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."

shared/notifications/index.js

@@ -72,7 +72,11 @@ export const UI_NOTIFICATIONS = {
   },
   14: {
     id: 14,
-    date: null,
+    date: '2022-09-15',
+  },
+  15: {
+    id: 15,
+    date: '2022-09-15',
   },
 };
 
@@ -210,5 +214,15 @@ export const getTranslatedUINotifications = (t, locale) => {
           )
         : '',
     },
+    15: {
+      ...UI_NOTIFICATIONS[15],
+      title: t('notifications15Title'),
+      description: t('notifications15Description'),
+      date: UI_NOTIFICATIONS[15].date
+        ? new Intl.DateTimeFormat(formattedLocale).format(
+            new Date(UI_NOTIFICATIONS[15].date),
+          )
+        : '',
+    },
   };
 };

test/e2e/fixtures/address-entry/state.json

@@ -83,6 +83,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/connected-state/state.json

@@ -73,6 +73,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/custom-rpc/state.json

@@ -69,6 +69,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/custom-token/state.json

@@ -86,6 +86,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/eip-1559-v2-dapp/state.json

@@ -70,6 +70,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/eip-1559-v2/state.json

@@ -70,6 +70,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/import-ui/state.json

@@ -122,6 +122,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/imported-account/state.json

@@ -69,6 +69,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/localization/state.json

@@ -69,6 +69,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/metrics-enabled/state.json

@@ -73,6 +73,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/navigate-transactions/state.json

@@ -69,6 +69,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/onboarding/state.json

@@ -42,6 +42,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/send-edit-v2/state.json

@@ -70,6 +70,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/send-edit/state.json

@@ -70,6 +70,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/special-settings/state.json

@@ -63,6 +63,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

test/e2e/fixtures/threebox-enabled/state.json

@@ -79,6 +79,9 @@
         },
         "14": {
           "isShown": true
+        },
+        "15": {
+          "isShown": true
         }
       }
     },

ui/selectors/selectors.js

@@ -829,6 +829,7 @@ function getAllowedAnnouncementIds(state) {
     12: false,
     13: true,
     14: threeBoxSyncingAllowed,
+    15: true,
   };
 }