kasy-cli 1.31.12 → 1.31.14

package/lib/scaffold/backends/api/patch/lib/features/subscriptions/api/stripe_backend_api.dart

@@ -37,6 +37,7 @@ class StripeBackendApi {
     required String priceId,
     String? successUrl,
     String? cancelUrl,
+    String? locale,
   }) async {
     final Response res = await _client.post(
       '/stripe/checkout-session',
@@ -44,6 +45,7 @@ class StripeBackendApi {
         'priceId': priceId,
         if (successUrl != null) 'successUrl': successUrl,
         if (cancelUrl != null) 'cancelUrl': cancelUrl,
+        if (locale != null) 'locale': locale,
       },
     );
     return (res.data as Map)['url'] as String;

package/lib/scaffold/backends/supabase/deploy.js

@@ -363,6 +363,11 @@ async function enableGoogleSignIn(projectRef, webClientId, clientSecret) {
     external_google_client_id: webClientId,
     external_google_secret: clientSecret,
     external_google_skip_nonce_check: true,
+    // Allow the web app's dev origin as a redirect target so the web OAuth flow
+    // (signInWithOAuth redirectTo) and email links (recovery/confirm) land back on
+    // the app. http://localhost:5555 is the port `kasy run --web` uses. Add your
+    // production web origin here when you deploy to the web.
+    uri_allow_list: 'http://localhost:5555,http://localhost:5555/**',
   });
   if (!result.ok) return { ok: false, error: result.error };
   if (result.data.external_google_enabled === true) return { ok: true };

package/lib/scaffold/backends/supabase/edge-functions/delete-user-account/index.ts

