From 89cd1e507b339f8ced2122e4a996efac3b6e54de Mon Sep 17 00:00:00 2001
From: monicamuyama <monicamuyama@gmail.com>
Date: Sun, 25 May 2025 23:37:42 +0300
Subject: [PATCH 1/3] Added the logic for sorting stores on API creation

---
 BTCPayServer/Controllers/UIManageController.APIKeys.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer/Controllers/UIManageController.APIKeys.cs b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
index a6eaafd20..4722d3482 100644
--- a/BTCPayServer/Controllers/UIManageController.APIKeys.cs
+++ b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
@@ -466,7 +466,10 @@ namespace BTCPayServer.Controllers
 
         private async Task<T> SetViewModelValues<T>(T viewModel) where T : AddApiKeyViewModel
         {
-            viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
+            // FIXED: Added OrderBy to sort stores alphabetically by name
+            var stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
+            viewModel.Stores = stores.OrderBy(store => store.StoreName).ToArray();
+            //viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
             var isAdmin = (await _authorizationService.AuthorizeAsync(User, Policies.CanModifyServerSettings))
                 .Succeeded;
             viewModel.PermissionValues ??= Policies.AllPolicies

From 6107990bf343f4b392b7bd03b29aede2c1e050ac Mon Sep 17 00:00:00 2001
From: monicamuyama <monicamuyama@gmail.com>
Date: Sun, 25 May 2025 23:50:02 +0300
Subject: [PATCH 2/3] Adding the sorting for the archives

---
 BTCPayServer/Controllers/UIManageController.APIKeys.cs | 2 +-
 BTCPayServer/Controllers/UIUserStoresController.cs     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BTCPayServer/Controllers/UIManageController.APIKeys.cs b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
index 4722d3482..fbc22e5f7 100644
--- a/BTCPayServer/Controllers/UIManageController.APIKeys.cs
+++ b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
@@ -468,7 +468,7 @@ namespace BTCPayServer.Controllers
         {
             // FIXED: Added OrderBy to sort stores alphabetically by name
             var stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
-            viewModel.Stores = stores.OrderBy(store => store.StoreName).ToArray();
+            viewModel.Stores = stores.OrderBy(store => store.StoreName, StringComparer.InvariantCultureIgnoreCase).ToArray();
             //viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
             var isAdmin = (await _authorizationService.AuthorizeAsync(User, Policies.CanModifyServerSettings))
                 .Succeeded;
diff --git a/BTCPayServer/Controllers/UIUserStoresController.cs b/BTCPayServer/Controllers/UIUserStoresController.cs
index 37ea5538a..5a796dac7 100644
--- a/BTCPayServer/Controllers/UIUserStoresController.cs
+++ b/BTCPayServer/Controllers/UIUserStoresController.cs
@@ -52,6 +52,7 @@ namespace BTCPayServer.Controllers
             {
                 Stores = stores
                     .Where(s => s.Archived == archived)
+                    .OrderBy(s => s.StoreName, StringComparer.InvariantCultureIgnoreCase)
                     .Select(s => new ListStoresViewModel.StoreViewModel
                     {
                         StoreId = s.Id,

From 1abc5fbdb51bc8b6bef82a69d17b4a3c02e43b67 Mon Sep 17 00:00:00 2001
From: rockstardev <5191402+rockstardev@users.noreply.github.com>
Date: Fri, 30 May 2025 23:26:45 -0500
Subject: [PATCH 3/3] Removing unnecessary comments

---
 BTCPayServer/Controllers/UIManageController.APIKeys.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BTCPayServer/Controllers/UIManageController.APIKeys.cs b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
index fbc22e5f7..d369bc177 100644
--- a/BTCPayServer/Controllers/UIManageController.APIKeys.cs
+++ b/BTCPayServer/Controllers/UIManageController.APIKeys.cs
@@ -466,10 +466,9 @@ namespace BTCPayServer.Controllers
 
         private async Task<T> SetViewModelValues<T>(T viewModel) where T : AddApiKeyViewModel
         {
-            // FIXED: Added OrderBy to sort stores alphabetically by name
             var stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
             viewModel.Stores = stores.OrderBy(store => store.StoreName, StringComparer.InvariantCultureIgnoreCase).ToArray();
-            //viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
+
             var isAdmin = (await _authorizationService.AuthorizeAsync(User, Policies.CanModifyServerSettings))
                 .Succeeded;
             viewModel.PermissionValues ??= Policies.AllPolicies