Merge branch 'main' into refactor/use-new-accounts-packages

MetaMask · Dec 17, 2024 · 79dad4d · 79dad4d
2 parents 90050b9 + da16971
commit 79dad4d
Show file tree

Hide file tree

Showing 89 changed files with 702 additions and 501 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/scripts/controllers/permissions/background-api.js b/app/scripts/controllers/permissions/background-api.js
@@ -1,4 +1,4 @@
-import nanoid from 'nanoid';
+import { nanoid } from 'nanoid';
 import {
   CaveatTypes,
   RestrictedMethods,

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -47,7 +47,7 @@ import { rawChainData } from 'eth-chainlist';
 import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring';
 import EthQuery from '@metamask/eth-query';
 import EthJSQuery from '@metamask/ethjs-query';
-import nanoid from 'nanoid';
+import { nanoid } from 'nanoid';
 import { captureException } from '@sentry/browser';
 import { AddressBookController } from '@metamask/address-book-controller';
 import {

diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1970,11 +1970,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2434,7 +2434,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2445,6 +2444,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4502,9 +4502,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {

diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1970,11 +1970,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2434,7 +2434,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2445,6 +2444,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4502,9 +4502,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {

diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
@@ -637,9 +637,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -1970,11 +1970,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2434,7 +2434,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2445,6 +2444,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4502,9 +4502,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {

diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
@@ -729,9 +729,9 @@
         "console.info": true
       },
       "packages": {
-        "@metamask/approval-controller>nanoid": true,
         "@metamask/base-controller": true,
-        "@metamask/rpc-errors": true
+        "@metamask/rpc-errors": true,
+        "nanoid": true
       }
     },
     "@metamask/approval-controller>nanoid": {
@@ -2062,11 +2062,11 @@
         "@metamask/base-controller": true,
         "@metamask/controller-utils": true,
         "@metamask/json-rpc-engine": true,
-        "@metamask/permission-controller>nanoid": true,
         "@metamask/rpc-errors": true,
         "@metamask/utils": true,
         "deep-freeze-strict": true,
-        "immer": true
+        "immer": true,
+        "nanoid": true
       }
     },
     "@metamask/permission-controller>nanoid": {
@@ -2526,7 +2526,6 @@
         "@metamask/snaps-controllers>@xstate/fsm": true,
         "@metamask/snaps-controllers>concat-stream": true,
         "@metamask/snaps-controllers>get-npm-tarball-url": true,
-        "@metamask/snaps-controllers>nanoid": true,
         "@metamask/snaps-controllers>readable-web-to-node-stream": true,
         "@metamask/snaps-controllers>tar-stream": true,
         "@metamask/snaps-rpc-methods": true,
@@ -2537,6 +2536,7 @@
         "browserify>browserify-zlib": true,
         "eslint>fast-deep-equal": true,
         "immer": true,
+        "nanoid": true,
         "readable-stream": true,
         "semver": true
       }
@@ -4594,9 +4594,7 @@
     },
     "nanoid": {
       "globals": {
-        "crypto": true,
-        "msCrypto": true,
-        "navigator": true
+        "crypto.getRandomValues": true
       }
     },
     "nock>debug": {

diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
@@ -6510,7 +6510,7 @@
         "process.env.NODE_ENV": true
       },
       "packages": {
-        "postcss>nanoid": true,
+        "nanoid": true,
         "postcss>picocolors": true,
         "postcss>source-map-js": true
       }

diff --git a/package.json b/package.json
@@ -400,7 +400,7 @@
     "loglevel": "^1.8.1",
     "lottie-web": "^5.12.2",
     "luxon": "^3.2.1",
-    "nanoid": "^2.1.6",
+    "nanoid": "^3.3.8",
     "pify": "^5.0.0",
     "promise-to-callback": "^1.0.0",
     "prop-types": "^15.6.1",

diff --git a/test/e2e/page-objects/pages/account-list-page.ts b/test/e2e/page-objects/pages/account-list-page.ts
@@ -547,6 +547,19 @@ class AccountListPage {
     });
   }
 
