Skip to content

fix: remove metadata cache provider from general settings screen #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2025
+9 −36
Merged

fix: remove metadata cache provider from general settings screen #560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 9 additions & 36 deletions lib/ui/settings/general_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
import 'package:whitenoise/config/providers/auth_provider.dart';
import 'package:whitenoise/config/providers/follows_provider.dart';
import 'package:whitenoise/config/providers/group_provider.dart';
import 'package:whitenoise/config/providers/metadata_cache_provider.dart';
import 'package:whitenoise/domain/models/contact_model.dart';
import 'package:whitenoise/routing/routes.dart';
import 'package:whitenoise/src/rust/api/accounts.dart';
import 'package:whitenoise/src/rust/api/accounts.dart' show Account, getAccounts, accountMetadata;
import 'package:whitenoise/src/rust/api/utils.dart';
import 'package:whitenoise/ui/contact_list/widgets/contact_list_tile.dart';
import 'package:whitenoise/ui/core/themes/assets.dart';
Expand Down Expand Up @@ -65,47 +64,21 @@ class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
Future<void> _loadAccounts() async {
try {
final accounts = await getAccounts();
final activeAccountPubkey = ref.read(activePubkeyProvider);

// Load metadata for all accounts using metadata cache
final metadataCache = ref.read(metadataCacheProvider.notifier);
final contactModels = <String, ContactModel>{};
for (final account in accounts) {
try {
// Use metadata cache instead of direct fetchMetadata
final contactModel = await metadataCache.getContactModel(account.pubkey);
contactModels[account.pubkey] = contactModel;
} catch (e) {
// Create fallback contact model
contactModels[account.pubkey] = ContactModel(
displayName: 'Unknown User',
publicKey: account.pubkey,
);
}
final metadata = await accountMetadata(pubkey: account.pubkey);
contactModels[account.pubkey] = ContactModel.fromMetadata(
publicKey: account.pubkey,
metadata: metadata,
);
}

Account? currentAccount;
if (activeAccountPubkey != null) {
try {
currentAccount = accounts.firstWhere(
(account) => account.pubkey == activeAccountPubkey,
);
} catch (e) {
// Active account not found, use first account
if (accounts.isNotEmpty) {
currentAccount = accounts.first;
await ref.read(activePubkeyProvider.notifier).setActivePubkey(currentAccount.pubkey);
}
}
} else if (accounts.isNotEmpty) {
// No active account set, use first account
currentAccount = accounts.first;
await ref.read(activePubkeyProvider.notifier).setActivePubkey(currentAccount.pubkey);
}
final activeAccountState = await ref.read(activeAccountProvider.future);
final activeAccount = activeAccountState.account;

setState(() {
_accounts = accounts;
_currentAccount = currentAccount;
_currentAccount = activeAccount;
_accountContactModels = contactModels;
});
} catch (e) {
Expand Down