Merge branch 'develop' into yomo-759

Emurgo · Sep 13, 2023 · b5af097 · b5af097
2 parents 3a71b42 + 722624e
commit b5af097
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/CreateOrder.tsx
@@ -40,22 +40,21 @@ export const CreateOrder = () => {
 
   const tokenInfos = useTokenInfos({
     wallet,
-    tokenIds: [createOrder.amounts.buy.tokenId, createOrder.amounts.sell.tokenId],
+    tokenIds: [createOrder.amounts?.buy.tokenId, createOrder.amounts?.sell.tokenId],
   })
-
   const [showLimitPriceWarning, setShowLimitPriceWarning] = useState(false)
   const {isBuyTouched, isSellTouched, poolDefaulted} = useSwapTouched()
   const {poolList} = usePoolsByPair({
-    tokenA: createOrder.amounts.sell.tokenId,
-    tokenB: createOrder.amounts.buy.tokenId,
+    tokenA: createOrder.amounts?.sell.tokenId ?? '',
+    tokenB: createOrder.amounts?.buy.tokenId ?? '',
   })
 
   useEffect(() => {
     if (poolList !== undefined) {
       selectedPoolChanged(poolList[0])
       poolDefaulted()
     }
-  }, [poolDefaulted, poolList, selectedPoolChanged])
+  }, [poolDefaulted, selectedPoolChanged, createOrder.amounts, poolList])
 
   const orderTypeLabels = [strings.marketButton, strings.limitButton]
   const orderTypeIndex = createOrder.type === 'market' ? 0 : 1

diff --git a/packages/swap/src/adapters/transformers.ts b/packages/swap/src/adapters/transformers.ts
@@ -124,8 +124,8 @@ export const asYoroiAmount = (openswapAmount: {
   amount: string
   token: string
 }): Balance.Amount => {
-  const {amount, token} = openswapAmount
-  if (amount) {
+  if (openswapAmount !== null && openswapAmount?.amount !== null) {
+    const {amount, token} = openswapAmount
     const [policyId = '', assetName = ''] = token.split('.')
     const subject = `${policyId}.${assetName}`
     return {
@@ -137,7 +137,7 @@ export const asYoroiAmount = (openswapAmount: {
 }
 
 export const asYoroiPools = (openswapPools: Pool[]): Swap.PoolPair[] => {
-  return openswapPools.map(asYoroiPool)
+  return openswapPools?.length > 0 ? openswapPools.map(asYoroiPool) : []
 }
 
 export const asYoroiBalanceTokens = (

diff --git a/packages/swap/src/translators/reactjs.tsx b/packages/swap/src/translators/reactjs.tsx
@@ -234,6 +234,7 @@ export const usePoolsByPair = (
   const query = useQuery({
     suspense: true,
     ...options,
+    enabled: tokenPair?.tokenA !== undefined && tokenPair?.tokenB !== undefined,
     queryKey: ['usePoolsByPair', tokenPair],
     queryFn: () => pools.list.byPair(tokenPair),
   })