feat: Haven removal flow, should go back to the previous screen/wallet if it is triggered within the app

lib/core/haven_removal_flow_parameters.dart

@@ -0,0 +1,14 @@
+import 'package:cake_wallet/view_model/haven_removal_view_model.dart';
+import 'package:cw_core/wallet_base.dart';
+
+class HavenRemovalFlowParameters {
+  final WalletBase wallet;
+  final bool isFromRemoveHavenAppStartFlow;
+  final HavenRemovalViewModel? havenRemovalViewModel;
+
+  HavenRemovalFlowParameters(
+    this.wallet,
+    this.isFromRemoveHavenAppStartFlow,
+    this.havenRemovalViewModel,
+  );
+}

lib/di.dart

@@ -4,6 +4,7 @@ import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
+import 'package:cake_wallet/core/haven_removal_flow_parameters.dart';
 import 'package:cake_wallet/core/yat_service.dart';
 import 'package:cake_wallet/entities/background_tasks.dart';
 import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
@@ -855,9 +856,8 @@ Future<void> setup({
 
   getIt.registerFactory(() => SupportPage(getIt.get<SupportViewModel>()));
 
-  getIt.registerFactory(() =>
+  getIt.registerFactory(() => SupportChatPage(getIt.get<SupportViewModel>(),
-      SupportChatPage(
+      secureStorage: getIt.get<FlutterSecureStorage>()));
-          getIt.get<SupportViewModel>(), secureStorage: getIt.get<FlutterSecureStorage>()));
 
   getIt.registerFactory(() => SupportOtherLinksPage(getIt.get<SupportViewModel>()));
 
@@ -1059,12 +1059,20 @@ Future<void> setup({
       walletInfoSource: _walletInfoSource,
       walletLoadingService: getIt.get<WalletLoadingService>()));
 
-  getIt.registerFactoryParam<HavenRemovalNoticePage, WalletBase, void>(
+  getIt.registerFactoryParam<HavenRemovalNoticePage, WalletBase, bool>(
-    (wallet, _) => HavenRemovalNoticePage(wallet, getIt.get<HavenRemovalViewModel>()),
+    (wallet, isFromHavenRemovalAtStartFlow) {
+      final params = HavenRemovalFlowParameters(
+        wallet,
+        isFromHavenRemovalAtStartFlow,
+        getIt.get<HavenRemovalViewModel>(),
       );
       
-  getIt.registerFactoryParam<HavenRemovalSeedPage, WalletBase, HavenRemovalViewModel>(
+      return HavenRemovalNoticePage(params);
-    (wallet, viewModel) => HavenRemovalSeedPage(wallet, viewModel),
+    },
+  );
+
+  getIt.registerFactoryParam<HavenRemovalSeedPage, HavenRemovalFlowParameters, void>(
+    (params, _) => HavenRemovalSeedPage(params),
   );
 
   _isSetupFinished = true;

lib/reactions/on_authentication_state_change.dart

@@ -44,11 +44,8 @@ Future<void> _navigateBasedOnWalletType(
   final wallet = appStore.wallet!;
 
   if (wallet.type == WalletType.haven) {
-    await navigatorKey.currentState!.pushNamedAndRemoveUntil(
+    await navigatorKey.currentState!
-      Routes.havenRemovalNoticePage,
+        .pushNamed(Routes.havenRemovalNoticePage, arguments: [wallet, true]);
-      (route) => false,
-      arguments: wallet,
-    );
     return;
   } else {
     await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);

lib/router.dart

@@ -1,5 +1,6 @@
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
+import 'package:cake_wallet/core/haven_removal_flow_parameters.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/buy/order.dart';
@@ -115,10 +116,11 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.newWalletFromWelcome:
       return CupertinoPageRoute<void>(
-          builder: (_) => getIt.get<SetupPinCodePage>(
+          builder: (_) =>
-              param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
+              getIt.get<SetupPinCodePage>(param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
                 if (availableWalletTypes.length == 1) {
-              Navigator.of(context.context).pushNamed(Routes.newWallet, arguments: availableWalletTypes.first);
+                  Navigator.of(context.context)
+                      .pushNamed(Routes.newWallet, arguments: availableWalletTypes.first);
                 } else {
                   Navigator.of(context.context).pushNamed(Routes.newWalletType);
                 }
@@ -129,22 +131,19 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<NewWalletTypePage>(
               param1: (BuildContext context, WalletType type) =>
-                  Navigator.of(context)
+                  Navigator.of(context).pushNamed(Routes.newWallet, arguments: type)));
-                      .pushNamed(Routes.newWallet, arguments: type)));
 
     case Routes.newWallet:
       final type = settings.arguments as WalletType;
       final walletNewVM = getIt.get<WalletNewVM>(param1: type);
 
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => NewWalletPage(walletNewVM));
-          builder: (_) => NewWalletPage(walletNewVM));
 
     case Routes.setupPin:
       Function(PinCodeState<PinCodeWidget>, String)? callback;
 
       if (settings.arguments is Function(PinCodeState<PinCodeWidget>, String)) {
-        callback =
+        callback = settings.arguments as Function(PinCodeState<PinCodeWidget>, String);
-            settings.arguments as Function(PinCodeState<PinCodeWidget>, String);
       }
 
       return CupertinoPageRoute<void>(
@@ -154,8 +153,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<NewWalletTypePage>(
               param1: (BuildContext context, WalletType type) =>
-                  Navigator.of(context)
+                  Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: type),
-                      .pushNamed(Routes.restoreWallet, arguments: type),
               param2: false));
 
     case Routes.restoreOptions:
@@ -176,60 +174,51 @@ Route<dynamic> createRoute(RouteSettings settings) {
                         .pushNamed(Routes.restoreWallet, arguments: availableWalletTypes.first);
                   }
 
-                  return Navigator.pushNamed(
+                  return Navigator.pushNamed(context.context, Routes.restoreWalletType);
-                        context.context, Routes.restoreWalletType);
                 }),
             fullscreenDialog: true);
       } else if (isSingleCoin) {
         return MaterialPageRoute<void>(
-            builder: (_) => getIt.get<WalletRestorePage>(
+            builder: (_) => getIt.get<WalletRestorePage>(param1: availableWalletTypes.first));
-                param1: availableWalletTypes.first
-            ));
       } else {
         return CupertinoPageRoute<void>(
             builder: (_) => getIt.get<NewWalletTypePage>(
                 param1: (BuildContext context, WalletType type) =>
-                    Navigator.of(context)
+                    Navigator.of(context).pushNamed(Routes.restoreWallet, arguments: type),
-                        .pushNamed(Routes.restoreWallet, arguments: type),
                 param2: false));
       }
 
     case Routes.seed:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) =>