@@ -71,6 +71,29 @@ Deno.serve(async (req: Request) => {
 
   const supabaseAdmin = createClient(supabaseUrl, serviceRoleKey);
 
+  // Best-effort Stripe teardown BEFORE deletion: deleting the Stripe customer
+  // cancels all of its subscriptions, so billing stops for the deleted account.
+  // The DB rows (stripe_customers, subscriptions, ...) are removed by ON DELETE
+  // CASCADE, but that does not reach Stripe. Guarded by the secret so a
+  // non-Stripe app simply skips it.
+  const stripeKey = Deno.env.get("STRIPE_SECRET_KEY");
+  if (stripeKey) {
+    try {
+      const { data: cust } = await supabaseAdmin
+        .from("stripe_customers")
+        .select("customer_id")
+        .eq("user_id", user.id)
+        .maybeSingle();
+      const customerId = cust?.customer_id as string | undefined;
+      if (customerId) {
+        const { default: Stripe } = await import("npm:stripe@18");
+        await new Stripe(stripeKey).customers.del(customerId);
+      }
+    } catch (e) {
+      console.error("[delete-user-account] Stripe cleanup failed:", e);
+    }
+  }
+
   try {
     const { error: deleteError } = await supabaseAdmin.auth.admin.deleteUser(user.id);
 

package/lib/scaffold/backends/supabase/edge-functions/stripe-create-checkout-session/index.ts

@@ -97,7 +97,7 @@ Deno.serve(async (req: Request) => {
   }
   const uid = user.id;
 
-  let body: { priceId?: string; successUrl?: string; cancelUrl?: string };
+  let body: { priceId?: string; successUrl?: string; cancelUrl?: string; locale?: string };
   try {
     body = await req.json();
   } catch {
@@ -109,10 +109,17 @@ Deno.serve(async (req: Request) => {
   }
   const successUrl = body.successUrl ?? "";
   const cancelUrl = body.cancelUrl ?? successUrl;
+  const locale = body.locale?.substring(0, 2).toLowerCase();
 
   try {
     const stripe = new Stripe(secretKey);
     const admin = createClient(supabaseUrl, serviceRoleKey);
+    // Persist the app language on the user so server-side notifications are sent
+    // in the right language (on web there is no registered device to read it
+    // from). Mirrors the Firebase checkout behavior.
+    if (locale) {
+      await admin.from("users").update({ locale }).eq("id", uid);
+    }
     const customerId = await getOrCreateCustomer(stripe, admin, uid, user.email);
 
     const price = await stripe.prices.retrieve(priceId, { expand: ["product"] });

package/lib/scaffold/backends/supabase/patch/lib/features/authentication/api/authentication_api.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:crypto/crypto.dart';
+import 'package:firebase_auth/firebase_auth.dart' as fb_auth;
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/services.dart' show PlatformException;
 import 'package:flutter_facebook_auth/flutter_facebook_auth.dart';
@@ -211,6 +212,18 @@ Note: wait a minute after enabling anonymous sign-in before trying again. It tak
 
   @override
   Future<Credentials> signinWithGoogle() async {
+    if (kIsWeb) {
+      // google_sign_in v7 can't do imperative auth on web. Get the Google ID token
+      // via Firebase's popup (zero manual config — reuses the Firebase web OAuth
+      // client + authorized domains, which the kit already sets up) and sign into
+      // Supabase with it. Supabase remains the auth backend.
+      final idToken = await _googleIdTokenFromWebPopup();
+      final res = await client.auth.signInWithIdToken(
+        provider: OAuthProvider.google,
+        idToken: idToken,
+      );
+      return Credentials(id: res.user!.id, token: res.session?.accessToken ?? '');
+    }
     final googleSignIn = GoogleSignIn.instance;
     // Web: clientId = Web Client ID (no serverClientId needed)
     // Native iOS: clientId = iOS Client ID, serverClientId = Web Client ID
@@ -252,6 +265,33 @@ Note: wait a minute after enabling anonymous sign-in before trying again. It tak
     
   }
 
+  /// Web only: obtains a Google ID token via Firebase's popup. google_sign_in v7
+  /// can't do imperative auth on the web, but the kit already initializes Firebase
+  /// (for FCM), so we reuse Firebase's working web OAuth client to get the token,
+  /// then sign into Supabase with it — no Supabase callback / Google console step
+  /// needed. The token's audience is the Firebase web client ID, which is the same
+  /// one configured as Supabase's Google provider, so signInWithIdToken accepts it.
+  Future<String> _googleIdTokenFromWebPopup() async {
+    try {
+      final cred = await fb_auth.FirebaseAuth.instance.signInWithPopup(
+        fb_auth.GoogleAuthProvider(),
+      );
+      final idToken = (cred.credential as fb_auth.OAuthCredential?)?.idToken;
+      if (idToken == null) {
+        throw ApiError(code: 401, message: 'No Google ID token from Firebase popup.');
+      }
+      return idToken;
+    } on fb_auth.FirebaseAuthException catch (e) {
+      if (e.code == 'popup-closed-by-user' ||
+          e.code == 'cancelled-popup-request' ||
+          e.code == 'web-context-cancelled' ||
+          e.code == 'user-cancelled') {
+        throw const UserCancelledSignInException();
+      }
+      rethrow;
+    }
+  }
+
   @override
   Future<Credentials> signinWithGooglePlay() {
     // Google Play Games sign-in is not supported for Supabase backend.
@@ -310,6 +350,28 @@ Note: wait a minute after enabling anonymous sign-in before trying again. It tak
 
   @override
   Future<Credentials> signupFromAnonymousWithGoogle() async {
+    if (kIsWeb) {
+      // Web: get the Google ID token via Firebase's popup (see signinWithGoogle) and
+      // link it to the current anonymous Supabase user.
+      final idToken = await _googleIdTokenFromWebPopup();
+      try {
+        final response = await client.auth.linkIdentityWithIdToken(
+          provider: OAuthProvider.google,
+          idToken: idToken,
+        );
+        return Credentials(id: response.user!.id, token: response.session?.accessToken ?? '');
+      } on AuthException catch (e) {
+        if (e.code == 'identity_already_exists') {
+          await _deleteCurrentAnonymousUser();
+          final res = await client.auth.signInWithIdToken(
+            provider: OAuthProvider.google,
+            idToken: idToken,
+          );
+          return Credentials(id: res.user!.id, token: res.session?.accessToken ?? '');
+        }
+        rethrow;
+      }
+    }
     final scopes = ['email'];
     final googleSignIn = GoogleSignIn.instance;
 

package/lib/scaffold/backends/supabase/patch/lib/features/subscriptions/api/stripe_backend_api.dart

@@ -29,6 +29,7 @@ class StripeBackendApi {
     required String priceId,
     String? successUrl,
     String? cancelUrl,
+    String? locale,
   }) async {
     final res = await _client.functions.invoke(
       'stripe-create-checkout-session',
@@ -36,6 +37,7 @@ class StripeBackendApi {
         'priceId': priceId,
         if (successUrl != null) 'successUrl': successUrl,
         if (cancelUrl != null) 'cancelUrl': cancelUrl,
+        if (locale != null) 'locale': locale,
       },
     );
     return (res.data as Map)['url'] as String;

package/lib/scaffold/backends/supabase/pubspec.yaml.tpl

@@ -26,6 +26,11 @@ dependencies:
   facebook_app_events: ^0.24.0
   firebase_app_installations: ^0.4.0+7
   firebase_core: ^4.5.0
+  # Web-only Google sign-in: on web, google_sign_in v7 can't do imperative auth, so we
+  # get the Google ID token via Firebase's popup (zero manual config — reuses the
+  # Firebase web client + authorized domains) and hand it to Supabase signInWithIdToken.
+  # Supabase stays the auth backend; mobile keeps the native google_sign_in flow.
+  firebase_auth: ^6.1.4
   firebase_messaging: ^16.1.2
   firebase_remote_config: ^6.2.0
   flutter:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.31.12",
+  "version": "1.31.14",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "scripts": {
-    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js && node test/generated-matches-kit.test.js && node test/supabase-verify-jwt.test.js && node test/supabase-cors.test.js && node test/backend-pubspec-local-reminders.test.js",
+    "prepack": "node scripts/check-feature-patches.js && node scripts/bundle-template.js && node test/generated-matches-kit.test.js && node test/supabase-verify-jwt.test.js && node test/supabase-cors.test.js && node test/supabase-google-web.test.js && node test/backend-pubspec-local-reminders.test.js",
     "start": "node ./bin/kasy.js",
     "setup": "node ./bin/kasy.js setup",
     "doctor": "node ./bin/kasy.js doctor",

package/templates/firebase/functions/src/subscriptions/stripe_functions.ts

@@ -1,5 +1,6 @@
 import {error} from "firebase-functions/logger";
 import {onCall, onRequest, HttpsError} from "firebase-functions/v2/https";
+import {onDocumentDeleted} from "firebase-functions/v2/firestore";
 import {defineSecret, defineString} from "firebase-functions/params";
 import * as admin from "firebase-admin";
 import {Timestamp} from "firebase-admin/firestore";
@@ -255,3 +256,39 @@ export const stripeWebhook = onRequest(
     }
   },
 );
+
+// ---------------------------------------------------------------------------
+// onUserDeletedCleanupStripe — tears down Stripe state when an account is
+// deleted. deleteUserAccount removes the users/{uid} doc; this trigger fires on
+// that deletion and (a) deletes the Stripe customer, which immediately cancels
+// all of its subscriptions so billing stops, and (b) removes the local
+// uid -> customer mapping so no orphan stripe_customers doc is left behind.
+// Lives in the Stripe module so a non-Stripe app never deploys it.
+// ---------------------------------------------------------------------------
+export const onUserDeletedCleanupStripe = onDocumentDeleted(
+  {document: "users/{userId}", secrets: [stripeSecretKey]},
+  async (event) => {
+    const uid = event.params.userId;
+    const custRef = admin
+      .firestore()
+      .collection(CUSTOMERS_COLLECTION)
+      .doc(uid);
+    try {
+      const snap = await custRef.get();
+      const customerId = snap.data()?.customerId as string | undefined;
+      if (customerId) {
+        // Deleting the Stripe customer cancels all of its subscriptions, so
+        // billing stops for the deleted account in a single call.
+        await stripeClient().customers.del(customerId);
+      }
+    } catch (e) {
+      console.log(`[stripe-cleanup] could not delete Stripe customer for ${uid}: ${e}`);
+    }
+    // Always drop the local mapping so no orphan remains.
+    try {
+      await custRef.delete();
+    } catch (e) {
+      console.log(`[stripe-cleanup] could not delete stripe_customers/${uid}: ${e}`);
+    }
+  },
+);

package/templates/firebase/lib/components/kasy_app_bar.dart

@@ -23,8 +23,6 @@
 
 library;
 
-import 'dart:ui' show ImageFilter;
-
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart' show SystemUiOverlayStyle;
@@ -111,17 +109,13 @@ Color kasyChromeOrbFillColor(BuildContext context) {
 class KasyFrostedChromeBackground extends StatelessWidget {
   final Widget child;
 
-  /// Backdrop blur strength; higher = more frosted (content still visible through tint).
-  final double blurSigma;
-
-  /// Insets content below the notch but keeps tint/blur covering the status-bar
-  /// strip so scroll never shows cards behind clock/battery icons.
+  /// Insets content below the notch but keeps the solid fill covering the
+  /// status-bar strip so scroll never shows cards behind clock/battery icons.
   final bool padForStatusBar;
 
   const KasyFrostedChromeBackground({
     super.key,
     required this.child,
-    this.blurSigma = 14,
     this.padForStatusBar = true,
   });
 
@@ -165,16 +159,8 @@ class KasyFrostedChromeBackground extends StatelessWidget {
     return AnnotatedRegion<SystemUiOverlayStyle>(
       value: overlayStyle,
       child: DecoratedBox(
-        decoration: BoxDecoration(boxShadow: chromeShadow),
-        child: ClipRect(
-          child: BackdropFilter(
-            filter: ImageFilter.blur(sigmaX: blurSigma, sigmaY: blurSigma),
-            child: DecoratedBox(
-              decoration: BoxDecoration(color: tint),
-              child: content,
-            ),
-          ),
-        ),
+        decoration: BoxDecoration(color: tint, boxShadow: chromeShadow),
+        child: content,
       ),
     );
   }
@@ -253,7 +239,6 @@ class KasyAppBar extends StatelessWidget {
   /// same tap target semantics as the built-in orbs.
   final Widget? trailing;
   final bool useSafeArea;
-  final double frostBlurSigma;
 
   /// When set, called instead of [ThemeProvider.toggle] for the theme orb
   /// ([KasyAppBarStyle.subpage], [KasyAppBarStyle.rootTab]).
@@ -282,7 +267,6 @@ class KasyAppBar extends StatelessWidget {
     this.onBack,
     this.trailing,
     this.useSafeArea = true,
-    this.frostBlurSigma = 14,
     this.onThemeToggle,
     this.toolbarHeight,
     this.topInset,
@@ -366,7 +350,6 @@ class KasyAppBar extends StatelessWidget {
           )
         : bar;
     final Widget chrome = KasyFrostedChromeBackground(
-      blurSigma: frostBlurSigma,
       padForStatusBar: useSafeArea,
       child: barContent,
     );

package/templates/firebase/lib/components/kasy_dialog.dart

@@ -506,6 +506,7 @@ Future<void> showKasyConfirmDialog(
   required String confirmLabel,
   VoidCallback? onCancel,
   VoidCallback? onConfirm,
+  Future<void> Function()? onConfirmAsync,
   bool destructive = false,
   bool barrierDismissible = false,
   IconData? leadingIcon,
@@ -517,37 +518,54 @@ Future<void> showKasyConfirmDialog(
   return showKasyBlurDialog<void>(
     context: context,
     barrierDismissible: barrierDismissible,
-    builder: (dialogCtx) => KasyDialog(
-      leadingIcon: leadingIcon ?? (destructive ? KasyIcons.trash : null),
-      iconTone: destructive ? KasyDialogIconTone.danger : iconTone,
-      title: title,
-      titleCentered: leadingIcon == null && !destructive,
-      message: message,
-      showCloseButton: false,
-      actionsAxis: Axis.horizontal,
-      actions: [
-        KasyButton(
-          label: cancelLabel,
-          variant: KasyButtonVariant.outline,
-          expand: true,
-          onPressed: () {
-            Navigator.of(dialogCtx).pop();
-            onCancel?.call();
-          },
-        ),
-        KasyButton(
-          label: confirmLabel,
-          variant: destructive
-              ? KasyButtonVariant.destructive
-              : KasyButtonVariant.primary,
-          expand: true,
-          onPressed: () {
-            Navigator.of(dialogCtx).pop();
-            onConfirm?.call();
-          },
+    builder: (dialogCtx) {
+      var isLoading = false;
+      return StatefulBuilder(
+        builder: (ctx, setState) => KasyDialog(
+          leadingIcon: leadingIcon ?? (destructive ? KasyIcons.trash : null),
+          iconTone: destructive ? KasyDialogIconTone.danger : iconTone,
+          title: title,
+          titleCentered: leadingIcon == null && !destructive,
+          message: message,
+          showCloseButton: false,
+          actionsAxis: Axis.horizontal,
+          actions: [
+            KasyButton(
+              label: cancelLabel,
+              variant: KasyButtonVariant.outline,
+              expand: true,
+              onPressed: isLoading
+                  ? null
+                  : () {
+                      Navigator.of(dialogCtx).pop();
+                      onCancel?.call();
+                    },
+            ),
+            KasyButton(
+              label: confirmLabel,
+              variant: destructive
+                  ? KasyButtonVariant.destructive
+                  : KasyButtonVariant.primary,
+              expand: true,
+              isLoading: isLoading,
+              onPressed: isLoading
+                  ? null
+                  : () {
+                      if (onConfirmAsync != null) {
+                        setState(() => isLoading = true);
+                        onConfirmAsync().whenComplete(() {
+                          if (dialogCtx.mounted) Navigator.of(dialogCtx).pop();
+                        });
+                      } else {
+                        Navigator.of(dialogCtx).pop();
+                        onConfirm?.call();
+                      }
+                    },
+            ),
+          ],
         ),
-      ],
-    ),
+      );
+    },
   );
 }
 

package/templates/firebase/lib/components/kasy_sidebar.dart

@@ -213,8 +213,14 @@ class KasySidebar extends StatefulWidget {
     this.profileAvatar,
     this.profileGradient = KasyAvatarGradients.indigo,
     this.onProfileTap,
+    this.notificationsUnread = 0,
   });
 
+  /// Unread notification count. When greater than zero, the Notifications nav
+  /// item shows an unread dot (mirrors the bottom-bar badge). Purely an unread
+  /// indicator — not tied to push (which is native-only).
+  final int notificationsUnread;
+
   final VoidCallback? onSettingsTap;
 
   /// Whether the profile block is shown at the bottom of the rail. Set false to
@@ -496,6 +502,9 @@ class _KasySidebarState extends State<KasySidebar> {
                             : (widget.routes![i].label ?? ''),
                         isActive: _activeItemId.isEmpty && currentIndex == i,
                         onTap: () => _navigateTo(i),
+                        showBadge: i < meta.length &&
+                            meta[i].icon == KasyIcons.notification &&
+                            widget.notificationsUnread > 0,
                       ),
                     // Static showcase extras (incl. the Income submenu).
                     for (final item in _kMainItems.skip(1))
@@ -842,6 +851,37 @@ class _KasySidebarState extends State<KasySidebar> {
 
   // ── Generic row (expanded) / icon+tooltip (collapsed) ────────────────────────
 
+  /// Overlays a small unread dot on the top-right of [child] when [show] is true.
+  /// The dot carries a thin border in the sidebar background color so it reads
+  /// cleanly over the icon.
+  Widget _withBadgeDot({
+    required Widget child,
+    required bool show,
+    required Color dotColor,
+    required Color borderColor,
+  }) {
+    if (!show) return child;
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        child,
+        Positioned(
+          top: -2,
+          right: -2,
+          child: Container(
+            width: 8,
+            height: 8,
+            decoration: BoxDecoration(
+              color: dotColor,
+              shape: BoxShape.circle,
+              border: Border.all(color: borderColor, width: 1.5),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
   Widget _buildItemRow(
     _SidebarColors c, {
     required IconData icon,
@@ -849,6 +889,7 @@ class _KasySidebarState extends State<KasySidebar> {
     required bool isActive,
     required VoidCallback onTap,
     bool isLogout = false,
+    bool showBadge = false,
     List<Widget> trailing = const [],
     double bottomGap = _kItemGap,
   }) {
@@ -861,14 +902,19 @@ class _KasySidebarState extends State<KasySidebar> {
     if (_collapsed) {
       return Padding(
         padding: EdgeInsets.only(bottom: bottomGap),
-        child: _ProTooltipIcon(
-          icon: icon,
-          label: label,
-          iconBg: fill,
-          iconColor: iconColor,
-          activeBg: c.activeBg,
-          colors: c,
-          onTap: onTap,
+        child: _withBadgeDot(
+          show: showBadge,
+          dotColor: c.logout,
+          borderColor: c.bg,
+          child: _ProTooltipIcon(
+            icon: icon,
+            label: label,
+            iconBg: fill,
+            iconColor: iconColor,
+            activeBg: c.activeBg,
+            colors: c,
+            onTap: onTap,
+          ),
         ),
       );
     }
@@ -894,7 +940,12 @@ class _KasySidebarState extends State<KasySidebar> {
           ),
           child: Row(
             children: [
-              Icon(icon, size: _kIconSize, color: iconColor),
+              _withBadgeDot(
+                show: showBadge,
+                dotColor: c.logout,
+                borderColor: c.bg,
+                child: Icon(icon, size: _kIconSize, color: iconColor),
+              ),
               const SizedBox(width: _kIconGap),
               Expanded(
                 child: Text(

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

@@ -14,6 +14,7 @@ import 'package:kasy_kit/core/states/logout_action.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/responsive_layout.dart';
+import 'package:kasy_kit/features/notifications/providers/unread_notifications_count_provider.dart';
 import 'package:kasy_kit/features/settings/ui/widgets/kasy_user_avatar.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
 
@@ -64,6 +65,10 @@ class BottomMenu extends StatelessWidget {
                 builder: (context, ref, _) {
                   final User user =
                       ref.watch(userStateNotifierProvider).user;
+                  final int unread = ref
+                      .watch(unreadNotificationsCountProvider)
+                      .value ??
+                      0;
                   final (String name, String email) = switch (user) {
                     final AuthenticatedUserData u => (
                       (u.name?.isNotEmpty ?? false)
@@ -81,6 +86,7 @@ class BottomMenu extends StatelessWidget {
                     profileName: name,
                     profileEmail: email,
                     profileAvatar: const KasyUserAvatar(),
+                    notificationsUnread: unread,
                   );
                 },
               ),

package/templates/firebase/lib/core/bottom_menu/notification_bottom_item.dart

@@ -1,48 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/core/theme/theme.dart';
-import 'package:kasy_kit/features/notifications/repositories/notifications_repository.dart';
+import 'package:kasy_kit/features/notifications/providers/unread_notifications_count_provider.dart';
 
-class BottomItemNotification extends ConsumerStatefulWidget {
+/// Bottom-bar notifications icon with an unread-count badge.
+///
+/// The badge is purely an unread indicator (works on web too) — it is not tied
+/// to push notifications, which are native-only. The count comes from the shared
+/// [unreadNotificationsCountProvider], which re-subscribes per signed-in user.
+class BottomItemNotification extends ConsumerWidget {
   const BottomItemNotification({super.key});
 
   @override
-  ConsumerState<ConsumerStatefulWidget> createState() =>
-      _BottomItemNotificationState();
-}
-
-class _BottomItemNotificationState
-    extends ConsumerState<BottomItemNotification> {
-  Stream<int>? _count$;
-
-  @override
-  Widget build(BuildContext context) {
-    final String? userId =
-        ref.watch(userStateNotifierProvider).user.idOrNull;
+  Widget build(BuildContext context, WidgetRef ref) {
     const icon = Icon(KasyIcons.notification);
-
-    if (userId == null) {
-      return icon;
-    }
-
-    _count$ ??= ref
-        .read(notificationRepositoryProvider)
-        .listenToUnreadNotificationsCount(userId);
-
-    return StreamBuilder<int>(
-      key: const ValueKey('notification-count'),
-      stream: _count$,
-      builder: (context, snapshot) {
-        final count = snapshot.data ?? 0;
-        if (count == 0) return icon;
-        return Badge(
-          backgroundColor: context.colors.error,
-          textColor: context.colors.onPrimary,
-          label: Text(count > 99 ? '99+' : '$count'),
-          child: icon,
-        );
-      },
+    final int count =
+        ref.watch(unreadNotificationsCountProvider).value ?? 0;
+    if (count == 0) return icon;
+    return Badge(
+      backgroundColor: context.colors.error,
+      textColor: context.colors.onError,
+      label: Text(count > 99 ? '99+' : '$count'),
+      child: icon,
     );
   }
 }

package/templates/firebase/lib/features/notifications/providers/unread_notifications_count_provider.dart

@@ -0,0 +1,17 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/states/user_state_notifier.dart';
+import 'package:kasy_kit/features/notifications/repositories/notifications_repository.dart';
+
+/// Live count of the signed-in user's unread notifications. Emits 0 when there
+/// is no user. Shared source for badging the notifications item everywhere it
+/// appears in the navigation (bottom bar, sidebar).
+///
+/// Watches the user id, so it automatically re-subscribes to the right stream
+/// when the account changes (avoids leaking the previous user's count).
+final unreadNotificationsCountProvider = StreamProvider.autoDispose<int>((ref) {
+  final String? userId = ref.watch(userStateNotifierProvider).user.idOrNull;
+  if (userId == null) return Stream<int>.value(0);
+  return ref
+      .read(notificationRepositoryProvider)
+      .listenToUnreadNotificationsCount(userId);
+});

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

@@ -14,15 +14,34 @@ class DeleteUserButton extends ConsumerWidget {
       label: t.settings.delete_account.button,
       variant: KasyButtonVariant.ghost,
       foregroundColor: context.colors.muted,
-      onPressed: () => showKasyConfirmDialog(
+      onPressed: () {
+        // Only warn about losing the subscription when the user actually has an
+        // active one — otherwise the generic permanent-deletion warning.
+        final bool isSubscriber =
+            ref.read(userStateNotifierProvider).subscription?.isActive ?? false;
+        final account = t.settings.delete_account;
+        showKasyConfirmDialog(
         context,
-        title: t.settings.delete_account.title,
-        message: t.settings.delete_account.content,
-        cancelLabel: t.settings.delete_account.cancel,
-        confirmLabel: t.settings.delete_account.confirm,
+        title: account.title,
+        message: isSubscriber ? account.content_subscriber : account.content,
+        cancelLabel: account.cancel,
+        confirmLabel: account.confirm,
         destructive: true,
-        onConfirm: () => ref.read(userStateNotifierProvider.notifier).deleteAccount(),
-      ),
+        onConfirmAsync: () async {
+          try {
+            await ref.read(userStateNotifierProvider.notifier).deleteAccount();
+          } catch (_) {
+            if (context.mounted) {
+              showKasyToast(
+                context,
+                title: t.settings.delete_account.error,
+                tone: KasyToastTone.danger,
+              );
+            }
+          }
+        },
+        );
+      },
     );
   }
 }

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

@@ -502,9 +502,11 @@
         "delete_account": {
             "button": "I want to delete my account",
             "title": "Delete your account?",
-            "content": "Warning: this action is irreversible.",
+            "content": "Warning: this action is permanent and cannot be undone.",
+            "content_subscriber": "Warning: this is permanent. You will lose your active subscription, and creating a new account later (even with the same email) will not restore it.",
             "cancel": "Cancel",
-            "confirm": "Yes, delete"
+            "confirm": "Yes, delete",
+            "error": "Something went wrong. Please try again."
         },
         "admin": {
             "update_bottom_sheet": "Update bottom sheet",

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

@@ -502,9 +502,11 @@
         "delete_account": {
             "button": "Quiero eliminar mi cuenta",
             "title": "¿Quieres eliminar tu cuenta?",
-            "content": "Advertencia: esta acción es irreversible.",
+            "content": "Advertencia: esta acción es permanente y no se puede deshacer.",
+            "content_subscriber": "Advertencia: esta acción es permanente. Perderás tu suscripción activa, y crear una cuenta nueva más tarde (incluso con el mismo correo) no la recuperará.",
             "cancel": "Cancelar",
-            "confirm": "Sí, eliminar"
+            "confirm": "Sí, eliminar",
+            "error": "Algo salió mal. Por favor, inténtalo de nuevo."
         },
         "admin": {
             "update_bottom_sheet": "Actualizar bottom sheet",

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

@@ -502,9 +502,11 @@
         "delete_account": {
             "button": "Quero excluir minha conta",
             "title": "Quer excluir sua conta?",
-            "content": "Atenção: esta ação é irreversível.",
+            "content": "Atenção: esta ação é permanente e não pode ser desfeita.",
+            "content_subscriber": "Atenção: esta ação é permanente. Você perde sua assinatura ativa, e criar uma nova conta depois (mesmo com o mesmo e-mail) não recupera ela.",
             "cancel": "Cancelar",
-            "confirm": "Sim, excluir"
+            "confirm": "Sim, excluir",
+            "error": "Algo deu errado. Por favor, tente novamente."
         },
         "admin": {
             "update_bottom_sheet": "Atualizar bottom sheet",