Merge pull request #608 from DeXter-on-Radix/fix-pair-selector-issue

BUG REPORT + FIX: Selecting pairs other than DEXTR/XRD silently crashed app
DeXter-on-Radix · Nov 12, 2024 · 8de4277 · 8de4277
2 parents 6ba1c42 + d89b77f
commit 8de4277
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/app/components/OrderInput.tsx b/src/app/components/OrderInput.tsx
@@ -26,6 +26,7 @@ import {
   pairAddressIsSet,
   priceIsValid,
   tokenIsSpecified,
+  amountIsPositive,
   submitOrder,
 } from "state/orderInputSlice";
 import { Calculator } from "services/Calculator";
@@ -118,7 +119,8 @@ export function OrderInput() {
     if (
       pairAddressIsSet(pairAddress) &&
       priceIsValid(price, type) &&
-      tokenIsSpecified(specifiedToken)
+      tokenIsSpecified(specifiedToken) &&
+      amountIsPositive(specifiedToken, token1, token2)
     ) {
       dispatch(fetchQuote());
     }

diff --git a/src/app/state/orderInputSlice.ts b/src/app/state/orderInputSlice.ts
@@ -216,6 +216,19 @@ export function tokenIsSpecified(specifiedToken: SpecifiedToken): boolean {
   return specifiedToken !== SpecifiedToken.UNSPECIFIED;
 }
 
+export function amountIsPositive(
+  specifiedToken: SpecifiedToken,
+  token1: TokenInput,
+  token2: TokenInput
+): boolean {
+  if (specifiedToken === SpecifiedToken.TOKEN_1) {
+    return token1.amount > 0;
+  } else if (specifiedToken === SpecifiedToken.TOKEN_2) {
+    return token2.amount > 0;
+  }
+  return false;
+}
+
 // for getting balances out of pairSelector slice
 // TODO(dcts): ask @chaotic whether this can live inside pairSelector now that
 // the orderInputState seems not to be needed anymore.