+          builder: (_) => getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
-              getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
 
     case Routes.restoreWallet:
       return MaterialPageRoute<void>(
-          builder: (_) => getIt.get<WalletRestorePage>(
+          builder: (_) => getIt.get<WalletRestorePage>(param1: settings.arguments as WalletType));
-              param1: settings.arguments as WalletType));
 
     case Routes.sweepingWalletPage:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<SweepingWalletPage>());
-          builder: (_) => getIt.get<SweepingWalletPage>());
 
     case Routes.dashboard:
       return CupertinoPageRoute<void>(
-          settings: settings,
+          settings: settings, builder: (_) => getIt.get<DashboardPage>());
-          builder: (_) => getIt.get<DashboardPage>());
 
     case Routes.send:
       final initialPaymentRequest = settings.arguments as PaymentRequest?;
 
       return CupertinoPageRoute<void>(
-        fullscreenDialog: true, builder: (_) => getIt.get<SendPage>(
+          fullscreenDialog: true,
+          builder: (_) => getIt.get<SendPage>(
                 param1: initialPaymentRequest,
               ));
 
     case Routes.sendTemplate:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<SendTemplatePage>());
-          builder: (_) => getIt.get<SendTemplatePage>());
 
     case Routes.receive:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<ReceivePage>());
-          builder: (_) => getIt.get<ReceivePage>());
 
     case Routes.addressPage:
       return CupertinoPageRoute<void>(
@@ -238,20 +227,18 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.transactionDetails:
       return CupertinoPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) => getIt.get<TransactionDetailsPage>(
+          builder: (_) =>
-              param1: settings.arguments as TransactionInfo));
+              getIt.get<TransactionDetailsPage>(param1: settings.arguments as TransactionInfo));
 
     case Routes.newSubaddress:
       return CupertinoPageRoute<void>(
-          builder: (_) =>
+          builder: (_) => getIt.get<AddressEditOrCreatePage>(param1: settings.arguments));
-              getIt.get<AddressEditOrCreatePage>(param1: settings.arguments));
 
     case Routes.disclaimer:
       return CupertinoPageRoute<void>(builder: (_) => DisclaimerPage());
 
     case Routes.readDisclaimer:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => DisclaimerPage(isReadOnly: true));
