bump version to 0.0.12

apps/desktop/electrobun.config.ts

@@ -4,7 +4,7 @@ export default {
 	app: {
 		name: 'koins',
 		identifier: 'koins.tzgyn.com',
-		version: '0.0.6',
+		version: '0.0.12',
 	},
 	build: {
 		// Vite builds to dist/, we copy from there

apps/desktop/package.json

@@ -20,6 +20,7 @@
 		"d3-shape": "^3.2.0",
 		"electrobun": "^1.18.1",
 		"env-paths": "^4.0.0",
+		"jsqr": "^1.4.0",
 		"mode-watcher": "^1.1.0",
 		"monero-ts": "^0.11.8",
 		"qrcode": "^1.5.4",

apps/desktop/src/bun/lib/monero/wallet.ts

@@ -41,13 +41,40 @@ function rpcConnection(
 	})
 }
 
+function withTimeout<T>(
+	promise: Promise<T>,
+	ms: number,
+	label: string,
+): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		const timer = setTimeout(
+			() => reject(new Error(`${label} timed out after ${ms}ms`)),
+			ms,
+		)
+		promise.then(
+			(v) => {
+				clearTimeout(timer)
+				resolve(v)
+			},
+			(e) => {
+				clearTimeout(timer)
+				reject(e)
+			},
+		)
+	})
+}
+
 async function rawRpc(
 	state: MoneroWalletState,
 	method: string,
 	params: Record<string, any> = {},
 ): Promise<any> {
 	const conn = rpcConnection(state)
-	const res = await conn.sendJsonRequest(method, params)
+	const res = await withTimeout(
+		conn.sendJsonRequest(method, params),
+		30000,
+		`wallet-rpc ${method}`,
+	)
 	if (res?.error)
 		throw new Error(res.error.message || JSON.stringify(res.error))
 	return res?.result
@@ -62,7 +89,11 @@ async function waitForRpc(
 	while (Date.now() - start < timeoutMs) {
 		try {
 			const conn = rpcConnection(state)
-			const res = await conn.sendJsonRequest('get_version', {})
+			const res = await withTimeout(
+				conn.sendJsonRequest('get_version', {}),
+				5000,
+				'wallet-rpc probe',
+			)
 			if (res?.result?.version) {
 				console.log(`[monero] RPC ready after ${Date.now() - start}ms`)
 				return
@@ -290,7 +321,11 @@ export async function createWallet(
 		language: 'English',
 	})
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const address = await state.wallet.getAddress(0, 0)
+	const address = (await withTimeout(
+		state.wallet.getAddress(0, 0),
+		30000,
+		'wallet get_address',
+	)) as string
 	console.log(`[monero] wallet created: ${name} -> ${address}`)
 	return { mnemonic: result.mnemonic, address }
 }
@@ -329,7 +364,7 @@ export async function openWallet(
 		state.wallet = await connectClient(state)
 	}
 	try {
-		await state.wallet.openWallet(name, password)
+		await withTimeout(state.wallet.openWallet(name, password), 30000, `open_wallet ${name}`)
 		log(`[monero] wallet opened: ${name}`)
 	} catch (e) {
 		logError(`[monero] wallet open failed (${name})`, e)
@@ -348,8 +383,16 @@ export async function getBalance(
 	state: MoneroWalletState,
 ): Promise<{ balance: bigint; unlocked: bigint }> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const balance = (await state.wallet.getBalance()) as bigint
+	const balance = (await withTimeout(
-	const unlocked = (await state.wallet.getUnlockedBalance()) as bigint
+		state.wallet.getBalance(),
+		30000,
+		'wallet get_balance',
+	)) as bigint
+	const unlocked = (await withTimeout(
+		state.wallet.getUnlockedBalance(),
+		30000,
+		'wallet get_unlocked_balance',
+	)) as bigint
 	console.log(`[monero] balance: ${balance} (unlocked: ${unlocked})`)
 	return { balance, unlocked }
 }
@@ -360,9 +403,10 @@ export async function getAddress(
 	subIdx = 0,
 ): Promise<string> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const address = (await state.wallet.getAddress(
+	const address = (await withTimeout(
-		accountIdx,
+		state.wallet.getAddress(accountIdx, subIdx),
-		subIdx,
+		30000,
+		'wallet get_address',
 	)) as string
 	console.log(`[monero] address: ${address}`)
 	return address
@@ -398,7 +442,11 @@ export async function getAccounts(
 	state: MoneroWalletState,
 ): Promise<any[]> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const accounts = (await state.wallet.getAccounts(true)) as any[]
+	const accounts = (await withTimeout(
+		state.wallet.getAccounts(true),
+		30000,
+		'wallet get_accounts',
+	)) as any[]
 	console.log(`[monero] accounts: ${accounts?.length ?? 0} returned`)
 	if (accounts?.length) {
 		for (const acct of accounts) {
@@ -543,7 +591,11 @@ export async function getHeight(
 	state: MoneroWalletState,
 ): Promise<number> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const height = (await state.wallet.getHeight()) as number
+	const height = (await withTimeout(
+		state.wallet.getHeight(),
+		30000,
+		'wallet get_height',
+	)) as number
 	console.log(`[monero] wallet height: ${height}`)
 	return height
 }
@@ -587,7 +639,11 @@ export async function getDaemonHeight(
 		const daemon = await connectToDaemonRpc(
 			`http://${state.daemonAddress}`,
 		)
-		const height = (await daemon.getHeight()) as number
+		const height = (await withTimeout(
+			daemon.getHeight(),
+		15000,
+			'daemon get_height',
+		)) as number
 		console.log(`[monero] daemon height: ${height}`)
 		return height
 	} catch (e) {
@@ -665,9 +721,13 @@ export async function isWalletOpen(
 ): Promise<boolean> {
 	if (!state.wallet) return false
 	try {
-		await state.wallet.getHeight()
+		await withTimeout(state.wallet.getHeight(), 8000, 'wallet get_height')
 		return true
-	} catch {
+	} catch (e) {
+		// A timeout usually means the wallet-rpc is busy syncing, not that
+		// the wallet is closed. Assume still-open so the UI doesn't flip to
+		// "closed" and try to re-open an already-open wallet.
+		if (e instanceof Error && e.message.includes('timed out')) return true
 		return false
 	}
 }
@@ -677,10 +737,12 @@ export async function isConnected(
 ): Promise<boolean> {
 	if (!state.wallet) return false
 	try {
-		const daemon = await connectToDaemonRpc(
+		const daemon = await withTimeout(
-			`http://${state.daemonAddress}`,
+			connectToDaemonRpc(`http://${state.daemonAddress}`),
+			8000,
+			'daemon connect',
 		)
-		await daemon.getHeight()
+		await withTimeout(daemon.getHeight(), 8000, 'daemon get_height')
 		return true
 	} catch (e) {
 		console.log(`[monero] connection check failed:`, e)

apps/desktop/src/bun/rpc/monero/index.ts

@@ -108,12 +108,19 @@ export function createMoneroHandlers(state: {
 			console.log('[rpc] moneroRestoreWallet:', name)
 			if (!state.manager)
 				throw new Error('Monero wallet RPC not started')
+			// Default to ~2 days of history instead of a full genesis scan
+			// (which can take hours against a remote daemon).
+			let height = restoreHeight
+			if (!height || height === 0) {
+				const tip = await walletGetDaemonHeight(state.manager)
+				if (tip > 1440) height = tip - 1440
+			}
 			await walletRestore(
 				state.manager,
 				name,
 				password,
 				mnemonic,
-				restoreHeight,
+				height,
 			)
 			const address = await walletGetAddress(state.manager)
 			console.log(
@@ -144,6 +151,7 @@ export function createMoneroHandlers(state: {
 			console.log('[rpc] moneroGetBalance')
 			if (!state.manager)
 				throw new Error('Monero wallet RPC not started')
+			try {
 				const { balance, unlocked } = await walletGetBalance(
 					state.manager,
 				)
@@ -164,6 +172,10 @@ export function createMoneroHandlers(state: {
 					height,
 					daemonHeight,
 				}
+			} catch (e) {
+				logError('[rpc] moneroGetBalance failed', e)
+				throw e
+			}
 		},
 		moneroGetTransactions: async ({
 			accountIndex,
@@ -173,12 +185,17 @@ export function createMoneroHandlers(state: {
 			console.log('[rpc] moneroGetTransactions', { accountIndex })
 			if (!state.manager)
 				throw new Error('Monero wallet RPC not started')
+			try {
 				const txs = await walletGetTransactions(
 					state.manager,
 					accountIndex,
 				)
 				console.log(`[rpc] moneroGetTransactions: ${txs.length} txs`)
 				return txs
+			} catch (e) {
+				logError('[rpc] moneroGetTransactions failed', e)
+				throw e
+			}
 		},
 		moneroWalletStatus: async () => {
 			if (!state.manager) {

apps/desktop/src/lib/components/qr-upload.svelte

@@ -0,0 +1,62 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button/index.js'
+	import Loader from '$lib/components/loader.svelte'
+	import QrCodeIcon from '@lucide/svelte/icons/qr-code'
+	import { decodeQrFromFile } from '$lib/qr.js'
+
+	let {
+		onDecode,
+		disabled = false,
+	}: {
+		onDecode: (text: string) => void
+		disabled?: boolean
+	} = $props()
+
+	let fileInput: HTMLInputElement
+	let busy = $state(false)
+	let error = $state('')
+
+	const handleFile = async (e: Event) => {
+		const file = (e.target as HTMLInputElement).files?.[0]
+		if (!file) return
+		busy = true
+		error = ''
+		try {
+			const text = await decodeQrFromFile(file)
+			if (!text) throw new Error('No QR code found in the image')
+			onDecode(text)
+		} catch (err) {
+			error = err instanceof Error ? err.message : 'Failed to read QR code'
+		} finally {
+			busy = false
+			if (fileInput) fileInput.value = ''
+		}
+	}
+</script>
+
+<div class="flex items-center gap-2">
+	<input
+		bind:this={fileInput}
+		type="file"
+		accept="image/*"
+		class="hidden"
+		onchange={handleFile}
+		disabled={disabled || busy} />
+	<Button
+		type="button"
+		variant="outline"
+		size="sm"
+		class="h-7 gap-1.5"
+		disabled={disabled || busy}
+		onclick={() => fileInput?.click()}>
+		{#if busy}
+			<Loader class="size-3.5" />
+		{:else}
+			<QrCodeIcon size={14} />
+		{/if}
+		Scan QR
+	</Button>
+	{#if error}
+		<span class="text-xs text-red-500">{error}</span>
+	{/if}
+</div>

apps/desktop/src/lib/qr.ts

@@ -0,0 +1,75 @@
+import jsQR from 'jsqr'
+
+export const decodeQrFromFile = (file: File): Promise<string> =>
+	new Promise((resolve, reject) => {
+		const url = URL.createObjectURL(file)
+		const img = new Image()
+		img.onload = () => {
+			try {
+				const canvas = document.createElement('canvas')
+				canvas.width = img.naturalWidth
+				canvas.height = img.naturalHeight
+				const ctx = canvas.getContext('2d')
+				if (!ctx) throw new Error('Canvas is not supported')
+				ctx.drawImage(img, 0, 0)
+				const { data, width, height } = ctx.getImageData(
+					0,
+					0,
+					canvas.width,
+					canvas.height,
+				)
+				resolve(jsQR(data, width, height)?.data ?? '')
+			} catch (e) {
+				reject(e)
+			} finally {
+				URL.revokeObjectURL(url)
+			}
+		}
+		img.onerror = () => {
+			URL.revokeObjectURL(url)
+			reject(new Error('Could not load the image'))
+		}
+		img.src = url
+	})
+
+export type QrParseResult = {
+	address: string
+	amount?: string
+	destinationTag?: string
+}
+
+// Handles payment URIs (monero:ADDRESS?tx_amount=..., xrp:rADDR?amount=..&dt=..)
+// as well as bare addresses. Returns the last path-like segment before any
+// query string so prefixes and /pay paths are skipped.
+export const parseQrPayload = (
+	text: string,
+	kind: 'xrp' | 'monero',
+): QrParseResult => {
+	let body = text.trim().replace(/\s+/g, '')
+	body = body.replace(/^(?:[a-z0-9+.-]+):\/?\//i, '')
+	const [beforeQuery, queryRaw] = body.split('?')
+	const segments = beforeQuery.split('/')
+	const address = segments[segments.length - 1]
+
+	const params: Record<string, string> = {}
+	if (queryRaw) {
+		for (const pair of queryRaw.split('&')) {
+			const eq = pair.indexOf('=')
+			const key = (eq >= 0 ? pair.slice(0, eq) : pair).toLowerCase()
+			const value = eq >= 0 ? decodeURIComponent(pair.slice(eq + 1)) : ''
+			if (key) params[key] = value
+		}
+	}
+
+	if (kind === 'xrp') {
+		return {
+			address,
+			amount: params['amount'] || undefined,
+			destinationTag: params['dt'] || undefined,
+		}
+	}
+	return {
+		address,
+		amount: params['tx_amount'] || undefined,
+	}
+}

apps/desktop/src/lib/states/monero-wallet.svelte.ts

@@ -1,5 +1,7 @@
 import {
 	electrobun,
+	frontendLog,
+	frontendLogError,
 	type MoneroTxEntry,
 	type MoneroAccountEntry,
 	type MoneroSendResult,
@@ -25,7 +27,7 @@ export const atomicToXmr = (atomic: string): string => {
 	return frac ? `${whole}.${frac}` : `${whole}`
 }
 
-export const MoneroWallet = () => {
+export const createMoneroWallet = () => {
 	let accountType = $state<'monero' | null>(null)
 	let ready = $state(false)
 	let biometricAvailable = $state(false)
@@ -51,6 +53,30 @@ export const MoneroWallet = () => {
 	let passwordRequired = $state(false)
 	let startInFlight: Promise<{ running: boolean; connected: boolean }> | null = null
 	let loginInFlight: Promise<void> | null = null
+	let refreshInFlight: Promise<void> | null = null
+	let syncing = $state(false)
+	let syncRetryTimer: ReturnType<typeof setTimeout> | null = null
+	let autoRefreshTimer: ReturnType<typeof setInterval> | null = null
+	let price = $state<string | null>(null)
+	let priceInFlight = false
+
+	const rpcTimeout = <T>(promise: Promise<T>, ms: number, label: string): Promise<T> =>
+		new Promise<T>((resolve, reject) => {
+			const timer = setTimeout(
+				() => reject(new Error(`${label} timed out after ${ms}ms`)),
+				ms,
+			)
+			promise.then(
+				(v) => {
+					clearTimeout(timer)
+					resolve(v)
+				},
+				(e) => {
+					clearTimeout(timer)
+					reject(e)
+				},
+			)
+		})
 
 	const beginOpening = () => {
 		openingDepth += 1
@@ -80,7 +106,10 @@ export const MoneroWallet = () => {
 		return authed === true
 	}
 
+	let initPromise: Promise<void> | null = null
 	const init = async () => {
+		if (initPromise) return initPromise
+		initPromise = (async () => {
 			await checkStatus()
 			if (installed && !running && !downloading) {
 				await start()
@@ -88,6 +117,8 @@ export const MoneroWallet = () => {
 			}
 			await checkBiometric()
 			ready = true
+		})()
+		return initPromise
 	}
 
 	const login = async () => {
@@ -203,14 +234,22 @@ export const MoneroWallet = () => {
 	const checkStatus = async () => {
 		if (!electrobun.rpc) return
 		const [binStatus] = await tryCatch(
+			rpcTimeout(
 				electrobun.rpc.request.moneroBinaryStatus({}),
+				15000,
+				'moneroBinaryStatus',
+			),
 		)
 		if (binStatus) {
 			installed = binStatus.installed
 			downloading = binStatus.downloading
 		}
 		const [status] = await tryCatch(
+			rpcTimeout(
 				electrobun.rpc.request.moneroWalletStatus({}),
+				30000,
+				'moneroWalletStatus',
+			),
 		)
 		if (status) {
 			running = status.running
@@ -362,13 +401,60 @@ export const MoneroWallet = () => {
 		if (remember) await moneroStorePassword(target, password)
 	}
 
+	const scheduleSyncRetry = () => {
+		if (syncRetryTimer) clearTimeout(syncRetryTimer)
+		syncRetryTimer = setTimeout(async () => {
+			syncRetryTimer = null
+			if (walletOpen && !loading) await refresh()
+		}, 15000)
+	}
+
+	const stopAutoRefresh = () => {
+		if (autoRefreshTimer) {
+			clearInterval(autoRefreshTimer)
+			autoRefreshTimer = null
+		}
+	}
+
+	// Refresh runs in the store so the dashboard's connection/sync state
+	// stays live regardless of which page is mounted.
+	const startAutoRefresh = () => {
+		if (autoRefreshTimer || !walletOpen) return
+		autoRefreshTimer = setInterval(() => {
+			if (walletOpen && !loading) refresh()
+		}, 30000)
+	}
+
+	// $effect needs a root outside a component; the root lives for the
+	// lifetime of the singleton store.
+	$effect.root(() => {
+		$effect(() => {
+			if (walletOpen && !loading) startAutoRefresh()
+			else if (!walletOpen) stopAutoRefresh()
+		})
+	})
+
 	const refresh = async () => {
-		if (!electrobun.rpc) return
+		const rpc = electrobun.rpc
+		if (!rpc) return
+		if (refreshInFlight) return refreshInFlight
+		refreshInFlight = (async () => {
 			loading = true
+			let failed = false
+			const wasSyncing = syncing
+			let lastError: unknown = null
 			try {
-			const [bal] = await tryCatch(
+				const [bal, balErr] = await tryCatch(
-				electrobun.rpc.request.moneroGetBalance({}),
+					rpcTimeout(
+						rpc.request.moneroGetBalance({}),
+						20000,
+						'moneroGetBalance',
+					),
 				)
+				if (balErr) {
+					failed = true
+					lastError = balErr
+				}
 				if (bal) {
 					balAtomic = bal.balance
 					unlockedAtomic = bal.unlocked
@@ -376,17 +462,64 @@ export const MoneroWallet = () => {
 					height = bal.height
 					daemonHeight = bal.daemonHeight
 				}
-			const [result] = await tryCatch(
+				const [result, txErr] = await tryCatch(
-				electrobun.rpc.request.moneroGetTransactions({
+					rpcTimeout(
+						rpc.request.moneroGetTransactions({
 							accountIndex: selectedAccountIndex,
 						}),
+						20000,
+						'moneroGetTransactions',
+					),
 				)
+				if (txErr) {
+					failed = true
+					lastError = txErr
+				}
 				txs = result ?? []
-			await fetchAccounts()
+				const ok = await fetchAccounts()
+				if (!ok) {
+					failed = true
+					lastError = new Error('moneroGetAccounts failed')
+				}
+				if (failed) {
+					// The wallet-rpc is likely busy syncing; keep the stale
+					// balance and retry shortly instead of showing an error.
+					syncing = true
+					scheduleSyncRetry()
+					frontendLogError(
+						`monero refresh failed (height ${height}/${daemonHeight})`,
+						lastError,
+					)
+				} else {
+					if (wasSyncing) {
+						frontendLog(`monero sync complete at height ${height}`)
+					}
+					syncing = false
+				}
 			} catch (e) {
-			error = e instanceof Error ? e.message : 'Monero refresh failed'
+				syncing = true
+				scheduleSyncRetry()
+				frontendLogError(
+					`monero refresh failed (height ${height}/${daemonHeight})`,
+					e,
+				)
 			} finally {
 				loading = false
+				refreshInFlight = null
+			}
+		})()
+		return refreshInFlight
+	}
+
+	const fetchPrice = async () => {
+		const rpc = electrobun.rpc
+		if (!rpc || priceInFlight) return
+		priceInFlight = true
+		try {
+			const [p] = await tryCatch(rpc.request.fetchMoneroPrice({}))
+			if (p) price = p.usd
+		} finally {
+			priceInFlight = false
 		}
 	}
 
@@ -506,6 +639,12 @@ export const MoneroWallet = () => {
 		get passwordRequired() {
 			return passwordRequired
 		},
+		get syncing() {
+			return syncing
+		},
+		get price() {
+			return price
+		},
 		get error() {
 			return error
 		},
@@ -555,6 +694,7 @@ export const MoneroWallet = () => {
 		autoUnlock,
 		unlockWallet,
 		refresh,
+		fetchPrice,
 		send,
 		sendAll,
 		createAccount,
@@ -562,4 +702,15 @@ export const MoneroWallet = () => {
 	}
 }
 
+// Singleton: calling MoneroWallet() always returns the same instance, so
+// no component can ever create a second, disconnected wallet state.
+type MoneroWalletStore = ReturnType<typeof createMoneroWallet>
+
+let moneroWalletInstance: MoneroWalletStore | null = null
+
+export const MoneroWallet = (): MoneroWalletStore => {
+	if (!moneroWalletInstance) moneroWalletInstance = createMoneroWallet()
+	return moneroWalletInstance
+}
+
 export const moneroWallet = MoneroWallet()

apps/desktop/src/lib/states/xrp-wallet.svelte.ts

@@ -13,7 +13,7 @@ export const xrpNetwork = {
 	explorerAddressUrl: 'https://xrpscan.com/account/',
 } as const
 
-export const XrpWallet = () => {
+export const createXrpWallet = () => {
 	let accountType = $state<'xrp' | null>(null)
 	let ready = $state(false)
 	let biometricAvailable = $state(false)
@@ -29,6 +29,9 @@ export const XrpWallet = () => {
 	let loading = $state(false)
 	let error = $state('')
 	let wallets = $state<XrpWalletInfo[]>([])
+	let balances = $state<Record<string, { balance: number; funded: boolean }>>({})
+	let balancesLoading = $state(false)
+	let fetchBalancesInFlight = false
 	let currentWalletId = $state<string | null>(null)
 	let currentPasswordHash = $state<string | null>(null)
 
@@ -73,7 +76,10 @@ export const XrpWallet = () => {
 		biometricAvailable = ok === true
 	}
 
+	let initPromise: Promise<void> | null = null
 	const init = async () => {
+		if (initPromise) return initPromise
+		initPromise = (async () => {
 			if (!electrobun.rpc) return
 			const [walletList] = await tryCatch(
 				electrobun.rpc.request.xrpListWallets({}),
@@ -86,6 +92,8 @@ export const XrpWallet = () => {
 			}
 			await checkBiometric()
 			ready = true
+		})()
+		return initPromise
 	}
 
 	const login = async () => {
@@ -319,6 +327,34 @@ export const XrpWallet = () => {
 		})()
 	}
 
+	const fetchBalances = async () => {
+		const rpc = electrobun.rpc
+		if (!rpc || fetchBalancesInFlight) return
+		if (wallets.length === 0) return
+		fetchBalancesInFlight = true
+		balancesLoading = true
+		try {
+			const [p] = await tryCatch(rpc.request.fetchXrpPrice({}))
+			if (p) price = p.usd
+			await Promise.allSettled(
+				wallets.map(async (w) => {
+					const [res] = await tryCatch(
+						rpc.request.xrpGetBalance({ address: w.address }),
+					)
+					if (res) {
+						balances[w.address] = {
+							balance: parseFloat(res.balance),
+							funded: res.funded,
+						}
+					}
+				}),
+			)
+		} finally {
+			balancesLoading = false
+			fetchBalancesInFlight = false
+		}
+	}
+
 	const send = async (
 		to: string,
 		amount: string,
@@ -399,6 +435,12 @@ export const XrpWallet = () => {
 		get wallets() {
 			return wallets
 		},
+		get balances() {
+			return balances
+		},
+		get balancesLoading() {
+			return balancesLoading
+		},
 		get currentWalletId() {
 			return currentWalletId
 		},
@@ -424,6 +466,7 @@ export const XrpWallet = () => {
 		login,
 		logout,
 		refresh,
+		fetchBalances,
 		createWallet,
 		importWallet,
 		lock,
@@ -442,4 +485,15 @@ export const XrpWallet = () => {
 	}
 }
 
+// Singleton: calling XrpWallet() always returns the same instance, so no
+// component can ever create a second, disconnected wallet state.
+type XrpWalletStore = ReturnType<typeof createXrpWallet>
+
+let xrpWalletInstance: XrpWalletStore | null = null
+
+export const XrpWallet = (): XrpWalletStore => {
+	if (!xrpWalletInstance) xrpWalletInstance = createXrpWallet()
+	return xrpWalletInstance
+}
+
 export const xrpWallet = XrpWallet()

apps/desktop/src/routes/index.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
 	import { moneroWallet } from '$lib/states/monero-wallet.svelte.js'
 	import { xrpWallet } from '$lib/states/xrp-wallet.svelte.js'
-	import { electrobun } from '$lib/electrobun.js'
 	import { navigate } from 'sv-router/generated'
 	import { onMount } from 'svelte'
 	import {
@@ -16,30 +15,23 @@
 	import WalletIcon from '@lucide/svelte/icons/wallet'
 	import Loader from '$lib/components/loader.svelte'
 	import { frontendLog, frontendLogError } from '$lib/electrobun.js'
-
+	import { arc } from 'd3-shape'
-	let xrpPrice = $state<string | null>(null)
+	import { tweened } from 'svelte/motion'
-	let xmrPrice = $state<string | null>(null)
+	import { cubicOut } from 'svelte/easing'
-	let xrpBalances = $state<Record<string, { balance: number; funded: boolean }>>({})
-	let loadingXrp = $state(true)
-	let loadingXmr = $state(true)
-	let fetchXrpInFlight = false
 
 	let feError = $state<string | null>(null)
 
-	const usd = (amount: string, price: string | null) =>
-		price ? parseFloat(amount) * parseFloat(price) : 0
-
 	const xrpTotalUsd = $derived.by(() => {
-		const price = xrpPrice
+		const p = xrpWallet.price
 		return xrpWallet.wallets.reduce((sum, w) => {
-			const b = xrpBalances[w.address]?.balance ?? 0
+			const b = xrpWallet.balances[w.address]?.balance ?? 0
-			return sum + (price ? b * parseFloat(price) : 0)
+			return sum + (p ? b * parseFloat(p) : 0)
 		}, 0)
 	})
 
 	const xrpTotalBalance = $derived.by(() =>
 		xrpWallet.wallets.reduce((sum, w) => {
-			return sum + (xrpBalances[w.address]?.balance ?? 0)
+			return sum + (xrpWallet.balances[w.address]?.balance ?? 0)
 		}, 0),
 	)
 
@@ -47,17 +39,54 @@
 		moneroWallet.walletOpen ? parseFloat(moneroWallet.balance || '0') : 0,
 	)
 	const xmrTotalUsd = $derived(
-		moneroWallet.walletOpen && xmrPrice
+		moneroWallet.walletOpen && moneroWallet.price
-			? xmrBalance * parseFloat(xmrPrice)
+			? xmrBalance * parseFloat(moneroWallet.price)
 			: 0,
 	)
 
 	const portfolioUsd = $derived(xrpTotalUsd + xmrTotalUsd)
 
+	const xrpShare = $derived(portfolioUsd > 0 ? xrpTotalUsd / portfolioUsd : 0)
+	const xmrShare = $derived(
+		portfolioUsd > 0 ? xmrTotalUsd / portfolioUsd : 0,
+	)
+
+	const tweenedUsd = tweened(0, { duration: 600, easing: cubicOut })
+	const tweenedXrpShare = tweened(0, { duration: 600, easing: cubicOut })
+
+	$effect(() => {
+		tweenedUsd.set(portfolioUsd)
+		tweenedXrpShare.set(xrpShare)
+	})
+
+	const donut = $derived.by(() => {
+		if (portfolioUsd <= 0) return { xrp: '', xmr: '' }
+		const a = arc<{ startAngle: number; endAngle: number }>()
+			.innerRadius(62)
+			.outerRadius(80)
+			.padAngle(0.02)
+		const start = -Math.PI / 2
+		const endXrp = start + $tweenedXrpShare * 2 * Math.PI
+		return {
+			xrp: a({ startAngle: start, endAngle: endXrp }) ?? '',
+			xmr: a({ startAngle: endXrp, endAngle: start + 2 * Math.PI }) ?? '',
+		}
+	})
+
 	const hasXrp = $derived(xrpWallet.wallets.length > 0)
 	const hasXmr = $derived(moneroWallet.wallets.length > 0)
 	const noWallets = $derived(!hasXrp && !hasXmr)
 
+	const moneroDot = $derived(
+		!moneroWallet.running
+			? 'bg-muted'
+			: !moneroWallet.connected
+				? 'bg-red-500'
+				: moneroWallet.syncing || moneroWallet.height < moneroWallet.daemonHeight
+					? 'bg-yellow-500 animate-pulse'
+					: 'bg-emerald-500',
+	)
+
 	const fmtUsd = (v: number) =>
 		v.toLocaleString(undefined, {
 			minimumFractionDigits: 2,
@@ -70,66 +99,23 @@
 			maximumFractionDigits: dp,
 		})
 
-	async function fetchXrp() {
+	const fmtPct = (v: number) => `${Math.round(v * 100)}%`
-		if (fetchXrpInFlight) return
-		fetchXrpInFlight = true
-		loadingXrp = true
-		const rpc = electrobun.rpc
-		if (!rpc) {
-			loadingXrp = false
-			fetchXrpInFlight = false
-			return
-		}
-		try {
-			const p = await rpc.request.fetchXrpPrice({})
-			if (p) xrpPrice = p.usd
-		} catch { /* ignore */ }
-		await Promise.allSettled(
-			xrpWallet.wallets.map(async (w) => {
-				const res = await rpc.request.xrpGetBalance({
-					address: w.address,
-				})
-				xrpBalances[w.address] = {
-					balance: parseFloat(res.balance),
-					funded: res.funded,
-				}
-			}),
-		)
-		loadingXrp = false
-		fetchXrpInFlight = false
-	}
-
-	async function fetchXmr() {
-		loadingXmr = true
-		const rpc = electrobun.rpc
-		if (!rpc) {
-			loadingXmr = false
-			return
-		}
-		try {
-			const p = await rpc.request.fetchMoneroPrice({})
-			xmrPrice = p?.usd ?? null
-		} catch { /* ignore */ }
-		loadingXmr = false
-	}
 
 	onMount(() => {
 		frontendLog('dashboard mounted')
-		moneroWallet.init().catch((e) => frontendLogError('moneroWallet.init() failed', e))
-		xrpWallet.init().catch((e) => frontendLogError('xrpWallet.init() failed', e))
-		fetchXmr()
 	})
 
-	// Wait for the XRP wallet list to load, then fetch balances.
+	// Balances live in the stores so they survive navigation; the effects
+	// only trigger background refetches.
 	$effect(() => {
 		if (xrpWallet.ready && xrpWallet.wallets.length > 0) {
-			fetchXrp()
+			xrpWallet.fetchBalances()
 		}
 	})
 
 	$effect(() => {
 		if (moneroWallet.walletOpen) {
-			fetchXmr()
+			moneroWallet.fetchPrice()
 		}
 	})
 
@@ -189,9 +175,9 @@
 			</div>
 		</div>
 	{:else}
-		<div class="flex flex-col items-center pt-4 pb-2">
+<div class="flex flex-col items-center pt-4 pb-2">
 				<p class="text-xs text-muted-foreground">Total Portfolio Value</p>
-			{#if loadingXrp || loadingXmr || moneroWallet.opening || (moneroWallet.wallets.length > 0 && !moneroWallet.walletOpen)}
+				{#if moneroWallet.opening || (moneroWallet.wallets.length > 0 && !moneroWallet.walletOpen) || (xrpWallet.wallets.length > 0 && !xrpWallet.price) || (moneroWallet.walletOpen && !moneroWallet.price)}
 					<div class="mt-2 h-9 w-44 rounded-md bg-muted animate-pulse"></div>
 				{:else}
 					<p class="mt-1 text-3xl font-semibold tabular-nums">
@@ -200,6 +186,43 @@
 				{/if}
 			</div>
 
+			<Card>
+				<CardHeader class="pb-2">
+					<CardTitle class="text-base">Portfolio Allocation</CardTitle>
+					<CardDescription class="text-xs">
+						Share of your balance by asset
+					</CardDescription>
+				</CardHeader>
+				<CardContent class="flex flex-col items-center gap-5 py-6">
+					<div class="relative">
+						<svg viewBox="-100 -100 200 200" class="size-48">
+							<path d={donut.xrp} fill="#0EA5E9" />
+							<path d={donut.xmr} fill="#F97316" />
+						</svg>
+						<div
+							class="absolute inset-0 flex flex-col items-center justify-center">
+							<p
+								class="text-lg font-semibold tabular-nums">$
+								{fmtUsd($tweenedUsd)}
+							</p>
+							<p class="text-xs text-muted-foreground">
+								Portfolio
+							</p>
+						</div>
+					</div>
+					<div class="flex gap-5 text-xs">
+						<span class="flex items-center gap-1.5">
+							<span class="size-2.5 rounded-full bg-sky-500"></span>
+							XRP · {fmtPct($tweenedXrpShare)}
+						</span>
+						<span class="flex items-center gap-1.5">
+							<span class="size-2.5 rounded-full bg-orange-500"></span>
+							XMR · {fmtPct(1 - $tweenedXrpShare)}
+						</span>
+					</div>
+				</CardContent>
+			</Card>
+
 			<div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
 			<button
 				onclick={() => navigate('/xrp')}
@@ -210,21 +233,19 @@
 							<img src="/icons/xrp.png" alt="" class="size-5 rounded-full" />
 							<CardTitle class="text-base">XRP</CardTitle>
 						</div>
-						<CardDescription class="text-xs">
+						<CardDescription class="text-xs">XRP Ledger</CardDescription>
-							{xrpWallet.wallets.length} wallet{xrpWallet.wallets.length !== 1 ? 's' : ''}
-						</CardDescription>
 					</CardHeader>
 					<CardContent class="flex flex-1 flex-col justify-center">
-						{#if !xrpWallet.ready || loadingXrp || (xrpWallet.wallets.length > 0 && Object.keys(xrpBalances).length === 0)}
+						{#if !xrpWallet.ready || (xrpWallet.wallets.length > 0 && Object.keys(xrpWallet.balances).length === 0)}
 							<div class="h-14 flex items-center"><Loader /></div>
 						{:else}
 							<p class="font-mono text-xl tabular-nums">{fmtBal(xrpTotalBalance)}</p>
-							{#if xrpPrice}
+							{#if xrpWallet.price}
 								<p class="mt-0.5 text-sm text-muted-foreground tabular-nums">
 									${fmtUsd(xrpTotalUsd)}
 								</p>
 								<p class="mt-2 text-xs text-muted-foreground">
-									${fmtUsd(parseFloat(xrpPrice) )} / XRP
+									${fmtUsd(parseFloat(xrpWallet.price) )} / XRP
 								</p>
 							{/if}
 						{/if}
@@ -241,23 +262,28 @@
 							<img src="/icons/monero.png" alt="" class="size-5 rounded-full" />
 							<CardTitle class="text-base">Monero</CardTitle>
 						</div>
-						<CardDescription class="text-xs">
+						<CardDescription class="flex items-center gap-1.5 text-xs">
-							{moneroWallet.walletOpen
+							<span class="size-2 shrink-0 rounded-full {moneroDot}"></span>
-								? moneroWallet.walletName || 'Wallet open'
+							{#if !moneroWallet.running}
-								: moneroWallet.wallets.length > 0
+								Server offline
-									? `${moneroWallet.wallets.length} wallet${moneroWallet.wallets.length !== 1 ? 's' : ''}`
+							{:else if !moneroWallet.connected}
-									: 'Not set up'}
+								Connecting to daemon…
+							{:else}
+								{fmtBal(moneroWallet.height, 0)} / {fmtBal(moneroWallet.daemonHeight, 0)}
+							{/if}
 						</CardDescription>
 					</CardHeader>
 					<CardContent class="flex flex-1 flex-col justify-center">
 						{#if moneroWallet.walletOpen}
 							<p class="font-mono text-xl tabular-nums">{fmtBal(xmrBalance, 4)}</p>
-							{#if xmrPrice}
+							{#if !moneroWallet.syncing && moneroWallet.price}
 								<p class="mt-0.5 text-sm text-muted-foreground tabular-nums">
 									${fmtUsd(xmrTotalUsd)}
 								</p>
+							{/if}
+							{#if moneroWallet.price}
 								<p class="mt-2 text-xs text-muted-foreground">
-									${fmtUsd(parseFloat(xmrPrice) )} / XMR
+									${fmtUsd(parseFloat(moneroWallet.price) )} / XMR
 								</p>
 							{/if}
 						{:else if moneroWallet.passwordRequired && moneroWallet.wallets.length > 0}
@@ -285,8 +311,6 @@
 								<Loader />
 								<p class="text-sm text-muted-foreground">Opening wallet...</p>
 							</div>
-						{:else if loadingXmr}
-							<div class="h-14 flex items-center"><Loader /></div>
 						{:else}
 							<Button
 								onclick={() => navigate('/monero')}

apps/desktop/src/routes/layout.svelte

@@ -31,6 +31,7 @@
 		if (!xrpWallet.ready) await xrpWallet.init()
 		if (!moneroWallet.ready) await moneroWallet.init()
 		await Promise.allSettled([
+			xrpWallet.login(),
 			xrpWallet.autoUnlock(),
 			moneroWallet.login(),
 		])

apps/desktop/src/routes/monero/index.svelte

@@ -24,8 +24,6 @@
 	let unlocking = $state(false)
 	let unlockError = $state('')
 
-	let initStarted = false
-
 	async function unlockWithPassword() {
 		if (unlocking || !walletPassword.trim()) return
 		unlocking = true
@@ -48,16 +46,6 @@
 		}
 	})
 
-	$effect(() => {
-		if (!initStarted) {
-			initStarted = true
-			w.init().then(async () => {
-				if (w.accountType === 'monero') return
-				await w.login()
-			})
-		}
-	})
-
 	$effect(() => {
 		if (w.running && !w.walletOpen && w.wallets.length > 0 && !w.loading && !w.opening) {
 			w.autoUnlock(w.wallets[0])

apps/desktop/src/routes/monero/send.svelte

@@ -19,6 +19,8 @@
 		SelectTrigger,
 	} from '$lib/components/ui/select/index.js'
 	import { navigate } from 'sv-router/generated'
+	import QrUpload from '$lib/components/qr-upload.svelte'
+	import { parseQrPayload } from '$lib/qr.js'
 
 	const w = moneroWallet
 
@@ -134,7 +136,15 @@
 				</div>
 
 				<div class="space-y-1.5">
+					<div class="flex items-center justify-between">
 						<label class="text-xs font-medium">Recipient Address</label>
+						<QrUpload
+							onDecode={(text) => {
+								const parsed = parseQrPayload(text, 'monero')
+								recipient = parsed.address
+								if (parsed.amount && !sendAll) amountXmr = parsed.amount
+							}} />
+					</div>
 					<Input
 						placeholder="Monero address starting with 4..."
 						bind:value={recipient} />

apps/desktop/src/routes/monero/settings.svelte

@@ -15,10 +15,6 @@
 	const w = moneroWallet
 
 	let moneroSettingsPw = $state('')
-
-	$effect(() => {
-		w.init()
-	})
 </script>
 
 <div class="mx-auto max-w-xl">

apps/desktop/src/routes/monero/wallet/[name].svelte

@@ -154,7 +154,6 @@
 	$effect(() => {
 		if (w.walletOpen && !autoRefreshTimer) {
 			autoRefreshTimer = setInterval(() => {
-				w.refresh()
 				electrobun.rpc?.request
 					.fetchMoneroPrice({})
 					.then((p) => (moneroPrice = p))
@@ -203,7 +202,7 @@
 {:else}
 <div class="space-y-6">
 	<div class="flex flex-col items-center py-2">
-		{#if w.loading}
+		{#if w.loading && !w.syncing}
 			<div class="h-12 w-40 rounded-lg bg-muted animate-pulse"></div>
 		{:else}
 			<p class="text-sm text-muted-foreground">Balance</p>
@@ -223,6 +222,14 @@
 					Unlocked: {w.unlocked} XMR
 				</p>
 			{/if}
+			{#if w.syncing}
+				<div class="mt-2 flex items-center gap-2">
+					<Loader />
+					<p class="text-xs text-muted-foreground">
+						Syncing wallet — balance updates when the scan completes
+					</p>
+				</div>
+			{/if}
 			<div class="mt-2 flex items-center gap-1.5">
 				<div class="size-2 rounded-full {w.connected ? 'bg-green-500' : 'bg-red-500'}"></div>
 				<span class="text-xs text-muted-foreground">

apps/desktop/src/routes/xrp/index.svelte

@@ -22,18 +22,6 @@
 	let inputUnlockPassword = $state('')
 	let newSeed = $state<string | null>(null)
 
-	let initStarted = false
-
-	$effect(() => {
-		if (!initStarted) {
-			initStarted = true
-			w.init().then(async () => {
-				if (w.accountType === 'xrp') return
-				await w.login()
-			})
-		}
-	})
-
 	$effect(() => {
 		if (w.accountType === 'xrp' && w.currentWalletId && w.seed && !newSeed) {
 			navigate('/xrp/wallet/:id', {

apps/desktop/src/routes/xrp/send.svelte

@@ -10,6 +10,8 @@
 		CardDescription,
 	} from '$lib/components/ui/card/index.js'
 	import { navigate } from 'sv-router/generated'
+	import QrUpload from '$lib/components/qr-upload.svelte'
+	import { parseQrPayload } from '$lib/qr.js'
 
 	const w = xrpWallet
 
@@ -78,7 +80,16 @@
 				}}
 				class="space-y-4">
 				<div class="space-y-1.5">
+					<div class="flex items-center justify-between">
 						<label class="text-xs font-medium">Recipient Address</label>
+						<QrUpload
+							onDecode={(text) => {
+								const parsed = parseQrPayload(text, 'xrp')
+								recipient = parsed.address
+								if (parsed.destinationTag) destinationTag = parsed.destinationTag
+								if (parsed.amount) amountXrp = parsed.amount
+							}} />
+					</div>
 					<Input
 						placeholder="XRP address starting with r..."
 						bind:value={recipient} />

bun.lock

@@ -18,6 +18,7 @@
         "d3-shape": "^3.2.0",
         "electrobun": "^1.18.1",
         "env-paths": "^4.0.0",
+        "jsqr": "^1.4.0",
         "mode-watcher": "^1.1.0",
         "monero-ts": "^0.11.8",
         "qrcode": "^1.5.4",
@@ -640,6 +641,8 @@
 
     "json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
 
+    "jsqr": ["jsqr@1.4.0", "", {}, "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A=="],
+
     "kleur": ["kleur@4.1.5", "", {}, "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="],
 
     "koins": ["koins@workspace:apps/desktop"],
@@ -846,7 +849,7 @@
 
     "supports-color": ["supports-color@8.1.1", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="],
 
-    "sv-router": ["sv-router@0.18.0", "", { "dependencies": { "esm-env": "^1.2.2" }, "peerDependencies": { "svelte": "^5" }, "bin": { "sv-router": "./src/cli/index.js" } }, "sha512-gLky7FBGj8P6MAna1wxYniHJxMrXgaeTNnkZ7WH387ddRyUohfDtvEgWQFfB4oLL2XxWlw8Lfmk03TtBdK/JTA=="],
+    "sv-router": ["sv-router@0.18.1", "", { "dependencies": { "esm-env": "^1.2.2" }, "peerDependencies": { "svelte": "^5" }, "bin": { "sv-router": "./src/cli/index.js" } }, "sha512-xMJxgDwmcWtLDopU6xdEiBICRN40ucTlK63GUZf6cQk8689LUaUD5FlMrdtTdPFRQ2kfJBeJgoaI1k+XOuIQSQ=="],
 
     "svelte": ["svelte@5.55.5", "", { "dependencies": { "@jridgewell/remapping": "^2.3.4", "@jridgewell/sourcemap-codec": "^1.5.0", "@sveltejs/acorn-typescript": "^1.0.5", "@types/estree": "^1.0.5", "@types/trusted-types": "^2.0.7", "acorn": "^8.12.1", "aria-query": "5.3.1", "axobject-query": "^4.1.0", "clsx": "^2.1.1", "devalue": "^5.6.4", "esm-env": "^1.2.1", "esrap": "^2.2.4", "is-reference": "^3.0.3", "locate-character": "^3.0.0", "magic-string": "^0.30.11", "zimmerframe": "^1.1.2" } }, "sha512-2uCs/LZ9us+AktdzYJM8OcxQ8qnPS1kpaO7syGT/MgO+6Qr1Ybl+TqPq+97u7PHqmmMlye5ZkoyXONy5mjjAbw=="],