remove hard-coded navigation targets.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
@@ -44,7 +44,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
ConnectHardwareWalletCommand = ReactiveCommand.Create(() =>
{
- NavigateTo(new ConnectHardwareWalletViewModel(navigationState, WalletName, network, walletManager), NavigationTarget.DialogScreen);
+ NavigateTo(new ConnectHardwareWalletViewModel(navigationState, WalletName, network, walletManager));
});
CreateWalletCommand = ReactiveCommand.CreateFromTask(

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/ConfirmRecoveryWordsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/ConfirmRecoveryWordsViewModel.cs
@@ -33,7 +33,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
{
walletManager.AddWallet(keyManager);
- NavigateTo(new AddedWalletPageViewModel(navigationState, keyManager.WalletName, WalletType.Normal), NavigationTarget.DialogScreen);
+ NavigateTo(new AddedWalletPageViewModel(navigationState, keyManager.WalletName, WalletType.Normal));
},
finishCommandCanExecute);

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/ConnectHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/ConnectHardwareWalletViewModel.cs
@@ -30,7 +30,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
NextCommand = ReactiveCommand.Create(() =>
{
- NavigateTo(new DetectHardwareWalletViewModel(navigationState, _detectionState), NavigationTarget.DialogScreen);
+ NavigateTo(new DetectHardwareWalletViewModel(navigationState, _detectionState));
});
}
@@ -49,14 +49,14 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
if (deviceCount == 0)
{
// navigate to detecting page.
- NavigateTo(new DetectHardwareWalletViewModel(NavigationState, _detectionState), NavigationTarget.DialogScreen);
+ NavigateTo(new DetectHardwareWalletViewModel(NavigationState, _detectionState));
}
else if (deviceCount == 1)
{
// navigate to detected hw wallet page.
_detectionState.SelectedDevice = _detectionState.Devices.First();
- NavigateTo(new DetectedHardwareWalletViewModel(NavigationState, _detectionState), NavigationTarget.DialogScreen);
+ NavigateTo(new DetectedHardwareWalletViewModel(NavigationState, _detectionState));
}
else
{

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/DetectHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/DetectHardwareWalletViewModel.cs
@@ -120,7 +120,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
_detectionState.SelectedDevice = SelectedHardwareWallet.HardwareWalletInfo;
- NavigateTo(new DetectedHardwareWalletViewModel(NavigationState, _detectionState), NavigationTarget.DialogScreen);
+ NavigateTo(new DetectedHardwareWalletViewModel(NavigationState, _detectionState));
}
catch (Exception ex)
{

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/DetectedHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/DetectedHardwareWalletViewModel.cs
@@ -48,14 +48,14 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
detectionState.WalletManager.AddWallet(newWallet);
- NavigateTo(new AddedWalletPageViewModel(navigationState, detectionState.WalletName, Type), NavigationTarget.DialogScreen);
+ NavigateTo(new AddedWalletPageViewModel(navigationState, detectionState.WalletName, Type));
IsBusy = false;
});
NoCommand = ReactiveCommand.Create(() =>
{
- NavigateTo(new ConnectHardwareWalletViewModel(navigationState, detectionState.WalletName, detectionState.Network, detectionState.WalletManager, false), NavigationTarget.DialogScreen);
+ NavigateTo(new ConnectHardwareWalletViewModel(navigationState, detectionState.WalletName, detectionState.Network, detectionState.WalletManager, false));
});
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -112,7 +112,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
}
finally
{
- NavigateTo(new AddedWalletPageViewModel(navigationState, walletName!, WalletType.Normal), NavigationTarget.DialogScreen);
+ NavigateTo(new AddedWalletPageViewModel(navigationState, walletName!, WalletType.Normal));
}
}

remove hard-coded navigation targets.