Use factories to create ViewModels (#256)

SuperJMN · web-flow · commit 631bea92a6e1 · 2025-02-11T16:52:10.000Z
diff --git a/src/Angor/Avalonia/AngorApp/Core/CompositionRoot.cs b/src/Angor/Avalonia/AngorApp/Core/CompositionRoot.cs
@@ -27,31 +27,33 @@ public static MainViewModel CreateMainViewModel(Control control)
     {
         var topLevel = TopLevel.GetTopLevel(control);
         var launcher = new LauncherService(topLevel!.Launcher);
+        var activeWallet = new ActiveWallet();
+        
         var uiServices = new UIServices(
             launcher,
             new DesktopDialog(),
             new NotificationService(new WindowNotificationManager(topLevel)
             {
                 Position = NotificationPosition.BottomRight
-            }));
+            }), new ActiveWallet());
 
         var walletStoreDesign = new WalletProviderDesign();
         var walletFactory = new WalletFactory(new WalletBuilderDesign(), uiServices);
-
+        
         MainViewModel mainViewModel = null!;
 
         var projectService = RealProjectService();
 
         IEnumerable<SectionBase> sections =
         [
-            new Section("Home", new HomeSectionViewModel(walletStoreDesign, uiServices, () => mainViewModel), "svg:/Assets/angor-icon.svg"),
+            new Section("Home", () => new HomeSectionViewModel(activeWallet, uiServices, () => mainViewModel), "svg:/Assets/angor-icon.svg"),
             new Separator(),
-            new Section("Wallet", new WalletSectionViewModel(walletFactory, walletStoreDesign, uiServices), "fa-wallet"),
-            new Section("Browse", new NavigationViewModel(navigator => new BrowseSectionViewModel(walletStoreDesign, projectService, navigator, uiServices)), "fa-magnifying-glass"),
-            new Section("Portfolio", new PortfolioSectionViewModel(), "fa-hand-holding-dollar"),
-            new Section("Founder", new FounderSectionViewModel(projectService), "fa-money-bills"),
+            new Section("Wallet", () => new WalletSectionViewModel(walletFactory, walletStoreDesign, uiServices), "fa-wallet"),
+            new Section("Browse", () => new NavigationViewModel(navigator => new BrowseSectionViewModel(walletStoreDesign, projectService, navigator, uiServices)), "fa-magnifying-glass"),
+            new Section("Portfolio", () => new PortfolioSectionViewModel(), "fa-hand-holding-dollar"),
+            new Section("Founder", () => new FounderSectionViewModel(projectService), "fa-money-bills"),
             new Separator(),
-            new Section("Settings", null, "fa-gear"),
+            new Section("Settings", () => null, "fa-gear"),
             new CommandSection("Angor Hub", ReactiveCommand.CreateFromTask(() => uiServices.LauncherService.LaunchUri(Constants.AngorHubUri)), "fa-magnifying-glass") { IsPrimary = false }
         ];
 
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Home/HomeSectionViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Home/HomeSectionViewModel.cs
@@ -6,21 +6,16 @@
 
 namespace AngorApp.Sections.Home;
 
