kasy-cli 1.32.0 → 1.35.0

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

@@ -0,0 +1,20 @@
+import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:universal_html/html.dart' as html;
+
+/// Forces the browser address bar to [path] on web (no-op on native).
+///
+/// Why this exists: the bottom bar (Bart) writes each tab's URL directly via
+/// `history.pushState`, bypassing GoRouter — and it never writes the Home tab's
+/// URL (Bart short-circuits when the tab index doesn't change, and Home is the
+/// default index). So after a fresh login forces Home, GoRouter is at `/` but
+/// the address bar still shows the previous session's tab (e.g. `/settings`),
+/// and `go('/')` is a no-op because GoRouter already considers itself at `/`.
+///
+/// `replaceState` (not `pushState`) so the stale entry is corrected in place,
+/// without adding a bogus history step the user could "back" into.
+void syncBrowserUrl(String path) {
+  if (!kIsWeb) {
+    return;
+  }
+  html.window.history.replaceState(null, '', path);
+}

package/templates/firebase/lib/core/chrome/chrome_visibility.dart

@@ -71,6 +71,28 @@ class KasyChromeVisibility {
   }
 }
 
+/// Brings the chrome back whenever a route is pushed onto or popped from the
+/// root navigator. Tab switches already reset via [BartScaffold.onRouteChanged],
+/// but detail screens (feedback, reminders, …) are pushed on the root navigator
+/// and bypass that — so without this, returning to a screen that had scrolled
+/// its chrome away would leave the app bar and bottom menu stuck hidden.
+///
+/// Only the chrome is restored; the destination screen keeps its scroll position
+/// (the framework preserves it), matching how large apps handle back navigation.
+class KasyChromeVisibilityObserver extends NavigatorObserver {
+  void _reset() => KasyChromeVisibility.instance.resetShown();
+
+  @override
+  void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) => _reset();
+
+  @override
+  void didPop(Route<dynamic> route, Route<dynamic>? previousRoute) => _reset();
+
+  @override
+  void didReplace({Route<dynamic>? newRoute, Route<dynamic>? oldRoute}) =>
+      _reset();
+}
+
 // ---------------------------------------------------------------------------
 // Configuration — edit these to change the experience your app ships with.
 // ---------------------------------------------------------------------------

package/templates/firebase/lib/core/config/features.dart

@@ -12,6 +12,11 @@ const bool withLocalReminders  = true;
 /// the CLI generates them as `false`. Apple shows on iOS/macOS regardless; it is
 /// hidden on Android (also needs a paid Service ID, and the native flow throws).
 const bool withAppleWebSignin = true;
+/// When true, the Facebook sign-in button is shown on WEB. Facebook-on-web works
+/// on the Firebase backend (signInWithPopup) after `kasy facebook`; on Supabase the
+/// web flow isn't wired yet (roadmap), so the CLI ships this `false` there. Native
+/// (iOS/Android) always shows the Facebook button regardless of this flag.
+const bool withFacebookWebSignin = false;
 /// When true, the app includes web support:
 ///   - anonymous sign-up is disabled on web (user is redirected to /signin)
 ///   - onboarding is skipped on web

package/templates/firebase/lib/core/data/api/remote_config_api.dart

@@ -1,4 +1,5 @@
 import 'package:firebase_remote_config/firebase_remote_config.dart';
+import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:kasy_kit/core/initializer/onstart_service.dart';
 import 'package:logger/logger.dart';
@@ -17,6 +18,18 @@ final remoteConfigApiProvider = Provider<RemoteConfigApi>(
           api: remoteConfigWrapper,
         ),
       ),
+      appUpdate: AppUpdateConfigs(
+        latestVersion: FirebaseRemoteConfigData<String>(
+          key: 'app_latest_version',
+          api: remoteConfigWrapper,
+          defaultValue: '0.0.0',
+        ),
+        minVersion: FirebaseRemoteConfigData<String>(
+          key: 'app_min_version',
+          api: remoteConfigWrapper,
+          defaultValue: '0.0.0',
+        ),
+      ),
     );
   },
 );
