Update Login.
MODIFY
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
@@ -2,6 +2,7 @@ using System.Reactive.Concurrency;
using System.Threading.Tasks;
using System.Windows.Input;
using ReactiveUI;
+using WalletWasabi.Fluent.Helpers;
using WalletWasabi.Fluent.ViewModels.AddWallet;
using WalletWasabi.Fluent.ViewModels.Login.PasswordFinder;
using WalletWasabi.Fluent.ViewModels.Navigation;
@@ -25,8 +26,7 @@ namespace WalletWasabi.Fluent.ViewModels.Login
WalletName = wallet.WalletName;
_password = "";
_errorMessage = "";
- WalletIcon = wallet.KeyManager.Icon;
- IsHardwareWallet = wallet.KeyManager.IsHardwareWallet;
+ WalletType = WalletHelpers.GetType(closedWalletViewModel.Wallet.KeyManager);
NextCommand = ReactiveCommand.CreateFromTask(async () => await OnNextAsync(walletManagerViewModel, closedWalletViewModel, wallet));
@@ -37,6 +37,14 @@ namespace WalletWasabi.Fluent.ViewModels.Login
EnableAutoBusyOn(NextCommand);
}
+ public WalletType WalletType { get; }
+
+ public string WalletName { get; }
+
+ public ICommand OkCommand { get; }
+
+ public ICommand ForgotPasswordCommand { get; }
+
private async Task OnNextAsync(WalletManagerViewModel walletManagerViewModel, ClosedWalletViewModel closedWalletViewModel, Wallet wallet)
{
string? compatibilityPasswordUsed = null;
@@ -78,16 +86,6 @@ namespace WalletWasabi.Fluent.ViewModels.Login
Navigate(NavigationTarget.DialogScreen).To(new PasswordFinderIntroduceViewModel(wallet));
}
- public string? WalletIcon { get; }
-
- public bool IsHardwareWallet { get; }
-
- public string WalletName { get; }
-
- public ICommand OkCommand { get; }
-
- public ICommand ForgotPasswordCommand { get; }
-
private void LoginWallet(WalletManagerViewModel walletManagerViewModel, ClosedWalletViewModel closedWalletViewModel)
{
closedWalletViewModel.RaisePropertyChanged(nameof(WalletViewModelBase.IsLoggedIn));

MODIFY
WalletWasabi.Fluent/Views/Dialogs/Authorization/HardwareWalletAuthDialogView.axaml
WalletWasabi.Fluent/Views/Dialogs/Authorization/HardwareWalletAuthDialogView.axaml
IsBusy="{Binding IsBusy}"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<Viewbox MaxHeight="150">
- <Image Source="{Binding WalletType, Converter={x:Static conv:WalletIconConverter.TypesToImage}}"/>
+ <Image Source="{Binding WalletType, Converter={x:Static conv:WalletIconConverter.WalletTypeToImage}}"/>
</Viewbox>
</c:ContentArea>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/Login/LoginView.axaml
WalletWasabi.Fluent/Views/Login/LoginView.axaml
<!-- Icon -->
<Viewbox MaxHeight="200">
- <Image>
- <Image.Source>
- <MultiBinding Converter="{x:Static conv:WalletIconConverter.TypesToImage}">
- <Binding Path="WalletIcon" Converter="{x:Static conv:WalletIconConverter.StringToType}" />
- <Binding Path="IsHardwareWallet" Converter="{x:Static conv:WalletIconConverter.BoolToType}" />
- </MultiBinding>
- </Image.Source>
- </Image>
+ <Image Source="{Binding WalletType, Converter={x:Static conv:WalletIconConverter.WalletTypeToImage}}"/>
</Viewbox>
</DockPanel>

Update Login.