diff --git a/src/Angor/Client/Models/InvestmentState.cs b/src/Angor/Client/Models/InvestmentState.cs index c7ac4191c..8db6ac750 100644 --- a/src/Angor/Client/Models/InvestmentState.cs +++ b/src/Angor/Client/Models/InvestmentState.cs @@ -4,7 +4,7 @@ public class InvestmentState { public string ProjectIdentifier { get; set; } public string InvestmentTransactionHash { get; set; } - public string investorPubKey { get; set; } - public string ReleaseAddress { get; set; } + public string InvestorPubKey { get; set; } + public string UnfundedReleaseAddress { get; set; } } \ No newline at end of file diff --git a/src/Angor/Client/Pages/Browse.razor b/src/Angor/Client/Pages/Browse.razor index a1064d5ab..8acad18c3 100644 --- a/src/Angor/Client/Pages/Browse.razor +++ b/src/Angor/Client/Pages/Browse.razor @@ -154,12 +154,12 @@ else } else { -
+
@foreach (var indexerData in projects.OrderByDescending(project => project.CreatedOnBlock)) { -
-
+
+
} -
-
-
+
+
+
- - + + -
-
+
+
Create New Project
@@ -56,12 +57,12 @@
-
+
-
-
+
@@ -74,8 +75,8 @@
-
-
+
@@ -88,8 +89,8 @@
-
-
+
@@ -106,38 +107,43 @@ -
+
@if (activeTab == 1) { -
+
+ -
- - -
-
- - -
+
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - +
+ + +
+ +
+ + +
-
+ +
+
+ + @if (isPresetMode) { - Switch to Manual Helper + +
+ + +
} else { - Switch to Presets + +
+ + +
+
+ + +
+ } - -
- - - @if (isPresetMode) - { - -
- - -
- } - else - { - -
- - -
-
- - -
- - } - -

Stages

- @foreach (var stage in project.ProjectInfo.Stages) - { -
- -
- - - -
- @if (project.ProjectInfo.Stages.IndexOf(stage) > 0) - { - var previousStage = project.ProjectInfo.Stages[project.ProjectInfo.Stages.IndexOf(stage) - 1]; - var daysBetween = (stage.ReleaseDate - previousStage.ReleaseDate).Days; -

Days since last stage: @daysBetween days

- } -
- } - + +

Stages

+ @foreach (var stage in project.ProjectInfo.Stages) + { +
+ +
+ + + +
+ @if (project.ProjectInfo.Stages.IndexOf(stage) > 0) + { + var previousStage = project.ProjectInfo.Stages[project.ProjectInfo.Stages.IndexOf(stage) - 1]; + var daysBetween = (stage.ReleaseDate - previousStage.ReleaseDate).Days; +

Days since last stage: @daysBetween days

+ } +
+ } - -
-
- +
- +
+
+ + + +
-
- + +
} @if (activeTab == 3) { -
- -

- Project Name: @project.Metadata.Name -

-
-
- -

- Project About: @((MarkupString)project.Metadata.About) -

-
-
- -

- Project Identifier: @project.ProjectInfo.ProjectIdentifier -

-
-
- -

Founder Key: @project.ProjectInfo.FounderKey.Substring(0, 10)...

-
-
- -

- Target amount: @targetAmountInBTC @network.CoinTicker -

-
-
- -

Start date: @project.ProjectInfo.StartDate.ToString("dd/MM/yyyy") in @((project.ProjectInfo.StartDate - DateTime.Now).Days) days

-
-
- -

Expiry date: @project.ProjectInfo.ExpiryDate.ToString("dd/MM/yyyy") in @((project.ProjectInfo.ExpiryDate - DateTime.Now).Days) days

-
-
- -

Penalty days: @project.ProjectInfo.PenaltyDays days

-
+
-
Stages
+
Project Information
- @foreach (var stage in project.ProjectInfo.Stages) - { -
-
- -

Stage Percent: @stage.AmountToRelease %

-
-
- -

Stage Date: @stage.ReleaseDate.ToString("dd/MM/yyyy") - @((stage.ReleaseDate - project.ProjectInfo.StartDate).Days) days after project starts

-
+
+ @foreach (var info in GetProjectInfoData()) + { +
+
+
+
+
@info.Label
+
@info.Value
+
+
+ +
+
+
+
+ }
- } -
-
Current Step
-
- @GetProgressMessage() +
+ @foreach (var info in GetAdditionalProjectInfo()) + { +
+
+
+
+
@info.Label
+
@info.Value
+
+
+ +
+
+
+
+ }
- - +
- -
+
+
Current Step
+
+ @GetProgressMessage() +
+ +
+ + + + + +
+
+ +
- } + @code { + private IEnumerable<(string IconName, string Label, string Value)> GetProjectInfoData() + { + return new List<(string, string, string)> + { + ("name", "Project Name", project.Metadata.Name), + ("about", "Project About", ((MarkupString)project.Metadata.About).ToString()), + ("identifier", "Project Identifier", project.ProjectInfo.ProjectIdentifier), + ("key", "Founder Key", project.ProjectInfo.FounderKey) + }; + } -@if (showCreateModal) -{ - -
-
-
+ private IEnumerable<(string IconName, string Label, string Value, string color)> GetAdditionalProjectInfo() + { + return new List<(string, string, string, string)> + { + ("balance", "Target amount", $"{targetAmountInBTC} {network.CoinTicker}","text-success"), + ("calendar", "Start date", $"{project.ProjectInfo.StartDate:dd/MM/yyyy} in {(project.ProjectInfo.StartDate - DateTime.Now).Days} days","text-warning"), + ("calendar", "Expiry date", $"{project.ProjectInfo.ExpiryDate:dd/MM/yyyy} in {(project.ProjectInfo.ExpiryDate - DateTime.Now).Days} days","text-warning"), + ("sad-circle", "Penalty days", $"{project.ProjectInfo.PenaltyDays} days","text-warning") + }; + } + } + } -
-
Confirmation
- - - -
+ + @if (showCreateModal) + { +
+
+
+
+
+
+ +
Confirmation
+
+ +
@@ -553,9 +605,11 @@
} -
+
+ } +
@code { private bool sendConfirmModal; @@ -574,14 +628,14 @@ private readonly FeeData feeData = new(); private FounderProject project = new(); - + private readonly Dictionary presets = new() { { "preset1", (new[] { 10, 30, 60 }, 10) }, { "preset2", (new[] { 25, 25, 25, 25 }, 10) }, { "preset3", (new[] { 60, 20, 20 }, 15) } }; - + private decimal targetAmountInBTC { get => Money.Satoshis(project.ProjectInfo.TargetAmount).ToUnit(MoneyUnit.BTC); @@ -589,7 +643,7 @@ } private int activeTab = 1; - + private int totalDuration; private int numberOfStages; private bool isValid = true; @@ -644,9 +698,9 @@ // check if the project was already published to nostr nostrMetadataCreated = project.NostrProfileCreated; nostrApplicationSpecificDataCreated = !string.IsNullOrEmpty(project.ProjectInfoEventId); - + // Select a preset - if(!project.ProjectInfo.Stages.Any()) + if (!project.ProjectInfo.Stages.Any()) { isPresetMode = true; OnStagePresetChange(new ChangeEventArgs { Value = "preset1" }); @@ -738,7 +792,7 @@ } else { - await CreatNostrProfile(); + await CreatNostrProfile(); } } @@ -754,7 +808,7 @@ var nostrKey = _derivationOperations.DeriveProjectNostrPrivateKey(words, project.ProjectIndex); var resultId = await _RelayService.CreateNostrProfileAsync( - project.Metadata.ToNostrMetadata(), + project.Metadata.ToNostrMetadata(), NBitcoin.DataEncoders.Encoders.Hex.EncodeData(nostrKey.ToBytes()), _ => { @@ -890,7 +944,7 @@ catch (Exception e) { _Logger.LogError(e, e.Message); - notificationComponent.ShowErrorMessage(e.Message,e); + notificationComponent.ShowErrorMessage(e.Message, e); } finally { @@ -898,7 +952,7 @@ StateHasChanged(); } } - + private async Task FeeRangeChanged(ChangeEventArgs e) { var selected = e.Value?.ToString(); @@ -962,7 +1016,7 @@ } catch (Exception e) { - notificationComponent.ShowErrorMessage(e.Message,e); + notificationComponent.ShowErrorMessage(e.Message, e); } finally { @@ -1073,10 +1127,10 @@ return false; } - if (project.ProjectInfo.TargetAmount < (decimal)0.1) + if (targetAmountInBTC < (decimal)0.1) { // temporary limit to not allow users to put too much in an Angor contract - + notificationComponent.ShowErrorMessage("Project target amount must be higher than 0.1 BTC"); return false; } @@ -1142,7 +1196,7 @@ // If all checks pass, return true return true; } - + private List GenerateStages(int[] percentages, int intervalDays) { var stages = new List(); @@ -1151,10 +1205,10 @@ for (int i = 0; i < percentages.Length; i++) { stages.Add(new Stage - { - AmountToRelease = percentages[i], - ReleaseDate = currentDate - }); + { + AmountToRelease = percentages[i], + ReleaseDate = currentDate + }); if (i > 0) { @@ -1167,7 +1221,7 @@ return stages; } - + private void GenerateSmartStages() { if (totalDuration <= 0 || numberOfStages <= 0) @@ -1184,10 +1238,10 @@ for (int i = 0; i < numberOfStages; i++) { project.ProjectInfo.Stages.Add(new Stage - { - AmountToRelease = stagePercentage, - ReleaseDate = project.ProjectInfo.StartDate.AddDays(i * stageDuration) - }); + { + AmountToRelease = stagePercentage, + ReleaseDate = project.ProjectInfo.StartDate.AddDays(i * stageDuration) + }); } StateHasChanged(); @@ -1198,7 +1252,7 @@ isPresetMode = !isPresetMode; // Toggle between Presets and Automatic StateHasChanged(); // Update the UI } - + private readonly string[] spacePhotos = new[] { "https://images-assets.nasa.gov/image/hubble-observes-one-of-a-kind-star-nicknamed-nasty_17754652960_o/hubble-observes-one-of-a-kind-star-nicknamed-nasty_17754652960_o~thumb.jpg?as=webp", @@ -1219,7 +1273,7 @@ "https://images-assets.nasa.gov/image/GSFC_20171208_Archive_e002020/GSFC_20171208_Archive_e002020~thumb.jpg?as=webp", "https://images-assets.nasa.gov/image/0203048/0203048~thumb.jpg?as=webp" }; - + private FounderProject CreateDefaultProject(FounderKeys projectsKeys) { return new FounderProject @@ -1235,11 +1289,10 @@ StartDate = DateTime.UtcNow.AddMinutes(2), // to allow testing and spending immediately PenaltyDays = 90, ExpiryDate = DateTime.UtcNow.AddDays(120), - TargetAmount = Money.Coins(50).Satoshi - } + TargetAmount = Money.Coins(50).Satoshi + } }; } - private void PopulateTestnetData(FounderProject project) { var random = new Random(); @@ -1256,5 +1309,21 @@ } } - + private async Task CopyToClipboard(string text) + { + await JS.InvokeVoidAsync("navigator.clipboard.writeText", text); + notificationComponent.ShowNotificationMessage("Copied to clipboard", 2); + } + + + private IEnumerable<(string IconName, string Label, string Value)> GetProjectInfo() + { + return new List<(string, string, string)> + { + ("name", "Project Name", project.Metadata.Name), + ("about", "Project About", ((MarkupString)project.Metadata.About).ToString()), + ("identifier", "Project Identifier", project.ProjectInfo.ProjectIdentifier), + ("key", "Founder Key", project.ProjectInfo.FounderKey) + }; + } } \ No newline at end of file diff --git a/src/Angor/Client/Pages/Founder.razor b/src/Angor/Client/Pages/Founder.razor index 650ebd81f..18223b077 100644 --- a/src/Angor/Client/Pages/Founder.razor +++ b/src/Angor/Client/Pages/Founder.razor @@ -73,7 +73,7 @@ @if (founderProjects.Count > 0) { -
+
@foreach (var project in founderProjects) { diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor index 56c95b18b..f816b891a 100644 --- a/src/Angor/Client/Pages/Invest.razor +++ b/src/Angor/Client/Pages/Invest.razor @@ -194,7 +194,11 @@
+ + + + @network.CoinTicker @@ -205,8 +209,8 @@ + @bind="Investment.InvestmentAmountBtc" + @oninput="UpdateStagesBreakdown" />
0.001 @network.CoinTicker @project.ProjectInfo.TargetAmount.ToUnitBtc() @network.CoinTicker @@ -278,7 +282,7 @@
-
+
@@ -324,12 +328,12 @@
+ class="form-range custom-range" + id="feeRange" + @bind="feeData.FeePosition" + @oninput="FeeRangeChanged" + min="@feeData.FeeMin" + max="@feeData.FeeMax">
Estimated confirmation in @feeData.SelectedFeeEstimation.Confirmations blocks @@ -349,21 +353,22 @@ int index = 0; @foreach (var stage in project.ProjectInfo.Stages) { -
+
Stage @(++index)
@StagesBreakdown[index - 1].AmountBtc @network.CoinTicker
-
Release Date
-
@stage.ReleaseDate.ToString("dd/MM/yyyy")
+
Release Date
+
@stage.ReleaseDate.ToString("dd/MM/yyyy")
@stage.AmountToRelease% of investment - @((stage.ReleaseDate - project.ProjectInfo.StartDate).Days) days after start
+ } }
@@ -688,29 +693,28 @@ else if (Investment.IsSeeder) { bool isTestnet = network.NetworkType == NetworkType.Testnet; - long maxInvestmentAmount = isTestnet ? long.MaxValue : Money.Satoshis(0.1m) ; // 0.1 BTC for mainnet, unlimited for testnet - long minInvestmentAmount = Money.Satoshis(0.001m) ; // Minimum investment for all networks - long investmentAmount = Investment.InvestmentAmountBtc.ToUnitSatoshi(); + decimal maxInvestmentBtc = isTestnet ? decimal.MaxValue : 0.1m; // 0.1 BTC for mainnet, unlimited for testnet + decimal minInvestmentBtc = 0.001m; // Minimum investment for all networks - if (investmentAmount < minInvestmentAmount) + if (Investment.InvestmentAmountBtc < minInvestmentBtc) { - notificationComponent.ShowErrorMessage($"Seeder minimum investment amount of {minInvestmentAmount} BTC was not reached"); + notificationComponent.ShowErrorMessage($"Seeder minimum investment amount of {minInvestmentBtc} BTC was not reached"); return; } - if (investmentAmount > maxInvestmentAmount) + if (Investment.InvestmentAmountBtc > maxInvestmentBtc) { - notificationComponent.ShowErrorMessage($"Maximum investment amount is {maxInvestmentAmount} BTC on the mainnet"); + notificationComponent.ShowErrorMessage($"Maximum investment amount is {maxInvestmentBtc} BTC on the mainnet"); return; } } else { - long investmentAmount = Investment.InvestmentAmountBtc.ToUnitSatoshi(); + decimal minInvestmentBtc = 0.001m; - if (investmentAmount < Money.Satoshis(0.001m)) + if (Investment.InvestmentAmountBtc < minInvestmentBtc) { - notificationComponent.ShowErrorMessage($"Investor minimum investment amount is {0.001} BTC"); + notificationComponent.ShowErrorMessage($"Investor minimum investment amount is {minInvestmentBtc} BTC"); return; } } @@ -1022,16 +1026,15 @@ else Investments investments = new() { ProjectIdentifiers = storage.GetInvestmentProjects() - .Where(x => x.InvestedInProject()) - .Select(x => new InvestmentState - { - ProjectIdentifier = x.ProjectInfo.ProjectIdentifier, - investorPubKey = x.InvestorPublicKey, - InvestmentTransactionHash = x.TransactionId, - ReleaseAddress = x.UnfundedReleaseAddress, - - }) - .ToList() + .Where(x => x.InvestedInProject()) + .Select(x => new InvestmentState + { + ProjectIdentifier = x.ProjectInfo.ProjectIdentifier, + InvestorPubKey = x.InvestorPublicKey, + InvestmentTransactionHash = x.TransactionId, + UnfundedReleaseAddress = x.UnfundedReleaseAddress, + }) + .ToList() }; var encryptedProjectIdList = await encryption.EncryptNostrContentAsync( @@ -1050,10 +1053,10 @@ else { /// /// Amount in BTC, this is a parameter that is bind to the users input, - /// so it makes sense to keep it in btc format (instead of satoshis) + /// so it makes sense to keep it in btc format (instead of satoshis) /// - public decimal InvestmentAmountBtc { get; set; } - + public decimal InvestmentAmountBtc { get; set; } + public bool IsSeeder { get; set; } } diff --git a/src/Angor/Client/Pages/Investor.razor b/src/Angor/Client/Pages/Investor.razor index 4aa9b3130..6ec2eeb52 100644 --- a/src/Angor/Client/Pages/Investor.razor +++ b/src/Angor/Client/Pages/Investor.razor @@ -526,7 +526,7 @@ var words = await passwordComponent.GetWalletAsync(); - var investment = await _IndexerService.GetInvestmentAsync(investmentState.ProjectIdentifier, investmentState.investorPubKey); + var investment = await _IndexerService.GetInvestmentAsync(investmentState.ProjectIdentifier, investmentState.InvestorPubKey); if (investment == null) return; diff --git a/src/Angor/Client/Pages/Settings.razor b/src/Angor/Client/Pages/Settings.razor index dd93d9095..182a4dae6 100644 --- a/src/Angor/Client/Pages/Settings.razor +++ b/src/Angor/Client/Pages/Settings.razor @@ -219,7 +219,7 @@ @@ -295,7 +295,7 @@ @@ -348,7 +348,7 @@
- +
Danger Zone
@@ -356,7 +356,7 @@
diff --git a/src/Angor/Client/Pages/Signatures.razor b/src/Angor/Client/Pages/Signatures.razor index 23e6a4d5b..6c4ffb21d 100644 --- a/src/Angor/Client/Pages/Signatures.razor +++ b/src/Angor/Client/Pages/Signatures.razor @@ -2,13 +2,17 @@ @using Angor.Shared @using Angor.Client.Storage @using Angor.Shared.Models +@using Angor.Client.Services @using Angor.Shared.ProtocolNew @using Angor.Client.Models @using Blockcore.NBitcoin @using Blockcore.NBitcoin.DataEncoders +@using System.Text.Json @using Angor.Shared.Services @using System.Security.Cryptography +@inject IJSRuntime JS + @inject ILogger Logger @inject IDerivationOperations DerivationOperations @inject IClientStorage Storage; @@ -50,115 +54,115 @@
- @if (!signaturesRequests.Any()) - { -
-
-
- - - - No pending signatures yet... -
+@if (!signaturesRequests.Any()) +{ +
+
+
+ + + + No pending signatures yet...
- } - else - { - -
-
- @if (messagesReceived || isLoading) - { -
-
- @if (isLoading) - { -
Approving Signatures... @numOfSignaturesSigned / @numOfSignatureToSign
- } -
-
+
+} +else +{ + +
+
+ @if (messagesReceived || isLoading) + { +
+
+ @if (isLoading) + { +
Approving Signatures... @numOfSignaturesSigned / @numOfSignatureToSign
+ } +
- } - - else - { -
-
-
-
-
-
Signatures
-
-
- - -
+
+ } + + else + { +
+
+
+
+
+
Signatures
+
+
+ +
-
- - -
- - + +
+ + +
+
+ + + + + + + + + @foreach (var signature in signaturesRequests.Where(_ => _ is { SignRecoveryRequest.InvestmentTransactionHex: not null, AmountToInvest: not null })) + { - - - + + + @if (signature.TimeApproved is null) + { + + } + else + { + + } - - - @foreach (var signature in signaturesRequests.Where(_ => _ is { SignRecoveryRequest.InvestmentTransactionHex: not null, AmountToInvest: not null })) - { - - - - @if (signature.TimeApproved is null) - { - - } - else - { - - } - - } - -
Investment amountReceived atStatus
Investment amountReceived atStatus@Money.Satoshis(signature.AmountToInvest ?? 0).ToUnit(MoneyUnit.BTC) @network.CoinTicker@signature.TimeArrived.ToString("g") + + Approved on - @signature.TimeApproved.ToString()
@Money.Satoshis(signature.AmountToInvest ?? 0).ToUnit(MoneyUnit.BTC) @network.CoinTicker@signature.TimeArrived.ToString("g") - - Approved on - @signature.TimeApproved.ToString()
-
+ } + +
+
- } -
+ }
+
+ +} - } - @code { [Parameter] @@ -167,8 +171,8 @@ public FounderProject FounderProject { get; set; } private List signaturesRequests = new(); - - private Dictionary signaturesRequestsApproving = new(); + + private Dictionary signaturesRequestsApproving = new(); bool messagesReceived; bool scanedForApprovals; @@ -210,11 +214,11 @@ { if (passwordComponent.HasPassword()) { - await FetchOrDecryptSignaturesRequest(); + await FetchSignatures(); } else { - passwordComponent.ShowPassword(FetchOrDecryptSignaturesRequest); + passwordComponent.ShowPassword(FetchSignatures); } } } @@ -238,11 +242,11 @@ { refreshButtonSpinner = true; StateHasChanged(); - + try { await FetchPendingSignatures(FounderProject); - await FetchOrDecryptSignaturesRequest(); + await FetchSignatures(); await Task.Delay(1000); } catch (Exception e) @@ -251,13 +255,13 @@ } finally { - + refreshButtonSpinner = false; StateHasChanged(); } } - protected async Task FetchOrDecryptSignaturesRequest() + protected async Task FetchSignatures() { Logger.LogDebug($"handled = {signaturesRequests.Count(x => x.AmountToInvest.HasValue)}, total = {signaturesRequests.Count}"); @@ -298,8 +302,7 @@ var investorTrx = _networkConfiguration.GetNetwork().CreateTransaction(pendingSignature.SignRecoveryRequest.InvestmentTransactionHex); //Todo get the actual outputs with taproot type - pendingSignature.AmountToInvest = investorTrx.Outputs.AsIndexedOutputs().Skip(2).Take(investorTrx.Outputs.Count - 3) - .Sum(_ => _.TxOut.Value.Satoshi); + pendingSignature.AmountToInvest = investorTrx.Outputs.AsIndexedOutputs().Skip(2).Take(investorTrx.Outputs.Count - 3).Sum(_ => _.TxOut.Value.Satoshi); } catch (FormatException fe) { @@ -317,6 +320,7 @@ pendingSignature.SignRecoveryRequest = null; } } + Logger.LogDebug($"Calling StateHasChanged in OnAfterRenderAsync"); messagesReceived = false; StateHasChanged(); @@ -353,12 +357,12 @@ messagesReceived = true; var signatureRequest = new SignatureItem - { - investorNostrPubKey = investorNostrPubKey, - TimeArrived = timeArrived, - EncryptedMessage = encryptedMessage, //To be encrypted after js interop is loaded - EventId = eventId - }; + { + investorNostrPubKey = investorNostrPubKey, + TimeArrived = timeArrived, + EncryptedMessage = encryptedMessage, //To be encrypted after js interop is loaded + EventId = eventId + }; signaturesRequests.Add(signatureRequest); Logger.LogDebug($"Added to pendingSignatures"); @@ -461,7 +465,7 @@ } catch (Exception e) { - notificationComponent.ShowErrorMessage(e.Message,e); + notificationComponent.ShowErrorMessage(e.Message, e); } finally { @@ -493,12 +497,15 @@ try { - var pendingSignatures = signaturesRequests.Where(s => s.SignRecoveryRequest?.InvestmentTransactionHex != null && s.AmountToInvest != null && s.TimeApproved == null).ToList(); + var pendingSignatures = signaturesRequests + .Where(s => s.SignRecoveryRequest?.InvestmentTransactionHex != null && s.AmountToInvest != null && s.TimeApproved == null) + .ToList(); + numOfSignatureToSign = pendingSignatures.Count; numOfSignaturesSigned = 0; - + var words = await passwordComponent.GetWalletAsync(); - + foreach (var signature in pendingSignatures) { await PerformSignatureApproval(signature, words); @@ -508,14 +515,14 @@ } catch (Exception e) { - notificationComponent.ShowErrorMessage(e.Message,e); + notificationComponent.ShowErrorMessage(e.Message, e); } finally { isLoading = false; passwordComponent.ClearPassword(); } - + StateHasChanged(); } @@ -564,7 +571,7 @@ return sig; } - + public class SignatureItem { public string investorNostrPubKey { get; set; } @@ -575,7 +582,6 @@ public DateTime? TimeApproved { get; set; } public SignRecoveryRequest? SignRecoveryRequest { get; set; } - public string? EncryptedMessage { get; set; } public string EventId { get; set; } diff --git a/src/Angor/Client/Pages/Spend.razor b/src/Angor/Client/Pages/Spend.razor index 960b1d565..f43f37e9c 100644 --- a/src/Angor/Client/Pages/Spend.razor +++ b/src/Angor/Client/Pages/Spend.razor @@ -37,14 +37,14 @@ NavigationManager.NavigateTo($"/wallet"); return; } -
+
-
+
Founder Stage Claim
@@ -64,18 +64,18 @@
-
+
- @if (firstTimeRefreshSpinner && refreshSpinner) - { -
-
-
-
+@if (firstTimeRefreshSpinner && refreshSpinner) +{ +
+
+
- } - else - { +
+} +else + { @if (totalInvestedAmount <= founderProject.ProjectInfo.TargetAmount && founderProject.ProjectHasStarted()) { } - -
-
-
- - - +
+
+
+ + +
Project Statistics diff --git a/src/Angor/Client/Pages/View.razor b/src/Angor/Client/Pages/View.razor index 015ae3376..3c3e653db 100644 --- a/src/Angor/Client/Pages/View.razor +++ b/src/Angor/Client/Pages/View.razor @@ -361,13 +361,13 @@

Manage your project funds and approve transactions

- + Manage Funds - + @@ -469,7 +469,7 @@
- *@ + @* *@
@if (founder) { - - +
+ + + +
+ + @if (isGeneratingNsec) { @@ -529,6 +543,15 @@
} } + else + { +
+ +
+ }
} @@ -879,7 +902,7 @@ } } - private async void OpenInBrowseAsync() + private async void OpenInHUBAsync() { var url = $"https://hub.angor.io/project/{project.ProjectInfo.ProjectIdentifier}"; diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor index 07c5682ed..c7add0372 100644 --- a/src/Angor/Client/Pages/Wallet.razor +++ b/src/Angor/Client/Pages/Wallet.razor @@ -157,7 +157,6 @@ case 2:
-

@stepDescription

@foreach (var (index, word) in selectedWordsToVerify) { @@ -276,29 +275,51 @@
- @if (currentStep > 1) - { - - } +
+ @if (network.NetworkType == NetworkType.Testnet && currentStep == 2 && isNewWallet) + { +
+ +
+ @if (currentStep > 1) + { + + } + +
+
+ } + else + { + @if (currentStep > 1) + { + + } - @if (currentStep < totalSteps) - { - - } - else - { - } - @(isNewWallet ? "Create Wallet" : "Recover Wallet") - - } + else + { + + } + } +
@@ -1785,5 +1806,11 @@ else showVerificationError = false; } + private void SkipVerification() + { + verificationPassed = true; + showVerificationError = false; + NextStep(); + } } \ No newline at end of file diff --git a/src/Angor/Client/Shared/NavMenu.razor b/src/Angor/Client/Shared/NavMenu.razor index f5fe7d401..3349f30d7 100644 --- a/src/Angor/Client/Shared/NavMenu.razor +++ b/src/Angor/Client/Shared/NavMenu.razor @@ -66,8 +66,7 @@ } -
- +
  • @@ -81,6 +80,7 @@
    • +