diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart index 15172aa68c..b3b7cb71c5 100644 --- a/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart +++ b/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart @@ -172,7 +172,6 @@ class _DeleteAccountBottomSheetState extends State<_DeleteAccountBottomSheet> { context, controller.text.trim(), isChecked.value, - onSuccess: () => Navigator.of(context).pop(), ), ), const VSpace(12.0), diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart index 1215a66dae..6f475bc627 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart @@ -19,7 +19,7 @@ class Loading { if (hasStopped) { WidgetsBinding.instance.addPostFrameCallback((_) { - Navigator.of(loadingContext!).pop(); + Navigator.of(loadingContext!).maybePop(); loadingContext = null; }); } diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart index f59053b55f..63249e46ed 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_deletion.dart @@ -2,7 +2,6 @@ import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/openai/widgets/loading.dart'; import 'package:appflowy/startup/startup.dart'; -import 'package:appflowy/user/application/auth/auth_service.dart'; import 'package:appflowy/user/application/user_service.dart'; import 'package:appflowy/workspace/presentation/home/menu/sidebar/space/shared_widget.dart'; import 'package:appflowy/workspace/presentation/widgets/dialogs.dart'; @@ -209,7 +208,6 @@ Future deleteMyAccount( ); return; } - if (!context.mounted) { return; } @@ -238,7 +236,6 @@ Future deleteMyAccount( message: LocaleKeys .newSettings_myAccount_deleteAccount_deleteAccountSuccess .tr(), - bottomPadding: bottomPadding, ); // delay 1 second to make sure the toast notification is shown @@ -246,7 +243,6 @@ Future deleteMyAccount( onSuccess?.call(); // restart the application - await getIt().signOut(); await runAppFlowy(); }); },