fix: token selection

Emurgo · Nov 8, 2023 · 2438a84 · 2438a84
1 parent 7556f53
commit 2438a84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
@@ -137,20 +137,21 @@ const SelectableToken = ({wallet, tokenInfo, walletTokenIds}: SelectableTokenPro
   const {buyTokenInfoChanged, orderData} = useSwap()
   const {
     sellQuantity: {isTouched: isSellTouched},
+    buyQuantity: {isTouched: isBuyTouched},
     buyTouched,
   } = useSwapForm()
   const navigateTo = useNavigateTo()
   const {track} = useMetrics()
 
   const isDisabled = id === orderData.amounts.sell.tokenId && isSellTouched
   const inUserWallet = walletTokenIds.includes(tokenInfo.id)
-  const isSameToken = id === orderData.amounts.buy.tokenId
+  const shouldUpdateToken = id !== orderData.amounts.buy.tokenId || !isBuyTouched
 
   const handleOnTokenSelection = () => {
     track.swapAssetToChanged({
       to_asset: [{asset_name: name, asset_ticker: ticker, policy_id: group}],
     })
-    if (!isSameToken) {
+    if (shouldUpdateToken) {
       buyTokenInfoChanged({
         decimals: decimals ?? 0,
         id: id,

diff --git a/...reateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx b/...reateOrder/EditSellAmount/SelectSellTokenFromListScreen/SelectSellTokenFromListScreen.tsx
@@ -91,20 +91,21 @@ const SelectableToken = ({tokenInfo, wallet}: SelectableTokenProps) => {
   const {sellTokenInfoChanged, orderData} = useSwap()
   const {
     buyQuantity: {isTouched: isBuyTouched},
+    sellQuantity: {isTouched: isSellTouched},
     sellTouched,
   } = useSwapForm()
   const navigateTo = useNavigateTo()
   const {track} = useMetrics()
 
   const balanceAvailable = useBalance({wallet, tokenId: tokenInfo.id})
   const isDisabled = tokenInfo.id === orderData.amounts.buy.tokenId && isBuyTouched
-  const isSameToken = tokenInfo.id === orderData.amounts.sell.tokenId
+  const shouldUpdateToken = tokenInfo.id !== orderData.amounts.sell.tokenId || !isSellTouched
 
   const handleOnTokenSelection = () => {
     track.swapAssetFromChanged({
       from_asset: [{asset_name: tokenInfo.name, asset_ticker: tokenInfo.ticker, policy_id: tokenInfo.group}],
     })
-    if (!isSameToken) {
+    if (shouldUpdateToken) {
       sellTouched()
       sellTokenInfoChanged({
         id: tokenInfo.id,