Merge branch 'develop' into olu/test-scenario-eth-sign

MetaMask · Mar 12, 2024 · 0dd6eb8 · 0dd6eb8
2 parents 564e263 + 6e397d0
commit 0dd6eb8
Show file tree

Hide file tree

Showing 87 changed files with 459 additions and 180 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/images/portfolio-v2-whatsnew-banner.png b/app/images/portfolio-v2-whatsnew-banner.png
diff --git a/shared/notifications/index.js b/shared/notifications/index.js
@@ -11,6 +11,7 @@ export const NOTIFICATION_U2F_LEDGER_LIVE = 28;
 export const NOTIFICATION_BLOCKAID_DEFAULT = 29;
 export const NOTIFICATION_STAKING_PORTFOLIO = 30;
 export const NOTIFICATION_PETNAMES = 31;
+export const NOTIFICATION_PORTFOLIO_V2 = 32;
 
 export const UI_NOTIFICATIONS = {
   8: {
@@ -72,6 +73,14 @@ export const UI_NOTIFICATIONS = {
       width: '100%',
     },
   },
+  [NOTIFICATION_PORTFOLIO_V2]: {
+    id: Number(NOTIFICATION_PORTFOLIO_V2),
+    date: null,
+    image: {
+      src: 'images/portfolio-v2-whatsnew-banner.png',
+      width: '100%',
+    },
+  },
 };
 
 export const getTranslatedUINotifications = (
@@ -212,5 +221,16 @@ export const getTranslatedUINotifications = (
       actionText: t('notificationsPetnamesActionText'),
       date: '',
     },
+    [NOTIFICATION_PORTFOLIO_V2]: {
+      ...UI_NOTIFICATIONS[NOTIFICATION_PORTFOLIO_V2],
+      title: t('notificationsPortfolioV2Title'),
+      description: [
+        t('notificationsPortfolioV2DescriptionOne'),
+        t('notificationsPortfolioV2DescriptionTwo'),
+        t('notificationsPortfolioV2DescriptionThree'),
+      ],
+      actionText: t('notificationsPortfolioV2ActionText'),
+      date: '',
+    },
   };
 };
