1 files changed, 31 insertions, 8 deletions

diff --git a/src/client/core.rs b/src/client/core.rs
index 21c1cb2..6d8294c 100644
--- a/src/client/core.rs
+++ b/src/client/core.rs
@@ -62,6 +62,8 @@ pub struct ClientCore {
     logged_in: Option<String>,
     pending: Option<Pending>,
     balance: Option<i64>,
+    /// Account number from the last `INFO`, shown by both frontends.
+    account: Option<String>,
     host: Option<String>,
     fingerprint: Option<String>,
     /// Local anchor for the crash multiplier, set when a round starts.
@@ -82,6 +84,7 @@ impl ClientCore {
             logged_in: None,
             pending: None,
             balance: None,
+            account: None,
             host: None,
             fingerprint: None,
             crash_started: None,
@@ -275,15 +278,18 @@ impl ClientCore {
             }
             Some(Pending::Echo) => print_line(format!("Echo: {}", reply.trim())),
             Some(Pending::Info) => {
+                // The same reply feeds the balance and the account number.
+                let balance = info_balance(reply);
+                if let Some(account) = info_account(reply) {
+                    self.account = Some(account);
+                }
+                if let Some(balance) = balance {
+                    self.balance = Some(balance);
+                    self.game.set_balance(balance);
+                }
                 if self.game.is_in_game() {
-                    // Balance fetch while entering a game. A failure is not
-                    // fatal: the board keeps showing `?`.
-                    if let Some(balance) = info_balance(reply) {
-                        self.balance = Some(balance);
-                        self.game.set_balance(balance);
-                        return self.board_effects();
-                    }
-                    Vec::new()
+                    // A failure is not fatal: the board keeps showing `?`.
+                    self.board_effects()
                 } else {
                     vec![Effect::Print(info_lines(reply))]
                 }
@@ -405,6 +411,7 @@ impl ClientCore {
                 None => Vec::new(),
             },
             Command::PlaceBetAt(target) => self.place_roulette_chip_on(target),
+            Command::RemoveBetAt(target) => self.remove_roulette_chip_on(target),
             Command::ClearBets => {
                 self.game.set_roulette_bets(&Bets::default());
                 self.game.set_roulette_status("place");
@@ -489,6 +496,12 @@ impl ClientCore {
         self.place_roulette_bets(bets)
     }
 
+    fn remove_roulette_chip_on(&mut self, target: BetTarget) -> Vec<Effect> {
+        let mut bets = self.game.roulette_bets();
+        bets.reduce(&target, self.game.roulette_chip());
+        self.place_roulette_bets(bets)
+    }
+
     fn place_roulette_bets(&mut self, bets: Bets) -> Vec<Effect> {
         if let Some(balance) = self.balance {
             if bets.total() > balance.max(0) as u64 {
@@ -782,6 +795,7 @@ impl ClientCore {
             Screen::Lobby => View::Lobby(LobbyView {
                 connected: self.connected,
                 user: self.logged_in.clone(),
+                account: self.account.clone(),
                 balance: self.balance,
                 games: self.games(),
                 login_error: self.login_error.clone(),
@@ -824,6 +838,15 @@ fn print_line(message: impl Into<String>) -> Vec<Effect> {
     vec![Effect::Print(vec![message.into()])]
 }
 
+fn info_account(reply: &str) -> Option<String> {
+    let parts: Vec<&str> = reply.split_whitespace().collect();
+    if parts.first() == Some(&"INFO") && parts.len() == 4 {
+        Some(parts[2].to_string()).filter(|account| account != "-")
+    } else {
+        None
+    }
+}
+
 fn info_balance(reply: &str) -> Option<i64> {
     let parts: Vec<&str> = reply.split_whitespace().collect();
     if parts.first() == Some(&"INFO") && parts.len() == 4 {