kasy-cli 1.32.0 → 1.35.0

package/templates/firebase/lib/features/subscriptions/ui/widgets/premium_feature.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 
 class PremiumFeature extends StatelessWidget {
@@ -25,10 +24,9 @@ class PremiumFeature extends StatelessWidget {
           Expanded(
             child: Text(
               text,
-              style: GoogleFonts.albertSans(
-                fontSize: 16,
-                fontWeight: FontWeight.w500,
+              style: context.textTheme.bodyLarge?.copyWith(
                 color: context.colors.onPrimary,
+                fontWeight: FontWeight.w500,
               ),
             ),
           ),

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_col.dart

@@ -242,9 +242,7 @@ class _SelectableColState extends State<SelectableCol>
                       flex: 0,
                       child: Text(
                         widget.label.toUpperCase(),
-                        style: context.textTheme.titleLarge?.copyWith(
-                          fontSize: 21,
-                          fontWeight: FontWeight.w700,
+                        style: context.textTheme.titleMedium?.copyWith(
                           color: switch(widget.brightness) {
                             Brightness.light => context.colors.onBackground,
                             _ => context.colors.background,
@@ -272,7 +270,6 @@ class _SelectableColState extends State<SelectableCol>
                       Text(
                         widget.sublabel,
                         style: context.textTheme.bodyLarge?.copyWith(
-                          fontWeight: FontWeight.w400,
                           color: switch(widget.brightness) {
                             Brightness.light => context.colors.onBackground.withValues(alpha: .7),
                             _ => context.colors.background,

package/templates/firebase/lib/features/subscriptions/ui/widgets/selectable_row.dart

@@ -243,8 +243,6 @@ class _SelectableRowState extends State<SelectableRow>
                                           TextSpan(
                                             text: widget.label.toUpperCase(),
                                             style: context.textTheme.titleMedium?.copyWith(
-                                                  fontSize: 18,
-                                                  fontWeight: FontWeight.w700,
                                                   color: switch (widget
                                                       .brightness) {
                                                     Brightness.dark =>
@@ -290,7 +288,6 @@ class _SelectableRowState extends State<SelectableRow>
                                   Text(
                                     widget.sublabel,
                                     style: context.textTheme.bodySmall?.copyWith(
-                                          fontWeight: FontWeight.w400,
                                           color: switch (widget.brightness) {
                                             Brightness.dark =>
                                               context.colors.onBackground

package/templates/firebase/lib/i18n/en.i18n.json

@@ -1,4 +1,12 @@
 {
+    "common": {
+        "close": "Close",
+        "copied": "Copied",
+        "saved": "Saved",
+        "error": "Error",
+        "unavailable": "Unavailable",
+        "native_only_title": "Native app only"
+    },
     "admin_console": {
         "tabs": {
             "overview": "Overview",
@@ -143,7 +151,9 @@
             "error_text": "Wrong email, password or this email is not registered",
             "email_invalid": "Email not valid",
             "password_required": "You must provide a password",
-            "password_too_short": "Your password must be at least 5 characters long"
+            "password_too_short": "Your password must be at least 5 characters long",
+            "social_error": "Couldn't sign in with $provider",
+            "email_already_registered": "This email already has an account with a different sign-in method. Use the method you signed up with."
         },
         "signup": {
             "title": "Signup now",
@@ -237,7 +247,17 @@
         "managed_elsewhere_title": "Subscription on another platform",
         "managed_elsewhere_description": "This subscription was made on another platform and can't be managed or cancelled here. Sign in to your account on the platform where you purchased it.",
         "restore_button": "Restore purchases",
-        "cancel_button": "Close"
+        "cancel_button": "Close",
+        "billing_title": "Billing",
+        "plan_label": "Account plan",
+        "plan_fallback": "Premium",
+        "manage_subscription": "Manage subscription",
+        "restore_purchases": "Restore purchases",
+        "renews_on": "Renews on $date",
+        "expires_on": "Expires on $date",
+        "trial_label": "Free trial",
+        "trial_until": "Free trial until $date",
+        "charges_from": "$price starting $date"
     },
     "paywallWithSwitch": {
         "withTrial": {
@@ -386,7 +406,15 @@
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit."
         ],
-        "continue_button": "Continue"
+        "continue_button": "Got it"
+    },
+    "update_available": {
+        "title": "Update available",
+        "description": "A newer version of the app is available. Update to get the latest improvements and fixes.",
+        "forced_title": "Update required",
+        "forced_description": "This version is no longer supported. Please update to keep using the app.",
+        "update_button": "Update now",
+        "later_button": "Not now"
     },
     "request_notification_permission": {
         "title": "Enable notifications?",
@@ -402,8 +430,8 @@
         "cancel_button": "Cancel"
     },
     "review_popup": {
-        "title": "Your opinion matters!",
-        "description": "Help us grow by sharing your experience with others. It only takes a few seconds and makes a huge difference to us 🙏🏻",
+        "title": "Your feedback matters",
+        "description": "If the app has been helpful, a quick review goes a long way. Got ideas to improve it? We'd love to hear them.",
         "cancel_button": "Suggest improvements",
         "rate_button": "Write a review"
     },
@@ -485,6 +513,7 @@
         "biometric_not_enabled_message": "App Lock wasn't enabled.",
         "feedback": "Send feedback",
         "premium": "Premium",
+        "billing": "Billing",
         "privacy": "Privacy policy",
         "support": "Support",
         "disconnect": "Yes, sign out",
@@ -497,6 +526,20 @@
         "register": "Register",
         "name_label": "Name",
         "email_label": "Email",
+        "connected_with_label": "Connected with",
+        "provider_email": "Email & password",
+        "provider_phone": "Phone",
+        "create_password_title": "Create password",
+        "create_password_subtitle": "Set a password so you can also sign in with email and password, on top of social login.",
+        "create_password_field": "New password",
+        "create_password_confirm_label": "Confirm password",
+        "create_password_success": "Password created",
+        "create_password_error": "Couldn't create the password. Please try again.",
+        "create_password_too_short": "Password must be at least 6 characters",
+        "create_password_mismatch": "Passwords don't match",
+        "link_social": "Link $provider",
+        "link_social_success": "$provider linked",
+        "link_social_error": "Couldn't link the account. Please try again.",
         "edit_name_title": "Edit name",
         "edit_name_hint": "Your name",
         "edit_name_save": "Save",
@@ -517,7 +560,8 @@
             "error": "Something went wrong. Please try again."
         },
         "admin": {
-            "update_bottom_sheet": "Update bottom sheet",
+            "update_bottom_sheet": "Preview what's new",
+            "preview_update_available": "Preview update available",
             "paywalls": "Paywalls",
             "test_onboarding": "Test onboarding",
             "copy_user_id": "Copy user id",
@@ -526,12 +570,13 @@
             "fcm_token_copied": "FCM Token copied to clipboard",
             "fcm_token_unavailable": "Token unavailable (notifications disabled?)",
             "ask_notification": "Ask for notification",
+            "native_only": "Available only in the native app (iOS / Android)",
             "ask_review": "Ask for review",
             "home_widgets_panel": "Home Widgets panel",
             "home_widgets_title": "Home Widgets Panel",
             "inspector_fab_title": "Widget inspector",
             "inspector_fab_subtitle_prefix": "Global shortcut:",
-            "update_mywidget_title": "📱 Update MyWidget Widget",
+            "update_mywidget_title": "Update MyWidget Widget",
             "update_mywidget_desc": "Call manual update for MyWidget widget",
             "paywalls_title": "Paywalls Admin Panel",
             "send_push_title": "Send notification",
@@ -617,6 +662,8 @@
         "title_verify": "Verify code",
         "verification_code": "Verification Code",
         "code_sent": "We have sent a verification code to $phone",
+        "signin_success_title": "All set",
+        "signin_success_text": "You're now signed in with your phone number",
         "verify_code": "Verify Code",
         "resend_code": "Resend Code",
         "enter_all_digits": "Please enter all 6 digits"

package/templates/firebase/lib/i18n/es.i18n.json

@@ -1,4 +1,12 @@
 {
+    "common": {
+        "close": "Cerrar",
+        "copied": "Copiado",
+        "saved": "Guardado",
+        "error": "Error",
+        "unavailable": "No disponible",
+        "native_only_title": "Solo en la app nativa"
+    },
     "admin_console": {
         "tabs": {
             "overview": "Resumen",
@@ -143,7 +151,9 @@
             "error_text": "Correo, contraseña incorrectos o este correo no está registrado",
             "email_invalid": "Correo electrónico inválido",
             "password_required": "Debes ingresar una contraseña",
-            "password_too_short": "Tu contraseña debe tener al menos 5 caracteres"
+            "password_too_short": "Tu contraseña debe tener al menos 5 caracteres",
+            "social_error": "No se pudo iniciar sesión con $provider",
+            "email_already_registered": "Este correo ya tiene una cuenta con otro método de inicio de sesión. Usa el método con el que te registraste."
         },
         "signup": {
             "title": "Regístrate ahora",
@@ -237,7 +247,17 @@
         "managed_elsewhere_title": "Suscripción en otra plataforma",
         "managed_elsewhere_description": "Esta suscripción se realizó en otra plataforma y no se puede gestionar ni cancelar aquí. Inicia sesión en tu cuenta en la plataforma donde la compraste.",
         "restore_button": "Restaurar compras",
-        "cancel_button": "Cerrar"
+        "cancel_button": "Cerrar",
+        "billing_title": "Facturación",
+        "plan_label": "Plan de cuenta",
+        "plan_fallback": "Premium",
+        "manage_subscription": "Administrar suscripción",
+        "restore_purchases": "Restaurar compras",
+        "renews_on": "Renueva el $date",
+        "expires_on": "Expira el $date",
+        "trial_label": "Evaluación gratuita",
+        "trial_until": "Evaluación gratuita hasta el $date",
+        "charges_from": "$price a partir del $date"
     },
     "paywallWithSwitch": {
         "withTrial": {
@@ -386,7 +406,15 @@
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit."
         ],
-        "continue_button": "Continuar"
+        "continue_button": "Entendido"
+    },
+    "update_available": {
+        "title": "Actualización disponible",
+        "description": "Hay una versión más nueva de la app. Actualiza para tener las últimas mejoras y correcciones.",
+        "forced_title": "Actualización requerida",
+        "forced_description": "Esta versión ya no es compatible. Actualiza para seguir usando la app.",
+        "update_button": "Actualizar ahora",
+        "later_button": "Ahora no"
     },
     "request_notification_permission": {
         "title": "¿Activar notificaciones?",
@@ -402,8 +430,8 @@
         "cancel_button": "Cancelar"
     },
     "review_popup": {
-        "title": "¡Tu opinión importa!",
-        "description": "Ayúdanos a crecer compartiendo tu experiencia. Solo toma unos segundos y hace una gran diferencia para nosotros 🙏🏻",
+        "title": "Tu opinión importa",
+        "description": "Si la app te ha sido útil, una reseña rápida marca la diferencia. ¿Tienes ideas para mejorarla? Nos encantaría escucharlas.",
         "cancel_button": "Sugerir mejoras",
         "rate_button": "Escribir una reseña"
     },
@@ -485,6 +513,7 @@
         "biometric_not_enabled_message": "El bloqueo de la app no se activó.",
         "feedback": "Enviar comentarios",
         "premium": "Premium",
+        "billing": "Facturación",
         "privacy": "Política de privacidad",
         "support": "Soporte",
         "disconnect": "Sí, salir",
@@ -497,6 +526,20 @@
         "register": "Registrarse",
         "name_label": "Nombre",
         "email_label": "Correo electrónico",
+        "connected_with_label": "Conectado con",
+        "provider_email": "Correo y contraseña",
+        "provider_phone": "Teléfono",
+        "create_password_title": "Crear contraseña",
+        "create_password_subtitle": "Define una contraseña para también iniciar sesión con correo y contraseña, además del inicio de sesión social.",
+        "create_password_field": "Nueva contraseña",
+        "create_password_confirm_label": "Confirmar contraseña",
+        "create_password_success": "Contraseña creada",
+        "create_password_error": "No se pudo crear la contraseña. Inténtalo de nuevo.",
+        "create_password_too_short": "La contraseña debe tener al menos 6 caracteres",
+        "create_password_mismatch": "Las contraseñas no coinciden",
+        "link_social": "Vincular $provider",
+        "link_social_success": "$provider vinculado",
+        "link_social_error": "No se pudo vincular la cuenta. Inténtalo de nuevo.",
         "edit_name_title": "Editar nombre",
         "edit_name_hint": "Tu nombre",
         "edit_name_save": "Guardar",
@@ -517,7 +560,8 @@
             "error": "Algo salió mal. Por favor, inténtalo de nuevo."
         },
         "admin": {
-            "update_bottom_sheet": "Actualizar bottom sheet",
+            "update_bottom_sheet": "Previsualizar novedades",
+            "preview_update_available": "Previsualizar actualización disponible",
             "paywalls": "Paywalls",
             "test_onboarding": "Probar onboarding",
             "copy_user_id": "Copiar ID de usuario",
@@ -526,12 +570,13 @@
             "fcm_token_copied": "FCM Token copiado al portapapeles",
             "fcm_token_unavailable": "Token no disponible (¿notificaciones desactivadas?)",
             "ask_notification": "Pedir permiso de notificación",
+            "native_only": "Disponible solo en la app nativa (iOS / Android)",
             "ask_review": "Pedir evaluación",
             "home_widgets_panel": "Panel de Home Widgets",
             "home_widgets_title": "Panel de Home Widgets",
             "inspector_fab_title": "Inspector de widgets",
             "inspector_fab_subtitle_prefix": "Atajo global:",
-            "update_mywidget_title": "📱 Actualizar Widget MyWidget",
+            "update_mywidget_title": "Actualizar Widget MyWidget",
             "update_mywidget_desc": "Llamar a la actualización manual para el widget MyWidget",
             "paywalls_title": "Panel de Admin de Paywalls",
             "send_push_title": "Enviar notificación",
@@ -617,6 +662,8 @@
         "title_verify": "Verificar Código",
         "verification_code": "Código de Verificación",
         "code_sent": "Hemos enviado un código de verificación a $phone",
+        "signin_success_title": "Listo",
+        "signin_success_text": "Has iniciado sesión con tu número de teléfono",
         "verify_code": "Verificar Código",
         "resend_code": "Reenviar Código",
         "enter_all_digits": "Por favor, ingresa los 6 dígitos"

package/templates/firebase/lib/i18n/pt.i18n.json

@@ -1,4 +1,12 @@
 {
+    "common": {
+        "close": "Fechar",
+        "copied": "Copiado",
+        "saved": "Salvo",
+        "error": "Erro",
+        "unavailable": "Indisponível",
+        "native_only_title": "Apenas no app nativo"
+    },
     "admin_console": {
         "tabs": {
             "overview": "Visão geral",
@@ -143,7 +151,9 @@
             "error_text": "E-mail, senha incorretos ou este e-mail não está cadastrado",
             "email_invalid": "E-mail inválido",
             "password_required": "Informe uma senha",
-            "password_too_short": "Sua senha deve ter pelo menos 5 caracteres"
+            "password_too_short": "Sua senha deve ter pelo menos 5 caracteres",
+            "social_error": "Não foi possível entrar com $provider",
+            "email_already_registered": "Esse e-mail já tem conta com outro método de login. Entre com o método que você usou antes."
         },
         "signup": {
             "title": "Cadastre-se agora",
@@ -237,7 +247,17 @@
         "managed_elsewhere_title": "Assinatura em outra plataforma",
         "managed_elsewhere_description": "Esta assinatura foi feita em outra plataforma e não pode ser gerenciada ou cancelada por aqui. Acesse a conta na plataforma onde você fez a compra.",
         "restore_button": "Restaurar compras",
-        "cancel_button": "Fechar"
+        "cancel_button": "Fechar",
+        "billing_title": "Cobrança",
+        "plan_label": "Plano da conta",
+        "plan_fallback": "Premium",
+        "manage_subscription": "Gerenciar assinatura",
+        "restore_purchases": "Restaurar compras",
+        "renews_on": "Renova em $date",
+        "expires_on": "Expira em $date",
+        "trial_label": "Avaliação gratuita",
+        "trial_until": "Avaliação gratuita até $date",
+        "charges_from": "$price a partir de $date"
     },
     "paywallWithSwitch": {
         "withTrial": {
@@ -386,7 +406,15 @@
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
             "- Lorem ipsum dolor sit amet, consectetur adipiscing elit."
         ],
-        "continue_button": "Continuar"
+        "continue_button": "Entendi"
+    },
+    "update_available": {
+        "title": "Atualização disponível",
+        "description": "Há uma versão mais nova do app. Atualize para ter as últimas melhorias e correções.",
+        "forced_title": "Atualização necessária",
+        "forced_description": "Esta versão não é mais suportada. Atualize para continuar usando o app.",
+        "update_button": "Atualizar agora",
+        "later_button": "Agora não"
     },
     "request_notification_permission": {
         "title": "Ativar notificações?",
@@ -402,8 +430,8 @@
         "cancel_button": "Cancelar"
     },
     "review_popup": {
-        "title": "Sua opinião importa!",
-        "description": "Ajude-nos a crescer compartilhando sua experiência. Leva apenas alguns segundos e faz uma enorme diferença para nós 🙏🏻",
+        "title": "Sua opinião importa",
+        "description": "Se o app tem te ajudado, uma avaliação rápida faz toda a diferença. Prefere sugerir melhorias? A gente quer ouvir.",
         "cancel_button": "Sugerir melhorias",
         "rate_button": "Escrever uma avaliação"
     },
@@ -485,6 +513,7 @@
         "biometric_not_enabled_message": "Bloqueio do app não foi ativado.",
         "feedback": "Enviar feedback",
         "premium": "Premium",
+        "billing": "Cobrança",
         "privacy": "Política de privacidade",
         "support": "Suporte",
         "disconnect": "Sim, sair",
@@ -497,6 +526,20 @@
         "register": "Cadastrar",
         "name_label": "Nome",
         "email_label": "Email",
+        "connected_with_label": "Conectado com",
+        "provider_email": "E-mail e senha",
+        "provider_phone": "Telefone",
+        "create_password_title": "Criar senha",
+        "create_password_subtitle": "Defina uma senha para também entrar com e-mail e senha, além do login social.",
+        "create_password_field": "Nova senha",
+        "create_password_confirm_label": "Confirmar senha",
+        "create_password_success": "Senha criada",
+        "create_password_error": "Não foi possível criar a senha. Tente novamente.",
+        "create_password_too_short": "A senha deve ter pelo menos 6 caracteres",
+        "create_password_mismatch": "As senhas não coincidem",
+        "link_social": "Vincular $provider",
+        "link_social_success": "$provider vinculado",
+        "link_social_error": "Não foi possível vincular. Tente novamente.",
         "edit_name_title": "Editar nome",
         "edit_name_hint": "Seu nome",
         "edit_name_save": "Salvar",
@@ -517,7 +560,8 @@
             "error": "Algo deu errado. Por favor, tente novamente."
         },
         "admin": {
-            "update_bottom_sheet": "Atualizar bottom sheet",
+            "update_bottom_sheet": "Pré-visualizar novidades",
+            "preview_update_available": "Pré-visualizar atualização disponível",
             "paywalls": "Paywalls",
             "test_onboarding": "Testar onboarding",
             "copy_user_id": "Copiar ID do usuário",
@@ -526,12 +570,13 @@
             "fcm_token_copied": "FCM Token copiado para a área de transferência",
             "fcm_token_unavailable": "Token não disponível (notificações desativadas?)",
             "ask_notification": "Pedir permissão de notificação",
+            "native_only": "Disponível apenas no app nativo (iOS / Android)",
             "ask_review": "Pedir avaliação",
             "home_widgets_panel": "Painel de Home Widgets",
             "home_widgets_title": "Painel de Home Widgets",
             "inspector_fab_title": "Inspector de widgets",
             "inspector_fab_subtitle_prefix": "Atalho global:",
-            "update_mywidget_title": "📱 Atualizar Widget MyWidget",
+            "update_mywidget_title": "Atualizar Widget MyWidget",
             "update_mywidget_desc": "Chamar atualização manual para o widget MyWidget",
             "paywalls_title": "Painel Admin de Paywalls",
             "send_push_title": "Enviar notificação",
@@ -617,6 +662,8 @@
         "title_verify": "Verificar Código",
         "verification_code": "Código de Verificação",
         "code_sent": "Enviamos um código de verificação para $phone",
+        "signin_success_title": "Tudo certo",
+        "signin_success_text": "Você entrou com seu número de telefone",
         "verify_code": "Verificar Código",
         "resend_code": "Reenviar Código",
         "enter_all_digits": "Por favor, digite todos os 6 números"

package/templates/firebase/lib/main.dart

@@ -18,9 +18,11 @@ import 'package:kasy_kit/core/initializer/onstart_widget.dart';
 import 'package:kasy_kit/core/keyboard_fix/keyboard_flicker_fix.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
+import 'package:kasy_kit/core/theme/responsive_text_theme.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/web_device_preview/web_device_preview.dart';
 import 'package:kasy_kit/core/web_viewport_scale.dart';
+import 'package:kasy_kit/core/widgets/focus_visibility.dart';
 import 'package:kasy_kit/environments.dart';
 import 'package:kasy_kit/features/authentication/api/authentication_api.dart';
 import 'package:kasy_kit/features/notifications/api/local_notifier.dart';
@@ -189,8 +191,15 @@ class _MyAppState extends ConsumerState<MyApp> {
                     analyticsApiProvider,
                     facebookEventApiProvider,
                   ],
-                  onReady: WebViewportScale.wrap(
-                    DevicePreview.appBuilder(context, child),
+                  onReady: FocusVisibility(
+                    child: WebViewportScale.wrap(
+                      DevicePreview.appBuilder(
+                        context,
+                        ResponsiveTextTheme(
+                          child: child ?? const SizedBox.shrink(),
+                        ),
+                      ),
+                    ),
                   ),
                   onError: (_, error) => InitializationErrorPage(error: error),
                   onLoading: Scaffold(

package/templates/firebase/lib/router.dart

@@ -3,12 +3,15 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/core/bottom_menu/bottom_menu.dart';
+import 'package:kasy_kit/core/chrome/chrome_visibility.dart';
 import 'package:kasy_kit/core/config/features.dart';
 import 'package:kasy_kit/core/data/api/analytics_api.dart';
-import 'package:kasy_kit/core/guards/user_info_guard.dart';
+import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/navigation/kasy_navigation_config.dart';
 import 'package:kasy_kit/core/navigation/kasy_page_transition.dart';
 import 'package:kasy_kit/core/security/biometric_guard.dart';
+import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
+import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/widgets/page_not_found.dart';
 import 'package:kasy_kit/features/authentication/ui/phone_auth_page.dart';
 import 'package:kasy_kit/features/authentication/ui/recover_password_page.dart';
@@ -30,7 +33,17 @@ import 'package:kasy_kit/features/subscriptions/ui/component/premium_page_factor
 import 'package:kasy_kit/features/subscriptions/ui/premium_page.dart';
 import 'package:logger/logger.dart';
 
-final goRouterProvider = Provider<GoRouter>((ref) => generateRouter());
+final goRouterProvider = Provider<GoRouter>((ref) {
+  // Re-run the auth redirect whenever the user state changes (sign-in, logout,
+  // onboarding completion, guest continue). This is what makes navigation
+  // reactive and reliable — the redirect replaces the old "navigate from inside
+  // a widget's build()" pattern that could leave a black screen frozen until
+  // the user tapped the screen.
+  final refresh = ValueNotifier<int>(0);
+  ref.listen(userStateNotifierProvider, (_, _) => refresh.value++);
+  ref.onDispose(refresh.dispose);
+  return generateRouter(ref: ref, refreshListenable: refresh);
+});
 
 extension GoRouterRiverpod on Ref {
   GoRouter get goRouter => read(goRouterProvider);
@@ -38,14 +51,86 @@ extension GoRouterRiverpod on Ref {
 
 final navigatorKey = GlobalKey<NavigatorState>();
 
+/// Auth/onboarding routes the redirect must never bounce an unauthenticated
+/// user away from (they're the destinations).
+const Set<String> _authRoutes = {
+  '/signin',
+  '/signup',
+  '/signinWithPhone',
+  '/recover_password',
+};
+
+/// Single source of truth for "where should this user be allowed to go".
+///
+/// Replaces the old widget-tree guards. Driven reactively by GoRouter via the
+/// [goRouterProvider] refresh listenable, so a logout (or sign-in, or onboarding
+/// completion) navigates immediately without depending on a post-frame callback.
+String? _authRedirect(Ref ref, GoRouterState state) {
+  final user = ref.read(userStateNotifierProvider).user;
+  // Session still resolving on boot: the Initializer shows a spinner. Don't
+  // redirect yet — we re-run once the state resolves (refresh listenable).
+  if (user.isLoading) return null;
+
+  final String loc = state.matchedLocation;
+  final bool onAuthRoute = _authRoutes.contains(loc);
+  final bool onboardingDone = ref
+      .read(sharedPreferencesProvider)
+      .getOnboardingCompleted();
+  final bool hasIdentity = user.idOrNull != null;
+
+  // WEB: there's no onboarding screen. Require a signed-in account OR an
+  // explicit guest choice ("continue without account" sets isOnboarded).
+  if (kIsWeb && withWeb) {
+    final bool ready = hasIdentity || user.isOnboarded || onboardingDone;
+    if (ready) {
+      if (onAuthRoute && user is AuthenticatedUserData) return '/';
+      return null;
+    }
+    return onAuthRoute ? null : '/signin';
+  }
+
+  // NATIVE. Let the onboarding flow own its own screens and its exit: it runs a
+  // nested navigator (questions → permissions → loader → paywall) and navigates
+  // to '/' itself when done. Bouncing it off '/onboarding' here would tear that
+  // nested flow down mid-way.
+  if (loc == '/onboarding') return null;
+
+  // Authenticated users skip onboarding: signing in is itself a commitment to
+  // the app, and they may be returning users who onboarded on another device.
+  final bool onboardedEffective =
+      !withOnboarding ||
+      user.isOnboarded ||
+      onboardingDone ||
+      user is AuthenticatedUserData;
+
+  // 1) One-time onboarding gate. Auth routes (sign-in/sign-up/recover) stay
+  //    reachable even before onboarding is done — that's the "I already have an
+  //    account" path out of the first onboarding screen. Only non-auth routes
+  //    are gated back to onboarding.
+  if (!onboardedEffective) return onAuthRoute ? null : '/onboarding';
+
+  // 2) Onboarded: using the app needs a backend identity. Anonymous accounts
+  //    are created lazily (onboarding end / "continue as guest"), so after a
+  //    logout there's no identity → send to sign-in, never back to onboarding.
+  if (hasIdentity) {
+    if (onAuthRoute && user is AuthenticatedUserData) return '/';
+    return null;
+  }
+  return onAuthRoute ? null : '/signin';
+}
+
 GoRouter generateRouter({
+  required Ref ref,
   String? initialLocation,
   List<GoRoute>? additionalRoutes,
   List<NavigatorObserver>? observers,
+  Listenable? refreshListenable,
 }) {
   return GoRouter(
-    initialLocation: '/',
+    initialLocation: initialLocation ?? '/',
     navigatorKey: navigatorKey,
+    refreshListenable: refreshListenable,
+    redirect: (context, state) => _authRedirect(ref, state),
     // Catches unknown routes (e.g. an Android warm-start from the home widget
     // landed on a stale URI) and silently sends the user home instead of
     // surfacing a dead-end "404" page. We log the offending URI so a real
@@ -62,6 +147,7 @@ GoRouter generateRouter({
     },
     observers: [
       AnalyticsObserver(analyticsApi: MixpanelAnalyticsApi.instance()),
+      KasyChromeVisibilityObserver(),
 
       ...?observers,
     ],
@@ -71,10 +157,7 @@ GoRouter generateRouter({
         path: '/',
         pageBuilder: (context, state) => kasyTransitionPage(
           key: state.pageKey,
-          child: const UserInfosGuard(
-            fallbackRoute: '/onboarding',
-            child: BiometricGuard(child: BottomMenu()),
-          ),
+          child: const BiometricGuard(child: BottomMenu()),
         ),
       ),
       // Home showcase detail screens. These are TOP-LEVEL routes (siblings of
@@ -190,9 +273,8 @@ GoRouter generateRouter({
         path: '/notifications',
         pageBuilder: (context, state) => kasyTransitionPage(
           key: state.pageKey,
-          child: const UserInfosGuard(
-            fallbackRoute: '/onboarding',
-            child: BiometricGuard(child: BottomMenu(initialRoute: 'notifications')),
+          child: const BiometricGuard(
+            child: BottomMenu(initialRoute: 'notifications'),
           ),
         ),
       ),
@@ -201,9 +283,8 @@ GoRouter generateRouter({
         path: '/settings',
         pageBuilder: (context, state) => kasyTransitionPage(
           key: state.pageKey,
-          child: const UserInfosGuard(
-            fallbackRoute: '/onboarding',
-            child: BiometricGuard(child: BottomMenu(initialRoute: 'settings')),
+          child: const BiometricGuard(
+            child: BottomMenu(initialRoute: 'settings'),
           ),
         ),
       ),