From 5395e8116198fb7750472ca868614324dbd9984a Mon Sep 17 00:00:00 2001
From: Jimmy <heiykjq54@hotmail.com>
Date: Sun, 21 Jun 2026 20:34:50 +0800
Subject: [PATCH 1/2] feat(assets): add custom NEP-17 token by contract hash

Tokens were a static embedded list, so any NEP-17 not in tokens.json was invisible
and unaddable. Add an Add-token popup (wallet toolbar) that resolves a pasted
contract hash via the existing GetTokenInfo and persists it; TokenManager merges
user tokens with the embedded list. Builds for net10.0-android (0 errors).
---
 OneGateApp/Controls/Popups/AddTokenPopup.xaml | 26 +++++++++
 .../Controls/Popups/AddTokenPopup.xaml.cs     | 48 +++++++++++++++++
 OneGateApp/Pages/WalletPage.xaml              |  1 +
 OneGateApp/Pages/WalletPage.xaml.cs           | 14 ++++-
 OneGateApp/Properties/Strings.Designer.cs     | 54 +++++++++++++++++++
 OneGateApp/Properties/Strings.resx            | 18 +++++++
 OneGateApp/Properties/Strings.zh-Hans.resx    | 18 +++++++
 OneGateApp/Properties/Strings.zh-Hant.resx    | 18 +++++++
 OneGateApp/Services/TokenManager.cs           | 20 +++++++
 9 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 OneGateApp/Controls/Popups/AddTokenPopup.xaml
 create mode 100644 OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs

diff --git a/OneGateApp/Controls/Popups/AddTokenPopup.xaml b/OneGateApp/Controls/Popups/AddTokenPopup.xaml
new file mode 100644
index 0000000..083ba76
--- /dev/null
+++ b/OneGateApp/Controls/Popups/AddTokenPopup.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<og:MyPopup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            xmlns:og="http://schemas.neoorder.org/onegate/controls"
+            xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+            x:Class="NeoOrder.OneGate.Controls.Popups.AddTokenPopup"
+            x:TypeArguments="x:Boolean"
+            BindingContext="{Binding Source={RelativeSource Self}}">
+    <VerticalStackLayout Spacing="15" MaximumWidthRequest="450">
+        <Grid ColumnDefinitions="*,auto">
+            <Label Text="{x:Static og:Strings.AddToken}" FontAttributes="Bold" />
+            <Button Grid.Column="1" StyleClass="Icon" Text="&#xe6b5;" FontSize="24" Margin="-10" Padding="10" Clicked="OnCancel" />
+        </Grid>
+        <Label StyleClass="Secondary" Text="{x:Static og:Strings.AddTokenText}" />
+        <Border StrokeShape="RoundRectangle 10" BackgroundColor="{toolkit:AppThemeResource TextBox}" Padding="10,0">
+            <Entry Text="{Binding ContractHash}" Placeholder="{x:Static og:Strings.ContractHashPlaceholder}" og:Border.IsVisible="False" />
+        </Border>
+        <Label StyleClass="Danger" Margin="0,-10,0,0" Text="{Binding ErrorMessage}" IsVisible="{Binding HasError}" FontSize="12" />
+        <Grid ColumnDefinitions="*,auto,*" Margin="-15,0,-15,-15">
+            <BoxView Grid.ColumnSpan="3" HeightRequest="1" VerticalOptions="Start" />
+            <Button Grid.Column="0" StyleClass="Secondary" Text="{x:Static og:Strings.Cancel}" BorderWidth="0" Clicked="OnCancel" />
+            <BoxView Grid.Column="1" WidthRequest="1" VerticalOptions="Fill" />
+            <Button Grid.Column="2" Text="{x:Static og:Strings.Add}" TextColor="#5676e7" BackgroundColor="Transparent" BorderWidth="0" Clicked="OnAdd" />
+        </Grid>
+    </VerticalStackLayout>
+</og:MyPopup>
diff --git a/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs b/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs
new file mode 100644
index 0000000..8b29f58
--- /dev/null
+++ b/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs
@@ -0,0 +1,48 @@
+using Neo;
+using NeoOrder.OneGate.Properties;
+using NeoOrder.OneGate.Services;
+
+namespace NeoOrder.OneGate.Controls.Popups;
+
+public partial class AddTokenPopup : MyPopup<bool>
+{
+    readonly TokenManager tokenManager;
+
+    public string? ContractHash
+    {
+        get;
+        set { field = value; OnPropertyChanged(); ErrorMessage = null; }
+    }
+    public string? ErrorMessage
+    {
+        get;
+        set { field = value; OnPropertyChanged(); OnPropertyChanged(nameof(HasError)); }
+    }
+    public bool HasError => !string.IsNullOrEmpty(ErrorMessage);
+
+    public AddTokenPopup(TokenManager tokenManager)
+    {
+        this.tokenManager = tokenManager;
+        InitializeComponent();
+    }
+
+    async void OnAdd(object sender, EventArgs e)
+    {
+        if (!UInt160.TryParse(ContractHash?.Trim(), out UInt160 hash))
+        {
+            ErrorMessage = Strings.InvalidContractHash;
+            return;
+        }
+        try
+        {
+            await tokenManager.AddCustomTokenAsync(hash);
+            await CloseAsync(true);
+        }
+        catch
+        {
+            ErrorMessage = Strings.TokenNotFound;
+        }
+    }
+
+    async void OnCancel(object sender, EventArgs e) => await CloseAsync(false);
+}
diff --git a/OneGateApp/Pages/WalletPage.xaml b/OneGateApp/Pages/WalletPage.xaml
index ecc6e63..4fe7ab2 100644
--- a/OneGateApp/Pages/WalletPage.xaml
+++ b/OneGateApp/Pages/WalletPage.xaml
@@ -13,6 +13,7 @@
         <toolkit:InvertedBoolConverter x:Key="InvertedBoolConverter" />
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
+        <ToolbarItem Order="Primary" IconImageSource="{FontImageSource &#xe642;, FontFamily=Icons, Color={toolkit:AppThemeResource Primary}}" Clicked="OnAddToken" />
         <ToolbarItem Order="Primary" IconImageSource="{FontImageSource &#xe69a;, FontFamily=Icons, Color={toolkit:AppThemeResource Primary}}" Command="{x:Static og:Commands.ScanQRCode}" />
     </ContentPage.ToolbarItems>
     <RefreshView Margin="20,8" IsRefreshing="{Binding LoadingService.IsReloading}" Command="{Binding LoadingService}">
