block-core · DavidGershony · May 13, 2025 · May 6, 2025 · May 6, 2025 · May 6, 2025
diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding.Tests/ProjectAppServiceTests.cs b/src/Angor/Avalonia/Angor.Contexts.Funding.Tests/ProjectAppServiceTests.cs
@@ -1,4 +1,5 @@
-using Angor.Contexts.Funding.Projects.Infrastructure.Interfaces;
+using Angor.Contexts.Funding.Projects.Domain;
+using Angor.Contexts.Funding.Projects.Infrastructure.Interfaces;
 using Angor.Contexts.Funding.Shared;
 using Angor.Contexts.Funding.Tests.TestDoubles;
 using Angor.Shared;
@@ -17,14 +18,26 @@ public async Task Get_latest_projects()
         var result = await sut.Latest();
         Assert.NotEmpty(result);
     }
+
+    [Fact]
+    public async Task Get_founder_projects()
+    {
+        var sut = CreateSut();
+
+        var projectId = new ProjectId("angor1qkmmqqktfhe79wxp20555cdp5gfardr4s26wr00");
+        var result = await sut.GetFounderProjects(Guid.NewGuid());
+
+        Assert.NotEmpty(result.Value);
+    }
+
 
     private IProjectAppService CreateSut()
     {
         var serviceCollection = new ServiceCollection();
 
         var logger = new LoggerConfiguration().WriteTo.TestOutput(output).CreateLogger();
         FundingContextServices.Register(serviceCollection, logger);
-        serviceCollection.AddSingleton<ISeedwordsProvider>(sp => new TestingSeedwordsProvider("print foil moment average quarter keep amateur shell tray roof acoustic where", "", sp.GetRequiredService<IDerivationOperations>()));
+        serviceCollection.AddSingleton<ISeedwordsProvider>(sp => new TestingSeedwordsProvider("oven suggest panda hip orange cheap kite focus cross never tornado forget", "", sp.GetRequiredService<IDerivationOperations>()));
 
         var serviceProvider = serviceCollection.BuildServiceProvider();
         var projectAppService = serviceProvider.GetService<IProjectAppService>();

diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding/Founder/Operations/GetFounderProjects.cs b/src/Angor/Avalonia/Angor.Contexts.Funding/Founder/Operations/GetFounderProjects.cs
@@ -0,0 +1,41 @@
+using Angor.Contests.CrossCutting;
+using Angor.Contexts.Funding.Projects.Application.Dtos;
+using Angor.Contexts.Funding.Projects.Domain;
+using Angor.Contexts.Funding.Projects.Infrastructure.Impl;
+using Angor.Contexts.Funding.Shared;
+using Angor.Shared;
+using CSharpFunctionalExtensions;
+using MediatR;
+using Zafiro.CSharpFunctionalExtensions;
+
+namespace Angor.Contexts.Funding.Founder.Operations;
+
+public static class GetFounderProjects
+{
+    public class GetFounderProjectsHandler(
+        IProjectRepository projectRepository,
+        ISeedwordsProvider seedwordsProvider,
+        IDerivationOperations derivationOperations, 
+        INetworkConfiguration networkConfiguration) : IRequestHandler<GetFounderProjectsRequest, Result<IEnumerable<ProjectDto>>>
+    {
+        public Task<Result<IEnumerable<ProjectDto>>> Handle(GetFounderProjectsRequest request, CancellationToken cancellationToken)
+        {
+            return GetProjectIds(request)
+                .Traverse(projectRepository.TryGet)
+                .Map(projectMaybes => projectMaybes.Values())
+                .MapEach(project => project.ToDto());
+        }
+
+        private Task<Result<IEnumerable<ProjectId>>> GetProjectIds(GetFounderProjectsRequest request)
+        {
+            return seedwordsProvider.GetSensitiveData(request.WalletId)
+                .Map(p => p.ToWalletWords())
+                .Map(words => derivationOperations.DeriveProjectKeys(words, networkConfiguration.GetAngorKey()))
+                .Map(collection => collection.Keys.AsEnumerable())
+                .MapEach(keys => keys.ProjectIdentifier)
+                .MapEach(fk => new ProjectId(fk));
+        }
+    }
+
+    public record GetFounderProjectsRequest(Guid WalletId) : IRequest<Result<IEnumerable<ProjectDto>>>;
+}
diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding/Founder/Operations/GetPendingInvestments.cs b/src/Angor/Avalonia/Angor.Contexts.Funding/Founder/Operations/GetPendingInvestments.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Reactive.Threading.Tasks;
 using Angor.Contexts.Funding.Projects.Domain;
 using Angor.Shared;
 using Angor.Shared.Models;
@@ -25,22 +26,25 @@ public class GetPendingInvestmentsHandler(IProjectRepository projectRepository,
     {
         public async Task<Result<IEnumerable<PendingInvestmentDto>>> Handle(GetPendingInvestmentsRequest request, CancellationToken cancellationToken)
         {
-            var project = await projectRepository.Get(request.ProjectId);
-            if (project.IsFailure)
+            var projectResult = await projectRepository.Get(request.ProjectId);
+            if (projectResult.IsFailure)
             {
-                return Result.Failure<IEnumerable<PendingInvestmentDto>>(project.Error);
+                return Result.Failure<IEnumerable<PendingInvestmentDto>>(projectResult.Error);
             }
 
-            var nostrPubKey = project.Value.NostrPubKey;
+            var nostrPubKey = projectResult.Value.NostrPubKey;
             var investingMessages = InvestmentMessages(nostrPubKey);
-            var pendingInvestmentResults = await investingMessages.SelectMany(nostrMessage => DecryptInvestmentMessage(request.WalletId, project, nostrMessage)).ToList();
+            var pendingInvestmentResults = await investingMessages
+                .SelectMany(nostrMessage => DecryptInvestmentMessage(request.WalletId, projectResult.Value, nostrMessage))
+                .ToList();
 
             return pendingInvestmentResults.Combine();
         }
 
-        private Task<Result<PendingInvestmentDto>> DecryptInvestmentMessage(Guid walletId, Result<Project> project, NostrMessage nostrMessage)
+        private Task<Result<PendingInvestmentDto>> DecryptInvestmentMessage(Guid walletId, Pro
6D40
ject project, NostrMessage nostrMessage)
         {
-            return from decrypted in nostrDecrypter.Decrypt(walletId, project.Value.Id, nostrMessage)
+            return 
+                from decrypted in nostrDecrypter.Decrypt(walletId, project.Id, nostrMessage)
                 from signRecoveryRequest in Result.Try(() => serializer.Deserialize<SignRecoveryRequest>(decrypted))
                 select new PendingInvestmentDto(nostrMessage.Created, GetAmount(signRecoveryRequest), nostrMessage.InvestorNostrPubKey);
         }
@@ -69,5 +73,7 @@ private decimal GetAmount(SignRecoveryRequest signRecoveryRequest)
         }
     }
 
-    public record PendingInvestmentDto(DateTime Created, decimal Amount, string InvestorNostrPubKey);
+    public record PendingInvestmentDto(DateTime Created, decimal Amount, string InvestorNostrPubKey)
+    {
+    }
 }
diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Domain/IProjectRepository.cs b/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Domain/IProjectRepository.cs
@@ -6,5 +6,6 @@ public interface IProjectRepository
 {
     Task<Result<Project>> Get(ProjectId id);
     Task<IList<Project>> Latest();
-
+
+    Task<Result<Maybe<Project>>> TryGet(ProjectId projectId);
 }
diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Impl/ProjectAppService.cs b/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Impl/ProjectAppService.cs
@@ -1,14 +1,16 @@
 using Angor.Contests.CrossCutting;
+using Angor.Contexts.Funding.Founder.Operations;
 using Angor.Contexts.Funding.Projects.Application.Dtos;
 using Angor.Contexts.Funding.Projects.Domain;
 using Angor.Contexts.Funding.Projects.Infrastructure.Interfaces;
 using CSharpFunctionalExtensions;
+using MediatR;
 using Zafiro.CSharpFunctionalExtensions;
 
 namespace Angor.Contexts.Funding.Projects.Infrastructure.Impl;
 
 public class ProjectAppService(
-    IProjectRepository projectRepository)
+    IProjectRepository projectRepository, IMediator mediator)
     : IProjectAppService
 {
     [MemoizeTimed]
@@ -23,4 +25,9 @@ public Task<Maybe<ProjectDto>> FindById(ProjectId projectId)
     {
         return projectRepository.Get(projectId).Map(project1 => project1.ToDto()).AsMaybe();
     }
+
+    public Task<Result<IEnumerable<ProjectDto>>> GetFounderProjects(Guid walletId)
+    {
+        return mediator.Send(new GetFounderProjects.GetFounderProjectsRequest(walletId));
+    }
 }
