From 86cebc2ddf70b1cfe2d717eb379999ee68699a5e Mon Sep 17 00:00:00 2001
From: Michael Mallan <michaelmallan@proton.me>
Date: Wed, 6 Nov 2024 09:34:41 +0000
Subject: [PATCH] gui(installer): use fixed keys ordering

This follows the same approach as used in the settings.
---
 gui/src/installer/view/mod.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gui/src/installer/view/mod.rs b/gui/src/installer/view/mod.rs
index 7879af34..fb220471 100644
--- a/gui/src/installer/view/mod.rs
+++ b/gui/src/installer/view/mod.rs
@@ -770,6 +770,9 @@ fn display_policy(
     keys_aliases: &HashMap<Fingerprint, String>,
 ) -> Element<'_, Message> {
     let (primary_threshold, primary_keys) = policy.primary_path().thresh_origins();
+    // The iteration over an HashMap keys can have a different order at each refresh
+    let mut primary_keys: Vec<Fingerprint> = primary_keys.into_keys().collect();
+    primary_keys.sort();
     let recovery_paths = policy.recovery_paths();
     let mut col = Column::new().push(
         Row::new()
@@ -789,7 +792,7 @@ fn display_policy(
             })
             .push(
                 primary_keys
-                    .keys()
+                    .iter()
                     .enumerate()
                     .fold(Row::new().spacing(5), |row, (i, k)| {
                         let content = if let Some(alias) = keys_aliases.get(k) {
@@ -817,6 +820,9 @@ fn display_policy(
     );
     for (i, (sequence, recovery_path)) in recovery_paths.iter().enumerate() {
         let (threshold, recovery_keys) = recovery_path.thresh_origins();
+        // The iteration over an HashMap keys can have a different order at each refresh
+        let mut recovery_keys: Vec<Fingerprint> = recovery_keys.into_keys().collect();
+        recovery_keys.sort();
         col = col.push(
             Row::new()
                 .spacing(5)
@@ -833,7 +839,7 @@ fn display_policy(
                 } else {
                     text("by")
                 })
-                .push(recovery_keys.keys().enumerate().fold(
+                .push(recovery_keys.iter().enumerate().fold(
                     Row::new().spacing(5),
                     |row, (i, k)| {
                         let content = if let Some(alias) = keys_aliases.get(k) {