kasy-cli 1.13.0 → 1.14.0

package/templates/firebase/functions/src/core/data/entities/user_device_entity.ts

@@ -16,6 +16,9 @@ export interface UserDeviceEntityData {
     operatingSystem: UserDeviceTypes;
     type: UserDeviceTypes;
     creation_date: Timestamp;
+    // Heartbeat timestamp written by the Flutter client. The field name matches
+    // what the client actually serializes (camelCase) — see device_entity.g.dart.
+    lastUpdateDate?: Timestamp;
     extra_data?: { [key: string]: string };
 }
 

package/templates/firebase/functions/src/core/data/repositories/user_device_repository.ts

@@ -1,5 +1,12 @@
+import {Timestamp} from "firebase-admin/firestore";
 import {UserDeviceAdapter, UserDeviceEntity} from "../entities/user_device_entity";
 
+// Devices that did not heartbeat within this window are treated as orphans
+// from prior installs (a fresh install creates a new doc with a different
+// installationId). Skipping them avoids sending the same push multiple times
+// to the same physical device after re-installs (e.g. Xcode -> TestFlight).
+const STALE_DEVICE_TTL_MS = 60 * 24 * 60 * 60 * 1000;
+
 export class UserDevicesRepository {
   constructor(
         private db: FirebaseFirestore.Firestore,
@@ -17,10 +24,19 @@ export class UserDevicesRepository {
   }
 
   async getDevices(userIds: string[]): Promise<UserDeviceEntity[]> {
+    const cutoffMs = Date.now() - STALE_DEVICE_TTL_MS;
     const result: UserDeviceEntity[] = [];
     for (const userId of userIds) {
       const userResult = await this.collection(userId).get();
-      result.push(...userResult.docs.map((doc) => doc.data()));
+      for (const doc of userResult.docs) {
+        const device = doc.data();
+        // Backward-compat: docs without lastUpdateDate (older app versions) pass through.
+        const lastUpdate = device.lastUpdateDate;
+        if (lastUpdate instanceof Timestamp && lastUpdate.toMillis() < cutoffMs) {
+          continue;
+        }
+        result.push(device);
+      }
     }
     return result;
   }

package/templates/firebase/functions/src/index.ts

@@ -13,6 +13,7 @@ exports.authFunctions = require("./authentication/functions");
 // notifications
 exports.notificationsTriggers = require("./notifications/triggers");
 exports.notificationsFunctions = require("./notifications/admin_functions");
+exports.deviceTriggers = require("./notifications/device_triggers");
 
 // subscriptions
 exports.subscriptions = require("./subscriptions/subscriptions_functions");

package/templates/firebase/functions/src/notifications/device_triggers.ts

@@ -0,0 +1,58 @@
+import * as admin from "firebase-admin";
+import {onDocumentWritten} from "firebase-functions/v2/firestore";
+import {Logger} from "../core/logger/logger";
+
+/**
+ * Cross-user device token deduplication.
+ *
+ * Fires when any `users/{userId}/devices/{deviceId}` doc is written. If the
+ * same FCM token exists under another user (typical scenario: logout failed
+ * offline, then the same install registered under a new account), the older
+ * docs are deleted. Winner = the doc that was just written (most recent intent).
+ *
+ * This guarantees the invariant: one FCM token belongs to at most one user at
+ * any time. Without it, sending a push to user A could deliver to a phone now
+ * signed in as user B.
+ */
+export const onDeviceWritten = onDocumentWritten(
+  "users/{userId}/devices/{deviceId}",
+  async (event) => {
+    const after = event.data?.after?.data();
+    if (!after) return; // Deletion — nothing to dedup against.
+
+    const token = after.token as string | undefined;
+    if (!token) return;
+
+    const currentUserId = event.params.userId;
+    const currentDeviceId = event.params.deviceId;
+    const logger = new Logger("onDeviceWritten");
+
+    try {
+      const duplicates = await admin
+        .firestore()
+        .collectionGroup("devices")
+        .where("token", "==", token)
+        .get();
+
+      const batch = admin.firestore().batch();
+      let staleCount = 0;
+      for (const doc of duplicates.docs) {
+        const parentUserId = doc.ref.parent.parent?.id;
+        if (parentUserId === currentUserId && doc.id === currentDeviceId) {
+          continue;
+        }
+        batch.delete(doc.ref);
+        staleCount++;
+      }
+
+      if (staleCount > 0) {
+        await batch.commit();
+        logger.info(
+          `Removed ${staleCount} duplicate device doc(s) for token …${token.slice(-8)} ` +
+          `after write at users/${currentUserId}/devices/${currentDeviceId}`,
+        );
+      }
+    } catch (e) {
+      logger.error(`Cross-user device dedup failed: ${e}`);
+    }
+  });

package/templates/firebase/ios/HomeWidgetExtension/MyWidget.swift

@@ -3,18 +3,11 @@ import SwiftUI
 
 struct MyWidgetProvider: TimelineProvider {
     func placeholder(in context: Context) -> MyWidgetEntry {
-        MyWidgetEntry(date: Date(), greeting: "", title: "", planText: "", isPro: false)
+        MyWidgetEntry.defaults()
     }
 
     func getSnapshot(in context: Context, completion: @escaping (MyWidgetEntry) -> Void) {
-        let prefs = UserDefaults(suiteName: "group.com.aicrus.firebase.kit")
-        completion(MyWidgetEntry(
-            date: Date(),
-            greeting: prefs?.string(forKey: "greeting") ?? "",
-            title: prefs?.string(forKey: "title") ?? "",
-            planText: prefs?.string(forKey: "planText") ?? "",
-            isPro: prefs?.string(forKey: "isPro") == "true"
-        ))
+        completion(MyWidgetEntry.fromPrefs())
     }
 
     func getTimeline(in context: Context, completion: @escaping (Timeline<MyWidgetEntry>) -> Void) {
@@ -30,12 +23,62 @@ struct MyWidgetEntry: TimelineEntry {
     let title: String
     let planText: String
     let isPro: Bool
+    let quote: String
+
+    /// Reads the latest data from the shared app group. If a string was never
+    /// written (first install before the Flutter app pushed data), falls back
+    /// to a time-based greeting in the device language so the widget never
+    /// shows a blank gradient.
+    static func fromPrefs() -> MyWidgetEntry {
+        let prefs = UserDefaults(suiteName: "group.com.aicrus.firebase.kit")
+        let storedGreeting = prefs?.string(forKey: "greeting") ?? ""
+        let storedTitle = prefs?.string(forKey: "title") ?? ""
+        let storedPlan = prefs?.string(forKey: "planText") ?? ""
+        let storedIsPro = prefs?.string(forKey: "isPro") == "true"
+        let storedQuote = prefs?.string(forKey: "quote") ?? ""
+
+        let defaults = MyWidgetEntry.defaults()
+        return MyWidgetEntry(
+            date: Date(),
+            greeting: storedGreeting.isEmpty ? defaults.greeting : storedGreeting,
+            title: storedTitle.isEmpty ? defaults.title : storedTitle,
+            planText: storedPlan,
+            isPro: storedIsPro,
+            quote: storedQuote
+        )
+    }
+
+    /// Time-aware fallback used when the Flutter side has not yet written
+    /// data. Picks the language from the device locale so the first render
+    /// is at least in the user's language; once the app runs, the real
+    /// values (in the app locale) overwrite this.
+    static func defaults() -> MyWidgetEntry {
+        let hour = Calendar.current.component(.hour, from: Date())
+        let lang = Locale.current.language.languageCode?.identifier ?? "en"
+        let (morning, afternoon, evening, hello): (String, String, String, String)
+        switch lang {
+        case "pt": (morning, afternoon, evening, hello) = ("Bom dia", "Boa tarde", "Boa noite", "Olá!")
+        case "es": (morning, afternoon, evening, hello) = ("Buenos días", "Buenas tardes", "Buenas noches", "¡Hola!")
+        default:   (morning, afternoon, evening, hello) = ("Good morning", "Good afternoon", "Good evening", "Hi there!")
+        }
+        let greeting: String
+        if hour < 12 { greeting = morning }
+        else if hour < 18 { greeting = afternoon }
+        else { greeting = evening }
+        return MyWidgetEntry(
+            date: Date(),
+            greeting: greeting,
+            title: hello,
+            planText: "",
+            isPro: false,
+            quote: ""
+        )
+    }
 }
 
 struct MyWidgetWidgetView: View {
     var entry: MyWidgetProvider.Entry
     @Environment(\.widgetFamily) var family
-    @Environment(\.colorScheme) var colorScheme
 
     private var titleSize: CGFloat {
         switch family {
@@ -45,15 +88,6 @@ struct MyWidgetWidgetView: View {
         }
     }
 
-    private var gradientColors: [Color] {
-        // Dark theme stays the same in both light/dark modes for brand consistency;
-        // tweak here if you want true light-mode variant.
-        return [
-            Color(red: 0.08, green: 0.03, blue: 0.16),
-            Color(red: 0.20, green: 0.09, blue: 0.42),
-        ]
-    }
-
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             Text(entry.greeting)
@@ -63,26 +97,69 @@ struct MyWidgetWidgetView: View {
 
             Spacer().frame(height: 6)
 
+            // Reserve room on the right so the title never sits flush against
+            // the widget edge (looks cramped, especially on small).
             Text(entry.title)
                 .font(.system(size: titleSize, weight: .bold, design: .rounded))
                 .foregroundStyle(.white)
                 .lineLimit(2)
                 .minimumScaleFactor(0.75)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .padding(.trailing, 8)
+
+            // Motivational quote only on the large widget — small/medium
+            // don't have the vertical room. Thin, low-emphasis typography
+            // so the title stays the hero element.
+            if family == .systemLarge && !entry.quote.isEmpty {
+                Spacer().frame(height: 12)
+                Text(entry.quote)
+                    .font(.system(size: 15, weight: .light, design: .rounded))
+                    .italic()
+                    .foregroundStyle(.white.opacity(0.7))
+                    .lineLimit(4)
+                    .lineSpacing(2)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.trailing, 8)
+            }
 
             Spacer()
 
-            if entry.isPro {
-                Label(entry.planText, systemImage: "star.fill")
-                    .font(.system(size: 10, weight: .bold, design: .rounded))
-                    .foregroundStyle(Color(red: 1.0, green: 0.84, blue: 0.0))
-                    .padding(.horizontal, 8)
-                    .padding(.vertical, 4)
-                    .background(Color(red: 1.0, green: 0.84, blue: 0.0).opacity(0.18))
-                    .clipShape(Capsule())
-            } else {
-                Text(entry.planText)
-                    .font(.system(size: 10, weight: .medium, design: .rounded))
-                    .foregroundStyle(.white.opacity(0.4))
+            // Plan tag + (medium/large only) decorative "+" pill.
+            // Small intentionally drops the "+" so the layout breathes —
+            // the pill sits flush left like the original design.
+            // Empty planText hides the pill (used in logged-out state).
+            HStack(alignment: .center, spacing: 8) {
+                if !entry.planText.isEmpty {
+                    if entry.isPro {
+                        Label(entry.planText, systemImage: "star.fill")
+                            .font(.system(size: 11, weight: .bold, design: .rounded))
+                            .foregroundStyle(Color(red: 1.0, green: 0.84, blue: 0.0))
+                            .padding(.horizontal, 10)
+                            .padding(.vertical, 5)
+                            .background(Color(red: 1.0, green: 0.84, blue: 0.0).opacity(0.18))
+                            .clipShape(Capsule())
+                    } else {
+                        Text(entry.planText)
+                            .font(.system(size: 11, weight: .medium, design: .rounded))
+                            .foregroundStyle(.white.opacity(0.45))
+                            .padding(.horizontal, 10)
+                            .padding(.vertical, 5)
+                            .background(Color.white.opacity(0.08))
+                            .clipShape(Capsule())
+                    }
+                }
+
+                if family != .systemSmall {
+                    Spacer(minLength: 12)
+                    ZStack {
+                        Circle()
+                            .fill(Color.white.opacity(0.18))
+                            .frame(width: 34, height: 34)
+                        Image(systemName: "plus")
+                            .font(.system(size: 16, weight: .bold))
+                            .foregroundStyle(.white)
+                    }
+                }
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
@@ -116,11 +193,17 @@ struct MyWidgetWidget: Widget {
 #Preview("Small", as: .systemSmall) {
     MyWidgetWidget()
 } timeline: {
-    MyWidgetEntry(date: .now, greeting: "Bom dia", title: "Olá, Paulo!", planText: "PRO", isPro: true)
+    MyWidgetEntry(date: .now, greeting: "Bom dia", title: "Olá, Paulo!", planText: "PRO", isPro: true, quote: "")
 }
 
 #Preview("Medium", as: .systemMedium) {
     MyWidgetWidget()
 } timeline: {
-    MyWidgetEntry(date: .now, greeting: "Boa tarde", title: "Olá, Paulo!", planText: "Plano grátis", isPro: false)
+    MyWidgetEntry(date: .now, greeting: "Boa tarde", title: "Olá, Paulo!", planText: "Plano grátis", isPro: false, quote: "")
+}
+
+#Preview("Large", as: .systemLarge) {
+    MyWidgetWidget()
+} timeline: {
+    MyWidgetEntry(date: .now, greeting: "Boa noite", title: "Olá, Paulo!", planText: "PRO", isPro: true, quote: "Sempre parece impossível, até que seja feito.")
 }

package/templates/firebase/ios/Runner/AppDelegate.swift

@@ -12,7 +12,23 @@ import home_widget
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-      return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+      let result = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+      applySavedThemeMode()
+      return result
+  }
+
+  // Forces the window's interface style to match the user's saved theme
+  // preference (read from `shared_preferences`) so the native splash overlay
+  // follows the in-app choice instead of only the OS brightness.
+  private func applySavedThemeMode() {
+      let saved = UserDefaults.standard.string(forKey: "flutter.themeMode")
+      let style: UIUserInterfaceStyle
+      switch saved {
+      case "dark": style = .dark
+      case "light": style = .light
+      default: style = .unspecified
+      }
+      window?.overrideUserInterfaceStyle = style
   }
 
   func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {

package/templates/firebase/ios/Runner/Info.plist

@@ -18,7 +18,7 @@
 			<string>pt-BR</string>
 		</array>
 		<key>CFBundleDisplayName</key>
-		<string>AppFirebase</string>
+		<string>Kasy App</string>
 		<key>CFBundleExecutable</key>
 		<string>$(EXECUTABLE_NAME)</string>
 		<key>CFBundleIdentifier</key>
@@ -57,7 +57,7 @@
 		<key>FacebookClientToken</key>
 		<string>00000000000000000000000000000000</string>
 		<key>FacebookDisplayName</key>
-		<string>AppFirebase</string>
+		<string>Kasy App</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>NSPhotoLibraryAddUsageDescription</key>

package/templates/firebase/ios/Runner/es.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized Info.plist strings — es resources for system picker/camera UI (iOS). */
-"CFBundleDisplayName" = "AppFirebase";
+"CFBundleDisplayName" = "Kasy App";
 "NSCameraUsageDescription" = "Necesitamos la cámara para tomar fotos y vídeos.";
 "NSPhotoLibraryAddUsageDescription" = "Necesitamos acceso para guardar fotos y vídeos en la galería.";
 "NSPhotoLibraryUsageDescription" = "Necesitamos acceso para mostrar tus fotos recientes y abrir la galería desde la cámara.";

package/templates/firebase/ios/Runner/pt-BR.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized Info.plist strings — presence of pt-BR resources lets iOS use Portuguese for system UI (e.g. image picker). */
-"CFBundleDisplayName" = "AppFirebase";
+"CFBundleDisplayName" = "Kasy App";
 "NSCameraUsageDescription" = "Precisamos da câmera para tirar fotos e vídeos.";
 "NSPhotoLibraryAddUsageDescription" = "Precisamos de acesso para salvar fotos e vídeos na galeria.";
 "NSPhotoLibraryUsageDescription" = "Precisamos de acesso para mostrar suas fotos recentes e abrir a galeria a partir da câmera.";

package/templates/firebase/ios/Runner/pt.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized Info.plist strings — presence of pt-BR resources lets iOS use Portuguese for system UI (e.g. image picker). */
-"CFBundleDisplayName" = "AppFirebase";
+"CFBundleDisplayName" = "Kasy App";
 "NSCameraUsageDescription" = "Precisamos da câmera para tirar fotos e vídeos.";
 "NSPhotoLibraryAddUsageDescription" = "Precisamos de acesso para salvar fotos e vídeos na galeria.";
 "NSPhotoLibraryUsageDescription" = "Precisamos de acesso para mostrar suas fotos recentes e abrir a galeria a partir da câmera.";

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

@@ -377,6 +377,9 @@ class KasyButton extends StatelessWidget {
     }
     final KasyColors c = context.colors;
     final Color soft = c.surfaceNeutralSoft;
+    // Variants used on non-theme-matched backgrounds (e.g. inverse on the paywall gradient)
+    // need an explicit case — the generic disabled fallback blends with surfaceNeutralSoft,
+    // which goes near-black in dark mode and kills contrast on colored surfaces.
     return switch (variant) {
       KasyButtonVariant.primary => _KasyButtonPalette(
         background: Color.alphaBlend(c.primary.withValues(alpha: 0.62), soft),
@@ -388,6 +391,11 @@ class KasyButton extends StatelessWidget {
         foreground: c.primary.withValues(alpha: 0.90),
         border: Colors.transparent,
       ),
+      KasyButtonVariant.inverse => _KasyButtonPalette(
+        background: c.onPrimary,
+        foreground: c.primary.withValues(alpha: 0.62),
+        border: Colors.transparent,
+      ),
       _ => null,
     };
   }

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

@@ -96,11 +96,29 @@ final class KasyPaddedSurfaceBottomBarFactory extends BartBottomBarFactory {
           ),
           Theme(
             data: Theme.of(context).copyWith(
+              splashFactory: NoSplash.splashFactory,
+              splashColor: Colors.transparent,
+              highlightColor: Colors.transparent,
               navigationBarTheme: NavigationBarTheme.of(context).copyWith(
                 backgroundColor: Colors.transparent,
                 elevation: 0,
                 shadowColor: Colors.transparent,
                 surfaceTintColor: Colors.transparent,
+                indicatorColor: Colors.transparent,
+                iconTheme: WidgetStateProperty.resolveWith((states) {
+                  final selected = states.contains(WidgetState.selected);
+                  return IconThemeData(
+                    color: selected ? colors.primary : colors.muted,
+                  );
+                }),
+                labelTextStyle: WidgetStateProperty.resolveWith((states) {
+                  final selected = states.contains(WidgetState.selected);
+                  final base = Theme.of(context).textTheme.labelMedium ??
+                      const TextStyle();
+                  return base.copyWith(
+                    color: selected ? colors.primary : colors.muted,
+                  );
+                }),
               ),
             ),
             child: BartMaterial3BottomBar(

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

@@ -1,7 +1,10 @@
+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';
-import 'package:kasy_kit/core/states/translations.dart';
 import 'package:kasy_kit/core/states/user_state_notifier.dart';
 import 'package:kasy_kit/features/subscription/repositories/subscription_repository.dart';
 import 'package:kasy_kit/i18n/translations.g.dart';
@@ -19,10 +22,11 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
   @override
   void build() {
     // Auto-refresh the widget whenever user state changes in a way that
-    // affects what it renders (login/logout, name, premium status). Without
-    // this, the widget would only update via the 15-min background task or
-    // a manual trigger — a fresh subscription would not reflect on the home
-    // screen until the next background tick.
+    // affects what it renders (login/logout, name, email, premium status).
+    // The initial render is triggered explicitly by HomeWidgetsManager.init()
+    // after setAppGroupId completes — putting it here would race with the
+    // app-group setup and the first saveWidgetData could land in the wrong
+    // UserDefaults suite.
     ref.listen(userStateNotifierProvider, (previous, next) {
       if (previous == null) return;
       if (_widgetSignature(previous.user) != _widgetSignature(next.user)) {
@@ -33,7 +37,7 @@ 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?, bool) _widgetSignature(User user) {
+  (String?, String?, String?, bool) _widgetSignature(User user) {
     final isPro = switch (user) {
       AuthenticatedUserData(:final subscription) ||
       AnonymousUserData(:final subscription) =>
@@ -44,34 +48,62 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       AuthenticatedUserData(:final name) => name,
       _ => null,
     };
-    return (user.idOrNull, name, isPro);
+    final email = switch (user) {
+      AuthenticatedUserData(:final email) => email,
+      _ => null,
+    };
+    return (user.idOrNull, name, email, isPro);
   }
 
   @override
-  Future<void> update() async {
+  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 {
     final logger = Logger();
-    logger.i('🔄 Updating MyWidget Home Widget');
+    logger.i('🔄 Updating MyWidget Home Widget (${locale.languageCode})');
     final user = ref.read(userStateNotifierProvider).user;
-    final t = ref.read(translationsProvider);
+    final t = locale.translations;
+
+    // "Logged out" = no user id at all (post-logout in authRequired mode, or
+    // before any anonymous signup completes). In this state we show a
+    // come-back message and hide the plan tag — showing a plan would be
+    // misleading when there is no account behind it.
+    final isLoggedOut = user.idOrNull == null;
 
     final name = switch (user) {
       AuthenticatedUserData(:final name)
           when name != null && name.isNotEmpty =>
         name.split(' ').first,
+      // Fallback when the Firestore profile has no name yet: derive a
+      // display name from the email local-part (matches what the
+      // settings page shows).
+      AuthenticatedUserData(:final email) => email.split('@').first,
       _ => null,
     };
 
-    final isPro = await _resolveIsPro(user);
+    final isPro = !isLoggedOut && await _resolveIsPro(user);
 
     final greeting = _greeting(t);
-    final title = name == null
-        ? t.home_widget.title_default
-        : t.home_widget.title_with_name(name: name);
-    final planText = isPro ? t.home_widget.plan_pro : t.home_widget.plan_free;
+    final title = isLoggedOut
+        ? t.home_widget.title_logged_out
+        : name == null
+            ? t.home_widget.title_default
+            : t.home_widget.title_with_name(name: name);
+    // Empty planText is the contract used by the native widget to skip
+    // rendering the pill — see MyWidget.swift / MyWidget.kt.
+    final planText = isLoggedOut
+        ? ''
+        : (isPro ? t.home_widget.plan_pro : t.home_widget.plan_free);
+    final quote = t.home_widget.quote;
 
     logger.d(
       'Widget payload → greeting: "$greeting", title: "$title", '
-      'planText: "$planText", isPro: $isPro',
+      'planText: "$planText", isPro: $isPro, loggedOut: $isLoggedOut',
     );
 
     return updateWidget({
@@ -79,6 +111,7 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
       'title': title,
       'planText': planText,
       'isPro': isPro.toString(),
+      'quote': quote,
     });
   }
 
@@ -98,9 +131,14 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     if (userId == null) return cached;
     try {
       final repo = ref.read(subscriptionRepositoryProvider);
-      await repo.initUser(userId);
-      final fresh = await repo.get(userId);
-      return fresh.isActive;
+      // 2s timeout — if RevenueCat/network is slow, fall back to the cached
+      // value so the widget renders promptly on first install. The next
+      // background tick (or any user-state change) will reconcile later.
+      return await Future(() async {
+        await repo.initUser(userId);
+        final fresh = await repo.get(userId);
+        return fresh.isActive;
+      }).timeout(const Duration(seconds: 2), onTimeout: () => cached);
     } catch (e) {
       Logger().w('Widget could not refresh subscription: $e (using cached)');
       return cached;
@@ -112,6 +150,16 @@ class MyWidgetHomeWidget extends _$MyWidgetHomeWidget
     await HomeWidget.saveWidgetData<String>('title', data['title'] ?? '');
     await HomeWidget.saveWidgetData<String>('planText', data['planText'] ?? '');
     await HomeWidget.saveWidgetData<String>('isPro', data['isPro'] ?? 'false');
+    await HomeWidget.saveWidgetData<String>('quote', data['quote'] ?? '');
+
+    // On Android, saveWidgetData writes to SharedPreferences asynchronously.
+    // Glance's HomeWidgetGlanceStateDefinition reads from the same prefs, but
+    // a tight saveWidgetData→updateWidget sequence can race with the commit —
+    // Glance occasionally recomposes with the previous values (most visible
+    // right after a locale change). A small yield lets the writes settle.
+    if (!kIsWeb && Platform.isAndroid) {
+      await Future<void>.delayed(const Duration(milliseconds: 120));
+    }
 
     await HomeWidget.updateWidget(
       name: _androidWidgetName,