[UI] passphrase redesign

WalletWasabi.Fluent/Behaviors/FocusBehavior.cs

@@ -2,6 +2,8 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Reactive;
+using Avalonia.Threading;
 using Avalonia.Xaml.Interactions.Custom;
 
 namespace WalletWasabi.Fluent.Behaviors;
@@ -19,19 +21,27 @@ public bool IsFocused
 
 	protected override void OnAttached(CompositeDisposable disposables)
 	{
-		base.OnAttached();
-
 		if (AssociatedObject is not null)
 		{
-			AssociatedObject.AttachedToLogicalTree += (sender, e) =>
-				disposables.Add(this.GetObservable(IsFocusedProperty)
-					.Subscribe(focused =>
+			disposables.Add(AssociatedObject.GetObservable(Avalonia.Input.InputElement.IsFocusedProperty)
+				.Subscribe(new AnonymousObserver<bool>(
+					focused =>
+					{
+						if (!focused)
+						{
+							SetCurrentValue(IsFocusedProperty, false);
+						}
+					})));
+
+			disposables.Add(this.GetObservable(IsFocusedProperty)
+				.Subscribe(new AnonymousObserver<bool>(
+					focused =>
 					{
 						if (focused)
 						{
-							AssociatedObject.Focus();
+							Dispatcher.UIThread.Post(() => AssociatedObject?.Focus());
 						}
-					}));
+					})));
 		}
 	}
 }

WalletWasabi.Fluent/Controls/ContentArea.axaml

@@ -27,40 +27,39 @@
           <ProgressRing Name="LoadingRing" IsIndeterminate="True" IsVisible="{TemplateBinding IsBusy}" />
           <DockPanel Name="MainDockPanel" IsVisible="{Binding !#LoadingRing.IsVisible}">
 
-            <Panel DockPanel.Dock="Bottom" x:Name="PART_ButtonArea">
+            <DockPanel DockPanel.Dock="Bottom" x:Name="PART_ButtonArea">
               <Button Name="PART_CancelButton"
                       Classes="invisible"
                       IsVisible="{TemplateBinding EnableCancel}"
                       Content="{TemplateBinding CancelContent}"
-                      HorizontalAlignment="Left" Command="{Binding CancelCommand}">
+                      HorizontalAlignment="Left" Command="{Binding CancelCommand}"
+                      DockPanel.Dock="Left">
                 <Interaction.Behaviors>
                   <FocusOnAttachedBehavior
                     IsEnabled="{Binding FocusCancel, RelativeSource={RelativeSource TemplatedParent}}" />
                 </Interaction.Behaviors>
               </Button>
-              <DockPanel>
-                <StackPanel Orientation="Horizontal" Spacing="30" DockPanel.Dock="Right">
-                  <Button Name="PART_SkipButton"
-                          IsVisible="{TemplateBinding EnableSkip}"
-                          Content="{TemplateBinding SkipContent}"
-                          Command="{Binding SkipCommand}"
-                          Classes="activeHyperLink skip"
-                          VerticalAlignment="Center" />
-                  <Button Name="PART_NextButton" Classes="action"
-                          IsVisible="{TemplateBinding EnableNext}"
-                          Content="{TemplateBinding NextContent}"
-                          Command="{Binding NextCommand}"
-                          IsDefault="{Binding IsActive}">
-                    <Interaction.Behaviors>
-                      <FocusOnAttachedBehavior
-                        IsEnabled="{Binding FocusNext, RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Interaction.Behaviors>
-                  </Button>
-                </StackPanel>
-                <ContentPresenter Content="{TemplateBinding BottomContent}"
-                                  x:Name="PART_BottomContentPresenter" />
-              </DockPanel>
-            </Panel>
+              <StackPanel Orientation="Horizontal" Spacing="30" DockPanel.Dock="Right">
+                <Button Name="PART_SkipButton"
+                        IsVisible="{TemplateBinding EnableSkip}"
+                        Content="{TemplateBinding SkipContent}"
+                        Command="{Binding SkipCommand}"
+                        Classes="activeHyperLink skip"
+                        VerticalAlignment="Center" />
+                <Button Name="PART_NextButton" Classes="action"
+                        IsVisible="{TemplateBinding EnableNext}"
+                        Content="{TemplateBinding NextContent}"
+                        Command="{Binding NextCommand}"
+                        IsDefault="{Binding IsActive}">
+                  <Interaction.Behaviors>
+                    <FocusOnAttachedBehavior
+                      IsEnabled="{Binding FocusNext, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Interaction.Behaviors>
+                </Button>
+              </StackPanel>
+              <ContentPresenter Content="{TemplateBinding BottomContent}"
+                                x:Name="PART_BottomContentPresenter" />
+            </DockPanel>
 
             <Panel DockPanel.Dock="Top">
               <Panel IsHitTestVisible="False" Background="{TemplateBinding HeaderBackground}" />
