fix: clean inputs after add liquidity (#347)

FuelLabs · Jun 24, 2022 · a7fd488 · a7fd488
1 parent 8fcf321
commit a7fd488
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/app/src/systems/Pool/hooks/useAddLiquidity.ts b/packages/app/src/systems/Pool/hooks/useAddLiquidity.ts
@@ -94,9 +94,13 @@ export function useAddLiquidity({
   );
 
   function handleSuccess() {
-    fromInput.setAmount(BigInt(0));
-    toInput.setAmount(BigInt(0));
-    navigate('../');
+    fromInput.setAmount(null);
+    toInput.setAmount(null);
+    // Clean state before navigate to next
+    // screen
+    setTimeout(() => {
+      navigate('../');
+    });
   }
 
   function handleError(e: any) {
@@ -117,7 +121,6 @@ export function useAddLiquidity({
 
   async function handleSettled() {
     onSettle?.();
-    navigate('../');
     setStage(0);
   }
 

diff --git a/packages/app/src/systems/Swap/pages/SwapPage.tsx b/packages/app/src/systems/Swap/pages/SwapPage.tsx
@@ -103,15 +103,18 @@ export function SwapPage() {
     txCost,
   });
 
-  const shouldDisableSwap =
-    isLoading || validationState !== ValidationStateEnum.Swap;
+  const shouldDisableSwap = !!(
+    isLoading ||
+    validationState !== ValidationStateEnum.Swap ||
+    !txCost.total ||
+    txCost.error
+  );
 
   const btnText = getValidationText(validationState, swapState);
 
   const { mutate: swap, isLoading: isSwapping } = useMutation(
     async () => {
       if (!swapState) return;
-      if (!txCost?.gas || txCost.error) return;
       setHasSwapped(false);
       const res = await swapTokens(contract, swapState, txCost);
       return res;