kasy-cli 1.13.0 → 1.14.0

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

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:background_fetch/background_fetch.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -8,14 +10,7 @@ import 'package:kasy_kit/core/initializer/onstart_service.dart';
 import 'package:logger/logger.dart';
 
 final homeWidgetsManagerProvider = Provider<HomeWidgetsManager>(
-  (ref) {
-    // Force-build the widget service at app startup so its user-state
-    // listener attaches and the widget auto-refreshes when subscription
-    // status or other relevant fields change. Without this read, the
-    // listener would only attach on first manual update.
-    ref.read(myWidgetHomeWidgetProvider.notifier);
-    return HomeWidgetsManager();
-  },
+  (ref) => HomeWidgetsManager(ref),
 );
 
 const String appGroupId = 'group.com.aicrus.firebase.kit';
@@ -26,12 +21,31 @@ const String appGroupId = 'group.com.aicrus.firebase.kit';
 /// will be used to initialize the home widgets and set the app group id
 /// Register the background task for the home widgets
 class HomeWidgetsManager implements OnStartService {
+  HomeWidgetsManager(this._ref);
+
+  final Ref _ref;
+
   @override
   Future<void> init() async {
     if (kIsWeb) return;
     try {
+      // Must be set BEFORE any saveWidgetData call, otherwise the data lands
+      // in the default UserDefaults suite and the native widget extension
+      // (which reads from the app group) sees nothing.
       await HomeWidget.setAppGroupId(appGroupId);
 
+      // Read the widget notifier so its user-state listener attaches —
+      // future state changes (login/logout, subscription) auto-refresh
+      // the widget without waiting for the 15-min background tick.
+      final myWidget = _ref.read(myWidgetHomeWidgetProvider.notifier);
+      // Push initial data so the widget renders something on first install
+      // instead of staying blank until the background task fires.
+      // Fire-and-forget: we do NOT await here because update() may do a
+      // network call (RevenueCat) that could stall app startup and even
+      // prevent BackgroundFetch from being configured. setAppGroupId has
+      // already completed, so it is safe to fire it off now.
+      unawaited(myWidget.update());
+
       final status = await BackgroundFetch.configure(
         BackgroundFetchConfig(
           minimumFetchInterval: 15,

package/templates/firebase/lib/core/shared_preferences/shared_preferences.dart

@@ -60,11 +60,23 @@ class SharedPreferencesBuilder implements OnStartService {
     return prefs.getBool('biometric_enabled') ?? false;
   }
 
-  Future<void> setBiometricPromptShown(bool shown) async {
-    await prefs.setBool('biometric_prompt_shown', shown);
+  /// How many times the user dismissed the ATT soft prompt without accepting.
+  /// Used to back off and eventually stop asking. See [MaybeShowAttPermission].
+  int getAttSoftDismissCount() {
+    return prefs.getInt('att_soft_dismiss_count') ?? 0;
   }
 
-  bool getBiometricPromptShown() {
-    return prefs.getBool('biometric_prompt_shown') ?? false;
+  Future<void> setAttSoftDismissCount(int count) async {
+    await prefs.setInt('att_soft_dismiss_count', count);
+  }
+
+  DateTime? getAttSoftLastAskedAt() {
+    final millis = prefs.getInt('att_soft_last_asked_at');
+    if (millis == null) return null;
+    return DateTime.fromMillisecondsSinceEpoch(millis);
+  }
+
+  Future<void> setAttSoftLastAskedAt(DateTime when) async {
+    await prefs.setInt('att_soft_last_asked_at', when.millisecondsSinceEpoch);
   }
 }

package/templates/firebase/lib/core/states/components/maybeshow_component.dart

@@ -13,20 +13,16 @@ import 'package:kasy_kit/core/states/models/event_model.dart';
 /// Ex of usage:
 /// @override
 ///  Widget build(BuildContext context) {
-///    final homeState = ref.watch(homeNotifierProvider);
-///    final userState = ref.watch(userStateNotifierProvider);
-///    // final translations = ref.watch(translationsProvider);
-///
 ///    return ConditionalWidgetsEvents(
 ///      eventWidgets: [
 ///        MaybeShowPremiumPage(),
-///        MaybeShowNotificationPermission(),
-///        MaybeLevelUpBottomSheet(),
+///        MaybeShowAttPermission(),
 ///        MaybeAskForReview(),
 ///        MaybeAskForRating(),
 ///      ],
-///      child: Background.blue(
-///        child: SafeArea(...
+///      child: ...,
+///    );
+///  }
 /// A widget that can be shown or not based on a condition.
 sealed class MaybeShow {}
 

package/templates/firebase/lib/core/states/user_state_notifier.dart

@@ -6,6 +6,7 @@ import 'package:kasy_kit/core/data/models/subscription.dart';
 import 'package:kasy_kit/core/data/models/user.dart';
 import 'package:kasy_kit/core/data/repositories/user_repository.dart';
 import 'package:kasy_kit/core/initializer/onstart_service.dart';
+import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/models/user_state.dart';
 import 'package:kasy_kit/environnements.dart';
 import 'package:kasy_kit/features/authentication/repositories/authentication_repository.dart';
@@ -125,8 +126,19 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
   Future<void> onLogout() async {
     final userId = state.user.idOrThrow;
     _deviceRepository.removeTokenUpdateListener();
-    await _deviceRepository.unregister(userId);
+    // Best-effort: if the network call fails we still proceed with logout so
+    // the user is never stuck on the previous account. A stale device doc on
+    // the old user is cleaned up server-side by the cross-user token dedup
+    // trigger when the same install registers under a new account.
+    try {
+      await _deviceRepository.unregister(userId);
+    } catch (e) {
+      _logger.w('Failed to unregister device during logout: $e');
+    }
     await _authenticationRepository.logout();
+    // Biometric lock is a per-account preference, not a device-wide one.
+    // The next user signing in on this install should start without it set.
+    await ref.read(sharedPreferencesProvider).setBiometricEnabled(false);
     state = const UserState(user: User.anonymous());
     if (mode == AuthenticationMode.anonymous) {
       await _loadAnonymousState();

package/templates/firebase/lib/features/home/home_page.dart

@@ -4,7 +4,6 @@ import 'package:kasy_kit/components/kasy_app_bar.dart';
 import 'package:kasy_kit/core/bottom_menu/bart_inner_paths.dart';
 import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/haptics/kasy_haptics.dart';
-import 'package:kasy_kit/core/states/components/maybe_ask_biometric_setup.dart';
 import 'package:kasy_kit/core/states/components/maybe_ask_rating.dart';
 import 'package:kasy_kit/core/states/components/maybe_show_update_bottom_sheet.dart';
 import 'package:kasy_kit/core/states/components/maybeshow_component.dart';
@@ -12,7 +11,6 @@ import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/home/home_components_page.dart';
 import 'package:kasy_kit/features/home/home_features_page.dart';
 import 'package:kasy_kit/features/notifications/shared/att_permission.dart';
-import 'package:kasy_kit/features/notifications/shared/notification_permission_bottom_sheet.dart';
 import 'package:kasy_kit/features/subscription/shared/maybeshow_premium.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
@@ -27,13 +25,9 @@ class HomePage extends ConsumerWidget {
       eventWidgets: [
         MaybeAskForReview(),
         MaybeAskForRating(),
-        // First OnAppStart handler that may return true — premium / notifications
-        // no longer suppress the biometric one-shot prompt.
-        MaybeAskBiometricSetup(),
         MaybeShowPremiumPage(),
         MaybeShowUpdateBottomSheet(),
         MaybeShowAttPermission(),
-        MaybeShowNotificationPermission(),
       ],
       child: ColoredBox(
         color: context.colors.background,

package/templates/firebase/lib/features/notifications/api/device_api.dart

@@ -38,6 +38,15 @@ abstract class DeviceApi {
   /// Unregister the device in the backend
   Future<void> unregister(String userId, String deviceId);
 
+  /// Heartbeat — update the `lastUpdateDate` on the current device doc.
+  /// Used so the backend can detect orphaned device docs from previous installs.
+  Future<void> touch(String userId, String installationId);
+
+  /// Delete device docs of the same user that haven't been touched in a while.
+  /// Called after registering a fresh installation to remove orphans left by
+  /// previous installs (whose installationId no longer matches).
+  Future<void> cleanupStaleDevices(String userId, String currentInstallationId);
+
   /// Listen to token refresh
   void onTokenRefresh(OnTokenRefresh onTokenRefresh);
 
@@ -167,6 +176,54 @@ class FirebaseDeviceApi implements DeviceApi {
     }
   }
 
+  @override
+  Future<void> touch(String userId, String installationId) async {
+    try {
+      await retryOnFirestoreUnavailable(
+        () => _client
+            .collection('users')
+            .doc(userId)
+            .collection('devices')
+            .doc(installationId)
+            .update({'lastUpdateDate': Timestamp.now()}),
+      );
+    } catch (_) {
+      // Missing doc — happens if the device was unregistered or never saved.
+      // Caller (DeviceRepository) recovers by re-registering on next session.
+    }
+  }
+
+  @override
+  Future<void> cleanupStaleDevices(
+    String userId,
+    String currentInstallationId,
+  ) async {
+    // Devices not touched in the last 30 days are treated as orphans from
+    // previous installations on the same physical device. Real second devices
+    // that the user actively uses stay above this threshold via heartbeat.
+    final cutoff = DateTime.now().subtract(const Duration(days: 30));
+    try {
+      final snapshot = await _client
+          .collection('users')
+          .doc(userId)
+          .collection('devices')
+          .where('lastUpdateDate', isLessThan: Timestamp.fromDate(cutoff))
+          .get();
+      final batch = _client.batch();
+      var hasDeletions = false;
+      for (final doc in snapshot.docs) {
+        if (doc.id == currentInstallationId) continue;
+        batch.delete(doc.reference);
+        hasDeletions = true;
+      }
+      if (hasDeletions) {
+        await batch.commit();
+      }
+    } catch (e) {
+      Logger().w('cleanupStaleDevices failed: $e');
+    }
+  }
+
   @override
   void onTokenRefresh(OnTokenRefresh onTokenRefresh) {
     _onTokenRefreshSubscription =

package/templates/firebase/lib/features/notifications/providers/models/notification.dart

@@ -117,6 +117,8 @@ sealed class NotificationPermission {
         await permission.ask();
       case NotificationPermissionDenied():
         await permission.ask();
+      case NotificationPermissionPermanentlyDenied():
+        await permission.openSettings();
       case NotificationPermissionGranted():
         await permission.ensureSetup();
     }
@@ -151,7 +153,7 @@ class NotificationPermissionGranted extends NotificationPermission {
   }
 }
 
-/// we asked for permission and it was denied
+/// we asked for permission and it was denied (but can still be asked again)
 class NotificationPermissionDenied extends NotificationPermission {
   final NotificationSettings? _notificationSettings;
   final NotificationsRepository? _repository;
@@ -175,6 +177,14 @@ class NotificationPermissionDenied extends NotificationPermission {
   }
 }
 
+/// User denied the permission and the OS will not show the native prompt again.
+/// The only way back is the system settings of the app.
+class NotificationPermissionPermanentlyDenied extends NotificationPermission {
+  Future<void> openSettings() async {
+    await openAppSettings();
+  }
+}
+
 /// we never asked for permission
 class NotificationPermissionWaiting extends NotificationPermission {
   final NotificationSettings? _notificationSettings;

package/templates/firebase/lib/features/notifications/repositories/device_repository.dart

@@ -54,6 +54,9 @@ class DeviceRepository {
     // Without the userId check, a new anonymous user (same device token) would
     // reuse the cached prefs and never register in the database.
     if (device != null && device.token == newDevice.token && cachedUserId == userId) {
+      // Heartbeat — keeps the backend's stale-device filter (60d TTL) from
+      // dropping this active install. Cheap: one Firestore update per launch.
+      await _deviceApi.touch(userId, newDevice.installationId);
       return;
     }
     // Include device properties so the welcome notification fires in the correct locale.
@@ -62,6 +65,12 @@ class DeviceRepository {
     final response = await _deviceApi.register(userId, deviceWithLocale);
     await _saveInPrefs(response);
     await _prefs.setString(_deviceUserIdPrefsKey, userId);
+    // Remove orphan devices left by previous installs on the same physical
+    // device (different installationId, never touched again). Without this,
+    // a re-install (Xcode -> TestFlight, or TestFlight build update with an
+    // uninstall in between) leaves stale tokens that still receive push,
+    // causing duplicated notifications.
+    await _deviceApi.cleanupStaleDevices(userId, newDevice.installationId);
   }
 
   Future<void> unregister(String userId) async {

package/templates/firebase/lib/features/notifications/repositories/notifications_repository.dart

@@ -158,10 +158,7 @@ class AppNotificationsRepository implements NotificationsRepository {
           repository: this,
         );
       case PermissionStatus.permanentlyDenied:
-        return NotificationPermissionDenied(
-          notificationSettings: _notificationSettings,
-          repository: this,
-        );
+        return NotificationPermissionPermanentlyDenied();
       default:
         return NotificationPermissionWaiting(
           notificationSettings: _notificationSettings,

package/templates/firebase/lib/features/notifications/shared/att_permission.dart

@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
 import 'package:kasy_kit/core/data/api/tracking_api.dart';
 import 'package:kasy_kit/core/icons/kasy_icons.dart';
+import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/states/components/maybeshow_component.dart';
 import 'package:kasy_kit/core/states/models/event_model.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
@@ -13,15 +14,19 @@ import 'package:permission_handler/permission_handler.dart';
 
 /// Requests App Tracking Transparency (ATT) on iOS if not yet determined.
 ///
-/// This handler always returns `false` so the event chain continues and
-/// [MaybeShowNotificationPermission] can still run in the same app-start cycle.
-///
-/// Placement: add it to [ConditionalWidgetsEvents] immediately before the
-/// notification-permission handler.
+/// Apple only allows the native ATT prompt to be shown once per install, so we
+/// gate the system call behind a soft explanation dialog (KasyDialog) first.
+/// If the user dismisses the soft dialog, we back off and ask again later (up
+/// to [_maxSoftAttempts] times, with [_cooldown] between attempts). After the
+/// last attempt we stop asking forever.
 ///
 /// To remove: delete this file and remove [MaybeShowAttPermission] from
 /// [HomePage]'s event list.
 class MaybeShowAttPermission implements MaybeShowWithRef {
+  static const Duration _settleDelay = Duration(milliseconds: 1500);
+  static const int _maxSoftAttempts = 3;
+  static const Duration _cooldown = Duration(days: 7);
+
   @override
   Future<bool> handle(WidgetRef ref, AppEvent event) async {
     if (kIsWeb) return false;
@@ -32,12 +37,28 @@ class MaybeShowAttPermission implements MaybeShowWithRef {
     // `denied` in permission_handler maps to iOS "notDetermined" — never asked.
     if (!status.isDenied) return false;
 
+    final prefs = ref.read(sharedPreferencesProvider);
+    final attempts = prefs.getAttSoftDismissCount();
+    if (attempts >= _maxSoftAttempts) return false;
+
+    final lastAsked = prefs.getAttSoftLastAskedAt();
+    if (lastAsked != null &&
+        DateTime.now().difference(lastAsked) < _cooldown) {
+      return false;
+    }
+
+    await Future<void>.delayed(_settleDelay);
+    await prefs.setAttSoftLastAskedAt(DateTime.now());
     if (!ref.context.mounted) return false;
 
     final confirmed = await _showExplanationDialog(ref.context);
-    if (!confirmed) return false;
+    if (!confirmed) {
+      await prefs.setAttSoftDismissCount(attempts + 1);
+      return false;
+    }
 
     await Permission.appTrackingTransparency.request();
+    await prefs.setAttSoftDismissCount(_maxSoftAttempts);
 
     final userId = ref.read(userStateNotifierProvider).user.idOrNull;
     if (userId != null) {
@@ -45,8 +66,7 @@ class MaybeShowAttPermission implements MaybeShowWithRef {
       ref.read(facebookEventApiProvider).initUser(userId).ignore();
     }
 
-    // Return false so MaybeShowNotificationPermission also runs.
-    return false;
+    return true;
   }
 
   Future<bool> _showExplanationDialog(BuildContext context) async {

package/templates/firebase/lib/features/notifications/ui/notifications_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/notifications/providers/models/notification.dart'
     as app;
@@ -20,25 +21,39 @@ class NotificationsPage extends ConsumerStatefulWidget {
   ConsumerState<NotificationsPage> createState() => _NotificationsPageState();
 }
 
-class _NotificationsPageState extends ConsumerState<NotificationsPage> {
+class _NotificationsPageState extends ConsumerState<NotificationsPage>
+    with WidgetsBindingObserver {
   final ScrollController _scrollController = ScrollController();
   Timer? _autoReadTimer;
 
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
     _scrollController.addListener(_onScrollChange);
     requestReadAll();
   }
 
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
     _autoReadTimer?.cancel();
     _scrollController.removeListener(_onScrollChange);
     _scrollController.dispose();
     super.dispose();
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+    if (state == AppLifecycleState.resumed && mounted) {
+      // Native permission dialogs push the app to the background briefly. When
+      // we come back, the Bart bottom bar can stay hidden because its internal
+      // visibility state is reset. Force it back so the user is never stranded.
+      kasyShowBottomBar(context);
+    }
+  }
+
   void _onScrollChange() {
     final direction = _scrollController.position.userScrollDirection;
     final isScrollingDown = direction == ScrollDirection.reverse;

package/templates/firebase/lib/features/notifications/ui/widgets/empty_notifications.dart

@@ -1,16 +1,45 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/components/components.dart';
+import 'package:kasy_kit/core/bottom_menu/kasy_bart_navigation.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/notifications/providers/models/notification.dart';
 import 'package:kasy_kit/features/notifications/repositories/notifications_repository.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
-class EmptyNotifications extends ConsumerWidget {
+class EmptyNotifications extends ConsumerStatefulWidget {
   const EmptyNotifications({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<EmptyNotifications> createState() => _EmptyNotificationsState();
+}
+
+class _EmptyNotificationsState extends ConsumerState<EmptyNotifications> {
+  late Future<NotificationPermission> _permissionFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _permissionFuture = _loadPermission();
+  }
+
+  Future<NotificationPermission> _loadPermission() {
+    return ref.read(notificationRepositoryProvider).getPermissionStatus();
+  }
+
+  Future<void> _onAskPressed(NotificationPermission permission) async {
+    await permission.maybeAsk();
+    if (!mounted) return;
+    // The native permission dialog pulls the app out of focus; restore the
+    // bottom bar defensively before refreshing the local state.
+    kasyShowBottomBar(context);
+    setState(() {
+      _permissionFuture = _loadPermission();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final tr = context.t.notifications;
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
@@ -50,18 +79,22 @@ class EmptyNotifications extends ConsumerWidget {
           ),
           const SizedBox(height: KasySpacing.xl),
           FutureBuilder<NotificationPermission>(
-            future: ref
-                .read(notificationRepositoryProvider)
-                .getPermissionStatus(),
+            future: _permissionFuture,
             builder: (context, snapshot) {
-              final isGranted = snapshot.data is NotificationPermissionGranted;
-              if (isGranted) return const SizedBox.shrink();
+              final permission = snapshot.data;
+              if (permission == null) return const SizedBox.shrink();
+              if (permission is NotificationPermissionGranted) {
+                return const SizedBox.shrink();
+              }
+              final isLocked =
+                  permission is NotificationPermissionPermanentlyDenied;
               return KasyButton(
-                label: tr.empty_cta,
+                label: isLocked ? tr.empty_cta_open_settings : tr.empty_cta,
                 variant: KasyButtonVariant.soft,
-                icon: KasyIcons.notificationAdd,
-                onPressed: () =>
-                    snapshot.data?.maybeAsk(),
+                icon: isLocked
+                    ? KasyIcons.settings
+                    : KasyIcons.notificationAdd,
+                onPressed: () => _onAskPressed(permission),
               );
             },
           ),

package/templates/firebase/lib/features/settings/ui/components/admin/admin_bottom_sheet.dart

@@ -11,7 +11,7 @@ import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/toast/toast_service.dart';
 import 'package:kasy_kit/core/web_device_preview/web_device_preview.dart';
 import 'package:kasy_kit/core/widgets/update_bottom_sheet.dart';
-import 'package:kasy_kit/features/notifications/shared/notification_permission_bottom_sheet.dart';
+import 'package:kasy_kit/features/notifications/api/local_notifier.dart';
 import 'package:kasy_kit/features/settings/settings_page.dart';
 import 'package:kasy_kit/features/settings/ui/components/admin/admin_routes.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
@@ -89,30 +89,33 @@ class _AdminSheet extends ConsumerWidget {
                             );
                           },
                         ),
-                        const SettingsDivider(),
-                        ValueListenableBuilder<bool>(
-                          valueListenable: webDevicePreviewEnabledNotifier,
-                          builder: (context, enabled, _) {
-                            return SettingsSwitchTile(
-                              icon: KasyIcons.phoneAndroid,
-                              title: t.settings.admin.device_preview_title,
-                              value: enabled,
-                              onChanged: (v) async {
-                                final navigator = Navigator.of(
-                                  context,
-                                  rootNavigator: true,
-                                );
-                                final p = await SharedPreferences.getInstance();
-                                await p.setBool(
-                                  webDevicePreviewEnabledPrefKey,
-                                  v,
-                                );
-                                webDevicePreviewEnabledNotifier.value = v;
-                                if (v) navigator.pop();
-                              },
-                            );
-                          },
-                        ),
+                        if (kIsWeb) ...[
+                          const SettingsDivider(),
+                          ValueListenableBuilder<bool>(
+                            valueListenable: webDevicePreviewEnabledNotifier,
+                            builder: (context, enabled, _) {
+                              return SettingsSwitchTile(
+                                icon: KasyIcons.phoneAndroid,
+                                title: t.settings.admin.device_preview_title,
+                                value: enabled,
+                                onChanged: (v) async {
+                                  final navigator = Navigator.of(
+                                    context,
+                                    rootNavigator: true,
+                                  );
+                                  final p =
+                                      await SharedPreferences.getInstance();
+                                  await p.setBool(
+                                    webDevicePreviewEnabledPrefKey,
+                                    v,
+                                  );
+                                  webDevicePreviewEnabledNotifier.value = v;
+                                  if (v) navigator.pop();
+                                },
+                              );
+                            },
+                          ),
+                        ],
                         const SettingsDivider(),
                         SettingsTile(
                           icon: KasyIcons.note,
@@ -186,10 +189,9 @@ class _AdminSheet extends ConsumerWidget {
                           title: t.settings.admin.ask_notification,
                           onTap: () {
                             Navigator.pop(context);
-                            showNotificationPermissionSheetIfNeeded(
-                              navigatorKey.currentContext!,
-                              force: true,
-                            );
+                            ref
+                                .read(notificationsSettingsProvider)
+                                .askPermission();
                           },
                         ),
                         const SettingsDivider(),

package/templates/firebase/lib/features/settings/ui/components/language_switcher.dart

@@ -1,5 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/home_widgets/home_widget_mywidget_service.dart';
 import 'package:kasy_kit/core/shared_preferences/shared_preferences.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/settings_tile.dart';
@@ -93,12 +96,25 @@ class LanguageSwitcher extends ConsumerWidget {
                 return _LocaleOptionTile(
                   locale: locale,
                   isSelected: isSelected,
-                  onTap: () async {
+                  onTap: () {
+                    // Close the sheet FIRST. Awaiting work before pop
+                    // races with the rebuild triggered by setLocale and
+                    // crashed Navigator.pop with !_debugLocked.
+                    Navigator.pop(sheetContext);
                     LocaleSettings.setLocale(locale);
-                    await ref
-                        .read(sharedPreferencesProvider)
-                        .setAppLocale(locale.languageCode);
-                    if (sheetContext.mounted) Navigator.pop(sheetContext);
+                    // Re-render the home widget in the new language —
+                    // fire-and-forget so the UI doesn't wait on a
+                    // network call (RevenueCat) inside update().
+                    unawaited(
+                      ref
+                          .read(sharedPreferencesProvider)
+                          .setAppLocale(locale.languageCode),
+                    );
+                    unawaited(
+                      ref
+                          .read(myWidgetHomeWidgetProvider.notifier)
+                          .updateForLocale(locale),
+                    );
                   },
                 );
               }),

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

@@ -443,6 +443,7 @@
         "group_yesterday": "Yesterday",
         "group_older": "Older",
         "empty_cta": "Enable notifications",
+        "empty_cta_open_settings": "Open settings",
         "delete_all": "Delete all",
         "delete_all_confirm_title": "Delete all notifications?",
         "delete_all_confirm_message": "This will permanently remove every notification from your account. This cannot be undone.",
@@ -527,8 +528,10 @@
         "greeting_evening": "Good evening",
         "title_with_name": "Hi, $name!",
         "title_default": "Hi there!",
+        "title_logged_out": "We'll be here when you're back",
         "plan_free": "Free plan",
-        "plan_pro": "PRO"
+        "plan_pro": "PRO",
+        "quote": "It always seems impossible until it's done."
     }
 }