tweak wording and password creation dialog title
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/RecoverWalletViewModel.cs
@@ -56,7 +56,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
private async Task OnNextAsync(string? walletName)
{
var dialogResult = await NavigateDialogAsync(
- new CreatePasswordDialogViewModel("Type the password of the wallet if you used one.")
+ new CreatePasswordDialogViewModel("Password", "Type the password of the wallet if there is one.")
, NavigationTarget.CompactDialogScreen);
if (dialogResult.Result is { } password)

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/SelectWalletCreationOptionViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/SelectWalletCreationOptionViewModel.cs
@@ -73,7 +73,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
private async Task OnCreateWalletAsync(string walletName)
{
var dialogResult = await NavigateDialogAsync(
- new CreatePasswordDialogViewModel("Create a password for the wallet.", enableEmpty: true)
+ new CreatePasswordDialogViewModel("Create Password", "Enter a password for your wallet.", enableEmpty: true)
, NavigationTarget.CompactDialogScreen);
if (dialogResult.Result is { } password)

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/CreatePasswordDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/CreatePasswordDialogViewModel.cs
@@ -8,14 +8,14 @@ using WalletWasabi.Userfacing;
namespace WalletWasabi.Fluent.ViewModels.Dialogs
{
- [NavigationMetaData(Title = "Password")]
public partial class CreatePasswordDialogViewModel : DialogViewModelBase<string?>
{
[AutoNotify] private string? _confirmPassword;
[AutoNotify] private string? _password;
- public CreatePasswordDialogViewModel(string caption, bool enableEmpty = true)
+ public CreatePasswordDialogViewModel(string title, string caption, bool enableEmpty = true)
{
+ Title = title;
Caption = caption;
// This means pressing continue will make the password empty string.
@@ -55,6 +55,8 @@ namespace WalletWasabi.Fluent.ViewModels.Dialogs
CancelCommand = ReactiveCommand.Create(() => Close(DialogResultKind.Cancel), cancelCommandCanExecute);
}
+ public sealed override string Title { get; protected set; }
+
public string Caption { get; }
protected override void OnDialogClosed()

MODIFY
WalletWasabi.Fluent/ViewModels/Login/PasswordFinder/PasswordFinderIntroduceViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/PasswordFinder/PasswordFinderIntroduceViewModel.cs
@@ -23,7 +23,7 @@ namespace WalletWasabi.Fluent.ViewModels.Login.PasswordFinder
{
var dialogResult =
await NavigateDialogAsync(
- new CreatePasswordDialogViewModel("Type in your most likely password.", enableEmpty: false)
+ new CreatePasswordDialogViewModel("Password", "Type in your most likely password.", enableEmpty: false)
, NavigationTarget.CompactDialogScreen);
if (dialogResult.Result is { } password)

tweak wording and password creation dialog title