chore: code cleanup and fixes (#181)

## Description
This PR introduces minor fixes related to UI and the CLI.
## Type

- [x] Bug fix
- [ ] Feature
- [ ] Breaking change
- [ ] Documentation
- [ ] Chore

## Package

- [ ] `@parity/dotns-cli`
- [ ] Root/monorepo
- [ ] Documentation

## Related Issues

## Fixes 

## Checklist

### Code

- [x] Follows project style
- [x] `bun run lint` passes
- [x] `bun run format` passes
- [x] `bun run typecheck` passes

### Documentation

- [ ] README updated if needed
- [ ] Types updated if needed

### Breaking Changes

- [x] No breaking changes
- [ ] Breaking changes documented below

**Breaking changes:**

## Testing

How to test:

1. 
2. 

## Notes

Author: sphamjoli

packages/cli/README.md

@@ -446,8 +446,10 @@ dotns --password test-password store get mykey --account default
 dotns --password test-password store set mykey "my value" --account default
 dotns --password test-password store delete mykey --account default
 
-# List the .dot names in your Label Store, and cached CIDs
+# List the .dot names in your Label Store (second-level names only by default;
+# add --all to include subdomains), and cached CIDs
 dotns --password test-password store names --account default
+dotns --password test-password store names --all --account default
 dotns --password test-password store cids --account default
 
 # Settle any pending names from the PoP controller into your Label Store

packages/cli/src/cli/commands/escrow.ts

@@ -19,6 +19,7 @@ import {
   formatRefundEntryLine,
 } from "../../commands/escrow";
 import { listStoreNames } from "../../commands/storeManagement";
+import { resolveTransferRecipient } from "../transfer";
 import { addAuthOptions } from "./authOptions";
 import { prepareContext } from "../context";
 import { prepareReadOnlyContext } from "./lookup";
@@ -30,10 +31,22 @@ import {
   handleCommandError,
 } from "./jsonHelpers";
 import { formatWeiAsEther } from "../../utils/formatting";
+import type { ReadOnlyContext } from "../../types/types";
 
 const DEFAULT_REFUND_PAGE_SIZE = 50;
 const MAX_REFUND_PAGE_SIZE = 200;
 
+async function resolveRecipientOption(
+  jsonOutput: boolean,
+  context: ReadOnlyContext,
+  recipientOption: string | undefined,
+): Promise<Address> {
+  if (!recipientOption) return context.evmAddress as Address;
+  return maybeQuiet(jsonOutput, () =>
+    resolveTransferRecipient(context.clientWrapper, context.account.address, recipientOption),
+  );
+}
+
 interface EscrowCommonOptions {
   rpc?: string;
 }
@@ -110,7 +123,10 @@ export function attachEscrowCommands(root: Command) {
   const balanceCommand = escrowCommand
     .command("balance")
     .description("Show the caller's claimable pull-payment balance")
-    .option("--recipient <address>", "Recipient EVM address (defaults to caller)")
+    .option(
+      "--recipient <address>",
+      "Recipient EVM address, SS58 address, or .dot label (defaults to caller)",
+    )
     .option("--json", "Output result as JSON (suppresses all other output)", false);
   addAuthOptions(balanceCommand).action(async (options: RefundListOptions, command: Command) => {
     const jsonOutput = getJsonFlag(command);
@@ -120,7 +136,7 @@ export function attachEscrowCommands(root: Command) {
         prepareReadOnlyContext(mergedOptions as any),
       );
 
-      const recipient = (options.recipient ?? context.evmAddress) as Address;
+      const recipient = await resolveRecipientOption(jsonOutput, context, options.recipient);
 
       if (!jsonOutput) console.log(chalk.bold("\n▶ Escrow balance\n"));
       const spinner = ora();
@@ -143,7 +159,10 @@ export function attachEscrowCommands(root: Command) {
   const positionsCommand = escrowCommand
     .command("positions")
     .description("List all escrow positions for the caller and the total locked")
-    .option("--recipient <address>", "Recipient EVM address (defaults to caller)")
+    .option(
+      "--recipient <address>",
+      "Recipient EVM address, SS58 address, or .dot label (defaults to caller)",
+    )
     .option("--json", "Output result as JSON (suppresses all other output)", false);
   addAuthOptions(positionsCommand).action(async (options: RefundListOptions, command: Command) => {
     const jsonOutput = getJsonFlag(command);
@@ -153,7 +172,7 @@ export function attachEscrowCommands(root: Command) {
         prepareReadOnlyContext(mergedOptions as any),
       );
 
-      const recipient = (options.recipient ?? context.evmAddress) as Address;
+      const recipient = await resolveRecipientOption(jsonOutput, context, options.recipient);
 
       if (!jsonOutput) console.log(chalk.bold("\n▶ Escrow positions\n"));
       const spinner = ora();
@@ -344,7 +363,10 @@ export function attachEscrowCommands(root: Command) {
   const refundsListCommand = refundsCommand
     .command("list")
     .description("List pending refund entries for the caller (or a specified recipient)")
-    .option("--recipient <address>", "Recipient EVM address (defaults to caller)")
+    .option(
+      "--recipient <address>",
+      "Recipient EVM address, SS58 address, or .dot label (defaults to caller)",
+    )
     .option("--offset <n>", "Page offset", "0")
     .option(
       "--limit <n>",
@@ -369,7 +391,7 @@ export function attachEscrowCommands(root: Command) {
           throw new Error(`limit must be between 1 and ${MAX_REFUND_PAGE_SIZE}`);
         }
 
-        const recipient = (options.recipient ?? context.evmAddress) as Address;
+        const recipient = await resolveRecipientOption(jsonOutput, context, options.recipient);
 
         if (!jsonOutput) console.log(chalk.bold("\n▶ Refund ledger\n"));
         const spinner = ora();

packages/cli/src/cli/commands/store.ts

@@ -6,6 +6,7 @@ import { prepareAssetHubContext } from "../context";
 import { prepareReadOnlyContext } from "./lookup";
 import { getJsonFlag, maybeQuiet } from "./jsonHelpers";
 import { formatErrorMessage } from "../../utils/formatting";
+import { isSecondLevelDotName } from "../../utils/validation";
 import {
   claimUserStore,
   getStoreInfo,
@@ -98,7 +99,7 @@ export function attachStoreCommands(root: Command): void {
 
   const listCommand = storeCommand
     .command("list")
-    .description("List all values in your Store")
+    .description("List all values in your UserStore")
     .option("--json", "Output result as JSON", false);
 
   addAuthOptions(listCommand).action(async (options: any, cmd: any) => {
@@ -128,7 +129,8 @@ export function attachStoreCommands(root: Command): void {
 
   const namesCommand = storeCommand
     .command("names")
-    .description("List all .dot names in your Store")
+    .description("List .dot names in your LabelStore (second-level names only by default)")
+    .option("--all", "Include subdomains (default: only second-level .dot names)", false)
     .option("--json", "Output result as JSON", false);
 
   addAuthOptions(namesCommand).action(async (options: any, cmd: any) => {
@@ -140,7 +142,8 @@ export function attachStoreCommands(root: Command): void {
         prepareReadOnlyContext(merged),
       );
 
-      const names = await listStoreNames(clientWrapper, account.address, evmAddress as Address);
+      const allNames = await listStoreNames(clientWrapper, account.address, evmAddress as Address);
+      const names = options.all ? allNames : allNames.filter(isSecondLevelDotName);
 
       if (jsonOutput) {
         console.log(JSON.stringify({ names }));

packages/cli/src/commands/escrow.ts

@@ -351,16 +351,8 @@ export async function listRefunds(
     [recipient],
   );
 
-  const ids = await performContractCall<bigint[]>(
-    clientWrapper,
-    originSubstrateAddress,
-    CONTRACTS.DOTNS_NAME_ESCROW,
-    DOTNS_NAME_ESCROW_ABI,
-    "pendingRefundIds",
-    [recipient, BigInt(offset), BigInt(limit)],
-  );
-
-  const entries = await performContractCall<RawRefundEntry[]>(
+  // pendingRefunds has two outputs, so the call decodes to a [ids, entries] tuple.
+  const [ids, entries] = await performContractCall<[bigint[], RawRefundEntry[]]>(
     clientWrapper,
     originSubstrateAddress,
     CONTRACTS.DOTNS_NAME_ESCROW,

packages/cli/src/utils/validation.ts

@@ -25,6 +25,11 @@ export function asLabel(name: string): string {
   return raw.endsWith(".dot") ? raw.slice(0, -4) : raw;
 }
 
+// True for a single label under .dot ("alice", "alice.dot"), false for subdomains ("sub.alice").
+export function isSecondLevelDotName(name: string): boolean {
+  return asLabel(name).split(".").filter(Boolean).length === 1;
+}
+
 // A single canonical DNS label, mirroring the contract's StringUtils._isDnsLabel
 // (PopRules._requireCanonicalLabel / registry subnode rules): lowercase ASCII
 // letters, digits and hyphen only, no leading or trailing hyphen, length 1-63, no

packages/cli/tests/unit/cli/transfer.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, test } from "bun:test";
+import { checksumAddress } from "viem";
+import { resolveTransferRecipient } from "../../../src/cli/transfer";
+
+// Only the EVM-address and unrecognised-input branches are exercised here; the
+// SS58 and .dot-label branches resolve via the chain client and belong to
+// integration coverage.
+const NO_CLIENT = null as never;
+
+describe("resolveTransferRecipient", () => {
+  test("returns a raw EVM address in checksummed form without touching the chain", async () => {
+    const lower = "0x35cdb23ff7fc86e8dccd577ca309bfea9c978d20";
+    await expect(resolveTransferRecipient(NO_CLIENT, "", lower)).resolves.toBe(
+      checksumAddress(lower),
+    );
+  });
+
+  test("rejects input that is neither an EVM address, SS58 address, nor .dot label", async () => {
+    await expect(resolveTransferRecipient(NO_CLIENT, "", "not a name!!")).rejects.toThrow(
+      "Unrecognised recipient",
+    );
+  });
+});

packages/cli/tests/unit/escrow/escrowFormatting.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import type { Address } from "viem";
+import { decodeFunctionResult, encodeFunctionResult, type Address } from "viem";
 import {
   formatRefundEntryLine,
   totalEscrowAmount,
@@ -9,6 +9,7 @@ import {
   formatPositionStatus,
   formatPositionsTable,
 } from "../../../src/commands/escrow";
+import { DOTNS_NAME_ESCROW_ABI } from "../../../src/utils/constants";
 
 function stripAnsi(input: string): string {
   // forge-lint-equivalent: keep the ANSI assertions readable by stripping colour codes.
@@ -169,3 +170,54 @@ describe("formatPositionsTable", () => {
     expect(lines[1]).toContain("cooldown 1m 0s");
   });
 });
+
+const REFUND_RECIPIENT = "0x1111111111111111111111111111111111111111" as Address;
+
+// pendingRefunds has two outputs, so decodeFunctionResult yields a [ids, entries]
+// tuple; listRefunds depends on that shape.
+describe("pendingRefunds multi-output decode", () => {
+  test("decodes to a [ids, entries] tuple", () => {
+    const encoded = encodeFunctionResult({
+      abi: DOTNS_NAME_ESCROW_ABI,
+      functionName: "pendingRefunds",
+      result: [
+        [7n, 8n],
+        [
+          { recipient: REFUND_RECIPIENT, amount: 10n, availableAt: 0n, tokenId: 100n },
+          { recipient: REFUND_RECIPIENT, amount: 20n, availableAt: 0n, tokenId: 200n },
+        ],
+      ],
+    });
+
+    const [ids, entries] = decodeFunctionResult({
+      abi: DOTNS_NAME_ESCROW_ABI,
+      functionName: "pendingRefunds",
+      data: encoded,
+    }) as [
+      bigint[],
+      { recipient: Address; amount: bigint; availableAt: bigint; tokenId: bigint }[],
+    ];
+
+    expect(ids).toEqual([7n, 8n]);
+    expect(entries).toHaveLength(2);
+    expect(entries[0]!.amount).toBe(10n);
+    expect(entries[1]!.tokenId).toBe(200n);
+  });
+
+  test("decodes an empty ledger to a pair of empty arrays", () => {
+    const encoded = encodeFunctionResult({
+      abi: DOTNS_NAME_ESCROW_ABI,
+      functionName: "pendingRefunds",
+      result: [[], []],
+    });
+
+    const [ids, entries] = decodeFunctionResult({
+      abi: DOTNS_NAME_ESCROW_ABI,
+      functionName: "pendingRefunds",
+      data: encoded,
+    }) as [bigint[], unknown[]];
+
+    expect(ids).toEqual([]);
+    expect(entries).toEqual([]);
+  });
+});

packages/cli/tests/unit/utils/validation.test.ts

@@ -4,6 +4,7 @@ import {
   validateGovernanceLabel,
   validateCanonicalLabel,
   isCanonicalLabel,
+  isSecondLevelDotName,
   countTrailingDigits,
   stripTrailingDigits,
 } from "../../../src/utils/validation";
@@ -33,6 +34,20 @@ describe("isCanonicalLabel", () => {
   });
 });
 
+describe("isSecondLevelDotName", () => {
+  test("accepts a single label, with or without the .dot suffix", () => {
+    expect(isSecondLevelDotName("alice")).toBe(true);
+    expect(isSecondLevelDotName("alice.dot")).toBe(true);
+    expect(isSecondLevelDotName("ALICE.DOT")).toBe(true);
+  });
+
+  test("rejects subdomains", () => {
+    expect(isSecondLevelDotName("sub.alice")).toBe(false);
+    expect(isSecondLevelDotName("sub.alice.dot")).toBe(false);
+    expect(isSecondLevelDotName("a.b.c.dot")).toBe(false);
+  });
+});
+
 describe("validateCanonicalLabel", () => {
   test("throws for a name containing a dot, naming the role", () => {
     expect(() => validateCanonicalLabel("sphakjjj.77", "subname")).toThrow(/subname/);

packages/ui/src/router/index.ts

@@ -2,6 +2,11 @@ import { createRouter, createWebHashHistory } from "vue-router";
 import { lazyLoad, isChunkLoadError } from "@/lib/lazyLoad";
 import { formatErrorMessage } from "@/lib/errorHandling";
 
+// /upload and /preview share one component so Vue Router reuses the instance
+// between them; a separate lazyLoad() per route would unmount PreviewView on the
+// transition and discard the post-upload hand-off cache (blank preview).
+const previewView = lazyLoad(() => import("../views/PreviewView.vue"));
+
 const routes = [
   {
     path: "/",
@@ -27,12 +32,12 @@ const routes = [
   {
     path: "/upload",
     name: "Upload",
-    component: lazyLoad(() => import("../views/PreviewView.vue")),
+    component: previewView,
   },
   {
     path: "/preview/:encoded?",
     name: "PreviewEncoded",
-    component: lazyLoad(() => import("../views/PreviewView.vue")),
+    component: previewView,
   },
   {
     path: "/docs",

packages/ui/src/store/useUserStoreManager.ts

@@ -17,12 +17,25 @@ import type { DotnsAvailability } from "@/type";
 import { useResolverStore } from "./useResolverStore";
 import { useWalletStore } from "./useWalletStore";
 
-// Maximum store entries enumerated per page. A user with more than 256 entries
-// would need a paginated read; treat as a soft cap (shared by both stores).
+// Store getters cap each getLabels/getKeys call at this size, so reads must page.
 const STORE_PAGE_SIZE = 256n;
 
 const ZERO: Address = zeroAddress;
 
+// Pages a store getter to completion; fetchPage returns one page, or null on query failure.
+async function readAllPages<T>(
+  fetchPage: (offset: bigint, limit: bigint) => Promise<readonly T[] | null>,
+): Promise<T[]> {
+  const items: T[] = [];
+  for (let offset = 0n; ; offset += STORE_PAGE_SIZE) {
+    const page = await fetchPage(offset, STORE_PAGE_SIZE);
+    if (!page) break;
+    items.push(...page);
+    if (page.length < Number(STORE_PAGE_SIZE)) break;
+  }
+  return items;
+}
+
 // UserStore keys are bytes32. To stay interoperable with the CLI (`dotns store`),
 // a plain string key is hashed exactly as the CLI does: keccak256(toHex(value)).
 function userStoreKey(value: string): Hash {
@@ -81,11 +94,12 @@ export const useUserStoreManager = defineStore("userStoreManager", () => {
       const labelStore = await getLabelStore(evm);
       if (labelStore === ZERO) return [];
       const store = await getProxyContract("@dotns/label-store", labelStore);
-      const result = await store.getLabels!.query(0n, STORE_PAGE_SIZE, {
-        origin: ZERO_SUBSTRATE_ADDRESS,
+      return readAllPages<string>(async (offset, limit) => {
+        const result = await store.getLabels!.query(offset, limit, {
+          origin: ZERO_SUBSTRATE_ADDRESS,
+        });
+        return result.success ? ((result.value as string[]) ?? []) : null;
       });
-      if (!result.success) return [];
-      return (result.value as string[]) ?? [];
     });
   }
 
@@ -200,11 +214,12 @@ export const useUserStoreManager = defineStore("userStoreManager", () => {
       if (store === ZERO) return [];
 
       const proxy = await getProxyContract("@dotns/user-store", store);
-      const keysResult = await proxy.getKeys!.query(0n, STORE_PAGE_SIZE, {
-        origin: ZERO_SUBSTRATE_ADDRESS,
+      const keys = await readAllPages<Hash>(async (offset, limit) => {
+        const keysResult = await proxy.getKeys!.query(offset, limit, {
+          origin: ZERO_SUBSTRATE_ADDRESS,
+        });
+        return keysResult.success ? ((keysResult.value as Hash[]) ?? []) : null;
       });
-      if (!keysResult.success) return [];
-      const keys = (keysResult.value as Hash[]) ?? [];
 
       const cids: string[] = [];
       for (const key of keys) {