From 42dd8469a4cb86f45c6aac78769f6f1916af5aec Mon Sep 17 00:00:00 2001
From: Mike Wajda <mewajda@gmail.com>
Date: Mon, 20 Jul 2026 18:40:16 -0500
Subject: [PATCH] fix: keep order after adding a header, also just map the
 headers instead of filtering

---
 src/App.tsx                   | 15 +--------------
 src/context/Global/reducer.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index d81f19f..dabadb1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -136,20 +136,7 @@ function App() {
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    {selectedProfile?.requestHeaders
-                                        ?.sort((a, b) => {
-                                            const nameA = a.name.toUpperCase();
-                                            const nameB = b.name.toUpperCase();
-                                            if (nameA < nameB) {
-                                                return -1;
-                                            }
-                                            if (nameA > nameB) {
-                                                return 1;
-                                            }
-
-                                            return 0;
-                                        })
-                                        .map((reqHeader: any) => {
+                                    {selectedProfile?.requestHeaders?.map((reqHeader: any) => {
                                             return (
                                                 <tr className="border-b" key={reqHeader.id}>
                                                     <td className="px-6 py-2 whitespace-nowrap text-sm font-medium text-gray-900">
diff --git a/src/context/Global/reducer.ts b/src/context/Global/reducer.ts
index 9cb33c1..847ff04 100644
--- a/src/context/Global/reducer.ts
+++ b/src/context/Global/reducer.ts
@@ -131,7 +131,6 @@ export const reducer = (state: GlobalSettings, action: Action) => {
         }
         case ActionType.SET_CURRENT_PROFILE_REQUEST_HEADERS: {
             const selectedProfile = state.profiles.find((x) => x.currentlySelected);
-            const currentRequestHeader: any = selectedProfile?.requestHeaders.find((x) => x.id === action.payload.id);
 
             return {
                 ...state,
@@ -139,10 +138,11 @@ export const reducer = (state: GlobalSettings, action: Action) => {
                     ...state.profiles.filter((x) => x.id !== selectedProfile?.id),
                     {
                         ...selectedProfile,
-                        requestHeaders: [
-                            ...(selectedProfile?.requestHeaders || []).filter((x) => x.id !== currentRequestHeader.id),
-                            { ...currentRequestHeader, [action.payload.name]: action.payload.value }
-                        ]
+                        requestHeaders: (selectedProfile?.requestHeaders || []).map((header) =>
+                            header.id === action.payload.id
+                                ? { ...header, [action.payload.name]: action.payload.value }
+                                : header
+                        )
                     }
                 ]
             };