fix some rebase issues

Signed-off-by: William Casarin <jb55@jb55.com>

Cargo.lock

@@ -1148,7 +1148,7 @@ dependencies = [
 [[package]]
 name = "egui_nav"
 version = "0.1.0"
-source = "git+https://github.com/damus-io/egui-nav?branch=egui-0.28#b19742503329a13df660ac8c5a3ada4a25b7cc53"
+source = "git+https://github.com/damus-io/egui-nav?rev=b19742503329a13df660ac8c5a3ada4a25b7cc53#b19742503329a13df660ac8c5a3ada4a25b7cc53"
 dependencies = [
  "egui",
  "egui_extras",

src/ui/account_management.rs

@@ -225,13 +225,13 @@ mod preview {
             ui.add_space(24.0);
             if let Some(response) = AccountManagementView::ui(
                 ui,
-                &self.app.account_manager,
+                &self.app.accounts,
                 &self.app.ndb,
                 &mut self.app.img_cache,
             )
             .inner
             {
-                process_management_view_response_stateless(&mut self.app.account_manager, response)
+                process_management_view_response_stateless(&mut self.app.accounts, response)
             }
         }
     }

src/ui/stateful_account_management.rs

@@ -112,7 +112,7 @@ mod preview {
             StatefulAccountManagementView::show(
                 ui,
                 &mut self.app.account_management_view_state,
-                &mut self.app.account_manager,
+                &mut self.app.accounts,
                 &mut self.app.img_cache,
                 &mut self.app.login_state,
                 &self.app.ndb,