-          builder: (_) => DisclaimerPage(isReadOnly: true));
 
     case Routes.seedLanguage:
       final args = settings.arguments as List<dynamic>;
@@ -260,8 +247,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
       return CupertinoPageRoute<void>(builder: (_) {
         return SeedLanguage(
-            onConfirm: (context, lang) => Navigator.of(context)
+            onConfirm: (context, lang) =>
-                .popAndPushNamed(redirectRoute, arguments: [type, lang]));
+                Navigator.of(context).popAndPushNamed(redirectRoute, arguments: [type, lang]));
       });
 
     case Routes.walletList:
@@ -271,15 +258,13 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.walletEdit:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) => getIt.get<WalletEditPage>(
+          builder: (_) => getIt.get<WalletEditPage>(param1: settings.arguments as List<dynamic>));
-              param1: settings.arguments as List<dynamic>));
 
     case Routes.auth:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
           builder: (_) => getIt.get<AuthPage>(
-              param1: settings.arguments as OnAuthenticationFinished,
+              param1: settings.arguments as OnAuthenticationFinished, param2: true));
-              param2: true));
 
     case Routes.totpAuthCodePage:
       final args = settings.arguments as TotpAuthArgumentsModel;
@@ -306,43 +291,34 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true,
           builder: (_) => WillPopScope(
               child: getIt.get<AuthPage>(
-                  param1: settings.arguments as OnAuthenticationFinished,
+                  param1: settings.arguments as OnAuthenticationFinished, param2: false),
-                  param2: false),
               onWillPop: () async => false));
 
     case Routes.connectionSync:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<ConnectionSyncPage>());
-          builder: (_) => getIt.get<ConnectionSyncPage>());
 
     case Routes.securityBackupPage:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<SecurityBackupPage>());
-          builder: (_) => getIt.get<SecurityBackupPage>());
 
     case Routes.privacyPage:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<PrivacyPage>());
-          builder: (_) => getIt.get<PrivacyPage>());
 
     case Routes.displaySettingsPage:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<DisplaySettingsPage>());
-          builder: (_) => getIt.get<DisplaySettingsPage>());
 
     case Routes.otherSettingsPage:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<OtherSettingsPage>());
-          builder: (_) => getIt.get<OtherSettingsPage>());
 
     case Routes.newNode:
       final args = settings.arguments as Map<String, dynamic>?;
       return CupertinoPageRoute<void>(
           builder: (_) => getIt.get<NodeCreateOrEditPage>(
-            param1: args?['editingNode'] as Node?,
+              param1: args?['editingNode'] as Node?, param2: args?['isSelected'] as bool?));
-            param2: args?['isSelected'] as bool?));
-
-
 
     case Routes.accountCreation:
       return CupertinoPageRoute<String>(
@@ -351,8 +327,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.addressBook:
       return MaterialPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<ContactListPage>());
-          builder: (_) => getIt.get<ContactListPage>());
 
     case Routes.pickerAddressBook:
       final selectedCurrency = settings.arguments as CryptoCurrency?;