diff --git a/test/e2e/tests/import-flow.spec.js → ...2e/tests/account-menu/import-flow.spec.js b/test/e2e/tests/import-flow.spec.js → ...2e/tests/account-menu/import-flow.spec.js
@@ -12,9 +12,9 @@ const {
   unlockWallet,
   WALLET_PASSWORD,
   waitForAccountRendered,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { emptyHtmlPage } = require('../mock-e2e');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { emptyHtmlPage } = require('../../mock-e2e');
 
 const ganacheOptions = {
   accounts: [
@@ -304,7 +304,7 @@ describe('Import flow @no-mmi', function () {
         const fileInput = await driver.findElement('input[type="file"]');
         const importJsonFile = path.join(
           __dirname,
-          '..',
+          '../..',
           'import-utc-json',
           'test-json-import-account-file.json',
         );

diff --git a/test/e2e/tests/block-explorer.spec.js → .../dapp-interactions/block-explorer.spec.js b/test/e2e/tests/block-explorer.spec.js → .../dapp-interactions/block-explorer.spec.js
@@ -3,9 +3,9 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Block Explorer', function () {
   it('links to the users account on the explorer, ', async function () {

diff --git a/test/e2e/tests/dapp-interactions.spec.js → ...pp-interactions/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions.spec.js → ...pp-interactions/dapp-interactions.spec.js
@@ -8,8 +8,8 @@ const {
   unlockWallet,
   WINDOW_TITLES,
   generateGanacheOptions,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Dapp interactions', function () {
   it('should trigger the add chain confirmation despite MetaMask being locked', async function () {

diff --git a/test/e2e/tests/dapp-tx-edit.spec.js → ...ts/dapp-interactions/dapp-tx-edit.spec.js b/test/e2e/tests/dapp-tx-edit.spec.js → ...ts/dapp-interactions/dapp-tx-edit.spec.js
@@ -5,9 +5,9 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Editing confirmations of dapp initiated contract interactions', function () {
   const smartContract = SMART_CONTRACTS.PIGGYBANK;

diff --git a/test/e2e/tests/permissions.spec.js → ...sts/dapp-interactions/permissions.spec.js b/test/e2e/tests/permissions.spec.js → ...sts/dapp-interactions/permissions.spec.js
@@ -5,8 +5,8 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Permissions', function () {
   it('sets permissions and connect to Dapp', async function () {

diff --git a/test/e2e/tests/revoke-permissions.spec.js → ...p-interactions/revoke-permissions.spec.js b/test/e2e/tests/revoke-permissions.spec.js → ...p-interactions/revoke-permissions.spec.js
@@ -4,8 +4,8 @@ const {
   openDapp,
   unlockWallet,
   defaultGanacheOptions,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Wallet Revoke Permissions', function () {
   it('should revoke eth_accounts permissions via test dapp', async function () {

diff --git a/test/e2e/tests/add-custom-network.spec.js → .../tests/network/add-custom-network.spec.js b/test/e2e/tests/add-custom-network.spec.js → .../tests/network/add-custom-network.spec.js
@@ -1,14 +1,14 @@
 const { strict: assert } = require('assert');
 const { toHex } = require('@metamask/controller-utils');
-const FixtureBuilder = require('../fixture-builder');
+const FixtureBuilder = require('../../fixture-builder');
 const {
   defaultGanacheOptions,
   withFixtures,
   openDapp,
   regularDelayMs,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
+} = require('../../helpers');
 
 const TEST_CHAIN_ID = toHex(100);
 

diff --git a/test/e2e/tests/chain-interactions.spec.js → .../tests/network/chain-interactions.spec.js b/test/e2e/tests/chain-interactions.spec.js → .../tests/network/chain-interactions.spec.js
@@ -5,8 +5,8 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Chain Interactions', function () {
   const port = 8546;

diff --git a/test/e2e/tests/deprecated-networks.spec.js → ...tests/network/deprecated-networks.spec.js b/test/e2e/tests/deprecated-networks.spec.js → ...tests/network/deprecated-networks.spec.js
@@ -1,12 +1,12 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
+const FixtureBuilder = require('../../fixture-builder');
 const {
   withFixtures,
   unlockWallet,
   openDapp,
   WINDOW_TITLES,
-} = require('../helpers');
-const { CHAIN_IDS } = require('../../../shared/constants/network');
+} = require('../../helpers');
+const { CHAIN_IDS } = require('../../../../shared/constants/network');
 
 describe('Deprecated networks', function () {
   it('User should not find goerli network when clicking on the network selector', async function () {

diff --git a/test/e2e/tests/network-error.spec.js → test/e2e/tests/network/network-error.spec.js b/test/e2e/tests/network-error.spec.js → test/e2e/tests/network/network-error.spec.js
@@ -4,9 +4,9 @@ const {
   logInWithBalanceValidation,
   openActionMenuAndStartSendFlow,
   generateGanacheOptions,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { GAS_API_BASE_URL } = require('../../../shared/constants/swaps');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { GAS_API_BASE_URL } = require('../../../../shared/constants/swaps');
 
 describe('Gas API fallback', function () {
   async function mockGasApiDown(mockServer) {

diff --git a/test/e2e/tests/switch-custom-network.spec.js → ...sts/network/switch-custom-network.spec.js b/test/e2e/tests/switch-custom-network.spec.js → ...sts/network/switch-custom-network.spec.js
@@ -1,12 +1,12 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
+const FixtureBuilder = require('../../fixture-builder');
 const {
   withFixtures,
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
   generateGanacheOptions,
-} = require('../helpers');
+} = require('../../helpers');
 
 describe('Switch ethereum chain', function () {
   it('should successfully change the network in response to wallet_switchEthereumChain', async function () {

diff --git a/test/e2e/tests/onboarding.spec.js → test/e2e/tests/onboarding/onboarding.spec.js b/test/e2e/tests/onboarding.spec.js → test/e2e/tests/onboarding/onboarding.spec.js
@@ -12,8 +12,8 @@ const {
   locateAccountBalanceDOM,
   defaultGanacheOptions,
   WALLET_PASSWORD,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask onboarding @no-mmi', function () {
   const wrongSeedPhrase =

diff --git a/test/e2e/tests/petnames-helpers.js → test/e2e/tests/petnames/petnames-helpers.js b/test/e2e/tests/petnames-helpers.js → test/e2e/tests/petnames/petnames-helpers.js
diff --git a/test/e2e/tests/petnames-signatures.spec.js → ...ests/petnames/petnames-signatures.spec.js b/test/e2e/tests/petnames-signatures.spec.js → ...ests/petnames/petnames-signatures.spec.js
@@ -4,9 +4,9 @@ const {
   withFixtures,
   unlockWallet,
   defaultGanacheOptions,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { TEST_SNAPS_WEBSITE_URL } = require('../snaps/enums');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { TEST_SNAPS_WEBSITE_URL } = require('../../snaps/enums');
 const {
   expectName,
   focusTestDapp,

diff --git a/test/e2e/tests/petnames-transactions.spec.js → ...ts/petnames/petnames-transactions.spec.js b/test/e2e/tests/petnames-transactions.spec.js → ...ts/petnames/petnames-transactions.spec.js
@@ -5,8 +5,8 @@ const {
   unlockWallet,
   defaultGanacheOptions,
   openActionMenuAndStartSendFlow,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 const {
   expectName,
   focusTestDapp,

diff --git a/test/e2e/tests/portfolio-site.spec.js → ...2e/tests/portfolio/portfolio-site.spec.js b/test/e2e/tests/portfolio-site.spec.js → ...2e/tests/portfolio/portfolio-site.spec.js
@@ -3,9 +3,9 @@ const {
   withFixtures,
   unlockWallet,
   defaultGanacheOptions,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { emptyHtmlPage } = require('../mock-e2e');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { emptyHtmlPage } = require('../../mock-e2e');
 
 describe('Portfolio site', function () {
   async function mockPortfolioSite(mockServer) {

diff --git a/...pom-blockaid-alert-erc20-approval.spec.js → ...pom-blockaid-alert-erc20-approval.spec.js b/...pom-blockaid-alert-erc20-approval.spec.js → ...pom-blockaid-alert-erc20-approval.spec.js
@@ -1,14 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
   withFixtures,
-} = require('../helpers');
+} = require('../../helpers');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

diff --git a/...pom-blockaid-alert-erc20-transfer.spec.js → ...pom-blockaid-alert-erc20-transfer.spec.js b/...pom-blockaid-alert-erc20-transfer.spec.js → ...pom-blockaid-alert-erc20-transfer.spec.js
@@ -1,14 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
   withFixtures,
-} = require('../helpers');
+} = require('../../helpers');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

diff --git a/...tests/ppom-blockaid-alert-metrics.spec.js → .../ppom/ppom-blockaid-alert-metrics.spec.js b/...tests/ppom-blockaid-alert-metrics.spec.js → .../ppom/ppom-blockaid-alert-metrics.spec.js
@@ -1,6 +1,6 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
@@ -9,7 +9,7 @@ const {
   withFixtures,
   getEventPayloads,
   switchToNotificationWindow,
-} = require('../helpers');
+} = require('../../helpers');
 
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
 const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1';

diff --git a/...m-blockaid-alert-networks-support.spec.js → ...m-blockaid-alert-networks-support.spec.js b/...m-blockaid-alert-networks-support.spec.js → ...m-blockaid-alert-networks-support.spec.js
@@ -1,13 +1,13 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
   withFixtures,
-} = require('../helpers');
+} = require('../../helpers');
 
 async function mockInfura(mockServer) {
   await mockServerJsonRpc(mockServer, [

diff --git a/...s/ppom-blockaid-alert-simple-send.spec.js → ...m/ppom-blockaid-alert-simple-send.spec.js b/...s/ppom-blockaid-alert-simple-send.spec.js → ...m/ppom-blockaid-alert-simple-send.spec.js
@@ -1,13 +1,13 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   defaultGanacheOptions,
   withFixtures,
   sendScreenToConfirmScreen,
   unlockWallet,
-} = require('../helpers');
+} = require('../../helpers');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 const mockMaliciousAddress = '0x5fbdb2315678afecb367f032d93f642f64180aa3';

diff --git a/...lockaid-alert-trade-order-farming.spec.js → ...lockaid-alert-trade-order-farming.spec.js b/...lockaid-alert-trade-order-farming.spec.js → ...lockaid-alert-trade-order-farming.spec.js
@@ -1,14 +1,14 @@
 const { strict: assert } = require('assert');
-const FixtureBuilder = require('../fixture-builder');
-const { mockServerJsonRpc } = require('../mock-server-json-rpc');
+const FixtureBuilder = require('../../fixture-builder');
+const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
   withFixtures,
-} = require('../helpers');
+} = require('../../helpers');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';