diff --git a/OneGateApp/Pages/WalletPage.xaml.cs b/OneGateApp/Pages/WalletPage.xaml.cs
index ff3cba8..2528567 100644
--- a/OneGateApp/Pages/WalletPage.xaml.cs
+++ b/OneGateApp/Pages/WalletPage.xaml.cs
@@ -1,7 +1,9 @@
 using CommunityToolkit.Maui.Alerts;
+using CommunityToolkit.Maui.Extensions;
 using Neo;
 using Neo.Wallets;
 using NeoOrder.OneGate.Controls;
+using NeoOrder.OneGate.Controls.Popups;
 using NeoOrder.OneGate.Data;
 using NeoOrder.OneGate.Models;
 using NeoOrder.OneGate.Properties;
@@ -13,6 +15,7 @@ public partial class WalletPage : ContentPage
 {
     readonly ApplicationDbContext dbContext;
     readonly TokenManager tokenManager;
+    readonly IServiceProvider serviceProvider;
 
     public LoadingService LoadingService { get; set { field = value; OnPropertyChanged(); } }
     public Wallet Wallet { get; set { field = value; OnPropertyChanged(); } }
@@ -23,9 +26,10 @@ public partial class WalletPage : ContentPage
     public IReadOnlyList<NFT>? NFTs { get; set { field = value; OnPropertyChanged(); } }
     public string TotalValuation { get; set { field = value; OnPropertyChanged(); } } = "N/A";
 
-    public WalletPage(ApplicationDbContext dbContext, IWalletProvider walletProvider, TokenManager tokenManager)
+    public WalletPage(IServiceProvider serviceProvider, ApplicationDbContext dbContext, IWalletProvider walletProvider, TokenManager tokenManager)
     {
         this.LoadingService = new(RefreshWallet, LoadAssetsAsync, LoadNFTsAsync);
+        this.serviceProvider = serviceProvider;
         this.dbContext = dbContext;
         this.tokenManager = tokenManager;
         Wallet = walletProvider.GetWallet()!;
@@ -92,4 +96,12 @@ async void OnNFTTapped(object sender, TappedEventArgs e)
         NFT nft = (NFT)e.Parameter!;
         await Shell.Current.GoToAsync("//wallet/nft/details", new Dictionary<string, object> { ["nft"] = nft });
     }
+
+    async void OnAddToken(object sender, EventArgs e)
+    {
+        AddTokenPopup popup = serviceProvider.GetServiceOrCreateInstance<AddTokenPopup>();
+        var result = await this.ShowPopupAsync<bool>(popup);
+        if (result.Result)
+            LoadingService.BeginLoad();
+    }
 }
diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index 9b455dd..383170d 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -2625,5 +2625,59 @@ internal static string WifPrivateKeyWarning {
                 return ResourceManager.GetString("WifPrivateKeyWarning", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add token.
+        /// </summary>
+        internal static string AddToken {
+            get {
+                return ResourceManager.GetString("AddToken", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enter a NEP-17 contract hash to track a custom token..
+        /// </summary>
+        internal static string AddTokenText {
+            get {
+                return ResourceManager.GetString("AddTokenText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 0x… contract hash.
+        /// </summary>
+        internal static string ContractHashPlaceholder {
+            get {
+                return ResourceManager.GetString("ContractHashPlaceholder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enter a valid contract hash..
+        /// </summary>
+        internal static string InvalidContractHash {
+            get {
+                return ResourceManager.GetString("InvalidContractHash", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No NEP-17 token found at this contract..
+        /// </summary>
+        internal static string TokenNotFound {
+            get {
+                return ResourceManager.GetString("TokenNotFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add.
+        /// </summary>
+        internal static string Add {
+            get {
+                return ResourceManager.GetString("Add", resourceCulture);
+            }
+        }
     }
 }
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index e0fbfd0..a44f01f 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -989,4 +989,22 @@ It is recommended to store the NEP-2 key and password separately and back them u
   <data name="Unavailable" xml:space="preserve">
     <value>Unavailable</value>
   </data>
+  <data name="AddToken" xml:space="preserve">
+    <value>Add token</value>
+  </data>
+  <data name="AddTokenText" xml:space="preserve">
+    <value>Enter a NEP-17 contract hash to track a custom token.</value>
+  </data>
+  <data name="ContractHashPlaceholder" xml:space="preserve">
+    <value>0x… contract hash</value>
+  </data>
+  <data name="InvalidContractHash" xml:space="preserve">
+    <value>Enter a valid contract hash.</value>
+  </data>
+  <data name="TokenNotFound" xml:space="preserve">
+    <value>No NEP-17 token found at this contract.</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
 </root>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index 068ed29..453a85b 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -989,4 +989,22 @@
   <data name="Unavailable" xml:space="preserve">
     <value>不可用</value>
   </data>
+  <data name="AddToken" xml:space="preserve">
+    <value>添加代币</value>
+  </data>
+  <data name="AddTokenText" xml:space="preserve">
+    <value>输入 NEP-17 合约哈希以添加自定义代币。</value>
+  </data>
+  <data name="ContractHashPlaceholder" xml:space="preserve">
+    <value>0x… 合约哈希</value>
+  </data>
+  <data name="InvalidContractHash" xml:space="preserve">
+    <value>请输入有效的合约哈希。</value>
+  </data>
+  <data name="TokenNotFound" xml:space="preserve">
+    <value>该合约上未找到 NEP-17 代币。</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>添加</value>
+  </data>
 </root>
diff --git a/OneGateApp/Properties/Strings.zh-Hant.resx b/OneGateApp/Properties/Strings.zh-Hant.resx
index e985d08..48a4c81 100644
--- a/OneGateApp/Properties/Strings.zh-Hant.resx
+++ b/OneGateApp/Properties/Strings.zh-Hant.resx
@@ -989,4 +989,22 @@
   <data name="Unavailable" xml:space="preserve">
     <value>不可用</value>
   </data>
+  <data name="AddToken" xml:space="preserve">
+    <value>新增代幣</value>
+  </data>
+  <data name="AddTokenText" xml:space="preserve">
+    <value>輸入 NEP-17 合約雜湊以新增自訂代幣。</value>
+  </data>
+  <data name="ContractHashPlaceholder" xml:space="preserve">
+    <value>0x… 合約雜湊</value>
+  </data>
+  <data name="InvalidContractHash" xml:space="preserve">
+    <value>請輸入有效的合約雜湊。</value>
+  </data>
+  <data name="TokenNotFound" xml:space="preserve">
+    <value>該合約上未找到 NEP-17 代幣。</value>
+  </data>
+  <data name="Add" xml:space="preserve">
+    <value>新增</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/OneGateApp/Services/TokenManager.cs b/OneGateApp/Services/TokenManager.cs
index 8a5b087..ba3cf67 100644
--- a/OneGateApp/Services/TokenManager.cs
+++ b/OneGateApp/Services/TokenManager.cs
@@ -15,6 +15,16 @@ public class TokenManager(ApplicationDbContext dbContext, IWalletProvider wallet
     public async Task<IReadOnlyList<TokenInfo>> LoadTokensAsync(bool includeHiddens = false)
     {
         List<TokenInfo> tokens = EmbeddedResource.LoadJson<List<TokenInfo>>("tokens.json");
+        UInt160[]? custom = await dbContext.Settings.GetAsync<UInt160[]>("tokens/custom");
+        if (custom is not null)
+        {
+            foreach (UInt160 hash in custom)
+            {
+                if (tokens.Any(p => p.Hash == hash)) continue;
+                try { tokens.Add(await rpcClient.GetTokenInfo(hash)); }
+                catch { /* custom token no longer resolvable on chain; skip */ }
+            }
+        }
         if (!includeHiddens)
         {
             UInt160[]? hiddens = await dbContext.Settings.GetAsync<UInt160[]>("tokens/hidden");
@@ -23,6 +33,16 @@ public async Task<IReadOnlyList<TokenInfo>> LoadTokensAsync(bool includeHiddens
         return tokens;
     }
 
+    // Resolve a NEP-17 by contract hash (throws if not a valid token) and persist it as a user-added token.
+    public async Task<TokenInfo> AddCustomTokenAsync(UInt160 hash)
+    {
+        TokenInfo token = await rpcClient.GetTokenInfo(hash);
+        UInt160[] custom = await dbContext.Settings.GetAsync<UInt160[]>("tokens/custom") ?? [];
+        if (!custom.Contains(hash))
+            await dbContext.Settings.PutAsync("tokens/custom", custom.Append(hash).ToArray());
+        return token;
+    }
+
     public async Task<AssetInfo> LoadAssetAsync(UInt160 assetId)
     {
         Wallet wallet = walletProvider.GetWallet()!;

From 85af6c297a335cd1b802650d0ed822f71bba832f Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@r3e.network>
Date: Mon, 22 Jun 2026 01:39:41 +0800
Subject: [PATCH 2/2] Handle custom token resolution failures precisely

---
 OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs | 10 ++++++++--
 OneGateApp/Services/TokenManager.cs              |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs b/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs
index 8b29f58..4b0a481 100644
--- a/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs
+++ b/OneGateApp/Controls/Popups/AddTokenPopup.xaml.cs
@@ -1,6 +1,7 @@
 using Neo;
 using NeoOrder.OneGate.Properties;
 using NeoOrder.OneGate.Services;
+using NeoOrder.OneGate.Services.RPC;
 
 namespace NeoOrder.OneGate.Controls.Popups;
 
@@ -28,20 +29,25 @@ public AddTokenPopup(TokenManager tokenManager)
 
     async void OnAdd(object sender, EventArgs e)
     {
-        if (!UInt160.TryParse(ContractHash?.Trim(), out UInt160 hash))
+        if (!UInt160.TryParse(ContractHash?.Trim() ?? string.Empty, out UInt160? parsedHash) || parsedHash is null)
         {
             ErrorMessage = Strings.InvalidContractHash;
             return;
         }
+        UInt160 hash = parsedHash;
         try
         {
             await tokenManager.AddCustomTokenAsync(hash);
             await CloseAsync(true);
         }
-        catch
+        catch (RpcException)
         {
             ErrorMessage = Strings.TokenNotFound;
         }
+        catch
+        {
+            ErrorMessage = Strings.UnknownError;
+        }
     }
 
     async void OnCancel(object sender, EventArgs e) => await CloseAsync(false);
diff --git a/OneGateApp/Services/TokenManager.cs b/OneGateApp/Services/TokenManager.cs
index ba3cf67..3bc2ec1 100644
--- a/OneGateApp/Services/TokenManager.cs
+++ b/OneGateApp/Services/TokenManager.cs
@@ -22,7 +22,7 @@ public async Task<IReadOnlyList<TokenInfo>> LoadTokensAsync(bool includeHiddens
             {
                 if (tokens.Any(p => p.Hash == hash)) continue;
                 try { tokens.Add(await rpcClient.GetTokenInfo(hash)); }
-                catch { /* custom token no longer resolvable on chain; skip */ }
+                catch (RpcException) { /* custom token no longer resolvable on chain; skip */ }
             }
         }
         if (!includeHiddens)