chore: bridge validation fixes

Polkadex-Substrate · Jun 21, 2024 · 3408e88 · 3408e88
1 parent adb9e30
commit 3408e88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/apps/hestia/src/components/thea/Form/index.tsx b/apps/hestia/src/components/thea/Form/index.tsx
@@ -119,6 +119,8 @@ export const Form = () => {
   } = useFormik({
     initialValues,
     validationSchema: bridgeValidations(
+      !!sourceAccount,
+      !!destinationAccount,
       minAmount,
       max?.amount,
       destinationPDEXBalance,

diff --git a/packages/core/src/validations/index.ts b/packages/core/src/validations/index.ts
@@ -12,6 +12,8 @@ import {
 } from "@orderbook/core/constants";
 
 export const bridgeValidations = (
+  sourceWalletPresent: boolean,
+  destinationWalletPresent: boolean,
   minAmount = 0,
   maxAmount = 0,
   destinationPDEXBalance = 0,
@@ -24,6 +26,16 @@ export const bridgeValidations = (
   return Yup.object().shape({
     amount: Yup.string()
       .required("Required")
+      .test(
+        CrossChainError.SOURCE_WALLET,
+        CrossChainError.SOURCE_WALLET,
+        () => sourceWalletPresent
+      )
+      .test(
+        CrossChainError.DESTINATION_WALLET,
+        CrossChainError.DESTINATION_WALLET,
+        () => destinationWalletPresent
+      )
       .test(
         ErrorMessages().WHITESPACE_NOT_ALLOWED,
         ErrorMessages().WHITESPACE_NOT_ALLOWED,