feat: [GSW-2033] Improve User Typing state

gnoswap-labs · Jan 5, 2025 · 60706d0 · 60706d0
1 parent 415b380
commit 60706d0
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/packages/web/src/hooks/swap/data/use-swap.tsx b/packages/web/src/hooks/swap/data/use-swap.tsx
@@ -166,25 +166,20 @@ export const useSwap = ({ tokenA, tokenB, direction, slippage, swapFee = 15 }: U
     return 0;
   }, [direction, estimatedAmount, slippage, tokenA]);
 
-  const updateSwapAmount = useCallback(
-    (amount: string) => {
-      if (!amount) {
-        setSwapAmount(null);
-        setIsTyping(false);
-        return;
-      }
-
-      const processedAmount = amount.endsWith(".") ? amount.slice(0, -1) : amount;
+  const updateSwapAmount = (amount: string) => {
+    if (!amount) {
+      setSwapAmount(null);
+      setIsTyping(false);
+      return;
+    }
 
-      let newAmount = 0;
-      if (BigNumber(processedAmount).isZero()) {
-        newAmount = 0;
-      }
-      newAmount = BigNumber(processedAmount).toNumber();
+    const processedAmount = amount.endsWith(".") ? amount.slice(0, -1) : amount;
+    const newAmount = BigNumber(processedAmount).isZero() ? 0 : BigNumber(processedAmount).toNumber();
 
-      setSwapAmount(newAmount);
+    setSwapAmount(prevAmount => {
+      const hasValueChanged = prevAmount !== newAmount;
 
-      if (tokenA && tokenB && !amount.endsWith(".")) {
+      if (hasValueChanged) {
         setIsTyping(true);
 
         if (typingTimeoutRef.current) {
@@ -195,9 +190,10 @@ export const useSwap = ({ tokenA, tokenB, direction, slippage, swapFee = 15 }: U
           setIsTyping(false);
         }, SWAP_AMOUNT_DEBOUNCE_TIME_MS + 100);
       }
-    },
-    [tokenA, tokenB],
-  );
+
+      return hasValueChanged ? newAmount : prevAmount;
+    });
+  };
 
   useEffect(() => {
     if (debouncedSwapAmount !== null) {