+
+
-
-
- The document is now completed, please follow any instructions provided within the parent application.
-
+
+ Document Completed
+
+
+
+
+
+ No further action is required
+
+
+
+
+ Please follow any instructions provided within the parent application.
);
diff --git a/apps/remix/app/components/embed/embed-document-signing-page-v1.tsx b/apps/remix/app/components/embed/embed-document-signing-page-v1.tsx
index 739a5c8a6..ff583ed22 100644
--- a/apps/remix/app/components/embed/embed-document-signing-page-v1.tsx
+++ b/apps/remix/app/components/embed/embed-document-signing-page-v1.tsx
@@ -55,6 +55,7 @@ export type EmbedSignDocumentV1ClientPageProps = {
completedFields: DocumentField[];
metadata?: DocumentMeta | null;
isCompleted?: boolean;
+ isRejected?: boolean;
hidePoweredBy?: boolean;
allowWhitelabelling?: boolean;
allRecipients?: RecipientWithFields[];
@@ -70,6 +71,7 @@ export const EmbedSignDocumentV1ClientPage = ({
completedFields,
metadata,
isCompleted,
+ isRejected,
hidePoweredBy = false,
allowWhitelabelling = false,
allRecipients = [],
@@ -83,7 +85,9 @@ export const EmbedSignDocumentV1ClientPage = ({
const [hasFinishedInit, setHasFinishedInit] = useState(false);
const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
const [hasCompletedDocument, setHasCompletedDocument] = useState(isCompleted);
- const [hasRejectedDocument, setHasRejectedDocument] = useState(recipient.signingStatus === SigningStatus.REJECTED);
+ const [hasRejectedDocument, setHasRejectedDocument] = useState(
+ isRejected ?? recipient.signingStatus === SigningStatus.REJECTED,
+ );
const [selectedSignerId, setSelectedSignerId] = useState
(
allRecipients.length > 0 ? allRecipients[0].id : null,
);
@@ -263,6 +267,44 @@ export const EmbedSignDocumentV1ClientPage = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
+ useEffect(() => {
+ if (!window.parent) {
+ return;
+ }
+
+ if (hasRejectedDocument) {
+ window.parent.postMessage(
+ {
+ action: 'document-rejected',
+ data: {
+ token,
+ documentId,
+ recipientId: recipient.id,
+ },
+ },
+ '*',
+ );
+
+ return;
+ }
+
+ if (hasCompletedDocument) {
+ window.parent.postMessage(
+ {
+ action: 'document-completed',
+ data: {
+ token,
+ documentId,
+ recipientId: recipient.id,
+ },
+ },
+ '*',
+ );
+ }
+
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
useEffect(() => {
if (hasFinishedInit && hasDocumentLoaded && window.parent) {
window.parent.postMessage(
diff --git a/apps/remix/app/components/embed/embed-document-signing-page-v2.tsx b/apps/remix/app/components/embed/embed-document-signing-page-v2.tsx
index 55e7cb6d1..8973a23df 100644
--- a/apps/remix/app/components/embed/embed-document-signing-page-v2.tsx
+++ b/apps/remix/app/components/embed/embed-document-signing-page-v2.tsx
@@ -40,12 +40,18 @@ export const EmbedSignDocumentV2ClientPage = ({
const [isNameLocked, setIsNameLocked] = useState(false);
const [isEmailLocked, setIsEmailLocked] = useState(envelope.type === EnvelopeType.DOCUMENT && !!email);
+ // The signing provider's envelope data isn't refreshed on revalidation.
+ const [hasCompletedDocument, setHasCompletedDocument] = useState(isCompleted);
+ const [hasRejectedDocument, setHasRejectedDocument] = useState(isRejected);
+
const onDocumentCompleted = (data: {
token: string;
documentId: number;
envelopeId: string;
recipientId: number;
}) => {
+ setHasCompletedDocument(true);
+
if (window.parent) {
window.parent.postMessage(
{
@@ -112,6 +118,8 @@ export const EmbedSignDocumentV2ClientPage = ({
recipientId: number;
reason?: string;
}) => {
+ setHasRejectedDocument(true);
+
if (window.parent) {
window.parent.postMessage(
{
@@ -219,23 +227,26 @@ export const EmbedSignDocumentV2ClientPage = ({
}
}, [isRejected, envelope.id, recipient.id, recipient.token]);
- if (isRejected) {
+ if (hasRejectedDocument) {
return ;
}
- if (isCompleted) {
+ if (hasCompletedDocument) {
+ const completedSignature =
+ recipient.fields.find((field) => field.signature)?.signature ?? recipientSignature ?? null;
+
return (
{
- // Sort by signingOrder first (nulls last), then by id
- if (a.signingOrder === null && b.signingOrder === null) {
- return a.id - b.id;
- }
- if (a.signingOrder === null) {
- return 1;
- }
- if (b.signingOrder === null) {
- return -1;
- }
- if (a.signingOrder === b.signingOrder) {
- return a.id - b.id;
- }
- return a.signingOrder - b.signingOrder;
+ return getNextDictatableRecipient({
+ recipients: template.recipients,
+ currentRecipientId: directRecipient.id,
});
-
- const currentIndex = sortedRecipients.findIndex((r) => r.id === directRecipient.id);
- return currentIndex !== -1 && currentIndex < sortedRecipients.length - 1
- ? sortedRecipients[currentIndex + 1]
- : undefined;
}, [template.templateMeta?.signingOrder, template.recipients, directRecipient.id]);
return (
@@ -435,7 +419,7 @@ export const DirectTemplateSigningForm = ({
fields={localFields}
fieldsValidated={fieldsValidated}
recipient={directRecipient}
- allowDictateNextSigner={nextRecipient && template.templateMeta?.allowDictateNextSigner}
+ allowDictateNextSigner={Boolean(nextRecipient && template.templateMeta?.allowDictateNextSigner)}
defaultNextSigner={nextRecipient ? { name: nextRecipient.name, email: nextRecipient.email } : undefined}
/>
diff --git a/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx b/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
index f5508f727..b8caa4a83 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx
@@ -102,8 +102,10 @@ export const DocumentSigningCompleteDialog = ({
const { isNameLocked, isEmailLocked } = useEmbedSigningContext() || {};
+ const canDictateNextSigner = allowDictateNextSigner && Boolean(defaultNextSigner);
+
const form = useForm