diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx index cb0ea37076..cefc8676d4 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx @@ -132,6 +132,7 @@ export function PortfolioScreen({ navigation }: Props): JSX.Element { const dispatch = useAppDispatch(); const [refreshing, setRefreshing] = useState(false); const [isZeroBalance, setIsZeroBalance] = useState(true); + const [isEvmZeroBalance, setIsEvmZeroBalance] = useState(true); const { hasFetchedToken, allTokens } = useSelector( (state: RootState) => state.wallet, ); @@ -455,7 +456,10 @@ export function PortfolioScreen({ navigation }: Props): JSX.Element { setIsZeroBalance( !tokens.some((token) => new BigNumber(token.amount).isGreaterThan(0)), ); - }, [tokens]); + setIsEvmZeroBalance( + !evmTokens.some((token) => new BigNumber(token.amount).isGreaterThan(0)), + ); + }, [tokens, evmTokens]); const assetSortBottomSheetScreen = useMemo(() => { return [ @@ -695,6 +699,7 @@ export function PortfolioScreen({ navigation }: Props): JSX.Element { ) : ( ; buttonGroupOptions?: { @@ -35,6 +36,7 @@ interface PortfolioCardProps { export function PortfolioCard({ isZeroBalance, + isEvmZeroBalance, filteredTokens, navigation, buttonGroupOptions, @@ -44,7 +46,7 @@ export function PortfolioCard({ const { hasFetchedToken } = useSelector((state: RootState) => state.wallet); const { domain } = useDomainContext(); // return empty portfolio if no DFI and other tokens - if (isZeroBalance) { + if ((isZeroBalance && !isEvmDomain) || (isEvmZeroBalance && isEvmDomain)) { const screenDetails = getEmptyScreenDetails( ButtonGroupTabKey.AllTokens, domain,