From 72a3e741a04289f4f57b81ef5a0d318cd4287855 Mon Sep 17 00:00:00 2001
From: r4bbit <445106+0x-r4bbit@users.noreply.github.com>
Date: Mon, 17 Aug 2026 14:40:08 +0200
Subject: [PATCH] fix(apps/amm): match swap holdings on the configured id
 encoding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moving the token list app-side (readTokensConfig) dropped the module
tokenList()'s base58->hex normalization, so a token's definitionId now
reaches the swap view in whatever encoding TOKENS_CONFIG uses — base58 in
practice. The swap account selector filtered holdings on the hex
definitionIdHex field using that value, so a base58 id matched nothing and
every token showed "No funds", blocking swaps.

Make the selector encoding-aware: a 64-char hex id filters definitionIdHex,
otherwise the base58 definitionId. tokenHoldings already emits both encodings
per holding, so this matches whichever the config uses, needs no app-side
base58 decoder, and mirrors how the liquidity view already filters. The swap
quote/submit path already normalizes base58->hex in the module, so nothing
else changes.
---
 apps/amm/qml/components/swap/TokenInput.qml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/apps/amm/qml/components/swap/TokenInput.qml b/apps/amm/qml/components/swap/TokenInput.qml
index bb4ecdf..01eae43 100644
--- a/apps/amm/qml/components/swap/TokenInput.qml
+++ b/apps/amm/qml/components/swap/TokenInput.qml
@@ -14,7 +14,13 @@ Rectangle {
     // The wallet's token holdings (backend.tokenHoldings()); the selector narrows
     // them to this slot's token. The chosen holding id is exposed as selectedHoldingId.
     property var holdings: []
-    readonly property string tokenDefinitionIdHex: root.token ? String(root.token.definitionId || "") : ""
+    // The token's definitionId as configured (TOKENS_CONFIG passes it through
+    // as-is — base58 or hex). tokenHoldings emits both encodings per holding, so
+    // match on whichever this id is: a 64-char hex string filters the holding's
+    // definitionIdHex, otherwise the base58 definitionId. (Filtering on a single
+    // fixed encoding shows "No funds" whenever the config uses the other one.)
+    readonly property string tokenDefinitionId: root.token ? String(root.token.definitionId || "") : ""
+    readonly property bool tokenIdIsHex: /^[0-9a-fA-F]{64}$/.test(root.tokenDefinitionId)
     readonly property string selectedHoldingId: accountSelector.selectedAccountId
     property bool active: true
     // When true, restrict input to digits only — used for the sell-amount
@@ -182,12 +188,10 @@ Rectangle {
             Layout.preferredWidth: Math.round(tiContent.width / 2)
             sourceModel: root.holdings
             accountType: "TokenHolding"
-            // The swap view is hex end-to-end: the token's definitionId is hex, so match the
-            // holding's hex definitionIdHex (tokenHoldings emits both — `definitionId` is base58
-            // for the liquidity view). Filtering on `definitionId` here never matches a hex
-            // stateValue, so every token would show "No funds".
-            stateField: "definitionIdHex"
-            stateValue: root.tokenDefinitionIdHex
+            // Match the holding encoding to the configured id's encoding (see
+            // tokenDefinitionId above): hex → definitionIdHex, base58 → definitionId.
+            stateField: root.tokenIdIsHex ? "definitionIdHex" : "definitionId"
+            stateValue: root.tokenIdIsHex ? root.tokenDefinitionId.toLowerCase() : root.tokenDefinitionId
             selectionMode: ProgramAccountSelector.Input
             showWhenSingle: true
             textAlignment: Text.AlignRight