@saasquatch/mint-components 2.3.0-11 → 2.3.0-13

package/dist/collection/components/tax-and-cash/sqm-user-info-form/useUserInfoForm.js

@@ -3,7 +3,7 @@ import { useEffect, useMemo, useRef, useState, } from "@saasquatch/universal-hoo
 import jsonpointer from "jsonpointer";
 import { CURRENCIES_NAMESPACE, SORTED_COUNTRIES_NAMESPACE, TAX_CONTEXT_NAMESPACE, TAX_FORM_CONTEXT_NAMESPACE, USER_FORM_CONTEXT_NAMESPACE, USER_QUERY_NAMESPACE, } from "../data";
 import { ADDRESS_REGIONS } from "../subregions";
-import { objectIsFull, validTaxDocument } from "../utils";
+import { objectIsFull, toDomesticNumber, validTaxDocument } from "../utils";
 import { TAX_FORM_UPDATED_EVENT_KEY } from "../eventKeys";
 import { CONNECT_PARTNER, COMPLETE_PARTNER, } from "../sqm-indirect-tax-form/useIndirectTaxForm";
 import { gql } from "graphql-request";
@@ -16,7 +16,7 @@ const GET_INDIRECT_TAX_COUNTRY_CODE = gql `
   }
 `;
 export function useUserInfoForm(props) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
   const currencyRef = useRef(undefined);
   const phoneCountryRef = useRef(undefined);
   const formRef = useRef(null);
@@ -136,7 +136,7 @@ export function useUserInfoForm(props) {
     }
   }, [currencySearch, currencies]);
   async function connectPartner(formData) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const vars = {
       user: {
         id: user.id,
@@ -150,39 +150,34 @@ export function useUserInfoForm(props) {
       city: formData.city,
       state: formData.state,
       postalCode: formData.postalCode,
-      phoneNumber: formData.phoneNumber,
+      phoneNumber: toDomesticNumber(formData.phoneNumberCountryCode, formData.phoneNumber),
       phoneNumberCountryCode: formData.phoneNumberCountryCode,
     };
-    // If the partner has already been started call completeImpactPartner to
-    // update the remaining details. Otherwise create a new connection.
+    // if user went through early partner creation, connectionStatus === "STARTED"
+    // otherwise trigger legacy partner creation
     const userData = data === null || data === void 0 ? void 0 : data.user;
     let result = null;
     let connectionResult;
-    result = await completeImpactPartner({
-      vars,
-    });
-    connectionResult = (_a = result) === null || _a === void 0 ? void 0 : _a.completeImpactConnection;
-    // if (userData?.impactConnection?.connectionStatus === "STARTED") {
-    //   result = await completeImpactPartner({
-    //     vars,
-    //   });
-    //   connectionResult = (result as CompletePartnerResult)
-    //     ?.completeImpactConnection;
-    // } else {
-    //   result = await connectImpactPartner({
-    //     vars,
-    //   });
-    //   connectionResult = (result as ConnectPartnerResult)
-    //     ?.createImpactConnection;
-    // }
-    if (!result || ((_b = result) === null || _b === void 0 ? void 0 : _b.message))
+    if (((_a = userData === null || userData === void 0 ? void 0 : userData.impactConnection) === null || _a === void 0 ? void 0 : _a.connectionStatus) === "STARTED") {
+      result = await completeImpactPartner({
+        vars,
+      });
+      connectionResult = (_b = result) === null || _b === void 0 ? void 0 : _b.completeImpactConnection;
+    }
+    else {
+      result = await connectImpactPartner({
+        vars,
+      });
+      connectionResult = (_c = result) === null || _c === void 0 ? void 0 : _c.createImpactConnection;
+    }
+    if (!result || ((_d = result) === null || _d === void 0 ? void 0 : _d.message))
       throw new Error();
     if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.success)) {
       console.error("Failed to create Impact connection: ", connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.validationErrors);
       throw new Error();
     }
     await refetch();
