From cd1da2ad96fc4ed80c269ec8d23d1525739d38f5 Mon Sep 17 00:00:00 2001
From: Jack Wills <32690432+mrjackwills@users.noreply.github.com>
Date: Sun, 19 Nov 2023 22:52:43 +0000
Subject: [PATCH] fix: State ordering use .order()

---
 src/app_data/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app_data/mod.rs b/src/app_data/mod.rs
index 22d9a17..10b4532 100644
--- a/src/app_data/mod.rs
+++ b/src/app_data/mod.rs
@@ -164,10 +164,10 @@ impl AppData {
                 match head {
                     Header::State => match ord {
                         SortedOrder::Asc => {
-                            a.status.cmp(&b.status).then_with(|| a.name.cmp(&b.name))
+                            a.state.order().cmp(&b.state.order()).then_with(|| a.name.cmp(&b.name))
                         }
                         SortedOrder::Desc => {
-                            b.status.cmp(&a.status).then_with(|| b.name.cmp(&a.name))
+                            b.state.order().cmp(&a.state.order()).then_with(|| b.name.cmp(&a.name))
                         }
                     },
                     Header::Status => match ord {
@@ -213,8 +213,8 @@ impl AppData {
                         }
                     },
                     Header::Name => match ord {
-                        SortedOrder::Asc => a.name.cmp(&b.name).then_with(|| a.name.cmp(&b.name)),
-                        SortedOrder::Desc => b.name.cmp(&a.name).then_with(|| b.name.cmp(&a.name)),
+                        SortedOrder::Asc => a.name.cmp(&b.name).then_with(|| a.id.cmp(&b.id)),
+                        SortedOrder::Desc => b.name.cmp(&a.name).then_with(|| b.id.cmp(&a.id)),
                     },
                     Header::Rx => match ord {
                         SortedOrder::Asc => a.rx.cmp(&b.rx).then_with(|| a.name.cmp(&b.name)),