@@ -361,31 +336,26 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.addressBookAddContact:
       return CupertinoPageRoute<void>(
-          builder: (_) => getIt.get<ContactPage>(
+          builder: (_) => getIt.get<ContactPage>(param1: settings.arguments as ContactRecord?));
-              param1: settings.arguments as ContactRecord?));
 
     case Routes.showKeys:
       return MaterialPageRoute<void>(
           builder: (_) => getIt.get<WalletKeysPage>(), fullscreenDialog: true);
 
     case Routes.exchangeTrade:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<ExchangeTradePage>());
-          builder: (_) => getIt.get<ExchangeTradePage>());
 
     case Routes.exchangeConfirm:
-      return MaterialPageRoute<void>(
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<ExchangeConfirmPage>());
-          builder: (_) => getIt.get<ExchangeConfirmPage>());
 
     case Routes.tradeDetails:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) =>
+          builder: (_) => getIt.get<TradeDetailsPage>(param1: settings.arguments as Trade));
-              getIt.get<TradeDetailsPage>(param1: settings.arguments as Trade));
 
     case Routes.orderDetails:
       return MaterialPageRoute<void>(
-          builder: (_) =>
+          builder: (_) => getIt.get<OrderDetailsPage>(param1: settings.arguments as Order));
-              getIt.get<OrderDetailsPage>(param1: settings.arguments as Order));
 
     case Routes.buy:
       return MaterialPageRoute<void>(builder: (_) => getIt.get<BuyOptionsPage>());
@@ -394,18 +364,14 @@ Route<dynamic> createRoute(RouteSettings settings) {
       final args = settings.arguments as List;
 
       return MaterialPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<BuyWebViewPage>(param1: args));
-          builder: (_) =>
-              getIt.get<BuyWebViewPage>(param1: args));
 
     case Routes.exchange:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<ExchangePage>());
-          builder: (_) => getIt.get<ExchangePage>());
 
     case Routes.exchangeTemplate:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<ExchangeTemplatePage>());
-          builder: (_) => getIt.get<ExchangeTemplatePage>());
 
     case Routes.rescan:
       return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
@@ -415,51 +381,41 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.preSeed:
       return MaterialPageRoute<void>(
-          builder: (_) =>
+          builder: (_) => getIt.get<PreSeedPage>(param1: settings.arguments as WalletType));
-              getIt.get<PreSeedPage>(param1: settings.arguments as WalletType));
 
     case Routes.backup:
       return CupertinoPageRoute<void>(
           fullscreenDialog: true, builder: (_) => getIt.get<BackupPage>());
 
     case Routes.editBackupPassword:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<EditBackupPasswordPage>());
-          builder: (_) => getIt.get<EditBackupPasswordPage>());
 
     case Routes.restoreFromBackup:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<RestoreFromBackupPage>());
-          builder: (_) => getIt.get<RestoreFromBackupPage>());
 
     case Routes.support:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<SupportPage>());
-          builder: (_) => getIt.get<SupportPage>());
 
     case Routes.supportLiveChat:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<SupportChatPage>());
-          builder: (_) => getIt.get<SupportChatPage>());
 
     case Routes.supportOtherLinks:
       return CupertinoPageRoute<void>(
-          fullscreenDialog: true,
+          fullscreenDialog: true, builder: (_) => getIt.get<SupportOtherLinksPage>());
-          builder: (_) => getIt.get<SupportOtherLinksPage>());
 
     case Routes.unspentCoinsList:
-      return MaterialPageRoute<void>(
+      return MaterialPageRoute<void>(builder: (_) => getIt.get<UnspentCoinsListPage>());
-          builder: (_) => getIt.get<UnspentCoinsListPage>());
 
     case Routes.unspentCoinsDetails:
       final args = settings.arguments as List;
 
       return MaterialPageRoute<void>(
-          builder: (_) =>
+          builder: (_) => getIt.get<UnspentCoinsDetailsPage>(param1: args));
-              getIt.get<UnspentCoinsDetailsPage>(
-                  param1: args));
 
     case Routes.fullscreenQR:
       return MaterialPageRoute<void>(
-          builder: (_) =>
+          builder: (_) => getIt.get<FullscreenQRPage>(
-              getIt.get<FullscreenQRPage>(
                 param1: settings.arguments as QrViewData,
               ));
 
@@ -476,16 +432,17 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaCreateAccountPage>());
 
     case Routes.ioniaManageCardsPage:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaManageCardsPage>());
