From 2d569292ce01dd620d8101e30daae7bad5d0d9e9 Mon Sep 17 00:00:00 2001
From: David Nguyen <davidngu28@gmail.com>
Date: Mon, 15 Apr 2024 20:29:42 +0700
Subject: [PATCH] fix: refactor

---
 .../ui/primitives/document-flow/add-signers.tsx | 16 +++-------------
 .../add-template-placeholder-recipients.tsx     | 17 ++++-------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/packages/ui/primitives/document-flow/add-signers.tsx b/packages/ui/primitives/document-flow/add-signers.tsx
index 40201361d..647cd5348 100644
--- a/packages/ui/primitives/document-flow/add-signers.tsx
+++ b/packages/ui/primitives/document-flow/add-signers.tsx
@@ -63,7 +63,6 @@ export const AddSignersFormPartial = ({
   const { remaining } = useLimits();
   const { data: session } = useSession();
   const user = session?.user;
-  const [selfSignerFormId, setSelfSignerFormId] = useState<string | undefined>(undefined);
 
   const initialId = useId();
 
@@ -149,8 +148,6 @@ export const AddSignersFormPartial = ({
       role: RecipientRole.SIGNER,
       actionAuth: undefined,
     });
-
-    setSelfSignerFormId(newSelfSignerId);
   };
 
   const onAddSigner = () => {
@@ -176,10 +173,6 @@ export const AddSignersFormPartial = ({
       return;
     }
 
-    if (signer.formId === selfSignerFormId) {
-      setSelfSignerFormId(undefined);
-    }
-
     removeSigner(index);
   };
 
@@ -235,7 +228,6 @@ export const AddSignersFormPartial = ({
                             disabled={
                               isSubmitting ||
                               hasBeenSentToRecipientId(signer.nativeId) ||
-                              signer.formId === selfSignerFormId ||
                               signers[index].email === user?.email
                             }
                             onKeyDown={onKeyDown}
@@ -268,7 +260,6 @@ export const AddSignersFormPartial = ({
                             disabled={
                               isSubmitting ||
                               hasBeenSentToRecipientId(signer.nativeId) ||
-                              signer.formId === selfSignerFormId ||
                               signers[index].email === user?.email
                             }
                             onKeyDown={onKeyDown}
@@ -448,9 +439,7 @@ export const AddSignersFormPartial = ({
                 className="dark:bg-muted dark:hover:bg-muted/80 bg-black/5 hover:bg-black/10"
                 disabled={
                   isSubmitting ||
-                  signers.length >= remaining.recipients ||
-                  !!selfSignerFormId ||
-                  signers.some((signer) => signer.email === user?.email)
+                  form.getValues('signers').some((signer) => signer.email === user?.email)
                 }
                 onClick={() => onAddSelfSigner()}
               >
@@ -458,8 +447,9 @@ export const AddSignersFormPartial = ({
                 Add myself
               </Button>
             </div>
+
             {!alwaysShowAdvancedSettings && isDocumentEnterprise && (
-              <div className="mt-6">
+              <div className="mt-4 flex flex-row items-center">
                 <Checkbox
                   id="showAdvancedRecipientSettings"
                   className="h-5 w-5"
diff --git a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
index 642e76031..70b31053b 100644
--- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
+++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
@@ -44,18 +44,16 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
   const initialId = useId();
   const { data: session } = useSession();
   const user = session?.user;
-  const [selfSignerFormId, setSelfSignerFormId] = useState<string | undefined>(undefined);
   const [placeholderRecipientCount, setPlaceholderRecipientCount] = useState(() =>
     recipients.length > 1 ? recipients.length + 1 : 2,
   );
 
-  const userIsSelfRecipient = () => signers.some((signer) => signer.email === user?.email);
-
   const { currentStep, totalSteps, previousStep } = useStep();
 
   const {
     control,
     handleSubmit,
+    getValues,
     formState: { errors, isSubmitting },
   } = useForm<TAddTemplatePlacholderRecipientsFormSchema>({
     resolver: zodResolver(ZAddTemplatePlacholderRecipientsFormSchema),
@@ -100,9 +98,6 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
       email: user?.email ?? '',
       role: RecipientRole.SIGNER,
     });
-
-    setSelfSignerFormId(newSelfSignerId);
-    setPlaceholderRecipientCount((count) => count + 1);
   };
 
   const onAddPlaceholderRecipient = () => {
@@ -117,13 +112,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
   };
 
   const onRemoveSigner = (index: number) => {
-    const isSelfSigner = signers[index].formId === selfSignerFormId;
-
     removeSigner(index);
-
-    if (isSelfSigner) {
-      setSelfSignerFormId(undefined);
-    }
   };
 
   return (
@@ -242,7 +231,9 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
           <Button
             type="button"
             className="dark:bg-muted dark:hover:bg-muted/80 bg-black/5 hover:bg-black/10"
-            disabled={isSubmitting || !!selfSignerFormId || userIsSelfRecipient()}
+            disabled={
+              isSubmitting || getValues('signers').some((signer) => signer.email === user?.email)
+            }
             onClick={() => onAddPlaceholderSelfRecipient()}
           >
             <Plus className="-ml-1 mr-2 h-5 w-5" />