From 1aaae711e64cda0b3d2ddf8eb0a9de2c25bc4db1 Mon Sep 17 00:00:00 2001
From: itailiors <78041027+itailiors@users.noreply.github.com>
Date: Mon, 4 Nov 2024 22:49:19 +0200
Subject: [PATCH] fix bug and polish

---
 src/Angor/Client/Pages/View.razor         | 178 +++++++++++++---------
 src/Angor/Client/Storage/ClientStorage.cs | 162 +++++++++-----------
 2 files changed, 176 insertions(+), 164 deletions(-)

diff --git a/src/Angor/Client/Pages/View.razor b/src/Angor/Client/Pages/View.razor
index 97ef5d18..a0641c04 100644
--- a/src/Angor/Client/Pages/View.razor
+++ b/src/Angor/Client/Pages/View.razor
@@ -153,11 +153,9 @@ else
                         @if (projectStats.Loading)
                         {
                             <div class="loader"></div>
-                            @project?.CreationTransactionId
                         }
                         else
                         {
-                            @project?.CreationTransactionId
                             <div class="form-control mt-1 d-flex align-items-center">
                                 <Icon IconName="calculator"></Icon>
                                 <p class="card-text ms-2">Total Raised: @Money.Satoshis(projectStats.TotalRaised).ToUnit(MoneyUnit.BTC) @network.CoinTicker</p>
@@ -170,14 +168,19 @@ else
                             <div class="form-control mt-1 d-flex align-items-center">
                                 <Icon IconName="calendar"></Icon>
                                 <p class="card-text ms-2">
-                                    @if (projectStats.TimeLeft > 0)
+                                    @{
+                                        var daysLeft = (project.ProjectInfo.StartDate - DateTime.UtcNow).Days;
+                                    }
+
+                                    @if (daysLeft >= 0)
                                     {
-                                        <span>Time Left for Investing: @projectStats.TimeLeft days</span>
+                                        <span>Time Left for Investing: @daysLeft days</span>
                                     }
                                     else
                                     {
                                         <span>The investing period is over</span>
                                     }
+
                                 </p>
                             </div>
                         }
@@ -297,11 +300,14 @@ else
                 <p class="mt-4">
                     Seize the opportunity to invest in this project.
                 </p>
+                @{
+                    var timeLeft = (project.ProjectInfo.StartDate - DateTime.UtcNow).Days;
+                }
                 <button class="btn btn-border mb-3" data-cy="INVEST_BUTTON"
                         @onclick="InvestInProject"
-                        disabled="@(projectStats.TimeLeft == 0 ? "disabled" : null)"
-                        title="@(projectStats.TimeLeft == 0 ? "The investing period is over" : null)">
-                    @if (projectStats.TimeLeft > 0)
+                        disabled="@(timeLeft <= 0 ? "disabled" : null)"
+                        title="@(timeLeft <= 0 ? "The investing period is over" : null)">
+                    @if (timeLeft > 0)
                     {
                         <text>Invest Now</text>
                     }
@@ -463,99 +469,111 @@ else
 
     protected override async Task OnInitializedAsync()
     {
-        // Set up default Nostr clients
-        NostrClients = _NetworkConfiguration.GetDefaultRelayUrls().Select(_ => _.Url.ToString()).ToList();
-
-        // Check for the project in local storage first
-        project = storage.GetFounderProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId);
+        projectStats.Loading = true;
+        findInProgress = false;
+        error = string.Empty;
 
-        if (project != null)
+        try
         {
-            founder = true;
-            projectStats.Loading = false; // Stop loading spinner as data is found locally
+            NostrClients = _NetworkConfiguration.GetDefaultRelayUrls().Select(_ => _.Url.ToString()).ToList();
 
-            // Check if CreationTransactionId is set; if not, notify the user
-            if (!string.IsNullOrEmpty(project.CreationTransactionId))
+            project = storage.GetFounderProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId);
+            if (project != null)
             {
-                projectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{project.CreationTransactionId}";
+                founder = true;
+                projectStats.Loading = false;
+                SetProjectLinksAndRefreshBalance();
+                return;
             }