-        builder: (_) => getIt.get<IoniaManageCardsPage>());
 
     case Routes.ioniaBuyGiftCardPage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaBuyGiftCardPage>(param1: args));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<IoniaBuyGiftCardPage>(param1: args));
 
     case Routes.ioniaBuyGiftCardDetailPage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaBuyGiftCardDetailPage>(param1: args));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<IoniaBuyGiftCardDetailPage>(param1: args));
 
     case Routes.ioniaVerifyIoniaOtpPage:
       final args = settings.arguments as List;
@@ -509,31 +466,33 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.ioniaGiftCardDetailPage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaGiftCardDetailPage>(param1: args.first));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<IoniaGiftCardDetailPage>(param1: args.first));
 
     case Routes.ioniaCustomRedeemPage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaCustomRedeemPage>(param1: args));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<IoniaCustomRedeemPage>(param1: args));
 
     case Routes.ioniaMoreOptionsPage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaMoreOptionsPage>(param1: args));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<IoniaMoreOptionsPage>(param1: args));
 
     case Routes.ioniaPaymentStatusPage:
       final args = settings.arguments as List;
       final paymentInfo = args.first as IoniaAnyPayPaymentInfo;
       final commitedInfo = args[1] as AnyPayPaymentCommittedInfo;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaPaymentStatusPage>(
+      return CupertinoPageRoute<void>(
-        param1: paymentInfo,
+          builder: (_) =>
-        param2: commitedInfo));
+              getIt.get<IoniaPaymentStatusPage>(param1: paymentInfo, param2: commitedInfo));
 
     case Routes.webViewPage:
       final args = settings.arguments as List;
       final title = args.first as String;
       final url = args[1] as Uri;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<WebViewPage>(
+      return CupertinoPageRoute<void>(
-          param1: title,
+          builder: (_) => getIt.get<WebViewPage>(param1: title, param2: url));
-          param2: url));
 
     case Routes.advancedPrivacySettings:
       final type = settings.arguments as WalletType;
@@ -546,16 +505,17 @@ Route<dynamic> createRoute(RouteSettings settings) {
 
     case Routes.anonPayInvoicePage:
       final args = settings.arguments as List;
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => getIt.get<AnonPayInvoicePage>(param1: args));
-          builder: (_) => getIt.get<AnonPayInvoicePage>(param1: args));
 
     case Routes.anonPayReceivePage:
       final anonInvoiceViewData = settings.arguments as AnonpayInfoBase;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<AnonPayReceivePage>(param1: anonInvoiceViewData));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<AnonPayReceivePage>(param1: anonInvoiceViewData));
 
     case Routes.anonPayDetailsPage:
       final anonInvoiceViewData = settings.arguments as AnonpayInvoiceInfo;
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<AnonpayDetailsPage>(param1: anonInvoiceViewData));
+      return CupertinoPageRoute<void>(
+          builder: (_) => getIt.get<AnonpayDetailsPage>(param1: anonInvoiceViewData));
 
     case Routes.desktop_actions:
       return PageRouteBuilder(
@@ -564,12 +524,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
       );
 
     case Routes.desktop_settings_page:
-      return CupertinoPageRoute<void>(
+      return CupertinoPageRoute<void>(builder: (_) => DesktopSettingsPage());
-          builder: (_) => DesktopSettingsPage());
 
     case Routes.empty_no_route:
-      return MaterialPageRoute<void>(
+      return MaterialPageRoute<void>(builder: (_) => SizedBox.shrink());
-          builder: (_) => SizedBox.shrink());
 
     case Routes.transactionsPage:
       return CupertinoPageRoute<void>(
@@ -609,24 +567,25 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => getIt.get<ManageNodesPage>());
 
     case Routes.havenRemovalNoticePage:
