Fix LoadWalletVM
MODIFY
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
@@ -330,7 +330,12 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
IsWalletSelected = SelectedWallet != null;
CanTestPassword = IsWalletSelected;
- if (Global.WalletService is null)
+ if (Global.WalletManager.AnyWallet())
+ {
+ IsWalletOpened = true;
+ CanLoadWallet = false;
+ }
+ else
{
IsWalletOpened = false;
@@ -339,11 +344,6 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
// And no wallet is opened.
CanLoadWallet = !IsBusy && IsWalletSelected;
}
- else
- {
- IsWalletOpened = true;
- CanLoadWallet = false;
- }
SetLoadButtonText();
return true;

MODIFY
WalletWasabi/Wallets/WalletManager.cs
WalletWasabi/Wallets/WalletManager.cs
@@ -63,6 +63,14 @@ namespace WalletWasabi.Wallets
}
}
+ public bool AnyWallet()
+ {
+ lock (Lock)
+ {
+ return Wallets.Keys.Any();
+ }
+ }
+
public async Task<WalletService> CreateAndStartWalletServiceAsync(KeyManager keyManager)
{
using (await AddRemoveLock.LockAsync(CancelAllInitialization.Token).ConfigureAwait(false))

Fix LoadWalletVM