Remove NextCommand duplications.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/ConfirmRecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/ConfirmRecoveryWordsViewModel.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Reactive.Linq;
-using System.Windows.Input;
using DynamicData;
using DynamicData.Binding;
using ReactiveUI;
@@ -47,11 +46,9 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
.Subscribe();
// Select 4 random words to confirm.
- confirmationWordsSourceList.AddRange(mnemonicWords.OrderBy(x => new Random().NextDouble()).Take(4));
+ confirmationWordsSourceList.AddRange(mnemonicWords.OrderBy(_ => new Random().NextDouble()).Take(4));
}
public ReadOnlyObservableCollection<RecoveryWordViewModel> ConfirmationWords => _confirmationWords;
-
- public ICommand NextCommand { get; }
}
}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -115,8 +115,6 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
public ICommand AdvancedRecoveryOptionsDialogCommand { get; }
- public ICommand NextCommand { get; }
-
private KeyPath AccountKeyPath { get; set; } = KeyPath.Parse("m/84'/0'/0'");
private int MinGapLimit { get; set; } = 63;

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoveryWordsViewModel.cs
using System.Collections.Generic;
-using System.Windows.Input;
using NBitcoin;
using ReactiveUI;
using WalletWasabi.Blockchain.Keys;
@@ -29,8 +28,6 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
CancelCommand = ReactiveCommand.Create(() => ClearNavigation(NavigationTarget.DialogScreen));
}
- public ICommand NextCommand { get; }
-
public List<RecoveryWordViewModel> MnemonicWords { get; set; }
}
}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/AdvancedRecoveryOptionsViewModel.cs
using System.Reactive.Linq;
-using System.Windows.Input;
using NBitcoin;
using ReactiveUI;
using WalletWasabi.Blockchain.Keys;
@@ -60,8 +59,6 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
set => this.RaiseAndSetIfChanged(ref _minGapLimit, value);
}
- public ICommand NextCommand { get; }
-
private void ValidateMinGapLimit(IValidationErrors errors)
{
if (!int.TryParse(MinGapLimit, out var minGapLimit) || minGapLimit < KeyManager.AbsoluteMinGapLimit ||

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/TestDialogViewModel.cs
@@ -18,7 +18,7 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
var nextCommandCanExecute = this.WhenAnyValue(x => x.IsDialogOpen).ObserveOn(RxApp.MainThreadScheduler);
- BackCommand = ReactiveCommand.Create(() => GoBack(), backCommandCanExecute);
+ BackCommand = ReactiveCommand.Create(GoBack, backCommandCanExecute);
CancelCommand = ReactiveCommand.Create(() => Close(false), cancelCommandCanExecute);
NextCommand = ReactiveCommand.Create(() => Close(true), nextCommandCanExecute);
}
@@ -29,8 +29,6 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
set => this.RaiseAndSetIfChanged(ref _message, value);
}
- public ICommand NextCommand { get; }
-
protected override void OnDialogClosed()
{
// TODO: Disable when using Dialog inside DialogScreenViewModel / Settings

MODIFY
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
@@ -52,8 +52,6 @@ namespace WalletWasabi.Fluent.ViewModels
});
}
- public ICommand NextCommand { get; }
-
public ICommand OpenDialogCommand { get; }
public ICommand OpenDialogScreenCommand { get; }

Remove NextCommand duplications.