-public class HomeSectionViewModel : ReactiveObject, IHomeSectionViewModel
+public class HomeSectionViewModel(
+    IActiveWallet activeWallet,
+    UIServices uiServices,
+    Func<IMainViewModel> getMainViewModel)
+    : ReactiveObject, IHomeSectionViewModel
 {
-    private readonly IWalletProvider provider;
+    //GoToFounderSection = ReactiveCommand.Create(() => getMainViewModel().GoToSection("Founder"));
 
-    public HomeSectionViewModel(IWalletProvider provider, UIServices uiServices, Func<IMainViewModel> getMainViewModel)
-    {
-        this.provider = provider;
-        provider.GetWallet();
-        GoToWalletSection = ReactiveCommand.Create(() => getMainViewModel().GoToSection("Wallet"));
-        OpenHub = ReactiveCommand.CreateFromTask(() => uiServices.LauncherService.LaunchUri(Constants.AngorHubUri));
-        //GoToFounderSection = ReactiveCommand.Create(() => getMainViewModel().GoToSection("Founder"));
-    }
-
-    public bool IsWalletSetup => provider.GetWallet().HasValue;
-    public ICommand GoToWalletSection { get; }
+    public bool IsWalletSetup => activeWallet.Current.HasValue;
+    public ICommand GoToWalletSection { get; } = ReactiveCommand.Create(() => getMainViewModel().GoToSection("Wallet"), activeWallet.HasWallet);
     public ICommand GoToFounderSection { get; }
-    public ICommand OpenHub { get; }
+    public ICommand OpenHub { get; } = ReactiveCommand.CreateFromTask(() => uiServices.LauncherService.LaunchUri(Constants.AngorHubUri));
 }
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Shell/MainView.axaml b/src/Angor/Avalonia/AngorApp/Sections/Shell/MainView.axaml
@@ -19,7 +19,7 @@
             <Interaction.Behaviors>
                 <behaviors:NestedScrollViewerBehavior />
             </Interaction.Behaviors>
-            <ContentControl MinWidth="300" MinHeight="300" Margin="10 10 10 10" Content="{Binding SelectedSection.ViewModel}" ClipToBounds="False" />
+            <ContentControl MinWidth="300" MinHeight="300" Margin="10 10 10 10" Content="{Binding CurrentContent^}" ClipToBounds="False" />
         </ScrollViewer>
     </DockPanel>
 </UserControl>
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Shell/MainViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Shell/MainViewModel.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Reactive.Linq;
 using AngorApp.Core;
 using AngorApp.Services;
 using ReactiveUI.SourceGenerators;
@@ -12,13 +13,15 @@ public partial class MainViewModel : ReactiveObject, IMainViewModel
     public MainViewModel(IEnumerable<SectionBase> sections, UIServices uiServices)
     {
         Sections = sections;
-        SelectedSection = Sections.OfType<Section>().Skip(0).First();
+        SelectedSection = Sections.OfType<Section>().First();
         OpenHub = ReactiveCommand.CreateFromTask(() => uiServices.LauncherService.LaunchUri(Constants.AngorHubUri));
+        CurrentContent = this.WhenAnyValue(x => x.SelectedSection).Select(section => section.GetViewModel());
     }
 
     public ReactiveCommand<Unit,Unit> OpenHub { get; }
 
     public IEnumerable<SectionBase> Sections { get; }
