Moved call to javascript module to after render

block-core · Jan 10, 2024 · 01fcd5c · 01fcd5c
1 parent aa08a41
commit 01fcd5c
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor
@@ -269,26 +269,11 @@
         await CheckIfSeederTimeHasPassed();
 
         UpdateStagesBreakdown(new ChangeEventArgs { Value = Investment.InvestmentAmount });
-
-
-        if (project != null && recoverySigs?.Signatures.Any() == false)
-        {
-            var accountInfo = storage.GetAccountInfo(_networkConfiguration.GetNetwork().Name);
-
-            var nostrPrivateKey = _derivationOperations.DeriveProjectNostrPrivateKey(_walletStorage.GetWallet(), accountInfo.InvestmentsCount + 1);
-
-            var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes());
-
-            _SignService.LookupSignatureForInvestmentRequest(
-                NostrPrivateKey.FromHex(nostrPrivateKeyHex).DerivePublicKey().Hex
-                , project.NostrPubKey, recoverySigs.TimeOfRequestForSigning.Value,
-                async _ => await HandleSignatureReceivedAsync(nostrPrivateKeyHex, _));
-        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender || javascriptNostrToolsModule == null)
         {
             try
             {
@@ -301,6 +286,20 @@
                 notificationComponent.ShowErrorMessage(e.Message);
             }
         }
+
+        if (project != null && recoverySigs?.Signatures.Any() == false)
+        {
+            var accountInfo = storage.GetAccountInfo(_networkConfiguration.GetNetwork().Name);
+
+            var nostrPrivateKey = _derivationOperations.DeriveProjectNostrPrivateKey(_walletStorage.GetWallet(), accountInfo.InvestmentsCount + 1);
+
+            var nostrPrivateKeyHex = Encoders.Hex.EncodeData(nostrPrivateKey.ToBytes());
+
+            _SignService.LookupSignatureForInvestmentRequest(
+                NostrPrivateKey.FromHex(nostrPrivateKeyHex).DerivePublicKey().Hex
+                , project.NostrPubKey, recoverySigs.TimeOfRequestForSigning.Value,
+                async _ => await HandleSignatureReceivedAsync(nostrPrivateKeyHex, _));
+        }
     }
 
     private Task CheckIfSeederTimeHasPassed()