diff --git a/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Impl/ProjectRepository.cs b/src/Angor/Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Impl/ProjectRepository.cs
@@ -15,18 +15,19 @@ public class ProjectRepository(
 {
     public Task<Result<Project>> Get(ProjectId id)
     {
-        return FindById(id);
+        return TryGet(id).Bind(maybe => maybe.ToResult("Project not found"));
     }
 
     public Task<IList<Project>> Latest()
     {
         return ProjectsFrom(indexerService.GetLatest()).ToList().ToTask();
     }
 
-    public async Task<Result<Project>> FindById(ProjectId projectId)
+    public Task<Result<Maybe<Project>>> TryGet(ProjectId projectId)
     {
-        var project = (await indexerService.GetProjectByIdAsync(projectId.Value)).AsMaybe();
-        return await project.Map(async data => await ProjectsFrom(new[] { data }.ToObservable()).FirstAsync()).ToResult($"Project {projectId} not Found");
+        return Result.Try(() => indexerService.GetProjectByIdAsync(projectId.Value))
+            .Map(data => data.AsMaybe())
+            .Map(maybe => maybe.Map(async data => await ProjectsFrom(new[]{ data}.ToObservable())));
     }
 
     private IObservable<Project> ProjectsFrom(IObservable<ProjectIndexerData> projectIndexerDatas)

diff --git a/.../Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Interfaces/IProjectAppService.cs b/.../Avalonia/Angor.Contexts.Funding/Projects/Infrastructure/Interfaces/IProjectAppService.cs
@@ -8,4 +8,5 @@ public interface IProjectAppService
 {
     Task<IList<ProjectDto>> Latest();
     Task<Maybe<ProjectDto>> FindById(ProjectId projectId);
+    Task<Result<IEnumerable<ProjectDto>>> GetFounderProjects(Guid walletId);
 }
diff --git a/src/Angor/Avalonia/AngorApp/AngorApp.csproj b/src/Angor/Avalonia/AngorApp/AngorApp.csproj
@@ -47,6 +47,13 @@
         <ProjectReference Include="..\Angor.Contexts.Wallet\Angor.Contexts.Wallet.csproj" />
         <ProjectReference Include="..\Angor.Contexts.Funding\Angor.Contexts.Funding.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Compile Update="Sections\Founder\Details\FounderProjectDetailsView.axaml.cs">
+        <DependentUpon>FounderProjectDetailsView.axaml</DependentUpon>
+        <SubType>Code</SubType>
+      </Compile>
+    </ItemGroup>
 
 
 </Project>
diff --git a/src/Angor/Avalonia/AngorApp/Composition/Registrations/ViewModels.cs b/src/Angor/Avalonia/AngorApp/Composition/Registrations/ViewModels.cs
@@ -1,5 +1,7 @@
+using Angor.Contexts.Funding.Projects.Application.Dtos;
 using AngorApp.Sections.Browse;
 using AngorApp.Sections.Founder;
+using AngorApp.Sections.Founder.Details;
 using AngorApp.Sections.Home;
 using AngorApp.Sections.Portfolio;
 using AngorApp.Sections.Shell;
@@ -16,9 +18,11 @@ public static IServiceCollection Register(this IServiceCollection services)
             .AddTransient<Lazy<IMainViewModel>>(sp => new Lazy<IMainViewModel>(sp.GetRequiredService<IMainViewModel>))
             .AddTransient<IHomeSectionViewModel, HomeSectionViewModel>()
             .AddTransient<IWalletSectionViewModel, WalletSectionViewModel>()
-            .AddTransient<IBrowseSectionViewModel, BrowseSectionViewModel>()
+            .AddScoped<IBrowseSectionViewModel, BrowseSectionViewModel>()
             .AddTransient<IPortfolioSectionViewModel, PortfolioSectionViewModel>()
             .AddTransient<IFounderSectionViewModel, FounderSectionViewModel>()
+            .AddScoped<Func<ProjectDto, IFounderProjectViewModel>>(provider => dto => ActivatorUtilities.CreateInstance<FounderProjectViewModel>(provider, dto))
+            .AddScoped<Func<ProjectDto, IFounderProjectDetailsViewModel>>(provider => dto => ActivatorUtilities.CreateInstance<FounderProjectDetailsViewModel>(provider, dto))
             .AddTransient<IMainViewModel, MainViewModel>();
     }
 }
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Browse/BrowseSectionViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Browse/BrowseSectionViewModel.cs
@@ -1,12 +1,9 @@
-using System.Windows.Input;
 using Angor.Contexts.Funding.Projects.Infrastructure.Interfaces;
 using Angor.Contexts.Wallet.Application;
 using AngorApp.Features.Invest;
