remove password confirm dialog when checking seeds.
MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/VerifyRecoveryPhraseViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/VerifyRecoveryPhraseViewModel.cs
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
-using System.Reactive.Disposables;
using System.Reactive.Linq;
using System.Threading.Tasks;
using DynamicData;
@@ -10,7 +9,6 @@ using NBitcoin;
using ReactiveUI;
using WalletWasabi.Blockchain.Keys;
using WalletWasabi.Fluent.Validation;
-using WalletWasabi.Fluent.ViewModels.Dialogs.Authorization;
using WalletWasabi.Fluent.ViewModels.Navigation;
using WalletWasabi.Logging;
using WalletWasabi.Models;
@@ -53,15 +51,11 @@ public partial class VerifyRecoveryPhraseViewModel : RoutableViewModel
NextCommand = ReactiveCommand.CreateFromTask(
async () => await OnNextAsync(),
NextCommandCanExecute);
+
+ SetupCancel(enableCancel: true, enableCancelOnEscape: true, enableCancelOnPressed: true);
}
private async Task OnNextAsync()
- {
- var dialogResult = await NavigateDialogAsync(
- new PasswordAuthDialogViewModel(_wallet),
- NavigationTarget.CompactDialogScreen);
-
- if (dialogResult.Result)
{
IsBusy = true;
@@ -71,7 +65,8 @@ public partial class VerifyRecoveryPhraseViewModel : RoutableViewModel
{
var saltSoup = _wallet.Kitchen.SaltSoup();
- var recovered = KeyManager.Recover(_currentMnemonics, saltSoup, _wallet.Network, _wallet.KeyManager.AccountKeyPath,
+ var recovered = KeyManager.Recover(_currentMnemonics, saltSoup, _wallet.Network,
+ _wallet.KeyManager.AccountKeyPath,
null, _wallet.KeyManager.MinGapLimit);
if (_wallet.KeyManager.ExtPubKey == recovered.ExtPubKey)
@@ -96,12 +91,6 @@ public partial class VerifyRecoveryPhraseViewModel : RoutableViewModel
IsBusy = false;
}
- else
- {
- await ShowErrorAsync("Error", "The entered password was incorrect.",
- "You may try again, but if you are unable to verify your recovery phrase correctly. You MUST move your funds to a new wallet as soon as possible.");
- }
- }
public bool IsMnemonicsValid => CurrentMnemonics is { IsValidChecksum: true };
@@ -128,11 +117,4 @@ public partial class VerifyRecoveryPhraseViewModel : RoutableViewModel
{
return string.Join(' ', Mnemonics);
}
-
- protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disposables)
- {
- base.OnNavigatedTo(isInHistory, disposables);
-
- SetupCancel(enableCancel: true, enableCancelOnEscape: true, enableCancelOnPressed: true);
- }
}

remove password confirm dialog when checking seeds.