From 5570206533a86eef0ea3280b29cf596c32cc21fd Mon Sep 17 00:00:00 2001
From: Michiel Post <michiel@michielpost.nl>
Date: Fri, 30 Aug 2024 12:09:15 +0200
Subject: [PATCH] Hide invalid tokens and atomic assets

---
 src/aoWebWallet/Pages/TransactionDetail.razor     | 15 ++++++++++++++-
 src/aoWebWallet/Services/TokenDataService.cs      | 11 ++++++-----
 .../Shared/Components/TransactionComponent.razor  | 15 +++++++++++++--
 src/aoWebWallet/aoWebWallet.csproj                |  4 ++--
 src/aoww.ProcesModels/aoww.ProcesModels.csproj    |  2 +-
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/aoWebWallet/Pages/TransactionDetail.razor b/src/aoWebWallet/Pages/TransactionDetail.razor
index 68a9906..a20a6ed 100644
--- a/src/aoWebWallet/Pages/TransactionDetail.razor
+++ b/src/aoWebWallet/Pages/TransactionDetail.razor
@@ -29,7 +29,14 @@
             <MudTimeline TimelinePosition="TimelinePosition.Left">
                 <MudTimelineItem>
                     <ItemDot>
-                        <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId"><MudImage Src="@UrlHelper.GetArweaveUrl(tokenData?.Logo)" /></MudAvatar>
+                        @if (!string.IsNullOrWhiteSpace(tokenData?.Logo))
+                        {
+                            <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId"><MudImage Src="@UrlHelper.GetArweaveUrl(tokenData?.Logo)" /></MudAvatar>
+                        }
+                        else if (tokenData?.TokenType == ArweaveAO.Models.Token.TokenType.AtomicAsset)
+                        {
+                            <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId" Color="Color.Info" Variant="Variant.Outlined">AA</MudAvatar>
+                        }
                     </ItemDot>
                     <ItemContent>
                         @if (transfer.BlockHeight.HasValue)
@@ -41,6 +48,12 @@
                             <MudText Typo="Typo.caption">unconfirmed</MudText>
                         }
 
+                        @if (string.IsNullOrWhiteSpace(tokenData?.Logo))
+                        {
+                            <br />
+                            <MudText Typo="Typo.caption">Process: @transfer?.TokenId</MudText>
+                        }
+
                         @if (tokenData != null)
                         {
                             <MudStack Justify="Justify.Center" Spacing="0">
diff --git a/src/aoWebWallet/Services/TokenDataService.cs b/src/aoWebWallet/Services/TokenDataService.cs
index 1cb5dea..b82c417 100644
--- a/src/aoWebWallet/Services/TokenDataService.cs
+++ b/src/aoWebWallet/Services/TokenDataService.cs
@@ -1,6 +1,7 @@
 
 using aoWebWallet.Models;
 using aoWebWallet.Pages;
+using aoww.Services.Models;
 using ArweaveAO;
 using ArweaveAO.Models.Token;
 using System.Collections.ObjectModel;
@@ -42,16 +43,18 @@ public async Task TryAddTokenIds(List<string> allTokenIds)
                     return data;
                 }, async data =>
                 {
-                    if (data != null)
+                    if (data != null && data.IsValidToken())
                     {
                         await storageService.AddToken(tokenId, data, isUserAdded: false, null);
 
                         await LoadTokenList(force: true);
                     }
+                    
                 });
 
                 
             }
+
         }
 
         public async Task<Token> LoadTokenAsync(string tokenId)
@@ -75,9 +78,8 @@ public async Task<Token> LoadTokenAsync(string tokenId)
                     return data;
                 });
 
-                if (data != null)
+                if (data != null && data.IsValidToken())
                 {
-
                     token.TokenData = data;
 
                     var existing = TokenList.Where(x => x.TokenId.Equals(tokenId, StringComparison.OrdinalIgnoreCase)).Any();
@@ -86,7 +88,6 @@ public async Task<Token> LoadTokenAsync(string tokenId)
 
                     await storageService.AddToken(tokenId, data, false, null);
                 }
-               
             }
 
             return token;
@@ -128,7 +129,7 @@ private async IAsyncEnumerable<Token> LoadTokenDataAsync()
                     catch { }
                 }
 
-                if (token.TokenData != null)
+                if (token.TokenData != null && token.TokenData.IsValidToken())
                     yield return token;
             }
 
diff --git a/src/aoWebWallet/Shared/Components/TransactionComponent.razor b/src/aoWebWallet/Shared/Components/TransactionComponent.razor
index 766be9b..5743d85 100644
--- a/src/aoWebWallet/Shared/Components/TransactionComponent.razor
+++ b/src/aoWebWallet/Shared/Components/TransactionComponent.razor
@@ -11,7 +11,14 @@
     string txUrl = $"transaction/{transfer.Id}";
     <MudTimelineItem>
         <ItemDot>
-            <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId"><MudImage Src="@UrlHelper.GetArweaveUrl(tokenData?.Logo)" /></MudAvatar>
+            @if (!string.IsNullOrWhiteSpace(tokenData?.Logo))
+            {
+                <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId"><MudImage Src="@UrlHelper.GetArweaveUrl(tokenData?.Logo)" /></MudAvatar>
+            }
+            else if(tokenData?.TokenType == ArweaveAO.Models.Token.TokenType.AtomicAsset)
+            {
+                <MudAvatar Size="Size.Medium" title="@tokenData?.TokenId" Color="Color.Info" Variant="Variant.Outlined">AA</MudAvatar>
+            }
         </ItemDot>
         <ItemContent>
             @if (transfer.BlockHeight.HasValue)
@@ -22,7 +29,11 @@
             {
                 <MudText Typo="Typo.caption">unconfirmed</MudText>
             }
-            @*<MudText Typo="Typo.body1">@tokenData.Name</MudText>*@
+            @if (string.IsNullOrWhiteSpace(tokenData?.Logo))
+            {
+                <br />
+                <MudText Typo="Typo.caption">Process: @transfer?.TokenId</MudText>
+            }
             <MudText style="font-weight:500;" Typo="Typo.body2">@tokenData?.Ticker</MudText>
             <MudStack Row=true>
                 <MudText>txId: </MudText>
diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
index cfb1d74..a9645d8 100644
--- a/src/aoWebWallet/aoWebWallet.csproj
+++ b/src/aoWebWallet/aoWebWallet.csproj
@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.7" />
+		<PackageReference Include="ArweaveAO" Version="0.0.8" />
 		<PackageReference Include="ArweaveBlazor" Version="0.0.10" />
 		<PackageReference Include="ClipLazor" Version="2.1.1" />
 		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.1" />
@@ -23,7 +23,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
 		<PackageReference Include="ReactorBlazorQRCodeScanner" Version="1.0.7" />
-		<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="2.1.295" />
+		<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="2.1.296" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/aoww.ProcesModels/aoww.ProcesModels.csproj b/src/aoww.ProcesModels/aoww.ProcesModels.csproj
index 8405626..e5ca49a 100644
--- a/src/aoww.ProcesModels/aoww.ProcesModels.csproj
+++ b/src/aoww.ProcesModels/aoww.ProcesModels.csproj
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ArweaveAO" Version="0.0.7" />
+		<PackageReference Include="ArweaveAO" Version="0.0.8" />
 	</ItemGroup>
 	
 </Project>