added xdc mainnet and testnet support

.circleci/config.yml

@@ -3,27 +3,30 @@ version: 2.1
 executors:
   node-browsers:
     docker:
-      - image: cimg/node:18.18-browsers
+      - image: cimg/node:20.11-browsers
     environment:
+      FONTCONFIG_PATH: /etc/fonts
       NODE_OPTIONS: --max_old_space_size=3072
   node-browsers-medium-plus:
     docker:
-      - image: cimg/node:18.18-browsers
+      - image: cimg/node:20.11-browsers
     resource_class: medium+
     environment:
+      FONTCONFIG_PATH: /etc/fonts
       NODE_OPTIONS: --max_old_space_size=4096
   node-browsers-large:
     docker:
-      - image: cimg/node:18.18-browsers
+      - image: cimg/node:20.11-browsers
     resource_class: large
     environment:
+      FONTCONFIG_PATH: /etc/fonts
       NODE_OPTIONS: --max_old_space_size=4096
   shellcheck:
     docker:
       - image: koalaman/shellcheck-alpine@sha256:dfaf08fab58c158549d3be64fb101c626abc5f16f341b569092577ae207db199
   playwright:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.39.0-jammy
+      - image: mcr.microsoft.com/playwright:v1.41.1-jammy
 
 orbs:
   gh: circleci/[email protected]

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -104,6 +104,7 @@ body:
        - Keystone
        - GridPlus Lattice1
        - AirGap Vault
+       - imToken
        - Other (please elaborate in the "Additional Context" section)
  - type: textarea
    id: additional

.nvmrc

@@ -1 +1 @@
-v18
+v20

.storybook/initial-states/approval-screens/add-suggested-token.js

@@ -9,7 +9,7 @@ export const pendingTokenApprovals = {
         address: '0x6b175474e89094c44da98b954eedeac495271d0f',
         symbol: 'ETH',
         decimals: 18,
-        image: './images/eth_logo.png',
+        image: './images/eth_logo.svg',
         unlisted: false,
       },
     },
@@ -118,4 +118,4 @@ export const pendingTokenApprovals = {
       },
     },
   },
-};
+};

.storybook/test-data.js

@@ -115,7 +115,7 @@ const state = {
         address: '0x6b175474e89094c44da98b954eedeac495271d0f',
         symbol: 'ETH',
         decimals: 18,
-        image: './images/eth_logo.png',
+        image: './images/eth_logo.svg',
         unlisted: false,
       },
       '0xB8c77482e45F1F44dE1745F52C74426C631bDD52': {

.vscode/settings.json

@@ -8,5 +8,6 @@
       "fileMatch": ["app/manifest/*/*.json"],
       "url": "https://json.schemastore.org/chrome-manifest"
     }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

.yarn/patches/@metamask-accounts-controller-npm-10.0.0-247993ca9a.patch

@@ -0,0 +1,88 @@
+diff --git a/dist/utils.js b/dist/utils.js
+index 810f229841ffff83f7a28191bc558862b1809e01..aa2ea845d4cccfac8e28f575d7972bd2dba8decf 100644
+--- a/dist/utils.js
++++ b/dist/utils.js
+@@ -11,35 +11,40 @@ const uuid_1 = require("uuid");
+  * @returns The name of the keyring type.
+  */
+ function keyringTypeToName(keyringType) {
+-    switch (keyringType) {
+-        case keyring_controller_1.KeyringTypes.simple: {
+-            return 'Account';
+-        }
+-        case keyring_controller_1.KeyringTypes.hd: {
+-            return 'Account';
+-        }
+-        case keyring_controller_1.KeyringTypes.trezor: {
+-            return 'Trezor';
+-        }
+-        case keyring_controller_1.KeyringTypes.ledger: {
+-            return 'Ledger';
+-        }
+-        case keyring_controller_1.KeyringTypes.lattice: {
+-            return 'Lattice';
+-        }
+-        case keyring_controller_1.KeyringTypes.qr: {
+-            return 'QR';
+-        }
+-        case keyring_controller_1.KeyringTypes.snap: {
+-            return 'Snap Account';
+-        }
+-        case keyring_controller_1.KeyringTypes.custody: {
+-            return 'Custody';
+-        }
+-        default: {
+-            throw new Error(`Unknown keyring ${keyringType}`);
+-        }
++  // Custody Keyrings follow this pattern
++  if (/^Custody.*/.test(keyringType)) {
++    return "Custody";
++  }
++
++  switch (keyringType) {
++    case keyring_controller_1.KeyringTypes.simple: {
++      return "Account";
+     }
++    case keyring_controller_1.KeyringTypes.hd: {
++      return "Account";
++    }
++    case keyring_controller_1.KeyringTypes.trezor: {
++      return "Trezor";
++    }
++    case keyring_controller_1.KeyringTypes.ledger: {
++      return "Ledger";
++    }
++    case keyring_controller_1.KeyringTypes.lattice: {
++      return "Lattice";
++    }
++    case keyring_controller_1.KeyringTypes.qr: {
++      return "QR";
++    }
++    case keyring_controller_1.KeyringTypes.snap: {
++      return "Snap Account";
++    }
++    case keyring_controller_1.KeyringTypes.custody: {
++      return "Custody";
++    }
++    default: {
++      throw new Error(`Unknown keyring ${keyringType}`);
++    }
++  }
+ }
+ exports.keyringTypeToName = keyringTypeToName;
+ /**
+@@ -48,10 +53,10 @@ exports.keyringTypeToName = keyringTypeToName;
+  * @returns The generated UUID.
+  */
+ function getUUIDFromAddressOfNormalAccount(address) {
+-    const v4options = {
+-        random: (0, ethereumjs_util_1.sha256FromString)(address).slice(0, 16),
+-    };
+-    return (0, uuid_1.v4)(v4options);
++  const v4options = {
++    random: (0, ethereumjs_util_1.sha256FromString)(address).slice(0, 16),
++  };
++  return (0, uuid_1.v4)(v4options);
+ }
+ exports.getUUIDFromAddressOfNormalAccount = getUUIDFromAddressOfNormalAccount;
+ //# sourceMappingURL=utils.js.map

README.md

@@ -14,7 +14,7 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
 
 ## Building locally
 
-- Install [Node.js](https://nodejs.org) version 18
+- Install [Node.js](https://nodejs.org) version 20
   - If you are using [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Enable Corepack by executing the command `corepack enable` within the metamask-extension project. Corepack is a utility included with Node.js by default. It manages Yarn on a per-project basis, using the version specified by the `packageManager` property in the project's package.json file. Please note that modern releases of [Yarn](https://yarnpkg.com/getting-started/install) are not intended to be installed globally or via npm.
 - Duplicate `.metamaskrc.dist` within the root and rename it to `.metamaskrc` by running `cp .metamaskrc{.dist,}`.