PE-4700: Release App v2.17.0

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

@@ -0,0 +1,5 @@
+- Add app version number on login page
+- Disables multi-select option when a modal is open
+- Pending files now can be shared
+- Layout improvements to the country dropdown on the Turbo payment form
+- Fixed issue where switching ArConnect wallets redirected users to initial unlock screen.

lib/app_shell.dart

@@ -2,6 +2,7 @@ import 'package:ardrive/components/profile_card.dart';
 import 'package:ardrive/components/side_bar.dart';
 import 'package:ardrive/pages/drive_detail/components/hover_widget.dart';
 import 'package:ardrive/utils/html/html_util.dart';
+import 'package:ardrive/utils/logger/logger.dart';
 import 'package:ardrive/utils/size_constants.dart';
 import 'package:ardrive_ui/ardrive_ui.dart';
 import 'package:flutter/material.dart';
@@ -32,16 +33,26 @@ class AppShellState extends State<AppShell> {
   bool _showWalletSwitchDialog = true;
   @override
   Widget build(BuildContext context) => BlocBuilder<DrivesCubit, DrivesState>(
-        builder: (context, state) {
+        builder: (context, _) {
           onArConnectWalletSwitch(() {
-            if (_showWalletSwitchDialog) {
-              showDialog(
-                context: context,
-                builder: (context) => const WalletSwitchDialog(),
-              );
-            }
-            //Used to prevent the dialog being shown multiple times.
-            _showWalletSwitchDialog = false;
+            context
+                .read<ProfileCubit>()
+                .isCurrentProfileArConnect()
+                .then((isCurrentProfileArConnect) {
+              if (_showWalletSwitchDialog) {
+                if (isCurrentProfileArConnect) {
+                  showDialog(
+                    context: context,
+                    builder: (context) => const WalletSwitchDialog(),
+                  );
+                } else {
+                  logger.d('Wallet switch detected while not logged in'
+                      ' to ArConnect. Ignoring.');
+                }
+              }
+              //Used to prevent the dialog being shown multiple times.
+              _showWalletSwitchDialog = false;
+            });
           });
 
           Widget buildPage(scaffold) => Material(

lib/authentication/ardrive_auth.dart

@@ -26,7 +26,7 @@ abstract class ArDriveAuth {
   Future<User> unlockWithBiometrics({required String localizedReason});
   Future<User> unlockUser({required String password});
   Future<void> logout();
-  User? get currentUser;
+  User get currentUser;
   Stream<User?> onAuthStateChanged();
   Future<bool> isBiometricsEnabled();
 
@@ -216,32 +216,33 @@ class ArDriveAuthImpl implements ArDriveAuth {
 
     try {
       if (_currentUser != null) {
-        if (currentUser.profileType == ProfileType.arConnect) {
-          try {
-            await _arConnectService.disconnect();
-          } catch (e) {
-            logger.e('Failed to disconnect from ArConnect', e);
-          }
-        }
-
-        _secureKeyValueStore.remove('password');
-        _secureKeyValueStore.remove('biometricEnabled');
-
+        await _secureKeyValueStore.remove('password');
+        await _secureKeyValueStore.remove('biometricEnabled');
         currentUser = null;
         firstPrivateDriveTxId = null;
-
+        await _disconnectFromArConnect();
         _userStreamController.add(null);
       }
 
       await _databaseHelpers.deleteAllTables();
-
       (await _metadataCache).clear();
     } catch (e) {
       logger.e('Failed to logout user', e);
       throw AuthenticationFailedException('Failed to logout user');
     }
   }
 
+  Future<void> _disconnectFromArConnect() async {
+    final hasArConnectPermissions = await _arConnectService.checkPermissions();
+    if (hasArConnectPermissions) {
+      try {
+        await _arConnectService.disconnect();
+      } catch (e) {
+        logger.e('Failed to disconnect from ArConnect', e);
+      }
+    }
+  }
+
   @override
   Future<bool> isBiometricsEnabled() {
     return _biometricAuthentication.isEnabled();

lib/authentication/components/biometric_toggle.dart

@@ -91,6 +91,7 @@ class _BiometricToggleState extends State<BiometricToggle> {
                 } catch (e) {
                   widget.onError?.call();
                   if (e is BiometricException) {
+                    // ignore: use_build_context_synchronously
                     showBiometricExceptionDialogForException(
                       context,
                       e,

lib/authentication/login/blocs/login_bloc.dart

@@ -77,7 +77,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleUnlockUserWithBiometricsEvent(
-      UnLockWithBiometrics event, Emitter<LoginState> emit) async {
+    UnLockWithBiometrics event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     try {
@@ -107,7 +109,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleAddWalletFileEvent(
-      AddWalletFile event, Emitter<LoginState> emit) async {
+    AddWalletFile event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     try {
@@ -130,7 +134,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleLoginWithPasswordEvent(
-      LoginWithPassword event, Emitter<LoginState> emit) async {
+    LoginWithPassword event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     try {
@@ -150,7 +156,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleCheckIfUserIsLoggedInEvent(
-      CheckIfUserIsLoggedIn event, Emitter<LoginState> emit) async {
+    CheckIfUserIsLoggedIn event,
+    Emitter<LoginState> emit,
+  ) async {
     emit(LoginLoading());
 
     if (await _arDriveAuth.isUserLoggedIn()) {
@@ -172,7 +180,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleUnlockUserWithPasswordEvent(
-      UnlockUserWithPassword event, Emitter<LoginState> emit) async {
+    UnlockUserWithPassword event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     emit(LoginLoading());
@@ -192,7 +202,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleCreatePasswordEvent(
-      CreatePassword event, Emitter<LoginState> emit) async {
+    CreatePassword event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     emit(LoginLoading());
@@ -212,7 +224,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleAddWalletFromArConnectEvent(
-      AddWalletFromArConnect event, Emitter<LoginState> emit) async {
+    AddWalletFromArConnect event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
 
     try {
@@ -260,10 +274,6 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
       await _arDriveAuth.logout();
     }
 
-    if (_isArConnectWallet()) {
-      await _arConnectService.disconnect();
-    }
-
     emit(LoginInitial(_arConnectService.isExtensionPresent()));
   }
 
@@ -312,7 +322,13 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
       return;
     }
 
-    onArConnectWalletSwitch(() {
+    onArConnectWalletSwitch(() async {
+      final isUserLoggedIng = await _arDriveAuth.isUserLoggedIn();
+      if (isUserLoggedIng && !_isArConnectWallet()) {
+        logger.d('Wallet switch detected. Is current profile ArConnect: false');
+        return;
+      }
+
       if (ignoreNextWaletSwitch) {
         ignoreNextWaletSwitch = false;
         return;
@@ -322,7 +338,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
       // ignore: invalid_use_of_visible_for_testing_member
       emit(const LoginFailure(WalletMismatchException()));
 
-      _arDriveAuth.logout();
+      await _arDriveAuth.logout();
 
       // ignore: invalid_use_of_visible_for_testing_member
       emit(const LoginInitial(true));
@@ -343,7 +359,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleEnterSeedPhrase(
-      EnterSeedPhrase event, Emitter<LoginState> emit) async {
+    EnterSeedPhrase event,
+    Emitter<LoginState> emit,
+  ) async {
     emit(LoginEnterSeedPhrase());
   }
 
@@ -358,7 +376,9 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleAddWalletFromCompleterEvent(
-      AddWalletFromCompleter event, Emitter<LoginState> emit) async {
+    AddWalletFromCompleter event,
+    Emitter<LoginState> emit,
+  ) async {
     profileType = ProfileType.json;
 
     Completer<Wallet> completer = event.walletCompleter;
@@ -380,14 +400,18 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
   }
 
   Future<void> _handleCreateNewWalletEvent(
-      CreateNewWallet event, Emitter<LoginState> emit) async {
+    CreateNewWallet event,
+    Emitter<LoginState> emit,
+  ) async {
     profileType = ProfileType.json;
     final mnemonic = bip39.generateMnemonic();
     emit(LoginCreateNewWallet(mnemonic));
   }
 
   Future<void> _handleCompleteWalletGenerationEvent(
-      CompleteWalletGeneration event, Emitter<LoginState> emit) async {
+    CompleteWalletGeneration event,
+    Emitter<LoginState> emit,
+  ) async {
     final previousState = state;
     final wallet = event.wallet;