PE-6731: Release ArDrive v2.54.1

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

@@ -0,0 +1 @@
+- Improved ArNS names load for single upload modal

lib/arns/domain/arns_repository.dart

@@ -238,7 +238,7 @@ class _ARNSRepository implements ARNSRepository {
     } catch (e) {
       logger.e('Error getting ANT records for wallet: $e');
 
-      _getARNSUndernamesCompleter!.complete([]);
+      _getARNSUndernamesCompleter!.completeError(e);
 
       _getARNSUndernamesCompleter = null;
 

lib/blocs/upload/upload_cubit.dart

@@ -105,24 +105,60 @@ class UploadCubit extends Cubit<UploadState> {
         isNextButtonEnabled: canUpload,
       ));
     } else if (state is UploadReadyToPrepare) {
-      final hasUndernames = (await _arnsRepository
-              .getAntRecordsForWallet(_auth.currentUser.walletAddress))
-          .isNotEmpty;
+      bool showArnsCheckbox = false;
 
-      emit(
-        UploadReady(
-          params: (state as UploadReadyToPrepare).params,
-          paymentInfo: paymentInfo,
-          numberOfFiles: files.length,
-          uploadIsPublic: !_targetDrive.isPrivate,
-          isDragNDrop: isDragNDrop,
-          isNextButtonEnabled: canUpload,
-          isArConnect: (state as UploadReadyToPrepare).isArConnect,
-          showArnsCheckbox:
-              hasUndernames && files.length == 1 && _targetDrive.isPublic,
-          showArnsNameSelection: false,
-        ),
-      );
+      if (_targetDrive.isPublic && files.length == 1) {
+        emit(
+          UploadReady(
+            params: (state as UploadReadyToPrepare).params,
+            paymentInfo: paymentInfo,
+            numberOfFiles: files.length,
+            uploadIsPublic: !_targetDrive.isPrivate,
+            isDragNDrop: isDragNDrop,
+            isNextButtonEnabled: canUpload,
+            isArConnect: (state as UploadReadyToPrepare).isArConnect,
+            showArnsCheckbox: showArnsCheckbox,
+            showArnsNameSelection: false,
+            loadingArNSNames: true,
+          ),
+        );
+
+        try {
+          final hasUndernames = (await _arnsRepository
+                  .getAntRecordsForWallet(_auth.currentUser.walletAddress))
+              .isNotEmpty;
+
+          showArnsCheckbox = hasUndernames;
+
+          if (state is! UploadReady) {
+            logger.d('State is not UploadReady');
+            return;
+          }
+
+          final readyState = state as UploadReady;
+
+          emit(readyState.copyWith(
+              loadingArNSNames: false, showArnsCheckbox: showArnsCheckbox));
+        } catch (e) {
+          final readyState = state as UploadReady;
+          emit(readyState.copyWith(
+              loadingArNSNamesError: true, loadingArNSNames: false));
+        }
+      } else {
+        emit(
+          UploadReady(
+            params: (state as UploadReadyToPrepare).params,
+            paymentInfo: paymentInfo,
+            numberOfFiles: files.length,
+            uploadIsPublic: !_targetDrive.isPrivate,
+            isDragNDrop: isDragNDrop,
+            isNextButtonEnabled: canUpload,
+            isArConnect: (state as UploadReadyToPrepare).isArConnect,
+            showArnsCheckbox: showArnsCheckbox,
+            showArnsNameSelection: false,
+          ),
+        );
+      }
     }
   }
 

lib/blocs/upload/upload_state.dart

@@ -95,6 +95,8 @@ class UploadReady extends UploadState {
   final UploadParams params;
   final bool showArnsCheckbox;
   final bool showArnsNameSelection;
+  final bool loadingArNSNames;
+  final bool loadingArNSNamesError;
 
   final bool isArConnect;
 
@@ -108,6 +110,8 @@ class UploadReady extends UploadState {
     required this.isArConnect,
     required this.showArnsCheckbox,
     required this.showArnsNameSelection,
+    this.loadingArNSNames = false,
+    this.loadingArNSNamesError = false,
   });
 
   // copyWith
