much simpler handling of welcome screen and oobe.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/AddedWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/AddedWalletPageViewModel.cs
@@ -33,8 +33,6 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
private void OnNext()
{
- Services.UiConfig.Oobe = false;
-
Navigate().Clear();
var navBar = NavigationManager.Get<NavBarViewModel>();

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/WelcomePageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/WelcomePageViewModel.cs
@@ -8,9 +8,19 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
{
public partial class WelcomePageViewModel : DialogViewModelBase<Unit>
{
- public WelcomePageViewModel()
+ public WelcomePageViewModel(AddWalletPageViewModel addWalletPage)
{
- GetStartedCommand = ReactiveCommand.Create(() => Close());
+ GetStartedCommand = ReactiveCommand.Create(() =>
+ {
+ if (!Services.WalletManager.HasWallet())
+ {
+ Navigate().To(addWalletPage);
+ }
+ else
+ {
+ Close();
+ }
+ });
}
public ICommand GetStartedCommand { get; }

MODIFY
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
WalletWasabi.Fluent/ViewModels/MainViewModel.cs
@@ -86,14 +86,6 @@ namespace WalletWasabi.Fluent.ViewModels
var (dialogScreenIsOpen, fullScreenIsOpen, compactDialogScreenIsOpen) = tup;
IsMainContentEnabled = !(dialogScreenIsOpen || fullScreenIsOpen || compactDialogScreenIsOpen);
-
- if (IsMainContentEnabled)
- {
- if (Services.WalletManager.HasWallet() && !Services.UiConfig.Oobe)
- {
- IsSetup = true;
- }
- }
});
this.WhenAnyValue(
@@ -144,7 +136,7 @@ namespace WalletWasabi.Fluent.ViewModels
{
IsSetup = false;
- await _dialogScreen.NavigateDialogAsync(new WelcomePageViewModel());
+ await _dialogScreen.NavigateDialogAsync(new WelcomePageViewModel(_addWalletPage));
if (Services.WalletManager.HasWallet())
{
@@ -152,11 +144,6 @@ namespace WalletWasabi.Fluent.ViewModels
IsSetup = true;
}
}
-
- if (!Services.WalletManager.HasWallet())
- {
- _dialogScreen.To(_addWalletPage, NavigationMode.Clear);
- }
});
}

much simpler handling of welcome screen and oobe.