Handle wallet loading process
MODIFY
WalletWasabi.Fluent/ViewModels/NavBar/NavBarViewModel.cs
WalletWasabi.Fluent/ViewModels/NavBar/NavBarViewModel.cs
@@ -52,9 +52,12 @@ namespace WalletWasabi.Fluent.ViewModels.NavBar
.Subscribe(x =>
{
if (x > 0 && SelectedItem is null)
+ {
+ if (!_walletManager.IsLoadingWallet)
{
SelectedItem = Items.FirstOrDefault();
}
+ }
});
this.WhenAnyValue(x => x.IsOpen)

MODIFY
WalletWasabi.Fluent/ViewModels/WalletManagerViewModel.cs
WalletWasabi.Fluent/ViewModels/WalletManagerViewModel.cs
@@ -22,6 +22,7 @@ namespace WalletWasabi.Fluent.ViewModels
private readonly Dictionary<WalletViewModelBase, List<WalletActionViewModel>> _walletActionsDictionary;
private readonly ReadOnlyObservableCollection<NavBarItemViewModel> _items;
[AutoNotify] private WalletViewModelBase? _selectedWallet;
+ [AutoNotify(SetterModifier = AccessModifier.Private)] private bool _isLoadingWallet;
[AutoNotify] private bool _loggedInAndSelectedAlwaysFirst;
[AutoNotify] private ObservableCollection<NavBarItemViewModel> _actions;
[AutoNotify] private ObservableCollection<WalletViewModelBase> _wallets;
@@ -68,7 +69,9 @@ namespace WalletWasabi.Fluent.ViewModels
}
else if (_walletDictionary[wallet] is ClosedWalletViewModel cwvm && wallet.State == WalletState.Started)
{
+ IsLoadingWallet = true;
OpenClosedWallet(walletManager, uiConfig, cwvm);
+ IsLoadingWallet = false;
}
}

Handle wallet loading process