From b1ddc5e1cc818aeeb77c976f7928dca6128fcc07 Mon Sep 17 00:00:00 2001 From: hieubt Date: Wed, 3 Jan 2024 18:45:41 +0700 Subject: [PATCH] TF-2101 Update navigation to email_recovery handle (cherry picked from commit 5dd6fec26537825eda3b6882afb3180227ef7cf6) --- .../model/email_recovery_arguments.dart | 1 - .../mailbox_dashboard_controller.dart | 25 +++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/features/email_recovery/presentation/model/email_recovery_arguments.dart b/lib/features/email_recovery/presentation/model/email_recovery_arguments.dart index 794de5751..5bc0383bb 100644 --- a/lib/features/email_recovery/presentation/model/email_recovery_arguments.dart +++ b/lib/features/email_recovery/presentation/model/email_recovery_arguments.dart @@ -16,5 +16,4 @@ class EmailRecoveryArguments with EquatableMixin { accountId, session, ]; - } \ No newline at end of file diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart index fa8b4acdb..3848d268f 100644 --- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart +++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart @@ -61,6 +61,7 @@ import 'package:tmail_ui_user/features/email/domain/usecases/unsubscribe_email_i import 'package:tmail_ui_user/features/email/presentation/action/email_ui_action.dart'; import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart'; import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart'; +import 'package:tmail_ui_user/features/email_recovery/presentation/model/email_recovery_arguments.dart'; import 'package:tmail_ui_user/features/home/domain/usecases/store_session_interactor.dart'; import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart'; import 'package:tmail_ui_user/features/mailbox/domain/state/mark_as_mailbox_read_state.dart'; @@ -2428,13 +2429,23 @@ class MailboxDashBoardController extends ReloadableController { void gotoEmailRecovery() async { closeMailboxMenuDrawer(); - if (PlatformInfo.isWeb) { - await DialogRouter.pushGeneralDialog( - routeName: AppRoutes.emailRecovery, - arguments: {}, - ); - } else { - await push(AppRoutes.emailRecovery); + + final currentAccountId = accountId.value; + final currentSession = sessionCurrent; + if (currentAccountId != null && currentSession != null) { + final arguments = EmailRecoveryArguments(currentAccountId, currentSession); + + if (PlatformInfo.isWeb) { + await DialogRouter.pushGeneralDialog( + routeName: AppRoutes.emailRecovery, + arguments: arguments, + ); + } else { + await push( + AppRoutes.emailRecovery, + arguments: arguments + ); + } } }