refactor: replace direct rust api methods call by pubkey formatter

josefinalliende · josefinalliende · commit c60bb004c0f9 · 2025-09-07T21:28:36.000-03:00
diff --git a/lib/config/providers/auth_provider.dart b/lib/config/providers/auth_provider.dart
@@ -9,7 +9,7 @@ import 'package:whitenoise/config/states/auth_state.dart';
 import 'package:whitenoise/src/rust/api.dart' show createWhitenoiseConfig, initializeWhitenoise;
 import 'package:whitenoise/src/rust/api/accounts.dart';
 import 'package:whitenoise/src/rust/api/error.dart' show ApiError;
-import 'package:whitenoise/src/rust/api/utils.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 
 /// Auth Provider
 ///
@@ -291,16 +291,10 @@ class AuthNotifier extends Notifier<AuthState> {
         // Check if there are other accounts available
         final remainingAccounts = await getAccounts();
         // Normalize pubkeys to hex then filter
-        final activeHex =
-            activeAccount.pubkey.startsWith('npub')
-                ? hexPubkeyFromNpub(npub: activeAccount.pubkey)
-                : activeAccount.pubkey.toLowerCase();
+        final activeHex = PubkeyFormatter(pubkey: activeAccount.pubkey).toHex();
         final otherAccounts = <Account>[];
         for (final account in remainingAccounts) {
-          final keyHex =
-              account.pubkey.startsWith('npub')
-                  ? hexPubkeyFromNpub(npub: account.pubkey)
-                  : account.pubkey.toLowerCase();
+          final keyHex = PubkeyFormatter(pubkey: account.pubkey).toHex();
           if (keyHex != activeHex) otherAccounts.add(account);
         }
         if (otherAccounts.isNotEmpty) {
diff --git a/lib/config/providers/group_provider.dart b/lib/config/providers/group_provider.dart
@@ -11,8 +11,8 @@ import 'package:whitenoise/domain/models/user_model.dart';
 import 'package:whitenoise/src/rust/api/error.dart' show ApiError;
 import 'package:whitenoise/src/rust/api/groups.dart';
 import 'package:whitenoise/src/rust/api/users.dart' as rust_users;
-import 'package:whitenoise/src/rust/api/utils.dart';
 import 'package:whitenoise/utils/error_handling.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 
 class GroupsNotifier extends Notifier<GroupsState> {
   final _logger = Logger('GroupsNotifier');
@@ -155,8 +155,8 @@ class GroupsNotifier extends Notifier<GroupsState> {
       final activePubkey = ref.read(activePubkeyProvider) ?? '';
       if (activePubkey.isEmpty) return null;
 
-      final currentUserNpub = npubFromHexPubkey(hexPubkey: activePubkey);
-      final otherUserNpub = npubFromHexPubkey(hexPubkey: otherUserPubkeyHex);
+      final currentUserNpub = PubkeyFormatter(pubkey: activePubkey).toNpub();
+      final otherUserNpub = PubkeyFormatter(pubkey: otherUserPubkeyHex).toNpub();
 
       final directMessageGroups = await getDirectMessageGroups();
 
@@ -310,11 +310,10 @@ class GroupsNotifier extends Notifier<GroupsState> {
       final List<User> members = [];
       for (final memberPubkey in memberPubkeys) {
         try {
-          final pubkeyString = npubFromHexPubkey(hexPubkey: memberPubkey);
-
+          final npub = PubkeyFormatter(pubkey: memberPubkey).toNpub() ?? '';
           try {
             final metadata = await rust_users.userMetadata(pubkey: memberPubkey);
-            final user = User.fromMetadata(metadata, pubkeyString);
+            final user = User.fromMetadata(metadata, npub);
             members.add(user);
           } catch (metadataError) {
             // Log the full exception details with proper Whitenoise ApiError unpacking
@@ -328,10 +327,10 @@ class GroupsNotifier extends Notifier<GroupsState> {
             _logger.warning(logMessage, metadataError);
             // Create a fallback user with minimal info
             final fallbackUser = User(
-              id: pubkeyString,
+              id: npub,
               displayName: 'Unknown User',
               nip05: '',
-              publicKey: pubkeyString,
+              publicKey: npub,
             );
             members.add(fallbackUser);
           }
@@ -389,12 +388,11 @@ class GroupsNotifier extends Notifier<GroupsState> {
       final List<User> admins = [];
       for (final adminPubkey in adminPubkeys) {
         try {
-          // Get pubkey string first to avoid multiple uses of the same PublicKey object
-          final pubkeyString = npubFromHexPubkey(hexPubkey: adminPubkey);
+          final npub = PubkeyFormatter(pubkey: adminPubkey).toNpub() ?? '';
 
           try {
             final metadata = await rust_users.userMetadata(pubkey: adminPubkey);
-            final user = User.fromMetadata(metadata, pubkeyString);
+            final user = User.fromMetadata(metadata, npub);
             admins.add(user);
           } catch (metadataError) {
             // Log the full exception details with proper ApiError unpacking
@@ -408,10 +406,10 @@ class GroupsNotifier extends Notifier<GroupsState> {
             _logger.warning(logMessage, metadataError);
             // Create a fallback user with minimal info
             final fallbackUser = User(
-              id: pubkeyString,
+              id: npub,
               displayName: 'Unknown User',
               nip05: '',
-              publicKey: pubkeyString,
+              publicKey: npub,
             );
             admins.add(fallbackUser);
           }
@@ -595,7 +593,7 @@ class GroupsNotifier extends Notifier<GroupsState> {
     final groupInformation = await getGroupInformation(groupId: group.mlsGroupId);
     if (groupInformation.groupType == GroupType.directMessage) {
       try {
-        final currentUserNpub = npubFromHexPubkey(hexPubkey: currentUserPubkey);
+        final currentUserNpub = PubkeyFormatter(pubkey: currentUserPubkey).toNpub();
         final otherMember = getOtherGroupMember(group.mlsGroupId, currentUserNpub);
 
         if (otherMember == null) {
@@ -883,11 +881,10 @@ class GroupsNotifier extends Notifier<GroupsState> {
         return;
       }
 
-      final usersPubkeyHex = await Future.wait(
-        membersNpubs.map((userNpub) async {
-          return hexPubkeyFromNpub(npub: userNpub);
-        }),
-      );
+      final usersPubkeyHex =
+          membersNpubs.map((userNpub) {
+            return PubkeyFormatter(pubkey: userNpub).toHex() ?? '';
+          }).toList();
 
       await addMembersToGroup(
         pubkey: activePubkey,
@@ -938,11 +935,10 @@ class GroupsNotifier extends Notifier<GroupsState> {
         return;
       }
 
-      final usersPubkeyHex = await Future.wait(
-        membersNpubs.map((userNpub) async {
-          return hexPubkeyFromNpub(npub: userNpub);
-        }),
-      );
+      final usersPubkeyHex =
+          membersNpubs.map((userNpub) {
+            return PubkeyFormatter(pubkey: userNpub).toHex() ?? '';
+          }).toList();
 
       await removeMembersFromGroup(
         pubkey: activePubkey,
diff --git a/lib/config/providers/metadata_cache_provider.dart b/lib/config/providers/metadata_cache_provider.dart
@@ -6,7 +6,7 @@ import 'package:logging/logging.dart';
 import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
 import 'package:whitenoise/domain/models/contact_model.dart';
 import 'package:whitenoise/src/rust/api/users.dart' as wn_users_api;
-import 'package:whitenoise/src/rust/api/utils.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/public_key_validation_extension.dart';
 
 /// Cached metadata with basic expiration
@@ -68,7 +68,7 @@ class MetadataCacheNotifier extends Notifier<MetadataCacheState> {
   /// Convert hex to npub safely
   Future<String> _safeHexToNpub(String hexPubkey) async {
     try {
-      return npubFromHexPubkey(hexPubkey: hexPubkey);
+      return PubkeyFormatter(pubkey: hexPubkey).toNpub() ?? '';
     } catch (e) {
       _logger.warning('Failed to convert hex to npub for $hexPubkey: $e');
       return hexPubkey;
@@ -78,7 +78,7 @@ class MetadataCacheNotifier extends Notifier<MetadataCacheState> {
   /// Convert npub to hex safely
   Future<String> _safeNpubToHex(String npub) async {
     try {
-      return hexPubkeyFromNpub(npub: npub);
+      return PubkeyFormatter(pubkey: npub).toHex() ?? '';
     } catch (e) {
       _logger.warning('Failed to convert npub to hex for $npub: $e');
       return npub;
diff --git a/lib/domain/services/dm_chat_service.dart b/lib/domain/services/dm_chat_service.dart
@@ -4,19 +4,15 @@ import 'package:whitenoise/config/providers/group_provider.dart';
 import 'package:whitenoise/domain/models/contact_model.dart';
 import 'package:whitenoise/domain/models/dm_chat_data.dart';
 import 'package:whitenoise/src/rust/api/users.dart' as wn_users_api;
-import 'package:whitenoise/src/rust/api/utils.dart';
-import 'package:whitenoise/utils/public_key_validation_extension.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 
 class DMChatService {
   static Future<DMChatData?> getDMChatData(String groupId, WidgetRef ref) async {
     try {
       final activePubkey = ref.read(activePubkeyProvider) ?? '';
       if (activePubkey.isEmpty) return null;
 
-      final currentUserNpub = npubFromHexPubkey(
-        hexPubkey: activePubkey,
-      );
-
+      final currentUserNpub = PubkeyFormatter(pubkey: activePubkey).toNpub();
       final otherMember = ref
           .read(groupsProvider.notifier)
           .getOtherGroupMember(
@@ -27,10 +23,7 @@ class DMChatService {
       if (otherMember != null) {
         final user = await wn_users_api.getUser(pubkey: otherMember.publicKey);
         final otherMemberPubkey = otherMember.publicKey;
-        String otherMemberNpubPubkey = otherMemberPubkey;
-        if (otherMemberPubkey.isValidHexPublicKey) {
-          otherMemberNpubPubkey = npubFromHexPubkey(hexPubkey: otherMemberPubkey);
-        }
+        final otherMemberNpubPubkey = PubkeyFormatter(pubkey: otherMemberPubkey).toNpub() ?? '';
         final contactModel = ContactModel.fromMetadata(
           pubkey: otherMemberNpubPubkey,
           metadata: user.metadata,
diff --git a/lib/ui/chat/chat_info/group_chat_info.dart b/lib/ui/chat/chat_info/group_chat_info.dart
@@ -30,9 +30,7 @@ class _GroupChatInfoState extends ConsumerState<GroupChatInfo> {
     final groupDetails = ref.read(groupsProvider).groupsMap?[widget.groupId];
     if (groupDetails?.nostrGroupId != null) {
       try {
-        final npub = npubFromHexPubkey(
-          hexPubkey: groupDetails!.nostrGroupId,
-        );
+        final npub = PubkeyFormatter(pubkey: groupDetails?.nostrGroupId).toNpub();
         if (mounted) {
           setState(() {
             groupNpub = npub;
@@ -104,7 +102,7 @@ class _GroupChatInfoState extends ConsumerState<GroupChatInfo> {
   Future<void> _loadCurrentUserNpub() async {
     final activeAccount = ref.read(activePubkeyProvider) ?? '';
     if (activeAccount.isNotEmpty) {
-      final currentUserNpub = npubFromHexPubkey(hexPubkey: activeAccount);
+      final currentUserNpub = PubkeyFormatter(pubkey: activeAccount).toNpub();
       if (mounted) {
         setState(() {
           this.currentUserNpub = currentUserNpub;
diff --git a/lib/ui/chat/invite/chat_invite_screen.dart b/lib/ui/chat/invite/chat_invite_screen.dart
@@ -7,13 +7,13 @@ import 'package:whitenoise/config/providers/group_provider.dart';
 import 'package:whitenoise/config/providers/toast_message_provider.dart';
 import 'package:whitenoise/config/providers/user_profile_data_provider.dart';
 import 'package:whitenoise/config/providers/welcomes_provider.dart';
-import 'package:whitenoise/src/rust/api/utils.dart';
 import 'package:whitenoise/src/rust/api/welcomes.dart';
 import 'package:whitenoise/ui/chat/widgets/contact_info.dart';
 import 'package:whitenoise/ui/core/themes/src/extensions.dart';
 import 'package:whitenoise/ui/core/ui/wn_app_bar.dart';
 import 'package:whitenoise/ui/core/ui/wn_avatar.dart';
 import 'package:whitenoise/ui/core/ui/wn_button.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/string_extensions.dart';
 
 class ChatInviteScreen extends ConsumerStatefulWidget {
@@ -178,7 +178,7 @@ class GroupInviteHeader extends StatelessWidget {
           ),
           Gap(16.h),
           Text(
-            npubFromHexPubkey(hexPubkey: welcome.nostrGroupId).formatPublicKey(),
+            PubkeyFormatter(pubkey: welcome.nostrGroupId).toNpub()?.formatPublicKey() ?? '',
             textAlign: TextAlign.center,
             style: TextStyle(
               fontSize: 14.sp,
@@ -280,7 +280,7 @@ class DMInviteHeader extends ConsumerWidget {
               ),
               Gap(12.h),
               Text(
-                npubFromHexPubkey(hexPubkey: welcome.welcomer).formatPublicKey(),
+                PubkeyFormatter(pubkey: welcome.welcomer).toNpub()?.formatPublicKey() ?? '',
                 textAlign: TextAlign.center,
                 style: TextStyle(
                   fontSize: 12.sp,
diff --git a/lib/ui/chat/widgets/chat_header_widget.dart b/lib/ui/chat/widgets/chat_header_widget.dart
@@ -6,10 +6,10 @@ import 'package:whitenoise/config/providers/group_provider.dart';
 import 'package:whitenoise/domain/models/dm_chat_data.dart';
 import 'package:whitenoise/domain/services/dm_chat_service.dart';
 import 'package:whitenoise/src/rust/api/groups.dart';
-import 'package:whitenoise/src/rust/api/utils.dart';
 import 'package:whitenoise/ui/core/themes/assets.dart';
 import 'package:whitenoise/ui/core/themes/src/extensions.dart';
 import 'package:whitenoise/ui/core/ui/wn_avatar.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/string_extensions.dart';
 
 class ChatContactHeader extends ConsumerWidget {
@@ -56,14 +56,14 @@ class _GroupChatHeaderState extends ConsumerState<GroupChatHeader> {
   @override
   void initState() {
     super.initState();
-    _groupNpub = npubFromHexPubkey(hexPubkey: widget.group.nostrGroupId);
+    _groupNpub = PubkeyFormatter(pubkey: widget.group.nostrGroupId).toNpub();
   }
 
   @override
   void didUpdateWidget(GroupChatHeader oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.group.nostrGroupId != widget.group.nostrGroupId) {
-      _groupNpub = npubFromHexPubkey(hexPubkey: widget.group.nostrGroupId);
+      _groupNpub = PubkeyFormatter(pubkey: widget.group.nostrGroupId).toNpub();
     }
   }
 
diff --git a/lib/ui/contact_list/group_welcome_invitation_sheet.dart b/lib/ui/contact_list/group_welcome_invitation_sheet.dart
@@ -6,12 +6,12 @@ import 'package:whitenoise/config/extensions/toast_extension.dart';
 import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
 import 'package:whitenoise/src/rust/api/metadata.dart' show FlutterMetadata;
 import 'package:whitenoise/src/rust/api/users.dart' as wn_users_api;
-import 'package:whitenoise/src/rust/api/utils.dart';
 import 'package:whitenoise/src/rust/api/welcomes.dart';
 import 'package:whitenoise/ui/core/themes/src/extensions.dart';
 import 'package:whitenoise/ui/core/ui/wn_avatar.dart';
 import 'package:whitenoise/ui/core/ui/wn_bottom_sheet.dart';
 import 'package:whitenoise/ui/core/ui/wn_button.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/string_extensions.dart';
 
 class GroupWelcomeInvitationSheet extends StatelessWidget {
@@ -126,7 +126,7 @@ class _GroupMessageInviteState extends ConsumerState<GroupMessageInvite> {
 
   Future<String> _getDisplayablePublicKey() async {
     try {
-      final npub = npubFromHexPubkey(hexPubkey: widget.welcome.nostrGroupId);
+      final npub = PubkeyFormatter(pubkey: widget.welcome.nostrGroupId).toNpub() ?? '';
       return npub;
     } catch (e) {
       return widget.welcome.nostrGroupId.formatPublicKey();
@@ -296,7 +296,7 @@ class _DirectMessageInviteCardState extends ConsumerState<DirectMessageInviteCar
 
   Future<String> _getDisplayablePublicKey() async {
     try {
-      final npub = npubFromHexPubkey(hexPubkey: widget.welcome.welcomer);
+      final npub = PubkeyFormatter(pubkey: widget.welcome.welcomer).toNpub() ?? '';
       return npub;
     } catch (e) {
       return widget.welcome.welcomer.formatPublicKey();
diff --git a/lib/ui/contact_list/widgets/contact_list_tile.dart b/lib/ui/contact_list/widgets/contact_list_tile.dart
@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:gap/gap.dart';
 import 'package:whitenoise/domain/models/contact_model.dart';
-import 'package:whitenoise/src/rust/api/utils.dart';
 import 'package:whitenoise/ui/core/themes/assets.dart';
 import 'package:whitenoise/ui/core/themes/src/extensions.dart';
 import 'package:whitenoise/ui/core/ui/wn_avatar.dart';
 import 'package:whitenoise/ui/core/ui/wn_image.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/string_extensions.dart';
 
 class ContactListTile extends StatelessWidget {
@@ -33,7 +33,7 @@ class ContactListTile extends StatelessWidget {
 
   Future<String> _getNpub(String publicKeyHex) async {
     try {
-      final npub = npubFromHexPubkey(hexPubkey: publicKeyHex);
+      final npub = PubkeyFormatter(pubkey: publicKeyHex).toNpub() ?? '';
       return npub.formatPublicKey();
     } catch (e) {
       // Return the full hex key as fallback
diff --git a/lib/ui/settings/general_settings_screen.dart b/lib/ui/settings/general_settings_screen.dart
@@ -15,7 +15,6 @@ import 'package:whitenoise/domain/models/contact_model.dart';
 import 'package:whitenoise/domain/services/draft_message_service.dart';
 import 'package:whitenoise/routing/routes.dart';
 import 'package:whitenoise/src/rust/api/accounts.dart' show Account, getAccounts;
-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';
 import 'package:whitenoise/ui/core/themes/src/extensions.dart';
@@ -25,6 +24,7 @@ import 'package:whitenoise/ui/core/ui/wn_dialog.dart';
 import 'package:whitenoise/ui/core/ui/wn_image.dart';
 import 'package:whitenoise/ui/settings/developer/developer_settings_screen.dart';
 import 'package:whitenoise/ui/settings/profile/switch_profile_bottom_sheet.dart';
+import 'package:whitenoise/utils/pubkey_formatter.dart';
 import 'package:whitenoise/utils/public_key_validation_extension.dart';
 
 class GeneralSettingsScreen extends ConsumerStatefulWidget {
@@ -152,7 +152,7 @@ class _GeneralSettingsScreenState extends ConsumerState<GeneralSettingsScreen> {
           // Try to convert npub to hex for matching
           String hexKey = selectedProfile.publicKey;
           if (selectedProfile.publicKey.isValidNpubPublicKey) {
-            hexKey = hexPubkeyFromNpub(npub: selectedProfile.publicKey);
+            hexKey = PubkeyFormatter(pubkey: selectedProfile.publicKey).toHex() ?? '';
           }
 
           selectedAccount = _accounts.where((account) => account.pubkey == hexKey).firstOrNull;
diff --git a/lib/ui/settings/profile/switch_profile_bottom_sheet.dart b/lib/ui/settings/profile/switch_profile_bottom_sheet.dart
