Merge pull request #325 from arconnectio/fix/misc-onramp

fix: updated switch button added debounce
arconnectio · May 16, 2024 · 3caddd5 · 3caddd5
2 parents 10fa74c + 75eaa9c
commit 3caddd5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/src/routes/popup/purchase.tsx b/src/routes/popup/purchase.tsx
@@ -18,10 +18,12 @@ import { PageType, trackPage } from "~utils/analytics";
 import type { PaymentType, Quote } from "~lib/onramper";
 import { useHistory } from "~utils/hash_router";
 import { ExtensionStorage } from "~utils/storage";
+import { useDebounce } from "~wallets/hooks";
 
 export default function Purchase() {
   const [push] = useHistory();
   const youPayInput = useInput();
+  const debouncedYouPayInput = useDebounce(youPayInput.state, 300);
   const [arConversion, setArConversion] = useState<boolean>(false);
   const [loading, setLoading] = useState(false);
   const [currencies, setCurrencies] = useState<any[]>([]);
@@ -77,7 +79,8 @@ export default function Purchase() {
       setLoading(true);
       setQuote(null);
       if (
-        Number(youPayInput.state) <= 0 ||
+        Number(debouncedYouPayInput) <= 0 ||
+        debouncedYouPayInput === "" ||
         !selectedCurrency ||
         !paymentMethod
       ) {
@@ -95,9 +98,9 @@ export default function Purchase() {
         paymentMethod: paymentMethod.id
       });
       if (arConversion) {
-        params.append("cryptoAmount", youPayInput.state);
+        params.append("cryptoAmount", debouncedYouPayInput);
       } else {
-        params.append("fiatAmount", youPayInput.state);
+        params.append("fiatAmount", debouncedYouPayInput);
       }
 
       const url = `${baseUrl}?${params.toString()}`;
@@ -119,12 +122,12 @@ export default function Purchase() {
       setLoading(false);
     };
 
-    if (youPayInput.state) {
+    if (debouncedYouPayInput) {
       fetchQuote();
     } else {
       setQuote(null);
     }
-  }, [youPayInput.state, selectedCurrency, paymentMethod, arConversion]);
+  }, [debouncedYouPayInput, selectedCurrency, paymentMethod, arConversion]);
 
   return (
     <>
@@ -164,7 +167,7 @@ export default function Purchase() {
             </SwitchText>
           </Switch>
           <InputButton
-            disabled={arConversion}
+            disabled={!arConversion}
             label={
               arConversion
                 ? browser.i18n.getMessage("buy_screen_pay")

diff --git a/src/wallets/hooks.ts b/src/wallets/hooks.ts
@@ -1,7 +1,7 @@
 import type { WalletInterface } from "~components/welcome/load/Migrate";
 import type { JWKInterface } from "arweave/web/lib/wallet";
 import { type AnsUser, getAnsProfile } from "~lib/ans";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useStorage } from "@plasmohq/storage/hook";
 import { defaultGateway } from "~gateways/gateway";
 import { ExtensionStorage } from "~utils/storage";
@@ -128,3 +128,22 @@ export function useBalance() {
 
   return balance;
 }
+
+export function useDebounce<T>(value: T, delay: number): T {
+  const [debouncedValue, setDebouncedValue] = useState(value);
+  const handler = useRef<ReturnType<typeof setTimeout>>();
+
+  useEffect(() => {
+    handler.current = setTimeout(() => {
+      setDebouncedValue(value);
+    }, delay);
+
+    return () => {
+      if (handler.current) {
+        clearTimeout(handler.current);
+      }
+    };
+  }, [value, delay]);
+
+  return debouncedValue;
+}