@@ -48,10 +61,12 @@ final remoteConfigApiProvider = Provider<RemoteConfigApi>(
 class RemoteConfigApi implements OnStartService {
   final FirebaseRemoteConfig _remoteConfig;
   final SubscriptionConfigs subscription; // this is an example of group of keys
+  final AppUpdateConfigs appUpdate;
 
   RemoteConfigApi({
     required FirebaseRemoteConfig remoteConfig,
     required this.subscription,
+    required this.appUpdate,
   }) : _remoteConfig = remoteConfig;
 
   @override
@@ -59,7 +74,11 @@ class RemoteConfigApi implements OnStartService {
     try {
       await _remoteConfig.setConfigSettings(RemoteConfigSettings(
         fetchTimeout: const Duration(seconds: 60),
-        minimumFetchInterval: const Duration(hours: 1),
+        // In debug we fetch every launch so config changes (e.g. testing the
+        // "update available" versions) show up immediately; release throttles
+        // to once an hour as recommended.
+        minimumFetchInterval:
+            kDebugMode ? Duration.zero : const Duration(hours: 1),
       ));
       await _remoteConfig.fetchAndActivate();
     } catch (e) {
@@ -168,3 +187,21 @@ class SubscriptionConfigs {
   });
 }
 
+/// Remote keys that drive the "update available" prompt. Set these in the
+/// Firebase Remote Config console (works on every backend, since Firebase Core
+/// is always initialized):
+/// - `app_latest_version`: the newest version published to the stores. When the
+///   installed version is older, an *optional* update sheet is shown.
+/// - `app_min_version`: the oldest version still allowed. When the installed
+///   version is older, a *forced* (blocking) update sheet is shown.
+/// Both default to `0.0.0` (feature effectively off until you set real values).
+class AppUpdateConfigs {
+  final RemoteConfigData<String> latestVersion;
+  final RemoteConfigData<String> minVersion;
+
+  AppUpdateConfigs({
+    required this.latestVersion,
+    required this.minVersion,
+  });
+}
+

package/templates/firebase/lib/core/guards/guard.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:kasy_kit/core/theme/theme.dart';
 
 enum RouterType {
   goRouter,
@@ -30,18 +31,27 @@ class Guard extends StatelessWidget {
       future: canActivate,
       builder: (_, result) {
         if (!result.hasData || result.hasError) {
-          return Container();
+          return _loadingScreen(context);
         }
         final bool canActivate = result.data!;
         if (canActivate) {
           return child;
         }
         redirect(context);
-        return loading ?? Container();
+        return loading ?? _loadingScreen(context);
       },
     );
   }
 
+  /// Themed placeholder shown while the guard resolves or redirects. Never a
+  /// bare [Container] (which paints nothing and shows the black window behind).
+  Widget _loadingScreen(BuildContext context) {
+    return Material(
+      color: context.colors.background,
+      child: const Center(child: CircularProgressIndicator.adaptive()),
+    );
+  }
+
   void redirect(BuildContext context) {
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       if (!context.mounted) return;
@@ -64,5 +74,9 @@ class Guard extends StatelessWidget {
           Navigator.of(context).pushReplacementNamed(fallbackRoute);
       }
     });
+    // addPostFrameCallback does not schedule a frame on its own; if the app is
+    // idle the redirect would otherwise wait until the next input event (the
+    // "stuck until you tap the screen" symptom). Force a frame so it runs now.
+    WidgetsBinding.instance.scheduleFrame();
   }
 }

package/templates/firebase/lib/core/icons/kasy_icons.dart

