fix: show loading on switch instead of no accounts (#676)

Author: josefinalliende

CHANGELOG.md

@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed profile image not showing up chatlist after login
 - Fixes auto-scroll to bottom when keyboard opens
 - Fixed time shown in messages to be in local time instead of UTC
+- Fixed account switcher error
 
 ### Security
 

ios/Podfile.lock

@@ -84,21 +84,21 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
 
 SPEC CHECKSUMS:
-  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
-  emoji_picker_flutter: 8e50ec5caac456a23a78637e02c6293ea0ac8771
+  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
+  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  just_audio: a42c63806f16995daf5b219ae1d679deb76e6a79
-  mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  rust_lib_whitenoise: 69ef24b69b2aba78a7ebabc09a504b5a39177d21
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
+  mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  rust_lib_whitenoise: 22de658398f8e36a1a396d35b6b6547a0732e6bb
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
 
 PODFILE CHECKSUM: 251cb053df7158f337c0712f2ab29f4e0fa474ce
 

lib/ui/settings/general_settings_screen.dart

@@ -5,10 +5,8 @@ import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:whitenoise/config/extensions/toast_extension.dart';
-import 'package:whitenoise/config/providers/active_account_provider.dart';
 import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
 import 'package:whitenoise/config/providers/auth_provider.dart';
-import 'package:whitenoise/config/providers/user_profile_data_provider.dart';
 import 'package:whitenoise/domain/models/contact_model.dart';
 import 'package:whitenoise/domain/services/draft_message_service.dart';
 import 'package:whitenoise/routing/routes.dart';
@@ -31,88 +29,17 @@ class GeneralSettingsScreen extends ConsumerStatefulWidget {
 }
 
 class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
-  List<Account> _accounts = [];
-  List<ContactModel> _accountsProfileData = [];
-  ProviderSubscription<AsyncValue<ActiveAccountState>>? _activeAccountSubscription;
   PackageInfo? _packageInfo;
-
-  bool _isLoadingAccounts = false;
   bool _isLoadingPackageInfo = false;
-  DateTime? _lastAccountsLoadTime;
-
-  static const Duration _accountsCacheDuration = Duration(minutes: 2);
 
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      _loadAccountsProfileData();
       _loadPackageInfo();
-      _activeAccountSubscription = ref.listenManual(
-        activeAccountProvider,
-        (previous, next) {
-          if (next is AsyncData) {
-            // This ensures profile updates are reflected immediately
-            _invalidateAccountsCache();
-            _loadAccountsProfileData();
-          }
-        },
-      );
     });
   }
 
-  @override
-  void dispose() {
-    _activeAccountSubscription?.close();
-    super.dispose();
-  }
-
-  Future<void> _loadAccountsProfileDataIfNeeded() async {
-    if (_lastAccountsLoadTime != null) {
-      final cacheAge = DateTime.now().difference(_lastAccountsLoadTime!);
-      if (cacheAge < _accountsCacheDuration &&
-          _accounts.isNotEmpty &&
-          _accountsProfileData.isNotEmpty) {
-        return; // Use cached data
-      }
-    }
-    await _loadAccountsProfileData();
-  }
-
-  void _invalidateAccountsCache() {
-    _lastAccountsLoadTime = null;
-  }
-
-  Future<void> _loadAccountsProfileData() async {
-    if (_isLoadingAccounts) return;
-    _isLoadingAccounts = true;
-
-    try {
-      final List<Account> accounts = await getAccounts();
-      final UserProfileDataNotifier userProfileDataNotifier = ref.read(
-        userProfileDataProvider.notifier,
-      );
-      final List<Future<ContactModel>> accountsProfileDataFutures =
-          accounts
-              .map((account) => userProfileDataNotifier.getUserProfileData(account.pubkey))
-              .toList();
-      final List<ContactModel> accountsProfileData = await Future.wait(accountsProfileDataFutures);
-
-      if (!mounted) return;
-      setState(() {
-        _accounts = accounts;
-        _accountsProfileData = accountsProfileData;
-        _lastAccountsLoadTime = DateTime.now();
-      });
-    } catch (e) {
-      if (mounted) {
-        ref.showErrorToast('Failed to load accounts');
-      }
-    } finally {
-      _isLoadingAccounts = false;
-    }
-  }
-
   Future<void> _loadPackageInfo() async {
     if (_isLoadingPackageInfo || _packageInfo != null) return;
     _isLoadingPackageInfo = true;
@@ -149,18 +76,13 @@ class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
     bool isDismissible = true,
     bool showSuccessToast = false,
   }) async {
-    if (_accounts.isEmpty) {
-      await _loadAccountsProfileDataIfNeeded();
-    }
-
     if (!mounted) return;
 
     SwitchProfileBottomSheet.show(
       context: context,
-      profiles: _accountsProfileData,
       isDismissible: isDismissible,
       showSuccessToast: showSuccessToast,
-      onProfileSelected: (selectedProfile) async {
+      onProfileSelected: (ContactModel selectedProfile) async {
         await _switchAccount(selectedProfile.publicKey);
       },
     );
@@ -210,8 +132,6 @@ class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
 
     final authNotifier = ref.read(authProvider.notifier);
 
-    final hasMultipleAccounts = _accounts.length > 2;
-
     if (!mounted) return;
 
     // Clear all draft messages before logout
@@ -230,15 +150,19 @@ class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
     }
 
     if (finalAuthState.isAuthenticated) {
-      if (hasMultipleAccounts) {
-        await _loadAccountsProfileData();
+      try {
+        final List<Account> accounts = await getAccounts();
+        final hasMultipleAccounts = accounts.length > 1;
 
-        if (mounted) {
-          await _showAccountSwitcher(isDismissible: false, showSuccessToast: true);
+        if (hasMultipleAccounts) {
+          if (mounted) {
+            await _showAccountSwitcher(isDismissible: false, showSuccessToast: true);
+          }
+        } else {
+          ref.showSuccessToast('Account signed out. Switched to the other available account.');
         }
-      } else {
-        ref.showSuccessToast('Account signed out. Switched to the other available account.');
-        await _loadAccountsProfileData();
+      } catch (e) {
+        ref.showErrorToast('Failed to check accounts after logout');
       }
     } else {
       ref.showSuccessToast('Signed out successfully.');