From 06294d872e63f0e9027cff4ebe4048a7f1f9d5cc Mon Sep 17 00:00:00 2001
From: emilis <emilis@puff.place>
Date: Wed, 18 Feb 2026 00:54:09 +0000
Subject: [PATCH] fix hydration error for cancel game button

---
 werewolves/build.rs                       |  6 +---
 werewolves/src/app/components/nav.rs      |  4 +--
 werewolves/src/app/pages/game/host.rs     | 42 ++++++++++++++---------
 werewolves/src/app/pages/user_settings.rs |  6 ++--
 werewolves/src/server/game_connection.rs  |  1 -
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/werewolves/build.rs b/werewolves/build.rs
index 960dede..d68320c 100644
--- a/werewolves/build.rs
+++ b/werewolves/build.rs
@@ -1,13 +1,9 @@
-use std::{
-    fs::File,
-    io::Write,
-};
+use std::{fs::File, io::Write};
 
 const STYLESHEET_PATH: &str = "../style/faction.scss";
 
 fn main() {
     println!("cargo::rerun-if-changed=../style/main.scss");
-    println!("cargo::rerun-if-changed=../target/site/pkg/werewolves.wasm");
 
     let mut sheet_file = File::create(STYLESHEET_PATH).unwrap();
     let mut out = String::new();
diff --git a/werewolves/src/app/components/nav.rs b/werewolves/src/app/components/nav.rs
index afb7409..9699f69 100644
--- a/werewolves/src/app/components/nav.rs
+++ b/werewolves/src/app/components/nav.rs
@@ -82,9 +82,7 @@ pub fn Nav() -> impl IntoView {
                     })
             };
             let active_game_button = move || {
-                let Some(session) = auth.session().get() else {
-                    return None;
-                };
+                let session = auth.session().get()?;
                 if active_game.value().read_untracked().is_none() {
                     active_game.dispatch(GetActiveGame {
                         token: session.token,
diff --git a/werewolves/src/app/pages/game/host.rs b/werewolves/src/app/pages/game/host.rs
index 1ce276e..32e35de 100644
--- a/werewolves/src/app/pages/game/host.rs
+++ b/werewolves/src/app/pages/game/host.rs
@@ -20,6 +20,7 @@ pub fn HostGamePage(
     message: Signal<Option<Srv2Host>>,
     reply: WriteSignal<Option<HostMessage>>,
 ) -> impl IntoView {
+    let prefs = expect_context::<(Signal<Preferences>, WriteSignal<Preferences>)>().0;
     let settings = RwSignal::new(GameSettings::default());
     let qr_mode = RwSignal::new(false);
     let players: RwSignal<Box<[PlayerState]>> = RwSignal::new(Box::new([]));
@@ -75,28 +76,40 @@ pub fn HostGamePage(
             ().into_any()
         }
     };
-
+    let cancel = move || {
+        view! {
+            <CancelGame reply=reply prefs=prefs />
+        }
+    };
     view! {
-        <CancelGame reply=reply />
+        {cancel}
         {content}
     }
 }
 
 #[component]
-fn CancelGame(reply: WriteSignal<Option<HostMessage>>) -> impl IntoView {
+fn CancelGame(
+    reply: WriteSignal<Option<HostMessage>>,
+    prefs: Signal<Preferences>,
+) -> impl IntoView {
     let open = RwSignal::new(false);
-    let prefs = expect_context::<(Signal<Preferences>, WriteSignal<Preferences>)>().0;
     let cancel = move |_| {
         open.set(false);
         reply.set(Some(HostMessage::CancelGame));
-        #[cfg(feature = "hydrate")]
-        gloo::utils::window()
-            .location()
-            .replace("/")
-            .console_log_warn();
+        #[cfg(not(feature = "ssr"))]
+        {
+            gloo::utils::window()
+                .location()
+                .replace("/")
+                .console_log_warn();
+        }
     };
-    let content = move || match prefs.get().show_cancel_game {
-        true => view! {
+    let derive_hidden = RwSignal::new(false);
+    Effect::new(move || derive_hidden.set(!prefs.get().show_cancel_game));
+
+    let content = move || {
+        view! {
+            <div hidden=move || derive_hidden.get()>
                 <DialogModal
                     button_class="cancel-game-button".into()
                     text="cancel game".into()
@@ -107,11 +120,8 @@ fn CancelGame(reply: WriteSignal<Option<HostMessage>>) -> impl IntoView {
                         "i'm sure, cancel the game."
                     </button>
                 </DialogModal>
+            </div>
         }
-        .into_any(),
-        false => ().into_any(),
     };
-    view! {
-        {content}
-    }
+    view! { {content} }
 }
diff --git a/werewolves/src/app/pages/user_settings.rs b/werewolves/src/app/pages/user_settings.rs
index 7fe79f6..5ac8741 100644
--- a/werewolves/src/app/pages/user_settings.rs
+++ b/werewolves/src/app/pages/user_settings.rs
@@ -10,6 +10,8 @@ use crate::app::{
 #[component]
 pub fn UserSettings() -> impl IntoView {
     let auth = expect_context::<Store<AuthContext>>();
+    let (prefs_read, prefs_write) =
+        expect_context::<(Signal<Preferences>, WriteSignal<Preferences>)>();
     let log_out = {
         let click = move |e: MouseEvent| {
             e.prevent_default();
@@ -18,8 +20,6 @@ pub fn UserSettings() -> impl IntoView {
         };
         view! { <button on:click=click>"log out"</button> }
     };
-    let (prefs_read, prefs_write) =
-        expect_context::<(Signal<Preferences>, WriteSignal<Preferences>)>();
     let tutorial_toggle_button = move || match prefs_read.read().tutorials_enabled {
         true => view! {
             <button on:click=move |_| {
@@ -34,7 +34,7 @@ pub fn UserSettings() -> impl IntoView {
         }
         .into_any(),
     };
-    let cancel_game_toggle_button = move || match prefs_read.read().show_cancel_game {
+    let cancel_game_toggle_button = move || match prefs_read.get().show_cancel_game {
         true => view! {
             <button on:click=move |_| {
                 prefs_write.write().show_cancel_game = false;
diff --git a/werewolves/src/server/game_connection.rs b/werewolves/src/server/game_connection.rs
index 0423b4c..9d4294c 100644
--- a/werewolves/src/server/game_connection.rs
+++ b/werewolves/src/server/game_connection.rs
@@ -24,7 +24,6 @@ use axum_extra::{
 };
 use codee::HybridDecoder;
 use colored::Colorize;
-use futures::FutureExt;
 use uuid::Uuid;
 use werewolves_proto::{
     error::ServerError, game::GameId, message::WrappedServerMessage, token::TokenString,