Fix unable to navigate back bug
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs
@@ -34,7 +34,7 @@ public partial class ConfirmRecoveryWordsViewModel : RoutableViewModel
EnableBack = true;
- NextCommand = ReactiveCommand.Create(() => OnNext(keyManager), nextCommandCanExecute);
+ NextCommand = ReactiveCommand.Create(() => OnNextAsync(keyManager), nextCommandCanExecute);
if (_isSkipEnable)
{
@@ -57,9 +57,9 @@ public partial class ConfirmRecoveryWordsViewModel : RoutableViewModel
public ReadOnlyObservableCollection<RecoveryWordViewModel> ConfirmationWords => _confirmationWords;
- private void OnNext(KeyManager keyManager)
+ private async void OnNextAsync(KeyManager keyManager)
{
- Navigate().To(new CoinJoinProfilesViewModel(keyManager, true));
+ await NavigateDialogAsync(new CoinJoinProfilesViewModel(keyManager, true), NavigationTarget.DialogScreen);
}
private void OnCancel()

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -86,7 +86,7 @@ public partial class RecoverWalletViewModel : RoutableViewModel
return result;
});
- Navigate().To(new CoinJoinProfilesViewModel(keyManager, true));
+ await NavigateDialogAsync(new CoinJoinProfilesViewModel(keyManager, true), NavigationTarget.DialogScreen);
}
catch (Exception ex)
{

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/CoinJoinStateViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/CoinJoinStateViewModel.cs
@@ -96,7 +96,7 @@ public partial class CoinJoinStateViewModel : ViewModelBase
{
if (!_wallet.KeyManager.IsCoinjoinProfileSelected)
{
- var response = await RoutableViewModel.NavigateDialogAsync(new CoinJoinProfilesViewModel(_wallet.KeyManager, false), NavigationTarget.DialogScreen);
+ await RoutableViewModel.NavigateDialogAsync(new CoinJoinProfilesViewModel(_wallet.KeyManager, false), NavigationTarget.DialogScreen);
}
if (_wallet.KeyManager.IsCoinjoinProfileSelected)

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/WalletSettingsViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/WalletSettingsViewModel.cs
@@ -53,7 +53,7 @@ public partial class WalletSettingsViewModel : RoutableViewModel
{
if (!_wallet.KeyManager.IsCoinjoinProfileSelected)
{
- DialogResult<bool> isProfileSelected = await NavigateDialogAsync(new CoinJoinProfilesViewModel(_wallet.KeyManager, false), NavigationTarget.DialogScreen);
+ await NavigateDialogAsync(new CoinJoinProfilesViewModel(_wallet.KeyManager, false), NavigationTarget.DialogScreen);
}
if (_wallet.KeyManager.IsCoinjoinProfileSelected)

Fix unable to navigate back bug