fix rebase imports

Author: estebanmino

ios/Podfile.lock

@@ -2429,4 +2429,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0839e4141c8f26133bf9a961f5ded1ea3127af54
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2

src/components/Transactions/TransactionDetailsCard.tsx

@@ -9,7 +9,6 @@ import { abbreviations, ethereumUtils } from '@/utils';
 import { TransactionSimulationMeta } from '@/graphql/__generated__/metadataPOST';
 import { ChainId } from '@/networks/types';
 
-import { getNetworkObject } from '@/networks';
 import { TransactionDetailsRow } from '@/components/Transactions/TransactionDetailsRow';
 import { FadedScrollCard } from '@/components/FadedScrollCard';
 import { IconContainer } from '@/components/Transactions/TransactionIcons';
@@ -21,6 +20,7 @@ import {
   CARD_BORDER_WIDTH,
   EXPANDED_CARD_TOP_INSET,
 } from '@/components/Transactions/constants';
+import { chainsName } from '@/networks/chains';
 
 interface TransactionDetailsCardProps {
   chainId: ChainId;
@@ -49,8 +49,6 @@ export const TransactionDetailsCard = ({
   const contentHeight = useSharedValue(COLLAPSED_CARD_HEIGHT - CARD_BORDER_WIDTH * 2);
   const [isExpanded, setIsExpanded] = useState(false);
 
-  const currentNetwork = getNetworkObject({ chainId });
-
   const listStyle = useAnimatedStyle(() => ({
     opacity: interpolate(
       cardHeight.value,
@@ -95,7 +93,7 @@ export const TransactionDetailsCard = ({
         </Box>
         <Animated.View style={listStyle}>
           <Stack space="24px">
-            {<TransactionDetailsRow chainId={chainId} detailType="chain" value={currentNetwork.name} />}
+            {<TransactionDetailsRow chainId={chainId} detailType="chain" value={chainsName[chainId]} />}
             {!!(meta?.to?.address || toAddress || showTransferToRow) && (
               <TransactionDetailsRow
                 detailType={isContract ? 'contract' : 'to'}

src/components/Transactions/TransactionSimulationCard.tsx

@@ -14,7 +14,6 @@ import { TextColor } from '@/design-system/color/palettes';
 
 import { TransactionErrorType, TransactionSimulationResult, TransactionScanResultType } from '@/graphql/__generated__/metadataPOST';
 
-import { getNetworkObject } from '@/networks';
 import { isEmpty } from 'lodash';
 import { TransactionSimulatedEventRow } from '@/components/Transactions/TransactionSimulatedEventRow';
 import { FadedScrollCard } from '@/components/FadedScrollCard';
@@ -29,6 +28,7 @@ import {
   timingConfig,
 } from '@/components/Transactions/constants';
 import { ChainId } from '@/networks/types';
+import { chainsName } from '@/networks/chains';
 
 interface TransactionSimulationCardProps {
   chainId: ChainId;
@@ -271,7 +271,7 @@ export const TransactionSimulationCard = ({
               <Text color="labelQuaternary" size="13pt" weight="semibold">
                 {i18n.t(i18n.l.walletconnect.simulation.simulation_card.messages.need_more_native, {
                   symbol: walletBalance?.symbol,
-                  network: getNetworkObject({ chainId }).name,
+                  network: chainsName[chainId],
                 })}
               </Text>
             ) : (

src/hooks/useCalculateGasLimit.ts

@@ -2,7 +2,6 @@ import { useEffect, useRef, useCallback } from 'react';
 import { estimateGas, web3Provider, toHex } from '@/handlers/web3';
 import { convertHexToString, omitFlatten } from '@/helpers/utilities';
 import { logger, RainbowError } from '@/logger';
-import { getNetworkObject } from '@/networks';
 import { ethereumUtils } from '@/utils';
 import { hexToNumber, isHex } from 'viem';
 import { isEmpty } from 'lodash';
@@ -11,6 +10,7 @@ import { GasFeeParamsBySpeed } from '@/entities';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { useGas } from '@/hooks';
 import { ChainId } from '@/networks/types';
+import { needsL1SecurityFeeChains } from '@/networks/chains';
 
 type CalculateGasLimitProps = {
   isMessageRequest: boolean;
@@ -52,8 +52,8 @@ export const useCalculateGasLimit = ({
     } finally {
       logger.debug('WC: Setting gas limit to', { gas: convertHexToString(gas) }, logger.DebugContext.walletconnect);
 
-      const networkObject = getNetworkObject({ chainId });
-      if (chainId && networkObject.gas.OptimismTxFee) {
+      const needsL1SecurityFee = needsL1SecurityFeeChains.includes(chainId);
+      if (needsL1SecurityFee) {
         const l1GasFeeOptimism = await ethereumUtils.calculateL1FeeOptimism(txPayload, provider || web3Provider);
         updateTxFee(gas, null, l1GasFeeOptimism);
       } else {

src/hooks/useWatchPendingTxs.ts

@@ -17,7 +17,6 @@ import { getNftSortForAddress } from './useNFTsSortBy';
 import { ChainId } from '@/networks/types';
 import { staleBalancesStore } from '@/state/staleBalances';
 import { useConnectedToHardhatStore } from '@/state/connectedToHardhat';
-import { networkObjects } from '@/networks';
 import { SUPPORTED_MAINNET_CHAIN_IDS } from '@/networks/chains';
 
 export const useWatchPendingTransactions = ({ address }: { address: string }) => {
@@ -190,10 +189,6 @@ export const useWatchPendingTransactions = ({ address }: { address: string }) =>
     );
 
     if (minedTransactions.length) {
-		const chainIds = Object.values(networkObjects)
-        .filter(networkObject => networkObject.enabled && networkObject.networkType !== 'testnet')
-        .map(networkObject => networkObject.id);
-
       minedTransactions.forEach(tx => {
         if (tx.changes?.length) {
           tx.changes?.forEach(change => {
@@ -212,7 +207,7 @@ export const useWatchPendingTransactions = ({ address }: { address: string }) =>
         queryKey: consolidatedTransactionsQueryKey({
           address,
           currency: nativeCurrency,
-          chainIds,
+          chainIds: SUPPORTED_MAINNET_CHAIN_IDS,
         }),
       });
 

src/resources/assets/UserAssetsQuery.ts

@@ -11,7 +11,7 @@ import { fetchHardhatBalances } from './hardhatAssets';
 import { AddysAccountAssetsMeta, AddysAccountAssetsResponse, RainbowAddressAssets } from './types';
 import { Network } from '@/networks/types';
 import { staleBalancesStore } from '@/state/staleBalances';
-import { networkObjects } from '@/networks';
+import { SUPPORTED_MAINNET_CHAIN_IDS } from '@/networks/chains';
 
 // ///////////////////////////////////////////////
 // Query Types
@@ -74,14 +74,15 @@ async function userAssetsQueryFunction({
   }
 
   try {
-    const chainIds = Object.values(networkObjects)
-      .filter(network => network.enabled && network.networkType !== 'testnet')
-      .map(network => network.id);
-
     staleBalancesStore.getState().clearExpiredData(address);
     const staleBalanceParam = staleBalancesStore.getState().getStaleBalancesQueryParam(address);
 
-    const { erroredChainIds, results } = await fetchAndParseUserAssetsForChainIds({ address, currency, chainIds, staleBalanceParam });
+    const { erroredChainIds, results } = await fetchAndParseUserAssetsForChainIds({
+      address,
+      currency,
+      chainIds: SUPPORTED_MAINNET_CHAIN_IDS,
+      staleBalanceParam,
+    });
     let parsedSuccessResults = results;
 
     // grab cached data for chain IDs with errors