Merge branch 'main' into mms-2045-paste-flaky-address

MetaMask · Mar 5, 2025 · 23a0e0e · 23a0e0e
2 parents 0257f2a + bb66894
commit 23a0e0e
Show file tree

Hide file tree

Showing 16 changed files with 5,081 additions and 33 deletions.
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
diff --git a/ui/ducks/bridge/bridge.ts b/ui/ducks/bridge/bridge.ts
@@ -1,5 +1,6 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { type Hex, type CaipChainId } from '@metamask/utils';
+import { zeroAddress } from 'ethereumjs-util';
 import {
   type BridgeToken,
   ChainId,
@@ -94,6 +95,7 @@ const bridgeSlice = createSlice({
           balance: payload.balance ?? '0',
           string: payload.string ?? '0',
           chainId: formatChainIdToCaip(payload.chainId),
+          address: payload.address || zeroAddress(),
         };
       } else {
         state.toToken = payload;

diff --git a/ui/ducks/bridge/utils.ts b/ui/ducks/bridge/utils.ts
@@ -138,11 +138,6 @@ export const getTokenExchangeRate = async (request: {
     tokenAddress,
   );
   if (chainId === MultichainNetworks.SOLANA) {
-    console.log(
-      '=====getTokenExchangeRate solana',
-      exchangeRates,
-      tokenAddress,
-    );
     return exchangeRates?.[tokenAddress];
   }
   // The exchange rate can be checksummed or not, so we need to check both