Merge pull request #1929 from ardriveapp/dev

PE-7226: Release ArDrive v2.59.0

android/fastlane/metadata/android/en-US/changelogs/165.txt

@@ -0,0 +1 @@
+- Added support for displaying Primary Names in the ArDrive app

lib/arns/domain/arns_repository.dart

@@ -21,7 +21,6 @@ abstract class ARNSRepository {
     required String processId,
     bool uploadNewRevision = true,
   });
-
   Future<List<sdk.ANTRecord>> getAntRecordsForWallet(String address,
       {bool update = false});
   Future<List<sdk.ARNSUndername>> getARNSUndernames(sdk.ANTRecord record,
@@ -33,6 +32,7 @@ abstract class ARNSRepository {
   Future<void> saveAllFilesWithAssignedNames();
   Future<List<ArnsRecord>> getActiveARNSRecordsForFile(String fileId);
   Future<void> waitForARNSRecordsToUpdate();
+  Future<String> getPrimaryName(String address, {bool update = false});
 
   factory ARNSRepository({
     required ArioSDK sdk,
@@ -83,11 +83,13 @@ class _ARNSRepository implements ARNSRepository {
     auth.onAuthStateChanged().listen((user) {
       if (user == null) {
         _cachedUndernames.clear();
+        _cachedPrimaryName = null;
       }
     });
   }
 
   final Map<String, Map<String, ARNSUndername>> _cachedUndernames = {};
+  String? _cachedPrimaryName;
 
   @override
   Future<void> setUndernamesToFile({
@@ -371,6 +373,23 @@ class _ARNSRepository implements ARNSRepository {
 
     await _getARNSUndernamesCompleter!.future;
   }
+
+  @override
+  Future<String> getPrimaryName(String address, {bool update = false}) async {
+    logger.d('Getting primary name for address: $address');
+
+    if (!update && _cachedPrimaryName != null) {
+      return _cachedPrimaryName!;
+    }
+
+    final primaryName = await _sdk.getPrimaryName(address);
+
+    logger.d('Primary name: $primaryName');
+
+    _cachedPrimaryName = primaryName;
+
+    return primaryName;
+  }
 }
 
 AntRecord toAntRecordFromSDK(sdk.ANTRecord record) {

lib/authentication/login/views/login_page.dart

@@ -16,6 +16,7 @@ import 'package:ardrive/services/authentication/biometric_authentication.dart';
 import 'package:ardrive/services/authentication/biometric_permission_dialog.dart';
 import 'package:ardrive/services/ethereum/provider/ethereum_provider.dart';
 import 'package:ardrive/turbo/services/upload_service.dart';
+import 'package:ardrive/user/name/presentation/bloc/profile_name_bloc.dart';
 import 'package:ardrive/user/repositories/user_repository.dart';
 import 'package:ardrive/utils/app_localizations_wrapper.dart';
 import 'package:ardrive/utils/logger.dart';
@@ -95,6 +96,7 @@ class _LoginPageState extends State<LoginPage> {
           if (loginState is LoginSuccess) {
             logger.setContext(logger.context
                 .copyWith(userAddress: loginState.user.walletAddress));
+            context.read<ProfileNameBloc>().add(LoadProfileName());
           }
 
           if (loginState is PromptPassword) {

lib/components/app_top_bar.dart

@@ -8,6 +8,7 @@ import 'package:ardrive/pages/drive_detail/components/hover_widget.dart';
 import 'package:ardrive/search/search_modal.dart';
 import 'package:ardrive/search/search_text_field.dart';
 import 'package:ardrive/sync/domain/cubit/sync_cubit.dart';
+import 'package:ardrive/user/name/presentation/bloc/profile_name_bloc.dart';
 import 'package:ardrive/utils/app_localizations_wrapper.dart';
 import 'package:ardrive/utils/plausible_event_tracker/plausible_custom_event_properties.dart';
 import 'package:ardrive/utils/plausible_event_tracker/plausible_event_tracker.dart';
@@ -124,6 +125,7 @@ class SyncButton extends StatelessWidget {
           ArDriveDropdownItem(
             onClick: () {
               context.read<SyncCubit>().startSync(deepSync: false);
+              context.read<ProfileNameBloc>().add(RefreshProfileName());
               PlausibleEventTracker.trackResync(type: ResyncType.resync);
             },
             content: ArDriveDropdownItemTile(
@@ -136,6 +138,7 @@ class SyncButton extends StatelessWidget {
           ArDriveDropdownItem(
             onClick: () {
               context.read<SyncCubit>().startSync(deepSync: true);
+              context.read<ProfileNameBloc>().add(RefreshProfileName());
               PlausibleEventTracker.trackResync(type: ResyncType.deepResync);
             },
             content: ArDriveDropdownItemTile(

lib/components/profile_card.dart

@@ -17,6 +17,7 @@ import 'package:ardrive/turbo/topup/components/turbo_balance_widget.dart';
 import 'package:ardrive/turbo/utils/utils.dart';
 import 'package:ardrive/user/balance/user_balance_bloc.dart';
 import 'package:ardrive/user/download_wallet/download_wallet_modal.dart';
+import 'package:ardrive/user/name/presentation/bloc/profile_name_bloc.dart';
 import 'package:ardrive/utils/app_localizations_wrapper.dart';
 import 'package:ardrive/utils/open_url.dart';
 import 'package:ardrive/utils/open_url_utils.dart';
@@ -548,15 +549,46 @@ class _ProfileCardState extends State<ProfileCard> {
 
   Widget _buildProfileCardHeader(BuildContext context, String walletAddress) {
     final typography = ArDriveTypographyNew.of(context);
-    return ArDriveButtonNew(
-      text: truncateString(walletAddress, offsetStart: 2, offsetEnd: 2),
-      typography: typography,
-      variant: ButtonVariant.outline,
-      maxWidth: 100,
-      onPressed: () {
-        setState(() {
-          _showProfileCard = !_showProfileCard;
-        });
+    return BlocBuilder<ProfileNameBloc, ProfileNameState>(
+      builder: (context, state) {
+        final primaryName = state is ProfileNameLoaded
+            ? state.primaryName
+            : truncateString(walletAddress, offsetStart: 2, offsetEnd: 2);
+        double maxWidth = 100;
+
+        if (state is ProfileNameLoaded) {
+          maxWidth = primaryName.length * 15;
+
+          if (maxWidth < 100) {
+            maxWidth = 100;
+          }
+
+          if (maxWidth > 200) {
+            maxWidth = 200;
+          }
+        }
+
+        String? tooltipMessage;
+
+        if (primaryName.length > 20) {
+          tooltipMessage = primaryName;
+        }
+
+        return ArDriveTooltip(
+          message: tooltipMessage ?? '',
+          child: ArDriveButtonNew(
+            text: primaryName,
+            typography: typography,
+            variant: ButtonVariant.outline,
+            maxWidth: maxWidth,
+            maxHeight: 40,
+            onPressed: () {
+              setState(() {
+                _showProfileCard = !_showProfileCard;
+              });
+            },
+          ),
+        );
       },
     );
   }

lib/main.dart

@@ -32,6 +32,7 @@ import 'package:ardrive/theme/theme_switcher_state.dart';
 import 'package:ardrive/turbo/services/payment_service.dart';
 import 'package:ardrive/turbo/services/upload_service.dart';
 import 'package:ardrive/turbo/turbo.dart';
+import 'package:ardrive/user/name/presentation/bloc/profile_name_bloc.dart';
 import 'package:ardrive/user/repositories/user_preferences_repository.dart';
 import 'package:ardrive/user/repositories/user_repository.dart';
 import 'package:ardrive/utils/app_flavors.dart';
@@ -356,6 +357,12 @@ class AppState extends State<App> {
           ),
         ),
         BlocProvider<AppBannerBloc>(create: (context) => AppBannerBloc()),
+        BlocProvider(
+          create: (context) => ProfileNameBloc(
+            context.read<ARNSRepository>(),
+            context.read<ArDriveAuth>(),
+          ),
+        ),
       ];
 
   List<SingleChildWidget> get repositoryProviders => [

lib/shared/blocs/banner/app_banner_bloc.dart

@@ -5,7 +5,7 @@ part 'app_banner_event.dart';
 part 'app_banner_state.dart';
 
 class AppBannerBloc extends Bloc<AppBannerEvent, AppBannerState> {
-  AppBannerBloc() : super(AppBannerVisible()) {
+  AppBannerBloc() : super(AppBannerHidden()) {
     on<AppBannerEvent>((event, emit) {
       if (event is AppBannerCloseEvent) {
         emit(AppBannerHidden());

lib/sync/domain/cubit/sync_cubit.dart

@@ -246,7 +246,9 @@ class SyncCubit extends Cubit<SyncState> {
         syncProgressController.add(_syncProgress);
       }
 
-      if (profile is ProfileLoggedIn) _profileCubit.refreshBalance();
+      if (profile is ProfileLoggedIn) {
+        _profileCubit.refreshBalance();
+      }
 
       logger.i('Transaction statuses updated');
     } catch (err, stackTrace) {

lib/user/name/presentation/bloc/profile_name_bloc.dart

@@ -0,0 +1,62 @@
+import 'package:ardrive/arns/domain/arns_repository.dart';
+import 'package:ardrive/authentication/ardrive_auth.dart';
+import 'package:ardrive/utils/logger.dart';
+import 'package:ario_sdk/ario_sdk.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+part 'profile_name_event.dart';
+part 'profile_name_state.dart';
+
+class ProfileNameBloc extends Bloc<ProfileNameEvent, ProfileNameState> {
+  final ARNSRepository _arnsRepository;
+  final ArDriveAuth _auth;
+
+  ProfileNameBloc(this._arnsRepository, this._auth)
+      : super(ProfileNameInitial(_auth.currentUser.walletAddress)) {
+    on<LoadProfileName>((event, emit) async {
+      await _loadProfileName(
+        walletAddress: _auth.currentUser.walletAddress,
+        refresh: false,
+        emit: emit,
+      );
+    });
+    on<RefreshProfileName>((event, emit) async {
+      await _loadProfileName(
+        walletAddress: _auth.currentUser.walletAddress,
+        refresh: true,
+        emit: emit,
+      );
+    });
+  }
+
+  Future<void> _loadProfileName({
+    required String walletAddress,
+    required bool refresh,
+    required Emitter<ProfileNameState> emit,
+  }) async {
+    try {
+      /// if we are not refreshing, we emit a loading state
+      if (!refresh) {
+        emit(ProfileNameLoading(walletAddress));
+      }
+
+      final primaryName =
+          await _arnsRepository.getPrimaryName(walletAddress, update: refresh);
+
+      emit(ProfileNameLoaded(primaryName, walletAddress));
+    } catch (e) {
+      if (e is PrimaryNameNotFoundException) {
+        logger.d('Primary name not found for address: $walletAddress');
+      } else {
+        logger.e('Error getting primary name.', e);
+      }
+
+      emit(
+        ProfileNameLoadedWithWalletAddress(
+          walletAddress,
+        ),
+      );
+    }
+  }
+}

lib/user/name/presentation/bloc/profile_name_event.dart

@@ -0,0 +1,12 @@
+part of 'profile_name_bloc.dart';
+
+sealed class ProfileNameEvent extends Equatable {
+  const ProfileNameEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+final class RefreshProfileName extends ProfileNameEvent {}
+
+final class LoadProfileName extends ProfileNameEvent {}

lib/user/name/presentation/bloc/profile_name_state.dart

@@ -0,0 +1,44 @@
+part of 'profile_name_bloc.dart';
+
+sealed class ProfileNameState extends Equatable {
+  const ProfileNameState();
+
+  abstract final String walletAddress;
+
+  @override
+  List<Object> get props => [];
+}
+
+final class ProfileNameInitial extends ProfileNameState {
+  const ProfileNameInitial(this.walletAddress);
+
+  @override
+  final String walletAddress;
+}
+
+final class ProfileNameLoading extends ProfileNameState {
+  @override
+  final String walletAddress;
+
+  const ProfileNameLoading(this.walletAddress);
+}
+
+final class ProfileNameLoaded extends ProfileNameState {
+  final String primaryName;
+
+  const ProfileNameLoaded(this.primaryName, this.walletAddress);
+
+  @override
+  final String walletAddress;
+
+  @override
+  List<Object> get props => [primaryName, walletAddress];
+}
+
+// if fails to load primary name, show current wallet address
+final class ProfileNameLoadedWithWalletAddress extends ProfileNameState {
+  @override
+  final String walletAddress;
+
+  const ProfileNameLoadedWithWalletAddress(this.walletAddress);
+}

packages/ardrive_ui/lib/src/components/button.dart

@@ -367,8 +367,14 @@ class _ArDriveButtonNewState extends State<ArDriveButtonNew> {
     final text = Text(widget.text,
         textAlign: TextAlign.center,
         style: widget.fontStyle ??
-            typography.paragraphLarge(
-                color: foregroundColor, fontWeight: ArFontWeight.semiBold));
+            typography
+                .paragraphLarge(
+                  color: foregroundColor,
+                  fontWeight: ArFontWeight.semiBold,
+                )
+                .copyWith(
+                  overflow: TextOverflow.ellipsis,
+                ));
 
     final buttonH = widget.maxHeight ?? buttonDefaultHeight;