update navigation things
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/ConnectHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/ConnectHardwareWalletViewModel.cs
@@ -33,7 +33,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
private HardwareWalletViewModel _selectedHardwareWallet;
public ConnectHardwareWalletViewModel(NavigationStateViewModel navigationState, string walletName, Network network,
- WalletManager walletManager) : base(navigationState, NavigationTarget.DialogScreen)
+ WalletManager walletManager, NavigationTarget navigationTarget) : base(navigationState, navigationTarget)
{
_walletName = walletName;
_network = network;
@@ -43,8 +43,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
Task.Run(StartHardwareWalletDetection);
- CancelCommand = ReactiveCommand.Create(() => navigationState.DialogScreen?.Invoke().Router.NavigationStack.Clear());
- CancelCommand = ReactiveCommand.Create(() => _searchHardwareWalletCts.Cancel());
+ CancelCommand = ReactiveCommand.Create(ClearNavigation);
var connectCommandIsExecute = this.WhenAnyValue(x => x.SelectedHardwareWallet).Select(selectedHardwareWallet => selectedHardwareWallet?.HardwareWalletInfo?.Fingerprint is { });
NextCommand = ReactiveCommand.Create(() => { },connectCommandIsExecute);

MODIFY
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
@@ -38,7 +38,7 @@ namespace WalletWasabi.Fluent.ViewModels
ConnectHardwareWalletCommand = ReactiveCommand.CreateFromTask(async () =>
{
await navigationState.DialogScreen.Invoke().Router.Navigate.Execute(
- new ConnectHardwareWalletViewModel(navigationState, WalletName, network, walletManager));
+ new ConnectHardwareWalletViewModel(navigationState, WalletName, network, walletManager, NavigationTarget.DialogScreen));
});
CreateWalletCommand = ReactiveCommand.CreateFromTask(

update navigation things