Merge branch 'dev' into PE-6948-hotfix

ardriveapp · Oct 17, 2024 · 6b6a724 · 6b6a724
2 parents 806d2eb + 705172e
commit 6b6a724
Show file tree

Hide file tree

Showing 36 changed files with 5,017 additions and 2,406 deletions.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/158.txt b/android/fastlane/metadata/android/en-US/changelogs/158.txt
@@ -0,0 +1,5 @@
+- New feature: auto-update for manifests after file uploads.
+- Refresh the upload UI with updated icons, dropdowns, and selectors.
+- Add loading feedback during large file fetches to prevent app unresponsiveness.
+- Improved sidebar styling.
+- Fixes an issue where the blurred seed phrase content was not displaying after resizing the page.
diff --git a/lib/authentication/login/views/modals/enter_your_password_modal.dart b/lib/authentication/login/views/modals/enter_your_password_modal.dart
@@ -236,7 +236,7 @@ class _EnterYourPasswordWidgetState extends State<EnterYourPasswordWidget> {
                 child: ArDriveButtonNew(
                   variant: ButtonVariant.outline,
                   text: 'Advanced Settings',
-                  maxHeight: 32,
+                  maxHeight: 40,
                   typography: typography,
                   onPressed: () {
                     showGatewaySwitcherModal(context);

diff --git a/lib/authentication/login/views/wallet_created_view.dart b/lib/authentication/login/views/wallet_created_view.dart
@@ -385,11 +385,10 @@ class _WalletCreatedViewState extends State<WalletCreatedView> {
                 color: colorTokens.textMid, fontWeight: ArFontWeight.book)));
 
     return isBlurred
-        ? ClipRect(
-            child: ImageFiltered(
+        ? ImageFiltered(
             imageFilter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
             child: text,
-          ))
+          )
         : text;
   }
 

diff --git a/lib/blocs/create_manifest/create_manifest_cubit.dart b/lib/blocs/create_manifest/create_manifest_cubit.dart
@@ -172,9 +172,8 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
   }
 
   Future<void> checkNameConflicts(String name) async {
-    final arns = await _arnsRepository.getAntRecordsForWallet(
-      _auth.currentUser.walletAddress
-    );
+    final arns = await _arnsRepository
+        .getAntRecordsForWallet(_auth.currentUser.walletAddress);
 
     final parentFolder =
         (state as CreateManifestCheckingForConflicts).parentFolder;
@@ -273,7 +272,7 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
     }
   }
 
-  Future<void> uploadManifest() async {
+  Future<void> uploadManifest({UploadMethod? method}) async {
     if (await _profileCubit.logoutIfWalletMismatch()) {
       emit(CreateManifestWalletMismatch());
       return;
@@ -283,7 +282,8 @@ class CreateManifestCubit extends Cubit<CreateManifestState> {
       try {
         final createManifestUploadReview = state as CreateManifestUploadReview;
         final uploadType =
-            createManifestUploadReview.uploadMethod == UploadMethod.ar
+            (method ?? createManifestUploadReview.uploadMethod) ==
+                    UploadMethod.ar
                 ? UploadType.d2n
                 : UploadType.turbo;
 

diff --git a/lib/blocs/upload/payment_method/view/upload_payment_method_view.dart b/lib/blocs/upload/payment_method/view/upload_payment_method_view.dart
@@ -14,6 +14,7 @@ class UploadPaymentMethodView extends StatelessWidget {
     this.onTurboTopupSucess,
     this.loadingIndicator,
     this.useNewArDriveUI = false,
+    this.useDropdown = false,
   });
 
   final Function(UploadMethod, UploadPaymentMethodInfo, bool)
@@ -22,6 +23,7 @@ class UploadPaymentMethodView extends StatelessWidget {
   final Function()? onTurboTopupSucess;
   final Widget? loadingIndicator;
   final bool useNewArDriveUI;
+  final bool useDropdown;
 
   @override
   Widget build(BuildContext context) {
@@ -44,6 +46,7 @@ class UploadPaymentMethodView extends StatelessWidget {
           return PaymentMethodSelector(
             useNewArDriveUI: useNewArDriveUI,
             uploadMethodInfo: state.paymentMethodInfo,
+            useDropdown: useDropdown,
             onArSelect: () {
               context.read<UploadPaymentMethodBloc>().add(
                     const ChangeUploadPaymentMethod(