From a56af17c441cef5d125802d583212a837da7ee5a Mon Sep 17 00:00:00 2001 From: Chloe <44501120+chloezxyy@users.noreply.github.com> Date: Wed, 1 Nov 2023 09:43:23 +0800 Subject: [PATCH] fix(ui-ux): convert screen continue button (#4118) --- .../screens/Portfolio/screens/ConvertScreen.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx index b2f69e2c28..0db762d45e 100644 --- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx +++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/ConvertScreen.tsx @@ -16,8 +16,8 @@ import { import { useWhaleApiClient } from "@waveshq/walletkit-ui/dist/contexts"; import { RootState } from "@store"; import { - hasTxQueued, hasOceanTXQueued, + hasTxQueued, tokensSelector, } from "@waveshq/walletkit-ui/dist/store"; import { getColor, tailwind } from "@tailwind"; @@ -41,8 +41,8 @@ import { getNativeIcon } from "@components/icons/assets"; import { EVMLinearGradient } from "@components/EVMLinearGradient"; import { PortfolioParamList } from "../PortfolioNavigator"; import { - TokenListType, SelectionToken, + TokenListType, } from "../../Dex/CompositeSwap/SwapTokenSelectionScreen"; import { useTokenPrice } from "../hooks/TokenPrice"; import { DomainToken, useTokenBalance } from "../hooks/TokenBalance"; @@ -632,7 +632,8 @@ export function ConvertScreen(props: Props): JSX.Element { disabled={ !canConvert(convAmount, sourceToken.available) || hasPendingJob || - hasPendingBroadcastJob + hasPendingBroadcastJob || + targetToken === undefined } styleProps="w-full" onPress={() => convert(sourceToken, targetToken)}