@@ -123,8 +127,11 @@ class UploadReady extends UploadState {
     bool? showSettings,
     bool? showArnsCheckbox,
     bool? showArnsNameSelection,
+    bool? loadingArNSNames,
+    bool? loadingArNSNamesError,
   }) {
     return UploadReady(
+      loadingArNSNames: loadingArNSNames ?? this.loadingArNSNames,
       isArConnect: isArConnect ?? this.isArConnect,
       uploadIsPublic: uploadIsPublic ?? this.uploadIsPublic,
       isDragNDrop: isDragNDrop ?? this.isDragNDrop,
@@ -135,6 +142,8 @@ class UploadReady extends UploadState {
       showArnsCheckbox: showArnsCheckbox ?? this.showArnsCheckbox,
       showArnsNameSelection:
           showArnsNameSelection ?? this.showArnsNameSelection,
+      loadingArNSNamesError:
+          loadingArNSNamesError ?? this.loadingArNSNamesError,
     );
   }
 
@@ -143,6 +152,9 @@ class UploadReady extends UploadState {
         paymentInfo,
         isNextButtonEnabled,
         showArnsNameSelection,
+        loadingArNSNamesError,
+        loadingArNSNames,
+        showArnsCheckbox,
       ];
 
   @override

lib/components/upload_form.dart

@@ -629,7 +629,44 @@ class _UploadFormState extends State<UploadForm> {
                             ],
                           ),
                         ),
-                      if (state.showArnsCheckbox)
+                      if (state.loadingArNSNamesError)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 8),
+                          child: Row(
+                            children: [
+                              Text(
+                                'Error loading ARNS names',
+                                style: typography.paragraphLarge(
+                                  fontWeight: ArFontWeight.semiBold,
+                                  color: colorTokens.textRed,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      if (state.loadingArNSNames)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 8),
+                          child: Row(
+                            children: [
+                              Text(
+                                'Loading ArNS names...',
+                                style: typography.paragraphLarge(
+                                  fontWeight: ArFontWeight.semiBold,
+                                ),
+                              ),
+                              const SizedBox(width: 8),
+                              const SizedBox(
+                                height: 16,
+                                width: 16,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              )
+                            ],
+                          ),
+                        ),
+                      if (state.showArnsCheckbox && !state.loadingArNSNames)
                         Padding(
                           padding: const EdgeInsets.symmetric(vertical: 8),
                           child: Row(

lib/turbo/services/payment_service.dart

@@ -61,20 +61,10 @@ class PaymentService {
   Future<BigInt> getBalance({
     required Wallet wallet,
   }) async {
-    final nonce = const Uuid().v4();
-    final publicKey = await wallet.getOwner();
-    final signature = await signNonceAndData(
-      nonce: nonce,
-      wallet: wallet,
-    );
     try {
       final result = await httpClient.get(
-        url: '$turboPaymentUri/v1/balance',
-        headers: {
-          'x-nonce': nonce,
-          'x-signature': signature,
-          'x-public-key': publicKey,
-        },
+        url:
+            '$turboPaymentUri/v1/account/balance/arweave?address=${await wallet.getAddress()}',
       );
 
       final price = BigInt.parse((json.decode(result.data)['winc']));

test/services/payment_service_test.dart

@@ -72,7 +72,7 @@ void main() async {
 
       when(
         () => httpClient.get(
-          url: '$fakeUrl/v1/balance',
+          url: '$fakeUrl/v1/account/balance/arweave?address=$walletAddress',
           headers: any(named: 'headers'),
         ),
       ).thenAnswer(
@@ -249,7 +249,7 @@ void main() async {
           () async {
         when(
           () => httpClient.get(
-            url: '$fakeUrl/v1/balance',
+            url: '$fakeUrl/v1/account/balance/arweave?address=$walletAddress',
             headers: any(named: 'headers'),
           ),
         ).thenThrow(ArDriveHTTPException(
@@ -266,7 +266,7 @@ void main() async {
       test('should throw an exception if the status code is not 404', () async {
         when(
           () => httpClient.get(
-            url: '$fakeUrl/v1/balance',
+            url: '$fakeUrl/v1/account/balance/arweave?address=$walletAddress',
             headers: any(named: 'headers'),
           ),
         ).thenThrow(ArDriveHTTPException(