Add Invest v2. No business logic. (block-core#640)

Author: SuperJMN

src/Angor/Avalonia/.gitignore

@@ -257,7 +257,6 @@ Generated_Code/
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)
 _UpgradeReport_Files/
-Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 ServiceFabricBackup/

src/Angor/Avalonia/AngorApp.Model/Contracts/Wallet/IWallet.cs

@@ -14,6 +14,7 @@ public interface IWallet
     IAmountUI ReservedBalance { get; }
     Result IsAddressValid(string address);
     WalletId Id { get; }
+    public string Name { get; }
     IEnhancedCommand Send { get; }
     public IEnhancedCommand<Result<string>> GetReceiveAddress { get; }
     public Task<Result<string>> GenerateReceiveAddress();

src/Angor/Avalonia/AngorApp.Model/Wallet/Simple/SimpleWallet.cs

@@ -88,6 +88,7 @@ private RefreshableCollection<IBroadcastedTransaction, string> CreateTransaction
     }
 
     public IObservable<string> ReceiveAddress { get; }
+    public string Name { get; } = "Default";
     public IEnhancedCommand Send { get; }
     public IEnhancedCommand<Result<string>> GetReceiveAddress { get; }
     public IEnhancedCommand<Result<IEnumerable<IBroadcastedTransaction>>> Load { get; }

src/Angor/Avalonia/AngorApp/Composition/Registrations/ViewModels/ViewModels.cs

@@ -16,6 +16,9 @@
 using ShellViewModel = AngorApp.UI.Shell.ShellViewModel;
 using WalletSectionViewModel = AngorApp.UI.Sections.Wallet.Main.WalletSectionViewModel;
 using Angor.Sdk.Funding.Projects.Dtos;
+using AngorApp.UI.Flows.InvestV2;
+
+using AngorApp.UI.Flows.InvestV2.PaymentSelector;
 
 namespace AngorApp.Composition.Registrations.ViewModels;
 
@@ -37,6 +40,8 @@ public static IServiceCollection AddViewModels(this IServiceCollection services)
                 .AddTransient<IFounderSectionViewModel, FounderSectionViewModel>()
                 .AddTransient<ISettingsSectionViewModel, SettingsSectionViewModel>()
                 .AddScoped<IPenaltiesViewModel, PenaltiesViewModel>()
+                .AddScoped<IInvestViewModel, InvestViewModel>()
+                .AddScoped<IPaymentSelectorViewModel, PaymentSelectorViewModel>()
                 .AddScoped<IRecoverViewModel, RecoverViewModel>()
                 .AddSingleton<IShellViewModel, ShellViewModel>();
     }

src/Angor/Avalonia/AngorApp/Core/Factories/IProjectInvestCommandFactory.cs

@@ -2,5 +2,5 @@ namespace AngorApp.Core.Factories;
 
 public interface IProjectInvestCommandFactory
 {
-    IEnhancedCommand<Result<Maybe<Unit>>> Create(FullProject project, bool isInsideInvestmentPeriod);
+    IEnhancedCommand<Result<Unit>> Create(FullProject project, bool isInsideInvestmentPeriod);
 }

src/Angor/Avalonia/AngorApp/Core/Factories/ProjectInvestCommandFactory.cs

@@ -1,4 +1,6 @@
 using AngorApp.UI.Flows.Invest;
+using AngorApp.UI.Flows.InvestV2;
+using Zafiro.UI.Navigation;
 
 namespace AngorApp.Core.Factories;
 
@@ -7,28 +9,24 @@ public class ProjectInvestCommandFactory : IProjectInvestCommandFactory
     private readonly InvestFlow investFlow;
     private readonly UIServices uiServices;
     private readonly IWalletContext walletContext;
+    private readonly INavigator navigator;
 
     public ProjectInvestCommandFactory(
         InvestFlow investFlow,
         UIServices uiServices,
-        IWalletContext walletContext)
+        IWalletContext walletContext, INavigator navigator)
     {
         this.investFlow = investFlow;
         this.uiServices = uiServices;
         this.walletContext = walletContext;
+        this.navigator = navigator;
     }
 
-    public IEnhancedCommand<Result<Maybe<Unit>>> Create(FullProject project, bool isInsideInvestmentPeriod)
+    public IEnhancedCommand<Result<Unit>> Create(FullProject project, bool isInsideInvestmentPeriod)
     {
         var canExecute = Observable.Return(isInsideInvestmentPeriod);
-
-        var command = ReactiveCommand.CreateFromTask(
-                () => walletContext.RequiresWallet(wallet => investFlow.Invest(wallet, project)),
-                canExecute)
-            .Enhance();
-
+        var command = EnhancedCommand.CreateWithResult(() => navigator.Go<IInvestViewModel>(), canExecute);
         command.HandleErrorsWith(uiServices.NotificationService, "Investment failed");
-
         return command;
     }
 }

