secure canceling on add wallet pages
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs
@@ -71,7 +71,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.Create
base.OnNavigatedTo(isInHistory, disposables);
var enableCancel = Services.WalletManager.HasWallet();
- SetupCancel(enableCancel: false, enableCancelOnEscape: enableCancel, enableCancelOnPressed: enableCancel);
+ SetupCancel(enableCancel: false, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
}
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/Create/RecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/Create/RecoveryWordsViewModel.cs
@@ -40,7 +40,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.Create
protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
{
var enableCancel = Services.WalletManager.HasWallet();
- SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: enableCancel);
+ SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
base.OnNavigatedTo(isInHistory, disposables);
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel.cs
@@ -220,7 +220,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
base.OnNavigatedTo(isInHistory, disposables);
var enableCancel = Services.WalletManager.HasWallet();
- SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: enableCancel);
+ SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
if (isInHistory)
{

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
@@ -79,6 +79,9 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
{
base.OnNavigatedTo(isInHistory, disposables);
+ var enableCancel = Services.WalletManager.HasWallet();
+ SetupCancel(enableCancel: false, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
+
Disposable.Create(() =>
{
CancelCts.Cancel();

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -144,7 +144,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
base.OnNavigatedTo(isInHistory, disposables);
var enableCancel = Services.WalletManager.HasWallet();
- SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: enableCancel);
+ SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
}
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/SelectWalletCreationOptionViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/SelectWalletCreationOptionViewModel.cs
@@ -101,7 +101,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
base.OnNavigatedTo(isInHistory, disposables);
var enableCancel = Services.WalletManager.HasWallet();
- SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: enableCancel);
+ SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
}
}
}

secure canceling on add wallet pages