-            else
+
+            project = storage.GetInvestmentProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId);
+            if (project is InvestorProject investorProject)
             {
-                error = "Project created; awaiting confirmation. Check back shortly.";
+                invested = investorProject.InvestedInProject();
+                myProjectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{investorProject.TransactionId}";
+                projectStats.Loading = false;
+                SetProjectLinksAndRefreshBalance();
+                return;
             }
 
-            await RefreshBalance(); // Optionally refresh balance
-            StateHasChanged();
-            return; // Data is ready; no need to proceed further
-        }
-
-        // Check for an investor project if not found as a founder project
-        project = storage.GetInvestmentProjects().FirstOrDefault(p => p.ProjectInfo.ProjectIdentifier == ProjectId);
-
-        if (project is InvestorProject findProject)
-        {
-            invested = findProject.InvestedInProject();
-            myProjectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{findProject.TransactionId}";
-            projectStats.Loading = false; // Stop loading spinner as data is found
-            await RefreshBalance();
-            StateHasChanged();
-            return;
-        }
-
-        // If project is not found in local storage, proceed with session storage and indexer fallback
-        project = SessionStorage.GetProjectById(ProjectId);
+            project = SessionStorage.GetProjectById(ProjectId);
+            if (project != null)
+            {
+                projectStats.Loading = false;
+                StateHasChanged();
+                return;
+            }
 
-        if (project == null)
-        {
             findInProgress = true;
-
-            // Attempt to retrieve project data from the indexer
             var projectIndexerData = await _IndexerService.GetProjectByIdAsync(ProjectId);
 
             if (projectIndexerData != null)
             {
                 project = new Project { CreationTransactionId = projectIndexerData.TrxId };
-                _RelayService.RequestProjectCreateEventsByPubKey(e =>
-                {
-                    if (project != null)
+
+                _RelayService.RequestProjectCreateEventsByPubKey(
+                    e =>
                     {
-                        switch (e)
+                        if (project != null)
                         {
-                            case { Kind: NostrKind.Metadata }:
-                                var nostrMetadata = serializer.Deserialize<ProjectMetadata>(e.Content);
-                                project.Metadata ??= nostrMetadata;
-                                break;
-                            case { Kind: NostrKind.ApplicationSpecificData }:
-                                var projectInfo = serializer.Deserialize<ProjectInfo>(e.Content);
-                                project.ProjectInfo ??= projectInfo;
-                                break;
+                            switch (e)
+                            {
+                                case { Kind: NostrKind.Metadata }:
+                                    project.Metadata ??= serializer.Deserialize<ProjectMetadata>(e.Content);
+                                    break;
+                                case { Kind: NostrKind.ApplicationSpecificData }:
+                                    project.ProjectInfo ??= serializer.Deserialize<ProjectInfo>(e.Content);
+                                    break;
+                            }
                         }
-                    }
-                }, () =>
-                {
-                    findInProgress = false;
-                    projectStats.Loading = false; // Stop loading spinner once data is available
-
-                    if (project?.ProjectInfo != null)
-                    {
-                        SessionStorage.StoreProject(project);
-                    }
-                    else
+                    },
+                    () =>
                     {
-                        error = "Project not found...";
-                    }
+                        findInProgress = false;
+                        projectStats.Loading = false;
 
-                    StateHasChanged();
-                }, projectIndexerData.NostrPubKey);
+                        if (project?.ProjectInfo != null)
+                        {
+                            SessionStorage.StoreProject(project);
+                        }
+                        else
+                        {
+                            error = "Project not found...";
+                        }
+
+                        StateHasChanged();
+                    },
+                    projectIndexerData.NostrPubKey);
             }
             else
             {
                 findInProgress = false;
+                projectStats.Loading = false;
                 error = "Project not found...";
-                projectStats.Loading = false; // Stop loading spinner as no data is found
                 StateHasChanged();
             }
         }
