kasy-cli 1.15.0 → 1.17.0

package/templates/firebase/lib/core/home_widgets/home_widget_mywidget_service.dart

@@ -1,7 +1,3 @@
-import 'dart:async';
-import 'dart:io' show Platform;
-
-import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:home_widget/home_widget.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/home_widgets/home_widget_service.dart';
@@ -38,12 +34,6 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
   /// Snapshot of the user fields the widget reads. Used to skip the update
   /// when an unrelated field changes (e.g. lastUpdateDate refresh).
   (String?, String?, String?, bool) _widgetSignature(User user) {
-    final isPro = switch (user) {
-      AuthenticatedUserData(:final subscription) ||
-      AnonymousUserData(:final subscription) =>
-        subscription?.isActive ?? false,
-      _ => false,
-    };
     final name = switch (user) {
       AuthenticatedUserData(:final name) => name,
       _ => null,
@@ -52,21 +42,41 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       AuthenticatedUserData(:final email) => email,
       _ => null,
     };
-    return (user.idOrNull, name, email, isPro);
+    return (user.idOrNull, name, email, _cachedIsPro(user));
   }
 
   @override
-  Future<void> update() => updateForLocale(LocaleSettings.currentLocale);
-
-  /// Same as [update] but renders against an explicit locale. Use this
-  /// from the language picker so the widget never falls one step behind:
-  /// `LocaleSettings.setLocale` propagates to `currentLocale` over a
-  /// frame boundary, and an [update] call scheduled at the same time
-  /// can race with it. Passing the locale removes the race.
-  Future<void> updateForLocale(AppLocale locale) async {
+  Future<void> update() => _renderForLocale(
+        LocaleSettings.currentLocale,
+        refreshSubscription: true,
+      );
+
+  /// Same as [update] but renders against an explicit locale and skips the
+  /// RevenueCat refresh. Two reasons:
+  ///  1. `LocaleSettings.setLocale` propagates to `currentLocale` over a
+  ///     frame boundary, and an [update] call scheduled at the same time
+  ///     can race with it — passing the locale removes the race.
+  ///  2. The network call inside [_resolveIsPro] adds up to 2s of latency
+  ///     before the new strings reach SharedPreferences, which is what made
+  ///     the widget look "one step behind" after switching language.
+  Future<void> updateForLocale(AppLocale locale) =>
+      _renderForLocale(locale, refreshSubscription: false);
+
+  Future<void> _renderForLocale(
+    AppLocale locale, {
+    required bool refreshSubscription,
+  }) async {
     final logger = Logger();
     logger.i('🔄 Updating MyWidget Home Widget (${locale.languageCode})');
     final user = ref.read(userStateNotifierProvider).user;
+
+    // Slang lazy-loads non-base locales: AppLocale.pt.translations falls back
+    // silently to the base locale (en) until the locale's bundle is loaded
+    // into memory. setLocale() kicks off that load asynchronously, so a tap
+    // on "Português" immediately followed by updateForLocale(pt) would push
+    // English text to the widget on the first try and the correct one on
+    // the retry. Awaiting loadLocale here removes the race.
+    await LocaleSettings.instance.loadLocale(locale);
     final t = locale.translations;
 
     // "Logged out" = no user id at all (post-logout in authRequired mode, or
@@ -86,7 +96,8 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       _ => null,
     };
 
-    final isPro = !isLoggedOut && await _resolveIsPro(user);
+    final isPro = !isLoggedOut &&
+        (refreshSubscription ? await _resolveIsPro(user) : _cachedIsPro(user));
 
     final greeting = _greeting(t);
     final title = isLoggedOut
@@ -115,18 +126,20 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     });
   }
 
+  bool _cachedIsPro(User user) => switch (user) {
+        AuthenticatedUserData(:final subscription) ||
+        AnonymousUserData(:final subscription) =>
+          subscription?.isActive ?? false,
+        _ => false,
+      };
+
   /// Returns true if the user has an active subscription.
   /// Queries the SubscriptionRepository directly so the widget reflects the
   /// most recent state — including the RevenueCat fallback when the backend
   /// webhook is delayed. Falls back to the in-memory user.subscription if the
   /// fresh fetch fails (no network, RC not initialised, etc.).
   Future<bool> _resolveIsPro(User user) async {
-    final cached = switch (user) {
-      AuthenticatedUserData(:final subscription) ||
-      AnonymousUserData(:final subscription) =>
-        subscription?.isActive ?? false,
-      _ => false,
-    };
+    final cached = _cachedIsPro(user);
     final userId = user.idOrNull;
     if (userId == null) return cached;
     try {
@@ -152,21 +165,6 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     await HomeWidget.saveWidgetData<String>('isPro', data['isPro'] ?? 'false');
     await HomeWidget.saveWidgetData<String>('quote', data['quote'] ?? '');
 
-    // On Android, saveWidgetData writes via SharedPreferences.apply() which
-    // is asynchronous. Glance's HomeWidgetGlanceStateDefinition reads from
-    // the same prefs, but a tight saveWidgetData→updateWidget sequence can
-    // race the apply() flush — Glance recomposes with the previous values
-    // (most visible right after a locale change). Fire two updates spaced
-    // out by 400ms each so even slow devices catch the new state.
-    if (!kIsWeb && Platform.isAndroid) {
-      await Future<void>.delayed(const Duration(milliseconds: 400));
-      await HomeWidget.updateWidget(
-        name: _androidWidgetName,
-        iOSName: _iosWidgetName,
-      );
-      await Future<void>.delayed(const Duration(milliseconds: 400));
-    }
-
     await HomeWidget.updateWidget(
       name: _androidWidgetName,
       iOSName: _iosWidgetName,

package/templates/firebase/lib/router.dart

@@ -24,6 +24,7 @@ import 'package:kasy_kit/features/settings/ui/components/admin/admin_routes.dart
 import 'package:kasy_kit/features/settings/ui/components/admin/send_push_notification_page.dart';
 import 'package:kasy_kit/features/subscription/ui/component/premium_page_factory.dart';
 import 'package:kasy_kit/features/subscription/ui/premium_page.dart';
+import 'package:logger/logger.dart';
 
 final goRouterProvider = Provider<GoRouter>((ref) => generateRouter());
 
@@ -41,7 +42,20 @@ GoRouter generateRouter({
   return GoRouter(
     initialLocation: '/',
     navigatorKey: navigatorKey,
-    errorBuilder: (context, state) => const PageNotFound(),
+    // 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
+    // misconfigured route doesn't get masked.
+    // Note: GoRouter doesn't accept both onException and errorBuilder, so the
+    // /404 GoRoute below is what reaches PageNotFound when explicitly navigated.
+    onException: (context, state, router) {
+      Logger().w(
+        'GoRouter caught unknown route → "${state.uri}" '
+        '(matched: "${state.matchedLocation}", error: ${state.error}). '
+        'Redirecting to "/".',
+      );
+      router.go('/');
+    },
     observers: [
       AnalyticsObserver(analyticsApi: MixpanelAnalyticsApi.instance()),
 

package/templates/firebase/web/index.html

@@ -38,6 +38,8 @@
   
   
   
+  
+  
   <style id="splash-screen-style">
     html {
       height: 100%
@@ -120,6 +122,7 @@
   
   
   
+  
   <script src="flutter_bootstrap.js" async=""></script>
   <script src="./local_notifications.js"></script>