fixes

src/app/methods/navigation.rs

@@ -82,6 +82,7 @@ impl<T: TdClientTrait> NavigationMethods<T> for App<T> {
         self.cursor_position = 0;
         self.message_scroll_offset = 0;
         self.last_typing_sent = None;
+        self.pending_chat_init = None;
         // Сбрасываем состояние чата в нормальный режим
         self.chat_state = ChatState::Normal;
         self.input_mode = InputMode::Normal;

src/app/mod.rs

@@ -13,9 +13,28 @@ pub use chat_state::{ChatState, InputMode};
 pub use state::AppScreen;
 pub use methods::*;
 
+use crate::accounts::AccountProfile;
 use crate::tdlib::{ChatInfo, TdClient, TdClientTrait};
 use crate::types::ChatId;
 use ratatui::widgets::ListState;
+use std::path::PathBuf;
+
+/// State of the account switcher modal overlay.
+#[derive(Debug, Clone)]
+pub enum AccountSwitcherState {
+    /// List of accounts with navigation.
+    SelectAccount {
+        accounts: Vec<AccountProfile>,
+        selected_index: usize,
+        current_account: String,
+    },
+    /// Input for new account name.
+    AddAccount {
+        name_input: String,
+        cursor_position: usize,
+        error: Option<String>,
+    },
+}
 
 /// Main application state for the Telegram TUI client.
 ///
@@ -44,7 +63,7 @@ use ratatui::widgets::ListState;
 /// use tele_tui::config::Config;
 ///
 /// let config = Config::default();
-/// let mut app = App::new(config);
+/// let mut app = App::new(config, std::path::PathBuf::from("tdlib_data"));
 ///
 /// // Navigate through chats
 /// app.next_chat();
@@ -102,6 +121,15 @@ pub struct App<T: TdClientTrait = TdClient> {
     /// Время последнего рендеринга изображений (для throttling до 15 FPS)
     #[cfg(feature = "images")]
     pub last_image_render_time: Option<std::time::Instant>,
+    // Account switcher
+    /// Account switcher modal state (global overlay)
+    pub account_switcher: Option<AccountSwitcherState>,
+    /// Name of the currently active account
+    pub current_account_name: String,
+    /// Pending account switch: (account_name, db_path)
+    pub pending_account_switch: Option<(String, PathBuf)>,
+    /// Pending background chat init (reply info, pinned, photos) after fast open
+    pub pending_chat_init: Option<ChatId>,
     // Voice playback
     /// Аудиопроигрыватель для голосовых сообщений (rodio)
     pub audio_player: Option<crate::audio::AudioPlayer>,
@@ -164,6 +192,11 @@ impl<T: TdClientTrait> App<T> {
             search_query: String::new(),
             needs_redraw: true,
             last_typing_sent: None,
+            // Account switcher
+            account_switcher: None,
+            current_account_name: "default".to_string(),
+            pending_account_switch: None,
+            pending_chat_init: None,
             #[cfg(feature = "images")]
             image_cache,
             #[cfg(feature = "images")]
@@ -210,6 +243,123 @@ impl<T: TdClientTrait> App<T> {
         self.status_message = None;
     }
 
+    /// Opens the account switcher modal, loading accounts from config.
+    pub fn open_account_switcher(&mut self) {
+        let config = crate::accounts::load_or_create();
+        self.account_switcher = Some(AccountSwitcherState::SelectAccount {
+            accounts: config.accounts,
+            selected_index: 0,
+            current_account: self.current_account_name.clone(),
+        });
+    }
+
+    /// Closes the account switcher modal.
+    pub fn close_account_switcher(&mut self) {
+        self.account_switcher = None;
+    }
+
+    /// Navigate to previous item in account switcher list.
+    pub fn account_switcher_select_prev(&mut self) {
+        if let Some(AccountSwitcherState::SelectAccount { selected_index, .. }) =
+            &mut self.account_switcher
+        {
+            *selected_index = selected_index.saturating_sub(1);
+        }
+    }
+
+    /// Navigate to next item in account switcher list.
+    pub fn account_switcher_select_next(&mut self) {
+        if let Some(AccountSwitcherState::SelectAccount {
+            accounts,
+            selected_index,
+            ..
+        }) = &mut self.account_switcher
+        {
+            // +1 for the "Add account" item at the end
+            let max_index = accounts.len();
+            if *selected_index < max_index {
+                *selected_index += 1;
+            }
+        }
+    }
+
+    /// Confirm selection in account switcher.
+    /// If on an account: sets pending_account_switch.
+    /// If on "+ Add": transitions to AddAccount state.
+    pub fn account_switcher_confirm(&mut self) {
+        let state = self.account_switcher.take();
+        match state {
+            Some(AccountSwitcherState::SelectAccount {
+                accounts,
+                selected_index,
+                current_account,
+            }) => {
+                if selected_index < accounts.len() {
+                    // Selected an existing account
+                    let account = &accounts[selected_index];
+                    if account.name == current_account {
+                        // Already on this account, just close
+                        self.account_switcher = None;
+                        return;
+                    }
+                    let db_path = account.db_path();
+                    self.pending_account_switch = Some((account.name.clone(), db_path));
+                    self.account_switcher = None;
+                } else {
+                    // Selected "+ Add account"
+                    self.account_switcher = Some(AccountSwitcherState::AddAccount {
+                        name_input: String::new(),
+                        cursor_position: 0,
+                        error: None,
+                    });
+                }
+            }
+            other => {
+                self.account_switcher = other;
+            }
+        }
+    }
+
+    /// Switch to AddAccount state from SelectAccount.
+    pub fn account_switcher_start_add(&mut self) {
+        self.account_switcher = Some(AccountSwitcherState::AddAccount {
+            name_input: String::new(),
+            cursor_position: 0,
+            error: None,
+        });
+    }
+
+    /// Confirm adding a new account. Validates, saves, and sets pending switch.
+    pub fn account_switcher_confirm_add(&mut self) {
+        let state = self.account_switcher.take();
+        match state {
+            Some(AccountSwitcherState::AddAccount { name_input, .. }) => {
+                match crate::accounts::manager::add_account(&name_input, &name_input) {
+                    Ok(db_path) => {
+                        self.pending_account_switch = Some((name_input, db_path));
+                        self.account_switcher = None;
+                    }
+                    Err(e) => {
+                        let cursor_pos = name_input.chars().count();
+                        self.account_switcher = Some(AccountSwitcherState::AddAccount {
+                            name_input,
+                            cursor_position: cursor_pos,
+                            error: Some(e),
+                        });
+                    }
+                }
+            }
+            other => {
+                self.account_switcher = other;
+            }
+        }
+    }
+
+    /// Go back from AddAccount to SelectAccount.
+    pub fn account_switcher_back(&mut self) {
+        self.open_account_switcher();
+    }
+
     /// Get the selected chat info
     pub fn get_selected_chat(&self) -> Option<&ChatInfo> {
         self.selected_chat_id
@@ -425,16 +575,17 @@ impl App<TdClient> {
     /// Creates a new App instance with the given configuration and a real TDLib client.
     ///
     /// This is a convenience method for production use that automatically creates
-    /// a new TdClient instance.
+    /// a new TdClient instance with the specified database path.
     ///
     /// # Arguments
     ///
     /// * `config` - Application configuration loaded from config.toml
+    /// * `db_path` - Path to the TDLib database directory for this account
     ///
     /// # Returns
     ///
     /// A new `App<TdClient>` instance ready to start authentication.
-    pub fn new(config: crate::config::Config) -> App<TdClient> {
-        App::with_client(config, TdClient::new())
+    pub fn new(config: crate::config::Config, db_path: std::path::PathBuf) -> App<TdClient> {
+        App::with_client(config, TdClient::new(db_path))
     }
 }