@afosto/checkout-ui 0.0.16 → 0.0.18

package/dist/steps/informationStep.js

@@ -1,34 +1,34 @@
-import { CheckoutInformationStep as ni } from "../CheckoutInformationStep/CheckoutInformationStep.js";
+import { CheckoutInformationStep as si } from "../CheckoutInformationStep/CheckoutInformationStep.js";
 import { addressDefaultValues as q } from "../constants/addressDefaultValues.js";
-import { formatAddressResponse as j } from "../utils/formatAddressResponse.js";
-import { getErrorMessage as W } from "../utils/getErrorMessage.js";
-import { capitalize as X, isDefined as D } from "@afosto/utils";
+import { formatAddressResponse as F } from "../utils/formatAddressResponse.js";
+import { getErrorMessage as X } from "../utils/getErrorMessage.js";
+import { capitalize as Y, isDefined as D } from "@afosto/utils";
 import * as u from "yup";
-import { formatUpdateAccountInformationPayload as si } from "../utils/formatUpdateAccountInformationPayload.js";
-import { formatUpdateOrganisationOnAccountPayload as ri } from "../utils/formatUpdateOrganisationOnAccountPayload.js";
-import { setupCustomValidationRules as ti } from "../utils/setupCustomValidationRules.js";
-import { formatInformationStepPayload as oi } from "../utils/formatInformationStepPayload.js";
-ti();
-const ai = {
+import { formatUpdateAccountInformationPayload as ri } from "../utils/formatUpdateAccountInformationPayload.js";
+import { formatUpdateOrganisationOnAccountPayload as ti } from "../utils/formatUpdateOrganisationOnAccountPayload.js";
+import { setupCustomValidationRules as oi } from "../utils/setupCustomValidationRules.js";
+import { formatInformationStepPayload as ai } from "../utils/formatInformationStepPayload.js";
+oi();
+const P = (y, r) => r ? y(r) : null, di = {
   signUpFailedTitle: "Sign up failed",
   signUpFailedDescription: "Failed to create an account. Try again or continue as guest.",
   signUpFailedActionLabel: "Continue as guest",
   informationStepErrorTitle: "Could not process information",
   informationStepErrorDescription: "Something went wrong while processing the contact and address information. Please check your input and try again."
-}, yi = {
+}, fi = {
   key: "information",
   label: "Information",
-  component: ni,
+  component: si,
   reviewTargets: [
     "contactDetails",
     "businessDetails",
     "shippingAddress",
     "billingAddress"
   ],
-  defaultValues: (S) => {
-    const { defaultCountry: a, formatCountryAsOption: v, settings: O } = S || {}, { isB2cExcluded: y, isSharedOrganisationRequired: s } = O || {};
+  defaultValues: (y) => {
+    const { defaultCountry: r, formatCountryAsOption: v, settings: O } = y || {}, { isB2cExcluded: f, isSharedOrganisationRequired: s } = O || {};
     return {
-      type: y ? "business" : "private",
+      type: f ? "business" : "private",
       contact: null,
       email: "",
       emailOptIn: !1,
@@ -38,115 +38,122 @@ const ai = {
         cocNumber: "",
         type: s ? "SHARED" : "DEFAULT",
         vatNumber: "",
-        vatNumberCountry: y && a ? v(a) : null
+        vatNumberCountry: f && r ? v(r) : null
       },
       password: "",
       passwordConfirm: "",
       phoneNumber: "",
-      phoneNumberCountry: a ? v(a) : null,
+      phoneNumberCountry: r ? v(r) : null,
       phoneNumberId: "",
       phoneNumberIsDirty: !1,
       sameBillingAsShippingAddress: !0,
       shipping: {
         ...q,
-        country: a ? v(a) : null,
-        countryCode: a ? a.alpha2Code : ""
+        country: r ? v(r) : null,
+        countryCode: r ? r.alpha2Code : ""
       },
       shippingAddressId: "",
       billing: {
         ...q,
-        country: a ? v(a) : null,
-        countryCode: a ? a.alpha2Code : ""
+        country: r ? v(r) : null,
+        countryCode: r ? r.alpha2Code : ""
       },
       billingAddressId: "",
       shouldCreateAccount: !1
     };
   },
-  initialize: (S, a, v) => {
+  initialize: (y, r, v) => {
     const {
       defaultCountry: O,
-      formatCountryAsOption: y,
+      formatCountryAsOption: f,
       getCountryByCode: s,
-      settings: f,
+      settings: C,
       step: g
-    } = v || {}, { defaultValues: C } = g || {}, { addressOptions: B } = a || {}, { countryCode: N } = B || {}, { isB2bExcluded: U, isB2cExcluded: $ } = f || {}, n = typeof C == "function" ? C(v) : C, {
-      billing: M,
+    } = v || {}, { defaultValues: N } = g || {}, { addressOptions: B } = r || {}, { countryCode: A } = B || {}, { isB2bExcluded: T, isB2cExcluded: z } = C || {}, n = typeof N == "function" ? N(v) : N, {
+      billing: H,
       customer: e,
       delivery: m,
       expressPayment: b,
       options: i,
-      phoneNumber: o
-    } = S || {}, {
-      contact: t,
+      phoneNumber: a
+    } = y || {}, {
+      contact: o,
       countryCode: d,
-      organisation: r
-    } = e || {}, { address: A } = M || {}, { address: P } = m || {}, { address: E, customer: p } = b?.details?.express || {}, { shipping: x } = i || {}, { countries: V } = x || {}, I = s(N) || O, R = s(d), c = !!r?.id && !U || $, _ = c ? r?.phoneNumbers?.primary : t?.phoneNumbers?.primary, w = s(
-      o?.countryCode || _?.countryCode
-    ) || R || I || null, [L] = w?.callingCodes || [], k = (D(o?.number) ? o.number : _?.number || n.phoneNumber).replace(`+${L}`, ""), T = c ? r?.addressing?.shipping?.primary : t?.addressing?.shipping?.primary, l = j(
-      P?.addressLine1 ? P : E || T || {}
+      organisation: t
+    } = e || {}, { address: I } = H || {}, { address: _ } = m || {}, { address: x, customer: p } = b?.details?.express || {}, { shipping: U } = i || {}, { countries: V } = U || {}, S = s(A) || O, R = s(d), c = !!t?.id && !T || z, w = c ? t?.phoneNumbers?.primary : o?.phoneNumbers?.primary, L = s(
+      a?.countryCode || w?.countryCode
+    ) || R || S || null, [E] = L?.callingCodes || [], j = (D(a?.number) ? a.number : w?.number || n.phoneNumber).replace(`+${E}`, ""), k = c ? t?.addressing?.shipping?.primary : o?.addressing?.shipping?.primary, l = F(
+      _?.addressLine1 ? _ : x || k || {}
     );
-    let G = null;
+    let M = null;
     if (R && V?.includes(R?.alpha2Code))
-      G = R;
-    else if (I && V?.includes(I?.alpha2Code))
-      G = I;
+      M = R;
+    else if (S && V?.includes(S?.alpha2Code))
+      M = S;
     else {
-      const [ei] = V || [];
-      G = s(ei);
+      const [ni] = V || [];
+      M = s(ni);
     }
-    const J = s(l?.countryCode) || G, F = D(J) ? y(J) : n.shipping.country, z = l?.administrativeArea || n.shipping.administrativeArea, Y = z && typeof z == "string" ? {
-      code: z,
-      label: z,
-      value: z
-    } : z, Z = c ? r?.addressing?.billing?.primary : t?.addressing?.billing?.primary, h = j(
-      A?.addressLine1 ? A : Z || {}
-    ), K = s(h?.countryCode) || I, Q = D(K) ? y(K) : n.billing.country, H = h?.administrativeArea || n.billing.administrativeArea, ii = H && typeof H == "string" ? {
-      code: H,
-      label: H,
-      value: H
-    } : H;
+    const G = s(l?.countryCode ?? "") || M, $ = D(G) ? f(G) : n.shipping.country, J = l?.administrativeArea || n.shipping.administrativeArea, Z = typeof J == "string" ? {
+      code: J,
+      label: J,
+      value: J
+    } : J, ii = c ? t?.addressing?.billing?.primary : o?.addressing?.billing?.primary, h = F(
+      I?.addressLine1 ? I : ii || {}
+    ), Q = s(h?.countryCode ?? "") || S, W = D(Q) ? f(Q) : n.billing.country, K = h?.administrativeArea || n.billing.administrativeArea, ei = typeof K == "string" ? {
+      code: K,
+      label: K,
+      value: K
+    } : K;
     return {
       ...n,
-      defaultCountry: y(I),
+      defaultCountry: P(
+        f,
+        S
+      ),
       type: c ? "business" : "private",
-      contact: t || null,
-      email: c ? r?.administration?.email || t?.email || p?.email || n.email : t?.email || p?.email || n.email,
+      contact: o || null,
+      email: c ? t?.administration?.email || o?.email || p?.email || n.email : o?.email || p?.email || n.email,
       organisation: {
         ...n.organisation,
         ...c ? {
-          id: r?.id || n.organisation.id,
-          name: r?.name || n.organisation.name,
-          cocNumber: r?.cocNumber || n.organisation.cocNumber,
-          type: r?.type || n.organisation.type,
-          vatNumber: r?.vatNumber || n.organisation.vatNumber,
-          vatNumberCountry: y(
-            s(r?.registration?.countryCode) || I
+          id: t?.id || n.organisation.id,
+          name: t?.name || n.organisation.name,
+          cocNumber: t?.cocNumber || n.organisation.cocNumber,
+          type: t?.type || n.organisation.type,
+          vatNumber: t?.vatNumber || n.organisation.vatNumber,
+          vatNumberCountry: P(
+            f,
+            s(t?.registration?.countryCode) || S
           )
         } : {
-          vatNumberCountry: y(I)
+          vatNumberCountry: P(
+            f,
+            S
+          )
         }
       },
-      phoneNumber: k,
-      phoneNumberCountry: D(w) ? y(w) : n.phoneNumberCountry,
-      phoneNumberId: o?.id || _?.id || n.phoneNumberId,
+      phoneNumber: j,
+      phoneNumberCountry: D(L) ? f(L) : n.phoneNumberCountry,
+      phoneNumberId: a?.id || w?.id || n.phoneNumberId,
       shipping: {
         ...n.shipping,
-        givenName: l?.givenName || (c ? void 0 : t?.givenName) || n.shipping.givenName,
-        additionalName: l?.additionalName || (c ? void 0 : t?.additionalName) || n.shipping.additionalName,
-        familyName: l?.familyName || (c ? void 0 : t?.familyName) || n.shipping.familyName,
+        givenName: l?.givenName || (c ? void 0 : o?.givenName) || n.shipping.givenName,
+        additionalName: l?.additionalName || (c ? void 0 : o?.additionalName) || n.shipping.additionalName,
+        familyName: l?.familyName || (c ? void 0 : o?.familyName) || n.shipping.familyName,
         address_line_1: l?.address_line_1 || n.shipping.address_line_1,
         address_line_2: l?.address_line_2 || n.shipping.address_line_2,
         addressLine1: l?.addressLine1 || n.shipping.addressLine1,
         addressLine2: l?.addressLine2 || n.shipping.addressLine2,
-        country: F,
-        countryCode: F?.value || n.shipping.countryCode,
+        country: $,
+        countryCode: $?.value || n.shipping.countryCode,
         organisation: l?.organisation || n.shipping.organisation,
         postalCode: l?.postalCode || n.shipping.postalCode,
         premiseNumber: l?.premiseNumber || n.shipping.premiseNumber,
         premiseNumberSuffix: l?.premiseNumberSuffix || n.shipping.premiseNumberSuffix,
         thoroughfare: l?.thoroughfare || n.shipping.thoroughfare,
         locality: l?.locality || n.shipping.locality,
-        administrativeArea: Y
+        administrativeArea: Z
       },
       shippingAddressId: l?.id || n.shippingAddressId,
       billing: {
@@ -158,78 +165,85 @@ const ai = {
         address_line_2: h?.address_line_2 || n.billing.address_line_2,
         addressLine1: h?.addressLine1 || n.billing.addressLine1,
         addressLine2: h?.addressLine2 || n.billing.addressLine2,
-        country: Q,
-        countryCode: Q?.value || n.billing.countryCode,
+        country: W,
+        countryCode: W?.value || n.billing.countryCode,
         organisation: h?.organisation || n.billing.organisation,
         postalCode: h?.postalCode || n.billing.postalCode,
         premiseNumber: h?.premiseNumber || n.billing.premiseNumber,
         premiseNumberSuffix: h?.premiseNumberSuffix || n.billing.premiseNumberSuffix,
         thoroughfare: h?.thoroughfare || n.billing.thoroughfare,
         locality: h?.locality || n.billing.locality,
-        administrativeArea: ii
+        administrativeArea: ei
       },
       billingAddressId: h?.id || n.billingAddressId,
       sameBillingAsShippingAddress: D(h?.id) && D(l?.id) ? h?.id === l?.id : n.sameBillingAsShippingAddress
     };
   },
-  isComplete: (S, a) => {
-    const { step: v } = a || {};
-    return v.validationSchema(a).isValidSync(S);
+  isComplete: (y, r) => {
+    const { step: v } = r || {};
+    return v.validationSchema(r).isValidSync(y);
   },
-  onEvent: async (S, a, v, O) => {
-    const { step: y, stepIndex: s } = v || {}, {
-      activeStep: f,
+  onEvent: async (y, r, v, O) => {
+    const { step: f, stepIndex: s } = v || {}, {
+      activeStep: C,
       addCustomer: g,
-      formRef: C,
+      formRef: N,
       formatCountryAsOption: B,
-      getCountryByCode: N,
-      settings: U
-    } = O || {}, { isB2bExcluded: $, isB2cExcluded: n } = U || {}, M = C.current?.formProps?.data || [], e = f === s ? C.current?.getValues() : M[s] ?? {}, m = typeof y.defaultValues == "function" ? y.defaultValues(O) : y.defaultValues;
-    if (S === "signedIn") {
-      const { user: b, account: i } = a || {};
-      let o = e?.contact;
-      b?.id && e?.contact?.id !== b?.id && (o = (await g({
+      getCountryByCode: A,
+      settings: T
+    } = O || {}, { isB2bExcluded: z, isB2cExcluded: n } = T || {}, H = N.current?.formProps?.data || [], e = (C === s ? N.current?.getValues() : H[s]) ?? {}, m = typeof f.defaultValues == "function" ? f.defaultValues(O) : f.defaultValues;
+    if (y === "signedIn") {
+      const { user: b, account: i } = r;
+      let a = e?.contact;
+      b?.id && e?.contact?.id !== b?.id && (a = (await g({
         customer: {
           contactId: b.id
         }
       }))?.customer?.contact);
-      const [t] = i?.billing || [], [d] = i?.shipping || [], [r] = i?.organisations || [], [A] = i?.phoneNumbers || [], P = N(A?.countryCode) || e?.defaultCountry, [E] = P?.callingCodes || [], p = d ? j(d) : null, {
-        id: x,
+      const [o] = i?.billing || [], [d] = i?.shipping || [], [t] = i?.organisations || [], [I] = i?.phoneNumbers || [], _ = A(I?.countryCode) || e?.defaultCountry, [x] = _?.callingCodes || [], p = d ? F(d) : {}, {
+        id: U,
         isValid: V,
-        ...I
-      } = p || {}, R = I?.countryCode ? B(N(I.countryCode)) : e?.defaultCountry, c = t ? j(t) : null, {
-        id: _,
-        isValid: w,
-        ...L
-      } = c || {}, k = L?.countryCode ? B(N(L.countryCode)) : e?.defaultCountry, T = !$ && r?.id || n, l = T && r?.administration?.email || i?.email, J = {
+        ...S
+      } = p, R = S?.countryCode ? P(
+        B,
+        A(S.countryCode)
+      ) : e?.defaultCountry, c = o ? F(o) : {}, {
+        id: w,
+        isValid: L,
+        ...E
+      } = c, j = E?.countryCode ? P(
+        B,
+        A(E.countryCode)
+      ) : e?.defaultCountry, k = !z && t?.id || n, l = k && t?.administration?.email || i?.email, G = {
         ...e,
         ...m || {},
-        contact: o,
+        contact: a,
         email: l,
-        type: T ? "business" : "private",
-        ...A ? {
-          phoneNumber: A.number?.replace(
-            `+${E}`,
+        type: k ? "business" : "private",
+        ...I ? {
+          phoneNumber: I.number?.replace(
+            `+${x}`,
             ""
           ),
-          phoneNumberCountry: P,
-          phoneNumberId: A?.id || ""
+          phoneNumberCountry: _,
+          phoneNumberId: I?.id || ""
         } : {
           phoneNumberCountry: e.defaultCountry
         },
-        organisation: T ? {
+        organisation: k ? {
           ...e?.organisation || {},
           ...m?.organisation || {},
-          id: r?.id || "",
-          name: r?.name || "",
-          cocNumber: r?.cocNumber || "",
+          id: t?.id || "",
+          name: t?.name || "",
+          cocNumber: t?.cocNumber || "",
           isCocNumberRequired: e?.organisation?.isCocNumberRequired ?? !1,
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
-          type: r?.type || "DEFAULT",
-          vatNumber: r?.registration?.number || "",
-          vatNumberCountry: B(
-            N(
-              r?.registration?.countryCode
+          type: t?.type || "DEFAULT",
+          vatNumber: t?.registration?.number || "",
+          vatNumberCountry: P(
+            B,
+            A(
+              t?.registration?.countryCode
             ) || e?.defaultCountry
           )
         } : {
@@ -239,85 +253,91 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
         },
-        billing: t ? {
+        billing: o ? {
           ...e.billing,
           ...q,
-          ...L,
-          country: k
+          ...E,
+          country: j
         } : {
           ...e.billing,
           ...q,
           country: e.defaultCountry
         },
-        billingAddressId: _ || "",
+        billingAddressId: w || "",
         shipping: d ? {
           ...e.shipping,
           ...q,
-          ...I,
+          ...S,
           country: R
         } : {
           ...e.shipping,
           ...q,
           country: e.defaultCountry
         },
-        shippingAddressId: x || "",
-        sameBillingAsShippingAddress: D(_) || D(_) && _ === x
+        shippingAddressId: U || "",
+        sameBillingAsShippingAddress: D(w) || D(w) && w === U
       };
-      i && (f === s && C.current?.reset({
+      i && (C === s && N.current?.reset({
         ...e,
-        ...J
-      }), C.current?.formProps?.setData((F) => (F.splice(s, 1, {
-        ...F[s],
-        ...J
-      }), F)));
+        ...G
+      }), N.current?.formProps?.setData(($) => ($.splice(s, 1, {
+        ...$[s],
+        ...G
+      }), $)));
     }
-    if (S === "clearSession") {
-      const { sessionExpired: b, shouldCreateAccount: i } = a || {}, o = {
+    if (y === "clearSession") {
+      const { sessionExpired: b, shouldCreateAccount: i } = r, a = {
         ...e,
         ...b ? m || {} : {},
         shouldCreateAccount: i ?? !1
       };
-      f === s && C.current?.reset({
+      C === s && N.current?.reset({
         ...e,
-        ...o
-      }), C.current?.formProps?.setData((t) => (t.splice(s, 1, {
-        ...t[s],
-        ...o
-      }), t));
+        ...a
+      }), N.current?.formProps?.setData((o) => (o.splice(s, 1, {
+        ...o[s],
+        ...a
+      }), o));
     }
-    if (S === "accountSelected") {
-      const { account: b, user: i } = a || {}, [o] = b?.billing || [], [t] = b?.shipping || [], [d] = b?.organisations || [], [r] = b?.phoneNumbers || [], A = N(r?.countryCode) || e?.defaultCountry, [P] = A?.callingCodes || [], E = t ? j(t) : null, {
+    if (y === "accountSelected") {
+      const { account: b, user: i } = r, [a] = b?.billing || [], [o] = b?.shipping || [], [d] = b?.organisations || [], [t] = b?.phoneNumbers || [], I = A(t?.countryCode) || e?.defaultCountry, [_] = I?.callingCodes || [], x = o ? F(o) : {}, {
         id: p,
-        isValid: x,
+        isValid: U,
         ...V
-      } = E || {}, I = V?.countryCode ? B(N(V.countryCode)) : e?.defaultCountry, R = o ? j(o) : null, {
+      } = x, S = V?.countryCode ? P(
+        B,
+        A(V.countryCode)
+      ) : e?.defaultCountry, R = a ? F(a) : {}, {
         id: c,
-        isValid: _,
-        ...w
-      } = R || {}, L = w?.countryCode ? B(N(w.countryCode)) : e?.defaultCountry, k = !$ && d?.id || n;
+        isValid: w,
+        ...L
+      } = R, E = L?.countryCode ? P(
+        B,
+        A(L.countryCode)
+      ) : e?.defaultCountry, j = !z && d?.id || n;
       await g({
         customer: {
           contactId: i.id,
-          ...k && d?.id ? { organisationId: d?.id } : {}
+          ...j && d?.id ? { organisationId: d?.id } : {}
         }
       });
-      const T = {
+      const k = {
         ...e,
         ...m || {},
         contact: e?.contact,
-        email: k && d?.administration?.email || b?.email,
-        type: k ? "business" : "private",
-        ...r ? {
-          phoneNumber: r.number?.replace(
-            `+${P}`,
+        email: j && d?.administration?.email || b?.email,
+        type: j ? "business" : "private",
+        ...t ? {
+          phoneNumber: t.number?.replace(
+            `+${_}`,
             ""
           ),
-          phoneNumberCountry: A,
-          phoneNumberId: r?.id || ""
+          phoneNumberCountry: I,
+          phoneNumberId: t?.id || ""
         } : {
           phoneNumberCountry: e.defaultCountry
         },
-        organisation: k ? {
+        organisation: j ? {
           ...e?.organisation || {},
           ...m?.organisation || {},
           id: d?.id || "",
@@ -327,8 +347,9 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           type: d?.type || "DEFAULT",
           vatNumber: d?.registration?.number || "",
-          vatNumberCountry: B(
-            N(
+          vatNumberCountry: P(
+            B,
+            A(
               d?.registration?.countryCode
             ) || e?.defaultCountry
           )
@@ -339,22 +360,22 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
         },
-        billing: o ? {
+        billing: a ? {
           ...e.billing,
           ...q,
-          ...w,
-          country: L
+          ...L,
+          country: E
         } : {
           ...e.billing,
           ...q,
           country: e.defaultCountry
         },
         billingAddressId: c || "",
-        shipping: t ? {
+        shipping: o ? {
           ...e.shipping,
           ...q,
           ...V,
-          country: I
+          country: S
         } : {
           ...e.shipping,
           ...q,
@@ -363,47 +384,49 @@ const ai = {
         shippingAddressId: p || "",
         sameBillingAsShippingAddress: !D(c) || D(c) && c === p
       };
-      f === s && C.current?.reset({
+      C === s && N.current?.reset({
         ...e,
-        ...T
-      }), C.current?.formProps?.setData((l) => (l.splice(s, 1, {
+        ...k
+      }), N.current?.formProps?.setData((l) => (l.splice(s, 1, {
         ...l[s],
-        ...T
+        ...k
       }), l));
     }
-    if (S === "businessAccountSelected") {
-      const { account: b, organisation: i, user: o } = a || {};
+    if (y === "businessAccountSelected") {
+      const { account: b, organisation: i, user: a } = r;
       await g({
         customer: {
-          contactId: o.id,
+          contactId: a.id,
           organisationId: i?.id
         }
       });
-      const t = i?.addressing?.billing?.primary ? j(i?.addressing?.billing?.primary) : null, {
+      const o = i?.addressing?.billing?.primary ? F(i?.addressing?.billing?.primary) : {}, {
         id: d,
-        isValid: r,
-        ...A
-      } = t || {}, P = A?.countryCode ? B(
-        N(A.countryCode)
-      ) : e?.defaultCountry, E = i?.addressing?.shipping?.primary ? j(i?.addressing?.shipping?.primary) : null, {
+        isValid: t,
+        ...I
+      } = o, _ = I?.countryCode ? P(
+        B,
+        A(I.countryCode)
+      ) : e?.defaultCountry, x = i?.addressing?.shipping?.primary ? F(i?.addressing?.shipping?.primary) : {}, {
         id: p,
-        isValid: x,
+        isValid: U,
         ...V
-      } = E || {}, I = V?.countryCode ? B(
-        N(V.countryCode)
-      ) : e?.defaultCountry, R = i?.phoneNumbers?.primary, c = N(R?.countryCode) || e?.defaultCountry, [_] = c?.callingCodes || [], w = {
+      } = x, S = V?.countryCode ? P(
+        B,
+        A(V.countryCode)
+      ) : e?.defaultCountry, R = i?.phoneNumbers?.primary, c = A(R?.countryCode) || e?.defaultCountry, [w] = c?.callingCodes || [], L = {
         ...e,
         ...m || {}
       };
-      f === s && C.current?.reset({
+      C === s && N.current?.reset({
         ...e,
-        ...w,
+        ...L,
         contact: e?.contact,
         email: i?.administration?.email || b?.email || "",
         type: "business",
         ...R ? {
           phoneNumber: R?.number?.replace(
-            `+${_}`,
+            `+${w}`,
             ""
           ),
           phoneNumberCountry: c,
@@ -421,8 +444,9 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           type: i?.type || "SHARED",
           vatNumber: i?.registration?.number || "",
-          vatNumberCountry: B(
-            N(i?.registration?.countryCode) || e?.defaultCountry
+          vatNumberCountry: P(
+            B,
+            A(i?.registration?.countryCode) || e?.defaultCountry
           )
         } : {
           ...e?.organisation || {},
@@ -431,22 +455,22 @@ const ai = {
           isVatNumberRequired: e?.organisation?.isVatNumberRequired ?? !1,
           vatNumberCountry: e.defaultCountry
         },
-        billing: t ? {
+        billing: o ? {
           ...e.billing,
           ...q,
-          ...A,
-          country: P
+          ...I,
+          country: _
         } : {
           ...e.billing,
           ...q,
           country: e.defaultCountry
         },
         billingAddressId: d || "",
-        shipping: E ? {
+        shipping: x ? {
           ...e.shipping,
           ...q,
           ...V,
-          country: I
+          country: S
         } : {
           ...e.shipping,
           ...q,
@@ -454,39 +478,39 @@ const ai = {
         },
         shippingAddressId: p || "",
         sameBillingAsShippingAddress: !D(d) || D(d) && d === p
-      }), C.current?.formProps?.setData((L) => (L.splice(s, 1, {
-        ...L[s],
-        ...w
-      }), L));
+      }), N.current?.formProps?.setData((E) => (E.splice(s, 1, {
+        ...E[s],
+        ...L
+      }), E));
     }
   },
-  submit: async (S, a, v) => {
+  submit: async (y, r, v) => {
     const {
       activeStep: O,
-      addInformation: y,
+      addInformation: f,
       currentOrganisation: s,
-      formRef: f,
+      formRef: C,
       getCountryByCode: g,
-      getUser: C,
+      getUser: N,
       isSignedIn: B,
-      setCurrentOrganisation: N,
-      setErrorMessage: U,
-      signUp: $,
+      setCurrentOrganisation: A,
+      setErrorMessage: T,
+      signUp: z,
       translations: n = {},
-      updateAccountInformation: M,
+      updateAccountInformation: H,
       updateOrganisationOnAccount: e
     } = v || {}, m = {
-      ...ai,
+      ...di,
       ...n.feedback || {}
-    }, { shouldCreateAccount: b } = S || {};
+    }, { shouldCreateAccount: b } = y || {};
     try {
-      U(null);
-      const i = oi(S, {
+      T(null);
+      const i = ai(y, {
         currentOrganisation: s,
         isSignedIn: B
-      }), o = C();
+      }), a = N();
       if (b) {
-        const p = await $({
+        const p = await z({
           givenName: i?.shipping?.givenName,
           additionalName: i?.shipping?.additionalName,
           familyName: i?.shipping?.familyName,
@@ -497,28 +521,28 @@ const ai = {
             shipping: i?.shippingAddress ? [i.shippingAddress] : []
           },
           ...i?.phoneNumber ? { phoneNumber: i?.phoneNumber } : {}
-        }).catch((x) => {
-          const V = W(x);
-          return U({
-            title: m.feedback?.signUpFailedTitle,
-            description: V ? X(V) : m.feedback?.signUpFailedDescription,
+        }).catch((U) => {
+          const V = X(U);
+          return T({
+            title: m.signUpFailedTitle,
+            description: V ? Y(V) : m.signUpFailedDescription,
             action: {
-              label: m.feedback?.signUpFailedActionLabel,
+              label: m.signUpFailedActionLabel,
               onClick: () => {
-                U(null), f.current?.reset({
-                  ...f.current?.getValues() || {},
+                T(null), C.current?.reset({
+                  ...C.current?.getValues() || {},
                   shouldCreateAccount: !1
-                }), f.current?.submitForm();
+                }), C.current?.submitForm();
               }
             }
-          }), Promise.reject(x);
+          }), Promise.reject(U);
         });
         if (!p)
           return Promise.reject();
-        delete i.customer.contact, i.customer.contactId = p.id, f.current?.setValue("shouldCreateAccount", !1);
+        delete i.customer.contact, i.customer.contactId = p.id, C.current?.setValue("shouldCreateAccount", !1);
       }
-      if (o && !o?.organisation?.id) {
-        const p = si(
+      if (a && !a?.organisation?.id) {
+        const p = ri(
           {
             billingAddress: i.billingAddress,
             billingAddressId: i.billingAddressId,
@@ -532,17 +556,19 @@ const ai = {
             shippingAddress: i.shippingAddress,
             shippingAddressId: i.shippingAddressId,
             type: i.type,
-            user: o
+            user: a
           },
           {
             getCountryByCode: g
           }
         );
-        p && await M(p).catch(() => {
+        p && await H(
+          p
+        ).catch(() => {
         });
       }
-      if (o?.organisation?.id && o?.organisation?.role?.toLowerCase() === "admin") {
-        const p = ri(
+      if (a?.organisation?.id && a?.organisation?.role?.toLowerCase() === "admin") {
+        const p = ti(
           {
             billingAddress: i.billingAddress,
             billingAddressId: i.billingAddressId,
@@ -556,48 +582,48 @@ const ai = {
             shippingAddress: i.shippingAddress,
             shippingAddressId: i.shippingAddressId,
             type: i.type,
-            user: o
+            user: a
           },
           {
             getCountryByCode: g
           }
         );
-        p && await e(p).catch(
-          () => {
-          }
-        );
+        p && await e(
+          p
+        ).catch(() => {
+        });
       }
-      const t = await y({
+      const o = await f({
         billingAddress: i.billingAddress,
         customer: i.customer,
         phoneNumber: i.phoneNumber,
         shippingAddress: i.shippingAddress
-      }), { customer: d, billing: r, delivery: A, phoneNumber: P } = t || {}, { organisation: E } = d || {};
-      return f.current?.formProps?.setData((p) => (p.splice(O, 1, {
+      }), { customer: d, billing: t, delivery: I, phoneNumber: _ } = o || {}, { organisation: x } = d || {};
+      return C.current?.formProps?.setData((p) => (p.splice(O, 1, {
         ...p[O],
         contact: d?.contact,
-        billingAddressId: r?.address?.id,
-        shippingAddressId: A?.address?.id,
-        phoneNumberId: P?.id,
+        billingAddressId: t?.address?.id,
+        shippingAddressId: I?.address?.id,
+        phoneNumberId: _?.id,
         phoneNumberIsDirty: !1
-      }), p)), N(E), t;
+      }), p)), A(x), o;
     } catch (i) {
-      const o = W(i);
-      return U({
-        title: m.feedback?.informationStepErrorTitle,
-        description: o ? X(o) : m.feedback?.informationStepErrorDescription
+      const a = X(i);
+      return T({
+        title: m.informationStepErrorTitle,
+        description: a ? Y(a) : m.informationStepErrorDescription
       }), Promise.reject(i);
     }
   },
-  validationSchema: (S) => {
+  validationSchema: (y) => {
     const {
-      billingAddressValidationSchema: a,
+      billingAddressValidationSchema: r,
       shippingAddressValidationSchema: v,
       settings: O
-    } = S || {}, {
-      isCocNumberRequired: y,
+    } = y || {}, {
+      isCocNumberRequired: f,
       isPhoneNumberRequired: s,
-      isVatNumberRequired: f
+      isVatNumberRequired: C
     } = O || {};
     return u.object().shape({
       type: u.string().oneOf(["business", "private"]).required(),
@@ -620,20 +646,20 @@ const ai = {
         then: (g) => g.shape({
           id: u.string().nullable(),
           name: u.string().required(),
-          cocNumber: y ? u.string().trim().required() : u.string().trim().nullable(),
-          vatNumber: f ? u.string().trim().required() : u.string().trim().nullable(),
-          vatNumberCountry: f ? u.object().nullable().required() : u.object().nullable()
+          cocNumber: f ? u.string().trim().required() : u.string().trim().nullable(),
+          vatNumber: C ? u.string().trim().required() : u.string().trim().nullable(),
+          vatNumberCountry: C ? u.object().nullable().required() : u.object().nullable()
         })
       }),
       sameBillingAsShippingAddress: u.boolean().nullable(),
       shipping: u.object().nullable().shape(v),
       billing: u.object().nullable().when("sameBillingAsShippingAddress", {
         is: !1,
-        then: (g) => g.shape(a)
+        then: (g) => g.shape(r)
       })
     });
   }
 };
 export {
-  yi as informationStep
+  fi as informationStep
 };