@@ -118,7 +117,7 @@
       <Setter Property="Margin" Value="31 11 31 21" />
     </Style>
 
-    <Style Selector="^/template/ Panel#PART_ButtonArea">
+    <Style Selector="^/template/ DockPanel#PART_ButtonArea">
       <Setter Property="Margin" Value="31,10" />
     </Style>
 

WalletWasabi.Fluent/Controls/TagsBoxAutoCompleteBox.axaml

@@ -55,7 +55,7 @@
                      Padding="{TemplateBinding Padding}"
                      Margin="0"
                      DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                     Theme="{StaticResource AutoCompleteBoxTextBox}" />
+                     Theme="{StaticResource AutoCompleteBoxTextBox}"/>
             <Popup x:Name="PART_Popup"
                    WindowManagerAddShadowHint="False"
                    MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"

WalletWasabi.Fluent/Models/WalletCreationOptions.cs

@@ -3,19 +3,23 @@
 
 namespace WalletWasabi.Fluent.Models;
 
-public abstract record WalletCreationOptions(string? WalletName = null)
+public abstract record WalletCreationOptions(string? WalletName = null, string? Passphrase = null)
 {
-	public record AddNewWallet(string? WalletName = null, string? Password = null, Mnemonic? Mnemonic = null) : WalletCreationOptions(WalletName)
+	public record AddNewWallet(string? WalletName = null, string? Passphrase = null, Mnemonic? Mnemonic = null)
+		: WalletCreationOptions(WalletName, Passphrase)
 	{
 		public AddNewWallet WithNewMnemonic()
 		{
 			return this with { Mnemonic = new Mnemonic(Wordlist.English, WordCount.Twelve) };
 		}
 	}
 
-	public record ConnectToHardwareWallet(string? WalletName = null, HwiEnumerateEntry? Device = null) : WalletCreationOptions(WalletName);
+	public record ConnectToHardwareWallet(string? WalletName = null, HwiEnumerateEntry? Device = null)
+		: WalletCreationOptions(WalletName);
 
-	public record ImportWallet(string? WalletName = null, string? FilePath = null) : WalletCreationOptions(WalletName);
+	public record ImportWallet(string? WalletName = null, string? FilePath = null)
+		: WalletCreationOptions(WalletName);
 
-	public record RecoverWallet(string? WalletName = null, string? Password = null, Mnemonic? Mnemonic = null, int? MinGapLimit = null) : WalletCreationOptions(WalletName);
+	public record RecoverWallet(string? WalletName = null, string? Passphrase = null, Mnemonic? Mnemonic = null, int? MinGapLimit = null, string? AccountKeyPath = null)
+		: WalletCreationOptions(WalletName, Passphrase);
 }

WalletWasabi.Fluent/Models/Wallets/WalletRepository.cs

