move to recoverwallet namespace
MODIFY
WalletWasabi.Fluent/Controls/TagsBox.xaml
WalletWasabi.Fluent/Controls/TagsBox.xaml
<Style Selector="c|TagsBox AutoCompleteBox">
<Setter Property="Background" Value="{x:Null}" />
- <!-- <Setter Property="Padding" Value="3,10,0, 10" /> -->
+ <Setter Property="Padding" Value="3,10,0, 10" />
<Setter Property="Margin" Value="0" />
</Style>

MODIFY
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWalletPageViewModel.cs
@@ -9,6 +9,7 @@ using WalletWasabi.Stores;
using NBitcoin;
using WalletWasabi.Fluent.ViewModels.Dialogs;
using WalletWasabi.Fluent.ViewModels.AddWallet;
+using WalletWasabi.Fluent.ViewModels.RecoverWallet;
using System.Threading.Tasks;
namespace WalletWasabi.Fluent.ViewModels
@@ -18,7 +19,8 @@ namespace WalletWasabi.Fluent.ViewModels
private string _walletName = "";
private bool _optionsEnabled;
- public AddWalletPageViewModel(IScreen screen, WalletManager walletManager, BitcoinStore store, Network network) : base(screen)
+ public AddWalletPageViewModel(IScreen screen, WalletManager walletManager, BitcoinStore store, Network network)
+ : base(screen)
{
Title = "Add Wallet";
@@ -33,7 +35,7 @@ namespace WalletWasabi.Fluent.ViewModels
if (result is { } password)
{
await screen.Router.Navigate.Execute(
- new RecoveryPageViewModel(screen, WalletName, password, walletManager));
+ new RecoverWalletViewModel(screen, WalletName, password, walletManager));
}
});
@@ -47,7 +49,8 @@ namespace WalletWasabi.Fluent.ViewModels
var (km, mnemonic) = await Task.Run(
() =>
{
- var walletGenerator = new WalletGenerator(walletManager.WalletDirectories.WalletsDir,network)
+ var walletGenerator =
+ new WalletGenerator(walletManager.WalletDirectories.WalletsDir, network)
{
TipHeight = store.SmartHeaderChain.TipHeight
};
@@ -66,11 +69,12 @@ namespace WalletWasabi.Fluent.ViewModels
async interaction => interaction.SetOutput(await new EnterPasswordViewModel().ShowDialogAsync()));
RecoveryPagePasswordInteraction.RegisterHandler(
- async interaction => interaction.SetOutput(await new EnterPasswordViewModel("Type the password of the wallet you intend to recover and click Continue.").ShowDialogAsync()));
-
+ async interaction =>
+ interaction.SetOutput(await new EnterPasswordViewModel(
+ "Type the password of the wallet you intend to recover and click Continue.")
+ .ShowDialogAsync()));
}
-
public override string IconName => "add_circle_regular";
public string WalletName

RENAME
WalletWasabi.Fluent/ViewModels/RecoverWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/RecoverWallet/RecoverWalletPageViewModel.cs
@@ -10,19 +10,18 @@ using NBitcoin;
using ReactiveUI;
using WalletWasabi.Fluent.ViewModels.Dialogs;
using WalletWasabi.Gui.Validation;
-using WalletWasabi.Gui.ViewModels;
using WalletWasabi.Models;
using WalletWasabi.Wallets;
-namespace WalletWasabi.Fluent.ViewModels
+namespace WalletWasabi.Fluent.ViewModels.RecoverWallet
{
- public class RecoveryPageViewModel : RoutableViewModel
+ public class RecoverWalletViewModel : RoutableViewModel
{
private readonly ObservableAsPropertyHelper<Mnemonic?> _currentMnemonic;
private IEnumerable<string>? _suggestions;
private string? _selectedTag;
- public RecoveryPageViewModel(IScreen screen, string walletName, string password, WalletManager walletManager) : base(screen)
+ public RecoverWalletViewModel(IScreen screen, string walletName, string password, WalletManager walletManager) : base(screen)
{
Suggestions = new Mnemonic(Wordlist.English, WordCount.Twelve).WordList.GetWords();

RENAME
WalletWasabi.Fluent/Views/RecoveryPageView.axaml
WalletWasabi.Fluent/Views/RecoverWallet/RecoverWalletView.axaml
xmlns:vm="clr-namespace:WalletWasabi.Fluent.ViewModels"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Fluent.Behaviors"
+ xmlns:recoverWallet="clr-namespace:WalletWasabi.Fluent.ViewModels.RecoverWallet"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:DataType="vm:RecoveryPageViewModel"
+ x:DataType="recoverWallet:RecoverWalletViewModel"
x:CompileBindings="True"
- x:Class="WalletWasabi.Fluent.Views.RecoveryPageView">
+ x:Class="WalletWasabi.Fluent.Views.RecoverWallet.RecoverWalletView">
<Panel Margin="25 0 25 20">
<!-- <Button Classes="invisible" Margin="0 35 0 0" Command="{Binding GoBackCommand}" DockPanel.Dock="Left" -->
<!-- HorizontalAlignment="Left" VerticalAlignment="Top"> -->

RENAME
WalletWasabi.Fluent/Views/RecoveryPageView.axaml.cs
WalletWasabi.Fluent/Views/RecoverWallet/RecoverWalletView.axaml.cs
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using WalletWasabi.Fluent.ViewModels;
+using WalletWasabi.Fluent.ViewModels.RecoverWallet;
-namespace WalletWasabi.Fluent.Views
+namespace WalletWasabi.Fluent.Views.RecoverWallet
{
- public class RecoveryPageView : ReactiveUserControl<RecoveryPageViewModel>
+ public class RecoverWalletView : ReactiveUserControl<RecoverWalletViewModel>
{
- public RecoveryPageView()
+ public RecoverWalletView()
{
InitializeComponent();
}

move to recoverwallet namespace