+  /**
+   * Verifies that all occurrences of the account balance value and symbol are displayed as private.
+   *
+   */
+  async check_balanceIsPrivateEverywhere(): Promise<void> {
+    console.log(`Verify all account balance occurrences are private`);
+    const balanceSelectors = {
+      tag: 'span',
+      text: '••••••',
+    };
+    await this.driver.elementCountBecomesN(balanceSelectors, 6);
+  }
+
   async check_currentAccountIsImported(): Promise<void> {
     console.log(`Check that current account is an imported account`);
     await this.driver.waitForSelector({

diff --git a/test/e2e/page-objects/pages/header-navbar.ts b/test/e2e/page-objects/pages/header-navbar.ts
@@ -80,13 +80,6 @@ class HeaderNavbar {
     await this.driver.clickElement(this.switchNetworkDropDown);
   }
 
-  async check_currentSelectedNetwork(networkName: string): Promise<void> {
-    console.log(`Validate the Switch network to ${networkName}`);
-    await this.driver.waitForSelector(
-      `button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
-    );
-  }
-
   /**
    * Verifies that the displayed account label in header matches the expected label.
    *
@@ -101,6 +94,18 @@ class HeaderNavbar {
       text: expectedLabel,
     });
   }
+
+  /**
+   * Validates that the currently selected network matches the expected network name.
+   *
+   * @param networkName - The expected name of the currently selected network.
+   */
+  async check_currentSelectedNetwork(networkName: string): Promise<void> {
+    console.log(`Validate the Switch network to ${networkName}`);
+    await this.driver.waitForSelector(
+      `button[data-testid="network-display"][aria-label="Network Menu ${networkName}"]`,
+    );
+  }
 }
 
 export default HeaderNavbar;
diff --git a/test/e2e/page-objects/pages/home/homepage.ts b/test/e2e/page-objects/pages/home/homepage.ts
@@ -8,8 +8,9 @@ class HomePage {
 
   public headerNavbar: HeaderNavbar;
 
-  private readonly activityTab =
-    '[data-testid="account-overview__activity-tab"]';
+  private readonly activityTab = {
+    testId: 'account-overview__activity-tab',
+  };
 
   private readonly balance = '[data-testid="eth-overview__primary-currency"]';
 
@@ -23,19 +24,35 @@ class HomePage {
     tag: 'h6',
   };
 
-  private readonly erc20TokenDropdown = '[data-testid="import-token-button"]';
+  private readonly erc20TokenDropdown = {
+    testId: 'import-token-button',
+  };
 
-  private readonly nftTab = '[data-testid="account-overview__nfts-tab"]';
+  private readonly nftTab = {
+    testId: 'account-overview__nfts-tab',
+  };
 
   private readonly popoverBackground = '.popover-bg';
 
-  private readonly popoverCloseButton = '[data-testid="popover-close"]';
+  private readonly popoverCloseButton = {
+    testId: 'popover-close',
+  };
 
-  private readonly refreshErc20Tokens = '[data-testid="refreshList"]';
+  private readonly privacyBalanceToggle = {
+    testId: 'sensitive-toggle',
+  };
 
-  private readonly sendButton = '[data-testid="eth-overview-send"]';
+  private readonly refreshErc20Tokens = {
+    testId: 'refreshList',
+  };
 
-  private readonly tokensTab = '[data-testid="account-overview__asset-tab"]';
+  private readonly sendButton = {
+    testId: 'eth-overview-send',
+  };
+
+  private readonly tokensTab = {
+    testId: 'account-overview__asset-tab',
+  };
 
   constructor(driver: Driver) {
     this.driver = driver;
@@ -93,6 +110,10 @@ class HomePage {
     await this.driver.clickElement(this.sendButton);
   }
 
+  async togglePrivacyBalance(): Promise<void> {
+    await this.driver.clickElement(this.privacyBalanceToggle);
+  }
+
   /**
    * Checks if the toaster message for adding a network is displayed on the homepage.
    *