simplify address validation, include solana addresses

ChainSafe · Jan 22, 2025 · fe2392e · fe2392e
1 parent 4f5d8d9
commit fe2392e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/packages/circle-demo-webapp/app/components/SendTransactionForm/SendTransactionForm.tsx b/packages/circle-demo-webapp/app/components/SendTransactionForm/SendTransactionForm.tsx
@@ -128,6 +128,7 @@ export function SendTransactionForm({
         <Controller
           name="tokenId"
           control={control}
+          defaultValue={balances.find((b) => b.token.symbol === 'USDC')?.token.id ?? ''}
           render={({ field }) => (
             <TokenSelect
               balances={balances}

diff --git a/packages/circle-demo-webapp/app/lib/utils.ts b/packages/circle-demo-webapp/app/lib/utils.ts
@@ -47,33 +47,16 @@ export async function callGetFetch<ReturnType>(
   return (await res.json()) as ReturnType;
 }
 
-export type ValidInputTypes = Uint8Array | bigint | string | number | boolean;
+export const isSolanaAddress = (value: string): boolean => {
+  return /^[1-9A-HJ-NP-Za-km-z]{43,44}$/.test(value);
+};
 
-export const isHexStrict = (hex: ValidInputTypes) =>
-  typeof hex === 'string' && /^((-)?0x[0-9a-f]+|(0x))$/i.test(hex);
+const isEthAddress = (address: string): boolean => {
+  return /^0x[a-fA-F0-9]{40}$/.test(address);
+};
 
 export const isAddress = (value: string): boolean => {
-  let valueToCheck: string;
-
-  if (!isHexStrict(value)) {
-    valueToCheck = value.toLowerCase().startsWith('0x') ? value : `0x${value}`;
-  } else {
-    valueToCheck = value;
-  }
-
-  // check if it has the basic requirements of an address
-  if (!/^(0x)?[0-9a-f]{40}$/i.test(valueToCheck)) {
-    return false;
-  }
-  // If it's ALL lowercase or ALL upppercase
-  if (
-    /^(0x|0X)?[0-9a-f]{40}$/.test(valueToCheck) ||
-    /^(0x|0X)?[0-9A-F]{40}$/.test(valueToCheck)
-  ) {
-    return true;
-    // Otherwise check each case
-  }
-  return true;
+  return isSolanaAddress(value) || isEthAddress(value);
 };
 
 /**