Fix token change (#589)

* Fix max check of balance-input * Fix token onChange
helix-bridge · Dec 1, 2023 · bc73733 · bc73733
1 parent c008f45
commit bc73733
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/apps/src/components/balance-input.tsx b/packages/apps/src/components/balance-input.tsx
@@ -71,7 +71,7 @@ export function BalanceInput({
         if (token && !Number.isNaN(Number(input))) {
           parsed = parseValue(input, token.decimals);
           insufficientRef.current = balance !== undefined && balance < parsed.value ? true : false;
-          exceededRef.current = max && max < parsed.value ? true : false;
+          exceededRef.current = typeof max === "bigint" && max < parsed.value ? true : false;
           valid = !(insufficientRef.current || exceededRef.current);
           onChange({ valid, ...parsed });
         }
@@ -128,7 +128,7 @@ export function BalanceInput({
     if (token && token.decimals !== tokenRef.current?.decimals) {
       const parsed = parseValue(value.input, token.decimals);
       insufficientRef.current = balance !== undefined && balance < parsed.value ? true : false;
-      exceededRef.current = max && max < parsed.value ? true : false;
+      exceededRef.current = typeof max === "bigint" && max < parsed.value ? true : false;
       const valid = !(insufficientRef.current || exceededRef.current);
       onChange({ valid, ...parsed });
     }
@@ -141,7 +141,7 @@ export function BalanceInput({
       const decimals = token.decimals;
       const parsed = parseValue(formatUnits(max ?? 0n, decimals), decimals);
       insufficientRef.current = balance !== undefined && balance < parsed.value ? true : false;
-      exceededRef.current = max && max < parsed.value ? true : false;
+      exceededRef.current = typeof max === "bigint" && max < parsed.value ? true : false;
       const valid = !(insufficientRef.current || exceededRef.current);
       onChange({ valid, ...parsed });
     }

diff --git a/packages/apps/src/components/transfer.tsx b/packages/apps/src/components/transfer.tsx
@@ -148,7 +148,7 @@ export default function Transfer() {
   }, [address, bridgeInstance, updateSourceBalance]);
 
   useEffect(() => {
-    setBridgeCategory(bridgeOptions.at(0));
+    setBridgeCategory((prevValue) => prevValue ?? bridgeOptions.at(0));
   }, [bridgeOptions, setBridgeCategory]);
 
   useEffect(() => {
@@ -292,7 +292,15 @@ export default function Transfer() {
             tokenOptions={getAvailableSourceTokens(sourceChain, targetChain)}
             onBalanceRefresh={refreshBalance}
             onChange={setTransferAmount}
-            onTokenChange={setSourceToken}
+            onTokenChange={(_sourceToken) => {
+              const _targetTokens = getAvailableTargetTokens(sourceChain, targetChain, _sourceToken);
+              const _targetToken = _targetTokens.at(0);
+              const _category = getAvailableBridges(sourceChain, targetChain, _sourceToken).at(0);
+              setBridgeCategory(_category);
+              setSourceToken(_sourceToken);
+              setTargetToken(_targetToken);
+              handleUrlParams({ _category, _sourceToken, _targetToken });
+            }}
           />
         </Label>