fix back buttons.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
@@ -26,10 +26,6 @@ namespace WalletWasabi.Fluent.ViewModels
{
Title = "Add Wallet";
- BackCommand = ReactiveCommand.Create(() => ClearNavigation());
-
- CancelCommand = ReactiveCommand.Create(() => ClearNavigation());
-
this.WhenAnyValue(x => x.WalletName)
.Select(x => !string.IsNullOrWhiteSpace(x))
.Subscribe(x => OptionsEnabled = x && !Validations.Any);
@@ -96,9 +92,6 @@ namespace WalletWasabi.Fluent.ViewModels
public override string IconName => "add_circle_regular";
- public ICommand BackCommand { get; }
- public ICommand CancelCommand { get; }
-
public string WalletName
{
get => _walletName;

MODIFY
WalletWasabi.Fluent/ViewModels/RoutableViewModel.cs
WalletWasabi.Fluent/ViewModels/RoutableViewModel.cs
using System;
+using System.Windows.Input;
using ReactiveUI;
using WalletWasabi.Gui.ViewModels;
@@ -13,6 +14,10 @@ namespace WalletWasabi.Fluent.ViewModels
{
_navigationState = navigationState;
_navigationTarget = navigationTarget;
+
+ BackCommand = ReactiveCommand.Create(() => GoBack());
+
+ CancelCommand = ReactiveCommand.Create(() => ClearNavigation());
}
public string UrlPathSegment { get; } = Guid.NewGuid().ToString().Substring(0, 5);
@@ -53,6 +58,10 @@ namespace WalletWasabi.Fluent.ViewModels
}
}
+ public ICommand BackCommand { get; }
+
+ public ICommand CancelCommand { get; }
+
public void GoBack()
{
switch (_navigationTarget)

MODIFY
WalletWasabi.Fluent/Views/AddWallet/ConfirmRecoveryWordsView.axaml
WalletWasabi.Fluent/Views/AddWallet/ConfirmRecoveryWordsView.axaml
<KeyBinding Gesture="Enter" Command="{Binding NextCommand}" />
</UserControl.KeyBindings>
<c:ContentArea Title="Confirm recovery words" Caption="Type the required recovery words"
+ EnableBack="True"
EnableCancel="True" CancelContent="Cancel"
EnableNext="True" NextContent="Continue">
<ScrollViewer>

MODIFY
WalletWasabi.Fluent/Views/AddWallet/RecoveryWordsView.axaml
WalletWasabi.Fluent/Views/AddWallet/RecoveryWordsView.axaml
<c:ContentArea Title="Recovery words"
Caption="Write down the following numbered security words in order. These can be used to recover your wallet in the future. It is very important you keep them in a safe place."
EnableCancel="True" CancelContent="Cancel"
+ EnableBack="True"
EnableNext="True" NextContent="Continue" FocusNext="True">
<ItemsControl Items="{Binding MnemonicWords}" HorizontalAlignment="Stretch">
<ItemsControl.Styles>

MODIFY
WalletWasabi.Fluent/Views/AddWalletPageView.axaml
WalletWasabi.Fluent/Views/AddWalletPageView.axaml
x:DataType="vm:HomePageViewModel"
x:Class="WalletWasabi.Fluent.Views.AddWalletPageView">
<c:ContentArea Title="Add Wallet" Caption="Type in your wallets name and select an option:"
- EnableBack="True"
- EnableCancel="True" CancelContent="Cancel">
+ EnableBack="True">
<DockPanel>
<StackPanel DockPanel.Dock="Top" Margin="0 0 0 40">
<Label Content="Wallet _Name:" Target="walletNameTb" />

fix back buttons.