From 9bdd5c31cc4d1933777fb2ec0a8e8d8865f81927 Mon Sep 17 00:00:00 2001
From: Ephraim Duncan <55143799+ephraimduncan@users.noreply.github.com>
Date: Mon, 18 Nov 2024 08:54:51 +0000
Subject: [PATCH 1/2] fix: sort recipients for template with signing order
 (#1468)

---
 .../add-template-placeholder-recipients.tsx          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 b9b8dd4a8..50335dac1 100644
--- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
+++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react';
 
 import type { DropResult, SensorAPI } from '@hello-pangea/dnd';
 import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
@@ -94,7 +94,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
       ];
     }
 
-    return recipients.map((recipient, index) => ({
+    let mappedRecipients = recipients.map((recipient, index) => ({
       nativeId: recipient.id,
       formId: String(recipient.id),
       name: recipient.name,
@@ -103,6 +103,14 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
       actionAuth: ZRecipientAuthOptionsSchema.parse(recipient.authOptions)?.actionAuth ?? undefined,
       signingOrder: recipient.signingOrder ?? index + 1,
     }));
+
+    if (signingOrder === DocumentSigningOrder.SEQUENTIAL) {
+      mappedRecipients = mappedRecipients.sort(
+        (a, b) => (a.signingOrder ?? 0) - (b.signingOrder ?? 0),
+      );
+    }
+
+    return mappedRecipients;
   };
 
   const form = useForm<TAddTemplatePlacholderRecipientsFormSchema>({

From 0eff336175f5c112a6e7c952c15f1e2a6a255e48 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Tue, 19 Nov 2024 16:44:25 +1100
Subject: [PATCH 2/2] v1.8.0-rc.4

---
 apps/marketing/package.json | 2 +-
 apps/web/package.json       | 2 +-
 package-lock.json           | 8 ++++----
 package.json                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/marketing/package.json b/apps/marketing/package.json
index 127b57a71..5d4abe5ce 100644
--- a/apps/marketing/package.json
+++ b/apps/marketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@documenso/marketing",
-  "version": "1.8.0-rc.3",
+  "version": "1.8.0-rc.4",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
diff --git a/apps/web/package.json b/apps/web/package.json
index a53ecc72b..21e61a5f3 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@documenso/web",
-  "version": "1.8.0-rc.3",
+  "version": "1.8.0-rc.4",
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
diff --git a/package-lock.json b/package-lock.json
index c484c2ebc..f7838ee3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.8.0-rc.3",
+  "version": "1.8.0-rc.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.8.0-rc.3",
+      "version": "1.8.0-rc.4",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -80,7 +80,7 @@
     },
     "apps/marketing": {
       "name": "@documenso/marketing",
-      "version": "1.8.0-rc.3",
+      "version": "1.8.0-rc.4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/assets": "*",
@@ -441,7 +441,7 @@
     },
     "apps/web": {
       "name": "@documenso/web",
-      "version": "1.8.0-rc.3",
+      "version": "1.8.0-rc.4",
       "license": "AGPL-3.0",
       "dependencies": {
         "@documenso/api": "*",
diff --git a/package.json b/package.json
index 56b8b5fdb..a8b3ca7b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.8.0-rc.3",
+  "version": "1.8.0-rc.4",
   "scripts": {
     "build": "turbo run build",
     "build:web": "turbo run build --filter=@documenso/web",