fix: refactoring order sorting

JoinColony · Jan 30, 2025 · 3b8e652 · 3b8e652
1 parent 63cbde7
commit 3b8e652
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/components/v5/common/ActionSidebar/partials/ActionSidebarContent/hooks.ts b/src/components/v5/common/ActionSidebar/partials/ActionSidebarContent/hooks.ts
@@ -19,13 +19,13 @@ export const useGetFormActionErrors = () => {
 
   const { inputsOrder } = useInputsOrderContext();
 
-  const sortedFlatFormErrors = flatFormErrors.sort((a, b) => {
-    const aIndex = inputsOrder.findIndex((fieldName) => a.key === fieldName);
-    const bIndex = inputsOrder.findIndex((fieldName) => b.key === fieldName);
+  const orderMap = new Map<string, number>(
+    inputsOrder.map((fieldName, index) => [fieldName, index]),
+  );
 
-    if (aIndex === -1 && bIndex === -1) return 0;
-    if (aIndex === -1) return 1;
-    if (bIndex === -1) return -1;
+  const sortedFlatFormErrors = flatFormErrors.sort((a, b) => {
+    const aIndex = orderMap.get(a.key.toString()) ?? Infinity;
+    const bIndex = orderMap.get(b.key.toString()) ?? Infinity;
 
     return aIndex - bIndex;
   });

diff --git a/src/components/v5/common/ActionSidebar/partials/forms/PaymentBuilderForm/hooks.ts b/src/components/v5/common/ActionSidebar/partials/forms/PaymentBuilderForm/hooks.ts
@@ -67,7 +67,7 @@ export const useValidationSchema = () => {
                         return formatText({ id: 'errors.recipient.required' });
                       }
                       return formatText(
-                        { id: 'errors.recipient.requiredIn' },
+                        { id: 'errors.recipient.requiredInPayment' },
                         { paymentIndex: index + 1 },
                       );
                     })

diff --git a/src/components/v5/common/ActionSidebar/partials/forms/SplitPaymentForm/hooks.ts b/src/components/v5/common/ActionSidebar/partials/forms/SplitPaymentForm/hooks.ts
@@ -132,7 +132,7 @@ export const useValidationSchema = () => {
                   const index = getLastIndexFromPath(path);
 
                   return formatText(
-                    { id: 'errors.recipient.requiredIn' },
+                    { id: 'errors.recipient.requiredInPayment' },
                     { paymentIndex: index === undefined ? 1 : index + 1 },
                   );
                 }),

diff --git a/src/components/v5/common/ActionSidebar/partials/forms/StagedPaymentForm/hooks.ts b/src/components/v5/common/ActionSidebar/partials/forms/StagedPaymentForm/hooks.ts
@@ -57,7 +57,7 @@ export const useValidationSchema = () => {
                 return formatText({ id: 'errors.recipient.required' });
               }
               return formatText(
-                { id: 'errors.recipient.requiredIn' },
+                { id: 'errors.recipient.requiredInPayment' },
                 { paymentIndex: index + 1 },
               );
             })