fix: min amount handling fix

wormhole-foundation · Sep 23, 2024 · b485214 · b485214
1 parent 603d894
commit b485214
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/wormhole-connect/src/components/InputTransparent.tsx b/wormhole-connect/src/components/InputTransparent.tsx
@@ -40,6 +40,7 @@ type Props = {
   disabled?: boolean;
   value?: string | number;
   testId?: string;
+  pattern?: string;
 };
 
 const NUMBER_FORMAT_REGEX = /^\d*\.?\d*$/;
@@ -78,6 +79,7 @@ function InputTransparent(props: Props) {
       readOnly={props.disabled}
       value={props.value}
       data-testid={props.testId}
+      pattern={props.pattern}
     />
   );
 }

diff --git a/wormhole-connect/src/hooks/useAmountValidation.ts b/wormhole-connect/src/hooks/useAmountValidation.ts
@@ -82,9 +82,11 @@ export const useAmountValidation = (props: Props): HookReturn => {
   // All quotes fail.
   if (allRoutesFailed) {
     if (minAmount) {
-      const amountDisplay = sdkAmount.display(minAmount);
+      const formattedAmount = sdkAmount.whole(minAmount).toLocaleString('en', {
+        maximumFractionDigits: 4,
+      });
       return {
-        error: `Amount too small (min ~${amountDisplay} ${props.tokenSymbol})`,
+        error: `Amount too small (min ~${formattedAmount} ${props.tokenSymbol})`,
       };
     } else {
       return {
@@ -95,9 +97,11 @@ export const useAmountValidation = (props: Props): HookReturn => {
 
   // MinQuote warnings information
   if (minAmount) {
-    const amountDisplay = sdkAmount.display(minAmount);
+    const formattedAmount = sdkAmount.whole(minAmount).toLocaleString('en', {
+      maximumFractionDigits: 4,
+    });
     return {
-      warning: `More routes available for amounts exceeding ${amountDisplay} ${props.tokenSymbol}`,
+      warning: `More routes available for amounts exceeding ${formattedAmount} ${props.tokenSymbol}`,
     };
   }
 

diff --git a/wormhole-connect/src/utils/sdkv2.ts b/wormhole-connect/src/utils/sdkv2.ts
@@ -445,5 +445,5 @@ export const isMinAmountError = (
   error?: Error,
 ): error is routes.MinAmountError => {
   const unsafeCastError = error as routes.MinAmountError;
-  return isAmount(unsafeCastError?.min?.amount);
+  return isAmount(unsafeCastError?.min);
 };
diff --git a/wormhole-connect/src/views/Bridge/Inputs/AmountInput.tsx b/wormhole-connect/src/views/Bridge/Inputs/AmountInput.tsx
@@ -80,6 +80,7 @@ function AmountInput(props: Props) {
             disabled={isTransactionInProgress || props.disabled}
             value={props.value}
             testId={props.side + '-section-amount-input'}
+            pattern="[0-9]+([\.|,][0-9]{1,2})?"
           />
           {price && <Price>{price}</Price>}
         </>