-using AngorApp.Sections.Browse.Details;
 using AngorApp.Sections.Browse.ProjectLookup;
 using AngorApp.UI.Services;
 using ReactiveUI.SourceGenerators;
-using Zafiro.Avalonia.Controls.Navigation;
 using Zafiro.Reactive;
 using Zafiro.UI.Navigation;
 

diff --git a/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsView.axaml b/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsView.axaml
@@ -0,0 +1,50 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:c="clr-namespace:Zafiro.Avalonia.Controls;assembly=Zafiro.Avalonia"
+             xmlns:sdg="clr-namespace:Zafiro.Avalonia.Controls.SlimDataGrid;assembly=Zafiro.Avalonia"
+             xmlns:angorApp="clr-namespace:AngorApp"
+             xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
+             xmlns:controls="clr-namespace:AngorApp.UI.Controls"
+             xmlns:pt="https://github.com/projektanker/icons.avalonia"
+             xmlns:details="clr-namespace:AngorApp.Sections.Founder.Details"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="AngorApp.Sections.Founder.Details.FounderProjectDetailsView" x:DataType="details:IFounderProjectDetailsViewModel">
+
+    <Design.DataContext>
+        <details:FounderProjectDetailsViewModelDesign BannerUrl="https://images-assets.nasa.gov/image/PIA05062/PIA05062~thumb.jpg" />
+    </Design.DataContext>
+
+    <Interaction.Behaviors>
+        <DataContextChangedTrigger>
+            <InvokeCommandAction Command="{Binding LoadPendingInvestments}" />
+        </DataContextChangedTrigger>
+    </Interaction.Behaviors>
+
+    <StackPanel Spacing="10">
+        <controls:Pane Padding="0" CornerRadius="20">
+            <StackPanel>
+                <asyncImageLoader:AdvancedImage CornerRadius="20 20 0 0" Height="200" Stretch="UniformToFill" Source="{Binding BannerUrl}" />
+                <StackPanel Margin="20" Spacing="10">
+                    <TextBlock Classes="SizeBig" Text="{Binding Name}" />
+                    <TextBlock TextWrapping="Wrap" Text="{Binding ShortDescription}" />
+                </StackPanel>
+            </StackPanel>
+        </controls:Pane>
+        <controls:Pane Title="Investments pending approval" IsTitleVisible="True">
+            <controls:Pane.TitleRightContent>
+                <Button pt:Attached.Icon="fa-rotate-right" Command="{Binding LoadPendingInvestments}" />
+            </controls:Pane.TitleRightContent>
+            <c:Loading IsLoading="{Binding LoadPendingInvestments.IsExecuting^}">
+                <sdg:SlimDataGrid Margin="0 10" ItemsSource="{Binding PendingInvestments}">
+                    <sdg:SlimDataGrid.Columns>
+                        <sdg:Column Header="Amount" Binding="{Binding Amount}" />
+                        <sdg:Column Header="NPub" Binding="{Binding InvestorNostrPubKey}" />
+                        <sdg:Column Header="Date" Binding="{Binding Created}" />
+                    </sdg:SlimDataGrid.Columns>
+                </sdg:SlimDataGrid>
+            </c:Loading>
+        </controls:Pane>
+    </StackPanel>
+</UserControl>
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsView.axaml.cs b/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsView.axaml.cs
@@ -0,0 +1,9 @@
+namespace AngorApp.Sections.Founder.Details;
+
+public partial class FounderProjectDetailsView : UserControl
+{
+    public FounderProjectDetailsView()
+    {
+        InitializeComponent();
+    }
+}
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsViewModel.cs
@@ -0,0 +1,41 @@
+using Angor.Contexts.Funding.Founder.Operations;
+using Angor.Contexts.Funding.Investor;
+using Angor.Contexts.Funding.Projects.Application.Dtos;
+using AngorApp.UI.Services;
+using DynamicData;
+using Zafiro.CSharpFunctionalExtensions;
+using Zafiro.UI;
+
+namespace AngorApp.Sections.Founder.Details;
+
+public class FounderProjectDetailsViewModel : IFounderProjectDetailsViewModel
+{
+    private readonly ProjectDto projectDto;
+
+    public FounderProjectDetailsViewModel(ProjectDto projectDto, IInvestmentAppService investmentAppService, UIServices uiServices)
+    {
+        this.projectDto = projectDto;
+        LoadPendingInvestments = ReactiveCommand.CreateFromTask(token =>
+        {
+            return uiServices.WalletRoot.GetDefaultWalletAndActivate()
+                .Bind(maybe => maybe.ToResult("You need to create a wallet first"))
+                .Bind(wallet => investmentAppService.GetPendingInvestments(wallet.Id.Value, projectDto.Id));
+        });
+
+        LoadPendingInvestments.HandleErrorsWith(uiServices.NotificationService, "Failed to get pending investments");
+
+        LoadPendingInvestments.Successes()
+            .EditDiff(dto => dto)
+            .Bind(out var pendingInvestments)
+            .Subscribe();
+
+        PendingInvestments = pendingInvestments;
+    }
+
+    public IEnumerable<GetPendingInvestments.PendingInvestmentDto> PendingInvestments { get; }
+
+    public ReactiveCommand<Unit, Result<IEnumerable<GetPendingInvestments.PendingInvestmentDto>>> LoadPendingInvestments { get; }
+    public Uri? BannerUrl => projectDto.Banner;
+    public string ShortDescription => projectDto.ShortDescription;
+    public string Name => projectDto.Name;
+}
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsViewModelDesign.cs b/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/FounderProjectDetailsViewModelDesign.cs
@@ -0,0 +1,19 @@
+using Angor.Contexts.Funding.Founder.Operations;
+
+namespace AngorApp.Sections.Founder.Details;
+
+public class FounderProjectDetailsViewModelDesign : IFounderProjectDetailsViewModel
+{
+    public string Name { get; } = "Test";
+
+    public IEnumerable<GetPendingInvestments.PendingInvestmentDto> PendingInvestments { get; } = new List<GetPendingInvestments.PendingInvestmentDto>()
+    {
+        new(DateTime.Now, 1234, "nostr pub key"),
+        new(DateTime.Now.AddHours(-2), 1233, "nostr pub key"),
+        new(DateTime.Now.AddHours(-4), 1235, "nostr pub key"),
+    };
+
+    public ReactiveCommand<Unit, Result<IEnumerable<GetPendingInvestments.PendingInvestmentDto>>> LoadPendingInvestments { get; }
+    public Uri? BannerUrl { get; set; }
+    public string ShortDescription { get; } = "Short description, Bitcoin ONLY.";
+}
diff --git a/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/IFounderProjectDetailsViewModel.cs b/src/Angor/Avalonia/AngorApp/Sections/Founder/Details/IFounderProjectDetailsViewModel.cs
@@ -0,0 +1,12 @@
+using Angor.Contexts.Funding.Founder.Operations;
+
+namespace AngorApp.Sections.Founder.Details;
+
+public interface IFounderProjectDetailsViewModel
+{
+    public string Name { get; }
+    public IEnumerable<GetPendingInvestments.PendingInvestmentDto> PendingInvestments { get; }
+    ReactiveCommand<Unit, Result<IEnumerable<GetPendingInvestments.PendingInvestmentDto>>> LoadPendingInvestments { get; }
+    public Uri? BannerUrl { get; }
+    public string ShortDescription { get; }
+}