fixes

Author: mgrabina

src/components/transactions/Switch/CollateralSwapModal.tsx

@@ -7,7 +7,7 @@ import {
 import { TokenInfoWithBalance } from 'src/hooks/generic/useTokensBalance';
 import { ModalContextType, ModalType, useModalContext } from 'src/hooks/useModal';
 import { useRootStore } from 'src/store/root';
-import { TokenInfo } from 'src/ui-config/TokenList';
+import { TOKEN_LIST, TokenInfo } from 'src/ui-config/TokenList';
 
 import { BaseSwitchModal } from './BaseSwitchModal';
 import { SwitchDetailsParams as SwitchDetailsParams } from './BaseSwitchModalContent';
@@ -76,7 +76,9 @@ export const CollateralSwapModal = () => {
         const isWrappedNative =
           wrappedNative && position.reserve.underlyingAsset.toLowerCase() === wrappedNative;
         const nativeToken = isWrappedNative
-          ? baseTokens.find((t) => (t as TokenInfoWithBalance).extensions?.isNative)
+          ? TOKEN_LIST.tokens.find(
+              (t) => (t as TokenInfoWithBalance).extensions?.isNative && t.chainId === realChainId
+            )
           : undefined;
 
         return {

src/components/transactions/Switch/SwitchActions.tsx

@@ -104,6 +104,7 @@ export const ParaswapSwitchActionsWrapper = ({
   isMaxSelected,
   addTransaction,
   setMainTxState,
+  invalidate,
 }: {
   inputAmount: string;
   inputSymbol: string;
@@ -122,6 +123,7 @@ export const ParaswapSwitchActionsWrapper = ({
     context?: TransactionContext
   ) => void;
   setMainTxState: (txState: TxStateType) => void;
+  invalidate: () => void;
 }) => {
   const userAddress = useRootStore.getState().account;
   const [swapCollateral, currentMarketData, trackEvent] = useRootStore(
@@ -220,21 +222,7 @@ export const ParaswapSwitchActionsWrapper = ({
 
   useEffect(() => {
     if (mainTxState.success) {
-      addTransaction(
-        mainTxState.txHash || '',
-        {
-          txState: 'success',
-        },
-        {
-          chainId,
-        }
-      );
-
-      setMainTxState({
-        txHash: mainTxState.txHash || '',
-        loading: false,
-        success: true,
-      });
+      invalidate();
 
       trackEvent(GENERAL.COLLATERAL_SWAP_WITH_FLASHLOAN, {
         chainId,
@@ -253,6 +241,22 @@ export const ParaswapSwitchActionsWrapper = ({
         txHash: mainTxState.txHash,
         status: 'success',
       });
+
+      addTransaction(
+        mainTxState.txHash || '',
+        {
+          txState: 'success',
+        },
+        {
+          chainId,
+        }
+      );
+
+      setMainTxState({
+        txHash: mainTxState.txHash || '',
+        loading: false,
+        success: true,
+      });
     }
   }, [mainTxState.success]);
 
@@ -391,6 +395,40 @@ export const SwitchActions = ({
     }
   }, [inputSymbol, chainId, approvedAmount, inputAmount, setShowUSDTResetWarning, switchRates]);
 
+  const invalidate = () => {
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.poolTokens(user, findByChainId(chainId) ?? currentMarketData),
+    });
+
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.transactionHistory(
+        user,
+        findByChainId(chainId) ?? currentMarketData
+      ),
+    });
+
+    // Refresh dashboard data after collateral swap
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.poolReservesDataHumanized(
+        findByChainId(chainId) ?? currentMarketData
+      ),
+    });
+
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.userPoolReservesDataHumanized(
+        user,
+        findByChainId(chainId) ?? currentMarketData
+      ),
+    });
+
+    queryClient.invalidateQueries({
+      queryKey: queryKeysFactory.userPoolReservesIncentiveDataHumanized(
+        user,
+        findByChainId(chainId) ?? currentMarketData
+      ),
+    });
+  };
+
   const action = async () => {
     setMainTxState({ ...mainTxState, loading: true });
     if (isParaswapRates(switchRates)) {
@@ -773,38 +811,7 @@ export const SwitchActions = ({
       console.error('Error tracking swap event:', error);
     }
 
-    // Invalidate the pool tokens query to refresh the data
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.poolTokens(user, findByChainId(chainId) ?? currentMarketData),
-    });
-
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.transactionHistory(
-        user,
-        findByChainId(chainId) ?? currentMarketData
-      ),
-    });
-
-    // Refresh dashboard data after collateral swap
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.poolReservesDataHumanized(
-        findByChainId(chainId) ?? currentMarketData
-      ),
-    });
-
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.userPoolReservesDataHumanized(
-        user,
-        findByChainId(chainId) ?? currentMarketData
-      ),
-    });
-
-    queryClient.invalidateQueries({
-      queryKey: queryKeysFactory.userPoolReservesIncentiveDataHumanized(
-        user,
-        findByChainId(chainId) ?? currentMarketData
-      ),
-    });
+    invalidate();
   };
 
   const approval = async () => {
@@ -1098,6 +1105,7 @@ export const SwitchActions = ({
         isMaxSelected={isMaxSelected}
         addTransaction={addTransaction}
         setMainTxState={setMainTxState}
+        invalidate={invalidate}
       />
     );
   }

src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsList.tsx

@@ -75,13 +75,27 @@ export const SuppliedPositionsList = () => {
     localStorage.getItem(localStorageName) === 'true'
   );
 
+  const userHasSmallBalanceAssets = useMemo(() => {
+    return user?.userReservesData.some((userReserve) => {
+      if (userReserve.underlyingBalance === '0') return false;
+
+      const balanceUSD = amountToUsd(
+        userReserve.underlyingBalance,
+        userReserve.reserve.formattedPriceInMarketReferenceCurrency,
+        marketReferencePriceInUsd
+      );
+
+      return Number(balanceUSD) <= SMALL_BALANCE_THRESHOLD;
+    });
+  }, [user?.userReservesData, marketReferencePriceInUsd]);
+
   const suppliedPositions = useMemo(() => {
     return (
       user?.userReservesData
         .filter((userReserve) => {
           if (userReserve.underlyingBalance === '0') return false;
 
-          if (isShowSmallBalanceAssets) return true;
+          if (!!isShowSmallBalanceAssets) return true;
 
           // Filter out dust amounts < $0.01 USD
           const balanceUSD = amountToUsd(
@@ -105,7 +119,7 @@ export const SuppliedPositionsList = () => {
           },
         })) || []
     );
-  }, [isShowSmallBalanceAssets]);
+  }, [isShowSmallBalanceAssets, user?.userReservesData, marketReferencePriceInUsd]);
 
   // Transform to the DashboardReserve schema so the sort utils can work with it
   const preSortedReserves = suppliedPositions as DashboardReserve[];
@@ -156,18 +170,20 @@ export const SuppliedPositionsList = () => {
       localStorageName="suppliedAssetsDashboardTableCollapse"
       noData={!sortedReserves.length}
       subChildrenComponent={
-        <Box>
-          <DashboardListTopPanel
-            value={isShowSmallBalanceAssets}
-            onClick={setIsShowSmallBalanceAssets}
-            localStorageName={localStorageName}
-            bridge={currentNetworkConfig.bridge}
-            eventName={DASHBOARD.SHOW_ASSETS_SMALL_BALANCE}
-            label={<Trans>Show assets with small balance</Trans>}
-            showFaucet={false}
-            showBridge={false}
-          />
-        </Box>
+        !!userHasSmallBalanceAssets && (
+          <Box>
+            <DashboardListTopPanel
+              value={isShowSmallBalanceAssets}
+              onClick={setIsShowSmallBalanceAssets}
+              localStorageName={localStorageName}
+              bridge={currentNetworkConfig.bridge}
+              eventName={DASHBOARD.SHOW_ASSETS_SMALL_BALANCE}
+              label={<Trans>Show assets with small balance</Trans>}
+              showFaucet={false}
+              showBridge={false}
+            />
+          </Box>
+        )
       }
       topInfo={
         <>