+        catch (Exception ex)
+        {
+            error = $"An error occurred: {ex.Message}";
+            projectStats.Loading = false;
+            StateHasChanged();
+        }
+    }
+
+    private async Task SetProjectLinksAndRefreshBalance()
+    {
+        if (!string.IsNullOrEmpty(project?.CreationTransactionId))
+        {
+            projectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{project.CreationTransactionId}";
+        }
+        else
+        {
+            error = "Project created; awaiting confirmation. Check back shortly.";
+        }
+
+        await RefreshBalance();
+        StateHasChanged();
     }
 
 
@@ -574,10 +592,19 @@ else
                     projectStats.TotalInvestors = (int)data.InvestorCount;
                     projectStats.TotalRaised = data.AmountInvested;
 
-                    projectStats.TimeLeft = (project.ProjectInfo.StartDate - DateTime.UtcNow).Days;
-                    if (projectStats.TimeLeft < 0)
-                        projectStats.TimeLeft = 0;
+                    // Calculate time left based on the project start and expiry dates
+                    if (DateTime.UtcNow < project.ProjectInfo.StartDate)
+                    {
+                        // Project has not started yet, so time left is until the start date
+                        projectStats.TimeLeft = (project.ProjectInfo.StartDate - DateTime.UtcNow).Days;
+                    }
+                    else
+                    {
+                        // Project has expired
+                        projectStats.TimeLeft = 0; // Ensure no negative time left
+                    }
 
+                    // Calculate funding progress as a percentage of the target amount
                     var targetSat = Money.Coins(project.ProjectInfo.TargetAmount).Satoshi;
                     projectStats.FundingProgressPercent = (int)(projectStats.TotalRaised * 100 / targetSat);
                 }
@@ -590,6 +617,7 @@ else
         finally
         {
             projectStats.Loading = false;
+            StateHasChanged();
         }
     }
 
diff --git a/src/Angor/Client/Storage/ClientStorage.cs b/src/Angor/Client/Storage/ClientStorage.cs
index ffd03f50..dede6846 100644
--- a/src/Angor/Client/Storage/ClientStorage.cs
+++ b/src/Angor/Client/Storage/ClientStorage.cs
@@ -2,45 +2,41 @@
 using Angor.Shared;
 using Angor.Shared.Models;
 using Blazored.LocalStorage;
-using Blazored.SessionStorage;
 
 namespace Angor.Client.Storage;
 
 public class ClientStorage : IClientStorage, INetworkStorage
 {
-    private readonly ISyncLocalStorageService _storage;
-    
     private const string CurrencyDisplaySettingKey = "currencyDisplaySetting";
-    
+
     private const string utxoKey = "utxo:{0}";
+    private readonly ISyncLocalStorageService _storage;
+
     public ClientStorage(ISyncLocalStorageService storage)
     {
         _storage = storage;
     }
-    
+
     public AccountInfo GetAccountInfo(string network)
     {
-        return _storage.GetItem<AccountInfo>(string.Format(utxoKey,network));
+        return _storage.GetItem<AccountInfo>(string.Format(utxoKey, network));
     }
-        
+
     public void SetAccountInfo(string network, AccountInfo items)
     {
-        _storage.SetItem(string.Format(utxoKey,network), items);
+        _storage.SetItem(string.Format(utxoKey, network), items);
     }
 
     public void DeleteAccountInfo(string network)
     {
-        _storage.RemoveItem(string.Format(utxoKey,network));
+        _storage.RemoveItem(string.Format(utxoKey, network));
     }
 
     public void AddInvestmentProject(InvestorProject project)
     {
         var ret = GetInvestmentProjects();
 
-        if (ret.Any(a => a.ProjectInfo?.ProjectIdentifier == project.ProjectInfo.ProjectIdentifier))
-        {
-            return;
-        }
+        if (ret.Any(a => a.ProjectInfo?.ProjectIdentifier == project.ProjectInfo.ProjectIdentifier)) return;
 
         ret.Add(project);
 
@@ -53,7 +49,7 @@ public void UpdateInvestmentProject(InvestorProject project)
 
         var item = ret.First(_ => _.ProjectInfo?.ProjectIdentifier == project.ProjectInfo.ProjectIdentifier);
 
-        if(!ret.Remove(item)) 
+        if (!ret.Remove(item))
             throw new InvalidOperationException();
 
         ret.Add(project);
@@ -61,8 +57,6 @@ public void UpdateInvestmentProject(InvestorProject project)
         _storage.SetItem("projects", ret);
     }
 
-    
-    
 
     public void RemoveInvestmentProject(string projectId)
     {
@@ -75,14 +69,9 @@ public void RemoveInvestmentProject(string projectId)
         _storage.SetItem("projects", ret);
     }
 
-    public void DeleteInvestmentProjects()
-    {
-        _storage.RemoveItem("projects");
-    }
-
     public List<InvestorProject> GetInvestmentProjects()
     {
-        var ret =  _storage.GetItem<List<InvestorProject>>("projects");
+        var ret = _storage.GetItem<List<InvestorProject>>("projects");
 
         return ret ?? new List<InvestorProject>();
     }
@@ -95,7 +84,7 @@ public void AddFounderProject(params FounderProject[] projects)
 
         _storage.SetItem("founder-projects", ret.OrderBy(_ => _.ProjectIndex));
     }