@@ -149,13 +149,27 @@ private async Task<IWalletSettingsModel> ImportWalletAsync(WalletCreationOptions
 
 	private async Task<IWalletSettingsModel> RecoverWalletAsync(WalletCreationOptions.RecoverWallet options)
 	{
-		var (walletName, password, mnemonic, minGapLimit) = options;
+		var (walletName, password, mnemonic, minGapLimit, path) = options;
 
 		ArgumentException.ThrowIfNullOrEmpty(walletName);
 		ArgumentNullException.ThrowIfNull(password);
 		ArgumentNullException.ThrowIfNull(mnemonic);
 		ArgumentNullException.ThrowIfNull(minGapLimit);
 
+		var accountKeyPath = AccountKeyPath;
+
+		if (!string.IsNullOrEmpty(path))
+		{
+			if (KeyPath.TryParse(path, out var userKeyPath) && userKeyPath is not null)
+			{
+				accountKeyPath = userKeyPath;
+			}
+			else
+			{
+				throw new InvalidOperationException("Could not parse key path.");
+			}
+		}
+
 		var keyManager = await Task.Run(() =>
 		{
 			var walletFilePath = Services.WalletManager.WalletDirectories.GetWalletFilePaths(walletName).walletFilePath;
@@ -164,7 +178,7 @@ private async Task<IWalletSettingsModel> RecoverWalletAsync(WalletCreationOption
 				mnemonic,
 				password,
 				Services.WalletManager.Network,
-				AccountKeyPath,
+				accountKeyPath,
 				null,
 				"", // Make sure it is not saved into a file yet.
 				minGapLimit.Value);

WalletWasabi.Fluent/ViewModels/AddWallet/AddedWalletPageViewModel.cs

@@ -73,8 +73,8 @@ private async Task AutoLoginAsync(WalletCreationOptions? options)
 		var password =
 			options switch
 			{
-				WalletCreationOptions.AddNewWallet add => add.Password,
-				WalletCreationOptions.RecoverWallet rec => rec.Password,
+				WalletCreationOptions.AddNewWallet add => add.Passphrase,
+				WalletCreationOptions.RecoverWallet rec => rec.Passphrase,
 				WalletCreationOptions.ConnectToHardwareWallet => "",
 				_ => null
 			};

WalletWasabi.Fluent/ViewModels/AddWallet/Create/ConfirmRecoveryWordsViewModel.cs

@@ -7,7 +7,10 @@
 using DynamicData.Binding;
 using ReactiveUI;
 using WalletWasabi.Fluent.Models;
+using WalletWasabi.Fluent.Validation;
 using WalletWasabi.Fluent.ViewModels.Navigation;
+using WalletWasabi.Models;
+using WalletWasabi.Userfacing;
 
 namespace WalletWasabi.Fluent.ViewModels.AddWallet.Create;
 
@@ -20,13 +23,19 @@ public partial class ConfirmRecoveryWordsViewModel : RoutableViewModel
 	[AutoNotify] private bool _isSkipEnabled;
 	[AutoNotify] private RecoveryWordViewModel _currentWord;
 	[AutoNotify] private List<RecoveryWordViewModel> _availableWords;
+	[AutoNotify(SetterModifier = AccessModifier.Private)] private string? _passphrase;
+	[AutoNotify] private string? _confirmPassphrase;
+	[AutoNotify(SetterModifier = AccessModifier.Private)] private bool _allWordsConfirmed;
+	[AutoNotify(SetterModifier = AccessModifier.Private)] private bool _passphraseConfirmed;
 
 	private ConfirmRecoveryWordsViewModel(WalletCreationOptions.AddNewWallet options, List<RecoveryWordViewModel> words)
 	{
 		_options = options;
 		_availableWords = new List<RecoveryWordViewModel>();
 		_words = words.OrderBy(x => x.Index).ToList();
 		_currentWord = words.First();
+
+		this.ValidateProperty(x => x.ConfirmPassphrase, ValidateConfirmPassphrase);
 	}
 
 	public ObservableCollectionExtended<RecoveryWordViewModel> ConfirmationWords { get; } = new();
@@ -53,11 +62,30 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 
 		CancelCommand = ReactiveCommand.Create(OnCancel);
 
-		var nextCommandCanExecute =
-			confirmationWordsSourceList
+		confirmationWordsSourceList
 			.Connect()
 			.WhenValueChanged(x => x.IsConfirmed)
-			.Select(_ => confirmationWordsSourceList.Items.All(x => x.IsConfirmed));
+			.Subscribe(_ => AllWordsConfirmed = confirmationWordsSourceList.Items.All(x => x.IsConfirmed))
+			.DisposeWith(disposables);
+
+		if (string.IsNullOrEmpty(_options.Passphrase))
+		{
+			PassphraseConfirmed = true;
+		}
+		else
+		{
+			this.WhenAnyValue(x => x.ConfirmPassphrase)
+				.Subscribe(confirmPassphrase =>
+				{
+					PassphraseConfirmed = confirmPassphrase == _options.Passphrase;
+				})
+				.DisposeWith(disposables);
+		}
+
+		var nextCommandCanExecute = this.WhenAnyValue(
+				x => x.AllWordsConfirmed,
+				x => x.PassphraseConfirmed)
+			.Select(x => x.Item1 && x.Item2);
 
 		NextCommand = ReactiveCommand.CreateFromTask(OnNextAsync, nextCommandCanExecute);
 
@@ -83,10 +111,20 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 
 		SetNextWord();
 
+		Passphrase = _options.Passphrase;
+
 		var enableCancel = UiContext.WalletRepository.HasWallet;
 		SetupCancel(enableCancel: false, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
 	}
 
+	private void ValidateConfirmPassphrase(IValidationErrors errors)
+	{
+		if (!string.IsNullOrEmpty(ConfirmPassphrase) && Passphrase != ConfirmPassphrase)
+		{
+			errors.Add(ErrorSeverity.Error, PasswordHelper.MatchingMessage);
+		}
+	}
+
 	private void SetNextWord()
 	{
 		if (ConfirmationWords.FirstOrDefault(x => !x.IsConfirmed) is { } nextWord)
@@ -134,23 +172,13 @@ private void EnableAvailableWords(bool enable)
 
 	private async Task OnNextAsync()
 	{
-		var dialogCaption = "Store your passphrase safely, it cannot be reset if lost.\n" +
-			"It's needed to open and to recover your wallet.\n" +
-			"It's a recovery words extension for more security.";
-		var password = await Navigate().To().CreatePasswordDialog("Add Passphrase", dialogCaption, enableEmpty: true).GetResultAsync();
-
-		if (password is { })
-		{
-			IsBusy = true;
+		IsBusy = true;
 
-			var options = _options with { Password = password };
+		var walletSettings = await UiContext.WalletRepository.NewWalletAsync(_options);
 
-			var walletSettings = await UiContext.WalletRepository.NewWalletAsync(options);
+		IsBusy = false;
 
-			IsBusy = false;
-
-			await Navigate().To().CoinJoinProfiles(walletSettings, options).GetResultAsync();
-		}
+		await Navigate().To().CoinJoinProfiles(walletSettings, _options).GetResultAsync();
 	}
 
 	private void OnCancel()

WalletWasabi.Fluent/ViewModels/AddWallet/Create/RecoveryWordsViewModel.cs

@@ -14,6 +14,8 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.Create;
 [NavigationMetaData(Title = "Recovery Words")]
 public partial class RecoveryWordsViewModel : RoutableViewModel
 {
+	[AutoNotify] private bool _isConfirmed;
+
 	private RecoveryWordsViewModel(WalletCreationOptions.AddNewWallet options)
 	{
 		var (_, _, mnemonic) = options;
@@ -22,9 +24,13 @@ private RecoveryWordsViewModel(WalletCreationOptions.AddNewWallet options)
 
 		MnemonicWords = CreateList(mnemonic);
 
+		Passphrase = options.Passphrase;
+
 		EnableBack = true;
 
-		NextCommand = ReactiveCommand.Create(() => OnNext(options));
+		var canExecuteNext = this.WhenAnyValue(x => x.IsConfirmed);
+
+		NextCommand = ReactiveCommand.Create(() => OnNext(options), canExecuteNext);
 
 		CancelCommand = ReactiveCommand.Create(OnCancel);
 		CopyToClipboardCommand = ReactiveCommand.CreateFromTask(OnCopyToClipboardAsync);
@@ -34,6 +40,8 @@ private RecoveryWordsViewModel(WalletCreationOptions.AddNewWallet options)
 
 	public List<RecoveryWordViewModel> MnemonicWords { get; }
 
+	public string? Passphrase { get; }
+
 	private void OnNext(WalletCreationOptions.AddNewWallet options)
 	{
 		Navigate().To().ConfirmRecoveryWords(options, MnemonicWords);
@@ -75,6 +83,8 @@ protected override void OnNavigatedTo(bool isInHistory, CompositeDisposable disp
 		var enableCancel = UiContext.WalletRepository.HasWallet;
 		SetupCancel(enableCancel: enableCancel, enableCancelOnEscape: enableCancel, enableCancelOnPressed: false);
 
+		IsConfirmed = false;
+
 		base.OnNavigatedTo(isInHistory, disposables);
 	}