diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 3ebc7c3fe..a289f128e 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -2344,6 +2344,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." diff --git a/shared/notifications/index.js b/shared/notifications/index.js index 4d4325e1d..9a3cb0351 100644 --- a/shared/notifications/index.js +++ b/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), + ) + : '', + }, }; }; diff --git a/test/e2e/fixtures/address-entry/state.json b/test/e2e/fixtures/address-entry/state.json index fcd464900..03ed534bd 100644 --- a/test/e2e/fixtures/address-entry/state.json +++ b/test/e2e/fixtures/address-entry/state.json @@ -82,6 +82,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/connected-state/state.json b/test/e2e/fixtures/connected-state/state.json index e0c27264e..e29020a90 100644 --- a/test/e2e/fixtures/connected-state/state.json +++ b/test/e2e/fixtures/connected-state/state.json @@ -72,6 +72,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/custom-rpc/state.json b/test/e2e/fixtures/custom-rpc/state.json index 9aae513b6..ecd4ea5dc 100644 --- a/test/e2e/fixtures/custom-rpc/state.json +++ b/test/e2e/fixtures/custom-rpc/state.json @@ -68,6 +68,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/custom-token/state.json b/test/e2e/fixtures/custom-token/state.json index 6013db122..ea408f952 100644 --- a/test/e2e/fixtures/custom-token/state.json +++ b/test/e2e/fixtures/custom-token/state.json @@ -85,6 +85,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/eip-1559-v2-dapp/state.json b/test/e2e/fixtures/eip-1559-v2-dapp/state.json index 8c52dd45f..1a6149f20 100644 --- a/test/e2e/fixtures/eip-1559-v2-dapp/state.json +++ b/test/e2e/fixtures/eip-1559-v2-dapp/state.json @@ -69,6 +69,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/eip-1559-v2/state.json b/test/e2e/fixtures/eip-1559-v2/state.json index d5fcb62f7..e44ba2a37 100644 --- a/test/e2e/fixtures/eip-1559-v2/state.json +++ b/test/e2e/fixtures/eip-1559-v2/state.json @@ -69,6 +69,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/import-ui/state.json b/test/e2e/fixtures/import-ui/state.json index c8921ee5e..80ab5894a 100644 --- a/test/e2e/fixtures/import-ui/state.json +++ b/test/e2e/fixtures/import-ui/state.json @@ -122,6 +122,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json index 3805dc636..2a5849f2e 100644 --- a/test/e2e/fixtures/imported-account/state.json +++ b/test/e2e/fixtures/imported-account/state.json @@ -68,6 +68,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/localization/state.json b/test/e2e/fixtures/localization/state.json index 0b96e54c0..7b8d4ae27 100644 --- a/test/e2e/fixtures/localization/state.json +++ b/test/e2e/fixtures/localization/state.json @@ -68,6 +68,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/metrics-enabled/state.json b/test/e2e/fixtures/metrics-enabled/state.json index 38569ec40..7a4c864a5 100644 --- a/test/e2e/fixtures/metrics-enabled/state.json +++ b/test/e2e/fixtures/metrics-enabled/state.json @@ -72,6 +72,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json index 9123d3a9b..a9faca5ba 100644 --- a/test/e2e/fixtures/navigate-transactions/state.json +++ b/test/e2e/fixtures/navigate-transactions/state.json @@ -68,6 +68,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/onboarding/state.json b/test/e2e/fixtures/onboarding/state.json index 32d270bd3..9bd17bc72 100644 --- a/test/e2e/fixtures/onboarding/state.json +++ b/test/e2e/fixtures/onboarding/state.json @@ -42,6 +42,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/send-edit-v2/state.json b/test/e2e/fixtures/send-edit-v2/state.json index f18eaf5c2..830976631 100644 --- a/test/e2e/fixtures/send-edit-v2/state.json +++ b/test/e2e/fixtures/send-edit-v2/state.json @@ -69,6 +69,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/send-edit/state.json b/test/e2e/fixtures/send-edit/state.json index 0df44fd78..8c5a4658e 100644 --- a/test/e2e/fixtures/send-edit/state.json +++ b/test/e2e/fixtures/send-edit/state.json @@ -69,6 +69,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/special-settings/state.json b/test/e2e/fixtures/special-settings/state.json index 1fdb61bb1..2f0297cc2 100644 --- a/test/e2e/fixtures/special-settings/state.json +++ b/test/e2e/fixtures/special-settings/state.json @@ -62,6 +62,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/test/e2e/fixtures/threebox-enabled/state.json b/test/e2e/fixtures/threebox-enabled/state.json index 57b5ae345..a2e4229a4 100644 --- a/test/e2e/fixtures/threebox-enabled/state.json +++ b/test/e2e/fixtures/threebox-enabled/state.json @@ -78,6 +78,9 @@ }, "14": { "isShown": true + }, + "15": { + "isShown": true } } }, diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index 13b259f9c..4a63ca187 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -834,6 +834,7 @@ function getAllowedAnnouncementIds(state) { 12: false, 13: true, 14: threeBoxSyncingAllowed, + 15: true, }; }