-    
+
     public List<FounderProject> GetFounderProjects()
     {
         var ret = _storage.GetItem<List<FounderProject>>("founder-projects");
@@ -113,16 +102,14 @@ public List<FounderProject> GetFounderProjects()
     public void UpdateFounderProject(FounderProject project)
     {
         var projects = _storage.GetItem<List<FounderProject>>("founder-projects");
-        
-        var item = projects.FirstOrDefault(f => f.ProjectInfo.ProjectIdentifier == project.ProjectInfo.ProjectIdentifier);
-
-        if (item != null)
-        {
-            projects.Remove(item);   
-        }
-        
+
+        var item = projects.FirstOrDefault(
+            f => f.ProjectInfo.ProjectIdentifier == project.ProjectInfo.ProjectIdentifier);
+
+        if (item != null) projects.Remove(item);
+
         projects.Add(project);
-        
+
         _storage.SetItem("founder-projects", projects.OrderBy(_ => _.ProjectIndex));
     }
 
@@ -131,64 +118,41 @@ public void DeleteFounderProjects()
         _storage.RemoveItem("founder-projects");
     }
 
-    public void AddOrUpdateSignatures(SignatureInfo signatureInfo)
+    public SettingsInfo GetSettingsInfo()
     {
-        var ret = GetSignatures();
-
-        var item = ret.FirstOrDefault(f => f.ProjectIdentifier == signatureInfo.ProjectIdentifier);
-
-        if (item != null)
-        {
-            ret.Remove(item);
-        }
-
-        ret.Add(signatureInfo);
+        var ret = _storage.GetItem<SettingsInfo>("settings-info");
 
-        _storage.SetItem("recovery-signatures", ret);
+        return ret ?? new SettingsInfo();
     }
 
-    public List<SignatureInfo> GetSignatures()
+    public void SetSettingsInfo(SettingsInfo settingsInfo)
     {
-        var ret = _storage.GetItem<List<SignatureInfo>>("recovery-signatures");
-
-        return ret ?? new List<SignatureInfo>();
+        _storage.SetItem("settings-info", settingsInfo);
     }
 
-    public void RemoveSignatures(SignatureInfo signatureInfo)
+    public void WipeStorage()
     {
-        var ret = GetSignatures();
-
-        var item = ret.FirstOrDefault(f => f.ProjectIdentifier == signatureInfo.ProjectIdentifier);
-
-        if (item != null)
-        {
-            ret.Remove(item);
-        }
-
-        _storage.SetItem("recovery-signatures", ret);
+        _storage.Clear();
     }
 
