Merge remote-tracking branch 'origin/main' into refactor/unlock-deep-defi-v5-compat

Author: DDDDDanica

CHANGELOG.md

@@ -7,6 +7,66 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.8.0]
+
+### Added
+
+- Bump bitcoin snap version to v1.4.3 (#37023)
+- Subscription & shield controller updates (#37371)
+- Added account type labels to asset details (#37332)
+- Show Need help link together with error on Claims form Transaction hash field (#37297)
+- Update payment-method component in shield-subscription page (#37340)
+- Added optional prop, `fallbackName` to `name-details` component. (#37299)
+  Provide token symbol from shield pricing as a
+  `fallbackName` prop in Shield-subscription-approval page.
+- Claims form back button redirect to Transaction shield page (#37333)
+- Set autofocus false on confirmation alert modals (#37294)
+- Added account type tags for bitcoin (#36927)
+- Use ArrowDown instead of ArrowRight on shield list buttons (#37292)
+- Updated two-tab components to use full-width layout for better visual balance (#37142)
+- Sidebar experimental PR (#36564)
+- Hide search field on asset picker inside Shield plan (#37193)
+- Updated add custom RPC flow (#36640)
+- Added support for buying Bitcoin and other non-EVM cryptocurrencies through the MetaMask buy crypto flow (#37146)
+- Added chain ID and display backend errors properly (#37174)
+- Added copy icon to network addresses in the account header (#37112)
+- Updated UI and copywriting on Shield Plan Confirm page (#37159)
+- Updated pay with crypto copywriting (#37110)
+
+### Fixed
+
+- Updates add account button text to `Add account` (#37288)
+- Fixes `Background connection unresponsive` issues caused by the UI attempting to load before the background process has (#36729)
+  begun initializing.
+- Updated smart account terminology in the UI from "Enable smart contract account" to "Use smart account" (#37235)
+- Transaction shield covered button show modal (#37225)
+- Update broken onekey tutorial link. (#37217)
+- Added popular networks (Arbitrum, BSC, Optimism, Polygon, Sei, and Base) by default for all users, filtered to only (#37172)
+  include networks supported by accounts API v4
+- Fixed a bug causing the setting showNativeTokenAsMainBalance to not display native user balance when ON. (#37233)
+- Enables storing EIP-7715 permissions granted by the user (#37158)
+- Reduce excess re-renders (#37293)
+- Aligned the Import Wallet UI in the 'Add Wallet' flow with the existing 'Import SRP' onboarding design for consistency (#37207)
+- Fixed shield subscription trial days value inconsistency (#37295)
+- Removed scroll state for MetaMetric UI when opening it on small-screen devices. (#37220)
+- Fixed address security alerts to be properly cached per network, preventing incorrect security warnings when switching between (#36708)
+  chains
+- Fix wrong link on BTC asset details (#37180)
+- Added modal overlay for onboarding modal (#37206)
+- Fixed delay checking if token is already imported inside import tokens modal. (#37116)
+- Fix BTC activity is not shown on asset details (#37170)
+- Fixed Solana and Bitcoin icons not showing in the details page (#37065)
+- Fixed pre-emptive phishing page redirect on Google search results. (#37029)
+- Normalize basePath trailing slash in getRelativeLocationForNestedRoutes (#37161)
+- Fixed an issue where some avatars would be out of sync (#37173)
+- Fix the manual refresh and token detection (#37130)
+- Fixes subscription-polling when shield feature is disabled (#37476)
+- Fixes network nicknames for popular networks (#37477)
+- Fixes historical prices chart ranges for non-evm assets (#37505)
+- Fixes issue where we're failing to log swap comparisons in some scenarios (#37496)
+- Fixes token image and symbol in confirmation for EVM transactions when nonEVM network is selected at wallet view (#37491)
+- Fixes a bug where tokenId for NFT was not being sent correctly in send flow (#37555)
+
 ## [13.7.0]
 
 ### Added
@@ -1009,7 +1069,8 @@ authorized by the user.` error until the user fully revoked dapp
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.7.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.8.0...HEAD
+[13.8.0]: https://github.com/MetaMask/metamask-extension/compare/v13.7.0...v13.8.0
 [13.7.0]: https://github.com/MetaMask/metamask-extension/compare/v13.6.0...v13.7.0
 [13.6.0]: https://github.com/MetaMask/metamask-extension/compare/v13.5.0...v13.6.0
 [13.5.0]: https://github.com/MetaMask/metamask-extension/compare/v13.4.3...v13.5.0

builds.yml

@@ -21,6 +21,7 @@ buildTypes:
       - multi-srp
       - multichain
       - bitcoin
+      - bitcoin-swaps
     # Additional env variables that are specific to this build
     env:
       - INFURA_PROD_PROJECT_ID
@@ -450,6 +451,3 @@ env:
   # This should only be used for local testing, and should not be enabled in any
   # production builds (including beta and Flask).
   - FORCE_PREINSTALLED_SNAPS: 'false'
-
-  # Enable dapp swap shield implementation
-  - DAPP_SWAP_SHIELD_ENABLED: false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "13.9.0",
+  "version": "13.10.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -321,7 +321,7 @@
     "@metamask/logging-controller": "^7.0.0",
     "@metamask/logo": "^4.0.0",
     "@metamask/message-manager": "^14.0.0",
-    "@metamask/message-signing-snap": "1.1.3",
+    "@metamask/message-signing-snap": "1.1.4",
     "@metamask/messenger": "^0.3.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/multichain-account-service": "^2.1.0",

test/e2e/tests/confirmations/transactions/metrics.spec.ts

@@ -18,6 +18,12 @@ import { assertAdvancedGasDetails } from './shared';
 const { withFixtures, getEventPayloads } = require('../../../helpers');
 const FixtureBuilder = require('../../../fixture-builder');
 
+// Type definition for event structure
+type MetricsEvent = {
+  event: string;
+  [key: string]: unknown;
+};
+
 describe('Metrics', function () {
   it('Sends a contract interaction type 2 transaction (EIP1559) with the right properties in the metric events', async function () {
     await withFixtures(
@@ -75,6 +81,18 @@ describe('Metrics', function () {
         await transactionConfirmation.checkGasFeeSymbol('ETH');
         await transactionConfirmation.checkGasFee('0.0009');
 
+        // Wait for Transaction Added events before enabling advanced view
+        // This ensures contract interaction "Added" events have transaction_advanced_view: undefined
+        await driver.wait(async () => {
+          const currentEvents = await getEventPayloads(driver, mockedEndpoints);
+          const addedEvents = currentEvents.filter(
+            (event: MetricsEvent) =>
+              event.event === 'Transaction Added' ||
+              event.event === 'Transaction Added Anon',
+          );
+          return addedEvents.length >= 4; // Wait for 4 "Added" events (2 deployment + 2 contract interaction)
+        }, 10000);
+
         // enable the advanced view
         await transactionConfirmation.clickAdvancedDetailsButton();
         await transactionConfirmation.verifyAdvancedDetailsHexDataIsDisplayed(

test/env.js

@@ -18,4 +18,3 @@ process.env.METAMASK_VERSION = 'MOCK_VERSION';
 process.env.TZ = 'UTC';
 process.env.SEEDLESS_ONBOARDING_ENABLED = 'true';
 process.env.METAMASK_SHIELD_ENABLED = 'false';
-process.env.DAPP_SWAP_SHIELD_ENABLED = 'true';

ui/components/app/import-token/token-list/token-list.component.js

@@ -71,6 +71,7 @@ export default class TokenList extends Component {
               .fill(undefined)
               .map((_, i) => {
                 const { symbol, name, address, chainId } = results[i] || {};
+                const uniqueKey = `${address || 'unknown'}-${chainId || 'nochain'}-${i}-${symbol || 'nosymbol'}-${name || 'noname'}`;
                 let tokenAlreadyAdded = false;
 
                 tokenAlreadyAdded = checkExistingAllTokens(
@@ -85,7 +86,7 @@ export default class TokenList extends Component {
                 return (
                   Boolean(results[i]?.iconUrl || symbol || name) && (
                     <Box
-                      key={address}
+                      key={uniqueKey}
                       display={Display.Flex}
                       alignItems={AlignItems.center}
                       flexDirection={FlexDirection.Row}

ui/components/app/multichain-bridge-transaction-details-modal/multichain-bridge-transaction-details-modal.tsx

@@ -450,6 +450,16 @@ const MultichainBridgeTransactionDetailsModal = ({
                           : assetData.amount;
                         return `${displayAmount} ${assetData.unit}`;
                       }
+
+                      // Fallback to quote data when transaction.from is empty (e.g., BTC transactions)
+                      if (quote?.srcTokenAmount && quote?.srcAsset?.symbol) {
+                        const formattedAmount = formatDestTokenAmount(
+                          quote.srcTokenAmount,
+                          quote.srcAsset.decimals,
+                        );
+                        return `${formattedAmount} ${quote.srcAsset.symbol}`;
+                      }
+
                       return '';
                     })()}
                   </Text>

ui/contexts/rive-wasm/index.tsx

@@ -54,13 +54,21 @@ const RiveWasmContext = createContext<{
   error: Error | undefined;
   urlBufferMap: Record<string, ArrayBuffer>;
   setUrlBufferCache: (url: string, buffer: ArrayBuffer) => void;
+  animationCompleted: Record<string, boolean>;
+  setIsAnimationCompleted: (
+    animationName: string,
+    isAnimationCompleted: boolean,
+  ) => void;
 }>({
   isWasmReady: false,
   loading: false,
   error: undefined,
   urlBufferMap: {},
   // eslint-disable-next-line no-empty-function
   setUrlBufferCache: () => {},
+  animationCompleted: {},
+  // eslint-disable-next-line no-empty-function
+  setIsAnimationCompleted: () => {},
 });
 
 // TODO: Fix in https://github.com/MetaMask/metamask-extension/issues/31860
@@ -73,18 +81,40 @@ export default function RiveWasmProvider({
   const [urlBufferMap, setUrlBufferMap] = useState<Record<string, ArrayBuffer>>(
     {},
   );
+  const [animationCompleted, setAnimationCompleted] = useState<
+    Record<string, boolean>
+  >({});
+
   const setUrlBufferCache = useCallback(
     (url: string, buffer: ArrayBuffer) => {
       setUrlBufferMap((prev) => ({ ...prev, [url]: buffer }));
     },
     [setUrlBufferMap],
   );
 
+  const setIsAnimationCompleted = useCallback(
+    (animationName: string, isAnimationCompleted: boolean) => {
+      setAnimationCompleted((prev) => ({
+        ...prev,
+        [animationName]: isAnimationCompleted,
+      }));
+    },
+    [setAnimationCompleted],
+  );
+
   const { isWasmReady, loading, error } = useRiveWasmReady();
 
   return (
     <RiveWasmContext.Provider
-      value={{ isWasmReady, loading, error, urlBufferMap, setUrlBufferCache }}
+      value={{
+        isWasmReady,
+        loading,
+        error,
+        urlBufferMap,
+        setUrlBufferCache,
+        animationCompleted,
+        setIsAnimationCompleted,
+      }}
     >
       {children}
     </RiveWasmContext.Provider>

ui/pages/bridge/quotes/multichain-bridge-quote-card.tsx

@@ -27,7 +27,11 @@ import {
   getIsStxEnabled,
 } from '../../../ducks/bridge/selectors';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { formatCurrencyAmount, formatTokenAmount } from '../utils/quote';
+import {
+  formatCurrencyAmount,
+  formatNetworkFee,
+  formatTokenAmount,
+} from '../utils/quote';
 import { getCurrentCurrency } from '../../../ducks/metamask/metamask';
 import {
   IconColor,
@@ -264,15 +268,13 @@ export const MultichainBridgeQuoteCard = ({
                   style={{ textDecoration: 'line-through' }}
                 >
                   {activeQuote.includedTxFees?.valueInCurrency
-                    ? formatCurrencyAmount(
+                    ? formatNetworkFee(
                         activeQuote.includedTxFees.valueInCurrency,
                         currency,
-                        2,
                       )
-                    : formatCurrencyAmount(
+                    : formatNetworkFee(
                         activeQuote.totalNetworkFee?.valueInCurrency,
                         currency,
-                        2,
                       )}
                 </Text>
                 <Text
@@ -289,10 +291,9 @@ export const MultichainBridgeQuoteCard = ({
                 color={TextColor.textAlternative}
                 data-testid="network-fees"
               >
-                {formatCurrencyAmount(
+                {formatNetworkFee(
                   activeQuote.totalNetworkFee?.valueInCurrency,
                   currency,
-                  2,
                 )}
               </Text>
             )}

ui/pages/bridge/utils/quote.ts

@@ -25,7 +25,7 @@ export const formatTokenAmount = (
 };
 
 export const formatCurrencyAmount = (
-  stringifiedDecAmount: string | null,
+  stringifiedDecAmount: string | null | undefined,
   currency: string,
   precision: number = DEFAULT_PRECISION,
 ) => {
@@ -45,6 +45,62 @@ export const formatCurrencyAmount = (
   return formatCurrency(amount.toString(), currency, precision);
 };
 
+/**
+ * Formats network fees with dynamic precision to avoid showing $0.00 for non-zero fees.
+ * If fees are less than $0.01, increases decimal places up to 4 until the first non-zero digit is shown.
+ * If fees are non-zero but smaller than $0.0001, rounds up to $0.0001.
+ *
+ * @param stringifiedDecAmount - The fee amount as a string
+ * @param currency - The currency code (e.g., 'USD')
+ * @returns Formatted currency string with appropriate precision
+ */
+export function formatNetworkFee(
+  stringifiedDecAmount: string | null | undefined,
+  currency: string,
+): string | undefined {
+  if (!stringifiedDecAmount) {
+    return undefined;
+  }
+
+  const amount = new BigNumber(stringifiedDecAmount);
+
+  // If amount is zero, return formatted zero
+  if (amount.isZero()) {
+    return formatCurrency(amount.toString(), currency, 2);
+  }
+
+  // If amount is >= $0.01, use standard 2 decimal places
+  if (amount.gte(0.01)) {
+    return formatCurrency(amount.toString(), currency, 2);
+  }
+
+  // For amounts < $0.01, find the precision that shows the first non-zero digit
+  // Try precision from 2 to 4 (max allowed)
+  for (let precision = 2; precision <= 4; precision++) {
+    // Scale the amount by 10^precision to move the target digit to the ones place
+    // Example: 0.0005 with precision 3 → 0.5 (moves 3rd decimal to ones place)
+    const scaleFactor = new BigNumber(10).pow(precision);
+    const scaledAmount = amount.times(scaleFactor);
+
+    // Round using ROUND_HALF_UP to match currency formatter's rounding behavior
+    // If the rounded value is non-zero, this precision will show a non-zero digit
+    const roundedValue = scaledAmount.round(0, BigNumber.ROUND_HALF_UP);
+
+    if (roundedValue.gt(0)) {
+      return formatCurrency(amount.toString(), currency, precision);
+    }
+  }
+
+  // If after 4 decimal places it's still showing as zero but original amount > 0,
+  // round up to $0.0001
+  if (amount.gt(0)) {
+    return formatCurrency('0.0001', currency, 4);
+  }
+
+  // Fallback to 2 decimal places
+  return formatCurrency(amount.toString(), currency, 2);
+}
+
 export const formatProviderLabel = (args?: {
   bridgeId: QuoteResponse['quote']['bridgeId'];
   bridges: QuoteResponse['quote']['bridges'];