+      final args = settings.arguments as List;
+
+      final wallet = args.first as WalletBase;
+      final isFromHavenRemovalAtStartFlow = args[1];
+
       return CupertinoPageRoute<void>(
-        builder: (_) => getIt.get<HavenRemovalNoticePage>(param1: settings.arguments as WalletBase),
+        builder: (_) => getIt.get<HavenRemovalNoticePage>(param1: wallet, param2: isFromHavenRemovalAtStartFlow),
       );
 
     case Routes.havenRemovalSeedPage:
-      final args = settings.arguments as List;
+      final args = settings.arguments as HavenRemovalFlowParameters;
-      final wallet = args.first as WalletBase;
-      final havenRemovalViewModel = args[1] as HavenRemovalViewModel;
 
       return CupertinoPageRoute<void>(
-        builder: (_) =>
+        builder: (_) => getIt.get<HavenRemovalSeedPage>(param1: args),
-            getIt.get<HavenRemovalSeedPage>(param1: wallet, param2: havenRemovalViewModel),
       );
 
     default:
       return MaterialPageRoute<void>(
           builder: (_) => Scaffold(
-              body: Center(
+              body: Center(child: Text(S.current.router_no_route(settings.name ?? 'No route')))));
-                  child: Text(S.current.router_no_route(settings.name ?? 'No route')))));
   }
 }

