Fix rule on address requirement for NLD membership (#683)

Closes FRONT-973
swan-io · Apr 9, 2024 · 345515b · 345515b
1 parent 15f39a0
commit 345515b
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/clients/banking/src/components/NewMembershipWizard.tsx b/clients/banking/src/components/NewMembershipWizard.tsx
@@ -225,9 +225,10 @@ export const NewMembershipWizard = ({
  canInitiatePayments: getFieldState("canInitiatePayments").value,
  })
  .with(
- { accountCountry: "NLD" },
- { canViewAccount: true },
- { canInitiatePayments: true },
+ P.intersection(
+ { accountCountry: "NLD" },
+ P.union({ canViewAccount: true }, { canInitiatePayments: true }),
+ ),
  () => {
  const validate = combineValidators(validateRequired, validateAddressLine);
  return validate(value);
@@ -247,9 +248,10 @@ export const NewMembershipWizard = ({
  canInitiatePayments: getFieldState("canInitiatePayments").value,
  })
  .with(
- { accountCountry: "NLD" },
- { canViewAccount: true },
- { canInitiatePayments: true },
+ P.intersection(
+ { accountCountry: "NLD" },
+ P.union({ canViewAccount: true }, { canInitiatePayments: true }),
+ ),
  () => {
  return validateRequired(value);
  },
@@ -266,9 +268,10 @@ export const NewMembershipWizard = ({
  canInitiatePayments: getFieldState("canInitiatePayments").value,
  })
  .with(
- { accountCountry: "NLD" },
- { canViewAccount: true },
- { canInitiatePayments: true },
+ P.intersection(
+ { accountCountry: "NLD" },
+ P.union({ canViewAccount: true }, { canInitiatePayments: true }),
+ ),
  () => {
  return validateRequired(value);
  },
@@ -285,9 +288,10 @@ export const NewMembershipWizard = ({
  canInitiatePayments: getFieldState("canInitiatePayments").value,
  })
  .with(
- { accountCountry: "NLD" },
- { canViewAccount: true },
- { canInitiatePayments: true },
+ P.intersection(
+ { accountCountry: "NLD" },
+ P.union({ canViewAccount: true }, { canInitiatePayments: true }),
+ ),
  () => {
  return validateRequired(value);
  },