Skip to content

The Open Source DocuSign Alternative.

fix: isAssistantMode was incorrectly set to true for regular recipients (#1854)

Ephraim Duncan55abecc5269b
diff --git a/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx b/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx
index 23a577f9e..99695320e 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-number-field.tsx
@@ -54,7 +54,7 @@ export const DocumentSigningNumberField = ({
const { toast } = useToast();
const { revalidate } = useRevalidator();
- const { recipient, targetSigner, isAssistantMode } = useDocumentSigningRecipientContext();
+ const { recipient, isAssistantMode } = useDocumentSigningRecipientContext();
const [showNumberModal, setShowNumberModal] = useState(false);
@@ -62,8 +62,8 @@ export const DocumentSigningNumberField = ({
const parsedFieldMeta = safeFieldMeta.success ? safeFieldMeta.data : null;
const defaultValue = parsedFieldMeta?.value;
- const [localNumber, setLocalNumber] = useState(
- parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0',
+ const [localNumber, setLocalNumber] = useState(() =>
+ parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '',
);
const initialErrors: ValidationErrors = {
@@ -213,16 +213,13 @@ export const DocumentSigningNumberField = ({
useEffect(() => {
if (!showNumberModal) {
- setLocalNumber(parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '0');
+ setLocalNumber(parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '');
setErrors(initialErrors);
}
}, [showNumberModal]);
useEffect(() => {
- if (
- (!field.inserted && defaultValue && localNumber) ||
- (!field.inserted && parsedFieldMeta?.readOnly && defaultValue)
- ) {
+ if (!field.inserted && defaultValue) {
void executeActionAuthProcedure({
onReauthFormSubmit: async (authOptions) => await onSign(authOptions),
actionTarget: field.type,
@@ -318,7 +315,7 @@ export const DocumentSigningNumberField = ({
variant="secondary"
onClick={() => {
setShowNumberModal(false);
- setLocalNumber('');
+ setLocalNumber(parsedFieldMeta?.value ? String(parsedFieldMeta.value) : '');
}}
>
<Trans>Cancel</Trans>
diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
index 98aa35893..e750bae74 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
@@ -72,9 +72,11 @@ export const DocumentSigningPageView = ({
}
const selectedSigner = allRecipients?.find((r) => r.id === selectedSignerId);
+ const targetSigner =
+ recipient.role === RecipientRole.ASSISTANT && selectedSigner ? selectedSigner : null;
return (
- <DocumentSigningRecipientProvider recipient={recipient} targetSigner={selectedSigner ?? null}>
+ <DocumentSigningRecipientProvider recipient={recipient} targetSigner={targetSigner}>
<div className="mx-auto w-full max-w-screen-xl">
<h1
className="mt-4 block max-w-[20rem] truncate text-2xl font-semibold md:max-w-[30rem] md:text-3xl"
diff --git a/apps/remix/app/components/general/document-signing/document-signing-recipient-provider.tsx b/apps/remix/app/components/general/document-signing/document-signing-recipient-provider.tsx
index 96a051d56..93a842637 100644
--- a/apps/remix/app/components/general/document-signing/document-signing-recipient-provider.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-recipient-provider.tsx
@@ -38,11 +38,6 @@ export const DocumentSigningRecipientProvider = ({
recipient,
targetSigner = null,
}: DocumentSigningRecipientProviderProps) => {
- // console.log({
- // recipient,
- // targetSigner,
- // isAssistantMode: !!targetSigner,
- // });
return (
<DocumentSigningRecipientContext.Provider
value={{