@@ -50,6 +50,9 @@ abstract final class KasyIcons {
 
   /// Collapse the left panel (sidebar) — narrow/expand toggle.
   static const IconData panelLeft = LucideIcons.panelLeft300;
+
+  /// Hamburger — opens the navigation drawer (e.g. from an app-bar leading).
+  static const IconData menu = LucideIcons.menu300;
   static const IconData cameraAlt = LucideIcons.camera400;
   static const IconData check = LucideIcons.check300;
   static const IconData checkCircle = LucideIcons.circleCheck300;

package/templates/firebase/lib/core/rating/widgets/rate_banner.dart

@@ -133,9 +133,7 @@ class RateBannerWidget extends StatelessWidget {
           Text(
             title,
             textAlign: TextAlign.center,
-            style: TextStyle(
-              fontSize: 17,
-              fontWeight: FontWeight.w600,
+            style: context.kasyTextTheme.sectionTitle.copyWith(
               color: cs.onSurface,
               height: 1.3,
             ),
@@ -144,8 +142,7 @@ class RateBannerWidget extends StatelessWidget {
           Text(
             text,
             textAlign: TextAlign.center,
-            style: TextStyle(
-              fontSize: 14,
+            style: context.textTheme.bodyMedium?.copyWith(
               color: cs.onSurface.withValues(alpha: 0.55),
               height: 1.4,
             ),

package/templates/firebase/lib/core/rating/widgets/review_popup.dart

@@ -1,5 +1,5 @@
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:kasy_kit/components/components.dart';
@@ -7,17 +7,27 @@ import 'package:kasy_kit/core/data/api/analytics_api.dart';
 import 'package:kasy_kit/core/rating/providers/rating_repository.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/i18n/translations.g.dart';
 import 'package:logger/logger.dart';
 
 /// Shows the in-app review dialog. Prefer a stable [context] (not a sheet that
 /// will be popped before the async work finishes).
+///
+/// A clean [KasyDialog]: a title, a short message and two stacked actions
+/// (write a review / suggest improvements). Dismissing via the dialog's own
+/// close button just defers the next ask and keeps the user where they are.
 Future<bool> showReviewDialog(
   BuildContext context,
   WidgetRef ref, {
   bool force = false,
 }) async {
+  // Store reviews are native-only (App Store / Play Store). In production the
+  // auto prompt never shows on web (nowhere to send the user). But a forced
+  // call — the admin preview — still shows the dialog on web so its design can
+  // be reviewed there; only the store action won't do anything.
+  if (kIsWeb && !force) {
+    return false;
+  }
   if (!context.mounted) {
     return false;
   }
@@ -41,97 +51,42 @@ Future<bool> showReviewDialog(
     barrierDismissible: false,
     builder: (dialogContext) {
       ratingRepository.delay();
-      return Animate(
-        effects: const [
-          FadeEffect(
-            delay: Duration(milliseconds: 100),
-            duration: Duration(milliseconds: 300),
-          ),
-          MoveEffect(
-            delay: Duration(milliseconds: 100),
-            duration: Duration(milliseconds: 450),
-            curve: Curves.easeOut,
-            begin: Offset(0, 50),
-            end: Offset.zero,
-          ),
-        ],
-        child: DeviceSizeBuilder(
-          builder: (device) {
-            final maxWidth = switch (device) {
-              DeviceType.medium =>
-                MediaQuery.of(dialogContext).size.width - KasySpacing.xl,
-              _ => 550.0,
-            };
-            final translations = Translations.of(dialogContext).review_popup;
-            return KasyDialog(
-              title: translations.title,
-              titleCentered: true,
-              showCloseButton: false,
-              body: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Stack(
-                    clipBehavior: Clip.none,
-                    children: [
-                      ClipRRect(
-                        borderRadius: BorderRadius.circular(KasyRadius.md),
-                        child: Image.asset(
-                          'assets/images/review.png',
-                          fit: BoxFit.fitWidth,
-                          width: maxWidth,
-                        ),
-                      ),
-                      Positioned(
-                        top: KasySpacing.sm,
-                        left: KasySpacing.sm,
-                        child: CloseIcon(
-                          onExit: () {
-                            analytics.logEvent('rating_popup_close', {});
-                            rating.delay().then((_) {
-                              if (!dialogContext.mounted) return;
-                              Navigator.of(dialogContext).pop();
-                            });
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: KasySpacing.md),
-                  Text(
-                    translations.description,
-                    textAlign: TextAlign.center,
-                    style: Theme.of(dialogContext).textTheme.bodyMedium,
-                  ),
-                ],
-              ),
-              footer: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  KasyButton(
-                    label: translations.rate_button,
-                    expand: true,
-                    onPressed: () {
-                      analytics.logEvent('rating_popup_show', {});
-                      ratingRepository.rate().then((_) => rating.review()).then(
-                        (_) {
-                          if (!dialogContext.mounted) return;
-                          Navigator.of(dialogContext).pop();
-                        },
-                      );
-                    },
-                  ),
-                  const SizedBox(height: KasySpacing.sm),
-                  KasyButton(
-                    label: translations.cancel_button,
-                    variant: KasyButtonVariant.soft,
-                    expand: true,
-                    onPressed: () => Navigator.of(dialogContext).pop(true),
-                  ),
-                ],
-              ),
-            );
-          },
+      final translations = Translations.of(dialogContext).review_popup;
+      return KasyDialog(
+        leadingIcon: KasyIcons.star,
+        iconTone: KasyDialogIconTone.info,
+        title: translations.title,
+        titleCentered: true,
+        message: translations.description,
+        onClose: () {
+          analytics.logEvent('rating_popup_close', {});
+          rating.delay();
+          Navigator.of(dialogContext).pop();
+        },
+        footer: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            KasyButton(
+              label: translations.rate_button,
+              expand: true,
+              onPressed: () {
+                analytics.logEvent('rating_popup_show', {});
+                ratingRepository.rate().then((_) => rating.review()).then(
+                  (_) {
+                    if (!dialogContext.mounted) return;
+                    Navigator.of(dialogContext).pop();
+                  },
+                );
+              },
+            ),
+            const SizedBox(height: KasySpacing.sm),
+            KasyButton(
+              label: translations.cancel_button,
+              variant: KasyButtonVariant.soft,
+              expand: true,
+              onPressed: () => Navigator.of(dialogContext).pop(true),
+            ),
+          ],
         ),
       );
     },
@@ -142,34 +97,3 @@ Future<bool> showReviewDialog(
   }
   return true;
 }
-
-class CloseIcon extends StatelessWidget {
-  final VoidCallback onExit;
-
-  const CloseIcon({super.key, required this.onExit});
-
-  @override
-  Widget build(BuildContext context) {
-    return ClipOval(
-      child: Material(
-        color: Colors.transparent,
-        child: InkWell(
-          onTap: () => onExit.call(),
-          child: Ink(
-            width: 32,
-            height: 32,
-            decoration: BoxDecoration(
-              color: context.colors.background,
-              shape: BoxShape.circle,
-            ),
-            child: Icon(
-              KasyIcons.close,
-              color: context.colors.onBackground,
-              size: KasyIconSize.lg,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -72,6 +72,20 @@ class SharedPreferencesBuilder implements OnStartService {
     return prefs.getBool('biometric_enabled') ?? false;
   }
 
+  /// Whether the user has already been through the one-time onboarding intro.
+  ///
+  /// Persisted locally so onboarding shows only once per install. Crucially it
+  /// survives logout (logout clears the account identity, not the fact that the
+  /// user has already seen the intro), so after signing out the user lands on
+  /// the sign-in screen instead of being dragged through onboarding again.
+  Future<void> setOnboardingCompleted(bool completed) async {
+    await prefs.setBool('onboarding_completed', completed);
+  }
+
+  bool getOnboardingCompleted() {
+    return prefs.getBool('onboarding_completed') ?? false;
+  }
+
   /// How many times the user dismissed the ATT soft prompt without accepting.
   /// Used to back off and eventually stop asking. See [MaybeShowAttPermission].
   int getAttSoftDismissCount() {

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

@@ -0,0 +1,32 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/app_update/app_update_repository.dart';
+import 'package:kasy_kit/core/app_update/app_update_status.dart';
+import 'package:kasy_kit/core/app_update/update_available_sheet.dart';
+import 'package:kasy_kit/core/states/components/maybeshow_component.dart';
+import 'package:kasy_kit/core/states/models/event_model.dart';
+
+/// On app start, checks whether a newer version is available (remote config vs
+/// installed version) and, if so, prompts the user to update via the store.
+///
+/// Native-only. Distinct from `MaybeShowUpdateBottomSheet` (the "what's new"
+/// sheet, which runs *after* the user already updated): this runs *before*,
+/// when the user is behind. It is registered first so a required update
+/// pre-empts every other start-up prompt.
+class MaybeShowUpdateAvailable extends MaybeShowWithRef {
+  @override
+  Future<bool> handle(WidgetRef ref, AppEvent event) async {
+    if (event is! OnAppStartEvent) return false;
+    if (kIsWeb) return false;
+
+    final status = await ref.read(appUpdateRepositoryProvider).check();
+    if (status == AppUpdateStatus.upToDate) return false;
+    if (!ref.context.mounted) return false;
+
+    await showUpdateAvailableSheet(
+      ref.context,
+      forced: status == AppUpdateStatus.forced,
+    );
+    return true;
+  }
+}

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

@@ -20,6 +20,10 @@ Future<void> confirmLogout(BuildContext context, WidgetRef ref) {
     message: tr.disconnect_confirm_message,
     cancelLabel: tr.disconnect_cancel,
     confirmLabel: tr.disconnect,
-    onConfirm: () => ref.read(userStateNotifierProvider.notifier).onLogout(),
+    // Async so the confirm button shows a spinner while signing out, then the
+    // router redirect lands the user on the sign-in screen. (Don't fire-and-
+    // forget: that closed the dialog instantly and left the old screen frozen.)
+    onConfirmAsync: () =>
+        ref.read(userStateNotifierProvider.notifier).onLogout(),
   );
 }

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

@@ -10,6 +10,7 @@ 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/core/utils/image_bytes_loader.dart';
 import 'package:kasy_kit/environments.dart';
 import 'package:kasy_kit/features/authentication/repositories/authentication_repository.dart';
 import 'package:kasy_kit/features/notifications/providers/models/device.dart';
@@ -89,11 +90,18 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     state = const UserState(user: User.loading());
     await _loadState();
     await _initDeviceRegistration();
+    // A successful sign-in puts the user past first-run onboarding. Remember it
+    // so that after a later logout they land on the sign-in screen instead of
+    // being sent back through onboarding.
+    await ref.read(sharedPreferencesProvider).setOnboardingCompleted(true);
   }
 
   /// Set the user as onboarded in the database
   /// This function is called when the user has completed the onboarding
   Future<void> onOnboarded() async {
+    // Remember locally that onboarding is done, so it's never shown again on
+    // this install (survives logout and account deletion).
+    await ref.read(sharedPreferencesProvider).setOnboardingCompleted(true);
     if (state.user.idOrNull == null) {
       // Guest with no account: persist onboarding in local state only.
       // No Firestore document exists yet — no write needed.
@@ -104,10 +112,27 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     state = state.copyWith(user: newUser);
   }
 
+  /// Finish onboarding (or "continue as guest" from the sign-in screen) by
+  /// making sure the user has a backend identity, then marking them onboarded.
+  ///
+  /// This is the ONLY place an anonymous account is created. It is created
+  /// lazily here — never eagerly on app start, never on logout — so users who
+  /// never get this far (or who later sign out) don't leave orphan anonymous
+  /// accounts behind in the backend.
+  Future<void> continueAsGuest() async {
+    if (mode == AuthenticationMode.anonymous && state.user.idOrNull == null) {
+      await _loadAnonymousState();
+    }
+    await onOnboarded();
+  }
+
   /// Mark the user as onboarded immediately (optimistic) and write to the
   /// backend in background. Used by the skip-onboarding flow so navigation
   /// to home is instant — no spinner while waiting for a network round-trip.
   void onSkippedOnboarding() {
+    // Remember onboarding as done locally (same flag as [onOnboarded]) so it's
+    // never shown again, even after a logout.
+    unawaited(ref.read(sharedPreferencesProvider).setOnboardingCompleted(true));
     state = state.copyWith(
       user: switch (state.user) {
         final AuthenticatedUserData u => u.copyWith(onboarded: true),
@@ -142,11 +167,14 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     await ref.read(sharedPreferencesProvider).setBiometricEnabled(false);
     // Forget the last bottom-bar tab so the next login lands on the default tab
     // (Home) instead of wherever the previous account left off.
-    activeTabRouteNotifier.value = null;
+    forgetActiveTab();
     state = const UserState(user: User.anonymous());
-    if (mode == AuthenticationMode.anonymous) {
-      await _loadAnonymousState();
-    }
+    // No anonymous re-signup here. The router redirect sends the user to the
+    // sign-in screen (onboarding is remembered as done, so it isn't repeated).
+    // Recreating an anonymous account on every logout would pile up orphan
+    // users in the backend — an anonymous account is only ever created lazily,
+    // in [continueAsGuest], when the user finishes onboarding or explicitly
+    // chooses to continue as a guest.
   }
 
   /// Refresh the user
@@ -164,6 +192,41 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     state = state.copyWith(user: user ?? User.anonymous(id: id));
   }
 
+  /// On first social sign-in, copy the provider's profile photo (e.g. Google)
+  /// into our own storage so the user starts with an avatar. Best-effort and
+  /// one-shot: only runs when the user has no avatar yet, and it never overwrites
+  /// a photo the user set manually. Apple does not expose a photo (no-op there).
+  Future<void> _importSocialAvatarIfNeeded() async {
+    final user = state.user;
+    if (user is! AuthenticatedUserData) return;
+    final userId = user.id;
+    if (userId == null || userId.isEmpty) return;
+    if (user.avatarPath?.isNotEmpty ?? false) return; // keep existing avatar
+    try {
+      final photoUrl = await _authenticationRepository.getCurrentUserPhotoUrl();
+      if (photoUrl == null || photoUrl.isEmpty) return;
+      final bytes = await loadImageBytes(_normalizeAvatarUrl(photoUrl));
+      if (bytes == null || bytes.isEmpty) return;
+      await for (final _ in _userRepository.saveAvatar(
+        userId: userId,
+        data: Uint8List.fromList(bytes),
+      )) {}
+      await refresh();
+    } catch (e) {
+      // Best-effort: keep the fallback avatar if the import fails.
+      _logger.w('Social avatar import skipped: $e');
+    }
+  }
+
+  /// Google serves profile photos with a size suffix (e.g. `=s96-c`, only 96px).
+  /// Request a ~400px source so the avatar stays crisp after our 450px
+  /// re-compression. URLs from other providers are returned unchanged.
+  String _normalizeAvatarUrl(String url) {
+    if (!url.contains('googleusercontent.com')) return url;
+    final base = url.contains('=') ? url.substring(0, url.indexOf('=')) : url;
+    return '$base=s400-c';
+  }
+
   /// This function is called after a user successfuly purchased a subscription
   /// It will refresh the subscription state without waiting for the webhook
   /// (which can take some time and could show a wrong state to the user)
@@ -208,11 +271,14 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
     }
     await _userRepository.delete();
     await _authenticationRepository.logout();
+    // Same as onLogout: forget the last bottom-bar tab so the next account that
+    // signs in lands on Home, not wherever the deleted account left off (the
+    // user deletes from Settings, so without this the next login reopens it).
+    forgetActiveTab();
     state = const UserState(user: User.anonymous());
-
-    if (mode == AuthenticationMode.anonymous) {
-      await _loadAnonymousState();
-    }
+    // Same as [onLogout]: no anonymous re-signup. The user lands on the sign-in
+    // screen; a new anonymous account is only created lazily if they choose to
+    // continue as a guest.
   }
 
   // -------------------------------
@@ -252,13 +318,16 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
   Future<void> _loadState() async {
     final credentials = await _authenticationRepository.get();
 
-    if (credentials == null && mode == AuthenticationMode.anonymous) {
-      _logger.i('Anonymous user mode activated, signup anonymously');
-      await _loadAnonymousState();
-    } else if (credentials == null && mode == AuthenticationMode.authRequired) {
-      _logger.i('Authentification required, user is not connected');
+    if (credentials == null) {
+      // No account yet. We deliberately do NOT create an anonymous account here
+      // anymore (even in anonymous mode). It's created lazily in
+      // [continueAsGuest] when the user finishes onboarding or taps "continue
+      // as guest", so simply opening the app — or signing out — never piles up
+      // orphan anonymous users. The router redirect decides where to send them:
+      // onboarding on the very first run, the sign-in screen after a logout.
+      _logger.i('No credentials: user starts as a guest with no account yet');
       state = state.copyWith(user: const User.anonymous());
-    } else if (credentials != null) {
+    } else {
       _logger.i('User is connected with id ${credentials.id}');
       var user = await _userRepository.get(credentials.id);
       // Retry a few times: the Cloud Function onUserRegistration may not have
@@ -299,10 +368,12 @@ class UserStateNotifier extends _$UserStateNotifier implements OnStartService {
           );
           final syncedUser = await _userRepository.get(credentials.id);
           state = state.copyWith(user: syncedUser ?? user);
+          unawaited(_importSocialAvatarIfNeeded());
           return;
         }
       }
       state = state.copyWith(user: user);
+      unawaited(_importSocialAvatarIfNeeded());
     }
   }