restore previous login functionality.
MODIFY
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/LoginViewModel.cs
@@ -54,8 +54,6 @@ namespace WalletWasabi.Fluent.ViewModels.Login
return true;
});
- await _closedWalletVm.LoadWallet();
-
if (!IsPasswordIncorrect)
{
if (legalChecker.TryGetNewLegalDocs(out var document))

MODIFY
WalletWasabi.Fluent/ViewModels/Wallets/ClosedWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/Wallets/ClosedWalletViewModel.cs
using System;
using System.Collections.ObjectModel;
+using System.Reactive.Concurrency;
+using System.Reactive.Disposables;
using System.Threading.Tasks;
using ReactiveUI;
using WalletWasabi.Fluent.ViewModels.Login;
@@ -32,6 +34,19 @@ namespace WalletWasabi.Fluent.ViewModels.Wallets
});
}
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ {
+ base.OnNavigatedTo(inStack, disposable);
+
+ if (Wallet.State == WalletState.Uninitialized)
+ {
+ RxApp.MainThreadScheduler.Schedule(async () =>
+ {
+ await LoadWallet();
+ });
+ }
+ }
+
public override string IconName => "web_asset_regular";
public async Task LoadWallet()

restore previous login functionality.