Fix for receive token dialog, always display address

michielpost · May 16, 2024 · 3812019 · 3812019
1 parent 9509002
commit 3812019
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/aoWebWallet/Shared/BalanceDataComponent.razor b/src/aoWebWallet/Shared/BalanceDataComponent.razor
@@ -50,9 +50,9 @@
     [Parameter]
     public bool CanSend { get; set; }
 
-    private void Receive(BalanceDataViewModel? balanceDataVM)
+    private void Receive(BalanceDataViewModel balanceDataVM)
     {
-        var parameters = new DialogParameters<ReceiveTokenDialog> { { x => x.SelectedBalanceDataVM, balanceDataVM } };
+        var parameters = new DialogParameters<ReceiveTokenDialog> { { x => x.SelectedBalanceDataVM, balanceDataVM }, { x => x.Address, balanceDataVM.Address } };
         var options = new DialogOptions { CloseOnEscapeKey = true };
         DialogService.Show<ReceiveTokenDialog>("Receive Token", parameters, options);
     }

diff --git a/src/aoWebWallet/Shared/ReceiveTokenDialog.razor b/src/aoWebWallet/Shared/ReceiveTokenDialog.razor
@@ -16,7 +16,7 @@
             <MudText Typo="Typo.h4">How to receive tokens?</MudText>
             <MudText>Send tokens to this address:</MudText>
             <MudText Class="KodeMono" style="text-overflow: ellipsis; white-space: nowrap;overflow: hidden;" Typo="Typo.subtitle1">
-                @SelectedBalanceDataVM?.BalanceDataLoader.Data?.Account
+                @Address
             </MudText>
             <MudText Typo="Typo.subtitle1"></MudText>
         </MudStack>
@@ -25,7 +25,7 @@
             <MudText Typo="Typo.h5">From aos:</MudText>
             <MudText>Command:</MudText>
             <MudText Class="KodeMono" Typo="Typo.subtitle1">
-                Send({ Target = "@SelectedBalanceDataVM?.Token?.TokenId", Action = "Transfer", Recipient = "@SelectedBalanceDataVM?.BalanceDataLoader.Data?.Account", Quantity = "TOKEN_AMOUNT"})
+                Send({ Target = "@SelectedBalanceDataVM?.Token?.TokenId", Action = "Transfer", Recipient = "@Address", Quantity = "TOKEN_AMOUNT"})
             </MudText>
         </MudStack>
     </DialogContent>
@@ -40,6 +40,9 @@
     [Parameter] 
     public BalanceDataViewModel? SelectedBalanceDataVM { get; set; }
 
+    [Parameter]
+    public string Address { get; set; } = string.Empty;
+
     public async Task Submit()
     {
         MudDialog.Close(DialogResult.Ok(true));

diff --git a/src/aoWebWallet/ViewModels/BalanceDataViewModel.cs b/src/aoWebWallet/ViewModels/BalanceDataViewModel.cs
@@ -7,7 +7,9 @@ namespace aoWebWallet.ViewModels
     public class BalanceDataViewModel
     {
         public DataLoaderViewModel<BalanceData> BalanceDataLoader { get; set; } = new DataLoaderViewModel<BalanceData>();
-        public Token? Token { get; set; }
+        public required Token Token { get; set; }
+
+        public required string Address { get; set; }
 
         //public void Load()
         //{

diff --git a/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs b/src/aoWebWallet/ViewModels/WalletDetailViewModel.cs
@@ -280,7 +280,7 @@ private async Task LoadBalanceDataList(string address, bool onlyNew = false)
                         continue;
 
                 }
-                var balanceData = new BalanceDataViewModel { Token = token };
+                var balanceData = new BalanceDataViewModel { Token = token, Address = address };
                 BalanceDataList.Add(balanceData);
 
                 await Task.Delay(50);