+    public IObservable<object> CurrentContent { get; }
 
     public void GoToSection(string sectionName)
     {
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Shell/MainViewModelDesign.cs b/src/Angor/Avalonia/AngorApp/Sections/Shell/MainViewModelDesign.cs
@@ -1,9 +1,4 @@
-using AngorApp.Sections.Browse;
 using AngorApp.Sections.Home;
-using AngorApp.Sections.Wallet;
-using AngorApp.Services;
-using CSharpFunctionalExtensions;
-using Zafiro.Avalonia.Controls.Navigation;
 
 namespace AngorApp.Sections.Shell;
 
@@ -13,7 +8,7 @@ public MainViewModelDesign()
     {
         Sections =
         [
-            new Section("Home", new HomeSectionViewModelDesign(), "svg:/Assets/angor-icon.svg"),
+            new Section("Home", () => new HomeSectionViewModelDesign(), "svg:/Assets/angor-icon.svg"),
             new Separator(),
             new Section("Wallet", null, "fa-wallet"),
             new Section("Browse", null, "fa-magnifying-glass"),
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Shell/Section.cs b/src/Angor/Avalonia/AngorApp/Sections/Shell/Section.cs
@@ -1,8 +1,8 @@
 namespace AngorApp.Sections.Shell;
 
-public class Section(string name, object viewModel, object? icon = null) : SectionBase
+public class Section(string name, Func<object> getViewModel, object? icon = null) : SectionBase
 {
     public string Name { get; } = name;
-    public object ViewModel { get; } = viewModel;
+    public Func<object> GetViewModel { get; } = getViewModel;
     public object? Icon { get; } = icon;
 }
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Create.cs b/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Create.cs
@@ -34,7 +34,7 @@ public async Task<Maybe<Result<IWallet>>> Start()
             .Then(prev => new SeedWordsConfirmationViewModel(prev.Words.Value))
             .Then(prev => new PassphraseCreateViewModel(prev.SeedWords))
             .Then(prev => new EncryptionPasswordViewModel(prev.SeedWords, prev.Passphrase!))
-            .Then(prev => new SummaryAndCreationViewModel(prev.Passphrase, prev.SeedWords, prev.Password!, walletBuilder)
+            .Then(prev => new SummaryAndCreationViewModel(prev.Passphrase, prev.SeedWords, prev.Password!, walletBuilder, uiServices)
             {
                  IsRecovery = false,
             })
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Recover.cs b/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Recover.cs
@@ -33,7 +33,7 @@ public async Task<Maybe<Result<IWallet>>> Start()
                 .Then(_ => new RecoverySeedWordsViewModel())
                 .Then(seedwords => new PassphraseRecoverViewModel(seedwords.SeedWords))
                 .Then(passphrase => new EncryptionPasswordViewModel(passphrase.SeedWords, passphrase.Passphrase!))
-                .Then(passphrase => new SummaryAndCreationViewModel(passphrase.Passphrase, passphrase.SeedWords, passphrase.Password!, walletBuilder)
+                .Then(passphrase => new SummaryAndCreationViewModel(passphrase.Passphrase, passphrase.SeedWords, passphrase.Password!, walletBuilder, uiServices)
                 {
                     IsRecovery = true
                 })
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Steps/SeedWordsGeneration/SeedWordsView.axaml b/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Steps/SeedWordsGeneration/SeedWordsView.axaml
@@ -13,7 +13,7 @@
 
     <Panel>
         <seedWordsGeneration:Empty IsVisible="{Binding Words.HasNoValue}" />
-        <seedWordsGeneration:GeneratedWords IsVisible="{Binding Words.HasValue}" />
+        <!-- <seedWordsGeneration:GeneratedWords IsVisible="{Binding Words.HasValue}" /> -->
     </Panel>
 
 </UserControl>
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Steps/SummaryAndCreation/SummaryAndCreationViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Wallet/CreateAndRecover/Steps/SummaryAndCreation/SummaryAndCreationViewModel.cs
@@ -1,4 +1,6 @@
+using System.Threading.Tasks;
 using Angor.UI.Model;
+using AngorApp.Services;
 using CSharpFunctionalExtensions;
 using ReactiveUI.SourceGenerators;
 using ReactiveUI.Validation.Helpers;
@@ -10,14 +12,24 @@ namespace AngorApp.Sections.Wallet.CreateAndRecover.Steps.SummaryAndCreation;
 
 public partial class SummaryAndCreationViewModel : ReactiveValidationObject, IStep, ISummaryAndCreationViewModel
 {
+    private readonly IWalletBuilder walletBuilder;
+    private readonly UIServices uiServices;
     [ObservableAsProperty] private IWallet? wallet;
 
-    public SummaryAndCreationViewModel(Maybe<string> passphrase, SeedWords seedwords, string encryptionKey, IWalletBuilder walletBuilder)
+    public SummaryAndCreationViewModel(Maybe<string> passphrase, SeedWords seedwords, string encryptionKey, IWalletBuilder walletBuilder, UIServices uiServices)
     {
+        this.walletBuilder = walletBuilder;
+        this.uiServices = uiServices;
         Passphrase = passphrase;
-        CreateWallet = ReactiveCommand.CreateFromTask(() => walletBuilder.Create(seedwords, passphrase, encryptionKey));
+        CreateWallet = ReactiveCommand.CreateFromTask(() => CreateAndSet(seedwords, encryptionKey, encryptionKey));
         walletHelper = CreateWallet.Successes().ToProperty(this, x => x.Wallet);
     }
+    
+    private Task<Result<IWallet>> CreateAndSet(SeedWords seedwords, Maybe<string> passphrase, string encryptionKey)
+    {
+        return walletBuilder.Create(seedwords, passphrase, encryptionKey)
+            .Tap(w => uiServices.ActiveWallet.Current = w.AsMaybe());
+    }
 
     public string CreateWalletText => IsRecovery ? "Recover Wallet" : "Create Wallet";
     public string CreatingWalletText => IsRecovery ? "Recovering Wallet..." : "Creating Wallet...";
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Wallet/WalletSectionViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Wallet/WalletSectionViewModel.cs
@@ -17,8 +17,12 @@ public WalletSectionViewModel(IWalletFactory walletFactory, IWalletProvider wall
     {
         CreateWallet = ReactiveCommand.CreateFromTask(walletFactory.Create);
         CreateWallet.Values().Successes().Do(walletProvider.SetWallet).Subscribe();
-        walletHelper = CreateWallet.Values().Successes().Select(w => new WalletViewModel(w, services)).ToProperty<WalletSectionViewModel, IWalletViewModel>(this, x => x.Wallet);
         RecoverWallet = ReactiveCommand.CreateFromTask(walletFactory.Recover);
+        
+        walletHelper = services.ActiveWallet.CurrentChanged
+            .Merge(Observable.Return(services.ActiveWallet.Current).Values())
+            .Select(w => new WalletViewModel(w, services))
+            .ToProperty(this, x => x.Wallet);
     }
 
     public ReactiveCommand<Unit, Maybe<Result<IWallet>>> CreateWallet { get; }
diff --git a/src/Angor/Avalonia/AngorApp/Services/ActiveWallet.cs b/src/Angor/Avalonia/AngorApp/Services/ActiveWallet.cs
@@ -0,0 +1,21 @@
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using Angor.UI.Model;
+using CSharpFunctionalExtensions;
+using Zafiro.CSharpFunctionalExtensions;
+
+namespace AngorApp.Services;
+
+public class ActiveWallet : IActiveWallet
+{
+    private readonly BehaviorSubject<Maybe<IWallet>> currentWallet = new(Maybe<IWallet>.None);
+    public IObservable<bool> HasWallet => currentWallet.Any();
+
+    public Maybe<IWallet> Current
+    {
+        get => currentWallet.Value;
+        set => currentWallet.OnNext(value);
+    }
+
+    public IObservable<IWallet> CurrentChanged => currentWallet.Values().AsObservable();
+}
diff --git a/src/Angor/Avalonia/AngorApp/Services/IActiveWallet.cs b/src/Angor/Avalonia/AngorApp/Services/IActiveWallet.cs
@@ -0,0 +1,11 @@
+using Angor.UI.Model;
+using CSharpFunctionalExtensions;
+
+namespace AngorApp.Services;
+
+public interface IActiveWallet
+{
+    Maybe<IWallet> Current { get; set; }
+    IObservable<IWallet> CurrentChanged { get; }
+    IObservable<bool> HasWallet { get; }
+}
diff --git a/src/Angor/Avalonia/AngorApp/Services/UIServices.cs b/src/Angor/Avalonia/AngorApp/Services/UIServices.cs
@@ -9,11 +9,13 @@ public class UIServices
     public ILauncherService LauncherService { get; }
     public IDialog Dialog { get; }
     public INotificationService NotificationService { get; }
+    public IActiveWallet ActiveWallet { get; }
 
-    public UIServices(ILauncherService launcherService, IDialog dialog, INotificationService notificationService)
+    public UIServices(ILauncherService launcherService, IDialog dialog, INotificationService notificationService, IActiveWallet activeWallet)
     {
         LauncherService = launcherService;
         Dialog = dialog;
         NotificationService = notificationService;
+        ActiveWallet = activeWallet;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Linq;`
	`2`	`+using System.Reactive.Linq;`
`2`	`3`	`using AngorApp.Core;`
`3`	`4`	`using AngorApp.Services;`
`4`	`5`	`using ReactiveUI.SourceGenerators;`
`@@ -12,13 +13,15 @@ public partial class MainViewModel : ReactiveObject, IMainViewModel`
`12`	`13`	`public MainViewModel(IEnumerable<SectionBase> sections, UIServices uiServices)`
`13`	`14`	`{`
`14`	`15`	`Sections = sections;`
`15`		`- SelectedSection = Sections.OfType<Section>().Skip(0).First();`
	`16`	`+ SelectedSection = Sections.OfType<Section>().First();`
`16`	`17`	`OpenHub = ReactiveCommand.CreateFromTask(() => uiServices.LauncherService.LaunchUri(Constants.AngorHubUri));`
	`18`	`+ CurrentContent = this.WhenAnyValue(x => x.SelectedSection).Select(section => section.GetViewModel());`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`public ReactiveCommand<Unit,Unit> OpenHub { get; }`
`20`	`22`
`21`	`23`	`public IEnumerable<SectionBase> Sections { get; }`
	`24`	`+ public IObservable<object> CurrentContent { get; }`
`22`	`25`
`23`	`26`	`public void GoToSection(string sectionName)`
`24`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`namespace AngorApp.Sections.Shell;`
`2`	`2`
`3`		`-public class Section(string name, object viewModel, object? icon = null) : SectionBase`
	`3`	`+public class Section(string name, Func<object> getViewModel, object? icon = null) : SectionBase`
`4`	`4`	`{`
`5`	`5`	`public string Name { get; } = name;`
`6`		`- public object ViewModel { get; } = viewModel;`
	`6`	`+ public Func<object> GetViewModel { get; } = getViewModel;`
`7`	`7`	`public object? Icon { get; } = icon;`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public async Task<Maybe<Result<IWallet>>> Start()`
`34`	`34`	`.Then(prev => new SeedWordsConfirmationViewModel(prev.Words.Value))`
`35`	`35`	`.Then(prev => new PassphraseCreateViewModel(prev.SeedWords))`
`36`	`36`	`.Then(prev => new EncryptionPasswordViewModel(prev.SeedWords, prev.Passphrase!))`
`37`		`- .Then(prev => new SummaryAndCreationViewModel(prev.Passphrase, prev.SeedWords, prev.Password!, walletBuilder)`
	`37`	`+ .Then(prev => new SummaryAndCreationViewModel(prev.Passphrase, prev.SeedWords, prev.Password!, walletBuilder, uiServices)`
`38`	`38`	`{`
`39`	`39`	`IsRecovery = false,`
`40`	`40`	`})`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task<Maybe<Result<IWallet>>> Start()`
`33`	`33`	`.Then(_ => new RecoverySeedWordsViewModel())`
`34`	`34`	`.Then(seedwords => new PassphraseRecoverViewModel(seedwords.SeedWords))`
`35`	`35`	`.Then(passphrase => new EncryptionPasswordViewModel(passphrase.SeedWords, passphrase.Passphrase!))`
`36`		`- .Then(passphrase => new SummaryAndCreationViewModel(passphrase.Passphrase, passphrase.SeedWords, passphrase.Password!, walletBuilder)`
	`36`	`+ .Then(passphrase => new SummaryAndCreationViewModel(passphrase.Passphrase, passphrase.SeedWords, passphrase.Password!, walletBuilder, uiServices)`
`37`	`37`	`{`
`38`	`38`	`IsRecovery = true`
`39`	`39`	`})`