Merge branch 'master' into persist_decks

Author: kernelkind

Cargo.lock

@@ -18,7 +18,7 @@ eframe = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da
 egui_extras = { git = "https://github.com/emilk/egui", rev = "fcb7764e48ce00f8f8e58da10f937410d65b0bfb", package = "egui_extras", features = ["all_loaders"] }
 ehttp = "0.2.0"
 egui_tabs = { git = "https://github.com/damus-io/egui-tabs", branch = "egui-0.28" }
-egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "6ba42de2bae384d10e35c532f3856b81d2e9f645" }
+egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "956338a90e09c7cda951d554626483e0cdbc7825" }
 egui_virtual_list = { git = "https://github.com/jb55/hello_egui", branch = "egui-0.28", package = "egui_virtual_list" }
 reqwest = { version = "0.12.4", default-features = false, features = [ "rustls-tls-native-roots" ] }
 image = { version = "0.25", features = ["jpeg", "png", "webp"] }

Cargo.toml

@@ -18,6 +18,20 @@ pub struct PoolEvent<'a> {
     pub event: ewebsock::WsEvent,
 }
 
+impl<'a> PoolEvent<'a> {
+    pub fn into_owned(self) -> PoolEventBuf {
+        PoolEventBuf {
+            relay: self.relay.to_owned(),
+            event: self.event,
+        }
+    }
+}
+
+pub struct PoolEventBuf {
+    pub relay: String,
+    pub event: ewebsock::WsEvent,
+}
+
 pub struct PoolRelay {
     pub relay: Relay,
     pub last_ping: Instant,

enostr/src/relay/pool.rs

@@ -2,12 +2,13 @@ use std::cmp::Ordering;
 
 use enostr::{FilledKeypair, FullKeypair, Keypair};
 use nostrdb::Ndb;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     app::get_active_columns_mut,
     decks::{AccountId, DecksCache},
     imgcache::ImageCache,
-    login_manager::LoginState,
+    login_manager::AcquireKeyState,
     route::Route,
     storage::{KeyStorageResponse, KeyStorageType},
     ui::{
@@ -33,7 +34,7 @@ pub enum AccountsRouteResponse {
     AddAccount(AccountLoginResponse),
 }
 
-#[derive(Debug, Eq, PartialEq, Clone, Copy)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, Serialize, Deserialize)]
 pub enum AccountsRoute {
     Accounts,
     AddAccount,
@@ -54,7 +55,7 @@ pub fn render_accounts_route(
     img_cache: &mut ImageCache,
     accounts: &mut AccountManager,
     decks: &mut DecksCache,
-    login_state: &mut LoginState,
+    login_state: &mut AcquireKeyState,
     route: AccountsRoute,
 ) -> Option<AccountSelectionResponse> {
     let resp = match route {