Merge branch 'main' into feat-tmcu-443-splash-screen-animation

Author: vinnyhoward

.github/workflows/ci.yml

@@ -214,7 +214,7 @@ jobs:
           NODE_OPTIONS: --max_old_space_size=12288
 
       - name: Check bundle size
-        run: ./scripts/js-bundle-stats.sh ios/main.jsbundle 54
+        run: ./scripts/js-bundle-stats.sh ios/main.jsbundle 55
 
       - name: Upload iOS bundle
         uses: actions/upload-artifact@v4

app/components/Nav/Main/MainNavigator.js

@@ -1132,7 +1132,10 @@ const MainNavigator = () => {
       <Stack.Screen
         name={Routes.BRIDGE.MODALS.ROOT}
         component={BridgeModalStack}
-        options={clearStackNavigatorOptionsWithTransitionAnimation}
+        options={{
+          ...clearStackNavigatorOptionsWithTransitionAnimation,
+          presentation: 'transparentModal',
+        }}
       />
       <Stack.Screen
         name="StakeScreens"

app/components/Nav/Main/__snapshots__/MainNavigator.test.tsx.snap

@@ -245,6 +245,7 @@ exports[`MainNavigator Tab Bar Visibility hides tab bar when browser is active 1
         },
         "cardStyleInterpolator": [Function],
         "headerShown": false,
+        "presentation": "transparentModal",
       }
     }
   />
@@ -663,6 +664,7 @@ exports[`MainNavigator Tab Bar Visibility shows tab bar when not in browser 1`]
         },
         "cardStyleInterpolator": [Function],
         "headerShown": false,
+        "presentation": "transparentModal",
       }
     }
   />
@@ -1081,6 +1083,7 @@ exports[`MainNavigator matches rendered snapshot 1`] = `
         },
         "cardStyleInterpolator": [Function],
         "headerShown": false,
+        "presentation": "transparentModal",
       }
     }
   />

app/components/UI/AssetOverview/TokenDetails/TokenDetails.test.tsx