src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/CreateProjectFlow.cs

@@ -38,7 +38,7 @@ private SlimWizard<string> CreateWizard(IWallet wallet, ProjectSeedDto projectSe
         var wizard = WizardBuilder
             .StartWith(() => new CreateProjectViewModel(wallet, projectSeed, uiServices, projectAppService, founderAppService, logger), "Create Project").NextCommand(model => model.Create)
             .Then(transactionId => new ProjectCreatedViewModel(transactionId, commands), "Success").Next((_, projectId) => projectId, "Close").Always()
-            .WithCompletionFinalStep();
+            .Build(StepKind.Completion);
 
         return wizard;
     }

src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/CreateProjectFlowV2.cs

@@ -48,7 +48,7 @@ private async Task<Result<Maybe<string>>> Create(WalletId walletId, ProjectSeedD
                                                 walletId,
                                                 seed))
                                             .Then(txId => new SuccessViewModel($"Project {txId} created successfully!"), "Success").Next((_, s) => s, "Finish").Always()
-                                            .WithCompletionFinalStep();
+                                            .Build(StepKind.Completion);
 
             return await rootWizard.Navigate(navigator);
         }
@@ -94,7 +94,7 @@ private SlimWizard<string> CreateInvestmentProjectWizard(WalletId walletId, Proj
                                                   seed,
                                                   uiServices))
                                         .NextCommand(review => review.DeployCommand)
-                                        .WithCommitFinalStep();
+                                        .Build(StepKind.Commit);
 
             return wizard;
         }
@@ -119,7 +119,7 @@ private SlimWizard<string> CreateFundProjectWizard(WalletId walletId, ProjectSee
                                                   seed,
                                                   uiServices))
                                         .NextCommand(review => review.DeployCommand)
-                                        .WithCommitFinalStep();
+                                        .Build(StepKind.Commit);
 
             return wizard;
         }

src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/FundProject/Payouts/PayoutsView.axaml

@@ -43,7 +43,7 @@
                     <ListBox SelectedItem="{Binding FundProject.PayoutFrequency, Mode=TwoWay}"
                              SelectionMode="Single"
                              ItemsSource="{Binding AvailableFrequencies}"
-                             ItemContainerTheme="{StaticResource ButtonizedAccent}"
+                             ItemContainerTheme="{StaticResource ButtonizedAccentListBoxItem}"
                              Background="Transparent">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -66,7 +66,7 @@
 
                     <ListBox ItemsSource="{Binding AvailableInstallmentCounts}"
                              Selection="{Binding FundProject.SelectedInstallments.SelectionModel}"
-                             ItemContainerTheme="{StaticResource ButtonizedAccent}"
+                             ItemContainerTheme="{StaticResource ButtonizedAccentListBoxItem}"
                              Background="Transparent">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -94,7 +94,7 @@
                     <ListBox SelectedItem="{Binding FundProject.MonthlyPayoutDate, Mode=TwoWay}"
                              SelectionMode="Multiple"
                              ItemsSource="{Binding AvailablePayoutDates}"
-                             ItemContainerTheme="{StaticResource ButtonizedAccent}"
+                             ItemContainerTheme="{StaticResource ButtonizedAccentListBoxItem}"
                              Background="Transparent">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -118,7 +118,7 @@
                     <ListBox SelectedItem="{Binding FundProject.WeeklyPayoutDay, Mode=TwoWay}"
                              SelectionMode="Single"
                              ItemsSource="{Binding AvailableDaysOfWeek}"
-                             ItemContainerTheme="{StaticResource ButtonizedAccent}"
+                             ItemContainerTheme="{StaticResource ButtonizedAccentListBoxItem}"
                              Background="Transparent">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>

src/Angor/Avalonia/AngorApp/UI/Flows/CreateProject/Wizard/InvestmentProject/FundingConfigurationView.axaml

@@ -260,7 +260,7 @@
 
                         <ListBox SelectedValueBinding="{Binding Months}" 
                                  SelectedValue="{Binding NewProject.FundingEndDate, Mode=TwoWay, Converter={x:Static controls:AngorConverters.AddMonthsToToday}}"
-                                 ItemContainerTheme="{StaticResource ButtonizedAccent}" Background="Transparent">
+                                 ItemContainerTheme="{StaticResource ButtonizedAccentListBoxItem}" Background="Transparent">
                             <ListBox.ItemsSource>
                                 <generic:List x:TypeArguments="model:PeriodOption">
                                     <model:PeriodOption Months="1" Title="1 Month" />