Skip to content

refactor(wallet): keep native DERO out of the contract-token list #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DHEBP merged 1 commit into from
Jun 17, 2026
Merged

refactor(wallet): keep native DERO out of the contract-token list #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,12 @@ func (a *App) GetTokenPortfolio() map[string]interface{} {
if resultMap, ok := result.(map[string]interface{}); ok {
if balances, ok := resultMap["balances"].(map[string]interface{}); ok {
for scid, balance := range balances {
// Native DERO is the base coin, not a contract token. Skip the
// zero SCID so it never appears in the contract-token list (its
// balance/send live on the Dashboard). Mirrors GetTrackedTokens.
if scid == deroSCID {
continue
}
token := map[string]interface{}{
"scid": scid,
"balance": balance,
Expand All @@ -1049,12 +1055,6 @@ func (a *App) GetTokenPortfolio() map[string]interface{} {
}
}

if scid == deroSCID {
token["name"] = "DERO"
token["symbol"] = "DERO"
token["native"] = true
}

tokens = append(tokens, token)
}
}
Expand Down
55 changes: 19 additions & 36 deletions frontend/src/lib/components/TokenPortfolio.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,16 +144,14 @@
let result = null;
let useXSWD = false;

// If local wallet is open, ALWAYS try GetTrackedTokens first (it includes native DERO)
// If local wallet is open, try GetTrackedTokens first. The list is
// contract-assets only — native DERO is the base coin and lives on the
// Dashboard, not here.
if (localWalletOpen) {
result = await GetTrackedTokens();
if (result.success) {
tokens = result.tokens || [];
tokens.sort((a, b) => {
if (a.native) return -1;
if (b.native) return 1;
return (b.balance || 0) - (a.balance || 0);
});
tokens.sort((a, b) => (b.balance || 0) - (a.balance || 0));
error = null;
loading = false;
maybeAutoScan();
Expand All @@ -166,11 +164,7 @@
result = await GetTokenPortfolio();
if (result.success) {
tokens = result.tokens || [];
tokens.sort((a, b) => {
if (a.native) return -1;
if (b.native) return 1;
return (b.balance || 0) - (a.balance || 0);
});
tokens.sort((a, b) => (b.balance || 0) - (a.balance || 0));
useXSWD = true;
error = null;
loading = false;
Expand Down Expand Up @@ -236,16 +230,17 @@
}
}

// Auto-scan once per mount when the portfolio holds nothing but native DERO —
// Auto-scan once per mount when the portfolio holds no contract tokens —
// mirrors Engram's first-view rescan. Runs quietly: a no-result auto-scan
// shows no toast, and if Gnomon isn't running the backend just returns an
// error we swallow (the manual Scan button surfaces it on demand).
async function maybeAutoScan() {
if (scanning || !localWalletOpen) return;
const addr = $walletState.address;
if (!addr || autoScannedWallets.has(addr)) return;
const onlyNative = tokens.length <= 1 && tokens.every(t => t.native);
if (!onlyNative) return;
// No contract tokens held yet — auto-scan to discover any. (Native DERO is
// never in this list, so an empty list means "no tokens".)
if (tokens.length > 0) return;
// Don't auto-scan against a half-built index. Right after a filter-change
// re-index (or any cold start), Gnomon's candidate set isn't complete yet, so
// a scan would find nothing and falsely conclude the wallet holds no tokens.
Expand Down Expand Up @@ -375,7 +370,8 @@
{:else if tokens.length === 0}
<div class="portfolio-empty">
<Coins size={24} strokeWidth={1} />
<p>No tokens found</p>
<p>No contract tokens yet</p>
<p class="empty-hint">This list holds DERO-native contract assets. Your DERO balance lives on the Dashboard.</p>
{#if localWalletOpen && !gnomonRunning}
<p class="empty-hint">Start Gnomon in Settings to auto-detect tokens your wallet holds.</p>
{/if}
Expand All @@ -390,17 +386,15 @@
{:else}
<div class="token-list">
{#each tokens as token}
<div class="token-row" class:native={token.native}>
<div class="token-row">
<div class="token-icon">
{#if shouldShowIcon(token.icon)}
<img src={token.icon} alt={token.name || 'Token'} on:error={() => handleIconError(token.icon)} />
{:else if token.native}
<span class="dero-icon">◆</span>
{:else}
<span class="default-icon">⬡</span>
{/if}
</div>

<div class="token-info">
<div class="token-name">
{token.name || 'Unknown Token'}
Expand All @@ -410,11 +404,9 @@
</div>
<div class="token-scid">
<span>{formatSCID(token.scid)}</span>
{#if !token.native}
<button class="copy-btn" on:click={() => copyToClipboard(token.scid)} title="Copy SCID">
<Copy size={10} />
</button>
{/if}
<button class="copy-btn" on:click={() => copyToClipboard(token.scid)} title="Copy SCID">
<Copy size={10} />
</button>
</div>
</div>

Expand All @@ -428,7 +420,7 @@
XSWD *server* is running — always, on most setups — which hid
these buttons permanently rather than only for remote portfolios. -->
<div class="row-actions">
{#if !token.native && localWalletOpen}
{#if localWalletOpen}
<button
class="row-action"
on:click={() => openRefreshModal(token)}
Expand All @@ -446,7 +438,7 @@
<ArrowUp size={13} strokeWidth={2} />
</button>
{/if}
{#if !token.native && localWalletOpen}
{#if localWalletOpen}
<button
class="row-action row-action-danger"
on:click={() => openRemoveModal(token)}
Expand Down Expand Up @@ -678,11 +670,7 @@
.token-row:hover {
background: var(--void-up);
}

.token-row.native {
background: linear-gradient(135deg, rgba(34, 211, 238, 0.05), transparent);
}


.token-icon {
width: 36px;
height: 36px;
Expand All @@ -701,11 +689,6 @@
object-fit: cover;
}

.dero-icon {
font-size: 18px;
color: var(--cyan-400);
}

.default-icon {
font-size: 16px;
color: var(--text-4);
Expand Down
14 changes: 4 additions & 10 deletions wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2660,16 +2660,10 @@ func (a *App) GetTrackedTokens() map[string]interface{} {

result := make([]map[string]interface{}, 0)

// Always include native DERO first if wallet is open
if localWalletOpen {
result = append(result, map[string]interface{}{
"scid": deroSCID,
"name": "DERO",
"symbol": "DERO",
"balance": readNativeBalance(wallet),
"native": true,
})
}
// Native DERO is the base coin, not a contract token: it is intentionally NOT
// listed here. Its balance and send/receive live on the Dashboard. Listing it
// among contract tokens routed native sends through the token-transfer path,
// which is reserved for non-zero SCIDs. This list is contract-assets only.

// For each tracked token, read the cached encrypted balance the wallet
// engine already maintains. A DERO token balance is an encrypted per-account
Expand Down
Loading