@@ -151,17 +151,10 @@ describe('TokenDetails', () => {
     useSelectorSpy.mockImplementation((selectorOrCallback) => {
       const SELECTOR_MOCKS = {
         selectIsEvmNetworkSelected: true,
-        selectEvmTokenMarketData: {
-          marketData:
-            mockTokenMarketDataByChainId['0x1'][
-              '0x6B175474E89094C44Da98b954EedeAC495271d0F'
-            ],
-          metadata: {
-            decimals: 18,
-            conversionRate: 2712.15,
-            aggregators: ['Metamask', 'Coinmarketcap'],
-          },
-        },
+        selectTokenMarketData:
+          mockTokenMarketDataByChainId['0x1'][
+            '0x6B175474E89094C44Da98b954EedeAC495271d0F'
+          ],
         selectTokenMarketDataByChainId: {},
         selectConversionRateBySymbol: mockExchangeRate,
         selectNativeCurrencyByChainId: 'ETH',
@@ -242,17 +235,6 @@ describe('TokenDetails', () => {
       selectConversionRateBySymbol: mockExchangeRate,
       selectNativeCurrencyByChainId: 'ETH',
       selectMultichainAssetsRates: {},
-      selectEvmTokenMarketData: {
-        marketData:
-          mockTokenMarketDataByChainId['0x1'][
-            '0x6b175474e89094c44da98b954eedeac495271d0f'
-          ],
-        metadata: {
-          decimals: 18,
-          conversionRate: 2712.15,
-          aggregators: ['Metamask', 'Coinmarketcap'],
-        },
-      },
     } as const;
 
     useSelectorSpy.mockImplementation((selectorOrCallback) => {
@@ -301,16 +283,10 @@ describe('TokenDetails', () => {
     const useSelectorSpy = jest.spyOn(reactRedux, 'useSelector');
     useSelectorSpy.mockImplementation((selectorOrCallback) => {
       const SELECTOR_MOCKS = {
-        selectEvmTokenMarketData: {
-          marketData:
-            mockTokenMarketDataByChainId['0x1'][
-              '0x6B175474E89094C44Da98b954EedeAC495271d0F'
-            ],
-          // null metadata ensures:
-          // 1. tokenList is null (no aggregators array in metadata)
-          // 2. tokenMetadata is null (so tokenMetadata condition is false)
-          metadata: null,
-        },
+        selectTokenMarketData:
+          mockTokenMarketDataByChainId['0x1'][
+            '0x6B175474E89094C44Da98b954EedeAC495271d0F'
+          ],
         selectConversionRateBySymbol: mockExchangeRate,
         selectNativeCurrencyByChainId: 'ETH',
       } as const;
@@ -408,7 +384,7 @@ describe('TokenDetails', () => {
 
     jest.spyOn(reactRedux, 'useSelector').mockImplementation(
       mockUseSelectorImplementation({
-        selectEvmTokenMarketData: null,
+        selectTokenMarketData: null,
         selectConversionRateBySymbol: mockExchangeRate,
         selectNativeCurrencyByChainId: 'ETH',
         isEvmNetwork: true,
@@ -436,7 +412,7 @@ describe('TokenDetails', () => {
 
     jest.spyOn(reactRedux, 'useSelector').mockImplementation(
       mockUseSelectorImplementation({
-        selectEvmTokenMarketData: null,
+        selectTokenMarketData: null,
         isEvmNetwork: false,
       }),
     );
@@ -457,11 +433,9 @@ describe('TokenDetails', () => {
 
     jest.spyOn(reactRedux, 'useSelector').mockImplementation(
       mockUseSelectorImplementation({
-        selectEvmTokenMarketData: {
-          marketData: {
-            price: 0.0005,
-            marketCap: '5000000',
-          },
+        selectTokenMarketData: {
+          price: 0.0005,
+          marketCap: '5000000',
         },
         selectConversionRateBySymbol: mockExchangeRate,
         selectNativeCurrencyByChainId: 'ETH',
@@ -483,7 +457,7 @@ describe('TokenDetails', () => {
 
     jest.spyOn(reactRedux, 'useSelector').mockImplementation(
       mockUseSelectorImplementation({
-        selectEvmTokenMarketData: null,
+        selectTokenMarketData: null,
         multichainRates: {
           [mockSolanaToken.address]: {
             rate: 0.431111,

app/components/UI/AssetOverview/TokenDetails/TokenDetails.tsx

@@ -27,7 +27,7 @@ import {
   isAssetFromSearch,
   selectTokenDisplayData,
 } from '../../../../selectors/tokenSearchDiscoveryDataController';
-import { selectEvmTokenMarketData } from '../../../../selectors/multichain/evm';
+import { selectTokenMarketData } from '../../../../selectors/tokenRatesController';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { selectMultichainAssetsRates } from '../../../../selectors/multichain';
 ///: END:ONLY_INCLUDE_IF
@@ -59,11 +59,6 @@ interface TokenDetailsProps {
   asset: TokenI;
 }
 
-interface EvmMarketData {
-  metadata?: Record<string, string | number | string[]>;
-  marketData?: MarketDataDetails;
-}
-
 const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   // For non evm assets, the resultChainId is equal to the asset.chainId; while for evm assets; the resultChainId === "eip155:1" !== asset.chainId
   const resultChainId = formatChainIdToCaip(asset.chainId as Hex);
@@ -96,17 +91,15 @@ const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   ///: END:ONLY_INCLUDE_IF
 
   const evmMarketData = useSelector((state: RootState) =>
-    !isNonEvmAsset
-      ? selectEvmTokenMarketData(state, {
-          chainId: asset.chainId as Hex,
-          tokenAddress: asset.address,
-        })
+    !isNonEvmAsset && tokenContractAddress
+      ? (selectTokenMarketData(state)?.[asset.chainId as Hex]?.[
+          tokenContractAddress as Hex
+        ] ?? null)
       : null,
-  ) as EvmMarketData | null;
+  ) as MarketDataDetails | null;
 
   const conversionRate = isAssetFromSearch(asset) ? 1 : conversionRateBySymbol;
 
-  let tokenMetadata;
   let cachedMarketData: MarketDataDetails | undefined;
 
   if (
@@ -116,11 +109,9 @@ const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   ) {
     // Search results have market data
     cachedMarketData = tokenSearchResult.price;
-    tokenMetadata = tokenSearchResult.token;
   } else {
-    tokenMetadata = !isNonEvmAsset ? evmMarketData?.metadata : null;
     cachedMarketData = !isNonEvmAsset
-      ? evmMarketData?.marketData
+      ? (evmMarketData ?? undefined)
       : (nonEvmMarketData as MarketDataDetails | undefined);
   }
 
@@ -181,14 +172,8 @@ const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   const needsConversion = isUsingCachedData && !isNonEvmAsset;
 
   const tokenDetails = useMemo(
-    () =>
-      getTokenDetails(
-        asset,
-        isNonEvmAsset,
-        tokenContractAddress,
-        tokenMetadata as Record<string, string | number | string[]>,
-      ),
-    [asset, isNonEvmAsset, tokenContractAddress, tokenMetadata],
+    () => getTokenDetails(asset, isNonEvmAsset, tokenContractAddress),
+    [asset, isNonEvmAsset, tokenContractAddress],
   );
 
   const marketDetails = useMemo(() => {
@@ -231,13 +216,10 @@ const TokenDetails: React.FC<TokenDetailsProps> = ({ asset }) => {
   }, [marketData, currentCurrency, needsConversion, conversionRate]);
 
   const hasAddressAndDecimals =
-    tokenDetails.contractAddress && tokenDetails.tokenDecimal;
+    tokenDetails.contractAddress !== null && tokenDetails.tokenDecimal !== null;
   return (
     <View style={styles.tokenDetailsContainer}>
-      {(asset.isETH ||
-        tokenMetadata ||
-        isNonEvmAsset ||
-        hasAddressAndDecimals) && (
+      {(asset.isETH || isNonEvmAsset || hasAddressAndDecimals) && (
         <TokenDetailsList tokenDetails={tokenDetails} />
       )}
       {marketData && marketDetails && (