Merge pull request #1934 from ardriveapp/PE-4381-wallet-switch-dialog…

…-uses-the-old-modal-component PE-4381: wallet switch dialog uses the old modal component
ardriveapp · Jan 6, 2025 · caf8abd · caf8abd
2 parents f3b0d60 + 8a88ca8
commit caf8abd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 38 deletions.
diff --git a/lib/app_shell.dart b/lib/app_shell.dart
@@ -1,3 +1,4 @@
+import 'package:ardrive/authentication/ardrive_auth.dart';
 import 'package:ardrive/blocs/prompt_to_snapshot/prompt_to_snapshot_bloc.dart';
 import 'package:ardrive/blocs/prompt_to_snapshot/prompt_to_snapshot_event.dart';
 import 'package:ardrive/components/profile_card.dart';
@@ -46,14 +47,22 @@ class AppShellState extends State<AppShell> {
   @override
   void initState() {
     onArConnectWalletSwitch(() {
+      logger.d('Wallet switch detected');
       context.read<ProfileCubit>().isCurrentProfileArConnect().then(
         (isCurrentProfileArConnect) {
           if (_showWalletSwitchDialog) {
             if (isCurrentProfileArConnect) {
-              showDialog(
-                context: context,
-                builder: (context) => const WalletSwitchDialog(),
-              );
+              context.read<ArDriveAuth>().isUserLoggedIn().then((isLoggedIn) {
+                context.read<ProfileCubit>().logoutIfWalletMismatch();
+                if (isLoggedIn) {
+                  logger.d('Wallet switch detected while logged in'
+                      ' to ArConnect. Showing wallet switch dialog.');
+                  showArDriveDialog(
+                    context,
+                    content: const WalletSwitchDialog(),
+                  );
+                }
+              });
             } else {
               logger.d('Wallet switch detected while not logged in'
                   ' to ArConnect. Ignoring.');

diff --git a/lib/authentication/ardrive_auth.dart b/lib/authentication/ardrive_auth.dart
@@ -231,16 +231,17 @@ class ArDriveAuthImpl implements ArDriveAuth {
     logger.d('Logging out user');
 
     try {
+      await _userRepository.deleteUser();
+
       if (_currentUser != null) {
+        await _disconnectFromArConnect();
+        (await _metadataCache).clear();
         await _secureKeyValueStore.remove('password');
         await _secureKeyValueStore.remove('biometricEnabled');
-        currentUser = null;
-        await _disconnectFromArConnect();
       }
-
-      await _userRepository.deleteUser();
+
       await _databaseHelpers.deleteAllTables();
-      (await _metadataCache).clear();
+      currentUser = null;
       _userStreamController.add(null);
     } catch (e, stacktrace) {
       logger.e('Failed to logout user', e, stacktrace);

diff --git a/lib/authentication/login/blocs/login_bloc.dart b/lib/authentication/login/blocs/login_bloc.dart
@@ -571,6 +571,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     }
 
     onArConnectWalletSwitch(() async {
+      logger.d('Wallet switch detected on LoginBloc');
       final isUserLoggedIng = await _arDriveAuth.isUserLoggedIn();
       if (isUserLoggedIng && !_isArConnectWallet()) {
         logger.d(

diff --git a/lib/components/wallet_switch_dialog.dart b/lib/components/wallet_switch_dialog.dart
@@ -1,42 +1,16 @@
 // ignore_for_file: use_build_context_synchronously
 
-import 'package:ardrive/authentication/ardrive_auth.dart';
-import 'package:ardrive/blocs/blocs.dart';
-import 'package:ardrive/components/app_dialog.dart';
 import 'package:ardrive/utils/app_localizations_wrapper.dart';
-import 'package:ardrive_utils/ardrive_utils.dart';
+import 'package:ardrive_ui/ardrive_ui.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 
-// TODO: Add the new modal PE-4381
 class WalletSwitchDialog extends StatelessWidget {
   final bool fromAuthPage;
 
   const WalletSwitchDialog({super.key, this.fromAuthPage = false});
   @override
-  Widget build(BuildContext context) => AppDialog(
-        dismissable: false,
+  Widget build(BuildContext context) => ArDriveStandardModalNew(
         title: appLocalizationsOf(context).walletSwitch,
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.end,
-          children: [Text(appLocalizationsOf(context).walletChangeDetected)],
-        ),
-        actions: [
-          TextButton(
-            onPressed: () async {
-              await context.read<ArDriveAuth>().logout();
-              await context.read<ProfileCubit>().logoutProfile();
-
-              Navigator.pop(context);
-
-              if (fromAuthPage) {
-                triggerHTMLPageReload();
-                context.read<ProfileAddCubit>().promptForWallet();
-              }
-            },
-            child: Text(appLocalizationsOf(context).logOut),
-          )
-        ],
+        description: appLocalizationsOf(context).walletChangeDetected,
       );
 }