Button styling and eval fix

michielpost · Apr 26, 2024 · 98b07e2 · 98b07e2
1 parent 1c03932
commit 98b07e2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/aoWebWallet/Pages/ActionPage.razor b/src/aoWebWallet/Pages/ActionPage.razor
@@ -58,13 +58,13 @@
 
     @if (!readOnly)
     {
-        <MudButton OnClick="Preview">Preview</MudButton>
+        <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="Preview">Preview</MudButton>
         <MudText Color="Color.Error">@validation</MudText>
     }
     else if (!started && string.IsNullOrEmpty(transactionService.LastTransaction.Data?.Id))
     {
-        <MudButton OnClick="Cancel">Cancel</MudButton>
-        <MudButton OnClick="Submit">Submit</MudButton>
+        <MudButton Color="Color.Default" Variant="Variant.Filled" OnClick="Cancel">Cancel</MudButton>
+        <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="Submit">Submit</MudButton>
     }
 
     @if (transactionService.LastTransaction.DataLoader != null)
@@ -80,7 +80,7 @@
                 </MudText>
             </MudStack>
 
-            <MudButton OnClick="ReturnToWallet">Return to wallet</MudButton>
+            <MudButton Color="Color.Primary" OnClick="ReturnToWallet">Return to wallet</MudButton>
         }
     }
 
@@ -91,6 +91,7 @@
 {
     private string? validation;
     private string? selectedWallet;
+    private Wallet? selectedWalletObj;
     private bool readOnly = false;
     private bool started = false;
 
@@ -117,6 +118,13 @@
             return;
 
         var wallet = BindingContext.WalletList.Data.Where(x => x.Address == selectedWallet).FirstOrDefault();
+        if(wallet == null)
+        {
+            if(selectedWalletObj?.Address == selectedWallet)
+            {
+                wallet = selectedWalletObj;
+            }
+        }
 
         if (wallet == null)
             return;

diff --git a/src/aoWebWallet/Pages/ActionPage.razor.cs b/src/aoWebWallet/Pages/ActionPage.razor.cs
@@ -18,8 +18,12 @@ protected override void OnInitialized()
             WatchDataLoaderVM(transactionService.LastTransaction);
 
             //Auto select wallet
-            if(!string.IsNullOrEmpty(WalletDetailViewModel.SelectedWallet?.Wallet.Address))
-                selectedWallet = WalletDetailViewModel.SelectedWallet?.Wallet.Address;
+            if (!string.IsNullOrEmpty(WalletDetailViewModel.SelectedWallet?.Wallet.Address))
+            {
+                selectedWalletObj = WalletDetailViewModel.SelectedWallet?.Wallet;
+                selectedWallet = selectedWalletObj?.Address;
+
+            }
 
             NavigationManager.LocationChanged += NavigationManager_LocationChanged;
 

diff --git a/src/aoWebWallet/Services/TransactionService.cs b/src/aoWebWallet/Services/TransactionService.cs
@@ -45,19 +45,16 @@ public async Task SendAction(Wallet wallet, Wallet? ownerWallet, AoAction action
                     await SendActionWithEvalWithArConnect(wallet.Address, action);
             }
 
-            if (!string.IsNullOrEmpty(wallet.OwnerAddress) && ownerWallet?.Address == wallet.Address
+            if (!string.IsNullOrEmpty(wallet.OwnerAddress) && ownerWallet?.Address == wallet.OwnerAddress
                 && !string.IsNullOrEmpty(ownerWallet?.Jwk))
             {
-                Console.WriteLine("eval");
-
                 await SendActionWithEval(ownerWallet.Jwk, wallet.Address, action);
-
             }
 
             if (!string.IsNullOrEmpty(wallet.Jwk))
                 await SendActionWithJwk(wallet.Jwk, action);
 
-            Console.WriteLine("nothing");
+            Console.WriteLine("No Wallet to send");
             return;
         }