Merge branch 'develop' into MMS-1564-swaps-token-verification-info

package.json

@@ -361,7 +361,7 @@
     "@metamask/snaps-utils": "^8.1.1",
     "@metamask/transaction-controller": "^37.2.0",
     "@metamask/user-operation-controller": "^13.0.0",
-    "@metamask/utils": "^9.1.0",
+    "@metamask/utils": "^9.3.0",
     "@ngraveio/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.3.3",
     "@popperjs/core": "^2.4.0",

shared/lib/multichain.test.ts

@@ -1,4 +1,9 @@
-import { isBtcMainnetAddress, isBtcTestnetAddress } from './multichain';
+import { KnownCaipNamespace } from '@metamask/utils';
+import {
+  getCaipNamespaceFromAddress,
+  isBtcMainnetAddress,
+  isBtcTestnetAddress,
+} from './multichain';
 
 const BTC_MAINNET_ADDRESSES = [
   // P2WPKH
@@ -20,35 +25,71 @@ const SOL_ADDRESSES = [
 ];
 
 describe('multichain', () => {
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each(BTC_MAINNET_ADDRESSES)(
-    'returns true if address is compatible with BTC mainnet: %s',
-    (address: string) => {
-      expect(isBtcMainnetAddress(address)).toBe(true);
-    },
-  );
-
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each([...BTC_TESTNET_ADDRESSES, ...ETH_ADDRESSES, ...SOL_ADDRESSES])(
-    'returns false if address is not compatible with BTC mainnet: %s',
-    (address: string) => {
-      expect(isBtcMainnetAddress(address)).toBe(false);
-    },
-  );
-
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each(BTC_TESTNET_ADDRESSES)(
-    'returns true if address is compatible with BTC testnet: %s',
-    (address: string) => {
-      expect(isBtcTestnetAddress(address)).toBe(true);
-    },
-  );
-
-  // @ts-expect-error This is missing from the Mocha type definitions
-  it.each([...BTC_MAINNET_ADDRESSES, ...ETH_ADDRESSES, ...SOL_ADDRESSES])(
-    'returns false if address is compatible with BTC testnet: %s',
-    (address: string) => {
-      expect(isBtcTestnetAddress(address)).toBe(false);
-    },
-  );
+  describe('isBtcMainnetAddress', () => {
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(BTC_MAINNET_ADDRESSES)(
+      'returns true if address is compatible with BTC mainnet: %s',
+      (address: string) => {
+        expect(isBtcMainnetAddress(address)).toBe(true);
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([...BTC_TESTNET_ADDRESSES, ...ETH_ADDRESSES, ...SOL_ADDRESSES])(
+      'returns false if address is not compatible with BTC mainnet: %s',
+      (address: string) => {
+        expect(isBtcMainnetAddress(address)).toBe(false);
+      },
+    );
+  });
+
+  describe('isBtcTestnetAddress', () => {
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(BTC_TESTNET_ADDRESSES)(
+      'returns true if address is compatible with BTC testnet: %s',
+      (address: string) => {
+        expect(isBtcTestnetAddress(address)).toBe(true);
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([...BTC_MAINNET_ADDRESSES, ...ETH_ADDRESSES, ...SOL_ADDRESSES])(
+      'returns false if address is compatible with BTC testnet: %s',
+      (address: string) => {
+        expect(isBtcTestnetAddress(address)).toBe(false);
+      },
+    );
+  });
+
+  describe('getChainTypeFromAddress', () => {
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each([...BTC_MAINNET_ADDRESSES, ...BTC_TESTNET_ADDRESSES])(
+      'returns ChainType.Bitcoin for bitcoin address: %s',
+      (address: string) => {
+        expect(getCaipNamespaceFromAddress(address)).toBe(
+          KnownCaipNamespace.Bip122,
+        );
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(ETH_ADDRESSES)(
+      'returns ChainType.Ethereum for ethereum address: %s',
+      (address: string) => {
+        expect(getCaipNamespaceFromAddress(address)).toBe(
+          KnownCaipNamespace.Eip155,
+        );
+      },
+    );
+
+    // @ts-expect-error This is missing from the Mocha type definitions
+    it.each(SOL_ADDRESSES)(
+      'returns ChainType.Ethereum for non-supported address: %s',
+      (address: string) => {
+        expect(getCaipNamespaceFromAddress(address)).toBe(
+          KnownCaipNamespace.Eip155,
+        );
+      },
+    );
+  });
 });

shared/lib/multichain.ts

@@ -1,3 +1,4 @@
+import { CaipNamespace, KnownCaipNamespace } from '@metamask/utils';
 import { validate, Network } from 'bitcoin-address-validation';
 
 /**
@@ -26,3 +27,17 @@ export function isBtcMainnetAddress(address: string): boolean {
 export function isBtcTestnetAddress(address: string): boolean {
   return validate(address, Network.testnet);
 }
+
+/**
+ * Returns the associated chain's type for the given address.
+ *
+ * @param address - The address to check.
+ * @returns The chain's type for that address.
+ */
+export function getCaipNamespaceFromAddress(address: string): CaipNamespace {
+  if (isBtcMainnetAddress(address) || isBtcTestnetAddress(address)) {
+    return KnownCaipNamespace.Bip122;
+  }
+  // Defaults to "Ethereum" for all other cases for now.
+  return KnownCaipNamespace.Eip155;
+}

test/e2e/tests/confirmations/alerts/insufficient-funds.spec.ts

@@ -73,6 +73,6 @@ async function mintNft(driver: Driver) {
 async function displayAlertForInsufficientBalance(driver: Driver) {
   await driver.waitForSelector({
     css: '[data-testid="alert-modal__selected-alert"]',
-    text: 'You do not have enough ETH in your account to pay for transaction fees.',
+    text: 'You do not have enough ETH in your account to pay for network fees.',
   });
 }

test/e2e/tests/multichain/asset-picker-send.spec.ts

@@ -71,15 +71,15 @@ describe('AssetPickerSendFlow @no-mmi', function () {
           )
         ).getText();
 
-        assert.equal(tokenListValue, '25 ETH');
+        assert.equal(tokenListValue, '$250,000.00');
 
         const tokenListSecondaryValue = await (
           await driver.findElement(
             '[data-testid="multichain-token-list-item-secondary-value"]',
           )
         ).getText();
 
-        assert.equal(tokenListSecondaryValue, '$250,000.00');
+        assert.equal(tokenListSecondaryValue, '25 ETH');
 
         // Search for CHZ
         const searchInputField = await driver.waitForSelector(

ui/components/app/snaps/snap-authorship-header/snap-authorship-header.js

@@ -91,12 +91,14 @@ const SnapAuthorshipHeader = ({
           display={Display.Flex}
           justifyContent={JustifyContent.center}
           alignItems={AlignItems.center}
+          style={{ overflow: 'hidden' }}
         >
           <SnapIcon snapId={snapId} avatarSize={IconSize.Sm} />
           <Text
             color={TextColor.textDefault}
             variant={TextVariant.bodyMdMedium}
             marginLeft={2}
+            title={snapName}
             ellipsis
           >
             {snapName}