lib/src/screens/haven_removal/haven_removal_notice_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/haven_removal_flow_parameters.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
@@ -5,20 +6,17 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
-import 'package:cake_wallet/view_model/haven_removal_view_model.dart';
-import 'package:cw_core/wallet_base.dart';
 import 'package:flutter/material.dart';
 
 class HavenRemovalNoticePage extends BasePage {
-  HavenRemovalNoticePage(this.wallet, this.viewModel)
+  HavenRemovalNoticePage(this.params)
       : imageLight = Image.asset('assets/images/pre_seed_light.png'),
         imageDark = Image.asset('assets/images/pre_seed_dark.png');
 
   final Image imageDark;
   final Image imageLight;
 
-  final WalletBase wallet;
+  final HavenRemovalFlowParameters params;
-  final HavenRemovalViewModel viewModel;
 
   @override
   Widget? leading(BuildContext context) => null;
@@ -30,9 +28,7 @@ class HavenRemovalNoticePage extends BasePage {
   Widget body(BuildContext context) {
     final image = currentTheme.type == ThemeType.dark ? imageDark : imageLight;
 
-    return WillPopScope(
+    return Container(
-      onWillPop: () async => false,
-      child: Container(
       alignment: Alignment.center,
       padding: EdgeInsets.all(24),
       child: ConstrainedBox(
@@ -70,7 +66,7 @@ class HavenRemovalNoticePage extends BasePage {
             ),
             PrimaryButton(
               onPressed: () => Navigator.of(context)
-                    .pushNamed(Routes.havenRemovalSeedPage, arguments: [wallet, viewModel]),
+                  .popAndPushNamed(Routes.havenRemovalSeedPage, arguments: params),
               text: S.of(context).pre_seed_button_text,
               color: Theme.of(context).primaryColor,
               textColor: Colors.white,
@@ -78,7 +74,6 @@ class HavenRemovalNoticePage extends BasePage {
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/src/screens/haven_removal/haven_removal_seed_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/haven_removal_flow_parameters.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/pin_code_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
@@ -17,12 +18,18 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 
 class HavenRemovalSeedPage extends BasePage {
-  HavenRemovalSeedPage(this.wallet, this.havenRemovalViewModel);
+  HavenRemovalSeedPage(this.params)
+      : wallet = params.wallet,
+        isFromRemoveHavenAppStartFlow = params.isFromRemoveHavenAppStartFlow,
+        havenRemovalViewModel = params.havenRemovalViewModel!;
 
   final imageLight = Image.asset('assets/images/crypto_lock_light.png');
   final imageDark = Image.asset('assets/images/crypto_lock.png');
 
+  final HavenRemovalFlowParameters params;
+
   final WalletBase wallet;
+  final bool isFromRemoveHavenAppStartFlow;
   final HavenRemovalViewModel havenRemovalViewModel;
 
   @override
@@ -30,7 +37,7 @@ class HavenRemovalSeedPage extends BasePage {
 
   @override
   void onClose(BuildContext context) async {
-    await showPopUp<bool>(
+    final shouldPopBack = await showPopUp<bool>(
           context: context,
           builder: (BuildContext context) {
             return AlertWithTwoActions(
@@ -39,12 +46,17 @@ class HavenRemovalSeedPage extends BasePage {
               leftButtonText: S.of(context).seed_alert_back,
               rightButtonText: S.of(context).seed_alert_yes,
               actionLeftButton: () => Navigator.of(context).pop(false),
-              actionRightButton: () async => await havenRemovalViewModel.onSeedsCopiedConfirmed(),
+              actionRightButton: () async =>
+                  await havenRemovalViewModel.onSeedsCopiedConfirmed(isFromRemoveHavenAppStartFlow),
             );
           },
         ) ??
         false;
 
+    if (shouldPopBack) {
+      Navigator.of(context).pop();
+    }
+
     return;
   }
 
@@ -80,9 +92,7 @@ class HavenRemovalSeedPage extends BasePage {
   Widget body(BuildContext context) {
     final image = currentTheme.type == ThemeType.dark ? imageDark : imageLight;
 
-    return WillPopScope(
+    return Container(
-      onWillPop: () async => false,
-      child: Container(
       padding: EdgeInsets.all(24),
       alignment: Alignment.center,
       child: ConstrainedBox(
@@ -129,9 +139,8 @@ class HavenRemovalSeedPage extends BasePage {
                     style: TextStyle(
                       fontSize: 12,
                       fontWeight: FontWeight.normal,
-                        color: Theme.of(context)
+                      color:
-                            .extension<TransactionTradeTheme>()!
+                          Theme.of(context).extension<TransactionTradeTheme>()!.detailsTitlesColor,
-                            .detailsTitlesColor,
                     ),
                   ),
                 ),
@@ -178,7 +187,6 @@ class HavenRemovalSeedPage extends BasePage {
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/haven_removal_flow_parameters.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
@@ -286,7 +287,7 @@ class WalletListBodyState extends State<WalletListBody> {
     changeProcessText(S.of(context).wallet_list_loading_wallet(walletListItem.name));
     final wallet = await widget.walletListViewModel.loadWalletWithoutChanging(walletListItem);
     await hideProgressText();
-    await Navigator.pushNamed(context, Routes.havenRemovalNoticePage, arguments: wallet);
+    await Navigator.pushNamed(context, Routes.havenRemovalNoticePage, arguments: [wallet, false]);
   }
 
   void changeProcessText(String text) {

lib/view_model/haven_removal_view_model.dart

@@ -18,10 +18,15 @@ class HavenRemovalViewModel {
   final Box<WalletInfo> walletInfoSource;
   final WalletLoadingService walletLoadingService;
 
-  Future<void> onSeedsCopiedConfirmed() async {
+  Future<bool> onSeedsCopiedConfirmed(bool isFromStart) async {
     if (walletInfoSource.length == 1) {
       _navigateToWelcomePage();
-      return;
+      return false;
+    }
+
+    if (!isFromStart) {
+      goBack();
+      return true;
     }
 
     final walletInfo = _getFirstNonHavenWallet();
@@ -31,6 +36,8 @@ class HavenRemovalViewModel {
     _changeWallet(wallet);
 
     await _navigateToDashboardPage();
+    
+    return false;
   }
 
   WalletInfo _getFirstNonHavenWallet() {
@@ -56,4 +63,8 @@ class HavenRemovalViewModel {
     await navigatorKey.currentState!.pushNamedAndRemoveUntil(Routes.welcome, (route) => false);
     return;
   }
+
+  void goBack() {
+    navigatorKey.currentState!.pop(true);
+  }
 }