From 76decc06c3d9f59139deca990cf6c0f6e5ee7a72 Mon Sep 17 00:00:00 2001
From: Tony Vincent <tonyvince7@gmail.com>
Date: Wed, 16 Oct 2024 17:09:52 +0100
Subject: [PATCH] Maintain order (#1318)

---
 app/helpers/accounts_helper.rb                      | 2 +-
 app/views/pages/_account_percentages_table.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 0bb56ff2..542c80ef 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -86,7 +86,7 @@ module AccountsHelper
 
   def account_groups(period: nil)
     assets, liabilities = Current.family.accounts.by_group(currency: Current.family.currency, period: period || Period.last_30_days).values_at(:assets, :liabilities)
-    [ assets.children, liabilities.children ].flatten
+    [ assets.children.sort_by(&:name), liabilities.children.sort_by(&:name) ].flatten
   end
 
   private
diff --git a/app/views/pages/_account_percentages_table.html.erb b/app/views/pages/_account_percentages_table.html.erb
index 3fa8126d..ab37414b 100644
--- a/app/views/pages/_account_percentages_table.html.erb
+++ b/app/views/pages/_account_percentages_table.html.erb
@@ -15,6 +15,6 @@
     </div>
   </div>
   <div class="bg-white border border-alpha-black-25 shadow-xs rounded-lg divide-y divide-alpha-black-50">
-    <%= render partial: "pages/account_group_disclosure", collection: account_groups.sort_by(&:percent_of_total).reverse, as: :accountable_group %>
+    <%= render partial: "pages/account_group_disclosure", collection: account_groups.sort_by(&:name), as: :accountable_group %>
   </div>
 </div>