Merge pull request #2043 from zeitgeistpm/tr-trade-box-slider

Handle 0 balances better in trade form
zeitgeistpm · Dec 10, 2023 · c4670e1 · c4670e1
2 parents 440330e + 3db9974
commit c4670e1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/components/trade-form/BuyForm.tsx b/components/trade-form/BuyForm.tsx
@@ -182,7 +182,13 @@ const BuyForm = ({
     const subscription = watch((value, { name, type }) => {
       const changedByUser = type != null;
 
-      if (!changedByUser || !maxSpendableBalance || !maxAmountIn) return;
+      if (
+        !changedByUser ||
+        !maxSpendableBalance ||
+        maxSpendableBalance.eq(0) ||
+        !maxAmountIn
+      )
+        return;
 
       if (name === "percentage") {
         const max = maxSpendableBalance.greaterThan(maxAmountIn)
@@ -255,9 +261,9 @@ const BuyForm = ({
               },
               validate: (value) => {
                 if (value > (maxSpendableBalance?.div(ZTG).toNumber() ?? 0)) {
-                  return `Insufficient balance. Current balance: ${maxSpendableBalance
+                  return `Insufficient balance (${maxSpendableBalance
                     ?.div(ZTG)
-                    .toFixed(3)}`;
+                    .toFixed(3)}${baseSymbol})`;
                 } else if (value <= 0) {
                   return "Value cannot be zero or less";
                 } else if (maxAmountIn?.div(ZTG)?.lessThanOrEqualTo(value)) {

diff --git a/components/trade-form/SellForm.tsx b/components/trade-form/SellForm.tsx
@@ -166,7 +166,13 @@ const SellForm = ({
     const subscription = watch((value, { name, type }) => {
       const changedByUser = type != null;
 
-      if (!changedByUser || !selectedAssetBalance || !maxAmountIn) return;
+      if (
+        !changedByUser ||
+        !selectedAssetBalance ||
+        selectedAssetBalance.eq(0) ||
+        !maxAmountIn
+      )
+        return;
 
       if (name === "percentage") {
         const max = selectedAssetBalance.greaterThan(maxAmountIn)