[pull] main from MetaMask:main

.yarn/patches/@metamask-assets-controllers-npm-89.0.1-02fa7acd54.patch

@@ -46,3 +46,16 @@ index f64d13f8de56631345a44e6ebb025e62e03f51bc..99aa7f27c574c94b26daa56091ac50d1
                      }
                  }
              });
+diff --git a/dist/token-prices-service/codefi-v2.cjs b/dist/token-prices-service/codefi-v2.cjs
+index 34f7bcf4dea1b8d6a1ea45051be09059d9d35353..6aa82360e63727852cda1719f5e893508b764e75 100644
+--- a/dist/token-prices-service/codefi-v2.cjs
++++ b/dist/token-prices-service/codefi-v2.cjs
+@@ -98,6 +98,8 @@ exports.SUPPORTED_CURRENCIES = [
+     'mxn',
+     // Malaysian Ringgit
+     'myr',
++    // Monad
++    'mon',
+     // Nigerian Naira
+     'ngn',
+     // Norwegian Krone

app/components/UI/Bridge/hooks/useInitialSlippage/index.ts

@@ -8,9 +8,9 @@ import {
   selectSourceToken,
   setSlippage,
 } from '../../../../../core/redux/slices/bridge';
-import { getIsStablecoinPair } from '../../../Swaps/useStablecoinsDefaultSlippage';
 import { isHex } from 'viem';
 import AppConstants from '../../../../../core/AppConstants';
+import { getIsStablecoinPair } from '../useStablecoinsDefaultSlippage';
 
 export const useInitialSlippage = () => {
   const dispatch = useDispatch();

app/components/UI/Swaps/useStablecoinsDefaultSlippage.test.tsx → app/components/UI/Bridge/hooks/useStablecoinsDefaultSlippage/index.test.tsx

@@ -1,11 +1,8 @@
-import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
-import {
-  useStablecoinsDefaultSlippage,
-  handleEvmStablecoinSlippage,
-} from './useStablecoinsDefaultSlippage';
+import { useStablecoinsDefaultSlippage, handleEvmStablecoinSlippage } from './';
 import { Hex } from '@metamask/utils';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
-import AppConstants from '../../../core/AppConstants';
+import { renderHookWithProvider } from '../../../../../util/test/renderWithProvider';
+import AppConstants from '../../../../../core/AppConstants';
 
 describe('useStablecoinsDefaultSlippage', () => {
   const mockSetSlippage = jest.fn();

app/components/UI/Swaps/useStablecoinsDefaultSlippage.ts → app/components/UI/Bridge/hooks/useStablecoinsDefaultSlippage/index.ts

@@ -1,10 +1,10 @@
 import { useEffect } from 'react';
-import AppConstants from '../../../core/AppConstants';
 import { Hex } from '@metamask/utils';
 import { toChecksumHexAddress } from '@metamask/controller-utils';
-import usePrevious from '../../hooks/usePrevious';
-import { NETWORKS_CHAIN_ID } from '../../../constants/network';
 import { CHAIN_IDS } from '@metamask/transaction-controller';
+import AppConstants from '../../../../../core/AppConstants';
+import { NETWORKS_CHAIN_ID } from '../../../../../constants/network';
+import usePrevious from '../../../../hooks/usePrevious';
 
 // USDC and USDT for now
 const StablecoinsByChainId: Partial<Record<Hex, Set<string>>> = {

app/components/UI/Predict/views/PredictBuyPreview/PredictBuyPreview.tsx

@@ -65,6 +65,7 @@ import ButtonHero from '../../../../../component-library/components-temp/Buttons
 import { usePredictRewards } from '../../hooks/usePredictRewards';
 import { TraceName } from '../../../../../util/trace';
 import { usePredictMeasurement } from '../../hooks/usePredictMeasurement';
+import { PredictBuyPreviewSelectorsIDs } from '../../../../../../e2e/selectors/Predict/Predict.selectors';
 
 const PredictBuyPreview = () => {
   const tw = useTailwind();
@@ -473,6 +474,7 @@ const PredictBuyPreview = () => {
 
     return (
       <ButtonHero
+        testID={PredictBuyPreviewSelectorsIDs.PLACE_BET_BUTTON}
         onPress={onPlaceBet}
         disabled={!canPlaceBet}
         isLoading={isLoading}

app/components/UI/Swaps/QuotesView.js

@@ -46,8 +46,8 @@ import {
   getErrorMessage,
   getFetchParams,
   getQuotesNavigationsParams,
-  isSwapsNativeAsset,
 } from './utils';
+import { isSwapsNativeAsset } from '../../../util/bridge';
 import { strings } from '../../../../locales/i18n';
 
 import Engine from '../../../core/Engine';

app/components/UI/Swaps/index.js

@@ -46,10 +46,10 @@ import AppConstants from '../../../core/AppConstants';
 import { strings } from '../../../../locales/i18n';
 import {
   setQuotesNavigationsParams,
-  isSwapsNativeAsset,
   isDynamicToken,
   shouldShowMaxBalanceLink,
 } from './utils';
+import { isSwapsNativeAsset } from '../../../util/bridge';
 import { getSwapsAmountNavbar } from '../Navbar';
 
 import useModalHandler from '../../Base/hooks/useModalHandler';
@@ -88,9 +88,9 @@ import {
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { getSwapsLiveness } from '../../../reducers/swaps/utils';
 import { selectShouldUseSmartTransaction } from '../../../selectors/smartTransactionsController';
-import { useStablecoinsDefaultSlippage } from './useStablecoinsDefaultSlippage';
 import { selectNetworkImageSourceByChainId } from '../../../selectors/networkInfos';
 import ContextualNetworkPicker from '../ContextualNetworkPicker/ContextualNetworkPicker';
+import { useStablecoinsDefaultSlippage } from '../Bridge/hooks/useStablecoinsDefaultSlippage';
 import Routes from '../../../constants/navigation/Routes';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { useChainRedirect } from './useChainRedirect';

app/components/UI/Swaps/utils/index.js

@@ -10,6 +10,7 @@ import {
   NATIVE_SWAPS_TOKEN_ADDRESS,
   SWAPS_TESTNET_CHAIN_ID,
 } from '../../../../constants/bridge';
+import { isSwapsNativeAsset } from '../../../../util/bridge';
 
 const allowedChainIds = [
   CHAIN_IDS.MAINNET,
@@ -54,10 +55,6 @@ export function isSwapsAllowed(chainId) {
   return allowedChainIds.includes(chainId);
 }
 
-export function isSwapsNativeAsset(token) {
-  return Boolean(token) && token?.address === NATIVE_SWAPS_TOKEN_ADDRESS;
-}
-
 export function isDynamicToken(token) {
   return (
     Boolean(token) &&

app/components/UI/Swaps/utils/token-list-utils.ts

@@ -1,5 +1,4 @@
 import { Hex } from '@metamask/utils';
-import { isSwapsNativeAsset } from '.';
 import { safeToChecksumAddress } from '../../../../util/address';
 import {
   balanceToFiatNumber,
@@ -8,6 +7,7 @@ import {
   renderFromWei,
   weiToFiatNumber,
 } from '../../../../util/number';
+import { isSwapsNativeAsset } from '../../../../util/bridge';
 
 export interface Token {
   address: string;

app/components/UI/Swaps/utils/useBalance.js

@@ -1,11 +1,12 @@
 import { useMemo } from 'react';
-import { isSwapsNativeAsset } from '.';
+
 import {
   renderFromTokenMinimalUnit,
   renderFromWei,
   safeNumberToBN,
 } from '../../../../util/number';
 import { safeToChecksumAddress } from '../../../../util/address';
+import { isSwapsNativeAsset } from '../../../../util/bridge';
 
 function useBalance(
   accounts,

app/components/UI/TransactionElement/utils.js

@@ -27,7 +27,7 @@ import {
   isTransactionIncomplete,
 } from '../../../util/transactions';
 import { swapsUtils } from '@metamask/swaps-controller';
-import { isSwapsNativeAsset } from '../Swaps/utils';
+import { isSwapsNativeAsset } from '../../../util/bridge';
 import Engine from '../../../core/Engine';
 import { TransactionType } from '@metamask/transaction-controller';
 import {

app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.test.tsx

@@ -38,7 +38,7 @@ const mockNetworks: ProcessedNetwork[] = [
 
 const mockUsePopularNetworks = jest.fn(() => mockNetworks);
 
-jest.mock('../../hooks/usePopularNetworks', () => ({
+jest.mock('../../hooks/usePopularNetworks/usePopularNetworks', () => ({
   usePopularNetworks: () => mockUsePopularNetworks(),
 }));
 

app/components/UI/Trending/components/TrendingTokensBottomSheet/TrendingTokenNetworkBottomSheet.tsx

@@ -19,7 +19,7 @@ import Avatar, {
 import { strings } from '../../../../../../locales/i18n';
 import { ProcessedNetwork } from '../../../../hooks/useNetworksByNamespace/useNetworksByNamespace';
 import { CaipChainId } from '@metamask/utils';
-import { usePopularNetworks } from '../../hooks/usePopularNetworks';
+import { usePopularNetworks } from '../../hooks/usePopularNetworks/usePopularNetworks';
 
 export enum NetworkOption {
   AllNetworks = 'all',

app/components/UI/Trending/hooks/usePopularNetworks/usePopularNetworks.test.ts

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { CaipChainId } from '@metamask/utils';
 import { BtcScope, SolScope } from '@metamask/keyring-api';
 import { isTestNet } from '../../../../../util/networks';
-import { usePopularNetworks } from '.';
+import { usePopularNetworks } from './usePopularNetworks';
 
 jest.mock('react-redux', () => ({
   useSelector: jest.fn(),