Update new view models
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -106,13 +106,13 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
AdvancedOptionsInteraction.RegisterHandler(
async interaction =>
interaction.SetOutput(
- await new AdvancedRecoveryOptionsViewModel(interaction.Input).ShowDialogAsync()));
+ await new AdvancedRecoveryOptionsViewModel(navigationState, NavigationTarget.Dialog, interaction.Input).ShowDialogAsync()));
PasswordInteraction = new Interaction<string, string?>();
PasswordInteraction.RegisterHandler(
async interaction =>
- interaction.SetOutput(await new EnterPasswordViewModel(interaction.Input).ShowDialogAsync()));
+ interaction.SetOutput(await new EnterPasswordViewModel(navigationState, NavigationTarget.Dialog, interaction.Input).ShowDialogAsync()));
}
public IObservable<bool> FinishCommandCanExecute { get; }

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs
@@ -13,7 +13,7 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
private string? _accountKeyPath;
private string? _minGapLimit;
- public AdvancedRecoveryOptionsViewModel((KeyPath keyPath, int minGapLimit) interactionInput)
+ public AdvancedRecoveryOptionsViewModel(NavigationStateViewModel navigationState, NavigationTarget navigationTarget, (KeyPath keyPath, int minGapLimit) interactionInput) : base(navigationState, navigationTarget)
{
this.ValidateProperty(x => x.AccountKeyPath, ValidateAccountKeyPath);
this.ValidateProperty(x => x.MinGapLimit, ValidateMinGapLimit);
@@ -55,8 +55,6 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
public ICommand ContinueCommand { get; }
- public ICommand CancelCommand { get; }
-
private int? GetMinGapLimit()
{
if (int.TryParse(MinGapLimit, out var minGapLimit) && minGapLimit > KeyManager.AbsoluteMinGapLimit &&

Update new view models