-    const resultPublisher = (_d = (_c = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.user) === null || _c === void 0 ? void 0 : _c.impactConnection) === null || _d === void 0 ? void 0 : _d.publisher;
+    const resultPublisher = (_f = (_e = connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.user) === null || _e === void 0 ? void 0 : _e.impactConnection) === null || _f === void 0 ? void 0 : _f.publisher;
     const hasValidCurrentDocument = validTaxDocument(resultPublisher === null || resultPublisher === void 0 ? void 0 : resultPublisher.requiredTaxDocumentType) && (resultPublisher === null || resultPublisher === void 0 ? void 0 : resultPublisher.currentTaxDocument);
     // Fire form change event
     window.dispatchEvent(new Event(TAX_FORM_UPDATED_EVENT_KEY));
@@ -220,12 +215,13 @@ export function useUserInfoForm(props) {
       return;
     }
     const { allowBankingCollection, ...userData } = formData;
+    const normalizedPhoneNumber = toDomesticNumber(userData.phoneNumberCountryCode, userData.phoneNumber);
     setUserFormContext({
       ...userFormContext,
       firstName: userData.firstName,
       lastName: userData.lastName,
       phoneNumberCountryCode: userData.phoneNumberCountryCode,
-      phoneNumber: userData.phoneNumber,
+      phoneNumber: normalizedPhoneNumber,
       countryCode: userData.countryCode,
       address: userData.address,
       city: userData.city,
@@ -236,7 +232,10 @@ export function useUserInfoForm(props) {
     const skipNextStep = getSkipNextStep(userData);
     if (skipNextStep) {
       try {
-        const { resultPublisher, hasValidCurrentDocument } = await connectPartner(formData);
+        const { resultPublisher, hasValidCurrentDocument } = await connectPartner({
+          ...formData,
+          phoneNumber: normalizedPhoneNumber,
+        });
         if ((resultPublisher === null || resultPublisher === void 0 ? void 0 : resultPublisher.requiredTaxDocumentType) &&
           !hasValidCurrentDocument) {
           // Go to docusign form
@@ -312,6 +311,11 @@ export function useUserInfoForm(props) {
       loading: loading || connectLoading || completeLoading,
       isPartner: !!((_g = (_f = data === null || data === void 0 ? void 0 : data.user) === null || _f === void 0 ? void 0 : _f.impactConnection) === null || _g === void 0 ? void 0 : _g.publisher),
       isUser: !!((_j = (_h = data === null || data === void 0 ? void 0 : data.user) === null || _h === void 0 ? void 0 : _h.impactConnection) === null || _j === void 0 ? void 0 : _j.user),
+      // Show banner when pre-existing partner is created with legacy mutation createImpactConnection
+      isUserLegacy: !!((_l = (_k = data === null || data === void 0 ? void 0 : data.user) === null || _k === void 0 ? void 0 : _k.impactConnection) === null || _l === void 0 ? void 0 : _l.user) &&
+        ((_o = (_m = data === null || data === void 0 ? void 0 : data.user) === null || _m === void 0 ? void 0 : _m.impactConnection) === null || _o === void 0 ? void 0 : _o.connectionStatus) !== "STARTED",
+      isPartnerLegacy: !!((_q = (_p = data === null || data === void 0 ? void 0 : data.user) === null || _p === void 0 ? void 0 : _p.impactConnection) === null || _q === void 0 ? void 0 : _q.publisher) &&
+        ((_s = (_r = data === null || data === void 0 ? void 0 : data.user) === null || _r === void 0 ? void 0 : _r.impactConnection) === null || _s === void 0 ? void 0 : _s.connectionStatus) !== "STARTED",
       formState: {
         ...userFormContext,
         errors: formErrors,

package/dist/collection/components/tax-and-cash/utils.js

@@ -1,31 +1,46 @@
+import { parsePhoneNumberFromString } from "libphonenumber-js";
 import { intl } from "../../global/global";
-import { PHONE_EXTENSIONS } from "./phoneExtensions";
-function stripLeadingZero(d) {
-  return d.startsWith("0") ? d.slice(1) : d;
+/**
+ * Normalize user input to the domestic form Impact stores: digits only,
+ * with the country dial code and trunk-zero prefix removed.
+ */
+export function toDomesticNumber(phoneCountryCode, input) {
+  var _a;
+  if (!input)
+    return "";
+  const parsed = parsePhoneNumberFromString(input, phoneCountryCode === null || phoneCountryCode === void 0 ? void 0 : phoneCountryCode.toUpperCase());
+  return (_a = parsed === null || parsed === void 0 ? void 0 : parsed.nationalNumber) !== null && _a !== void 0 ? _a : input.replace(/\D/g, "");
 }
 /**
- * Mirrors Impact's I18nPhoneNumberParams validation rules per country.
- * Returns true when the phone number is valid for the given the phoneNumberCountryCode country.
+ * Validates a phone number against both libphonenumber-js's per-country
+ * pattern rules AND Impact's I18nPhoneNumber length rules, applied to the
+ * sanitized value we'll submit.
  */
 export function isValidI18nPhoneNumber(phoneCountryCode, phoneNumber) {
-  var _a, _b;
   if (!phoneCountryCode || !(phoneNumber === null || phoneNumber === void 0 ? void 0 : phoneNumber.trim()))
     return false;
   const country = phoneCountryCode.toUpperCase();
-  const digits = phoneNumber.replace(/\D/g, "");
+  const parsed = parsePhoneNumberFromString(phoneNumber, country);
+  if (!(parsed === null || parsed === void 0 ? void 0 : parsed.isValid()))
+    return false;
+  return passesImpactBackendLengthCheck(country, toDomesticNumber(country, phoneNumber));
+}
+/**
+ * Mirrors estalea.bucket.phone.I18nPhoneNumber.isValidI18nPhoneNumber()
+ * length rules on the already-sanitized (digits-only) submission value.
+ */
+function passesImpactBackendLengthCheck(country, digits) {
+  if (!digits)
+    return false;
   switch (country) {
     case "US":
     case "CA": {
-      // strip a single leading "1", then exactly 10 digits
       const n = digits.startsWith("1") ? digits.slice(1) : digits;
       return n.length === 10;
     }
     case "AU":
-      // 9 or 10 digits
       return digits.length === 9 || digits.length === 10;
     case "NZ": {
-      // trim "640" country prefix or leading "0" (only when >9 digits),
-      // then 8–10 digits
       let n = digits;
       if (n.length > 9) {
         if (n.startsWith("640"))
@@ -35,25 +50,13 @@ export function isValidI18nPhoneNumber(phoneCountryCode, phoneNumber) {
       }
       return n.length >= 8 && n.length <= 10;
     }
-    case "GB":
-      // >= 6 digits after stripping a single leading "0", no dialing-code check
+    default:
       return stripLeadingZero(digits).length >= 6;
-    default: {
-      // All other countries: strip a single leading "0", then >= 6 digits
-      if (stripLeadingZero(digits).length < 6)
-        return false;
-      // If input starts with "+", the dialing code (first whitespace-split
-      // token) must match the selected country exactly. Splits on first
-      // whitespace, so "+4420 7946 0958" supplies "4420" (not "44") and fails.
-      if (phoneNumber.trim().startsWith("+")) {
-        const supplied = phoneNumber.trim().split(/\s/)[0].slice(1);
-        const expected = (_b = (_a = PHONE_EXTENSIONS[country]) === null || _a === void 0 ? void 0 : _a.dial_code) === null || _b === void 0 ? void 0 : _b.replace(/^\+/, "");
-        return expected === supplied;
-      }
-      return true;
-    }
   }
 }
+function stripLeadingZero(digits) {
+  return digits.startsWith("0") ? digits.slice(1) : digits;
+}
 export function validTaxDocument(requiredType) {
   const validTypes = ["W9", "W8BENE", "W8BEN"];
   if (validTypes.includes(requiredType))