@saasquatch/mint-components 1.8.0-99 → 1.8.0

package/dist/collection/components/tax-and-cash/sqm-docusign-form/useDocusignForm.js

@@ -1,10 +1,8 @@
-import { useMutation, useUserIdentity, } from "@saasquatch/component-boilerplate";
+import { useMutation, useParent, useParentQueryValue, useParentValue, useUserIdentity, } from "@saasquatch/component-boilerplate";
 import { useEffect, useState } from "@saasquatch/universal-hooks";
 import { gql } from "graphql-request";
-import { useParentQueryValue } from "../../../utils/useParentQuery";
-import { useParent, useParentValue } from "../../../utils/useParentState";
 import { TAX_CONTEXT_NAMESPACE, TAX_FORM_CONTEXT_NAMESPACE, USER_QUERY_NAMESPACE, } from "../sqm-tax-and-cash/data";
-import { taxTypeToName } from "../utils";
+import { taxTypeToName, validTaxDocument } from "../utils";
 const GET_TAX_DOCUMENT = gql `
   mutation createImpactPublisherTaxDocument(
     $vars: CreateImpactPublisherTaxDocumentInput!
@@ -25,7 +23,7 @@ export const DOCUSIGN_ERROR_STATES = [
 export const DOCUSIGN_EXPIRED_STATES = ["ttl_expired", "session_timeout"];
 export const DOCUSIGN_SUCCESS_STATES = ["signing_complete", "viewing_complete"];
 export function useDocusignForm(props) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const user = useUserIdentity();
   const context = useParentValue(TAX_FORM_CONTEXT_NAMESPACE);
   const [step, setStep] = useParent(TAX_CONTEXT_NAMESPACE);
@@ -36,21 +34,21 @@ export function useDocusignForm(props) {
   const [participantType, setParticipantType] = useState(undefined);
   const [errors, setErrors] = useState({});
   const [loading, setLoading] = useState(false);
-  const existingDocumentType = (_c = publisher === null || publisher === void 0 ? void 0 : publisher.currentTaxDocument) === null || _c === void 0 ? void 0 : _c.type;
+  // Only look at current document if it's valid (same as required type)
+  const existingDocumentType = validTaxDocument(publisher === null || publisher === void 0 ? void 0 : publisher.requiredTaxDocumentType, (_c = publisher === null || publisher === void 0 ? void 0 : publisher.currentTaxDocument) === null || _c === void 0 ? void 0 : _c.type)
+    ? (_d = publisher === null || publisher === void 0 ? void 0 : publisher.currentTaxDocument) === null || _d === void 0 ? void 0 : _d.type : undefined;
   const actualDocumentType = existingDocumentType ||
     getDocumentType(participantType) || (publisher === null || publisher === void 0 ? void 0 : publisher.requiredTaxDocumentType);
   useEffect(() => {
-    var _a;
-    if (!((_a = publisher === null || publisher === void 0 ? void 0 : publisher.currentTaxDocument) === null || _a === void 0 ? void 0 : _a.type))
+    if (!existingDocumentType)
       return;
-    const type = publisher.currentTaxDocument.type;
-    if (type === "W8BEN") {
+    if (existingDocumentType === "W8BEN") {
       setParticipantType("individualParticipant");
     }
-    else if (type === "W8BENE") {
+    else if (existingDocumentType === "W8BENE") {
       setParticipantType("businessEntity");
     }
-  }, [publisher]);
+  }, [existingDocumentType]);
   useEffect(() => {
     var _a;
     // Skip if no publisher info
@@ -89,7 +87,10 @@ export function useDocusignForm(props) {
         setLoading(true);
         await refetch();
         // Skip banking info form if it already is saved
-        setStep(context.overrideNextStep || !!(publisher === null || publisher === void 0 ? void 0 : publisher.withdrawalSettings)
+        // or if brandedSignup is false
+        setStep(context.overrideNextStep ||
+          !!(publisher === null || publisher === void 0 ? void 0 : publisher.withdrawalSettings) ||
+          !(publisher === null || publisher === void 0 ? void 0 : publisher.brandedSignup)
           ? "/dashboard"
           : "/4");
       }
@@ -107,9 +108,6 @@ export function useDocusignForm(props) {
       onSubmit();
     }
   }, [docusignStatus, refetch]);
-  const onBack = () => {
-    setStep(context.overrideBackStep);
-  };
   const allLoading = userLoading || documentLoading || loading;
   return {
     states: {
@@ -128,16 +126,14 @@ export function useDocusignForm(props) {
       docusignStatus,
       documentType: actualDocumentType,
       documentTypeString: taxTypeToName(actualDocumentType),
-      hideBackButton: !context.overrideBackStep,
     },
     data: {
       taxForm: actualDocumentType,
-      documentUrl: (_d = document === null || document === void 0 ? void 0 : document.createImpactPublisherTaxDocument) === null || _d === void 0 ? void 0 : _d.documentUrl,
+      documentUrl: (_e = document === null || document === void 0 ? void 0 : document.createImpactPublisherTaxDocument) === null || _e === void 0 ? void 0 : _e.documentUrl,
     },
     callbacks: {
       setDocusignStatus,
       setParticipantType,
-      onBack,
     },
     text: props.getTextProps(),
   };

package/dist/collection/components/tax-and-cash/sqm-indirect-tax-form/sqm-indirect-tax-form-view.js

@@ -106,6 +106,11 @@ const style = {
     height: "26px",
     width: "26px",
   },
+  PageDescriptionText: {
+    color: "var(--sl-color-neutral-500)",
+    fontSize: "var(--sl-font-size-medium)",
+    marginBottom: "var(--sl-spacing-small)",
+  },
 };
 const sheet = createStyleSheet(style);
 const styleString = sheet.toString();
@@ -142,7 +147,8 @@ export const IndirectTaxFormView = (props) => {
             defaultMessage: text.formStep,
           }, { step: states.step, count: FORM_STEPS }))),
         h("h3", null, text.indirectTax),
-        h("p", { class: classes.DescriptionText }, text.indirectTaxDetailsDescription)),
+        h("p", { class: classes.PageDescriptionText }, text.taxAndPayoutsDescription),
+        h("p", { class: classes.DescriptionText }, text.indirectTaxDescription)),
       states.loadingError && (h("div", null,
         h("sl-alert", { exportparts: "base: alert-base, icon:alert-icon", type: "danger", open: true, class: sheet.classes.AlertContainer },
           h("sl-icon", { slot: "icon", name: "exclamation-octagon" }),