-    public void DeleteSignatures()
+    public void SetNostrPublicKeyPerProject(string projectId, string nostrPubKey)
     {
-        // signatures are valuable to have so to avoid losing them forever 
-        // we just store them in new entry we will lever use again.
-        var sigs = GetSignatures();
-        _storage.SetItem($"recovery-signatures-{DateTime.UtcNow.Ticks}", sigs);
-
-        _storage.RemoveItem("recovery-signatures");
+        _storage.SetItem($"project:{projectId}:nostrKey", nostrPubKey);
     }
 
-    public SettingsInfo GetSettingsInfo()
+    public string GetNostrPublicKeyPerProject(string projectId)
     {
-        var ret = _storage.GetItem<SettingsInfo>("settings-info");
-
-        return ret ?? new SettingsInfo();
+        return _storage.GetItem<string>($"project:{projectId}:nostrKey");
+    }
 
+    public string GetCurrencyDisplaySetting()
+    {
+        return _storage.GetItem<string>(CurrencyDisplaySettingKey) ?? "BTC";
     }
 
-    public void SetSettingsInfo(SettingsInfo settingsInfo)
+    public void SetCurrencyDisplaySetting(string setting)
     {
-        _storage.SetItem("settings-info", settingsInfo);
+        _storage.SetItem(CurrencyDisplaySettingKey, setting);
     }
 
     public SettingsInfo GetSettings()
@@ -201,39 +165,59 @@ public void SetSettings(SettingsInfo settingsInfo)
         SetSettingsInfo(settingsInfo);
     }
 
-    public void WipeStorage()
-    {
-        _storage.Clear();
-    }
-
     public void SetNetwork(string network)
     {
         _storage.SetItem("network", network);
-
     }
 
     public string GetNetwork()
     {
         return _storage.GetItem<string>("network");
     }
-    
-    public void SetNostrPublicKeyPerProject(string projectId,string nostrPubKey)
+
+    public void DeleteInvestmentProjects()
     {
-        _storage.SetItem($"project:{projectId}:nostrKey", nostrPubKey);
+        _storage.RemoveItem("projects");
     }
-    
-    public string GetNostrPublicKeyPerProject(string projectId)
+
+    public void AddOrUpdateSignatures(SignatureInfo signatureInfo)
     {
-        return _storage.GetItem<string>($"project:{projectId}:nostrKey");
+        var ret = GetSignatures();
+
+        var item = ret.FirstOrDefault(f => f.ProjectIdentifier == signatureInfo.ProjectIdentifier);
+
+        if (item != null) ret.Remove(item);
+
+        ret.Add(signatureInfo);
+
+        _storage.SetItem("recovery-signatures", ret);
     }
-    
-    public string GetCurrencyDisplaySetting()
+
+    public List<SignatureInfo> GetSignatures()
     {
-        return _storage.GetItem<string>(CurrencyDisplaySettingKey) ?? "BTC";
+        var ret = _storage.GetItem<List<SignatureInfo>>("recovery-signatures");
+
+        return ret ?? new List<SignatureInfo>();
     }
 
-    public void SetCurrencyDisplaySetting(string setting)
+    public void RemoveSignatures(SignatureInfo signatureInfo)
     {
-        _storage.SetItem(CurrencyDisplaySettingKey, setting);
+        var ret = GetSignatures();
+
+        var item = ret.FirstOrDefault(f => f.ProjectIdentifier == signatureInfo.ProjectIdentifier);
+
+        if (item != null) ret.Remove(item);
+
+        _storage.SetItem("recovery-signatures", ret);
+    }
+
+    public void DeleteSignatures()
+    {
+        // signatures are valuable to have so to avoid losing them forever 
+        // we just store them in new entry we will lever use again.
+        var sigs = GetSignatures();
+        _storage.SetItem($"recovery-signatures-{DateTime.UtcNow.Ticks}", sigs);
+
+        _storage.RemoveItem("recovery-signatures");
     }
 }
\ No newline at end of file