From 690e32750ee4ed8f6a78af261dc391efad435f2c Mon Sep 17 00:00:00 2001
From: Lucas Smith <me@lucasjamessmith.me>
Date: Thu, 20 Nov 2025 10:31:02 +1100
Subject: [PATCH] fix: resolve logic issues

---
 .../embed/authoring/configure-fields-view.tsx | 97 ++++++++++---------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/apps/remix/app/components/embed/authoring/configure-fields-view.tsx b/apps/remix/app/components/embed/authoring/configure-fields-view.tsx
index 551b50ced..5596f2f0f 100644
--- a/apps/remix/app/components/embed/authoring/configure-fields-view.tsx
+++ b/apps/remix/app/components/embed/authoring/configure-fields-view.tsx
@@ -95,6 +95,14 @@ export const ConfigureFieldsView = ({
     return base64.encode(configData.documentData.data);
   }, [configData.documentData]);
 
+  const normalizedEnvelopeItem = useMemo(() => {
+    if (envelopeItem) {
+      return envelopeItem;
+    }
+
+    return { id: '', envelopeId: '' };
+  }, [envelopeItem]);
+
   const recipients = useMemo(() => {
     return configData.signers.map<Recipient>((signer, index) => ({
       id: signer.nativeId || index,
@@ -536,55 +544,50 @@ export const ConfigureFieldsView = ({
             )}
 
             <Form {...form}>
-              {normalizedDocumentData ||
-                (envelopeItem && (
-                  <div>
-                    <PDFViewer
-                      presignToken={presignToken}
-                      overrideData={normalizedDocumentData}
-                      envelopeItem={envelopeItem}
-                      token={undefined}
-                      version="signed"
-                    />
+              <div>
+                <PDFViewer
+                  presignToken={presignToken}
+                  overrideData={normalizedDocumentData}
+                  envelopeItem={normalizedEnvelopeItem}
+                  token={undefined}
+                  version="signed"
+                />
 
-                    <ElementVisible
-                      target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
-                    >
-                      {localFields.map((field, index) => {
-                        const recipientIndex = recipients.findIndex(
-                          (r) => r.id === field.recipientId,
-                        );
+                <ElementVisible
+                  target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
+                >
+                  {localFields.map((field, index) => {
+                    const recipientIndex = recipients.findIndex((r) => r.id === field.recipientId);
 
-                        return (
-                          <FieldItem
-                            key={field.formId}
-                            field={field}
-                            minHeight={MIN_HEIGHT_PX}
-                            minWidth={MIN_WIDTH_PX}
-                            defaultHeight={DEFAULT_HEIGHT_PX}
-                            defaultWidth={DEFAULT_WIDTH_PX}
-                            onResize={(node) => onFieldResize(node, index)}
-                            onMove={(node) => onFieldMove(node, index)}
-                            onRemove={() => remove(index)}
-                            onDuplicate={() => onFieldCopy(null, { duplicate: true })}
-                            onDuplicateAllPages={() => onFieldCopy(null, { duplicateAll: true })}
-                            onFocus={() => setLastActiveField(field)}
-                            onBlur={() => setLastActiveField(null)}
-                            onAdvancedSettings={() => {
-                              setCurrentField(field);
-                              setShowAdvancedSettings(true);
-                            }}
-                            recipientIndex={recipientIndex}
-                            active={activeFieldId === field.formId}
-                            onFieldActivate={() => setActiveFieldId(field.formId)}
-                            onFieldDeactivate={() => setActiveFieldId(null)}
-                            disabled={selectedRecipient?.id !== field.recipientId}
-                          />
-                        );
-                      })}
-                    </ElementVisible>
-                  </div>
-                ))}
+                    return (
+                      <FieldItem
+                        key={field.formId}
+                        field={field}
+                        minHeight={MIN_HEIGHT_PX}
+                        minWidth={MIN_WIDTH_PX}
+                        defaultHeight={DEFAULT_HEIGHT_PX}
+                        defaultWidth={DEFAULT_WIDTH_PX}
+                        onResize={(node) => onFieldResize(node, index)}
+                        onMove={(node) => onFieldMove(node, index)}
+                        onRemove={() => remove(index)}
+                        onDuplicate={() => onFieldCopy(null, { duplicate: true })}
+                        onDuplicateAllPages={() => onFieldCopy(null, { duplicateAll: true })}
+                        onFocus={() => setLastActiveField(field)}
+                        onBlur={() => setLastActiveField(null)}
+                        onAdvancedSettings={() => {
+                          setCurrentField(field);
+                          setShowAdvancedSettings(true);
+                        }}
+                        recipientIndex={recipientIndex}
+                        active={activeFieldId === field.formId}
+                        onFieldActivate={() => setActiveFieldId(field.formId)}
+                        onFieldDeactivate={() => setActiveFieldId(null)}
+                        disabled={selectedRecipient?.id !== field.recipientId}
+                      />
+                    );
+                  })}
+                </ElementVisible>
+              </div>
             </Form>
           </div>
         </div>