Action dry run bugfix

michielpost · May 2, 2024 · 3c25939 · 3c25939
1 parent 4124d77
commit 3c25939
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/aoWebWallet/Pages/ActionPage.razor b/src/aoWebWallet/Pages/ActionPage.razor
@@ -95,13 +95,14 @@
         {
             <MudStack>
                 <MudText Typo="Typo.h5">Transfer success!</MudText>
-                <MudText>TransactionId</MudText>
+                <MudText>Message Id</MudText>
                 <MudText Class="KodeMono" Typo="Typo.caption">
                     @transactionService.LastTransaction.Data?.Id
                 </MudText>
             </MudStack>
 
-            <MudButton Color="Color.Primary" OnClick="ReturnToWallet">Return to wallet</MudButton>
+            <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="ReturnToWallet">Return to wallet</MudButton>
+            @* <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="ViewTransaction">View Transaction</MudButton> *@
         }
     }
 
@@ -152,9 +153,9 @@
             return;
 
         //Do we need the owner wallet?
-        Wallet? ownerWallet = BindingContext.WalletList.Data.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
+        //Wallet? ownerWallet = BindingContext.WalletList.Data.Where(x => x.Address == wallet.OwnerAddress).FirstOrDefault();
 
-        transactionService.DryRunAction(wallet, ownerWallet, AoAction);
+        transactionService.DryRunAction(wallet, AoAction);
 
     }
     private void Cancel()
@@ -167,6 +168,15 @@
         NavigationManager.NavigateTo($"/wallet/{selectedWallet}");
     }
 
+    private void ViewTransaction()
+    {
+        if (!string.IsNullOrEmpty(transactionService.LastTransaction.Data?.Id))
+            NavigationManager.NavigateTo($"/transaction/{transactionService.LastTransaction.Data?.Id}");
+        else
+            ReturnToWallet();
+
+    }
+
     private async Task Submit()
     {
         if (BindingContext.WalletList.Data == null)

diff --git a/src/aoWebWallet/Services/TransactionService.cs b/src/aoWebWallet/Services/TransactionService.cs
@@ -33,14 +33,14 @@ public void Reset()
             return null;
         }
 
-        public Task<MessageResult?> DryRunAction(Wallet wallet, Wallet? ownerWallet, AoAction action)
+        public Task<MessageResult?> DryRunAction(Wallet wallet, AoAction action)
              => DryRunResult.DataLoader.LoadAsync(async () =>
              {
                  var target = action.Target?.Value ?? string.Empty;
                  var druRunRequest = new DryRunRequest()
                  {
                      Target = target,
-                     Owner = ownerWallet?.Address ?? wallet.Address,
+                     Owner = wallet.Address,
                      Tags = action.ToDryRunTags()
                  };