From d51512610d5912327228ff4429baba39090d6d84 Mon Sep 17 00:00:00 2001
From: Joel Prat Vilanova <joel.pratvilanova@proton.ch>
Date: Thu, 8 Jan 2026 11:18:09 +0100
Subject: [PATCH] [VPNBE-1767] Sort users in gateway popup list

---
 .../components/containers/vpn/gateways/helpers.tsx     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/components/containers/vpn/gateways/helpers.tsx b/packages/components/containers/vpn/gateways/helpers.tsx
index d6758d7edc..6578f2381e 100644
--- a/packages/components/containers/vpn/gateways/helpers.tsx
+++ b/packages/components/containers/vpn/gateways/helpers.tsx
@@ -18,6 +18,14 @@ export const getSuffix = (name: string | undefined) => name?.match(/#\d+$/)?.[0]
 
 const locations: Record<string, GatewayLocation> = {};
 
+const sortGatewayUsers = (a: GatewayUser, b: GatewayUser): number => {
+    if (!a.Name || !b.Name) {
+        return 0;
+    }
+
+    return a.Name.localeCompare(b.Name);
+};
+
 const getAverageLoad = (servers: GatewayServer[]) =>
     servers.reduce((load, server) => load + server.Load, 0) / servers.length;
 
@@ -95,7 +103,7 @@ const GroupItem = ({ group, keyPrefix, id }: GroupItemProps) => {
             </DropdownButton>
 
             <Dropdown isOpen={isOpen} anchorRef={anchorRef} onClose={close}>
-                {group?.Users.map((user) => (
+                {group?.Users.sort(sortGatewayUsers).map((user) => (
                     <div
                         key={`logical-users-${keyPrefix}-${id}-${(user as any).UserID}`}
                         className="flex items-center gap-1 py-2 px-4"