Relay Lists: Reset edit state when changing pages. fixes #628

mikedilger · Feb 3, 2024 · 617079f · 617079f
1 parent 6fd1a41
commit 617079f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/gossip-bin/src/ui/mod.rs b/gossip-bin/src/ui/mod.rs
@@ -817,6 +817,7 @@ impl GossipUi {
             | Page::RelaysCoverage
             | Page::RelaysMine
             | Page::RelaysKnownNetwork => {
+                self.relays.enter_page();
                 self.open_menu(ctx, SubMenu::Relays);
             }
             Page::Search => {

diff --git a/gossip-bin/src/ui/relays/mod.rs b/gossip-bin/src/ui/relays/mod.rs
@@ -55,6 +55,16 @@ impl RelayUi {
             new_relay_url: RELAY_URL_PREPOPULATE.to_string(),
         }
     }
+
+    pub(super) fn enter_page(&mut self) {
+        // preserve search and filter but reset edits and dialogues
+        self.edit = None;
+        self.edit_relays = Vec::new();
+        self.edit_done = None;
+        self.edit_needs_scroll = false;
+        self.add_dialog_step = AddRelayDialogStep::Inactive;
+        self.new_relay_url = RELAY_URL_PREPOPULATE.to_string();
+    }
 }
 
 #[derive(PartialEq, Default)]