diff --git a/.repos/effect b/.repos/effect
index 7f524e25c..9a91b1926 160000
--- a/.repos/effect
+++ b/.repos/effect
@@ -1 +1 @@
-Subproject commit 7f524e25cfb49a71ac39b0f44278d08d40dda5de
+Subproject commit 9a91b1926a5fbfaffd302a7a41a94d4d53a1154e
diff --git a/biome.json b/biome.json
index 24886b8b5..af4692848 100644
--- a/biome.json
+++ b/biome.json
@@ -15,7 +15,9 @@
       "!**/region-iso-3166-codes.ts",
       "!**/mockServiceWorker.js",
       "!**/package.json",
-      "!**/.repos"
+      "!**/.repos",
+      "!**/CHANGELOG.md",
+      "!!**/@dedot/api/chaintypes/substrate/tx.d.ts"
     ]
   },
   "formatter": {
@@ -37,7 +39,7 @@
     "rules": {
       "preset": "recommended",
       "style": {
-        "noNonNullAssertion": "off",
+        "noNonNullAssertion": "error",
         "noParameterAssign": "error",
         "useAsConstAssertion": "error",
         "useDefaultParameterLast": "error",
@@ -59,14 +61,19 @@
       },
       "correctness": {
         "useJsxKeyInIterable": "off",
-        "useUniqueElementIds": "off"
+        "useUniqueElementIds": "off",
+        "noComponentHookFactories": "off"
       },
       "complexity": {
         "noForEach": "off",
         "useIndexOf": "off"
       },
       "nursery": {
-        "useReactCompiler": "error"
+        "useReactCompiler": "error",
+        "useExhaustiveSwitchCases": "error",
+        "noFloatingPromises": "error",
+        "noMisusedPromises": "error",
+        "noUselessTypeConversion": "error"
       }
     },
     "domains": {
@@ -76,6 +83,26 @@
     }
   },
   "overrides": [
+    {
+      "includes": ["packages/widget/src/**"],
+      "linter": {
+        "rules": {
+          "nursery": {
+            "noUnsafeTypeAssertion": "error"
+          }
+        }
+      }
+    },
+    {
+      "includes": ["packages/widget/tests/**"],
+      "linter": {
+        "rules": {
+          "style": {
+            "noNonNullAssertion": "off"
+          }
+        }
+      }
+    },
     {
       "includes": [
         "packages/widget/src/**",
diff --git a/package.json b/package.json
index 5c4a8fc1a..72b2888f9 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,6 @@
   ],
   "author": "Petar Todorovic <petar@omni.app> (https://github.com)",
   "license": "MIT",
-  "devEngines": {
-    "packageManager": {
-      "name": "pnpm",
-      "version": "12"
-    }
-  },
   "scripts": {
     "dev": "mise run dev --",
     "build": "mise run build --",
diff --git a/packages/examples/with-angular/package.json b/packages/examples/with-angular/package.json
index 809c00e03..a1c06f248 100644
--- a/packages/examples/with-angular/package.json
+++ b/packages/examples/with-angular/package.json
@@ -21,6 +21,7 @@
     "tslib": "catalog:"
   },
   "devDependencies": {
+    "@types/node": "catalog:",
     "@angular/build": "catalog:",
     "@angular/cli": "catalog:",
     "@angular/compiler-cli": "catalog:",
diff --git a/packages/examples/with-vite-bundled/package.json b/packages/examples/with-vite-bundled/package.json
index 93bd85fbe..1dc54493c 100644
--- a/packages/examples/with-vite-bundled/package.json
+++ b/packages/examples/with-vite-bundled/package.json
@@ -14,6 +14,7 @@
     "@stakekit/widget": "workspace:*"
   },
   "devDependencies": {
+    "@types/node": "catalog:",
     "@typescript/native": "catalog:",
     "vite": "catalog:"
   }
diff --git a/packages/examples/with-vite-bundled/src/main.ts b/packages/examples/with-vite-bundled/src/main.ts
index 9d5d5c3ff..b32c1382f 100644
--- a/packages/examples/with-vite-bundled/src/main.ts
+++ b/packages/examples/with-vite-bundled/src/main.ts
@@ -2,8 +2,11 @@ import "./style.css";
 import "@stakekit/widget/style.css";
 import { darkTheme, renderSKWidget } from "@stakekit/widget/bundle";
 
+const container = document.querySelector<HTMLDivElement>("#app");
+if (!container) throw new Error("Missing #app container");
+
 renderSKWidget({
-  container: document.querySelector<HTMLDivElement>("#app")!,
+  container,
   apiKey: import.meta.env.VITE_API_KEY,
   theme: darkTheme,
 });
diff --git a/packages/examples/with-vite/package.json b/packages/examples/with-vite/package.json
index c1b24fc58..ebb414fd9 100644
--- a/packages/examples/with-vite/package.json
+++ b/packages/examples/with-vite/package.json
@@ -16,6 +16,7 @@
     "react-dom": "catalog:"
   },
   "devDependencies": {
+    "@types/node": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "@typescript/native": "catalog:",
diff --git a/packages/examples/with-vite/src/main.tsx b/packages/examples/with-vite/src/main.tsx
index 95e2bdc2c..a6e452fa0 100644
--- a/packages/examples/with-vite/src/main.tsx
+++ b/packages/examples/with-vite/src/main.tsx
@@ -2,7 +2,10 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App.tsx";
 
-ReactDOM.createRoot(document.getElementById("root")!).render(
+const root = document.getElementById("root");
+if (!root) throw new Error("Missing #root element");
+
+ReactDOM.createRoot(root).render(
   <React.StrictMode>
     <App />
   </React.StrictMode>
diff --git a/packages/widget/package.json b/packages/widget/package.json
index e9b8c021c..76e4ca2fd 100644
--- a/packages/widget/package.json
+++ b/packages/widget/package.json
@@ -134,6 +134,7 @@
     "@tronweb3/tronwallet-adapter-bitkeep": "catalog:",
     "@tronweb3/tronwallet-adapter-ledger": "catalog:",
     "@tronweb3/tronwallet-adapter-tronlink": "catalog:",
+    "@types/node": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "@typescript/native": "catalog:",
diff --git a/packages/widget/playground/panel.tsx b/packages/widget/playground/panel.tsx
index 98c902551..4fe825dd2 100644
--- a/packages/widget/playground/panel.tsx
+++ b/packages/widget/playground/panel.tsx
@@ -40,7 +40,7 @@ const Choice = <Value extends string>({
   value,
 }: {
   readonly disabled?: boolean;
-  readonly hint?: string;
+  readonly hint?: string | undefined;
   readonly label: string;
   readonly onChange: (value: Value) => void;
   readonly options: ReadonlyArray<Value>;
@@ -75,7 +75,7 @@ const Toggle = ({
 }: {
   readonly checked: boolean;
   readonly disabled?: boolean;
-  readonly hint?: string;
+  readonly hint?: string | undefined;
   readonly label: string;
   readonly onChange: (checked: boolean) => void;
 }) => (
diff --git a/packages/widget/playground/playground-config.ts b/packages/widget/playground/playground-config.ts
index 5c5709af2..22f2f1aab 100644
--- a/packages/widget/playground/playground-config.ts
+++ b/packages/widget/playground/playground-config.ts
@@ -45,7 +45,7 @@ export type PlaygroundConfig = typeof PlaygroundConfigSchema.Type;
 export const defaultPlaygroundConfig: PlaygroundConfig = {
   wallet: "builtin",
   scriptedAddress: scriptedWalletAccount,
-  trackingLog: true,
+  trackingLog: false,
   variant: "default",
   theme: "dark",
   language: "auto",
diff --git a/packages/widget/scripts/architecture/check-architecture.ts b/packages/widget/scripts/architecture/check-architecture.ts
index cd70482ee..efab11b94 100644
--- a/packages/widget/scripts/architecture/check-architecture.ts
+++ b/packages/widget/scripts/architecture/check-architecture.ts
@@ -25,7 +25,6 @@ const { options: configuredOptions = {}, ...ruleSet } =
 const cruiseOutput = await cruise(["src"], {
   ...configuredOptions,
   baseDir: widgetRoot,
-  outputType: undefined,
   ruleSet,
   validate: true,
 });
diff --git a/packages/widget/scripts/architecture/dependency-cruiser.config.mts b/packages/widget/scripts/architecture/dependency-cruiser.config.mts
index 294e2f40f..9a3165327 100644
--- a/packages/widget/scripts/architecture/dependency-cruiser.config.mts
+++ b/packages/widget/scripts/architecture/dependency-cruiser.config.mts
@@ -271,10 +271,11 @@ const compileCollection = (
     sameOwnerInterfacePath: `^${declaration.root}/$1/${interfacePattern}\\.ts$`,
     interfacePaths,
     interfaceImporters,
-    parentInterfacePath:
-      declaration.parent === undefined
-        ? undefined
-        : `^${declaration.parent}/${interfacePattern}\\.ts$`,
+    ...(declaration.parent === undefined
+      ? {}
+      : {
+          parentInterfacePath: `^${declaration.parent}/${interfacePattern}\\.ts$`,
+        }),
   };
 };
 
diff --git a/packages/widget/scripts/generated-api/generated-schema-safety.ts b/packages/widget/scripts/generated-api/generated-schema-safety.ts
index d33813bd8..50e99830b 100644
--- a/packages/widget/scripts/generated-api/generated-schema-safety.ts
+++ b/packages/widget/scripts/generated-api/generated-schema-safety.ts
@@ -97,6 +97,8 @@ const schemaMemberName = (expression: ts.Expression): string | undefined => {
   ) {
     return current.expression.name.text;
   }
+
+  return undefined;
 };
 
 const isEmptyStruct = (expression: ts.Expression): boolean => {
diff --git a/packages/widget/scripts/smoke/check-production-host-consumption.ts b/packages/widget/scripts/smoke/check-production-host-consumption.ts
index 2c4287948..8453868c3 100644
--- a/packages/widget/scripts/smoke/check-production-host-consumption.ts
+++ b/packages/widget/scripts/smoke/check-production-host-consumption.ts
@@ -311,12 +311,16 @@ const assertEncryptWorkerStarts = async (
             name: string;
           }) => Worker)
         : undefined;
-    if (scriptUrl === null && InlineWorker === undefined) {
+    // Code here runs in the page: a named helper would be compiled to
+    // `__name(...)`, which the page does not define.
+    const worker =
+      InlineWorker === undefined
+        ? scriptUrl !== null &&
+          new Worker(scriptUrl, { name: "zama-fhe-encrypt", type: "module" })
+        : new InlineWorker({ name: "zama-fhe-encrypt" });
+    if (worker === false) {
       return `${chunk} does not export an inline worker constructor`;
     }
-    const worker = InlineWorker
-      ? new InlineWorker({ name: "zama-fhe-encrypt" })
-      : new Worker(scriptUrl!, { name: "zama-fhe-encrypt", type: "module" });
     const { promise, resolve } = Promise.withResolvers<string>();
     worker.addEventListener("message", (event) => {
       if (event.data === "zama-encrypt-worker-ready") resolve("ready");
diff --git a/packages/widget/src/app/composition/providers/theme-wrapper.tsx b/packages/widget/src/app/composition/providers/theme-wrapper.tsx
index 6757e6d7f..c513154fc 100644
--- a/packages/widget/src/app/composition/providers/theme-wrapper.tsx
+++ b/packages/widget/src/app/composition/providers/theme-wrapper.tsx
@@ -1,4 +1,5 @@
 import { assignInlineVars } from "@vanilla-extract/dynamic";
+import { Predicate } from "effect";
 import type { PropsWithChildren } from "react";
 import { useWidgetConfig } from "../../../features/widget-configuration/index";
 import type { WidgetConfig } from "../../../services/config/widget-config-model";
@@ -6,7 +7,10 @@ import { mergeDeep } from "../../../shared/effect/merge-deep";
 import { vars } from "../../../shared/styles/theme/contract.css";
 import { id, rootSelector } from "../../../shared/styles/theme/ids";
 import { lightTheme } from "../../../shared/styles/theme/themes";
-import { getFineryThemeOverrides } from "../../../shared/styles/theme/variant-overrides/finery";
+import {
+  type FineryBaseTheme,
+  getFineryThemeOverrides,
+} from "../../../shared/styles/theme/variant-overrides/finery";
 import { portoThemeOverrides } from "../../../shared/styles/theme/variant-overrides/porto";
 import { utilaThemeOverrides } from "../../../shared/styles/theme/variant-overrides/utila";
 import type { RecursivePartial } from "../../../shared/types/utils";
@@ -15,7 +19,7 @@ export const getThemeOverrides = ({
   baseTheme,
   variant,
 }: {
-  baseTheme: typeof lightTheme;
+  baseTheme: FineryBaseTheme;
   variant: WidgetConfig["variant"];
 }): RecursivePartial<typeof lightTheme> => {
   if (variant === "utila") {
@@ -33,6 +37,25 @@ export const getThemeOverrides = ({
   return {};
 };
 
+/**
+ * CSS variable assignments for a merged theme, read through the theme
+ * contract: each contract leaf (a `var(--…)` reference) takes the merged value
+ * at the same path. Values off the contract are not emitted.
+ */
+const themeVarEntries = (
+  contract: unknown,
+  tokens: unknown
+): ReadonlyArray<readonly [string, string]> => {
+  if (typeof contract === "string") {
+    return typeof tokens === "string" ? [[contract, tokens]] : [];
+  }
+  if (!Predicate.isObject(contract) || !Predicate.isObject(tokens)) return [];
+
+  return Object.entries(contract).flatMap(([key, node]) =>
+    themeVarEntries(node, tokens[key])
+  );
+};
+
 /** Theme variables for a host theme and variant, read from props. */
 export const ThemeStyles = ({
   children,
@@ -42,19 +65,21 @@ export const ThemeStyles = ({
   readonly theme: WidgetConfig["theme"];
   readonly variant: WidgetConfig["variant"];
 }>) => {
-  const baseTheme = mergeDeep(lightTheme, theme);
   const overrides = getThemeOverrides({
-    baseTheme,
+    baseTheme: {
+      color: { primary: theme?.color?.primary ?? lightTheme.color.primary },
+    },
     variant,
   });
   const finalTheme = mergeDeep(lightTheme, theme, overrides);
+  const themeVars = Object.fromEntries(themeVarEntries(vars, finalTheme));
 
   return (
     <div data-rk={id}>
       <style
         // biome-ignore lint: false
         dangerouslySetInnerHTML={{
-          __html: `${rootSelector} {${assignInlineVars(vars, finalTheme)}}`,
+          __html: `${rootSelector} {${assignInlineVars(themeVars)}}`,
         }}
       />
       {children}
diff --git a/packages/widget/src/app/composition/providers/widget-presentation.tsx b/packages/widget/src/app/composition/providers/widget-presentation.tsx
index bc1ad5318..529132b36 100644
--- a/packages/widget/src/app/composition/providers/widget-presentation.tsx
+++ b/packages/widget/src/app/composition/providers/widget-presentation.tsx
@@ -1,6 +1,7 @@
+import { Schema } from "effect";
 import type { PropsWithChildren } from "react";
 import { useTranslation } from "react-i18next";
-import type { Network } from "../../../domain/network/network";
+import { Network } from "../../../domain/network/network";
 import type { Token } from "../../../domain/token/token";
 import { isWalletNetwork } from "../../../domain/wallet/network";
 import { useWidgetConfig } from "../../../features/widget-configuration/index";
@@ -9,6 +10,8 @@ import {
   WidgetPresentationProvider,
 } from "../../../shared/ui/widget-presentation";
 
+const isNetwork = Schema.is(Network);
+
 /**
  * Populates the shared UI kit's rendering environment from widget config, so
  * `shared/ui` components render host preferences without importing
@@ -33,7 +36,7 @@ export const WidgetPresentationAdapter = ({ children }: PropsWithChildren) => {
     hostTokenIconMapping,
     layout: layout === "Dashboard" ? "dashboard" : "compact",
     locale: i18n.resolvedLanguage ?? i18n.language,
-    mapNetworkIconUrl: (network: Network) => {
+    mapNetworkIconUrl: (network: Token["network"]) => {
       if (!isWalletNetwork(network)) return undefined;
 
       return typeof chainIconMapping === "function"
@@ -42,10 +45,14 @@ export const WidgetPresentationAdapter = ({ children }: PropsWithChildren) => {
     },
     mapTokenIconUrl: (token: Token) => {
       if (!tokenIconMapping) return undefined;
+      if (typeof tokenIconMapping !== "function") {
+        return tokenIconMapping[token.symbol];
+      }
 
-      return typeof tokenIconMapping === "function"
-        ? tokenIconMapping(token as Parameters<typeof tokenIconMapping>[0])
-        : tokenIconMapping[token.symbol];
+      // Hosts receive an `SKToken`, whose network is limited to `Network`.
+      return isNetwork(token.network)
+        ? tokenIconMapping({ ...token, network: token.network })
+        : undefined;
     },
     portalContainer,
     variant,
diff --git a/packages/widget/src/app/layouts/dashboard/dashboard-routes.tsx b/packages/widget/src/app/layouts/dashboard/dashboard-routes.tsx
index 0521b9f73..2435e6115 100644
--- a/packages/widget/src/app/layouts/dashboard/dashboard-routes.tsx
+++ b/packages/widget/src/app/layouts/dashboard/dashboard-routes.tsx
@@ -24,7 +24,10 @@ import { WalletScopeRouteGuard } from "../../../features/wallet/composition";
 import { GlobalModals } from "../../../features/widget-shell/composition";
 // import { RewardsTabPage } from "../../../domain/portfolio/rewards";
 import { createYieldFlowRoutes } from "../../../features/yield-transaction-flow/composition";
-import { widgetRoutes } from "../../../services/navigation/widget-routes";
+import {
+  type WidgetPath,
+  widgetRoutes,
+} from "../../../services/navigation/widget-routes";
 import { BorrowFeatureRoute } from "../../routes/ui/borrow-feature-route";
 import { dashboardEarnRoute } from "./dashboard-earn-route";
 import {
@@ -33,7 +36,10 @@ import {
   DashboardOverview,
 } from "./dashboard-overview";
 import { DashboardShell } from "./dashboard-shell";
-import { resolveDashboardRouteTab } from "./dashboard-tabs";
+import {
+  type DashboardRouteTab,
+  resolveDashboardRouteTab,
+} from "./dashboard-tabs";
 
 const borrowRouteComposition = {
   WalletScopeRouteGuard,
@@ -48,7 +54,9 @@ export const shouldRegisterDashboardEarnFooterButton = (pathname: string) =>
  * transition (exit, then enter); steps inside one page, such as the Earn form
  * into its Review or a position into its unstake flow, keep the same key.
  */
-const resolveDashboardPageKey = (pathname: string): string => {
+const resolveDashboardPageKey = (
+  pathname: string
+): Exclude<DashboardRouteTab, "manage"> | WidgetPath => {
   const tab = resolveDashboardRouteTab(pathname);
   if (tab !== "manage") return tab;
   // A position's pages share its key: a market position, a yield position,
diff --git a/packages/widget/src/app/layouts/dashboard/dashboard-tabs/index.tsx b/packages/widget/src/app/layouts/dashboard/dashboard-tabs/index.tsx
index f8bf3a561..65c334130 100644
--- a/packages/widget/src/app/layouts/dashboard/dashboard-tabs/index.tsx
+++ b/packages/widget/src/app/layouts/dashboard/dashboard-tabs/index.tsx
@@ -21,10 +21,12 @@ import {
 } from "./styles.css";
 import { DashboardTab } from "./tab";
 
-type RouteTab = "earn" | "borrow" | "manage" | "activity";
+export type DashboardRouteTab = "earn" | "borrow" | "manage" | "activity";
 
 /** The route tab a dashboard pathname belongs to. */
-export const resolveDashboardRouteTab = (pathname: string): RouteTab => {
+export const resolveDashboardRouteTab = (
+  pathname: string
+): DashboardRouteTab => {
   if (Option.isSome(widgetRoutes.activity.matchPrefix(pathname))) {
     return "activity";
   }
@@ -37,7 +39,7 @@ export const resolveDashboardRouteTab = (pathname: string): RouteTab => {
   return "earn";
 };
 
-const tabsMap: Record<RouteTab, WidgetPath> = {
+const tabsMap: Record<DashboardRouteTab, WidgetPath> = {
   activity: widgetRoutes.activity.build(),
   borrow: widgetRoutes.borrow.build("Dashboard"),
   earn: widgetRoutes.earn.build(),
@@ -58,10 +60,10 @@ export const DashboardTabs = ({
     pendingYieldCategory ?? yieldSelection.selectedCategory;
   const selectedTab = resolveDashboardRouteTab(useLocation().pathname);
 
-  const onRouteTabPress = (selected: RouteTab) => {
+  const onRouteTabPress = (selected: DashboardRouteTab) => {
     if (selectedTab === selected) return;
     trackEvent("tabClicked", { selected });
-    navigation.push(tabsMap[selected]);
+    void navigation.push(tabsMap[selected]);
   };
 
   const onYieldCategoryPress = (category: YieldCategory) => {
@@ -70,7 +72,7 @@ export const DashboardTabs = ({
     }
 
     trackEvent("tabClicked", { selected: category });
-    navigation.push(dashboardEarnRoute.build({ yieldCategory: category }));
+    void navigation.push(dashboardEarnRoute.build({ yieldCategory: category }));
   };
 
   const borrowEnabled = useWidgetConfig("borrowEnabled");
diff --git a/packages/widget/src/app/layouts/dashboard/dashboard-tabs/tab.tsx b/packages/widget/src/app/layouts/dashboard/dashboard-tabs/tab.tsx
index d03b2bb32..0d8292214 100644
--- a/packages/widget/src/app/layouts/dashboard/dashboard-tabs/tab.tsx
+++ b/packages/widget/src/app/layouts/dashboard/dashboard-tabs/tab.tsx
@@ -39,7 +39,7 @@ export const DashboardTab = ({ isSelected, variant, onTabPress }: Props) => {
           pressAnimation,
           combineRecipeWithVariant({
             rec: tab,
-            state: isSelected ? "active" : undefined,
+            ...(isSelected ? { state: "active" } : {}),
             variant: appVariant,
           }),
         ])}
@@ -48,7 +48,7 @@ export const DashboardTab = ({ isSelected, variant, onTabPress }: Props) => {
         <Text
           className={combineRecipeWithVariant({
             rec: tabText,
-            state: isSelected ? "selected" : undefined,
+            ...(isSelected ? { state: "selected" } : {}),
             variant: appVariant,
           })}
           data-state={isSelected ? "selected" : "default"}
diff --git a/packages/widget/src/app/runtime/deep-link-coordinator.ts b/packages/widget/src/app/runtime/deep-link-coordinator.ts
index 622227d6c..939f82310 100644
--- a/packages/widget/src/app/runtime/deep-link-coordinator.ts
+++ b/packages/widget/src/app/runtime/deep-link-coordinator.ts
@@ -1,6 +1,10 @@
 import { Context, Effect, Layer, Ref, Stream } from "effect";
 import type { YieldPendingActionType } from "../../domain/action/pending-action";
-import type { YieldId } from "../../domain/identity/identifiers";
+import type {
+  ValidatorAddress,
+  YieldId,
+} from "../../domain/identity/identifiers";
+import type { BalanceDataKey } from "../../domain/portfolio/positions";
 import {
   sameWalletScopeOwner,
   type WalletScopeKey,
@@ -24,15 +28,15 @@ type YieldFlowStartInput = Parameters<
 type PendingActionIntent = Readonly<{
   readonly address: WalletScopeKey["address"];
   readonly network: WalletScopeKey["network"];
-  readonly pendingAction: string;
-  readonly validator: string | null;
-  readonly yieldId: string;
+  readonly pendingAction: YieldPendingActionType;
+  readonly validator: ValidatorAddress | null;
+  readonly yieldId: YieldId;
 }>;
 
 export type PendingActionDeepLinkObservation =
   | Readonly<{
       readonly _tag: "OpenValidatorSelection";
-      readonly balanceId: string;
+      readonly balanceId: BalanceDataKey;
       readonly intent: PendingActionIntent;
       readonly pendingActionType: YieldPendingActionType;
       readonly walletScope: WalletScopeKey;
@@ -49,7 +53,7 @@ export type DeepLinkRouteObservation = Readonly<{
   readonly maintenance: boolean;
   readonly pendingAction: PendingActionDeepLinkObservation | null;
   readonly position: {
-    readonly balanceId: string;
+    readonly balanceId: BalanceDataKey;
     readonly yieldId: YieldId;
   } | null;
   readonly ready: boolean;
diff --git a/packages/widget/src/domain/action/action-command.ts b/packages/widget/src/domain/action/action-command.ts
index a4c746b5b..1110720f8 100644
--- a/packages/widget/src/domain/action/action-command.ts
+++ b/packages/widget/src/domain/action/action-command.ts
@@ -64,7 +64,7 @@ export const preparePendingActionCommand = ({
   pendingAction: PendingAction;
   yieldBalance: PendingActionBalance;
   integration: EarnYieldWithProvider;
-  selectedValidators: ValidatorDto["address"][];
+  selectedValidators: ReadonlyArray<ValidatorDto["address"]>;
 }): Result.Result<PreparedPendingAction, Error> => {
   if (!address) return Result.fail(new Error("missing address"));
 
@@ -97,7 +97,7 @@ export const preparePendingActionCommand = ({
         getPendingActionStateKey({
           balanceType: yieldBalance.type,
           token: yieldBalance.token,
-          actionType: pendingAction.type as YieldPendingActionType,
+          actionType: pendingAction.type,
           passthrough: pendingAction.passthrough,
         })
       )
@@ -119,7 +119,7 @@ export const preparePendingActionCommand = ({
 
   return Result.succeed({
     command: {
-      action: pendingAction.type as YieldPendingActionType,
+      action: pendingAction.type,
       address,
       arguments: { ...args, ...(additionalAddresses ?? {}) },
       passthrough: pendingAction.passthrough,
diff --git a/packages/widget/src/domain/action/direct-transaction.ts b/packages/widget/src/domain/action/direct-transaction.ts
index f5d2cc4ab..ddec62699 100644
--- a/packages/widget/src/domain/action/direct-transaction.ts
+++ b/packages/widget/src/domain/action/direct-transaction.ts
@@ -1,8 +1,16 @@
+import { Schema } from "effect";
 import { encodeFunctionData, erc20Abi } from "viem";
 import type { Network } from "../network/network";
+import type { EvmChainIds } from "../wallet/chain-ids";
 
 type Address = `0x${string}`;
 
+/** Names a Direct Transaction for one Flow Session; no API knows it. */
+export const DirectTransactionId = Schema.NonEmptyString.pipe(
+  Schema.brand("DirectTransactionId")
+);
+export type DirectTransactionId = typeof DirectTransactionId.Type;
+
 /** An ERC-20 allowance an approval sets: `owner` lets `spender` move `amount` of `token`. */
 export type Erc20Approval = Readonly<{
   readonly amount: bigint;
@@ -21,10 +29,10 @@ export type DirectTransaction = Readonly<{
    * signing, since an approval may have landed after it was planned.
    */
   readonly approval: Erc20Approval | null;
-  readonly chainId: number;
+  readonly chainId: EvmChainIds;
   readonly data: Address;
   /** Stable for one Flow Session, so a retry finds it again. */
-  readonly id: string;
+  readonly id: DirectTransactionId;
   readonly network: Network;
   readonly to: Address;
   readonly type: "APPROVAL" | "RESET_APPROVAL" | "WRAP";
@@ -43,8 +51,8 @@ export const makeErc20Approval = ({
   type,
   ...approval
 }: Erc20Approval & {
-  readonly chainId: number;
-  readonly id: string;
+  readonly chainId: EvmChainIds;
+  readonly id: DirectTransactionId;
   readonly network: Network;
   readonly type: "APPROVAL" | "RESET_APPROVAL";
 }): DirectTransaction => ({
@@ -55,7 +63,7 @@ export const makeErc20Approval = ({
     args: [approval.spender, type === "APPROVAL" ? approval.amount : 0n],
     functionName: "approve",
   }),
-  id: type === "APPROVAL" ? id : `${id}-reset`,
+  id: type === "APPROVAL" ? id : DirectTransactionId.make(`${id}-reset`),
   network,
   to: approval.token,
   type,
diff --git a/packages/widget/src/domain/action/models.ts b/packages/widget/src/domain/action/models.ts
index bc6c81777..60704d567 100644
--- a/packages/widget/src/domain/action/models.ts
+++ b/packages/widget/src/domain/action/models.ts
@@ -1,5 +1,6 @@
 import { Schema, Struct } from "effect";
 import * as YieldApi from "../../generated/api/yield-schema";
+import { TolerantNullOr } from "../decoding/response-schema";
 import {
   ExactBaseUnitAmount,
   ExactDecimal,
@@ -9,9 +10,12 @@ import {
 import {
   ActionId,
   ProviderOption,
+  SignedTransactionPayload,
+  TransactionHash,
   TransactionId,
   ValidatorAddress,
   WalletAddress,
+  WalletSignature,
   YieldId,
 } from "../identity/identifiers";
 import { Token } from "../token/token";
@@ -54,7 +58,6 @@ export const ActionTransaction = Schema.Struct({
     "network",
     "status",
     "type",
-    "hash",
     "unsignedTransaction",
     "annotatedTransaction",
     "structuredTransaction",
@@ -69,15 +72,23 @@ export const ActionTransaction = Schema.Struct({
     field: "broadcastedAt",
   }),
   createdAt: UtcDateTimeFromString,
+  hash: TolerantNullOr(TransactionHash, {
+    operation: "yield-action-transaction",
+    field: "hash",
+  }),
   id: TransactionId,
 });
 export type ActionTransaction = typeof ActionTransaction.Type;
 
 // Status polling and submission only read these fields; validating the rest
 // would let unrelated additions fail an in-flight transaction.
-export const ActionTransactionReceipt = Schema.Struct(
-  Struct.pick(YieldApi.TransactionDto.fields, ["status", "hash", "explorerUrl"])
-);
+export const ActionTransactionReceipt = Schema.Struct({
+  ...Struct.pick(YieldApi.TransactionDto.fields, ["status", "explorerUrl"]),
+  hash: TolerantNullOr(TransactionHash, {
+    operation: "yield-transaction-receipt",
+    field: "hash",
+  }),
+});
 export type ActionTransactionReceipt = typeof ActionTransactionReceipt.Type;
 
 // `executionPattern` and `events` are unread, so they are not decoded.
@@ -139,14 +150,20 @@ export const PendingAction = Schema.Struct({
 export type PendingAction = typeof PendingAction.Type;
 
 export const SubmitTransactionHashCommand = Schema.Struct({
-  payload: YieldApi.SubmitHashDto,
+  payload: Schema.Struct({ hash: TransactionHash }),
   transactionId: TransactionId,
 });
 export type SubmitTransactionHashCommand =
   typeof SubmitTransactionHashCommand.Type;
 
+/** A yield message is submitted as its signature, a transaction as its payload. */
 export const SubmitSignedTransactionCommand = Schema.Struct({
-  payload: YieldApi.SubmitTransactionDto,
+  payload: Schema.Struct({
+    signedTransaction: Schema.Union([
+      SignedTransactionPayload,
+      WalletSignature,
+    ]),
+  }),
   transactionId: TransactionId,
 });
 export type SubmitSignedTransactionCommand =
diff --git a/packages/widget/src/domain/action/pending-action.ts b/packages/widget/src/domain/action/pending-action.ts
index 8b97d0568..2c9477308 100644
--- a/packages/widget/src/domain/action/pending-action.ts
+++ b/packages/widget/src/domain/action/pending-action.ts
@@ -77,7 +77,7 @@ export const getPendingActionAmountConfig = (
   const maximum = amountArg.maximum;
 
   return {
-    required: !!amountArg.required,
+    required: amountArg.required,
     minimum,
     maximum,
     forceMax:
diff --git a/packages/widget/src/domain/borrow/execution/action.ts b/packages/widget/src/domain/borrow/execution/action.ts
index 6d8093f1c..8ae746721 100644
--- a/packages/widget/src/domain/borrow/execution/action.ts
+++ b/packages/widget/src/domain/borrow/execution/action.ts
@@ -61,8 +61,22 @@ export const Action = Schema.Struct({
 });
 export type Action = typeof Action.Type;
 
-export const isUnsuccessfulBorrowActionStatus = (status: string) =>
-  status === "FAILED" || status === "CANCELED" || status === "STALE";
+/** Every action status is classified, so a new one must be placed here. */
+const borrowActionStatusOutcome = {
+  CREATED: "Running",
+  WAITING_FOR_NEXT: "Running",
+  PROCESSING: "Running",
+  SUCCESS: "Succeeded",
+  FAILED: "Unsuccessful",
+  CANCELED: "Unsuccessful",
+  STALE: "Unsuccessful",
+} as const satisfies Record<
+  Action["status"],
+  "Running" | "Succeeded" | "Unsuccessful"
+>;
 
-export const isTerminalBorrowActionStatus = (status: string) =>
-  status === "SUCCESS" || isUnsuccessfulBorrowActionStatus(status);
+export const isUnsuccessfulBorrowActionStatus = (status: Action["status"]) =>
+  borrowActionStatusOutcome[status] === "Unsuccessful";
+
+export const isTerminalBorrowActionStatus = (status: Action["status"]) =>
+  borrowActionStatusOutcome[status] !== "Running";
diff --git a/packages/widget/src/domain/borrow/execution/transaction.ts b/packages/widget/src/domain/borrow/execution/transaction.ts
index f8d0b859e..f5bc7c7cf 100644
--- a/packages/widget/src/domain/borrow/execution/transaction.ts
+++ b/packages/widget/src/domain/borrow/execution/transaction.ts
@@ -1,6 +1,12 @@
 import { Effect, Schema, SchemaTransformation, Struct } from "effect";
 import * as BorrowApi from "../../../generated/api/borrow";
+import { TolerantNullOr } from "../../decoding/response-schema";
 import { ExactBaseUnitAmount } from "../../finance/scalars";
+import {
+  SignedTransactionPayload,
+  TransactionHash,
+  WalletSignature,
+} from "../../identity/identifiers";
 import { TransactionId, WalletAddress } from "../ids";
 import { BorrowNetwork } from "../network";
 
@@ -135,16 +141,25 @@ export const decodeBorrowTypedDataForWallet = (transaction: Transaction) =>
     })
   );
 
-export const SubmitTransactionCommand = Schema.Struct(
-  BorrowApi.SubmitTransactionDto.fields
-);
+/** A typed-data step is submitted as its signature, a transaction as its payload. */
+export const SubmitTransactionCommand = Schema.Struct({
+  signedPayload: Schema.optionalKey(
+    Schema.Union([SignedTransactionPayload, WalletSignature])
+  ),
+  transactionHash: Schema.optionalKey(TransactionHash),
+});
 export type SubmitTransactionCommand = typeof SubmitTransactionCommand.Type;
 
-export const SubmitTransactionResult = Schema.Struct(
-  Struct.pick(BorrowApi.SubmitTransactionResponseDto.fields, [
-    "transactionHash",
+export const SubmitTransactionResult = Schema.Struct({
+  ...Struct.pick(BorrowApi.SubmitTransactionResponseDto.fields, [
     "link",
     "status",
-  ])
-);
+  ]),
+  transactionHash: Schema.optionalKey(
+    TolerantNullOr(TransactionHash, {
+      operation: "borrow-transaction-submit",
+      field: "transactionHash",
+    })
+  ),
+});
 export type SubmitTransactionResult = typeof SubmitTransactionResult.Type;
diff --git a/packages/widget/src/domain/borrow/network.ts b/packages/widget/src/domain/borrow/network.ts
index 4e306a618..2d46a3a7e 100644
--- a/packages/widget/src/domain/borrow/network.ts
+++ b/packages/widget/src/domain/borrow/network.ts
@@ -21,21 +21,16 @@ const borrowChainsByNetwork: Record<BorrowNetwork, Chain> = {
   optimism,
 };
 
-const borrowChainEntries = Object.entries(borrowChainsByNetwork) as [
-  BorrowNetwork,
-  Chain,
-][];
-
-const borrowChainIdsToNetworks = Object.fromEntries(
-  borrowChainEntries.map(([network, chain]) => [
-    decodeChainId(chain.id),
+const borrowChainIdsToNetworks = new Map<ChainId, BorrowNetwork>(
+  borrowNetworks.map((network) => [
+    decodeChainId(borrowChainsByNetwork[network].id),
     network,
   ])
-) as Record<ChainId, BorrowNetwork>;
+);
 
 export const isBorrowNetwork = Schema.is(BorrowNetwork);
 
 export const getBorrowNetworkForChainId = (
   chainId: number | string
 ): BorrowNetwork | null =>
-  borrowChainIdsToNetworks[decodeChainId(chainId)] ?? null;
+  borrowChainIdsToNetworks.get(decodeChainId(chainId)) ?? null;
diff --git a/packages/widget/src/domain/borrow/positions/position-action-key.ts b/packages/widget/src/domain/borrow/positions/position-action-key.ts
new file mode 100644
index 000000000..e183d7d0b
--- /dev/null
+++ b/packages/widget/src/domain/borrow/positions/position-action-key.ts
@@ -0,0 +1,19 @@
+import { Schema } from "effect";
+import { TokenAddress } from "../../identity/identifiers";
+
+const TokenScopedPositionActionKey = Schema.TemplateLiteral([
+  Schema.Literals(["repay", "enableCollateral", "disableCollateral"]),
+  Schema.Literal("-"),
+  TokenAddress,
+]);
+
+/**
+ * Identifies a configurable action a borrow market position offers: withdraw
+ * is one action across collateral tokens, every other action is per token.
+ * Not the API action id; it keys the action's route and form.
+ */
+export const BorrowPositionActionKey = Schema.Union([
+  Schema.Literal("withdraw"),
+  TokenScopedPositionActionKey,
+]);
+export type BorrowPositionActionKey = typeof BorrowPositionActionKey.Type;
diff --git a/packages/widget/src/domain/borrow/responses.ts b/packages/widget/src/domain/borrow/responses.ts
index 042c5f5ca..6b8263c60 100644
--- a/packages/widget/src/domain/borrow/responses.ts
+++ b/packages/widget/src/domain/borrow/responses.ts
@@ -19,21 +19,24 @@ import {
 } from "./ids";
 import { BorrowAccountSnapshot } from "./positions/borrow-account-snapshot";
 
-const ItemIdentifier = Schema.Struct({ id: Schema.String }).pipe(
-  Schema.decodeTo(Schema.String, {
-    decode: SchemaGetter.transform((value) => value.id),
-    encode: SchemaGetter.forbidden(() => "Item identifier is decode-only"),
-  })
-);
+const itemIdentifier = (
+  id: typeof IntegrationId | typeof MarketId | typeof ActionId
+) =>
+  Schema.Struct({ id }).pipe(
+    Schema.decodeTo(Schema.String, {
+      decode: SchemaGetter.transform((value) => value.id),
+      encode: SchemaGetter.forbidden(() => "Item identifier is decode-only"),
+    })
+  );
 
 export const BorrowIntegrationsResponse = TolerantArray(Integration, {
   operation: "borrow-integrations",
-  identifier: ItemIdentifier,
+  identifier: itemIdentifier(IntegrationId),
 });
 
 const BorrowMarketItems = TolerantArray(Market, {
   operation: "borrow-markets",
-  identifier: ItemIdentifier,
+  identifier: itemIdentifier(MarketId),
 });
 
 export const BorrowMarketsResponse = Schema.Struct({
@@ -112,7 +115,7 @@ export const BorrowActionsPage = Schema.Struct({
   items: Schema.optionalKey(
     TolerantArray(BorrowActivityAction, {
       operation: "borrow-actions",
-      identifier: ItemIdentifier,
+      identifier: itemIdentifier(ActionId),
     })
   ),
 });
diff --git a/packages/widget/src/domain/borrow/risk/collateral-state.ts b/packages/widget/src/domain/borrow/risk/collateral-state.ts
index 106f18bf6..9837a902d 100644
--- a/packages/widget/src/domain/borrow/risk/collateral-state.ts
+++ b/packages/widget/src/domain/borrow/risk/collateral-state.ts
@@ -30,10 +30,7 @@ export const getDefinitions = (
 
   for (const market of markets) {
     for (const collateralToken of market.collateralTokens) {
-      const tokenId = decodeTokenId({
-        address: collateralToken.token.address,
-        symbol: collateralToken.token.symbol,
-      });
+      const tokenId = decodeTokenId(collateralToken.token);
       const previous = definitions.get(tokenId);
       const definition = {
         liquidationThreshold: collateralToken.liquidationThreshold,
diff --git a/packages/widget/src/domain/borrow/risk/market-risk.ts b/packages/widget/src/domain/borrow/risk/market-risk.ts
index fc1c544c3..cea9a3a25 100644
--- a/packages/widget/src/domain/borrow/risk/market-risk.ts
+++ b/packages/widget/src/domain/borrow/risk/market-risk.ts
@@ -17,24 +17,24 @@ export const deriveMarketRiskLimits = (market: Market): MarketRiskLimits => {
   }
 
   return {
-    liquidationPenalty: market.collateralTokens.reduce(
+    liquidationPenalty: market.collateralTokens.reduce<BigNumber | null>(
       (result, token) =>
         result == null
           ? token.liquidationPenalty
           : BigNumber.max(result, token.liquidationPenalty),
-      null as BigNumber | null
+      null
     ),
-    liquidationThreshold: market.collateralTokens.reduce(
+    liquidationThreshold: market.collateralTokens.reduce<BigNumber | null>(
       (result, token) =>
         result == null
           ? token.liquidationThreshold
           : BigNumber.min(result, token.liquidationThreshold),
-      null as BigNumber | null
+      null
     ),
-    maxLtv: market.collateralTokens.reduce(
+    maxLtv: market.collateralTokens.reduce<BigNumber | null>(
       (result, token) =>
         result == null ? token.maxLtv : BigNumber.min(result, token.maxLtv),
-      null as BigNumber | null
+      null
     ),
   };
 };
diff --git a/packages/widget/src/domain/decoding/response-schema.ts b/packages/widget/src/domain/decoding/response-schema.ts
index d396655ee..d69e17ba1 100644
--- a/packages/widget/src/domain/decoding/response-schema.ts
+++ b/packages/widget/src/domain/decoding/response-schema.ts
@@ -56,13 +56,15 @@ export const TolerantArray = <Item extends Schema.ConstraintDecoder<unknown>>(
           const result = Schema.decodeUnknownResult(item)(input);
 
           return Result.match(result, {
-            onFailure: (failure) =>
-              logDecodeRejection({
+            onFailure: (failure) => {
+              const identifier = decodeIdentifier(options.identifier, input);
+              return logDecodeRejection({
                 operation: options.operation,
                 location: index,
-                identifier: decodeIdentifier(options.identifier, input),
+                ...(identifier === undefined ? {} : { identifier }),
                 issue: failure.message,
-              }).pipe(Effect.as(Option.none<Item["Type"]>())),
+              }).pipe(Effect.as(Option.none<Item["Type"]>()));
+            },
             onSuccess: Effect.succeedSome,
           });
         }).pipe(Effect.map(EArray.getSomes))
diff --git a/packages/widget/src/domain/earn/confidential.ts b/packages/widget/src/domain/earn/confidential.ts
index 0db075f48..2b88e1b7e 100644
--- a/packages/widget/src/domain/earn/confidential.ts
+++ b/packages/widget/src/domain/earn/confidential.ts
@@ -1,20 +1,31 @@
 import type BigNumber from "bignumber.js";
-import {
-  Data,
-  type HashMap,
-  Option,
-  Schema,
-  SchemaTransformation,
-  Struct,
-} from "effect";
+import { Data, type HashMap, Option, Schema, Struct } from "effect";
 import type { YieldAction } from "../action/models";
 import type { YieldPendingActionType } from "../action/pending-action";
-import { exactDecimal, truncateToTokenDecimals } from "../finance/exact";
+import {
+  exactDecimal,
+  exactZero,
+  truncateToTokenDecimals,
+} from "../finance/exact";
+import {
+  type ContractAddress,
+  TokenAddress,
+  WalletAddress,
+} from "../identity/identifiers";
 import type { Network } from "../network/network";
 import type { Token } from "../token/token";
+import type { EvmChainIds } from "../wallet/chain-ids";
 import { getWalletRoutingId } from "../wallet/network";
 import type { WalletScopeOwner } from "../wallet/wallet-scope";
-import type { EarnBalance, EarnYieldWithProvider } from "./models";
+import {
+  type BalanceShares,
+  ConfidentialHandle,
+  type EarnBalance,
+  type EarnBalanceShares,
+  type EarnYieldWithProvider,
+  getEncryptedHandle,
+  getVisibleShares,
+} from "./models";
 import { getYieldActionArg } from "./yield";
 
 type ConfidentialIntent = "enter" | "exit";
@@ -26,7 +37,12 @@ export type ConfidentialBatchSide = "redemption" | "subscription";
 
 const confidentialNetworks = ["ethereum", "ethereum-sepolia"] as const;
 
-const getChainId = (network: Network) => {
+/** The chain ids of the networks confidential vaults run on. */
+export type ConfidentialChainId =
+  | typeof EvmChainIds.Ethereum
+  | typeof EvmChainIds.EthereumSepolia;
+
+const getChainId = (network: Network): ConfidentialChainId | undefined => {
   const allowed = confidentialNetworks.find((item) => item === network);
   return allowed === undefined ? undefined : getWalletRoutingId(allowed);
 };
@@ -52,7 +68,7 @@ export const sameTokenContract = (
 const isExecutionContract = (
   yieldDto: EarnYieldWithProvider,
   intent: ConfidentialIntent,
-  address: string
+  address: ContractAddress | TokenAddress
 ) =>
   (yieldDto.executionContracts?.[intent] ?? []).some((contract) =>
     sameAddress(contract, address)
@@ -157,7 +173,7 @@ export const getConfidentialAssetToken = (
     : null;
 
 export type ConfidentialConversion = Readonly<{
-  readonly chainId: number;
+  readonly chainId: ConfidentialChainId;
   readonly underlying: string;
   readonly wrapper: string;
 }>;
@@ -183,7 +199,7 @@ export type ConfidentialEncryptionPlan = Readonly<{
     readonly contract: string;
     readonly value: bigint;
   }> | null;
-  readonly chainId: number;
+  readonly chainId: ConfidentialChainId;
   readonly legs: Readonly<{
     readonly contract: string;
     readonly values: ReadonlyArray<bigint>;
@@ -241,11 +257,11 @@ export const planConfidentialEncryption = ({
 
 export type ConfidentialEncryption = Readonly<{
   readonly amount: Readonly<{
-    readonly handle: string;
+    readonly handle: ConfidentialHandle;
     readonly proof: string;
   }> | null;
   readonly legs: Readonly<{
-    readonly handles: ReadonlyArray<string>;
+    readonly handles: ReadonlyArray<ConfidentialHandle>;
     readonly proof: string;
   }> | null;
 }>;
@@ -292,33 +308,26 @@ export const toBaseUnits = (amount: BigNumber, decimals: number): bigint =>
     truncateToTokenDecimals(amount, decimals).shiftedBy(decimals).toFixed(0)
   );
 
-export const ConfidentialHandle = Schema.String.pipe(
-  Schema.decode(SchemaTransformation.toLowerCase()),
-  Schema.decodeTo(
-    Schema.String.check(Schema.isPattern(/^0x[0-9a-f]{64}$/)).pipe(
-      Schema.brand("ConfidentialHandle")
-    )
-  )
-);
-export type ConfidentialHandle = typeof ConfidentialHandle.Type;
-
 /** A token balance its owner revealed; EVM addresses compare lowercased. */
 export class ConfidentialTokenBalanceKey extends Data.Class<{
   readonly network: Network;
-  readonly owner: string;
-  readonly token: string | null;
+  readonly owner: WalletAddress;
+  readonly token: TokenAddress | null;
 }> {
   constructor({
     owner,
     token,
   }: {
-    readonly owner: string;
+    readonly owner: WalletAddress;
     readonly token: Token;
   }) {
+    // Lowercasing a non-empty address keeps it non-empty, so `make` cannot throw.
     super({
       network: token.network,
-      owner: owner.toLowerCase(),
-      token: token.address?.toLowerCase() ?? null,
+      owner: WalletAddress.make(owner.toLowerCase()),
+      token: token.address
+        ? TokenAddress.make(token.address.toLowerCase())
+        : null,
     });
   }
 
@@ -344,31 +353,17 @@ const decodeHandle = (value: string | null | undefined) =>
     ? Option.getOrNull(Schema.decodeOption(ConfidentialHandle)(value))
     : null;
 
-// The API puts an encrypted balance's handle in `shareAmountRaw`.
-export const getEncryptedHandle = (
-  balance: Readonly<{
-    readonly isEncrypted?: boolean;
-    readonly shareAmountRaw?: string;
-  }>
-): ConfidentialHandle | null =>
-  balance.isEncrypted ? decodeHandle(balance.shareAmountRaw) : null;
-
 /**
  * Whether a balance's pending position, hidden or revealed, has a cancel in
  * flight.
  */
 export const isCancellingBalance = (
-  balance: Readonly<{
-    readonly isEncrypted?: boolean;
-    readonly revealedHandle?: string;
-    readonly shareAmountRaw?: string;
-  }>,
+  balance: BalanceShares,
   cancellingHandles: ReadonlySet<ConfidentialHandle>
-): boolean => {
-  const handle =
-    getEncryptedHandle(balance) ?? decodeHandle(balance.revealedHandle);
-  return handle !== null && cancellingHandles.has(handle);
-};
+): boolean =>
+  (balance.shares?._tag === "Encrypted" ||
+    balance.shares?._tag === "Revealed") &&
+  cancellingHandles.has(balance.shares.handle);
 
 /**
  * Pending positions with a cancel broadcast but not yet confirmed; the cancel
@@ -394,9 +389,7 @@ type ConfidentialBalance = Readonly<{
   readonly amountRaw: bigint;
   readonly amountUsd?: BigNumber | null;
   readonly isEncrypted?: boolean;
-  readonly revealedHandle?: string;
-  readonly shareAmount?: string;
-  readonly shareAmountRaw?: string;
+  readonly shares?: EarnBalanceShares;
   readonly shareToken?: Pick<Token, "address" | "decimals">;
   readonly token: Pick<Token, "decimals">;
 }>;
@@ -406,13 +399,11 @@ const getConfidentialPricePerShare = (
   shareToken: Pick<Token, "address">
 ): BigNumber => {
   const state = yieldDto.state?.pricePerShareState;
-  const price = state ? exactDecimal(state.price) : null;
-  return price?.isFinite() &&
-    price.isGreaterThan(0) &&
-    state?.shareToken.address &&
+  return state?.price.isGreaterThan(0) &&
+    state.shareToken.address &&
     shareToken.address &&
     sameAddress(state.shareToken.address, shareToken.address)
-    ? price
+    ? state.price
     : exactDecimal(1);
 };
 
@@ -465,7 +456,7 @@ export const isUnfinishedInstantExit = (
   pendingActionType === "WITHDRAW";
 
 export const getPendingActionDecryptHandle = (
-  balance: Pick<EarnBalance, "isEncrypted" | "shareAmountRaw" | "type">,
+  balance: Pick<EarnBalance, "isEncrypted" | "shares" | "type">,
   pendingActionType: YieldPendingActionType
 ): ConfidentialHandle | null =>
   isUnfinishedInstantExit(balance, pendingActionType)
@@ -518,7 +509,7 @@ export const getCancelReturn = (
   pendingActionType: YieldPendingActionType,
   balance: Readonly<{
     readonly amount: BigNumber;
-    readonly shareAmount?: string;
+    readonly shares?: EarnBalanceShares;
     readonly shareToken?: Token;
     readonly type: BalanceType;
   }>
@@ -528,7 +519,7 @@ export const getCancelReturn = (
   // A withdrawal is valued in the underlying but holds vault shares.
   const amount =
     balance.type === "exiting"
-      ? exactDecimal(balance.shareAmount || 0)
+      ? (getVisibleShares(balance)?.amount ?? exactZero())
       : balance.amount;
   return { amount, token };
 };
@@ -557,7 +548,7 @@ export const getBalanceRowDisplayAmount = (
 type ConfidentialExitSource = Readonly<{
   readonly amount: BigNumber;
   readonly amountUsd?: BigNumber | null;
-  readonly shareAmount?: string;
+  readonly shares?: EarnBalanceShares;
   readonly shareToken?: Token;
   readonly token: Token;
 }>;
@@ -597,7 +588,7 @@ export const getConfidentialExitBalance = (
   }
   return activeBalances.reduce<ConfidentialExitBalance>(
     (sum, balance) => ({
-      amount: sum.amount.plus(exactDecimal(balance.shareAmount || 0)),
+      amount: sum.amount.plus(getVisibleShares(balance)?.amount ?? exactZero()),
       amountUsd: sum.amountUsd.plus(balance.amountUsd ?? 0),
       token: shareToken,
       underlying: {
@@ -614,21 +605,35 @@ export const getConfidentialExitBalance = (
   );
 };
 
-// The API sends empty amounts for encrypted balances.
+// The API sends empty amounts for encrypted balances; their shares are a handle.
 export const zeroEncryptedBalance = <
   Balance extends Readonly<{ readonly isEncrypted?: boolean }>,
 >(
   balance: Balance
 ): Balance =>
-  balance.isEncrypted
-    ? { ...balance, amount: "0", amountRaw: "0", shareAmount: "0" }
-    : balance;
+  balance.isEncrypted ? { ...balance, amount: "0", amountRaw: "0" } : balance;
+
+/**
+ * An encrypted balance after its handle is revealed: no longer encrypted,
+ * valued from the decrypted share count, and still carrying the handle so a
+ * cancel of its pending position stays recognisable.
+ */
+export type RevealedBalance<Balance extends ConfidentialBalance> = Omit<
+  Balance,
+  "amount" | "amountRaw" | "amountUsd" | "isEncrypted" | "shares"
+> &
+  Readonly<{
+    readonly amount: BigNumber;
+    readonly amountRaw: bigint;
+    readonly amountUsd?: BigNumber | null;
+    readonly shares: typeof EarnBalanceShares.cases.Revealed.Type;
+  }>;
 
 export const fillConfidentialBalance = <Balance extends ConfidentialBalance>(
   balance: Balance,
   handles: RevealedHandles,
   valuation: ConfidentialValuation | null = null
-): Balance => {
+): Balance | RevealedBalance<Balance> => {
   const handle = getEncryptedHandle(balance);
   if (handle === null) return balance;
   const revealed = handles.get(handle);
@@ -646,17 +651,27 @@ export const fillConfidentialBalance = <Balance extends ConfidentialBalance>(
     shareAmount.times(pricePerShare),
     balance.token.decimals
   );
+  const amountUsd = valuation?.usdPrice
+    ? amount.times(valuation.usdPrice)
+    : balance.amountUsd;
   return {
-    ...Struct.omit(balance, ["isEncrypted"]),
+    ...Struct.omit(balance, [
+      "amount",
+      "amountRaw",
+      "amountUsd",
+      "isEncrypted",
+      "shares",
+    ]),
     amount,
-    amountRaw: BigInt(amount.shiftedBy(balance.token.decimals).toFixed(0)),
-    ...(valuation?.usdPrice
-      ? { amountUsd: amount.times(valuation.usdPrice) }
-      : {}),
-    revealedHandle: handle as string,
-    shareAmount: shareAmount.toFixed(),
-    shareAmountRaw: revealed.toString(),
-  } as Balance;
+    amountRaw: toBaseUnits(amount, balance.token.decimals),
+    ...(amountUsd === undefined ? {} : { amountUsd }),
+    shares: {
+      _tag: "Revealed",
+      amount: shareAmount,
+      amountRaw: revealed,
+      handle,
+    },
+  };
 };
 
 export const fillConfidentialPosition = <
@@ -666,7 +681,7 @@ export const fillConfidentialPosition = <
   position: Position,
   handles: RevealedHandles,
   valuation: ConfidentialValuation | null = null
-): Position => ({
+) => ({
   ...position,
   balances: position.balances.map((balance) =>
     fillConfidentialBalance(balance, handles, valuation)
diff --git a/packages/widget/src/domain/earn/kyc.ts b/packages/widget/src/domain/earn/kyc.ts
index 79041c8bb..0625c06d5 100644
--- a/packages/widget/src/domain/earn/kyc.ts
+++ b/packages/widget/src/domain/earn/kyc.ts
@@ -27,53 +27,34 @@ export const getKycUrl = ({ status, yieldDto }: KycUrlSource) =>
   yieldDto?.mechanics.requirements?.kyc?.authorizeUrl ??
   yieldDto?.provider?.website;
 
-const getKycGateUrlFields = ({
-  kycUrl,
-  yieldDto,
-}: {
-  readonly kycUrl?: string;
-  readonly yieldDto?: EarnYieldWithProvider | null;
-}) => ({
+const getKycGateUrlFields = (
+  kycUrl: string | undefined,
+  yieldDto: EarnYieldWithProvider | null | undefined
+) => ({
   ...(kycUrl ? { kycUrl } : {}),
   ...(kycUrl && yieldDto?.mechanics.requirements?.kyc?.iframeAllowed === true
     ? { iframeAllowed: true as const }
     : {}),
 });
 
-export const mapKycStatusToGate = ({
-  status,
-  yieldDto,
-}: {
+export const mapKycStatusToGate = (source: {
   readonly status?: KycStatus | null;
   readonly yieldDto?: EarnYieldWithProvider | null;
 }): KycGate => {
-  const kycUrl = getKycUrl({ status, yieldDto });
+  const urlFields = getKycGateUrlFields(getKycUrl(source), source.yieldDto);
 
-  switch (status?.kycStatus) {
+  switch (source.status?.kycStatus) {
     case "not_required":
     case "approved":
       return { state: "pass" };
     case "not_started":
-      return {
-        state: "start_kyc",
-        ...getKycGateUrlFields({ kycUrl, yieldDto }),
-      };
+      return { state: "start_kyc", ...urlFields };
     case "pending":
-      return {
-        state: "pending",
-        ...getKycGateUrlFields({ kycUrl, yieldDto }),
-      };
+      return { state: "pending", ...urlFields };
     case "rejected":
-      return {
-        state: "rejected",
-        ...getKycGateUrlFields({ kycUrl, yieldDto }),
-      };
+      return { state: "rejected", ...urlFields };
     default:
-      return {
-        state: "unknown",
-        retryable: true,
-        ...getKycGateUrlFields({ kycUrl, yieldDto }),
-      };
+      return { state: "unknown", retryable: true, ...urlFields };
   }
 };
 
diff --git a/packages/widget/src/domain/earn/models.ts b/packages/widget/src/domain/earn/models.ts
index 5098860b8..13a9d5c1e 100644
--- a/packages/widget/src/domain/earn/models.ts
+++ b/packages/widget/src/domain/earn/models.ts
@@ -3,15 +3,16 @@ import {
   Option,
   Predicate,
   Schema,
+  type SchemaAST,
   SchemaGetter,
   SchemaParser,
+  SchemaTransformation,
   Struct,
 } from "effect";
 import * as YieldApi from "../../generated/api/yield-schema";
 import { PendingAction } from "../action/models";
 import { TronResource } from "../action/tron-resource";
 import { TolerantArray, TolerantNullOr } from "../decoding/response-schema";
-import { exactDecimal } from "../finance/exact";
 import {
   ExactBaseUnitAmount,
   ExactDecimal,
@@ -19,6 +20,7 @@ import {
   TolerantOptionalUtcDateTimeFromString,
 } from "../finance/scalars";
 import {
+  ContractAddress,
   ProviderId,
   ProviderOption,
   TokenAddress,
@@ -27,6 +29,13 @@ import {
 } from "../identity/identifiers";
 import { Token } from "../token/token";
 
+/**
+ * An optional decimal the widget reads: a malformed value becomes `null` so
+ * only that field is lost, never the model holding it.
+ */
+const TolerantExactDecimal = (operation: string, field: string) =>
+  TolerantNullOr(ExactDecimal, { operation, field });
+
 // `yieldSource` stays open: reward-rate breakdowns already fall back for
 // sources they do not group.
 const EarnReward = Schema.Struct({
@@ -122,18 +131,12 @@ const hasCoherentAmountBounds = (
 };
 
 const normalizeAmountMaximum = (
-  minimumValue: string | number,
-  maximumValue: string | number | null
-) => {
-  const minimum = exactDecimal(minimumValue);
-  const maximum = maximumValue === null ? null : exactDecimal(maximumValue);
-
-  return maximum !== null &&
-    minimum.isGreaterThanOrEqualTo(0) &&
-    maximum.isEqualTo(-1)
+  minimum: ExactDecimal,
+  maximum: ExactDecimal | null
+) =>
+  maximum !== null && minimum.isGreaterThanOrEqualTo(0) && maximum.isEqualTo(-1)
     ? null
-    : maximumValue;
-};
+    : maximum;
 
 const decodeApiArgument = <
   const Name extends ApiArgumentName,
@@ -161,10 +164,15 @@ const decodeApiArgument = <
     })
   );
 
-const AmountArgumentDomain = Schema.Struct({
-  required: Schema.Boolean,
+const AmountArgumentBounds = Schema.Struct({
   minimum: ExactDecimal,
   maximum: Schema.NullOr(ExactDecimal),
+});
+
+const AmountArgumentDomain = Schema.Struct({
+  required: Schema.Boolean,
+  minimum: Schema.toType(ExactDecimal),
+  maximum: Schema.NullOr(Schema.toType(ExactDecimal)),
 }).check(
   Schema.makeFilter((field) =>
     hasCoherentAmountBounds(field.minimum, field.maximum)
@@ -177,16 +185,20 @@ const AmountArgument = decodeApiArgument(
   "amount",
   "string",
   AmountArgumentDomain,
-  SchemaGetter.transform<typeof AmountArgumentDomain.Encoded, ApiArgumentField>(
-    (field) => {
-      const minimum = field.minimum ?? "0";
-
-      return {
-        maximum: normalizeAmountMaximum(minimum, field.maximum ?? null),
+  SchemaGetter.transformEffect<
+    typeof AmountArgumentDomain.Encoded,
+    ApiArgumentField
+  >((field, options) =>
+    SchemaParser.decodeEffect(AmountArgumentBounds)(
+      { maximum: field.maximum ?? null, minimum: field.minimum ?? "0" },
+      options
+    ).pipe(
+      Effect.map(({ maximum, minimum }) => ({
+        maximum: normalizeAmountMaximum(minimum, maximum),
         minimum,
         required: field.required ?? false,
-      };
-    }
+      }))
+    )
   )
 );
 
@@ -313,7 +325,7 @@ const EncryptedAmountArgument = decodeApiArgument(
 
 const EncryptedLegAmountsArgumentDomain = Schema.Struct({
   required: Schema.Boolean,
-  options: Schema.Array(Schema.String),
+  options: Schema.Array(ContractAddress),
 }).check(makeRequiredOptionsFilter("encryptedLegAmounts"));
 
 const EncryptedLegAmountsArgument = decodeApiArgument(
@@ -395,13 +407,9 @@ const EarnYieldArguments = Schema.Struct({
 
 // Provider `type` is not picked, so new provider kinds stay decodable.
 export const EarnProvider = Schema.Struct({
-  ...Struct.pick(YieldApi.ProviderDto.fields, [
-    "name",
-    "logoURI",
-    "website",
-    "tvlUsd",
-  ]),
+  ...Struct.pick(YieldApi.ProviderDto.fields, ["name", "logoURI", "website"]),
   id: ProviderId,
+  tvlUsd: TolerantExactDecimal("yield-provider", "tvlUsd"),
 });
 export type EarnProvider = typeof EarnProvider.Type;
 
@@ -412,14 +420,13 @@ export type EarnValidatorKey = typeof EarnValidatorKey.Type;
 
 const makeEarnValidatorKey = Schema.decodeSync(EarnValidatorKey);
 
+// `tvlRaw` is not decoded: TVL is displayed in token units from `tvl`.
 const EarnValidatorWire = Schema.Struct({
   ...Struct.pick(YieldApi.ValidatorDto.fields, [
     "name",
     "logoURI",
     "website",
     "commission",
-    "tvl",
-    "tvlRaw",
     "votingPower",
     "preferred",
     "nominatorCount",
@@ -429,6 +436,7 @@ const EarnValidatorWire = Schema.Struct({
   address: ValidatorAddress,
   providerId: Schema.optionalKey(ProviderId),
   rewardRate: Schema.optionalKey(EarnRewardRate),
+  tvl: Schema.optionalKey(TolerantExactDecimal("yield-validator", "tvl")),
 });
 
 export const EarnValidator = EarnValidatorWire.pipe(
@@ -463,9 +471,55 @@ const EarnYieldRequirements = Schema.Struct({
   ),
 });
 
-const EarnYieldState = YieldApi.YieldStateDto.mapFields(
-  Struct.pick(["pricePerShareState"])
-);
+const EarnPricePerShareState = Schema.Struct({
+  price: ExactDecimal,
+  shareToken: Token,
+});
+
+// A malformed price-per-share state only drops share pricing.
+const EarnYieldState = Schema.Struct({
+  pricePerShareState: Schema.optionalKey(
+    TolerantNullOr(EarnPricePerShareState, {
+      operation: "yield-state",
+      field: "pricePerShareState",
+    })
+  ),
+});
+
+// Only the statistics the widget reads are decoded; `tvl`/`tvlRaw` are unread.
+const EarnYieldStatistics = Schema.Struct({
+  ...Struct.pick(YieldApi.YieldStatisticsDto.fields, ["uniqueUsers"]),
+  averagePositionSizeUsd: Schema.optionalKey(
+    TolerantExactDecimal("yield-statistics", "averagePositionSizeUsd")
+  ),
+  tvlUsd: Schema.optionalKey(
+    TolerantExactDecimal("yield-statistics", "tvlUsd")
+  ),
+});
+
+// Fees are percentages; a malformed one drops only itself.
+const EarnYieldFee = Schema.Struct({
+  deposit: Schema.optionalKey(TolerantExactDecimal("yield-fee", "deposit")),
+  management: Schema.optionalKey(
+    TolerantExactDecimal("yield-fee", "management")
+  ),
+  performance: Schema.optionalKey(
+    TolerantExactDecimal("yield-fee", "performance")
+  ),
+  withdrawal: Schema.optionalKey(
+    TolerantExactDecimal("yield-fee", "withdrawal")
+  ),
+});
+
+// Token-unit limits; a malformed limit reads as no limit.
+const EarnYieldEntryLimits = Schema.Struct({
+  maximum: TolerantExactDecimal("yield-entry-limits", "maximum"),
+  minimum: TolerantExactDecimal("yield-entry-limits", "minimum"),
+  subsequentMinimum: TolerantExactDecimal(
+    "yield-entry-limits",
+    "subsequentMinimum"
+  ),
+});
 
 const EarnYieldRisk = Schema.Struct({
   ratings: Schema.Array(
@@ -505,11 +559,18 @@ const EarnInvestmentSchedule = Schema.Struct({
 });
 export type EarnInvestmentSchedule = typeof EarnInvestmentSchedule.Type;
 
+/** The contracts a yield's enter and exit transactions call. */
+const EarnExecutionContracts = Schema.Struct({
+  enter: Schema.optionalKey(Schema.Array(ContractAddress)),
+  exit: Schema.optionalKey(Schema.Array(ContractAddress)),
+});
+
 export const EarnYield = Schema.Struct({
-  ...Struct.pick(YieldApi.YieldDto.fields, ["network", "statistics", "status"]),
+  ...Struct.pick(YieldApi.YieldDto.fields, ["network", "status"]),
+  statistics: Schema.optionalKey(EarnYieldStatistics),
   // Malformed contracts leave the yield non-confidential.
   executionContracts: Schema.optionalKey(
-    TolerantNullOr(YieldApi.ExecutionContractsDto, {
+    TolerantNullOr(EarnExecutionContracts, {
       operation: "yield",
       field: "executionContracts",
     })
@@ -533,9 +594,9 @@ export const EarnYield = Schema.Struct({
       "lockupPeriod",
       "cooldownPeriod",
       "warmupPeriod",
-      "fee",
-      "entryLimits",
     ]),
+    entryLimits: Schema.optionalKey(EarnYieldEntryLimits),
+    fee: Schema.optionalKey(EarnYieldFee),
     arguments: Schema.optionalKey(EarnYieldArguments),
     gasFeeToken: Token,
     requirements: Schema.optionalKey(EarnYieldRequirements),
@@ -568,14 +629,74 @@ const OptionalKeyFromNullOr = <S extends Schema.Top>(schema: S) =>
     })
   );
 
-export const EarnBalance = Schema.Struct({
+/** The ciphertext handle a confidential balance's shares are hidden behind. */
+export const ConfidentialHandle = Schema.String.pipe(
+  Schema.decode(SchemaTransformation.toLowerCase()),
+  Schema.decodeTo(
+    Schema.TemplateLiteral(["0x", Schema.String])
+      .check(Schema.isPattern(/^0x[0-9a-f]{64}$/))
+      .pipe(Schema.brand("ConfidentialHandle"))
+  )
+);
+export type ConfidentialHandle = typeof ConfidentialHandle.Type;
+
+/**
+ * A balance's shares. The API sends an encrypted balance's handle where a
+ * plain balance has its base-unit share count; a revealed balance holds the
+ * decrypted count beside the handle it was decrypted from.
+ */
+export const EarnBalanceShares = Schema.TaggedUnion({
+  Plain: {
+    amount: Schema.optionalKey(Schema.toType(ExactDecimal)),
+    amountRaw: Schema.optionalKey(Schema.BigInt),
+  },
+  Encrypted: { handle: Schema.toType(ConfidentialHandle) },
+  Revealed: {
+    amount: Schema.toType(ExactDecimal),
+    amountRaw: Schema.BigInt,
+    handle: Schema.toType(ConfidentialHandle),
+  },
+});
+export type EarnBalanceShares = typeof EarnBalanceShares.Type;
+
+export type BalanceShares = Readonly<{
+  readonly shares?: EarnBalanceShares;
+}>;
+
+/** The handle a still-encrypted balance's shares are hidden behind. */
+export const getEncryptedHandle = (
+  balance: BalanceShares
+): ConfidentialHandle | null =>
+  balance.shares?._tag === "Encrypted" ? balance.shares.handle : null;
+
+/** The share count a balance shows: plain from the API, or revealed. */
+export const getVisibleShares = (balance: BalanceShares) =>
+  balance.shares === undefined || balance.shares._tag === "Encrypted"
+    ? null
+    : balance.shares;
+
+const PlainShareAmountRaw = TolerantNullOr(ExactBaseUnitAmount, {
+  operation: "yield-balance",
+  field: "shareAmountRaw",
+});
+
+const EncryptedShareHandle = TolerantNullOr(ConfidentialHandle, {
+  operation: "yield-balance",
+  field: "shareAmountRaw",
+});
+
+const EarnBalanceWire = Schema.Struct({
   ...Struct.pick(YieldApi.BalanceDto.fields, [
     "address",
     "type",
     "isEncrypted",
-    "shareAmount",
-    "shareAmountRaw",
   ]),
+  shareAmount: Schema.optionalKey(
+    TolerantExactDecimal("yield-balance", "shareAmount")
+  ),
+  // Its meaning depends on `isEncrypted`, so the tolerant decoders below
+  // check it; any wire value reaches them.
+  shareAmountRaw: Schema.optionalKey(Schema.Unknown),
   shareToken: Schema.optionalKey(Token),
   amount: ExactDecimal,
   amountRaw: ExactBaseUnitAmount,
@@ -595,13 +716,65 @@ export const EarnBalance = Schema.Struct({
     TolerantArray(EarnValidator, { operation: "balance-validators" })
   ),
 });
-/**
- * `revealedHandle` is set by the widget, never by the API: the handle a
- * revealed balance was decrypted from, which its `shareAmountRaw` no longer holds.
- */
-export type EarnBalance = typeof EarnBalance.Type & {
-  readonly revealedHandle?: string;
-};
+
+const EarnBalanceDomain = Schema.Struct({
+  ...Struct.map(
+    Struct.omit(EarnBalanceWire.fields, ["shareAmount", "shareAmountRaw"]),
+    Schema.toType
+  ),
+  shares: Schema.optionalKey(EarnBalanceShares),
+});
+
+type EarnBalanceWire = typeof EarnBalanceWire.Type;
+
+const decodeBalanceShares = (
+  {
+    isEncrypted,
+    shareAmount,
+    shareAmountRaw,
+  }: Pick<EarnBalanceWire, "isEncrypted" | "shareAmount" | "shareAmountRaw">,
+  options: SchemaAST.ParseOptions
+) =>
+  isEncrypted
+    ? SchemaParser.decodeEffect(EncryptedShareHandle)(
+        shareAmountRaw ?? null,
+        options
+      ).pipe(
+        Effect.map((handle): EarnBalanceShares | null =>
+          handle === null ? null : { _tag: "Encrypted", handle }
+        )
+      )
+    : SchemaParser.decodeEffect(PlainShareAmountRaw)(
+        shareAmountRaw ?? null,
+        options
+      ).pipe(
+        Effect.map((amountRaw): EarnBalanceShares | null =>
+          amountRaw === null && shareAmount == null
+            ? null
+            : {
+                _tag: "Plain",
+                ...(shareAmount == null ? {} : { amount: shareAmount }),
+                ...(amountRaw === null ? {} : { amountRaw }),
+              }
+        )
+      );
+
+export const EarnBalance = EarnBalanceWire.pipe(
+  Schema.decodeTo(EarnBalanceDomain, {
+    decode: SchemaGetter.transformEffect((wire, options) => {
+      const balance = Struct.omit(wire, ["shareAmount", "shareAmountRaw"]);
+      return decodeBalanceShares(wire, options).pipe(
+        Effect.map((shares) =>
+          shares === null ? balance : { ...balance, shares }
+        )
+      );
+    }),
+    encode: SchemaGetter.forbidden(
+      () => "Decoded Earn balances are decode-only"
+    ),
+  })
+);
+export type EarnBalance = typeof EarnBalance.Type;
 
 export const EarnPosition = Schema.Struct({
   yieldId: YieldId,
@@ -621,14 +794,14 @@ export type EarnPosition = typeof EarnPosition.Type;
 export const EarnYieldBalancesResponse = EarnPosition;
 export type EarnYieldBalancesResponse = EarnPosition;
 
-const YieldIdentifier = Schema.Struct({ id: Schema.String }).pipe(
+const YieldIdentifier = Schema.Struct({ id: YieldId }).pipe(
   Schema.decodeTo(Schema.String, {
     decode: SchemaGetter.transform((value) => value.id),
     encode: SchemaGetter.forbidden(() => "Yield identifier is decode-only"),
   })
 );
 
-const ValidatorIdentifier = Schema.Struct({ address: Schema.String }).pipe(
+const ValidatorIdentifier = Schema.Struct({ address: ValidatorAddress }).pipe(
   Schema.decodeTo(Schema.String, {
     decode: SchemaGetter.transform((value) => value.address),
     encode: SchemaGetter.forbidden(() => "Validator identifier is decode-only"),
diff --git a/packages/widget/src/domain/earn/reward-rate.ts b/packages/widget/src/domain/earn/reward-rate.ts
index 8db51c674..c142d1e7e 100644
--- a/packages/widget/src/domain/earn/reward-rate.ts
+++ b/packages/widget/src/domain/earn/reward-rate.ts
@@ -1,8 +1,11 @@
 import type BigNumber from "bignumber.js";
 import { Array as EArray, Match } from "effect";
 import { exactZero } from "../finance/exact";
-import type { EarnValidator, EarnYieldWithProvider } from "./models";
-import type { ValidatorKey } from "./validator";
+import type {
+  EarnValidator,
+  EarnValidatorKey,
+  EarnYieldWithProvider,
+} from "./models";
 
 export type YieldRewardRate = NonNullable<EarnYieldWithProvider["rewardRate"]>;
 type YieldRewardDto = YieldRewardRate["components"][number];
@@ -10,13 +13,13 @@ type YieldWithRewardRate = Pick<EarnYieldWithProvider, "rewardRate">;
 type ValidatorRewardRateDto = NonNullable<EarnValidator["rewardRate"]>;
 export type SelectedValidators =
   | ReadonlyArray<EarnValidator>
-  | ReadonlyMap<ValidatorKey, EarnValidator>;
+  | ReadonlyMap<EarnValidatorKey, EarnValidator>;
 
 type RewardRateBreakdownKey = "native" | "protocol_incentive" | "campaign";
 
 const isSelectedValidatorMap = (
   validators: SelectedValidators
-): validators is ReadonlyMap<ValidatorKey, EarnValidator> =>
+): validators is ReadonlyMap<EarnValidatorKey, EarnValidator> =>
   validators instanceof Map;
 
 const getSelectedValidators = (
diff --git a/packages/widget/src/domain/earn/stake.ts b/packages/widget/src/domain/earn/stake.ts
index cb06c2ef9..cfb4e3c18 100644
--- a/packages/widget/src/domain/earn/stake.ts
+++ b/packages/widget/src/domain/earn/stake.ts
@@ -1,6 +1,7 @@
 import BigNumber from "bignumber.js";
+import { Schema } from "effect";
 import { exactDecimal, exactZero } from "../finance/exact";
-import type { Network } from "../network/network";
+import { YieldId } from "../identity/identifiers";
 import { equalTokens, type Token } from "../token/token";
 import { isConfidentialYield } from "./confidential";
 import type { EarnYieldWithProvider } from "./models";
@@ -34,16 +35,12 @@ export const getMaxAmount = ({
 export const isForceMaxAmount = (
   args:
     | {
-        readonly minimum?: string | number | BigNumber | null;
-        readonly maximum?: string | number | BigNumber | null;
+        readonly minimum?: BigNumber | null;
+        readonly maximum?: BigNumber | null;
       }
     | null
     | undefined
-) =>
-  args?.minimum != null &&
-  args?.maximum != null &&
-  exactDecimal(args.minimum).isEqualTo(-1) &&
-  exactDecimal(args.maximum).isEqualTo(-1);
+) => (args?.minimum?.isEqualTo(-1) && args.maximum?.isEqualTo(-1)) === true;
 
 export const isYieldActionAmountEditable = (
   yieldDto: EarnYieldWithProvider,
@@ -75,7 +72,7 @@ export const getEnterAmountConstraint = (
     return { type: "force-max" };
   }
 
-  const maximum = exactDecimal(amountArgument?.maximum ?? 0);
+  const maximum = amountArgument?.maximum ?? exactZero();
 
   return {
     maximum: maximum.isGreaterThan(0) ? maximum : null,
@@ -84,13 +81,19 @@ export const getEnterAmountConstraint = (
   };
 };
 
-const yieldsWithEnterMinBasedOnPosition = new Map<Network, Set<string>>([
-  ["polkadot", new Set(["polkadot-dot-validator-staking"])],
+const yieldsWithEnterMinBasedOnPosition = new Map<
+  Token["network"],
+  ReadonlySet<YieldId>
+>([
+  [
+    "polkadot",
+    new Set([Schema.decodeSync(YieldId)("polkadot-dot-validator-staking")]),
+  ],
 ]);
 
 const isYieldWithEnterMinBasedOnPosition = (yieldDto: EarnYieldWithProvider) =>
   yieldsWithEnterMinBasedOnPosition
-    .get(yieldDto.mechanics.gasFeeToken.network as Network)
+    .get(yieldDto.mechanics.gasFeeToken.network)
     ?.has(yieldDto.id) ?? false;
 
 /**
@@ -103,18 +106,17 @@ export const getMinStakeAmount = (
   selectedYieldHasActivePosition: boolean
 ) => {
   const entryLimits = yieldDto.mechanics.entryLimits;
-  const firstEntryMin = exactDecimal(
+  const firstEntryMin =
     entryLimits?.minimum ??
-      getYieldActionArg(yieldDto, "enter", "amount")?.minimum ??
-      0
-  );
+    getYieldActionArg(yieldDto, "enter", "amount")?.minimum ??
+    exactZero();
 
   if (!selectedYieldHasActivePosition) {
     return firstEntryMin;
   }
 
   if (entryLimits?.subsequentMinimum != null) {
-    return exactDecimal(entryLimits.subsequentMinimum);
+    return entryLimits.subsequentMinimum;
   }
 
   if (isYieldWithEnterMinBasedOnPosition(yieldDto)) {
@@ -126,17 +128,18 @@ export const getMinStakeAmount = (
 
 export const getMinUnstakeAmount = (
   yieldDto: EarnYieldWithProvider,
-  pricePerShare: string | null
+  pricePerShare: BigNumber | null
 ) => {
-  const integrationMin = exactDecimal(
-    getYieldActionArg(yieldDto, "exit", "amount")?.minimum ?? 0
-  );
-
-  const pricePerShareBN = exactDecimal(pricePerShare ?? 0);
-
-  if (pricePerShareBN.isZero() || !isBittensorStaking(yieldDto.id)) {
+  const integrationMin =
+    getYieldActionArg(yieldDto, "exit", "amount")?.minimum ?? exactZero();
+
+  if (
+    !pricePerShare ||
+    pricePerShare.isZero() ||
+    !isBittensorStaking(yieldDto.id)
+  ) {
     return integrationMin;
   }
 
-  return integrationMin.dividedBy(pricePerShareBN).decimalPlaces(16);
+  return integrationMin.dividedBy(pricePerShare).decimalPlaces(16);
 };
diff --git a/packages/widget/src/domain/earn/validator.ts b/packages/widget/src/domain/earn/validator.ts
index 19ff6a8a0..defcee465 100644
--- a/packages/widget/src/domain/earn/validator.ts
+++ b/packages/widget/src/domain/earn/validator.ts
@@ -2,7 +2,6 @@ import { addressIdentity } from "../identity/identifiers";
 import type { Network } from "../network/network";
 import type { EarnValidator } from "./models";
 
-export type ValidatorKey = string;
 export type ValidatorInput = Omit<EarnValidator, "key">;
 
 export const validatorAddressIdentity = addressIdentity;
diff --git a/packages/widget/src/domain/earn/yield-provider-order.ts b/packages/widget/src/domain/earn/yield-provider-order.ts
index 6f4138edf..fe5359b70 100644
--- a/packages/widget/src/domain/earn/yield-provider-order.ts
+++ b/packages/widget/src/domain/earn/yield-provider-order.ts
@@ -1,3 +1,4 @@
+import type { ProviderId } from "../identity/identifiers";
 import type { YieldCategory } from "./contract";
 import type { EarnYieldWithProvider } from "./models";
 import {
@@ -13,7 +14,7 @@ import {
  * A category without an entry keeps the default yield order.
  */
 export type YieldProviderOrder = Readonly<
-  Partial<Record<YieldCategory, ReadonlyArray<string>>>
+  Partial<Record<YieldCategory, ReadonlyArray<ProviderId>>>
 >;
 
 const unranked = Number.MAX_SAFE_INTEGER;
diff --git a/packages/widget/src/domain/earn/yield.ts b/packages/widget/src/domain/earn/yield.ts
index 0e81aeebe..506d9dfc6 100644
--- a/packages/widget/src/domain/earn/yield.ts
+++ b/packages/widget/src/domain/earn/yield.ts
@@ -1,7 +1,8 @@
-import { Array as EArray, pipe } from "effect";
+import type BigNumber from "bignumber.js";
+import { Array as EArray, Record as ERecord, pipe, Schema } from "effect";
 import type { TFunction } from "i18next";
-import { exactDecimal } from "../finance/exact";
-import type { ProviderOption, YieldId } from "../identity/identifiers";
+import { sumExact } from "../finance/exact";
+import { type ProviderOption, YieldId } from "../identity/identifiers";
 import type { Network } from "../network/network";
 import { equalTokens, type HostTokenKey, tokenString } from "../token/token";
 import {
@@ -29,7 +30,7 @@ export type YieldMetadata = Pick<
   EarnYieldWithProvider["metadata"],
   "logoURI" | "name"
 > & {
-  provider?: EarnProvider;
+  provider?: EarnProvider | undefined;
 };
 
 const knownApiYieldTypes = [
@@ -70,9 +71,11 @@ type YieldTypeLabelsMap = {
   };
 };
 
-/** Preferred yield ID per host token key, per network. */
+/** Preferred yield ID, or `"*"` for the default choice, per host token key, per network. */
 export type PreferredTokenYieldsPerNetwork = Readonly<
-  Record<string, Readonly<Record<HostTokenKey, string>>>
+  Partial<
+    Record<Network, Readonly<Partial<Record<HostTokenKey, YieldId | "*">>>>
+  >
 >;
 
 export type ValidatorsConfig = ReadonlyMap<
@@ -112,14 +115,9 @@ const apiYieldTypeToYieldCategory = {
 export const getApiYieldTypesForYieldCategory = (
   category: YieldCategoryType
 ): KnownApiYieldType[] =>
-  (
-    Object.entries(apiYieldTypeToYieldCategory) as [
-      KnownApiYieldType,
-      YieldCategoryType,
-    ][]
-  )
-    .filter(([, mapped]) => mapped === category)
-    .map(([yieldType]) => yieldType);
+  ERecord.keys(apiYieldTypeToYieldCategory).filter(
+    (yieldType) => apiYieldTypeToYieldCategory[yieldType] === category
+  );
 
 export const getYieldCategory = (
   yieldDto: EarnYieldWithProvider
@@ -169,7 +167,7 @@ export const filterValidators = <T extends ValidatorDto>({
         const blockedIdentities = toAddressIdentities(blocked);
         const preferredIdentities = toAddressIdentities(preferred);
 
-        return validators.flatMap((v) => {
+        return validators.flatMap((v): T[] => {
           const addressIdentity = validatorAddressIdentity(v.address);
 
           if (allowedIdentities && !allowedIdentities.has(addressIdentity)) {
@@ -182,10 +180,10 @@ export const filterValidators = <T extends ValidatorDto>({
             !!(mergePreferredWithDefault && v.preferred);
 
           if (preferredOnly) {
-            return isPreferred ? [{ ...v, preferred: true } as T] : [];
+            return isPreferred ? [{ ...v, preferred: true }] : [];
           }
 
-          return [{ ...v, preferred: isPreferred } as T];
+          return [{ ...v, preferred: isPreferred }];
         });
       })();
 
@@ -196,15 +194,6 @@ export const filterValidators = <T extends ValidatorDto>({
   return filtered;
 };
 
-const toNumber = (value: number | string | null | undefined) => {
-  if (value === null || value === undefined) {
-    return undefined;
-  }
-
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : undefined;
-};
-
 const secondsToDays = (seconds: number | undefined) => {
   if (seconds === undefined) return undefined;
 
@@ -281,7 +270,7 @@ export const getYieldRiskSourceLabel = (
 
 export const hasYieldFeeConfigurationEnabled = (
   yieldDto: EarnYieldWithProvider
-) => Object.values(yieldDto.mechanics.fee ?? {}).some(Boolean);
+) => Object.values(yieldDto.mechanics.fee ?? {}).some((fee) => fee != null);
 
 export const getYieldCooldownPeriod = (yieldDto: EarnYieldWithProvider) =>
   secondsToDays(yieldDto.mechanics.cooldownPeriod?.seconds);
@@ -289,30 +278,22 @@ export const getYieldCooldownPeriod = (yieldDto: EarnYieldWithProvider) =>
 export const getYieldWarmupPeriod = (yieldDto: EarnYieldWithProvider) =>
   secondsToDays(yieldDto.mechanics.warmupPeriod?.seconds);
 
-export const getYieldTvlUsd = (yieldDto: EarnYieldWithProvider) => {
-  const tvlUsd = yieldDto.statistics?.tvlUsd;
-
-  if (tvlUsd == null || tvlUsd === "") return null;
-
-  return tvlUsd;
-};
+export const getYieldTvlUsd = (yieldDto: EarnYieldWithProvider) =>
+  yieldDto.statistics?.tvlUsd ?? null;
 
+/**
+ * The yield's total fee as a decimal ratio (0.02 = 2%), summed exactly from
+ * the API's percentages; null when it charges none.
+ */
 export const getYieldFeePercent = (
   yieldDto: EarnYieldWithProvider
-): number | null => {
-  const fee = yieldDto.mechanics.fee;
-
-  if (!fee) return null;
-
-  const total = Object.values(fee).reduce((acc, value) => {
-    const parsed = toNumber(value);
-
-    return parsed !== undefined ? acc + parsed : acc;
-  }, 0);
-
-  if (total <= 0) return null;
+): BigNumber | null => {
+  const fees = Object.values(yieldDto.mechanics.fee ?? {}).filter(
+    (fee) => fee != null
+  );
+  const total = sumExact(fees);
 
-  return total / 100;
+  return total.isGreaterThan(0) ? total.dividedBy(100) : null;
 };
 
 export const getYieldLockupPeriod = (yieldDto: EarnYieldWithProvider) =>
@@ -334,7 +315,7 @@ export const getExtendedYieldType = (
     return "pooled_staking";
   }
 
-  const type = yieldDto.mechanics.type as string;
+  const type = yieldDto.mechanics.type;
 
   return isKnownApiYieldType(type) ? type : "unknown";
 };
@@ -344,15 +325,8 @@ export const getYieldOutputToken = (yieldDto: EarnYieldWithProvider) =>
     ? yieldDto.outputToken
     : null;
 
-const hasPositivePricePerShare = (yieldDto: EarnYieldWithProvider) => {
-  const price = yieldDto.state?.pricePerShareState?.price;
-
-  if (price === null || price === undefined) return false;
-
-  const amount = exactDecimal(price);
-
-  return amount.isFinite() && amount.isGreaterThan(0);
-};
+const hasPositivePricePerShare = (yieldDto: EarnYieldWithProvider) =>
+  yieldDto.state?.pricePerShareState?.price.isGreaterThan(0) ?? false;
 
 export const hasYieldBearingOutputToken = (yieldDto: EarnYieldWithProvider) =>
   getYieldOutputToken(yieldDto) !== null && hasPositivePricePerShare(yieldDto);
@@ -487,11 +461,10 @@ const isNativeStaking = (yieldDto: EarnYieldWithProvider) => {
     return false;
   }
 
-  const minimum = getYieldActionArg(yieldDto, "enter", "amount")?.minimum;
-
-  return minimum !== null && minimum !== undefined
-    ? exactDecimal(minimum).isEqualTo(32)
-    : false;
+  return (
+    getYieldActionArg(yieldDto, "enter", "amount")?.minimum.isEqualTo(32) ??
+    false
+  );
 };
 
 const isPooledStaking = (yieldDto: EarnYieldWithProvider) =>
@@ -529,14 +502,21 @@ export const isYieldValidatorSelectionRequired = (
     isYieldActionArgRequired(yieldDto, "enter", "validatorAddresses")
   );
 
-export const isEthenaUsdeStaking = (yieldId: string) =>
-  yieldId === "ethena-usde-staking";
+const decodeYieldId = Schema.decodeSync(YieldId);
+
+const ethenaUsdeStakingYieldId = decodeYieldId("ethena-usde-staking");
+const bittensorStakingYieldId = decodeYieldId("bittensor-native-staking");
+
+export const isEthenaUsdeStaking = (yieldId: YieldId) =>
+  yieldId === ethenaUsdeStakingYieldId;
 
-export const isBittensorStaking = (yieldId: string) =>
-  yieldId === "bittensor-native-staking";
+export const isBittensorStaking = (yieldId: YieldId) =>
+  yieldId === bittensorStakingYieldId;
 
-const zeroRewardRateYieldIdWhitelist = new Set<string>([
-  "optimism-usdc-gtusdcb-0x4ffc4e5f1f1f5c43dc9bc27b53728da13b02be35-4626-vault",
+const zeroRewardRateYieldIdWhitelist = new Set<YieldId>([
+  decodeYieldId(
+    "optimism-usdc-gtusdcb-0x4ffc4e5f1f1f5c43dc9bc27b53728da13b02be35-4626-vault"
+  ),
 ]);
 
 export const isNonZeroRewardRateYield = (
@@ -549,27 +529,27 @@ export const isNonZeroRewardRateYield = (
  * Yields closed to deposits (`status.enter: false`) that stay visible while
  * their investment schedule pauses deposits. Entry remains disabled for them.
  */
-const displayOnlyYields: Record<
-  string,
+const displayOnlyYields = new Map<
+  YieldId,
   { readonly network: Network; readonly yieldType: KnownApiYieldType }
-> = {
-  "base-usdc-midas-mglo-vault": {
-    network: "base",
-    yieldType: "real_world_asset",
-  },
-  "robinhood-usdg-midas-mglo-vault": {
-    network: "robinhood",
-    yieldType: "real_world_asset",
-  },
-  "ethereum-usdc-midas-mglobal-vault": {
-    network: "ethereum",
-    yieldType: "real_world_asset",
-  },
-};
+>([
+  [
+    decodeYieldId("base-usdc-midas-mglo-vault"),
+    { network: "base", yieldType: "real_world_asset" },
+  ],
+  [
+    decodeYieldId("robinhood-usdg-midas-mglo-vault"),
+    { network: "robinhood", yieldType: "real_world_asset" },
+  ],
+  [
+    decodeYieldId("ethereum-usdc-midas-mglobal-vault"),
+    { network: "ethereum", yieldType: "real_world_asset" },
+  ],
+]);
 
 export const isYieldVisible = (
   yieldDto: Pick<EarnYieldWithProvider, "id" | "status">
-) => yieldDto.status.enter || Object.hasOwn(displayOnlyYields, yieldDto.id);
+) => yieldDto.status.enter || displayOnlyYields.has(yieldDto.id);
 
 /**
  * API yield types that can hold a display-only yield within a token-catalog
@@ -580,7 +560,7 @@ export const getDisplayOnlyYieldTypes = (scope: {
   readonly yieldTypes?: ReadonlyArray<KnownApiYieldType>;
 }): KnownApiYieldType[] => [
   ...new Set(
-    Object.values(displayOnlyYields)
+    Array.from(displayOnlyYields.values())
       .filter(
         ({ network, yieldType }) =>
           (!scope.network || scope.network === network) &&
@@ -607,7 +587,7 @@ export const withDisplayOnlyYields = <Option extends TokenYieldOption>(
 
   for (const offeredOption of offered) {
     const displayOnly = offeredOption.availableYields.filter((id) =>
-      Object.hasOwn(displayOnlyYields, id)
+      displayOnlyYields.has(id)
     );
     if (displayOnly.length === 0) continue;
 
diff --git a/packages/widget/src/domain/finance/funded-balance.ts b/packages/widget/src/domain/finance/funded-balance.ts
index 6adec6117..d17e517ea 100644
--- a/packages/widget/src/domain/finance/funded-balance.ts
+++ b/packages/widget/src/domain/finance/funded-balance.ts
@@ -1,5 +1,4 @@
 import type BigNumber from "bignumber.js";
-import { exactDecimal } from "./exact";
 
 const minimumFundedUsdValue = 0.01;
 const minimumFundedUnitAmount = 0.000001;
@@ -13,13 +12,12 @@ export const isFundedBalance = ({
   amount,
   priceUsd,
 }: {
-  readonly amount: string | BigNumber;
+  readonly amount: BigNumber;
   readonly priceUsd: BigNumber | null;
 }): boolean => {
-  const exactAmount = exactDecimal(amount);
-  if (!exactAmount.isGreaterThan(0)) return false;
+  if (!amount.isGreaterThan(0)) return false;
 
   return priceUsd?.isGreaterThan(0)
-    ? exactAmount.times(priceUsd).isGreaterThanOrEqualTo(minimumFundedUsdValue)
-    : exactAmount.isGreaterThanOrEqualTo(minimumFundedUnitAmount);
+    ? amount.times(priceUsd).isGreaterThanOrEqualTo(minimumFundedUsdValue)
+    : amount.isGreaterThanOrEqualTo(minimumFundedUnitAmount);
 };
diff --git a/packages/widget/src/domain/finance/gas.ts b/packages/widget/src/domain/finance/gas.ts
index e49974ab3..cae9f137f 100644
--- a/packages/widget/src/domain/finance/gas.ts
+++ b/packages/widget/src/domain/finance/gas.ts
@@ -1,12 +1,8 @@
 import type BigNumber from "bignumber.js";
-import { equalTokens } from "../token/token";
+import { equalTokens, type Token } from "../token/token";
 import type { TokenBalance } from "./models";
 
-type ComparableToken = {
-  readonly address?: string;
-  readonly network: string;
-  readonly symbol: string;
-};
+type ComparableToken = Pick<Token, "symbol" | "network" | "address">;
 
 type CheckGasAmountIfStake =
   | { isStake: true; stakeToken: ComparableToken; stakeAmount: BigNumber }
diff --git a/packages/widget/src/domain/finance/price.ts b/packages/widget/src/domain/finance/price.ts
index b129f7ba7..7975207fe 100644
--- a/packages/widget/src/domain/finance/price.ts
+++ b/packages/widget/src/domain/finance/price.ts
@@ -1,12 +1,9 @@
 import type BigNumber from "bignumber.js";
 import type { Prices } from "../health/models";
-import { exactDecimal } from "./exact";
+import type { Token } from "../token/token";
+import { exactZero } from "./exact";
 
-type PriceLookupToken = {
-  readonly symbol: string;
-  readonly network: string;
-  readonly address?: string;
-};
+type PriceLookupToken = Pick<Token, "network" | "address">;
 
 export const getTokenPriceInUSD = ({
   token,
@@ -17,22 +14,17 @@ export const getTokenPriceInUSD = ({
 }: {
   token: PriceLookupToken;
   baseToken: PriceLookupToken | null;
-  amount: string | BigNumber;
-  pricePerShare: string | null;
+  amount: BigNumber;
+  pricePerShare: BigNumber | null;
   prices: Prices;
 }): BigNumber => {
-  const amountBN = exactDecimal(amount);
-
   if (pricePerShare && baseToken) {
-    const baseTokenPrice = exactDecimal(
-      prices.getByToken(baseToken)?.price ?? 0
-    );
-    const pricePerShareBN = exactDecimal(pricePerShare);
+    const baseTokenPrice = prices.getByToken(baseToken)?.price ?? exactZero();
 
-    return amountBN.times(baseTokenPrice).times(pricePerShareBN);
+    return amount.times(baseTokenPrice).times(pricePerShare);
   }
 
-  const tokenPrice = exactDecimal(prices.getByToken(token)?.price ?? 0);
+  const tokenPrice = prices.getByToken(token)?.price ?? exactZero();
 
-  return amountBN.times(tokenPrice);
+  return amount.times(tokenPrice);
 };
diff --git a/packages/widget/src/domain/health/models.ts b/packages/widget/src/domain/health/models.ts
index fee04663e..69759595d 100644
--- a/packages/widget/src/domain/health/models.ts
+++ b/packages/widget/src/domain/health/models.ts
@@ -31,11 +31,7 @@ type Price = {
 export class Prices {
   constructor(public readonly value: Map<string, Price>) {}
 
-  getByToken(token: {
-    readonly symbol: string;
-    readonly network: string;
-    readonly address?: string;
-  }) {
+  getByToken(token: Pick<Token, "network" | "address">) {
     const priceKey = `${token.network}-${token.address?.toLowerCase() ?? ""}`;
     const price = this.value.get(priceKey);
 
@@ -88,8 +84,10 @@ export const PriceResponse = PriceEntries.pipe(
           Array.from(prices.value, ([key, value]) => [
             key,
             {
-              price: value.price,
-              price_24_h: value.price24H,
+              ...(value.price === undefined ? {} : { price: value.price }),
+              ...(value.price24H === undefined
+                ? {}
+                : { price_24_h: value.price24H }),
             },
           ])
         ),
diff --git a/packages/widget/src/domain/identity/identifiers.ts b/packages/widget/src/domain/identity/identifiers.ts
index 360ca6f7c..fb25ca9ad 100644
--- a/packages/widget/src/domain/identity/identifiers.ts
+++ b/packages/widget/src/domain/identity/identifiers.ts
@@ -27,6 +27,24 @@ export const TransactionWorkflowId = Schema.NonEmptyString.pipe(
 );
 export type TransactionWorkflowId = typeof TransactionWorkflowId.Type;
 
+/** A transaction's hash on its chain, in that chain's own encoding. */
+export const TransactionHash = Schema.NonEmptyString.pipe(
+  Schema.brand("TransactionHash")
+);
+export type TransactionHash = typeof TransactionHash.Type;
+
+/** A signature a wallet produced over a message or typed data. */
+export const WalletSignature = Schema.NonEmptyString.pipe(
+  Schema.brand("WalletSignature")
+);
+export type WalletSignature = typeof WalletSignature.Type;
+
+/** A transaction a wallet signed but did not broadcast, in its chain's encoding. */
+export const SignedTransactionPayload = Schema.NonEmptyString.pipe(
+  Schema.brand("SignedTransactionPayload")
+);
+export type SignedTransactionPayload = typeof SignedTransactionPayload.Type;
+
 export const WalletAddress = Schema.NonEmptyString.pipe(
   Schema.brand("WalletAddress")
 );
@@ -42,6 +60,12 @@ export const ValidatorAddress = Schema.NonEmptyString.pipe(
 );
 export type ValidatorAddress = typeof ValidatorAddress.Type;
 
+/** A smart contract's address on its chain, such as a confidential vault's batcher. */
+export const ContractAddress = Schema.NonEmptyString.pipe(
+  Schema.brand("ContractAddress")
+);
+export type ContractAddress = typeof ContractAddress.Type;
+
 const hexAddress = /^0x[0-9a-f]+$/i;
 
 /** 0x-prefixed hex addresses are case-insensitive; other encodings keep their case. */
diff --git a/packages/widget/src/domain/portfolio/models.ts b/packages/widget/src/domain/portfolio/models.ts
index c063ab8e3..75bf002ed 100644
--- a/packages/widget/src/domain/portfolio/models.ts
+++ b/packages/widget/src/domain/portfolio/models.ts
@@ -1,5 +1,4 @@
 import { Schema, Struct } from "effect";
-import * as LegacyApi from "../../generated/api/legacy-schema";
 import * as YieldApi from "../../generated/api/yield-schema";
 import { TolerantArray, TolerantRecord } from "../decoding/response-schema";
 import { ExactDecimal, UtcDateTimeFromString } from "../finance/scalars";
@@ -27,10 +26,10 @@ const RewardRateHistoryItem = Schema.Struct({
 });
 export type RewardRateHistoryItem = typeof RewardRateHistoryItem.Type;
 
+// `tvlRaw` is unread: the chart plots `tvl` in token units.
 const TvlHistoryItem = Schema.Struct({
   timestamp: UtcDateTimeFromString,
   tvl: ExactDecimal,
-  tvlRaw: Schema.String,
 });
 export type TvlHistoryItem = typeof TvlHistoryItem.Type;
 
@@ -54,8 +53,9 @@ export const TvlHistoryResponse = Schema.Struct({
   }),
 });
 
+// Only the reward total is read.
 export const RewardsSummary = Schema.Struct({
-  ...Struct.pick(LegacyApi.YieldRewardsSummaryResponseDto.fields, ["rewards"]),
+  rewards: Schema.Struct({ total: ExactDecimal }),
   token: LegacyToken,
 });
 export type RewardsSummary = typeof RewardsSummary.Type;
diff --git a/packages/widget/src/domain/portfolio/positions.ts b/packages/widget/src/domain/portfolio/positions.ts
index bd2cb64fe..da3cd7da3 100644
--- a/packages/widget/src/domain/portfolio/positions.ts
+++ b/packages/widget/src/domain/portfolio/positions.ts
@@ -1,11 +1,21 @@
 import type BigNumber from "bignumber.js";
-import { DateTime } from "effect";
-import type { EarnBalance, EarnPosition, EarnValidator } from "../earn/models";
+import { DateTime, Schema } from "effect";
+import {
+  type EarnBalance,
+  type EarnPosition,
+  type EarnValidator,
+  EarnValidatorKey,
+  getVisibleShares,
+} from "../earn/models";
 import type { YieldRewardRate } from "../earn/reward-rate";
-import type { ValidatorKey } from "../earn/validator";
 import { exactDecimal, exactZero } from "../finance/exact";
 import type { YieldId } from "../identity/identifiers";
-import { equalTokens, type TokenString, tokenString } from "../token/token";
+import {
+  equalTokens,
+  type Token,
+  type TokenString,
+  tokenString,
+} from "../token/token";
 
 export type YieldBalanceType = EarnBalance["type"];
 
@@ -17,11 +27,28 @@ export type PositionBalancesByType = Map<
 >;
 export type PositionValidators = ReadonlyArray<EarnValidator>;
 
-export type PositionDetailsLabelType = "hasFrozenV1";
-
-type BalanceType = "validators" | "default";
-
-export type BalanceDataKey = BalanceType | `validator::${ValidatorKey}`;
+/**
+ * Identifies one balance group of a position: `default`, `validators` (a
+ * balance spread over several validators), or `validator::<validator key>`.
+ */
+export type BalanceDataKey =
+  | "default"
+  | "validators"
+  | `validator::${EarnValidatorKey}`;
+
+const validatorBalanceDataKeyPrefix = "validator::";
+const isEarnValidatorKey = Schema.is(EarnValidatorKey);
+
+export const BalanceDataKey = Schema.String.pipe(
+  Schema.refine(
+    (key): key is BalanceDataKey =>
+      key === "default" ||
+      key === "validators" ||
+      (key.startsWith(validatorBalanceDataKeyPrefix) &&
+        isEarnValidatorKey(key.slice(validatorBalanceDataKeyPrefix.length))),
+    { expected: "a position balance key" }
+  )
+);
 
 export type PositionsData = Map<
   YieldId,
@@ -64,7 +91,7 @@ export const getPositionBalanceDataKey = (
   const validator = balance.validator ?? balance.validators?.[0];
 
   if (validator) {
-    return `validator::${validator.key}` as BalanceDataKey;
+    return `validator::${validator.key}`;
   }
 
   return "default";
@@ -78,44 +105,43 @@ export const getBalanceValidators = (balance: EarnBalance) => {
 export const toPositionsData = (
   balancesData: ReadonlyArray<EarnPosition>
 ): PositionsData =>
-  balancesData.reduce((positions, position) => {
+  balancesData.reduce<PositionsData>((positions, position) => {
     positions.set(position.yieldId, {
       yieldId: position.yieldId,
-      rewardRate: position.rewardRate,
+      ...(position.rewardRate === undefined
+        ? {}
+        : { rewardRate: position.rewardRate }),
       balanceData: [...position.balances]
         .sort((a, b) =>
           getPositionBalanceDataKey(a).localeCompare(
             getPositionBalanceDataKey(b)
           )
         )
-        .reduce(
-          (balances, balance) => {
-            const key = getPositionBalanceDataKey(balance);
-            const previous = balances.get(key);
-
-            if (previous) {
-              previous.balances.push(balance);
-            } else if (key === "default") {
-              balances.set(key, {
-                balances: [balance],
-                type: "default",
-              });
-            } else {
-              balances.set(key, {
-                balances: [balance],
-                type: "validators",
-                validators: getBalanceValidators(balance),
-              });
-            }
-
-            return balances;
-          },
-          new Map() as PositionData["balanceData"]
-        ),
+        .reduce<PositionData["balanceData"]>((balances, balance) => {
+          const key = getPositionBalanceDataKey(balance);
+          const previous = balances.get(key);
+
+          if (previous) {
+            previous.balances.push(balance);
+          } else if (key === "default") {
+            balances.set(key, {
+              balances: [balance],
+              type: "default",
+            });
+          } else {
+            balances.set(key, {
+              balances: [balance],
+              type: "validators",
+              validators: getBalanceValidators(balance),
+            });
+          }
+
+          return balances;
+        }, new Map()),
     });
 
     return positions;
-  }, new Map() as PositionsData);
+  }, new Map());
 
 export const getPositionData = (
   positions: PositionsData,
@@ -124,11 +150,11 @@ export const getPositionData = (
 
 export const getPositionBalances = (
   position: PositionData | null,
-  balanceId: string | null
+  balanceId: BalanceDataKey | null
 ): PositionBalances | null => {
   if (!position || !balanceId) return null;
 
-  const balanceData = position.balanceData.get(balanceId as BalanceDataKey);
+  const balanceData = position.balanceData.get(balanceId);
   return balanceData
     ? { ...balanceData, rewardRate: position.rewardRate }
     : null;
@@ -174,7 +200,7 @@ export type PositionBalanceRow = PositionTokenSum &
     readonly isEncrypted?: boolean;
     /** The share token's amount, for balances denominated in shares. */
     readonly shareAmount?: BigNumber;
-    readonly shareToken?: EarnBalance["shareToken"];
+    readonly shareToken?: NonNullable<EarnBalance["shareToken"]>;
     readonly type: YieldBalanceType;
   }>;
 
@@ -193,20 +219,13 @@ export const groupPositionBalanceRows = (
       | "amountUsd"
       | "date"
       | "isEncrypted"
-      | "revealedHandle"
-      | "shareAmount"
-      | "shareAmountRaw"
+      | "shares"
       | "shareToken"
       | "token"
       | "type"
     >
   >,
-  isCancelling: (
-    balance: Pick<
-      EarnBalance,
-      "isEncrypted" | "revealedHandle" | "shareAmountRaw"
-    >
-  ) => boolean
+  isCancelling: (balance: Pick<EarnBalance, "shares">) => boolean
 ): ReadonlyArray<PositionBalanceRow> => [
   ...balances
     .reduce((rows, balance) => {
@@ -217,6 +236,7 @@ export const groupPositionBalanceRows = (
         balance.shareToken ? tokenString(balance.shareToken) : ""
       }`;
       const previous = rows.get(key);
+      const isEncrypted = previous?.isEncrypted || balance.isEncrypted;
 
       rows.set(key, {
         amount: (previous?.amount ?? exactZero()).plus(balance.amount),
@@ -225,11 +245,11 @@ export const groupPositionBalanceRows = (
         ),
         cancelling,
         date: balance.date,
-        isEncrypted: previous?.isEncrypted || balance.isEncrypted,
+        ...(isEncrypted === undefined ? {} : { isEncrypted }),
         ...(balance.shareToken
           ? {
               shareAmount: (previous?.shareAmount ?? exactZero()).plus(
-                exactDecimal(balance.shareAmount || 0)
+                getVisibleShares(balance)?.amount ?? exactZero()
               ),
               shareToken: balance.shareToken,
             }
@@ -262,7 +282,7 @@ export const getSingleExitTokenSum = (
 export const toPositionBalancesByType = (
   balances: ReadonlyArray<EarnBalance>
 ): PositionBalancesByType =>
-  balances.reduce((byType, balance) => {
+  balances.reduce<PositionBalancesByType>((byType, balance) => {
     const amount = exactDecimal(balance.amount);
     if (!balance.isEncrypted && (amount.isZero() || amount.isNaN())) {
       return byType;
@@ -279,15 +299,11 @@ export const toPositionBalancesByType = (
     ]);
 
     return byType;
-  }, new Map() as PositionBalancesByType);
+  }, new Map());
 
 export const getPositionTotalAmount = (
   balances: EarnBalance[],
-  baseToken: {
-    readonly address?: string;
-    readonly symbol: string;
-    readonly network: string;
-  }
+  baseToken: Pick<Token, "symbol" | "network" | "address">
 ) => {
   const baseTokenBalance = balances.find((b) =>
     equalTokens(b.token, baseToken)
diff --git a/packages/widget/src/domain/portfolio/rewards.ts b/packages/widget/src/domain/portfolio/rewards.ts
index 13edb5d22..6e70272f4 100644
--- a/packages/widget/src/domain/portfolio/rewards.ts
+++ b/packages/widget/src/domain/portfolio/rewards.ts
@@ -53,16 +53,11 @@ const enabledRewardsSummaryYieldIds = {
   >
 >;
 
-const enabledRewardsSummaryYieldIdsSet = new Set(
+const enabledRewardsSummaryYieldIdsSet = new Set<YieldId>(
   Object.values(enabledRewardsSummaryYieldIds).flatMap((v) =>
     v.map((v) => v.id)
   )
 );
 
-type EnabledRewardsSummaryYieldId =
-  (typeof enabledRewardsSummaryYieldIds)[keyof typeof enabledRewardsSummaryYieldIds][number]["id"];
-
-export const isValidYieldIdForRewardsSummary = (
-  yieldId: string
-): yieldId is EnabledRewardsSummaryYieldId =>
-  enabledRewardsSummaryYieldIdsSet.has(yieldId as EnabledRewardsSummaryYieldId);
+export const isValidYieldIdForRewardsSummary = (yieldId: YieldId) =>
+  enabledRewardsSummaryYieldIdsSet.has(yieldId);
diff --git a/packages/widget/src/domain/portfolio/token-balance.ts b/packages/widget/src/domain/portfolio/token-balance.ts
deleted file mode 100644
index 1865267de..000000000
--- a/packages/widget/src/domain/portfolio/token-balance.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type YieldBalanceLabel = {
-  readonly params: Readonly<Record<string, never>>;
-  readonly type: string;
-};
diff --git a/packages/widget/src/domain/token/token.ts b/packages/widget/src/domain/token/token.ts
index 716b78895..1c5b6cfdb 100644
--- a/packages/widget/src/domain/token/token.ts
+++ b/packages/widget/src/domain/token/token.ts
@@ -1,4 +1,4 @@
-import { type Brand, Schema, SchemaTransformation, Struct } from "effect";
+import { Schema, SchemaTransformation, Struct } from "effect";
 import * as LegacyApi from "../../generated/api/legacy-schema";
 import * as YieldApi from "../../generated/api/yield-schema";
 import { addressIdentity, TokenAddress } from "../identity/identifiers";
@@ -33,20 +33,24 @@ export const LegacyToken = LegacyApi.TokenDto.mapFields(
   ])
 ).pipe(Schema.decodeTo(Token));
 
-/** Internal token identity: `${network}-${symbol}-${address}`. Never host input. */
-export type TokenString = Brand.Branded<string, "TokenString">;
+/**
+ * Internal token identity: `${network}-${symbol}-${address}`. Never host input.
+ * `tokenString` is its only producer: it builds the value from a decoded
+ * token's network, symbol and address identity, so the brand holds by
+ * construction.
+ */
+const TokenString = Schema.String.pipe(Schema.brand("TokenString"));
+export type TokenString = typeof TokenString.Type;
 
-type TokenLike = Pick<Token, "symbol"> & {
-  network: string;
-  address?: string;
-};
+type TokenLike = Pick<Token, "symbol" | "network" | "address">;
 
 const identityAddress = (token: TokenLike) =>
   token.address === undefined ? "<no-address>" : addressIdentity(token.address);
 
-export const tokenString = (token: TokenLike): TokenString => {
-  return `${token.network}-${token.symbol}-${identityAddress(token)}` as TokenString;
-};
+export const tokenString = (token: TokenLike): TokenString =>
+  TokenString.make(
+    `${token.network}-${token.symbol}-${identityAddress(token)}`
+  );
 
 export const equalTokens = (a: TokenLike, b: TokenLike) =>
   tokenString(a) === tokenString(b);
@@ -66,7 +70,7 @@ export type HostTokenKey = typeof HostTokenKey.Type;
 
 const decodeHostTokenKey = Schema.decodeSync(HostTokenKey);
 
-export const hostTokenKey = (token: Omit<TokenLike, "symbol">) =>
+export const hostTokenKey = (token: Pick<Token, "network" | "address">) =>
   decodeHostTokenKey(`${token.network}-${token.address ?? ""}`);
 
 /** Yield API sentinel for a network's native token in `inputToken`/`outputToken`. */
diff --git a/packages/widget/src/domain/wallet/models.ts b/packages/widget/src/domain/wallet/models.ts
index 3d6af6071..d4d70e05a 100644
--- a/packages/widget/src/domain/wallet/models.ts
+++ b/packages/widget/src/domain/wallet/models.ts
@@ -5,22 +5,26 @@ import {
   type WalletNetwork as WalletNetworkType,
 } from "./network";
 
-// Network IDs stay open strings: the API adds networks independently of the
-// generated client, and only Wallet Networks matter to the widget.
-const EnabledNetworkIds = Schema.Array(Schema.Struct({ id: Schema.String }));
+// Network IDs stay open: the API adds networks independently of the generated
+// client, and only Wallet Networks matter to the widget. The brand keeps an
+// unvetted API network ID apart from a Wallet Network.
+const ApiNetworkId = Schema.String.pipe(Schema.brand("ApiNetworkId"));
+type ApiNetworkId = typeof ApiNetworkId.Type;
+
+const EnabledNetworkIds = Schema.Array(Schema.Struct({ id: ApiNetworkId }));
 
 export const EnabledWalletNetworksResponse = EnabledNetworkIds.pipe(
   Schema.decodeTo(
     Schema.ReadonlySet(WalletNetwork),
     SchemaTransformation.transform({
       decode: (
-        networks: ReadonlyArray<{ readonly id: string }>
+        networks: ReadonlyArray<{ readonly id: ApiNetworkId }>
       ): ReadonlySet<WalletNetworkType> =>
         new Set(networks.map(({ id }) => id).filter(isWalletNetwork)),
       encode: (
         networks: ReadonlySet<WalletNetworkType>
-      ): ReadonlyArray<{ readonly id: string }> =>
-        Array.from(networks, (id) => ({ id })),
+      ): ReadonlyArray<{ readonly id: ApiNetworkId }> =>
+        Array.from(networks, (id) => ({ id: ApiNetworkId.make(id) })),
     })
   )
 );
diff --git a/packages/widget/src/domain/wallet/network.ts b/packages/widget/src/domain/wallet/network.ts
index 142d7ff69..11e5f97b1 100644
--- a/packages/widget/src/domain/wallet/network.ts
+++ b/packages/widget/src/domain/wallet/network.ts
@@ -1,4 +1,4 @@
-import { Schema } from "effect";
+import { Record as ERecord, Schema } from "effect";
 import type { Network } from "../network/network";
 import { EvmChainIds, MiscChainIds, SubstrateChainIds } from "./chain-ids.ts";
 
@@ -175,10 +175,7 @@ export type WalletMiscNetwork = Exclude<
   WalletEvmNetwork | WalletCosmosNetwork | WalletSubstrateNetwork
 >;
 
-const walletNetworks = Object.keys(walletNetworkCatalog) as [
-  WalletNetwork,
-  ...WalletNetwork[],
-];
+const walletNetworks = ERecord.keys(walletNetworkCatalog);
 
 export const WalletNetwork = Schema.Literals(walletNetworks);
 
@@ -190,12 +187,8 @@ const networksForProtocol = <Family extends WalletProtocolFamily>(
       walletNetworkCatalog[network].protocolFamily === protocolFamily
   );
 
-const walletEvmNetworks = networksForProtocol("evm");
 export const walletCosmosNetworks = networksForProtocol("cosmos");
 
-const walletEvmNetworkSet = new Set<WalletNetwork>(walletEvmNetworks);
-const walletCosmosNetworkSet = new Set<WalletNetwork>(walletCosmosNetworks);
-
 export const getWalletProtocolFamily = <NetworkId extends WalletNetwork>(
   network: NetworkId
 ): (typeof walletNetworkCatalog)[NetworkId]["protocolFamily"] =>
@@ -211,14 +204,14 @@ export const getProtocolChainIdentity = <NetworkId extends WalletNetwork>(
 ): (typeof walletNetworkCatalog)[NetworkId]["protocolChainIdentity"] =>
   walletNetworkCatalog[network].protocolChainIdentity;
 
+export const isWalletNetwork = Schema.is(WalletNetwork);
+
 export const isEvmWalletNetwork = (
   network: string
 ): network is WalletEvmNetwork =>
-  walletEvmNetworkSet.has(network as WalletNetwork);
+  isWalletNetwork(network) && getWalletProtocolFamily(network) === "evm";
 
 export const isCosmosWalletNetwork = (
   network: string
 ): network is WalletCosmosNetwork =>
-  walletCosmosNetworkSet.has(network as WalletNetwork);
-
-export const isWalletNetwork = Schema.is(WalletNetwork);
+  isWalletNetwork(network) && getWalletProtocolFamily(network) === "cosmos";
diff --git a/packages/widget/src/domain/wallet/wallet-policy.ts b/packages/widget/src/domain/wallet/wallet-policy.ts
index 1bea46f46..b740e24cf 100644
--- a/packages/widget/src/domain/wallet/wallet-policy.ts
+++ b/packages/widget/src/domain/wallet/wallet-policy.ts
@@ -58,8 +58,8 @@ export const applyWalletPolicy = <Wallet extends WalletIdentity>(
     ...available.map(({ groupName }) => groupName),
     ...Object.values(policy.groups ?? {}),
   ].filter((groupName, index, names) => names.indexOf(groupName) === index);
-  const grouped = new Map(
-    groupNames.map((groupName) => [groupName, [] as Array<Wallet>])
+  const grouped = new Map<string, Array<Wallet>>(
+    groupNames.map((groupName) => [groupName, []])
   );
 
   for (const group of available) {
diff --git a/packages/widget/src/domain/wallet/wallet-scope.ts b/packages/widget/src/domain/wallet/wallet-scope.ts
index 09187e015..14dbfc64a 100644
--- a/packages/widget/src/domain/wallet/wallet-scope.ts
+++ b/packages/widget/src/domain/wallet/wallet-scope.ts
@@ -1,5 +1,5 @@
 import { Data } from "effect";
-import type { WalletAddress } from "../identity/identifiers";
+import { WalletAddress } from "../identity/identifiers";
 import type { AdditionalAddresses } from "./address";
 import { isEvmWalletNetwork, type WalletNetwork } from "./network";
 
@@ -52,14 +52,15 @@ export const walletScopeOwnerKey = (
   scope: Pick<WalletScopeKey, "address" | "network">
 ) =>
   new WalletScopeOwnerKey({
+    // Lowercasing a non-empty address keeps it non-empty, so `make` cannot throw.
     address: isEvmWalletNetwork(scope.network)
-      ? (scope.address.toLowerCase() as WalletAddress)
+      ? WalletAddress.make(scope.address.toLowerCase())
       : scope.address,
     network: scope.network,
   });
 
 export type WalletScopeOwner = {
-  readonly address: string;
+  readonly address: WalletAddress;
   readonly network: WalletNetwork;
 };
 
diff --git a/packages/widget/src/features/activity/model/activity-action-details.ts b/packages/widget/src/features/activity/model/activity-action-details.ts
index 15c8c4c7c..ba84cb84f 100644
--- a/packages/widget/src/features/activity/model/activity-action-details.ts
+++ b/packages/widget/src/features/activity/model/activity-action-details.ts
@@ -41,18 +41,19 @@ type ActivityDetailsTransactionFields = Readonly<{
   readonly error: string | null;
   readonly explorerUrl: string | null;
   readonly hash: string | null;
-  readonly id: string;
   readonly status: ActivityDetailsTransactionStatus;
 }>;
 
-/** Yield and Borrow name transaction types from different vocabularies. */
+/** Yield and Borrow name transactions from different vocabularies. */
 type ActivityDetailsTransaction =
   | (ActivityDetailsTransactionFields & {
       readonly _tag: "yield";
+      readonly id: ActionTransaction["id"];
       readonly type: ActionTransaction["type"];
     })
   | (ActivityDetailsTransactionFields & {
       readonly _tag: "borrow";
+      readonly id: BorrowActivityTransaction["id"];
       readonly type: BorrowActivityTransaction["type"];
     });
 
diff --git a/packages/widget/src/features/activity/model/activity-enrichment.ts b/packages/widget/src/features/activity/model/activity-enrichment.ts
index ac29cb9cb..4d314a0ad 100644
--- a/packages/widget/src/features/activity/model/activity-enrichment.ts
+++ b/packages/widget/src/features/activity/model/activity-enrichment.ts
@@ -4,6 +4,11 @@ import { getActionValidatorAddresses } from "../../../domain/action/rules";
 import type { Integration } from "../../../domain/borrow/catalog/integration";
 import type { Market } from "../../../domain/borrow/catalog/market";
 import type { BorrowToken } from "../../../domain/borrow/catalog/token";
+import type {
+  IntegrationId,
+  MarketId,
+  TokenAddress,
+} from "../../../domain/borrow/ids";
 import type { BorrowActivityAction } from "../../../domain/borrow/responses";
 import type {
   EarnValidator,
@@ -26,8 +31,8 @@ import type {
 
 /** Facts resolved for a set of Activity rows; missing facts stay absent. */
 export type ActivityEnrichmentFacts = {
-  readonly borrowIntegrationsById: ReadonlyMap<string, Integration>;
-  readonly borrowMarketsById: ReadonlyMap<string, Market>;
+  readonly borrowIntegrationsById: ReadonlyMap<IntegrationId, Integration>;
+  readonly borrowMarketsById: ReadonlyMap<MarketId, Market>;
   readonly validatorsByKey: ReadonlyMap<string, EarnValidator>;
   readonly yieldsById: ReadonlyMap<YieldId, EarnYieldWithProvider | null>;
 };
@@ -53,7 +58,7 @@ const BORROW_DEBT_ACTIONS: Record<BorrowActivityAction["action"], boolean> = {
 /** A market's loan or collateral token at an address, case-insensitively. */
 export const findBorrowMarketToken = (
   market: Market,
-  address: string
+  address: TokenAddress
 ): BorrowToken | null => {
   const normalized = address.toLowerCase();
 
@@ -110,8 +115,9 @@ export const projectBorrowActivityItem = (
   walletScope: WalletScopeKey,
   { borrowIntegrationsById, borrowMarketsById }: ActivityEnrichmentFacts
 ): BorrowActivityItem => {
-  const market =
-    borrowMarketsById.get(action.rawArguments?.marketId ?? "") ?? null;
+  const market = action.rawArguments
+    ? (borrowMarketsById.get(action.rawArguments.marketId) ?? null)
+    : null;
 
   return {
     _tag: "borrow",
diff --git a/packages/widget/src/features/activity/react/activity-action-route.tsx b/packages/widget/src/features/activity/react/activity-action-route.tsx
index 16a48668b..38b9eff55 100644
--- a/packages/widget/src/features/activity/react/activity-action-route.tsx
+++ b/packages/widget/src/features/activity/react/activity-action-route.tsx
@@ -108,9 +108,9 @@ const BoundActivityActionRoute = ({
   const retry = useAtomSet(retryActivityActionRouteAtom(selectionKey));
   // The action whose Continuation this route mounted from its Review. Its
   // Session lives in this subtree across Review, Steps, and Complete.
-  const [continuedActionId, setContinuedActionId] = useState<string | null>(
-    null
-  );
+  const [continuedActionId, setContinuedActionId] = useState<
+    ActivityActionItem["actionData"]["id"] | null
+  >(null);
 
   if (result.status === "loading") {
     return <ContentLoaderSquare heightPx={320} />;
diff --git a/packages/widget/src/features/activity/state/enrichment.ts b/packages/widget/src/features/activity/state/enrichment.ts
index a903e9c7d..50493e188 100644
--- a/packages/widget/src/features/activity/state/enrichment.ts
+++ b/packages/widget/src/features/activity/state/enrichment.ts
@@ -6,6 +6,7 @@ import type { YieldAction } from "../../../domain/action/models";
 import { getActionValidatorAddresses } from "../../../domain/action/rules";
 import type { Integration } from "../../../domain/borrow/catalog/integration";
 import type { Market } from "../../../domain/borrow/catalog/market";
+import type { IntegrationId, MarketId } from "../../../domain/borrow/ids";
 import type { BorrowNetwork } from "../../../domain/borrow/network";
 import type {
   EarnValidator,
@@ -182,8 +183,8 @@ export const loadActivityEnrichmentFacts = (
     concurrency: ACTIVITY_ENRICHMENT_CONCURRENCY,
   }).pipe(
     Effect.map((facts): ActivityEnrichmentFacts => {
-      const borrowIntegrationsById = new Map<string, Integration>();
-      const borrowMarketsById = new Map<string, Market>();
+      const borrowIntegrationsById = new Map<IntegrationId, Integration>();
+      const borrowMarketsById = new Map<MarketId, Market>();
       const validatorsByKey = new Map<string, EarnValidator>();
       const yieldsById = new Map<YieldId, EarnYieldWithProvider | null>();
 
diff --git a/packages/widget/src/features/activity/state/page-resources.ts b/packages/widget/src/features/activity/state/page-resources.ts
index ce1e38163..8939619fb 100644
--- a/packages/widget/src/features/activity/state/page-resources.ts
+++ b/packages/widget/src/features/activity/state/page-resources.ts
@@ -57,7 +57,7 @@ export const getActivityHistoryKey = (
     includeYield,
     scope: key.scope,
     statuses: ACTIVITY_ACTION_STATUSES,
-    yieldTypes,
+    yieldTypes: yieldTypes ?? [],
   });
 };
 
diff --git a/packages/widget/src/features/borrow-transaction-flow/model/borrow-completion.ts b/packages/widget/src/features/borrow-transaction-flow/model/borrow-completion.ts
index ad73f042e..5048e63c9 100644
--- a/packages/widget/src/features/borrow-transaction-flow/model/borrow-completion.ts
+++ b/packages/widget/src/features/borrow-transaction-flow/model/borrow-completion.ts
@@ -1,5 +1,6 @@
 import type { Market } from "../../../domain/borrow/catalog/market";
 import type { ActionMetadata } from "../../../domain/borrow/execution/action";
+import type { MarketId } from "../../../domain/borrow/ids";
 import type { BorrowPositions } from "../../../domain/borrow/positions/borrow-positions";
 import { exactDecimal, exactZero } from "../../../domain/finance/exact";
 import {
@@ -50,10 +51,10 @@ export const settleBorrowPosition = ({
   positions,
 }: {
   readonly action: Summary["action"];
-  readonly marketId: string;
+  readonly marketId: MarketId;
   readonly markets: ReadonlyArray<Market>;
   /** The position page's market; a pool collateral action targets another. */
-  readonly positionMarketId: string;
+  readonly positionMarketId: MarketId;
   readonly positions: BorrowPositions;
 }): BorrowSettledPosition | null => {
   const market = markets.find((candidate) => candidate.id === marketId);
@@ -170,7 +171,7 @@ export const projectBorrowCompletion = ({
   settled,
   summary,
 }: {
-  readonly metadata?: ActionMetadata;
+  readonly metadata?: ActionMetadata | undefined;
   readonly settled?: BorrowSettledPosition | null;
   readonly summary: Summary;
 }) => {
diff --git a/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-flow.ts b/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-flow.ts
index d1cf10c19..85480b0b1 100644
--- a/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-flow.ts
+++ b/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-flow.ts
@@ -7,7 +7,7 @@ import type {
   ActionMetadata,
 } from "../../../domain/borrow/execution/action";
 import type { ActionCommand } from "../../../domain/borrow/execution/action-command";
-import type { MarketId } from "../../../domain/borrow/ids";
+import { ActionId, type MarketId } from "../../../domain/borrow/ids";
 import type { BorrowNetwork } from "../../../domain/borrow/network";
 import type {
   RiskGateBlockReason,
@@ -404,7 +404,7 @@ export class BorrowFlowSession {
 const BorrowFlowNavigationState = Schema.Struct({
   borrowFlowSession: Schema.instanceOf(BorrowFlowSession),
   /** On Steps and Complete: the handed-off action their Execution runs. */
-  executionActionId: Schema.optional(Schema.String),
+  executionActionId: Schema.optional(ActionId),
 });
 
 type BorrowFlowNavigationState = typeof BorrowFlowNavigationState.Type;
diff --git a/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-workflow.ts b/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-workflow.ts
index df3b4a6a4..3c50722cf 100644
--- a/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-workflow.ts
+++ b/packages/widget/src/features/borrow-transaction-flow/model/borrow-transaction-workflow.ts
@@ -1,4 +1,5 @@
 import type { Transaction } from "../../../domain/borrow/execution/transaction";
+import type { TransactionHash } from "../../../domain/identity/identifiers";
 import {
   flattenTransactionWorkflowTransactions,
   getCurrentTransactionWorkflowBatch,
@@ -13,7 +14,7 @@ import {
 type BorrowExecutionStep = {
   readonly done: boolean;
   readonly explorerUrl: string | null;
-  readonly id: string;
+  readonly id: Transaction["id"];
   readonly progress: TransactionStepProgress;
   readonly type: Transaction["type"];
 };
@@ -21,8 +22,8 @@ type BorrowExecutionStep = {
 /** A submitted transaction of a completed action, for the completion page. */
 type BorrowCompletedTransaction = {
   readonly explorerUrl: string;
-  readonly hash: string | null;
-  readonly id: string;
+  readonly hash: TransactionHash | null;
+  readonly id: Transaction["id"];
   readonly type: Transaction["type"];
 };
 
@@ -108,7 +109,7 @@ export const projectBorrowExecution = (state: TransactionWorkflowState) => {
                     {
                       explorerUrl: submission.link,
                       hash: submission.hash,
-                      id: submission.transactionId,
+                      id: submission.source.transaction.id,
                       type: submission.source.transaction.type,
                     },
                   ]
diff --git a/packages/widget/src/features/borrow-transaction-flow/state/execution-page.ts b/packages/widget/src/features/borrow-transaction-flow/state/execution-page.ts
index 77a4a6771..c5762aa35 100644
--- a/packages/widget/src/features/borrow-transaction-flow/state/execution-page.ts
+++ b/packages/widget/src/features/borrow-transaction-flow/state/execution-page.ts
@@ -2,6 +2,7 @@ import { Data, Effect, Option, Ref, type Scope, Stream } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import { walletRuntime } from "../../../app/runtime/wallet-runtime";
+import type { ActionId } from "../../../domain/borrow/ids";
 import { isBorrowNetwork } from "../../../domain/borrow/network";
 import {
   BorrowMarketsKey,
@@ -37,7 +38,7 @@ import { leaveBorrowFlow } from "./borrow-flow-session";
 export const startBorrowFlowExecution = Effect.fn("startBorrowFlowExecution")(
   function* (
     { handoff, walletScope }: BorrowFlowSession,
-    actionId: string
+    actionId: ActionId
   ): Effect.fn.Return<
     TransactionWorkflowHandle,
     TransactionWorkflowInputError,
@@ -115,7 +116,7 @@ export const makeBorrowFlowSettledPositionAtom = (
 
 /** One handed-off action's Execution in a Session. */
 export class BorrowFlowExecutionKey extends Data.Class<{
-  readonly actionId: string;
+  readonly actionId: ActionId;
   readonly session: BorrowFlowSession;
 }> {}
 
@@ -136,7 +137,7 @@ export const borrowFlowExecutionPage = Atom.family(
 
 export const makeBorrowFlowExecutionPage = (
   session: BorrowFlowSession,
-  actionId: string
+  actionId: ActionId
 ) => {
   const workflowAtom = walletRuntime
     .atom(startBorrowFlowExecution(session, actionId))
diff --git a/packages/widget/src/features/borrow/action-preparation/model/open-position.ts b/packages/widget/src/features/borrow/action-preparation/model/open-position.ts
index b828690d8..54229e791 100644
--- a/packages/widget/src/features/borrow/action-preparation/model/open-position.ts
+++ b/packages/widget/src/features/borrow/action-preparation/model/open-position.ts
@@ -92,10 +92,7 @@ export const prepareOpenPositionAction = (
       ? [
           {
             amount: effectiveCollateralAmount,
-            tokenId: decodeTokenId({
-              address: collateralToken.token.address,
-              symbol: collateralToken.token.symbol,
-            }),
+            tokenId: decodeTokenId(collateralToken.token),
             type: "supply" as const,
           },
         ]
diff --git a/packages/widget/src/features/borrow/action-preparation/model/withdraw.ts b/packages/widget/src/features/borrow/action-preparation/model/withdraw.ts
index 35a8ff037..571f87fbc 100644
--- a/packages/widget/src/features/borrow/action-preparation/model/withdraw.ts
+++ b/packages/widget/src/features/borrow/action-preparation/model/withdraw.ts
@@ -33,10 +33,7 @@ export const prepareWithdrawAction = (
   const assessment = position.risk.assess([
     {
       amount: executableAmount,
-      tokenId: decodeTokenId({
-        address: token.collateralToken.token.address,
-        symbol: token.collateralToken.token.symbol,
-      }),
+      tokenId: decodeTokenId(token.collateralToken.token),
       type: "withdraw",
     },
   ]);
diff --git a/packages/widget/src/features/borrow/amount-input/ui/amount-field.tsx b/packages/widget/src/features/borrow/amount-input/ui/amount-field.tsx
index 72c3c742e..a07a43dc0 100644
--- a/packages/widget/src/features/borrow/amount-input/ui/amount-field.tsx
+++ b/packages/widget/src/features/borrow/amount-input/ui/amount-field.tsx
@@ -33,14 +33,14 @@ export const BorrowAmountField = ({
   readonly amount: BigNumber;
   readonly balance?: ReactNode;
   readonly balanceError?: boolean;
-  readonly dataRk?: string;
-  readonly disabled?: boolean;
+  readonly dataRk?: string | undefined;
+  readonly disabled?: boolean | undefined;
   readonly label: string;
   readonly onAmountChange: (amount: BigNumber) => void;
-  readonly onMaxClick?: (() => void) | null;
+  readonly onMaxClick?: (() => void) | null | undefined;
   readonly tone?: "stake" | "action";
-  readonly usdValue?: BigNumber;
-  readonly warning?: string | null;
+  readonly usdValue?: BigNumber | undefined;
+  readonly warning?: string | null | undefined;
 }) => {
   const variant = useWidgetConfig("variant");
   const { locale } = useWidgetPresentation();
diff --git a/packages/widget/src/features/borrow/borrow-entry/model/borrow-entry.ts b/packages/widget/src/features/borrow/borrow-entry/model/borrow-entry.ts
index d0e870012..82bc58630 100644
--- a/packages/widget/src/features/borrow/borrow-entry/model/borrow-entry.ts
+++ b/packages/widget/src/features/borrow/borrow-entry/model/borrow-entry.ts
@@ -9,7 +9,11 @@ import {
   isListedBorrowMarket,
   type Market,
 } from "../../../../domain/borrow/catalog/market";
-import { decodeTokenId, type TokenId } from "../../../../domain/borrow/ids";
+import {
+  decodeTokenId,
+  type MarketId,
+  type TokenId,
+} from "../../../../domain/borrow/ids";
 import type { BorrowNetwork } from "../../../../domain/borrow/network";
 import {
   type BorrowPositions,
@@ -43,7 +47,7 @@ export type BorrowFormIntent = {
   readonly borrowAmount: string;
   readonly collateralAmount: string;
   readonly selectedCollateralTokenId: TokenId | null;
-  readonly selectedMarketId: string | null;
+  readonly selectedMarketId: MarketId | null;
 };
 
 export type BorrowFormAction =
@@ -61,7 +65,7 @@ export type BorrowFormAction =
     }
   | {
       readonly type: "market/select";
-      readonly marketId: string;
+      readonly marketId: MarketId;
     }
   | {
       readonly type: "amounts/clear";
@@ -122,7 +126,7 @@ export type BorrowEntryView = {
   readonly selectedIntegration: Integration | null;
   readonly selectedMarket: Market | null;
   readonly selectedMarketPosition: MarketPosition | null;
-  readonly selectedMarketId: string | null;
+  readonly selectedMarketId: MarketId | null;
   readonly validation: BorrowFormValidation;
   readonly walletBalances: BorrowMarketWalletBalances | null;
 };
diff --git a/packages/widget/src/features/borrow/borrow-entry/model/details.ts b/packages/widget/src/features/borrow/borrow-entry/model/details.ts
index edcec3617..0f3567a76 100644
--- a/packages/widget/src/features/borrow/borrow-entry/model/details.ts
+++ b/packages/widget/src/features/borrow/borrow-entry/model/details.ts
@@ -93,7 +93,7 @@ export const getBorrowDetailsModel = ({
   readonly integration: Integration | null;
   readonly locale: string;
   readonly market: Market;
-  readonly projection?: BorrowFormProjection;
+  readonly projection?: BorrowFormProjection | undefined;
   readonly t: TFunction;
 }) => {
   const borrowUsd = getTokenUsdValue({
diff --git a/packages/widget/src/features/borrow/borrow-entry/model/market-groups.ts b/packages/widget/src/features/borrow/borrow-entry/model/market-groups.ts
index 6eb5bc676..041e0c329 100644
--- a/packages/widget/src/features/borrow/borrow-entry/model/market-groups.ts
+++ b/packages/widget/src/features/borrow/borrow-entry/model/market-groups.ts
@@ -1,5 +1,6 @@
 import BigNumber from "bignumber.js";
 import type { CollateralToken } from "../../../../domain/borrow/catalog/collateral-token";
+import type { Integration } from "../../../../domain/borrow/catalog/integration";
 import {
   getBorrowMarketPairLabel,
   getListedCollateralTokens,
@@ -34,11 +35,6 @@ type BorrowMarketGroup = {
   readonly network: BorrowNetwork;
 };
 
-type NamedIntegration = {
-  readonly id: string;
-  readonly name: string;
-};
-
 export const toBorrowEntryToken = ({
   network,
   token,
@@ -101,7 +97,7 @@ export const filterBorrowMarketGroups = ({
   markets,
   search,
 }: {
-  readonly integrations: readonly NamedIntegration[];
+  readonly integrations: ReadonlyArray<Pick<Integration, "id" | "name">>;
   readonly markets: readonly Market[];
   readonly search: string;
 }): readonly BorrowMarketGroup[] => {
diff --git a/packages/widget/src/features/borrow/borrow-entry/state/borrow-entry.ts b/packages/widget/src/features/borrow/borrow-entry/state/borrow-entry.ts
index 3205a5784..5b9871ee1 100644
--- a/packages/widget/src/features/borrow/borrow-entry/state/borrow-entry.ts
+++ b/packages/widget/src/features/borrow/borrow-entry/state/borrow-entry.ts
@@ -5,7 +5,7 @@ import * as Atom from "effect/reactivity/Atom";
 import { appRuntime } from "../../../../app/runtime/app-runtime";
 import { BorrowFeatureDisabled } from "../../../../domain/borrow/availability";
 import type { CollateralToken } from "../../../../domain/borrow/catalog/collateral-token";
-import { decodeTokenId } from "../../../../domain/borrow/ids";
+import { decodeTokenId, type MarketId } from "../../../../domain/borrow/ids";
 import {
   type BorrowNetwork,
   isBorrowNetwork,
@@ -286,7 +286,7 @@ export const setBorrowCollateralMaxAmountAtom = appRuntime
   .pipe(Atom.withLabel("setBorrowCollateralMaxAmountAtom"));
 
 export const selectBorrowMarketAtom = appRuntime
-  .fn((marketId: string, context) => {
+  .fn((marketId: MarketId, context) => {
     context.set(currentBorrowEntryAtom, {
       marketId,
       type: "market/select",
diff --git a/packages/widget/src/features/borrow/borrow-entry/ui/components/asset-selector.tsx b/packages/widget/src/features/borrow/borrow-entry/ui/components/asset-selector.tsx
index e8aa8a202..ece84dfdb 100644
--- a/packages/widget/src/features/borrow/borrow-entry/ui/components/asset-selector.tsx
+++ b/packages/widget/src/features/borrow/borrow-entry/ui/components/asset-selector.tsx
@@ -13,7 +13,7 @@ export const BorrowAssetSelectorList = ({
   title,
 }: {
   readonly children: ReactNode;
-  readonly columnLabel?: string;
+  readonly columnLabel?: string | undefined;
   readonly title: string;
 }) => (
   <Box className={styles.assetSelectorList} mx="4">
@@ -56,11 +56,11 @@ export const BorrowAssetSelectorRow = ({
   readonly indented?: boolean;
   readonly label: string;
   /** Muted note on the label line, e.g. collateral yield. */
-  readonly labelMeta?: string;
+  readonly labelMeta?: string | undefined;
   readonly meta?: string;
   readonly onClick: () => void;
-  readonly rate?: string;
-  readonly rateMeta?: string;
+  readonly rate?: string | undefined;
+  readonly rateMeta?: string | undefined;
   readonly selected?: boolean;
   readonly testId?: string;
   readonly token: Token;
diff --git a/packages/widget/src/features/borrow/borrow-entry/ui/components/market-select-modal.tsx b/packages/widget/src/features/borrow/borrow-entry/ui/components/market-select-modal.tsx
index 61bbc0923..40e5940f1 100644
--- a/packages/widget/src/features/borrow/borrow-entry/ui/components/market-select-modal.tsx
+++ b/packages/widget/src/features/borrow/borrow-entry/ui/components/market-select-modal.tsx
@@ -9,6 +9,7 @@ import {
   type Market,
 } from "../../../../../domain/borrow/catalog/market";
 import { getBorrowOriginationFeeBps } from "../../../../../domain/borrow/execution/origination-fee";
+import type { MarketId } from "../../../../../domain/borrow/ids";
 import { formatBorrowProviderName } from "../../../../../shared/lib/formatters";
 import {
   formatPercent,
@@ -40,7 +41,7 @@ export const MarketSelectModal = ({
 }: {
   readonly integrations: ReadonlyArray<Integration>;
   readonly markets: readonly Market[];
-  readonly selectedMarketId: string | null;
+  readonly selectedMarketId: MarketId | null;
 }) => {
   const { t } = useTranslation();
   const { locale } = useWidgetPresentation();
diff --git a/packages/widget/src/features/borrow/market-position/model/action-form.ts b/packages/widget/src/features/borrow/market-position/model/action-form.ts
index 1f3caf4a1..18e460ca4 100644
--- a/packages/widget/src/features/borrow/market-position/model/action-form.ts
+++ b/packages/widget/src/features/borrow/market-position/model/action-form.ts
@@ -1,4 +1,5 @@
 import type BigNumber from "bignumber.js";
+import type { TokenAddress } from "../../../../domain/borrow/ids";
 import type { RiskGateBlockReason } from "../../../../domain/borrow/risk/risk-gate";
 import { exactDecimal } from "../../../../domain/finance/exact";
 import type { TokenBalance } from "../../../../domain/finance/models";
@@ -46,7 +47,7 @@ export type BorrowRepayFormAction =
 
 export type BorrowWithdrawFormIntent = {
   readonly amount: string;
-  readonly selectedTokenAddress: string | null;
+  readonly selectedTokenAddress: TokenAddress | null;
 };
 
 export type BorrowWithdrawFormAction =
@@ -56,7 +57,7 @@ export type BorrowWithdrawFormAction =
     }
   | {
       readonly type: "token/select";
-      readonly tokenAddress: string;
+      readonly tokenAddress: TokenAddress;
     }
   | {
       readonly type: "reset";
diff --git a/packages/widget/src/features/borrow/market-position/model/details.ts b/packages/widget/src/features/borrow/market-position/model/details.ts
index ebb9276ec..bd458fb20 100644
--- a/packages/widget/src/features/borrow/market-position/model/details.ts
+++ b/packages/widget/src/features/borrow/market-position/model/details.ts
@@ -4,6 +4,7 @@ import {
   deriveMarketPositionOverview,
   type MarketPosition,
 } from "../../../../domain/borrow/positions/market-position";
+import type { BorrowPositionActionKey } from "../../../../domain/borrow/positions/position-action-key";
 import { deriveMarketRiskLimits } from "../../../../domain/borrow/risk/market-risk";
 import { borrowTokenToAppToken } from "../../../../shared/lib/borrow-token";
 import {
@@ -42,7 +43,7 @@ type BorrowPositionDetailRow = {
 };
 
 export type BorrowPositionAction = {
-  readonly id: string;
+  readonly id: BorrowPositionActionKey;
   readonly label: string;
   readonly pendingContext: BorrowPositionPendingActionContext;
   readonly type:
@@ -234,7 +235,7 @@ export const getBorrowPositionDetailsModel = ({
     {
       id: "debt",
       label: t("dashboard.borrow.position_details.debt"),
-      subValue: debtBalance?.tokenSymbol,
+      ...(debtBalance ? { subValue: debtBalance.tokenSymbol } : {}),
       value: formatUsd(position.metrics.totalBorrowedUsd, locale),
     },
     ...(currentLtv === null
diff --git a/packages/widget/src/features/borrow/market-position/state/action-form.ts b/packages/widget/src/features/borrow/market-position/state/action-form.ts
index 3e3ba979d..a9fe4cd9a 100644
--- a/packages/widget/src/features/borrow/market-position/state/action-form.ts
+++ b/packages/widget/src/features/borrow/market-position/state/action-form.ts
@@ -5,6 +5,7 @@ import { appRuntime } from "../../../../app/runtime/app-runtime";
 import { BorrowFeatureDisabled } from "../../../../domain/borrow/availability";
 import type { MarketId } from "../../../../domain/borrow/ids";
 import type { BorrowNetwork } from "../../../../domain/borrow/network";
+import type { BorrowPositionActionKey } from "../../../../domain/borrow/positions/position-action-key";
 import {
   sameWalletScopeOwner,
   type WalletScopeKey,
@@ -38,7 +39,7 @@ import {
 } from "../model/details";
 
 class BorrowPositionActionRouteKey extends Data.Class<{
-  readonly actionId: string;
+  readonly actionId: BorrowPositionActionKey;
   readonly marketId: MarketId;
   readonly network: BorrowNetwork;
 }> {}
@@ -53,7 +54,7 @@ export const makeBorrowPositionActionRouteKey = (
   });
 
 class BorrowPositionActionFormKey extends Data.Class<{
-  readonly actionId: string;
+  readonly actionId: BorrowPositionActionKey;
   readonly marketId: MarketId;
   readonly network: BorrowNetwork;
   readonly owner: WalletScopeOwnerKey;
diff --git a/packages/widget/src/features/borrow/market-position/ui/actions.page.tsx b/packages/widget/src/features/borrow/market-position/ui/actions.page.tsx
index 85c785261..50d29b1c3 100644
--- a/packages/widget/src/features/borrow/market-position/ui/actions.page.tsx
+++ b/packages/widget/src/features/borrow/market-position/ui/actions.page.tsx
@@ -30,7 +30,7 @@ export const BorrowPositionActionsPage = () => {
 
   const onActionSelect = (action: BorrowPositionAction) => {
     if (!marketId) return;
-    navigation.push(
+    void navigation.push(
       widgetRoutes.borrowPositionAction.build("Dashboard", {
         actionId: action.id,
         marketId,
diff --git a/packages/widget/src/features/borrow/market-position/ui/components/metric-cards.tsx b/packages/widget/src/features/borrow/market-position/ui/components/metric-cards.tsx
index 211bdd731..c0edf7752 100644
--- a/packages/widget/src/features/borrow/market-position/ui/components/metric-cards.tsx
+++ b/packages/widget/src/features/borrow/market-position/ui/components/metric-cards.tsx
@@ -22,7 +22,9 @@ export const MetricCards = ({
     };
     const toneClass = getToneClass();
 
-    return { ...card, valueClassName: toneClass };
+    return toneClass === undefined
+      ? card
+      : { ...card, valueClassName: toneClass };
   });
 
   return <PositionMetricCards cards={positionCards} />;
diff --git a/packages/widget/src/features/borrow/positions/react/use-borrow-positions.ts b/packages/widget/src/features/borrow/positions/react/use-borrow-positions.ts
index dab468e33..e3cba4feb 100644
--- a/packages/widget/src/features/borrow/positions/react/use-borrow-positions.ts
+++ b/packages/widget/src/features/borrow/positions/react/use-borrow-positions.ts
@@ -1,8 +1,9 @@
 import { useAtomValue } from "@effect/atom-react";
+import type { MarketId } from "../../../../domain/borrow/ids";
 import { useWalletScopeRoute } from "../../../wallet/index";
 import { BorrowPositionKey, borrowPositionAtom } from "../state/positions";
 
-export const useBorrowPosition = (marketId: string | null | undefined) => {
+export const useBorrowPosition = (marketId: MarketId | null | undefined) => {
   const walletScope = useWalletScopeRoute();
   const positionResult = useAtomValue(
     borrowPositionAtom(
diff --git a/packages/widget/src/features/borrow/positions/state/positions.ts b/packages/widget/src/features/borrow/positions/state/positions.ts
index 4c832353d..9f61bef63 100644
--- a/packages/widget/src/features/borrow/positions/state/positions.ts
+++ b/packages/widget/src/features/borrow/positions/state/positions.ts
@@ -12,7 +12,7 @@ import {
 import { walletScopeAtom } from "../../../wallet/index";
 
 export class BorrowPositionKey extends Data.Class<{
-  readonly marketId: MarketId | string | null;
+  readonly marketId: MarketId | null;
   readonly scope: WalletScopeKey;
 }> {}
 
diff --git a/packages/widget/src/features/earn/model/pending-action-deep-link.ts b/packages/widget/src/features/earn/model/pending-action-deep-link.ts
index 4b3f1feb3..9fbd5527b 100644
--- a/packages/widget/src/features/earn/model/pending-action-deep-link.ts
+++ b/packages/widget/src/features/earn/model/pending-action-deep-link.ts
@@ -1,5 +1,10 @@
+import type { YieldPendingActionType } from "../../../domain/action/pending-action";
 import type { EarnBalance } from "../../../domain/earn/models";
-import { getPositionBalanceDataKey } from "../../../domain/portfolio/positions";
+import type { ValidatorAddress } from "../../../domain/identity/identifiers";
+import {
+  type BalanceDataKey,
+  getPositionBalanceDataKey,
+} from "../../../domain/portfolio/positions";
 
 /**
  * A deep link with `balanceId` targets only balances under that position key;
@@ -11,10 +16,10 @@ export const findPendingActionDeepLinkTarget = ({
   pendingActionType,
   validator,
 }: {
-  readonly balanceId: string | null;
+  readonly balanceId: BalanceDataKey | null;
   readonly balances: ReadonlyArray<EarnBalance>;
-  readonly pendingActionType: string;
-  readonly validator: string | null;
+  readonly pendingActionType: YieldPendingActionType;
+  readonly validator: ValidatorAddress | null;
 }) => {
   for (const balance of balances) {
     if (balanceId && getPositionBalanceDataKey(balance) !== balanceId) continue;
diff --git a/packages/widget/src/features/earn/state/earn-selection/catalog/catalog.ts b/packages/widget/src/features/earn/state/earn-selection/catalog/catalog.ts
index 3683d6102..b659bd032 100644
--- a/packages/widget/src/features/earn/state/earn-selection/catalog/catalog.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/catalog/catalog.ts
@@ -1,11 +1,12 @@
+import type BigNumber from "bignumber.js";
 import { Array as EArray, Option } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import type { YieldCategory } from "../../../../../domain/earn/contract";
 import type { EarnValidator } from "../../../../../domain/earn/models";
 import { filterValidators } from "../../../../../domain/earn/yield";
+import { exactZero } from "../../../../../domain/finance/exact";
 import { isFundedBalance } from "../../../../../domain/finance/funded-balance";
-import type { PositionsData } from "../../../../../domain/portfolio/positions";
 import { toPositionsData } from "../../../../../domain/portfolio/positions";
 import { tokenString } from "../../../../../domain/token/token";
 import { widgetConfigAtom } from "../../../../../features/widget-configuration/index";
@@ -25,6 +26,7 @@ import {
 } from "../../../../../resources/yield-directory/index";
 import { yieldPositionsResourceAtom } from "../../../../../resources/yield-positions/index";
 import { mapAsyncResultError } from "../../../../../shared/effect/async-result";
+import { makeEmptyPositionsData } from "../model/view-model";
 import {
   EarnCatalogError,
   type EarnCatalogOperation,
@@ -116,7 +118,6 @@ export const earnYieldCatalogAtom = Atom.family((key: YieldCatalogKey) => {
     new YieldDirectoryKey({
       network: key.network,
       token: key.token,
-      types: undefined,
       yieldIds: key.yieldIds,
     })
   );
@@ -140,7 +141,7 @@ export const positionsDataAtom = Atom.family((key: PositionsDataKey) => {
           AsyncResult.map((positions) => toPositionsData(positions.items)),
           mapAsyncResultError(toCatalogError("positions-data"))
         )
-      : AsyncResult.success(new Map() as PositionsData)
+      : AsyncResult.success(makeEmptyPositionsData())
   ).pipe(Atom.withLabel("earnPositionsDataAtom"));
 });
 
@@ -148,7 +149,7 @@ const tokenBalancesResult = (
   get: Atom.AtomContext,
   key: TokenOptionsKey
 ): AsyncResult.AsyncResult<
-  ReadonlyMap<string, string> | null,
+  ReadonlyMap<string, BigNumber> | null,
   EarnCatalogError
 > => {
   if (!key.scope) return AsyncResult.success(null);
@@ -159,7 +160,7 @@ const tokenBalancesResult = (
         new Map(
           balances.map((balance) => [
             tokenString(balance.token),
-            balance.amount.toFixed(),
+            balance.amount,
           ])
         )
     ),
@@ -174,7 +175,7 @@ const tokenBalancesResult = (
 
 const enrichTokenOptions = (
   canonical: ReadonlyArray<EarnTokenOption>,
-  balances: ReadonlyMap<string, string> | null
+  balances: ReadonlyMap<string, BigNumber> | null
 ) =>
   canonical
     .map((option, index) => ({
@@ -182,7 +183,7 @@ const enrichTokenOptions = (
       option: balances
         ? ({
             ...option,
-            amount: balances.get(tokenString(option.token)) ?? "0",
+            amount: balances.get(tokenString(option.token)) ?? exactZero(),
             source: "balance",
           } satisfies EarnTokenOption)
         : option,
diff --git a/packages/widget/src/features/earn/state/earn-selection/model/form.ts b/packages/widget/src/features/earn/state/earn-selection/model/form.ts
index 197149b44..13eb8afd0 100644
--- a/packages/widget/src/features/earn/state/earn-selection/model/form.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/model/form.ts
@@ -1,3 +1,4 @@
+import type BigNumber from "bignumber.js";
 import type { EarnYieldWithProvider } from "../../../../../domain/earn/models";
 import { getEnterAmountConstraint } from "../../../../../domain/earn/stake";
 import {
@@ -17,7 +18,7 @@ export const canSubmitEarnForm = ({
   positionsData,
   selectedYield,
 }: {
-  readonly availableAmount: string | null;
+  readonly availableAmount: BigNumber | null;
   readonly form: EarnSelectionForm;
   readonly positionsData: PositionsData;
   readonly selectedYield: EarnYieldWithProvider;
@@ -60,7 +61,7 @@ export const resolveForm = ({
   positionsData,
   selectedYield,
 }: {
-  availableAmount: string | null;
+  availableAmount: BigNumber | null;
   intent: EarnEntryIntent;
   positionsData: PositionsData;
   selectedYield: EarnYieldWithProvider;
@@ -104,12 +105,12 @@ const resolveStakeAmount = ({
   constraint,
   intent,
 }: {
-  availableAmount: string | null;
+  availableAmount: BigNumber | null;
   constraint: ReturnType<typeof getEnterAmountConstraint>;
   intent: EarnEntryIntent;
 }) => {
   if (constraint.type === "force-max") {
-    return availableAmount ?? "0";
+    return availableAmount?.toFixed() ?? "0";
   }
 
   if (intent.amountInput !== "untouched") {
diff --git a/packages/widget/src/features/earn/state/earn-selection/model/view.ts b/packages/widget/src/features/earn/state/earn-selection/model/view.ts
index 8d65ffc6e..7752491fc 100644
--- a/packages/widget/src/features/earn/state/earn-selection/model/view.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/model/view.ts
@@ -76,10 +76,15 @@ const resolveCategorySelection = ({
   readonly intent: EarnEntryIntent;
   readonly observations: EarnViewObservations;
   readonly previous: EarnSelectionView | null;
-}) => {
+}): {
+  readonly available: ReadonlyArray<YieldCategory>;
+  readonly blockingFailure: boolean;
+  readonly category: YieldCategory | null;
+  readonly loading: boolean;
+} => {
   if (observations.category._tag === "disabled") {
     return {
-      available: [] as ReadonlyArray<YieldCategory>,
+      available: [],
       blockingFailure: false,
       category: null,
       loading: false,
diff --git a/packages/widget/src/features/earn/state/earn-selection/state/atoms.ts b/packages/widget/src/features/earn/state/earn-selection/state/atoms.ts
index eb58c278d..330ad6f38 100644
--- a/packages/widget/src/features/earn/state/earn-selection/state/atoms.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/state/atoms.ts
@@ -45,7 +45,8 @@ export const earnEntryAtom = Atom.make<EarnEntry>((context) => {
     categoryOrder: config.yieldCategoryOrder,
     categoryGrouping,
     initParams: context.get(initParamsAtom),
-    preferredTokenYieldsPerNetwork: config.preferredTokenYieldsPerNetwork,
+    preferredTokenYieldsPerNetwork:
+      config.preferredTokenYieldsPerNetwork ?? null,
     walletScope: wallet.walletScope,
     walletResolution: wallet.walletResolution,
     yieldProviderOrder: categoryGrouping ? config.yieldProviderOrder : {},
diff --git a/packages/widget/src/features/earn/state/earn-selection/state/resource-observations.ts b/packages/widget/src/features/earn/state/earn-selection/state/resource-observations.ts
index b4b7def86..a01cea05a 100644
--- a/packages/widget/src/features/earn/state/earn-selection/state/resource-observations.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/state/resource-observations.ts
@@ -197,7 +197,7 @@ const bindValidatorsKey = (
 
 export const resolveEarnViewFromResources = (
   context: Atom.AtomContext,
-  { entry, intent, previous }: EarnViewResolutionInput
+  { entry, intent, previous = null }: EarnViewResolutionInput
 ): EarnSelectionView => {
   const initial = readInitial(context, entry);
   const category = readCategory(context, { entry, network: initial.network });
diff --git a/packages/widget/src/features/earn/state/earn-selection/types.ts b/packages/widget/src/features/earn/state/earn-selection/types.ts
index 3d7f80277..d31159d84 100644
--- a/packages/widget/src/features/earn/state/earn-selection/types.ts
+++ b/packages/widget/src/features/earn/state/earn-selection/types.ts
@@ -1,3 +1,4 @@
+import type BigNumber from "bignumber.js";
 import { Data } from "effect";
 import type { AsyncResult } from "effect/reactivity/AsyncResult";
 import type { Atom, PullResult, Writable } from "effect/reactivity/Atom";
@@ -27,7 +28,7 @@ import type {
 export type EarnTokenOption = {
   readonly token: Token;
   readonly availableYields: ReadonlyArray<YieldId>;
-  readonly amount: string | null;
+  readonly amount: BigNumber | null;
   readonly source: "balance" | "default";
 };
 export type EarnTokenKey = TokenString;
diff --git a/packages/widget/src/features/earn/state/token-selection.ts b/packages/widget/src/features/earn/state/token-selection.ts
index ec230b2f1..2dec2698f 100644
--- a/packages/widget/src/features/earn/state/token-selection.ts
+++ b/packages/widget/src/features/earn/state/token-selection.ts
@@ -3,7 +3,6 @@ import { Option } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import { appRuntime } from "../../../app/runtime/app-runtime";
-import { exactDecimal } from "../../../domain/finance/exact";
 import { isFundedBalance } from "../../../domain/finance/funded-balance";
 import type { Prices } from "../../../domain/health/models";
 import { tokenString } from "../../../domain/token/token";
@@ -25,11 +24,8 @@ export type EarnTokenSelectionItem = EarnTokenOption & {
   readonly fundedUsd: BigNumber | null;
 };
 
-const positiveAmount = (option: EarnTokenOption) => {
-  if (option.amount === null) return null;
-  const amount = exactDecimal(option.amount);
-  return amount.isGreaterThan(0) ? amount : null;
-};
+const positiveAmount = (option: EarnTokenOption) =>
+  option.amount?.isGreaterThan(0) ? option.amount : null;
 
 const toSelectionItem = (
   option: EarnTokenOption,
diff --git a/packages/widget/src/features/earn/ui/compact/earn-page/components/select-provider/index.tsx b/packages/widget/src/features/earn/ui/compact/earn-page/components/select-provider/index.tsx
index f22eb35a7..3a5f36cae 100644
--- a/packages/widget/src/features/earn/ui/compact/earn-page/components/select-provider/index.tsx
+++ b/packages/widget/src/features/earn/ui/compact/earn-page/components/select-provider/index.tsx
@@ -1,4 +1,5 @@
 import { Trigger } from "@radix-ui/react-dialog";
+import type BigNumber from "bignumber.js";
 import { useTranslation } from "react-i18next";
 import { formatUsd } from "../../../../../../../shared/lib/number-format";
 import { Box } from "../../../../../../../shared/ui/primitives/box";
@@ -27,8 +28,11 @@ const getDisplayWebsite = (website: string) => {
   }
 };
 
-const getProviderTvl = (tvlUsd: unknown, locale: string) => {
-  if (typeof tvlUsd !== "string" && typeof tvlUsd !== "number") return null;
+const getProviderTvl = (
+  tvlUsd: BigNumber | null | undefined,
+  locale: string
+) => {
+  if (!tvlUsd) return null;
 
   const formatted = formatUsd(tvlUsd, locale);
 
diff --git a/packages/widget/src/features/earn/ui/compact/earn-page/components/select-validator-section/select-validator-trigger.tsx b/packages/widget/src/features/earn/ui/compact/earn-page/components/select-validator-section/select-validator-trigger.tsx
index 07fc4ea11..677a9b1f7 100644
--- a/packages/widget/src/features/earn/ui/compact/earn-page/components/select-validator-section/select-validator-trigger.tsx
+++ b/packages/widget/src/features/earn/ui/compact/earn-page/components/select-validator-section/select-validator-trigger.tsx
@@ -44,7 +44,7 @@ const formatValidatorTvl = (
   selectedStake: EarnYieldWithProvider,
   locale: string
 ) => {
-  const tvl = validator.tvl ?? validator.tvlRaw;
+  const tvl = validator.tvl;
 
   if (!tvl) return null;
 
diff --git a/packages/widget/src/features/earn/ui/compact/earn-page/earn.page.tsx b/packages/widget/src/features/earn/ui/compact/earn-page/earn.page.tsx
index 0d5978009..819fc7559 100644
--- a/packages/widget/src/features/earn/ui/compact/earn-page/earn.page.tsx
+++ b/packages/widget/src/features/earn/ui/compact/earn-page/earn.page.tsx
@@ -148,11 +148,17 @@ export const AnimatedEarnPage = () => {
     "disableInitLayoutAnimation"
   );
 
-  const getAnimation = () => {
+  const getAnimation = (): {
+    readonly transition: { readonly duration: number; readonly delay: number };
+    readonly initial: {
+      readonly opacity: number;
+      readonly translateY: string | number;
+    };
+  } => {
     if (mountAnimationFinished) {
       return {
         transition: { duration: 0.3, delay: 0 },
-        initial: { opacity: 0, translateY: "-10px" as string | number },
+        initial: { opacity: 0, translateY: "-10px" },
       };
     }
     if (disableInitLayoutAnimation) {
diff --git a/packages/widget/src/features/earn/ui/components/select-opportunity-list-item/index.tsx b/packages/widget/src/features/earn/ui/components/select-opportunity-list-item/index.tsx
index f3daafb62..857b2a3b3 100644
--- a/packages/widget/src/features/earn/ui/components/select-opportunity-list-item/index.tsx
+++ b/packages/widget/src/features/earn/ui/components/select-opportunity-list-item/index.tsx
@@ -64,7 +64,7 @@ export const SelectOpportunityListItem = <T extends EarnYieldWithProvider>({
           name: item.metadata.name,
           provider,
         }}
-        token={item.token as Parameters<typeof ProviderIcon>[0]["token"]}
+        token={item.token}
       />
 
       <Box
diff --git a/packages/widget/src/features/earn/ui/components/select-yield-section/select-yield-reward-details.tsx b/packages/widget/src/features/earn/ui/components/select-yield-section/select-yield-reward-details.tsx
index dd00e513c..f133e3d9d 100644
--- a/packages/widget/src/features/earn/ui/components/select-yield-section/select-yield-reward-details.tsx
+++ b/packages/widget/src/features/earn/ui/components/select-yield-section/select-yield-reward-details.tsx
@@ -5,7 +5,6 @@ import {
   getYieldOutputToken,
   getYieldTypeLabels,
 } from "../../../../../domain/earn/yield";
-import { exactDecimal } from "../../../../../domain/finance/exact";
 import type { Token } from "../../../../../domain/token/token";
 import { formatTokenAmount } from "../../../../../shared/lib/number-format";
 import { Divider } from "../../../../../shared/ui/components/divider";
@@ -96,11 +95,9 @@ export const SelectYieldRewardDetails = ({
                   yieldDto.metadata.name,
               },
             ];
-        const pricePerShare = exactDecimal(
-          yieldDto.state?.pricePerShareState?.price ?? 1
-        );
+        const pricePerShare = yieldDto.state?.pricePerShareState?.price;
         const outputAmount =
-          pricePerShare.isFinite() && !pricePerShare.isZero()
+          pricePerShare && !pricePerShare.isZero()
             ? stakeAmount.dividedBy(pricePerShare)
             : stakeAmount;
 
diff --git a/packages/widget/src/features/earn/ui/dashboard/earn-details/components/network-detail-value.tsx b/packages/widget/src/features/earn/ui/dashboard/earn-details/components/network-detail-value.tsx
index 94d5f5358..733c5c371 100644
--- a/packages/widget/src/features/earn/ui/dashboard/earn-details/components/network-detail-value.tsx
+++ b/packages/widget/src/features/earn/ui/dashboard/earn-details/components/network-detail-value.tsx
@@ -7,8 +7,8 @@ import { Text } from "../../../../../../shared/ui/primitives/typography/text";
 
 import * as styles from "../styles.css";
 
-export const NetworkDetailValue = ({ network }: { network: string }) => {
-  const networkLogoUri = useVariantNetworkUrls(network as Network);
+export const NetworkDetailValue = ({ network }: { network: Network }) => {
+  const networkLogoUri = useVariantNetworkUrls(network);
   const networkName = formatNetworkName(network);
 
   return (
diff --git a/packages/widget/src/features/earn/ui/dashboard/earn-details/components/provider-selection-card.tsx b/packages/widget/src/features/earn/ui/dashboard/earn-details/components/provider-selection-card.tsx
index b2cc708b8..3727a547a 100644
--- a/packages/widget/src/features/earn/ui/dashboard/earn-details/components/provider-selection-card.tsx
+++ b/packages/widget/src/features/earn/ui/dashboard/earn-details/components/provider-selection-card.tsx
@@ -39,7 +39,7 @@ type ProviderCardItem = {
   logo: string | undefined;
   name: string;
   preferred: boolean | undefined;
-  stakedBalance: ProviderDetailsItem["stakedBalance"] | EarnValidator["tvlRaw"];
+  stakedBalance: ProviderDetailsItem["stakedBalance"];
   status: ProviderDetailsItem["status"] | EarnValidator["status"];
   validator: EarnValidator | undefined;
   website: string | undefined;
@@ -332,8 +332,7 @@ const getProviderCardItems = ({
         logo: providerDetails?.logo ?? validator.logoURI,
         name: providerDetails?.name ?? name,
         preferred: providerDetails?.preferred ?? validator.preferred,
-        stakedBalance:
-          providerDetails?.stakedBalance ?? validator.tvl ?? validator.tvlRaw,
+        stakedBalance: providerDetails?.stakedBalance ?? validator.tvl,
         status: providerDetails?.status ?? validator.status,
         validator,
         website: providerDetails?.website ?? validator.website,
diff --git a/packages/widget/src/features/earn/ui/dashboard/earn-details/earn-details-model.tsx b/packages/widget/src/features/earn/ui/dashboard/earn-details/earn-details-model.tsx
index 765c0eb68..9c0ae0d2f 100644
--- a/packages/widget/src/features/earn/ui/dashboard/earn-details/earn-details-model.tsx
+++ b/packages/widget/src/features/earn/ui/dashboard/earn-details/earn-details-model.tsx
@@ -1,3 +1,4 @@
+import { Schema } from "effect";
 import type { TFunction } from "i18next";
 import type { ReactNode } from "react";
 import { isConfidentialYield } from "../../../../../domain/earn/confidential";
@@ -20,6 +21,7 @@ import {
   getYieldWarmupPeriod,
   isYieldValidatorSelectionRequired,
 } from "../../../../../domain/earn/yield";
+import { Network } from "../../../../../domain/network/network";
 import {
   formatNetworkName,
   humanizeEnumValue,
@@ -141,7 +143,7 @@ export const canPresentRewardRateHistory = (yieldDto: EarnYieldWithProvider) =>
 
 export const getEarnDetailsModel = ({
   locale,
-  selectedValidators,
+  selectedValidators = null,
   t,
   yieldDto,
 }: {
@@ -214,7 +216,7 @@ const getPromotedFactIds = (
 
 const toMetricCard = (fact: EarnDetailFact): EarnDetailsMetricCard => ({
   label: fact.label,
-  subValue: fact.subValue,
+  ...(fact.subValue === undefined ? {} : { subValue: fact.subValue }),
   value: fact.value,
 });
 
@@ -265,7 +267,11 @@ const getDetailRows = ({
   {
     id: "network",
     label: t("dashboard.earn_details.network"),
-    value: <NetworkDetailValue network={yieldDto.network} />,
+    value: Schema.is(Network)(yieldDto.network) ? (
+      <NetworkDetailValue network={yieldDto.network} />
+    ) : (
+      formatNetworkName(yieldDto.network)
+    ),
   },
   {
     id: "provider",
diff --git a/packages/widget/src/features/earn/ui/dashboard/earn-details/reward-rate-chart.tsx b/packages/widget/src/features/earn/ui/dashboard/earn-details/reward-rate-chart.tsx
index 8d8700977..d3f1494b2 100644
--- a/packages/widget/src/features/earn/ui/dashboard/earn-details/reward-rate-chart.tsx
+++ b/packages/widget/src/features/earn/ui/dashboard/earn-details/reward-rate-chart.tsx
@@ -31,7 +31,7 @@ type Props = {
   isRefreshing: boolean;
   refreshKey: HistoryPeriod;
   tickFormatter: (value: number) => string;
-  valueFormatter?: (value: number) => string;
+  valueFormatter?: ((value: number) => string) | undefined;
 };
 
 // History is sampled per day, week, or month at UTC midnight; formatting in
@@ -43,9 +43,9 @@ const height = 150;
 const accentColor = vars.color.primaryButtonBackground;
 
 type EndpointDotProps = {
-  cx?: number;
-  cy?: number;
-  index?: number;
+  cx?: number | undefined;
+  cy?: number | undefined;
+  index?: number | undefined;
 };
 
 const ChartDotGlyph = ({
diff --git a/packages/widget/src/features/navigation/ui/widget-navigate.tsx b/packages/widget/src/features/navigation/ui/widget-navigate.tsx
index 31d695240..15bc95d09 100644
--- a/packages/widget/src/features/navigation/ui/widget-navigate.tsx
+++ b/packages/widget/src/features/navigation/ui/widget-navigate.tsx
@@ -16,7 +16,7 @@ export const WidgetNavigate = ({
   readonly to: WidgetNavigationTarget;
 }) => (
   <Navigate
-    replace={replace}
+    replace={replace ?? false}
     state={widgetTargetState(to)}
     to={widgetTargetPath(to)}
   />
diff --git a/packages/widget/src/features/portfolio/react/use-position-list-item.ts b/packages/widget/src/features/portfolio/react/use-position-list-item.ts
index 8db1ca5eb..ef3bf0d85 100644
--- a/packages/widget/src/features/portfolio/react/use-position-list-item.ts
+++ b/packages/widget/src/features/portfolio/react/use-position-list-item.ts
@@ -7,7 +7,10 @@ import {
 } from "../../../shared/lib/number-format";
 import { useWidgetPresentation } from "../../../shared/ui/widget-presentation";
 import { YieldSummaryKey, yieldSummaryAtom } from "../../yield-summary/index";
-import { positionYieldAtom } from "../state/read-models/position-list-item";
+import {
+  positionYieldAtom,
+  toInactiveValidatorStatus,
+} from "../state/read-models/position-list-item";
 import type { PositionItem } from "../state/read-models/positions";
 
 export const usePositionListItem = (item: PositionItem) => {
@@ -38,12 +41,7 @@ export const usePositionListItem = (item: PositionItem) => {
         )
       : null;
 
-  const inactiveValidator = providersDetails?.find(
-    (provider) => provider.status !== "active"
-  )?.status as Exclude<
-    NonNullable<NonNullable<typeof providersDetails>[number]["status"]>,
-    "active"
-  > | null;
+  const inactiveValidator = toInactiveValidatorStatus(providersDetails);
 
   const tokenToDisplay = item.token;
   const baseToken = integrationData?.token ?? null;
diff --git a/packages/widget/src/features/portfolio/state/read-models/position-list-item.ts b/packages/widget/src/features/portfolio/state/read-models/position-list-item.ts
index dd2cd7ab6..6863ad1c5 100644
--- a/packages/widget/src/features/portfolio/state/read-models/position-list-item.ts
+++ b/packages/widget/src/features/portfolio/state/read-models/position-list-item.ts
@@ -23,3 +23,19 @@ export const positionPricesAtom = Atom.family((key: PricesKey) =>
     .foreground(key)
     .pipe(Atom.map(toPresentable), Atom.withLabel("positionPricesAtom"))
 );
+
+/**
+ * How a row presents its first non-active validator: jailed validators get
+ * their own badge, every other provider status shares the inactive badge.
+ */
+export type InactiveValidatorStatus = "jailed" | "other";
+
+export const toInactiveValidatorStatus = (
+  providers: ReadonlyArray<{ readonly status?: string | undefined }> | null
+): InactiveValidatorStatus | null => {
+  const status = providers?.find(
+    (provider) => provider.status !== "active"
+  )?.status;
+  if (!status) return null;
+  return status === "jailed" ? "jailed" : "other";
+};
diff --git a/packages/widget/src/features/portfolio/state/read-models/positions.ts b/packages/widget/src/features/portfolio/state/read-models/positions.ts
index 37d3df23e..d3512f5d0 100644
--- a/packages/widget/src/features/portfolio/state/read-models/positions.ts
+++ b/packages/widget/src/features/portfolio/state/read-models/positions.ts
@@ -10,11 +10,11 @@ import { getYieldCategory } from "../../../../domain/earn/yield";
 import { exactDecimal } from "../../../../domain/finance/exact";
 import type { YieldId } from "../../../../domain/identity/identifiers";
 import {
+  type BalanceDataKey,
   type PositionData,
   type PositionValidators,
   toPositionsData,
 } from "../../../../domain/portfolio/positions";
-import type { YieldBalanceLabel } from "../../../../domain/portfolio/token-balance";
 import { widgetConfigAtom } from "../../../../features/widget-configuration/index";
 import {
   BorrowPositionsKey,
@@ -32,7 +32,7 @@ export type PositionItem = {
   readonly integrationId: YieldId;
   readonly balancesWithAmount: EarnBalance[];
   readonly allBalances: EarnBalance[];
-  readonly balanceId: string;
+  readonly balanceId: BalanceDataKey;
   readonly actionRequired: boolean;
   /**
    * Only optional cancellations are pending, or an Instant Exit is still to
@@ -42,7 +42,6 @@ export type PositionItem = {
   readonly pointsRewardTokenBalances: ReadonlyArray<EarnBalance>;
   readonly hasPendingClaimRewards: boolean;
   readonly token: EarnBalance["token"] | null;
-  readonly yieldLabelDto: YieldBalanceLabel | null;
 } & (
   | { readonly type: "validators"; readonly validators: PositionValidators }
   | { readonly type: "default" }
@@ -106,7 +105,6 @@ export const toPositionItems = (
           balancesWithAmount,
           balanceId,
           allBalances: value.balances,
-          yieldLabelDto: null,
           token:
             [...value.balances].sort(
               (a, b) => priorityOrder[a.type] - priorityOrder[b.type]
diff --git a/packages/widget/src/features/portfolio/state/read-models/summary.ts b/packages/widget/src/features/portfolio/state/read-models/summary.ts
index d63feffdd..5d381add1 100644
--- a/packages/widget/src/features/portfolio/state/read-models/summary.ts
+++ b/packages/widget/src/features/portfolio/state/read-models/summary.ts
@@ -24,7 +24,10 @@ const DEFAULT_CURRENCY = "USD";
 const positionsResultAtom = positionsTableDataAtom;
 
 const yieldIdsAtom = Atom.make((get) =>
-  AsyncResult.getOrElse(get(positionsResultAtom), () => [] as PositionItem[])
+  AsyncResult.getOrElse(
+    get(positionsResultAtom),
+    (): ReadonlyArray<PositionItem> => []
+  )
     .map((position) => position.integrationId)
     .filter((yieldId, index, values) => values.indexOf(yieldId) === index)
 );
@@ -160,7 +163,7 @@ export const availableBalanceSummaryAtom = Atom.make((get) => {
                 getTokenPriceInUSD({
                   amount: balance.amount,
                   baseToken: balance.token,
-                  pricePerShare: "1",
+                  pricePerShare: null,
                   prices,
                   token: balance.token,
                 })
diff --git a/packages/widget/src/features/portfolio/ui/components/earn-position-list-item.tsx b/packages/widget/src/features/portfolio/ui/components/earn-position-list-item.tsx
index 795263681..16412b00b 100644
--- a/packages/widget/src/features/portfolio/ui/components/earn-position-list-item.tsx
+++ b/packages/widget/src/features/portfolio/ui/components/earn-position-list-item.tsx
@@ -3,14 +3,12 @@ import type { ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import { isConfidentialYield } from "../../../../domain/earn/confidential";
 import type { EarnYieldWithProvider } from "../../../../domain/earn/models";
-import type { PositionDetailsLabelType } from "../../../../domain/portfolio/positions";
 import { widgetRoutes } from "../../../../services/navigation/widget-routes";
 import {
   formatTokenAmount,
   formatUsd,
 } from "../../../../shared/lib/number-format";
 import { TokenIcon } from "../../../../shared/ui/components/token-icon";
-import { ToolTip } from "../../../../shared/ui/components/tooltip";
 import { Box } from "../../../../shared/ui/primitives/box";
 import { ContentLoaderSquare } from "../../../../shared/ui/primitives/content-loader";
 import { ListItem } from "../../../../shared/ui/primitives/list/list-item";
@@ -19,6 +17,7 @@ import { Text } from "../../../../shared/ui/primitives/typography/text";
 import { useWidgetPresentation } from "../../../../shared/ui/widget-presentation";
 import { WidgetLink } from "../../../navigation/views";
 import type { YieldSummaryProvider } from "../../../yield-summary/index";
+import type { InactiveValidatorStatus } from "../../state/read-models/position-list-item";
 import type { PositionItem } from "../../state/read-models/positions";
 import {
   listItem,
@@ -34,10 +33,7 @@ export type EarnPositionListItemDetails = {
   readonly hasHiddenBalance: boolean;
   readonly integrationData: EarnYieldWithProvider | null;
   readonly providersDetails: ReadonlyArray<YieldSummaryProvider> | null;
-  readonly inactiveValidator: Exclude<
-    NonNullable<YieldSummaryProvider["status"]>,
-    "active"
-  > | null;
+  readonly inactiveValidator: InactiveValidatorStatus | null;
   readonly rewardRateAverage: string | null;
   readonly totalAmountFormatted: string | null;
   /** Positive USD value of the position, when priced. */
@@ -194,29 +190,6 @@ export const EarnPositionListItem = ({
                       {integrationData.metadata.name}
                     </Text>
 
-                    {item.yieldLabelDto ? (
-                      <ToolTip
-                        textAlign="left"
-                        maxWidth={300}
-                        label={t(
-                          `position_details.labels.${item.yieldLabelDto.type as PositionDetailsLabelType}.details`,
-                          item.yieldLabelDto.params as
-                            | Record<string, string>
-                            | undefined
-                        )}
-                      >
-                        <Box
-                          className={positionBadge({ type: "actionRequired" })}
-                        >
-                          <Text variant={{ type: "white" }} className={noWrap}>
-                            {t(
-                              `position_details.labels.${item.yieldLabelDto.type as PositionDetailsLabelType}.label`
-                            )}
-                          </Text>
-                        </Box>
-                      </ToolTip>
-                    ) : null}
-
                     {actionBadge ? (
                       <Box
                         className={positionBadge({ type: actionBadge.type })}
diff --git a/packages/widget/src/features/portfolio/ui/dashboard/positions/hooks/use-position-list-item.ts b/packages/widget/src/features/portfolio/ui/dashboard/positions/hooks/use-position-list-item.ts
index 36943531f..ce940755c 100644
--- a/packages/widget/src/features/portfolio/ui/dashboard/positions/hooks/use-position-list-item.ts
+++ b/packages/widget/src/features/portfolio/ui/dashboard/positions/hooks/use-position-list-item.ts
@@ -1,5 +1,4 @@
 import { useAtomValue } from "@effect/atom-react";
-import { exactDecimal } from "../../../../../../domain/finance/exact";
 import { getTokenPriceInUSD } from "../../../../../../domain/finance/price";
 import { PricesKey } from "../../../../../../resources/token-prices/index";
 import { config } from "../../../../../../shared/config/widget-defaults";
@@ -37,8 +36,7 @@ export const usePositionListItem = (item: PositionItem) => {
     rewardsSummaries._tag === "Ready"
       ? rewardsSummaries.value?.[item.integrationId]
       : undefined;
-  const rewardsSummary =
-    summary && exactDecimal(summary.rewards.total).gt(0) ? summary : null;
+  const rewardsSummary = summary?.rewards.total.gt(0) ? summary : null;
 
   const pricesView = useAtomValue(
     positionPricesAtom(
@@ -56,11 +54,7 @@ export const usePositionListItem = (item: PositionItem) => {
   const prices = pricesView._tag === "Ready" ? pricesView.value : null;
 
   const rewardsAmountFormatted = rewardsSummary
-    ? formatTokenAmount(
-        exactDecimal(rewardsSummary.rewards.total),
-        locale,
-        "down"
-      )
+    ? formatTokenAmount(rewardsSummary.rewards.total, locale, "down")
     : null;
 
   const rewardsAmountPriceFormatted =
diff --git a/packages/widget/src/features/position-details/model/exit-receive-token.ts b/packages/widget/src/features/position-details/model/exit-receive-token.ts
index a4f28d31b..ca1e31888 100644
--- a/packages/widget/src/features/position-details/model/exit-receive-token.ts
+++ b/packages/widget/src/features/position-details/model/exit-receive-token.ts
@@ -1,4 +1,4 @@
-import { Struct } from "effect";
+import { Array as Arr, Struct } from "effect";
 import type { ExitReceiveToken } from "../../../domain/action/rules";
 import {
   getConfidentialAssetToken,
@@ -100,10 +100,12 @@ export const resolvePositionDetailsExitReceiveTokenSelection = ({
     "exit",
     "outputToken"
   )?.options;
-  if (!advertisedOptions?.length) return null;
+  if (!advertisedOptions || !Arr.isReadonlyArrayNonEmpty(advertisedOptions)) {
+    return null;
+  }
 
   const tokensByAddress = buildExitReceiveTokensByAddress(integration);
-  const options = advertisedOptions.map((address) => ({
+  const options = Arr.map(advertisedOptions, (address) => ({
     address,
     symbol: tokensByAddress.get(addressIdentity(address))?.symbol ?? address,
   }));
@@ -126,7 +128,7 @@ export const resolvePositionDetailsExitReceiveTokenSelection = ({
       )
     : preferred;
 
-  const resolved = selected ?? defaultOption ?? options[0]!;
+  const resolved = selected ?? defaultOption ?? Arr.headNonEmpty(options);
   const exitMode =
     confidentialAsset &&
     equalExitReceiveTokenAddresses(resolved.address, confidentialAsset)
@@ -152,14 +154,12 @@ export const projectExitReceiveTokenOption = ({
   const token =
     known ??
     ({
-      ...Struct.omit(positionToken, ["address"]),
+      ...Struct.omit(positionToken, ["address", "coinGeckoId", "logoURI"]),
       ...(option.address === NATIVE_TOKEN_ADDRESS
         ? {}
         : { address: option.address }),
       name: option.symbol,
       symbol: option.symbol,
-      logoURI: undefined,
-      coinGeckoId: undefined,
     } satisfies Token);
 
   return {
diff --git a/packages/widget/src/features/position-details/model/flow-actions.ts b/packages/widget/src/features/position-details/model/flow-actions.ts
index 03e1ec51b..f9b1b29cc 100644
--- a/packages/widget/src/features/position-details/model/flow-actions.ts
+++ b/packages/widget/src/features/position-details/model/flow-actions.ts
@@ -18,15 +18,20 @@ import {
   isConfidentialYield,
   toBaseUnits,
 } from "../../../domain/earn/confidential";
-import type {
-  EarnBalance,
-  EarnValidator,
-  EarnYieldWithProvider,
+import {
+  type EarnBalance,
+  type EarnValidator,
+  type EarnValidatorKey,
+  type EarnYieldWithProvider,
+  getVisibleShares,
 } from "../../../domain/earn/models";
 import { getMaxSelectedValidators } from "../../../domain/earn/validator";
 import { getYieldActionArg } from "../../../domain/earn/yield";
 import { truncateToTokenDecimals } from "../../../domain/finance/exact";
-import type { WalletAddress } from "../../../domain/identity/identifiers";
+import type {
+  ValidatorAddress,
+  WalletAddress,
+} from "../../../domain/identity/identifiers";
 import type { Token } from "../../../domain/token/token";
 import type { AdditionalAddresses } from "../../../domain/wallet/address";
 
@@ -39,20 +44,26 @@ type PendingActionSelection = Readonly<{
   readonly yieldBalance: EarnBalance;
 }>;
 
+/** Selected validators by key, so subnets of one address stay distinct. */
+type PendingActionSelectedValidators = ReadonlyMap<
+  EarnValidatorKey,
+  ValidatorAddress
+>;
+
 export type PendingActionModalState =
   | Readonly<{
       readonly _tag: "Closed";
       readonly attemptId: null;
       readonly multiSelect: false;
       readonly pendingAction: null;
-      readonly selectedValidators: Set<EarnValidator["address"]>;
+      readonly selectedValidators: PendingActionSelectedValidators;
     }>
   | Readonly<{
       readonly _tag: "Open";
       readonly attemptId: PendingActionAttemptId;
       readonly multiSelect: boolean;
       readonly pendingAction: PendingActionSelection;
-      readonly selectedValidators: Set<EarnValidator["address"]>;
+      readonly selectedValidators: PendingActionSelectedValidators;
     }>;
 
 export type PendingActionModalStore = Readonly<{
@@ -71,7 +82,7 @@ export const closedPendingActionModalState: PendingActionModalState = {
   attemptId: null,
   multiSelect: false,
   pendingAction: null,
-  selectedValidators: new Set(),
+  selectedValidators: new Map(),
 };
 
 export const makePendingActionModalStore = (): PendingActionModalStore => ({
@@ -91,12 +102,12 @@ const makeOpenPendingActionModalState = ({
   attemptId,
   multiSelect: isPendingActionValidatorAddressesRequired(pendingAction),
   pendingAction: { pendingAction, yieldBalance },
-  selectedValidators: new Set([
-    ...(yieldBalance.validators?.map((validator) => validator.address) ?? []),
-    ...(yieldBalance.validator?.address
-      ? [yieldBalance.validator.address]
-      : []),
-  ]),
+  selectedValidators: new Map(
+    [
+      ...(yieldBalance.validators ?? []),
+      ...(yieldBalance.validator ? [yieldBalance.validator] : []),
+    ].map((validator) => [validator.key, validator.address])
+  ),
 });
 
 export const openPendingActionModal = ({
@@ -159,27 +170,34 @@ export const togglePendingActionValidator = ({
   validator,
 }: {
   readonly store: PendingActionModalStore;
-  readonly validator: EarnValidator["address"];
+  readonly validator: EarnValidator;
 }): PendingActionModalStore => {
   if (store.state._tag !== "Open") return store;
 
-  const selectedValidators = new Set(store.state.selectedValidators);
+  const selectedValidators = new Map(store.state.selectedValidators);
   const maxSelected = getMaxSelectedValidators(
     store.state.pendingAction.yieldBalance.token.network
   );
-  if (store.state.multiSelect && selectedValidators.has(validator)) {
-    selectedValidators.delete(validator);
+  if (store.state.multiSelect && selectedValidators.has(validator.key)) {
+    selectedValidators.delete(validator.key);
   } else if (!store.state.multiSelect) {
     selectedValidators.clear();
-    selectedValidators.add(validator);
+    selectedValidators.set(validator.key, validator.address);
   } else if (maxSelected === null || selectedValidators.size < maxSelected) {
-    selectedValidators.add(validator);
+    selectedValidators.set(validator.key, validator.address);
   }
   return selectedValidators.size > 0
     ? { ...store, state: { ...store.state, selectedValidators } }
     : store;
 };
 
+/** The addresses a pending action submits for the selected validators. */
+export const getPendingActionValidatorAddresses = (
+  state: PendingActionModalState
+): ReadonlyArray<ValidatorAddress> => [
+  ...new Set(state.selectedValidators.values()),
+];
+
 export const pendingActionNeedsValidatorSelection = (
   pendingAction: PendingAction
 ): boolean =>
@@ -304,7 +322,8 @@ const preparePositionDetailsExitAction = (facts: PositionDetailsExitFacts) => {
     // Exact share count; converting back could leave dust.
     if (facts.useMaxAmount) {
       return shareBalances.reduce(
-        (total, balance) => total + BigInt(balance.shareAmountRaw ?? 0),
+        (total, balance) =>
+          total + (getVisibleShares(balance)?.amountRaw ?? 0n),
         0n
       );
     }
@@ -381,10 +400,12 @@ export type PendingActionTelemetry =
   | Readonly<{
       readonly _tag: "ValidatorsSubmitted";
       readonly pendingActionType: PendingAction["type"];
-      readonly validators: ReadonlyArray<EarnValidator["address"]>;
+      readonly validators: ReadonlyArray<ValidatorAddress>;
       readonly yieldId: EarnYieldWithProvider["id"];
     }>;
 
+const noSelectedValidators: ReadonlyArray<ValidatorAddress> = [];
+
 export const resolvePositionPendingActionDecision = ({
   canMount,
   command,
@@ -422,7 +443,7 @@ export const resolvePositionPendingActionDecision = ({
       return {
         attemptId: null,
         pendingAction: command.pendingAction,
-        selectedValidators: [] as EarnValidator["address"][],
+        selectedValidators: noSelectedValidators,
         yieldBalance: command.yieldBalance,
       };
     }
@@ -430,7 +451,7 @@ export const resolvePositionPendingActionDecision = ({
       ? {
           attemptId: modal.attemptId,
           ...modal.pendingAction,
-          selectedValidators: [...modal.selectedValidators],
+          selectedValidators: getPendingActionValidatorAddresses(modal),
         }
       : null;
   })();
diff --git a/packages/widget/src/features/position-details/model/position-overview.ts b/packages/widget/src/features/position-details/model/position-overview.ts
index 012c9f69a..609a50197 100644
--- a/packages/widget/src/features/position-details/model/position-overview.ts
+++ b/packages/widget/src/features/position-details/model/position-overview.ts
@@ -7,13 +7,13 @@ import {
   isOptionalPendingAction,
 } from "../../../domain/action/pending-action";
 import {
-  type ConfidentialHandle,
   getBalanceRowDisplayAmount,
   isCancellingBalance,
   isConfidentialYield,
   isUnfinishedInstantExit,
 } from "../../../domain/earn/confidential";
 import type {
+  ConfidentialHandle,
   EarnBalance,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
@@ -65,7 +65,7 @@ type PositionOverviewStatusTone = "action" | "claim" | "default";
 type PositionOverviewMetricCard = {
   id: string;
   label: string;
-  subValue?: string;
+  subValue?: string | undefined;
   tone?: PositionOverviewStatusTone;
   /** Several lines when a card lists one amount per token. */
   value: string | ReadonlyArray<string>;
@@ -125,10 +125,10 @@ type PositionOverviewPendingAction = {
 };
 
 type ProviderDetail = {
-  address?: string;
-  name?: string;
-  rewardRate?: BigNumber | null;
-  status?: string | null;
+  address?: string | undefined;
+  name?: string | undefined;
+  rewardRate?: BigNumber | null | undefined;
+  status?: string | null | undefined;
 };
 
 export const getPositionOverviewModel = ({
@@ -152,10 +152,10 @@ export const getPositionOverviewModel = ({
   /** Presentation time; batch timing is omitted without it. */
   now?: DateTime.Utc | null;
   pendingActions: PositionOverviewPendingAction[];
-  personalizedRewardRate?: YieldRewardRate | null;
+  personalizedRewardRate?: YieldRewardRate | null | undefined;
   positionBalancesByType: PositionBalancesByType;
   providersDetails: ProviderDetail[];
-  rewardsSummary?: RewardsSummary;
+  rewardsSummary?: RewardsSummary | undefined;
   t: TFunction;
 }): PositionOverviewModel => {
   const promotedFactIds = new Set<string>();
@@ -394,7 +394,7 @@ const getRewardsMetric = ({
   pendingActions: PositionOverviewPendingAction[];
   positionBalancesByType: PositionBalancesByType;
   promotedFactIds: Set<string>;
-  rewardsSummary?: RewardsSummary;
+  rewardsSummary?: RewardsSummary | undefined;
   t: TFunction;
 }): PositionOverviewMetricCard | null => {
   const claimableSums = getPositiveTokenSums(
@@ -412,10 +412,7 @@ const getRewardsMetric = ({
     };
   }
 
-  if (
-    rewardsSummary &&
-    exactDecimal(rewardsSummary.rewards.total).isGreaterThan(0)
-  ) {
+  if (rewardsSummary?.rewards.total.isGreaterThan(0)) {
     promotedFactIds.add("rewards");
 
     return {
@@ -455,7 +452,7 @@ const getApyMetric = ({
 }: {
   integrationData: EarnYieldWithProvider;
   locale: string;
-  personalizedRewardRate?: YieldRewardRate | null;
+  personalizedRewardRate?: YieldRewardRate | null | undefined;
   promotedFactIds: Set<string>;
   t: TFunction;
 }): PositionOverviewMetricCard | null => {
@@ -612,7 +609,7 @@ const getBreakdownRows = ({
     return {
       id: `${row.type}-${row.token.symbol}-${index}`,
       label: formatBalanceTypeLabel(row.type, t),
-      subValue: subValue || undefined,
+      ...(subValue ? { subValue } : {}),
       value: row.isEncrypted
         ? t("shared.confidential.hidden")
         : `${formatTokenAmount(display.amount, locale, "down")} ${display.token.symbol}`,
diff --git a/packages/widget/src/features/position-details/react/use-pending-actions.ts b/packages/widget/src/features/position-details/react/use-pending-actions.ts
index 57e995355..2c89e14c8 100644
--- a/packages/widget/src/features/position-details/react/use-pending-actions.ts
+++ b/packages/widget/src/features/position-details/react/use-pending-actions.ts
@@ -2,7 +2,6 @@ import { useAtomSet, useAtomValue } from "@effect/atom-react";
 import type { PendingAction } from "../../../domain/action/models";
 import type { EarnBalance } from "../../../domain/earn/models";
 
-import type { ValidatorInput as ValidatorDto } from "../../../domain/earn/validator";
 import { positionDetailsPendingActions } from "../state/actions/pending-action";
 import type {
   PositionDetailsWorkflowAction as Actions,
@@ -46,7 +45,7 @@ export const usePendingActions = ({
     });
   };
 
-  const onValidatorsSubmit = (_selectedValidators: ValidatorDto["address"][]) =>
+  const onValidatorsSubmit = () =>
     runPendingAction({ _tag: "SubmitValidators" });
 
   return {
diff --git a/packages/widget/src/features/position-details/react/use-validator-addresses-handling.ts b/packages/widget/src/features/position-details/react/use-validator-addresses-handling.ts
index 31e252625..6f58a8eea 100644
--- a/packages/widget/src/features/position-details/react/use-validator-addresses-handling.ts
+++ b/packages/widget/src/features/position-details/react/use-validator-addresses-handling.ts
@@ -1,5 +1,5 @@
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
-import type { ValidatorInput as ValidatorDto } from "../../../domain/earn/validator";
+import type { EarnValidator } from "../../../domain/earn/models";
 import type { SelectModalProps } from "../../../shared/ui/components/select-modal";
 import { positionDetailsPendingActions } from "../state/actions/pending-action";
 import type { PositionDetailsWorkflowKey } from "../state/workflow";
@@ -29,10 +29,10 @@ export const useValidatorAddressesHandling = (
     closeModal: () => close(undefined),
     modalState,
     multiSelect: state.multiSelect,
-    onItemClick: (validator: ValidatorDto["address"]) => toggle(validator),
+    onItemClick: (validator: EarnValidator) => toggle(validator),
     openModal: open,
     pendingAction: isOpen ? state.pendingAction.pendingAction : null,
-    selectedValidators: state.selectedValidators,
+    selectedValidatorKeys: new Set(state.selectedValidators.keys()),
     showValidatorsModal: isOpen,
     submitDisabled: state.selectedValidators.size === 0,
     yieldBalance: isOpen ? state.pendingAction.yieldBalance : null,
diff --git a/packages/widget/src/features/position-details/state/actions/pending-action.ts b/packages/widget/src/features/position-details/state/actions/pending-action.ts
index 618e7c07e..1ffbd3293 100644
--- a/packages/widget/src/features/position-details/state/actions/pending-action.ts
+++ b/packages/widget/src/features/position-details/state/actions/pending-action.ts
@@ -11,6 +11,8 @@ import type {
   EarnBalance,
   EarnValidator,
 } from "../../../../domain/earn/models";
+import type { YieldId } from "../../../../domain/identity/identifiers";
+import type { BalanceDataKey } from "../../../../domain/portfolio/positions";
 import { walletScopeOwnerKey } from "../../../../domain/wallet/wallet-scope";
 import { TrackingService } from "../../../../services/tracking/tracking-service";
 import { startYieldTransactionFlowAtom } from "../../../yield-transaction-flow/index";
@@ -34,8 +36,8 @@ import type { PositionDetailsWorkflowKey } from "../workflow";
 import { positionDetailsFlowFactsAtom } from "./facts";
 
 class PendingActionModalKey extends Data.Class<{
-  readonly balanceId: string | null;
-  readonly integrationId: string | null;
+  readonly balanceId: BalanceDataKey | null;
+  readonly integrationId: YieldId | null;
   readonly owner: ReturnType<typeof walletScopeOwnerKey>;
   readonly pendingActionType: PositionDetailsWorkflowKey["pendingActionType"];
 }> {}
@@ -163,7 +165,7 @@ const openPositionPendingActionModalAtom = Atom.family(
 
 const togglePositionPendingActionValidatorAtom = Atom.family(
   (key: PositionDetailsWorkflowKey) =>
-    Atom.fnSync((validator: EarnValidator["address"], context) => {
+    Atom.fnSync((validator: EarnValidator, context) => {
       const storeAtom = pendingActionModalStoreAtom(
         getPendingActionModalKey(key)
       );
diff --git a/packages/widget/src/features/position-details/state/actions/reveal.ts b/packages/widget/src/features/position-details/state/actions/reveal.ts
index 3b743d8c0..d8633fa1e 100644
--- a/packages/widget/src/features/position-details/state/actions/reveal.ts
+++ b/packages/widget/src/features/position-details/state/actions/reveal.ts
@@ -7,9 +7,9 @@ import { walletRuntime } from "../../../../app/runtime/wallet-runtime";
 import {
   getConfidentialChainId,
   getConfidentialHandleContract,
-  getEncryptedHandle,
   isUserRevealableBalance,
 } from "../../../../domain/earn/confidential";
+import { getEncryptedHandle } from "../../../../domain/earn/models";
 import { resourceInvalidationKeys } from "../../../../services/resource-invalidation";
 import { RevealedBalances } from "../../../../services/zama/revealed-balances";
 import { ZamaService } from "../../../../services/zama/zama-service";
diff --git a/packages/widget/src/features/position-details/state/details-view.ts b/packages/widget/src/features/position-details/state/details-view.ts
index 17ce49e2b..7eb6e4a13 100644
--- a/packages/widget/src/features/position-details/state/details-view.ts
+++ b/packages/widget/src/features/position-details/state/details-view.ts
@@ -2,10 +2,13 @@ import type BigNumber from "bignumber.js";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import {
-  type ConfidentialHandle,
   isConfidentialYield,
   isUserRevealableBalance,
 } from "../../../domain/earn/confidential";
+import {
+  type ConfidentialHandle,
+  getVisibleShares,
+} from "../../../domain/earn/models";
 import {
   getRewardRateBreakdown,
   type YieldRewardRate,
@@ -102,23 +105,15 @@ export const positionDetailsViewAtom = Atom.family(
         integration && workflow.positionBalancesByType
           ? [...workflow.positionBalancesByType.values()].reduce(
               (conversions, balances) => {
-                balances
-                  .filter(
-                    (balance) =>
-                      !balance.isEncrypted &&
-                      balance.shareAmount &&
-                      balance.amount &&
-                      !balance.token.isPoints
-                  )
-                  .forEach((balance) => {
-                    conversions.set(tokenString(balance.token), {
-                      rate: exactDecimal(balance.shareAmount ?? 0).dividedBy(
-                        exactDecimal(balance.amount ?? 0)
-                      ),
-                      shareSymbol: balance.shareToken?.symbol,
-                      symbol: balance.token.symbol,
-                    });
+                balances.forEach((balance) => {
+                  const shareAmount = getVisibleShares(balance)?.amount;
+                  if (!shareAmount || balance.token.isPoints) return;
+                  conversions.set(tokenString(balance.token), {
+                    rate: shareAmount.dividedBy(balance.amount),
+                    shareSymbol: balance.shareToken?.symbol,
+                    symbol: balance.token.symbol,
                   });
+                });
                 return conversions;
               },
               new Map<TokenString, PositionDetailsShareConversion>()
@@ -226,7 +221,7 @@ export const positionDetailsViewAtom = Atom.family(
         unstakeMaxAmount:
           amountArgument && !forceMax ? (amountArgument.maximum ?? null) : null,
         unstakeMinAmount:
-          amountArgument && !forceMax && exactDecimal(minimum).isGreaterThan(0)
+          amountArgument && !forceMax && minimum.isGreaterThan(0)
             ? minimum
             : null,
         unstakeToken: workflow.unstakeToken,
diff --git a/packages/widget/src/features/position-details/state/stake-entry.ts b/packages/widget/src/features/position-details/state/stake-entry.ts
index f95c31643..daa95ec9a 100644
--- a/packages/widget/src/features/position-details/state/stake-entry.ts
+++ b/packages/widget/src/features/position-details/state/stake-entry.ts
@@ -2,12 +2,13 @@ import { Data } from "effect";
 import * as Atom from "effect/reactivity/Atom";
 import type { TronResource } from "../../../domain/action/tron-resource";
 import type { YieldId } from "../../../domain/identity/identifiers";
+import type { BalanceDataKey } from "../../../domain/portfolio/positions";
 import type { Token } from "../../../domain/token/token";
 import type { WalletScopeKey } from "../../../domain/wallet/wallet-scope";
 
 type PositionDetailsStakeEntryParams = {
   integrationId: YieldId;
-  balanceId: string;
+  balanceId: BalanceDataKey;
   walletScope: WalletScopeKey;
 };
 
diff --git a/packages/widget/src/features/position-details/state/stake-view.ts b/packages/widget/src/features/position-details/state/stake-view.ts
index 2d4c41381..41929bace 100644
--- a/packages/widget/src/features/position-details/state/stake-view.ts
+++ b/packages/widget/src/features/position-details/state/stake-view.ts
@@ -6,10 +6,10 @@ import { appRuntime } from "../../../app/runtime/app-runtime";
 import type { TronResource } from "../../../domain/action/tron-resource";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
 import { stakeTokenSameAsGasToken } from "../../../domain/earn/stake";
-import type { ValidatorKey } from "../../../domain/earn/validator";
 import {
   getYieldActionArg,
   isYieldValidatorSelectionRequired,
@@ -104,7 +104,7 @@ const positionDetailsStakeFacadeAtom = Atom.family(
     const selectedValidatorsAtom = Atom.make((get) => {
       const selectedYield = get(selectedYieldAtom);
       if (!selectedYield || !isYieldValidatorSelectionRequired(selectedYield)) {
-        return new Map<ValidatorKey, EarnValidator>();
+        return new Map<EarnValidatorKey, EarnValidator>();
       }
       const balances =
         get(positionBalancesResultAtom).pipe(
diff --git a/packages/widget/src/features/position-details/state/workflow-view.ts b/packages/widget/src/features/position-details/state/workflow-view.ts
index 4e7d5ad02..9d44eb113 100644
--- a/packages/widget/src/features/position-details/state/workflow-view.ts
+++ b/packages/widget/src/features/position-details/state/workflow-view.ts
@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { Option, Schema } from "effect";
+import { Option } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import {
@@ -22,7 +22,6 @@ import {
   truncateToTokenDecimals,
 } from "../../../domain/finance/exact";
 import { getTokenPriceInUSD } from "../../../domain/finance/price";
-import { YieldId } from "../../../domain/identity/identifiers";
 import {
   getSingleExitTokenSum,
   type PositionBalancesByType,
@@ -194,9 +193,7 @@ const resolveUnstakeAmount = ({
 export const positionDetailsWorkflowViewAtom = Atom.family(
   (key: PositionDetailsWorkflowKey) =>
     Atom.make((get) => {
-      const yieldId = key.integrationId
-        ? Schema.decodeOption(YieldId)(key.integrationId).pipe(Option.getOrNull)
-        : null;
+      const yieldId = key.integrationId;
       const yieldOpportunity = get(
         yieldOpportunityAtom.foreground(new YieldOpportunityKey({ yieldId }))
       );
@@ -336,7 +333,7 @@ export const dispatchPositionDetailsWorkflowAtom = Atom.family(
         reducePositionDetailsWorkflow({
           action,
           maxUnstakeAmount: view.maxUnstakeAmount,
-          pendingActions,
+          ...(pendingActions === undefined ? {} : { pendingActions }),
           state: {
             exitReceiveTokenAddress: view.exitReceiveTokenAddress,
             pendingActions: view.pendingActions,
diff --git a/packages/widget/src/features/position-details/state/workflow.ts b/packages/widget/src/features/position-details/state/workflow.ts
index 41e41dc56..78d581ecb 100644
--- a/packages/widget/src/features/position-details/state/workflow.ts
+++ b/packages/widget/src/features/position-details/state/workflow.ts
@@ -8,7 +8,10 @@ import type {
   TokenAddress,
   YieldId,
 } from "../../../domain/identity/identifiers";
-import type { YieldBalanceType } from "../../../domain/portfolio/positions";
+import type {
+  BalanceDataKey,
+  YieldBalanceType,
+} from "../../../domain/portfolio/positions";
 import type { Token } from "../../../domain/token/token";
 import type { WalletScopeKey } from "../../../domain/wallet/wallet-scope";
 
@@ -91,7 +94,7 @@ export const reducePositionDetailsWorkflow = ({
 export class PositionDetailsWorkflowKey extends Data.TaggedClass(
   "PositionDetailsWorkflowKey"
 )<{
-  readonly balanceId: string | null;
+  readonly balanceId: BalanceDataKey | null;
   readonly integrationId: YieldId | null;
   readonly pendingActionType: YieldPendingActionType | null;
   readonly scope: WalletScopeKey;
diff --git a/packages/widget/src/features/position-details/ui/compact/components/position-balances.tsx b/packages/widget/src/features/position-details/ui/compact/components/position-balances.tsx
index 6cd36ab33..2b88b1bb5 100644
--- a/packages/widget/src/features/position-details/ui/compact/components/position-balances.tsx
+++ b/packages/widget/src/features/position-details/ui/compact/components/position-balances.tsx
@@ -39,9 +39,9 @@ export const PositionBalances = ({
   const yieldType = getExtendedYieldType(integrationData);
   const display = getBalanceRowDisplayAmount(integrationData, yieldBalance);
 
-  const balanceTypeContext = isDepositYieldType(yieldType)
-    ? "yearn_or_deposit"
-    : undefined;
+  const balanceTypeOptions = isDepositYieldType(yieldType)
+    ? { context: "yearn_or_deposit" }
+    : {};
 
   return (
     <Box
@@ -51,9 +51,10 @@ export const PositionBalances = ({
       gap="4"
     >
       <Text variant={{ weight: "normal" }}>
-        {t(`position_details.balance_type.${yieldBalance.type}`, {
-          context: balanceTypeContext,
-        })}
+        {t(
+          `position_details.balance_type.${yieldBalance.type}`,
+          balanceTypeOptions
+        )}
       </Text>
 
       <Box textAlign="end">
diff --git a/packages/widget/src/features/position-details/ui/components/amount-block.tsx b/packages/widget/src/features/position-details/ui/components/amount-block.tsx
index 25c2597a7..ac4165afd 100644
--- a/packages/widget/src/features/position-details/ui/components/amount-block.tsx
+++ b/packages/widget/src/features/position-details/ui/components/amount-block.tsx
@@ -25,7 +25,7 @@ type AmountBlockProps = {
   canChangeAmount: boolean;
   disabled?: boolean;
   onClick: () => void;
-  unstakeAmountError?: boolean;
+  unstakeAmountError?: boolean | undefined;
   onMaxClick: (() => void) | null;
   label: string;
   formattedAmount: string;
@@ -61,10 +61,7 @@ export const AmountBlock = ({
   const { t } = useTranslation();
   const { locale } = useWidgetPresentation();
 
-  const unstakeProps =
-    rest.variant === "unstake"
-      ? (rest as Extract<AmountBlockProps, { variant: "unstake" }>)
-      : null;
+  const unstakeProps = rest.variant === "unstake" ? rest : null;
   const min =
     unstakeProps?.unstakeMinAmount == null
       ? null
diff --git a/packages/widget/src/features/position-details/ui/components/position-details-pending-actions.tsx b/packages/widget/src/features/position-details/ui/components/position-details-pending-actions.tsx
index ee634f3ef..1b7c76966 100644
--- a/packages/widget/src/features/position-details/ui/components/position-details-pending-actions.tsx
+++ b/packages/widget/src/features/position-details/ui/components/position-details-pending-actions.tsx
@@ -1,8 +1,6 @@
+import { toLowerCase } from "effect/String";
 import { useTranslation } from "react-i18next";
-import {
-  getPendingActionLabelContext,
-  type YieldPendingActionType,
-} from "../../../../domain/action/pending-action";
+import { getPendingActionLabelContext } from "../../../../domain/action/pending-action";
 import { isConfidentialYield } from "../../../../domain/earn/confidential";
 import { humanizePendingActionType } from "../../../../shared/lib/formatters";
 import { formatUsd } from "../../../../shared/lib/number-format";
@@ -56,14 +54,14 @@ export const PositionDetailsPendingActions = ({
         }
 
         const labelKey =
-          `position_details.pending_action_button.${val.pendingAction.type.toLowerCase() as Lowercase<YieldPendingActionType>}` as const;
-        const labelOptions = {
-          context: getPendingActionLabelContext(
-            val.pendingAction.type,
-            val.yieldBalance.type,
-            { confidential: isConfidentialYield(integrationData) }
-          ),
-        };
+          `position_details.pending_action_button.${toLowerCase(val.pendingAction.type)}` as const;
+        const labelContext = getPendingActionLabelContext(
+          val.pendingAction.type,
+          val.yieldBalance.type,
+          { confidential: isConfidentialYield(integrationData) }
+        );
+        const labelOptions =
+          labelContext === undefined ? {} : { context: labelContext };
         const label = humanizesUntranslatedLabels
           ? t(labelKey, {
               ...labelOptions,
diff --git a/packages/widget/src/features/position-details/ui/components/position-details-validator-modal.tsx b/packages/widget/src/features/position-details/ui/components/position-details-validator-modal.tsx
index 16df155af..42b03f26b 100644
--- a/packages/widget/src/features/position-details/ui/components/position-details-validator-modal.tsx
+++ b/packages/widget/src/features/position-details/ui/components/position-details-validator-modal.tsx
@@ -31,13 +31,13 @@ export const PositionDetailsValidatorModal = () => {
 
   return (
     <SelectValidator
-      selectedValidators={validatorAddressesHandling.selectedValidators}
+      selectedValidators={validatorAddressesHandling.selectedValidatorKeys}
       onItemClick={(val) => {
-        validatorAddressesHandling.onItemClick(val.address);
+        validatorAddressesHandling.onItemClick(val);
 
         if (validatorAddressesHandling.multiSelect) return;
 
-        onValidatorsSubmit([val.address]);
+        onValidatorsSubmit();
       }}
       selectedStake={integrationDataValue}
       validators={validatorsData}
@@ -56,11 +56,7 @@ export const PositionDetailsValidatorModal = () => {
                 : "primary",
             }}
             disabled={validatorAddressesHandling.submitDisabled}
-            onClick={() =>
-              onValidatorsSubmit([
-                ...validatorAddressesHandling.selectedValidators.values(),
-              ])
-            }
+            onClick={() => onValidatorsSubmit()}
           >
             {t("position_details.select_validators.submit")}
           </Button>
diff --git a/packages/widget/src/features/position-details/ui/components/static-action-block.tsx b/packages/widget/src/features/position-details/ui/components/static-action-block.tsx
index a663743c1..449c1ffc4 100644
--- a/packages/widget/src/features/position-details/ui/components/static-action-block.tsx
+++ b/packages/widget/src/features/position-details/ui/components/static-action-block.tsx
@@ -1,10 +1,8 @@
 import type BigNumber from "bignumber.js";
+import { toLowerCase } from "effect/String";
 import { Trans, useTranslation } from "react-i18next";
 import type { PendingAction } from "../../../../domain/action/models";
-import {
-  getPendingActionLabelContext,
-  type YieldPendingActionType,
-} from "../../../../domain/action/pending-action";
+import { getPendingActionLabelContext } from "../../../../domain/action/pending-action";
 import {
   getCancelReturn,
   isConfidentialYield,
@@ -43,8 +41,7 @@ export const StaticActionBlock = ({
 }: StaticActionBlockProps) => {
   const { t } = useTranslation();
   const { locale } = useWidgetPresentation();
-  const actionKey =
-    pendingAction.type.toLowerCase() as Lowercase<YieldPendingActionType>;
+  const actionKey = toLowerCase(pendingAction.type);
   const labelContext = getPendingActionLabelContext(
     pendingAction.type,
     yieldBalance.type,
diff --git a/packages/widget/src/features/position-details/ui/dashboard/components/position-details-stake-actions.tsx b/packages/widget/src/features/position-details/ui/dashboard/components/position-details-stake-actions.tsx
index 999572999..10fe3acc0 100644
--- a/packages/widget/src/features/position-details/ui/dashboard/components/position-details-stake-actions.tsx
+++ b/packages/widget/src/features/position-details/ui/dashboard/components/position-details-stake-actions.tsx
@@ -1,6 +1,7 @@
 import { Match } from "effect";
 import { useTranslation } from "react-i18next";
 import { getYieldTypeLabels } from "../../../../../domain/earn/yield";
+import { widgetRoutes } from "../../../../../services/navigation/widget-routes";
 import {
   formatNumber,
   formatTokenAmount,
@@ -11,12 +12,15 @@ import { AmountTokenSection } from "../../../../../shared/ui/components/amount-t
 import { Box } from "../../../../../shared/ui/primitives/box";
 import { ContentLoaderSquare } from "../../../../../shared/ui/primitives/content-loader";
 import { useWidgetPresentation } from "../../../../../shared/ui/widget-presentation";
+import { useWidgetRouteMatch } from "../../../../navigation/index";
+import { useWalletScopeRoute } from "../../../../wallet/index";
 import { type PageCta, PageCtaButton } from "../../../../widget-shell/views";
 import {
   ConfidentialTokenBalance,
   TronResourceSelection,
 } from "../../../../yield-entry/views";
 import { KycGateCard, MetaInfo } from "../../../../yield-summary/views";
+import { PositionDetailsStakeEntryKey } from "../../../state/stake-entry";
 import { usePositionDetailsStake } from "../hooks/use-position-details-stake";
 import { PositionDetailsStakeTokenSelect } from "./position-details-stake-token-select";
 
@@ -203,8 +207,12 @@ const PositionDetailsStakePrimaryAction = ({
   return <PageCtaButton cta={cta} />;
 };
 
-export const PositionDetailsStakeActions = () => {
-  const stake = usePositionDetailsStake();
+const PositionDetailsStakeActionsContent = ({
+  stakeKey,
+}: {
+  stakeKey: PositionDetailsStakeEntryKey;
+}) => {
+  const stake = usePositionDetailsStake(stakeKey);
 
   return (
     <>
@@ -216,3 +224,23 @@ export const PositionDetailsStakeActions = () => {
     </>
   );
 };
+
+/** Staking more needs the position the route names; without one, nothing. */
+export const PositionDetailsStakeActions = () => {
+  const walletScope = useWalletScopeRoute();
+  const match = useWidgetRouteMatch(widgetRoutes.positionDetails);
+
+  if (!match) return null;
+
+  return (
+    <PositionDetailsStakeActionsContent
+      stakeKey={
+        new PositionDetailsStakeEntryKey({
+          balanceId: match.balanceId,
+          integrationId: match.integrationId,
+          walletScope,
+        })
+      }
+    />
+  );
+};
diff --git a/packages/widget/src/features/position-details/ui/dashboard/hooks/use-position-details-stake.ts b/packages/widget/src/features/position-details/ui/dashboard/hooks/use-position-details-stake.ts
index 01f78843d..a22362b26 100644
--- a/packages/widget/src/features/position-details/ui/dashboard/hooks/use-position-details-stake.ts
+++ b/packages/widget/src/features/position-details/ui/dashboard/hooks/use-position-details-stake.ts
@@ -1,10 +1,6 @@
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
-import type { YieldId } from "../../../../../domain/identity/identifiers";
-import { widgetRoutes } from "../../../../../services/navigation/widget-routes";
-import { useWidgetRouteMatch } from "../../../../navigation/index";
-import { useWalletScopeRoute } from "../../../../wallet/index";
 import { usePositionDetails } from "../../../react/use-position-details";
-import { PositionDetailsStakeEntryKey } from "../../../state/stake-entry";
+import type { PositionDetailsStakeEntryKey } from "../../../state/stake-entry";
 import {
   hidePositionDetailsStakeTokenBalanceAtom,
   positionDetailsStakeViewAtom,
@@ -17,14 +13,7 @@ import {
   submitPositionDetailsStakeAtom,
 } from "../../../state/stake-view";
 
-export const usePositionDetailsStake = () => {
-  const walletScope = useWalletScopeRoute();
-  const match = useWidgetRouteMatch(widgetRoutes.positionDetails);
-  const key = new PositionDetailsStakeEntryKey({
-    balanceId: match?.balanceId ?? "",
-    integrationId: (match?.integrationId ?? "") as YieldId,
-    walletScope,
-  });
+export const usePositionDetailsStake = (key: PositionDetailsStakeEntryKey) => {
   const view = useAtomValue(positionDetailsStakeViewAtom(key));
   const refreshKyc = useAtomSet(refreshPositionDetailsStakeKycAtom(key));
   const setAmount = useAtomSet(setPositionDetailsStakeAmountAtom(key));
diff --git a/packages/widget/src/features/tracking/react/use-track-event.ts b/packages/widget/src/features/tracking/react/use-track-event.ts
index fb1d86db6..79898e1a1 100644
--- a/packages/widget/src/features/tracking/react/use-track-event.ts
+++ b/packages/widget/src/features/tracking/react/use-track-event.ts
@@ -1,6 +1,6 @@
 import { useAtomSet } from "@effect/atom-react";
 import type {
-  Properties,
+  TrackEventArgs,
   TrackEventKey,
 } from "../../../services/tracking/types";
 import { trackEventAtom } from "../state/commands";
@@ -8,6 +8,8 @@ import { trackEventAtom } from "../state/commands";
 export const useTrackEvent = () => {
   const dispatch = useAtomSet(trackEventAtom);
 
-  return (event: TrackEventKey, properties?: Properties) =>
-    dispatch({ event, properties });
+  return <Event extends TrackEventKey>(
+    event: Event,
+    ...[properties]: TrackEventArgs<Event>
+  ) => dispatch({ event, properties });
 };
diff --git a/packages/widget/src/features/tracking/react/use-track-page.ts b/packages/widget/src/features/tracking/react/use-track-page.ts
index f8dc66877..70011795e 100644
--- a/packages/widget/src/features/tracking/react/use-track-page.ts
+++ b/packages/widget/src/features/tracking/react/use-track-page.ts
@@ -1,18 +1,18 @@
 import { useAtomSet } from "@effect/atom-react";
 import { useEffect, useEffectEvent } from "react";
 import type {
-  Properties,
+  TrackPageArgs,
   TrackPageKey,
 } from "../../../services/tracking/types";
 import { trackPageViewAtom } from "../state/commands";
 
-export const useTrackPage = (
-  pageName: TrackPageKey,
-  properties?: Properties
+export const useTrackPage = <Page extends TrackPageKey>(
+  pageName: Page,
+  ...[properties]: TrackPageArgs<Page>
 ) => {
   const trackPageView = useAtomSet(trackPageViewAtom);
 
-  const reportPageView = useEffectEvent((page: TrackPageKey) =>
+  const reportPageView = useEffectEvent((page: Page) =>
     trackPageView({ page, properties })
   );
 
diff --git a/packages/widget/src/features/tracking/state/commands.ts b/packages/widget/src/features/tracking/state/commands.ts
index 04cec4b04..d77362bdf 100644
--- a/packages/widget/src/features/tracking/state/commands.ts
+++ b/packages/widget/src/features/tracking/state/commands.ts
@@ -2,19 +2,24 @@ import { Effect } from "effect";
 import { appRuntime } from "../../../app/runtime/app-runtime";
 import { TrackingService } from "../../../services/tracking/tracking-service";
 import type {
-  Properties,
+  AnyTrackEventProperties,
+  AnyTrackPageProperties,
   TrackEventKey,
   TrackPageKey,
 } from "../../../services/tracking/types";
 
+/**
+ * Commands carry any event's properties; `useTrackEvent` and `useTrackPage`
+ * check them against the event before dispatching.
+ */
 type TrackEventCommand = {
   readonly event: TrackEventKey;
-  readonly properties?: Properties;
+  readonly properties?: AnyTrackEventProperties | undefined;
 };
 
 type TrackPageViewCommand = {
   readonly page: TrackPageKey;
-  readonly properties?: Properties;
+  readonly properties?: AnyTrackPageProperties | undefined;
 };
 
 export const trackEventAtom = appRuntime.fn((command: TrackEventCommand) =>
diff --git a/packages/widget/src/features/wallet/state/wallet-modal.ts b/packages/widget/src/features/wallet/state/wallet-modal.ts
index 46464bb0e..8011452b1 100644
--- a/packages/widget/src/features/wallet/state/wallet-modal.ts
+++ b/packages/widget/src/features/wallet/state/wallet-modal.ts
@@ -112,7 +112,10 @@ export const connectWalletAtom = walletRuntime.fn(
         enabledChains: wallet.wagmiConfig.chains,
         initialChain,
       });
-      yield* wallet.connect({ chainId, connector });
+      yield* wallet.connect({
+        ...(chainId === undefined ? {} : { chainId }),
+        connector,
+      });
     }),
   // WalletService decides whether a repeated selection starts a connection.
   { concurrent: true }
diff --git a/packages/widget/src/features/wallet/ui/wallet-dialog/chain-icon.tsx b/packages/widget/src/features/wallet/ui/wallet-dialog/chain-icon.tsx
index 3dc8d775d..50f1ed883 100644
--- a/packages/widget/src/features/wallet/ui/wallet-dialog/chain-icon.tsx
+++ b/packages/widget/src/features/wallet/ui/wallet-dialog/chain-icon.tsx
@@ -27,7 +27,7 @@ export const WalletChainIcon = ({
     return initial === undefined ? null : (
       <Monogram
         initial={initial}
-        className={className}
+        {...(className === undefined ? {} : { className })}
         style={{ width: size, height: size }}
       />
     );
diff --git a/packages/widget/src/features/wallet/ui/wallet-dialog/index.tsx b/packages/widget/src/features/wallet/ui/wallet-dialog/index.tsx
index 911cffcbc..c5d011239 100644
--- a/packages/widget/src/features/wallet/ui/wallet-dialog/index.tsx
+++ b/packages/widget/src/features/wallet/ui/wallet-dialog/index.tsx
@@ -29,7 +29,7 @@ export const WalletDialog = ({
   className,
 }: PropsWithChildren<{
   readonly open: boolean;
-  readonly suspended?: boolean;
+  readonly suspended?: boolean | undefined;
   readonly onOpenChange: (open: boolean) => void;
   readonly testId: string;
   readonly className?: string;
diff --git a/packages/widget/src/features/widget-configuration/react/use-widget-config.ts b/packages/widget/src/features/widget-configuration/react/use-widget-config.ts
index 8a43fdd58..15f00ce5d 100644
--- a/packages/widget/src/features/widget-configuration/react/use-widget-config.ts
+++ b/packages/widget/src/features/widget-configuration/react/use-widget-config.ts
@@ -1,9 +1,7 @@
 import { useAtomValue } from "@effect/atom-react";
-import type * as Atom from "effect/reactivity/Atom";
 import type { WidgetConfig } from "../../../services/config/widget-config-model";
 import { widgetConfigFieldAtom } from "../state/widget-config";
 
 export const useWidgetConfig = <Field extends keyof WidgetConfig>(
   field: Field
-): WidgetConfig[Field] =>
-  useAtomValue(widgetConfigFieldAtom(field) as Atom.Atom<WidgetConfig[Field]>);
+): WidgetConfig[Field] => useAtomValue(widgetConfigFieldAtom(field));
diff --git a/packages/widget/src/features/widget-configuration/state/widget-config.ts b/packages/widget/src/features/widget-configuration/state/widget-config.ts
index b5fdf15e3..17ab04da2 100644
--- a/packages/widget/src/features/widget-configuration/state/widget-config.ts
+++ b/packages/widget/src/features/widget-configuration/state/widget-config.ts
@@ -42,8 +42,12 @@ export const rejectedWidgetConfigAtom = Atom.make((get) =>
     : null
 ).pipe(Atom.withLabel("rejectedWidgetConfigAtom"));
 
-export const widgetConfigFieldAtom = Atom.family((field: keyof WidgetConfig) =>
-  selectAtom(widgetConfigAtom, (settings) => settings[field])
+/** One atom per config field; the family keeps each field's value type. */
+export const widgetConfigFieldAtom = Atom.family(
+  <Field extends keyof WidgetConfig>(
+    field: Field
+  ): Atom.Atom<WidgetConfig[Field]> =>
+    selectAtom(widgetConfigAtom, (settings) => settings[field])
 );
 
 export const widgetBootstrapSnapshotAtom = Atom.make((get) => {
diff --git a/packages/widget/src/features/widget-shell/react/use-header.ts b/packages/widget/src/features/widget-shell/react/use-header.ts
index 03cd48d18..001df2b96 100644
--- a/packages/widget/src/features/widget-shell/react/use-header.ts
+++ b/packages/widget/src/features/widget-shell/react/use-header.ts
@@ -41,7 +41,7 @@ export const useHeader = () => {
     if (!showBack) return;
 
     trackEvent("backClicked");
-    navigation.back();
+    void navigation.back();
   };
 
   const disconnectWidget = useAtomSet(disconnectWidgetAtom);
diff --git a/packages/widget/src/features/widget-shell/ui/compact/details/components/tab.tsx b/packages/widget/src/features/widget-shell/ui/compact/details/components/tab.tsx
index 9fb5cba33..c2d199bcc 100644
--- a/packages/widget/src/features/widget-shell/ui/compact/details/components/tab.tsx
+++ b/packages/widget/src/features/widget-shell/ui/compact/details/components/tab.tsx
@@ -11,7 +11,7 @@ type Props = {
   onTabPress: () => void;
 } & (
   | { variant: "earn"; pendingActionsCount?: never }
-  | { variant: "positions"; pendingActionsCount?: number }
+  | { variant: "positions"; pendingActionsCount?: number | undefined }
   | { variant: "activity"; pendingActionsCount?: never }
 );
 
diff --git a/packages/widget/src/features/widget-shell/ui/compact/details/components/tabs.tsx b/packages/widget/src/features/widget-shell/ui/compact/details/components/tabs.tsx
index 413207a69..a3b1a5638 100644
--- a/packages/widget/src/features/widget-shell/ui/compact/details/components/tabs.tsx
+++ b/packages/widget/src/features/widget-shell/ui/compact/details/components/tabs.tsx
@@ -45,7 +45,7 @@ const Tabs = ({ pendingActionsCount }: TabsProps) => {
 
     trackEvent("tabClicked", { selected });
 
-    navigation.push(TABS_MAP[selected]);
+    void navigation.push(TABS_MAP[selected]);
   };
 
   return (
diff --git a/packages/widget/src/features/yield-entry/model/confidential-token-balance.ts b/packages/widget/src/features/yield-entry/model/confidential-token-balance.ts
index cfeceb7c1..ef37f36e6 100644
--- a/packages/widget/src/features/yield-entry/model/confidential-token-balance.ts
+++ b/packages/widget/src/features/yield-entry/model/confidential-token-balance.ts
@@ -8,6 +8,7 @@ import {
 } from "../../../domain/earn/confidential";
 import type { EarnYieldWithProvider } from "../../../domain/earn/models";
 import { exactDecimal } from "../../../domain/finance/exact";
+import type { WalletAddress } from "../../../domain/identity/identifiers";
 import type { Token } from "../../../domain/token/token";
 
 /** The API cannot read a confidential asset's balance; the owner reveals it. */
@@ -35,7 +36,7 @@ type YieldEntryTokenBalance = Readonly<{
 }>;
 
 export type YieldEntryTokenBalanceInput = Readonly<{
-  readonly owner: string | null;
+  readonly owner: WalletAddress | null;
   /** Balance the API reports for a non-confidential token. */
   readonly publicAmount: BigNumber | null;
   readonly token: Token | null;
diff --git a/packages/widget/src/features/yield-entry/model/yield-entry.ts b/packages/widget/src/features/yield-entry/model/yield-entry.ts
index de535eb4d..0875430f4 100644
--- a/packages/widget/src/features/yield-entry/model/yield-entry.ts
+++ b/packages/widget/src/features/yield-entry/model/yield-entry.ts
@@ -4,6 +4,7 @@ import { ActionCommand } from "../../../domain/action/models";
 import type { TronResource } from "../../../domain/action/tron-resource";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
 import {
@@ -12,10 +13,8 @@ import {
   getMinUnstakeAmount,
   isForceMaxAmount,
 } from "../../../domain/earn/stake";
-import type { ValidatorKey } from "../../../domain/earn/validator";
 import { getYieldActionArg } from "../../../domain/earn/yield";
 import {
-  exactDecimal,
   exactZero,
   truncateToTokenDecimals,
 } from "../../../domain/finance/exact";
@@ -36,7 +35,7 @@ type YieldEntryInput = Readonly<{
   readonly token: Token | null;
   readonly tronResource: TronResource | null;
   readonly useMaxAmount: boolean;
-  readonly validators: ReadonlyMap<ValidatorKey, EarnValidator>;
+  readonly validators: ReadonlyMap<EarnValidatorKey, EarnValidator>;
   readonly yield: EarnYieldWithProvider | null;
 }>;
 
@@ -47,7 +46,7 @@ type YieldEntryWallet = Readonly<{
 }>;
 
 type YieldEntryRewardProvider = Readonly<{
-  readonly rewardRate?: BigNumber | number | null;
+  readonly rewardRate?: BigNumber | number | null | undefined;
 }>;
 
 export type YieldEntryAmountInitialization =
@@ -230,7 +229,7 @@ type YieldAmountConstraintsInput = Readonly<{
       }>
     | Readonly<{
         readonly type: "exit";
-        readonly pricePerShare: string | null;
+        readonly pricePerShare: BigNumber | null;
       }>
   );
 
@@ -241,11 +240,9 @@ const resolveMinimum = (
   if (forceMax) return input.availableAmount;
   if (!input.yield) return null;
 
-  return exactDecimal(
-    input.type === "enter"
-      ? getMinStakeAmount(input.yield, input.selectedYieldHasActivePosition)
-      : getMinUnstakeAmount(input.yield, input.pricePerShare)
-  );
+  return input.type === "enter"
+    ? getMinStakeAmount(input.yield, input.selectedYieldHasActivePosition)
+    : getMinUnstakeAmount(input.yield, input.pricePerShare);
 };
 
 const resolveMaximum = (
diff --git a/packages/widget/src/features/yield-entry/ui/components/select-validator/index.tsx b/packages/widget/src/features/yield-entry/ui/components/select-validator/index.tsx
index b3516242d..48552391c 100644
--- a/packages/widget/src/features/yield-entry/ui/components/select-validator/index.tsx
+++ b/packages/widget/src/features/yield-entry/ui/components/select-validator/index.tsx
@@ -3,9 +3,9 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../../../domain/earn/models";
-import type { ValidatorKey } from "../../../../../domain/earn/validator";
 import type { SelectModalProps } from "../../../../../shared/ui/components/select-modal";
 import { SelectModal } from "../../../../../shared/ui/components/select-modal";
 import type { InfiniteScrollProps } from "../../../../../shared/ui/components/virtual-list";
@@ -20,7 +20,7 @@ type SelectValidatorProps = PropsWithChildren<
     SelectModalProps,
     "isLoading" | "onClose" | "onOpen" | "state" | "trigger"
   > & {
-    selectedValidators: Set<ValidatorKey>;
+    selectedValidators: ReadonlySet<EarnValidatorKey>;
     onItemClick: (item: EarnValidator) => void;
     onViewMoreClick?: () => void;
     onLoadMore?: () => void;
@@ -194,11 +194,11 @@ const getValidatorGroups = ({
     },
     {
       preferred: {
-        items: [] as EarnValidator[],
+        items: [],
         label: preferredLabel,
       },
       other: {
-        items: [] as EarnValidator[],
+        items: [],
         label: otherLabel,
       },
     }
diff --git a/packages/widget/src/features/yield-entry/ui/components/select-validator/meta-info.tsx b/packages/widget/src/features/yield-entry/ui/components/select-validator/meta-info.tsx
index 6108e2bd6..a6e5e95f3 100644
--- a/packages/widget/src/features/yield-entry/ui/components/select-validator/meta-info.tsx
+++ b/packages/widget/src/features/yield-entry/ui/components/select-validator/meta-info.tsx
@@ -37,7 +37,7 @@ export const useMetaInfo = ({
   commission?: ValidatorDto["commission"];
   stakedBalance?: ValidatorDto["tvl"];
   votingPower?: ValidatorDto["votingPower"];
-  address?: ValidatorDto["address"];
+  address?: ValidatorDto["address"] | undefined;
   website?: ValidatorDto["website"];
   nominatorCount?: ValidatorDto["nominatorCount"];
   subnetName?: ValidatorSubnet["name"];
@@ -74,7 +74,7 @@ export const useMetaInfo = ({
         ? {
             title: t("details.validators_staked_balance"),
             val: formatBigNumber(
-              exactDecimal(stakedBalance),
+              stakedBalance,
               (value) =>
                 `${formatNumber(value, locale, 0)} ${stakedBalanceToken.symbol}`
             ),
diff --git a/packages/widget/src/features/yield-entry/ui/components/select-validator/select-validator-list.tsx b/packages/widget/src/features/yield-entry/ui/components/select-validator/select-validator-list.tsx
index bb34ed379..12fa36210 100644
--- a/packages/widget/src/features/yield-entry/ui/components/select-validator/select-validator-list.tsx
+++ b/packages/widget/src/features/yield-entry/ui/components/select-validator/select-validator-list.tsx
@@ -3,9 +3,9 @@ import type { ComponentProps } from "react";
 import { useTranslation } from "react-i18next";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../../../domain/earn/models";
-import type { ValidatorKey } from "../../../../../domain/earn/validator";
 import { getRewardTypeFormatted } from "../../../../../shared/lib/formatters";
 import { formatRewardRatePercent } from "../../../../../shared/lib/number-format";
 import { vars } from "../../../../../shared/styles/theme/contract.css";
@@ -49,7 +49,7 @@ export const SelectValidatorList = ({
   ...infiniteScroll
 }: {
   multiSelect: boolean;
-  selectedValidators: Set<ValidatorKey>;
+  selectedValidators: ReadonlySet<EarnValidatorKey>;
   onItemClick: (item: EarnValidator) => void;
   onViewMoreClick: () => void;
   selectedStake: EarnYieldWithProvider;
diff --git a/packages/widget/src/features/yield-summary/model/estimated-rewards.ts b/packages/widget/src/features/yield-summary/model/estimated-rewards.ts
index 6c58104be..ee3604cc7 100644
--- a/packages/widget/src/features/yield-summary/model/estimated-rewards.ts
+++ b/packages/widget/src/features/yield-summary/model/estimated-rewards.ts
@@ -2,14 +2,14 @@ import type BigNumber from "bignumber.js";
 import { Array as EArray, Option } from "effect";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
-import type { ValidatorKey } from "../../../domain/earn/validator";
 import { isBittensorStaking } from "../../../domain/earn/yield";
 import { exactDecimal, exactZero } from "../../../domain/finance/exact";
 
 type YieldRewardProvider = Readonly<{
-  readonly rewardRate?: BigNumber | number | null;
+  readonly rewardRate?: BigNumber | number | null | undefined;
 }>;
 
 export const getYieldEstimatedRewards = ({
@@ -20,7 +20,7 @@ export const getYieldEstimatedRewards = ({
 }: {
   readonly amount: BigNumber;
   readonly providers: ReadonlyArray<YieldRewardProvider> | null;
-  readonly validators: ReadonlyMap<ValidatorKey, EarnValidator>;
+  readonly validators: ReadonlyMap<EarnValidatorKey, EarnValidator>;
   readonly yield: EarnYieldWithProvider | null;
 }) => {
   const firstValidator = EArray.head([...validators.values()]).pipe(
diff --git a/packages/widget/src/features/yield-summary/model/yield-details-formatters.ts b/packages/widget/src/features/yield-summary/model/yield-details-formatters.ts
index a112f0e21..9fd74eb0f 100644
--- a/packages/widget/src/features/yield-summary/model/yield-details-formatters.ts
+++ b/packages/widget/src/features/yield-summary/model/yield-details-formatters.ts
@@ -1,3 +1,4 @@
+import type BigNumber from "bignumber.js";
 import type { TFunction } from "i18next";
 import type { EarnYieldWithProvider } from "../../../domain/earn/models";
 import type { getEffectiveYieldRewardRateDetails } from "../../../domain/earn/reward-rate";
@@ -65,20 +66,16 @@ export const formatMinStake = (
   t: TFunction,
   locale: string
 ): { kpiPrimaryEligible: boolean; value: string } | null => {
-  const minimum =
+  const amount =
     yieldDto.mechanics.entryLimits?.minimum ??
     getYieldActionArg(yieldDto, "enter", "amount")?.minimum;
 
-  if (minimum === null || minimum === undefined) return null;
-
-  const amount = exactDecimal(minimum);
-
-  if (!amount.isFinite()) return null;
+  if (!amount) return null;
 
   if (amount.isZero()) {
     return {
       kpiPrimaryEligible: false,
-      value: t("dashboard.earn_details.no_minimum") as string,
+      value: t("dashboard.earn_details.no_minimum"),
     };
   }
 
@@ -113,11 +110,11 @@ export const formatCommission = (
 };
 
 export const formatProviderTvl = (
-  tvl: string | number | null | undefined,
+  tvl: BigNumber | null | undefined,
   tokenSymbol: string,
   locale: string
 ) => {
-  if (tvl === null || tvl === undefined) return null;
+  if (!tvl) return null;
 
   const formatted = formatCompactNumber(tvl, locale);
 
@@ -169,13 +166,7 @@ export const formatPricePerShare = (
 ): string | null => {
   const price = yieldDto.state?.pricePerShareState?.price;
 
-  if (price === null || price === undefined) return null;
-
-  const amount = exactDecimal(price);
-
-  if (!amount.isFinite() || amount.isLessThanOrEqualTo(0)) return null;
-
-  return formatNumber(amount, locale, 8);
+  return price?.isGreaterThan(0) ? formatNumber(price, locale, 8) : null;
 };
 
 export const formatCooldownDays = (days: number, t: TFunction): string => {
@@ -205,10 +196,10 @@ export const formatOptionalDays = (
 };
 
 export const formatMeaningfulCompactUsd = (
-  value: string | number | null | undefined,
+  value: BigNumber | null | undefined,
   locale: string
 ) => {
-  if (!isPositiveFinite(value)) return null;
+  if (!value?.isGreaterThan(0)) return null;
 
   const formatted = formatUsd(value, locale);
 
@@ -216,20 +207,12 @@ export const formatMeaningfulCompactUsd = (
 };
 
 export const formatMeaningfulCompactNumber = (
-  value: string | number | null | undefined,
+  value: number | null | undefined,
   locale: string
 ) => {
-  if (!isPositiveFinite(value)) return null;
+  if (value == null || value <= 0) return null;
 
   const formatted = formatCompactNumber(value, locale);
 
   return formatted === "-" ? null : formatted;
 };
-
-const isPositiveFinite = (value: string | number | null | undefined) => {
-  if (value === null || value === undefined || value === "") return false;
-
-  const amount = exactDecimal(value);
-
-  return amount.isFinite() && amount.isGreaterThan(0);
-};
diff --git a/packages/widget/src/features/yield-summary/model/yield-summary.ts b/packages/widget/src/features/yield-summary/model/yield-summary.ts
index c63a1b110..c48fa6ef3 100644
--- a/packages/widget/src/features/yield-summary/model/yield-summary.ts
+++ b/packages/widget/src/features/yield-summary/model/yield-summary.ts
@@ -1,9 +1,9 @@
 import type BigNumber from "bignumber.js";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
-import type { ValidatorKey } from "../../../domain/earn/validator";
 import {
   getExtendedYieldType,
   getYieldRewardTokens,
@@ -25,7 +25,7 @@ export type YieldSummaryProvider = Readonly<{
 
 export type YieldSummaryInput = Readonly<{
   readonly validators:
-    | ReadonlyMap<ValidatorKey, EarnValidator>
+    | ReadonlyMap<EarnValidatorKey, EarnValidator>
     | ReadonlyArray<EarnValidator>
     | null;
   readonly yield: EarnYieldWithProvider | null;
@@ -76,9 +76,7 @@ const getYieldSummaryProviders = ({
 }: YieldSummaryInput): YieldSummaryProvider[] | null => {
   if (!validators || !selectedYield) return null;
 
-  const values = Array.isArray(validators)
-    ? validators
-    : [...(validators as ReadonlyMap<ValidatorKey, EarnValidator>).values()];
+  const values = [...validators.values()];
   if (values.length === 0) return [getYieldProvider(selectedYield)];
 
   return values.map(getValidatorProvider);
diff --git a/packages/widget/src/features/yield-summary/react/use-yield-meta-info.tsx b/packages/widget/src/features/yield-summary/react/use-yield-meta-info.tsx
index c40553773..bcbc677bb 100644
--- a/packages/widget/src/features/yield-summary/react/use-yield-meta-info.tsx
+++ b/packages/widget/src/features/yield-summary/react/use-yield-meta-info.tsx
@@ -254,9 +254,9 @@ export const useYieldMetaInfo = ({
               stakeToken,
               rewardTokens,
               providerName,
-              context: haveFeeConfigurationEnabled
-                ? "with_fee_configuration"
-                : undefined,
+              ...(haveFeeConfigurationEnabled
+                ? { context: "with_fee_configuration" }
+                : {}),
             }),
         withdrawnNotAvailable: null,
         ...def,
@@ -271,7 +271,9 @@ export const useYieldMetaInfo = ({
         description: t("details.vault.description", {
           stakeToken,
           depositToken: rewardTokens,
-          context: vaultDescriptionContext,
+          ...(vaultDescriptionContext === undefined
+            ? {}
+            : { context: vaultDescriptionContext }),
         }),
         earnPeriod: getVaultEarnPeriod(),
         earnRewards:
diff --git a/packages/widget/src/features/yield-summary/ui/components/meta-info/index.tsx b/packages/widget/src/features/yield-summary/ui/components/meta-info/index.tsx
index bb991152c..3ea932d86 100644
--- a/packages/widget/src/features/yield-summary/ui/components/meta-info/index.tsx
+++ b/packages/widget/src/features/yield-summary/ui/components/meta-info/index.tsx
@@ -1,9 +1,9 @@
 import type { JSX, ReactNode } from "react";
 import type {
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../../../domain/earn/models";
-import type { ValidatorKey } from "../../../../../domain/earn/validator";
 import type { Token } from "../../../../../domain/token/token";
 import { Box } from "../../../../../shared/ui/primitives/box";
 import { ContentLoaderSquare } from "../../../../../shared/ui/primitives/content-loader";
@@ -21,9 +21,9 @@ type MetaInfoTextSize = NonNullable<NonNullable<TextVariants>["size"]>;
 type Props = {
   isLoading?: boolean;
   selectedStake: EarnYieldWithProvider | null;
-  selectedValidators: Map<ValidatorKey, EarnValidator>;
+  selectedValidators: Map<EarnValidatorKey, EarnValidator>;
   selectedToken: Token | null;
-  textSize?: MetaInfoTextSize;
+  textSize?: MetaInfoTextSize | undefined;
 };
 
 export const MetaInfo = ({
diff --git a/packages/widget/src/features/yield-summary/ui/components/reward-token-details/index.tsx b/packages/widget/src/features/yield-summary/ui/components/reward-token-details/index.tsx
index 496a9b34b..e6fa7cbc6 100644
--- a/packages/widget/src/features/yield-summary/ui/components/reward-token-details/index.tsx
+++ b/packages/widget/src/features/yield-summary/ui/components/reward-token-details/index.tsx
@@ -1,3 +1,4 @@
+import { toLowerCase } from "effect/String";
 import type { ComponentProps } from "react";
 import { Trans } from "react-i18next";
 import type { YieldPendingActionType } from "../../../../../domain/action/pending-action";
@@ -28,18 +29,18 @@ export const RewardTokenDetails = ({
     }
 
     if (rest.type === "pendingAction") {
-      return `pending_action_review.pending_action_type.${
-        rest.pendingAction.toLowerCase() as Lowercase<YieldPendingActionType>
-      }` as const;
+      return `pending_action_review.pending_action_type.${toLowerCase(
+        rest.pendingAction
+      )}` as const;
     }
 
     return "unstake_review.unstake_from";
   })();
 
-  const i18nDefaults =
+  const i18nDefaultsProps =
     rest.type === "pendingAction"
-      ? humanizePendingActionType(rest.pendingAction)
-      : undefined;
+      ? { defaults: humanizePendingActionType(rest.pendingAction) }
+      : {};
 
   if (!rewardToken) return null;
   const symbols = getRewardTokenSymbols(rewardToken.rewardTokens);
@@ -70,7 +71,7 @@ export const RewardTokenDetails = ({
       <Text variant={{ weight: "semibold" }}>
         <Trans
           i18nKey={i18nKey}
-          defaults={i18nDefaults}
+          {...i18nDefaultsProps}
           values={{ providerName: rewardToken.providerName }}
           components={{
             symbols1: (
diff --git a/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-flow.ts b/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-flow.ts
index c78f1df5c..baa4055da 100644
--- a/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-flow.ts
+++ b/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-flow.ts
@@ -11,7 +11,6 @@ import type { ExitReceiveToken } from "../../../domain/action/rules";
 import { getActionInputToken } from "../../../domain/action/rules";
 import {
   type CancelReturn,
-  type ConfidentialHandle,
   getConfidentialAssetToken,
   getConfidentialChainId,
   getConfidentialConversion,
@@ -21,17 +20,21 @@ import {
   toConfidentialUnderlyingAmount,
 } from "../../../domain/earn/confidential";
 import type {
+  ConfidentialHandle,
   EarnProvider,
   EarnValidator,
+  EarnValidatorKey,
   EarnYieldWithProvider,
 } from "../../../domain/earn/models";
-import type { ValidatorKey } from "../../../domain/earn/validator";
 import { exactDecimal } from "../../../domain/finance/exact";
 import type {
   ProviderOption,
   YieldId,
 } from "../../../domain/identity/identifiers";
-import type { YieldBalanceType } from "../../../domain/portfolio/positions";
+import type {
+  BalanceDataKey,
+  YieldBalanceType,
+} from "../../../domain/portfolio/positions";
 import type { Token } from "../../../domain/token/token";
 import {
   sameWalletScopeOwner,
@@ -69,7 +72,7 @@ type EnterYieldTransactionFlowIntake = {
   readonly selectedProviderOption: YieldFlowProviderOption | null;
   readonly selectedStake: EarnYieldWithProvider;
   readonly selectedToken: Token;
-  readonly selectedValidators: ReadonlyMap<ValidatorKey, EarnValidator>;
+  readonly selectedValidators: ReadonlyMap<EarnValidatorKey, EarnValidator>;
   readonly walletScope: WalletScopeKey;
 };
 
@@ -112,10 +115,14 @@ type YieldActionContinuationIntake = {
   readonly walletScope: WalletScopeKey;
 };
 
-export type YieldTransactionFlowIntake =
+/** An intake Review previews: every intake except a continued action. */
+export type YieldPreviewIntake =
   | EnterYieldTransactionFlowIntake
   | ExitYieldTransactionFlowIntake
-  | ManageYieldTransactionFlowIntake
+  | ManageYieldTransactionFlowIntake;
+
+export type YieldTransactionFlowIntake =
+  | YieldPreviewIntake
   | YieldActionContinuationIntake;
 
 type YieldTransactionFlowDestination = WidgetFlowDestination<
@@ -133,17 +140,17 @@ type YieldTransactionFlowMount =
   | Readonly<{ readonly _tag: "Earn" }>
   | Readonly<{
       readonly _tag: "PositionExit";
-      readonly balanceId: string;
+      readonly balanceId: BalanceDataKey;
       readonly integrationId: YieldId;
     }>
   | Readonly<{
       readonly _tag: "PositionManage";
-      readonly balanceId: string;
+      readonly balanceId: BalanceDataKey;
       readonly integrationId: YieldId;
     }>
   | Readonly<{
       readonly _tag: "PositionStake";
-      readonly balanceId: string;
+      readonly balanceId: BalanceDataKey;
       readonly integrationId: YieldId;
     }>;
 
@@ -292,13 +299,10 @@ export const yieldFlowRoutes = {
 const copyYieldTransactionFlowIntake = (
   intake: YieldTransactionFlowIntake,
   walletScope: WalletScopeKey
-): YieldTransactionFlowIntake => {
-  const { walletScope: _expectedWalletScope, ...facts } = intake;
-  return {
-    ...facts,
-    walletScope: new WalletScopeKey(walletScope),
-  } as YieldTransactionFlowIntake;
-};
+): YieldTransactionFlowIntake => ({
+  ...intake,
+  walletScope: new WalletScopeKey(walletScope),
+});
 
 export const makeYieldFlowSession = (
   command: StartYieldTransactionFlow,
@@ -364,7 +368,7 @@ export const makeYieldActionContinuationSession = (
  * mount share it, so a layout can keep that subtree (and its Session) mounted
  * across the flow's own navigation. Null outside Yield flow routes.
  */
-export const getYieldFlowRouteGroup = (pathname: string): string | null =>
+export const getYieldFlowRouteGroup = (pathname: string): WidgetPath | null =>
   Option.getOrNull(
     Option.firstSomeOf(
       Object.values(widgetYieldFlowRoutes).map((routes) =>
@@ -446,18 +450,21 @@ export const isYieldTransactionFlowWalletScopeValid = (
   currentWalletScope !== null &&
   sameWalletScopeOwner(intake.walletScope, currentWalletScope);
 
+const isYieldTransactionFlowIntakeVariant = <
+  Variant extends YieldTransactionFlowIntake["_tag"],
+>(
+  intake: YieldTransactionFlowIntake,
+  variant: Variant
+): intake is Extract<YieldTransactionFlowIntake, { readonly _tag: Variant }> =>
+  intake._tag === variant;
+
 export const getYieldTransactionFlowIntakeVariant = <
   Variant extends YieldTransactionFlowIntake["_tag"],
 >(
   intake: YieldTransactionFlowIntake,
   variant: Variant
 ): Extract<YieldTransactionFlowIntake, { readonly _tag: Variant }> | null =>
-  intake._tag === variant
-    ? (intake as Extract<
-        YieldTransactionFlowIntake,
-        { readonly _tag: Variant }
-      >)
-    : null;
+  isYieldTransactionFlowIntakeVariant(intake, variant) ? intake : null;
 
 const getYieldFlowInputToken = (intake: YieldTransactionFlowIntake) =>
   Match.value(intake).pipe(
diff --git a/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-workflow.ts b/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-workflow.ts
index f79951fba..8fdb79f1b 100644
--- a/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-workflow.ts
+++ b/packages/widget/src/features/yield-transaction-flow/model/yield-transaction-workflow.ts
@@ -21,7 +21,7 @@ export type YieldTransactionCompletionUrl = {
 export const formatTransactionTypeLabel = (
   type: TransactionType | "DECRYPT" | "ENCRYPT" | "RESET_APPROVAL",
   t: TFunction,
-  options?: { readonly context?: "ETHENA_USDE" }
+  options?: { readonly context?: "ETHENA_USDE" | undefined }
 ) =>
   t(`steps.tx_type.${type}`, {
     context: options?.context,
diff --git a/packages/widget/src/features/yield-transaction-flow/state/review-page.ts b/packages/widget/src/features/yield-transaction-flow/state/review-page.ts
index a3cedefe0..e6b9f4e35 100644
--- a/packages/widget/src/features/yield-transaction-flow/state/review-page.ts
+++ b/packages/widget/src/features/yield-transaction-flow/state/review-page.ts
@@ -49,6 +49,7 @@ import {
   type YieldFlowExecutionSource,
   YieldFlowHandoff,
   type YieldFlowSession,
+  type YieldPreviewIntake,
   type YieldTransactionFlowIntake,
 } from "../model/yield-transaction-flow";
 import { makeYieldFlowStakeReviewViewAtom } from "./yield-summary";
@@ -85,10 +86,7 @@ const isRetryablePreviewError = Predicate.isTagged("YieldFlowPreviewError");
 
 /** The preview request a Review of `intake` sends. */
 const getYieldFlowPreviewRequest = (
-  intake: Exclude<
-    YieldTransactionFlowIntake,
-    { readonly _tag: "YieldActionContinuation" }
-  >
+  intake: YieldPreviewIntake
 ): ActionPreviewRequest => {
   switch (intake._tag) {
     case "Enter":
diff --git a/packages/widget/src/features/yield-transaction-flow/state/yield-summary.ts b/packages/widget/src/features/yield-transaction-flow/state/yield-summary.ts
index 467ea9608..e0070644e 100644
--- a/packages/widget/src/features/yield-transaction-flow/state/yield-summary.ts
+++ b/packages/widget/src/features/yield-transaction-flow/state/yield-summary.ts
@@ -33,13 +33,13 @@ const makePercentageFee = ({
   percentage,
 }: {
   readonly amount: BigNumber;
-  readonly percentage: string | undefined;
+  readonly percentage: BigNumber | null | undefined;
 }): YieldFlowPercentageFee | null =>
-  percentage === undefined
+  percentage == null
     ? null
     : {
         amount: amount.multipliedBy(percentage).dividedBy(100),
-        ratio: exactDecimal(percentage).dividedBy(100),
+        ratio: percentage.dividedBy(100),
       };
 
 export const makeYieldFlowStakeReviewViewAtom = (
@@ -69,17 +69,7 @@ export const makeYieldFlowStakeReviewViewAtom = (
       validators: new Map(intake.selectedValidators),
       yield: intake.selectedStake,
     });
-    const yieldFee = (
-      intake.selectedStake as typeof intake.selectedStake & {
-        mechanics?: {
-          fee?: {
-            deposit?: string;
-            management?: string;
-            performance?: string;
-          };
-        };
-      }
-    ).mechanics?.fee;
+    const yieldFee = intake.selectedStake.mechanics.fee;
     const feeInput = { amount: stakeAmount };
 
     return {
diff --git a/packages/widget/src/features/yield-transaction-flow/ui/complete/hooks/use-complete.hook.ts b/packages/widget/src/features/yield-transaction-flow/ui/complete/hooks/use-complete.hook.ts
index 6a231bf0e..cecffd879 100644
--- a/packages/widget/src/features/yield-transaction-flow/ui/complete/hooks/use-complete.hook.ts
+++ b/packages/widget/src/features/yield-transaction-flow/ui/complete/hooks/use-complete.hook.ts
@@ -51,9 +51,7 @@ export const useComplete = () => {
     isLoading: false,
     label:
       activityAction === null
-        ? t("complete.continue", {
-            context: opensLedgerEarn ? "ledger" : undefined,
-          })
+        ? t("complete.continue", opensLedgerEarn ? { context: "ledger" } : {})
         : t("activity.complete.continue"),
     onClick,
     hide: false,
diff --git a/packages/widget/src/features/yield-transaction-flow/ui/complete/pages/common.page.tsx b/packages/widget/src/features/yield-transaction-flow/ui/complete/pages/common.page.tsx
index 54d6eb869..5ed4795a4 100644
--- a/packages/widget/src/features/yield-transaction-flow/ui/complete/pages/common.page.tsx
+++ b/packages/widget/src/features/yield-transaction-flow/ui/complete/pages/common.page.tsx
@@ -13,6 +13,7 @@ import {
   type ExtendedYieldType,
   isEthenaUsdeStaking,
 } from "../../../../../domain/earn/yield";
+import type { YieldId } from "../../../../../domain/identity/identifiers";
 import type { Token } from "../../../../../domain/token/token";
 import { presentationClockAtom } from "../../../../../shared/effect/presentation-clock";
 import { TokenIcon } from "../../../../../shared/ui/components/token-icon";
@@ -39,15 +40,15 @@ type Props = {
   network: string;
   amount: string;
   pendingActionType?: YieldPendingActionType;
-  pendingActionLabelContext?: PendingActionLabelContext;
+  pendingActionLabelContext?: PendingActionLabelContext | undefined;
   /** The request was queued into this vault's next batch, not settled. */
   batched?: BatchedRequest | null;
   providersDetails: ReadonlyArray<{
-    logo?: string;
+    logo?: string | undefined;
     name?: string;
   }> | null;
   yieldType: ExtendedYieldType | null;
-  integrationId: string;
+  integrationId: YieldId;
 };
 
 type BatchedRequest = Readonly<{
@@ -80,9 +81,9 @@ export const CompletePageComponent = ({
     pendingActionMatch,
     urls,
   } = completion;
-  const translationContext = isEthenaUsdeStaking(integrationId)
-    ? "ethena_usde"
-    : undefined;
+  const translationOptions = isEthenaUsdeStaking(integrationId)
+    ? { context: "ethena_usde" }
+    : {};
   const getSuccessKey = () => {
     if (batched?.side === "redemption") {
       return "complete.withdrawal_submitted" as const;
@@ -99,15 +100,21 @@ export const CompletePageComponent = ({
   const getAction = () => {
     if (!yieldType) return "";
     if (unstakeMatch) {
-      return t(`complete.unstake.${yieldType}`, {
-        context: translationContext,
-      });
+      return t(`complete.unstake.${yieldType}`, translationOptions);
     }
-    return t(`complete.stake.${yieldType}`, {
-      context: translationContext,
-    });
+    return t(`complete.stake.${yieldType}`, translationOptions);
   };
   const action = getAction();
+  const pendingAction = pendingActionType
+    ? {
+        pendingAction: t(
+          `complete.pending_action.${toLowerCase(pendingActionType)}`,
+          pendingActionLabelContext === undefined
+            ? translationOptions
+            : { context: pendingActionLabelContext }
+        ),
+      }
+    : {};
   const nextBatch = batched
     ? formatNextBatchTiming({
         now: presentationTime?.now ?? null,
@@ -175,14 +182,7 @@ export const CompletePageComponent = ({
                   action,
                   amount,
                   tokenNetwork: network,
-                  pendingAction: t(
-                    `complete.pending_action.${
-                      pendingActionType?.toLowerCase() as Lowercase<YieldPendingActionType>
-                    }` as const,
-                    {
-                      context: pendingActionLabelContext ?? translationContext,
-                    }
-                  ),
+                  ...pendingAction,
                 })}
               </Heading>
             </motion.div>
diff --git a/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-pending-review.hook.ts b/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-pending-review.hook.ts
index abaa5de70..25b7e745b 100644
--- a/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-pending-review.hook.ts
+++ b/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-pending-review.hook.ts
@@ -1,10 +1,8 @@
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
+import { toLowerCase } from "effect/String";
 import type { ComponentProps } from "react";
 import { useTranslation } from "react-i18next";
-import {
-  getPendingActionLabelContext,
-  type YieldPendingActionType,
-} from "../../../../../domain/action/pending-action";
+import { getPendingActionLabelContext } from "../../../../../domain/action/pending-action";
 import { isConfidentialYield } from "../../../../../domain/earn/confidential";
 import { exactDecimal } from "../../../../../domain/finance/exact";
 import { getGasFeeInUSD } from "../../../../../shared/lib/formatters";
@@ -44,10 +42,10 @@ export const usePendingActionReview = () => {
     { confidential: isConfidentialYield(integrationData) }
   );
   const title = t(
-    `position_details.pending_action_button.${
-      manageFlow.request.action.toLowerCase() as Lowercase<YieldPendingActionType>
-    }` as const,
-    { context: labelContext }
+    `position_details.pending_action_button.${toLowerCase(
+      manageFlow.request.action
+    )}` as const,
+    labelContext === undefined ? {} : { context: labelContext }
   );
 
   const fee = getGasFeeInUSD({
diff --git a/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-unstake-review.hook.ts b/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-unstake-review.hook.ts
index 6176c7202..7e9f26fb2 100644
--- a/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-unstake-review.hook.ts
+++ b/packages/widget/src/features/yield-transaction-flow/ui/review/hooks/use-unstake-review.hook.ts
@@ -43,7 +43,7 @@ export const useUnstakeActionReview = () => {
   const formattedAmount = formatTokenAmount(amount, locale, "down");
 
   const title = isUnstakeYieldType(getExtendedYieldType(integrationData))
-    ? (t("position_details.unstake") as string)
+    ? t("position_details.unstake")
     : t("position_details.withdraw");
 
   const fee = getGasFeeInUSD({
diff --git a/packages/widget/src/features/yield-transaction-flow/ui/review/pages/common-page/components/review-top-section.tsx b/packages/widget/src/features/yield-transaction-flow/ui/review/pages/common-page/components/review-top-section.tsx
index 498e84822..56df0f0de 100644
--- a/packages/widget/src/features/yield-transaction-flow/ui/review/pages/common-page/components/review-top-section.tsx
+++ b/packages/widget/src/features/yield-transaction-flow/ui/review/pages/common-page/components/review-top-section.tsx
@@ -13,16 +13,22 @@ import {
 import { headingStyles } from "../../style.css";
 
 type Props = {
-  facts?: ReadonlyArray<Readonly<{ label: string; value: string }>>;
+  facts?: ReadonlyArray<Readonly<{ label: string; value: string }>> | undefined;
   title: string;
   token: Token | null;
   metadata: ComponentProps<typeof TokenIcon>["metadata"] | null;
   info: ReactNode;
-  rewardTokenDetailsProps?: ComponentProps<typeof RewardTokenDetails> | null;
-  estimatedRewardAmounts?: {
-    earnYearly: string;
-    earnMonthly: string;
-  } | null;
+  rewardTokenDetailsProps?:
+    | ComponentProps<typeof RewardTokenDetails>
+    | null
+    | undefined;
+  estimatedRewardAmounts?:
+    | {
+        earnYearly: string;
+        earnMonthly: string;
+      }
+    | null
+    | undefined;
 };
 
 const ReviewTopSection = ({
diff --git a/packages/widget/src/public-api/types.ts b/packages/widget/src/public-api/types.ts
index 71654eb0f..b7eb78431 100644
--- a/packages/widget/src/public-api/types.ts
+++ b/packages/widget/src/public-api/types.ts
@@ -310,9 +310,9 @@ type NonNullishValue = NonNullable<unknown>;
 export type SKTxMeta = ActionMeta & {
   txId: string;
   txType: SKTransactionType;
-  structuredTransaction?: NonNullishValue | null;
-  annotatedTransaction?: NonNullishValue | null;
-  gasEstimate?: string;
+  structuredTransaction?: NonNullishValue | null | undefined;
+  annotatedTransaction?: NonNullishValue | null | undefined;
+  gasEstimate?: string | undefined;
 };
 
 /**
@@ -588,7 +588,7 @@ export type SKTrackingConfig = {
  * The value is a yield ID, or `"*"` for the widget's default choice.
  */
 export type SKPreferredTokenYieldsPerNetwork = Readonly<
-  Record<string, Readonly<Record<`${string}-${string}`, string>>>
+  Partial<Record<SKNetwork, Readonly<Record<`${string}-${string}`, string>>>>
 >;
 
 /**
@@ -651,25 +651,29 @@ type SettingsPropsBase = {
   /** Translation overrides per language. */
   customTranslations?: SKCustomTranslations;
   /** Validator rules per network ID, or `"*"` for every network without its own entry. */
-  validatorsConfig?: Record<
-    string,
-    {
-      /** Shows only these validator addresses. */
-      allowed?: string[];
-      /** Hides these validator addresses, even when allowed. */
-      blocked?: string[];
-      /** Marks these validator addresses as preferred. */
-      preferred?: string[];
-      /** Also keeps the API's preferred validators. Defaults to `true`. */
-      mergePreferredWithDefault?: boolean;
-      /** Shows only preferred validators. Defaults to `false`. */
-      preferredOnly?: boolean;
-    }
+  validatorsConfig?: Partial<
+    Record<
+      SKNetwork | "*",
+      {
+        /** Shows only these validator addresses. */
+        allowed?: string[];
+        /** Hides these validator addresses, even when allowed. */
+        blocked?: string[];
+        /** Marks these validator addresses as preferred. */
+        preferred?: string[];
+        /** Also keeps the API's preferred validators. Defaults to `true`. */
+        mergePreferredWithDefault?: boolean;
+        /** Shows only preferred validators. Defaults to `false`. */
+        preferredOnly?: boolean;
+      }
+    >
   >;
   /** Token icon URLs by token symbol, or a function returning the URL for a token. */
   tokenIconMapping?: Record<string, string> | ((token: SKToken) => string);
   /** Network icon URLs by network ID (for example `"ethereum"`), or a function returning one. */
-  chainIconMapping?: Record<string, string> | ((chain: string) => string);
+  chainIconMapping?:
+    | Partial<Record<SKNetwork, string>>
+    | ((network: SKNetwork) => string);
   /** Enables the dashboard route tree and category yield grouping by default. */
   dashboardVariant?: boolean;
   /** Order of yield categories. Omitted categories follow in the default order. */
diff --git a/packages/widget/src/resources/borrow-positions/borrow-positions.ts b/packages/widget/src/resources/borrow-positions/borrow-positions.ts
index a439d4904..f4f6a4575 100644
--- a/packages/widget/src/resources/borrow-positions/borrow-positions.ts
+++ b/packages/widget/src/resources/borrow-positions/borrow-positions.ts
@@ -2,10 +2,7 @@ import { Data, Duration, Effect } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import * as Atom from "effect/reactivity/Atom";
 import { appRuntime } from "../../app/runtime/app-runtime";
-import {
-  type BorrowNetwork,
-  isBorrowNetwork,
-} from "../../domain/borrow/network";
+import { isBorrowNetwork } from "../../domain/borrow/network";
 import { deriveBorrowPositions } from "../../domain/borrow/positions/borrow-positions";
 import type { BorrowIntegrationPositionsResponse } from "../../domain/borrow/responses";
 import {
@@ -38,14 +35,14 @@ const borrowPositionPolicy = withApiResourcePolicy({
   staleTime: Duration.minutes(1),
 });
 
+const noBorrowPositions: typeof BorrowIntegrationPositionsResponse.Type = [];
+
 const borrowPositionDataResourceAtom = Atom.family((key: BorrowPositionsKey) =>
   appRuntime
     .atom((context) => {
       const network = key.scope?.network;
       if (!key.scope || !network || !isBorrowNetwork(network)) {
-        return Effect.succeed(
-          [] as typeof BorrowIntegrationPositionsResponse.Type
-        );
+        return Effect.succeed(noBorrowPositions);
       }
       const scope = key.scope;
 
@@ -61,13 +58,11 @@ const borrowPositionDataResourceAtom = Atom.family((key: BorrowPositionsKey) =>
           .getPositionData({
             address: scope.address,
             integrations,
-            network: network as BorrowNetwork,
+            network,
           })
           .pipe(
             Effect.catchTag("BorrowFeatureDisabled", () =>
-              Effect.succeed(
-                [] as typeof BorrowIntegrationPositionsResponse.Type
-              )
+              Effect.succeed(noBorrowPositions)
             ),
             withBorrowResourceError("borrow-positions")
           );
diff --git a/packages/widget/src/resources/earn-token-catalog/earn-token-catalog.ts b/packages/widget/src/resources/earn-token-catalog/earn-token-catalog.ts
index 281f3b6ab..9b3e1bf94 100644
--- a/packages/widget/src/resources/earn-token-catalog/earn-token-catalog.ts
+++ b/packages/widget/src/resources/earn-token-catalog/earn-token-catalog.ts
@@ -36,21 +36,23 @@ const earnTokenCatalogCanonicalAtom = Atom.family((key: EarnTokenCatalogKey) =>
     .atom(() =>
       Effect.gen(function* () {
         const source = yield* LegacyResourceSource;
-        const network = key.network ?? undefined;
-        const yieldTypes = key.category
-          ? getApiYieldTypesForYieldCategory(key.category)
-          : undefined;
-        const displayOnlyYieldTypes = getDisplayOnlyYieldTypes({
-          network,
-          yieldTypes,
-        });
+        const scope = {
+          ...(key.network === null ? {} : { network: key.network }),
+          ...(key.category === null
+            ? {}
+            : { yieldTypes: getApiYieldTypesForYieldCategory(key.category) }),
+        };
+        const displayOnlyYieldTypes = getDisplayOnlyYieldTypes(scope);
         // The display-only request is supplemental: its failure must not hide
         // the enterable yields, so it degrades to no display-only yields.
         const offered =
           displayOnlyYieldTypes.length === 0
             ? Effect.succeed([])
             : source
-                .getTokenOptions({ network, yieldTypes: displayOnlyYieldTypes })
+                .getTokenOptions({
+                  ...scope,
+                  yieldTypes: displayOnlyYieldTypes,
+                })
                 .pipe(
                   Effect.catch((cause) =>
                     Effect.logWarning("Display-only yields unavailable").pipe(
@@ -65,7 +67,7 @@ const earnTokenCatalogCanonicalAtom = Atom.family((key: EarnTokenCatalogKey) =>
         const [enterableTokens, offeredTokens] = yield* Effect.all(
           [
             source
-              .getTokenOptions({ enter: true, network, yieldTypes })
+              .getTokenOptions({ enter: true, ...scope })
               .pipe(
                 Effect.mapError((cause) => new EarnTokenCatalogError({ cause }))
               ),
diff --git a/packages/widget/src/resources/gas-token-balances/gas-token-balances.ts b/packages/widget/src/resources/gas-token-balances/gas-token-balances.ts
index e18be0266..1d5796a8d 100644
--- a/packages/widget/src/resources/gas-token-balances/gas-token-balances.ts
+++ b/packages/widget/src/resources/gas-token-balances/gas-token-balances.ts
@@ -45,7 +45,7 @@ const gasTokenBalancesCanonicalAtom = Atom.family((key: GasTokenBalancesKey) =>
           isWalletNetwork(address.network)
             ? resourceInvalidationKeys.walletBalances(
                 new WalletScopeKey({
-                  additionalAddresses: address.additionalAddresses,
+                  additionalAddresses: address.additionalAddresses ?? null,
                   address: address.address,
                   network: address.network,
                 })
diff --git a/packages/widget/src/resources/resource-failure-presentation.ts b/packages/widget/src/resources/resource-failure-presentation.ts
index d633d8ac3..68fc59e23 100644
--- a/packages/widget/src/resources/resource-failure-presentation.ts
+++ b/packages/widget/src/resources/resource-failure-presentation.ts
@@ -97,10 +97,13 @@ export const makePresentableResource = <
       : Effect.void;
   });
 
-  const foreground = Atom.transform(local, (get) => {
+  const transformed = Atom.transform(local, (get) => {
     get.mount(reporterAtom);
     return get(local);
-  }) as unknown as Atom.WithoutSerializable<ResourceAtom>;
+  });
+  const foreground: Atom.WithoutSerializable<ResourceAtom> =
+    // biome-ignore lint/nursery/noUnsafeTypeAssertion: Atom.transform's return is a conditional type over the generic ResourceAtom that TypeScript cannot relate to Atom.WithoutSerializable<ResourceAtom>.
+    transformed as unknown as Atom.WithoutSerializable<ResourceAtom>;
 
   return Object.assign(foreground, { foreground, local });
 };
diff --git a/packages/widget/src/resources/reward-summaries/reward-summaries.ts b/packages/widget/src/resources/reward-summaries/reward-summaries.ts
index 00332532f..defdb7e21 100644
--- a/packages/widget/src/resources/reward-summaries/reward-summaries.ts
+++ b/packages/widget/src/resources/reward-summaries/reward-summaries.ts
@@ -41,11 +41,13 @@ const rewardsPolicy = withApiResourcePolicy({
   staleTime: Duration.seconds(30),
 });
 
+const noRewardSummaries: RewardSummaries = {};
+
 const rewardSummariesCanonicalAtom = Atom.family((key: RewardSummariesKey) =>
   appRuntime
     .atom(() =>
       key.yieldIds.length === 0
-        ? Effect.succeed({} as RewardSummaries)
+        ? Effect.succeed(noRewardSummaries)
         : LegacyResourceSource.use((source) =>
             source
               .getRewardsSummaries({
diff --git a/packages/widget/src/resources/validator-directory/validator-directory.ts b/packages/widget/src/resources/validator-directory/validator-directory.ts
index 90430ea71..5f3acaf75 100644
--- a/packages/widget/src/resources/validator-directory/validator-directory.ts
+++ b/packages/widget/src/resources/validator-directory/validator-directory.ts
@@ -90,6 +90,12 @@ const toRequest = ({
   ...(key.status ? { status: key.status } : {}),
 });
 
+const validatorBranches = [
+  "list",
+  "name",
+  "address",
+] as const satisfies ReadonlyArray<ValidatorBranch>;
+
 const validatorsCanonicalPullAtom = Atom.family((key: ValidatorsKey) =>
   appRuntime
     .pull(() => {
@@ -104,12 +110,11 @@ const validatorsCanonicalPullAtom = Atom.family((key: ValidatorsKey) =>
         } satisfies ValidatorPaginationState,
         (state) =>
           Effect.gen(function* () {
-            const activeBranches = (
-              Object.entries(state.cursor) as ReadonlyArray<
-                readonly [ValidatorBranch, number | null]
-              >
-            ).filter(
-              (entry): entry is [ValidatorBranch, number] => entry[1] !== null
+            const activeBranches = validatorBranches.flatMap(
+              (branch): Array<readonly [ValidatorBranch, number]> => {
+                const offset = state.cursor[branch];
+                return offset === null ? [] : [[branch, offset]];
+              }
             );
             const pages = yield* Effect.forEach(
               activeBranches,
diff --git a/packages/widget/src/resources/yield-positions/yield-positions.ts b/packages/widget/src/resources/yield-positions/yield-positions.ts
index 1a754affa..0d23ca507 100644
--- a/packages/widget/src/resources/yield-positions/yield-positions.ts
+++ b/packages/widget/src/resources/yield-positions/yield-positions.ts
@@ -5,6 +5,7 @@ import { appRuntime } from "../../app/runtime/app-runtime";
 import type { YieldBalancesCommand } from "../../domain/finance/models";
 import type { YieldId } from "../../domain/identity/identifiers";
 import {
+  type BalanceDataKey,
   getPositionBalances,
   getPositionData,
   type PositionBalancesByType,
@@ -121,7 +122,7 @@ export const positionDataAtom = Atom.family((key: PositionDataKey) =>
 );
 
 export class PositionBalancesKey extends Data.Class<{
-  readonly balanceId: string | null;
+  readonly balanceId: BalanceDataKey | null;
   readonly scope: WalletScopeKey;
   readonly yieldId: YieldId | null;
 }> {}
diff --git a/packages/widget/src/services/api/borrow-operations.ts b/packages/widget/src/services/api/borrow-operations.ts
index 34d24d065..50f9ae870 100644
--- a/packages/widget/src/services/api/borrow-operations.ts
+++ b/packages/widget/src/services/api/borrow-operations.ts
@@ -5,6 +5,10 @@ import {
   type SubmitTransactionCommand as BorrowSubmitTransactionCommand,
   SubmitTransactionResult as BorrowSubmitTransactionResult,
 } from "../../domain/borrow/execution/transaction";
+import type {
+  ActionId as BorrowActionId,
+  TransactionId as BorrowTransactionId,
+} from "../../domain/borrow/ids";
 import type * as BorrowApi from "../../generated/api/borrow-client";
 import type { RichErrorService } from "../errors/rich-error-service";
 import {
@@ -18,7 +22,7 @@ import type { ApiClients } from "./transport";
 
 type SubmitTransactionRequest = {
   readonly command: BorrowSubmitTransactionCommand;
-  readonly transactionId: string;
+  readonly transactionId: BorrowTransactionId;
 };
 
 export const makeBorrowOperations = (
@@ -45,7 +49,7 @@ export const makeBorrowOperations = (
   });
 
   const getAction = Effect.fn("BorrowOperations.getAction")(function* (
-    actionId: string
+    actionId: BorrowActionId
   ) {
     const client = yield* requireTransport();
     const response = yield* client.read
@@ -60,7 +64,7 @@ export const makeBorrowOperations = (
   });
 
   const stepAction = Effect.fn("BorrowOperations.stepAction")(function* (
-    actionId: string
+    actionId: BorrowActionId
   ) {
     const client = yield* requireTransport();
     return yield* client.write
diff --git a/packages/widget/src/services/api/legacy-resource-source.ts b/packages/widget/src/services/api/legacy-resource-source.ts
index 4d1eefe42..2b97dc698 100644
--- a/packages/widget/src/services/api/legacy-resource-source.ts
+++ b/packages/widget/src/services/api/legacy-resource-source.ts
@@ -70,13 +70,7 @@ export const makeLegacyResourceSource = (legacyApi: LegacyApi.LegacyApi) => {
   const getTokenOptions = Effect.fn("LegacyResourceSource.getTokenOptions")(
     function* (request: EarnTokenCatalogRequest) {
       return yield* legacyApi
-        .TokenControllerGetTokens({
-          params: {
-            enter: request.enter,
-            network: request.network,
-            yieldTypes: request.yieldTypes,
-          },
-        })
+        .TokenControllerGetTokens({ params: request })
         .pipe(
           decodeApiResponse(
             "legacy-token-options",
diff --git a/packages/widget/src/services/api/operations.ts b/packages/widget/src/services/api/operations.ts
index 160c9d89f..89f948100 100644
--- a/packages/widget/src/services/api/operations.ts
+++ b/packages/widget/src/services/api/operations.ts
@@ -15,6 +15,10 @@ import type {
   SubmitTransactionCommand as BorrowSubmitTransactionCommand,
   SubmitTransactionResult as BorrowSubmitTransactionResult,
 } from "../../domain/borrow/execution/transaction";
+import type {
+  ActionId as BorrowActionId,
+  TransactionId as BorrowTransactionId,
+} from "../../domain/borrow/ids";
 import type { EarnYieldBalancesResponse } from "../../domain/earn/models";
 import type { WalletAddress, YieldId } from "../../domain/identity/identifiers";
 import {
@@ -46,14 +50,14 @@ type BorrowOperationsService = {
     command: BorrowActionCommand
   ) => Effect.Effect<BorrowAction, BorrowOperationFailure>;
   readonly getAction: (
-    actionId: string
+    actionId: BorrowActionId
   ) => Effect.Effect<BorrowAction | null, BorrowOperationFailure>;
   readonly stepAction: (
-    actionId: string
+    actionId: BorrowActionId
   ) => Effect.Effect<BorrowAction, BorrowOperationFailure>;
   readonly submitTransaction: (request: {
     readonly command: BorrowSubmitTransactionCommand;
-    readonly transactionId: string;
+    readonly transactionId: BorrowTransactionId;
   }) => Effect.Effect<BorrowSubmitTransactionResult, BorrowOperationFailure>;
   /**
    * `submitTransaction` for work that outlives the user's Transaction Flow:
@@ -61,7 +65,7 @@ type BorrowOperationsService = {
    */
   readonly submitTransactionInBackground: (request: {
     readonly command: BorrowSubmitTransactionCommand;
-    readonly transactionId: string;
+    readonly transactionId: BorrowTransactionId;
   }) => Effect.Effect<BorrowSubmitTransactionResult, BorrowOperationFailure>;
 };
 
diff --git a/packages/widget/src/services/api/resource-sources.ts b/packages/widget/src/services/api/resource-sources.ts
index f43ad0de5..563d36434 100644
--- a/packages/widget/src/services/api/resource-sources.ts
+++ b/packages/widget/src/services/api/resource-sources.ts
@@ -5,7 +5,10 @@ import type { ActivityActionsQuery } from "../../domain/activity/query";
 import type { BorrowFeatureDisabled } from "../../domain/borrow/availability";
 import type { Integration } from "../../domain/borrow/catalog/integration";
 import type { BorrowMarketsScope } from "../../domain/borrow/catalog/market";
-import type { ActionId as BorrowActionId } from "../../domain/borrow/ids";
+import type {
+  ActionId as BorrowActionId,
+  IntegrationId as BorrowIntegrationId,
+} from "../../domain/borrow/ids";
 import type { BorrowNetwork } from "../../domain/borrow/network";
 import type {
   BorrowActionsPage,
@@ -83,11 +86,13 @@ export type EarnTokenCatalogRequest = {
 
 export type BorrowActionsRequest = {
   readonly address: WalletAddress;
-  readonly integrationId?: string;
+  readonly integrationId?: BorrowIntegrationId;
   readonly limit: number;
   readonly network: BorrowNetwork;
   readonly offset: number;
-  readonly statuses?: BorrowApi.ActionsControllerGetActionsV1Params["statuses"];
+  readonly statuses?: NonNullable<
+    BorrowApi.ActionsControllerGetActionsV1Params["statuses"]
+  >;
 };
 
 export class MissingBorrowApiConfig extends Data.TaggedError(
diff --git a/packages/widget/src/services/config/theme-decoder.ts b/packages/widget/src/services/config/theme-decoder.ts
index cfaddddd7..b05df4e93 100644
--- a/packages/widget/src/services/config/theme-decoder.ts
+++ b/packages/widget/src/services/config/theme-decoder.ts
@@ -5,70 +5,57 @@ import {
   themeContract,
 } from "../../public-api/theme";
 
+type ThemeSchema = Schema.Codec<unknown, unknown, never, never>;
+
 const makeThemeSchema = (
   contract: Readonly<Record<string, ThemeContractNode>>
-): Schema.Codec<unknown, unknown, never, never> => {
-  const fields = Object.fromEntries(
-    Object.entries(contract).map(([key, value]) => {
-      if (typeof value === "string") {
-        return [key, Schema.optionalKey(Schema.String)];
-      }
-
-      return [key, Schema.optionalKey(makeThemeSchema(value))];
-    })
+): ThemeSchema =>
+  Schema.Struct(
+    Object.fromEntries(
+      Object.entries(contract).map(([key, value]) => [
+        key,
+        Schema.optionalKey(
+          typeof value === "string" ? Schema.String : makeThemeSchema(value)
+        ),
+      ])
+    )
   );
 
-  return Schema.Struct(fields) as unknown as Schema.Codec<
-    unknown,
-    unknown,
-    never,
-    never
-  >;
-};
-
 const makeResilientThemeSchema = (
   contract: Readonly<Record<string, ThemeContractNode>>
-): Schema.Codec<unknown, unknown, never, never> => {
-  const fields = Object.fromEntries(
-    Object.entries(contract).map(([key, value]) => {
-      const target =
-        typeof value === "string"
-          ? Schema.String
-          : makeResilientThemeSchema(value);
-      const field = Schema.optionalKey(Schema.Unknown).pipe(
-        Schema.decodeTo(
-          Schema.optionalKey(target),
-          SchemaTransformation.transformOptional({
-            decode: Option.flatMap((input) =>
-              Schema.decodeUnknownOption(target)(input)
-            ),
-            encode: (input) => input,
-          })
-        )
-      );
+): ThemeSchema =>
+  Schema.Struct(
+    Object.fromEntries(
+      Object.entries(contract).map(([key, value]) => {
+        const target =
+          typeof value === "string"
+            ? Schema.String
+            : makeResilientThemeSchema(value);
+        const field = Schema.optionalKey(Schema.Unknown).pipe(
+          Schema.decodeTo(
+            Schema.optionalKey(target),
+            SchemaTransformation.transformOptional({
+              decode: Option.flatMap((input) =>
+                Schema.decodeUnknownOption(target)(input)
+              ),
+              encode: (input) => input,
+            })
+          )
+        );
 
-      return [key, field];
-    })
+        return [key, field];
+      })
+    )
   );
 
-  return Schema.Struct(fields) as unknown as Schema.Codec<
-    unknown,
-    unknown,
-    never,
-    never
-  >;
-};
+const Theme = makeThemeSchema(themeContract);
 
-const Theme = makeThemeSchema(themeContract) as unknown as Schema.Codec<
-  SKTheme,
-  unknown,
-  never,
-  never
->;
+const ResilientTheme = makeResilientThemeSchema(themeContract);
 
-const ResilientTheme = makeResilientThemeSchema(
-  themeContract
-) as unknown as Schema.Codec<SKTheme, unknown, never, never>;
+// The theme schema is built from the contract `SKTheme` is derived from, so a
+// value it accepts is an `SKTheme`.
+const isThemeShape = Schema.is(Theme);
+const isTheme = (value: unknown): value is SKTheme => isThemeShape(value);
 
 export type ThemeDecodeWarning = "invalid-theme-root" | "invalid-theme-token";
 
@@ -78,12 +65,16 @@ type ThemeDecodeResult = Readonly<{
 }>;
 
 export const decodeTheme = (input: unknown): ThemeDecodeResult => {
-  const strict = Schema.decodeUnknownOption(Theme)(input);
+  const strict = Schema.decodeUnknownOption(Theme)(input).pipe(
+    Option.filter(isTheme)
+  );
   if (Option.isSome(strict)) {
     return { theme: strict.value, warnings: [] };
   }
 
-  const resilient = Schema.decodeUnknownOption(ResilientTheme)(input);
+  const resilient = Schema.decodeUnknownOption(ResilientTheme)(input).pipe(
+    Option.filter(isTheme)
+  );
   if (Option.isSome(resilient)) {
     return {
       theme: resilient.value,
diff --git a/packages/widget/src/services/config/widget-config-boundary.ts b/packages/widget/src/services/config/widget-config-boundary.ts
index 5260f66cf..af38d5175 100644
--- a/packages/widget/src/services/config/widget-config-boundary.ts
+++ b/packages/widget/src/services/config/widget-config-boundary.ts
@@ -1,5 +1,17 @@
-import { Data, Predicate, Result, Schema, SchemaIssue } from "effect";
+import {
+  Data,
+  Option,
+  Predicate,
+  Result,
+  Schema,
+  SchemaGetter,
+  SchemaIssue,
+} from "effect";
 import { YieldCategory } from "../../domain/earn/contract";
+import type { PreferredTokenYieldsPerNetwork } from "../../domain/earn/yield";
+import type { YieldProviderOrder } from "../../domain/earn/yield-provider-order";
+import { ProviderId, YieldId } from "../../domain/identity/identifiers";
+import { Network } from "../../domain/network/network";
 import { HostTokenKey } from "../../domain/token/token";
 import {
   EvmChainIds,
@@ -21,8 +33,17 @@ import type { ExternalProviderSnapshot } from "./external-provider-snapshot";
 import { decodeTheme, type ThemeDecodeWarning } from "./theme-decoder";
 import type { WidgetLayout } from "./widget-config-model";
 
-const optional = <S extends Schema.Constraint>(schema: S) =>
-  Schema.optionalKey(Schema.UndefinedOr(schema));
+// Hosts may pass `undefined` for any optional setting; decoding normalizes it
+// to an absent key so consumers see a single "not set" representation.
+const optional = <S extends Schema.Top>(schema: S) =>
+  Schema.optionalKey(Schema.UndefinedOr(schema)).pipe(
+    Schema.decodeTo(Schema.optionalKey(Schema.toType(schema)), {
+      decode: SchemaGetter.transformOptional(
+        Option.filter(Predicate.isNotUndefined)
+      ),
+      encode: SchemaGetter.passthroughSubtype(),
+    })
+  );
 
 const exhaustiveLiterals =
   <All extends number | string>() =>
@@ -115,8 +136,8 @@ const customTranslationFields = {
 const CustomTranslations = Schema.Struct(customTranslationFields);
 
 type ValidatorPolicySettings = NonNullable<
-  SettingsProps["validatorsConfig"]
->[string];
+  NonNullable<SettingsProps["validatorsConfig"]>["*"]
+>;
 
 const validatorPolicyFields = {
   allowed: optional(Schema.Array(Schema.String)),
@@ -129,10 +150,10 @@ const validatorPolicyFields = {
 const ValidatorPolicy = Schema.Struct(validatorPolicyFields);
 
 const IconMapping = Schema.Record(Schema.String, Schema.String);
-const PreferredTokenYieldsPerNetwork = Schema.Record(
-  Schema.String,
-  Schema.Record(HostTokenKey, Schema.String)
-);
+// Fields recovered entry by entry: only their outer shape is decoded with the
+// Host Configuration, so an invalid entry drops only itself.
+const LooseRecord = Schema.Record(Schema.String, Schema.Unknown);
+const PreferredYield = Schema.Union([Schema.Literal("*"), YieldId]);
 
 type ExternalProviderSettings = NonNullable<SettingsProps["externalProviders"]>;
 type ExternalProviderValueKey = Exclude<
@@ -170,15 +191,6 @@ const walletPolicyFields = {
 
 const WalletPolicy = Schema.Struct(walletPolicyFields);
 
-const yieldProviderOrderFields = {
-  [YieldCategory.RWA]: optional(Schema.Array(Schema.String)),
-  [YieldCategory.DeFi]: optional(Schema.Array(Schema.String)),
-  [YieldCategory.Stake]: optional(Schema.Array(Schema.String)),
-} satisfies Record<
-  keyof NonNullable<SettingsProps["yieldProviderOrder"]>,
-  Schema.Constraint
->;
-
 type OpaqueHostConfigurationKey =
   | "mapWalletFn"
   | "onMountAnimationComplete"
@@ -195,7 +207,7 @@ const hostConfigurationValueFields = {
   borrowApiUrl: optional(Schema.String),
   borrowEnabled: optional(Schema.Boolean),
   borrowMarketsScope: optional(Schema.Literals(borrowMarketsScopeValues)),
-  chainIconMapping: optional(IconMapping),
+  chainIconMapping: optional(LooseRecord),
   customTranslations: optional(CustomTranslations),
   dashboardVariant: optional(Schema.Boolean),
   yieldCategoryOrder: optional(
@@ -214,15 +226,15 @@ const hostConfigurationValueFields = {
   institutionalWallets: optional(Schema.Boolean),
   isSafe: optional(Schema.Boolean),
   language: optional(Schema.Literals(hostLanguageValues)),
-  preferredTokenYieldsPerNetwork: optional(PreferredTokenYieldsPerNetwork),
+  preferredTokenYieldsPerNetwork: optional(LooseRecord),
   theme: optional(Schema.Unknown),
   tokenIconMapping: optional(IconMapping),
   tonConnectManifestUrl: optional(Schema.String),
-  validatorsConfig: optional(Schema.Record(Schema.String, ValidatorPolicy)),
+  validatorsConfig: optional(LooseRecord),
   variant: optional(Schema.Literals(hostVariantValues)),
   walletPolicy: optional(WalletPolicy),
   yieldGrouping: optional(Schema.Literals(hostYieldGroupingValues)),
-  yieldProviderOrder: optional(Schema.Struct(yieldProviderOrderFields)),
+  yieldProviderOrder: optional(LooseRecord),
   yieldsApiUrl: optional(Schema.String),
 } satisfies Record<HostConfigurationValueKey, Schema.Constraint>;
 
@@ -245,11 +257,17 @@ type TokenIconMapper = Extract<
 /**
  * Host settings fixed at mount (ADR 0004). A decode given them uses them in
  * place of the host's values, so cross-field rules hold for the published value.
+ * Every key is present: an unset mount value (`undefined`) still overrides the
+ * host's later value.
  */
-export type MountFixedHostSettings = Pick<
-  SKHostConfiguration,
-  "apiKey" | "baseUrl" | "borrowApiUrl" | "borrowEnabled" | "yieldsApiUrl"
->;
+export type MountFixedHostSettings = {
+  readonly [Key in
+    | "apiKey"
+    | "baseUrl"
+    | "borrowApiUrl"
+    | "borrowEnabled"
+    | "yieldsApiUrl"]: SKHostConfiguration[Key];
+};
 
 // Borrow follows `borrowEnabled`, which may be fixed at mount while the
 // provider comes from a later update, so its settings are not narrowed here.
@@ -269,13 +287,20 @@ type HostCapabilities = Readonly<{
   tracking: SettingsProps["tracking"];
 }>;
 
+/** Host Configuration fields keyed by network. */
+type NetworkKeyedField =
+  | "chainIconMapping"
+  | "preferredTokenYieldsPerNetwork"
+  | "validatorsConfig";
+
 export type DecodedHostConfiguration = Omit<
   HostConfigurationValueData,
   | "chainModal"
   | "externalProviders"
   | "tokenIconMapping"
-  | "chainIconMapping"
+  | NetworkKeyedField
   | "theme"
+  | "yieldProviderOrder"
 > &
   Readonly<{
     chainIconMapping: SettingsProps["chainIconMapping"];
@@ -284,9 +309,14 @@ export type DecodedHostConfiguration = Omit<
     mapWalletFn: SettingsProps["mapWalletFn"];
     onMountAnimationComplete: SettingsProps["onMountAnimationComplete"];
     portalContainer: SettingsProps["portalContainer"];
+    preferredTokenYieldsPerNetwork: PreferredTokenYieldsPerNetwork | undefined;
     theme: SKTheme | undefined;
     tokenIconMapping: SettingsProps["tokenIconMapping"];
     tracking: SettingsProps["tracking"];
+    validatorsConfig:
+      | Partial<Record<Network | "*", typeof ValidatorPolicy.Type>>
+      | undefined;
+    yieldProviderOrder: YieldProviderOrder | undefined;
   }>;
 
 export type InvalidHostConfigurationIssue =
@@ -304,10 +334,23 @@ export class InvalidHostConfiguration extends Data.TaggedError(
   readonly issues: ReadonlyArray<InvalidHostConfigurationIssue>;
 }> {}
 
-export type HostConfigurationWarning = Readonly<{
-  readonly _tag: "Theme";
-  readonly issue: ThemeDecodeWarning;
-}>;
+export type HostConfigurationWarning =
+  | Readonly<{
+      readonly _tag: "Theme";
+      readonly issue: ThemeDecodeWarning;
+    }>
+  /** An entry under a key that names no network; only that entry is dropped. */
+  | Readonly<{
+      readonly _tag: "UnknownNetworkKey";
+      readonly field: NetworkKeyedField;
+      readonly key: string;
+    }>
+  /** A value that does not decode; only its entry is dropped. */
+  | Readonly<{
+      readonly _tag: "InvalidEntry";
+      readonly field: NetworkKeyedField | "yieldProviderOrder";
+      readonly path: string;
+    }>;
 
 export type HostConfigurationDecodeSuccess = Readonly<{
   configuration: DecodedHostConfiguration;
@@ -322,6 +365,108 @@ const issuePaths = (error: Schema.SchemaError): ReadonlyArray<string> => [
   ),
 ];
 
+const isNetwork = Schema.is(Network);
+
+const isNetworkOrAnyKey = (key: string): key is Network | "*" =>
+  key === "*" || isNetwork(key);
+
+type NetworkKeyedEntries<Key extends string, Value> = Readonly<{
+  entries: Partial<Record<Key, Value>> | undefined;
+  warnings: ReadonlyArray<HostConfigurationWarning>;
+}>;
+
+/**
+ * Keeps the entries under a network key whose value decodes. An unknown key
+ * is dropped before its value is read; each dropped entry is a warning.
+ * `decodeValue` may add warnings for entries nested in a value it keeps.
+ */
+const keepNetworkEntries = <Key extends string, Value>(
+  field: NetworkKeyedField,
+  record: Readonly<Record<string, unknown>> | undefined,
+  isKey: (key: string) => key is Key,
+  decodeValue: (
+    value: unknown,
+    key: Key,
+    warnings: Array<HostConfigurationWarning>
+  ) => Option.Option<Value>
+): NetworkKeyedEntries<Key, Value> => {
+  if (record === undefined) return { entries: undefined, warnings: [] };
+  const entries: Partial<Record<Key, Value>> = {};
+  const warnings: Array<HostConfigurationWarning> = [];
+  for (const [key, raw] of Object.entries(record)) {
+    if (!isKey(key)) {
+      warnings.push({ _tag: "UnknownNetworkKey", field, key });
+      continue;
+    }
+    const value = decodeValue(raw, key, warnings);
+    if (Option.isSome(value)) entries[key] = value.value;
+    else warnings.push({ _tag: "InvalidEntry", field, path: key });
+  }
+  return { entries, warnings };
+};
+
+const decodeIconUrl = Schema.decodeUnknownOption(Schema.String);
+const decodeValidatorPolicy = Schema.decodeUnknownOption(ValidatorPolicy);
+const decodeHostTokenKey = Schema.decodeUnknownOption(HostTokenKey);
+const decodePreferredYield = Schema.decodeUnknownOption(PreferredYield);
+const decodeProviderId = Schema.decodeUnknownOption(ProviderId);
+
+/** One network's preferred token yields that decode; each other is a warning. */
+const decodePreferredYields = (
+  tokens: unknown,
+  network: Network,
+  warnings: Array<HostConfigurationWarning>
+): Option.Option<Partial<Record<HostTokenKey, YieldId | "*">>> => {
+  if (!Predicate.isObject(tokens)) return Option.none();
+  const kept: Partial<Record<HostTokenKey, YieldId | "*">> = {};
+  for (const [token, yieldId] of Object.entries(tokens)) {
+    const key = decodeHostTokenKey(token);
+    const value = decodePreferredYield(yieldId);
+    if (Option.isSome(key) && Option.isSome(value)) {
+      kept[key.value] = value.value;
+    } else {
+      warnings.push({
+        _tag: "InvalidEntry",
+        field: "preferredTokenYieldsPerNetwork",
+        path: `${network}.${token}`,
+      });
+    }
+  }
+  return Option.some(kept);
+};
+
+/** Keeps each category's provider IDs that decode; each other is a warning. */
+const keepProviderIds = (
+  order: HostConfigurationValueData["yieldProviderOrder"]
+) => {
+  if (order === undefined) return { order: undefined, warnings: [] };
+  const warnings: Array<HostConfigurationWarning> = [];
+  const kept: Partial<Record<YieldCategory, ReadonlyArray<ProviderId>>> = {};
+  for (const category of yieldCategoryValues) {
+    const providerIds = order[category];
+    if (providerIds === undefined) continue;
+    if (!Array.isArray(providerIds)) {
+      warnings.push({
+        _tag: "InvalidEntry",
+        field: "yieldProviderOrder",
+        path: category,
+      });
+      continue;
+    }
+    kept[category] = providerIds.flatMap((providerId: unknown, index) => {
+      const decoded = decodeProviderId(providerId);
+      if (Option.isSome(decoded)) return [decoded.value];
+      warnings.push({
+        _tag: "InvalidEntry",
+        field: "yieldProviderOrder",
+        path: `${category}.${index}`,
+      });
+      return [];
+    });
+  }
+  return { order: kept, warnings };
+};
+
 const makeCapabilities = (
   hostConfiguration: SKHostConfiguration,
   borrowEnabled: boolean | undefined
@@ -412,11 +557,13 @@ const combineExternalProvider = (
 
   const common = {
     currentAddress: values.currentAddress,
-    currentChain: values.currentChain,
-    initToken: values.initToken,
-    supportedChainIds: values.supportedChainIds
-      ? [...values.supportedChainIds]
-      : undefined,
+    ...(values.currentChain === undefined
+      ? {}
+      : { currentChain: values.currentChain }),
+    ...(values.initToken === undefined ? {} : { initToken: values.initToken }),
+    ...(values.supportedChainIds
+      ? { supportedChainIds: [...values.supportedChainIds] }
+      : {}),
     type: values.type,
   };
 
@@ -511,20 +658,41 @@ export const decodeHostConfiguration = (
     decoded.success.theme === undefined
       ? { theme: undefined, warnings: [] }
       : decodeTheme(decoded.success.theme);
+  const chainIcons = keepNetworkEntries(
+    "chainIconMapping",
+    decoded.success.chainIconMapping,
+    isNetwork,
+    (value) => decodeIconUrl(value)
+  );
+  const preferredTokenYields = keepNetworkEntries(
+    "preferredTokenYieldsPerNetwork",
+    decoded.success.preferredTokenYieldsPerNetwork,
+    isNetwork,
+    decodePreferredYields
+  );
+  const providerOrder = keepProviderIds(decoded.success.yieldProviderOrder);
+  const validators = keepNetworkEntries(
+    "validatorsConfig",
+    decoded.success.validatorsConfig,
+    isNetworkOrAnyKey,
+    (value) => decodeValidatorPolicy(value)
+  );
 
   const configuration: DecodedHostConfiguration = {
     ...decoded.success,
-    chainIconMapping:
-      capabilities.chainIconMapper ?? decoded.success.chainIconMapping,
+    chainIconMapping: capabilities.chainIconMapper ?? chainIcons.entries,
     chainModal: capabilities.chainModal,
     externalProviders: externalProviders.success,
     mapWalletFn: capabilities.mapWalletFn,
     onMountAnimationComplete: capabilities.onMountAnimationComplete,
     portalContainer: capabilities.portalContainer,
+    preferredTokenYieldsPerNetwork: preferredTokenYields.entries,
     theme: theme.theme,
     tokenIconMapping:
       capabilities.tokenIconMapper ?? decoded.success.tokenIconMapping,
     tracking: capabilities.tracking,
+    validatorsConfig: validators.entries,
+    yieldProviderOrder: providerOrder.order,
   };
   const issues = semanticIssues(configuration);
   if (issues.length > 0) {
@@ -540,7 +708,15 @@ export const decodeHostConfiguration = (
 
   return Result.succeed({
     configuration,
-    warnings: theme.warnings.map((issue) => ({ _tag: "Theme", issue })),
+    warnings: [
+      ...theme.warnings.map(
+        (issue): HostConfigurationWarning => ({ _tag: "Theme", issue })
+      ),
+      ...chainIcons.warnings,
+      ...preferredTokenYields.warnings,
+      ...validators.warnings,
+      ...providerOrder.warnings,
+    ],
   });
 };
 
diff --git a/packages/widget/src/services/config/widget-config.ts b/packages/widget/src/services/config/widget-config.ts
index 9ff6f2724..a22c58912 100644
--- a/packages/widget/src/services/config/widget-config.ts
+++ b/packages/widget/src/services/config/widget-config.ts
@@ -7,6 +7,7 @@ import {
   Result,
   Semaphore,
   Stream,
+  Struct,
   SubscriptionRef,
 } from "effect";
 import type { YieldCategory } from "../../domain/earn/contract";
@@ -15,7 +16,7 @@ import {
   type ValidatorsConfig,
   yieldCategories,
 } from "../../domain/earn/yield";
-import type { Network } from "../../domain/network/network";
+import { Network } from "../../domain/network/network";
 import type { SKHostConfiguration } from "../../public-api/react-types";
 import { config } from "../../shared/config/widget-defaults";
 import type { ExternalProviderSnapshot } from "./external-provider-snapshot";
@@ -197,45 +198,61 @@ const normalizeWidgetConfig = (
     hostConfiguration.yieldGrouping ??
     (layout === "Dashboard" ? "category" : "flat");
 
-  const yieldCategoryOrder = [
+  const yieldCategoryOrder: ReadonlyArray<YieldCategory> = [
     ...new Set([
       ...(hostConfiguration.yieldCategoryOrder ?? []),
       ...yieldCategories,
     ]),
-  ] as YieldCategory[];
+  ];
+  const validatorPolicies = hostConfiguration.validatorsConfig ?? {};
   const validatorsConfig: ValidatorsConfig = new Map(
-    Object.entries(hostConfiguration.validatorsConfig ?? {}).map(
-      ([network, validators]) =>
-        [
-          network as Network | "*",
-          {
-            allowed: validators.allowed
-              ? new Set(validatorAddressIdentities(validators.allowed))
-              : undefined,
-            blocked: validators.blocked
-              ? new Set(validatorAddressIdentities(validators.blocked))
-              : undefined,
-            mergePreferredWithDefault:
-              validators.mergePreferredWithDefault ?? true,
-            preferred: validators.preferred
-              ? new Set(validatorAddressIdentities(validators.preferred))
-              : undefined,
-            preferredOnly: validators.preferredOnly ?? false,
-          },
-        ] as const
-    )
+    [...Network.literals, "*" as const].flatMap((network) => {
+      const validators = validatorPolicies[network];
+      if (validators === undefined) return [];
+      const policy = {
+        ...(validators.allowed
+          ? { allowed: new Set(validatorAddressIdentities(validators.allowed)) }
+          : {}),
+        ...(validators.blocked
+          ? { blocked: new Set(validatorAddressIdentities(validators.blocked)) }
+          : {}),
+        mergePreferredWithDefault: validators.mergePreferredWithDefault ?? true,
+        ...(validators.preferred
+          ? {
+              preferred: new Set(
+                validatorAddressIdentities(validators.preferred)
+              ),
+            }
+          : {}),
+        preferredOnly: validators.preferredOnly ?? false,
+      };
+      return [[network, policy] as const];
+    })
   );
   const externalProviders = hostConfiguration.externalProviders
     ? {
-        ...hostConfiguration.externalProviders,
-        supportedChainIds: hostConfiguration.externalProviders.supportedChainIds
-          ? [
-              ...new Set(hostConfiguration.externalProviders.supportedChainIds),
-            ].sort((first, second) => first - second)
-          : undefined,
+        externalProviders: {
+          ...hostConfiguration.externalProviders,
+          ...(hostConfiguration.externalProviders.supportedChainIds
+            ? {
+                supportedChainIds: [
+                  ...new Set(
+                    hostConfiguration.externalProviders.supportedChainIds
+                  ),
+                ].sort((first, second) => first - second),
+              }
+            : {}),
+        },
       }
-    : undefined;
+    : {};
   return {
+    ...Struct.pick(hostConfiguration, [
+      "customTranslations",
+      "initialChain",
+      "language",
+      "tonConnectManifestUrl",
+      "walletPolicy",
+    ]),
     apiKey: hostConfiguration.apiKey,
     baseUrl: hostConfiguration.baseUrl ?? environment.apiUrl,
     borrowApiUrl: (hostConfiguration.borrowApiUrl ?? environment.borrowApiUrl)
@@ -244,11 +261,10 @@ const normalizeWidgetConfig = (
     borrowEnabled,
     borrowMarketsScope: hostConfiguration.borrowMarketsScope ?? "all",
     chainIconMapping: hostConfiguration.chainIconMapping,
-    chainModal:
-      hostConfiguration.variant === "zerion"
-        ? hostConfiguration.chainModal
-        : undefined,
-    customTranslations: hostConfiguration.customTranslations,
+    ...(hostConfiguration.variant === "zerion" &&
+    hostConfiguration.chainModal !== undefined
+      ? { chainModal: hostConfiguration.chainModal }
+      : {}),
     earnCategoryGrouping:
       layout === "Dashboard" && yieldGrouping === "category",
     yieldCategoryOrder,
@@ -259,18 +275,16 @@ const normalizeWidgetConfig = (
       hostConfiguration.disableInjectedProviderDiscovery ?? false,
     disableResizingInputFontSize:
       hostConfiguration.disableResizingInputFontSize ?? false,
-    externalProviders,
+    ...externalProviders,
     hideAccountAndChainSelector:
       hostConfiguration.hideAccountAndChainSelector ?? false,
     hideChainSelector: hostConfiguration.hideChainSelector ?? false,
     hideGasFee: hostConfiguration.hideGasFee ?? false,
     hideNetworkLogo: hostConfiguration.hideNetworkLogo ?? false,
     hostProfile: resolveHostProfile(variant, layout),
-    initialChain: hostConfiguration.initialChain,
     institutionalWallets: hostConfiguration.institutionalWallets ?? false,
     isLedgerLive: environment.isLedgerLive,
     isSafe: hostConfiguration.isSafe ?? false,
-    language: hostConfiguration.language,
     layout,
     mapWalletFn: hostConfiguration.mapWalletFn,
     mountAnimationStartsFinished:
@@ -279,15 +293,17 @@ const normalizeWidgetConfig = (
         environment.mountAnimationStartsFinishedByDefault),
     onMountAnimationComplete: hostConfiguration.onMountAnimationComplete,
     portalContainer: hostConfiguration.portalContainer,
-    preferredTokenYieldsPerNetwork:
-      hostConfiguration.preferredTokenYieldsPerNetwork,
+    ...(hostConfiguration.preferredTokenYieldsPerNetwork === undefined
+      ? {}
+      : {
+          preferredTokenYieldsPerNetwork:
+            hostConfiguration.preferredTokenYieldsPerNetwork,
+        }),
     theme: hostConfiguration.theme,
     tokenIconMapping: hostConfiguration.tokenIconMapping,
-    tonConnectManifestUrl: hostConfiguration.tonConnectManifestUrl,
     tracking: hostConfiguration.tracking,
     validatorsConfig,
     variant,
-    walletPolicy: hostConfiguration.walletPolicy,
     yieldGrouping,
     yieldProviderOrder: hostConfiguration.yieldProviderOrder ?? {},
     yieldsApiUrl: hostConfiguration.yieldsApiUrl ?? environment.yieldsApiUrl,
diff --git a/packages/widget/src/services/evm-rpc/evm-rpc.ts b/packages/widget/src/services/evm-rpc/evm-rpc.ts
index 5e7c2ccab..d7f70ca00 100644
--- a/packages/widget/src/services/evm-rpc/evm-rpc.ts
+++ b/packages/widget/src/services/evm-rpc/evm-rpc.ts
@@ -18,6 +18,7 @@ import {
   waitForTransactionReceipt,
 } from "viem/actions";
 import type { Erc20Approval } from "../../domain/action/direct-transaction";
+import type { EvmChainIds } from "../../domain/wallet/chain-ids";
 import { WalletService } from "../wallet/wallet-service";
 
 export class EvmRpcError extends Data.TaggedError("EvmRpcError")<{
@@ -38,7 +39,7 @@ type EvmTransactionOutcome = "Confirmed" | "Dropped" | "Reverted";
 type EvmRpcApi = Readonly<{
   /** The unsigned EIP-1559 transaction a wallet signs, gas and fees estimated. */
   readonly prepare: (input: {
-    readonly chainId: number;
+    readonly chainId: EvmChainIds;
     readonly data: Hex;
     readonly from: Hex;
     readonly to: Hex;
@@ -48,21 +49,21 @@ type EvmRpcApi = Readonly<{
    * Only an error the node answered while not holding it is a rejection.
    */
   readonly broadcast: (input: {
-    readonly chainId: number;
+    readonly chainId: EvmChainIds;
     readonly hash: Hex;
     readonly signedTx: Hex;
   }) => Effect.Effect<void, EvmBroadcastRejectedError | EvmRpcError>;
   readonly awaitOutcome: (input: {
-    readonly chainId: number;
+    readonly chainId: EvmChainIds;
     readonly hash: Hex;
   }) => Effect.Effect<EvmTransactionOutcome, EvmRpcError>;
   readonly explorerUrl: (input: {
-    readonly chainId: number;
+    readonly chainId: EvmChainIds;
     readonly hash: Hex;
   }) => string | null;
   /** How much of `token` `owner` currently lets `spender` move. */
   readonly readAllowance: (
-    input: Omit<Erc20Approval, "amount"> & { readonly chainId: number }
+    input: Omit<Erc20Approval, "amount"> & { readonly chainId: EvmChainIds }
   ) => Effect.Effect<bigint, EvmRpcError>;
 }>;
 
@@ -83,6 +84,7 @@ export class EvmRpc extends Context.Service<EvmRpc, EvmRpcApi>()(
     EvmRpc,
     Effect.gen(function* () {
       const { wagmiConfig } = yield* WalletService;
+      // Wagmi types one client per configured chain; a number reads the common client.
       const clientFor = (chainId: number) =>
         Effect.try({
           try: () => wagmiConfig.getClient({ chainId }),
diff --git a/packages/widget/src/services/navigation/widget-routes.ts b/packages/widget/src/services/navigation/widget-routes.ts
index f1a641ad4..cbcb8068b 100644
--- a/packages/widget/src/services/navigation/widget-routes.ts
+++ b/packages/widget/src/services/navigation/widget-routes.ts
@@ -1,7 +1,9 @@
-import { Option, Schema } from "effect";
+import { Option, Predicate, Schema } from "effect";
 import { YieldPendingActionType } from "../../domain/action/pending-action";
 import { ActionId as BorrowActionId, MarketId } from "../../domain/borrow/ids";
+import { BorrowPositionActionKey } from "../../domain/borrow/positions/position-action-key";
 import { ActionId, YieldId } from "../../domain/identity/identifiers";
+import { BalanceDataKey } from "../../domain/portfolio/positions";
 import type { WidgetLayout } from "../config/widget-config-model";
 
 /**
@@ -10,19 +12,21 @@ import type { WidgetLayout } from "../config/widget-config-model";
  * navigation, and pathname parsing elsewhere use these definitions.
  */
 
-declare const widgetPathBrand: unique symbol;
+const WidgetPathSchema = Schema.String.pipe(Schema.brand("WidgetPath"));
 
 /** An absolute Widget path, built only by a registry route. */
-export type WidgetPath = string & { readonly [widgetPathBrand]: true };
-
-declare const widgetLocationBrand: unique symbol;
+export type WidgetPath = typeof WidgetPathSchema.Type;
 
 /** A path together with the navigation state its route carries. */
-type WidgetLocation<State = unknown> = Readonly<{
-  readonly path: WidgetPath;
-  readonly state: State;
-  readonly [widgetLocationBrand]: true;
-}>;
+class WidgetLocation<State = unknown> {
+  /** Only a registry route builds a location; no runtime field. */
+  declare private readonly builtByRoute: never;
+
+  constructor(
+    readonly path: WidgetPath,
+    readonly state: State
+  ) {}
+}
 
 /** Where a navigation goes: a path, or a path with its route's state. */
 export type WidgetNavigationTarget = WidgetPath | WidgetLocation;
@@ -51,16 +55,8 @@ type ParamNames<Pattern extends string> =
       ? Name
       : never;
 
-type ParamSchemas<Pattern extends string> = {
-  readonly [Name in ParamNames<Pattern>]?: ParamSchema;
-};
-
-type RouteParams<Pattern extends string, Schemas> = {
-  readonly [Name in ParamNames<Pattern>]: Name extends keyof Schemas
-    ? Schemas[Name] extends { readonly Type: infer Value }
-      ? Value
-      : string
-    : string;
+type ParamFields<Pattern extends string> = {
+  readonly [Name in ParamNames<Pattern>]: ParamSchema;
 };
 
 /**
@@ -103,12 +99,11 @@ const decodeSegment = (segment: string): Option.Option<string> => {
   }
 };
 
+/** The params object among a build's arguments; a Layout is a string. */
 const findParams = (
   args: ReadonlyArray<unknown>
-): Readonly<Record<string, string>> => {
-  const params = args.find((arg) => typeof arg === "object" && arg !== null);
-  return (params ?? {}) as Readonly<Record<string, string>>;
-};
+): Readonly<Record<PropertyKey, unknown>> =>
+  args.find(Predicate.isObject) ?? {};
 
 /** True when `pathname` is exactly `path`, ignoring a trailing slash. */
 export const isWidgetPath = (pathname: string, path: WidgetPath): boolean =>
@@ -129,8 +124,11 @@ class WidgetRoute<
     readonly pattern: Pattern,
     /** The Layouts whose route trees mount this route. */
     readonly layouts: ReadonlyArray<Layout>,
-    /** Decoders of the params with a domain schema. */
-    readonly paramSchemas: Readonly<Record<string, ParamSchema>>
+    /** Decodes the path segments' raw values into the route's params. */
+    readonly paramsSchema: Schema.Codec<
+      Params,
+      Readonly<Record<string, string>>
+    >
   ) {
     this.descendants = `${pattern}/*`;
     this.#segments = parseSegments(pattern);
@@ -140,13 +138,25 @@ class WidgetRoute<
   }
 
   build(...args: WidgetRouteBuildArgs<Layout, Params>): WidgetPath {
+    return this.#path(args);
+  }
+
+  /**
+   * This route's path for `params` in whichever Layout mounts it: it names a
+   * mount, not a navigation target, so it needs no Layout.
+   */
+  mountPath(params: Params): WidgetPath {
+    return this.#path([params]);
+  }
+
+  #path(args: ReadonlyArray<unknown>): WidgetPath {
     const params = findParams(args);
-    const segments = this.#segments.map((segment) =>
-      segment._tag === "Param"
-        ? encodeURIComponent(params[segment.name] ?? "")
-        : segment.value
-    );
-    return `/${segments.join("/")}` as WidgetPath;
+    const segments = this.#segments.map((segment) => {
+      if (segment._tag === "Static") return segment.value;
+      const value = params[segment.name];
+      return encodeURIComponent(typeof value === "string" ? value : "");
+    });
+    return WidgetPathSchema.make(`/${segments.join("/")}`);
   }
 
   /** Binds the navigation state this route's owner carries with its path. */
@@ -156,7 +166,7 @@ class WidgetRoute<
         state: State,
         ...args: WidgetRouteBuildArgs<Layout, Params>
       ): WidgetLocation<State> =>
-        ({ path: this.build(...args), state }) as WidgetLocation<State>,
+        new WidgetLocation(this.build(...args), state),
       state: Schema.decodeUnknownOption(schema),
     };
   }
@@ -188,16 +198,11 @@ class WidgetRoute<
         if (value.toLowerCase() !== segment.value) return Option.none();
         continue;
       }
-      const decoded = decodeSegment(value).pipe(
-        Option.flatMap((raw) => {
-          const schema = this.paramSchemas[segment.name];
-          return schema ? Schema.decodeOption(schema)(raw) : Option.some(raw);
-        })
-      );
+      const decoded = decodeSegment(value);
       if (Option.isNone(decoded)) return Option.none();
       params[segment.name] = decoded.value;
     }
-    return Option.some(params as Params);
+    return Schema.decodeOption(this.paramsSchema)(params);
   }
 }
 
@@ -218,9 +223,9 @@ export type WidgetFlowDestination<State> = WidgetFlowPaths &
 
 /** The route a flow mounts under, in whichever Layouts mount it. */
 type WidgetFlowBase<Params> = Readonly<{
-  readonly build: (...args: never) => WidgetPath;
+  readonly mountPath: (params: Params) => WidgetPath;
   readonly match: (pathname: string) => Option.Option<Params>;
-  readonly paramSchemas: Readonly<Record<string, ParamSchema>>;
+  readonly paramsSchema: Schema.Codec<Params, Readonly<Record<string, string>>>;
   readonly pattern: string;
 }>;
 
@@ -246,15 +251,11 @@ class WidgetFlowRoutes<Params, Layout extends WidgetLayout> {
    * group's pages: its Review, Steps, and Complete share it.
    */
   mountKey(pathname: string): Option.Option<WidgetPath> {
-    // The key names a mount, not a navigation target, so it needs no Layout.
-    const buildBase = this.base.build.bind(this.base) as unknown as (
-      params: Params
-    ) => WidgetPath;
     return Option.firstSomeOf([
       this.review.match(pathname),
       this.steps.match(pathname),
       this.complete.match(pathname),
-    ]).pipe(Option.map(buildBase));
+    ]).pipe(Option.map((params) => this.base.mountPath(params)));
   }
 
   /** Binds the navigation state the flow's pages carry. */
@@ -283,7 +284,7 @@ class StatefulWidgetFlowRoutes<Params, Layout extends WidgetLayout, State> {
     const located =
       (path: WidgetPath) =>
       (state: State): WidgetLocation<State> =>
-        ({ path, state }) as WidgetLocation<State>;
+        new WidgetLocation(path, state);
     return {
       ...paths,
       complete: located(paths.completePath),
@@ -296,16 +297,16 @@ class StatefulWidgetFlowRoutes<Params, Layout extends WidgetLayout, State> {
 const route = <
   const Pattern extends string,
   Layout extends WidgetLayout,
-  const Schemas extends ParamSchemas<Pattern> = Record<never, never>,
+  const Fields extends Schema.Struct.Fields & ParamFields<Pattern>,
 >(
   pattern: Pattern,
   layouts: ReadonlyArray<Layout>,
-  schemas?: Schemas
+  fields: Fields
 ) =>
-  new WidgetRoute<Pattern, RouteParams<Pattern, Schemas>, Layout>(
+  new WidgetRoute<Pattern, Schema.Struct<Fields>["Type"], Layout>(
     pattern,
     layouts,
-    (schemas ?? {}) as Readonly<Record<string, ParamSchema>>
+    Schema.Struct(fields)
   );
 
 const flowRoutes = <Params, Layout extends WidgetLayout>(
@@ -317,7 +318,7 @@ const flowRoutes = <Params, Layout extends WidgetLayout>(
     new WidgetRoute<string, Params, Layout>(
       `${prefix}/${name}`,
       layouts,
-      base.paramSchemas
+      base.paramsSchema
     );
   return new WidgetFlowRoutes<Params, Layout>(
     base,
@@ -327,7 +328,10 @@ const flowRoutes = <Params, Layout extends WidgetLayout>(
   );
 };
 
-const positionParams = { integrationId: YieldId } as const;
+const positionParams = {
+  balanceId: BalanceDataKey,
+  integrationId: YieldId,
+} as const;
 const activityActionParams = { actionId: ActionId } as const;
 const borrowPositionParams = { marketId: MarketId } as const;
 
@@ -338,8 +342,8 @@ const activityAction = route(
 );
 
 export const widgetRoutes = {
-  earn: route("/", allLayouts),
-  positions: route("/positions", allLayouts),
+  earn: route("/", allLayouts, {}),
+  positions: route("/positions", allLayouts, {}),
   positionDetails: route(
     "/positions/:integrationId/:balanceId",
     allLayouts,
@@ -366,14 +370,14 @@ export const widgetRoutes = {
     allLayouts,
     positionParams
   ),
-  activity: route("/activity", allLayouts),
+  activity: route("/activity", allLayouts, {}),
   activityAction,
   activityBorrowAction: route("/activity/borrow/:actionId", allLayouts, {
     actionId: BorrowActionId,
   }),
-  borrow: route("/borrow", wideLayouts),
+  borrow: route("/borrow", wideLayouts, {}),
   /** Base of market positions; its unknown paths redirect to Positions. */
-  positionsBorrow: route("/positions/borrow", wideLayouts),
+  positionsBorrow: route("/positions/borrow", wideLayouts, {}),
   borrowPosition: route(
     "/positions/borrow/:marketId",
     wideLayouts,
@@ -382,7 +386,7 @@ export const widgetRoutes = {
   borrowPositionAction: route(
     "/positions/borrow/:marketId/action/:actionId",
     wideLayouts,
-    borrowPositionParams
+    { ...borrowPositionParams, actionId: BorrowPositionActionKey }
   ),
 } as const;
 
diff --git a/packages/widget/src/services/persistence/widget-persistence.ts b/packages/widget/src/services/persistence/widget-persistence.ts
index 6e8945ecc..f7f5020d5 100644
--- a/packages/widget/src/services/persistence/widget-persistence.ts
+++ b/packages/widget/src/services/persistence/widget-persistence.ts
@@ -11,7 +11,7 @@ import {
   SubscriptionRef,
 } from "effect";
 import * as KeyValueStore from "effect/persistence/KeyValueStore";
-import type { WalletAddress } from "../../domain/identity/identifiers";
+import { WalletAddress } from "../../domain/identity/identifiers";
 import { config } from "../../shared/config/widget-defaults";
 
 const storageKey = <Name extends string>(name: Name) =>
@@ -22,7 +22,7 @@ export const widgetStorageKeys = {
   tosAccepted: storageKey("tosAccepted"),
 } as const;
 
-export const StoredPublicKeys = Schema.Record(Schema.String, Schema.String);
+export const StoredPublicKeys = Schema.Record(WalletAddress, Schema.String);
 export type StoredPublicKeys = typeof StoredPublicKeys.Type;
 
 export const TosAcknowledged = Schema.Boolean;
diff --git a/packages/widget/src/services/tracking/tracking-service.ts b/packages/widget/src/services/tracking/tracking-service.ts
index 71b76e30c..01b8b5e40 100644
--- a/packages/widget/src/services/tracking/tracking-service.ts
+++ b/packages/widget/src/services/tracking/tracking-service.ts
@@ -2,8 +2,11 @@ import { Context, Effect, Layer } from "effect";
 import { config } from "../../shared/config/widget-defaults";
 import { WidgetConfigService } from "../config/widget-config";
 import {
-  type Properties,
+  type AnyTrackEventProperties,
+  type AnyTrackPageProperties,
+  type TrackEventArgs,
   type TrackEventKey,
+  type TrackPageArgs,
   type TrackPageKey,
   trackEventMap,
   trackPageMap,
@@ -25,8 +28,8 @@ export class TrackingService extends Context.Service<TrackingService>()(
         }).pipe(Effect.orElseSucceed(() => undefined))
       );
 
-      const trackEvent = Effect.fn("TrackingService.trackEvent")(
-        function* (event: TrackEventKey, properties?: Properties) {
+      const sendEvent = Effect.fn("TrackingService.trackEvent")(
+        function* (event: TrackEventKey, properties?: AnyTrackEventProperties) {
           const { hostProfile, tracking } = yield* widgetConfig.current;
           const variantTracking = hostProfile.hostTracking
             ? yield* getVariantTracking
@@ -53,8 +56,8 @@ export class TrackingService extends Context.Service<TrackingService>()(
         (effect) => Effect.ignore(effect)
       );
 
-      const trackPageView = Effect.fn("TrackingService.trackPageView")(
-        function* (page: TrackPageKey, properties?: Properties) {
+      const sendPageView = Effect.fn("TrackingService.trackPageView")(
+        function* (page: TrackPageKey, properties?: AnyTrackPageProperties) {
           const { hostProfile, tracking } = yield* widgetConfig.current;
           const variantTracking = hostProfile.hostTracking
             ? yield* getVariantTracking
@@ -81,7 +84,16 @@ export class TrackingService extends Context.Service<TrackingService>()(
         (effect) => Effect.ignore(effect)
       );
 
-      return { trackEvent, trackPageView } as const;
+      return {
+        trackEvent: <Event extends TrackEventKey>(
+          event: Event,
+          ...[properties]: TrackEventArgs<Event>
+        ) => sendEvent(event, properties),
+        trackPageView: <Page extends TrackPageKey>(
+          page: Page,
+          ...[properties]: TrackPageArgs<Page>
+        ) => sendPageView(page, properties),
+      } as const;
     }),
   }
 ) {
diff --git a/packages/widget/src/services/tracking/types.ts b/packages/widget/src/services/tracking/types.ts
index ef21f52b3..d0ba5121d 100644
--- a/packages/widget/src/services/tracking/types.ts
+++ b/packages/widget/src/services/tracking/types.ts
@@ -1,3 +1,11 @@
+import type { YieldPendingActionType } from "../../domain/action/pending-action";
+import type { MarketId } from "../../domain/borrow/ids";
+import type { YieldCategory } from "../../domain/earn/contract";
+import type {
+  ValidatorAddress,
+  YieldId,
+} from "../../domain/identity/identifiers";
+
 export const trackPageMap = {
   earn: "Earn",
   borrow: "Borrow",
@@ -68,4 +76,134 @@ export const trackEventMap = {
 
 export type TrackEventKey = keyof typeof trackEventMap;
 
-export type Properties = Record<string, unknown>;
+type TabTrackingProperties = {
+  readonly selected:
+    | "activity"
+    | "borrow"
+    | "earn"
+    | "manage"
+    | "positions"
+    | YieldCategory;
+};
+
+type ValidatorTrackingProperties = {
+  readonly validatorAddress: ValidatorAddress;
+  readonly validatorName: string | undefined;
+};
+
+type BorrowCollateralTrackingProperties = {
+  readonly collateralTokenAddress: string | undefined;
+  readonly collateralTokenSymbol: string | undefined;
+  readonly marketId: MarketId | undefined;
+};
+
+type TransactionTrackingProperties = {
+  readonly network: string;
+  readonly txId: string;
+  /** The Yield ID, or a borrow integration ID. */
+  readonly yieldId: string;
+};
+
+/**
+ * What each event sends to the host alongside its name; `undefined` for
+ * events sent without properties.
+ */
+type TrackEventProperties = {
+  readonly tabClicked: TabTrackingProperties;
+  readonly connectWalletClicked: undefined;
+  readonly addLedgerAccountClicked: undefined;
+  readonly selectTokenModalOpened: undefined;
+  readonly exitReceiveTokenModalOpened: undefined;
+  readonly tokenSelected: { readonly token: string };
+  readonly selectYieldModalOpened: undefined;
+  readonly yieldSelected: undefined;
+  readonly selectValidatorModalOpened: undefined;
+  readonly selectValidatorModalClosed: undefined;
+  readonly selectValidatorViewMoreClicked: undefined;
+  readonly validatorSelected: ValidatorTrackingProperties;
+  readonly validatorRemoved: ValidatorTrackingProperties;
+  readonly widgetDisconnectClicked: undefined;
+  readonly backClicked: undefined;
+  readonly helpModalOpened: { readonly modal: string };
+  readonly termsModalOpened: undefined;
+  readonly termsModalAccepted: undefined;
+  readonly termsModalDeclined: undefined;
+  readonly earnPageMaxClicked: undefined;
+  readonly borrowPageMaxClicked: BorrowCollateralTrackingProperties & {
+    readonly field: "collateral";
+  };
+  readonly borrowMarketSelected: { readonly marketId: MarketId };
+  readonly borrowCollateralSelected: BorrowCollateralTrackingProperties;
+  readonly borrowReviewClicked: BorrowCollateralTrackingProperties & {
+    readonly borrowAmount: string;
+    readonly collateralAmount: string;
+  };
+  readonly connectedWallet: {
+    readonly address: string;
+    readonly network: string;
+  };
+  readonly importValidatorModalOpened: undefined;
+  readonly chainModalOpened: undefined;
+  readonly accountModalOpened: undefined;
+  readonly termsClicked: undefined;
+  readonly txSigned: TransactionTrackingProperties;
+  readonly txSubmitted: TransactionTrackingProperties;
+  readonly txNotConfirmed: undefined;
+  readonly positionDetailsPageMaxClicked: {
+    readonly yieldId: YieldId | undefined;
+  };
+  readonly unstakeClicked: {
+    readonly amount?: string;
+    readonly yieldId: YieldId;
+  };
+  readonly pendingActionClicked: {
+    readonly type: YieldPendingActionType;
+    readonly yieldId: YieldId;
+  };
+  readonly validatorsSubmitted: {
+    readonly type: YieldPendingActionType;
+    readonly validators: ReadonlyArray<ValidatorAddress>;
+    readonly yieldId: YieldId;
+  };
+  readonly validatorImported: undefined;
+  readonly viewTxClicked: undefined;
+  readonly actionStepsCancelled: undefined;
+  readonly initYield: undefined;
+  readonly initToken: undefined;
+};
+
+/**
+ * What each page view sends alongside its name; a union with `undefined`
+ * marks properties some views of the page omit.
+ */
+type TrackPageProperties = {
+  readonly [Page in Exclude<TrackPageKey, "positionDetails">]: undefined;
+} & {
+  readonly positionDetails: { readonly yield: string | undefined } | undefined;
+};
+
+/** Properties of any tracked event. */
+export type AnyTrackEventProperties = Exclude<
+  TrackEventProperties[TrackEventKey],
+  undefined
+>;
+
+/** Properties of any tracked page view. */
+export type AnyTrackPageProperties = Exclude<
+  TrackPageProperties[TrackPageKey],
+  undefined
+>;
+
+type TrackingArgs<Properties> = undefined extends Properties
+  ? [properties?: Exclude<Properties, undefined>]
+  : [properties: Properties];
+
+/** `trackEvent` arguments after the event name: its properties, if any. */
+export type TrackEventArgs<Event extends TrackEventKey> = TrackingArgs<
+  TrackEventProperties[Event]
+>;
+
+/** `trackPageView` arguments after the page name: its properties, if any. */
+export type TrackPageArgs<Page extends TrackPageKey> = TrackingArgs<
+  TrackPageProperties[Page]
+>;
diff --git a/packages/widget/src/services/transaction-workflow/internal/confirmation.ts b/packages/widget/src/services/transaction-workflow/internal/confirmation.ts
index ccc9eb482..d847f5b86 100644
--- a/packages/widget/src/services/transaction-workflow/internal/confirmation.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/confirmation.ts
@@ -1,4 +1,5 @@
 import { Data, Duration, Effect, Match, Ref, Schedule } from "effect";
+import { isHex } from "viem";
 import { isTransactionError } from "../../../domain/action/rules";
 import {
   type Action as BorrowAction,
@@ -70,8 +71,13 @@ export const makeConfirmCurrent = Effect.gen(function* () {
     if (current._tag === "Direct") {
       const direct = current.transaction.source.transaction;
       const { chainId } = direct;
-      const hash = current.transaction.meta.signedTx as `0x${string}` | null;
+      const { meta } = current.transaction;
+      const hash = meta.broadcasted === true ? meta.signedTx : null;
       if (!hash) return yield* fail("The transaction hash is not available.");
+      // viem takes hex, and an EVM wallet answers in it.
+      if (!isHex(hash)) {
+        return yield* fail("The transaction hash is not EVM hex.");
+      }
       const outcome = yield* evmRpc
         .awaitOutcome({ chainId, hash })
         .pipe(
diff --git a/packages/widget/src/services/transaction-workflow/internal/held-hash-registration.ts b/packages/widget/src/services/transaction-workflow/internal/held-hash-registration.ts
index 6a0d3b383..b584b94b3 100644
--- a/packages/widget/src/services/transaction-workflow/internal/held-hash-registration.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/held-hash-registration.ts
@@ -8,6 +8,7 @@ import {
   Match,
   Schedule,
 } from "effect";
+import type { TransactionHash } from "../../../domain/identity/identifiers";
 import {
   BorrowOperations,
   isTransientApiFailure,
@@ -53,7 +54,7 @@ export const makeHeldHashRegistration = Effect.gen(function* () {
 
   const registerHash = (
     source: ApiRecordedSource,
-    hash: string
+    hash: TransactionHash
   ): Effect.Effect<void> => {
     const register = Match.value(source).pipe(
       Match.tag("Yield", (source) =>
diff --git a/packages/widget/src/services/transaction-workflow/internal/model.ts b/packages/widget/src/services/transaction-workflow/internal/model.ts
index beea56565..8cbd9e078 100644
--- a/packages/widget/src/services/transaction-workflow/internal/model.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/model.ts
@@ -24,18 +24,40 @@ type TransactionWorkflowTransaction =
 type TransactionWorkflowSource = TransactionWorkflowTransaction["source"];
 type TransactionWorkflowDomainContext = TransactionWorkflowContext["domain"];
 
-export const isTransactionWorkflowDoneStatus = (status: string) =>
-  status === "CONFIRMED" || status === "SKIPPED";
-
-const isBroadcastStatus = (status: string) =>
-  status === "BROADCASTED" || status === "CONFIRMED";
+type TransactionWorkflowRemoteStatus =
+  | YieldAction["transactions"][number]["status"]
+  | BorrowAction["transactions"][number]["status"];
+
+/** Every remote status is classified, so a new one must be placed here. */
+const transactionWorkflowStatusProgress = {
+  NOT_FOUND: { broadcast: false, done: false },
+  CREATED: { broadcast: false, done: false },
+  BLOCKED: { broadcast: false, done: false },
+  WAITING_FOR_SIGNATURE: { broadcast: false, done: false },
+  SIGNED: { broadcast: false, done: false },
+  BROADCASTED: { broadcast: true, done: false },
+  PENDING: { broadcast: false, done: false },
+  CONFIRMED: { broadcast: true, done: true },
+  FAILED: { broadcast: false, done: false },
+  SKIPPED: { broadcast: false, done: true },
+} as const satisfies Record<
+  TransactionWorkflowRemoteStatus,
+  { readonly broadcast: boolean; readonly done: boolean }
+>;
+
+export const isTransactionWorkflowDoneStatus = (
+  status: TransactionWorkflowRemoteStatus
+) => transactionWorkflowStatusProgress[status].done;
 
 const toTransaction = (
   source: Exclude<TransactionWorkflowSource, { readonly _tag: "Direct" }>
 ): TransactionWorkflowTransaction => ({
   source,
   meta: {
-    broadcasted: isBroadcastStatus(source.transaction.status) ? true : null,
+    broadcasted: transactionWorkflowStatusProgress[source.transaction.status]
+      .broadcast
+      ? true
+      : null,
     confirmationError: null,
     done: isTransactionWorkflowDoneStatus(source.transaction.status),
     signError: null,
@@ -69,11 +91,12 @@ const toDirectTransaction = ({
   return {
     source: { _tag: "Direct", transaction },
     meta: {
-      broadcasted: record ? true : null,
+      ...(record
+        ? { broadcasted: true, signedTx: record.hash }
+        : { broadcasted: null, signedTx: null }),
       confirmationError: null,
       done: record?._tag === "Confirmed",
       signError: null,
-      signedTx: record?.hash ?? null,
       submissionIndex: null,
       url: null,
     },
diff --git a/packages/widget/src/services/transaction-workflow/internal/preparation.ts b/packages/widget/src/services/transaction-workflow/internal/preparation.ts
index babade525..262d07cf9 100644
--- a/packages/widget/src/services/transaction-workflow/internal/preparation.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/preparation.ts
@@ -1,7 +1,10 @@
 import { Data, Duration, Effect, Result, Schedule } from "effect";
-import { keccak256 } from "viem";
+import { isHex, keccak256 } from "viem";
 import type { ManageActionCommand } from "../../../domain/action/models";
 import { getValidStakeSessionTx } from "../../../domain/action/rules";
+import type { ConfidentialChainId } from "../../../domain/earn/confidential";
+import { getEncryptedHandle } from "../../../domain/earn/models";
+import { TransactionHash } from "../../../domain/identity/identifiers";
 import {
   type ActionPreviewRequest,
   isTransientApiFailure,
@@ -133,7 +136,7 @@ export const makePrepareAction = Effect.gen(function* () {
       context,
       input,
     }: {
-      readonly chainId: number;
+      readonly chainId: ConfidentialChainId;
       readonly context: TransactionWorkflowContext;
       readonly input: ConfidentialTransactionWorkflowInput;
     }) {
@@ -151,10 +154,11 @@ export const makePrepareAction = Effect.gen(function* () {
           : (context.submissions[unwrap.meta.submissionIndex] ?? null);
       // The API may not return the hash; a signed EVM transaction's keccak256
       // is its hash.
+      const signedPayload = submission?.signedPayload ?? null;
       const hash =
         submission?.hash ??
-        (submission?.signedPayload
-          ? keccak256(submission.signedPayload as `0x${string}`)
+        (signedPayload && isHex(signedPayload)
+          ? TransactionHash.make(keccak256(signedPayload))
           : null);
       if (!hash) {
         return yield* fail("The unwrap transaction is unknown.", null, false);
@@ -175,8 +179,7 @@ export const makePrepareAction = Effect.gen(function* () {
               .filter(
                 (balance) =>
                   balance.type === "withdrawable" &&
-                  balance.shareAmountRaw?.toLowerCase() ===
-                    requestId.toLowerCase()
+                  getEncryptedHandle(balance) === requestId
               )
               .flatMap((balance) => balance.pendingActions)
               .find(({ type }) => type === "WITHDRAW");
diff --git a/packages/widget/src/services/transaction-workflow/internal/signing.ts b/packages/widget/src/services/transaction-workflow/internal/signing.ts
index aa5500af3..bef26e955 100644
--- a/packages/widget/src/services/transaction-workflow/internal/signing.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/signing.ts
@@ -1,13 +1,16 @@
 import { Effect, Match } from "effect";
+import { isAddress } from "viem";
 import type { Action as BorrowAction } from "../../../domain/borrow/execution/action";
 import {
   decodeBorrowTransactionForWallet,
   decodeBorrowTypedDataForWallet,
 } from "../../../domain/borrow/execution/transaction";
-import { TransactionId } from "../../../domain/identity/identifiers";
-import type { Network } from "../../../domain/network/network";
+import {
+  TransactionId,
+  type WalletSignature,
+} from "../../../domain/identity/identifiers";
 import type { WalletScopeOwner } from "../../../domain/wallet/wallet-scope";
-import { EvmRpc } from "../../evm-rpc/evm-rpc";
+import { EvmRpc, EvmRpcError } from "../../evm-rpc/evm-rpc";
 import { TrackingService } from "../../tracking/tracking-service";
 import type {
   WalletOwnerMismatchError,
@@ -82,10 +85,16 @@ const walletSignFailureReason = (
     }),
   });
 
+/** What the wallet returned: a broadcast hash, a signed payload, or a signature. */
+type WorkflowSignedResult =
+  | WalletBroadcastResult
+  | WalletSignedPayloadResult
+  | { readonly broadcasted: false; readonly signedTx: WalletSignature };
+
 /** `context` with its current transaction holding what the wallet returned. */
 export const withSignedTransaction = (
   context: TransactionWorkflowContext,
-  signed: WalletBroadcastResult | WalletSignedPayloadResult
+  signed: WorkflowSignedResult
 ): TransactionWorkflowContext =>
   updateCurrentTransactionWorkflowTransaction({
     context,
@@ -93,10 +102,9 @@ export const withSignedTransaction = (
       ...current,
       meta: {
         ...current.meta,
-        broadcasted: signed.broadcasted,
+        ...signed,
         confirmationError: null,
         signError: null,
-        signedTx: signed.signedTx,
       },
     }),
   });
@@ -207,12 +215,25 @@ export const makePrepareAndSign = Effect.fn("makePrepareAndSign")(function* (
     const signed = yield* Match.value(current).pipe(
       Match.tag("Direct", ({ domain, transaction }) => {
         const direct = transaction.source.transaction;
+        const from = expectedOwner.address;
+        // A Direct Transaction runs on an EVM chain, whose senders are hex.
+        if (!isAddress(from, { strict: false })) {
+          return Effect.fail(
+            fail({
+              _tag: "EstimateFailed",
+              cause: new EvmRpcError({
+                cause: `Not an EVM sender address: ${from}`,
+                operation: "prepare-transaction",
+              }),
+            })
+          );
+        }
 
         return evmRpc
           .prepare({
             chainId: direct.chainId,
             data: direct.data,
-            from: expectedOwner.address as `0x${string}`,
+            from,
             to: direct.to,
           })
           .pipe(
@@ -249,7 +270,7 @@ export const makePrepareAndSign = Effect.fn("makePrepareAndSign")(function* (
                     signed.broadcasted
                       ? recordDirectTransaction(ledger, direct, {
                           _tag: "Sent",
-                          hash: signed.signedTx as `0x${string}`,
+                          hash: signed.signedTx,
                         })
                       : Effect.void
                   )
@@ -284,7 +305,7 @@ export const makePrepareAndSign = Effect.fn("makePrepareAndSign")(function* (
               expectedOwner,
               family: "yield",
               ledgerHwAppId: null,
-              network: network as Network,
+              network,
               tx: payload,
               txMeta: {
                 ...domain.actionMeta,
@@ -342,7 +363,7 @@ export const makePrepareAndSign = Effect.fn("makePrepareAndSign")(function* (
               expectedOwner,
               family: "borrow",
               ledgerHwAppId: null,
-              network: network as Network,
+              network,
               tx,
               txMeta,
             })
diff --git a/packages/widget/src/services/transaction-workflow/internal/submission.ts b/packages/widget/src/services/transaction-workflow/internal/submission.ts
index b181f7b76..63226a6ad 100644
--- a/packages/widget/src/services/transaction-workflow/internal/submission.ts
+++ b/packages/widget/src/services/transaction-workflow/internal/submission.ts
@@ -1,5 +1,10 @@
 import { Effect, Match } from "effect";
-import { keccak256 } from "viem";
+import { type Hex, isHex, keccak256 } from "viem";
+import {
+  type SignedTransactionPayload,
+  TransactionHash,
+  type WalletSignature,
+} from "../../../domain/identity/identifiers";
 import { BorrowOperations, YieldOperations } from "../../api/operations";
 import { EvmRpc } from "../../evm-rpc/evm-rpc";
 import { TrackingService } from "../../tracking/tracking-service";
@@ -16,6 +21,28 @@ import {
 import { recordDirectTransaction } from "./ledger";
 import { updateCurrentTransactionWorkflowTransaction } from "./model";
 
+type TransactionWorkflowTransactionMeta =
+  TransactionWorkflowContext["batches"][number]["transactions"][number]["meta"];
+
+/** What the wallet returned that a submission records. */
+type SubmittableSigned =
+  | { readonly broadcasted: true; readonly signedTx: TransactionHash }
+  | {
+      readonly broadcasted: false;
+      readonly signedTx: SignedTransactionPayload | WalletSignature;
+    };
+
+/** Null until the wallet returned something, or when no hash is known. */
+const getSubmittableSigned = (
+  meta: TransactionWorkflowTransactionMeta
+): SubmittableSigned | null => {
+  if (meta.broadcasted === null) return null;
+  if (meta.broadcasted === false) return meta;
+  return meta.signedTx === null
+    ? null
+    : { broadcasted: true, signedTx: meta.signedTx };
+};
+
 export const makeSubmitCurrent = Effect.gen(function* () {
   const [borrowOperations, evmRpc, tracking, yieldOperations] =
     yield* Effect.all([
@@ -35,7 +62,7 @@ export const makeSubmitCurrent = Effect.gen(function* () {
     const current = yield* requireCurrentWorkflow(context);
     const { batch, transaction, workflowId } = current;
     const { source } = transaction;
-    const signedTx = transaction.meta.signedTx;
+    const signed = getSubmittableSigned(transaction.meta);
     const broadcasted = transaction.meta.broadcasted === true;
     const fail = (message: string, cause?: unknown) =>
       new TransactionSubmissionError({
@@ -47,7 +74,7 @@ export const makeSubmitCurrent = Effect.gen(function* () {
         workflowId,
       });
 
-    if (!signedTx) {
+    if (!signed) {
       return yield* fail("The signed transaction payload is not available.");
     }
 
@@ -56,54 +83,72 @@ export const makeSubmitCurrent = Effect.gen(function* () {
         const { source } = transaction;
         const direct = source.transaction;
         const { chainId, id } = direct;
-        const signed = signedTx as `0x${string}`;
+        const submitted = (
+          hash: TransactionHash,
+          evmHash: Hex,
+          signedPayload: SignedTransactionPayload | WalletSignature | null
+        ) =>
+          ({
+            batchId: batch.id,
+            hash,
+            link: evmRpc.explorerUrl({ chainId, hash: evmHash }),
+            signedPayload,
+            source,
+            status: null,
+            transactionId: id,
+          }) satisfies TransactionWorkflowSubmission;
+
+        // viem takes hex, and an EVM wallet answers in it.
+        if (signed.broadcasted) {
+          const hash = signed.signedTx;
+          return isHex(hash)
+            ? Effect.succeed(submitted(hash, hash, null))
+            : Effect.fail(fail("The transaction hash is not EVM hex."));
+        }
+
+        const payload = signed.signedTx;
+        if (!isHex(payload)) {
+          return Effect.fail(fail("The signed transaction is not EVM hex."));
+        }
         // The hash is known before the broadcast, so a lost response cannot
         // make Retry sign the transaction again.
-        const hash = broadcasted ? signed : keccak256(signed);
-        const broadcast = broadcasted
-          ? Effect.void
-          : Effect.uninterruptibleMask((restore) =>
-              recordDirectTransaction(ledger, direct, {
-                _tag: "Sent",
-                hash,
-              }).pipe(
-                Effect.andThen(
-                  restore(evmRpc.broadcast({ chainId, hash, signedTx: signed }))
-                ),
-                // Only a broadcast the node refused is forgotten: a failed or
-                // interrupted one may still have reached it.
-                Effect.tapError((error) =>
-                  error._tag === "EvmBroadcastRejectedError"
-                    ? recordDirectTransaction(ledger, direct, null)
-                    : Effect.void
-                )
-              )
-            );
+        const evmHash = keccak256(payload);
+        const hash = TransactionHash.make(evmHash);
 
-        return broadcast.pipe(
+        return Effect.uninterruptibleMask((restore) =>
+          recordDirectTransaction(ledger, direct, {
+            _tag: "Sent",
+            hash,
+          }).pipe(
+            Effect.andThen(
+              restore(
+                evmRpc.broadcast({ chainId, hash: evmHash, signedTx: payload })
+              )
+            ),
+            // Only a broadcast the node refused is forgotten: a failed or
+            // interrupted one may still have reached it.
+            Effect.tapError((error) =>
+              error._tag === "EvmBroadcastRejectedError"
+                ? recordDirectTransaction(ledger, direct, null)
+                : Effect.void
+            )
+          )
+        ).pipe(
           Effect.mapError((cause) =>
             fail("Transaction broadcast failed.", cause)
           ),
-          Effect.as({
-            batchId: batch.id,
-            hash,
-            link: evmRpc.explorerUrl({ chainId, hash }),
-            signedPayload: broadcasted ? null : signed,
-            source,
-            status: null,
-            transactionId: id,
-          } satisfies TransactionWorkflowSubmission)
+          Effect.as(submitted(hash, evmHash, payload))
         );
       }),
       Match.tag("Yield", ({ transaction }) => {
         const { source } = transaction;
-        const submit = broadcasted
+        const submit = signed.broadcasted
           ? yieldOperations.submitTransactionHash({
-              payload: { hash: signedTx },
+              payload: { hash: signed.signedTx },
               transactionId: source.transaction.id,
             })
           : yieldOperations.submitSignedTransaction({
-              payload: { signedTransaction: signedTx },
+              payload: { signedTransaction: signed.signedTx },
               transactionId: source.transaction.id,
             });
 
@@ -120,9 +165,11 @@ export const makeSubmitCurrent = Effect.gen(function* () {
             (response) =>
               ({
                 batchId: batch.id,
-                hash: broadcasted ? signedTx : (response.hash ?? null),
+                hash: signed.broadcasted
+                  ? signed.signedTx
+                  : (response.hash ?? null),
                 link: response.explorerUrl ?? null,
-                signedPayload: broadcasted ? null : signedTx,
+                signedPayload: signed.broadcasted ? null : signed.signedTx,
                 source,
                 status: response.status ?? null,
                 transactionId: source.transaction.id,
@@ -135,9 +182,9 @@ export const makeSubmitCurrent = Effect.gen(function* () {
 
         return borrowOperations
           .submitTransaction({
-            command: broadcasted
-              ? { transactionHash: signedTx }
-              : { signedPayload: signedTx },
+            command: signed.broadcasted
+              ? { transactionHash: signed.signedTx }
+              : { signedPayload: signed.signedTx },
             transactionId: source.transaction.id,
           })
           .pipe(
@@ -148,11 +195,11 @@ export const makeSubmitCurrent = Effect.gen(function* () {
               (response) =>
                 ({
                   batchId: batch.id,
-                  hash: broadcasted
-                    ? signedTx
-                    : (response.transactionHash ?? signedTx),
+                  hash: signed.broadcasted
+                    ? signed.signedTx
+                    : (response.transactionHash ?? null),
                   link: response.link ?? null,
-                  signedPayload: broadcasted ? null : signedTx,
+                  signedPayload: signed.broadcasted ? null : signed.signedTx,
                   source,
                   status: response.status ?? null,
                   transactionId: source.transaction.id,
@@ -169,19 +216,22 @@ export const makeSubmitCurrent = Effect.gen(function* () {
         ...context,
         submissions: [...context.submissions, submission],
       },
-      update: (current) => ({
-        ...current,
-        meta: {
+      update: (current) => {
+        const meta = {
           ...current.meta,
-          // A Direct transaction is confirmed by its hash.
-          ...(current.source._tag === "Direct"
-            ? { broadcasted: true, signedTx: submission.hash }
-            : {}),
           confirmationError: null,
           signError: null,
           submissionIndex,
-        },
-      }),
+        };
+        return {
+          ...current,
+          // A Direct transaction is confirmed by its hash.
+          meta:
+            current.source._tag === "Direct"
+              ? { ...meta, broadcasted: true, signedTx: submission.hash }
+              : meta,
+        };
+      },
     });
 
     yield* tracking.trackEvent("txSubmitted", {
diff --git a/packages/widget/src/services/transaction-workflow/transaction-workflow-model.ts b/packages/widget/src/services/transaction-workflow/transaction-workflow-model.ts
index 63c8e4375..fd010caba 100644
--- a/packages/widget/src/services/transaction-workflow/transaction-workflow-model.ts
+++ b/packages/widget/src/services/transaction-workflow/transaction-workflow-model.ts
@@ -7,7 +7,14 @@ import type {
 } from "../../domain/action/models";
 import type { Action as BorrowAction } from "../../domain/borrow/execution/action";
 import type { Transaction as BorrowTransaction } from "../../domain/borrow/execution/transaction";
-import type { TransactionWorkflowId } from "../../domain/identity/identifiers";
+import type { ConfidentialChainId } from "../../domain/earn/confidential";
+import type {
+  SignedTransactionPayload,
+  TransactionHash,
+  TransactionWorkflowId,
+  WalletSignature,
+} from "../../domain/identity/identifiers";
+import type { Network } from "../../domain/network/network";
 import { WalletScopeKey } from "../../domain/wallet/wallet-scope";
 import { toRepresentationNumber } from "../../shared/lib/number-format";
 import type { EvmRpcError } from "../evm-rpc/evm-rpc";
@@ -25,7 +32,7 @@ import type { ConfidentialPreparation } from "../zama/zama-service";
 
 export type DirectTransactionRecord = Readonly<{
   readonly _tag: "Confirmed" | "Sent";
-  readonly hash: `0x${string}`;
+  readonly hash: TransactionHash;
   /** What was sent, so a later confirm can resume it without planning again. */
   readonly transaction: DirectTransaction;
 }>;
@@ -64,12 +71,12 @@ export class YieldTransactionWorkflowInput extends Data.TaggedClass(
 }
 
 export type YieldTransactionWorkflowProviderDetail = {
-  readonly address?: string;
-  readonly logo?: string;
+  readonly address?: string | undefined;
+  readonly logo?: string | undefined;
   readonly name: string;
-  readonly rewardRate?: BigNumber | number;
-  readonly rewardType?: string;
-  readonly website?: string;
+  readonly rewardRate?: BigNumber | number | undefined;
+  readonly rewardType?: string | undefined;
+  readonly website?: string | undefined;
 };
 
 type YieldActionFacts = {
@@ -125,7 +132,9 @@ type ConfidentialTransactionWorkflowInputFields = YieldActionFacts & {
    * confirms, the workflow decrypts the unwrapped amount on this chain and
    * withdraws it.
    */
-  readonly finalizeUnwrap?: Readonly<{ readonly chainId: number }> | null;
+  readonly finalizeUnwrap?: Readonly<{
+    readonly chainId: ConfidentialChainId;
+  }> | null;
   readonly ledger: DirectTransactionLedger;
   readonly preparation: ConfidentialPreparation;
   readonly walletScope: WalletScopeKey;
@@ -206,11 +215,15 @@ type TransactionWorkflowSource =
       readonly transaction: BorrowTransaction;
     };
 
+/** A transaction's id, branded by the source it came from. */
+type TransactionWorkflowTransactionId =
+  TransactionWorkflowSource["transaction"]["id"];
+
 type WorkflowErrorFields = {
   readonly batchId: string;
   readonly cause?: unknown;
   readonly message: string;
-  readonly transactionId: string | null;
+  readonly transactionId: TransactionWorkflowTransactionId | null;
   readonly workflowId: TransactionWorkflowId;
 };
 
@@ -300,17 +313,17 @@ export class TransactionSignError extends Data.TaggedError(
 )<{
   readonly batchId: string;
   readonly message: string;
-  readonly network: string;
+  readonly network: Network;
   readonly reason: TransactionSignFailureReason;
-  readonly transactionId: string | null;
+  readonly transactionId: TransactionWorkflowTransactionId | null;
   readonly workflowId: TransactionWorkflowId;
 }> {}
 
 export const makeTransactionSignError = (input: {
   readonly batchId: string;
-  readonly network: string;
+  readonly network: Network;
   readonly reason: TransactionSignFailureReason;
-  readonly transactionId: string | null;
+  readonly transactionId: TransactionWorkflowTransactionId | null;
   readonly workflowId: TransactionWorkflowId;
 }): TransactionSignError =>
   new TransactionSignError({
@@ -344,7 +357,7 @@ export class TransactionSubmissionError extends Data.TaggedError(
 
 export class TransactionConfirmationError extends Data.TaggedError(
   "TransactionConfirmationError"
-)<WorkflowErrorFields & { readonly network: string }> {}
+)<WorkflowErrorFields & { readonly network: Network }> {}
 
 export class TransactionAdvanceError extends Data.TaggedError(
   "TransactionAdvanceError"
@@ -366,20 +379,31 @@ export type TransactionWorkflowError =
 
 export type TransactionWorkflowSubmission = {
   readonly batchId: string;
-  readonly hash: string | null;
+  readonly hash: TransactionHash | null;
   readonly link: string | null;
-  readonly signedPayload: string | null;
+  readonly signedPayload: SignedTransactionPayload | WalletSignature | null;
   readonly source: TransactionWorkflowSource;
   readonly status: string | null;
-  readonly transactionId: string;
+  readonly transactionId: TransactionWorkflowTransactionId;
 };
 
-type TransactionWorkflowTransactionMeta = {
-  readonly broadcasted: boolean | null;
+/**
+ * What the wallet returned. A broadcast transaction holds its hash, or none
+ * when only its API status says it was broadcast; a signed one holds the
+ * payload, or for a message or typed data the signature, an API submits.
+ */
+type TransactionWorkflowSignedMeta =
+  | { readonly broadcasted: null; readonly signedTx: null }
+  | { readonly broadcasted: true; readonly signedTx: TransactionHash | null }
+  | {
+      readonly broadcasted: false;
+      readonly signedTx: SignedTransactionPayload | WalletSignature;
+    };
+
+type TransactionWorkflowTransactionMeta = TransactionWorkflowSignedMeta & {
   readonly confirmationError: TransactionConfirmationError | null;
   readonly done: boolean;
   readonly signError: TransactionSignError | null;
-  readonly signedTx: string | null;
   readonly submissionIndex: number | null;
   readonly url: string | null;
 };
diff --git a/packages/widget/src/services/translation/English/translations.json b/packages/widget/src/services/translation/English/translations.json
index 650c3fb00..11d1307c7 100644
--- a/packages/widget/src/services/translation/English/translations.json
+++ b/packages/widget/src/services/translation/English/translations.json
@@ -1253,12 +1253,6 @@
     }
   },
   "position_details": {
-    "labels": {
-      "hasFrozenV1": {
-        "label": "Frozen 1.0",
-        "details": "{{amount}} TRX are frozen with Legacy Stake 1.0. To migrate to 2.0: Simply unstake {{amount}} TRX in Yield.xyz and stake again (Yield.xyz automatically prioritizes unstaking of Stake 1.0 balance)"
-      }
-    },
     "via": "{{stakeType}} via {{providerName}}",
     "rewards": "Rewards",
     "available_to": "<bold>{{amount}} {{symbol}}</bold> available to {{pendingAction, lowercase}}",
diff --git a/packages/widget/src/services/translation/French/translations.json b/packages/widget/src/services/translation/French/translations.json
index 473731b2a..34fa92a4c 100644
--- a/packages/widget/src/services/translation/French/translations.json
+++ b/packages/widget/src/services/translation/French/translations.json
@@ -880,12 +880,6 @@
     }
   },
   "position_details": {
-    "labels": {
-      "hasFrozenV1": {
-        "label": "Gelé 1.0",
-        "details": "{{amount}} TRX sont gelés avec Legacy Stake 1.0. Pour migrer vers 2.0 : Il suffit de déstaker {{amount}} TRX dans Yield.xyz et de les staker à nouveau (Yield.xyz priorise automatiquement le déstaking du solde de Stake 1.0)"
-      }
-    },
     "via": "{{stakeType}} via {{providerName}}",
     "rewards": "Récompenses",
     "available_to": "<bold>{{amount}} {{symbol}}</bold> disponibles pour {{pendingAction, lowercase}}",
diff --git a/packages/widget/src/services/translation/widget-translation.ts b/packages/widget/src/services/translation/widget-translation.ts
index c18d9026d..ab5d814a3 100644
--- a/packages/widget/src/services/translation/widget-translation.ts
+++ b/packages/widget/src/services/translation/widget-translation.ts
@@ -4,10 +4,12 @@ import {
   Effect,
   Equal,
   Layer,
+  Predicate,
   Ref,
   Schema,
   type Scope,
   Stream,
+  Struct,
 } from "effect";
 import { FetchHttpClient, HttpClient, HttpClientResponse } from "effect/http";
 import { createInstance } from "i18next";
@@ -57,8 +59,7 @@ type WidgetTranslationSettings = Pick<
 const selectWidgetTranslationSettings = (
   settings: WidgetConfig
 ): WidgetTranslationSettings => ({
-  customTranslations: settings.customTranslations,
-  language: settings.language,
+  ...Struct.pick(settings, ["customTranslations", "language"]),
   translationOverlay: settings.hostProfile.translationOverlay,
 });
 
@@ -131,7 +132,7 @@ export const reconcileWidgetI18n = ({
     i18n.addResourceBundle(
       resourceLanguage,
       "translation",
-      bundle.translation,
+      Predicate.isObject(bundle) ? bundle.translation : undefined,
       true,
       true
     );
diff --git a/packages/widget/src/services/wallet/default-wagmi-config.ts b/packages/widget/src/services/wallet/default-wagmi-config.ts
index cd8060b59..ef2e443a4 100644
--- a/packages/widget/src/services/wallet/default-wagmi-config.ts
+++ b/packages/widget/src/services/wallet/default-wagmi-config.ts
@@ -3,15 +3,13 @@ import { createConfig, http } from "wagmi";
 import { mainnet } from "wagmi/chains";
 import type { Chain as WalletChain } from "./wallet-descriptors";
 
-export const omitEnsUniversalResolver = <T extends WalletChain>(
-  chain: T
-): T => {
+export const omitEnsUniversalResolver = (chain: WalletChain): WalletChain => {
   if (!chain.contracts?.ensUniversalResolver) return chain;
 
   const { ensUniversalResolver: _ensUniversalResolver, ...contracts } =
     chain.contracts;
 
-  return { ...chain, contracts } as T;
+  return { ...chain, contracts };
 };
 
 export const makeDefaultConfig = () =>
diff --git a/packages/widget/src/services/wallet/external-provider.ts b/packages/widget/src/services/wallet/external-provider.ts
index 6a066677c..df0211945 100644
--- a/packages/widget/src/services/wallet/external-provider.ts
+++ b/packages/widget/src/services/wallet/external-provider.ts
@@ -1,4 +1,8 @@
 import { Data, Effect, Schema } from "effect";
+import {
+  TransactionHash,
+  WalletSignature,
+} from "../../domain/identity/identifiers";
 import type {
   SKBorrowTx,
   SKTx,
@@ -30,15 +34,18 @@ export type CurrentRef<A> = {
 };
 
 /** A host call: its broadcast hash or signature, or why it failed. */
-type HostOutcome = Effect.Effect<
-  string,
+type HostOutcome<A extends TransactionHash | WalletSignature> = Effect.Effect<
+  A,
   ExternalProviderError | ExternalProviderCancelled
 >;
 
 export class ExternalProvider {
   constructor(private variantProvider: CurrentRef<ExternalProviderSnapshot>) {}
 
-  sendTransaction(tx: SKTx, txMeta: YieldTransactionMeta): HostOutcome {
+  sendTransaction(
+    tx: SKTx,
+    txMeta: YieldTransactionMeta
+  ): HostOutcome<TransactionHash> {
     return Effect.suspend(() => {
       const sendTransaction =
         this.variantProvider.current.provider.sendTransaction;
@@ -70,7 +77,7 @@ export class ExternalProvider {
   sendBorrowTransaction(
     tx: SKBorrowTx,
     txMeta: BorrowTransactionMeta
-  ): HostOutcome {
+  ): HostOutcome<TransactionHash> {
     return Effect.suspend(() => {
       const config = this.variantProvider.current;
       if (!config.borrow) {
@@ -101,7 +108,7 @@ export class ExternalProvider {
     });
   }
 
-  signMessage(messageHash: string): HostOutcome {
+  signMessage(messageHash: string): HostOutcome<WalletSignature> {
     return Effect.suspend(() =>
       callHost(
         () => this.variantProvider.current.provider.signMessage(messageHash),
@@ -121,7 +128,7 @@ export class ExternalProvider {
   signTypedData(
     typedData: Eip712TypedData,
     txMeta: BorrowTransactionMeta
-  ): HostOutcome {
+  ): HostOutcome<WalletSignature> {
     return Effect.suspend(() => {
       const config = this.variantProvider.current;
       if (!config.borrow) {
@@ -147,7 +154,7 @@ export class ExternalProvider {
   signZamaPermit(
     typedData: Eip712TypedData,
     meta: SKZamaPermitMeta
-  ): HostOutcome {
+  ): HostOutcome<WalletSignature> {
     return Effect.suspend(() => {
       const provider = this.variantProvider.current.provider;
       if (!hasZamaPermitSigner(provider)) {
@@ -187,17 +194,17 @@ const SignatureError = Schema.Struct({
  */
 const TransactionError = Schema.Struct({
   ...SignatureError.fields,
-  txHash: Schema.optional(Schema.NonEmptyString),
+  txHash: Schema.optional(TransactionHash),
 });
 
 const TransactionSuccess = Schema.Struct({
   type: Schema.Literal("success"),
-  txHash: Schema.NonEmptyString,
+  txHash: TransactionHash,
 });
 
 const SignatureSuccess = Schema.Struct({
   type: Schema.Literal("success"),
-  signature: Schema.NonEmptyString,
+  signature: WalletSignature,
 });
 
 const TransactionOutcome = Schema.Union([
@@ -214,12 +221,12 @@ const SignatureOutcome = Schema.Union([
 
 /** Yield callbacks also accept the legacy bare string. */
 const LegacyTransactionOutcome = Schema.Union([
-  Schema.NonEmptyString,
+  TransactionHash,
   ...TransactionOutcome.members,
 ]);
 
 const LegacySignatureOutcome = Schema.Union([
-  Schema.NonEmptyString,
+  WalletSignature,
   ...SignatureOutcome.members,
 ]);
 
@@ -230,7 +237,7 @@ const LegacySignatureOutcome = Schema.Union([
  */
 const toTransactionHash =
   (family: "borrow" | "yield") =>
-  (result: typeof TransactionOutcome.Type): HostOutcome => {
+  (result: typeof TransactionOutcome.Type): HostOutcome<TransactionHash> => {
     if (result.type === "success") return Effect.succeed(result.txHash);
     if (result.type === "error" && result.txHash !== undefined) {
       return Effect.logWarning(
@@ -243,7 +250,9 @@ const toTransactionHash =
     return failHost(result);
   };
 
-const toSignature = (result: typeof SignatureOutcome.Type): HostOutcome =>
+const toSignature = (
+  result: typeof SignatureOutcome.Type
+): HostOutcome<WalletSignature> =>
   result.type === "success"
     ? Effect.succeed(result.signature)
     : failHost(result);
@@ -270,7 +279,7 @@ const callHost = <S extends Schema.Top>(
 
 const failHost = (
   result: typeof HostCancelled.Type | typeof SignatureError.Type
-): HostOutcome =>
+): Effect.Effect<never, ExternalProviderError | ExternalProviderCancelled> =>
   result.type === "cancelled"
     ? Effect.fail(new ExternalProviderCancelled())
     : Effect.fail(hostResultError(result.error));
diff --git a/packages/widget/src/services/wallet/init-params.ts b/packages/widget/src/services/wallet/init-params.ts
index 2cf007d42..1b9bdc4af 100644
--- a/packages/widget/src/services/wallet/init-params.ts
+++ b/packages/widget/src/services/wallet/init-params.ts
@@ -1,6 +1,8 @@
 import { Effect, Schema, SchemaGetter, SchemaTransformation } from "effect";
-import { YieldId } from "../../domain/identity/identifiers";
+import { YieldPendingActionType } from "../../domain/action/pending-action";
+import { ValidatorAddress, YieldId } from "../../domain/identity/identifiers";
 import { Network } from "../../domain/network/network";
+import { BalanceDataKey } from "../../domain/portfolio/positions";
 import { HostTokenKey } from "../../domain/token/token";
 import {
   isWalletNetwork,
@@ -18,12 +20,10 @@ const SafeQueryParam = Schema.String.check(
 
 // Position balance keys (`default`, `validators`, `validator::<address>[:<subnet>]`)
 // contain `:`, which is safe inside a route segment; `/`, `%`, `?` and `..` stay out.
-const BalanceIdParam = Schema.String.check(
+const BalanceIdParam = BalanceDataKey.check(
   Schema.isPattern(/^(?!.*\.\.)[a-zA-Z0-9-_.+:]*$/)
 );
 
-const PendingActionType = SafeQueryParam.check(Schema.isPattern(/^[A-Z_]+$/));
-
 const InitTab = invalidAsNull(
   Schema.Literals(["earn", "positions", "manage", "activity", "borrow"])
 );
@@ -94,10 +94,10 @@ export const InitParams = Schema.Struct({
   accountId: invalidAsNull(AccountId),
   balanceId: invalidAsNull(BalanceIdParam),
   network: invalidAsNull(SupportedNetwork),
-  pendingaction: invalidAsNull(PendingActionType),
+  pendingaction: invalidAsNull(YieldPendingActionType),
   tab: InitTab,
   token: invalidAsNull(InitToken),
-  validator: invalidAsNull(Schema.String),
+  validator: invalidAsNull(ValidatorAddress),
   yieldId: invalidAsNull(SafeYieldId),
 });
 export type InitParams = typeof InitParams.Type;
diff --git a/packages/widget/src/services/wallet/internal/adapters/cardano/cardano-connector.ts b/packages/widget/src/services/wallet/internal/adapters/cardano/cardano-connector.ts
index 42dfc65ed..d8e1b905f 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cardano/cardano-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cardano/cardano-connector.ts
@@ -1,6 +1,6 @@
 import { BrowserWallet } from "@meshsdk/wallet";
 import { Effect, Stream } from "effect";
-import type { Address, Chain } from "viem";
+import type { Chain } from "viem";
 import { createConnector } from "wagmi";
 import type {
   WalletDetailsParams,
@@ -11,6 +11,7 @@ import {
   WalletNotAvailableError,
 } from "../../../wallet-errors";
 import { getWalletNetworkLogo } from "../../runtime/assets";
+import { toWagmiAccount } from "../../wagmi-seam";
 import { cardano } from "../configured-chains";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
@@ -95,10 +96,11 @@ const createCardanoConnector = ({
       id: wallet.id,
       name: wallet.name,
       type: configMeta.type,
-      signTransaction: (tx: string) =>
-        connectedWallet
+      signTransaction: (tx: string) => {
+        const signer = connectedWallet;
+        return signer
           ? Effect.tryPromise({
-              try: () => connectedWallet!.signTx(tx),
+              try: () => signer.signTx(tx),
               catch: (cause) =>
                 new WalletIntegrationError({
                   cause,
@@ -112,7 +114,8 @@ const createCardanoConnector = ({
                 message: "No wallet connected",
                 operation: "cardano-sign-transaction",
               })
-            ),
+            );
+      },
       connect: async (args) => {
         config.emitter.emit("message", { type: "connecting" });
 
@@ -134,7 +137,7 @@ const createCardanoConnector = ({
 
         return wagmiConnectResult(
           args?.withCapabilities,
-          [address as Address],
+          [address],
           cardano.id
         );
       },
@@ -148,7 +151,7 @@ const createCardanoConnector = ({
 
         return connectedWallet
           .getUsedAddress()
-          .then((address) => [address.toBech32() as Address]);
+          .then((address) => [toWagmiAccount(address.toBech32())]);
       },
       switchChain: async () => cardano,
       getChainId: async () => cardano.id,
@@ -175,12 +178,17 @@ const createCardanoConnector = ({
 
 export const getCardanoConnectors = (): WalletList[number] => {
   const detected = BrowserWallet.getInstalledWallets().map(
-    (wallet): CardanoWallet => ({
-      id: wallet.id,
-      name: wallet.name,
-      iconUrl: wallet.icon,
-      installUrl: catalogue.find(({ id }) => id === wallet.id)?.installUrl,
-    })
+    (wallet): CardanoWallet => {
+      const installUrl = catalogue.find(
+        ({ id }) => id === wallet.id
+      )?.installUrl;
+      return {
+        id: wallet.id,
+        name: wallet.name,
+        iconUrl: wallet.icon,
+        ...(installUrl === undefined ? {} : { installUrl }),
+      };
+    }
   );
   const listed = [
     ...detected,
@@ -199,7 +207,9 @@ export const getCardanoConnectors = (): WalletList[number] => {
       availability: {
         _tag: "Injected",
         detect: Effect.sync(() => isInjected(wallet.id)),
-        installUrl: wallet.installUrl,
+        ...(wallet.installUrl === undefined
+          ? {}
+          : { installUrl: wallet.installUrl }),
       },
       chainGroup: {
         id: "cardano",
diff --git a/packages/widget/src/services/wallet/internal/adapters/cardano/driver.ts b/packages/widget/src/services/wallet/internal/adapters/cardano/driver.ts
index 3cf83180f..11ef5325a 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cardano/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cardano/driver.ts
@@ -4,7 +4,10 @@ import {
   WalletCapabilityUnavailableError,
   WalletSigningError,
 } from "../../../wallet-errors";
-import type { WalletSignedPayloadResult } from "../../../wallet-transactions";
+import {
+  decodeWalletSignedPayloadResult,
+  type WalletSignedPayloadResult,
+} from "../../../wallet-transactions";
 import { isCardanoConnector } from "./cardano-connector-meta";
 
 export const makeCardanoWalletDriver = ({
@@ -37,6 +40,6 @@ export const makeCardanoWalletDriver = ({
           )
         );
 
-      return { broadcasted: false, signedTx };
+      return yield* decodeWalletSignedPayloadResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains.ts
index d83a7a169..dd8312160 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains.ts
@@ -6,11 +6,13 @@ export type CosmosChain = (typeof chains)[number];
 export type WithWagmiName<T> = T & { readonly wagmiName: string };
 export type CosmosChainsAssets = WithWagmiName<CosmosChain>;
 
+export type CosmosChainEntry<Key extends WalletCosmosNetwork> = {
+  type: "cosmos";
+  network: Key;
+  wagmiChain: Chain;
+  chain: CosmosChainsAssets;
+};
+
 export type CosmosChainsMap = {
-  [Key in WalletCosmosNetwork]: {
-    type: "cosmos";
-    network: Key;
-    wagmiChain: Chain;
-    chain: CosmosChainsAssets;
-  };
+  [Key in WalletCosmosNetwork]: CosmosChainEntry<Key>;
 };
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/get-chain-registry.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/get-chain-registry.ts
index 06b11794f..09ec85558 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/get-chain-registry.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/get-chain-registry.ts
@@ -1,5 +1,5 @@
 import { assets, chains as RegistryChains } from "chain-registry";
-import { Array as EArray, Option } from "effect";
+import { Array as EArray, Option, Struct } from "effect";
 import {
   getProtocolChainIdentity,
   type WalletCosmosNetwork,
@@ -177,76 +177,91 @@ const assetMapper = (
 
 const pickGasPrices = (
   feeToken: NonNullable<CosmosChain["fees"]>["fee_tokens"][number]
-) => ({
-  denom: feeToken.denom,
-  low_gas_price: feeToken.low_gas_price,
-  average_gas_price: feeToken.average_gas_price,
-  high_gas_price: feeToken.high_gas_price,
-});
+) =>
+  Struct.pick(feeToken, [
+    "denom",
+    "low_gas_price",
+    "average_gas_price",
+    "high_gas_price",
+  ]);
 
 const trimChain = (
   chain: WithWagmiName<CosmosChain>
-): WithWagmiName<CosmosChain> =>
-  ({
-    chain_name: chain.chain_name,
-    pretty_name: chain.pretty_name,
-    chain_id: chain.chain_id,
-    bech32_prefix: chain.bech32_prefix,
-    slip44: chain.slip44,
-    fees: chain.fees
-      ? {
-          fee_tokens: chain.fees.fee_tokens.map(pickGasPrices),
-        }
-      : undefined,
-    staking: chain.staking
-      ? {
+): WithWagmiName<CosmosChain> => ({
+  ...Struct.pick(chain, [
+    "chain_name",
+    "pretty_name",
+    "chain_type",
+    "chain_id",
+    "bech32_prefix",
+    "slip44",
+    "logo_URIs",
+    "wagmiName",
+  ]),
+  ...(chain.fees
+    ? { fees: { fee_tokens: chain.fees.fee_tokens.map(pickGasPrices) } }
+    : {}),
+  ...(chain.staking
+    ? {
+        staking: {
           staking_tokens: chain.staking.staking_tokens.map((stakingToken) => ({
             denom: stakingToken.denom,
           })),
-        }
-      : undefined,
-    apis: {
-      rpc: chain.apis?.rpc?.map(({ address }) => ({ address })),
-      rest: chain.apis?.rest?.map(({ address }) => ({ address })),
-    },
-    codebase: chain.codebase
-      ? {
-          cosmos_sdk_version: chain.codebase.cosmos_sdk_version,
-          cosmwasm_enabled: chain.codebase.cosmwasm_enabled,
-          cosmwasm_version: chain.codebase.cosmwasm_version,
-          sdk: chain.codebase.sdk,
-          cosmwasm: chain.codebase.cosmwasm,
-        }
-      : undefined,
-    logo_URIs: chain.logo_URIs,
-    explorers: chain.explorers?.map(({ url }) => ({ url })),
-    wagmiName: chain.wagmiName,
-  }) as WithWagmiName<CosmosChain>;
+        },
+      }
+    : {}),
+  apis: {
+    ...(chain.apis?.rpc
+      ? { rpc: chain.apis.rpc.map(({ address }) => ({ address })) }
+      : {}),
+    ...(chain.apis?.rest
+      ? { rest: chain.apis.rest.map(({ address }) => ({ address })) }
+      : {}),
+  },
+  ...(chain.codebase
+    ? {
+        codebase: Struct.pick(chain.codebase, [
+          "cosmos_sdk_version",
+          "cosmwasm_enabled",
+          "cosmwasm_version",
+          "sdk",
+          "cosmwasm",
+        ]),
+      }
+    : {}),
+  ...(chain.explorers
+    ? {
+        explorers: chain.explorers.map((explorer) =>
+          Struct.pick(explorer, ["url"])
+        ),
+      }
+    : {}),
+});
 
-const trimAsset = (asset: Asset): Asset =>
-  ({
-    base: asset.base,
-    name: asset.name,
-    display: asset.display,
-    symbol: asset.symbol,
-    denom_units: asset.denom_units.map(({ denom, exponent }) => ({
-      denom,
-      exponent,
-    })),
-    logo_URIs: asset.logo_URIs,
-    coingecko_id: asset.coingecko_id,
-    type_asset: asset.type_asset,
-  }) as Asset;
+const trimAsset = (asset: Asset): Asset => ({
+  ...Struct.pick(asset, [
+    "base",
+    "name",
+    "display",
+    "symbol",
+    "logo_URIs",
+    "coingecko_id",
+    "type_asset",
+  ]),
+  denom_units: asset.denom_units.map(({ denom, exponent }) => ({
+    denom,
+    exponent,
+  })),
+});
 
 const trimAssetList = (
   assetList: WithWagmiName<AssetList & Pick<CosmosChain, "chain_id">>
-): WithWagmiName<AssetList & Pick<CosmosChain, "chain_id">> =>
-  ({
-    chain_name: assetList.chain_name,
-    assets: assetList.assets.map(trimAsset),
-    wagmiName: assetList.wagmiName,
-    chain_id: assetList.chain_id,
-  }) as WithWagmiName<AssetList & Pick<CosmosChain, "chain_id">>;
+): WithWagmiName<AssetList & Pick<CosmosChain, "chain_id">> => ({
+  chain_name: assetList.chain_name,
+  assets: assetList.assets.map(trimAsset),
+  wagmiName: assetList.wagmiName,
+  chain_id: assetList.chain_id,
+});
 
 const cosmosRegistryChains: WithWagmiName<CosmosChain>[] = chains
   .filter((c) => registryIdsSet.has(c.chain_id))
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/index.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/index.ts
index 09e3d3456..ecfab38b2 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/index.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/chains/index.ts
@@ -1,40 +1,47 @@
+import { Schema } from "effect";
 import { mainnet } from "viem/chains";
-import type { Network } from "../../../../../../domain/network/network";
+import { Network } from "../../../../../../domain/network/network";
 import type { Chain } from "../../../../wallet-descriptors";
 import {
   getWalletNetworkLogo,
   getWalletTokenLogo,
 } from "../../../runtime/assets";
+import { toWagmiChainId } from "../../../wagmi-seam";
 import type { CosmosChainsAssets } from "../chains";
 
+const isNetwork = Schema.is(Network);
+
 const getChainIconUrl = (chain: CosmosChainsAssets) => {
   if (chain.chain_id === "osmosis-1") {
     return getWalletNetworkLogo("osmosis");
   }
   if (chain.chain_id === "mars-1") return getWalletTokenLogo("mars");
-  return (
-    chain.logo_URIs?.png ??
-    chain.logo_URIs?.svg ??
-    getWalletNetworkLogo(chain.chain_name as Network)
-  );
+  const registryLogo = chain.logo_URIs?.png ?? chain.logo_URIs?.svg;
+  if (registryLogo !== undefined) return registryLogo;
+  return isNetwork(chain.chain_name)
+    ? getWalletNetworkLogo(chain.chain_name)
+    : undefined;
 };
 
 export const getWagmiChain = (
   chain: CosmosChainsAssets
-): Chain & { cosmosChainName: string } => ({
-  id: chain.chain_id as unknown as number,
-  iconUrl: getChainIconUrl(chain),
+): Chain & { cosmosChainName: string } => {
+  const iconUrl = getChainIconUrl(chain);
+  return {
+    id: toWagmiChainId(chain.chain_id),
+    ...(iconUrl === undefined ? {} : { iconUrl }),
 
-  name: chain.wagmiName,
-  cosmosChainName: chain.chain_name,
-  // TODO: change this
-  nativeCurrency: mainnet.nativeCurrency,
-  rpcUrls: {
-    default: {
-      http: chain.apis?.rpc?.map((r) => r.address) ?? [""],
-    },
-    public: {
-      http: chain.apis?.rpc?.map((r) => r.address) ?? [""],
+    name: chain.wagmiName,
+    cosmosChainName: chain.chain_name,
+    // TODO: change this
+    nativeCurrency: mainnet.nativeCurrency,
+    rpcUrls: {
+      default: {
+        http: chain.apis?.rpc?.map((r) => r.address) ?? [""],
+      },
+      public: {
+        http: chain.apis?.rpc?.map((r) => r.address) ?? [""],
+      },
     },
-  },
-});
+  };
+};
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/config.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/config.ts
index 14001a620..7d0955b46 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/config.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/config.ts
@@ -1,12 +1,19 @@
-import { Effect, Record } from "effect";
+import { Effect } from "effect";
 import type { WalletAddress } from "../../../../../domain/identity/identifiers";
 import type { Network } from "../../../../../domain/network/network";
-import { walletCosmosNetworks } from "../../../../../domain/wallet/network";
+import {
+  type WalletCosmosNetwork,
+  walletCosmosNetworks,
+} from "../../../../../domain/wallet/network";
 import type { Chain, WalletList } from "../../../wallet-descriptors";
 import { WalletIntegrationError } from "../../../wallet-errors";
 import type { WalletConnectProtocol } from "../../platform/wallet-connect-protocol";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
-import type { CosmosChainsMap } from "./chains";
+import type {
+  CosmosChainEntry,
+  CosmosChainsAssets,
+  CosmosChainsMap,
+} from "./chains";
 import { getWagmiChain } from "./chains/index";
 import type { CosmosWalletManagerOptions } from "./wallet-manager";
 
@@ -78,6 +85,7 @@ const loadCosmosConnector = Effect.fn("loadCosmosConnector")(function* ({
     Effect.tryPromise(() => walletManager.onMounted()),
     {
       onFailure: () => {
+        // biome-ignore lint/nursery/noUnsafeTypeAssertion: @cosmos-kit/core declares _restoreAccounts private and untyped; it is the only restore path after a failed mount
         const restorableWalletManager = walletManager as unknown as {
           _restoreAccounts: () => Promise<void>;
         };
@@ -93,6 +101,23 @@ const loadCosmosConnector = Effect.fn("loadCosmosConnector")(function* ({
   return connector;
 });
 
+const makeCosmosChainEntry = <Key extends WalletCosmosNetwork>(
+  network: Key,
+  chain: CosmosChainsAssets
+): CosmosChainEntry<Key> => ({
+  type: "cosmos",
+  network,
+  chain,
+  wagmiChain: getWagmiChain(chain),
+});
+
+const setCosmosChainEntry = <Key extends WalletCosmosNetwork>(
+  map: { [Network in Key]?: CosmosChainEntry<Network> },
+  entry: CosmosChainEntry<Key>
+) => {
+  map[entry.network] = entry;
+};
+
 const queryFn = ({
   buildConnectors,
   enabledNetworks,
@@ -138,27 +163,16 @@ const queryFn = ({
     });
     const chainsToUseSet = new Set(chainsToUse);
 
-    const cosmosChainsMap: Partial<CosmosChainsMap> = Record.filter(
-      registry.cosmosRegistryChains.reduce((acc, next) => {
-        const network = registry.registryIdsToSKCosmosNetworks[next.chain_id];
-
-        if (!network || !chainsToUseSet.has(network)) {
-          return acc;
-        }
-
-        return {
-          // biome-ignore lint: false
-          ...acc,
-          [network]: {
-            type: "cosmos",
-            network,
-            chain: next,
-            wagmiChain: getWagmiChain(next),
-          },
-        };
-      }, {} as CosmosChainsMap),
-      (v) => networks.has(v.network)
-    );
+    const cosmosChainsMap: Partial<CosmosChainsMap> = {};
+    for (const next of registry.cosmosRegistryChains) {
+      const network = registry.registryIdsToSKCosmosNetworks[next.chain_id];
+      if (network && chainsToUseSet.has(network)) {
+        setCosmosChainEntry(
+          cosmosChainsMap,
+          makeCosmosChainEntry(network, next)
+        );
+      }
+    }
 
     const cosmosWagmiChains = Object.values(cosmosChainsMap).map(
       (value) => value.wagmiChain
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/cosmos-connector.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/cosmos-connector.ts
index 0c2ccc8a4..230dc5658 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/cosmos-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/cosmos-connector.ts
@@ -2,7 +2,7 @@ import { decodeSignature } from "@cosmjs/amino";
 import { fromHex, toBase64, toHex } from "@cosmjs/encoding";
 import { SignDoc, TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { Array as EArray, Effect, Option, Schema, Stream } from "effect";
-import type { Address, Chain } from "viem";
+import type { Chain } from "viem";
 import type { CreateConnectorFn } from "wagmi";
 import { createConnector } from "wagmi";
 import {
@@ -15,8 +15,14 @@ import type {
   WalletDescriptor,
 } from "../../../wallet-descriptors";
 import { WalletIntegrationError } from "../../../wallet-errors";
+import { WalletConnectTopic } from "../../platform/wallet-connect-protocol";
 import { getWalletNetworkLogo } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import {
+  fromWagmiChainId,
+  toWagmiAccounts,
+  toWagmiChainId,
+} from "../../wagmi-seam";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
 import type { CosmosChainsAssets, CosmosChainsMap } from "./chains";
@@ -32,7 +38,7 @@ export const cosmosWalletConnectStorageKey = "cosmos.walletConnect" as const;
 
 export const CosmosWalletConnectRecord = Schema.Struct({
   connectorId: Schema.String,
-  topic: Schema.String,
+  topic: WalletConnectTopic,
   chainId: Schema.String,
   address: Schema.String,
 });
@@ -83,8 +89,6 @@ export type CosmosWallet = Readonly<{
   ) => CosmosWalletSession;
 }>;
 
-const cosmosWagmiChainId = (chainId: string) => chainId as unknown as number;
-
 export const createCosmosConnector = ({
   wallet,
   cosmosChainsMap,
@@ -154,13 +158,16 @@ export const createCosmosConnector = ({
       ) => {
         config.emitter.emit("message", { type: "connecting" });
 
+        const requestedChainId =
+          args?.chainId === undefined
+            ? undefined
+            : fromWagmiChainId(args.chainId);
         const next = args?.isReconnecting
           ? await session.restore()
           : await session.connect(
               // The host's initial chain, when it is one of this connector's chains.
-              chains.find(
-                (chain) => cosmosWagmiChainId(chain.chain_id) === args?.chainId
-              ) ?? currentChain
+              chains.find((chain) => chain.chain_id === requestedChainId) ??
+                currentChain
             );
         currentChain =
           chains.find((chain) => chain.chain_id === next.wallet.chainId) ??
@@ -171,8 +178,8 @@ export const createCosmosConnector = ({
 
         return wagmiConnectResult(
           args?.withCapabilities,
-          [next.address as Address],
-          cosmosWagmiChainId(next.wallet.chainId)
+          [next.address],
+          toWagmiChainId(next.wallet.chainId)
         );
       };
 
@@ -180,9 +187,8 @@ export const createCosmosConnector = ({
         chainId,
       }) => {
         const wagmiChain = config.chains.find((c) => c.id === chainId);
-        const chain = chains.find(
-          (chain) => cosmosWagmiChainId(chain.chain_id) === chainId
-        );
+        const routingId = fromWagmiChainId(chainId);
+        const chain = chains.find((chain) => chain.chain_id === routingId);
 
         if (!wagmiChain || !chain) throw new Error("Chain not found");
 
@@ -192,13 +198,13 @@ export const createCosmosConnector = ({
         await persistAccountPublicKey(next.wallet);
 
         onChainChanged(chainId.toString());
-        onAccountsChanged([next.address as Address]);
+        onAccountsChanged([next.address]);
 
         return wagmiChain;
       };
 
       const { onAccountsChanged, onChainChanged, onDisconnect } =
-        makeWagmiConnectorEvents(config.emitter, cosmosWagmiChainId);
+        makeWagmiConnectorEvents(config.emitter);
 
       const signTransaction = ({
         cw,
@@ -252,7 +258,7 @@ export const createCosmosConnector = ({
         onChainChanged,
         onDisconnect,
         getAccounts: async () =>
-          connection ? [connection.address as Address] : [],
+          toWagmiAccounts(connection ? [connection.address] : []),
         isAuthorized: async () => {
           try {
             return await session.isAuthorized();
@@ -260,7 +266,7 @@ export const createCosmosConnector = ({
             return false;
           }
         },
-        getChainId: async () => cosmosWagmiChainId(currentChain.chain_id),
+        getChainId: async () => toWagmiChainId(currentChain.chain_id),
         getProvider: async () => ({}),
         disconnect: async () => {
           setConnection(null);
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/driver.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/driver.ts
index dbf545a91..9968f6ca1 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/driver.ts
@@ -4,6 +4,7 @@ import {
   WalletCapabilityUnavailableError,
   WalletSigningError,
 } from "../../../wallet-errors";
+import { decodeWalletSignedPayloadResult } from "../../../wallet-transactions";
 import {
   type CosmosChainWallet,
   isCosmosConnector,
@@ -34,6 +35,6 @@ export const makeCosmosWalletDriver = ({
           )
         );
 
-      return { broadcasted: false, signedTx };
+      return yield* decodeWalletSignedPayloadResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/extension-wallet.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/extension-wallet.ts
index 093e14412..2615ac864 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/extension-wallet.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/extension-wallet.ts
@@ -103,6 +103,9 @@ export const makeExtensionWallet = (
       throw new WalletNotAvailableError({ walletId: walletInfo.name });
     }
   };
+  const installUrl = walletInfo.downloads?.find(
+    (download) => download.device === "desktop"
+  )?.link;
 
   return {
     id: walletInfo.name,
@@ -113,9 +116,7 @@ export const makeExtensionWallet = (
       detect: Effect.tryPromise(detectClient).pipe(
         Effect.orElseSucceed(() => false)
       ),
-      installUrl: walletInfo.downloads?.find(
-        (download) => download.device === "desktop"
-      )?.link,
+      ...(installUrl === undefined ? {} : { installUrl }),
     },
     makeSession: ({ connectorId, storage }) => {
       /**
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-connect.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-connect.ts
index 9491a11cf..1539cface 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-connect.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-connect.ts
@@ -1,9 +1,13 @@
 import type { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { Effect, Option, Schema } from "effect";
 import { WalletIntegrationError } from "../../../wallet-errors";
-import type {
-  WalletConnectProtocol,
-  WalletConnectSession,
+import {
+  type CaipChainId,
+  caipAddresses,
+  caipChainId,
+  type WalletConnectProtocol,
+  type WalletConnectSession,
+  type WalletConnectTopic,
 } from "../../platform/wallet-connect-protocol";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
 import type { CosmosChainsAssets } from "./chains";
@@ -49,11 +53,11 @@ const SignDirectResponse = Schema.Struct({
 const cosmosError = (operation: string, message: string, cause?: unknown) =>
   new WalletIntegrationError({ cause, message, operation });
 
-/** The bare address of `session`'s CAIP-10 account on `chainId`. */
-const sessionAddress = (session: WalletConnectSession, chainId: string) =>
-  Option.fromNullishOr(
-    session.accounts.find((account) => account.startsWith(`cosmos:${chainId}:`))
-  ).pipe(Option.map((account) => account.slice(`cosmos:${chainId}:`.length)));
+/** The bare address of `session`'s account on `caipChain`. */
+const sessionAddress = (
+  session: WalletConnectSession,
+  caipChain: CaipChainId
+) => Option.fromNullishOr(caipAddresses(session.accounts, caipChain)[0]);
 
 const hasRequiredMethods = (session: WalletConnectSession) =>
   requiredMethods.every((method) => session.methods.includes(method));
@@ -61,19 +65,21 @@ const hasRequiredMethods = (session: WalletConnectSession) =>
 const makeChainWallet = ({
   address,
   chainId,
+  caipChain,
   protocol,
   topic,
 }: {
   readonly address: string;
   readonly chainId: string;
+  readonly caipChain: CaipChainId;
   readonly protocol: WalletConnectProtocol;
-  readonly topic: string;
+  readonly topic: WalletConnectTopic;
 }): CosmosChainWallet => ({
   chainId,
   getAccount: protocol
     .request({
       topic,
-      chainId: `cosmos:${chainId}`,
+      chainId: caipChain,
       method: "cosmos_getAccounts",
       params: {},
       response: Accounts,
@@ -100,7 +106,7 @@ const makeChainWallet = ({
       Effect.flatMap((wireSignDoc) =>
         protocol.request({
           topic,
-          chainId: `cosmos:${chainId}`,
+          chainId: caipChain,
           method: "cosmos_signDirect",
           params: { signerAddress: address, signDoc: wireSignDoc },
           response: SignDirectResponse,
@@ -110,7 +116,7 @@ const makeChainWallet = ({
 });
 
 type OwnedSession = Readonly<{
-  topic: string;
+  topic: WalletConnectTopic;
   address: string;
   unsubscribe: () => void;
 }>;
@@ -142,11 +148,13 @@ const makeSession = ({
   const activate = async ({
     address,
     chainId,
+    caipChain,
     topic,
   }: {
     readonly address: string;
     readonly chainId: string;
-    readonly topic: string;
+    readonly caipChain: CaipChainId;
+    readonly topic: WalletConnectTopic;
   }): Promise<CosmosWalletConnection> => {
     const attempt = ++activation;
     if (owned.get(chainId)?.topic !== topic) {
@@ -182,11 +190,15 @@ const makeSession = ({
     }
     return {
       address,
-      wallet: makeChainWallet({ address, chainId, protocol, topic }),
+      wallet: makeChainWallet({ address, chainId, caipChain, protocol, topic }),
     };
   };
 
-  const liveSession = (topic: string, account: string) =>
+  const liveSession = (
+    topic: WalletConnectTopic,
+    caipChain: CaipChainId,
+    address: string
+  ) =>
     protocol
       .sessions("cosmos")
       .pipe(
@@ -194,7 +206,7 @@ const makeSession = ({
           sessions.some(
             (session) =>
               session.topic === topic &&
-              session.accounts.includes(account) &&
+              caipAddresses(session.accounts, caipChain).includes(address) &&
               hasRequiredMethods(session)
           )
         )
@@ -209,16 +221,27 @@ const makeSession = ({
       Option.getOrUndefined
     );
     if (!record) return undefined;
+    const caipChain = Option.getOrUndefined(
+      caipChainId("cosmos", record.chainId)
+    );
+    if (!caipChain) return undefined;
     const live = await runWalletEffect(
-      liveSession(record.topic, `cosmos:${record.chainId}:${record.address}`)
+      liveSession(record.topic, caipChain, record.address)
     );
-    return live ? record : undefined;
+    return live ? { ...record, caipChain } : undefined;
   };
 
   return {
     ready: async () => {},
     connect: async (chain: CosmosChainsAssets) => {
       const chainId = chain.chain_id;
+      const caipChain = Option.getOrUndefined(caipChainId("cosmos", chainId));
+      if (!caipChain) {
+        throw cosmosError(
+          "cosmos-connect",
+          "Cosmos chain id is not a valid WalletConnect chain"
+        );
+      }
       // A live session already holding this chain's account, e.g. approved
       // before a reload; prefer the one this connector last used for it.
       const reusable = (
@@ -226,7 +249,7 @@ const makeSession = ({
       ).flatMap((session) =>
         hasRequiredMethods(session)
           ? Option.toArray(
-              Option.map(sessionAddress(session, chainId), (address) => ({
+              Option.map(sessionAddress(session, caipChain), (address) => ({
                 address,
                 topic: session.topic,
               }))
@@ -236,23 +259,23 @@ const makeSession = ({
       const existing =
         reusable.find(({ topic }) => topic === owned.get(chainId)?.topic) ??
         reusable[0];
-      if (existing) return activate({ ...existing, chainId });
+      if (existing) return activate({ ...existing, chainId, caipChain });
       const session = await runWalletEffect(
         protocol.connect({
           namespace: "cosmos",
-          chains: [`cosmos:${chainId}`],
+          chains: [caipChain],
           requiredMethods,
           events: ["chainChanged", "accountsChanged"],
         })
       );
-      const address = Option.getOrUndefined(sessionAddress(session, chainId));
+      const address = Option.getOrUndefined(sessionAddress(session, caipChain));
       if (!address) {
         throw cosmosError(
           "cosmos-connect",
           "Wallet did not approve an account for this Cosmos chain"
         );
       }
-      return activate({ address, chainId, topic: session.topic });
+      return activate({ address, chainId, caipChain, topic: session.topic });
     },
     restore: async () => {
       const record = await restorable();
diff --git a/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-manager.ts b/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-manager.ts
index 88554892a..21708145c 100644
--- a/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-manager.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/cosmos/wallet-manager.ts
@@ -62,17 +62,12 @@ export const getWalletManager = ({
         walletConnectProtocol,
       }),
   ];
-  const { chains, cosmosWagmiChains } = Object.values(cosmosChainsMap).reduce(
-    (acc, next) => {
-      acc.cosmosWagmiChains.push(next.wagmiChain);
-      acc.chains.push(next.chain);
-
-      return acc;
-    },
-    {
-      cosmosWagmiChains: [] as Chain[],
-      chains: [] as CosmosChainsAssets[],
-    }
+  const cosmosChainEntries = Object.values(cosmosChainsMap);
+  const cosmosWagmiChains: Chain[] = cosmosChainEntries.map(
+    (entry) => entry.wagmiChain
+  );
+  const chains: CosmosChainsAssets[] = cosmosChainEntries.map(
+    (entry) => entry.chain
   );
 
   chains.sort((a) =>
@@ -103,7 +98,7 @@ export const getWalletManager = ({
       false,
       true,
       undefined,
-      cosmosAssets as ConstructorParameters<typeof WalletManager>[6]
+      cosmosAssets
     ),
   };
 };
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/chains.ts b/packages/widget/src/services/wallet/internal/adapters/evm/chains.ts
index 1f5ee963c..5820b3092 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/chains.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/chains.ts
@@ -29,12 +29,14 @@ import {
 import { getNetworkLogo } from "../../../network-assets";
 import type { Chain } from "../../../wallet-descriptors";
 
+type EvmChainEntry<Key extends WalletEvmNetwork> = {
+  type: "evm";
+  network: Key;
+  wagmiChain: Chain;
+};
+
 export type EvmChainsMap = {
-  [Key in WalletEvmNetwork]: {
-    type: "evm";
-    network: Key;
-    wagmiChain: Chain;
-  };
+  [Key in WalletEvmNetwork]: EvmChainEntry<Key>;
 };
 
 const evmChainConfiguration: EvmChainsMap = {
@@ -276,15 +278,43 @@ const evmChainConfiguration: EvmChainsMap = {
   },
 };
 
-export const evmChainsMap = Object.fromEntries(
-  Object.entries(evmChainConfiguration).map(([network, configuration]) => [
-    network,
-    {
-      ...configuration,
-      wagmiChain: {
-        ...configuration.wagmiChain,
-        id: getWalletRoutingId(network as WalletEvmNetwork),
-      },
-    },
-  ])
-) as EvmChainsMap;
+const withWalletRoutingId = <Key extends WalletEvmNetwork>(
+  entry: EvmChainEntry<Key>
+): EvmChainEntry<Key> => ({
+  ...entry,
+  wagmiChain: {
+    ...entry.wagmiChain,
+    id: getWalletRoutingId(entry.network),
+  },
+});
+
+const configured = evmChainConfiguration;
+
+export const evmChainsMap: EvmChainsMap = {
+  ethereum: withWalletRoutingId(configured.ethereum),
+  polygon: withWalletRoutingId(configured.polygon),
+  optimism: withWalletRoutingId(configured.optimism),
+  arbitrum: withWalletRoutingId(configured.arbitrum),
+  "avalanche-c": withWalletRoutingId(configured["avalanche-c"]),
+  celo: withWalletRoutingId(configured.celo),
+  harmony: withWalletRoutingId(configured.harmony),
+  viction: withWalletRoutingId(configured.viction),
+  binance: withWalletRoutingId(configured.binance),
+  base: withWalletRoutingId(configured.base),
+  linea: withWalletRoutingId(configured.linea),
+  core: withWalletRoutingId(configured.core),
+  sonic: withWalletRoutingId(configured.sonic),
+  "ethereum-hoodi": withWalletRoutingId(configured["ethereum-hoodi"]),
+  "ethereum-goerli": withWalletRoutingId(configured["ethereum-goerli"]),
+  "ethereum-sepolia": withWalletRoutingId(configured["ethereum-sepolia"]),
+  unichain: withWalletRoutingId(configured.unichain),
+  gnosis: withWalletRoutingId(configured.gnosis),
+  plasma: withWalletRoutingId(configured.plasma),
+  katana: withWalletRoutingId(configured.katana),
+  hyperevm: withWalletRoutingId(configured.hyperevm),
+  "monad-testnet": withWalletRoutingId(configured["monad-testnet"]),
+  monad: withWalletRoutingId(configured.monad),
+  robinhood: withWalletRoutingId(configured.robinhood),
+  "robinhood-testnet": withWalletRoutingId(configured["robinhood-testnet"]),
+  pharos: withWalletRoutingId(configured.pharos),
+};
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/driver.ts b/packages/widget/src/services/wallet/internal/adapters/evm/driver.ts
index 3587a3e60..319049970 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/driver.ts
@@ -1,4 +1,4 @@
-import { Effect } from "effect";
+import { Effect, Struct } from "effect";
 import type { Address } from "viem";
 import type { Connector } from "wagmi";
 import { WalletDecodeError } from "../../../wallet-errors";
@@ -17,19 +17,23 @@ const prepareEvmTransaction = (
     data: decodedTx.data,
     gas: decodedTx.gasLimit,
     to: decodedTx.to,
-    value: decodedTx.value,
+    ...(decodedTx.value === undefined ? {} : { value: decodedTx.value }),
   };
 
   return decodedTx.maxFeePerGas !== undefined
     ? {
         ...transaction,
         maxFeePerGas: decodedTx.maxFeePerGas,
-        maxPriorityFeePerGas: decodedTx.maxPriorityFeePerGas,
+        ...(decodedTx.maxPriorityFeePerGas === undefined
+          ? {}
+          : { maxPriorityFeePerGas: decodedTx.maxPriorityFeePerGas }),
         type: "eip1559" as const,
       }
     : {
         ...transaction,
-        gasPrice: decodedTx.gasPrice,
+        ...(decodedTx.gasPrice === undefined
+          ? {}
+          : { gasPrice: decodedTx.gasPrice }),
         type: "legacy" as const,
       };
 };
@@ -57,23 +61,23 @@ export const makeEvmWalletDriver = ({
 }: {
   readonly sendTransaction: WagmiActions["sendEvmTransaction"];
 }) => ({
-  signTransaction: ({
-    account,
-    connector,
-    family,
-    tx,
-  }: {
+  signTransaction: (request: {
     readonly account?: Address;
     readonly connector?: Connector;
     readonly family: "borrow" | "yield";
     readonly tx: string;
   }) => {
     const decode =
-      family === "borrow" ? decodeBorrowEvmTransaction : decodeEvmTransaction;
+      request.family === "borrow"
+        ? decodeBorrowEvmTransaction
+        : decodeEvmTransaction;
 
-    return decode(tx).pipe(
+    return decode(request.tx).pipe(
       Effect.flatMap((input) =>
-        sendTransaction({ ...input, account, connector })
+        sendTransaction({
+          ...input,
+          ...Struct.pick(request, ["account", "connector"]),
+        })
       )
     );
   },
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/finery-wallet-list/index.ts b/packages/widget/src/services/wallet/internal/adapters/evm/finery-wallet-list/index.ts
index 2533c7098..04eefe699 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/finery-wallet-list/index.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/finery-wallet-list/index.ts
@@ -1,5 +1,4 @@
 import { createStore } from "mipd";
-import type { EIP1193Provider } from "viem";
 import { injected } from "wagmi";
 import { evmChainGroup } from "../../../../../../services/wallet/evm-chain-group";
 import type { Chain, WalletList } from "../../../../wallet-descriptors";
@@ -85,10 +84,6 @@ const safeWalletWC: CommonWalletOptions = {
   chainGroup: evmChainGroup,
 };
 
-const asEip1193Provider = (
-  provider: Record<string, unknown> | undefined
-): EIP1193Provider | undefined => provider as EIP1193Provider | undefined;
-
 export const createFineryWallets = (
   evmChains: Chain[],
   wallets: EvmWallets
@@ -100,7 +95,7 @@ export const createFineryWallets = (
   // listening, so detection sees extensions that appear after bootstrap.
   const store = createStore();
   const announcedProvider = (rdns: string) =>
-    asEip1193Provider(store.findProvider({ rdns })?.provider);
+    store.findProvider({ rdns })?.provider;
 
   const institutionalExtension =
     ({
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/injected-availability.ts b/packages/widget/src/services/wallet/internal/adapters/evm/injected-availability.ts
index 439f62791..eb6270308 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/injected-availability.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/injected-availability.ts
@@ -17,7 +17,7 @@ export const announcedWalletAvailability = ({
 }): WalletAvailability => ({
   _tag: "Injected",
   detect: Effect.sync(() => store.findProvider({ rdns }) !== undefined),
-  installUrl,
+  ...(installUrl === undefined ? {} : { installUrl }),
 });
 
 /**
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/transaction.ts b/packages/widget/src/services/wallet/internal/adapters/evm/transaction.ts
index ef5423d0d..69b8b72d6 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/transaction.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/transaction.ts
@@ -6,27 +6,25 @@ const HexString = Schema.declare<Hex>(
   (input): input is Hex => typeof input === "string" && input.startsWith("0x"),
   { expected: "a 0x-prefixed hex string" }
 );
-const EvmAddress = Schema.declare<Address>(
-  (input): input is Address =>
-    typeof input === "string" && input.startsWith("0x"),
-  { expected: "a 0x-prefixed address" }
-);
+/** An EVM account as wallets and the API quote it: a 0x-prefixed string. */
+export const isEvmAddress = (input: unknown): input is Address =>
+  typeof input === "string" && input.startsWith("0x");
+const EvmAddress = Schema.declare<Address>(isEvmAddress, {
+  expected: "a 0x-prefixed address",
+});
 
 /**
  * EVM nodes quote transaction quantities as hex, while the API quotes them as
  * decimal strings or safe integers.
  */
-const HexQuantity = Schema.String.check(
-  Schema.makeFilter((value) =>
-    isHex(value) && value.length > 2
-      ? true
-      : "expected a 0x-prefixed hex quantity"
-  )
-).pipe(
+const HexQuantity = Schema.String.pipe(
+  Schema.refine((value): value is Hex => isHex(value) && value.length > 2, {
+    message: "expected a 0x-prefixed hex quantity",
+  }),
   Schema.decodeTo(
     Schema.BigInt,
     SchemaTransformation.transform({
-      decode: (value) => hexToBigInt(value as Hex),
+      decode: (value) => hexToBigInt(value),
       encode: (value) => numberToHex(value),
     })
   )
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/utils.ts b/packages/widget/src/services/wallet/internal/adapters/evm/utils.ts
index dc843709b..11d87a7b8 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/utils.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/utils.ts
@@ -1,3 +1,4 @@
+import { Array as EArray } from "effect";
 import { createConnector } from "wagmi";
 import type { Chain, WalletList } from "../../../wallet-descriptors";
 
@@ -15,7 +16,7 @@ export const passCorrectChainsToWallet =
         createConnector((config) =>
           w.createConnector(walletDetails)({
             ...config,
-            chains: chains as [Chain, ...Chain[]],
+            chains: EArray.isArrayNonEmpty(chains) ? chains : config.chains,
           })
         ),
     };
diff --git a/packages/widget/src/services/wallet/internal/adapters/evm/wallets.ts b/packages/widget/src/services/wallet/internal/adapters/evm/wallets.ts
index 7ecd025e3..c8c79c29d 100644
--- a/packages/widget/src/services/wallet/internal/adapters/evm/wallets.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/evm/wallets.ts
@@ -14,7 +14,11 @@ import type {
   WalletDescriptor,
 } from "../../../wallet-descriptors";
 import { WalletIntegrationError } from "../../../wallet-errors";
-import type { WalletConnectPresentation } from "../../platform/wallet-connect-presentation";
+import {
+  makeWalletConnectConnection,
+  type WalletConnectConnection,
+  type WalletConnectPresentation,
+} from "../../platform/wallet-connect-presentation";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import coinbaseWalletIcon from "./icons/coinbase-wallet.svg";
@@ -53,16 +57,16 @@ type WalletConnectRequest = {
 };
 type SharedWalletConnectConnection = {
   request: WalletConnectRequest;
-  readonly effect: Effect.Effect<
-    { readonly accounts: readonly Address[]; readonly chainId: number },
-    WalletIntegrationError
-  >;
+  readonly connection: WalletConnectConnection<{
+    readonly accounts: readonly Address[];
+    readonly chainId: number;
+  }>;
 };
 type SharedWalletConnectFactory = {
   readonly factory: WalletConnectFactory;
   readonly getConnection: (
     request: WalletConnectRequest
-  ) => SharedWalletConnectConnection["effect"];
+  ) => SharedWalletConnectConnection["connection"];
   readonly release: (request: WalletConnectRequest) => void;
 };
 type GetWalletConnectFactory = (
@@ -108,24 +112,26 @@ export const createEvmWallets = (
         activeRequest = request;
         if (sharedConnection) {
           sharedConnection.request = request;
-          return sharedConnection.effect;
+          return sharedConnection.connection;
         }
-        const connection: SharedWalletConnectConnection = {
+        const shared: SharedWalletConnectConnection = {
           request,
-          effect: Effect.suspend(() => {
-            const { connector, parameters, failure } = connection.request;
-            return Effect.tryPromise({
-              try: () =>
-                connector.connect({
-                  ...parameters,
-                  withCapabilities: false,
-                }),
-              catch: failure,
-            });
-          }),
+          connection: makeWalletConnectConnection(
+            Effect.suspend(() => {
+              const { connector, parameters, failure } = shared.request;
+              return Effect.tryPromise({
+                try: () =>
+                  connector.connect({
+                    ...parameters,
+                    withCapabilities: false,
+                  }),
+                catch: failure,
+              });
+            })
+          ),
         };
-        sharedConnection = connection;
-        return connection.effect;
+        sharedConnection = shared;
+        return shared.connection;
       },
     };
     return sharedFactory;
@@ -240,10 +246,7 @@ export const injectedWallet: CreateWalletDescriptor = () => ({
   chainGroup: evmChainGroup,
   createConnector: (details) =>
     withWalletDetails(
-      failWhenProviderMissing(
-        "injected",
-        injected({ shimDisconnect: true }) as CreateConnectorFn
-      ),
+      failWhenProviderMissing("injected", injected({ shimDisconnect: true })),
       details
     ),
   iconBackground: "transparent",
@@ -387,7 +390,16 @@ const createMetaMaskWallet =
           const connector = await selectConnector();
           return connector.isAuthorized();
         },
-        switchChain: (parameters) => activeConnector.switchChain!(parameters),
+        switchChain: (parameters) => {
+          const connector = activeConnector;
+          if (!connector.switchChain) {
+            throw new WalletIntegrationError({
+              message: "MetaMask connector cannot switch chains",
+              operation: "evm-wallet-switch-chain",
+            });
+          }
+          return connector.switchChain(parameters);
+        },
         onAccountsChanged: (accounts) =>
           activeConnector.onAccountsChanged(accounts),
         onChainChanged: (chainId) => activeConnector.onChainChanged(chainId),
@@ -414,7 +426,10 @@ export const coinbaseWallet: CreateWalletDescriptor = ({
   chainGroup: evmChainGroup,
   createConnector: (details) =>
     ((config) => ({
-      ...createCoinbaseConnector({ appName, appLogoUrl: appIcon })(config),
+      ...createCoinbaseConnector({
+        appName,
+        ...(appIcon === undefined ? {} : { appLogoUrl: appIcon }),
+      })(config),
       walletDetails: details.walletDetails,
     })) satisfies ReturnType<WalletDescriptor["createConnector"]>,
   iconBackground: "#0052FF",
diff --git a/packages/widget/src/services/wallet/internal/adapters/external-provider/driver.ts b/packages/widget/src/services/wallet/internal/adapters/external-provider/driver.ts
index c9c096c6d..7addc926a 100644
--- a/packages/widget/src/services/wallet/internal/adapters/external-provider/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/external-provider/driver.ts
@@ -1,6 +1,6 @@
 import { Effect, Result, Schema } from "effect";
-import type { Address } from "viem";
 import type { Connector } from "wagmi";
+import type { WalletSignature } from "../../../../../domain/identity/identifiers";
 import type { Network } from "../../../../../domain/network/network";
 import { isEvmWalletNetwork } from "../../../../../domain/wallet/network";
 import type {
@@ -33,6 +33,7 @@ import { decodeWalletPayload } from "../decode-wallet-payload";
 import {
   decodeAndPrepareBorrowEvmTransaction,
   decodeAndPrepareEvmTransaction,
+  isEvmAddress,
 } from "../evm/transaction";
 import {
   normalizeSolanaTransactionToHex,
@@ -73,16 +74,21 @@ const tryResult = <A>(
   }
 };
 
+const notEvmAccount = new WalletDecodeError({
+  cause: "Connected account is not an EVM address",
+});
+
 const decodeExternalProviderTransaction = ({
   address,
   network,
   tx,
 }: {
-  readonly address: Address;
+  readonly address: string;
   readonly network: Network;
   readonly tx: string;
 }): Effect.Effect<SKTx, WalletDecodeError> => {
   if (isEvmWalletNetwork(network)) {
+    if (!isEvmAddress(address)) return Effect.fail(notEvmAccount);
     return decodeAndPrepareEvmTransaction({ address, tx }).pipe(
       Effect.map((decodedTx): SKTx => ({ type: "evm", tx: decodedTx })),
       Effect.mapError((cause) => new WalletDecodeError({ cause }))
@@ -119,7 +125,7 @@ const decodeExternalProviderTransaction = ({
         Schema.fromJsonString(unsignedTronTransactionCodec),
         tx
       ).pipe(
-        Result.map((decodedTx) => ({ type: "tron", tx: decodedTx }) as TronTx)
+        Result.map((decodedTx): TronTx => ({ type: "tron", tx: decodedTx }))
       );
     }
 
@@ -129,7 +135,7 @@ const decodeExternalProviderTransaction = ({
         tx
       ).pipe(
         Result.map(
-          (decodedTx) => ({ type: "bittensor", tx: decodedTx }) as BittensorTx
+          (decodedTx): BittensorTx => ({ type: "bittensor", tx: decodedTx })
         )
       );
     }
@@ -147,7 +153,7 @@ const decodeBorrowExternalProviderTransaction = ({
   network,
   tx,
 }: {
-  readonly address: Address;
+  readonly address: string;
   readonly network: Network;
   readonly tx: string;
 }): Effect.Effect<SKBorrowTx, WalletDecodeError> => {
@@ -156,6 +162,7 @@ const decodeBorrowExternalProviderTransaction = ({
       new WalletDecodeError({ cause: "Unsupported Borrow network" })
     );
   }
+  if (!isEvmAddress(address)) return Effect.fail(notEvmAccount);
 
   return decodeAndPrepareBorrowEvmTransaction({ address, tx }).pipe(
     Effect.map((decodedTx): SKBorrowTx => ({ type: "evm", tx: decodedTx })),
@@ -164,7 +171,7 @@ const decodeBorrowExternalProviderTransaction = ({
 };
 
 type ExternalProviderTransactionInput = {
-  readonly address: Address;
+  readonly address: string;
   readonly network: Network;
   readonly tx: string;
 } & (
@@ -188,7 +195,7 @@ export const makeExternalProviderWalletDriver = ({
   }: {
     readonly message: string;
   }): Effect.Effect<
-    string,
+    WalletSignature,
     | WalletCapabilityUnavailableError
     | WalletRequestCancelledError
     | WalletSigningError
@@ -208,7 +215,7 @@ export const makeExternalProviderWalletDriver = ({
   signTypedData: (
     input: WalletSignBorrowTypedDataInput
   ): Effect.Effect<
-    string,
+    WalletSignature,
     | WalletCapabilityUnavailableError
     | WalletRequestCancelledError
     | WalletSigningError
@@ -228,7 +235,7 @@ export const makeExternalProviderWalletDriver = ({
   signZamaPermit: (
     input: WalletSignPermitInput
   ): Effect.Effect<
-    string,
+    WalletSignature,
     | WalletCapabilityUnavailableError
     | WalletRequestCancelledError
     | WalletSigningError
diff --git a/packages/widget/src/services/wallet/internal/adapters/external-provider/index.ts b/packages/widget/src/services/wallet/internal/adapters/external-provider/index.ts
index 63b117ecc..1a8411bf1 100644
--- a/packages/widget/src/services/wallet/internal/adapters/external-provider/index.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/external-provider/index.ts
@@ -1,5 +1,4 @@
 import { Array as EArray, Option } from "effect";
-import type { Address } from "viem";
 import type { Connector, CreateConnectorFn } from "wagmi";
 import { createConnector } from "wagmi";
 import type { Chain } from "wagmi/chains";
@@ -9,8 +8,12 @@ import type { ExternalProviderSnapshot } from "../../../../config/external-provi
 import { type CurrentRef, ExternalProvider } from "../../../external-provider";
 import type { ConnectorWithFilteredChains } from "../../../wallet-connectors";
 import type { WalletList } from "../../../wallet-descriptors";
-import { normalizeChainId } from "../../normalize-chain-id";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import {
+  parseWalletRoutingId,
+  toWagmiAccounts,
+  toWagmiChainId,
+} from "../../wagmi-seam";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 
 const configMeta = {
@@ -129,9 +132,11 @@ export const externalProviderConnector = (
 
           const getAccounts: ReturnType<CreateConnectorFn>["getAccounts"] =
             async () =>
-              variant.current.currentAddress
-                ? [variant.current.currentAddress as Address]
-                : [];
+              toWagmiAccounts(
+                variant.current.currentAddress
+                  ? [variant.current.currentAddress]
+                  : []
+              );
 
           // Preserve the host's identity even when the topology cannot route it.
           const getChainId: ReturnType<CreateConnectorFn>["getChainId"] =
@@ -152,7 +157,7 @@ export const externalProviderConnector = (
 
             return wagmiConnectResult(
               args?.withCapabilities,
-              accounts as Address[],
+              accounts,
               chainId
             );
           };
@@ -187,15 +192,15 @@ export const externalProviderConnector = (
           const onChainChanged: ReturnType<CreateConnectorFn>["onChainChanged"] =
             (chainId) => {
               connectorConfig.emitter.emit("change", {
-                chainId: normalizeChainId(chainId),
+                chainId: toWagmiChainId(parseWalletRoutingId(chainId)),
               });
             };
 
           const onAccountsChanged: ReturnType<CreateConnectorFn>["onAccountsChanged"] =
             (accounts) => {
-              const connectedAccounts = accounts.filter(
-                (account) => !!account
-              ) as Address[];
+              const connectedAccounts = toWagmiAccounts(
+                accounts.filter((account) => !!account)
+              );
               if (connectedAccounts.length === 0) {
                 onDisconnect();
                 return;
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/config.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/config.ts
index 44d3b381d..19ae87830 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/config.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/config.ts
@@ -3,7 +3,7 @@ import type { InitParams } from "../../../../../services/wallet/init-params";
 import type { WalletList } from "../../../wallet-descriptors";
 import { WalletIntegrationError } from "../../../wallet-errors";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
-import type { EnabledChainsMap } from "./ledger-connector";
+import type { EnabledChainsMap } from "./utils";
 
 const queryFn = ({
   enabledChainsMap,
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/driver.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/driver.ts
index 56f5fb799..d09a21a6b 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/driver.ts
@@ -7,9 +7,9 @@ import {
   WalletDecodeError,
   WalletSwitchError,
 } from "../../../wallet-errors";
-import type {
-  WalletBroadcastResult,
-  WalletSignTransactionInput,
+import {
+  decodeWalletBroadcastResult,
+  type WalletSignTransactionInput,
 } from "../../../wallet-transactions";
 import {
   isLedgerLiveConnector,
@@ -53,7 +53,7 @@ export const makeLedgerWalletDriver = ({
           family: input.family,
           network: input.network,
           tx: input.tx,
-          txMeta: input.family === "yield" ? input.txMeta : undefined,
+          ...(input.family === "yield" ? { txMeta: input.txMeta } : {}),
         })
         .pipe(Effect.mapError((cause) => new WalletDecodeError({ cause })));
       const deserializedTransaction = yield* Effect.try({
@@ -71,10 +71,7 @@ export const makeLedgerWalletDriver = ({
           new WalletBroadcastError({ cause, customMessage: null }),
       });
 
-      return {
-        broadcasted: true,
-        signedTx: signedTx as string,
-      } satisfies WalletBroadcastResult;
+      return yield* decodeWalletBroadcastResult(signedTx);
     }),
   switchAccount: ({ account }: WalletSwitchAccountInput) =>
     requireLedgerConnector(connector).pipe(
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-connector.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-connector.ts
index d67e43a6d..dc79c7a93 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-connector.ts
@@ -5,10 +5,8 @@ import {
   WindowMessageTransport,
 } from "@ledgerhq/wallet-api-client";
 import { Effect, Result, Stream } from "effect";
-import type { Address } from "viem";
 import type { CreateConnectorFn } from "wagmi";
 import { createConnector } from "wagmi";
-import type { WalletNetwork } from "../../../../../domain/wallet/network";
 import type { InitParams } from "../../../../../services/wallet/init-params";
 import { makeCurrentValueStream } from "../../../../../shared/effect/current-value-stream";
 import type {
@@ -17,9 +15,9 @@ import type {
   WalletList,
 } from "../../../wallet-descriptors";
 import { WalletIntegrationError } from "../../../wallet-errors";
-import { normalizeChainId } from "../../normalize-chain-id";
 import { walletImages } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import { parseWalletRoutingId, toWagmiAccount } from "../../wagmi-seam";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
 import {
@@ -32,8 +30,11 @@ import {
   type PrepareLedgerLiveTransaction,
 } from "./prepare-ledger-live-transaction";
 import {
+  type EnabledChainsMap,
   getFilteredSupportedLedgerFamiliesWithCurrency,
   getLedgerCurrencies,
+  isSupportedLedgerLiveFamily,
+  type LedgerChainItem,
 } from "./utils";
 
 const createLedgerLiveConnector = ({
@@ -52,7 +53,7 @@ const createLedgerLiveConnector = ({
   walletDetailsParams: WalletDetailsParams;
 }) =>
   createConnector<unknown, ExtraProps>((config) => {
-    const noAccountPlaceholder = "N/A" as Address;
+    const noAccountPlaceholder = toWagmiAccount("N/A");
     const filteredChains = makeCurrentValueStream<Chain[]>([]);
     const disabledChains = makeCurrentValueStream<Chain[]>([]);
     const currentAccount = makeCurrentValueStream<Account | undefined>(
@@ -64,13 +65,14 @@ const createLedgerLiveConnector = ({
     );
     let ledgerAccounts: Account[] = [];
     const accountsOnCurrentChainState = makeCurrentValueStream<Account[]>([]);
-    let currentChain: ChainItem | null = null;
+    let currentChain: LedgerChainItem | null = null;
     let filteredSkSupportedChainsToCurrencyIdMap: Map<
       Chain["id"],
       Currency["id"]
     > | null = null;
-    let filteredSkSupportedChainsValues: ReturnType<
-      typeof getFilteredSupportedLedgerFamiliesWithCurrency
+    let filteredSkSupportedChainsValues: Map<
+      SupportedLedgerLiveFamilies,
+      Map<string, LedgerChainItem>
     > | null = null;
 
     const transport = new WindowMessageTransport();
@@ -141,50 +143,34 @@ const createLedgerLiveConnector = ({
       filteredSkSupportedChainsValues =
         filteredSupportedLedgerFamiliesWithCurrency;
 
-      const { enabled, disabled } = [
-        ...filteredSupportedLedgerFamiliesWithCurrency.values(),
-      ].reduce(
-        (acc, next) => {
-          next.forEach((v) => {
-            if (v.enabled) {
-              acc.enabled.push(v.chain);
-            } else {
-              acc.disabled.push(v.chain);
-            }
-          });
-
-          return acc;
-        },
-        { enabled: [] as Chain[], disabled: [] as Chain[] }
-      );
+      const enabled: Chain[] = [];
+      const disabled: Chain[] = [];
+      for (const items of filteredSupportedLedgerFamiliesWithCurrency.values()) {
+        for (const item of items.values()) {
+          if (item.enabled) {
+            enabled.push(item.chain);
+          } else {
+            disabled.push(item.chain);
+          }
+        }
+      }
 
       // Set chains to expose for switcher
       filteredChains.set([...enabled, ...disabled]);
       disabledChains.set(disabled);
 
       const accountsWithChain = allAccounts
-        .reduce(
-          (acc, next) => {
-            const family = ledgerCurrencies.get(next.currency);
-
-            if (!family) return acc;
+        .flatMap((account) => {
+          const family = ledgerCurrencies.get(account.currency);
 
-            const itemMap = filteredSupportedLedgerFamiliesWithCurrency.get(
-              family as SupportedLedgerLiveFamilies
-            );
+          if (!family || !isSupportedLedgerLiveFamily(family)) return [];
 
-            if (!family || !itemMap) return acc;
+          const itemMap =
+            filteredSupportedLedgerFamiliesWithCurrency.get(family);
+          const chainItem = itemMap?.get("*") || itemMap?.get(account.currency);
 
-            const chainItem = itemMap.get("*") || itemMap.get(next.currency);
-
-            if (chainItem) {
-              acc.push({ account: next, chainItem });
-            }
-
-            return acc;
-          },
-          [] as { account: Account; chainItem: ChainItem }[]
-        )
+          return chainItem ? [{ account, chainItem }] : [];
+        })
         .sort((a, b) => {
           const aPriority = ledgerChainPriority.get(a.chainItem.network) || 999;
           const bPriority = ledgerChainPriority.get(b.chainItem.network) || 999;
@@ -202,12 +188,12 @@ const createLedgerLiveConnector = ({
         accountsOnCurrentChainState.set([]);
         currentChain = defaultChain;
 
-        onAccountsChanged([noAccountPlaceholder as Address]);
+        onAccountsChanged([noAccountPlaceholder]);
         onChainChanged(defaultChain.chain.id.toString());
 
         return wagmiConnectResult(
           args?.withCapabilities,
-          [noAccountPlaceholder as Address],
+          [noAccountPlaceholder],
           defaultChain.chain.id
         );
       }
@@ -249,12 +235,12 @@ const createLedgerLiveConnector = ({
         Result.getOrThrow(getAccountsOnCurrentChain())
       );
 
-      onAccountsChanged([accountWithChain.account.address as Address]);
+      onAccountsChanged([accountWithChain.account.address]);
       onChainChanged(currentChain.chain.id.toString());
 
       return wagmiConnectResult(
         args?.withCapabilities,
-        [accountWithChain.account.address as Address],
+        [accountWithChain.account.address],
         currentChain.chain.id
       );
     };
@@ -269,7 +255,7 @@ const createLedgerLiveConnector = ({
         : Result.fail(new Error("Current chain not found"));
 
     const { onAccountsChanged, onChainChanged, onDisconnect } =
-      makeWagmiConnectorEvents(config.emitter, normalizeChainId);
+      makeWagmiConnectorEvents(config.emitter, parseWalletRoutingId);
 
     const getProvider: ReturnType<CreateConnectorFn>["getProvider"] =
       async () => ({});
@@ -290,11 +276,13 @@ const createLedgerLiveConnector = ({
       };
 
     const getAccounts: ReturnType<CreateConnectorFn>["getAccounts"] =
-      async () => [currentAccount.get()?.address as Address];
+      async () => [
+        toWagmiAccount(currentAccount.get()?.address ?? noAccountPlaceholder),
+      ];
 
     const switchAccount = (account: Account) => {
       currentAccount.set(account);
-      onAccountsChanged([account.address as Address]);
+      onAccountsChanged([account.address]);
     };
 
     const requestAndSwitchAccount = (chain: Chain) =>
@@ -368,7 +356,7 @@ const createLedgerLiveConnector = ({
       if (!selectedAccount) throw new Error("Account not found");
 
       onChainChanged(chainId.toString());
-      onAccountsChanged([selectedAccount.address as Address]);
+      onAccountsChanged([selectedAccount.address]);
 
       return skSupportedChain.chain;
     };
@@ -447,14 +435,3 @@ export const ledgerLiveConnector = ({
       ],
     };
   });
-
-type ChainItem = {
-  currencyId: string;
-  family: SupportedLedgerLiveFamilies;
-  network: WalletNetwork;
-  chain: Chain;
-};
-
-export type EnabledChainsMap = Parameters<
-  typeof getFilteredSupportedLedgerFamiliesWithCurrency
->[0]["enabledChainsMap"];
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-live-connector-meta.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-live-connector-meta.ts
index 8c3b5a17c..3012333c3 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-live-connector-meta.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/ledger-live-connector-meta.ts
@@ -3,15 +3,13 @@ import type {
   deserializeTransaction,
   WalletAPIClient,
 } from "@ledgerhq/wallet-api-client";
-import type { RawTransaction } from "@ledgerhq/wallet-api-core";
 import type { Effect, Stream } from "effect";
 import type { Address } from "viem";
 import type { Connector } from "wagmi";
 import type { ConnectorWithFilteredChains } from "../../../wallet-connectors";
 import type { Chain } from "../../../wallet-descriptors";
 import type { WalletIntegrationError } from "../../../wallet-errors";
-import type { YieldTransactionMeta } from "../../../wallet-transactions";
-import type { LedgerTransactionPreparationError } from "./prepare-ledger-live-transaction";
+import type { PrepareLedgerLiveTransaction } from "./prepare-ledger-live-transaction";
 
 export const configMeta = {
   id: "ledgerLive",
@@ -30,17 +28,7 @@ export type ExtraProps = ConnectorWithFilteredChains & {
   switchAccount: (account: Account) => void;
   noAccountPlaceholder: Address;
   deserializeTransaction: typeof deserializeTransaction;
-  prepareTransaction: ({
-    family,
-    network,
-    tx,
-    txMeta,
-  }: {
-    family: "borrow" | "yield";
-    network: string;
-    tx: string;
-    txMeta?: YieldTransactionMeta;
-  }) => Effect.Effect<RawTransaction, LedgerTransactionPreparationError>;
+  prepareTransaction: PrepareLedgerLiveTransaction;
 };
 
 type LedgerLiveConnector = Connector & ExtraProps;
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/polkadot-ledger-transaction.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/polkadot-ledger-transaction.ts
index fd00dfe56..283697e69 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/polkadot-ledger-transaction.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/polkadot-ledger-transaction.ts
@@ -1,14 +1,26 @@
-import type { RawTransaction } from "@ledgerhq/wallet-api-core";
+import type {
+  RawPolkadotTransaction,
+  RawTransaction,
+} from "@ledgerhq/wallet-api-core";
 import { TypeRegistry } from "@polkadot/types";
-import { Result } from "effect";
+import { Option, Result, Schema } from "effect";
 import type { YieldTransactionMeta } from "../../../wallet-transactions";
 import type { substratePayloadCodec } from "../substrate/transaction";
 
-type SubstrateHumanMethod = {
-  section: string;
-  method: string;
-  args: Record<string, unknown> | null;
-};
+const SubstrateHumanMethod = Schema.Struct({
+  method: Schema.String,
+  args: Schema.optional(
+    Schema.NullOr(Schema.Record(Schema.String, Schema.Unknown))
+  ),
+});
+
+const PolkadotRewardDestination = Schema.Literals([
+  "None",
+  "Staked",
+  "Stash",
+  "Controller",
+  "Account",
+]);
 
 export type BuildPolkadotLedgerTransaction = (params: {
   fee: string;
@@ -38,12 +50,18 @@ export const buildPolkadotLedgerTransaction: BuildPolkadotLedgerTransaction = ({
       { method: payload.tx.method },
       { version: payload.tx.version }
     );
-    const humanMethod = extrinsic.method.toHuman() as SubstrateHumanMethod;
-    const args = formatSubstrateArgs(humanMethod.args);
+    const humanMethod = Schema.decodeUnknownOption(SubstrateHumanMethod)(
+      extrinsic.method.toHuman()
+    );
+    if (Option.isNone(humanMethod)) {
+      return Result.fail("Invalid Polkadot transaction");
+    }
+    const { method } = humanMethod.value;
+    const args = formatSubstrateArgs(humanMethod.value.args ?? null);
     const recipient = payload.tx.address;
 
-    const ledgerTx = (() => {
-      switch (humanMethod.method) {
+    const ledgerTx = ((): RawPolkadotTransaction => {
+      switch (method) {
         case "bond":
           return {
             mode: "bond",
@@ -51,7 +69,9 @@ export const buildPolkadotLedgerTransaction: BuildPolkadotLedgerTransaction = ({
             amount: readString(args.value, txMeta.amountRaw),
             recipient,
             fee,
-            rewardDestination: readOptionalString(args.payee),
+            rewardDestination: Schema.decodeUnknownOption(
+              PolkadotRewardDestination
+            )(args.payee).pipe(Option.getOrUndefined),
           };
         case "bondExtra":
           return {
@@ -107,13 +127,11 @@ export const buildPolkadotLedgerTransaction: BuildPolkadotLedgerTransaction = ({
             fee,
           };
         default:
-          throw new Error(
-            `Unsupported Polkadot Ledger method: ${humanMethod.method}`
-          );
+          throw new Error(`Unsupported Polkadot Ledger method: ${method}`);
       }
     })();
 
-    return Result.succeed(ledgerTx as RawTransaction);
+    return Result.succeed(ledgerTx);
   } catch (error) {
     return Result.fail(
       error instanceof Error ? error.message : "Invalid Polkadot transaction"
@@ -121,9 +139,7 @@ export const buildPolkadotLedgerTransaction: BuildPolkadotLedgerTransaction = ({
   }
 };
 
-const formatSubstrateArgs = (
-  args: Record<string, unknown> | null
-): Record<string, unknown> => {
+const formatSubstrateArgs = (args: object | null): Record<string, unknown> => {
   if (!args) return {};
 
   return Object.entries(args).reduce<Record<string, unknown>>(
@@ -148,7 +164,7 @@ const normalizeSubstrateValue = (value: unknown): unknown => {
   }
 
   if (typeof value === "object" && value !== null) {
-    return formatSubstrateArgs(value as Record<string, unknown>);
+    return formatSubstrateArgs(value);
   }
 
   return value;
@@ -179,27 +195,16 @@ const readString = (
   return "0";
 };
 
-const readOptionalString = (value: unknown): string | undefined => {
-  if (typeof value === "string") return value;
-  if (typeof value === "number" || typeof value === "bigint") {
-    return value.toString();
-  }
-
-  return undefined;
-};
-
 const readValidatorTargets = (value: unknown): string[] => {
   if (!Array.isArray(value)) return [];
 
   return value.flatMap((item) => {
     if (typeof item === "string") return [item];
     if (typeof item === "object" && item !== null && "Id" in item) {
-      const id = (item as { Id?: unknown }).Id;
-      return typeof id === "string" ? [id] : [];
+      return typeof item.Id === "string" ? [item.Id] : [];
     }
     if (typeof item === "object" && item !== null && "id" in item) {
-      const id = (item as { id?: unknown }).id;
-      return typeof id === "string" ? [id] : [];
+      return typeof item.id === "string" ? [item.id] : [];
     }
 
     return [];
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/prepare-ledger-live-transaction.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/prepare-ledger-live-transaction.ts
index cb0858315..4903385ce 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/prepare-ledger-live-transaction.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/prepare-ledger-live-transaction.ts
@@ -1,13 +1,13 @@
-import type {
-  RawEthereumTransaction,
-  RawTransaction,
-  RawTronTransaction,
-} from "@ledgerhq/wallet-api-core";
 import {
-  Cell,
-  type CommonMessageInfoRelaxedInternal,
-  loadMessageRelaxed,
-} from "@ton/core";
+  type RawCosmosTransaction,
+  type RawEthereumTransaction,
+  type RawNearTransaction,
+  type RawTezosTransaction,
+  type RawTransaction,
+  type RawTronTransaction,
+  schemaRawTransaction,
+} from "@ledgerhq/wallet-api-core";
+import { Cell, loadMessageRelaxed } from "@ton/core";
 import BigNumber from "bignumber.js";
 import { Effect, Option, Result, Schema } from "effect";
 import { hexToBytes } from "viem";
@@ -16,9 +16,11 @@ import {
   exactZero,
   toSafeIntegerCount,
 } from "../../../../../domain/finance/exact";
+import type { Network } from "../../../../../domain/network/network";
 import {
   isCosmosWalletNetwork,
   isEvmWalletNetwork,
+  type WalletEvmNetwork,
 } from "../../../../../domain/wallet/network";
 import type { YieldTransactionMeta } from "../../../wallet-transactions";
 import { decodeWalletPayload } from "../decode-wallet-payload";
@@ -31,7 +33,7 @@ import type { BuildPolkadotLedgerTransaction } from "./polkadot-ledger-transacti
 type PrepareLedgerLiveTransactionParams = {
   family: "borrow" | "yield";
   tx: string;
-  network: string;
+  network: Network;
   txMeta?: YieldTransactionMeta;
 };
 
@@ -53,7 +55,7 @@ type GasEstimate = typeof GasEstimate.Type;
 const GasEstimateFromJson = Schema.fromJsonString(GasEstimate);
 const JsonValue = Schema.fromJsonString(Schema.Unknown);
 
-const eip1559FieldsUnsupportedNetworks = new Set<string>([
+const eip1559FieldsUnsupportedNetworks = new Set<WalletEvmNetwork>([
   "polygon",
   "optimism",
   "arbitrum",
@@ -65,7 +67,7 @@ export type PrepareLedgerLiveTransaction = (
   params: PrepareLedgerLiveTransactionParams
 ) => Effect.Effect<RawTransaction, LedgerTransactionPreparationError>;
 
-export class LedgerTransactionPreparationError extends Schema.TaggedError<
+class LedgerTransactionPreparationError extends Schema.TaggedError<
   LedgerTransactionPreparationError,
   { readonly brand: unique symbol }
 >()("LedgerTransactionPreparationError", {
@@ -163,9 +165,9 @@ const prepareSynchronousTransaction = ({
   txMeta,
 }: {
   family: "borrow" | "yield";
-  network: string;
+  network: Network;
   payload: unknown;
-  txMeta?: YieldTransactionMeta;
+  txMeta: YieldTransactionMeta | undefined;
 }): Result.Result<RawTransaction, string> => {
   if (isEvmWalletNetwork(network)) {
     return decodeWalletPayload(unsignedEVMTransactionCodec, payload).pipe(
@@ -206,15 +208,26 @@ const prepareSynchronousTransaction = ({
         return buildCosmosLedgerTransaction(txMeta);
       }
 
-      return Result.succeed(payload as RawTransaction);
+      return decodeLedgerRawTransaction(payload);
   }
 };
 
+/** Other networks receive a ready Ledger raw transaction; Ledger's own schema checks it. */
+const decodeLedgerRawTransaction = (
+  payload: unknown
+): Result.Result<RawTransaction, string> => {
+  const decoded = schemaRawTransaction.safeParse(payload);
+
+  return decoded.success
+    ? Result.succeed(decoded.data)
+    : Result.fail("Unsupported Ledger transaction payload");
+};
+
 const buildEthereumLedgerTransaction = ({
   network,
   tx,
 }: {
-  network: string;
+  network: WalletEvmNetwork;
   tx: typeof unsignedEVMTransactionCodec.Type;
 }): RawTransaction => {
   const ledgerTx: RawEthereumTransaction = {
@@ -236,7 +249,7 @@ const buildEthereumLedgerTransaction = ({
     ledgerTx.gasPrice = tx.gasPrice.toString();
   }
 
-  return ledgerTx as RawTransaction;
+  return ledgerTx;
 };
 
 const buildCosmosLedgerTransaction = (
@@ -251,7 +264,7 @@ const buildCosmosLedgerTransaction = (
     return Result.fail("Missing Cosmos Ledger arguments");
   }
 
-  return Result.succeed({
+  const ledgerTx: RawCosmosTransaction = {
     family: "cosmos",
     mode,
     validators: [
@@ -263,7 +276,9 @@ const buildCosmosLedgerTransaction = (
     amount: amount.toString(),
     recipient: validatorAddress,
     memo: "via StakeKit CID-1009",
-  } as RawTransaction);
+  };
+
+  return Result.succeed(ledgerTx);
 };
 
 const buildTronLedgerTransaction = (
@@ -276,91 +291,89 @@ const buildTronLedgerTransaction = (
     txMeta.rawArguments?.validatorAddresses?.[0];
   const recipient: string = txMeta.address;
 
-  const tronLedgerTx = (() => {
-    switch (txMeta.txType) {
-      case "FREEZE_BANDWIDTH":
-      case "FREEZE_ENERGY":
-        if (!amount || !resource)
-          return Result.fail("Missing Tron freeze arguments");
-        return Result.succeed({
-          amount: amount.toString(),
-          recipient,
-          family: "tron",
-          mode: "freeze",
-          resource,
-        } as RawTronTransaction);
-      case "VOTE": {
-        const validatorAddresses = txMeta.rawArguments?.validatorAddresses;
-
-        if (!amount || !validatorAddresses?.length) {
-          return Result.fail("Missing Tron vote arguments");
-        }
-
-        return getTronVotes({
-          txMeta,
-          validatorAddresses,
-        }).pipe(
-          Result.map(
-            (votes) =>
-              ({
-                amount: amount.toString(),
-                recipient,
-                family: "tron",
-                mode: "vote",
-                votes,
-              }) as RawTronTransaction
-          )
-        );
+  switch (txMeta.txType) {
+    case "FREEZE_BANDWIDTH":
+    case "FREEZE_ENERGY":
+      if (!amount || !resource)
+        return Result.fail("Missing Tron freeze arguments");
+      return Result.succeed({
+        amount: amount.toString(),
+        recipient,
+        family: "tron",
+        mode: "freeze",
+        resource,
+        votes: [],
+      });
+    case "VOTE": {
+      const validatorAddresses = txMeta.rawArguments?.validatorAddresses;
+
+      if (!amount || !validatorAddresses?.length) {
+        return Result.fail("Missing Tron vote arguments");
       }
-      case "UNDELEGATE_BANDWIDTH":
-      case "UNDELEGATE_ENERGY":
-        if (!amount || !resource || !validatorAddress) {
-          return Result.fail("Missing Tron undelegate arguments");
-        }
-        return Result.succeed({
-          amount: amount.toString(),
-          recipient: String(validatorAddress),
-          family: "tron",
-          mode: "unDelegateResource",
-          resource,
-        } as RawTronTransaction);
-      case "UNFREEZE_LEGACY_BANDWIDTH":
-      case "UNFREEZE_LEGACY_ENERGY":
-        return Result.succeed({
-          amount: "0",
-          recipient: "",
-          family: "tron",
-          mode: "legacyUnfreeze",
-          resource,
-        } as RawTronTransaction);
-      case "UNFREEZE_BANDWIDTH":
-      case "UNFREEZE_ENERGY":
-        if (!amount || !resource)
-          return Result.fail("Missing Tron unfreeze arguments");
-        return Result.succeed({
-          amount: amount.toString(),
-          recipient,
-          family: "tron",
-          mode: "unfreeze",
-          resource,
-        } as RawTronTransaction);
-      case "CLAIM_REWARDS":
-        return Result.succeed({
-          amount: "0",
-          recipient,
-          family: "tron",
-          mode: "claimReward",
-        } as RawTronTransaction);
-      default:
-        return Result.fail(
-          `Unsupported Tron Ledger transaction type: ${txMeta.txType}`
-        );
-    }
-  })();
 
-  return tronLedgerTx.pipe(
-    Result.map((tx) => ({ ...tx, votes: tx.votes ?? [] }))
-  );
+      return getTronVotes({
+        txMeta,
+        validatorAddresses,
+      }).pipe(
+        Result.map(
+          (votes): RawTronTransaction => ({
+            amount: amount.toString(),
+            recipient,
+            family: "tron",
+            mode: "vote",
+            votes,
+          })
+        )
+      );
+    }
+    case "UNDELEGATE_BANDWIDTH":
+    case "UNDELEGATE_ENERGY":
+      if (!amount || !resource || !validatorAddress) {
+        return Result.fail("Missing Tron undelegate arguments");
+      }
+      return Result.succeed({
+        amount: amount.toString(),
+        recipient: String(validatorAddress),
+        family: "tron",
+        mode: "unDelegateResource",
+        resource,
+        votes: [],
+      });
+    case "UNFREEZE_LEGACY_BANDWIDTH":
+    case "UNFREEZE_LEGACY_ENERGY":
+      return Result.succeed({
+        amount: "0",
+        recipient: "",
+        family: "tron",
+        mode: "legacyUnfreeze",
+        resource,
+        votes: [],
+      });
+    case "UNFREEZE_BANDWIDTH":
+    case "UNFREEZE_ENERGY":
+      if (!amount || !resource)
+        return Result.fail("Missing Tron unfreeze arguments");
+      return Result.succeed({
+        amount: amount.toString(),
+        recipient,
+        family: "tron",
+        mode: "unfreeze",
+        resource,
+        votes: [],
+      });
+    case "CLAIM_REWARDS":
+      return Result.succeed({
+        amount: "0",
+        recipient,
+        family: "tron",
+        mode: "claimReward",
+        votes: [],
+      });
+    default:
+      return Result.fail(
+        `Unsupported Tron Ledger transaction type: ${txMeta.txType}`
+      );
+  }
 };
 
 const buildNearLedgerTransaction = (
@@ -373,13 +386,15 @@ const buildNearLedgerTransaction = (
     return Result.fail("Missing Near Ledger arguments");
   }
 
-  return Result.succeed({
+  const ledgerTx: RawNearTransaction = {
     amount: amount.toString(),
     recipient: validatorAddress,
     family: "near",
     mode: getNearMode(txMeta.txType),
     fees: getFeeInBaseUnits(parseGasEstimate(txMeta.gasEstimate)).toString(),
-  } as RawTransaction);
+  };
+
+  return Result.succeed(ledgerTx);
 };
 
 const buildTezosLedgerTransaction = (
@@ -393,14 +408,16 @@ const buildTezosLedgerTransaction = (
     return Result.fail("Missing Tezos Ledger validator");
   }
 
-  return Result.succeed({
+  const ledgerTx: RawTezosTransaction = {
     family: "tezos",
     mode: isUnstake ? "undelegate" : "delegate",
     amount: "0",
     recipient: recipient ?? "",
     fees: getFeeInBaseUnits(gasEstimate).toString(),
     gasLimit: String(gasEstimate?.gasLimit ?? 0),
-  } as RawTransaction);
+  };
+
+  return Result.succeed(ledgerTx);
 };
 
 const buildTonLedgerTransaction = (
@@ -425,14 +442,17 @@ const buildTonLedgerTransaction = (
         text: firstMessage.payload,
         isEncrypted: false,
       },
-    } as RawTransaction);
+    });
   }
 
   try {
     const parsedTx = loadMessageRelaxed(
       Cell.fromBase64(tx.message).beginParse()
     );
-    const info = parsedTx.info as CommonMessageInfoRelaxedInternal;
+    const info = parsedTx.info;
+    if (info.type !== "internal") {
+      return Result.fail("Unsupported Ton Ledger transaction payload");
+    }
 
     return Result.succeed({
       family: "ton",
@@ -443,7 +463,7 @@ const buildTonLedgerTransaction = (
         text: parsedTx.body.toBoc().toString("base64"),
         isEncrypted: false,
       },
-    } as RawTransaction);
+    });
   } catch {
     return Result.fail("Unsupported Ton Ledger transaction payload");
   }
@@ -486,7 +506,9 @@ const getFeeInBaseUnits = (gasEstimate: GasEstimate): BigNumber => {
   );
 };
 
-const getCosmosMode = (txType: YieldTransactionMeta["txType"]): string => {
+const getCosmosMode = (
+  txType: YieldTransactionMeta["txType"]
+): RawCosmosTransaction["mode"] => {
   switch (txType) {
     case "STAKE":
       return "delegate";
@@ -504,10 +526,14 @@ const getCosmosMode = (txType: YieldTransactionMeta["txType"]): string => {
   }
 };
 
-const isCosmosClaimMode = (mode: string): boolean =>
+const isCosmosClaimMode = (mode: RawCosmosTransaction["mode"]): boolean =>
   mode === "claimReward" || mode === "claimRewardCompound";
 
-const getNearMode = (txType: YieldTransactionMeta["txType"]): string => {
+type NearLedgerMode = "stake" | "unstake" | "withdraw";
+
+const getNearMode = (
+  txType: YieldTransactionMeta["txType"]
+): NearLedgerMode => {
   switch (txType) {
     case "STAKE":
       return "stake";
diff --git a/packages/widget/src/services/wallet/internal/adapters/ledger/utils.ts b/packages/widget/src/services/wallet/internal/adapters/ledger/utils.ts
index 0c4c9f5fc..d8a3ba68c 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ledger/utils.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ledger/utils.ts
@@ -20,128 +20,88 @@ import {
   supportedLedgerFamiliesWithCurrency,
 } from "./chains";
 
+/** Ledger currency id to its crypto-currency family; token currencies map to their parent's family. */
+export type LedgerCurrencyFamilies = Map<
+  Currency["id"],
+  CryptoCurrency["family"]
+>;
+
+type SupportedLedgerCurrency =
+  SupportedLedgerFamiliesWithCurrency[SupportedLedgerLiveFamilies][string];
+
+export type LedgerChainItem = SupportedLedgerCurrency & {
+  chain: Chain;
+  enabled: boolean;
+};
+
+export type EnabledChainsMap = {
+  evm: Partial<EvmChainsMap>;
+  cosmos: Partial<CosmosChainsMap>;
+  misc: Partial<MiscChainsMap>;
+  substrate: Partial<SubstrateChainsMap>;
+};
+
+const ledgerFamilies: SupportedLedgerFamiliesWithCurrency =
+  supportedLedgerFamiliesWithCurrency;
+
+export const isSupportedLedgerLiveFamily = (
+  family: string
+): family is SupportedLedgerLiveFamilies =>
+  Object.hasOwn(ledgerFamilies, family);
+
 export const getFilteredSupportedLedgerFamiliesWithCurrency = ({
   accounts,
   ledgerCurrencies,
   enabledChainsMap,
 }: {
   accounts: Account[];
-  ledgerCurrencies: Effect.Success<ReturnType<typeof getLedgerCurrencies>>;
-  enabledChainsMap: {
-    evm: Partial<EvmChainsMap>;
-    cosmos: Partial<CosmosChainsMap>;
-    misc: Partial<MiscChainsMap>;
-    substrate: Partial<SubstrateChainsMap>;
-  };
-}) => {
-  const { accountsFamilies, accountsCurrencies } = accounts.reduce(
-    (acc, next) => {
-      const ledgerCurrency = ledgerCurrencies.get(next.currency);
-
-      if (ledgerCurrency) {
-        acc.accountsFamilies.add(ledgerCurrency);
-        acc.accountsCurrencies.add(next.currency);
-      }
-
-      return acc;
-    },
-    { accountsFamilies: new Set(), accountsCurrencies: new Set() }
+  ledgerCurrencies: LedgerCurrencyFamilies;
+  enabledChainsMap: EnabledChainsMap;
+}): Map<SupportedLedgerLiveFamilies, Map<string, LedgerChainItem>> => {
+  const accountsFamilies = new Set<string>();
+  const accountsCurrencies = new Set<string>();
+  for (const account of accounts) {
+    const ledgerCurrency = ledgerCurrencies.get(account.currency);
+
+    if (ledgerCurrency) {
+      accountsFamilies.add(ledgerCurrency);
+      accountsCurrencies.add(account.currency);
+    }
+  }
+
+  const chainByNetwork = new Map<WalletNetwork, Chain>(
+    [
+      ...Object.values(enabledChainsMap.evm),
+      ...Object.values(enabledChainsMap.cosmos),
+      ...Object.values(enabledChainsMap.misc),
+      ...Object.values(enabledChainsMap.substrate),
+    ].map((entry) => [entry.network, entry.wagmiChain])
   );
 
-  const v = Record.toEntries(supportedLedgerFamiliesWithCurrency).reduce(
-    (acc, [k, v]) => {
-      const filtered = Object.keys(v).reduce((acc, key) => {
-        const item = v[key as keyof typeof v] as
-          | SupportedLedgerCurrency
-          | undefined;
-
-        if (!item) return acc;
-
-        const chain =
-          enabledChainsMap.evm[
-            item.network as unknown as EvmChainsMap[keyof EvmChainsMap]["network"]
-          ]?.wagmiChain ||
-          enabledChainsMap.cosmos[
-            item.network as unknown as CosmosChainsMap[keyof CosmosChainsMap]["network"]
-          ]?.wagmiChain ||
-          enabledChainsMap.misc[
-            item.network as unknown as MiscChainsMap[keyof MiscChainsMap]["network"]
-          ]?.wagmiChain ||
-          enabledChainsMap.substrate[
-            item.network as unknown as SubstrateChainsMap[keyof SubstrateChainsMap]["network"]
-          ]?.wagmiChain;
-
-        if (!chain) return acc;
-
-        if (
-          accountsFamilies.has(item.family) &&
-          (key === "*" || accountsCurrencies.has(item.currencyId))
-        ) {
-          // biome-ignore lint: false
-          return { ...acc, [key]: { ...item, chain, enabled: true } };
-        }
-
-        if (ledgerChainPriority.has(item.network)) {
-          // biome-ignore lint: false
-          return { ...acc, [key]: { ...item, chain, enabled: false } };
-        }
-
-        return acc;
-      }, {} as MappedSupportedLedgerFamiliesWithCurrency);
-
-      // biome-ignore lint: false
-      return { ...acc, [k]: filtered };
-    },
-    {} as MappedSupportedLedgerFamiliesWithCurrency
-  );
-
-  type V = typeof v;
-  type Key = keyof V;
-
-  return Object.keys(v).reduce(
-    (acc, key) => {
-      const subItem = v[key as Key];
-
-      type SubItemKey = keyof typeof subItem;
-
-      const subItemMap = Object.keys(subItem).reduce((acc, subKey) => {
-        const value = subItem[subKey as keyof typeof subItem];
-
-        if (value) acc.set(subKey as SubItemKey, value);
-
-        return acc;
-      }, new Map<SubItemKey, V[Key][SubItemKey]>());
-
-      acc.set(key as Key, subItemMap);
-
-      return acc;
-    },
-    new Map<
-      Key,
-      Map<
-        "*" | (string & {}),
-        {
-          currencyId: string;
-          family: SupportedLedgerLiveFamilies;
-          network: WalletNetwork;
-          chain: Chain;
-          enabled: boolean;
-        }
-      >
-    >()
-  );
-};
+  const result = new Map<
+    SupportedLedgerLiveFamilies,
+    Map<string, LedgerChainItem>
+  >();
+  for (const [family, currencies] of Record.toEntries(ledgerFamilies)) {
+    const items = new Map<string, LedgerChainItem>();
+    for (const [key, item] of Record.toEntries(currencies)) {
+      const chain = chainByNetwork.get(item.network);
+
+      if (!chain) continue;
+
+      if (
+        accountsFamilies.has(item.family) &&
+        (key === "*" || accountsCurrencies.has(item.currencyId))
+      ) {
+        items.set(key, { ...item, chain, enabled: true });
+      } else if (ledgerChainPriority.has(item.network)) {
+        items.set(key, { ...item, chain, enabled: false });
+      }
+    }
+    result.set(family, items);
+  }
 
-type SupportedLedgerCurrency =
-  SupportedLedgerFamiliesWithCurrency[keyof SupportedLedgerFamiliesWithCurrency][string];
-
-type MappedSupportedLedgerFamiliesWithCurrency = {
-  [Key in keyof SupportedLedgerFamiliesWithCurrency]: {
-    [K in keyof SupportedLedgerFamiliesWithCurrency[Key]]: SupportedLedgerFamiliesWithCurrency[Key][K] & {
-      chain: Chain;
-      enabled: boolean;
-    };
-  };
+  return result;
 };
 
 /**
@@ -164,32 +124,25 @@ export const getLedgerCurrencies = (walletAPIClient: WalletAPIClient) =>
         operation: "ledger-list-currencies",
       }),
   }).pipe(
-    Effect.map((val) => {
-      return val.reduce(
-        (acc, next) => {
-          if (next.type === "CryptoCurrency") {
-            acc.cryptoCurrency.set(next.id, next.family);
-          } else {
-            acc.tokenCurrency.push(next);
-          }
-
-          return acc;
-        },
-        { cryptoCurrency: new Map(), tokenCurrency: [] } as {
-          cryptoCurrency: Map<Currency["id"], CryptoCurrency["family"]>;
-          tokenCurrency: ERC20TokenCurrency[];
+    Effect.map((currencies): LedgerCurrencyFamilies => {
+      const cryptoCurrency: LedgerCurrencyFamilies = new Map();
+      const tokenCurrency: ERC20TokenCurrency[] = [];
+      for (const currency of currencies) {
+        if (currency.type === "CryptoCurrency") {
+          cryptoCurrency.set(currency.id, currency.family);
+        } else {
+          tokenCurrency.push(currency);
         }
-      );
-    }),
-    Effect.map((v) => {
-      v.tokenCurrency.forEach((t) => {
-        const parentCryptoCurrencyFamily = v.cryptoCurrency.get(t.parent);
+      }
+
+      for (const token of tokenCurrency) {
+        const parentCryptoCurrencyFamily = cryptoCurrency.get(token.parent);
 
         if (parentCryptoCurrencyFamily) {
-          v.cryptoCurrency.set(t.id, parentCryptoCurrencyFamily);
+          cryptoCurrency.set(token.id, parentCryptoCurrencyFamily);
         }
-      });
+      }
 
-      return v.cryptoCurrency;
+      return cryptoCurrency;
     })
   );
diff --git a/packages/widget/src/services/wallet/internal/adapters/safe/driver.ts b/packages/widget/src/services/wallet/internal/adapters/safe/driver.ts
index e9bc0c944..3997b57c0 100644
--- a/packages/widget/src/services/wallet/internal/adapters/safe/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/safe/driver.ts
@@ -6,7 +6,10 @@ import {
   WalletCapabilityUnavailableError,
   WalletDecodeError,
 } from "../../../wallet-errors";
-import type { WalletBroadcastResult } from "../../../wallet-transactions";
+import {
+  decodeWalletBroadcastResult,
+  type WalletBroadcastResult,
+} from "../../../wallet-transactions";
 import {
   decodeAndPrepareBorrowEvmTransaction,
   decodeAndPrepareEvmTransaction,
@@ -49,7 +52,11 @@ export const makeSafeWalletDriver = ({
       }
 
       const decode: Effect.Effect<
-        { readonly data: Hex; readonly to: Address; readonly value?: Hex },
+        {
+          readonly data: Hex;
+          readonly to: Address;
+          readonly value?: Hex | undefined;
+        },
         Schema.SchemaError
       > =
         family === "borrow"
@@ -113,6 +120,6 @@ export const makeSafeWalletDriver = ({
         )
       );
 
-      return { broadcasted: true, signedTx };
+      return yield* decodeWalletBroadcastResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/solana/driver.ts b/packages/widget/src/services/wallet/internal/adapters/solana/driver.ts
index 20ad0fd7d..8b819da2f 100644
--- a/packages/widget/src/services/wallet/internal/adapters/solana/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/solana/driver.ts
@@ -5,7 +5,10 @@ import {
   WalletCapabilityUnavailableError,
   WalletDecodeError,
 } from "../../../wallet-errors";
-import type { WalletBroadcastResult } from "../../../wallet-transactions";
+import {
+  decodeWalletBroadcastResult,
+  type WalletBroadcastResult,
+} from "../../../wallet-transactions";
 import { isSolanaConnector } from "./solana-connector-meta";
 import { unsignedSolanaTransactionCodec } from "./transaction";
 
@@ -39,6 +42,6 @@ export const makeSolanaWalletDriver = ({
           new WalletBroadcastError({ cause, customMessage: null }),
       });
 
-      return { broadcasted: true, signedTx };
+      return yield* decodeWalletBroadcastResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/solana/solana-connector.ts b/packages/widget/src/services/wallet/internal/adapters/solana/solana-connector.ts
index dee9adc0b..c2a193622 100644
--- a/packages/widget/src/services/wallet/internal/adapters/solana/solana-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/solana/solana-connector.ts
@@ -8,7 +8,6 @@ import {
   VersionedTransaction,
 } from "@solana/web3.js";
 import { Effect, Stream } from "effect";
-import type { Address } from "viem";
 import { createConnector } from "wagmi";
 import portoIcon from "../../../../../shared/assets/images/porto.svg";
 import type { HostProfile } from "../../../../config/host-profile";
@@ -22,6 +21,7 @@ import { WalletNotAvailableError } from "../../../wallet-errors";
 import { getWalletNetworkLogo } from "../../runtime/assets";
 import type { SolanaWalletDescriptor } from "../../runtime/solana-runtime";
 import { WalletConnectSolanaAdapter } from "../../runtime/solana-wallet-connect-adapter";
+import { toWagmiAccount } from "../../wagmi-seam";
 import { solana } from "../configured-chains";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
@@ -113,11 +113,10 @@ const createSolanaConnector = ({
           throw error;
         });
 
-        return wagmiConnectResult(
-          args?.withCapabilities,
-          [solanaWallet.adapter.publicKey?.toBase58() as Address],
-          solana.id
-        );
+        const address = solanaWallet.adapter.publicKey?.toBase58();
+        if (!address) throw new Error("No account found");
+
+        return wagmiConnectResult(args?.withCapabilities, [address], solana.id);
       },
       disconnect: () => {
         config.storage?.setItem("solana.disconnected", true);
@@ -126,7 +125,7 @@ const createSolanaConnector = ({
       getAccounts: async () => {
         const address = solanaWallet.adapter.publicKey?.toBase58();
         if (!address) throw new Error("No account found");
-        return [address as Address];
+        return [toWagmiAccount(address)];
       },
       switchChain: async () => solana,
       getChainId: async () => solana.id,
@@ -172,12 +171,13 @@ const availability = ({
   if (readyState === WalletReadyState.Unsupported) {
     return { _tag: "Injected", detect: Effect.succeed(false) };
   }
+  const installUrl = extensionInstallUrls[adapter.name];
   return {
     _tag: "Injected",
     detect: Effect.sync(
       () => adapter.readyState === WalletReadyState.Installed && isPresent()
     ),
-    installUrl: extensionInstallUrls[adapter.name],
+    ...(installUrl === undefined ? {} : { installUrl }),
   };
 };
 
diff --git a/packages/widget/src/services/wallet/internal/adapters/stellar/driver.ts b/packages/widget/src/services/wallet/internal/adapters/stellar/driver.ts
index 7984dc2c6..7838d8ff7 100644
--- a/packages/widget/src/services/wallet/internal/adapters/stellar/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/stellar/driver.ts
@@ -6,7 +6,10 @@ import {
   WalletIntegrationError,
   WalletSigningError,
 } from "../../../wallet-errors";
-import type { WalletSignTransactionInput } from "../../../wallet-transactions";
+import {
+  decodeWalletSignedPayloadResult,
+  type WalletSignTransactionInput,
+} from "../../../wallet-transactions";
 import { isStellarConnector } from "./stellar-connector-meta";
 
 const stellarMainnetIdentity = getProtocolChainIdentity("stellar");
@@ -50,7 +53,7 @@ export const makeStellarWalletDriver = ({
         });
       }
 
-      return { broadcasted: false, signedTx: result.signedTxXdr };
+      return yield* decodeWalletSignedPayloadResult(result.signedTxXdr);
     }
   );
 
diff --git a/packages/widget/src/services/wallet/internal/adapters/stellar/stellar-connector.ts b/packages/widget/src/services/wallet/internal/adapters/stellar/stellar-connector.ts
index 5d10fc3fe..7266f6a09 100644
--- a/packages/widget/src/services/wallet/internal/adapters/stellar/stellar-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/stellar/stellar-connector.ts
@@ -1,5 +1,5 @@
 import { Effect, Option, Schema, Stream } from "effect";
-import type { Address, Chain } from "viem";
+import type { Chain } from "viem";
 import { createConnector } from "wagmi";
 import type {
   WalletDetailsParams,
@@ -9,6 +9,7 @@ import { WalletIntegrationError } from "../../../wallet-errors";
 import type { StellarWalletClient } from "../../platform/stellar-wallets-kit-platform";
 import { getWalletNetworkLogo } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import { toWagmiAccounts } from "../../wagmi-seam";
 import { stellar } from "../configured-chains";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import {
@@ -37,7 +38,7 @@ const createStellarConnector = ({
   readonly walletDetailsParams: WalletDetailsParams;
 }) =>
   createConnector<StellarWalletClient, ExtraProps, StellarStorage>((config) => {
-    let currentAddress: Address | null = null;
+    let currentAddress: string | null = null;
 
     const readReconnectRecord = async () => {
       const stored = await config.storage?.getItem(reconnectStorageKey);
@@ -94,7 +95,7 @@ const createStellarConnector = ({
             address: result.address,
             connectorId: client.id,
           });
-          currentAddress = result.address as Address;
+          currentAddress = result.address;
         } catch (error) {
           await runWalletEffect(client.disconnect).catch(() => undefined);
           await clearLocalConnection();
@@ -111,7 +112,8 @@ const createStellarConnector = ({
         await runWalletEffect(client.disconnect).catch(() => undefined);
         await clearLocalConnection();
       },
-      getAccounts: async () => (currentAddress ? [currentAddress] : []),
+      getAccounts: async () =>
+        toWagmiAccounts(currentAddress ? [currentAddress] : []),
       getChainId: async () => stellar.id,
       getProvider: async () => client,
       isAuthorized: async () => {
@@ -123,7 +125,7 @@ const createStellarConnector = ({
           config.emitter.emit("disconnect");
           return;
         }
-        config.emitter.emit("change", { accounts: accounts as Address[] });
+        config.emitter.emit("change", { accounts: toWagmiAccounts(accounts) });
       },
       onChainChanged: (chainId) => {
         config.emitter.emit("change", { chainId: Number(chainId) });
diff --git a/packages/widget/src/services/wallet/internal/adapters/substrate/driver.ts b/packages/widget/src/services/wallet/internal/adapters/substrate/driver.ts
index 8757e8306..fc27371be 100644
--- a/packages/widget/src/services/wallet/internal/adapters/substrate/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/substrate/driver.ts
@@ -5,6 +5,7 @@ import {
   WalletDecodeError,
   WalletSigningError,
 } from "../../../wallet-errors";
+import { decodeWalletSignedPayloadResult } from "../../../wallet-transactions";
 import { isSubstrateConnector } from "./substrate-connector-meta";
 import { substratePayloadCodec } from "./transaction";
 
@@ -41,6 +42,6 @@ export const makeSubstrateWalletDriver = ({
           )
         );
 
-      return { broadcasted: false, signedTx };
+      return yield* decodeWalletSignedPayloadResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-connector.ts b/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-connector.ts
index eb7206617..b7f845bed 100644
--- a/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-connector.ts
@@ -6,7 +6,6 @@ import {
 import type { SignerPayloadJSON } from "@polkadot/types/types";
 import { u8aToHex } from "@polkadot/util";
 import { Array as EArray, Effect, Option, Stream } from "effect";
-import type { Address } from "viem";
 import { createConnector } from "wagmi";
 import type { Chain } from "wagmi/chains";
 import type {
@@ -21,6 +20,7 @@ import {
 import type { WalletConnectProtocol } from "../../platform/wallet-connect-protocol";
 import { getWalletNetworkLogo } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import { toWagmiAccounts } from "../../wagmi-seam";
 import walletConnectIcon from "../evm/icons/wallet-connect.svg";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
@@ -121,7 +121,7 @@ const createSubstrateConnector = ({
   chains: ReadonlyArray<Chain>;
 }) =>
   createConnector<unknown, ExtraProps, StorageItem>((config) => {
-    const filteredChains = chains as Chain[];
+    const filteredChains = [...chains];
     const getFirstFilteredChain = () =>
       EArray.head(filteredChains).pipe(
         Option.getOrThrowWith(() => new Error("No supported chains found"))
@@ -196,11 +196,7 @@ const createSubstrateConnector = ({
           config.storage?.removeItem("substrate.disconnected");
           config.storage?.setItem("substrate.lastConnectedId", id);
 
-          return wagmiConnectResult(
-            args?.withCapabilities,
-            accounts as Address[],
-            chain.id
-          );
+          return wagmiConnectResult(args?.withCapabilities, accounts, chain.id);
         }
 
         throw new Error("No accounts found");
@@ -212,9 +208,7 @@ const createSubstrateConnector = ({
         return wallet.disconnect();
       },
       getAccounts: () =>
-        wallet
-          .getAccounts(currentChainId())
-          .then((accounts) => accounts as Address[]),
+        wallet.getAccounts(currentChainId()).then(toWagmiAccounts),
       switchChain: async (chain) => {
         const chainToSwitchTo = filteredChains.find(
           (c) => c.id === chain.chainId
@@ -230,7 +224,7 @@ const createSubstrateConnector = ({
 
         state.chainId = chainToSwitchTo.id;
         config.emitter.emit("change", {
-          accounts: accounts as Address[],
+          accounts: toWagmiAccounts(accounts),
           chainId: chainToSwitchTo.id,
         });
 
diff --git a/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-wallet-connect.ts b/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-wallet-connect.ts
index 4df357cae..74b5fddbe 100644
--- a/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-wallet-connect.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/substrate/substrate-wallet-connect.ts
@@ -1,10 +1,12 @@
 import { isSameAddress } from "@luno-kit/core/utils";
 import type { SignerPayloadJSON } from "@polkadot/types/types";
-import { Array as EArray, Effect, Predicate, Schema } from "effect";
+import { Array as EArray, Effect, Option, Predicate, Schema } from "effect";
 import { WalletIntegrationError } from "../../../wallet-errors";
-import type {
-  WalletConnectProtocol,
-  WalletConnectSession,
+import {
+  caipAddresses,
+  caipChainId,
+  type WalletConnectProtocol,
+  type WalletConnectSession,
 } from "../../platform/wallet-connect-protocol";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
 import type { SubstrateChain } from "./chains";
@@ -23,16 +25,11 @@ const SignerResult = Schema.Struct({
 
 /** WalletConnect identifies a Substrate chain by its genesis hash's first 16 bytes. */
 const toChainId = (genesisHash: string) =>
-  `polkadot:${genesisHash.slice(2, 34)}`;
+  caipChainId("polkadot", genesisHash.slice(2, 34));
 
 const walletError = (operation: string, message: string) =>
   new WalletIntegrationError({ message, operation });
 
-const addressesOn = (session: WalletConnectSession, chainId: string) =>
-  session.accounts.flatMap((account) =>
-    account.startsWith(`${chainId}:`) ? [account.slice(chainId.length + 1)] : []
-  );
-
 /**
  * A Substrate wallet over the shared WalletConnect protocol (namespace
  * `polkadot`). One instance belongs to one wagmi connector; `onDisconnect`
@@ -49,9 +46,12 @@ export const makeSubstrateWalletConnect = ({
   readonly runWalletEffect: RunWalletEffect;
   readonly onDisconnect: () => void;
 }): SubstrateWallet => {
-  const chains = EArray.map(substrateChains, (chain) =>
-    toChainId(chain.genesisHash)
-  );
+  // Configured chains carry well-formed genesis hashes.
+  const configured = EArray.map(substrateChains, (chain) => ({
+    chain,
+    chainId: Option.getOrThrow(toChainId(chain.genesisHash)),
+  }));
+  const chains = EArray.map(configured, ({ chainId }) => chainId);
   const state: {
     session: WalletConnectSession | undefined;
     unsubscribeEnded: (() => void) | undefined;
@@ -60,7 +60,9 @@ export const makeSubstrateWalletConnect = ({
 
   const usable = (session: WalletConnectSession) =>
     session.methods.includes(signTransactionMethod) &&
-    chains.some((chainId) => addressesOn(session, chainId).length > 0);
+    chains.some(
+      (chainId) => caipAddresses(session.accounts, chainId).length > 0
+    );
 
   const restoredSession = protocol
     .sessions("polkadot")
@@ -128,11 +130,11 @@ export const makeSubstrateWalletConnect = ({
       if (topic) await runWalletEffect(protocol.disconnect(topic));
     },
     getAccounts: async (wagmiChainId) => {
-      const chain = substrateChains.find(
-        (candidate) => candidate.wagmiChain.id === wagmiChainId
-      );
-      return state.session && chain
-        ? addressesOn(state.session, toChainId(chain.genesisHash))
+      const chainId = configured.find(
+        ({ chain }) => chain.wagmiChain.id === wagmiChainId
+      )?.chainId;
+      return state.session && chainId
+        ? caipAddresses(state.session.accounts, chainId)
         : [];
     },
     canRestore: () =>
@@ -144,12 +146,14 @@ export const makeSubstrateWalletConnect = ({
           walletError("substrate-sign", "WalletConnect session not connected")
         );
       }
-      const chainId = toChainId(payload.genesisHash);
+      const chainId = Option.getOrUndefined(toChainId(payload.genesisHash));
       // Wallets may report the signer in another SS58 format.
-      const address = addressesOn(session, chainId).find((candidate) =>
-        isSameAddress(candidate, payload.address)
-      );
-      if (!address) {
+      const address = chainId
+        ? caipAddresses(session.accounts, chainId).find((candidate) =>
+            isSameAddress(candidate, payload.address)
+          )
+        : undefined;
+      if (!chainId || !address) {
         return Effect.fail(
           walletError(
             "substrate-sign",
diff --git a/packages/widget/src/services/wallet/internal/adapters/ton/driver.ts b/packages/widget/src/services/wallet/internal/adapters/ton/driver.ts
index c6961da7c..822f14cec 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ton/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ton/driver.ts
@@ -4,7 +4,10 @@ import {
   WalletBroadcastError,
   WalletCapabilityUnavailableError,
 } from "../../../wallet-errors";
-import type { WalletBroadcastResult } from "../../../wallet-transactions";
+import {
+  decodeWalletBroadcastResult,
+  type WalletBroadcastResult,
+} from "../../../wallet-transactions";
 import { isTonConnector } from "./ton-connector-meta";
 
 export const makeTonWalletDriver = ({
@@ -36,6 +39,6 @@ export const makeTonWalletDriver = ({
           )
         );
 
-      return { broadcasted: true, signedTx };
+      return yield* decodeWalletBroadcastResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/ton/ton-connector.ts b/packages/widget/src/services/wallet/internal/adapters/ton/ton-connector.ts
index 01e685c0d..96f7113c8 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ton/ton-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ton/ton-connector.ts
@@ -1,15 +1,11 @@
-import {
-  Cell,
-  type CommonMessageInfoRelaxedInternal,
-  loadMessageRelaxed,
-} from "@ton/core";
+import { Cell, loadMessageRelaxed } from "@ton/core";
 import {
   TonConnectUI,
   toUserFriendlyAddress,
   type Wallet,
 } from "@tonconnect/ui";
 import { Clock, Duration, Effect, Option, Schema, Stream } from "effect";
-import type { Address, Chain } from "viem";
+import type { Chain } from "viem";
 import { createConnector } from "wagmi";
 import type {
   WalletDetailsParams,
@@ -19,6 +15,7 @@ import { WalletIntegrationError } from "../../../wallet-errors";
 import type { WalletModal } from "../../../wallet-modal";
 import { getWalletNetworkLogo } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import { toWagmiAccount } from "../../wagmi-seam";
 import { ton } from "../configured-chains";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
@@ -124,7 +121,13 @@ const createTonConnector = (
               }),
           });
 
-          const info = parsedTx.info as CommonMessageInfoRelaxedInternal;
+          const info = parsedTx.info;
+          if (info.type !== "internal") {
+            return yield* new WalletIntegrationError({
+              message: "Unsupported TON message: expected an internal message",
+              operation: "ton-decode-message",
+            });
+          }
           const now = yield* Clock.currentTimeMillis;
 
           const result = yield* Effect.tryPromise({
@@ -180,7 +183,7 @@ const createTonConnector = (
 
         return wagmiConnectResult(
           args?.withCapabilities,
-          [userFriendlyAddress as Address],
+          [userFriendlyAddress],
           ton.id
         );
       },
@@ -195,7 +198,9 @@ const createTonConnector = (
         if (!connectedWallet) throw new Error("No wallet connected");
 
         return [
-          toUserFriendlyAddress(connectedWallet.account.address) as Address,
+          toWagmiAccount(
+            toUserFriendlyAddress(connectedWallet.account.address)
+          ),
         ];
       },
       switchChain: async () => ton,
diff --git a/packages/widget/src/services/wallet/internal/adapters/ton/transaction.ts b/packages/widget/src/services/wallet/internal/adapters/ton/transaction.ts
index e1e1af217..23bafd61e 100644
--- a/packages/widget/src/services/wallet/internal/adapters/ton/transaction.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/ton/transaction.ts
@@ -1,8 +1,4 @@
-import {
-  Cell,
-  type CommonMessageInfoRelaxedInternal,
-  loadMessageRelaxed,
-} from "@ton/core";
+import { Cell, loadMessageRelaxed } from "@ton/core";
 import { Schema, SchemaTransformation } from "effect";
 
 const BigIntFromNumber = Schema.Finite.pipe(
@@ -54,9 +50,12 @@ type DecodedTonRawTransaction = Extract<
 export const normalizeTonTransactionToRaw = (
   tx: DecodedTonTransaction
 ): DecodedTonRawTransaction => {
-  if (!("message" in tx)) return tx as DecodedTonRawTransaction;
+  if (!("message" in tx)) return tx;
   const parsedTx = loadMessageRelaxed(Cell.fromBase64(tx.message).beginParse());
-  const info = parsedTx.info as CommonMessageInfoRelaxedInternal;
+  const info = parsedTx.info;
+  if (info.type !== "internal") {
+    throw new Error("Unsupported TON message: expected an internal message");
+  }
   return [
     {
       address: info.dest.toString(),
diff --git a/packages/widget/src/services/wallet/internal/adapters/tron/driver.ts b/packages/widget/src/services/wallet/internal/adapters/tron/driver.ts
index 830b7e1bb..849883acb 100644
--- a/packages/widget/src/services/wallet/internal/adapters/tron/driver.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/tron/driver.ts
@@ -5,7 +5,10 @@ import {
   WalletDecodeError,
   WalletSigningError,
 } from "../../../wallet-errors";
-import type { WalletSignedPayloadResult } from "../../../wallet-transactions";
+import {
+  decodeWalletSignedPayloadResult,
+  type WalletSignedPayloadResult,
+} from "../../../wallet-transactions";
 import { unsignedTronTransactionCodec } from "./transaction";
 import { isTronConnector } from "./tron-connector-meta";
 
@@ -44,6 +47,6 @@ export const makeTronWalletDriver = ({
           new WalletSigningError({ cause, operation: "transaction" }),
       });
 
-      return { broadcasted: false, signedTx };
+      return yield* decodeWalletSignedPayloadResult(signedTx);
     }),
 });
diff --git a/packages/widget/src/services/wallet/internal/adapters/tron/tron-connector.ts b/packages/widget/src/services/wallet/internal/adapters/tron/tron-connector.ts
index 51fbcb4cb..cbf820262 100644
--- a/packages/widget/src/services/wallet/internal/adapters/tron/tron-connector.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/tron/tron-connector.ts
@@ -7,7 +7,6 @@ import { BitKeepAdapter } from "@tronweb3/tronwallet-adapter-bitkeep";
 import { LedgerAdapter } from "@tronweb3/tronwallet-adapter-ledger";
 import { TronLinkAdapter } from "@tronweb3/tronwallet-adapter-tronlink";
 import { Effect, Schema, Stream } from "effect";
-import type { Address } from "viem";
 import { createConnector } from "wagmi";
 import type {
   Chain,
@@ -23,6 +22,7 @@ import {
   walletImages,
 } from "../../runtime/assets";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
+import { toWagmiAccount } from "../../wagmi-seam";
 import { tron } from "../configured-chains";
 import { wagmiConnectResult } from "../wagmi-connect-result";
 import { makeWagmiConnectorEvents } from "../wagmi-connector-events";
@@ -89,7 +89,7 @@ const createTronConnector = ({
     const accounts = () => {
       const address = wallet.address();
       if (!address) throw new Error("No account found");
-      return [address as Address];
+      return [toWagmiAccount(address)];
     };
     return {
       ...walletDetailsParams,
diff --git a/packages/widget/src/services/wallet/internal/adapters/tron/tron-wallet-connect.ts b/packages/widget/src/services/wallet/internal/adapters/tron/tron-wallet-connect.ts
index 14ee211cc..fd7aac340 100644
--- a/packages/widget/src/services/wallet/internal/adapters/tron/tron-wallet-connect.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/tron/tron-wallet-connect.ts
@@ -1,8 +1,10 @@
 import { Effect, Predicate, Schema, SchemaTransformation } from "effect";
 import { WalletIntegrationError } from "../../../wallet-errors";
-import type {
-  WalletConnectProtocol,
-  WalletConnectSession,
+import {
+  CaipChainId,
+  caipAddresses,
+  type WalletConnectProtocol,
+  type WalletConnectSession,
 } from "../../platform/wallet-connect-protocol";
 import type { RunWalletEffect } from "../../runtime/effect-runner";
 import {
@@ -13,7 +15,7 @@ import {
 import type { TronWallet } from "./tron-connector-meta";
 
 /** CAIP-2 id of Tron mainnet, the only Tron network the widget configures. */
-const mainnet = "tron:0x2b6653dc";
+const mainnet = Schema.decodeSync(CaipChainId)("tron:0x2b6653dc");
 
 // Wallets answer with the signed transaction, bare or in a `result` envelope.
 const SignTransactionResponse = Schema.Union([
@@ -30,9 +32,7 @@ const SignTransactionResponse = Schema.Union([
 ]);
 
 const mainnetAddress = (session: WalletConnectSession) =>
-  session.accounts
-    .find((account) => account.startsWith(`${mainnet}:`))
-    ?.slice(mainnet.length + 1);
+  caipAddresses(session.accounts, mainnet)[0];
 
 type Connection = Readonly<{
   session: WalletConnectSession;
diff --git a/packages/widget/src/services/wallet/internal/adapters/wagmi-connect-result.ts b/packages/widget/src/services/wallet/internal/adapters/wagmi-connect-result.ts
index 16137d040..b2cce6c78 100644
--- a/packages/widget/src/services/wallet/internal/adapters/wagmi-connect-result.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/wagmi-connect-result.ts
@@ -1,5 +1,3 @@
-import type { Address } from "viem";
-
 /**
  * Wagmi types `connect` as a generic whose return depends on `withCapabilities`.
  * A runtime ternary cannot satisfy that conditional type, so wagmi's own
@@ -7,12 +5,15 @@ import type { Address } from "viem";
  */
 export const wagmiConnectResult = (
   withCapabilities: boolean | undefined,
-  accounts: readonly Address[],
+  accounts: readonly string[],
   chainId: number
-) =>
-  ({
+) => {
+  const result = {
     accounts: withCapabilities
       ? accounts.map((address) => ({ address, capabilities: {} }))
       : accounts,
     chainId,
-  }) as never;
+  };
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: wagmi's connect return type is conditional on the withCapabilities generic, which a runtime value cannot satisfy
+  return result as never;
+};
diff --git a/packages/widget/src/services/wallet/internal/adapters/wagmi-connector-events.ts b/packages/widget/src/services/wallet/internal/adapters/wagmi-connector-events.ts
index d702b7ab6..169d2c606 100644
--- a/packages/widget/src/services/wallet/internal/adapters/wagmi-connector-events.ts
+++ b/packages/widget/src/services/wallet/internal/adapters/wagmi-connector-events.ts
@@ -1,5 +1,9 @@
-import type { Address } from "viem";
 import type { Connector } from "wagmi";
+import {
+  toWagmiAccounts,
+  toWagmiChainId,
+  type WalletRoutingId,
+} from "../wagmi-seam";
 
 export type WagmiConnectorEvents = Pick<
   Connector,
@@ -8,23 +12,22 @@ export type WagmiConnectorEvents = Pick<
 
 /**
  * Forwards a non-EVM connector's account, chain, and disconnect notifications
- * to wagmi. Chain ids pass through unchanged (a type cast only) unless the
- * connector supplies its own mapping.
+ * to wagmi. Chain ids pass through unchanged unless the connector supplies its
+ * own mapping.
  */
 export const makeWagmiConnectorEvents = (
   emitter: Connector["emitter"],
-  mapChainId: (chainId: string) => number = (chainId) =>
-    chainId as unknown as number
+  mapChainId: (chainId: string) => WalletRoutingId = (chainId) => chainId
 ): WagmiConnectorEvents => ({
   onAccountsChanged: (accounts) => {
     if (accounts.length === 0) {
       emitter.emit("disconnect");
     } else {
-      emitter.emit("change", { accounts: accounts as Address[] });
+      emitter.emit("change", { accounts: toWagmiAccounts(accounts) });
     }
   },
   onChainChanged: (chainId) => {
-    emitter.emit("change", { chainId: mapChainId(chainId) });
+    emitter.emit("change", { chainId: toWagmiChainId(mapChainId(chainId)) });
   },
   onDisconnect: () => {
     emitter.emit("disconnect");
diff --git a/packages/widget/src/services/wallet/internal/normalize-chain-id.ts b/packages/widget/src/services/wallet/internal/normalize-chain-id.ts
deleted file mode 100644
index cf6729d02..000000000
--- a/packages/widget/src/services/wallet/internal/normalize-chain-id.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const normalizeChainId = (chainId: string) => {
-  const numericChainId = Number(chainId);
-
-  return Number.isNaN(numericChainId)
-    ? (chainId as unknown as number)
-    : numericChainId;
-};
diff --git a/packages/widget/src/services/wallet/internal/platform/stellar-wallets-kit-platform.ts b/packages/widget/src/services/wallet/internal/platform/stellar-wallets-kit-platform.ts
index 48cb1ff6f..9380c6e98 100644
--- a/packages/widget/src/services/wallet/internal/platform/stellar-wallets-kit-platform.ts
+++ b/packages/widget/src/services/wallet/internal/platform/stellar-wallets-kit-platform.ts
@@ -15,14 +15,18 @@ import {
   WalletIntegrationError,
   WalletNotAvailableError,
 } from "../../wallet-errors";
-import type {
-  WalletConnectProtocol,
-  WalletConnectSession,
+import {
+  CaipChainId,
+  caipAddresses,
+  type WalletConnectProtocol,
+  type WalletConnectSession,
+  type WalletConnectTopic,
 } from "./wallet-connect-protocol";
 
 const publicNetworkPassphrase =
   getProtocolChainIdentity("stellar").networkPassphrase;
-const walletConnectPublicChain = "stellar:pubnet";
+const walletConnectPublicChain =
+  Schema.decodeSync(CaipChainId)("stellar:pubnet");
 const walletConnectSignMethod = "stellar_signXDR";
 
 const AddressResult = Schema.Struct({ address: Schema.String });
@@ -273,7 +277,7 @@ export const makeWalletConnectStellarWalletClient = Effect.fn(
 )(function* (
   protocol: WalletConnectProtocol
 ): Effect.fn.Return<StellarWalletClient, never, Scope.Scope> {
-  let selected: { address: string; topic: string } | undefined;
+  let selected: { address: string; topic: WalletConnectTopic } | undefined;
   let unsubscribeEnded: (() => void) | undefined;
   const endedListeners = new Set<() => void>();
   const cancelled = () => integrationError("stellar-wallet-connect-cancelled");
@@ -296,8 +300,9 @@ export const makeWalletConnectStellarWalletClient = Effect.fn(
   );
 
   const supportsAccount = (session: WalletConnectSession, address: string) =>
-    session.accounts.includes(`${walletConnectPublicChain}:${address}`) &&
-    session.methods.includes(walletConnectSignMethod);
+    caipAddresses(session.accounts, walletConnectPublicChain).includes(
+      address
+    ) && session.methods.includes(walletConnectSignMethod);
   const unavailable = (operation: string) =>
     new WalletIntegrationError({
       message: "The Stellar WalletConnect session expired",
@@ -348,12 +353,10 @@ export const makeWalletConnectStellarWalletClient = Effect.fn(
             "stellar_signMessage",
           ],
         });
-        const account = session.accounts.find(
-          (account) =>
-            account.startsWith(`${walletConnectPublicChain}:`) &&
-            account.split(":").length === 3
-        );
-        const address = account?.slice(walletConnectPublicChain.length + 1);
+        const address = caipAddresses(
+          session.accounts,
+          walletConnectPublicChain
+        )[0];
         if (!address || !supportsAccount(session, address)) {
           return yield* unavailable("stellar-wallet-connect-approval");
         }
diff --git a/packages/widget/src/services/wallet/internal/platform/wagmi-operations.ts b/packages/widget/src/services/wallet/internal/platform/wagmi-operations.ts
index d1b5b960b..ce51d40ed 100644
--- a/packages/widget/src/services/wallet/internal/platform/wagmi-operations.ts
+++ b/packages/widget/src/services/wallet/internal/platform/wagmi-operations.ts
@@ -1,4 +1,4 @@
-import { Context, Effect, Layer, Schema } from "effect";
+import { Context, Array as EArray, Effect, Layer, Schema } from "effect";
 import type { Address, Hash, Hex } from "viem";
 import {
   type Config,
@@ -40,20 +40,19 @@ export class WagmiOperationsError extends Schema.TaggedError<
   ]),
 }) {}
 
-const connectionOwners = new WeakMap<
-  Config,
-  {
-    pending: symbol | undefined;
-    readonly connectors: Map<Connector, () => void>;
-  }
->();
+type ConnectionOwner = {
+  pending: symbol | undefined;
+  readonly connectors: Map<Connector, () => void>;
+};
+
+const connectionOwners = new WeakMap<Config, ConnectionOwner>();
 
 const connectionOwner = (config: Config) => {
   const current = connectionOwners.get(config);
   if (current) return current;
-  const owner = {
-    pending: undefined as symbol | undefined,
-    connectors: new Map<Connector, () => void>(),
+  const owner: ConnectionOwner = {
+    pending: undefined,
+    connectors: new Map(),
   };
   connectionOwners.set(config, owner);
   return owner;
@@ -160,10 +159,18 @@ export const wagmiOperations = {
           new WagmiOperationsError({ cause, operation: "connect" }),
       });
       if (owner.pending !== attempt) return yield* Effect.interrupt;
+      const accounts = result.accounts;
+      // Wagmi records a connection only with at least one account.
+      if (!EArray.isReadonlyArrayNonEmpty(accounts)) {
+        return yield* new WagmiOperationsError({
+          cause: new Error("Connector returned no accounts"),
+          operation: "connect",
+        });
+      }
       config.setState((state) => ({
         ...state,
         connections: new Map(state.connections).set(input.connector.uid, {
-          accounts: result.accounts as Connection["accounts"],
+          accounts,
           chainId: result.chainId,
           connector: input.connector,
         }),
diff --git a/packages/widget/src/services/wallet/internal/platform/wallet-connect-presentation.ts b/packages/widget/src/services/wallet/internal/platform/wallet-connect-presentation.ts
index e7114af43..0e3fd8152 100644
--- a/packages/widget/src/services/wallet/internal/platform/wallet-connect-presentation.ts
+++ b/packages/widget/src/services/wallet/internal/platform/wallet-connect-presentation.ts
@@ -27,9 +27,27 @@ export type WalletConnectModal = Readonly<{
   subscribeState: (listener: (state: unknown) => void) => () => void;
 }>;
 
+type PendingConnection<A> = Readonly<{
+  fiber: Fiber.Fiber<A, WalletIntegrationError>;
+  uris: Stream.Stream<string>;
+}>;
+
+/**
+ * One pending SDK approval. Pass the same connection to every `connect` that
+ * should resume it rather than start another.
+ */
+export type WalletConnectConnection<A> = Readonly<{
+  effect: Effect.Effect<A, WalletIntegrationError>;
+  /** Its in-flight handoff, per presentation. */
+  pending: WeakMap<object, PendingConnection<A>>;
+}>;
+
+export const makeWalletConnectConnection = <A>(
+  effect: Effect.Effect<A, WalletIntegrationError>
+): WalletConnectConnection<A> => ({ effect, pending: new WeakMap() });
+
 type WalletConnectInput<A> = Readonly<{
-  /** Reuse this Effect to resume the same pending SDK approval. */
-  connection: Effect.Effect<A, WalletIntegrationError>;
+  connection: WalletConnectConnection<A>;
   subscribeUri: (
     publish: (uri: string) => void
   ) => Effect.Effect<void, WalletIntegrationError, Scope.Scope>;
@@ -47,11 +65,6 @@ export type WalletConnectPresentation = Readonly<{
   ) => Effect.Effect<A, WalletIntegrationError>;
 }>;
 
-type PendingConnection<A> = Readonly<{
-  fiber: Fiber.Fiber<A, WalletIntegrationError>;
-  uris: Stream.Stream<string>;
-}>;
-
 type PresentationEvent =
   | { readonly type: "uri"; readonly uri: string }
   | { readonly type: "closed" }
@@ -77,10 +90,8 @@ export const makeWalletConnectPresentation = Effect.fn(
   const walletModal = yield* WalletModal;
   const connectionPermit = yield* Semaphore.make(1);
   const modalPermit = yield* Semaphore.make(1);
-  const pendingConnections = new Map<
-    Effect.Effect<unknown, WalletIntegrationError>,
-    PendingConnection<unknown>
-  >();
+  // Keys this presentation's entries in each connection's `pending`.
+  const presentationKey = {};
   let loadedModal: WalletConnectModal | undefined;
   let presentationOwner: object | undefined;
   let loadingModal:
@@ -108,9 +119,8 @@ export const makeWalletConnectPresentation = Effect.fn(
 
   const getConnection = Effect.fn("WalletConnectPresentation.getConnection")(
     function* <A>({ connection, subscribeUri }: WalletConnectInput<A>) {
-      const existing = pendingConnections.get(connection);
-      // The exact Effect key carries the result type of its cached fiber.
-      if (existing) return existing as PendingConnection<A>;
+      const existing = connection.pending.get(presentationKey);
+      if (existing) return existing;
 
       const latestUri = yield* SubscriptionRef.make<string | undefined>(
         undefined
@@ -128,7 +138,9 @@ export const makeWalletConnectPresentation = Effect.fn(
           Effect.andThen(Effect.never),
           Effect.forkScoped({ startImmediately: true })
         );
-        return yield* connection.pipe(Effect.raceFirst(Fiber.join(source)));
+        return yield* connection.effect.pipe(
+          Effect.raceFirst(Fiber.join(source))
+        );
       }).pipe(Effect.scoped, Effect.forkIn(owner));
       const pending: PendingConnection<A> = {
         fiber,
@@ -137,9 +149,9 @@ export const makeWalletConnectPresentation = Effect.fn(
           Stream.changes
         ),
       };
-      pendingConnections.set(connection, pending);
+      connection.pending.set(presentationKey, pending);
       fiber.addObserver(() => {
-        pendingConnections.delete(connection);
+        connection.pending.delete(presentationKey);
       });
       return pending;
     },
@@ -240,7 +252,11 @@ export const makeWalletConnectPresentation = Effect.fn(
             }
             // Finish the SDK's non-abortable open before another request owns it.
             yield* Effect.tryPromise({
-              try: () => modal.open({ uri, namespace: input.namespace }),
+              try: () =>
+                modal.open({
+                  uri,
+                  ...(input.namespace && { namespace: input.namespace }),
+                }),
               catch: (cause) => presentationError("wallet-connect-open", cause),
             }).pipe(Effect.uninterruptible);
           }
@@ -271,6 +287,13 @@ export const makeWalletConnectPresentation = Effect.fn(
   return { connect } satisfies WalletConnectPresentation;
 });
 
+// AppKit declares its own networks' `assets` as possibly undefined, which its
+// `AppKitNetwork` rejects as an optional key: omit it when it is absent.
+const withDefinedAssets = <Network extends { readonly assets?: unknown }>({
+  assets,
+  ...network
+}: Network) => (assets === undefined ? network : { ...network, assets });
+
 const loadModal = Effect.tryPromise({
   try: async (): Promise<WalletConnectModal> => {
     const [
@@ -321,7 +344,13 @@ const loadModal = Effect.tryPromise({
       manualWCControl: true,
       metadata,
       universalProvider,
-      networks: [mainnet, solana, tronMainnet, cosmosNetwork, polkadotNetwork],
+      networks: [
+        mainnet,
+        withDefinedAssets(solana),
+        withDefinedAssets(tronMainnet),
+        cosmosNetwork,
+        polkadotNetwork,
+      ],
       // AppKit cannot chain-filter Stellar. Featured wallets remain discoverable
       // in its generic manual chooser without pretending Stellar is an EVM chain.
       featuredWalletIds: [
diff --git a/packages/widget/src/services/wallet/internal/platform/wallet-connect-protocol.ts b/packages/widget/src/services/wallet/internal/platform/wallet-connect-protocol.ts
index 9cd38f60d..e42b7c09b 100644
--- a/packages/widget/src/services/wallet/internal/platform/wallet-connect-protocol.ts
+++ b/packages/widget/src/services/wallet/internal/platform/wallet-connect-protocol.ts
@@ -19,6 +19,8 @@ import { UserRejectedRequestError } from "viem";
 import { config } from "../../../../shared/config/widget-defaults";
 import { WalletIntegrationError } from "../../wallet-errors";
 import {
+  makeWalletConnectConnection,
+  type WalletConnectConnection,
   type WalletConnectPresentation,
   WalletConnectPresentationPlatform,
 } from "./wallet-connect-presentation";
@@ -32,10 +34,44 @@ export const WalletConnectNamespaceSchema = Schema.Literals([
 ]);
 export type WalletConnectNamespace = typeof WalletConnectNamespaceSchema.Type;
 
+/** A WalletConnect session topic. */
+export const WalletConnectTopic = Schema.String.pipe(
+  Schema.brand("WalletConnectTopic")
+);
+export type WalletConnectTopic = typeof WalletConnectTopic.Type;
+
+/** CAIP-2 chain id: `<namespace>:<reference>`. */
+export const CaipChainId = Schema.String.check(
+  Schema.isPattern(/^[-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32}$/)
+).pipe(Schema.brand("CaipChainId"));
+export type CaipChainId = typeof CaipChainId.Type;
+
+/** CAIP-10 account id: `<namespace>:<chain reference>:<address>`. */
+export const CaipAccountId = Schema.String.check(
+  Schema.isPattern(/^[-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32}:[-.%a-zA-Z0-9]{1,128}$/)
+).pipe(Schema.brand("CaipAccountId"));
+export type CaipAccountId = typeof CaipAccountId.Type;
+
+const decodeCaipChainId = Schema.decodeOption(CaipChainId);
+
+/** The CAIP-2 id of `reference` in `namespace`, if it is well-formed. */
+export const caipChainId = (
+  namespace: WalletConnectNamespace,
+  reference: string
+): Option.Option<CaipChainId> => decodeCaipChainId(`${namespace}:${reference}`);
+
+/** The bare addresses of `accounts` on `chainId`, in order. */
+export const caipAddresses = (
+  accounts: ReadonlyArray<CaipAccountId>,
+  chainId: CaipChainId
+): ReadonlyArray<string> =>
+  accounts.flatMap((account) =>
+    account.startsWith(`${chainId}:`) ? [account.slice(chainId.length + 1)] : []
+  );
+
 export type WalletConnectProposal = Readonly<{
   namespace: WalletConnectNamespace;
-  /** CAIP-2 chain ids. */
-  chains: readonly [string, ...string[]];
+  chains: readonly [CaipChainId, ...CaipChainId[]];
   /** Empty: the namespace is proposed through optionalNamespaces only. */
   requiredMethods: ReadonlyArray<string>;
   optionalMethods?: ReadonlyArray<string>;
@@ -46,10 +82,10 @@ export type WalletConnectProposal = Readonly<{
 
 /** An approved session narrowed to one namespace. */
 export type WalletConnectSession = Readonly<{
-  topic: string;
+  topic: WalletConnectTopic;
   namespace: WalletConnectNamespace;
-  /** CAIP-10 accounts of `namespace` only. */
-  accounts: ReadonlyArray<string>;
+  /** Accounts of `namespace` only. */
+  accounts: ReadonlyArray<CaipAccountId>;
   methods: ReadonlyArray<string>;
   /** Seconds since epoch. */
   expiry: number;
@@ -58,9 +94,8 @@ export type WalletConnectSession = Readonly<{
 }>;
 
 export type WalletConnectRequest<A> = Readonly<{
-  topic: string;
-  /** CAIP-2 chain id. */
-  chainId: string;
+  topic: WalletConnectTopic;
+  chainId: CaipChainId;
   method: string;
   params: unknown;
   response: Schema.Decoder<A>;
@@ -94,12 +129,17 @@ export type WalletConnectProtocol = Readonly<{
     input: WalletConnectRequest<A>
   ) => Effect.Effect<A, WalletIntegrationError>;
   /** Deletes only this topic's session. */
-  disconnect: (topic: string) => Effect.Effect<void, WalletIntegrationError>;
+  disconnect: (
+    topic: WalletConnectTopic
+  ) => Effect.Effect<void, WalletIntegrationError>;
   /**
    * Calls `listener` when the wallet deletes or expires `topic`. Returns the
    * unsubscribe function.
    */
-  subscribeEnded: (topic: string, listener: () => void) => () => void;
+  subscribeEnded: (
+    topic: WalletConnectTopic,
+    listener: () => void
+  ) => () => void;
 }>;
 
 type ProposalNamespace = Readonly<{
@@ -127,29 +167,25 @@ export type WalletConnectSignClient = Readonly<{
   ) => Promise<unknown>;
   disconnect: (topic: string) => Promise<void>;
   /** `session_delete` and `session_expire`, by topic. */
-  subscribeEnded: (listener: (topic: string) => void) => () => void;
+  subscribeEnded: (listener: (topic: WalletConnectTopic) => void) => () => void;
 }>;
 
 const StoredSession = Schema.Struct({
-  topic: Schema.String,
+  topic: WalletConnectTopic,
   expiry: Schema.Finite,
   namespaces: Schema.Record(Schema.String, Schema.Unknown),
   sessionProperties: Schema.optional(Schema.Unknown),
 });
-// CAIP-10 account id: `<namespace>:<chain reference>:<address>`.
-const CaipAccount = Schema.String.check(
-  Schema.isPattern(/^[-a-z0-9]{3,8}:[-_a-zA-Z0-9]{1,32}:[-.%a-zA-Z0-9]{1,128}$/)
-);
 const SessionNamespace = Schema.Struct({
   accounts: Schema.Array(Schema.Unknown),
   methods: Schema.Array(Schema.String),
 });
-const decodeCaipAccount = Schema.decodeUnknownOption(CaipAccount);
+const decodeCaipAccount = Schema.decodeUnknownOption(CaipAccountId);
 const decodeStoredSession = Schema.decodeUnknownOption(StoredSession);
 const decodeSessionNamespace = Schema.decodeUnknownOption(SessionNamespace);
 // Invalid SDK events are discarded: they name no session to end.
 const decodeTopic = Schema.decodeUnknownOption(
-  Schema.Struct({ topic: Schema.String })
+  Schema.Struct({ topic: WalletConnectTopic })
 );
 const decodeSessionProperties = Schema.decodeUnknownOption(
   Schema.Record(Schema.String, Schema.String)
@@ -262,16 +298,16 @@ export const walletConnectSessionOwners = (
   );
   return {
     // Unreadable storage owns nothing rather than restoring foreign sessions.
-    get: (topic: string) =>
+    get: (topic: WalletConnectTopic) =>
       owners.get(topic).pipe(Effect.orElseSucceed(() => Option.none())),
-    set: (topic: string, namespace: WalletConnectNamespace) =>
+    set: (topic: WalletConnectTopic, namespace: WalletConnectNamespace) =>
       owners.set(topic, namespace),
-    remove: (topic: string) => owners.remove(topic),
+    remove: (topic: WalletConnectTopic) => owners.remove(topic),
   };
 };
 
 type PendingProposal = Readonly<{
-  connection: Effect.Effect<WalletConnectSession, WalletIntegrationError>;
+  connection: WalletConnectConnection<WalletConnectSession>;
   subscribeUri: (
     publish: (uri: string) => void
   ) => Effect.Effect<void, never, Scope.Scope>;
@@ -291,7 +327,7 @@ export const makeWalletConnectProtocol = Effect.fn("makeWalletConnectProtocol")(
     const owner = yield* Effect.scope;
     const clientPermit = yield* Semaphore.make(1);
     const proposalPermit = yield* Semaphore.make(1);
-    const endedListeners = new Map<string, Set<() => void>>();
+    const endedListeners = new Map<WalletConnectTopic, Set<() => void>>();
     const pendingProposals = new Map<string, PendingProposal>();
     // Approved after their presentation was dismissed, by proposal key. The
     // next `connect` with that key adopts them; unclaimed ones stay owned.
@@ -401,8 +437,8 @@ export const makeWalletConnectProtocol = Effect.fn("makeWalletConnectProtocol")(
         if (existing) return existing;
         const { fiber, latestUri } = yield* propose(proposal);
         const pending: PendingProposal = {
-          // One stable Effect per proposal lets presentation resume it too.
-          connection: Fiber.join(fiber),
+          // One stable connection per proposal lets presentation resume it too.
+          connection: makeWalletConnectConnection(Fiber.join(fiber)),
           subscribeUri: (publish) =>
             SubscriptionRef.changes(latestUri).pipe(
               Stream.runForEach((uri) =>
diff --git a/packages/widget/src/services/wallet/internal/runtime/external-provider-sync.ts b/packages/widget/src/services/wallet/internal/runtime/external-provider-sync.ts
index 8564f392c..52f6f1209 100644
--- a/packages/widget/src/services/wallet/internal/runtime/external-provider-sync.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/external-provider-sync.ts
@@ -214,10 +214,8 @@ export const installExternalProviderSynchronization = Effect.fn(
     const chainKey = `${connector.uid}:${connection.chainId ?? ""}:${
       snapshot.currentChain ?? ""
     }`;
-    if (
-      snapshot.currentChain === undefined ||
-      connection.chainId === snapshot.currentChain
-    ) {
+    const currentChain = snapshot.currentChain;
+    if (currentChain === undefined || connection.chainId === currentChain) {
       yield* Ref.update(memory, (current) => ({
         ...current,
         chainNotification: null,
@@ -228,7 +226,7 @@ export const installExternalProviderSynchronization = Effect.fn(
         chainNotification: chainKey,
       }));
       yield* runConnectorNotification(() =>
-        connector.onChainChanged(snapshot.currentChain!.toString())
+        connector.onChainChanged(currentChain.toString())
       );
     }
   });
diff --git a/packages/widget/src/services/wallet/internal/runtime/initial-connection.ts b/packages/widget/src/services/wallet/internal/runtime/initial-connection.ts
index f72642005..7ae157e4d 100644
--- a/packages/widget/src/services/wallet/internal/runtime/initial-connection.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/initial-connection.ts
@@ -65,7 +65,9 @@ export const makeInitializeWallet = Effect.gen(function* () {
         yield* operations
           .connect(wagmiConfig, {
             connector: injectedConnector,
-            chainId: queryParamsInitChainId,
+            ...(queryParamsInitChainId === undefined
+              ? {}
+              : { chainId: queryParamsInitChainId }),
           })
           .pipe(
             Effect.mapError(
diff --git a/packages/widget/src/services/wallet/internal/runtime/router.ts b/packages/widget/src/services/wallet/internal/runtime/router.ts
index 1f5a3dfb9..7c9ed5d89 100644
--- a/packages/widget/src/services/wallet/internal/runtime/router.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/router.ts
@@ -1,5 +1,4 @@
 import { Effect } from "effect";
-import type { Address } from "viem";
 import type { Connector } from "wagmi";
 import { isEvmWalletNetwork } from "../../../../domain/wallet/network";
 import type {
@@ -9,7 +8,10 @@ import type {
   WalletSwitchAccountInput,
 } from "../../wallet-commands";
 import type { Chain } from "../../wallet-descriptors";
-import { WalletCapabilityUnavailableError } from "../../wallet-errors";
+import {
+  WalletCapabilityUnavailableError,
+  WalletDecodeError,
+} from "../../wallet-errors";
 import type {
   LedgerConnectorState,
   NormalizedWalletState,
@@ -23,6 +25,7 @@ import {
 } from "../adapters/cosmos/cosmos-connector-meta";
 import { makeCosmosWalletDriver } from "../adapters/cosmos/driver";
 import { makeEvmWalletDriver } from "../adapters/evm/driver";
+import { isEvmAddress } from "../adapters/evm/transaction";
 import { isExternalProviderConnector } from "../adapters/external-provider";
 import { makeExternalProviderWalletDriver } from "../adapters/external-provider/driver";
 import { makeLedgerWalletDriver } from "../adapters/ledger/driver";
@@ -182,7 +185,7 @@ export const routeWalletTransaction = Effect.fn("routeWalletTransaction")(
       return yield* makeExternalProviderWalletDriver({
         connector,
       }).signTransaction({
-        address: address as Address,
+        address,
         ...input,
       });
     }
@@ -199,11 +202,16 @@ export const routeWalletTransaction = Effect.fn("routeWalletTransaction")(
     if (isTonConnector(connector)) {
       return yield* makeTonWalletDriver({ connector }).signTransaction(input);
     }
+    if (!isEvmAddress(address)) {
+      return yield* new WalletDecodeError({
+        cause: "Connected account is not an EVM address",
+      });
+    }
     if (isSafeConnector(connector)) {
       return yield* makeSafeWalletDriver({
         connector,
       }).signTransaction({
-        address: address as Address,
+        address,
         family: input.family,
         tx: input.tx,
       });
@@ -212,7 +220,7 @@ export const routeWalletTransaction = Effect.fn("routeWalletTransaction")(
     return yield* makeEvmWalletDriver({
       sendTransaction: actions.sendEvmTransaction,
     }).signTransaction({
-      account: address as Address,
+      account: address,
       connector,
       family: input.family,
       tx: input.tx,
diff --git a/packages/widget/src/services/wallet/internal/runtime/solana-connector-membership.ts b/packages/widget/src/services/wallet/internal/runtime/solana-connector-membership.ts
index fc62f9ea9..8b1177039 100644
--- a/packages/widget/src/services/wallet/internal/runtime/solana-connector-membership.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/solana-connector-membership.ts
@@ -100,7 +100,7 @@ export const installSolanaConnectorMembership = Effect.fn(
       current.map((connector) => [connector.name, connector])
     );
     const desiredNames = new Set<string>(
-      snapshot.wallets.map((wallet) => wallet.adapter.name as string)
+      snapshot.wallets.map((wallet) => wallet.adapter.name)
     );
     const activeUids = new Set(config.state.connections.keys());
     const desired = yield* Effect.forEach(
diff --git a/packages/widget/src/services/wallet/internal/runtime/solana-runtime.ts b/packages/widget/src/services/wallet/internal/runtime/solana-runtime.ts
index bf65dbca2..075f4a370 100644
--- a/packages/widget/src/services/wallet/internal/runtime/solana-runtime.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/solana-runtime.ts
@@ -2,6 +2,7 @@ import {
   type Adapter,
   isWalletAdapterCompatibleStandardWallet,
   type WalletAdapter,
+  type WalletAdapterCompatibleStandardWallet,
   WalletAdapterNetwork,
   WalletReadyState,
 } from "@solana/wallet-adapter-base";
@@ -52,10 +53,6 @@ type StandardAdapter = WalletAdapter & {
   readonly destroy: () => void;
 };
 
-type DisposableAdapter = Adapter & {
-  readonly destroy?: () => void;
-};
-
 type SolanaRuntimeEnvironment = {
   readonly appIdentityUri: string | undefined;
   readonly userAgent: string | null;
@@ -74,9 +71,13 @@ type HeadlessSolanaRuntimeDependencies = {
     readonly appIdentityUri: string | undefined;
     readonly cluster: Cluster;
   }) => Adapter;
-  readonly createStandardAdapter: (wallet: StandardWallet) => StandardAdapter;
+  readonly createStandardAdapter: (
+    wallet: WalletAdapterCompatibleStandardWallet
+  ) => StandardAdapter;
   readonly environment: () => SolanaRuntimeEnvironment;
-  readonly isCompatibleStandardWallet: (wallet: StandardWallet) => boolean;
+  readonly isCompatibleStandardWallet: (
+    wallet: StandardWallet
+  ) => wallet is WalletAdapterCompatibleStandardWallet;
   readonly registry: Wallets;
 };
 
@@ -135,17 +136,12 @@ const makeDefaultDependencies = (
   createMobileAdapter: ({ appIdentityUri, cluster }) =>
     new SolanaMobileWalletAdapter({
       addressSelector: createDefaultAddressSelector(),
-      appIdentity: { uri: appIdentityUri },
+      appIdentity: appIdentityUri === undefined ? {} : { uri: appIdentityUri },
       authorizationResultCache: createDefaultAuthorizationResultCache(),
       cluster,
       onWalletNotFound: createDefaultWalletNotFoundHandler(),
     }),
-  createStandardAdapter: (wallet) =>
-    new StandardWalletAdapter({
-      wallet: wallet as ConstructorParameters<
-        typeof StandardWalletAdapter
-      >[0]["wallet"],
-    }),
+  createStandardAdapter: (wallet) => new StandardWalletAdapter({ wallet }),
   environment: () => ({
     appIdentityUri:
       typeof globalThis.location === "undefined"
@@ -214,7 +210,9 @@ const injectedProviders: Readonly<Record<string, (page: unknown) => boolean>> =
   };
 
 const disposeAdapter = (adapter: Adapter) => {
-  (adapter as DisposableAdapter).destroy?.();
+  if ("destroy" in adapter && typeof adapter.destroy === "function") {
+    adapter.destroy();
+  }
 };
 
 const makeHeadlessSolanaRuntime = (
@@ -322,8 +320,8 @@ const makeHeadlessSolanaRuntime = (
               .map((adapter) =>
                 getOrCreateDescriptor(
                   adapter,
-                  [...standardAdapters.values()].includes(
-                    adapter as StandardAdapter
+                  [...standardAdapters.values()].some(
+                    (standardAdapter) => standardAdapter === adapter
                   )
                     ? "standard"
                     : "fallback"
diff --git a/packages/widget/src/services/wallet/internal/runtime/solana-wallet-connect-adapter.ts b/packages/widget/src/services/wallet/internal/runtime/solana-wallet-connect-adapter.ts
index 295c9fecb..a8054c0b2 100644
--- a/packages/widget/src/services/wallet/internal/runtime/solana-wallet-connect-adapter.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/solana-wallet-connect-adapter.ts
@@ -19,9 +19,11 @@ import {
 } from "@solana/web3.js";
 import base58 from "bs58";
 import { Effect, Predicate, Schema } from "effect";
-import type {
-  WalletConnectProtocol,
-  WalletConnectSession,
+import {
+  CaipChainId,
+  caipAddresses,
+  type WalletConnectProtocol,
+  type WalletConnectSession,
 } from "../platform/wallet-connect-protocol";
 import type { RunWalletEffect } from "./effect-runner";
 
@@ -41,6 +43,16 @@ const solanaMethods = [
   "solana_signAndSendTransaction",
 ];
 
+const decodeChainId = Schema.decodeSync(CaipChainId);
+const mainnetChains = [
+  decodeChainId("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp"),
+  decodeChainId("solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ"),
+] as const;
+const devnetChains = [
+  decodeChainId("solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1"),
+  decodeChainId("solana:8E9rvCKLFQia2Y35HXjjpWzj8weVo44K"),
+] as const;
+
 type Options = {
   readonly network: WalletAdapterNetwork.Mainnet | WalletAdapterNetwork.Devnet;
   readonly walletConnectProtocol: WalletConnectProtocol;
@@ -63,14 +75,15 @@ const deserialize = <T extends Transaction | VersionedTransaction>(
 ): T => {
   const bytes = Buffer.from(serialized, "base64");
   // The request's transaction version determines the response's concrete type.
-  return (
-    isVersionedTransaction(original)
-      ? VersionedTransaction.deserialize(bytes)
-      : Transaction.from(bytes)
-  ) as T;
+  const deserialized = isVersionedTransaction(original)
+    ? VersionedTransaction.deserialize(bytes)
+    : Transaction.from(bytes);
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: @solana/wallet-adapter-base declares signTransaction generic over T; the response has the request's concrete class, which TypeScript cannot relate to T
+  return deserialized as T;
 };
 
 export class WalletConnectSolanaAdapter extends BaseMessageSignerWalletAdapter {
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: @solana/wallet-adapter-base brands WalletName and exposes no constructor for it; adapters declare their name by assertion
   readonly name = "WalletConnect" as WalletName<"WalletConnect">;
   readonly url = "https://walletconnect.org";
   readonly icon =
@@ -84,7 +97,7 @@ export class WalletConnectSolanaAdapter extends BaseMessageSignerWalletAdapter {
 
   private key: PublicKey | null = null;
   private session: WalletConnectSession | undefined;
-  private chainId: string | undefined;
+  private chainId: CaipChainId | undefined;
   private connectingPromise: Promise<void> | undefined;
   private unsubscribeEnded: (() => void) | undefined;
   private attempt = 0;
@@ -114,24 +127,17 @@ export class WalletConnectSolanaAdapter extends BaseMessageSignerWalletAdapter {
     return this.connectingPromise !== undefined;
   }
 
-  private get chains(): readonly [string, ...string[]] {
+  private get chains(): readonly [CaipChainId, ...CaipChainId[]] {
     return this.options.network === WalletAdapterNetwork.Mainnet
-      ? [
-          "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
-          "solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ",
-        ]
-      : [
-          "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1",
-          "solana:8E9rvCKLFQia2Y35HXjjpWzj8weVo44K",
-        ];
+      ? mainnetChains
+      : devnetChains;
   }
 
   /** The first account on a configured chain whose address is a public key. */
   private account(session: WalletConnectSession) {
     for (const chainId of this.chains) {
-      for (const account of session.accounts) {
-        if (!account.startsWith(`${chainId}:`)) continue;
-        const bytes = base58.decodeUnsafe(account.slice(chainId.length + 1));
+      for (const address of caipAddresses(session.accounts, chainId)) {
+        const bytes = base58.decodeUnsafe(address);
         if (bytes?.length === 32) {
           return { chainId, publicKey: new PublicKey(bytes) };
         }
@@ -163,7 +169,7 @@ export class WalletConnectSolanaAdapter extends BaseMessageSignerWalletAdapter {
       return Promise.reject(new WalletNotReadyError());
     }
     if (this.connected) return Promise.resolve();
-    if (this.connectingPromise) return this.connectingPromise;
+    if (this.connectingPromise !== undefined) return this.connectingPromise;
     const attempt = ++this.attempt;
     const protocol = this.options.walletConnectProtocol;
     this.connectingPromise = this.options
@@ -306,9 +312,13 @@ export class WalletConnectSolanaAdapter extends BaseMessageSignerWalletAdapter {
           "Wallet returned a different number of signed transactions"
         );
       }
-      return transactions.map((transaction, index) =>
-        deserialize(response.transactions[index]!, transaction)
-      );
+      return transactions.map((transaction, index) => {
+        const signed = response.transactions[index];
+        if (signed === undefined) {
+          throw new Error(`Wallet returned no signed transaction ${index}`);
+        }
+        return deserialize(signed, transaction);
+      });
     } catch (cause) {
       return this.signingError(cause);
     }
diff --git a/packages/widget/src/services/wallet/internal/runtime/state-projection.ts b/packages/widget/src/services/wallet/internal/runtime/state-projection.ts
index 5ba77dad3..d6b5d8b2a 100644
--- a/packages/widget/src/services/wallet/internal/runtime/state-projection.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/state-projection.ts
@@ -486,7 +486,7 @@ export const makeCompleteWalletStateStream = ({
               controller,
               forceAddress: config.env.forceAddress,
               ledgerState: ledger,
-              previous,
+              ...(previous === undefined ? {} : { previous }),
             });
 
             return {
diff --git a/packages/widget/src/services/wallet/internal/runtime/state.ts b/packages/widget/src/services/wallet/internal/runtime/state.ts
index c094bbda7..8036a1ba6 100644
--- a/packages/widget/src/services/wallet/internal/runtime/state.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/state.ts
@@ -7,6 +7,7 @@ import {
   Stream,
   SubscriptionRef,
 } from "effect";
+import { WalletAddress } from "../../../../domain/identity/identifiers";
 import { sameWalletScopeOwner } from "../../../../domain/wallet/wallet-scope";
 import type { WidgetPersistence } from "../../../persistence/widget-persistence";
 import type { WalletRuntimeInvariantError } from "../../wallet-errors";
@@ -62,7 +63,7 @@ const makeContextStream = ({
 }) =>
   makeCompleteWalletStateStream({
     controller,
-    previous,
+    ...(previous === undefined ? {} : { previous }),
     projection: core,
     readStoredPublicKeys,
   }).pipe(
@@ -109,6 +110,8 @@ const makeTransitionContext = ({
   };
 };
 
+const isWalletAddress = Schema.is(WalletAddress);
+
 const hasSameCommandIdentity = (
   current: WalletStateContext,
   next: WalletCoreState
@@ -118,7 +121,7 @@ const hasSameCommandIdentity = (
   if (
     currentConnection.status !== "connected" ||
     nextConnection.status !== "connected" ||
-    !nextConnection.address ||
+    !isWalletAddress(nextConnection.address) ||
     !nextConnection.connector
   ) {
     return false;
@@ -203,7 +206,7 @@ export const makeWalletStateRuntime = Effect.fn("makeWalletStateRuntime")(
         makeContextStream({
           controller,
           core: next,
-          previous,
+          ...(previous === undefined ? {} : { previous }),
           readStoredPublicKeys,
         })
       ),
diff --git a/packages/widget/src/services/wallet/internal/runtime/wagmi-actions.ts b/packages/widget/src/services/wallet/internal/runtime/wagmi-actions.ts
index 7fbf4e6b6..155147f83 100644
--- a/packages/widget/src/services/wallet/internal/runtime/wagmi-actions.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/wagmi-actions.ts
@@ -14,9 +14,10 @@ import {
   WalletSigningError,
   WalletSwitchError,
 } from "../../wallet-errors";
-import type {
-  WalletBroadcastResult,
-  WalletEvmTransactionInput,
+import {
+  decodeWalletBroadcastResult,
+  decodeWalletSignature,
+  type WalletEvmTransactionInput,
 } from "../../wallet-transactions";
 import { WagmiOperations } from "../platform/wagmi-operations";
 
@@ -76,13 +77,7 @@ export const makeWagmiActions = Effect.gen(function* () {
                 customMessage: null,
               })
           ),
-          Effect.map(
-            (signedTx) =>
-              ({
-                broadcasted: true,
-                signedTx,
-              }) satisfies WalletBroadcastResult
-          )
+          Effect.flatMap(decodeWalletBroadcastResult)
         );
     }),
     signMessage: Effect.fn("signMessage")(function* (
@@ -101,6 +96,9 @@ export const makeWagmiActions = Effect.gen(function* () {
                 cause: error.cause,
                 operation: "message",
               })
+          ),
+          Effect.flatMap((signature) =>
+            decodeWalletSignature(signature, "message")
           )
         );
     }),
@@ -116,6 +114,9 @@ export const makeWagmiActions = Effect.gen(function* () {
                 cause: error.cause,
                 operation: "typed-data",
               })
+          ),
+          Effect.flatMap((signature) =>
+            decodeWalletSignature(signature, "typed-data")
           )
         );
     }),
diff --git a/packages/widget/src/services/wallet/internal/runtime/wagmi-config.ts b/packages/widget/src/services/wallet/internal/runtime/wagmi-config.ts
index 8fcd96136..e5b7cef4d 100644
--- a/packages/widget/src/services/wallet/internal/runtime/wagmi-config.ts
+++ b/packages/widget/src/services/wallet/internal/runtime/wagmi-config.ts
@@ -1,11 +1,12 @@
 import type { Connection } from "@solana/web3.js";
-import { Array as EArray, Effect, FiberSet } from "effect";
+import { Array as EArray, Effect, FiberSet, Struct } from "effect";
 import { createStore, type Store as MipdStore } from "mipd";
 import { createClient } from "viem";
 import { type Connector, createConfig, http } from "wagmi";
 import { type Chain, mainnet } from "wagmi/chains";
 import type { Network } from "../../../../domain/network/network";
 import type { EnabledWalletNetworks } from "../../../../domain/wallet/models";
+import type { WalletNetwork } from "../../../../domain/wallet/network";
 import {
   applyWalletPolicy,
   type WalletPolicy,
@@ -28,16 +29,12 @@ import {
 import { WalletIntegrationError } from "../../wallet-errors";
 import type { WalletModal } from "../../wallet-modal";
 import { getConfig as getMiscConfig } from "../adapters/config";
-import type { MiscChainsMap } from "../adapters/configured-chains";
-import type { CosmosChainsMap } from "../adapters/cosmos/chains";
 import { getConfig as getCosmosConfig } from "../adapters/cosmos/config";
-import type { EvmChainsMap } from "../adapters/evm/chains";
 import { getConfig as getEvmConfig } from "../adapters/evm/config";
 import { announcedWalletAvailability } from "../adapters/evm/injected-availability";
 import { externalProviderConnector } from "../adapters/external-provider";
 import { getConfig as getLedgerLiveConfig } from "../adapters/ledger/config";
 import { getConfig as getSafeConnector } from "../adapters/safe/config";
-import type { SubstrateChainsMap } from "../adapters/substrate/chains";
 import { getConfig as getSubstrateConfig } from "../adapters/substrate/config";
 import type { StellarWalletsKitPlatformService } from "../platform/stellar-wallets-kit-platform";
 import type { WalletConnectPresentationPlatform } from "../platform/wallet-connect-presentation";
@@ -111,12 +108,14 @@ export const scopedMipdSubscription = ({
     (dispose) => Effect.sync(dispose)
   ).pipe(Effect.asVoid);
 
+// Built from the wallet config snapshot, which carries unset settings as
+// `undefined`.
 export type BuildWagmiConfigOptions = {
   disableInjectedProviderDiscovery: boolean;
   mapWalletFn?: WidgetConfig["mapWalletFn"];
-  externalProviders?: CurrentRef<ExternalProviderSnapshot>;
+  externalProviders?: CurrentRef<ExternalProviderSnapshot> | undefined;
   enabledNetworks: EnabledWalletNetworks;
-  walletListFactory?: (chains: Chain[]) => WalletList;
+  walletListFactory?: ((chains: Chain[]) => WalletList) | undefined;
   isLedgerLive: boolean;
   isSafe: boolean;
   chainIconMapping: WidgetConfig["chainIconMapping"];
@@ -124,7 +123,7 @@ export type BuildWagmiConfigOptions = {
   walletCatalogue: HostProfile["walletCatalogue"];
   solanaWallets: ReadonlyArray<SolanaWalletDescriptor>;
   solanaConnection: Connection;
-  walletPolicy?: WalletPolicy;
+  walletPolicy?: WalletPolicy | undefined;
   persistPublicKey: WidgetPersistence["Service"]["upsertStoredPublicKey"];
   queryParams: InitParams;
   tonConnectManifestUrl: string | undefined;
@@ -257,14 +256,25 @@ export const buildWagmiConfig = (
       safeConnector,
       queryParams: opts.queryParams,
     };
+    const configuredChainsMap: Partial<
+      Record<
+        WalletNetwork,
+        { readonly network: WalletNetwork; readonly wagmiChain: WalletChain }
+      >
+    > = {
+      ...evmConfig.evmChainsMap,
+      ...cosmos.cosmosChainsMap,
+      ...misc.miscChainsMap,
+      ...substrate.substrateChainsMap,
+    };
 
-    const chains = opts.chainIconMapping
+    const chains: WalletChain[] = opts.chainIconMapping
       ? (() => {
           const chainIconMapping = opts.chainIconMapping;
           const mapWagmiChain = (val: {
             wagmiChain: WalletChain;
             network: Network;
-          }) => {
+          }): WalletChain => {
             const res = getVariantNetworkUrl({
               network: val.network,
               chainIconMapping,
@@ -275,37 +285,28 @@ export const buildWagmiConfig = (
             }
 
             return {
-              ...val.wagmiChain,
-              iconBackground: undefined,
+              ...Struct.omit(val.wagmiChain, ["iconBackground"]),
               iconUrl: res,
-            } as WalletChain;
+            };
           };
 
-          return Object.values({
-            ...evmConfig.evmChainsMap,
-            ...cosmos.cosmosChainsMap,
-            ...misc.miscChainsMap,
-            ...substrate.substrateChainsMap,
-          }).map(mapWagmiChain) as [WalletChain, ...WalletChain[]];
+          return Object.values(configuredChainsMap).map(mapWagmiChain);
         })()
-      : (() => {
-          return [
-            ...evmConfig.evmChains,
-            ...cosmos.cosmosWagmiChains,
-            ...misc.miscChains,
-            ...substrate.substrateChains,
-          ] as [WalletChain, ...WalletChain[]];
-        })();
-
-    const chainsWithoutEnsProfileLookups = chains.map(
-      omitEnsUniversalResolver
-    ) as [WalletChain, ...WalletChain[]];
+      : [
+          ...evmConfig.evmChains,
+          ...cosmos.cosmosWagmiChains,
+          ...misc.miscChains,
+          ...substrate.substrateChains,
+        ];
+
+    const chainsWithoutEnsProfileLookups = chains.map(omitEnsUniversalResolver);
     const hasConfiguredWalletNetworks =
       chainsWithoutEnsProfileLookups.length > 0;
-    const wagmiChains: [WalletChain, ...WalletChain[]] =
-      hasConfiguredWalletNetworks
-        ? chainsWithoutEnsProfileLookups
-        : [omitEnsUniversalResolver(mainnet)];
+    const wagmiChains: [WalletChain, ...WalletChain[]] = EArray.isArrayNonEmpty(
+      chainsWithoutEnsProfileLookups
+    )
+      ? chainsWithoutEnsProfileLookups
+      : [omitEnsUniversalResolver(mainnet)];
 
     const multiInjectedProviderDiscovery =
       !opts.disableInjectedProviderDiscovery &&
@@ -361,8 +362,9 @@ export const buildWagmiConfig = (
                   wallet.createConnector(walletDetails)({
                     ...connectorConfig,
                     chains:
-                      wallet.chainGroup.id === evmChainGroup.id
-                        ? (evmConfig.evmChains as [Chain, ...Chain[]])
+                      wallet.chainGroup.id === evmChainGroup.id &&
+                      EArray.isArrayNonEmpty(evmConfig.evmChains)
+                        ? evmConfig.evmChains
                         : connectorConfig.chains,
                   }),
               };
@@ -423,16 +425,7 @@ export const buildWagmiConfig = (
 
     const queryNetwork = val.queryParams.network;
     const queryParamsInitChainId = queryNetwork
-      ? (
-          val.evmConfig.evmChainsMap[queryNetwork as keyof EvmChainsMap] ??
-          val.cosmosConfig.cosmosChainsMap[
-            queryNetwork as keyof CosmosChainsMap
-          ] ??
-          val.miscConfig.miscChainsMap[queryNetwork as keyof MiscChainsMap] ??
-          val.substrateConfig.substrateChainsMap[
-            queryNetwork as keyof SubstrateChainsMap
-          ]
-        )?.wagmiChain.id
+      ? configuredChainsMap[queryNetwork]?.wagmiChain.id
       : undefined;
 
     const wagmiConfig = yield* Effect.try({
@@ -468,7 +461,7 @@ export const buildWagmiConfig = (
             const unseenProviders = getUnseenMipdProviders({
               connectors: prev,
               providers,
-              walletPolicy: opts.walletPolicy,
+              walletPolicy: opts.walletPolicy ?? {},
             });
 
             return [
diff --git a/packages/widget/src/services/wallet/internal/wagmi-seam.ts b/packages/widget/src/services/wallet/internal/wagmi-seam.ts
new file mode 100644
index 000000000..6b26cdaab
--- /dev/null
+++ b/packages/widget/src/services/wallet/internal/wagmi-seam.ts
@@ -0,0 +1,37 @@
+import type { Address } from "viem";
+
+/** A Cosmos chain id such as `cosmoshub-4`; Cosmos wallets route by it. */
+type CosmosChainReference = string;
+
+/**
+ * The id a connection routes by. EVM, Substrate, and the misc chains use
+ * numbers; Cosmos chains use their chain reference.
+ */
+export type WalletRoutingId = number | CosmosChainReference;
+
+/** Reads a connector-reported chain id: numeric strings are numbers, anything else is a Cosmos chain reference. */
+export const parseWalletRoutingId = (chainId: string): WalletRoutingId => {
+  const numericChainId = Number(chainId);
+
+  return Number.isNaN(numericChainId) ? chainId : numericChainId;
+};
+
+/** Hands a routing id to wagmi, which stores it unchanged as the connection's `chainId`. */
+export const toWagmiChainId = (routingId: WalletRoutingId): number =>
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: wagmi types Chain["id"] and connector chain ids as number; Cosmos chain references travel through that slot as strings at runtime
+  routingId as number;
+
+/** Reads a chain id back from wagmi, where Cosmos chain references sit in the numeric slot. */
+export const fromWagmiChainId = (chainId: number): WalletRoutingId => chainId;
+
+/** Hands a connected account to wagmi, which stores it unchanged. */
+export const toWagmiAccount = (address: string): Address =>
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: wagmi types connector accounts as EVM Address; non-EVM connectors carry their native address formats through that slot
+  address as Address;
+
+/** Hands a connector's account list to wagmi as the same array. */
+export const toWagmiAccounts = (
+  addresses: readonly string[]
+): readonly Address[] =>
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: wagmi types connector accounts as EVM Address; non-EVM connectors carry their native address formats through that slot
+  addresses as readonly Address[];
diff --git a/packages/widget/src/services/wallet/wallet-chain-icons.ts b/packages/widget/src/services/wallet/wallet-chain-icons.ts
index e7f9e44a0..a2b8370cf 100644
--- a/packages/widget/src/services/wallet/wallet-chain-icons.ts
+++ b/packages/widget/src/services/wallet/wallet-chain-icons.ts
@@ -33,7 +33,12 @@ const chainIcons: Readonly<Partial<Record<number, ChainIcon>>> = {
   999: { iconUrl: hyperevm, iconBackground: "#000000" },
 };
 
-export const walletChainIcon = (chain: Chain): ChainIcon => ({
-  iconUrl: chain.iconUrl ?? chainIcons[chain.id]?.iconUrl,
-  iconBackground: chain.iconBackground ?? chainIcons[chain.id]?.iconBackground,
-});
+export const walletChainIcon = (chain: Chain): ChainIcon => {
+  const fallback = chainIcons[chain.id];
+  const iconUrl = chain.iconUrl ?? fallback?.iconUrl;
+  const iconBackground = chain.iconBackground ?? fallback?.iconBackground;
+  return {
+    ...(iconUrl === undefined ? {} : { iconUrl }),
+    ...(iconBackground === undefined ? {} : { iconBackground }),
+  };
+};
diff --git a/packages/widget/src/services/wallet/wallet-commands.ts b/packages/widget/src/services/wallet/wallet-commands.ts
index aeb8f114d..b4d9c3079 100644
--- a/packages/widget/src/services/wallet/wallet-commands.ts
+++ b/packages/widget/src/services/wallet/wallet-commands.ts
@@ -47,13 +47,15 @@ export type WalletSwitchAccountInput = {
 
 export type WalletSignMessageInput = {
   readonly account?: Address;
-  readonly connector?: Connector;
+  // `undefined` is passed to override a connector with Wagmi's current one.
+  readonly connector?: Connector | undefined;
   readonly message: string;
 };
 
 export type WalletSignTypedDataInput = Eip712TypedData & {
   readonly account?: Address;
-  readonly connector?: Connector;
+  // `undefined` is passed to override a connector with Wagmi's current one.
+  readonly connector?: Connector | undefined;
 };
 
 type ZamaPermitMeta = {
diff --git a/packages/widget/src/services/wallet/wallet-connectors.ts b/packages/widget/src/services/wallet/wallet-connectors.ts
index a748cf7c7..8b3150fcb 100644
--- a/packages/widget/src/services/wallet/wallet-connectors.ts
+++ b/packages/widget/src/services/wallet/wallet-connectors.ts
@@ -1,4 +1,4 @@
-import type { Stream } from "effect";
+import { Stream } from "effect";
 import type { Chain } from "viem";
 import type { Connector } from "wagmi";
 
@@ -9,8 +9,9 @@ export type ConnectorWithFilteredChains = {
 export const isConnectorWithFilteredChains = (
   connector: Connector
 ): connector is Connector & ConnectorWithFilteredChains => {
-  return !!(connector as unknown as ConnectorWithFilteredChains)
-    .$filteredChains;
+  return (
+    "$filteredChains" in connector && Stream.isStream(connector.$filteredChains)
+  );
 };
 
 const connectorsWithoutDisconnect = new Set([
diff --git a/packages/widget/src/services/wallet/wallet-descriptors.ts b/packages/widget/src/services/wallet/wallet-descriptors.ts
index d34573e31..6a098ae5f 100644
--- a/packages/widget/src/services/wallet/wallet-descriptors.ts
+++ b/packages/widget/src/services/wallet/wallet-descriptors.ts
@@ -1,4 +1,4 @@
-import type { Effect } from "effect";
+import { type Effect, Struct } from "effect";
 import type { Chain as ViemChain } from "viem";
 import type { Connector, CreateConnectorFn } from "wagmi";
 import type { WalletConnectParameters } from "wagmi/connectors";
@@ -106,7 +106,7 @@ export const connectorsForWallets = (
   for (const [groupIndex, group] of walletList.entries()) {
     for (const createWallet of group.wallets) {
       const wallet = createWallet({
-        appIcon: options.appIcon,
+        ...Struct.pick(options, ["appIcon"]),
         appName: options.appName,
         projectId: options.projectId,
         walletConnectParameters: { metadata },
diff --git a/packages/widget/src/services/wallet/wallet-transactions.ts b/packages/widget/src/services/wallet/wallet-transactions.ts
index 104331aae..3b0d3a31d 100644
--- a/packages/widget/src/services/wallet/wallet-transactions.ts
+++ b/packages/widget/src/services/wallet/wallet-transactions.ts
@@ -1,3 +1,4 @@
+import { Effect, Schema } from "effect";
 import type { Address, Hex } from "viem";
 import type { Connector } from "wagmi";
 import type {
@@ -6,9 +7,15 @@ import type {
 } from "../../domain/action/models";
 import type { Action as BorrowAction } from "../../domain/borrow/execution/action";
 import type { Transaction as BorrowTransaction } from "../../domain/borrow/execution/transaction";
+import {
+  SignedTransactionPayload,
+  TransactionHash,
+  WalletSignature,
+} from "../../domain/identity/identifiers";
 import type { Network } from "../../domain/network/network";
 import type { Token } from "../../domain/token/token";
 import * as LegacyApi from "../../generated/api/legacy-schema";
+import { WalletBroadcastError, WalletSigningError } from "./wallet-errors";
 
 type YieldProviderDetail = {
   readonly name: string;
@@ -33,6 +40,7 @@ export type YieldActionMeta = {
   readonly providersDetails: Array<YieldProviderDetail>;
 };
 
+/** Every field is always present (possibly `undefined`): hosts receive it as-is. */
 export type YieldTransactionMeta = YieldActionMeta & {
   readonly annotatedTransaction: ActionTransaction["annotatedTransaction"];
   readonly gasEstimate: ActionTransaction["gasEstimate"];
@@ -41,6 +49,8 @@ export type YieldTransactionMeta = YieldActionMeta & {
   readonly txType: ActionTransaction["type"];
 };
 
+type BorrowRawArguments = NonNullable<BorrowAction["rawArguments"]>;
+
 export type BorrowTransactionMeta = {
   readonly actionId: BorrowAction["id"];
   readonly actionType: BorrowAction["action"];
@@ -52,11 +62,13 @@ export type BorrowTransactionMeta = {
     readonly borrowAmount?: string;
     readonly collateralAmount?: string;
     readonly collateralAmountRaw?: string;
-    readonly collateralTokenAddress?: string;
-    readonly marketId: string;
+    readonly collateralTokenAddress?: NonNullable<
+      BorrowRawArguments["collateralTokenAddress"]
+    >;
+    readonly marketId: BorrowRawArguments["marketId"];
     readonly repayAll?: boolean;
     readonly targetLtv?: string;
-    readonly tokenAddress?: string;
+    readonly tokenAddress?: NonNullable<BorrowRawArguments["tokenAddress"]>;
   };
   readonly txId: BorrowTransaction["id"];
   readonly txType: BorrowTransaction["type"];
@@ -68,7 +80,8 @@ export type LegacyTransaction = typeof LegacyTransaction.Type;
 type WalletEvmTransactionInputCommon = {
   readonly account?: Address;
   readonly chainId?: number;
-  readonly connector?: Connector;
+  // `undefined` is passed to override a connector with Wagmi's current one.
+  readonly connector?: Connector | undefined;
   readonly data?: Hex;
   readonly gas?: bigint;
   readonly to: Address;
@@ -111,10 +124,41 @@ export type WalletSignTransactionInput = WalletSignTransactionInputFields &
 
 export type WalletSignedPayloadResult = {
   readonly broadcasted: false;
-  readonly signedTx: string;
+  readonly signedTx: SignedTransactionPayload;
 };
 
 export type WalletBroadcastResult = {
   readonly broadcasted: true;
-  readonly signedTx: string;
+  readonly signedTx: TransactionHash;
 };
+
+/** What a wallet answered for a transaction it signed and broadcast. */
+export const decodeWalletBroadcastResult = (
+  hash: unknown
+): Effect.Effect<WalletBroadcastResult, WalletBroadcastError> =>
+  Schema.decodeUnknownEffect(TransactionHash)(hash).pipe(
+    Effect.map((signedTx) => ({ broadcasted: true, signedTx }) as const),
+    Effect.mapError(
+      (cause) => new WalletBroadcastError({ cause, customMessage: null })
+    )
+  );
+
+/** What a wallet answered for a transaction it signed but did not broadcast. */
+export const decodeWalletSignedPayloadResult = (
+  payload: unknown
+): Effect.Effect<WalletSignedPayloadResult, WalletSigningError> =>
+  Schema.decodeUnknownEffect(SignedTransactionPayload)(payload).pipe(
+    Effect.map((signedTx) => ({ broadcasted: false, signedTx }) as const),
+    Effect.mapError(
+      (cause) => new WalletSigningError({ cause, operation: "transaction" })
+    )
+  );
+
+/** The signature a wallet answered for a message or typed data. */
+export const decodeWalletSignature = (
+  signature: unknown,
+  operation: "message" | "typed-data"
+): Effect.Effect<WalletSignature, WalletSigningError> =>
+  Schema.decodeUnknownEffect(WalletSignature)(signature).pipe(
+    Effect.mapError((cause) => new WalletSigningError({ cause, operation }))
+  );
diff --git a/packages/widget/src/services/zama/revealed-balances.ts b/packages/widget/src/services/zama/revealed-balances.ts
index 4c187788b..6ac3a6647 100644
--- a/packages/widget/src/services/zama/revealed-balances.ts
+++ b/packages/widget/src/services/zama/revealed-balances.ts
@@ -8,10 +8,10 @@ import {
   SubscriptionRef,
 } from "effect";
 import type {
-  ConfidentialHandle,
   ConfidentialTokenBalanceKey,
   RevealedBalances as Values,
 } from "../../domain/earn/confidential";
+import type { ConfidentialHandle } from "../../domain/earn/models";
 import type { WalletScopeOwner } from "../../domain/wallet/wallet-scope";
 
 type RevealedBalancesApi = Readonly<{
diff --git a/packages/widget/src/services/zama/zama-service.ts b/packages/widget/src/services/zama/zama-service.ts
index fe24edad7..3f6e5c9f5 100644
--- a/packages/widget/src/services/zama/zama-service.ts
+++ b/packages/widget/src/services/zama/zama-service.ts
@@ -20,12 +20,15 @@ import {
   erc20Abi,
   type Hex,
   http,
+  isAddress,
+  isHex,
   type PublicClient,
   parseAbi,
   parseEventLogs,
 } from "viem";
 import {
   type DirectTransaction,
+  DirectTransactionId,
   makeErc20Approval,
 } from "../../domain/action/direct-transaction";
 import type {
@@ -33,16 +36,24 @@ import type {
   ManageActionCommand,
 } from "../../domain/action/models";
 import {
+  type ConfidentialChainId,
   type ConfidentialConversion,
   type ConfidentialEncryption,
   type ConfidentialEncryptionPlan,
-  ConfidentialHandle,
   ConfidentialTokenBalanceKey,
   getConfidentialNetwork,
   planConfidentialEncryption,
   toConfidentialArguments,
 } from "../../domain/earn/confidential";
-import type { EarnYieldWithProvider } from "../../domain/earn/models";
+import {
+  ConfidentialHandle,
+  type EarnYieldWithProvider,
+} from "../../domain/earn/models";
+import type {
+  ContractAddress,
+  TransactionHash,
+  WalletAddress,
+} from "../../domain/identity/identifiers";
 import type { Network } from "../../domain/network/network";
 import type { Token } from "../../domain/token/token";
 import { WidgetConfigService } from "../config/widget-config";
@@ -57,6 +68,23 @@ class ZamaError extends Data.TaggedError("ZamaError")<{
   readonly operation: string;
 }> {}
 
+// viem takes 0x addresses; an EVM wallet's and contract's addresses are in them.
+const toEvmAddress = (
+  address: string,
+  operation: string
+): Effect.Effect<Address, ZamaError> =>
+  isAddress(address, { strict: false })
+    ? Effect.succeed(address)
+    : Effect.fail(
+        new ZamaError({ cause: `Not an EVM address: ${address}`, operation })
+      );
+
+// The SDK returns hex handles; the domain keeps them branded.
+const EncryptedHandles = Schema.Struct({
+  amount: Schema.NullOr(ConfidentialHandle),
+  legs: Schema.NullOr(Schema.Array(ConfidentialHandle)),
+});
+
 /**
  * How a confidential vault's action command gets its hidden amount: the
  * amount encrypted for the signing wallet, or a withdrawal decrypted publicly.
@@ -71,7 +99,7 @@ type ConfidentialEncryptPreparation = Readonly<{
   readonly assetAddress: string | null;
   /** The hidden balance `amount` must not exceed, if it is not wrapped first. */
   readonly balance: Readonly<{
-    readonly chainId: number;
+    readonly chainId: ConfidentialChainId;
     readonly token: Token;
   }> | null;
   readonly command: ActionCommand;
@@ -85,7 +113,7 @@ type ConfidentialEncryptPreparation = Readonly<{
 
 type ConfidentialDecryptPreparation = Readonly<{
   readonly _tag: "Decrypt";
-  readonly chainId: number;
+  readonly chainId: ConfidentialChainId;
   readonly command: ManageActionCommand;
   readonly handle: ConfidentialHandle;
 }>;
@@ -145,17 +173,17 @@ type ZamaServiceApi = Readonly<{
     readonly amount: bigint;
     readonly conversion: ConfidentialConversion;
     readonly network: Network;
-    readonly owner: string;
+    readonly owner: WalletAddress;
   }) => Effect.Effect<ReadonlyArray<DirectTransaction>>;
   /**
    * How many of `tokens` the owner has not yet made `operator` an operator
    * on; a grant whose status cannot be read counts as missing.
    */
   readonly countMissingOperatorGrants: (input: {
-    readonly chainId: number;
-    readonly operator: string;
-    readonly owner: string;
-    readonly tokens: ReadonlyArray<string>;
+    readonly chainId: ConfidentialChainId;
+    readonly operator: ContractAddress;
+    readonly owner: WalletAddress;
+    readonly tokens: ReadonlyArray<ContractAddress>;
   }) => Effect.Effect<number>;
   /** A deposit's or exit's command with its amount encrypted instead. */
   readonly encryptCommand: (
@@ -170,18 +198,18 @@ type ZamaServiceApi = Readonly<{
    * owner: the handle its WITHDRAW publicly decrypts.
    */
   readonly readUnwrapRequest: (input: {
-    readonly chainId: number;
-    readonly hash: string;
-    readonly owner: string;
+    readonly chainId: ConfidentialChainId;
+    readonly hash: TransactionHash;
+    readonly owner: WalletAddress;
   }) => Effect.Effect<ConfidentialHandle, ConfidentialPreparationError>;
   readonly revealHandles: (input: {
-    readonly chainId: number;
+    readonly chainId: ConfidentialChainId;
     readonly handles: ReadonlyArray<HandleInput>;
-    readonly owner: string;
+    readonly owner: WalletAddress;
   }) => Effect.Effect<void, ZamaError>;
   readonly revealTokenBalance: (input: {
-    readonly chainId: number;
-    readonly owner: string;
+    readonly chainId: ConfidentialChainId;
+    readonly owner: WalletAddress;
     readonly token: Token;
   }) => Effect.Effect<bigint, ZamaError>;
 }>;
@@ -273,8 +301,8 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
 
   const signPermit = (
     typedData: EIP712TypedData,
-    owner: string,
-    chainId: number
+    owner: WalletAddress,
+    chainId: ConfidentialChainId
   ) =>
     Effect.gen(function* () {
       const network = getConfidentialNetwork(chainId);
@@ -309,13 +337,21 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
           },
         } satisfies Eip712TypedData,
       });
-      return signature as Hex;
+      // viem's signer seam takes hex; an EVM wallet signs in hex.
+      if (!isHex(signature)) {
+        return yield* new ZamaError({
+          cause: "The wallet returned a non-hex permit signature",
+          operation: "permit",
+        });
+      }
+      return signature;
     });
 
   const makeSigner = (
     Base: typeof BaseSigner,
-    owner: string,
-    chainId: number
+    owner: WalletAddress,
+    address: Address,
+    chainId: ConfidentialChainId
   ) =>
     new (class WidgetPermitSigner extends Base {
       signTypedData(typedData: EIP712TypedData) {
@@ -326,9 +362,9 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
           new Error("Zama transactions go through the widget transaction flow")
         );
       }
-    })({ address: owner as Address, chainId });
+    })({ address, chainId });
 
-  const getChain = (zama: ZamaModules, chainId: number) =>
+  const getChain = (zama: ZamaModules, chainId: ConfidentialChainId) =>
     Effect.gen(function* () {
       const preset = zama.chains[chainId];
       if (!preset) {
@@ -349,12 +385,15 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     });
 
   // Read-only, so wallet events never fire.
-  const widgetRpcProvider = (chainId: number): EIP1193Provider => ({
-    on: () => {},
-    removeListener: () => {},
-    request: wallet.wagmiConfig.getClient({ chainId })
-      .request as EIP1193Provider["request"],
-  });
+  const widgetRpcProvider = (chainId: ConfidentialChainId): EIP1193Provider => {
+    const client = wallet.wagmiConfig.getClient({ chainId });
+    return {
+      on: () => {},
+      removeListener: () => {},
+      // biome-ignore lint/nursery/noUnsafeTypeAssertion: viem types a client's `request` by its RPC schema, which its own `EIP1193Provider["request"]` overloads do not accept though both send the same EIP-1193 requests.
+      request: client.request as EIP1193Provider["request"],
+    };
+  };
 
   // The Zama preset RPC is only a fallback.
   const publicClientFor = (chain: FheChain): PublicClient =>
@@ -367,8 +406,8 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     });
 
   const getSdk = Effect.fn("ZamaService.getSdk")(function* (
-    chainId: number,
-    owner: string
+    chainId: ConfidentialChainId,
+    owner: WalletAddress
   ) {
     const zama = yield* modules;
     const chain = yield* getChain(zama, chainId);
@@ -385,9 +424,18 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
           publicClient: publicClientFor(chain),
         }),
         relayers: {
-          [chain.id]: zama.web.web({ offloadWorker: zama.encryptWorker }),
+          [chain.id]: zama.web.web(
+            zama.encryptWorker === undefined
+              ? {}
+              : { offloadWorker: zama.encryptWorker }
+          ),
         },
-        signer: makeSigner(zama.core.BaseSigner, owner, chainId),
+        signer: makeSigner(
+          zama.core.BaseSigner,
+          owner,
+          yield* toEvmAddress(owner, "signer"),
+          chainId
+        ),
         // The default IndexedDB would keep keys and cleartexts for 30 days.
         storage: zama.core.memoryStorage,
       })
@@ -397,7 +445,7 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
   });
 
   const getPublicClient = Effect.fn("ZamaService.getPublicClient")(function* (
-    chainId: number
+    chainId: ConfidentialChainId
   ) {
     return publicClientFor(yield* getChain(yield* modules, chainId));
   });
@@ -406,17 +454,22 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     owner,
     plan,
   }: {
-    readonly owner: string;
+    readonly owner: WalletAddress;
     readonly plan: ConfidentialEncryptionPlan;
   }): Effect.fn.Return<ConfidentialEncryption, ZamaError> {
     const sdk = yield* getSdk(plan.chainId, owner);
+    const userAddress = yield* toEvmAddress(owner, "encrypt");
     const encryptValues = (contract: string, inputs: ReadonlyArray<bigint>) =>
-      tryZama("encrypt", () =>
-        sdk.encrypt({
-          contractAddress: contract as Address,
-          userAddress: owner as Address,
-          values: inputs.map((value) => ({ type: "euint64", value })),
-        })
+      toEvmAddress(contract, "encrypt").pipe(
+        Effect.flatMap((contractAddress) =>
+          tryZama("encrypt", () =>
+            sdk.encrypt({
+              contractAddress,
+              userAddress,
+              values: inputs.map((value) => ({ type: "euint64", value })),
+            })
+          )
+        )
       );
 
     const [amount, legs] = yield* Effect.all([
@@ -427,16 +480,22 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
         ? encryptValues(plan.legs.contract, plan.legs.values)
         : Effect.succeed(null),
     ]);
-    const amountHandle = amount?.encryptedValues[0];
+    const handles = yield* Schema.decodeEffect(EncryptedHandles)({
+      amount: amount?.encryptedValues[0] ?? null,
+      legs: legs?.encryptedValues ?? null,
+    }).pipe(
+      Effect.mapError((cause) => new ZamaError({ cause, operation: "encrypt" }))
+    );
 
     return {
       amount:
-        amount && amountHandle
-          ? { handle: amountHandle, proof: amount.inputProof }
+        amount && handles.amount
+          ? { handle: handles.amount, proof: amount.inputProof }
+          : null,
+      legs:
+        legs && handles.legs
+          ? { handles: handles.legs, proof: legs.inputProof }
           : null,
-      legs: legs
-        ? { handles: legs.encryptedValues, proof: legs.inputProof }
-        : null,
     } satisfies ConfidentialEncryption;
   });
 
@@ -444,14 +503,17 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     "ZamaService.revealHandles"
   )(function* ({ chainId, handles, owner }) {
     const sdk = yield* getSdk(chainId, owner);
-    const clear = yield* tryZama("decrypt", () =>
-      sdk.decryption.decryptValues(
-        handles.map((input) => ({
-          contractAddress: input.contract as Address,
-          encryptedValue: input.handle as Hex,
+    const inputs = yield* Effect.forEach(handles, (input) =>
+      toEvmAddress(input.contract, "decrypt").pipe(
+        Effect.map((contractAddress) => ({
+          contractAddress,
+          encryptedValue: input.handle,
         }))
       )
     );
+    const clear = yield* tryZama("decrypt", () =>
+      sdk.decryption.decryptValues(inputs)
+    );
     const cleartexts = new Map(
       Object.entries(clear).map(([handle, value]) => [
         handle.toLowerCase(),
@@ -477,8 +539,10 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
       });
     }
     const sdk = yield* getSdk(chainId, owner);
+    const tokenAddress = yield* toEvmAddress(address, "decrypt");
+    const ownerAddress = yield* toEvmAddress(owner, "decrypt");
     const balance = yield* tryZama("decrypt", () =>
-      sdk.createToken(address as Address).balanceOf(owner as Address)
+      sdk.createToken(tokenAddress).balanceOf(ownerAddress)
     );
     yield* values.addTokenBalance(
       new ConfidentialTokenBalanceKey({ owner, token }),
@@ -495,11 +559,12 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     readonly conversion: ConfidentialConversion;
   }) {
     const client = yield* getPublicClient(conversion.chainId);
+    const address = yield* toEvmAddress(conversion.wrapper, "read-rate");
     // `rate()` rebases underlying decimals to the wrapper's.
     const rate = yield* tryZama("read-rate", () =>
       client.readContract({
         abi: wrapperAbi,
-        address: conversion.wrapper as Address,
+        address,
         functionName: "rate",
       })
     );
@@ -509,16 +574,17 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
   const planConversion: ZamaServiceApi["planConversion"] = Effect.fn(
     "ZamaService.planConversion"
   )(function* ({ amount, conversion, network, owner }) {
-    const allowance = {
-      owner: owner as Address,
-      spender: conversion.wrapper as Address,
-      token: conversion.underlying as Address,
-    };
+    // A conversion runs on an EVM chain, so its addresses are hex.
+    const allowance = yield* Effect.all({
+      owner: toEvmAddress(owner, "plan-conversion"),
+      spender: toEvmAddress(conversion.wrapper, "plan-conversion"),
+      token: toEvmAddress(conversion.underlying, "plan-conversion"),
+    }).pipe(Effect.orDie);
     const approve = (type: "APPROVAL" | "RESET_APPROVAL") =>
       makeErc20Approval({
         amount,
         chainId: conversion.chainId,
-        id: "conversion-approval",
+        id: DirectTransactionId.make("conversion-approval"),
         network,
         type,
         ...allowance,
@@ -531,7 +597,7 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
         args: [allowance.owner, amount],
         functionName: "wrap",
       }),
-      id: "conversion-wrap",
+      id: DirectTransactionId.make("conversion-wrap"),
       network,
       to: allowance.spender,
       type: "WRAP",
@@ -572,14 +638,23 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
       const granted = yield* Effect.forEach(
         tokens,
         (token) =>
-          tryZama("read-operator", () =>
-            client.value.readContract({
-              abi: wrapperAbi,
-              address: token as Address,
-              args: [owner as Address, operator as Address],
-              functionName: "isOperator",
-            })
-          ).pipe(Effect.orElseSucceed(() => false)),
+          Effect.all([
+            toEvmAddress(token, "read-operator"),
+            toEvmAddress(owner, "read-operator"),
+            toEvmAddress(operator, "read-operator"),
+          ]).pipe(
+            Effect.flatMap(([address, holder, spender]) =>
+              tryZama("read-operator", () =>
+                client.value.readContract({
+                  abi: wrapperAbi,
+                  address,
+                  args: [holder, spender],
+                  functionName: "isOperator",
+                })
+              )
+            ),
+            Effect.orElseSucceed(() => false)
+          ),
         { concurrency: "unbounded" }
       );
       return granted.filter((isGranted) => !isGranted).length;
@@ -590,15 +665,15 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
     owner,
     requestId,
   }: {
-    readonly chainId: number;
-    readonly owner: string;
+    readonly chainId: ConfidentialChainId;
+    readonly owner: WalletAddress;
     readonly requestId: ConfidentialHandle;
   }) {
     const sdk = yield* getSdk(chainId, owner);
     const decrypted = yield* tryZama("public-decrypt", () =>
-      sdk.decryption.decryptPublicValues([requestId as Hex])
+      sdk.decryption.decryptPublicValues([requestId])
     );
-    const cleartext = decrypted.clearValues[requestId as Hex];
+    const cleartext = decrypted.clearValues[requestId];
     if (typeof cleartext !== "bigint") {
       return yield* new ZamaError({
         cause: decrypted,
@@ -698,15 +773,27 @@ const makeZamaService = Effect.fn("makeZamaService")(function* () {
   const readUnwrapRequest: ZamaServiceApi["readUnwrapRequest"] = Effect.fn(
     "ZamaService.readUnwrapRequest"
   )(function* ({ chainId, hash, owner }) {
+    // viem takes hex, and an EVM transaction's hash is in it.
+    if (!isHex(hash)) {
+      return yield* unpreparable(
+        "The unwrap transaction hash is not hex.",
+        hash
+      );
+    }
     const client = yield* getPublicClient(chainId).pipe(
       Effect.mapError(retryableFailure)
     );
     const receipt = yield* tryZama("read-unwrap-receipt", () =>
-      client.getTransactionReceipt({ hash: hash as Hex })
+      client.getTransactionReceipt({ hash })
     ).pipe(Effect.mapError(retryableFailure));
+    const receiver = yield* toEvmAddress(owner, "read-unwrap-receipt").pipe(
+      Effect.mapError((error) =>
+        unpreparable("The unwrap owner is not an EVM address.", error)
+      )
+    );
     const [requested] = parseEventLogs({
       abi: wrapperAbi,
-      args: { receiver: owner as Address },
+      args: { receiver },
       eventName: "UnwrapRequested",
       logs: receipt.logs,
     });
diff --git a/packages/widget/src/shared/assets/network-logo.ts b/packages/widget/src/shared/assets/network-logo.ts
index 7675eafcd..0f02c3e2d 100644
--- a/packages/widget/src/shared/assets/network-logo.ts
+++ b/packages/widget/src/shared/assets/network-logo.ts
@@ -1,5 +1,5 @@
-import type { Network } from "../../domain/network/network";
+import type { Token } from "../../domain/token/token";
 import { config } from "../config/widget-defaults";
 
-export const networkLogoUrl = (network: Network) =>
+export const networkLogoUrl = (network: Token["network"]) =>
   `${config.assetsUrl}/networks/${network}.svg`;
diff --git a/packages/widget/src/shared/effect/merge-deep.ts b/packages/widget/src/shared/effect/merge-deep.ts
index da8b7eff9..77bb70844 100644
--- a/packages/widget/src/shared/effect/merge-deep.ts
+++ b/packages/widget/src/shared/effect/merge-deep.ts
@@ -12,13 +12,17 @@ const combineNested = (left: unknown, right: unknown): unknown => {
   return right;
 };
 
-export const mergeDeep = <A>(
-  base: A,
-  ...overlays: ReadonlyArray<unknown>
-): A => {
+/**
+ * Merges plain objects key by key, later sources winning; nested plain objects
+ * merge recursively and `undefined` never overwrites. Non-object sources are
+ * skipped. The result is untyped: callers read it through their own decoder.
+ */
+export const mergeDeep = (
+  ...sources: ReadonlyArray<unknown>
+): Record<string, unknown> => {
   let merged: Record<string, unknown> = Record.empty();
 
-  for (const source of [base, ...overlays]) {
+  for (const source of sources) {
     if (!Predicate.isObject(source)) {
       continue;
     }
@@ -26,5 +30,5 @@ export const mergeDeep = <A>(
     merged = Record.union(merged, source, combineNested);
   }
 
-  return merged as A;
+  return merged;
 };
diff --git a/packages/widget/src/shared/effect/pagination.ts b/packages/widget/src/shared/effect/pagination.ts
index 94d726991..85efb70ac 100644
--- a/packages/widget/src/shared/effect/pagination.ts
+++ b/packages/widget/src/shared/effect/pagination.ts
@@ -150,6 +150,6 @@ export const getPullResultItems = <Item, E>(
 ): ReadonlyArray<Item> =>
   result.pipe(
     AsyncResult.value,
-    Option.map((value) => value.items as ReadonlyArray<Item>),
+    Option.map((value): ReadonlyArray<Item> => value.items),
     Option.getOrElse((): ReadonlyArray<Item> => [])
   );
diff --git a/packages/widget/src/shared/lib/borrow-token.ts b/packages/widget/src/shared/lib/borrow-token.ts
index a30eb53f5..baeda2974 100644
--- a/packages/widget/src/shared/lib/borrow-token.ts
+++ b/packages/widget/src/shared/lib/borrow-token.ts
@@ -9,9 +9,9 @@ export const borrowTokenToAppToken = ({
   readonly network: BorrowNetwork;
   readonly token: BorrowToken;
 }): Token => ({
-  address: token.address,
+  ...(token.address === undefined ? {} : { address: token.address }),
   decimals: token.decimals,
   name: token.name,
-  network: network as Token["network"],
+  network,
   symbol: token.symbol,
 });
diff --git a/packages/widget/src/shared/lib/formatters.ts b/packages/widget/src/shared/lib/formatters.ts
index 849647945..64661cf93 100644
--- a/packages/widget/src/shared/lib/formatters.ts
+++ b/packages/widget/src/shared/lib/formatters.ts
@@ -42,7 +42,7 @@ export const getGasFeeInUSD = ({
   if (!yieldDto || !gas) return "";
 
   const gasFeeInUSD = getTokenPriceInUSD({
-    amount: gas.toString(),
+    amount: gas,
     prices: prices ?? new Prices(new Map()),
     token: yieldDto.mechanics.gasFeeToken,
     pricePerShare: null,
diff --git a/packages/widget/src/shared/styles/recipe-variant.ts b/packages/widget/src/shared/styles/recipe-variant.ts
index d9c3bae9a..c0885ea8d 100644
--- a/packages/widget/src/shared/styles/recipe-variant.ts
+++ b/packages/widget/src/shared/styles/recipe-variant.ts
@@ -10,8 +10,8 @@ export const combineRecipeWithVariant = ({
 }: {
   rec: ReturnType<typeof recipe>;
   variant: WidgetVariant | undefined;
-  state?: string;
-  type?: string;
+  state?: string | undefined;
+  type?: string | undefined;
 }) => {
   if (rec.classNames.variants.variant?.[variant]) {
     return rec({ variant, state, type });
diff --git a/packages/widget/src/shared/styles/theme/atoms.css.ts b/packages/widget/src/shared/styles/theme/atoms.css.ts
index 38649e07e..459777dfb 100644
--- a/packages/widget/src/shared/styles/theme/atoms.css.ts
+++ b/packages/widget/src/shared/styles/theme/atoms.css.ts
@@ -1,5 +1,5 @@
 import { createSprinkles, defineProperties } from "@vanilla-extract/sprinkles";
-import type { Breakpoint } from "../tokens/breakpoints";
+import { Record as ERecord } from "effect";
 import { breakpoints, minMediaQuery } from "../tokens/breakpoints";
 import { responsiveProperties, unresponsiveProperties } from "./properties";
 
@@ -8,19 +8,10 @@ const unresponsiveAtomicProperties = defineProperties({
 });
 
 const responsiveAtomicProperties = defineProperties({
-  conditions: Object.keys(breakpoints).reduce(
-    (acc, key) => {
-      const k = key as Breakpoint;
-
-      if (k === "mobile") {
-        acc[k] = {};
-      } else {
-        acc[k] = { "@media": minMediaQuery(k) };
-      }
-
-      return acc;
-    },
-    {} as { [Key in Breakpoint]: { "@media"?: string } }
+  conditions: ERecord.map(
+    breakpoints,
+    (_, breakpoint): { "@media"?: string } =>
+      breakpoint === "mobile" ? {} : { "@media": minMediaQuery(breakpoint) }
   ),
 
   defaultCondition: "mobile",
diff --git a/packages/widget/src/shared/styles/theme/variant-overrides/finery.ts b/packages/widget/src/shared/styles/theme/variant-overrides/finery.ts
index 992b1d526..c6de03832 100644
--- a/packages/widget/src/shared/styles/theme/variant-overrides/finery.ts
+++ b/packages/widget/src/shared/styles/theme/variant-overrides/finery.ts
@@ -7,13 +7,18 @@ import {
   utilaPalette,
 } from "./palettes";
 
-const getFineryPalette = (theme: typeof lightTheme) =>
+/** The only base-theme value the Finery overrides depend on. */
+export type FineryBaseTheme = {
+  readonly color: Pick<(typeof lightTheme)["color"], "primary">;
+};
+
+const getFineryPalette = (theme: FineryBaseTheme) =>
   theme.color.primary === darkTheme.color.primary
     ? fineryDarkPalette
     : fineryLightPalette;
 
 export const getFineryThemeOverrides = (
-  theme: typeof lightTheme
+  theme: FineryBaseTheme
 ): RecursivePartial<typeof lightTheme> => {
   const palette = getFineryPalette(theme);
 
diff --git a/packages/widget/src/shared/styles/tokens/typography.ts b/packages/widget/src/shared/styles/tokens/typography.ts
index 3738245cc..f88780ece 100644
--- a/packages/widget/src/shared/styles/tokens/typography.ts
+++ b/packages/widget/src/shared/styles/tokens/typography.ts
@@ -55,8 +55,6 @@ export const fontSizes: CompleteTheme["fontSize"] = {
   "6xl": "3.815rem",
 } as const;
 
-export type Heading = keyof CompleteTheme["heading"];
-
 export const headings: CompleteTheme["heading"] = {
   h1: {
     mobile: { fontSize: fontSizes["3xl"] },
@@ -76,8 +74,6 @@ export const headings: CompleteTheme["heading"] = {
   },
 };
 
-export type Text = keyof CompleteTheme["text"];
-
 export const texts: CompleteTheme["text"] = {
   large: {
     mobile: { fontSize: fontSizes.lg },
diff --git a/packages/widget/src/shared/ui/components/amount-token-section/index.tsx b/packages/widget/src/shared/ui/components/amount-token-section/index.tsx
index 0829ceab2..0ae045ff9 100644
--- a/packages/widget/src/shared/ui/components/amount-token-section/index.tsx
+++ b/packages/widget/src/shared/ui/components/amount-token-section/index.tsx
@@ -48,22 +48,22 @@ export const AmountTokenSectionTitle = ({
 type AmountTokenSectionProps = {
   readonly value: NumberInputProps["value"];
   readonly onChange: NumberInputProps["onChange"];
-  readonly disabled?: boolean;
-  readonly isInvalid?: boolean;
+  readonly disabled?: boolean | undefined;
+  readonly isInvalid?: boolean | undefined;
   /** Right-hand control: selected token chip, token picker, or small CTA. */
   readonly accessory: ReactNode;
   readonly formattedPrice: string;
   readonly balance?: ReactNode;
-  readonly balanceError?: boolean;
-  readonly onMaxClick?: (() => void) | null;
-  readonly maxButtonProps?: Pick<BoxProps, "background">;
-  readonly minMaxLabel?: string | null;
+  readonly balanceError?: boolean | undefined;
+  readonly onMaxClick?: (() => void) | null | undefined;
+  readonly maxButtonProps?: Pick<BoxProps, "background"> | undefined;
+  readonly minMaxLabel?: string | null | undefined;
   readonly minMaxError?: boolean;
   readonly state?: "default" | "danger";
   /** Stake/unstake token border vs muted action-card border. */
   readonly tone?: "stake" | "action";
   readonly marginTop?: BoxProps["marginTop"];
-  readonly dataRk?: string;
+  readonly dataRk?: string | undefined;
   readonly header?: ReactNode;
   readonly children?: ReactNode;
 };
diff --git a/packages/widget/src/shared/ui/components/collapsible/index.tsx b/packages/widget/src/shared/ui/components/collapsible/index.tsx
index 4b0d30ed9..866dc8e77 100644
--- a/packages/widget/src/shared/ui/components/collapsible/index.tsx
+++ b/packages/widget/src/shared/ui/components/collapsible/index.tsx
@@ -139,7 +139,7 @@ const AnimateContent = ({
         setDisableTransitionDuration(false);
       };
 
-      enterAnimation();
+      void enterAnimation();
     } else {
       const exitAnimation = async () => {
         setDisableTransitionDuration(true);
@@ -148,7 +148,7 @@ const AnimateContent = ({
         safeToRemove();
       };
 
-      exitAnimation();
+      void exitAnimation();
     }
   }, [animate, isPresent, safeToRemove, scope, setDisableTransitionDuration]);
 
diff --git a/packages/widget/src/shared/ui/components/lazy-component/index.tsx b/packages/widget/src/shared/ui/components/lazy-component/index.tsx
index b82ecccb6..0cebb3f35 100644
--- a/packages/widget/src/shared/ui/components/lazy-component/index.tsx
+++ b/packages/widget/src/shared/ui/components/lazy-component/index.tsx
@@ -18,6 +18,7 @@ export const lazyComponent = <
 ): Module[Name] => {
   const Loaded = lazy(async () => {
     // The wrapper below hands this component exactly the props it was given.
+    // biome-ignore lint/nursery/noUnsafeTypeAssertion: React's ComponentType is contravariant in props, so a generic export cannot be widened to the wrapper's `object` props without an assertion.
     const component = (await load())[name] as ComponentType<object>;
     return { default: component };
   });
@@ -31,5 +32,6 @@ export const lazyComponent = <
 
   // The wrapper forwards every prop, so it takes the props of the export.
   const typed: ComponentType<never> = LazyComponent;
+  // biome-ignore lint/nursery/noUnsafeTypeAssertion: React cannot type a props-forwarding wrapper as the generic export `Module[Name]` it stands in for.
   return typed as Module[Name];
 };
diff --git a/packages/widget/src/shared/ui/components/number-input/index.tsx b/packages/widget/src/shared/ui/components/number-input/index.tsx
index bd8776de3..374d3a6cf 100644
--- a/packages/widget/src/shared/ui/components/number-input/index.tsx
+++ b/packages/widget/src/shared/ui/components/number-input/index.tsx
@@ -17,8 +17,8 @@ export type NumberInputProps = {
   onChange: (value: BigNumber) => void;
   onBlur?: () => void;
   value: BigNumber;
-  disabled?: boolean;
-  isInvalid?: boolean;
+  disabled?: boolean | undefined;
+  isInvalid?: boolean | undefined;
   shakeOnInvalid?: boolean;
 };
 
@@ -79,7 +79,7 @@ export const NumberInput = ({
   useEffect(() => {
     if (!shakeOnInvalid || !isInvalid) return;
 
-    animate.start("shake");
+    void animate.start("shake");
   }, [animate, isInvalid, shakeOnInvalid]);
 
   return (
diff --git a/packages/widget/src/shared/ui/components/select-modal/index.tsx b/packages/widget/src/shared/ui/components/select-modal/index.tsx
index 47d7e415f..3618ba814 100644
--- a/packages/widget/src/shared/ui/components/select-modal/index.tsx
+++ b/packages/widget/src/shared/ui/components/select-modal/index.tsx
@@ -31,9 +31,9 @@ type SelectModalWithoutStateProps = PropsWithChildren<
     inputPlaceholder?: string;
     trigger?: ReactNode;
     onClose?: () => void;
-    onOpen?: () => void;
+    onOpen?: (() => void) | undefined;
     searchValue?: string;
-    isLoading?: boolean;
+    isLoading?: boolean | undefined;
     errorMessage?: string;
     disableClose?: boolean;
     hideTopBar?: boolean;
@@ -58,7 +58,7 @@ type SelectModalContextType = {
 };
 
 export type SelectModalProps = SelectModalWithoutStateProps & {
-  state?: SelectModalContextType;
+  state?: SelectModalContextType | undefined;
   portalContainer?: HTMLElement;
 };
 
@@ -274,10 +274,10 @@ export const SelectModalItem = ({
   selected,
 }: PropsWithChildren<{
   onItemClick?: (args: { closeModal: () => void }) => void;
-  testId?: string;
+  testId?: string | undefined;
   variant?: ItemContainerVariants;
   className?: string;
-  selected?: boolean;
+  selected?: boolean | undefined;
 }>) => {
   const { setOpen } = useSelectModalContext();
   const onClick = () => onItemClick?.({ closeModal: () => setOpen(false) });
diff --git a/packages/widget/src/shared/ui/components/token-icon/network-icon-image/index.tsx b/packages/widget/src/shared/ui/components/token-icon/network-icon-image/index.tsx
index 85837975f..b86cb483d 100644
--- a/packages/widget/src/shared/ui/components/token-icon/network-icon-image/index.tsx
+++ b/packages/widget/src/shared/ui/components/token-icon/network-icon-image/index.tsx
@@ -6,7 +6,7 @@ import { logoContainer, logoImage } from "./style.css";
 type NetworkLogoImageProps = {
   networkLogoUri: string;
   networkName?: string;
-  tokenNetworkLogoHw?: Atoms["hw"];
+  tokenNetworkLogoHw?: Atoms["hw"] | undefined;
 };
 
 export const NetworkLogoImage = ({
diff --git a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-network-urls.ts b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-network-urls.ts
index 9c4727afb..261c99987 100644
--- a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-network-urls.ts
+++ b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-network-urls.ts
@@ -1,8 +1,8 @@
-import type { Network } from "../../../../../../domain/network/network";
+import type { Token } from "../../../../../../domain/token/token";
 import { networkLogoUrl } from "../../../../../assets/network-logo";
 import { useWidgetPresentation } from "../../../../widget-presentation";
 
-export const useVariantNetworkUrls = (network: Network) => {
+export const useVariantNetworkUrls = (network: Token["network"]) => {
   const { mapNetworkIconUrl } = useWidgetPresentation();
 
   return mapNetworkIconUrl(network) || networkLogoUrl(network);
diff --git a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-token-urls.ts b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-token-urls.ts
index a2b6adcde..958f04c13 100644
--- a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-token-urls.ts
+++ b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/hooks/use-variant-token-urls.ts
@@ -32,7 +32,7 @@ const getVariantTokenUrls = ({
   mapTokenIconUrl,
 }: {
   token: Token;
-  metadata?: Pick<YieldMetadata, "logoURI" | "name" | "provider">;
+  metadata: Pick<YieldMetadata, "logoURI" | "name" | "provider"> | undefined;
   hostTokenIconMapping: WidgetPresentation["hostTokenIconMapping"];
   mapTokenIconUrl: WidgetPresentation["mapTokenIconUrl"];
 }): VariantTokenUrls => {
diff --git a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/index.tsx b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/index.tsx
index 4b614ee83..0a2754226 100644
--- a/packages/widget/src/shared/ui/components/token-icon/token-icon-container/index.tsx
+++ b/packages/widget/src/shared/ui/components/token-icon/token-icon-container/index.tsx
@@ -1,6 +1,5 @@
 import type { ReactElement } from "react";
 import type { YieldMetadata } from "../../../../../domain/earn/yield";
-import type { Network } from "../../../../../domain/network/network";
 import type { Token } from "../../../../../domain/token/token";
 import { Box } from "../../../primitives/box";
 import { useVariantNetworkUrls } from "./hooks/use-variant-network-urls";
@@ -8,8 +7,8 @@ import { useVariantTokenUrls } from "./hooks/use-variant-token-urls";
 
 type TokenIconContainerProps = {
   token: Token;
-  metadata?: Pick<YieldMetadata, "logoURI" | "name" | "provider">;
-  hideNetwork?: boolean;
+  metadata?: Pick<YieldMetadata, "logoURI" | "name" | "provider"> | undefined;
+  hideNetwork?: boolean | undefined;
   children: (props: TokenIconContainerReturnType) => ReactElement;
 };
 
@@ -28,7 +27,7 @@ export const TokenIconContainer = ({
     metadata
   );
 
-  const networkLogoUri = useVariantNetworkUrls(token.network as Network);
+  const networkLogoUri = useVariantNetworkUrls(token.network);
 
   return (
     <Box
diff --git a/packages/widget/src/shared/ui/components/token-icon/token-icon-image/index.tsx b/packages/widget/src/shared/ui/components/token-icon/token-icon-image/index.tsx
index bc798a627..c54bc66dd 100644
--- a/packages/widget/src/shared/ui/components/token-icon/token-icon-image/index.tsx
+++ b/packages/widget/src/shared/ui/components/token-icon/token-icon-image/index.tsx
@@ -2,10 +2,10 @@ import type { Atoms } from "../../../../styles/theme/atoms.css";
 import { Image } from "../../../primitives/image";
 
 type TokenIconProps = {
-  mainUrl?: string;
-  fallbackUrl?: string;
+  mainUrl?: string | undefined;
+  fallbackUrl?: string | undefined;
   name: string;
-  tokenLogoHw?: Atoms["hw"];
+  tokenLogoHw?: Atoms["hw"] | undefined;
 };
 
 export const TokenIconImage = ({
diff --git a/packages/widget/src/shared/ui/components/virtual-list/index.tsx b/packages/widget/src/shared/ui/components/virtual-list/index.tsx
index 58cc3e84a..6ccea1b34 100644
--- a/packages/widget/src/shared/ui/components/virtual-list/index.tsx
+++ b/packages/widget/src/shared/ui/components/virtual-list/index.tsx
@@ -60,6 +60,7 @@ export const VirtualList = <ItemData,>({
 
   const isTabletOrBigger = useIsTabletOrBigger();
 
+  // biome-ignore lint/nursery/useReactCompiler: this component opts out with "use no memo", which Biome's incompatible-library check does not read.
   const rowVirtualizer = useVirtualizer({
     count: data.length,
     getScrollElement: () => innerRef.current,
@@ -145,6 +146,7 @@ export const GroupedVirtualList = ({
 
   const isTabletOrBigger = useIsTabletOrBigger();
 
+  // biome-ignore lint/nursery/useReactCompiler: this component opts out with "use no memo", which Biome's incompatible-library check does not read.
   const rowVirtualizer = useVirtualizer({
     count: groupCounts.reduce(
       (acc, numChildren) => acc + numChildren,
@@ -153,8 +155,12 @@ export const GroupedVirtualList = ({
     getScrollElement: () => innerRef.current,
     estimateSize,
     overscan: 10,
-    paddingStart: increaseViewportBy?.top,
-    paddingEnd: increaseViewportBy?.bottom,
+    ...(increaseViewportBy?.top === undefined
+      ? {}
+      : { paddingStart: increaseViewportBy.top }),
+    ...(increaseViewportBy?.bottom === undefined
+      ? {}
+      : { paddingEnd: increaseViewportBy.bottom }),
   });
 
   const virtualItems = rowVirtualizer.getVirtualItems();
@@ -175,7 +181,7 @@ export const GroupedVirtualList = ({
 
   const { resultArray } = useMemo(
     () =>
-      groupCounts.reduce(
+      groupCounts.reduce<{ resultArray: ResultsArray[]; childIndex: number }>(
         (acc, numChildren, parentIndex) => {
           acc.resultArray.push({ type: "parent", index: parentIndex });
 
@@ -195,7 +201,7 @@ export const GroupedVirtualList = ({
 
           return acc;
         },
-        { resultArray: [] as ResultsArray[], childIndex: 0 }
+        { resultArray: [], childIndex: 0 }
       ),
     [groupCounts]
   );
diff --git a/packages/widget/src/shared/ui/primitives/anchor/index.tsx b/packages/widget/src/shared/ui/primitives/anchor/index.tsx
index 8a3293a69..d34743ae1 100644
--- a/packages/widget/src/shared/ui/primitives/anchor/index.tsx
+++ b/packages/widget/src/shared/ui/primitives/anchor/index.tsx
@@ -1,13 +1,19 @@
-import type { PropsWithChildren } from "react";
+import { Children, type PropsWithChildren, type ReactNode } from "react";
 import { Box } from "../box";
 import { container } from "./style.css";
 
+/** A translation places a link's URL as its text, possibly split in parts. */
+const textHref = (children: ReactNode) =>
+  Children.toArray(children)
+    .filter((child) => typeof child === "string")
+    .join("");
+
 export const SKAnchor = (props: PropsWithChildren<{ href?: string }>) => {
   return (
     <Box
       className={container}
       as="a"
-      href={props.href ?? (props.children as string) ?? ""}
+      href={props.href ?? textHref(props.children)}
       target="_blank"
     >
       {props.children ?? props.href}
diff --git a/packages/widget/src/shared/ui/primitives/box/index.tsx b/packages/widget/src/shared/ui/primitives/box/index.tsx
index 1ade0b551..50afdfa0e 100644
--- a/packages/widget/src/shared/ui/primitives/box/index.tsx
+++ b/packages/widget/src/shared/ui/primitives/box/index.tsx
@@ -25,13 +25,15 @@ export type BoxProps = PropsWithChildren<
     }
 >;
 
+const atomPropertyNames: ReadonlySet<string> = atoms.properties;
+
 export const Box = forwardRef<unknown, BoxProps>(
   ({ children, as = "div", className, ...props }, ref) => {
     const atomsProps: Record<string, unknown> = {};
     const nativeProps: Record<string, unknown> = {};
 
     Object.entries(props).forEach(([key, value]) => {
-      if (atoms.properties.has(key as keyof Atoms)) {
+      if (atomPropertyNames.has(key)) {
         atomsProps[key] = value;
       } else {
         nativeProps[key] = value;
diff --git a/packages/widget/src/shared/ui/primitives/content-loader/index.tsx b/packages/widget/src/shared/ui/primitives/content-loader/index.tsx
index fb221b8c7..d51444987 100644
--- a/packages/widget/src/shared/ui/primitives/content-loader/index.tsx
+++ b/packages/widget/src/shared/ui/primitives/content-loader/index.tsx
@@ -15,7 +15,7 @@ export const ContentLoaderSquare = ({
   return (
     <Skeleton
       height={heightPx}
-      containerClassName={containerClassName}
+      {...(containerClassName === undefined ? {} : { containerClassName })}
       baseColor={vars.color.skeletonLoaderBase}
       highlightColor={vars.color.skeletonLoaderHighlight}
       enableAnimation
@@ -40,8 +40,8 @@ export const ContentLoaderLine = ({
   return (
     <Skeleton
       height={heightPx}
-      width={widthPx}
-      containerClassName={containerClassName}
+      {...(widthPx === undefined ? {} : { width: widthPx })}
+      {...(containerClassName === undefined ? {} : { containerClassName })}
       baseColor={vars.color.skeletonLoaderBase}
       highlightColor={vars.color.skeletonLoaderHighlight}
       enableAnimation
diff --git a/packages/widget/src/shared/ui/primitives/icons/check.tsx b/packages/widget/src/shared/ui/primitives/icons/check.tsx
index a32ddc05b..521dab2a2 100644
--- a/packages/widget/src/shared/ui/primitives/icons/check.tsx
+++ b/packages/widget/src/shared/ui/primitives/icons/check.tsx
@@ -5,9 +5,9 @@ export const Check = ({
   hw = 24,
   className,
 }: {
-  hw?: number;
+  hw?: number | undefined;
   color?: keyof (typeof vars)["color"];
-  className?: string;
+  className?: string | undefined;
 }) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/widget/src/shared/ui/primitives/icons/copy.tsx b/packages/widget/src/shared/ui/primitives/icons/copy.tsx
index e0b2d08e0..4acd712aa 100644
--- a/packages/widget/src/shared/ui/primitives/icons/copy.tsx
+++ b/packages/widget/src/shared/ui/primitives/icons/copy.tsx
@@ -4,8 +4,8 @@ export const Copy = ({
   hw = 24,
   className,
 }: {
-  hw?: number;
-  className?: string;
+  hw?: number | undefined;
+  className?: string | undefined;
 }) => (
   <svg
     xmlns="http://www.w3.org/2000/svg"
diff --git a/packages/widget/src/shared/ui/primitives/image/index.tsx b/packages/widget/src/shared/ui/primitives/image/index.tsx
index 0ba5b675d..e79398463 100644
--- a/packages/widget/src/shared/ui/primitives/image/index.tsx
+++ b/packages/widget/src/shared/ui/primitives/image/index.tsx
@@ -6,8 +6,8 @@ import type { BoxProps } from "../box";
 import { Box } from "../box";
 
 type ImageProps = {
-  src?: string;
-  fallbackName?: string;
+  src?: string | undefined;
+  fallbackName?: string | undefined;
   wrapperProps?: Omit<BoxProps, "as">;
   imgProps?: Omit<BoxProps, "as" | "src">;
 };
@@ -63,7 +63,7 @@ export const Monogram = ({
   style,
 }: {
   initial: string;
-  label?: string;
+  label?: string | undefined;
   className?: string;
   style?: CSSProperties;
 }) => (
diff --git a/packages/widget/src/shared/ui/primitives/list/list-item.tsx b/packages/widget/src/shared/ui/primitives/list/list-item.tsx
index 8c3b8478d..01c13bb50 100644
--- a/packages/widget/src/shared/ui/primitives/list/list-item.tsx
+++ b/packages/widget/src/shared/ui/primitives/list/list-item.tsx
@@ -15,7 +15,7 @@ export const ListItem = ({
 }: PropsWithChildren<
   {
     onClick?: () => void;
-    testId?: string;
+    testId?: string | undefined;
     variant?: ItemContainerVariants;
   } & BoxProps
 >) => {
diff --git a/packages/widget/src/shared/ui/primitives/typography/styles.css.ts b/packages/widget/src/shared/ui/primitives/typography/styles.css.ts
index 7f2563cf4..ae65bb21f 100644
--- a/packages/widget/src/shared/ui/primitives/typography/styles.css.ts
+++ b/packages/widget/src/shared/ui/primitives/typography/styles.css.ts
@@ -1,9 +1,9 @@
 import type { RecipeVariants } from "@vanilla-extract/recipes";
 import { recipe } from "@vanilla-extract/recipes";
+import { Record as ERecord } from "effect";
 import { atoms } from "../../../styles/theme/atoms.css";
 import { vars } from "../../../styles/theme/contract.css";
 import { minMediaQuery } from "../../../styles/tokens/breakpoints";
-import type { Heading, Text } from "../../../styles/tokens/typography";
 
 const fontWeightVariants = {
   normal: atoms({ fontWeight: "normal" }),
@@ -13,38 +13,21 @@ const fontWeightVariants = {
   extrabold: atoms({ fontWeight: "extrabold" }),
 };
 
+const responsiveFontSize = (sizes: {
+  readonly mobile: { readonly fontSize: string };
+  readonly tablet: { readonly fontSize: string };
+}) => ({
+  fontSize: sizes.mobile.fontSize,
+  "@media": {
+    [minMediaQuery("tablet")]: { fontSize: sizes.tablet.fontSize },
+  },
+});
+
 export const heading = recipe({
   base: atoms({ color: "text" }),
 
   variants: {
-    level: {
-      ...Object.keys(vars.heading).reduce(
-        (acc, key) => {
-          const K = key as Heading;
-
-          acc[K] = {
-            fontSize: vars.heading[K].mobile.fontSize,
-            "@media": {
-              [minMediaQuery("tablet")]: {
-                fontSize: vars.heading[K].tablet.fontSize,
-              },
-            },
-          };
-
-          return acc;
-        },
-        {} as Record<
-          Heading,
-          {
-            fontSize: typeof vars.heading.h1.mobile.fontSize;
-            "@media": Record<
-              string,
-              { fontSize: typeof vars.heading.h1.mobile.fontSize }
-            >;
-          }
-        >
-      ),
-    },
+    level: ERecord.map(vars.heading, responsiveFontSize),
     weight: fontWeightVariants,
   },
 
@@ -67,34 +50,7 @@ export const textStyles = recipe({
       white: atoms({ color: "white" }),
       danger: atoms({ color: "textDanger" }),
     },
-    size: {
-      ...Object.keys(vars.text).reduce(
-        (acc, key) => {
-          const K = key as Text;
-
-          acc[K] = {
-            fontSize: vars.text[K].mobile.fontSize,
-            "@media": {
-              [minMediaQuery("tablet")]: {
-                fontSize: vars.text[K].tablet.fontSize,
-              },
-            },
-          };
-
-          return acc;
-        },
-        {} as Record<
-          Text,
-          {
-            fontSize: typeof vars.text.small.mobile.fontSize;
-            "@media": Record<
-              string,
-              { fontSize: typeof vars.text.small.mobile.fontSize }
-            >;
-          }
-        >
-      ),
-    },
+    size: ERecord.map(vars.text, responsiveFontSize),
   },
 
   defaultVariants: {
diff --git a/packages/widget/src/shared/ui/widget-presentation.tsx b/packages/widget/src/shared/ui/widget-presentation.tsx
index 7c4f10e1c..9fedb0c10 100644
--- a/packages/widget/src/shared/ui/widget-presentation.tsx
+++ b/packages/widget/src/shared/ui/widget-presentation.tsx
@@ -1,5 +1,4 @@
 import { createContext, type PropsWithChildren, useContext } from "react";
-import type { Network } from "../../domain/network/network";
 import type { Token } from "../../domain/token/token";
 import type { WidgetVariant } from "../styles/recipe-variant";
 import type { LayoutAttributeValue } from "../styles/theme/ids";
@@ -23,7 +22,7 @@ export type WidgetPresentation = {
    */
   readonly layout: LayoutAttributeValue;
   readonly locale: string;
-  readonly mapNetworkIconUrl: (network: Network) => string | undefined;
+  readonly mapNetworkIconUrl: (network: Token["network"]) => string | undefined;
   readonly mapTokenIconUrl: (token: Token) => string | undefined;
   readonly portalContainer: HTMLElement | undefined;
   readonly variant: WidgetVariant;
diff --git a/packages/widget/tests/app/journeys/deep-links-flow/param-validation.dom.test.tsx b/packages/widget/tests/app/journeys/deep-links-flow/param-validation.dom.test.tsx
index fbc77ac2a..60b8e217d 100644
--- a/packages/widget/tests/app/journeys/deep-links-flow/param-validation.dom.test.tsx
+++ b/packages/widget/tests/app/journeys/deep-links-flow/param-validation.dom.test.tsx
@@ -96,6 +96,13 @@ describe("Deep link param validation", () => {
     await setAndAssertIsValidPendingActionParam("UNSTAKE/../", false);
   });
 
+  it("decodes an unknown pendingaction as null", () => {
+    expect(
+      decodeHref("https://host.test/?pendingaction=NOT_A_PENDING_ACTION")
+        .pendingaction
+    ).toBeNull();
+  });
+
   it("Keeps valid params when another param is invalid", () => {
     const url = new URL(window.location.href);
     url.searchParams.set("network", "not-supported");
@@ -199,6 +206,9 @@ describe("Deep link param validation", () => {
       "../positions",
       "validator::a%2Fb",
       "validator::a?b",
+      "balance-1",
+      "validator::",
+      "validator:abc",
     ]) {
       const url = new URL("https://host.test/");
       url.searchParams.set("balanceId", balanceId);
diff --git a/packages/widget/tests/app/journeys/deep-links-flow/setup.ts b/packages/widget/tests/app/journeys/deep-links-flow/setup.ts
index b8b07cb41..e7ceca08b 100644
--- a/packages/widget/tests/app/journeys/deep-links-flow/setup.ts
+++ b/packages/widget/tests/app/journeys/deep-links-flow/setup.ts
@@ -2,6 +2,7 @@ import { Array as EArray } from "effect";
 import { HttpResponse, http } from "msw";
 import { vitest } from "vitest";
 import type { ManageActionCommand } from "../../../../src/domain/action/models";
+import { TransactionHash } from "../../../../src/domain/identity/identifiers";
 import {
   legacyYieldFixture,
   yieldApiActionFixture,
@@ -434,7 +435,7 @@ export const setup = async (
             network: EArray.getUnsafe(pendingAction.transactions, 0).network,
             status: "BROADCASTED",
             id: transactionId,
-            hash: "transaction_hash",
+            hash: TransactionHash.make("transaction_hash"),
           }),
         });
       }
@@ -448,7 +449,9 @@ export const setup = async (
           explorerUrl:
             "https://snowtrace.dev/tx/0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb",
           network: avaxLiquidStaking.token.network,
-          hash: "0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb",
+          hash: TransactionHash.make(
+            "0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb"
+          ),
           status: "CONFIRMED",
         }),
       });
@@ -490,28 +493,21 @@ export const setup = async (
     requestFn,
   });
 
-  const setUrl = ({
-    accountId,
-    yieldId,
-    pendingaction,
-    network,
-  }:
-    | {
-        yieldId: string;
-        accountId: string;
-        pendingaction?: string;
-        network?: never;
-      }
-    | {
-        network: string;
-        yieldId?: never;
-        accountId?: never;
-        pendingaction?: never;
-      }) => {
-    return network
-      ? _setUrl({ network })
-      : _setUrl({ yieldId, accountId, pendingaction });
-  };
+  const setUrl = (
+    params:
+      | {
+          yieldId: string;
+          accountId: string;
+          pendingaction?: string;
+          network?: never;
+        }
+      | {
+          network: string;
+          yieldId?: never;
+          accountId?: never;
+          pendingaction?: never;
+        }
+  ) => _setUrl(params);
 
   return {
     customConnectors,
diff --git a/packages/widget/tests/app/journeys/staking-flow/setup.ts b/packages/widget/tests/app/journeys/staking-flow/setup.ts
index a93bd5dc6..6c12ba651 100644
--- a/packages/widget/tests/app/journeys/staking-flow/setup.ts
+++ b/packages/widget/tests/app/journeys/staking-flow/setup.ts
@@ -4,6 +4,7 @@ import { avalanche } from "viem/chains";
 import { vitest } from "vitest";
 import type { ActionCommand } from "../../../../src/domain/action/models";
 import { EarnYieldWithProvider } from "../../../../src/domain/earn/models";
+import { TransactionHash } from "../../../../src/domain/identity/identifiers";
 import type { LegacyTransaction } from "../../../../src/services/wallet/wallet-transactions";
 import {
   type LegacyYieldFixture,
@@ -169,7 +170,11 @@ export const setup = async (
       ...yieldApiYieldBase.mechanics,
       type: "staking",
       gasFeeToken: token,
-      supportsLedgerWalletApi: yieldOp.metadata.supportsLedgerWalletApi,
+      ...(yieldOp.metadata.supportsLedgerWalletApi === undefined
+        ? {}
+        : {
+            supportsLedgerWalletApi: yieldOp.metadata.supportsLedgerWalletApi,
+          }),
     },
   });
   const defiYieldOp = yieldApiYieldDtoFixture({
@@ -375,9 +380,13 @@ export const setup = async (
               network: transactionConstruct.network,
               status: "CREATED",
               type: "STAKE",
-              gasEstimate: transactionConstruct.gasEstimate
-                ? JSON.stringify(transactionConstruct.gasEstimate)
-                : undefined,
+              ...(transactionConstruct.gasEstimate
+                ? {
+                    gasEstimate: JSON.stringify(
+                      transactionConstruct.gasEstimate
+                    ),
+                  }
+                : {}),
               unsignedTransaction: transactionConstruct.unsignedTransaction,
               stepIndex: 0,
             }),
@@ -401,12 +410,14 @@ export const setup = async (
             id: transactionId,
             network: transactionConstruct.network,
             type: "STAKE",
-            hash: "transaction_hash",
+            hash: TransactionHash.make("transaction_hash"),
             status: "BROADCASTED",
             unsignedTransaction: transactionConstruct.unsignedTransaction,
-            gasEstimate: transactionConstruct.gasEstimate
-              ? JSON.stringify(transactionConstruct.gasEstimate)
-              : undefined,
+            ...(transactionConstruct.gasEstimate
+              ? {
+                  gasEstimate: JSON.stringify(transactionConstruct.gasEstimate),
+                }
+              : {}),
           })
         );
       }
@@ -420,12 +431,14 @@ export const setup = async (
           type: "STAKE",
           explorerUrl:
             "https://snowtrace.dev/tx/0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb",
-          hash: "0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb",
+          hash: TransactionHash.make(
+            "0x5c2e4ac81fa12b8e935e1cf5e39eda4594d75e82da0c9b44c6d85f20214452fb"
+          ),
           status: "CONFIRMED",
           unsignedTransaction: transactionConstruct.unsignedTransaction,
-          gasEstimate: transactionConstruct.gasEstimate
-            ? JSON.stringify(transactionConstruct.gasEstimate)
-            : undefined,
+          ...(transactionConstruct.gasEstimate
+            ? { gasEstimate: JSON.stringify(transactionConstruct.gasEstimate) }
+            : {}),
         })
       );
     })
diff --git a/packages/widget/tests/app/journeys/trust-incentive-apy/setup.ts b/packages/widget/tests/app/journeys/trust-incentive-apy/setup.ts
index 166780588..5bc236f0e 100644
--- a/packages/widget/tests/app/journeys/trust-incentive-apy/setup.ts
+++ b/packages/widget/tests/app/journeys/trust-incentive-apy/setup.ts
@@ -1,4 +1,4 @@
-import { Schema } from "effect";
+import { Schema, Struct } from "effect";
 import { HttpResponse, http } from "msw";
 import { avalanche } from "viem/chains";
 import { vitest } from "vitest";
@@ -202,11 +202,10 @@ export const setup = async (
       },
     },
     metadata: {
-      ...legacyYieldBase.metadata,
+      ...Struct.omit(legacyYieldBase.metadata, ["rewardTokens"]),
       name: "Trust USDA Earn",
       type: "vault",
       token,
-      rewardTokens: undefined,
       gasFeeToken: token,
       provider: {
         id: legacyYieldBase.metadata.provider?.id ?? "benqi",
diff --git a/packages/widget/tests/app/layouts/compact/compact-position-details-redirects.dom.test.tsx b/packages/widget/tests/app/layouts/compact/compact-position-details-redirects.dom.test.tsx
index 2bebf1d77..933b1c3fd 100644
--- a/packages/widget/tests/app/layouts/compact/compact-position-details-redirects.dom.test.tsx
+++ b/packages/widget/tests/app/layouts/compact/compact-position-details-redirects.dom.test.tsx
@@ -70,59 +70,57 @@ const renderAt = (path: string) =>
 
 describe("compact position details redirects", () => {
   it("keeps the bare hub", async () => {
-    const app = await renderAt("/positions/yield-1/balance-1");
+    const app = await renderAt("/positions/yield-1/default");
 
     expect(textFor(app.container, "hub")).toBe("hub");
     expect(textFor(app.container, "location")).toBe(
-      "/positions/yield-1/balance-1"
+      "/positions/yield-1/default"
     );
   });
 
   it.each(["stake", "unstake", "pending-action"] as const)(
     "redirects bare %s index to the hub",
     async (suffix) => {
-      const app = await renderAt(`/positions/yield-1/balance-1/${suffix}`);
+      const app = await renderAt(`/positions/yield-1/default/${suffix}`);
 
       expect(textFor(app.container, "hub")).toBe("hub");
       expect(textFor(app.container, "location")).toBe(
-        "/positions/yield-1/balance-1"
+        "/positions/yield-1/default"
       );
     }
   );
 
   it.each([
-    "/positions/yield-1/balance-1/stake/bogus",
-    "/positions/yield-1/balance-1/unstake/bogus",
-    "/positions/yield-1/balance-1/pending-action/bogus",
+    "/positions/yield-1/default/stake/bogus",
+    "/positions/yield-1/default/unstake/bogus",
+    "/positions/yield-1/default/pending-action/bogus",
   ] as const)("redirects illegal child %s to the hub", async (path) => {
     const app = await renderAt(path);
 
     expect(textFor(app.container, "hub")).toBe("hub");
     expect(textFor(app.container, "location")).toBe(
-      "/positions/yield-1/balance-1"
+      "/positions/yield-1/default"
     );
   });
 
   it("redirects unknown position segments to the hub, not home", async () => {
-    const app = await renderAt("/positions/yield-1/balance-1/bogus");
+    const app = await renderAt("/positions/yield-1/default/bogus");
 
     expect(textFor(app.container, "hub")).toBe("hub");
     expect(textFor(app.container, "home")).toBeNull();
     expect(textFor(app.container, "location")).toBe(
-      "/positions/yield-1/balance-1"
+      "/positions/yield-1/default"
     );
   });
 
   it("still reaches real flow children", async () => {
-    const unstake = await renderAt(
-      "/positions/yield-1/balance-1/unstake/review"
-    );
+    const unstake = await renderAt("/positions/yield-1/default/unstake/review");
     expect(
       unstake.container.querySelector('[data-testid="unstake-review"]')
     ).not.toBeNull();
 
     const pending = await renderAt(
-      "/positions/yield-1/balance-1/pending-action/review"
+      "/positions/yield-1/default/pending-action/review"
     );
     expect(
       pending.container.querySelector('[data-testid="pending-review"]')
diff --git a/packages/widget/tests/app/runtime/application-runtime-identity.dom.test.tsx b/packages/widget/tests/app/runtime/application-runtime-identity.dom.test.tsx
index 08f5e6844..ac0747098 100644
--- a/packages/widget/tests/app/runtime/application-runtime-identity.dom.test.tsx
+++ b/packages/widget/tests/app/runtime/application-runtime-identity.dom.test.tsx
@@ -138,7 +138,7 @@ const RuntimeHarness = ({
         onClick={() => {
           if (AsyncResult.isSuccess(tracking)) {
             // ast-grep-ignore: no-run-effect-in-test -- React event handlers are non-Effect boundaries
-            Effect.runFork(tracking.value.trackEvent("txSigned"));
+            Effect.runFork(tracking.value.trackEvent("txNotConfirmed"));
           }
         }}
       >
diff --git a/packages/widget/tests/app/runtime/pending-action-deep-link-route.test.ts b/packages/widget/tests/app/runtime/pending-action-deep-link-route.test.ts
index 252859cfb..7f01d7c0f 100644
--- a/packages/widget/tests/app/runtime/pending-action-deep-link-route.test.ts
+++ b/packages/widget/tests/app/runtime/pending-action-deep-link-route.test.ts
@@ -9,6 +9,7 @@ import {
   WalletAddress,
   YieldId,
 } from "../../../src/domain/identity/identifiers";
+import { BalanceDataKey } from "../../../src/domain/portfolio/positions";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import { findPendingActionDeepLinkTarget } from "../../../src/features/earn/model/pending-action-deep-link";
 import { yieldFlowRoutes } from "../../../src/features/yield-transaction-flow/model/yield-transaction-flow";
@@ -40,6 +41,7 @@ const otherAddress = Schema.decodeSync(WalletAddress)(
 );
 const scope = new WalletScopeKey({ address, network: "ethereum" });
 const yieldId = Schema.decodeSync(YieldId)("yield-1");
+const decodeBalanceDataKey = Schema.decodeSync(BalanceDataKey);
 
 const pendingObservation = (ownerScope = scope): DeepLinkRouteObservation => ({
   maintenance: false,
@@ -49,7 +51,7 @@ const pendingObservation = (ownerScope = scope): DeepLinkRouteObservation => ({
       intake: { walletScope: ownerScope } as never,
       mount: {
         _tag: "PositionManage",
-        balanceId: "balance-1",
+        balanceId: "default",
         integrationId: yieldId,
       },
     },
@@ -58,7 +60,7 @@ const pendingObservation = (ownerScope = scope): DeepLinkRouteObservation => ({
       network: ownerScope.network,
       pendingAction: "CLAIM_REWARDS",
       validator: null,
-      yieldId: "yield-1",
+      yieldId,
     },
     walletScope: ownerScope,
   },
@@ -176,11 +178,11 @@ describe("DeepLinkCoordinator", () => {
       expect(pending.pendingAction?._tag).toBe("StartYieldFlow");
       expect(started).toHaveLength(1);
       expect(started[0]?.path).toBe(
-        "/positions/yield-1/balance-1/pending-action/review"
+        "/positions/yield-1/default/pending-action/review"
       );
       expect(started[0]?.session.mount).toEqual({
         _tag: "PositionManage",
-        balanceId: "balance-1",
+        balanceId: "default",
         integrationId: "yield-1",
       });
       expect(started[0]?.session.intake.walletScope).toEqual(scope);
@@ -254,7 +256,7 @@ describe("DeepLinkCoordinator", () => {
         const position = {
           maintenance: false,
           pendingAction: null,
-          position: { balanceId: "balance-1", yieldId },
+          position: { balanceId: "default", yieldId },
           ready: true,
         } satisfies DeepLinkRouteObservation;
 
@@ -271,7 +273,7 @@ describe("DeepLinkCoordinator", () => {
 
         expect(navigate).toHaveBeenCalledTimes(2);
         expect(navigate).toHaveBeenCalledWith(
-          "/positions/yield-1/balance-1",
+          "/positions/yield-1/default",
           expect.anything()
         );
       })
@@ -286,7 +288,7 @@ describe("DeepLinkCoordinator", () => {
           {
             maintenance: false,
             pendingAction: null,
-            position: { balanceId: "balance-1", yieldId },
+            position: { balanceId: "default", yieldId },
             ready: true,
           },
         ],
@@ -326,7 +328,7 @@ describe("findPendingActionDeepLinkTarget", () => {
 
   it("targets the balance matching balanceId even when an earlier balance has the same action", () => {
     const target = findPendingActionDeepLinkTarget({
-      balanceId: "validator::validator-b",
+      balanceId: decodeBalanceDataKey("validator::validator-b"),
       balances,
       pendingActionType: "CLAIM_REWARDS",
       validator: null,
@@ -339,7 +341,7 @@ describe("findPendingActionDeepLinkTarget", () => {
   it("returns no action for an unknown balanceId", () => {
     expect(
       findPendingActionDeepLinkTarget({
-        balanceId: "validator::unknown",
+        balanceId: decodeBalanceDataKey("validator::unknown"),
         balances,
         pendingActionType: "CLAIM_REWARDS",
         validator: null,
@@ -350,7 +352,7 @@ describe("findPendingActionDeepLinkTarget", () => {
   it("returns no action when the matching balance lacks the action type", () => {
     expect(
       findPendingActionDeepLinkTarget({
-        balanceId: "validator::validator-b",
+        balanceId: decodeBalanceDataKey("validator::validator-b"),
         balances,
         pendingActionType: "UNLOCK_LOCKED",
         validator: null,
diff --git a/packages/widget/tests/app/runtime/transaction-workflow-event-projection.test.ts b/packages/widget/tests/app/runtime/transaction-workflow-event-projection.test.ts
index 22e9b5731..a7103f61c 100644
--- a/packages/widget/tests/app/runtime/transaction-workflow-event-projection.test.ts
+++ b/packages/widget/tests/app/runtime/transaction-workflow-event-projection.test.ts
@@ -15,7 +15,11 @@ import { TestClock } from "effect/testing";
 import { transactionWorkflowResourceEventProjection } from "../../../src/app/runtime/transaction-workflow-event-projection";
 import { Action } from "../../../src/domain/borrow/execution/action";
 import { Transaction } from "../../../src/domain/borrow/execution/transaction";
-import { WalletAddress } from "../../../src/domain/identity/identifiers";
+import {
+  SignedTransactionPayload,
+  TransactionHash,
+  WalletAddress,
+} from "../../../src/domain/identity/identifiers";
 import {
   WalletScopeKey,
   walletScopeOwnerKey,
@@ -255,14 +259,18 @@ const invalidationsBeforeTeardown = Effect.fn("invalidationsBeforeTeardown")(
           Effect.succeed({
             link: "https://explorer.test/borrow",
             status: "BROADCASTED",
-            transactionHash:
-              "0x1111111111111111111111111111111111111111111111111111111111111111",
+            transactionHash: TransactionHash.make(
+              "0x1111111111111111111111111111111111111111111111111111111111111111"
+            ),
           }),
       },
       initialWalletState: makeConnectedWalletState(borrowWalletScope),
       wallet: {
         signTransaction: () =>
-          Effect.succeed({ broadcasted: false, signedTx: "0xsigned" }),
+          Effect.succeed({
+            broadcasted: false,
+            signedTx: SignedTransactionPayload.make("0xsigned"),
+          }),
       },
     });
 
diff --git a/packages/widget/tests/app/runtime/widget-runtime-services.test.ts b/packages/widget/tests/app/runtime/widget-runtime-services.test.ts
index 73f66afe9..ad60f6410 100644
--- a/packages/widget/tests/app/runtime/widget-runtime-services.test.ts
+++ b/packages/widget/tests/app/runtime/widget-runtime-services.test.ts
@@ -207,17 +207,17 @@ describe("widget runtime service graph", () => {
           expect(secondService).not.toBe(firstService);
 
           yield* Effect.all([
-            firstService.trackEvent("txSigned", { registry: "first" }),
-            secondService.trackEvent("txSigned", { registry: "second" }),
+            firstService.trackEvent("helpModalOpened", { modal: "first" }),
+            secondService.trackEvent("helpModalOpened", { modal: "second" }),
           ]);
 
           expect(firstTrack).toHaveBeenCalledOnce();
-          expect(firstTrack).toHaveBeenCalledWith("Transaction signed", {
-            registry: "first",
+          expect(firstTrack).toHaveBeenCalledWith("Help modal opened", {
+            modal: "first",
           });
           expect(secondTrack).toHaveBeenCalledOnce();
-          expect(secondTrack).toHaveBeenCalledWith("Transaction signed", {
-            registry: "second",
+          expect(secondTrack).toHaveBeenCalledWith("Help modal opened", {
+            modal: "second",
           });
 
           const replacementTrack = vi.fn();
@@ -225,13 +225,13 @@ describe("widget runtime service graph", () => {
             firstRegistry.get(widgetConfigProbeAtom)
           );
           yield* firstConfig.update(makeConfig(replacementTrack));
-          yield* firstService.trackEvent("txSigned", {
-            registry: "first-updated",
+          yield* firstService.trackEvent("helpModalOpened", {
+            modal: "first-updated",
           });
 
           expect(firstTrack).toHaveBeenCalledOnce();
-          expect(replacementTrack).toHaveBeenCalledWith("Transaction signed", {
-            registry: "first-updated",
+          expect(replacementTrack).toHaveBeenCalledWith("Help modal opened", {
+            modal: "first-updated",
           });
           expect(secondTrack).toHaveBeenCalledOnce();
         } finally {
diff --git a/packages/widget/tests/domain/action/action-command-truncation.test.ts b/packages/widget/tests/domain/action/action-command-truncation.test.ts
index 586b2fc8a..3e19242e4 100644
--- a/packages/widget/tests/domain/action/action-command-truncation.test.ts
+++ b/packages/widget/tests/domain/action/action-command-truncation.test.ts
@@ -48,7 +48,6 @@ describe("executable token amount truncation", () => {
     const selectedYield = yieldApiYieldFixture();
     const view = projectYieldEntry({
       input: {
-        additionalValidationErrors: undefined,
         amountInitialization: "PreserveIntent",
         availableAmount: new BigNumber("1.5"),
         connected: true,
@@ -88,7 +87,6 @@ describe("executable token amount truncation", () => {
     const token = { ...selectedYield.token, decimals: 6 };
     const truncated = projectYieldEntry({
       input: {
-        additionalValidationErrors: undefined,
         amountInitialization: "PreserveIntent",
         availableAmount: new BigNumber("2"),
         connected: true,
@@ -120,7 +118,6 @@ describe("executable token amount truncation", () => {
     });
     const dust = projectYieldEntry({
       input: {
-        additionalValidationErrors: undefined,
         amountInitialization: "PreserveIntent",
         availableAmount: new BigNumber("2"),
         connected: true,
@@ -177,7 +174,6 @@ describe("executable token amount truncation", () => {
     });
     const view = projectYieldEntry({
       input: {
-        additionalValidationErrors: undefined,
         amountInitialization: "PreserveIntent",
         availableAmount: new BigNumber("2"),
         connected: true,
diff --git a/packages/widget/tests/domain/borrow/risk-position.test.ts b/packages/widget/tests/domain/borrow/risk-position.test.ts
index 1cfe2340a..ffce5f910 100644
--- a/packages/widget/tests/domain/borrow/risk-position.test.ts
+++ b/packages/widget/tests/domain/borrow/risk-position.test.ts
@@ -120,7 +120,7 @@ describe("BorrowPositions", () => {
     });
     expect(decodeTokenId({ symbol: "ETH" })).not.toBe(
       decodeTokenId({
-        address: addressedMarket.collateralTokens[0]!.token.address,
+        ...addressedMarket.collateralTokens[0]!.token,
         symbol: "ETH",
       })
     );
@@ -259,10 +259,9 @@ describe("BorrowPositions", () => {
       },
     });
 
-    const collateralTokenId = decodeTokenId({
-      address: usdcMarket.collateralTokens[0]!.token.address,
-      symbol: usdcMarket.collateralTokens[0]!.token.symbol,
-    });
+    const collateralTokenId = decodeTokenId(
+      usdcMarket.collateralTokens[0]!.token
+    );
     expect(
       newMarketRisk.assess([
         {
@@ -367,10 +366,7 @@ describe("BorrowPositions", () => {
       nonCollateralPositions.riskFor(usdcMarket).assess([
         {
           amount: new BigNumber(0.1),
-          tokenId: decodeTokenId({
-            address: usdcMarket.collateralTokens[0]!.token.address,
-            symbol: usdcMarket.collateralTokens[0]!.token.symbol,
-          }),
+          tokenId: decodeTokenId(usdcMarket.collateralTokens[0]!.token),
           type: "withdraw",
         },
       ])
@@ -572,10 +568,9 @@ describe("BorrowPositions", () => {
       id: "morpho-blue-borrow",
       name: "Morpho Blue",
     });
-    const collateralTokenId = decodeTokenId({
-      address: usdcMarket.collateralTokens[0]!.token.address,
-      symbol: usdcMarket.collateralTokens[0]!.token.symbol,
-    });
+    const collateralTokenId = decodeTokenId(
+      usdcMarket.collateralTokens[0]!.token
+    );
     const derive = ({
       collateral,
       debt,
diff --git a/packages/widget/tests/domain/confidential.test.ts b/packages/widget/tests/domain/confidential.test.ts
index 26847f83e..d368b04e5 100644
--- a/packages/widget/tests/domain/confidential.test.ts
+++ b/packages/widget/tests/domain/confidential.test.ts
@@ -3,7 +3,6 @@ import BigNumber from "bignumber.js";
 import { Schema } from "effect";
 import {
   type ConfidentialEncryption,
-  ConfidentialHandle,
   fillConfidentialBalance,
   getCancellingHandles,
   getCancelReturn,
@@ -20,7 +19,10 @@ import {
   planConfidentialEncryption,
   toConfidentialArguments,
 } from "../../src/domain/earn/confidential";
-import type { EarnBalance } from "../../src/domain/earn/models";
+import {
+  ConfidentialHandle,
+  type EarnBalance,
+} from "../../src/domain/earn/models";
 import { Token } from "../../src/domain/token/token";
 import {
   confidentialFixture,
@@ -33,9 +35,16 @@ const { cShare, cUsdc, depositBatcher, redeemBatcher, router, usdc } =
 const confidentialYield = confidentialYieldFixture;
 const shareToken = Schema.decodeSync(Token)(cShare);
 
+const toHandle = Schema.decodeSync(ConfidentialHandle);
+const amountHandle = toHandle(`0x${"01".repeat(32)}`);
+const legHandles = [
+  toHandle(`0x${"02".repeat(32)}`),
+  toHandle(`0x${"03".repeat(32)}`),
+];
+
 const encryption: ConfidentialEncryption = {
-  amount: { handle: "0xamount", proof: "0xamountproof" },
-  legs: { handles: ["0xleg0", "0xleg1"], proof: "0xlegproof" },
+  amount: { handle: amountHandle, proof: "0xamountproof" },
+  legs: { handles: legHandles, proof: "0xlegproof" },
 };
 
 describe("confidential vault rules", () => {
@@ -45,10 +54,10 @@ describe("confidential vault rules", () => {
   });
 
   it("publicly decrypts only an unwrap's WITHDRAW, never a batch cancel", () => {
-    const requestId = `0x${"cd".repeat(32)}`;
+    const requestId = toHandle(`0x${"cd".repeat(32)}`);
     const hidden = (type: EarnBalance["type"]) => ({
       isEncrypted: true,
-      shareAmountRaw: requestId,
+      shares: { _tag: "Encrypted", handle: requestId } as const,
       type,
     });
 
@@ -63,7 +72,7 @@ describe("confidential vault rules", () => {
     ).toBeNull();
     expect(
       getPendingActionDecryptHandle(
-        { shareAmountRaw: "5", type: "withdrawable" },
+        { shares: { _tag: "Plain", amountRaw: 5n }, type: "withdrawable" },
         "WITHDRAW"
       )
     ).toBeNull();
@@ -91,7 +100,7 @@ describe("confidential vault rules", () => {
   it("counts a cancelled withdrawal's refund in vault shares, not the underlying it is valued in", () => {
     const refund = getCancelReturn(confidentialYield(), "CANCEL_PENDING", {
       amount: new BigNumber("0.1"),
-      shareAmount: "0.097168",
+      shares: { _tag: "Plain", amount: new BigNumber("0.097168") },
       shareToken,
       type: "exiting",
     });
@@ -214,9 +223,9 @@ describe("confidential vault rules", () => {
     );
 
     expect(args).toEqual({
-      encryptedAmount: "0xamount",
+      encryptedAmount: amountHandle,
       encryptedAmountProof: "0xamountproof",
-      encryptedLegAmounts: ["0xleg0", "0xleg1"],
+      encryptedLegAmounts: legHandles,
       encryptedLegProof: "0xlegproof",
       inputToken: cUsdc.address,
       ledgerWalletApiCompatible: true,
@@ -279,15 +288,12 @@ describe("confidential vault rules", () => {
       amountRaw: 0n,
       amountUsd: null as BigNumber | null,
       isEncrypted: true,
-      shareAmount: "0",
-      shareAmountRaw: handle,
+      shares: { _tag: "Encrypted", handle: toHandle(handle) } as const,
       shareToken,
       token: usdc,
     };
     const revealedShares = (shares: bigint) =>
-      new Map([
-        [Schema.decodeSync(ConfidentialHandle)(handle.toUpperCase()), shares],
-      ]);
+      new Map([[toHandle(handle.toUpperCase()), shares]]);
 
     it("values revealed shares at the share price and the token USD price", () => {
       const yieldDto = confidentialYieldFixture({
@@ -311,7 +317,12 @@ describe("confidential vault rules", () => {
 
       expect(filled.amount.toFixed()).toBe("2.5");
       expect(filled.amountUsd?.toFixed()).toBe("5");
-      expect(filled.shareAmountRaw).toBe("2000000");
+      expect(filled.shares).toEqual({
+        _tag: "Revealed",
+        amount: new BigNumber("2"),
+        amountRaw: 2_000_000n,
+        handle,
+      });
     });
 
     it("stays recognisable as its pending position once revealed", () => {
@@ -324,7 +335,7 @@ describe("confidential vault rules", () => {
         },
       ]);
 
-      expect(filled.isEncrypted).toBeUndefined();
+      expect(filled).not.toHaveProperty("isEncrypted");
       expect(
         [hidden, filled].map((balance) =>
           isCancellingBalance(balance, cancelling)
diff --git a/packages/widget/tests/domain/decoding/api-forward-compatibility.test.ts b/packages/widget/tests/domain/decoding/api-forward-compatibility.test.ts
index 55db0d8df..c27d97ef4 100644
--- a/packages/widget/tests/domain/decoding/api-forward-compatibility.test.ts
+++ b/packages/widget/tests/domain/decoding/api-forward-compatibility.test.ts
@@ -518,9 +518,9 @@ describe("Domain schemas decode only the fields the widget reads", () => {
 
         expect(balances[0]?.token).not.toHaveProperty("feeConfigurationId");
         expect(Object.values(rewards)[0]?.token.symbol).toBe(token.symbol);
-        expect(
-          prices.getByToken({ network: "ethereum", symbol: "ETH" })?.price
-        ).toEqual(expect.anything());
+        expect(prices.getByToken({ network: "ethereum" })?.price).toEqual(
+          expect.anything()
+        );
       })
   );
 });
diff --git a/packages/widget/tests/domain/earn/earn-models.test.ts b/packages/widget/tests/domain/earn/earn-models.test.ts
index c145e116f..325c8a935 100644
--- a/packages/widget/tests/domain/earn/earn-models.test.ts
+++ b/packages/widget/tests/domain/earn/earn-models.test.ts
@@ -100,6 +100,89 @@ describe("Earn application models", () => {
     expect(balance.amountUsd?.toFixed()).toBe("12345678901234567890.12");
   });
 
+  it.effect("decodes an encrypted balance's shares as its handle", () =>
+    Effect.gen(function* () {
+      const balance = yield* Schema.decodeEffect(EarnBalance)({
+        address: "wallet-1",
+        type: "active",
+        amount: "0",
+        amountRaw: "0",
+        isEncrypted: true,
+        pendingActions: [],
+        shareAmount: "0",
+        shareAmountRaw: `0x${"AB".repeat(32)}`,
+        token,
+      }).pipe(Effect.provide(Logger.layer([])));
+
+      expect(balance.shares).toEqual({
+        _tag: "Encrypted",
+        handle: `0x${"ab".repeat(32)}`,
+      });
+    })
+  );
+
+  it.effect("decodes a plain balance's shares as exact amounts", () =>
+    Effect.gen(function* () {
+      const balance = yield* Schema.decodeEffect(EarnBalance)({
+        address: "wallet-1",
+        type: "active",
+        amount: "1.6",
+        amountRaw: "1600000",
+        pendingActions: [],
+        shareAmount: "1.500000000000000001",
+        shareAmountRaw: "1500000000000000001",
+        token,
+      }).pipe(Effect.provide(Logger.layer([])));
+
+      expect(balance.shares).toEqual({
+        _tag: "Plain",
+        amount: new BigNumber("1.500000000000000001"),
+        amountRaw: 1500000000000000001n,
+      });
+    })
+  );
+
+  it.effect("drops only a malformed plain share count", () =>
+    Effect.gen(function* () {
+      const balance = yield* Schema.decodeEffect(EarnBalance)({
+        address: "wallet-1",
+        type: "active",
+        amount: "1",
+        amountRaw: "1",
+        pendingActions: [],
+        shareAmount: "2.5",
+        shareAmountRaw: "not-a-quantity",
+        token,
+      }).pipe(Effect.provide(Logger.layer([])));
+
+      expect(balance.amount.toFixed()).toBe("1");
+      expect(balance.shares).toEqual({
+        _tag: "Plain",
+        amount: new BigNumber("2.5"),
+      });
+    })
+  );
+
+  it.effect("drops only a raw share count of the wrong wire type", () =>
+    Effect.gen(function* () {
+      const balance = yield* Schema.decodeEffect(EarnBalance)({
+        address: "wallet-1",
+        type: "active",
+        amount: "1",
+        amountRaw: "1",
+        pendingActions: [],
+        shareAmount: "2.5",
+        shareAmountRaw: { value: 25 },
+        token,
+      }).pipe(Effect.provide(Logger.layer([])));
+
+      expect(balance.shares).toEqual({
+        _tag: "Plain",
+        amount: new BigNumber("2.5"),
+      });
+    })
+  );
+
   it.effect("safely omits an invalid optional balance timestamp", () =>
     Effect.gen(function* () {
       const balance = yield* Schema.decodeEffect(EarnBalance)({
@@ -236,6 +319,119 @@ describe("Earn application models", () => {
     expect(yieldModel.state).toEqual({});
   });
 
+  const decodeYieldQuietly = (wire: unknown) =>
+    Schema.decodeUnknownEffect(EarnYield)(wire).pipe(
+      Effect.provide(Logger.layer([]))
+    );
+
+  it.effect("drops only a malformed fee and keeps the yield", () =>
+    Effect.gen(function* () {
+      const base = yieldApiYieldDtoFixture();
+      const yieldModel = yield* decodeYieldQuietly({
+        ...base,
+        mechanics: {
+          ...base.mechanics,
+          fee: { deposit: "abc", management: "2.00" },
+        },
+      });
+
+      expect(yieldModel.mechanics.fee).toEqual({
+        deposit: null,
+        management: new BigNumber("2"),
+      });
+    })
+  );
+
+  it.effect("drops only a malformed entry limit and keeps the yield", () =>
+    Effect.gen(function* () {
+      const base = yieldApiYieldDtoFixture();
+      const yieldModel = yield* decodeYieldQuietly({
+        ...base,
+        mechanics: {
+          ...base.mechanics,
+          entryLimits: {
+            maximum: null,
+            minimum: "ten",
+            subsequentMinimum: "10000",
+          },
+        },
+      });
+
+      expect(yieldModel.mechanics.entryLimits).toEqual({
+        maximum: null,
+        minimum: null,
+        subsequentMinimum: new BigNumber("10000"),
+      });
+    })
+  );
+
+  it.effect("drops only malformed TVL values and keeps their models", () =>
+    Effect.gen(function* () {
+      const yieldModel = yield* decodeYieldQuietly({
+        ...yieldApiYieldDtoFixture(),
+        statistics: { tvlUsd: "1,200,000", averagePositionSizeUsd: "3448.27" },
+      });
+      const provider = yield* Schema.decodeEffect(EarnProvider)({
+        id: "stakekit",
+        name: "StakeKit",
+        logoURI: "https://stakek.it/logo.svg",
+        website: "https://stakek.it",
+        tvlUsd: "",
+      }).pipe(Effect.provide(Logger.layer([])));
+      const validator = yield* Schema.decodeUnknownEffect(EarnValidator)({
+        address: "validator-1",
+        tvl: "lots",
+        tvlRaw: "8250450000000000000000",
+      }).pipe(Effect.provide(Logger.layer([])));
+      const validatorWithTvl = yield* Schema.decodeEffect(EarnValidator)({
+        address: "validator-2",
+        tvl: "8250.45",
+      });
+
+      expect(yieldModel.statistics).toEqual({
+        averagePositionSizeUsd: new BigNumber("3448.27"),
+        tvlUsd: null,
+      });
+      expect(provider.tvlUsd).toBeNull();
+      expect(validator.tvl).toBeNull();
+      expect(validator).not.toHaveProperty("tvlRaw");
+      expect(validatorWithTvl.tvl).toEqual(new BigNumber("8250.45"));
+    })
+  );
+
+  it.effect(
+    "drops only a malformed price-per-share state and keeps the yield",
+    () =>
+      Effect.gen(function* () {
+        const base = yieldApiYieldDtoFixture();
+        const malformed = yield* decodeYieldQuietly({
+          ...base,
+          state: {
+            pricePerShareState: {
+              price: "not-a-price",
+              quoteToken: base.token,
+              shareToken: base.token,
+            },
+          },
+        });
+        const priced = yield* decodeYieldQuietly({
+          ...base,
+          state: {
+            pricePerShareState: {
+              price: 1.05,
+              quoteToken: base.token,
+              shareToken: base.token,
+            },
+          },
+        });
+
+        expect(malformed.state).toEqual({ pricePerShareState: null });
+        expect(priced.state?.pricePerShareState?.price).toEqual(
+          new BigNumber("1.05")
+        );
+      })
+  );
+
   it("decodes advertised provider options as opaque values", () => {
     const baseYield = yieldApiYieldDtoFixture();
     const yieldModel = yieldApiYieldFixture({
diff --git a/packages/widget/tests/domain/earn/reward-rate.test.ts b/packages/widget/tests/domain/earn/reward-rate.test.ts
index a57c3585a..183cf0e59 100644
--- a/packages/widget/tests/domain/earn/reward-rate.test.ts
+++ b/packages/widget/tests/domain/earn/reward-rate.test.ts
@@ -54,7 +54,7 @@ describe("getEffectiveYieldRewardRateDetails", () => {
     );
 
     const rewardRate = getEffectiveYieldRewardRateDetails({
-      selectedValidators: new Map([[validator.address, validator]]),
+      selectedValidators: new Map([[validator.key, validator]]),
       yieldDto,
     });
 
@@ -89,8 +89,8 @@ describe("getEffectiveYieldRewardRateDetails", () => {
 
     const rewardRate = getEffectiveYieldRewardRateDetails({
       selectedValidators: new Map([
-        [firstValidator.address, firstValidator],
-        [secondValidator.address, secondValidator],
+        [firstValidator.key, firstValidator],
+        [secondValidator.key, secondValidator],
       ]),
       yieldDto,
     });
diff --git a/packages/widget/tests/domain/finance/funded-balance.test.ts b/packages/widget/tests/domain/finance/funded-balance.test.ts
index b025fab09..acaa61ee4 100644
--- a/packages/widget/tests/domain/finance/funded-balance.test.ts
+++ b/packages/widget/tests/domain/finance/funded-balance.test.ts
@@ -5,11 +5,14 @@ import { isFundedBalance } from "../../../src/domain/finance/funded-balance";
 describe("isFundedBalance", () => {
   it("treats a 1-wei balance as dust with or without a price", () => {
     expect(
-      isFundedBalance({ amount: "0.000000000000000001", priceUsd: null })
+      isFundedBalance({
+        amount: new BigNumber("0.000000000000000001"),
+        priceUsd: null,
+      })
     ).toBe(false);
     expect(
       isFundedBalance({
-        amount: "0.000000000000000001",
+        amount: new BigNumber("0.000000000000000001"),
         priceUsd: new BigNumber(3000),
       })
     ).toBe(false);
@@ -17,35 +20,53 @@ describe("isFundedBalance", () => {
 
   it("funds a priced balance worth $5", () => {
     expect(
-      isFundedBalance({ amount: "0.002", priceUsd: new BigNumber(2500) })
+      isFundedBalance({
+        amount: new BigNumber("0.002"),
+        priceUsd: new BigNumber(2500),
+      })
     ).toBe(true);
   });
 
   it("does not fund a priced balance worth $0.001", () => {
     expect(
-      isFundedBalance({ amount: "0.001", priceUsd: new BigNumber(1) })
+      isFundedBalance({
+        amount: new BigNumber("0.001"),
+        priceUsd: new BigNumber(1),
+      })
     ).toBe(false);
   });
 
   it("funds a priced balance worth exactly $0.01", () => {
     expect(
-      isFundedBalance({ amount: "0.01", priceUsd: new BigNumber(1) })
+      isFundedBalance({
+        amount: new BigNumber("0.01"),
+        priceUsd: new BigNumber(1),
+      })
     ).toBe(true);
   });
 
   it("uses the unit threshold when no positive price is known", () => {
-    expect(isFundedBalance({ amount: "0.0000005", priceUsd: null })).toBe(
-      false
-    );
-    expect(isFundedBalance({ amount: "0.000001", priceUsd: null })).toBe(true);
     expect(
-      isFundedBalance({ amount: "0.0000005", priceUsd: new BigNumber(0) })
+      isFundedBalance({ amount: new BigNumber("0.0000005"), priceUsd: null })
+    ).toBe(false);
+    expect(
+      isFundedBalance({ amount: new BigNumber("0.000001"), priceUsd: null })
+    ).toBe(true);
+    expect(
+      isFundedBalance({
+        amount: new BigNumber("0.0000005"),
+        priceUsd: new BigNumber(0),
+      })
     ).toBe(false);
-    expect(isFundedBalance({ amount: "5", priceUsd: null })).toBe(true);
+    expect(
+      isFundedBalance({ amount: new BigNumber("5"), priceUsd: null })
+    ).toBe(true);
   });
 
   it("does not fund zero or negative balances", () => {
-    expect(isFundedBalance({ amount: "0", priceUsd: null })).toBe(false);
+    expect(
+      isFundedBalance({ amount: new BigNumber("0"), priceUsd: null })
+    ).toBe(false);
     expect(
       isFundedBalance({ amount: new BigNumber(-1), priceUsd: new BigNumber(1) })
     ).toBe(false);
diff --git a/packages/widget/tests/domain/finance/price.test.ts b/packages/widget/tests/domain/finance/price.test.ts
index a9f045cc1..00418d41f 100644
--- a/packages/widget/tests/domain/finance/price.test.ts
+++ b/packages/widget/tests/domain/finance/price.test.ts
@@ -1,3 +1,4 @@
+import BigNumber from "bignumber.js";
 import { Schema } from "effect";
 import { describe, expect, it } from "vitest";
 import { getTokenPriceInUSD } from "../../../src/domain/finance/price";
@@ -6,16 +7,13 @@ import { formatUsd } from "../../../src/shared/lib/number-format";
 
 describe("token USD prices", () => {
   it("formats a native-token amount from the API price key", () => {
-    const token = {
-      network: "ethereum",
-      symbol: "ETH",
-    };
+    const token = { network: "ethereum" } as const;
     const prices = Schema.decodeSync(PriceResponse)({
       "ethereum-undefined": { price: 1619.22, price_24_h: 0 },
     });
 
     const amountInUsd = getTokenPriceInUSD({
-      amount: "0.0012",
+      amount: new BigNumber("0.0012"),
       baseToken: null,
       pricePerShare: null,
       prices,
diff --git a/packages/widget/tests/domain/portfolio/dashboard-models.test.ts b/packages/widget/tests/domain/portfolio/dashboard-models.test.ts
index c064f8855..2755341b8 100644
--- a/packages/widget/tests/domain/portfolio/dashboard-models.test.ts
+++ b/packages/widget/tests/domain/portfolio/dashboard-models.test.ts
@@ -66,7 +66,6 @@ describe("dashboard application schemas", () => {
       expect(DateTime.isDateTime(rewardRate.items[0]?.timestamp)).toBe(true);
       expect(tvl.items).toHaveLength(1);
       expect(tvl.items[0]?.tvl.toFixed()).toBe("1000.5");
-      expect(tvl.items[0]?.tvlRaw).toBe("1000500000");
       expect(DateTime.isDateTime(tvl.items[0]?.timestamp)).toBe(true);
     })
   );
diff --git a/packages/widget/tests/domain/portfolio/position-derivations.test.ts b/packages/widget/tests/domain/portfolio/position-derivations.test.ts
index 5affd877e..9765bad3d 100644
--- a/packages/widget/tests/domain/portfolio/position-derivations.test.ts
+++ b/packages/widget/tests/domain/portfolio/position-derivations.test.ts
@@ -6,6 +6,7 @@ import { describe, expect, it } from "vitest";
 import { EarnBalance, EarnPosition } from "../../../src/domain/earn/models";
 import { WalletAddress } from "../../../src/domain/identity/identifiers";
 import {
+  BalanceDataKey,
   getPositionBalances,
   getPositionData,
   getSingleExitTokenSum,
@@ -66,7 +67,12 @@ describe("position derivations", () => {
     const positions = toPositionsData([position]);
     const selected = getPositionData(positions, position.yieldId);
 
-    expect(getPositionBalances(selected, "missing-balance-group")).toBeNull();
+    expect(
+      getPositionBalances(
+        selected,
+        Schema.decodeSync(BalanceDataKey)("validator::missing")
+      )
+    ).toBeNull();
   });
 
   it("sums balances per token identity without merging equal symbols on different addresses", () => {
diff --git a/packages/widget/tests/domain/token/token.test.ts b/packages/widget/tests/domain/token/token.test.ts
index 47f444a60..deac3ddb2 100644
--- a/packages/widget/tests/domain/token/token.test.ts
+++ b/packages/widget/tests/domain/token/token.test.ts
@@ -41,7 +41,7 @@ describe("Token", () => {
     expect(
       equalTokens(
         { network: "ethereum", symbol: "ETH" },
-        { network: "ethereum", symbol: "ETH", address: "" }
+        token({ network: "ethereum", symbol: "ETH", address: "0x" })
       )
     ).toBe(false);
   });
diff --git a/packages/widget/tests/features/activity/activity-action-details.test.ts b/packages/widget/tests/features/activity/activity-action-details.test.ts
index a08d0a8c5..e75c13a41 100644
--- a/packages/widget/tests/features/activity/activity-action-details.test.ts
+++ b/packages/widget/tests/features/activity/activity-action-details.test.ts
@@ -3,6 +3,7 @@ import { describe, expect, it } from "vitest";
 import type { ActionTransaction } from "../../../src/domain/action/models";
 import { Market } from "../../../src/domain/borrow/catalog/market";
 import { BorrowActivityAction } from "../../../src/domain/borrow/responses";
+import { TransactionHash } from "../../../src/domain/identity/identifiers";
 import type {
   BorrowActivityItem,
   YieldActivityItem,
@@ -46,7 +47,7 @@ describe("Activity action details projection", () => {
     });
     const approval = yieldApiTransactionFixture({
       broadcastedAt: DateTime.makeUnsafe("2026-08-26T10:05:00.000Z"),
-      hash: "0xabc",
+      hash: TransactionHash.make("0xabc"),
       id: "approval",
       status: "CONFIRMED",
       stepIndex: 0,
diff --git a/packages/widget/tests/features/activity/activity-action-list-item.test.ts b/packages/widget/tests/features/activity/activity-action-list-item.test.ts
index c10969f14..0ed35158b 100644
--- a/packages/widget/tests/features/activity/activity-action-list-item.test.ts
+++ b/packages/widget/tests/features/activity/activity-action-list-item.test.ts
@@ -197,13 +197,7 @@ describe("Activity action list item projection", () => {
 
   it("projects an unavailable action without inventing a token", () => {
     const projection = projectActivityActionListItem({
-      action: makeItem(
-        yieldApiActionFixture({
-          createdAt: undefined,
-          type: "VOTE",
-        }),
-        null
-      ),
+      action: makeItem(yieldApiActionFixture({ type: "VOTE" }), null),
       locale: "en-US",
       presentationTime: null,
     });
diff --git a/packages/widget/tests/features/activity/activity-actions.test.ts b/packages/widget/tests/features/activity/activity-actions.test.ts
index 7616853bc..b537e0dc2 100644
--- a/packages/widget/tests/features/activity/activity-actions.test.ts
+++ b/packages/widget/tests/features/activity/activity-actions.test.ts
@@ -239,7 +239,11 @@ describe("activity action atom boundary", () => {
         readonly offset: number;
       }) =>
         tracked({
-          items: [yieldApiValidatorFixture({ address: request.address })],
+          items: [
+            yieldApiValidatorFixture(
+              request.address === undefined ? {} : { address: request.address }
+            ),
+          ],
           limit: request.limit,
           offset: request.offset,
           total: 1,
@@ -436,7 +440,11 @@ const validatorPage = (request: {
   readonly limit: number;
   readonly offset: number;
 }) => ({
-  items: [yieldApiValidatorFixture({ address: request.address })],
+  items: [
+    yieldApiValidatorFixture(
+      request.address === undefined ? {} : { address: request.address }
+    ),
+  ],
   limit: request.limit,
   offset: request.offset,
   total: 1,
diff --git a/packages/widget/tests/features/activity/activity-details.dom.test.tsx b/packages/widget/tests/features/activity/activity-details.dom.test.tsx
index fb7b50964..673a12b9f 100644
--- a/packages/widget/tests/features/activity/activity-details.dom.test.tsx
+++ b/packages/widget/tests/features/activity/activity-details.dom.test.tsx
@@ -4,6 +4,7 @@ import { I18nextProvider } from "react-i18next";
 import { MemoryRouter } from "react-router";
 import { describe, expect, it, vi } from "vitest";
 import { BorrowActivityAction } from "../../../src/domain/borrow/responses";
+import { TransactionHash } from "../../../src/domain/identity/identifiers";
 import type {
   BorrowActivityItem,
   YieldActivityItem,
@@ -59,7 +60,7 @@ const makeItem = ({
         yieldApiTransactionFixture({
           error: "Execution reverted",
           explorerUrl: "https://explorer.test/failed",
-          hash: "0x1234567890abcdef1234",
+          hash: TransactionHash.make("0x1234567890abcdef1234"),
           id: "stake",
           status: "FAILED",
           stepIndex: 1,
diff --git a/packages/widget/tests/features/activity/activity-workflow.dom.test.tsx b/packages/widget/tests/features/activity/activity-workflow.dom.test.tsx
index 090e8a0a2..f9ae37aa5 100644
--- a/packages/widget/tests/features/activity/activity-workflow.dom.test.tsx
+++ b/packages/widget/tests/features/activity/activity-workflow.dom.test.tsx
@@ -5,6 +5,7 @@ import { MemoryRouter } from "react-router";
 import { describe, expect, it, vi } from "vitest";
 import { SKAtomRegistryProvider } from "../../../src/app/composition/providers/atom-runtime";
 import { applicationRoutes } from "../../../src/app/routes/application-routes";
+import { YieldId } from "../../../src/domain/identity/identifiers";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import type { ActivityActionItem } from "../../../src/features/activity/model/activity-action";
 import type { ActivityPageView } from "../../../src/features/activity/state/page";
@@ -157,7 +158,7 @@ describe("activity and completion workflows", () => {
             unstakeMatch: false,
             urls: [{ type: "STAKE", url: "https://explorer.test/tx" }],
           }}
-          integrationId="test-yield"
+          integrationId={YieldId.make("test-yield")}
           metadata={null}
           network="ethereum"
           providersDetails={null}
diff --git a/packages/widget/tests/features/borrow-transaction-flow/borrow-execution-flow.browser.test.tsx b/packages/widget/tests/features/borrow-transaction-flow/borrow-execution-flow.browser.test.tsx
index c32403bdc..8ba5181c7 100644
--- a/packages/widget/tests/features/borrow-transaction-flow/borrow-execution-flow.browser.test.tsx
+++ b/packages/widget/tests/features/borrow-transaction-flow/borrow-execution-flow.browser.test.tsx
@@ -23,7 +23,10 @@ import type {
   Transaction as BorrowTransaction,
   SubmitTransactionCommand,
 } from "../../../src/domain/borrow/execution/transaction";
-import { WalletAddress } from "../../../src/domain/identity/identifiers";
+import {
+  TransactionHash,
+  WalletAddress,
+} from "../../../src/domain/identity/identifiers";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import {
   BorrowFlowSession,
@@ -77,8 +80,9 @@ import { applicationRuntimeInitInitialValue } from "../../utils/widget-config";
 const address = Schema.decodeSync(WalletAddress)(
   "0x0000000000000000000000000000000000000001"
 );
-const transactionHash =
-  "0x1111111111111111111111111111111111111111111111111111111111111111";
+const transactionHash = TransactionHash.make(
+  "0x1111111111111111111111111111111111111111111111111111111111111111"
+);
 const walletScope = new WalletScopeKey({ address, network: "base" });
 const i18nInstance = createWidgetI18nInstance();
 
@@ -511,7 +515,12 @@ const renderExecution = (
           </Route>
         </Route>
       ),
-      { initialEntries, initialIndex: options.initialIndex }
+      {
+        initialEntries,
+        ...(options.initialIndex === undefined
+          ? {}
+          : { initialIndex: options.initialIndex }),
+      }
     );
 
     const app = yield* Effect.acquireRelease(
@@ -652,7 +661,9 @@ describe("borrow execution flow component", () => {
             args: {
               amount: "25",
               marketId: command.args.marketId,
-              tokenAddress: command.args.tokenAddress,
+              ...(command.args.tokenAddress === undefined
+                ? {}
+                : { tokenAddress: command.args.tokenAddress }),
             },
           },
           summary: {
diff --git a/packages/widget/tests/features/borrow-transaction-flow/borrow-flow-operations.test.ts b/packages/widget/tests/features/borrow-transaction-flow/borrow-flow-operations.test.ts
index 137b32b48..4b0f525c5 100644
--- a/packages/widget/tests/features/borrow-transaction-flow/borrow-flow-operations.test.ts
+++ b/packages/widget/tests/features/borrow-transaction-flow/borrow-flow-operations.test.ts
@@ -13,7 +13,11 @@ import {
 } from "effect";
 import { Action } from "../../../src/domain/borrow/execution/action";
 import { Transaction } from "../../../src/domain/borrow/execution/transaction";
-import { IntegrationId, MarketId } from "../../../src/domain/borrow/ids";
+import {
+  ActionId,
+  IntegrationId,
+  MarketId,
+} from "../../../src/domain/borrow/ids";
 import {
   TransactionWorkflowId,
   WalletAddress,
@@ -225,7 +229,9 @@ const withoutNavigationState = (
 // The action id Steps' navigation state carries after a handoff.
 const handedOffActionId = (session: BorrowFlowSession) =>
   Ref.get(session.handoff).pipe(
-    Effect.map((handoff) => handoff?.action.id ?? "nothing-handed-off")
+    Effect.map(
+      (handoff) => handoff?.action.id ?? ActionId.make("nothing-handed-off")
+    )
   );
 
 describe("startBorrowTransactionFlow", () => {
@@ -771,7 +777,10 @@ describe("startBorrowFlowExecution", () => {
 
       const exit = yield* Effect.exit(
         Effect.scoped(
-          startBorrowFlowExecution(openSession(), "never-handed-off")
+          startBorrowFlowExecution(
+            openSession(),
+            ActionId.make("never-handed-off")
+          )
         ).pipe(Effect.provide(kit.layer))
       );
 
diff --git a/packages/widget/tests/features/borrow/borrow-entry/atoms.test.ts b/packages/widget/tests/features/borrow/borrow-entry/atoms.test.ts
index ef99bd286..03f47298c 100644
--- a/packages/widget/tests/features/borrow/borrow-entry/atoms.test.ts
+++ b/packages/widget/tests/features/borrow/borrow-entry/atoms.test.ts
@@ -590,7 +590,9 @@ describe("Borrow Entry atoms", () => {
           applicationRuntimeInitInitialValue({
             apiKey: "api-key",
             borrowEnabled: true,
-            borrowMarketsScope: configured,
+            ...(configured === undefined
+              ? {}
+              : { borrowMarketsScope: configured }),
             dashboardVariant: true,
             variant: "default",
           }),
diff --git a/packages/widget/tests/features/borrow/borrow-entry/market-groups.test.ts b/packages/widget/tests/features/borrow/borrow-entry/market-groups.test.ts
index 404302f70..1095b7dcc 100644
--- a/packages/widget/tests/features/borrow/borrow-entry/market-groups.test.ts
+++ b/packages/widget/tests/features/borrow/borrow-entry/market-groups.test.ts
@@ -1,6 +1,7 @@
 import * as Schema from "effect/Schema";
 import { describe, expect, it } from "vitest";
 import { Market } from "../../../../src/domain/borrow/catalog/market";
+import { IntegrationId } from "../../../../src/domain/borrow/ids";
 import { TokenBalancesResponse } from "../../../../src/domain/finance/models";
 import {
   type BorrowCollateralOption,
@@ -124,8 +125,11 @@ const aaveUsdt = makeMarket({
 });
 
 const integrations = [
-  { id: "aave-borrow", name: "Aave V3" },
-  { id: "morpho-blue-borrow", name: "Morpho Blue" },
+  { id: Schema.decodeSync(IntegrationId)("aave-borrow"), name: "Aave V3" },
+  {
+    id: Schema.decodeSync(IntegrationId)("morpho-blue-borrow"),
+    name: "Morpho Blue",
+  },
 ];
 
 const markets = [aaveUsdc, morphoUsdc, aaveUsdt];
diff --git a/packages/widget/tests/features/borrow/market-position/action-form.test.ts b/packages/widget/tests/features/borrow/market-position/action-form.test.ts
index 494d6e8ad..efa8fae9f 100644
--- a/packages/widget/tests/features/borrow/market-position/action-form.test.ts
+++ b/packages/widget/tests/features/borrow/market-position/action-form.test.ts
@@ -3,6 +3,7 @@ import { Schema } from "effect";
 import { describe, expect, it } from "vitest";
 import { Integration } from "../../../../src/domain/borrow/catalog/integration";
 import { Market } from "../../../../src/domain/borrow/catalog/market";
+import { TokenAddress } from "../../../../src/domain/borrow/ids";
 import { BorrowAccountSnapshot } from "../../../../src/domain/borrow/positions/borrow-account-snapshot";
 import { deriveBorrowPositions } from "../../../../src/domain/borrow/positions/borrow-positions";
 import {
@@ -47,7 +48,9 @@ describe("Borrow position action form intent", () => {
     expect(
       applyBorrowWithdrawFormAction({
         action: {
-          tokenAddress: "0x0000000000000000000000000000000000000001",
+          tokenAddress: Schema.decodeSync(TokenAddress)(
+            "0x0000000000000000000000000000000000000001"
+          ),
           type: "token/select",
         },
         intent: changed,
diff --git a/packages/widget/tests/features/earn/earn-details-model.test.tsx b/packages/widget/tests/features/earn/earn-details-model.test.tsx
index 8d6dfb917..a5416f809 100644
--- a/packages/widget/tests/features/earn/earn-details-model.test.tsx
+++ b/packages/widget/tests/features/earn/earn-details-model.test.tsx
@@ -1,3 +1,4 @@
+import BigNumber from "bignumber.js";
 import type { TFunction } from "i18next";
 import { describe, expect, it } from "vitest";
 import type { EarnYieldWithProvider } from "../../../src/domain/earn/models";
@@ -25,7 +26,11 @@ const t = (key: string, options?: Record<string, unknown>): string => {
 
 const minStakeMechanics = {
   ...yieldApiYieldFixture().mechanics,
-  entryLimits: { minimum: "1", maximum: null, subsequentMinimum: null },
+  entryLimits: {
+    minimum: new BigNumber("1"),
+    maximum: null,
+    subsequentMinimum: null,
+  },
 };
 
 const makeYield = (
@@ -76,8 +81,7 @@ describe("getEarnDetailsModel", () => {
       yieldDto: makeYield({
         state: {
           pricePerShareState: {
-            price: 1.06274537,
-            quoteToken: yieldApiYieldFixture().token,
+            price: new BigNumber("1.06274537"),
             shareToken: yieldApiYieldFixture().token,
           },
         },
@@ -183,8 +187,8 @@ describe("getEarnDetailsModel", () => {
     const model = getEarnDetailsModel({
       locale: "en",
       selectedValidators: new Map([
-        [firstValidator.address, firstValidator],
-        [secondValidator.address, secondValidator],
+        [firstValidator.key, firstValidator],
+        [secondValidator.key, secondValidator],
       ]),
       t: t as TFunction,
       yieldDto: makeYield(),
@@ -209,8 +213,7 @@ describe("getEarnDetailsModel", () => {
         },
         state: {
           pricePerShareState: {
-            price: 1.06274537,
-            quoteToken: baseYield.token,
+            price: new BigNumber("1.06274537"),
             shareToken: baseYield.token,
           },
         },
diff --git a/packages/widget/tests/features/earn/earn-entry-reset.test.ts b/packages/widget/tests/features/earn/earn-entry-reset.test.ts
index 4204c2065..416dba382 100644
--- a/packages/widget/tests/features/earn/earn-entry-reset.test.ts
+++ b/packages/widget/tests/features/earn/earn-entry-reset.test.ts
@@ -1,6 +1,7 @@
 import { Schema } from "effect";
 import { describe, expect, it } from "vitest";
 import {
+  ValidatorAddress,
   WalletAddress,
   YieldId,
 } from "../../../src/domain/identity/identifiers";
@@ -62,7 +63,7 @@ describe("Earn Entry amount clearing on workflow start", () => {
         pendingaction: null,
         tab: null,
         token: null,
-        validator: "validator-a",
+        validator: Schema.decodeSync(ValidatorAddress)("validator-a"),
         yieldId: Schema.decodeSync(YieldId)("seeded-yield"),
       },
       intent: {
diff --git a/packages/widget/tests/features/earn/earn-facade.test.ts b/packages/widget/tests/features/earn/earn-facade.test.ts
index 31cf2c15a..2fe7362df 100644
--- a/packages/widget/tests/features/earn/earn-facade.test.ts
+++ b/packages/widget/tests/features/earn/earn-facade.test.ts
@@ -146,7 +146,7 @@ describe("Earn facade", () => {
   it("projects client-side token and yield search from semantic options", () => {
     const selectedYield = yieldApiYieldFixture();
     const tokenOption = {
-      amount: "10",
+      amount: new BigNumber("10"),
       availableYields: [selectedYield.id],
       source: "balance",
       token: selectedYield.token,
@@ -188,7 +188,7 @@ describe("Earn facade", () => {
       address: string,
       amount: string | null
     ): EarnTokenOption => ({
-      amount,
+      amount: amount === null ? null : new BigNumber(amount),
       availableYields: [selectedYield.id],
       source: amount === null ? "default" : "balance",
       token: {
@@ -264,7 +264,7 @@ describe("Earn facade", () => {
       address: string,
       amount: string
     ): EarnTokenOption => ({
-      amount,
+      amount: new BigNumber(amount),
       availableYields: [selectedYield.id],
       source: "balance",
       token: {
diff --git a/packages/widget/tests/features/earn/earn-initial-validator.test.ts b/packages/widget/tests/features/earn/earn-initial-validator.test.ts
index f9c6b2778..0cdf0ad7c 100644
--- a/packages/widget/tests/features/earn/earn-initial-validator.test.ts
+++ b/packages/widget/tests/features/earn/earn-initial-validator.test.ts
@@ -5,7 +5,10 @@ import { describe, expect, it, vi } from "vitest";
 import { appRuntime } from "../../../src/app/runtime/app-runtime";
 import type { EarnYield } from "../../../src/domain/earn/models";
 import { TokenBalancesResponse } from "../../../src/domain/finance/models";
-import { WalletAddress } from "../../../src/domain/identity/identifiers";
+import {
+  ValidatorAddress,
+  WalletAddress,
+} from "../../../src/domain/identity/identifiers";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import {
   earnSelectionStatusViewAtom,
@@ -50,7 +53,7 @@ const entry = (requestedValidator: string): EarnEntry => ({
     pendingaction: null,
     tab: "earn",
     token: null,
-    validator: requestedValidator,
+    validator: Schema.decodeSync(ValidatorAddress)(requestedValidator),
     yieldId: validatorYield.id,
   },
   preferredTokenYieldsPerNetwork: null,
diff --git a/packages/widget/tests/features/earn/earn-refetch-failure.test.ts b/packages/widget/tests/features/earn/earn-refetch-failure.test.ts
index dba44971e..7ace55899 100644
--- a/packages/widget/tests/features/earn/earn-refetch-failure.test.ts
+++ b/packages/widget/tests/features/earn/earn-refetch-failure.test.ts
@@ -1,3 +1,4 @@
+import BigNumber from "bignumber.js";
 import { Effect, Layer, Option, Schema } from "effect";
 import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
 import * as Reactivity from "effect/reactivity/Reactivity";
@@ -88,7 +89,7 @@ describe("Earn derived atoms after a failed refetch", () => {
 
     try {
       expect(AsyncResult.getOrThrow(registry.get(tokenOptions))).toMatchObject([
-        { amount: "5", source: "balance" },
+        { amount: new BigNumber("5"), source: "balance" },
       ]);
 
       offline = true;
@@ -100,7 +101,10 @@ describe("Earn derived atoms after a failed refetch", () => {
       expect(option && tokenString(option.token)).toBe(
         tokenString(earnYield.token)
       );
-      expect(option).toMatchObject({ amount: "5", source: "balance" });
+      expect(option).toMatchObject({
+        amount: new BigNumber("5"),
+        source: "balance",
+      });
     } finally {
       unmount();
       registry.dispose();
diff --git a/packages/widget/tests/features/earn/earn-selection.test.ts b/packages/widget/tests/features/earn/earn-selection.test.ts
index a0329cc95..69a0d1bff 100644
--- a/packages/widget/tests/features/earn/earn-selection.test.ts
+++ b/packages/widget/tests/features/earn/earn-selection.test.ts
@@ -8,10 +8,12 @@ import type { EarnYield } from "../../../src/domain/earn/models";
 import { TokenBalancesResponse } from "../../../src/domain/finance/models";
 import { type PriceRequest, Prices } from "../../../src/domain/health/models";
 import {
+  ProviderId,
   ProviderOption,
   WalletAddress,
+  YieldId,
 } from "../../../src/domain/identity/identifiers";
-import { tokenString } from "../../../src/domain/token/token";
+import { hostTokenKey, tokenString } from "../../../src/domain/token/token";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import {
   earnSelectionProviderOptionsViewAtom,
@@ -601,12 +603,14 @@ describe("Earn Selection", () => {
       };
     };
 
+    const providers = (...ids: ReadonlyArray<string>) =>
+      ids.map((id) => ProviderId.make(id));
     it("lists and selects ranked providers first, keeping type groups together", async () => {
       await expect(
         renderYieldSelection({
           entry: {
             ...compactEntry,
-            yieldProviderOrder: { defi: ["morpho", "aave"] },
+            yieldProviderOrder: { defi: providers("morpho", "aave") },
           },
         })
       ).resolves.toEqual({
@@ -623,7 +627,10 @@ describe("Earn Selection", () => {
     it("keeps the default order for a category without a ranking", async () => {
       await expect(
         renderYieldSelection({
-          entry: { ...compactEntry, yieldProviderOrder: { stake: ["morpho"] } },
+          entry: {
+            ...compactEntry,
+            yieldProviderOrder: { stake: providers("morpho") },
+          },
         })
       ).resolves.toEqual({
         listed: [
@@ -640,7 +647,7 @@ describe("Earn Selection", () => {
       const { selected } = await renderYieldSelection({
         entry: {
           ...compactEntry,
-          yieldProviderOrder: { defi: ["morpho", "aave"] },
+          yieldProviderOrder: { defi: providers("morpho", "aave") },
         },
         yields: makeYields({ morphoRates: [0, 0] }),
       });
@@ -652,7 +659,7 @@ describe("Earn Selection", () => {
       const { listed, selected } = await renderYieldSelection({
         entry: {
           ...compactEntry,
-          yieldProviderOrder: { defi: ["morpho", "aave"] },
+          yieldProviderOrder: { defi: providers("morpho", "aave") },
         },
         yields: [
           usdcYield({
@@ -690,11 +697,12 @@ describe("Earn Selection", () => {
           ...compactEntry,
           preferredTokenYieldsPerNetwork: {
             ethereum: {
-              [`ethereum-${usdcToken.address?.toLowerCase()}`]:
-                "ethereum-usdc-aave-lending",
+              [hostTokenKey(usdcToken)]: YieldId.make(
+                "ethereum-usdc-aave-lending"
+              ),
             },
           },
-          yieldProviderOrder: { defi: ["morpho", "aave"] },
+          yieldProviderOrder: { defi: providers("morpho", "aave") },
         },
       });
 
@@ -1031,7 +1039,10 @@ describe("Earn Selection", () => {
       expect(
         registry
           .get(earnSelectionTokenOptionsViewAtom)
-          .items.map((option) => [option.token.symbol, option.amount])
+          .items.map((option) => [
+            option.token.symbol,
+            option.amount?.toFixed(),
+          ])
       ).toEqual([
         ["USDC", "5"],
         [firstYield.token.symbol, "0.000000000000000001"],
@@ -1067,7 +1078,7 @@ describe("Earn Selection", () => {
         registry
           .get(earnSelectionTokenOptionsViewAtom)
           .items.map(({ amount, source, token }) => ({
-            amount,
+            amount: amount?.toFixed(),
             source,
             symbol: token.symbol,
           }))
@@ -1188,7 +1199,7 @@ describe("Earn Selection", () => {
       getProvider?: YieldResourceSource["Service"]["getProvider"]
     ) =>
       makeRegistry({
-        getProvider,
+        ...(getProvider === undefined ? {} : { getProvider }),
         listYields: () =>
           Effect.succeed({
             items: [yieldModel],
diff --git a/packages/widget/tests/features/earn/history-chart-points.test.ts b/packages/widget/tests/features/earn/history-chart-points.test.ts
index f05d0eda9..37b220092 100644
--- a/packages/widget/tests/features/earn/history-chart-points.test.ts
+++ b/packages/widget/tests/features/earn/history-chart-points.test.ts
@@ -23,7 +23,6 @@ describe("history chart adapters", () => {
     const tvlPoint = toTvlHistoryChartPoint({
       timestamp,
       tvl,
-      tvlRaw: "9007199254740993250000000000000000",
     });
     const rewardPoint = toRewardRateHistoryChartPoint({
       timestamp,
diff --git a/packages/widget/tests/features/earn/validator-selection-limit.test.ts b/packages/widget/tests/features/earn/validator-selection-limit.test.ts
index 958499db0..f611d22d5 100644
--- a/packages/widget/tests/features/earn/validator-selection-limit.test.ts
+++ b/packages/widget/tests/features/earn/validator-selection-limit.test.ts
@@ -82,7 +82,7 @@ describe("Validator selection limit", () => {
 
     const next = togglePendingActionValidator({
       store,
-      validator: validators[SUBSTRATE_LIMIT]!.address,
+      validator: validators[SUBSTRATE_LIMIT]!,
     });
 
     expect(next.state.selectedValidators.size).toBe(SUBSTRATE_LIMIT);
diff --git a/packages/widget/tests/features/mount-animation/mount-animation.test.ts b/packages/widget/tests/features/mount-animation/mount-animation.test.ts
index 8547962f5..ff33d3644 100644
--- a/packages/widget/tests/features/mount-animation/mount-animation.test.ts
+++ b/packages/widget/tests/features/mount-animation/mount-animation.test.ts
@@ -14,7 +14,9 @@ const makeWidgetConfig = (
   apiKey: "api-key",
   dashboardVariant,
   disableInitLayoutAnimation: false,
-  onMountAnimationComplete,
+  ...(onMountAnimationComplete === undefined
+    ? {}
+    : { onMountAnimationComplete }),
   variant: "default" as const,
 });
 
diff --git a/packages/widget/tests/features/portfolio/positions-list-item.browser.test.tsx b/packages/widget/tests/features/portfolio/positions-list-item.browser.test.tsx
index a25af52f3..f37feb377 100644
--- a/packages/widget/tests/features/portfolio/positions-list-item.browser.test.tsx
+++ b/packages/widget/tests/features/portfolio/positions-list-item.browser.test.tsx
@@ -5,6 +5,7 @@ import { createMemoryRouter, RouterProvider } from "react-router";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { exactDecimal } from "../../../src/domain/finance/exact";
 import type { YieldId } from "../../../src/domain/identity/identifiers";
+import type { InactiveValidatorStatus } from "../../../src/features/portfolio/state/read-models/position-list-item";
 import type { PositionItem } from "../../../src/features/portfolio/state/read-models/positions";
 import { PositionsListItem as CompactPositionsListItem } from "../../../src/features/portfolio/ui/compact/positions-page/components/positions-list-item";
 import { PositionsListItem as DashboardPositionsListItem } from "../../../src/features/portfolio/ui/dashboard/positions/components/positions-list-item";
@@ -33,7 +34,7 @@ const i18nInstance = createWidgetI18nInstance();
 type RowDetails = {
   readonly integrationData: unknown;
   readonly providersDetails: unknown;
-  readonly inactiveValidator: string | null;
+  readonly inactiveValidator: InactiveValidatorStatus | null;
   readonly rewardRateAverage: string | null;
   readonly totalAmountFormatted: string | null;
   readonly totalAmountUsd: BigNumber | null;
@@ -78,13 +79,12 @@ const createItem = (
   integrationId: integrationData.id as YieldId,
   balancesWithAmount: [],
   allBalances: [],
-  balanceId: "balance-1",
+  balanceId: "default",
   actionRequired: false,
   hasPendingRequest: false,
   pointsRewardTokenBalances: [],
   hasPendingClaimRewards: false,
   token: integrationData.token,
-  yieldLabelDto: null,
   type: "default",
   ...overrides,
 });
@@ -169,7 +169,7 @@ describe("Earn position list item", () => {
       },
       {
         expected: "Inactive",
-        inactiveValidator: "inactive",
+        inactiveValidator: "other",
         item: { hasPendingClaimRewards: true },
       },
       {
@@ -182,7 +182,7 @@ describe("Earn position list item", () => {
         inactiveValidator: null,
         item: { hasPendingRequest: true },
       },
-    ])(
+    ] as const)(
       "shows the $expected badge first",
       async ({ expected, inactiveValidator, item }) => {
         hookState.details = createDetails({ inactiveValidator });
@@ -219,7 +219,7 @@ describe("Earn position list item", () => {
     const dashboard = await renderRow(presentations[1].row(createItem()));
 
     await expect.element(dashboard.getByText("4.2%")).toBeInTheDocument();
-    dashboard.unmount();
+    await dashboard.unmount();
 
     const compact = await renderRow(presentations[0].row(createItem()));
 
@@ -236,7 +236,7 @@ describe("Earn position list item", () => {
     await expect
       .element(dashboard.getByText("-", { exact: true }))
       .toBeInTheDocument();
-    dashboard.unmount();
+    await dashboard.unmount();
 
     const compact = await renderRow(presentations[0].row(createItem()));
 
@@ -257,19 +257,23 @@ describe("Earn position list item", () => {
       hookState.details = createDetails();
       const startViewTransition = vi
         .spyOn(document, "startViewTransition")
-        .mockImplementation((update) => {
-          const done = Promise.resolve(
-            typeof update === "function" ? update() : update?.update?.()
-          );
-
-          return {
-            finished: done,
-            ready: done,
-            skipTransition: () => undefined,
-            types: new Set(),
-            updateCallbackDone: done,
-          } as unknown as ViewTransition;
-        });
+        .mockImplementation(
+          (
+            update?: ViewTransitionUpdateCallback | StartViewTransitionOptions
+          ) => {
+            const done = Promise.resolve(
+              typeof update === "function" ? update() : update?.update?.()
+            );
+
+            return {
+              finished: done,
+              ready: done,
+              skipTransition: () => undefined,
+              types: new Set(),
+              updateCallbackDone: done,
+            } as unknown as ViewTransition;
+          }
+        );
 
       const app = await renderRow(presentation.row(createItem()));
       const link = app.getByRole("link");
diff --git a/packages/widget/tests/features/position-details/page-workflow-state.dom.test.tsx b/packages/widget/tests/features/position-details/page-workflow-state.dom.test.tsx
index 7c34b6785..fabb5a133 100644
--- a/packages/widget/tests/features/position-details/page-workflow-state.dom.test.tsx
+++ b/packages/widget/tests/features/position-details/page-workflow-state.dom.test.tsx
@@ -24,7 +24,7 @@ const settings = {
 
 const positionWorkflowAtom = positionDetailsWorkflowAtom(
   new PositionDetailsWorkflowKey({
-    balanceId: "balance-1",
+    balanceId: "default",
     integrationId: Schema.decodeSync(YieldId)("yield-1"),
     pendingActionType: null,
     scope: new WalletScopeKey({
diff --git a/packages/widget/tests/features/position-details/position-details-action-model.test.ts b/packages/widget/tests/features/position-details/position-details-action-model.test.ts
index d28e84b4b..04e18ce98 100644
--- a/packages/widget/tests/features/position-details/position-details-action-model.test.ts
+++ b/packages/widget/tests/features/position-details/position-details-action-model.test.ts
@@ -8,21 +8,26 @@ import {
   PendingActionStateKey,
   preparePendingActionCommand,
 } from "../../../src/domain/action/action-command";
-import { EarnBalance } from "../../../src/domain/earn/models";
+import { EarnBalance, EarnValidator } from "../../../src/domain/earn/models";
 import { Prices } from "../../../src/domain/health/models";
 import {
   TokenAddress,
   WalletAddress,
 } from "../../../src/domain/identity/identifiers";
-import { toPositionBalancesByType } from "../../../src/domain/portfolio/positions";
+import {
+  type BalanceDataKey,
+  toPositionBalancesByType,
+} from "../../../src/domain/portfolio/positions";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
 import { resolvePositionDetailsExitReceiveTokenSelection } from "../../../src/features/position-details/model/exit-receive-token";
 import {
+  getPendingActionValidatorAddresses,
   makeAutomaticPendingActionModalState,
   makePendingActionModalStore,
   openPendingActionModal,
   reconcilePendingActionModalReceipt,
   resolvePositionDetailsExitSubmission,
+  togglePendingActionValidator,
 } from "../../../src/features/position-details/model/flow-actions";
 import { resolvePositionDetailsActionCapabilities } from "../../../src/features/position-details/model/hub";
 import {
@@ -352,6 +357,69 @@ describe("Position Details action model", () => {
     ).toBe("Open");
   });
 
+  it("selects subnet validators by key and submits their addresses", () => {
+    const nominate = Schema.decodeSync(EarnBalance)(
+      yieldBalanceFixture({
+        pendingActions: [
+          {
+            arguments: {
+              fields: [
+                {
+                  label: "Validators",
+                  name: "validatorAddresses",
+                  required: true,
+                  type: "string",
+                },
+              ],
+            },
+            intent: "manage",
+            passthrough: "delegate",
+            type: "DELEGATE",
+          },
+        ],
+        token: selectedYield.token,
+      })
+    );
+    const [subnetA, subnetB] = [7, 8].map((id) =>
+      Schema.decodeSync(EarnValidator)(
+        yieldApiValidatorFixture({
+          address: "validator-subnet",
+          subnet: { id, name: `Subnet ${id}` },
+        })
+      )
+    );
+    if (!subnetA || !subnetB) throw new Error("Expected subnet validators");
+
+    const opened = openPendingActionModal({
+      input: {
+        pendingAction: nominate.pendingActions[0]!,
+        yieldBalance: nominate,
+      },
+      store: makePendingActionModalStore(),
+    });
+    const both = togglePendingActionValidator({
+      store: togglePendingActionValidator({
+        store: opened,
+        validator: subnetA,
+      }),
+      validator: subnetB,
+    });
+    const onlyB = togglePendingActionValidator({
+      store: both,
+      validator: subnetA,
+    });
+
+    expect(opened.state.multiSelect).toBe(true);
+    expect([...both.state.selectedValidators.keys()]).toEqual([
+      subnetA.key,
+      subnetB.key,
+    ]);
+    expect([...onlyB.state.selectedValidators.keys()]).toEqual([subnetB.key]);
+    expect(getPendingActionValidatorAddresses(onlyB.state)).toEqual([
+      subnetB.address,
+    ]);
+  });
+
   it("does not apply an automatic receipt to a different pending action", () => {
     const first = makeAutomaticPendingActionModalState({
       pendingAction,
@@ -443,7 +511,7 @@ describe("Position Details action model", () => {
       network: "ethereum",
     });
     const workflowKey = new PositionDetailsWorkflowKey({
-      balanceId: "collision-balance",
+      balanceId: "default",
       integrationId: selectedYield.id,
       pendingActionType: null,
       scope,
@@ -560,7 +628,7 @@ describe("Position Details action model", () => {
         })
       );
 
-    const singleToken = readWorkflowView("single-token", [
+    const singleToken = readWorkflowView("default", [
       active("1.25"),
       active("0.75"),
     ]);
@@ -575,7 +643,7 @@ describe("Position Details action model", () => {
       }).canUnstake
     ).toBe(true);
 
-    const twoTokens = readWorkflowView("two-tokens", [
+    const twoTokens = readWorkflowView("default", [
       active("1.25"),
       active("10", usdt),
     ]);
@@ -633,7 +701,7 @@ describe("Position Details action model", () => {
     const priceKey = (token: { network: string; address?: string }) =>
       `${token.network}-${token.address?.toLowerCase() ?? ""}`;
     const { registry, workflowKey } = makeWorkflowRegistry(
-      "valuation",
+      "default",
       [activeBalance, claimableBalance],
       new Prices(
         new Map([
@@ -661,7 +729,7 @@ describe("Position Details action model", () => {
   it("withdraws a confidential position in its revealed vault shares, valued in the underlying", () => {
     const { cShare, usdc } = confidentialFixture;
     const view = readWorkflowView(
-      "confidential-shares",
+      "default",
       [
         Schema.decodeSync(EarnBalance)(
           yieldBalanceFixture({
@@ -689,7 +757,7 @@ describe("Position Details action model", () => {
   it("keeps withdrawing available while the share balance is hidden, so the user can decrypt it there", () => {
     const { cShare, usdc } = confidentialFixture;
     const view = readWorkflowView(
-      "confidential-hidden",
+      "default",
       [
         Schema.decodeSync(EarnBalance)(
           yieldBalanceFixture({
@@ -841,7 +909,7 @@ describe("Position Details action model", () => {
 });
 
 const makeWorkflowRegistry = (
-  balanceId: string,
+  balanceId: BalanceDataKey,
   balances: ReadonlyArray<EarnBalance>,
   prices: Prices = new Prices(new Map()),
   integration: typeof selectedYield = selectedYield
@@ -890,7 +958,7 @@ const makeWorkflowRegistry = (
 };
 
 const readWorkflowView = (
-  balanceId: string,
+  balanceId: BalanceDataKey,
   balances: ReadonlyArray<EarnBalance>,
   integration: typeof selectedYield = selectedYield
 ) => {
diff --git a/packages/widget/tests/features/position-details/position-details-action-tabs.browser.test.tsx b/packages/widget/tests/features/position-details/position-details-action-tabs.browser.test.tsx
index dfb3f0133..6efc029c3 100644
--- a/packages/widget/tests/features/position-details/position-details-action-tabs.browser.test.tsx
+++ b/packages/widget/tests/features/position-details/position-details-action-tabs.browser.test.tsx
@@ -77,25 +77,22 @@ describe("position details action tabs", () => {
   it("registers the earn CTA only for the earn index", () => {
     expect(shouldRegisterDashboardEarnFooterButton("/")).toBe(true);
     expect(
-      shouldRegisterDashboardEarnFooterButton("/positions/yield-1/balance-1")
+      shouldRegisterDashboardEarnFooterButton("/positions/yield-1/default")
     ).toBe(false);
     expect(
       shouldRegisterDashboardEarnFooterButton(
-        "/positions/yield-1/balance-1/stake"
+        "/positions/yield-1/default/stake"
       )
     ).toBe(false);
     expect(
       shouldRegisterDashboardEarnFooterButton(
-        "/positions/yield-1/balance-1/stake/review"
+        "/positions/yield-1/default/stake/review"
       )
     ).toBe(false);
   });
 
   it("switches Unstake and Stake tabs without changing the URL", async () => {
-    const app = await renderTabs([
-      "/positions",
-      "/positions/yield-1/balance-1",
-    ]);
+    const app = await renderTabs(["/positions", "/positions/yield-1/default"]);
 
     await expect
       .element(app.getByTestId("position-details-action-tab-unstake"))
@@ -108,7 +105,7 @@ describe("position details action tabs", () => {
       .toHaveTextContent("unstake");
     await expect
       .element(app.getByTestId("location"))
-      .toHaveTextContent("/positions/yield-1/balance-1");
+      .toHaveTextContent("/positions/yield-1/default");
 
     await userEvent.click(app.getByTestId("position-details-action-tab-stake"));
 
@@ -117,7 +114,7 @@ describe("position details action tabs", () => {
       .toHaveTextContent("stake");
     await expect
       .element(app.getByTestId("location"))
-      .toHaveTextContent("/positions/yield-1/balance-1");
+      .toHaveTextContent("/positions/yield-1/default");
   });
 
   it("names the tabs Withdraw and Deposit for a vault", async () => {
@@ -140,7 +137,7 @@ describe("position details action tabs", () => {
   it("does not render a selector when there is only one available action", async () => {
     const app = await render(
       <I18nextProvider i18n={i18nInstance}>
-        <MemoryRouter initialEntries={["/positions/yield-1/balance-1"]}>
+        <MemoryRouter initialEntries={["/positions/yield-1/default"]}>
           <Routes>
             <Route
               path="positions/:integrationId/:balanceId"
diff --git a/packages/widget/tests/features/position-details/position-details-exit-command.test.ts b/packages/widget/tests/features/position-details/position-details-exit-command.test.ts
index 8cbfe79e6..d391467e1 100644
--- a/packages/widget/tests/features/position-details/position-details-exit-command.test.ts
+++ b/packages/widget/tests/features/position-details/position-details-exit-command.test.ts
@@ -56,7 +56,10 @@ import {
   yieldApiYieldFixture,
   yieldBalanceFixture,
 } from "../../fixtures";
-import { makeTestTracking } from "../../utils/services/tracking-service";
+import {
+  makeTestTracking,
+  type TestTrackingOptions,
+} from "../../utils/services/tracking-service";
 import { makeTestNavigation } from "../../utils/services/widget-navigation";
 import { makeYieldFlowTestKit } from "../../utils/yield-flow-test-kit";
 
@@ -252,7 +255,7 @@ const manageBalance = Schema.decodeSync(EarnBalance)(
 );
 const manageAction = manageBalance.pendingActions[0]!;
 const workflowKey = new PositionDetailsWorkflowKey({
-  balanceId: "balance-1",
+  balanceId: "default",
   integrationId: selectedYield.id,
   pendingActionType: null,
   scope,
@@ -262,8 +265,8 @@ const positionKey = new PositionBalancesKey({
   scope,
   yieldId: selectedYield.id,
 });
-const exitReviewPath = `/positions/${selectedYield.id}/balance-1/unstake/review`;
-const manageReviewPath = `/positions/${selectedYield.id}/balance-1/pending-action/review`;
+const exitReviewPath = `/positions/${selectedYield.id}/default/unstake/review`;
+const manageReviewPath = `/positions/${selectedYield.id}/default/pending-action/review`;
 
 const makeConnectedWallet = (
   overrides: Partial<
@@ -293,7 +296,7 @@ const makeRegistry = ({
 }: {
   readonly push: Mock<Push>;
   readonly serviceWallet?: NormalizedWalletState;
-  readonly trackEvent: TrackingService["Service"]["trackEvent"];
+  readonly trackEvent: NonNullable<TestTrackingOptions["trackEvent"]>;
   readonly wallet?: NormalizedWalletState;
   readonly yieldBalance?: EarnBalance;
   readonly yieldOpportunity?: typeof selectedYield;
diff --git a/packages/widget/tests/features/position-details/position-details-stake-token.test.ts b/packages/widget/tests/features/position-details/position-details-stake-token.test.ts
index 5f4260a83..23fa0b320 100644
--- a/packages/widget/tests/features/position-details/position-details-stake-token.test.ts
+++ b/packages/widget/tests/features/position-details/position-details-stake-token.test.ts
@@ -68,7 +68,7 @@ const addTokenBalanceAtom = appRuntime.fn(
 const makeRegistry = (selectedYield: EarnYield) => {
   const reveals: Array<{ chainId: number; owner: string; token: string }> = [];
   const entryKey = new PositionDetailsStakeEntryKey({
-    balanceId: "balance-1",
+    balanceId: "default",
     integrationId: selectedYield.id,
     walletScope,
   });
diff --git a/packages/widget/tests/features/position-details/position-details-stake-validators.test.ts b/packages/widget/tests/features/position-details/position-details-stake-validators.test.ts
index 4ab4b95f6..151741562 100644
--- a/packages/widget/tests/features/position-details/position-details-stake-validators.test.ts
+++ b/packages/widget/tests/features/position-details/position-details-stake-validators.test.ts
@@ -48,7 +48,7 @@ const positionValidator = yieldApiValidatorFixture({
   name: "Position validator",
 });
 const entryKey = new PositionDetailsStakeEntryKey({
-  balanceId: "balance-1",
+  balanceId: "default",
   integrationId: validatorYield.id,
   walletScope,
 });
diff --git a/packages/widget/tests/features/position-details/position-details-workflow.test.ts b/packages/widget/tests/features/position-details/position-details-workflow.test.ts
index 2e34baa6c..1fef2054c 100644
--- a/packages/widget/tests/features/position-details/position-details-workflow.test.ts
+++ b/packages/widget/tests/features/position-details/position-details-workflow.test.ts
@@ -29,7 +29,7 @@ const scopeB = new WalletScopeKey({
 
 const workflowAtom = positionDetailsWorkflowAtom(
   new PositionDetailsWorkflowKey({
-    balanceId: "balance-1",
+    balanceId: "default",
     integrationId: Schema.decodeSync(YieldId)("yield-1"),
     pendingActionType: null,
     scope: scopeA,
@@ -76,7 +76,7 @@ describe("position details workflow atoms", () => {
     );
     const walletBWorkflow = positionDetailsWorkflowAtom(
       new PositionDetailsWorkflowKey({
-        balanceId: "balance-1",
+        balanceId: "default",
         integrationId: Schema.decodeSync(YieldId)("yield-1"),
         pendingActionType: null,
         scope: scopeB,
diff --git a/packages/widget/tests/features/position-details/position-details-yield-entry.browser.test.tsx b/packages/widget/tests/features/position-details/position-details-yield-entry.browser.test.tsx
index 5234928d4..69d5caed3 100644
--- a/packages/widget/tests/features/position-details/position-details-yield-entry.browser.test.tsx
+++ b/packages/widget/tests/features/position-details/position-details-yield-entry.browser.test.tsx
@@ -64,7 +64,7 @@ const walletScope = new WalletScopeKey({
 });
 const selectedYield = yieldApiYieldFixture();
 const entryKey = new PositionDetailsStakeEntryKey({
-  balanceId: "balance-1",
+  balanceId: "default",
   integrationId: selectedYield.id,
   walletScope,
 });
@@ -155,7 +155,7 @@ const ReviewGuard = () => {
       intake._tag === "Enter" &&
       intake.selectedStake.id === selectedYield.id &&
       mount._tag === "PositionStake" &&
-      mount.balanceId === "balance-1"
+      mount.balanceId === "default"
   );
   return carriesPositionStake ? (
     <div>Position stake review</div>
@@ -170,11 +170,11 @@ const Runtime = () => {
       <NavigationBridge />
       <Routes>
         <Route
-          path={`/positions/${selectedYield.id}/balance-1`}
+          path={`/positions/${selectedYield.id}/default`}
           element={<PositionEntry />}
         />
         <Route
-          path={`/positions/${selectedYield.id}/balance-1/stake/review`}
+          path={`/positions/${selectedYield.id}/default/stake/review`}
           element={<ReviewGuard />}
         />
         <Route path="/missing" element={<div>Missing Flow Session</div>} />
@@ -207,7 +207,7 @@ const TestApp = () => {
           applicationBaseRuntime.layer,
           Layer.merge(
             ApplicationRouter.layer(applicationRoutes, {
-              initialEntries: [`/positions/${selectedYield.id}/balance-1`],
+              initialEntries: [`/positions/${selectedYield.id}/default`],
             }),
             WidgetConfigService.layer({
               apiKey: "test",
diff --git a/packages/widget/tests/features/position-details/position-overview-model.test.tsx b/packages/widget/tests/features/position-details/position-overview-model.test.tsx
index b20f0e017..697f916e5 100644
--- a/packages/widget/tests/features/position-details/position-overview-model.test.tsx
+++ b/packages/widget/tests/features/position-details/position-overview-model.test.tsx
@@ -2,9 +2,11 @@ import BigNumber from "bignumber.js";
 import { DateTime, Schema } from "effect";
 import type { TFunction } from "i18next";
 import { describe, expect, it } from "vitest";
-import { ConfidentialHandle } from "../../../src/domain/earn/confidential";
-import type { EarnYieldWithProvider } from "../../../src/domain/earn/models";
-import { EarnBalance } from "../../../src/domain/earn/models";
+import {
+  ConfidentialHandle,
+  EarnBalance,
+  type EarnYieldWithProvider,
+} from "../../../src/domain/earn/models";
 import { TokenAddress } from "../../../src/domain/identity/identifiers";
 import { RewardsSummary } from "../../../src/domain/portfolio/models";
 import type { PositionBalancesByType } from "../../../src/domain/portfolio/positions";
@@ -170,7 +172,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: yieldRewardRateFixture({ total: 0.025 }),
       positionBalancesByType: makePositionBalances(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -238,7 +239,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -310,7 +310,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -376,7 +375,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -433,7 +431,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -484,7 +481,12 @@ describe("getPositionOverviewModel", () => {
             // A revealed balance keeps the handle it was decrypted from.
             {
               ...balance({ amount: "1", amountUsd: "1", type: "exiting" }),
-              revealedHandle: cancelling,
+              shares: {
+                _tag: "Revealed",
+                amount: new BigNumber("1"),
+                amountRaw: 1_000_000n,
+                handle: cancelling,
+              },
             },
             balance({
               amount: "2",
@@ -498,7 +500,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -527,7 +528,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: makePositionBalances(),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -570,7 +570,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -609,7 +608,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: makePositionBalances(),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
     const facts = new Map(
@@ -676,7 +674,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -739,7 +736,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -773,7 +769,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -816,7 +811,6 @@ describe("getPositionOverviewModel", () => {
         personalizedRewardRate: null,
         positionBalancesByType: new Map(),
         providersDetails: [{ name: "Rocket Pool", status: "active" }],
-        rewardsSummary: undefined,
         t: t as TFunction,
       });
 
@@ -858,7 +852,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -895,7 +888,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -925,7 +917,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -978,7 +969,6 @@ describe("getPositionOverviewModel", () => {
         ],
       ]),
       providersDetails: [],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -1007,7 +997,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -1050,7 +1039,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType,
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -1080,13 +1068,7 @@ describe("getPositionOverviewModel", () => {
       positionBalancesByType: makePositionBalances(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
       rewardsSummary: Schema.decodeSync(RewardsSummary)({
-        rewards: {
-          last24H: "0",
-          last30D: "0",
-          last7D: "0",
-          lastYear: "0",
-          total: "1.5",
-        },
+        rewards: { total: "1.5" },
         token: yieldApiYieldFixture().token,
       }),
       t: t as TFunction,
@@ -1136,7 +1118,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: makePositionBalances(),
       providersDetails: [{ name: "Rocket Pool", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -1167,8 +1148,7 @@ describe("getPositionOverviewModel", () => {
         },
         state: {
           pricePerShareState: {
-            price: 1.06274537,
-            quoteToken: baseYield.token,
+            price: new BigNumber("1.06274537"),
             shareToken: baseYield.token,
           },
         },
@@ -1184,7 +1164,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: makePositionBalances(),
       providersDetails: [{ name: "Midas", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
@@ -1203,8 +1182,7 @@ describe("getPositionOverviewModel", () => {
       integrationData: makeYield({
         state: {
           pricePerShareState: {
-            price: 1.06274537,
-            quoteToken: yieldApiYieldFixture().token,
+            price: new BigNumber("1.06274537"),
             shareToken: yieldApiYieldFixture().token,
           },
         },
@@ -1213,7 +1191,6 @@ describe("getPositionOverviewModel", () => {
       personalizedRewardRate: null,
       positionBalancesByType: new Map(),
       providersDetails: [{ name: "Midas", status: "active" }],
-      rewardsSummary: undefined,
       t: t as TFunction,
     });
 
diff --git a/packages/widget/tests/features/position-details/position-source-details.browser.test.tsx b/packages/widget/tests/features/position-details/position-source-details.browser.test.tsx
index 3a00e80f0..526096790 100644
--- a/packages/widget/tests/features/position-details/position-source-details.browser.test.tsx
+++ b/packages/widget/tests/features/position-details/position-source-details.browser.test.tsx
@@ -1,3 +1,4 @@
+import BigNumber from "bignumber.js";
 import { I18nextProvider } from "react-i18next";
 import { describe, expect, it } from "vitest";
 import { userEvent } from "vitest/browser";
@@ -31,8 +32,7 @@ const integration: EarnYieldWithProvider = {
   rewardRate: yieldRewardRateFixture({ total: 0.04 }),
   state: {
     pricePerShareState: {
-      price: 1.06274537,
-      quoteToken: baseYield.token,
+      price: new BigNumber("1.06274537"),
       shareToken: baseYield.token,
     },
   },
@@ -92,7 +92,7 @@ describe("Position source yield details", () => {
             ...integration,
             mechanics: {
               ...integration.mechanics,
-              fee: { management: "0.02" },
+              fee: { management: new BigNumber("0.02") },
             },
           }}
           showRewardRate={false}
diff --git a/packages/widget/tests/features/tracking/tracking-ingress.dom.test.tsx b/packages/widget/tests/features/tracking/tracking-ingress.dom.test.tsx
index b04788069..5dbf30e2b 100644
--- a/packages/widget/tests/features/tracking/tracking-ingress.dom.test.tsx
+++ b/packages/widget/tests/features/tracking/tracking-ingress.dom.test.tsx
@@ -22,20 +22,26 @@ describe("application tracking ingress", () => {
     );
     const hook = await renderHook(
       () => {
-        useTrackPage("earn", { source: "test" });
+        useTrackPage("positionDetails", { yield: "Test yield" });
         return useTrackEvent();
       },
       { wrapper }
     );
 
-    hook.result.current("txSigned", { txId: "transaction-1" });
+    hook.result.current("txSigned", {
+      network: "ethereum",
+      txId: "transaction-1",
+      yieldId: "ethereum-eth-lido-staking",
+    });
 
     await vi.waitFor(() => {
       expect(tracking.trackEvent).toHaveBeenCalledWith("Transaction signed", {
+        network: "ethereum",
         txId: "transaction-1",
+        yieldId: "ethereum-eth-lido-staking",
       });
-      expect(tracking.trackPageView).toHaveBeenCalledWith("Earn", {
-        source: "test",
+      expect(tracking.trackPageView).toHaveBeenCalledWith("Position details", {
+        yield: "Test yield",
       });
     });
   });
diff --git a/packages/widget/tests/features/wallet/external-provider-lifecycle.dom.test.tsx b/packages/widget/tests/features/wallet/external-provider-lifecycle.dom.test.tsx
index 55447eed2..a7cf6d01d 100644
--- a/packages/widget/tests/features/wallet/external-provider-lifecycle.dom.test.tsx
+++ b/packages/widget/tests/features/wallet/external-provider-lifecycle.dom.test.tsx
@@ -1,5 +1,5 @@
 import { useAtomValue } from "@effect/atom-react";
-import { Option } from "effect";
+import { Option, Struct } from "effect";
 import * as AsyncResult from "effect/reactivity/AsyncResult";
 import { HttpResponse, http } from "msw";
 import {
@@ -528,10 +528,11 @@ describe("external provider runtime generations", () => {
       );
     const withoutCurrentChain = (
       supportedChainIds: SKExternalProviders["supportedChainIds"]
-    ): SKExternalProviders => ({
-      ...externalProvider(firstAddress, mainnet.id, supportedChainIds),
-      currentChain: undefined,
-    });
+    ): SKExternalProviders =>
+      Struct.omit(
+        externalProvider(firstAddress, mainnet.id, supportedChainIds),
+        ["currentChain"]
+      );
 
     try {
       const mounted = await mountWallet(
@@ -562,21 +563,24 @@ describe("external provider runtime generations", () => {
     worker,
   }) => {
     worker.use(enabledNetworks);
-    const mounted = await mountWallet({
-      ...externalProvider(firstAddress, mainnet.id, [plasmaChainId]),
-      currentChain: undefined,
-    });
+    const mounted = await mountWallet(
+      Struct.omit(externalProvider(firstAddress, mainnet.id, [plasmaChainId]), [
+        "currentChain",
+      ])
+    );
 
     await waitForChainsEnabled(mounted, false);
     await waitForUnsupported(mounted);
 
-    await mounted.updateProvider({
-      ...externalProvider(firstAddress, mainnet.id, [
-        plasmaChainId,
-        optimism.id,
-      ]),
-      currentChain: undefined,
-    });
+    await mounted.updateProvider(
+      Struct.omit(
+        externalProvider(firstAddress, mainnet.id, [
+          plasmaChainId,
+          optimism.id,
+        ]),
+        ["currentChain"]
+      )
+    );
     await waitForIdentity(mounted, firstAddress, optimism.id);
     await waitForChainsEnabled(mounted, true);
   });
@@ -604,16 +608,18 @@ describe("external provider runtime generations", () => {
     worker,
   }) => {
     worker.use(enabledNetworks);
-    const mounted = await mountWallet({
-      ...externalProvider(firstAddress, mainnet.id),
-      supportedChainIds: undefined,
-    });
+    const mounted = await mountWallet(
+      Struct.omit(externalProvider(firstAddress, mainnet.id), [
+        "supportedChainIds",
+      ])
+    );
     await waitForIdentity(mounted, firstAddress, mainnet.id);
 
-    await mounted.updateProvider({
-      ...externalProvider(secondAddress, optimism.id),
-      supportedChainIds: undefined,
-    });
+    await mounted.updateProvider(
+      Struct.omit(externalProvider(secondAddress, optimism.id), [
+        "supportedChainIds",
+      ])
+    );
     await waitForIdentity(mounted, secondAddress, optimism.id);
   });
 
diff --git a/packages/widget/tests/features/wallet/sk-wallet.dom.test.tsx b/packages/widget/tests/features/wallet/sk-wallet.dom.test.tsx
index d2c2f7f64..cb5eee733 100644
--- a/packages/widget/tests/features/wallet/sk-wallet.dom.test.tsx
+++ b/packages/widget/tests/features/wallet/sk-wallet.dom.test.tsx
@@ -83,8 +83,12 @@ const waitForWalletConnection = (
       .toBe(true);
   });
 
-const solanaAddress = "9TCnDo7Txc5bC9SnE9iKsU5CyffLfeK4nrv1BFUmxkiJ";
-const tonAddress = "UQDyiNAyPy8QRQy45-SjxzrbKVOTOVyXaVGPZSLI9jxHF_Sy";
+const solanaAddress = Schema.decodeSync(WalletAddress)(
+  "9TCnDo7Txc5bC9SnE9iKsU5CyffLfeK4nrv1BFUmxkiJ"
+);
+const tonAddress = Schema.decodeSync(WalletAddress)(
+  "UQDyiNAyPy8QRQy45-SjxzrbKVOTOVyXaVGPZSLI9jxHF_Sy"
+);
 
 const createYieldTxMeta = ({
   address,
diff --git a/packages/widget/tests/features/wallet/wallet-scope-route.dom.test.tsx b/packages/widget/tests/features/wallet/wallet-scope-route.dom.test.tsx
index aadebfda6..252248d54 100644
--- a/packages/widget/tests/features/wallet/wallet-scope-route.dom.test.tsx
+++ b/packages/widget/tests/features/wallet/wallet-scope-route.dom.test.tsx
@@ -69,7 +69,7 @@ const TestRouter = ({
   replacement,
 }: {
   readonly initialState: NormalizedWalletState;
-  readonly replacement?: NormalizedWalletState;
+  readonly replacement?: NormalizedWalletState | undefined;
 }) => {
   const [walletState, setWalletState] = useState(initialState);
 
diff --git a/packages/widget/tests/features/yield-entry/yield-entry-input-token.test.ts b/packages/widget/tests/features/yield-entry/yield-entry-input-token.test.ts
index 7b66f48c6..141d11325 100644
--- a/packages/widget/tests/features/yield-entry/yield-entry-input-token.test.ts
+++ b/packages/widget/tests/features/yield-entry/yield-entry-input-token.test.ts
@@ -17,7 +17,6 @@ const projectEnter = (token: Token, availableAmount = new BigNumber("1")) => {
   const selectedYield = yieldApiYieldFixture();
   return projectYieldEntry({
     input: {
-      additionalValidationErrors: undefined,
       amountInitialization: "PreserveIntent",
       availableAmount,
       connected: true,
diff --git a/packages/widget/tests/features/yield-entry/yield-entry-submission.test.ts b/packages/widget/tests/features/yield-entry/yield-entry-submission.test.ts
index bf9145dc1..664e3a9c0 100644
--- a/packages/widget/tests/features/yield-entry/yield-entry-submission.test.ts
+++ b/packages/widget/tests/features/yield-entry/yield-entry-submission.test.ts
@@ -72,12 +72,14 @@ const makeSubmissionHarness = Effect.fn("makeSubmissionHarness")(function* (
   const closeChainCount = yield* Ref.make(0);
   const addLedgerAccount = options.addLedgerAccount;
   const wallet = yield* makeTestWallet({
-    addLedgerAccount: addLedgerAccount
-      ? (input) =>
-          Ref.update(ledgerRequests, (current) => [...current, input]).pipe(
-            Effect.andThen(addLedgerAccount(input))
-          )
-      : undefined,
+    ...(addLedgerAccount
+      ? {
+          addLedgerAccount: (input: AddLedgerAccountInput) =>
+            Ref.update(ledgerRequests, (current) => [...current, input]).pipe(
+              Effect.andThen(addLedgerAccount(input))
+            ),
+        }
+      : {}),
     initialState: options.initialWalletState,
   });
   const modal = stubWalletModal({
diff --git a/packages/widget/tests/features/yield-flow-confidential.test.ts b/packages/widget/tests/features/yield-flow-confidential.test.ts
index 041c82cea..f6da3d89a 100644
--- a/packages/widget/tests/features/yield-flow-confidential.test.ts
+++ b/packages/widget/tests/features/yield-flow-confidential.test.ts
@@ -16,9 +16,16 @@ import { Atom, AtomRegistry } from "effect/reactivity";
 import * as Reactivity from "effect/reactivity/Reactivity";
 import { appRuntime } from "../../src/app/runtime/app-runtime";
 import { walletRuntime } from "../../src/app/runtime/wallet-runtime";
-import type { DirectTransaction } from "../../src/domain/action/direct-transaction";
-import { ConfidentialHandle } from "../../src/domain/earn/confidential";
-import { WalletAddress, YieldId } from "../../src/domain/identity/identifiers";
+import {
+  type DirectTransaction,
+  DirectTransactionId,
+} from "../../src/domain/action/direct-transaction";
+import { ConfidentialHandle } from "../../src/domain/earn/models";
+import {
+  SignedTransactionPayload,
+  WalletAddress,
+  YieldId,
+} from "../../src/domain/identity/identifiers";
 import { Token } from "../../src/domain/token/token";
 import { WalletScopeKey } from "../../src/domain/wallet/wallet-scope";
 import {
@@ -41,7 +48,11 @@ import type { EvmRpc } from "../../src/services/evm-rpc/evm-rpc";
 import type { TransactionWorkflowHandle } from "../../src/services/transaction-workflow/transaction-workflow-service";
 import { WalletRequestCancelledError } from "../../src/services/wallet/wallet-errors";
 import type { WalletState } from "../../src/services/wallet/wallet-state";
-import type { WalletSignTransactionInput } from "../../src/services/wallet/wallet-transactions";
+import type {
+  WalletBroadcastResult,
+  WalletSignedPayloadResult,
+  WalletSignTransactionInput,
+} from "../../src/services/wallet/wallet-transactions";
 import type { ZamaService } from "../../src/services/zama/zama-service";
 import {
   confidentialFixture,
@@ -57,6 +68,10 @@ const address = Schema.decodeSync(WalletAddress)(
   "0x1234567890123456789012345678901234567890"
 );
 const walletScope = new WalletScopeKey({ address, network: "ethereum" });
+const signedPayload = {
+  broadcasted: false,
+  signedTx: SignedTransactionPayload.make("0x02aa"),
+} as const;
 
 const enterStart = (
   pick: "asset" | "underlying"
@@ -71,7 +86,10 @@ const enterStart = (
       providersDetails: [],
       request: {
         address,
-        arguments: { amount: "5", inputToken: token.address },
+        arguments: {
+          amount: "5",
+          ...(token.address === undefined ? {} : { inputToken: token.address }),
+        },
         yieldId: selectedStake.id,
       },
       selectedProviderOption: null,
@@ -110,7 +128,7 @@ const exitStart = (
     },
     mount: {
       _tag: "PositionExit",
-      balanceId: "b",
+      balanceId: "default",
       integrationId: Schema.decodeSync(YieldId)("i"),
     },
   };
@@ -140,7 +158,7 @@ const withdrawUnwrapStart = (): NavigatingYieldTransactionFlowStart => {
     },
     mount: {
       _tag: "PositionManage",
-      balanceId: "b",
+      balanceId: "default",
       integrationId: Schema.decodeSync(YieldId)("i"),
     },
   };
@@ -167,7 +185,7 @@ const direct = (type: DirectTransaction["type"]): DirectTransaction => ({
   approval: null,
   chainId: 11155111,
   data: "0x00",
-  id: `conversion-${type.toLowerCase()}`,
+  id: DirectTransactionId.make(`conversion-${type.toLowerCase()}`),
   network: "ethereum",
   to: cUsdc.address as `0x${string}`,
   type,
@@ -194,8 +212,7 @@ const depositAction = yieldApiActionFixture({
 const openConfidentialFlow = Effect.fn("test.openConfidentialFlow")(function* ({
   evmRpc = {},
   previewAction = () => Effect.succeed(depositAction),
-  signTransaction = () =>
-    Effect.succeed({ broadcasted: false, signedTx: "0x02aa" }),
+  signTransaction = () => Effect.succeed(signedPayload),
   start,
   zama = {},
 }: {
@@ -206,7 +223,7 @@ const openConfidentialFlow = Effect.fn("test.openConfidentialFlow")(function* ({
   readonly signTransaction?: (
     input: WalletSignTransactionInput
   ) => Effect.Effect<
-    { broadcasted: boolean; signedTx: string },
+    WalletBroadcastResult | WalletSignedPayloadResult,
     WalletRequestCancelledError
   >;
   readonly start: NavigatingYieldTransactionFlowStart;
@@ -302,7 +319,7 @@ const awaitState = (
 const signedIds =
   (signed: Array<string>) => (input: WalletSignTransactionInput) =>
     Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-      Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+      Effect.as(signedPayload)
     );
 
 const convertingRpc: Partial<EvmRpc["Service"]> = {
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-completion-urls.test.ts b/packages/widget/tests/features/yield-transaction-flow/yield-completion-urls.test.ts
index aa3086321..51770ff6f 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-completion-urls.test.ts
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-completion-urls.test.ts
@@ -2,7 +2,9 @@ import { describe, expect, it, vi } from "@effect/vitest";
 import { Effect, Fiber, Layer, Option, Schema, Stream } from "effect";
 import type { TransactionType } from "../../../src/domain/action/rules";
 import {
+  SignedTransactionPayload,
   WalletAddress,
+  WalletSignature,
   YieldId,
 } from "../../../src/domain/identity/identifiers";
 import { WalletScopeKey } from "../../../src/domain/wallet/wallet-scope";
@@ -42,9 +44,12 @@ const runYieldToCompletion = (
       const kit = yield* makeTransactionWorkflowTestKit({
         initialWalletState: makeConnectedWalletState(yieldWalletScope),
         wallet: {
-          signMessage: () => Effect.succeed("0xsigned"),
+          signMessage: () => Effect.succeed(WalletSignature.make("0xsigned")),
           signTransaction: () =>
-            Effect.succeed({ broadcasted: false, signedTx: "0xsigned" }),
+            Effect.succeed({
+              broadcasted: false,
+              signedTx: SignedTransactionPayload.make("0xsigned"),
+            }),
         },
         yieldOperations: {
           getTransactionStatus: () =>
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-flow-operations.test.ts b/packages/widget/tests/features/yield-transaction-flow/yield-flow-operations.test.ts
index 4b25b89bb..b0f1560b4 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-flow-operations.test.ts
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-flow-operations.test.ts
@@ -175,7 +175,7 @@ const exitStart = (): NavigatingYieldTransactionFlowStart => ({
   intake: makeExitIntake(),
   mount: {
     _tag: "PositionExit",
-    balanceId: "balance",
+    balanceId: "default",
     integrationId,
   },
 });
@@ -601,7 +601,7 @@ describe("handOffYieldFlowSource", () => {
         {
           _tag: "Push",
           to: {
-            path: "/positions/integration/balance/unstake/steps",
+            path: "/positions/integration/default/unstake/steps",
             state: { executionHandoff: handoff, yieldFlowSession: handle },
           },
         },
@@ -979,7 +979,7 @@ describe("leaveYieldFlowExecution", () => {
         intake: makeManageIntake(),
         mount: {
           _tag: "PositionManage",
-          balanceId: "balance",
+          balanceId: "default",
           integrationId,
         },
       }),
@@ -990,7 +990,7 @@ describe("leaveYieldFlowExecution", () => {
         intake: makeEnterIntake(),
         mount: {
           _tag: "PositionStake",
-          balanceId: "balance",
+          balanceId: "default",
           integrationId,
         },
       }),
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-flow-review-page.test.ts b/packages/widget/tests/features/yield-transaction-flow/yield-flow-review-page.test.ts
index b245d6989..17f50d408 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-flow-review-page.test.ts
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-flow-review-page.test.ts
@@ -255,7 +255,7 @@ describe("Yield flow Review page", () => {
                 intake: makeExitIntake(integration),
                 mount: {
                   _tag: "PositionExit",
-                  balanceId: "balance",
+                  balanceId: "default",
                   integrationId,
                 },
               },
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-flow-route.dom.test.tsx b/packages/widget/tests/features/yield-transaction-flow/yield-flow-route.dom.test.tsx
index b3f55bd95..6c7baf9a3 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-flow-route.dom.test.tsx
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-flow-route.dom.test.tsx
@@ -81,7 +81,7 @@ const makeExitSession = () => {
       },
       mount: {
         _tag: "PositionExit",
-        balanceId: "balance",
+        balanceId: "default",
         integrationId: Schema.decodeSync(YieldId)("yield"),
       },
     },
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-review-fees.browser.test.tsx b/packages/widget/tests/features/yield-transaction-flow/yield-review-fees.browser.test.tsx
index 22fab38ca..2357fbff7 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-review-fees.browser.test.tsx
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-review-fees.browser.test.tsx
@@ -82,7 +82,7 @@ const renderStakeReview = ({
       <TestWidgetConfigProvider
         apiKey="test-key"
         baseUrl="https://api.example.com"
-        hideGasFee={hideGasFee}
+        {...(hideGasFee === undefined ? {} : { hideGasFee })}
         variant="default"
       >
         <MemoryRouter>
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-steps-view.test.ts b/packages/widget/tests/features/yield-transaction-flow/yield-steps-view.test.ts
index 1a172bcb7..d1dd40da4 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-steps-view.test.ts
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-steps-view.test.ts
@@ -2,9 +2,11 @@ import { Schema } from "effect";
 import { describe, expect, it } from "vitest";
 import {
   type DirectTransaction,
+  DirectTransactionId,
   makeErc20Approval,
 } from "../../../src/domain/action/direct-transaction";
 import {
+  TransactionHash,
   TransactionWorkflowId,
   WalletAddress,
   YieldId,
@@ -44,19 +46,19 @@ const approval = {
 } as const;
 const reset = makeErc20Approval({
   ...approval,
-  id: "conversion-approval",
+  id: DirectTransactionId.make("conversion-approval"),
   type: "RESET_APPROVAL",
 });
 const approve = makeErc20Approval({
   ...approval,
-  id: "conversion-approval",
+  id: DirectTransactionId.make("conversion-approval"),
   type: "APPROVAL",
 });
 const wrap: DirectTransaction = {
   approval: null,
   chainId: 11155111,
   data: "0x00",
-  id: "conversion-wrap",
+  id: DirectTransactionId.make("conversion-wrap"),
   network: "ethereum",
   to: approval.spender,
   type: "WRAP",
@@ -152,8 +154,12 @@ describe("Yield Steps view", () => {
       makeInput([wrap]),
       new Map([
         [
-          "conversion-wrap",
-          { _tag: "Confirmed", hash: "0x01", transaction: wrap },
+          wrap.id,
+          {
+            _tag: "Confirmed",
+            hash: TransactionHash.make("0x01"),
+            transaction: wrap,
+          },
         ],
       ])
     );
@@ -205,7 +211,7 @@ describe("Yield Steps view", () => {
           batchId: "yield",
           message: "receipt unavailable",
           network: "ethereum",
-          transactionId: "conversion-wrap",
+          transactionId: wrap.id,
           workflowId: TransactionWorkflowId.make("w"),
         }),
       })
diff --git a/packages/widget/tests/features/yield-transaction-flow/yield-transaction-flow-interface.test.ts b/packages/widget/tests/features/yield-transaction-flow/yield-transaction-flow-interface.test.ts
index 0186f49a1..fc327cd06 100644
--- a/packages/widget/tests/features/yield-transaction-flow/yield-transaction-flow-interface.test.ts
+++ b/packages/widget/tests/features/yield-transaction-flow/yield-transaction-flow-interface.test.ts
@@ -187,49 +187,49 @@ const startCases: ReadonlyArray<
     stepsPath: "/steps",
   },
   {
-    completePath: "/positions/yield/balance/stake/complete",
+    completePath: "/positions/yield/default/stake/complete",
     finishPath: "/positions",
     makeCommand: () => ({
       intake: makeEnterIntake(),
       mount: {
         _tag: "PositionStake",
-        balanceId: "balance",
+        balanceId: "default",
         integrationId: Schema.decodeSync(YieldId)("yield"),
       },
     }),
     name: "position Stake",
-    reviewPath: "/positions/yield/balance/stake/review",
-    stepsPath: "/positions/yield/balance/stake/steps",
+    reviewPath: "/positions/yield/default/stake/review",
+    stepsPath: "/positions/yield/default/stake/steps",
   },
   {
-    completePath: "/positions/yield/balance/unstake/complete",
+    completePath: "/positions/yield/default/unstake/complete",
     finishPath: "/positions",
     makeCommand: () => ({
       intake: makeExitIntake(),
       mount: {
         _tag: "PositionExit",
-        balanceId: "balance",
+        balanceId: "default",
         integrationId: Schema.decodeSync(YieldId)("yield"),
       },
     }),
     name: "position Exit",
-    reviewPath: "/positions/yield/balance/unstake/review",
-    stepsPath: "/positions/yield/balance/unstake/steps",
+    reviewPath: "/positions/yield/default/unstake/review",
+    stepsPath: "/positions/yield/default/unstake/steps",
   },
   {
-    completePath: "/positions/yield/balance/pending-action/complete",
+    completePath: "/positions/yield/default/pending-action/complete",
     finishPath: "/positions",
     makeCommand: () => ({
       intake: makeManageIntake(),
       mount: {
         _tag: "PositionManage",
-        balanceId: "balance",
+        balanceId: "default",
         integrationId: Schema.decodeSync(YieldId)("yield"),
       },
     }),
     name: "position Manage",
-    reviewPath: "/positions/yield/balance/pending-action/review",
-    stepsPath: "/positions/yield/balance/pending-action/steps",
+    reviewPath: "/positions/yield/default/pending-action/review",
+    stepsPath: "/positions/yield/default/pending-action/steps",
   },
 ];
 
@@ -304,27 +304,27 @@ describe("Yield Flow route group", () => {
     ["/steps", "/"],
     ["/complete", "/"],
     ["/complete/", "/"],
-    ["/positions/yield/balance/stake/review", "/positions/yield/balance/stake"],
-    ["/positions/yield/balance/stake/steps", "/positions/yield/balance/stake"],
+    ["/positions/yield/default/stake/review", "/positions/yield/default/stake"],
+    ["/positions/yield/default/stake/steps", "/positions/yield/default/stake"],
     [
-      "/positions/yield/balance/stake/complete/",
-      "/positions/yield/balance/stake",
+      "/positions/yield/default/stake/complete/",
+      "/positions/yield/default/stake",
     ],
     [
-      "/positions/yield/balance/unstake/review",
-      "/positions/yield/balance/unstake",
+      "/positions/yield/default/unstake/review",
+      "/positions/yield/default/unstake",
     ],
     [
-      "/positions/yield/balance/unstake/complete",
-      "/positions/yield/balance/unstake",
+      "/positions/yield/default/unstake/complete",
+      "/positions/yield/default/unstake",
     ],
     [
-      "/positions/yield/balance/pending-action/steps",
-      "/positions/yield/balance/pending-action",
+      "/positions/yield/default/pending-action/steps",
+      "/positions/yield/default/pending-action",
     ],
     [
-      "/positions/yield/other/pending-action/steps",
-      "/positions/yield/other/pending-action",
+      "/positions/yield/validators/pending-action/steps",
+      "/positions/yield/validators/pending-action",
     ],
     ["/activity/action-1", "/activity/action-1"],
     ["/activity/action-1/", "/activity/action-1"],
@@ -338,7 +338,7 @@ describe("Yield Flow route group", () => {
   it.each([
     "/",
     "/positions",
-    "/positions/yield/balance",
+    "/positions/yield/default",
     "/activity",
     "/activity/",
     "/borrow/review",
@@ -351,11 +351,11 @@ describe("Yield Flow route group", () => {
       new Set(paths.map(getYieldFlowRouteGroup));
     const mounts = [
       "",
-      "/positions/yield/balance/stake",
-      "/positions/yield/balance/unstake",
-      "/positions/yield/balance/pending-action",
-      "/positions/yield/other/stake",
-      "/positions/yield/other/pending-action",
+      "/positions/yield/default/stake",
+      "/positions/yield/default/unstake",
+      "/positions/yield/default/pending-action",
+      "/positions/yield/validators/stake",
+      "/positions/yield/validators/pending-action",
     ];
 
     for (const base of mounts) {
diff --git a/packages/widget/tests/fixtures/index.ts b/packages/widget/tests/fixtures/index.ts
index 4ac249a39..5dc419fed 100644
--- a/packages/widget/tests/fixtures/index.ts
+++ b/packages/widget/tests/fixtures/index.ts
@@ -446,7 +446,7 @@ export const yieldApiActionFixture = (
   const intent = overrides?.intent ?? getYieldActionIntent(type);
   const { completedAt, createdAt, transactions, ...rest } = overrides ?? {};
 
-  return Schema.decodeSync(YieldAction)({
+  const action = Schema.decodeSync(YieldAction)({
     ...yieldApiActionDtoFixture(),
     ...rest,
     ...(completedAt === undefined
@@ -459,15 +459,11 @@ export const yieldApiActionFixture = (
       ? {}
       : { createdAt: DateTime.formatIso(createdAt) }),
     intent,
-    ...(transactions
-      ? {
-          transactions: transactions.map((transaction) =>
-            Schema.encodeSync(ActionTransaction)(transaction)
-          ),
-        }
-      : {}),
     type,
   });
+
+  // Overridden transactions are already decoded.
+  return transactions ? { ...action, transactions } : action;
 };
 
 const getYieldActionIntent = (type: YieldAction["type"]) => {
diff --git a/packages/widget/tests/services/api/api-retries.test.ts b/packages/widget/tests/services/api/api-retries.test.ts
index bbbb94fec..d2e82484f 100644
--- a/packages/widget/tests/services/api/api-retries.test.ts
+++ b/packages/widget/tests/services/api/api-retries.test.ts
@@ -1,8 +1,13 @@
 import { describe, expect, it } from "@effect/vitest";
 import { Context, Effect, Layer, Schema } from "effect";
 import { FetchHttpClient } from "effect/http";
-import { TransactionId as BorrowTransactionId } from "../../../src/domain/borrow/ids";
 import {
+  ActionId as BorrowActionId,
+  TransactionId as BorrowTransactionId,
+} from "../../../src/domain/borrow/ids";
+import {
+  SignedTransactionPayload,
+  TransactionHash,
   TransactionId,
   WalletAddress,
   YieldId,
@@ -31,6 +36,7 @@ const transactionId = Schema.decodeSync(TransactionId)("transaction-1");
 const borrowTransactionId = Schema.decodeSync(BorrowTransactionId)(
   "borrow-transaction-1"
 );
+const borrowActionId = Schema.decodeSync(BorrowActionId)("borrow-action");
 
 type ApiContext = Context.Context<
   | BorrowOperations
@@ -78,7 +84,7 @@ const writes: ReadonlyArray<ApiCall> = [
     name: "transaction hash submission",
     run: (context) =>
       Context.get(context, YieldOperations).submitTransactionHash({
-        payload: { hash: "0xhash" },
+        payload: { hash: TransactionHash.make("0xhash") },
         transactionId,
       }),
   },
@@ -86,7 +92,9 @@ const writes: ReadonlyArray<ApiCall> = [
     name: "signed transaction submission",
     run: (context) =>
       Context.get(context, YieldOperations).submitSignedTransaction({
-        payload: { signedTransaction: "0xsigned" },
+        payload: {
+          signedTransaction: SignedTransactionPayload.make("0xsigned"),
+        },
         transactionId,
       }),
   },
@@ -103,7 +111,7 @@ const writes: ReadonlyArray<ApiCall> = [
   {
     name: "Borrow action step",
     run: (context) =>
-      Context.get(context, BorrowOperations).stepAction("borrow-action"),
+      Context.get(context, BorrowOperations).stepAction(borrowActionId),
   },
   {
     name: "Borrow transaction submission",
@@ -145,7 +153,7 @@ const reads: ReadonlyArray<ApiCall> = [
   {
     name: "Borrow action lookup",
     run: (context) =>
-      Context.get(context, BorrowOperations).getAction("borrow-action"),
+      Context.get(context, BorrowOperations).getAction(borrowActionId),
   },
 ];
 
diff --git a/packages/widget/tests/services/api/api-service.test.ts b/packages/widget/tests/services/api/api-service.test.ts
index 8a2f01363..c32dcc32b 100644
--- a/packages/widget/tests/services/api/api-service.test.ts
+++ b/packages/widget/tests/services/api/api-service.test.ts
@@ -8,6 +8,7 @@ import { BorrowFeatureDisabled } from "../../../src/domain/borrow/availability";
 import { ActionId as BorrowActionId } from "../../../src/domain/borrow/ids";
 import {
   ActionId,
+  TransactionHash,
   TransactionId,
   WalletAddress,
   YieldId,
@@ -49,6 +50,7 @@ const config = {
   borrowApiUrl: "https://borrow.example.com",
   yieldsApiUrl: "https://yield.example.com",
 };
+const borrowActionId = Schema.decodeSync(BorrowActionId)("borrow-action");
 
 const address = Schema.decodeSync(WalletAddress)("0xWallet");
 const firstYieldId = Schema.decodeSync(YieldId)("ethereum-eth-native-staking");
@@ -107,7 +109,7 @@ describe("application API services", () => {
           MissingBorrowApiConfig
         );
         expect(
-          yield* Effect.flip(operations.getAction("borrow-action"))
+          yield* Effect.flip(operations.getAction(borrowActionId))
         ).toBeInstanceOf(MissingBorrowApiConfig);
       })
   );
@@ -156,7 +158,7 @@ describe("application API services", () => {
           { present: () => Effect.void } as never
         );
 
-        expect(yield* operations.getAction("borrow-action")).toBe(null);
+        expect(yield* operations.getAction(borrowActionId)).toBe(null);
         expect(getAction).toHaveBeenCalledWith("borrow-action", undefined);
       })
   );
@@ -174,7 +176,7 @@ describe("application API services", () => {
       );
 
       expect(
-        yield* Effect.flip(operations.getAction("borrow-action"))
+        yield* Effect.flip(operations.getAction(borrowActionId))
       ).toBeInstanceOf(BorrowFeatureDisabled);
       expect(getAction).not.toHaveBeenCalled();
     })
@@ -292,7 +294,7 @@ describe("application API services", () => {
           { present } as never
         );
         const command = {
-          payload: { hash: "0xhash" },
+          payload: { hash: TransactionHash.make("0xhash") },
           transactionId,
         };
 
@@ -363,7 +365,7 @@ describe("application API services", () => {
 
         expect(hidden).toMatchObject({
           isEncrypted: true,
-          shareAmountRaw: handle,
+          shares: { _tag: "Encrypted", handle },
         });
         expect(hidden?.amount.toFixed()).toBe("0");
       })
diff --git a/packages/widget/tests/services/config/widget-config-boundary.test.ts b/packages/widget/tests/services/config/widget-config-boundary.test.ts
index 5111da6b7..deb6c82c5 100644
--- a/packages/widget/tests/services/config/widget-config-boundary.test.ts
+++ b/packages/widget/tests/services/config/widget-config-boundary.test.ts
@@ -1,5 +1,6 @@
 import { Result } from "effect";
 import { describe, expect, it } from "vitest";
+import { ProviderId, YieldId } from "../../../src/domain/identity/identifiers";
 import type { SKHostConfiguration } from "../../../src/public-api/react-types";
 import type {
   SettingsProps,
@@ -289,7 +290,7 @@ describe("decodeHostConfiguration", () => {
           accent: 42,
           background: "#fff",
         },
-      } as unknown as SettingsProps["theme"],
+      } as unknown as NonNullable<SettingsProps["theme"]>,
       variant: "default",
     });
 
@@ -304,6 +305,211 @@ describe("decodeHostConfiguration", () => {
     }
   });
 
+  it("drops a validatorsConfig entry under an unknown network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      validatorsConfig: {
+        "*": { preferredOnly: true },
+        ethereum: { allowed: ["0xvalidator"] },
+        "not-a-network": { blocked: ["0xother"] },
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.validatorsConfig).toEqual({
+        "*": { preferredOnly: true },
+        ethereum: { allowed: ["0xvalidator"] },
+      });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "UnknownNetworkKey",
+          field: "validatorsConfig",
+          key: "not-a-network",
+        },
+      ]);
+    }
+  });
+
+  it("drops preferred token yields under an unknown network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      preferredTokenYieldsPerNetwork: {
+        ethereum: { "ethereum-": "*" },
+        "not-a-network": { "not-a-network-": "*" },
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(
+        result.success.configuration.preferredTokenYieldsPerNetwork
+      ).toEqual({ ethereum: { "ethereum-": "*" } });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "UnknownNetworkKey",
+          field: "preferredTokenYieldsPerNetwork",
+          key: "not-a-network",
+        },
+      ]);
+    }
+  });
+
+  it("decodes preferred token yields as yield IDs or the default choice, dropping an invalid one", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      preferredTokenYieldsPerNetwork: {
+        ethereum: {
+          "ethereum-": "ethereum-eth-lido-staking",
+          "ethereum-0xa": "*",
+          "ethereum-0xb": "",
+        },
+      },
+      variant: "default",
+    });
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(
+        result.success.configuration.preferredTokenYieldsPerNetwork
+      ).toEqual({
+        ethereum: {
+          "ethereum-": YieldId.make("ethereum-eth-lido-staking"),
+          "ethereum-0xa": "*",
+        },
+      });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "InvalidEntry",
+          field: "preferredTokenYieldsPerNetwork",
+          path: "ethereum.ethereum-0xb",
+        },
+      ]);
+    }
+  });
+
+  it("drops a null preferred token yield under a known network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      hideGasFee: true,
+      preferredTokenYieldsPerNetwork: {
+        ethereum: { "ethereum-": null, "ethereum-0xa": "*" },
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.hideGasFee).toBe(true);
+      expect(
+        result.success.configuration.preferredTokenYieldsPerNetwork
+      ).toEqual({ ethereum: { "ethereum-0xa": "*" } });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "InvalidEntry",
+          field: "preferredTokenYieldsPerNetwork",
+          path: "ethereum.ethereum-",
+        },
+      ]);
+    }
+  });
+
+  it("drops a non-string chainIconMapping value under an unknown network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      chainIconMapping: {
+        ethereum: "https://icons.example/ethereum.svg",
+        "not-a-network": 42,
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.chainIconMapping).toEqual({
+        ethereum: "https://icons.example/ethereum.svg",
+      });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "UnknownNetworkKey",
+          field: "chainIconMapping",
+          key: "not-a-network",
+        },
+      ]);
+    }
+  });
+
+  it("drops a malformed validatorsConfig policy under an unknown network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      validatorsConfig: {
+        ethereum: { preferredOnly: true },
+        "not-a-network": { allowed: "0xvalidator" },
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.validatorsConfig).toEqual({
+        ethereum: { preferredOnly: true },
+      });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "UnknownNetworkKey",
+          field: "validatorsConfig",
+          key: "not-a-network",
+        },
+      ]);
+    }
+  });
+
+  it("drops an invalid yieldProviderOrder provider ID and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      yieldProviderOrder: { defi: ["morpho", "", "aave"], stake: ["lido"] },
+      variant: "default",
+    });
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.yieldProviderOrder).toEqual({
+        defi: [ProviderId.make("morpho"), ProviderId.make("aave")],
+        stake: [ProviderId.make("lido")],
+      });
+      expect(result.success.warnings).toEqual([
+        { _tag: "InvalidEntry", field: "yieldProviderOrder", path: "defi.1" },
+      ]);
+    }
+  });
+
+  it("drops a chainIconMapping entry under an unknown network and keeps the rest", () => {
+    const result = decodeHostConfiguration({
+      apiKey: "api-key",
+      chainIconMapping: {
+        ethereum: "https://icons.example/ethereum.svg",
+        "not-a-network": "https://icons.example/other.svg",
+      },
+      variant: "default",
+    } as unknown as SKHostConfiguration);
+
+    expect(Result.isSuccess(result)).toBe(true);
+    if (Result.isSuccess(result)) {
+      expect(result.success.configuration.chainIconMapping).toEqual({
+        ethereum: "https://icons.example/ethereum.svg",
+      });
+      expect(result.success.warnings).toEqual([
+        {
+          _tag: "UnknownNetworkKey",
+          field: "chainIconMapping",
+          key: "not-a-network",
+        },
+      ]);
+    }
+  });
+
   it("rejects malformed value-shaped input with sanitized paths", () => {
     const result = decodeHostConfiguration({
       apiKey: "api-key",
diff --git a/packages/widget/tests/services/navigation/widget-routes.test.ts b/packages/widget/tests/services/navigation/widget-routes.test.ts
index facc593c7..6fae76691 100644
--- a/packages/widget/tests/services/navigation/widget-routes.test.ts
+++ b/packages/widget/tests/services/navigation/widget-routes.test.ts
@@ -1,6 +1,7 @@
 import { Option, Schema } from "effect";
 import { describe, expect, it } from "vitest";
 import { YieldId } from "../../../src/domain/identity/identifiers";
+import { BalanceDataKey } from "../../../src/domain/portfolio/positions";
 import {
   isWidgetPath,
   widgetRoutes,
@@ -10,12 +11,12 @@ import {
 describe("widget route registry", () => {
   it("round-trips params that need encoding", () => {
     const params = {
-      balanceId: "a/b c?%",
+      balanceId: Schema.decodeSync(BalanceDataKey)("validator::a/b c?%"),
       integrationId: Schema.decodeSync(YieldId)("eth-lido#1"),
     };
     const path = widgetRoutes.positionDetails.build(params);
 
-    expect(path).toBe("/positions/eth-lido%231/a%2Fb%20c%3F%25");
+    expect(path).toBe("/positions/eth-lido%231/validator%3A%3Aa%2Fb%20c%3F%25");
     expect(widgetRoutes.positionDetails.match(path)).toEqual(
       Option.some(params)
     );
@@ -32,6 +33,26 @@ describe("widget route registry", () => {
     ).toBe(true);
   });
 
+  it("decodes a position balance key and rejects one outside its grammar", () => {
+    const integrationId = Schema.decodeSync(YieldId)("yield-1");
+
+    expect(
+      widgetRoutes.positionDetails.match(
+        "/positions/yield-1/validator::val-1:7"
+      )
+    ).toEqual(Option.some({ balanceId: "validator::val-1:7", integrationId }));
+    expect(
+      widgetRoutes.positionDetails.match("/positions/yield-1/default")
+    ).toEqual(Option.some({ balanceId: "default", integrationId }));
+    for (const balanceId of ["balance-1", "validator::", "validator:val-1"]) {
+      expect(
+        Option.isNone(
+          widgetRoutes.positionDetails.match(`/positions/yield-1/${balanceId}`)
+        )
+      ).toBe(true);
+    }
+  });
+
   it("matches exactly, tolerating a trailing slash, or as a section prefix", () => {
     const route = widgetRoutes.positions;
 
@@ -49,11 +70,14 @@ describe("widget route registry", () => {
   it("keys a flow mount's Review, Steps, and Complete alike", () => {
     const flow = widgetYieldFlowRoutes.PositionExit;
     const params = {
-      balanceId: "balance-1",
+      balanceId: Schema.decodeSync(BalanceDataKey)("default"),
       integrationId: Schema.decodeSync(YieldId)("yield-1"),
     };
     const { completePath, reviewPath, stepsPath } = flow.at(params);
-    const other = flow.at({ ...params, balanceId: "balance-2" });
+    const other = flow.at({
+      ...params,
+      balanceId: Schema.decodeSync(BalanceDataKey)("validators"),
+    });
 
     const key = flow.mountKey(reviewPath);
     expect(key).toEqual(
@@ -66,4 +90,23 @@ describe("widget route registry", () => {
       Option.isNone(flow.mountKey(widgetRoutes.positionUnstake.build(params)))
     ).toBe(true);
   });
+
+  it("decodes a borrow position action key and rejects an unknown one", () => {
+    const route = widgetRoutes.borrowPositionAction;
+
+    expect(
+      route.match("/positions/borrow/market-1/action/repay-0xabc")
+    ).toEqual(Option.some({ actionId: "repay-0xabc", marketId: "market-1" }));
+    expect(
+      Option.isSome(route.match("/positions/borrow/market-1/action/withdraw"))
+    ).toBe(true);
+    expect(
+      Option.isNone(
+        route.match("/positions/borrow/market-1/action/borrow-0xabc")
+      )
+    ).toBe(true);
+    expect(
+      Option.isNone(route.match("/positions/borrow/market-1/action/repay-"))
+    ).toBe(true);
+  });
 });
diff --git a/packages/widget/tests/services/revealed-balances.test.ts b/packages/widget/tests/services/revealed-balances.test.ts
index 2735a5a64..1ed2e49cd 100644
--- a/packages/widget/tests/services/revealed-balances.test.ts
+++ b/packages/widget/tests/services/revealed-balances.test.ts
@@ -1,10 +1,12 @@
 import { describe, expect, it } from "@effect/vitest";
-import { Effect, HashMap, Option } from "effect";
+import { Effect, HashMap, Option, Schema } from "effect";
 import { ConfidentialTokenBalanceKey } from "../../src/domain/earn/confidential";
+import { WalletAddress } from "../../src/domain/identity/identifiers";
 import { RevealedBalances } from "../../src/services/zama/revealed-balances";
 import { confidentialYieldFixture } from "../fixtures";
 
 const token = confidentialYieldFixture().inputTokens[0]!;
+const decodeWalletAddress = Schema.decodeSync(WalletAddress);
 const checksummed = "0xAbCd000000000000000000000000000000000001";
 
 describe("RevealedBalances", () => {
@@ -14,11 +16,14 @@ describe("RevealedBalances", () => {
       Effect.gen(function* () {
         const values = yield* RevealedBalances;
         yield* values.addTokenBalance(
-          new ConfidentialTokenBalanceKey({ owner: checksummed, token }),
+          new ConfidentialTokenBalanceKey({
+            owner: decodeWalletAddress(checksummed),
+            token,
+          }),
           9n
         );
         const lowercased = new ConfidentialTokenBalanceKey({
-          owner: checksummed.toLowerCase(),
+          owner: decodeWalletAddress(checksummed.toLowerCase()),
           token,
         });
         const found = HashMap.get(
diff --git a/packages/widget/tests/services/semantic-invalidation.test.ts b/packages/widget/tests/services/semantic-invalidation.test.ts
index a51d69e31..a6084ddd4 100644
--- a/packages/widget/tests/services/semantic-invalidation.test.ts
+++ b/packages/widget/tests/services/semantic-invalidation.test.ts
@@ -277,13 +277,19 @@ describe("semantic resource invalidation", () => {
         yield* Effect.promise(() =>
           vi.waitFor(() => {
             expect(
-              AsyncResult.getOrThrow(registry.get(aTokens))[0]?.amount
+              AsyncResult.getOrThrow(
+                registry.get(aTokens)
+              )[0]?.amount?.toFixed()
             ).toBe("1");
             expect(
-              AsyncResult.getOrThrow(registry.get(bTokens))[0]?.amount
+              AsyncResult.getOrThrow(
+                registry.get(bTokens)
+              )[0]?.amount?.toFixed()
             ).toBe("2");
             expect(
-              AsyncResult.getOrThrow(registry.get(currentTokens))[0]?.amount
+              AsyncResult.getOrThrow(
+                registry.get(currentTokens)
+              )[0]?.amount?.toFixed()
             ).toBe("1");
             expect(positionCalls).toEqual(
               new Map([
@@ -308,7 +314,9 @@ describe("semantic resource invalidation", () => {
             expect(balanceCalls.get(sameWalletCachedScope.address)).toBe(4);
             expect(positionCalls.get(sameWalletCachedScope.address)).toBe(2);
             expect(
-              AsyncResult.getOrThrow(registry.get(currentTokens))[0]?.amount
+              AsyncResult.getOrThrow(
+                registry.get(currentTokens)
+              )[0]?.amount?.toFixed()
             ).toBe("10");
           })
         );
@@ -317,7 +325,9 @@ describe("semantic resource invalidation", () => {
         yield* Effect.promise(() =>
           vi.waitFor(() =>
             expect(
-              AsyncResult.getOrThrow(registry.get(aTokens))[0]?.amount
+              AsyncResult.getOrThrow(
+                registry.get(aTokens)
+              )[0]?.amount?.toFixed()
             ).toBe("10")
           )
         );
@@ -352,13 +362,7 @@ describe("semantic resource invalidation", () => {
             readonly offset: number;
             readonly yieldTypes?: ReadonlyArray<string>;
           }) => {
-            activityRequests.push({
-              address: request.address,
-              limit: request.limit,
-              network: request.network,
-              offset: request.offset,
-              yieldTypes: request.yieldTypes,
-            });
+            activityRequests.push(request);
             if (request.limit === 1) {
               return Effect.succeed({
                 items: [],
diff --git a/packages/widget/tests/services/tracking/tracking-service.test.ts b/packages/widget/tests/services/tracking/tracking-service.test.ts
index b6562253f..c75fd566c 100644
--- a/packages/widget/tests/services/tracking/tracking-service.test.ts
+++ b/packages/widget/tests/services/tracking/tracking-service.test.ts
@@ -18,6 +18,12 @@ vi.mock("../../../src/services/tracking/tracking-variants", () => ({
   },
 }));
 
+const transaction = (txId: string) => ({
+  network: "ethereum",
+  txId,
+  yieldId: "ethereum-eth-lido-staking",
+});
+
 describe("tracking service", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -44,26 +50,32 @@ describe("tracking service", () => {
         yield* TrackingService.use((tracking) =>
           Effect.gen(function* () {
             const config = yield* WidgetConfigService;
-            yield* tracking.trackEvent("txSigned", { txId: "first" });
+            yield* tracking.trackEvent("txSigned", transaction("first"));
             yield* config.update({
               apiKey: "test-api-key",
               tracking: { trackEvent: secondTrackEvent, trackPageView },
               variant: "default",
             });
-            yield* tracking.trackEvent("txSubmitted", { txId: "second" });
-            yield* tracking.trackPageView("earn", { source: "test" });
+            yield* tracking.trackEvent("txSubmitted", transaction("second"));
+            yield* tracking.trackPageView("positionDetails", {
+              yield: "Test yield",
+            });
           })
         ).pipe(Effect.provide(layer));
 
         expect(firstTrackEvent).toHaveBeenCalledOnce();
-        expect(firstTrackEvent).toHaveBeenCalledWith("Transaction signed", {
-          txId: "first",
-        });
+        expect(firstTrackEvent).toHaveBeenCalledWith(
+          "Transaction signed",
+          transaction("first")
+        );
         expect(secondTrackEvent).toHaveBeenCalledOnce();
-        expect(secondTrackEvent).toHaveBeenCalledWith("Transaction submitted", {
-          txId: "second",
+        expect(secondTrackEvent).toHaveBeenCalledWith(
+          "Transaction submitted",
+          transaction("second")
+        );
+        expect(trackPageView).toHaveBeenCalledWith("Position details", {
+          yield: "Test yield",
         });
-        expect(trackPageView).toHaveBeenCalledWith("Earn", { source: "test" });
       })
   );
 
@@ -80,8 +92,8 @@ describe("tracking service", () => {
 
       yield* TrackingService.use((tracking) =>
         Effect.all([
-          tracking.trackEvent("txSigned", { txId: "first" }),
-          tracking.trackEvent("txSubmitted", { txId: "second" }),
+          tracking.trackEvent("txSigned", transaction("first")),
+          tracking.trackEvent("txSubmitted", transaction("second")),
           tracking.trackPageView("positions"),
         ])
       ).pipe(Effect.provide(layer));
@@ -90,12 +102,12 @@ describe("tracking service", () => {
       expect(variantTracking.trackEvent).toHaveBeenNthCalledWith(
         1,
         "Transaction signed",
-        { txId: "first" }
+        transaction("first")
       );
       expect(variantTracking.trackEvent).toHaveBeenNthCalledWith(
         2,
         "Transaction submitted",
-        { txId: "second" }
+        transaction("second")
       );
       expect(variantTracking.trackPageView).toHaveBeenCalledWith("Positions");
     })
diff --git a/packages/widget/tests/services/transaction-workflow/confidential-transaction-workflow.test.ts b/packages/widget/tests/services/transaction-workflow/confidential-transaction-workflow.test.ts
index 73d0e2dfa..281ce70b6 100644
--- a/packages/widget/tests/services/transaction-workflow/confidential-transaction-workflow.test.ts
+++ b/packages/widget/tests/services/transaction-workflow/confidential-transaction-workflow.test.ts
@@ -15,15 +15,18 @@ import { TestClock } from "effect/testing";
 import { keccak256 } from "viem";
 import {
   type DirectTransaction,
+  DirectTransactionId,
   makeErc20Approval,
 } from "../../../src/domain/action/direct-transaction";
 import type { ActionTransaction } from "../../../src/domain/action/models";
+import { zeroEncryptedBalance } from "../../../src/domain/earn/confidential";
 import {
   ConfidentialHandle,
-  zeroEncryptedBalance,
-} from "../../../src/domain/earn/confidential";
-import { EarnPosition } from "../../../src/domain/earn/models";
+  EarnPosition,
+} from "../../../src/domain/earn/models";
 import {
+  SignedTransactionPayload,
+  TransactionHash,
   WalletAddress,
   YieldId,
 } from "../../../src/domain/identity/identifiers";
@@ -65,6 +68,10 @@ const address = Schema.decodeSync(WalletAddress)(
 );
 const yieldId = Schema.decodeSync(YieldId)("ethereum-sepolia-zama-vault");
 const walletScope = new WalletScopeKey({ address, network: "ethereum" });
+const signedPayload = {
+  broadcasted: false,
+  signedTx: SignedTransactionPayload.make("0x02aa"),
+} as const;
 
 const command = {
   action: "WITHDRAW",
@@ -101,7 +108,7 @@ const wrap: DirectTransaction = {
   approval: null,
   chainId: 11155111,
   data: "0xea598cb0",
-  id: "conversion-wrap",
+  id: DirectTransactionId.make("conversion-wrap"),
   network: "ethereum",
   to: "0x00000000000000000000000000000000000000c0",
   type: "WRAP",
@@ -117,12 +124,12 @@ const approval = {
 } as const;
 const approve = makeErc20Approval({
   ...approval,
-  id: "conversion-approval",
+  id: DirectTransactionId.make("conversion-approval"),
   type: "APPROVAL",
 });
 const reset = makeErc20Approval({
   ...approval,
-  id: "conversion-approval",
+  id: DirectTransactionId.make("conversion-approval"),
   type: "RESET_APPROVAL",
 });
 
@@ -145,8 +152,7 @@ const makeInput = ({
 
 const capabilities = ({
   evmRpc,
-  signTransaction = () =>
-    Effect.succeed({ broadcasted: false, signedTx: "0x02aa" }),
+  signTransaction = () => Effect.succeed(signedPayload),
   yieldOperations,
   zama = { decryptCommand: () => Effect.succeed(decryptedCommand) },
 }: Pick<
@@ -367,7 +373,7 @@ describe("confidential transaction workflow", () => {
             },
             signTransaction: (input) =>
               Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-                Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+                Effect.as(signedPayload)
               ),
           }),
           makeInput({ conversion: [wrap], ledger })
@@ -415,7 +421,7 @@ describe("confidential transaction workflow", () => {
             },
             signTransaction: (input) =>
               Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-                Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+                Effect.as(signedPayload)
               ),
           })
         );
@@ -437,7 +443,7 @@ describe("confidential transaction workflow", () => {
           awaitState(workflow, (state) => state._tag === "Completed")
         );
 
-        expect(held.get("conversion-wrap")?._tag).toBe("Sent");
+        expect(held.get(wrap.id)?._tag).toBe("Sent");
         expect(signed).toEqual(["conversion-wrap", "deposit"]);
       }).pipe(Effect.scoped)
   );
@@ -450,8 +456,12 @@ describe("confidential transaction workflow", () => {
         ledger,
         new Map([
           [
-            "conversion-wrap",
-            { _tag: "Confirmed", hash: "0x01", transaction: wrap },
+            wrap.id,
+            {
+              _tag: "Confirmed",
+              hash: TransactionHash.make("0x01"),
+              transaction: wrap,
+            },
           ],
         ])
       );
@@ -459,7 +469,7 @@ describe("confidential transaction workflow", () => {
         capabilities({
           signTransaction: (input) =>
             Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-              Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+              Effect.as(signedPayload)
             ),
         }),
         makeInput({ conversion: [wrap], ledger })
@@ -492,7 +502,7 @@ describe("confidential transaction workflow", () => {
           },
           signTransaction: (input) =>
             Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-              Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+              Effect.as(signedPayload)
             ),
         }),
         makeInput({ conversion: [wrap], ledger })
@@ -534,7 +544,7 @@ describe("confidential transaction workflow", () => {
             },
             signTransaction: (input) =>
               Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-                Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+                Effect.as(signedPayload)
               ),
           }),
           makeInput({ conversion: [wrap] })
@@ -572,8 +582,11 @@ describe("confidential transaction workflow", () => {
             signTransaction: (input) =>
               Effect.succeed(
                 input.txMeta.txId === "conversion-wrap"
-                  ? { broadcasted: true, signedTx: "0xwallethash" }
-                  : { broadcasted: false, signedTx: "0x02aa" }
+                  ? ({
+                      broadcasted: true,
+                      signedTx: TransactionHash.make("0xeeee"),
+                    } as const)
+                  : signedPayload
               ),
           }),
           makeInput({ conversion: [wrap], ledger })
@@ -581,10 +594,10 @@ describe("confidential transaction workflow", () => {
 
         yield* awaitState(workflow, (state) => state._tag === "Completed");
 
-        expect(awaited).toEqual(["0xwallethash"]);
-        expect((yield* Ref.get(ledger)).get("conversion-wrap")).toEqual({
+        expect(awaited).toEqual(["0xeeee"]);
+        expect((yield* Ref.get(ledger)).get(wrap.id)).toEqual({
           _tag: "Confirmed",
-          hash: "0xwallethash",
+          hash: "0xeeee",
           transaction: wrap,
         });
       }).pipe(Effect.scoped)
@@ -607,7 +620,7 @@ describe("confidential transaction workflow", () => {
           },
           signTransaction: (input) =>
             Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-              Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+              Effect.as(signedPayload)
             ),
         }),
         makeInput({ conversion: [wrap], ledger })
@@ -649,7 +662,7 @@ describe("confidential transaction workflow", () => {
             },
             signTransaction: (input) =>
               Effect.sync(() => signed.push(input.txMeta.txId)).pipe(
-                Effect.as({ broadcasted: false, signedTx: "0x02aa" })
+                Effect.as(signedPayload)
               ),
           }),
           makeInput({ conversion: [wrap], ledger })
@@ -663,7 +676,7 @@ describe("confidential transaction workflow", () => {
         yield* workflow.dispatch({ _tag: "Retry" });
         yield* awaitState(workflow, (state) => state._tag === "Completed");
 
-        expect(held.get("conversion-wrap")?._tag).toBe("Sent");
+        expect(held.get(wrap.id)?._tag).toBe("Sent");
         expect(broadcast).toEqual(["0x02aa", "0x02aa"]);
         expect(signed).toEqual(["conversion-wrap", "deposit"]);
       }).pipe(Effect.scoped)
@@ -687,7 +700,7 @@ describe("confidential transaction workflow", () => {
                       operation: "transaction",
                     })
                   )
-                : Effect.succeed({ broadcasted: false, signedTx: "0x02aa" })
+                : Effect.succeed(signedPayload)
             ),
         }),
         makeInput({ conversion: [wrap] })
@@ -771,7 +784,7 @@ describe("confidential transaction workflow", () => {
               else if (input.txMeta.txId.includes("approval")) {
                 allowance = approval.amount;
               }
-              return { broadcasted: false, signedTx: "0x02aa" };
+              return signedPayload;
             }),
         }),
         makeInput({ conversion, ledger })
@@ -790,7 +803,11 @@ describe("confidential transaction workflow", () => {
           new Map([
             [
               approve.id,
-              { _tag: "Confirmed", hash: "0x01", transaction: approve },
+              {
+                _tag: "Confirmed",
+                hash: TransactionHash.make("0x01"),
+                transaction: approve,
+              },
             ],
           ])
         );
@@ -811,9 +828,20 @@ describe("confidential transaction workflow", () => {
           new Map([
             [
               approve.id,
-              { _tag: "Confirmed", hash: "0x01", transaction: approve },
+              {
+                _tag: "Confirmed",
+                hash: TransactionHash.make("0x01"),
+                transaction: approve,
+              },
+            ],
+            [
+              wrap.id,
+              {
+                _tag: "Sent",
+                hash: TransactionHash.make("0x02"),
+                transaction: wrap,
+              },
             ],
-            [wrap.id, { _tag: "Sent", hash: "0x02", transaction: wrap }],
           ])
         );
 
@@ -834,7 +862,14 @@ describe("confidential transaction workflow", () => {
         yield* Ref.set(
           ledger,
           new Map([
-            [reset.id, { _tag: "Sent", hash: "0x01", transaction: reset }],
+            [
+              reset.id,
+              {
+                _tag: "Sent",
+                hash: TransactionHash.make("0x01"),
+                transaction: reset,
+              },
+            ],
           ])
         );
         const signed: Array<string> = [];
@@ -856,7 +891,7 @@ describe("confidential transaction workflow", () => {
             signTransaction: (input) =>
               Effect.sync(() => {
                 signed.push(input.txMeta.txId);
-                return { broadcasted: false, signedTx: "0x02aa" };
+                return signedPayload;
               }),
           }),
           // Planned upfront this time: the same reset as the one sent.
@@ -1059,7 +1094,7 @@ describe("confidential transaction workflow", () => {
               signTransaction: ({ txMeta }) =>
                 Effect.sync(() =>
                   signed.push([txMeta.txId, txMeta.actionId, txMeta.actionType])
-                ).pipe(Effect.as({ broadcasted: false, signedTx: "0x02aa" })),
+                ).pipe(Effect.as(signedPayload)),
             }),
             instantInput
           );
diff --git a/packages/widget/tests/services/transaction-workflow/transaction-workflow-model.test.ts b/packages/widget/tests/services/transaction-workflow/transaction-workflow-model.test.ts
index daf94d4a2..d5bb4c481 100644
--- a/packages/widget/tests/services/transaction-workflow/transaction-workflow-model.test.ts
+++ b/packages/widget/tests/services/transaction-workflow/transaction-workflow-model.test.ts
@@ -4,6 +4,7 @@ import type { ActionTransaction } from "../../../src/domain/action/models";
 import { Action } from "../../../src/domain/borrow/execution/action";
 import { Transaction } from "../../../src/domain/borrow/execution/transaction";
 import {
+  TransactionId,
   TransactionWorkflowId,
   WalletAddress,
   YieldId,
@@ -287,7 +288,7 @@ describe("transaction workflow model", () => {
     const common = {
       batchId: "yield",
       message: "failed",
-      transactionId: "yield-1",
+      transactionId: TransactionId.make("yield-1"),
       workflowId: TransactionWorkflowId.make("action-1"),
     };
     const states = [
@@ -360,7 +361,7 @@ describe("transaction workflow model", () => {
         }),
         operation: "transaction",
       },
-      transactionId: "yield-1",
+      transactionId: TransactionId.make("yield-1"),
       workflowId: TransactionWorkflowId.make("action-1"),
     });
     expect(withCustom.message).toBe("Transaction signing failed.");
@@ -372,7 +373,7 @@ describe("transaction workflow model", () => {
       batchId: "yield",
       network: "ethereum",
       reason: { _tag: "WalletUnavailable", detail: "disconnected" },
-      transactionId: "yield-1",
+      transactionId: TransactionId.make("yield-1"),
       workflowId: TransactionWorkflowId.make("action-1"),
     });
     expect(withoutCustom.message).toBe(
@@ -396,7 +397,7 @@ describe("transaction workflow model", () => {
         }),
         operation: "message",
       },
-      transactionId: "yield-1",
+      transactionId: TransactionId.make("yield-1"),
       workflowId: TransactionWorkflowId.make("action-1"),
     });
 
@@ -424,7 +425,7 @@ describe("transaction workflow model", () => {
     const common = {
       batchId: "yield",
       message: "failed",
-      transactionId: "yield-1",
+      transactionId: TransactionId.make("yield-1"),
       workflowId: TransactionWorkflowId.make("action-1"),
     };
     const phases = (
@@ -565,7 +566,7 @@ describe("transaction workflow model", () => {
       message: "declined",
       network: "ethereum",
       reason: { _tag: "WalletRequestCancelled", operation: "transaction" },
-      transactionId: "yield-2",
+      transactionId: TransactionId.make("yield-2"),
       workflowId: TransactionWorkflowId.make("action-1"),
     });
 
diff --git a/packages/widget/tests/services/transaction-workflow/transaction-workflow-runtime.test.ts b/packages/widget/tests/services/transaction-workflow/transaction-workflow-runtime.test.ts
index f0e4e615b..bd7e1403d 100644
--- a/packages/widget/tests/services/transaction-workflow/transaction-workflow-runtime.test.ts
+++ b/packages/widget/tests/services/transaction-workflow/transaction-workflow-runtime.test.ts
@@ -20,7 +20,10 @@ import type { ActionTransaction } from "../../../src/domain/action/models";
 import { Action } from "../../../src/domain/borrow/execution/action";
 import { Transaction } from "../../../src/domain/borrow/execution/transaction";
 import {
+  SignedTransactionPayload,
+  TransactionHash,
   WalletAddress,
+  WalletSignature,
   YieldId,
 } from "../../../src/domain/identity/identifiers";
 import {
@@ -73,9 +76,11 @@ const yieldWalletScope = new WalletScopeKey({
   network: "ethereum",
 });
 const borrowWalletScope = new WalletScopeKey({ address, network: "base" });
-const signedPayload = "0xsigned-payload";
-const transactionHash =
-  "0x1111111111111111111111111111111111111111111111111111111111111111";
+const signedPayload = SignedTransactionPayload.make("0xsigned-payload");
+const messageSignature = WalletSignature.make("0xsigned-payload");
+const transactionHash = TransactionHash.make(
+  "0x1111111111111111111111111111111111111111111111111111111111111111"
+);
 const actionMeta = {
   actionId: "yield-action-1",
   actionType: "stake",
@@ -179,9 +184,9 @@ const makeCapabilities = (
   initialWalletState:
     overrides.initialWalletState ?? makeConnectedWalletState(yieldWalletScope),
   wallet: {
-    signMessage: () => Effect.succeed(signedPayload),
+    signMessage: () => Effect.succeed(messageSignature),
     signTransaction: () =>
-      Effect.succeed({ broadcasted: false, signedTx: signedPayload }),
+      Effect.succeed({ broadcasted: false as const, signedTx: signedPayload }),
     ...overrides.wallet,
   },
   yieldOperations: {
@@ -919,7 +924,10 @@ describe("transaction workflow runtime", () => {
             ],
           });
           const signTransaction = vi.fn(() =>
-            Effect.succeed({ broadcasted: false, signedTx: signedPayload })
+            Effect.succeed({
+              broadcasted: false as const,
+              signedTx: signedPayload,
+            })
           );
           const submit = vi.fn(() =>
             Effect.succeed({
diff --git a/packages/widget/tests/services/translation/widget-translation.test.ts b/packages/widget/tests/services/translation/widget-translation.test.ts
index 9b442bb0d..b23d5bb75 100644
--- a/packages/widget/tests/services/translation/widget-translation.test.ts
+++ b/packages/widget/tests/services/translation/widget-translation.test.ts
@@ -2,6 +2,10 @@ import { describe, expect, it } from "@effect/vitest";
 import { Deferred, Effect, Layer, Ref } from "effect";
 import { HttpClient, HttpClientResponse } from "effect/http";
 import type { SKAppProps } from "../../../src/public-api/react-types";
+import type {
+  SettingsProps,
+  SKHostVariant,
+} from "../../../src/public-api/types";
 import { WidgetConfigService } from "../../../src/services/config/widget-config";
 import type { WidgetConfig } from "../../../src/services/config/widget-config-model";
 import translationEN from "../../../src/services/translation/English/translations.json";
@@ -14,12 +18,19 @@ import {
 } from "../../../src/services/translation/widget-translation";
 import { getTestWidgetConfig } from "../../utils/widget-config";
 
-const makeSettings = (overrides: Partial<WidgetConfig> = {}): WidgetConfig =>
+const makeSettings = (
+  overrides: Partial<
+    Pick<
+      SettingsProps,
+      "customTranslations" | "disableInjectedProviderDiscovery" | "language"
+    >
+  > & { readonly variant?: Exclude<SKHostVariant, "zerion"> } = {}
+): WidgetConfig =>
   getTestWidgetConfig({
     apiKey: "test-key",
     variant: "default",
     ...overrides,
-  } as SKAppProps);
+  });
 
 const asHostConfiguration = (settings: WidgetConfig): SKAppProps =>
   settings as unknown as SKAppProps;
@@ -383,9 +394,17 @@ describe("WidgetTranslation resource ownership", () => {
       language: "en",
       translationOverlay: "none",
     });
-    expect(
-      local.en.translation.errors.KaminoLendingInsufficientSolForRentError.title
-    ).toBe("Insufficient SOL for Account Rent");
+    expect(local).toMatchObject({
+      en: {
+        translation: {
+          errors: {
+            KaminoLendingInsufficientSolForRentError: {
+              title: "Insufficient SOL for Account Rent",
+            },
+          },
+        },
+      },
+    });
 
     const enriched = composeWidgetTranslationResources({
       apiErrors: {
@@ -409,17 +428,28 @@ describe("WidgetTranslation resource ownership", () => {
       language: "en",
       translationOverlay: "none",
     });
-    expect(
-      enriched.en.translation.errors.KaminoLendingInsufficientSolForRentError
-    ).toEqual({
-      title: "HOST TITLE",
-      details: "REMOTE DETAILS",
-      solution: "REMOTE SOLUTION",
+    expect(enriched).toMatchObject({
+      en: {
+        translation: {
+          errors: {
+            KaminoLendingInsufficientSolForRentError: {
+              title: "HOST TITLE",
+              details: "REMOTE DETAILS",
+              solution: "REMOTE SOLUTION",
+            },
+          },
+        },
+      },
+      fr: {
+        translation: {
+          errors: {
+            KaminoLendingInsufficientSolForRentError: {
+              title: "SOL insuffisant pour le loyer du compte",
+            },
+          },
+        },
+      },
     });
-    expect(
-      enriched.fr.translation.errors.KaminoLendingInsufficientSolForRentError
-        .title
-    ).toBe("SOL insuffisant pour le loyer du compte");
   });
 
   it("rebuilds exact resources without mutating canonical translations", () => {
@@ -442,12 +472,18 @@ describe("WidgetTranslation resource ownership", () => {
       translationOverlay: "none",
     });
 
-    expect(customized.en.translation.details.rewards.receive_output).toBe(
-      "CUSTOM"
-    );
-    expect(canonical.en.translation.details.rewards.receive_output).toBe(
-      "You'll receive"
-    );
+    expect(customized).toMatchObject({
+      en: {
+        translation: { details: { rewards: { receive_output: "CUSTOM" } } },
+      },
+    });
+    expect(canonical).toMatchObject({
+      en: {
+        translation: {
+          details: { rewards: { receive_output: "You'll receive" } },
+        },
+      },
+    });
   });
 
   it("applies canonical, variant, API error, then host precedence", () => {
@@ -464,8 +500,11 @@ describe("WidgetTranslation resource ownership", () => {
       translationOverlay: "utila",
     });
 
-    expect(resources.en.translation.details.earn).toBe("Stake");
-    expect(resources.en.translation.errors).toMatchObject({ shared: "HOST" });
+    expect(resources).toMatchObject({
+      en: {
+        translation: { details: { earn: "Stake" }, errors: { shared: "HOST" } },
+      },
+    });
   });
 
   it("replaces omitted keys when reconciling a live generation", () => {
diff --git a/packages/widget/tests/services/wallet/ecosystem-connector-gate.dom.test.ts b/packages/widget/tests/services/wallet/ecosystem-connector-gate.dom.test.ts
index a15a48aa7..8f9e9e747 100644
--- a/packages/widget/tests/services/wallet/ecosystem-connector-gate.dom.test.ts
+++ b/packages/widget/tests/services/wallet/ecosystem-connector-gate.dom.test.ts
@@ -190,14 +190,11 @@ const buildControllerEffect = (
     return yield* buildWagmiConfig(
       {
         chainIconMapping: undefined,
-        walletListFactory: undefined,
         disableInjectedProviderDiscovery: true,
         enabledNetworks: new Set(["ethereum", "cosmos", "polkadot", "tron"]),
         institutionalWallets: false,
         isLedgerLive: false,
         isSafe: false,
-        mapWalletFn: undefined,
-        walletPolicy: undefined,
         persistPublicKey: () => Effect.void,
         queryParams,
         solanaConnection: {} as SolanaConnection,
diff --git a/packages/widget/tests/services/wallet/evm-wallet-driver.test.ts b/packages/widget/tests/services/wallet/evm-wallet-driver.test.ts
index b80e50acd..fb391f41b 100644
--- a/packages/widget/tests/services/wallet/evm-wallet-driver.test.ts
+++ b/packages/widget/tests/services/wallet/evm-wallet-driver.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from "@effect/vitest";
 import { Effect } from "effect";
-import type { Hash } from "viem";
 import { zeroAddress } from "viem";
+import { TransactionHash } from "../../../src/domain/identity/identifiers";
 import {
   decodeBorrowEvmTransaction,
   decodeEvmTransaction,
@@ -108,7 +108,7 @@ describe("EVM wallet driver", () => {
 
   it.effect("returns a broadcast result from the core send command", () =>
     Effect.gen(function* () {
-      const hash = `0x${"1".repeat(64)}` as Hash;
+      const hash = TransactionHash.make(`0x${"1".repeat(64)}`);
       const sendTransaction = vi.fn(() =>
         Effect.succeed({ broadcasted: true as const, signedTx: hash })
       );
diff --git a/packages/widget/tests/services/wallet/evm-wallet-provider.dom.test.ts b/packages/widget/tests/services/wallet/evm-wallet-provider.dom.test.ts
index f91895d7f..11d47a178 100644
--- a/packages/widget/tests/services/wallet/evm-wallet-provider.dom.test.ts
+++ b/packages/widget/tests/services/wallet/evm-wallet-provider.dom.test.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from "node:events";
 import { describe, expect, it } from "@effect/vitest";
-import { Effect, Exit, Fiber, Queue, Stream } from "effect";
+import { Effect, Exit, Fiber, Queue, Stream, Struct } from "effect";
 import { afterEach, vi } from "vitest";
 import { createConfig, http } from "wagmi";
 import { connect, getAccount } from "wagmi/actions";
@@ -8,6 +8,7 @@ import { mainnet } from "wagmi/chains";
 import type * as WagmiConnectors from "wagmi/connectors";
 import { createEvmWallets } from "../../../src/services/wallet/internal/adapters/evm/wallets";
 import {
+  makeWalletConnectConnection,
   makeWalletConnectPresentation,
   type WalletConnectModal,
 } from "../../../src/services/wallet/internal/platform/wallet-connect-presentation";
@@ -25,9 +26,9 @@ const uri = "wc:proposal@2?relay-protocol=irn&symKey=0123456789abcdef";
 const nativeSession = vi.hoisted(() => {
   const state: {
     approval: Promise<void> | undefined;
-    providerReady?: Promise<void>;
-    onProvider?: () => void;
-    onConnected?: () => void;
+    providerReady?: Promise<void> | undefined;
+    onProvider?: (() => void) | undefined;
+    onConnected?: (() => void) | undefined;
     requests: number;
     changeAccounts: ((accounts: string[]) => void) | undefined;
     disconnect: (() => void) | undefined;
@@ -102,7 +103,9 @@ const provider = (address: string, flags: Record<string, unknown>) => ({
 
 const makeMetaMaskConfig = (discover = false) => {
   const { metaMaskWallet } = createEvmWallets({
-    walletConnectPresentation: { connect: ({ connection }) => connection },
+    walletConnectPresentation: {
+      connect: ({ connection }) => connection.effect,
+    },
     runWalletEffect,
   });
   return createConfig({
@@ -246,10 +249,8 @@ describe("named EVM native handoff", () => {
                 groupName: "Ethereum",
                 wallets: [
                   wallets.metaMaskWallet,
-                  (options) => ({
-                    ...wallets.ledgerWallet(options),
-                    desktop: undefined,
-                  }),
+                  (options) =>
+                    Struct.omit(wallets.ledgerWallet(options), ["desktop"]),
                 ],
               },
             ],
@@ -360,19 +361,21 @@ describe("cross-ecosystem WalletConnect handoff", () => {
           const cosmos = presentation
             .connect({
               namespace: "cosmos",
-              connection: Effect.tryPromise({
-                try: async () => {
-                  const result = await cosmosApproval.promise;
-                  cosmosCompleted.resolve();
-                  return result;
-                },
-                catch: (cause) =>
-                  new WalletIntegrationError({
-                    cause,
-                    message: "Cosmos approval failed",
-                    operation: "cosmos-connect",
-                  }),
-              }),
+              connection: makeWalletConnectConnection(
+                Effect.tryPromise({
+                  try: async () => {
+                    const result = await cosmosApproval.promise;
+                    cosmosCompleted.resolve();
+                    return result;
+                  },
+                  catch: (cause) =>
+                    new WalletIntegrationError({
+                      cause,
+                      message: "Cosmos approval failed",
+                      operation: "cosmos-connect",
+                    }),
+                })
+              ),
               subscribeUri: (publish) =>
                 Effect.sync(() => publish("wc:cosmos@2")),
             })
@@ -503,7 +506,7 @@ describe("cross-ecosystem WalletConnect handoff", () => {
         const other = yield* presentation
           .connect({
             namespace: "cosmos",
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) =>
               Effect.sync(() => publish("wc:cosmos@2")),
           })
diff --git a/packages/widget/tests/services/wallet/external-provider-connector.test.ts b/packages/widget/tests/services/wallet/external-provider-connector.test.ts
index cb2d9c53e..8ab580322 100644
--- a/packages/widget/tests/services/wallet/external-provider-connector.test.ts
+++ b/packages/widget/tests/services/wallet/external-provider-connector.test.ts
@@ -250,13 +250,9 @@ describe("external-provider connector", () => {
   });
 
   it.effect.each([
-    { supportedChainIds: [], currentChain: undefined, chainId: mainnet.id },
+    { supportedChainIds: [], chainId: mainnet.id },
     { supportedChainIds: [], currentChain: polygon.id, chainId: polygon.id },
-    {
-      supportedChainIds: [arbitrum.id],
-      currentChain: undefined,
-      chainId: mainnet.id,
-    },
+    { supportedChainIds: [arbitrum.id], chainId: mainnet.id },
     {
       supportedChainIds: [arbitrum.id],
       currentChain: arbitrum.id,
diff --git a/packages/widget/tests/services/wallet/external-provider-contract.test.ts b/packages/widget/tests/services/wallet/external-provider-contract.test.ts
index ddbd9927c..53d086558 100644
--- a/packages/widget/tests/services/wallet/external-provider-contract.test.ts
+++ b/packages/widget/tests/services/wallet/external-provider-contract.test.ts
@@ -4,6 +4,7 @@ import type { RefObject } from "react";
 import {
   ActionId as BorrowActionId,
   IntegrationId as BorrowIntegrationId,
+  MarketId as BorrowMarketId,
   TransactionId as BorrowTransactionId,
 } from "../../../src/domain/borrow/ids";
 import {
@@ -87,7 +88,7 @@ const borrowTransactionMeta = {
   integrationId: Schema.decodeSync(BorrowIntegrationId)("aave-v3"),
   rawArguments: {
     amount: "1",
-    marketId: "aave-v3-ethereum-usdc",
+    marketId: Schema.decodeSync(BorrowMarketId)("aave-v3-ethereum-usdc"),
   },
   txId: Schema.decodeSync(BorrowTransactionId)("borrow-transaction-id"),
   txType: "BORROW",
diff --git a/packages/widget/tests/services/wallet/external-provider-wallet-driver.test.ts b/packages/widget/tests/services/wallet/external-provider-wallet-driver.test.ts
index 1edebb720..4f94c0227 100644
--- a/packages/widget/tests/services/wallet/external-provider-wallet-driver.test.ts
+++ b/packages/widget/tests/services/wallet/external-provider-wallet-driver.test.ts
@@ -9,6 +9,7 @@ import {
 import {
   ActionId as BorrowActionId,
   IntegrationId as BorrowIntegrationId,
+  MarketId as BorrowMarketId,
   TransactionId as BorrowTransactionId,
 } from "../../../src/domain/borrow/ids";
 import { WalletAddress } from "../../../src/domain/identity/identifiers";
@@ -52,7 +53,7 @@ const borrowTxMeta = {
   integrationId: Schema.decodeSync(BorrowIntegrationId)("aave-v3"),
   rawArguments: {
     amount: "1",
-    marketId: "aave-v3-ethereum-usdc",
+    marketId: Schema.decodeSync(BorrowMarketId)("aave-v3-ethereum-usdc"),
   },
   txId: Schema.decodeSync(BorrowTransactionId)("borrow-transaction-id"),
   txType: "BORROW",
diff --git a/packages/widget/tests/services/wallet/prepare-ledger-live-transaction.test.ts b/packages/widget/tests/services/wallet/prepare-ledger-live-transaction.test.ts
index 3dc31d26f..8536ba59e 100644
--- a/packages/widget/tests/services/wallet/prepare-ledger-live-transaction.test.ts
+++ b/packages/widget/tests/services/wallet/prepare-ledger-live-transaction.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it } from "@effect/vitest";
 import { Effect, Schema } from "effect";
 import { vi } from "vitest";
 import { ValidatorAddress } from "../../../src/domain/identity/identifiers";
+import type { Network } from "../../../src/domain/network/network";
 import { makePrepareLedgerLiveTransaction } from "../../../src/services/wallet/internal/adapters/ledger/prepare-ledger-live-transaction";
 import type { YieldTransactionMeta } from "../../../src/services/wallet/wallet-transactions";
 
@@ -33,7 +34,7 @@ vi.mock("@polkadot/types", () => ({
 
 type PrepareParams = {
   family?: "borrow" | "yield";
-  network: string;
+  network: Network;
   tx: string;
   txMeta?: YieldTransactionMeta;
 };
@@ -110,7 +111,7 @@ const polkadotTx = JSON.stringify({
   },
 });
 
-const polkadotBondParams = {
+const polkadotBondParams: PrepareParams = {
   network: "polkadot",
   tx: polkadotTx,
   txMeta: createTxMeta({
diff --git a/packages/widget/tests/services/wallet/solana-wallet-connect-adapter.browser.test.ts b/packages/widget/tests/services/wallet/solana-wallet-connect-adapter.browser.test.ts
index 630c56144..e9015a7ec 100644
--- a/packages/widget/tests/services/wallet/solana-wallet-connect-adapter.browser.test.ts
+++ b/packages/widget/tests/services/wallet/solana-wallet-connect-adapter.browser.test.ts
@@ -16,6 +16,7 @@ import base58 from "bs58";
 import { Effect, Fiber, FiberSet, Queue, Schema } from "effect";
 import { vi } from "vitest";
 import { getSolanaConnectors } from "../../../src/services/wallet/internal/adapters/solana/solana-connector";
+import { makeWalletConnectConnection } from "../../../src/services/wallet/internal/platform/wallet-connect-presentation";
 import { WalletConnectSolanaAdapter } from "../../../src/services/wallet/internal/runtime/solana-wallet-connect-adapter";
 import { WalletModal } from "../../../src/services/wallet/wallet-modal";
 import {
@@ -180,7 +181,7 @@ describe("Solana WalletConnect protocol adapter", () => {
         const other = yield* fixture.presentation
           .connect({
             namespace: "eip155",
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) =>
               Effect.sync(() => publish("wc:evm-proposal@2")),
           })
diff --git a/packages/widget/tests/services/wallet/stellar-wallets-kit-platform.test.ts b/packages/widget/tests/services/wallet/stellar-wallets-kit-platform.test.ts
index b55a8af96..eaca3774f 100644
--- a/packages/widget/tests/services/wallet/stellar-wallets-kit-platform.test.ts
+++ b/packages/widget/tests/services/wallet/stellar-wallets-kit-platform.test.ts
@@ -7,6 +7,7 @@ import {
   makeWalletConnectStellarWalletClient,
   type StellarWalletModule,
 } from "../../../src/services/wallet/internal/platform/stellar-wallets-kit-platform";
+import { makeWalletConnectConnection } from "../../../src/services/wallet/internal/platform/wallet-connect-presentation";
 import { WalletModal } from "../../../src/services/wallet/wallet-modal";
 import {
   makeFakeSignClient,
@@ -21,7 +22,6 @@ const publicNetworkPassphrase =
 const makeModule = (
   overrides: Partial<StellarWalletModule> = {}
 ): StellarWalletModule => ({
-  disconnect: undefined,
   getAddress: vi.fn(async () => ({ address })),
   getNetwork: vi.fn(async () => ({
     network: "PUBLIC",
@@ -306,7 +306,7 @@ describe("Stellar Wallets Kit platform", () => {
         yield* client.reconnect(address);
         yield* presentation
           .connect({
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) =>
               Effect.sync(() => publish("wc:solana-proposal@2")),
           })
diff --git a/packages/widget/tests/services/wallet/tron-wallet-connect.test.ts b/packages/widget/tests/services/wallet/tron-wallet-connect.test.ts
index 84080ee92..afa44008a 100644
--- a/packages/widget/tests/services/wallet/tron-wallet-connect.test.ts
+++ b/packages/widget/tests/services/wallet/tron-wallet-connect.test.ts
@@ -122,7 +122,7 @@ const makeFixture = Effect.fn("makeTronWcFixture")(function* (
   );
   const wagmi = yield* makeConnector({
     protocol: walletConnect.protocol,
-    storage: options.storage,
+    ...(options.storage === undefined ? {} : { storage: options.storage }),
   });
   return { ...walletConnect, ...wagmi };
 });
diff --git a/packages/widget/tests/services/wallet/wagmi-connector-events.test.ts b/packages/widget/tests/services/wallet/wagmi-connector-events.test.ts
index 7d832b5fb..2706fd8ef 100644
--- a/packages/widget/tests/services/wallet/wagmi-connector-events.test.ts
+++ b/packages/widget/tests/services/wallet/wagmi-connector-events.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from "vitest";
 import type { Connector } from "wagmi";
 import { makeWagmiConnectorEvents } from "../../../src/services/wallet/internal/adapters/wagmi-connector-events";
-import { normalizeChainId } from "../../../src/services/wallet/internal/normalize-chain-id";
+import { parseWalletRoutingId } from "../../../src/services/wallet/internal/wagmi-seam";
 
 const makeEmitter = () => {
   const emit = vi.fn();
@@ -43,7 +43,7 @@ describe("makeWagmiConnectorEvents", () => {
 
   it("maps chain ids through a supplied mapper", () => {
     const { emit, emitter } = makeEmitter();
-    const events = makeWagmiConnectorEvents(emitter, normalizeChainId);
+    const events = makeWagmiConnectorEvents(emitter, parseWalletRoutingId);
 
     events.onChainChanged("42");
     events.onChainChanged("not-numeric");
diff --git a/packages/widget/tests/services/wallet/wallet-atoms.test.ts b/packages/widget/tests/services/wallet/wallet-atoms.test.ts
index 6e9fb7680..42bb950be 100644
--- a/packages/widget/tests/services/wallet/wallet-atoms.test.ts
+++ b/packages/widget/tests/services/wallet/wallet-atoms.test.ts
@@ -204,7 +204,7 @@ describe("wallet Effect Atom boundaries", () => {
       })
     ).toMatchObject({ network: null });
     expect(
-      Schema.decodeSync(InitParams)({
+      Schema.decodeUnknownSync(InitParams)({
         ...emptyInitParams,
         pendingaction: "unstake",
       })
@@ -418,8 +418,6 @@ describe("wallet Effect Atom boundaries", () => {
                 institutionalWallets: false,
                 isLedgerLive: false,
                 isSafe: false,
-                mapWalletFn: undefined,
-                walletPolicy: undefined,
                 persistPublicKey: () => Effect.void,
                 queryParams,
                 solanaConnection: {} as SolanaConnection,
@@ -471,8 +469,6 @@ describe("wallet Effect Atom boundaries", () => {
                 institutionalWallets: false,
                 isLedgerLive: false,
                 isSafe: false,
-                mapWalletFn: undefined,
-                walletPolicy: undefined,
                 persistPublicKey: () => Effect.void,
                 queryParams,
                 solanaConnection: {} as SolanaConnection,
diff --git a/packages/widget/tests/services/wallet/wallet-connect-presentation.test.ts b/packages/widget/tests/services/wallet/wallet-connect-presentation.test.ts
index fe5f70e4b..4b4222336 100644
--- a/packages/widget/tests/services/wallet/wallet-connect-presentation.test.ts
+++ b/packages/widget/tests/services/wallet/wallet-connect-presentation.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "@effect/vitest";
 import { Effect, Exit, Fiber, Option, Queue, Scope } from "effect";
 import {
+  makeWalletConnectConnection,
   makeWalletConnectPresentation,
   type WalletConnectModal,
 } from "../../../src/services/wallet/internal/platform/wallet-connect-presentation";
@@ -57,7 +58,10 @@ describe("WalletConnect presentation", () => {
               })
           );
         yield* presentation
-          .connect({ connection: Effect.never, subscribeUri })
+          .connect({
+            connection: makeWalletConnectConnection(Effect.never),
+            subscribeUri,
+          })
           .pipe(Effect.forkIn(scope, { startImmediately: true }));
         yield* Effect.promise(() => opened.promise);
 
@@ -75,7 +79,7 @@ describe("WalletConnect presentation", () => {
         expect(
           yield* Effect.flip(
             presentation.connect({
-              connection: Effect.never,
+              connection: makeWalletConnectConnection(Effect.never),
               subscribeUri: (publish) => Effect.sync(() => publish(uri)),
             })
           )
@@ -119,7 +123,7 @@ describe("WalletConnect presentation", () => {
         );
         const connection = yield* presentation
           .connect({
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) => Effect.sync(() => publish(uri)),
           })
           .pipe(Effect.forkScoped({ startImmediately: true }));
@@ -172,27 +176,29 @@ describe("WalletConnect presentation", () => {
             deepLinks.push(url);
           }
         );
-        const connection = Effect.tryPromise({
-          try: async (signal) => {
-            sdkStarts++;
-            emitUri?.(sdkStarts === 1 ? uri : "wc:next-proposal@2");
-            const approved = await (sdkStarts === 1
-              ? firstApproval.promise
-              : nextApproval.promise);
-            session = approved;
-            if (signal.aborted) {
-              disconnects++;
-              session = undefined;
-            }
-            return approved;
-          },
-          catch: (cause) =>
-            new WalletIntegrationError({
-              cause,
-              message: "SDK approval failed",
-              operation: "test-connect",
-            }),
-        });
+        const connection = makeWalletConnectConnection(
+          Effect.tryPromise({
+            try: async (signal) => {
+              sdkStarts++;
+              emitUri?.(sdkStarts === 1 ? uri : "wc:next-proposal@2");
+              const approved = await (sdkStarts === 1
+                ? firstApproval.promise
+                : nextApproval.promise);
+              session = approved;
+              if (signal.aborted) {
+                disconnects++;
+                session = undefined;
+              }
+              return approved;
+            },
+            catch: (cause) =>
+              new WalletIntegrationError({
+                cause,
+                message: "SDK approval failed",
+                operation: "test-connect",
+              }),
+          })
+        );
         const subscribeUri = (publish: (uri: string) => void) =>
           Effect.acquireRelease(
             Effect.promise(async () => {
@@ -266,15 +272,17 @@ describe("WalletConnect presentation", () => {
         }),
         () => {}
       );
-      const connection = Effect.tryPromise({
-        try: () => approval.promise,
-        catch: (cause) =>
-          new WalletIntegrationError({
-            cause,
-            message: "Approval failed",
-            operation: "test-connect",
-          }),
-      });
+      const connection = makeWalletConnectConnection(
+        Effect.tryPromise({
+          try: () => approval.promise,
+          catch: (cause) =>
+            new WalletIntegrationError({
+              cause,
+              message: "Approval failed",
+              operation: "test-connect",
+            }),
+        })
+      );
       const input = {
         connection,
         subscribeUri: (publish: (uri: string) => void) =>
@@ -319,7 +327,9 @@ describe("WalletConnect presentation", () => {
         );
         const connecting = yield* presentation
           .connect({
-            connection: Effect.promise(() => approval.promise),
+            connection: makeWalletConnectConnection(
+              Effect.promise(() => approval.promise)
+            ),
             subscribeUri: (publish) =>
               Effect.sync(() => {
                 publishUri = publish;
@@ -379,7 +389,7 @@ describe("WalletConnect presentation", () => {
         yield* walletModal.openConnect;
         const connecting = yield* presentation
           .connect({
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) =>
               Effect.sync(() => {
                 publishUri = publish;
@@ -431,7 +441,7 @@ describe("WalletConnect presentation", () => {
         yield* walletModal.openConnect;
         const connecting = yield* presentation
           .connect({
-            connection: Effect.never,
+            connection: makeWalletConnectConnection(Effect.never),
             subscribeUri: (publish) =>
               Effect.sync(() => {
                 publishUri = publish;
diff --git a/packages/widget/tests/services/wallet/wallet-connect-protocol.test.ts b/packages/widget/tests/services/wallet/wallet-connect-protocol.test.ts
index 529b66c13..b634c2ba4 100644
--- a/packages/widget/tests/services/wallet/wallet-connect-protocol.test.ts
+++ b/packages/widget/tests/services/wallet/wallet-connect-protocol.test.ts
@@ -1,7 +1,9 @@
 import { describe, expect, it } from "@effect/vitest";
 import { Effect, Fiber, Option, Queue, Schema } from "effect";
 import {
+  CaipChainId,
   sharedSignClients,
+  WalletConnectTopic,
   walletConnectSessionHint,
   walletConnectSessionOwners,
 } from "../../../src/services/wallet/internal/platform/wallet-connect-protocol";
@@ -14,7 +16,9 @@ import {
   walletConnectSession,
 } from "../../utils/wallet-connect";
 
-const solanaChain = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+const toChain = Schema.decodeSync(CaipChainId);
+const toTopic = Schema.decodeSync(WalletConnectTopic);
+const solanaChain = toChain("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp");
 const solanaAccount = `${solanaChain}:wallet-public-key`;
 const solanaProposal = {
   namespace: "solana",
@@ -92,7 +96,7 @@ describe("WalletConnect protocol", () => {
       yield* protocol
         .connect({
           namespace: "stellar",
-          chains: ["stellar:pubnet"],
+          chains: [toChain("stellar:pubnet")],
           requiredMethods: ["stellar_signXDR"],
           optionalMethods: ["stellar_signMessage"],
         })
@@ -275,8 +279,10 @@ describe("WalletConnect protocol", () => {
       );
       yield* protocol.sessions("solana");
       const ended: Array<string> = [];
-      protocol.subscribeEnded("first-topic", () => ended.push("first"));
-      const unsubscribe = protocol.subscribeEnded("second-topic", () =>
+      protocol.subscribeEnded(toTopic("first-topic"), () =>
+        ended.push("first")
+      );
+      const unsubscribe = protocol.subscribeEnded(toTopic("second-topic"), () =>
         ended.push("second")
       );
 
@@ -303,7 +309,7 @@ describe("WalletConnect protocol", () => {
         })
       );
 
-      yield* protocol.disconnect("first-topic");
+      yield* protocol.disconnect(toTopic("first-topic"));
 
       expect(signClient.state.disconnects).toEqual(["first-topic"]);
       expect(
@@ -318,7 +324,7 @@ describe("WalletConnect protocol", () => {
       Effect.gen(function* () {
         const { protocol, signClient } = yield* makeTestWalletConnect();
         const request = {
-          topic: "session-topic",
+          topic: toTopic("session-topic"),
           chainId: solanaChain,
           method: "solana_signMessage",
           params: { message: "hello" },
@@ -406,7 +412,7 @@ describe("WalletConnect protocol", () => {
       const connecting = yield* firstPage.protocol
         .connect({
           namespace: "cosmos",
-          chains: ["cosmos:cosmoshub-4"],
+          chains: [toChain("cosmos:cosmoshub-4")],
           requiredMethods: [],
           optionalMethods: ["cosmos_signDirect"],
         })
@@ -501,14 +507,14 @@ describe("WalletConnect protocol", () => {
           (yield* protocol.sessions("solana")).map(({ topic }) => topic)
         ).toEqual(["ended", "disconnected", "live"]);
         signClient.end("ended");
-        yield* protocol.disconnect("disconnected");
+        yield* protocol.disconnect(toTopic("disconnected"));
         // Lets the remote end's owner removal run.
         yield* Effect.sleep("10 millis");
 
         const owners = walletConnectSessionOwners(store);
         expect(
           yield* Effect.forEach(topics, (topic) =>
-            owners.get(topic).pipe(Effect.map(Option.getOrUndefined))
+            owners.get(toTopic(topic)).pipe(Effect.map(Option.getOrUndefined))
           )
         ).toEqual([undefined, undefined, undefined, "solana"]);
       }).pipe(Effect.scoped, Effect.provide(WalletModal.layer))
@@ -527,7 +533,7 @@ describe("WalletConnect protocol", () => {
         });
         const cosmosProposal = {
           namespace: "cosmos",
-          chains: ["cosmos:cosmoshub-4"],
+          chains: [toChain("cosmos:cosmoshub-4")],
           requiredMethods: [],
         } as const;
         const firstConnecting = yield* firstTab.protocol
@@ -662,7 +668,7 @@ describe("WalletConnect protocol", () => {
           }),
           { store }
         );
-        yield* firstPage.protocol.disconnect("only-topic");
+        yield* firstPage.protocol.disconnect(toTopic("only-topic"));
 
         const reloaded = yield* makeTestWalletConnect(makeFakeSignClient(), {
           store,
diff --git a/packages/widget/tests/services/wallet/wallet-router.test.ts b/packages/widget/tests/services/wallet/wallet-router.test.ts
index 92a6048ef..302982f07 100644
--- a/packages/widget/tests/services/wallet/wallet-router.test.ts
+++ b/packages/widget/tests/services/wallet/wallet-router.test.ts
@@ -1,8 +1,12 @@
 import { describe, expect, it, vi } from "@effect/vitest";
 import { Effect, Schema } from "effect";
-import { type Chain, type Hash, type Hex, zeroAddress } from "viem";
+import { type Chain, zeroAddress } from "viem";
 import type { Connector } from "wagmi";
-import { WalletAddress } from "../../../src/domain/identity/identifiers";
+import {
+  TransactionHash,
+  WalletAddress,
+  WalletSignature,
+} from "../../../src/domain/identity/identifiers";
 import type { Network } from "../../../src/domain/network/network";
 import {
   routeWalletAccountSwitch,
@@ -75,11 +79,13 @@ const actions = () =>
     sendEvmTransaction: vi.fn(() =>
       Effect.succeed({
         broadcasted: true as const,
-        signedTx: "0xhash" as Hash,
+        signedTx: TransactionHash.make("0xhash"),
       })
     ),
-    signMessage: vi.fn(() => Effect.succeed("0xsignature" as Hex)),
-    signTypedData: vi.fn(() => Effect.succeed("0xtyped" as Hex)),
+    signMessage: vi.fn(() =>
+      Effect.succeed(WalletSignature.make("0xsignature"))
+    ),
+    signTypedData: vi.fn(() => Effect.succeed(WalletSignature.make("0xtyped"))),
     switchChain: vi.fn(() => Effect.die("unused")),
   }) satisfies WagmiActions;
 
diff --git a/packages/widget/tests/services/wallet/wallet-state.test.ts b/packages/widget/tests/services/wallet/wallet-state.test.ts
index f7366fd57..ca7811c83 100644
--- a/packages/widget/tests/services/wallet/wallet-state.test.ts
+++ b/packages/widget/tests/services/wallet/wallet-state.test.ts
@@ -6,12 +6,14 @@ import {
   Layer,
   Option,
   Ref,
+  Schema,
   Stream,
   SubscriptionRef,
 } from "effect";
 import type { Chain } from "viem";
 import { mainnet, optimism } from "viem/chains";
 import type { Connector } from "wagmi";
+import { WalletAddress } from "../../../src/domain/identity/identifiers";
 import type { WalletNetwork } from "../../../src/domain/wallet/network";
 import { WidgetConfigService } from "../../../src/services/config/widget-config";
 import { WidgetPersistence } from "../../../src/services/persistence/widget-persistence";
@@ -35,7 +37,10 @@ import { makeWalletTestController } from "./wallet-test-controller";
 
 const address = "0x0000000000000000000000000000000000000001";
 const nextAddress = "0x0000000000000000000000000000000000000002";
-const expectedOwner = { address, network: "ethereum" } as const;
+const expectedOwner = {
+  address: Schema.decodeSync(WalletAddress)(address),
+  network: "ethereum",
+} as const;
 
 const disconnectedConnection = {
   address: undefined,
diff --git a/packages/widget/tests/services/zama-service.test.ts b/packages/widget/tests/services/zama-service.test.ts
index e9c83cfef..cbccbd01d 100644
--- a/packages/widget/tests/services/zama-service.test.ts
+++ b/packages/widget/tests/services/zama-service.test.ts
@@ -11,10 +11,15 @@ import { decodeFunctionData, erc20Abi } from "viem";
 import { sepolia } from "viem/chains";
 import { vi } from "vitest";
 import {
-  ConfidentialHandle,
+  type ConfidentialConversion,
   ConfidentialTokenBalanceKey,
 } from "../../src/domain/earn/confidential";
-import { WalletAddress } from "../../src/domain/identity/identifiers";
+import { ConfidentialHandle } from "../../src/domain/earn/models";
+import {
+  WalletAddress,
+  WalletSignature,
+} from "../../src/domain/identity/identifiers";
+import { EvmChainIds } from "../../src/domain/wallet/chain-ids";
 import {
   WalletScopeKey,
   walletScopeOwnerKey,
@@ -96,10 +101,14 @@ const owner = Schema.decodeSync(WalletAddress)(
 );
 const { cUsdc, router, usdc } = confidentialFixture;
 const conversion = {
-  chainId: 11155111,
+  chainId: EvmChainIds.EthereumSepolia,
   underlying: usdc.address,
   wrapper: cUsdc.address,
-};
+} satisfies ConfidentialConversion;
+
+// The SDK returns 32-byte hex handles.
+const amountHandle = `0x${"01".repeat(32)}`;
+const legHandles = [`0x${"02".repeat(32)}`, `0x${"03".repeat(32)}`];
 
 const revealedHandle = Schema.decodeSync(ConfidentialHandle)(
   `0x${"cd".repeat(32)}`
@@ -128,7 +137,7 @@ const makeLayer = Effect.fn("makeZamaTestLayer")(function* (options: {
     readonly request: (args: unknown) => Promise<unknown>;
   };
   readonly wagmiChains?: ReadonlyArray<{ readonly id: number }>;
-  readonly signPermit?: (input: unknown) => Effect.Effect<`0x${string}`>;
+  readonly signPermit?: (input: unknown) => Effect.Effect<WalletSignature>;
 }) {
   const wallet = yield* makeTestWallet({
     canSignPermit: Effect.succeed(options.canSignPermit ?? true),
@@ -197,7 +206,10 @@ const depositPreparation = (
     balance: pick === "asset" ? { chainId: 11155111, token } : null,
     command: {
       address: owner,
-      arguments: { amount: "5", inputToken: token.address },
+      arguments: {
+        amount: "5",
+        ...(token.address === undefined ? {} : { inputToken: token.address }),
+      },
       yieldId: yieldDto.id,
     },
     conversion: pick === "asset" ? null : conversion,
@@ -269,10 +281,8 @@ describe("ZamaService", () => {
       Effect.gen(function* () {
         sdk.balanceOf.mockResolvedValueOnce(5_000_000n);
         sdk.encrypt
-          .mockImplementationOnce(() => encryptAs(["0xamount"], "0xap"))
-          .mockImplementationOnce(() =>
-            encryptAs(["0xleg0", "0xleg1"], "0xlp")
-          );
+          .mockImplementationOnce(() => encryptAs([amountHandle], "0xap"))
+          .mockImplementationOnce(() => encryptAs(legHandles, "0xlp"));
         const { layer } = yield* makeLayer({});
 
         const command = yield* ZamaService.use((zama) =>
@@ -289,9 +299,9 @@ describe("ZamaService", () => {
           [router, [0n, 5_000_000n]],
         ]);
         expect(command.arguments).toEqual({
-          encryptedAmount: "0xamount",
+          encryptedAmount: amountHandle,
           encryptedAmountProof: "0xap",
-          encryptedLegAmounts: ["0xleg0", "0xleg1"],
+          encryptedLegAmounts: legHandles,
           encryptedLegProof: "0xlp",
           inputToken: cUsdc.address,
         });
@@ -301,7 +311,7 @@ describe("ZamaService", () => {
   it.effect("encrypts the wrapped amount of an underlying deposit", () =>
     Effect.gen(function* () {
       client.readContract.mockResolvedValueOnce(2n);
-      sdk.encrypt.mockImplementation(() => encryptAs(["0xh"], "0xp"));
+      sdk.encrypt.mockImplementation(() => encryptAs([amountHandle], "0xp"));
       const { layer } = yield* makeLayer({});
 
       yield* ZamaService.use((zama) =>
@@ -393,7 +403,7 @@ describe("ZamaService", () => {
           signPermit: (input) =>
             Effect.sync(() => {
               signed.push(input);
-              return "0xsig" as const;
+              return WalletSignature.make("0x5167");
             }),
         });
 
@@ -428,7 +438,7 @@ describe("ZamaService", () => {
           relayerUrl: "https://api.example.test/v1/zama/relayer/11155111/",
         });
         expect(values.handles.get(handle)).toBe(42n);
-        expect(signature).toBe("0xsig");
+        expect(signature).toBe("0x5167");
         expect(signed).toEqual([
           {
             expectedOwner: { address: owner, network: "ethereum-sepolia" },
diff --git a/packages/widget/tests/shared/ui/primitives/anchor.dom.test.tsx b/packages/widget/tests/shared/ui/primitives/anchor.dom.test.tsx
new file mode 100644
index 000000000..94e768701
--- /dev/null
+++ b/packages/widget/tests/shared/ui/primitives/anchor.dom.test.tsx
@@ -0,0 +1,23 @@
+import { Trans } from "react-i18next";
+import { describe, expect, it } from "vitest";
+import { createWidgetI18nInstance } from "../../../../src/services/translation/widget-translation";
+import { SKAnchor } from "../../../../src/shared/ui/primitives/anchor";
+import { render } from "../../../utils/test-utils.dom.tsx";
+
+describe("SKAnchor", () => {
+  it("links to the URL a translation places inside it", async () => {
+    const app = await render(
+      <Trans
+        i18n={createWidgetI18nInstance()}
+        defaults="Read <link0>https://example.com/terms</link0>."
+        components={{ link0: <SKAnchor /> }}
+      />
+    );
+
+    expect(app.container.querySelector("a")?.getAttribute("href")).toBe(
+      "https://example.com/terms"
+    );
+
+    app.unmount();
+  });
+});
diff --git a/packages/widget/tests/utils/services/tracking-service.test.ts b/packages/widget/tests/utils/services/tracking-service.test.ts
index 2a7139bb3..f6333ea10 100644
--- a/packages/widget/tests/utils/services/tracking-service.test.ts
+++ b/packages/widget/tests/utils/services/tracking-service.test.ts
@@ -7,14 +7,16 @@ describe("makeTestTracking", () => {
     Effect.gen(function* () {
       const tracking = yield* makeTestTracking();
 
-      yield* tracking.service.trackEvent("tabClicked", { tab: "earn" });
-      yield* tracking.service.trackPageView("earn", { source: "test" });
+      yield* tracking.service.trackEvent("tabClicked", { selected: "earn" });
+      yield* tracking.service.trackPageView("positionDetails", {
+        yield: "Test yield",
+      });
 
       expect(yield* tracking.trackedEvents).toEqual([
-        { event: "tabClicked", properties: { tab: "earn" } },
+        { event: "tabClicked", properties: { selected: "earn" } },
       ]);
       expect(yield* tracking.trackedPageViews).toEqual([
-        { page: "earn", properties: { source: "test" } },
+        { page: "positionDetails", properties: { yield: "Test yield" } },
       ]);
 
       yield* tracking.clear;
@@ -31,11 +33,11 @@ describe("makeTestTracking", () => {
         trackEvent: () => Ref.update(delegatedCount, (count) => count + 1),
       });
 
-      yield* tracking.service.trackEvent("tabClicked", { tab: "earn" });
+      yield* tracking.service.trackEvent("tabClicked", { selected: "earn" });
 
       expect(yield* Ref.get(delegatedCount)).toBe(1);
       expect(yield* tracking.trackedEvents).toEqual([
-        { event: "tabClicked", properties: { tab: "earn" } },
+        { event: "tabClicked", properties: { selected: "earn" } },
       ]);
     })
   );
diff --git a/packages/widget/tests/utils/services/tracking-service.ts b/packages/widget/tests/utils/services/tracking-service.ts
index fd52102d7..5b84fcf03 100644
--- a/packages/widget/tests/utils/services/tracking-service.ts
+++ b/packages/widget/tests/utils/services/tracking-service.ts
@@ -1,23 +1,27 @@
 import { Effect, Layer, Ref } from "effect";
 import { TrackingService } from "../../../src/services/tracking/tracking-service";
 import type {
-  Properties,
+  AnyTrackEventProperties,
+  AnyTrackPageProperties,
   TrackEventKey,
   TrackPageKey,
 } from "../../../src/services/tracking/types";
 
 export type TrackedEvent = Readonly<{
   readonly event: TrackEventKey;
-  readonly properties?: Properties;
+  readonly properties?: AnyTrackEventProperties;
 }>;
 
 export type TrackedPageView = Readonly<{
   readonly page: TrackPageKey;
-  readonly properties?: Properties;
+  readonly properties?: AnyTrackPageProperties;
 }>;
 
 export type TestTrackingOptions = Readonly<{
-  readonly trackEvent?: TrackingService["Service"]["trackEvent"];
+  readonly trackEvent?: (
+    event: TrackEventKey,
+    properties?: AnyTrackEventProperties
+  ) => Effect.Effect<void>;
 }>;
 
 export const makeTestTracking = Effect.fn("makeTestTracking")(function* (
@@ -27,9 +31,12 @@ export const makeTestTracking = Effect.fn("makeTestTracking")(function* (
   const pageViews = yield* Ref.make<ReadonlyArray<TrackedPageView>>([]);
   const trackEvent = Effect.fn("makeTestTracking.trackEvent")(function* (
     event: TrackEventKey,
-    properties?: Properties
+    properties?: AnyTrackEventProperties
   ) {
-    yield* Ref.update(events, (current) => [...current, { event, properties }]);
+    yield* Ref.update(events, (current) => [
+      ...current,
+      properties === undefined ? { event } : { event, properties },
+    ]);
     if (!options.trackEvent) return;
     if (properties === undefined) {
       yield* options.trackEvent(event);
@@ -39,11 +46,11 @@ export const makeTestTracking = Effect.fn("makeTestTracking")(function* (
   });
   const trackPageView = Effect.fn("makeTestTracking.trackPageView")(function* (
     page: TrackPageKey,
-    properties?: Properties
+    properties?: AnyTrackPageProperties
   ) {
     yield* Ref.update(pageViews, (current) => [
       ...current,
-      { page, properties },
+      properties === undefined ? { page } : { page, properties },
     ]);
   });
   const service = TrackingService.of({
diff --git a/packages/widget/tests/utils/transaction-workflow-test-kit.test.ts b/packages/widget/tests/utils/transaction-workflow-test-kit.test.ts
index 5952ab9d7..185edac1f 100644
--- a/packages/widget/tests/utils/transaction-workflow-test-kit.test.ts
+++ b/packages/widget/tests/utils/transaction-workflow-test-kit.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "@effect/vitest";
-import { Cause, Context, Effect, Exit, Layer } from "effect";
+import { Cause, Context, Effect, Exit, Layer, Schema } from "effect";
+import { ActionId as BorrowActionId } from "../../src/domain/borrow/ids";
 import type { WalletAddress } from "../../src/domain/identity/identifiers";
 import { WalletScopeOwnerKey } from "../../src/domain/wallet/wallet-scope";
 import { BorrowOperations } from "../../src/services/api/operations";
@@ -16,6 +17,7 @@ const owner = new WalletScopeOwnerKey({
   address: "0x0000000000000000000000000000000000000001" as WalletAddress,
   network: "ethereum",
 });
+const borrowActionId = Schema.decodeSync(BorrowActionId)("id");
 
 describe("makeTransactionWorkflowTestKit", () => {
   it.effect("provides a fresh Workflow layer and adapter controls", () =>
@@ -51,7 +53,7 @@ describe("makeTransactionWorkflowTestKit", () => {
       const context = yield* Layer.build(kit.layer);
 
       expect(
-        yield* Context.get(context, BorrowOperations).getAction("id")
+        yield* Context.get(context, BorrowOperations).getAction(borrowActionId)
       ).toBe(null);
     })
   );
@@ -63,7 +65,7 @@ describe("makeTransactionWorkflowTestKit", () => {
       });
       const context = yield* Layer.build(kit.layer);
       const exit = yield* Effect.exit(
-        Context.get(context, BorrowOperations).getAction("id")
+        Context.get(context, BorrowOperations).getAction(borrowActionId)
       );
 
       expect(Exit.isFailure(exit)).toBe(true);
diff --git a/packages/widget/tests/utils/wallet-connect-picker.tsx b/packages/widget/tests/utils/wallet-connect-picker.tsx
index 1f5c8b3c9..6875183e8 100644
--- a/packages/widget/tests/utils/wallet-connect-picker.tsx
+++ b/packages/widget/tests/utils/wallet-connect-picker.tsx
@@ -82,7 +82,9 @@ const fakeWallet =
               })
             )
           ),
-          installUrl: wallet.injected.installUrl,
+          ...(wallet.injected.installUrl === undefined
+            ? {}
+            : { installUrl: wallet.injected.installUrl }),
         }
       : { _tag: "Remote" },
     chainGroup: wallet.family
@@ -299,7 +301,9 @@ export const makeWalletConnectPicker = Effect.fn("makeWalletConnectPicker")(
           settings={getTestWidgetConfig({
             apiKey: "test-api-key",
             disableInjectedProviderDiscovery: announcedWallets.length === 0,
-            initialChain: options.initialChain,
+            ...(options.initialChain === undefined
+              ? {}
+              : { initialChain: options.initialChain }),
             variant: "default",
           })}
         >
diff --git a/packages/widget/tests/utils/wallet-connect.ts b/packages/widget/tests/utils/wallet-connect.ts
index f7732f991..7aefe63e1 100644
--- a/packages/widget/tests/utils/wallet-connect.ts
+++ b/packages/widget/tests/utils/wallet-connect.ts
@@ -11,6 +11,7 @@ import {
   WalletConnectNamespaceSchema,
   type WalletConnectProtocol,
   type WalletConnectSignClient,
+  WalletConnectTopic,
   walletConnectSessionHint,
   walletConnectSessionOwners,
 } from "../../src/services/wallet/internal/platform/wallet-connect-protocol";
@@ -58,6 +59,7 @@ export const walletConnectSession = (input: {
 const decodeTopic = Schema.decodeUnknownOption(
   Schema.Struct({ topic: Schema.String })
 );
+const toTopic = Schema.decodeSync(WalletConnectTopic);
 const decodeNamespaced = Schema.decodeUnknownOption(
   Schema.Struct({
     topic: Schema.String,
@@ -94,11 +96,12 @@ export type FakeSignClient = Readonly<{
  */
 export const makeFakeSignClient = (
   options: {
-    readonly sessions?: ReadonlyArray<unknown>;
-    readonly request?: (input: RequestInput) => Promise<unknown>;
+    // Forwarded from fixtures' own optional options.
+    readonly sessions?: ReadonlyArray<unknown> | undefined;
+    readonly request?: ((input: RequestInput) => Promise<unknown>) | undefined;
   } = {}
 ): FakeSignClient => {
-  const ended = new Set<(topic: string) => void>();
+  const ended = new Set<(topic: WalletConnectTopic) => void>();
   const pending: Array<PromiseWithResolvers<unknown>> = [];
   const state: FakeSignClient["state"] = {
     sessions: options.sessions ?? [],
@@ -161,7 +164,7 @@ export const makeFakeSignClient = (
     reject: (cause) => nextApproval().reject(cause),
     end: (topic) => {
       removeSession(topic);
-      for (const listener of ended) listener(topic);
+      for (const listener of ended) listener(toTopic(topic));
     },
   };
 };
@@ -292,7 +295,7 @@ export const makeWalletConnectTestStore = (
       yield* walletConnectSessionHint(store).set(true).pipe(Effect.orDie);
       const owners = walletConnectSessionOwners(store);
       for (const [topic, namespace] of Object.entries(approved))
-        yield* owners.set(topic, namespace).pipe(Effect.orDie);
+        yield* owners.set(toTopic(topic), namespace).pipe(Effect.orDie);
     }
     return store;
   });
diff --git a/packages/widget/vite/vite.config.base.ts b/packages/widget/vite/vite.config.base.ts
index bf262eec1..9540c3c51 100644
--- a/packages/widget/vite/vite.config.base.ts
+++ b/packages/widget/vite/vite.config.base.ts
@@ -30,7 +30,7 @@ const chunkRelativePath = (filename: string, hostId: string) => {
 // and Vite hosts detect and copy into their own output. It resolves against
 // the chunk, so it stays correct wherever the host serves `dist`. Worker sites
 // wrap it once more; `hostBundlerOutputPlugin` collapses those.
-export const chunkRelativeAssetUrls: UserConfig["experimental"] = {
+export const chunkRelativeAssetUrls: NonNullable<UserConfig["experimental"]> = {
   renderBuiltUrl: (filename, { hostId, hostType }) =>
     hostType === "js"
       ? {
@@ -65,7 +65,7 @@ export const getConfig = (
       },
       plugins: [
         ...(options?.plugins ?? []),
-        nodePolyfills({ include: ["buffer", "crypto"] }),
+        nodePolyfills({ include: ["buffer", "crypto", "stream"] }),
         macros(),
         react({
           compiler: true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b7da463c7..3bfb393a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,161 +1,3 @@
----
-lockfileVersion: '9.0'
-
-importers:
-
-  .:
-    configDependencies: {}
-    packageManagerDependencies:
-      pnpm:
-        specifier: '12'
-        version: 12.14.0
-
-packages:
-
-  '@pnpm/exe.android-arm64@12.14.0':
-    resolution: {integrity: sha512-+iSh7x21C3A2hqc+Z0ZmbKTcn6YNlzrXM142PsnQH/dLj0DYxFzoBvc6XAnL/yfQ5nnH2ebBiRj/zVxr61fZbQ==}
-    cpu: [arm64]
-    os: [android]
-
-  '@pnpm/exe.android-x64@12.14.0':
-    resolution: {integrity: sha512-qT+0LqEr2wBVaxcG2T8cX/R8SSRz2Rvpp8nRR4fh8tnGUZRch87gFmsHUAoSQh7w6j1h0qTjrA384j4xi8frvw==}
-    cpu: [x64]
-    os: [android]
-
-  '@pnpm/exe.darwin-arm64@12.14.0':
-    resolution: {integrity: sha512-tnrdUB8ecJoehuKKqi1YHCBVl61xtJ9XVGcx5EviC6fWO4DeGI8GtXrjvJxDBM3nuVjJeWistgsUp/N142x4sw==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@pnpm/exe.darwin-x64@12.14.0':
-    resolution: {integrity: sha512-vlBfGkruqQRsEHTW43cPwpYd7QlbIJ//cvpAdb3bVXkI8SgTPoXhCnc05m+ZNiPrrEkBsX/t7KHw9aXpkzPm3Q==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@pnpm/exe.freebsd-x64@12.14.0':
-    resolution: {integrity: sha512-Qg5rxBrGYl6Tfso+EyygPf84fY1Fzy55E/0or+iuYKtnf0vc0MlHJfVIlT7pBukMRntQHRik7hUi0Z4s7AlJsw==}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@pnpm/exe.linux-arm64-musl@12.14.0':
-    resolution: {integrity: sha512-DRIe4yQkXBGA/PhVJdzlbnllxBdAtnMMvTVLLcGpsK5FvJz9kxD2Hyxtn68ovmNkVX06f6p45cQwfm3wx2jn1A==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@pnpm/exe.linux-arm64@12.14.0':
-    resolution: {integrity: sha512-7joGShZ44Nk3WpNU+60JoOPjCXlgxhJAq11S2UiVtwCUDgTer1yTPPfxGW8pxaD6046actYLIYDbZNlubHWs0A==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@pnpm/exe.linux-ppc64@12.14.0':
-    resolution: {integrity: sha512-gSoryn7ySdXd//gjgf3MvvA8ZerJayaSbuMZMtAWq4vb2/wlVEgpl0Kvqt54y58TRj533Qjq2txKgnxd4JyoAQ==}
-    cpu: [ppc64]
-    os: [linux]
-    libc: [glibc]
-
-  '@pnpm/exe.linux-riscv64@12.14.0':
-    resolution: {integrity: sha512-EMjew1H9WqQ7pL+tYqCPwiuB+0PeCiJRV7fyWeuFw0wwYUajFBjcaPO3IGAVu9sdmJDU+e+HYv/Zey6aKae0Vw==}
-    cpu: [riscv64]
-    os: [linux]
-    libc: [glibc]
-
-  '@pnpm/exe.linux-s390x@12.14.0':
-    resolution: {integrity: sha512-shYOj/SFoXD35fHe0pWr2JofwSXulC0BnEIXLj2QokDi0EF//AfKsui35yKIkTEl+s2VJybc3PO4iJNhKIj5Qw==}
-    cpu: [s390x]
-    os: [linux]
-    libc: [glibc]
-
-  '@pnpm/exe.linux-x64-musl@12.14.0':
-    resolution: {integrity: sha512-btZiZ2Ot0llKK1ndSfA5i3IRX7/S0VrmzseNH/BJ4c+Cady+S81H6vvU1zByggHMyqQhC8OgxO5PiIY7D9bH0Q==}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@pnpm/exe.linux-x64@12.14.0':
-    resolution: {integrity: sha512-F6K8e/jWxiuEYJaQtRRUG9ynBSTEHa+t7Lf86MKuOO5UA7WVVMbi+oB8nY6iKW++ncWS2yG6T9faXZGxqNsfoQ==}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@pnpm/exe.win32-arm64@12.14.0':
-    resolution: {integrity: sha512-DOjlkVB6TtTKeAAe0hNZXn5S7YqESmo1Z6SGbR4BZNQ4isRg31XVHjX2RFTbY8gnZq68IwzyLmPqlEjMmYxofg==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@pnpm/exe.win32-x64@12.14.0':
-    resolution: {integrity: sha512-/LSX6mew/sLf08XqcjemuklNKf1K/Ftpgj4//hK/HKzI2dKbmxDB27a/2OaQ5a0O3/3OFzlssXDziZsi+yVBwQ==}
-    cpu: [x64]
-    os: [win32]
-
-  pnpm@12.14.0:
-    resolution: {integrity: sha512-wYum2HmT09Fky16JSPMrLAbuhUSH4GzY2GeBNC+z5btGNDZwNHEehoArqpw3vqkGzhkprQjXCITJfYAd8TOJpg==}
-    engines: {node: '>=18.*'}
-    hasBin: true
-
-snapshots:
-
-  '@pnpm/exe.android-arm64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.android-x64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.darwin-arm64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.darwin-x64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.freebsd-x64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-arm64-musl@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-arm64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-ppc64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-riscv64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-s390x@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-x64-musl@12.14.0':
-    optional: true
-
-  '@pnpm/exe.linux-x64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.win32-arm64@12.14.0':
-    optional: true
-
-  '@pnpm/exe.win32-x64@12.14.0':
-    optional: true
-
-  pnpm@12.14.0:
-    optionalDependencies:
-      '@pnpm/exe.android-arm64': 12.14.0
-      '@pnpm/exe.android-x64': 12.14.0
-      '@pnpm/exe.darwin-arm64': 12.14.0
-      '@pnpm/exe.darwin-x64': 12.14.0
-      '@pnpm/exe.freebsd-x64': 12.14.0
-      '@pnpm/exe.linux-arm64': 12.14.0
-      '@pnpm/exe.linux-arm64-musl': 12.14.0
-      '@pnpm/exe.linux-ppc64': 12.14.0
-      '@pnpm/exe.linux-riscv64': 12.14.0
-      '@pnpm/exe.linux-s390x': 12.14.0
-      '@pnpm/exe.linux-x64': 12.14.0
-      '@pnpm/exe.linux-x64-musl': 12.14.0
-      '@pnpm/exe.win32-arm64': 12.14.0
-      '@pnpm/exe.win32-x64': 12.14.0
-
----
 lockfileVersion: '9.0'
 
 settings:
@@ -165,11 +7,11 @@ settings:
 catalogs:
   default:
     '@angular/build':
-      specifier: 22.2.3
-      version: 22.2.3
+      specifier: 22.2.4
+      version: 22.2.4
     '@angular/cli':
-      specifier: 22.2.3
-      version: 22.2.3
+      specifier: 22.2.4
+      version: 22.2.4
     '@angular/common':
       specifier: 22.2.3
       version: 22.2.3
@@ -189,8 +31,8 @@ catalogs:
       specifier: 0.51.0
       version: 0.51.0
     '@biomejs/biome':
-      specifier: ^2.5.15
-      version: 2.5.15
+      specifier: ^2.6.3
+      version: 2.6.3
     '@commitlint/cli':
       specifier: ^21.2.4
       version: 21.2.4
@@ -219,29 +61,29 @@ catalogs:
       specifier: jsr:2.7.1
       version: 2.7.1
     '@effect/atom-react':
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     '@effect/openapi-generator':
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     '@effect/platform-browser':
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     '@effect/platform-node':
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     '@effect/tsgo':
-      specifier: 0.56.0
-      version: 0.56.0
+      specifier: 0.63.0
+      version: 0.63.0
     '@effect/vitest':
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     '@ledgerhq/wallet-api-client':
-      specifier: ^1.16.0
-      version: 1.16.0
+      specifier: ^1.17.0
+      version: 1.17.0
     '@ledgerhq/wallet-api-core':
-      specifier: ^2.1.0
-      version: 2.1.0
+      specifier: ^2.2.0
+      version: 2.2.0
     '@luno-kit/core':
       specifier: ^0.0.13
       version: 0.0.13
@@ -300,8 +142,8 @@ catalogs:
       specifier: ^1.99.0
       version: 1.99.0
     '@tanstack/react-virtual':
-      specifier: ^3.14.21
-      version: 3.14.21
+      specifier: ^3.14.23
+      version: 3.14.23
     '@ton/core':
       specifier: ^0.63.1
       version: 0.63.1
@@ -321,8 +163,8 @@ catalogs:
       specifier: ^1.3.0
       version: 1.3.0
     '@types/node':
-      specifier: ^26.6.5
-      version: 26.6.5
+      specifier: ^24.19.2
+      version: 24.19.2
     '@types/react':
       specifier: 19.3.0
       version: 19.3.0
@@ -369,8 +211,8 @@ catalogs:
       specifier: 2.23.7
       version: 2.23.7
     '@zama-fhe/sdk':
-      specifier: 3.7.0
-      version: 3.7.0
+      specifier: 3.7.1
+      version: 3.7.1
     aria-hidden:
       specifier: ^1.2.6
       version: 1.2.6
@@ -393,11 +235,11 @@ catalogs:
       specifier: ^0.10.1
       version: 0.10.1
     dependency-cruiser:
-      specifier: ^18.6.0
-      version: 18.6.0
+      specifier: ^18.7.0
+      version: 18.7.0
     effect:
-      specifier: 4.0.5
-      version: 4.0.5
+      specifier: 4.1.0
+      version: 4.1.0
     esbuild:
       specifier: ^0.28.2
       version: 0.28.2
@@ -405,20 +247,20 @@ catalogs:
       specifier: ^9.1.7
       version: 9.1.7
     i18next:
-      specifier: ^26.5.2
-      version: 26.5.2
+      specifier: ^26.5.11
+      version: 26.5.11
     i18next-browser-languagedetector:
-      specifier: ^8.2.1
-      version: 8.2.1
+      specifier: ^8.2.3
+      version: 8.2.3
     jscpd:
-      specifier: 5.4.1
-      version: 5.4.1
+      specifier: 5.4.2
+      version: 5.4.2
     jsdom:
       specifier: ^30.1.3
       version: 30.1.3
     knip:
-      specifier: ^6.42.0
-      version: 6.42.0
+      specifier: ^6.43.0
+      version: 6.43.0
     mipd:
       specifier: ^0.0.7
       version: 0.0.7
@@ -426,14 +268,14 @@ catalogs:
       specifier: ^2.84.0
       version: 2.84.0
     motion:
-      specifier: 14.3.1
-      version: 14.3.1
+      specifier: 14.6.0
+      version: 14.6.0
     msw:
       specifier: ^3.0.3
       version: 3.0.3
     next:
-      specifier: ^16.4.2
-      version: 16.4.2
+      specifier: ^16.4.3
+      version: 16.4.3
     oxc-transform-react:
       specifier: ^0.152.0
       version: 0.152.0
@@ -450,8 +292,8 @@ catalogs:
       specifier: ^19.3.1
       version: 19.3.1
     react-i18next:
-      specifier: ^17.1.0
-      version: 17.1.0
+      specifier: ^17.1.9
+      version: 17.1.9
     react-loading-skeleton:
       specifier: ^3.5.0
       version: 3.5.0
@@ -459,8 +301,8 @@ catalogs:
       specifier: ^2.7.2
       version: 2.7.2
     react-router:
-      specifier: ^8.4.0
-      version: 8.4.0
+      specifier: ^8.5.0
+      version: 8.5.0
     recharts:
       specifier: ^3.10.1
       version: 3.10.1
@@ -486,11 +328,11 @@ catalogs:
       specifier: ^0.23.3
       version: 0.23.3
     viem:
-      specifier: ^2.57.7
-      version: 2.57.7
+      specifier: ^2.57.11
+      version: 2.57.11
     vite:
-      specifier: ^8.3.4
-      version: 8.3.4
+      specifier: ^8.3.5
+      version: 8.3.5
     vite-plugin-node-polyfills:
       specifier: ^0.28.0
       version: 0.28.0
@@ -501,15 +343,15 @@ catalogs:
       specifier: ^2.3.0
       version: 2.3.0
     wagmi:
-      specifier: 3.7.7
-      version: 3.7.7
+      specifier: 3.7.9
+      version: 3.7.9
     yaml:
       specifier: ^2.9.1
       version: 2.9.1
 
 overrides:
   '@reown/appkit': 1.8.24
-  '@angular/build>vite': ^8.3.4
+  '@angular/build>vite': ^8.3.5
   chain-registry>@chain-registry/types: 0.50.410
 
 packageExtensionsChecksum: sha256-FZ9pA8g2+w7cg8p8CU69qpPAEhtGVHP/kzcJxOvNvcM=
@@ -523,7 +365,7 @@ importers:
         version: 0.51.0
       '@biomejs/biome':
         specifier: 'catalog:'
-        version: 2.5.15
+        version: 2.6.3
       '@commitlint/cli':
         specifier: 'catalog:'
         version: 21.2.4(conventional-commits-parser@7.1.2)(typescript@7.0.2)
@@ -532,7 +374,7 @@ importers:
         version: 21.2.4
       '@effect/tsgo':
         specifier: 'catalog:'
-        version: 0.56.0
+        version: 0.63.0
       husky:
         specifier: 'catalog:'
         version: 9.1.7
@@ -563,13 +405,16 @@ importers:
     devDependencies:
       '@angular/build':
         specifier: 'catalog:'
-        version: 22.2.3(@angular/compiler-cli@22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3))(@angular/compiler@22.2.3)(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(@angular/platform-browser@22.2.3(@angular/common@22.2.3(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2)))(@types/node@26.6.5)(jiti@2.7.0)(less@4.2.2)(postcss@8.5.31)(rollup@4.53.3)(supports-color@8.1.1)(terser@5.48.0)(tslib@2.8.1)(tsx@4.23.15)(typescript@6.0.3)(vitest@5.0.5)(yaml@2.9.1)
+        version: 22.2.4(@angular/compiler-cli@22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3))(@angular/compiler@22.2.3)(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(@angular/platform-browser@22.2.3(@angular/common@22.2.3(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2)))(@types/node@24.19.2)(jiti@2.7.0)(less@4.2.2)(postcss@8.5.31)(rollup@4.53.3)(supports-color@8.1.1)(terser@5.48.0)(tslib@2.8.1)(tsx@4.23.15)(typescript@6.0.3)(vitest@5.0.5)(yaml@2.9.1)
       '@angular/cli':
         specifier: 'catalog:'
-        version: 22.2.3(@types/node@26.6.5)(chokidar@5.0.0)
+        version: 22.2.4(@types/node@24.19.2)(chokidar@5.0.0)
       '@angular/compiler-cli':
         specifier: 'catalog:'
         version: 22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3)
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.19.2
       serve:
         specifier: 'catalog:'
         version: 14.2.6(supports-color@8.1.1)
@@ -590,7 +435,7 @@ importers:
         version: link:../../widget
       next:
         specifier: 'catalog:'
-        version: 16.4.2(@babel/core@7.29.7(supports-color@8.1.1))(@types/node@26.6.5)(babel-plugin-react-compiler@1.0.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(sass@1.104.1)
+        version: 16.4.3(@babel/core@7.29.7(supports-color@8.1.1))(@types/node@24.19.2)(babel-plugin-react-compiler@1.0.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(sass@1.104.1)
       react:
         specifier: 'catalog:'
         version: 19.3.1
@@ -600,7 +445,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: 'catalog:'
-        version: 26.6.5
+        version: 24.19.2
       '@types/react':
         specifier: 'catalog:'
         version: 19.3.0
@@ -623,6 +468,9 @@ importers:
         specifier: 'catalog:'
         version: 19.3.1(react@19.3.1)
     devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.19.2
       '@types/react':
         specifier: 'catalog:'
         version: 19.3.0
@@ -634,10 +482,10 @@ importers:
         version: typescript@7.0.2
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       vite:
         specifier: 'catalog:'
-        version: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+        version: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
   packages/examples/with-vite-bundled:
     dependencies:
@@ -645,12 +493,15 @@ importers:
         specifier: workspace:*
         version: link:../../widget
     devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.19.2
       '@typescript/native':
         specifier: 'catalog:'
         version: typescript@7.0.2
       vite:
         specifier: 'catalog:'
-        version: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+        version: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
   packages/widget:
     dependencies:
@@ -696,25 +547,25 @@ importers:
         version: '@jsr/creit-tech__stellar-wallets-kit@2.7.1(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(@types/react@19.3.0)(bufferutil@4.0.9)(debug@4.4.3(supports-color@7.2.0))(encoding@0.1.13)(fastestsmallesttextencoderdecoder@1.0.22)(immer@11.1.15)(ioredis@5.10.1(supports-color@7.2.0))(near-api-js@5.1.1(encoding@0.1.13))(react@19.3.1)(supports-color@7.2.0)(tslib@2.8.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(utf-8-validate@5.0.10)(zod@3.25.76)'
       '@effect/atom-react':
         specifier: 'catalog:'
-        version: 4.0.5(effect@4.0.5)(react@19.3.1)(scheduler@0.28.0)
+        version: 4.1.0(effect@4.1.0)(react@19.3.1)(scheduler@0.28.0)
       '@effect/openapi-generator':
         specifier: 'catalog:'
-        version: 4.0.5(@effect/platform-node@4.0.5(bufferutil@4.0.9)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@5.0.10))(effect@4.0.5)(encoding@0.1.13)
+        version: 4.1.0(@effect/platform-node@4.1.0(bufferutil@4.0.9)(effect@4.1.0)(redis@6.2.1)(utf-8-validate@5.0.10))(effect@4.1.0)(encoding@0.1.13)
       '@effect/platform-browser':
         specifier: 'catalog:'
-        version: 4.0.5(effect@4.0.5)
+        version: 4.1.0(effect@4.1.0)
       '@effect/platform-node':
         specifier: 'catalog:'
-        version: 4.0.5(bufferutil@4.0.9)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@5.0.10)
+        version: 4.1.0(bufferutil@4.0.9)(effect@4.1.0)(redis@6.2.1)(utf-8-validate@5.0.10)
       '@effect/vitest':
         specifier: 'catalog:'
-        version: 4.0.5(effect@4.0.5)(vitest@5.0.5)
+        version: 4.1.0(effect@4.1.0)(vitest@5.0.5)
       '@ledgerhq/wallet-api-client':
         specifier: 'catalog:'
-        version: 1.16.0(@ton/crypto@3.3.0)(encoding@0.1.13)
+        version: 1.17.0(@ton/crypto@3.3.0)(encoding@0.1.13)
       '@ledgerhq/wallet-api-core':
         specifier: 'catalog:'
-        version: 2.1.0(@ton/crypto@3.3.0)(encoding@0.1.13)
+        version: 2.2.0(@ton/crypto@3.3.0)(encoding@0.1.13)
       '@luno-kit/core':
         specifier: 'catalog:'
         version: 0.0.13(@dedot/chaintypes@0.152.0(dedot@0.16.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)))(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(bufferutil@4.0.9)(debug@4.4.3(supports-color@7.2.0))(dedot@0.16.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(encoding@0.1.13)(ioredis@5.10.1(supports-color@7.2.0))(supports-color@7.2.0)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
@@ -723,7 +574,7 @@ importers:
         version: 1.9.1(@harmoniclabs/bytestring@1.0.0)(@harmoniclabs/crypto@0.3.0)(bufferutil@4.0.9)(encoding@0.1.13)(rxjs@7.8.2)(utf-8-validate@5.0.10)
       '@msw/playwright':
         specifier: 'catalog:'
-        version: 0.7.0(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(supports-color@7.2.0)
+        version: 0.7.0(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(supports-color@7.2.0)
       '@polkadot/types':
         specifier: 'catalog:'
         version: 17.0.2
@@ -768,7 +619,7 @@ importers:
         version: 1.99.0(bufferutil@4.0.9)(encoding@0.1.13)(typescript@6.0.3)(utf-8-validate@5.0.10)
       '@tanstack/react-virtual':
         specifier: 'catalog:'
-        version: 3.14.21(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
+        version: 3.14.23(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
       '@ton/core':
         specifier: 'catalog:'
         version: 0.63.1(@ton/crypto@3.3.0)
@@ -787,6 +638,9 @@ importers:
       '@tronweb3/tronwallet-adapter-tronlink':
         specifier: 'catalog:'
         version: 1.3.0(bufferutil@4.0.9)(debug@4.4.3(supports-color@7.2.0))(utf-8-validate@5.0.10)
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.19.2
       '@types/react':
         specifier: 'catalog:'
         version: 19.3.0
@@ -810,13 +664,13 @@ importers:
         version: 1.7.1(@vanilla-extract/css@1.21.3)
       '@vanilla-extract/vite-plugin':
         specifier: 'catalog:'
-        version: 5.2.6(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(yaml@2.9.1)
+        version: 5.2.6(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(yaml@2.9.1)
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       '@vitest/browser-playwright':
         specifier: 'catalog:'
-        version: 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
+        version: 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
       '@vitest/ui':
         specifier: 'catalog:'
         version: 5.0.5(vitest@5.0.5)
@@ -834,7 +688,7 @@ importers:
         version: 2.23.7(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(bufferutil@4.0.9)(encoding@0.1.13)(ioredis@5.10.1(supports-color@7.2.0))(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       '@zama-fhe/sdk':
         specifier: 'catalog:'
-        version: 3.7.0(@tanstack/query-core@5.104.1)(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
+        version: 3.7.1(@tanstack/query-core@5.104.1)(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
       autoprefixer:
         specifier: 'catalog:'
         version: 10.6.1(postcss@8.5.31)
@@ -855,28 +709,28 @@ importers:
         version: 0.10.1
       dependency-cruiser:
         specifier: 'catalog:'
-        version: 18.6.0
+        version: 18.7.0
       effect:
         specifier: 'catalog:'
-        version: 4.0.5
+        version: 4.1.0
       esbuild:
         specifier: 'catalog:'
         version: 0.28.2
       i18next:
         specifier: 'catalog:'
-        version: 26.5.2(typescript@6.0.3)
+        version: 26.5.11(typescript@6.0.3)
       i18next-browser-languagedetector:
         specifier: 'catalog:'
-        version: 8.2.1
+        version: 8.2.3
       jscpd:
         specifier: 'catalog:'
-        version: 5.4.1
+        version: 5.4.2
       jsdom:
         specifier: 'catalog:'
         version: 30.1.3(@noble/hashes@2.4.0)
       knip:
         specifier: 'catalog:'
-        version: 6.42.0
+        version: 6.43.0
       mipd:
         specifier: 'catalog:'
         version: 0.0.7(typescript@6.0.3)
@@ -885,10 +739,10 @@ importers:
         version: 2.84.0
       motion:
         specifier: 'catalog:'
-        version: 14.3.1(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
+        version: 14.6.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
       msw:
         specifier: 'catalog:'
-        version: 3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       oxc-transform-react:
         specifier: 'catalog:'
         version: 0.152.0
@@ -906,13 +760,13 @@ importers:
         version: 19.3.1(react@19.3.1)
       react-i18next:
         specifier: 'catalog:'
-        version: 17.1.0(i18next@26.5.2(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10))(react@19.3.1)(typescript@6.0.3)
+        version: 17.1.9(i18next@26.5.11(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10))(react@19.3.1)(typescript@6.0.3)
       react-loading-skeleton:
         specifier: 'catalog:'
         version: 3.5.0(react@19.3.1)
       react-router:
         specifier: 'catalog:'
-        version: 8.4.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
+        version: 8.5.0(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
       recharts:
         specifier: 'catalog:'
         version: 3.10.1(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react-is@19.2.8)(react@19.3.1)(redux@5.0.1)
@@ -924,25 +778,25 @@ importers:
         version: 6.0.3
       unplugin-macros:
         specifier: 'catalog:'
-        version: 0.23.3(esbuild@0.28.2)(rolldown@1.2.12)(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 0.23.3(esbuild@0.28.2)(rolldown@1.2.15)(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       viem:
         specifier: 'catalog:'
-        version: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+        version: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       vite:
         specifier: 'catalog:'
-        version: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+        version: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
       vite-plugin-node-polyfills:
         specifier: 'catalog:'
-        version: 0.28.0(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 0.28.0(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       vitest:
         specifier: 'catalog:'
-        version: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+        version: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       vitest-browser-react:
         specifier: 'catalog:'
         version: 2.3.0(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(vitest@5.0.5)
       wagmi:
         specifier: 'catalog:'
-        version: 3.7.7(99b8730116978f49449686857a28056d)
+        version: 3.7.9(640e0b218d143fe9b3ac1890c799c254)
       yaml:
         specifier: 'catalog:'
         version: 2.9.1
@@ -965,13 +819,13 @@ packages:
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
 
-  '@angular-devkit/architect@0.2202.3':
-    resolution: {integrity: sha512-/605FxTg8Kt5fqNuIBVZMfuiNwIf+CTNsiYnHY85/7OTqCNkEwdkXKc3DiFM2KlR/AV2g64GkvHgHqxHzYh34g==}
+  '@angular-devkit/architect@0.2202.4':
+    resolution: {integrity: sha512-hafew1tft3+bnv+DjAtLDEq/Yx5/UyAz/+M4VC5EWQQhcFCN81X47szTX3F9dNeiZIQb8d/WmCnmlbHz6CyupA==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     hasBin: true
 
-  '@angular-devkit/core@22.2.3':
-    resolution: {integrity: sha512-bi1oBjJeg1XCgRrBYSuJikaJV4sO/mcnyFE/0a1H646yHhQpVYoU/M2Vh69Qv8h+YoMfC7RuSxT4LZHaubhhLw==}
+  '@angular-devkit/core@22.2.4':
+    resolution: {integrity: sha512-HDlsVK/qN7p5ttKgPvVLo87yrN0UcHR7OyQo1n/lvvMQcYrA0n01E+ix4t+q4C04ifpMbNQtrK0I1222OKi99w==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       chokidar: ^5.0.0
@@ -979,12 +833,12 @@ packages:
       chokidar:
         optional: true
 
-  '@angular-devkit/schematics@22.2.3':
-    resolution: {integrity: sha512-+XfBViIGqiFQK8KJXA6PgANX9tLuMO/x8GFjlzEmA4LIe9ikAtpGZw+Ezo547BIJQoJBIKCJYR0knE4BmbFeSQ==}
+  '@angular-devkit/schematics@22.2.4':
+    resolution: {integrity: sha512-9pRNtcZN87yM7KQX+HTxGatrm86y30JxVwkF2WNG1pR0e9yeiYWc1KQ5hRS1Nq1LULoP95HApc+TBXqUXzF4Ag==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
-  '@angular/build@22.2.3':
-    resolution: {integrity: sha512-EtNEuPBUCyIuzdXrQ/nINvgFzW8bUI5AkAZtJiSn7nsFOlvaygaKN0kENNTO3zRl3T9B4GDog+Ks5Nec3FBkhg==}
+  '@angular/build@22.2.4':
+    resolution: {integrity: sha512-Emb3pxRkvf749NQ5cz4ux2h9Cnbxx3FmcupdXIaoRxIyNXM8JxjFDCLZTe0yGGOWv5+hSaoR7XESOcN134vBPw==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     peerDependencies:
       '@angular/compiler': ^22.0.0
@@ -994,7 +848,7 @@ packages:
       '@angular/platform-browser': ^22.0.0
       '@angular/platform-server': ^22.0.0
       '@angular/service-worker': ^22.0.0
-      '@angular/ssr': ^22.2.3
+      '@angular/ssr': ^22.2.4
       istanbul-lib-instrument: ^6.0.0
       karma: ^6.4.0
       less: ^4.2.0
@@ -1035,8 +889,8 @@ packages:
       vitest:
         optional: true
 
-  '@angular/cli@22.2.3':
-    resolution: {integrity: sha512-ObTX0DxJ0/PMl4pkUKI+uWPr7UC7Je94KpHP8l1lr3exhundapgr7VvNsozprJb1hMlOMDab6+quTReSYvF85Q==}
+  '@angular/cli@22.2.4':
+    resolution: {integrity: sha512-luD9gNbMV7ME7mv9cUatVE+WF8Ecqa8v9Zo47YZK/6EPQUKdLxeosGWlHtrvBXElK1YehHItrUbawtZQmQwwlg==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
     hasBin: true
 
@@ -1375,59 +1229,71 @@ packages:
     resolution: {integrity: sha512-R0XPZ/IQhU2TtetSFI9vI+7kJOJYNiCncn5ixEBW+/LNaZCo2HK37Mq3pRNzrM4FryuAkyeqY7Ujmj3I3e3t9g==}
     engines: {node: '>=16.0.0', npm: '>=7.0.0'}
 
-  '@biomejs/biome@2.5.15':
-    resolution: {integrity: sha512-WZTW4slm/pdkh92K6t/3aEN++44JD1PQ7squ7RCMLI1flHGl43DVOIGXvCjHiZgBMO1V4uYxoFNtqrIA4qGuIQ==}
+  '@biomejs/biome@2.6.3':
+    resolution: {integrity: sha512-va/0xPku7wnfzv+D8Zpdm5uKiGJWiV8neqoEPnRjvNQQwhl4tVXS4fETs4H0CCB2rGeqJ4cu9y4iOZOnOYKAUA==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.5.15':
-    resolution: {integrity: sha512-BZVzFhJ/mUvTLMYbc9x6el0o2Uv5zP7bACYyhFb6fSc1giroXm7PL0a5KqMJ9F+/BnkYRjagD/ROSDVOZ6eapg==}
+  '@biomejs/cli-android-arm64@2.6.3':
+    resolution: {integrity: sha512-5JD7QQDEHxdeEb4sftEHG+lsuUyu8Cob/hVLqRELbgGlFl68Rldv/PPi2k4dRjERZ/EItJ3O6Xmv8lqsEtUBiw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [android]
+
+  '@biomejs/cli-android-x64@2.6.3':
+    resolution: {integrity: sha512-70WOGKCgpT+Uqg6LFdTLqefV54/DypdZg+LnBQDO6AWvkgXO+9xhVClajQyDsIHYjnXMtI1pRO5sP+zMXlS/bw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [android]
+
+  '@biomejs/cli-darwin-arm64@2.6.3':
+    resolution: {integrity: sha512-ezf+XEKeyJ2yYlBhrzyEEHLvfRYrhtNKc6maLzR/WcAcBccb4RVDeFxsymjBve2LO0bpIMRUAiS90D4bUBRT0A==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.5.15':
-    resolution: {integrity: sha512-V5Kw63V+fVGNFhFrizDxMbGXAzZCh8kYzJpy3GI6gTapWDg7bZK9oYC9CbVgQSEdTnupz0U5Efz8Ev+5vdBBXw==}
+  '@biomejs/cli-darwin-x64@2.6.3':
+    resolution: {integrity: sha512-Lg2tFdg4elJo+7i707PpLMs6N1hATVt4kqDo6MD/q/VnPs8rsKReKXsz1TA5GNdfRVAQNJ5GRiyK2EwNptK+MA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.5.15':
-    resolution: {integrity: sha512-tGzZUTcJCV7tj5Adh/Gn6nR4MycqA3iohq2LEcrarAgRBkU0h0OKd2UzCRkOsOYOuUGaUJb4YmqRqyy2feGGSw==}
+  '@biomejs/cli-linux-arm64-musl@2.6.3':
+    resolution: {integrity: sha512-dYU70A89OFHzakQPE9VOPbE60JNcQt4mtxvUGQl+EgTkGtqCFxLD2RUn1SbiMu8Mu5xFscS1bfYDpoasaUrqNA==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-arm64@2.5.15':
-    resolution: {integrity: sha512-XaG7P7eeSLYETD3K9grfB0mQmpLQZjygdbsxekWBJAg4am79fGAtRpfRyNnTvXB2fZFNnJZG3nXm7HBat0+VUw==}
+  '@biomejs/cli-linux-arm64@2.6.3':
+    resolution: {integrity: sha512-8Stcvq98n1gs9VyLKuaWrnsd8kbXE2nKDAHtuLHGSYdGyNWN5JIIm5a28xdnmgdKzKHmiDgYyATetkEv7+zGow==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-linux-x64-musl@2.5.15':
-    resolution: {integrity: sha512-IlxUcyxilVGPsE008x13pWdkTbU3nQpP2i9b5UrbOYj6goBkKsRX1XB7yJLcV+O1H9LBchIIm4adOaVLZBX0ZQ==}
+  '@biomejs/cli-linux-x64-musl@2.6.3':
+    resolution: {integrity: sha512-j6eFjUcWSphmgVTbrobEMA0wdbfNHKrGi8hRsFkc17jeS1n7nHwFACxp6jWqe9sxQqyFAeyOgt2/1bOGVcbATA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-x64@2.5.15':
-    resolution: {integrity: sha512-xE4iEW/3LqlYj9GFgGrFsFSH51dEEpUbYWBfeOv0q87WkUDxK2o/HhreSb7qMJqck70RVM6Lg96hgedcAYcOkA==}
+  '@biomejs/cli-linux-x64@2.6.3':
+    resolution: {integrity: sha512-CShmx0bO6BngywT3minv8K1xsQX1ig1vsBqYTLnmDY3mBiDYHlaLRIsdHoM1pEU9dV3BN5a0uiH0IGDtYh9TWA==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-win32-arm64@2.5.15':
-    resolution: {integrity: sha512-2kPKzhNlm8C+Ru3GcO0Me2ODkCBLrVOUNuyi84RJyWDVKAA4+Kjj3jMjL938lF6BRfvltC4vB2nPY9SvN51Ovg==}
+  '@biomejs/cli-win32-arm64@2.6.3':
+    resolution: {integrity: sha512-00SthDxBPwNiT7IL/mOneif6fiEU1PXK875zhr+InpeZjovY1mF5tCuDhXo1Hh0GYyiKHKzLbItzn58SAyLhJQ==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.5.15':
-    resolution: {integrity: sha512-yAzh4UqEImV6Hcy0zjUqNfJAsUhoD64FBQCdTG8Md/Z2wQeVP/ZmJ3XRYAs1g8J9fjTFyl2fCtc5FB5til47+g==}
+  '@biomejs/cli-win32-x64@2.6.3':
+    resolution: {integrity: sha512-GhtOPphBWlnCepqpNk/w5eGN5oGRCzL20EbAkL1XCIpyboeVC9R642noyT43l8LSenGS4qz9IL8sKPfwY37V/Q==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -1813,81 +1679,81 @@ packages:
     resolution: {integrity: sha512-WXTuFvL3G+74SchFAtz3FgIYVOe196ycvGsMgvSH/8Goptb1qpIQtIuM4SOK9G9lhMWYpHxnXyy544ZhluFOew==}
     engines: {node: '>=6'}
 
-  '@effect/atom-react@4.0.5':
-    resolution: {integrity: sha512-tqTSiy0rWBitej7kPfvTSw29q4ipof52+txDg6bIBJx0ksHVzVXaFTsssDa+AZBeImafK0xmjm9m1XzPfE6k2A==}
+  '@effect/atom-react@4.1.0':
+    resolution: {integrity: sha512-PeaBDmwqG9BPQfaPHeWCB2NF4NQaFlI6poKxjlBHMrMjKqV+LVBdryhpDNqSZOhqGgT+qnh9gV+19MYjNOQ+bg==}
     peerDependencies:
-      effect: ^4.0.5
+      effect: ^4.1.0
       react: '>=19.0.0 <20.0.0'
       scheduler: '>=0.25.0 <0.29.0'
 
-  '@effect/openapi-generator@4.0.5':
-    resolution: {integrity: sha512-pksR5BhRKQQfDcpA8AbxCiAFLAbdnZseiRmgr1UtVi1x/IyEuS8WmXoFD1C424TEyS+n2Q6lPpR0ue/WQ743aw==}
+  '@effect/openapi-generator@4.1.0':
+    resolution: {integrity: sha512-GSi3GlaFru98Ma/U5/9Dr25GFyUxAk7o86L4w/FJyNunbE7ygZ6ZmN9TPiREo3SH5gCTC/xSzg95NJmJh69hnQ==}
     hasBin: true
     peerDependencies:
-      '@effect/platform-node': ^4.0.5
-      effect: ^4.0.5
+      '@effect/platform-node': ^4.1.0
+      effect: ^4.1.0
 
-  '@effect/platform-browser@4.0.5':
-    resolution: {integrity: sha512-o3H75xA91nkgIWOcp0XouIxxWxJEOFkTf7gG4qkQtZfy0tq46hJBI0U8jrUqsPruo2vCCNfM0yCoj5AG7F5BMQ==}
+  '@effect/platform-browser@4.1.0':
+    resolution: {integrity: sha512-IEyaPzejKozHDupOUSjQIgQYGv2C0I828up8z7/nvQTHzmQHUS2/tGMEwXX/FwAvnrWZ0H9MhlhTl18ZgCHQiQ==}
     peerDependencies:
-      effect: ^4.0.5
+      effect: ^4.1.0
 
-  '@effect/platform-node-shared@4.0.5':
-    resolution: {integrity: sha512-a8rCdEkfZBGe9C6bsIjxVZuRp73svIyK5IHwHdDAVsvZXjrbkxusfI+rZ8WlX31RP1mKizwI/E72GQTNfdMWHw==}
-    engines: {node: '>=18.0.0'}
+  '@effect/platform-node-shared@4.1.0':
+    resolution: {integrity: sha512-uYQfFRoxWLo8fIhiSeBcmz/R1ooOfE3HF3cWHFgxz82tZMk2Wn02BGABcdLmaAch9VpDLbtWnuhSxNyBsGMUFg==}
+    engines: {node: '>=22.19.0'}
     peerDependencies:
-      effect: ^4.0.5
+      effect: ^4.1.0
 
-  '@effect/platform-node@4.0.5':
-    resolution: {integrity: sha512-v4KD5fWvEUa4QmWFpZFbBsRhmfnTP6ETCME2r9ifyXVDPjhfpxpTZl41prjgQFMqZBHdWWCl7YC5ImbXv5ui5g==}
-    engines: {node: '>=18.0.0'}
+  '@effect/platform-node@4.1.0':
+    resolution: {integrity: sha512-v+X7moGVF9k5oMVvz0slA+NgtEod+W+oygeI285MDJgSlUCW3JcqElj+cD3rlijFZtpKhC7RLkU1GuCxjGHTpA==}
+    engines: {node: '>=22.19.0'}
     peerDependencies:
-      effect: ^4.0.5
+      effect: ^4.1.0
       redis: '>=5.0.0 <7.0.0'
 
-  '@effect/tsgo-darwin-arm64@0.56.0':
-    resolution: {integrity: sha512-08yYRU3OOw/jKzy582EF741xKvLJ2HK6GO+L2zuSR97b61ES7fER2fxg1xp4mv8u2Fc3bBRvk7026GzdKEGFgw==}
+  '@effect/tsgo-darwin-arm64@0.63.0':
+    resolution: {integrity: sha512-KBvYatuEol71+i+BERWuDRU9XE+4sTK78N83Ko6VNF5gy6yXiujj/bgtWs2P3cDGXsevAV6L+HtpuAWjAQKC6Q==}
     cpu: [arm64]
     os: [darwin]
 
-  '@effect/tsgo-darwin-x64@0.56.0':
-    resolution: {integrity: sha512-UQvYvVaam+EVMYm9gfHBx1WpKwLlW+ptjb2UD7qGhZdg+GzxMbl26AhuuqV2t/dN9shZ6EcFE2+++ThISMp/9g==}
+  '@effect/tsgo-darwin-x64@0.63.0':
+    resolution: {integrity: sha512-Qxp51/OFaHx5D+z5f1FtRKAiUH5rkMzaqjv/4ppUGNS0ppdqlcQ5rwQqbY6CiZOxqUlcnmKRirtWpmuxUgHP7w==}
     cpu: [x64]
     os: [darwin]
 
-  '@effect/tsgo-linux-arm64@0.56.0':
-    resolution: {integrity: sha512-zzzo/w7lLqiCMuJOI+jbjIuhHob3ccmth1bD9m1E98ukMuHhIqQMOXKU9EreoQkCGeoVrxGqHbXkl6E/+68/Sg==}
+  '@effect/tsgo-linux-arm64@0.63.0':
+    resolution: {integrity: sha512-uwnM3kSwaHDKPeU1WSMxijdZaM1NxpDREgJtyyIx2qdqB6HnRYhEZB8RrhWvYYPw1QDKaWHd+byzq5p49+o7+Q==}
     cpu: [arm64]
     os: [linux]
 
-  '@effect/tsgo-linux-arm@0.56.0':
-    resolution: {integrity: sha512-3WuPwP8vQPqKVpfGmKlnguuAZb7NGUyAhIHQjZnaINU6Aim7WczOy2WOmKjDPSKRlonU2WyYT+Q5T3B7f0VTLw==}
+  '@effect/tsgo-linux-arm@0.63.0':
+    resolution: {integrity: sha512-tVwlTyAqmDVPvDrr0oogCnlRVs96X19Ny9OD/XJ/6QQSp/1hIjXAvKjo9HAyncF2sAUQyVdF1E7Q7X3wFXvSnQ==}
     cpu: [arm]
     os: [linux]
 
-  '@effect/tsgo-linux-x64@0.56.0':
-    resolution: {integrity: sha512-R0d3dGf8qKPtvjff+J9HL0UjIBIES6xZiU16rMMezI4K52b+DGQkaWi1OX3tSgGivjlV+NSN7UhPJ2pYKufglw==}
+  '@effect/tsgo-linux-x64@0.63.0':
+    resolution: {integrity: sha512-fM3pJIhAZEX8LMbd/pN9iYNxkdVEkx68vMtILYGT4qazwxWelvouD/5fNV0SHDmY13Mv04NJ/550vTLC2hU8VA==}
     cpu: [x64]
     os: [linux]
 
-  '@effect/tsgo-win32-arm64@0.56.0':
-    resolution: {integrity: sha512-uVaLdXULUZx9U30YxlVu5PBiu+1a+9/UT2Ex7jQpIasnJy1CHWlhMbfCD/+7Ez1vqG5fLOvUESoQu5XSjs3Lnw==}
+  '@effect/tsgo-win32-arm64@0.63.0':
+    resolution: {integrity: sha512-LTS0CrEqZmQO0AJAIfFaETjIN/3d/Nda1Mi5zl90y/9BKZr4yyFfClCkz+DMl6/P/+TOuEQ5Wi8LvRiEdwWT4g==}
     cpu: [arm64]
     os: [win32]
 
-  '@effect/tsgo-win32-x64@0.56.0':
-    resolution: {integrity: sha512-Cf6SDixFTkp7Aoeg2eRwJps/2BG9lvx2m+iVRjUzxdqkTbCCNKmmOAIyDslNZm2sMwaDUw/iN/BPGqxx7xMxww==}
+  '@effect/tsgo-win32-x64@0.63.0':
+    resolution: {integrity: sha512-28s5YrwL26/7EUnUOu81IOJGJZLkPf2lPkiSIsd4EnFhimeBqP279bhAoDAEwLW1gv45GKM/49JKduXmdLyT1g==}
     cpu: [x64]
     os: [win32]
 
-  '@effect/tsgo@0.56.0':
-    resolution: {integrity: sha512-/S5G8RJjtaVjE/RhwFNTvWQwFAQyDGc+3Ig4Oynvlo3gJu8le4MUgM/DBjoiwkwBsQ+BhufGDCBpwojplerGlw==}
+  '@effect/tsgo@0.63.0':
+    resolution: {integrity: sha512-bRbvVj+YLE/nBmcBWGAwsul3mjEYlqqOmWMxvwSVKq/oNnJEuZYgi2OFDeUf7q49E2g3w+oMHMWyN2QayZ77RQ==}
     hasBin: true
 
-  '@effect/vitest@4.0.5':
-    resolution: {integrity: sha512-q64paZ/i4V2NiRhTyqCmT2KiDbFjlxc2EZrZca8GGt+Nf8844946HyJM5bPk/q+YeRkFSxIrlCs+J+LSfky/wA==}
+  '@effect/vitest@4.1.0':
+    resolution: {integrity: sha512-+APF69oTYgGj5WCewowk1/udepH74xz4ONyH7d+UfcK0SrF3osiSwsWEyODUpJvWd6MIk5F5PcFJiE4evMuG2A==}
     peerDependencies:
-      effect: ^4.0.5
+      effect: ^4.1.0
       vitest: '>=5.0.0 <6.0.0'
 
   '@emnapi/core@1.11.2':
@@ -2743,11 +2609,11 @@ packages:
   '@ledgerhq/logs@6.19.0':
     resolution: {integrity: sha512-kmWj18C7eTtuytdaWygzVrQm9EoD4YWuYnd/kY8stVBBAzRdJzrGlm013ijQF6I/kGLKlGY7JKmll6j32KGpfQ==}
 
-  '@ledgerhq/wallet-api-client@1.16.0':
-    resolution: {integrity: sha512-hkvFKOTLqbQRUblayJQkEm+6fdi8bCMUTW1YY9Ds0WYDwcBsy9N0xkRQvkduBndXm3MLXgrq10qDNKj1nNIecA==}
+  '@ledgerhq/wallet-api-client@1.17.0':
+    resolution: {integrity: sha512-etOLU7+s/wrARQK/WQ7tmUljuXOJjazDrbfEefAhARYxbIMDiN//vud0Vo0TjtAn9IFd8P81nAa2jry0+C8I/w==}
 
-  '@ledgerhq/wallet-api-core@2.1.0':
-    resolution: {integrity: sha512-+BHX58HXoT9UmpoZkWWey4lxIiQU48NxvxxOZ8RUfzozJyXPYnsKUMlHrvcI/b6USy5pX6lbPDj5n+gKk3jhZQ==}
+  '@ledgerhq/wallet-api-core@2.2.0':
+    resolution: {integrity: sha512-6n+b3HZP8M3oeTYXQIqChHfIEfPBND+v8h6ZhCNuEzmOh/Qlv7gXni4uEDrcNKPfzpOHJoNM4kRyTw5tXQh0bQ==}
 
   '@leichtgewicht/ip-codec@2.0.5':
     resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==}
@@ -3113,57 +2979,57 @@ packages:
     peerDependencies:
       near-api-js: ^4.0.0 || ^5.0.0
 
-  '@next/env@16.4.2':
-    resolution: {integrity: sha512-nTUTFH7G5/J/fmpkjVLegOkqyKOP0CEsJcMsyO4UCYeN1su+YMW/MfaSErnJskL7XM+UDK6aTvslxsRCyya/sA==}
+  '@next/env@16.4.3':
+    resolution: {integrity: sha512-a7tz1QCcWWkwC/rPJcPMJk/UNRu9CFhDd3OHYE5hddbJrs8BqRTalxI6GlKCWEGzRLHN+S/B7a4PAHCtm25aBQ==}
 
-  '@next/swc-darwin-arm64@16.4.2':
-    resolution: {integrity: sha512-ONkhFvZNFWlsEHOM/81AtxdyuJP2KRYKYR0JxPwvcu1AuPMMMgcL+wW2luldJvMtZwKtUxoSkCychW5wIeoYSw==}
+  '@next/swc-darwin-arm64@16.4.3':
+    resolution: {integrity: sha512-4yq5EXBt+VDtAZwTyfijaFp5D2C5oz3Ikw5a2kiX2K9nw72vrZX2q5UuAlkPtUMO1tQz6JTKpaKWjS7OOefTDQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@16.4.2':
-    resolution: {integrity: sha512-luPCMbOsCoaF+kXJEUjmjmOZg1lC3BflhmUu+ZmW4tBu2vW/4AXak8JBFvePizGkxVmNiAw/r9ra+6UviCWtWQ==}
+  '@next/swc-darwin-x64@16.4.3':
+    resolution: {integrity: sha512-1Rvkn/LUhnEF8WxnRkOrqGhbwXui1bkWFxONKIbN+r7C+9KHDSZ+iUoj4CzymVMWUyZIyx9szcb9+kbKhD500A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@16.4.2':
-    resolution: {integrity: sha512-xhwFTAncJyaCNy5KqKKuKaIIdCy1/1ZV1s5S1G0hhT7wGMkDTlfJ6aQbfRFnIG/s3/kDrxQ8aycVe+c5QnP8ow==}
+  '@next/swc-linux-arm64-gnu@16.4.3':
+    resolution: {integrity: sha512-dCKpXErGg3abUM6t5JTJV/ottVBTStJB5lRJTbgdUdQaQ+jNHiK56Hsc0YAEg/rinSh42hYG3HWiYmEMdilnxg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-arm64-musl@16.4.2':
-    resolution: {integrity: sha512-T1PNmfbPcxr5ndtWUL/3wQtLXsz808lq6sc2GrNT5k2oquF7UyqZddHSuAewHVsWsGXe6nsl9HoN1YNriVjuSg==}
+  '@next/swc-linux-arm64-musl@16.4.3':
+    resolution: {integrity: sha512-WwYbhWkhYBvBtib1K4W0kL8MW2snBD2A5b3SN4vPpqalZbZs5+bQ1yzAdepVoOqrFfEW3dmREy4Zs1MrWcrFbw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-linux-x64-gnu@16.4.2':
-    resolution: {integrity: sha512-N9cDUOCGtkJG5PNKDFZUF3xXndrJJcpLp121uAGjIGvO/U2p9tfdNOM9htj7+5f72l0m8rMw/cvYacUJBQoudg==}
+  '@next/swc-linux-x64-gnu@16.4.3':
+    resolution: {integrity: sha512-QymWvfUwDEC5/lpJOsxX5VAbyoR2D13+2Jsjz4be7gT4LPqEgdpkeLIR/HFfCLgKzoMhpJbp6I/JnogyNZHcaA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-x64-musl@16.4.2':
-    resolution: {integrity: sha512-yY2uh1YhX6ufuYy2FCbw1dqblbhI57GLYAJfCkqD9auTv6pLrH67Uccjc3QMKBeCYAG6lkgu08ExmX1bbjejjQ==}
+  '@next/swc-linux-x64-musl@16.4.3':
+    resolution: {integrity: sha512-Vmjd9D7DpA4Vv3cUlr82QWgJD/BQZmns801vtC5VWHg6jCIA4a5vMKpQnfrM2pyCrp2eV0ENdUg4PlN3bAc2Yw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-win32-arm64-msvc@16.4.2':
-    resolution: {integrity: sha512-j/ArWRIHpMMB6wYLMhr2puTguBt70lNU/Cmjl9p6dTDE8DGknYJMP9PdwPk2dqpCNL/KIX9yfngDvIesxJPmsg==}
+  '@next/swc-win32-arm64-msvc@16.4.3':
+    resolution: {integrity: sha512-lG1pPdPLk7gTyGb00n5JIMLdBJgjb+UEhSdZvFbhUMg0DyC6z4B7RnpSKF9VCd4imkLObVbXOFA0kFCpw7yFow==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@16.4.2':
-    resolution: {integrity: sha512-AA4edyWHDko3NCSo0x6GomsdgFb0oR1J3MXU1b5xt6FRFg4AucrMPW3S0hCe/9onU0O1BbpGQBsqo1r0Gneu1g==}
+  '@next/swc-win32-x64-msvc@16.4.3':
+    resolution: {integrity: sha512-NmQC9RkJdnPXRaMxtkCzobB3teVjqF33oSOnwDfi+XYGWWYpt+xlGK3mtktSKLbdjwaWbJu2OkkMiRFGUUncKg==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -3271,8 +3137,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@oxc-parser/binding-android-arm-eabi@0.154.0':
-    resolution: {integrity: sha512-sDdEtDl7vKdCvf54j72RJbowE3jCmyRz/+oOB6IAwQxAHZ0eI+Dcj4hvVnm0b9Dy31plUkdmfds9C+/Zt895Tg==}
+  '@oxc-parser/binding-android-arm-eabi@0.155.0':
+    resolution: {integrity: sha512-A6xv7hDtnTm+xlZ7utn6rRQpRMJHRhVr3gjRGqlx0RUX84mNk0pAsy6YN/wWhuOTkaZhRrrzaLxf0NfbH77j2w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
@@ -3283,8 +3149,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@oxc-parser/binding-android-arm64@0.154.0':
-    resolution: {integrity: sha512-UHrDPELzvWZoVkIDdSycj4bzcTMCJG3IbN++mSUgVBaUtNtWHjQ98U6Vz5bpF/1Ic3FYJyYhMr74huO5tVvpZw==}
+  '@oxc-parser/binding-android-arm64@0.155.0':
+    resolution: {integrity: sha512-T1wWwH9/JI5g7Z4kEQwDOwhToxdDhRyOTklH+uuNpJ16m3MZFmGl+l2rKc0NHQdbVRG2LTOBsNjpW3h1BWytPA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
@@ -3295,8 +3161,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@oxc-parser/binding-darwin-arm64@0.154.0':
-    resolution: {integrity: sha512-mokYzajOSXxtSRDWCdHARGdntrKH+rZZ24Jzo8AtafyNzz0NARmpMm26Tc5B6qiGrr6UliWibHCOif1qRN2vaA==}
+  '@oxc-parser/binding-darwin-arm64@0.155.0':
+    resolution: {integrity: sha512-ZoRB3qJxJ8DWA41jHja+YeB0lLfjBy4T+Kr15vnN1k65X3zbJt3rPZftEwN4Ju4tmA4K/T9dWWD7Z8ewQLnrVA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
@@ -3307,8 +3173,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@oxc-parser/binding-darwin-x64@0.154.0':
-    resolution: {integrity: sha512-WbtUBrclOVItWfLRSvs+Z/WLtXxJ2Ctv50PyuX894HzDN5/e0qzxVpTNPIVMzOerBhgKtFsSMcfxlYIAbvdVgg==}
+  '@oxc-parser/binding-darwin-x64@0.155.0':
+    resolution: {integrity: sha512-vxtL86BtM+IgrpejA86nbTk5j0HKTIMeuaJ1fQciw6p9RfavPtIPjI7gN34owap0yG9txXBaAWpGdxokNwdqIw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
@@ -3319,8 +3185,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@oxc-parser/binding-freebsd-x64@0.154.0':
-    resolution: {integrity: sha512-YooHZSLawOe2fqm+lDdG8oAaQh2NYV/RMYTYzWRLy72stm2BgE9O/8Al6kFENjkmzyyBccDLLBirGxVtpzQfrw==}
+  '@oxc-parser/binding-freebsd-x64@0.155.0':
+    resolution: {integrity: sha512-tN6Ru5e0UVnWaIuiH8jEwnvxuxg7FvhWwSd3oe5oDhOD4ObsSr9/N6WfHLjilUWlPPj65ptwrSDH0Y7lzwTzmw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
@@ -3331,8 +3197,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.154.0':
-    resolution: {integrity: sha512-hKOwhZbrXdTwc4bGVfbLCXl9f2swl6zWdISocLQSNX9MgPmwHE3qGzOUkCrkuGpwdCVHPnkfOwsqTuYsrP5uNg==}
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.155.0':
+    resolution: {integrity: sha512-h4ozA5n6L6lwolsz9iwunEhKWnIVbmFRots5QxEix0H6nJ5ICpuDa7PuShuhfpIDFe3+Qvyscioyiv+9g+4Syg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
@@ -3343,8 +3209,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.154.0':
-    resolution: {integrity: sha512-tnjiooXEU013349O/yxKbF5Cusp1CfHWQ8kYR8tGeRzR/P4sOpQGQo21fsS71M0fMD6ESLq+lbvXFWi43PuKeQ==}
+  '@oxc-parser/binding-linux-arm-musleabihf@0.155.0':
+    resolution: {integrity: sha512-058/+LardpfuUlsKIvBGk/CYoakEVcMgqYx8GgyUZeOxFWTojYLlCc1Gb60/y21v3esDhHidgiY/Zbq9LpBhaQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
@@ -3356,8 +3222,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.154.0':
-    resolution: {integrity: sha512-Cao2kj+8d7BT6XJU1gV9eVQjV+Cr+e8vQm3tddDRZiM2hHrMDxwy3j6t+ofaSl0idyuPPCZ4AlpmQoj8yOT1QA==}
+  '@oxc-parser/binding-linux-arm64-gnu@0.155.0':
+    resolution: {integrity: sha512-nrOt2Y3xIAzu+lSPzH0864ieO+iCCXgoo9qFlGANE8Xh0cQ+RP8Wstfp+/wXN2YCyb98cAGzX0VruKYw7it/jw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -3370,8 +3236,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-arm64-musl@0.154.0':
-    resolution: {integrity: sha512-uiwA0V3q8llWA7/8r+a9BBjk4j5YMDmi6wfOsyQfGOJMQSLHEiZ3HI8ulea766ykUa9wJFWk9XWEl4uJrZLQqw==}
+  '@oxc-parser/binding-linux-arm64-musl@0.155.0':
+    resolution: {integrity: sha512-KYAayyN5hQbJPtGKtRxlyc8XYmyntOplyXSQzTDrmbz7l/GCrzQbSswvyJFBTH1LGtsZrbXOAfN52i/Kz6kLKg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -3384,8 +3250,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.154.0':
-    resolution: {integrity: sha512-LICfN0Xs4Zdko+bJy6eOAEQojDuIR26suF2JtOsMaXjgbCrpRSH7/NCvJhY13YvYBx12V6hnwrL8n0lk0rbNJQ==}
+  '@oxc-parser/binding-linux-ppc64-gnu@0.155.0':
+    resolution: {integrity: sha512-CSuSY5hfjtsBnHXydOj8jiNfS1qHbdPZuPz1YL1cSgK7VmNYP+QlZIbG0BBYYBgX/vYEgZwbG9mBdW4YairZ5w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
@@ -3398,8 +3264,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.154.0':
-    resolution: {integrity: sha512-gbbSYxLF8ssRbQ2qQPy+2EhGNwNH1bAoRdkk6cnWaKHqmCikpSIPtpXjFbCCtjTi0uojqOM3ghFQwQPbDQsU0Q==}
+  '@oxc-parser/binding-linux-riscv64-gnu@0.155.0':
+    resolution: {integrity: sha512-7KCfOQm+Nz2N8trAXbQkal4TQ5756WVEmhm35y816YHvyFnEfVsICsiV5k0pEszNf/fRm4cm2i6i18SJ6/iCWg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
@@ -3412,8 +3278,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.154.0':
-    resolution: {integrity: sha512-nSnRYYDLCcRVjSQzF3g6rKqCNYwo5o+aQgnn8BBXfe+ofCgMGlGqkfRyvXm6ptZvoxNkkWtLlqM8W7Xc3j6ZnQ==}
+  '@oxc-parser/binding-linux-riscv64-musl@0.155.0':
+    resolution: {integrity: sha512-JSlhgoK+/g1TGJI5NuADx2+6syhxnQNLCWLXyO5QLFyetomcr/vIxSdiNlmyAv963YXUzCuwAwRG6npZ5xyJ1A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
@@ -3426,8 +3292,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.154.0':
-    resolution: {integrity: sha512-BxBQoJKtzRQgZEKQIt6CDUm8RGKC5T8Qo4576yDa5/xgc10X3fBDItMbRabzLtbUBfTqKLl+8AVr/H6CF7W22g==}
+  '@oxc-parser/binding-linux-s390x-gnu@0.155.0':
+    resolution: {integrity: sha512-WFIX+dPokWp64mi434Md3U3lJaTwNxAphvGjpltoyQjGUsdXavOIRrnp9dOS34Hd75HOAwDxAI+YwWOwqmJbtg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
@@ -3440,8 +3306,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-gnu@0.154.0':
-    resolution: {integrity: sha512-/whkust2vYy+GjRUVL5cWaJmEu6jkdFfo5mkxgckyeOX61eMwo4iBoiwzeJZeMWAdzb/XOtQyLApHhFht3sOWA==}
+  '@oxc-parser/binding-linux-x64-gnu@0.155.0':
+    resolution: {integrity: sha512-g6xSDC/JpbnVOz5uafMGyK3txBVRFMQTx8opv/yHXGxqV3ZMVl3bf7W8XrSnF68dmy3gM4dgReNryuE53+WkeQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
@@ -3454,8 +3320,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-x64-musl@0.154.0':
-    resolution: {integrity: sha512-EXURTyW9riw4B/kZnnE+58emAtw6+3VEszQfXUZkRqGaKIcmWDYkZtKB+xY/blHvuZ+Qy/fDclc31nmUCgtkSA==}
+  '@oxc-parser/binding-linux-x64-musl@0.155.0':
+    resolution: {integrity: sha512-6/4xlxKlZJWrQ0uwDFPc0H9+xLu7068CKhX3vIDW3SbvP/lVgnVuT5v6dyugeWskWpuxqF/WJ4WKwhxjU3pG2w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
@@ -3467,8 +3333,8 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxc-parser/binding-openharmony-arm64@0.154.0':
-    resolution: {integrity: sha512-ZRFooyH3qsR6vuR4jFGlG3XM36490SvvXtNaUahBK4zHpooMdTHNaOMtGGJI0EW38m5hi4rOco9kw7ZwCIp28w==}
+  '@oxc-parser/binding-openharmony-arm64@0.155.0':
+    resolution: {integrity: sha512-tltklL0J0XjDxIRTBXWOBhvc2mitcmES45pIxhwDWfxRyqz7Vkeu0NekTZEIxGE4f/lXgq3vZcjjffteQOVorg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
@@ -3479,8 +3345,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.154.0':
-    resolution: {integrity: sha512-U0Vp+4lvwUa/PnOCJTZOjydj1rX2+VLHz4Y2vSFqlN8/7LTiURgD7z4uQ9yNv9O/NlU3mELBnPDlu7aaSYG1zQ==}
+  '@oxc-parser/binding-win32-arm64-msvc@0.155.0':
+    resolution: {integrity: sha512-alAb9TzjatUEsOeoncAziUnfdTDxfyswhalFZ9sC6plUgATIUx2NIZ0+bMn6aJ28AduS1OpG/OAisr/YISn4Ig==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
@@ -3491,8 +3357,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.154.0':
-    resolution: {integrity: sha512-Hc8QgsFY5eUUP25we8TISUruibG2cDt0H4IcPG9RKdabb6odkCzIqjV6Gk9beGWGuOwMVCr81H/Su1q363LCCg==}
+  '@oxc-parser/binding-win32-ia32-msvc@0.155.0':
+    resolution: {integrity: sha512-yc5cbSfcGmRv/KpxDFuyk8adEBaWd/9HilWvBbQ4bFbus1V2PUh2mGB2Cfq9rqZTqLeiMT8x0skV+LKp9hOMgQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
@@ -3503,8 +3369,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@oxc-parser/binding-win32-x64-msvc@0.154.0':
-    resolution: {integrity: sha512-hD7judkUMA/hZPoamvKADs6+an1smp8UTK0aMYRijkvi00K/1vl7vEtmyn2JyQ9S+vibtnfcNzxqTLGyJUZCRQ==}
+  '@oxc-parser/binding-win32-x64-msvc@0.155.0':
+    resolution: {integrity: sha512-8heq6jGq+rfpTDRDjoQiBHw0maQZf3IXkS99pdHQZPoTL5kyF5qyPS0RidUlSdnWDIqxXb5nux7GBD9cT+imUw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -3515,11 +3381,8 @@ packages:
   '@oxc-project/types@0.150.0':
     resolution: {integrity: sha512-rDS5/31E9HfPl/CIzGrn0DOlvBbXFseQ5URJ9sYMfstbKLD/c6Gm9vmRzRGDdAXyOIL4zmO37lc9RIwYqVruZw==}
 
-  '@oxc-project/types@0.152.0':
-    resolution: {integrity: sha512-oM/5rLBm2tPkg0iBgkH/FOeR3PCDpY19GTgAZjMFM8h9WI9VW7cLgzp6nwtarYKmovavIQZ+Fe/RKX/8C8O/Rw==}
-
-  '@oxc-project/types@0.154.0':
-    resolution: {integrity: sha512-KYOUGQFlLWR+s4QMV2Q9ko38TZm7EdO87Qm7rvZLqk/webse/cDjtyxKhg/47l0byCbs/k46LT8qc4PKjAikzA==}
+  '@oxc-project/types@0.155.0':
+    resolution: {integrity: sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==}
 
   '@oxc-resolver/binding-android-arm-eabi@11.24.2':
     resolution: {integrity: sha512-y09e0L0SRI2OA2tUIrjBgoV3eH5hvUKXNkJqXmNo5V2WxIjyC7I7aJfRLMEVpA8yi95f90gFDvO0VMgrDw+vwA==}
@@ -4469,8 +4332,8 @@ packages:
   '@reown/appkit@1.8.24':
     resolution: {integrity: sha512-FXxZk+H/1PMABskdaMo+iuzr/9Oi6EYUw75PxeqzvGFVdB5YLAv9HIlIEc/nQiYv8SPoRy6y19TAae9ndiHmqA==}
 
-  '@rolldown/binding-android-arm-eabi@1.2.12':
-    resolution: {integrity: sha512-dB/a1214qKfHMXCpgqR4OZT+jS4kTyEXbQGJPqzobt5EwH5rX080pxE37alt3RzvR1bf1Yz/yGqRfrYAxuPw0A==}
+  '@rolldown/binding-android-arm-eabi@1.2.15':
+    resolution: {integrity: sha512-aLcgK9gIJ3YRvrrtfSBbRa27F5WrpiTaPulnFpsHPxpUHgFlSgnU4854MHwoRGEBhfRJDWCS2WQ7lIjskE9Olw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
@@ -4481,8 +4344,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@rolldown/binding-android-arm64@1.2.12':
-    resolution: {integrity: sha512-7KHFgQ5VJxIHcLlrwrc3Xbds7oTNQT7Pgi9gQCJKrd2VGab/UksIOYp6VD8MzCstGxOKMgNamPwUCfxPdP1OHg==}
+  '@rolldown/binding-android-arm64@1.2.15':
+    resolution: {integrity: sha512-xD7DdZCrbThKuxNg7ooQmvp07ys4J/pnSEMTG3/OdOWl6daC67m/Q4fL78sRHMxTH/N4fGUbYhcPM0MF5WFHkg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
@@ -4493,8 +4356,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@rolldown/binding-darwin-arm64@1.2.12':
-    resolution: {integrity: sha512-3YIhqHD96nA5SaYNRBR16HnGv4oavZvXfD/ayHM+oYZ0WD/8lBAtf6zQua4kEyAvpqrluKXl0lnOBoiNby7x9w==}
+  '@rolldown/binding-darwin-arm64@1.2.15':
+    resolution: {integrity: sha512-m2WuQ6r0B4OTYxyPpNLtXaMRbRDUbG8YQV2Q3KTdSSK8Th6KHCnC8jVCJt8bvYeSB5WivkkNbc85mKadaSdOxA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
@@ -4505,8 +4368,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rolldown/binding-darwin-x64@1.2.12':
-    resolution: {integrity: sha512-UuuJ35MFw4gmFOrE9pEqIV+K3syIKveph+Qc1/ljHZVdoDW4pz/JHR/eMVom+TZGl/5OOvGJOWaOCVt3ZfqhxA==}
+  '@rolldown/binding-darwin-x64@1.2.15':
+    resolution: {integrity: sha512-5RtnsHM36nodM9WbMy+zip0LGS/G+y5wro5RHrpOlr4ac24+1zSi9kiV2MP1myZeZ/ifEHfulQcWjnAXzc2C2A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
@@ -4517,8 +4380,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rolldown/binding-freebsd-x64@1.2.12':
-    resolution: {integrity: sha512-uMvssit0a4W+/7D8CbHUvG719mH3R2jwXAlh/XcPvuHTE0g++LymF88DCGNX0HM2rBOn0xrzgXktIB6fLSJBTQ==}
+  '@rolldown/binding-freebsd-x64@1.2.15':
+    resolution: {integrity: sha512-g3l09pyFqhu+135JKkbkwiKGQmwU5hUMUPJ4VdBADvuqR8d33L6H578rh8m7rtxbdp+VmX/+nzI7nvhSZlzpUQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
@@ -4529,8 +4392,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.2.12':
-    resolution: {integrity: sha512-XcFu0R0xWnwzSf4IQgFH1rJIckPN1pLy2R+4r9IDB7Yfu/ys9cVqfa4pBrMHj7a3gl8mIR4nRNPg0e5IvEVs6g==}
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.15':
+    resolution: {integrity: sha512-nIe3VugI97nGQtspPxDqA4sXMUpeiocKIP/CqpY/u/vgbT+alX+cVxu1C/oVBPKg4feNTmYovE91v4DgXvXNwQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
@@ -4541,8 +4404,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rolldown/binding-linux-arm64-gnu@1.2.12':
-    resolution: {integrity: sha512-260UrKgn8tz39ak+SMDOirKzr7V04M9dWPw5llW00SwBivCZoWcRBKV1d8cXnRkUmSZA3BdiUmBHWk7734Ulpw==}
+  '@rolldown/binding-linux-arm64-gnu@1.2.15':
+    resolution: {integrity: sha512-iTBjXx+B5QSvgI89lJfmqh4wTh8NabR1YZIIN3hNx4zSG0EVfVqkOvLulNpG4251pbd6/IAmZ/LefVk1Y4rPhw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -4555,8 +4418,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-arm64-musl@1.2.12':
-    resolution: {integrity: sha512-5YK1I9SqDkbPgc1IA8BgDl34suqUS2q0KWnBrirm0E51YjOs6eo6dV6jbQfNE/argHRSvd0QUGgtpIoYx+WWpw==}
+  '@rolldown/binding-linux-arm64-musl@1.2.15':
+    resolution: {integrity: sha512-uN26XOnVR7rqQupG3V9oAG2EGGatWjcJHOeDOHUFCh4TBWmP2tHTFoVN13aYbwfm0aHqJAEmcwhAu6sooIjfqQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
@@ -4569,8 +4432,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-linux-ppc64-gnu@1.2.12':
-    resolution: {integrity: sha512-Rkcrmp7eFRg74yL5fXEU91JEWbdEPLevWwGtXpmhbjlD1StScbWTmO94Bhly+Mo+ketKYkdmM1vNUKeWSlx8cQ==}
+  '@rolldown/binding-linux-ppc64-gnu@1.2.15':
+    resolution: {integrity: sha512-9nWkcdd+H+XhaA3fQIwpHnKIrfx/PQ6rO0pivr78Og07tXlUlctBBJoEYLPfhTmCR/QxEVdn6uPjHV5SymPhdw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
@@ -4583,8 +4446,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-s390x-gnu@1.2.12':
-    resolution: {integrity: sha512-qvK4DuAsQc2BSjlx+Xr+IzOIvvxbGZqxFwdWfG6F518Erj0GGISyQbJ6pIappnOxlNPzNHvo/L0BwB30GZ+zVw==}
+  '@rolldown/binding-linux-s390x-gnu@1.2.15':
+    resolution: {integrity: sha512-Ggh0ciFjLwIusLSLz7LZYEaGdxOAUJXI+Qu5JCbhPJJHEt8vP+IjRATTJheiJsdzzTYgUiHUiw3X1Ea3ZpMBdA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
@@ -4597,8 +4460,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-gnu@1.2.12':
-    resolution: {integrity: sha512-Q9uLBO53Xd4QIq1WOycVQyPP1O4HhraEV2qqb3uTrnVw6QZih9duY4vNXOivL1xoUS1/z+W8eF4NMfl2a8Sdjw==}
+  '@rolldown/binding-linux-x64-gnu@1.2.15':
+    resolution: {integrity: sha512-FHg60rS6DBePAYZ9X9F67x+JObFdmgn6tupA1C/a3B+CufFmTD4mX+e8M75tCiAO3foR/6xwVBI0KQiI7sn/rw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
@@ -4611,8 +4474,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rolldown/binding-linux-x64-musl@1.2.12':
-    resolution: {integrity: sha512-3IBxWFMjbOZskDPKv8Lf9BCnahlKuHthWkYnyIxOH/QcJrFcS4EmcenthApkwr/5+nEqZlLzeYbxeMaX7A5u4g==}
+  '@rolldown/binding-linux-x64-musl@1.2.15':
+    resolution: {integrity: sha512-/cvV/7v5VGz/moiz0XKRj2dE8DzsKyhIu1KpOvJGPjRywg3yscON889UGvAe8zfiJLHup7VLjBduoGWi3HusWQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
@@ -4625,8 +4488,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rolldown/binding-openharmony-arm64@1.2.12':
-    resolution: {integrity: sha512-xtX61xg4LKPkPWilZU1ynKClz5Gj4bf74LML4r3eVLWumKnGjoEr1OSHQhMdbBDoYTi+yjrujvpZe2pUnqCrrA==}
+  '@rolldown/binding-openharmony-arm64@1.2.15':
+    resolution: {integrity: sha512-MyzC5Hrv/sm+Z7TSGKP/j8001RO2xQm1zOpCNVL4j0cY/VhBZviludA2YFQ7i4lH6ZAXxQm0lcMdBzM+99mE7w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
@@ -4637,8 +4500,8 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
-  '@rolldown/binding-win32-arm64-msvc@1.2.12':
-    resolution: {integrity: sha512-At7fPB6PCaIjzgIhEZFxuT+BBFqiQibJDT4d3PhiR3f4E7bbMZF4aKblbFfEM3sETRDd1YiQx/+U/g/B/ou5Ew==}
+  '@rolldown/binding-win32-arm64-msvc@1.2.15':
+    resolution: {integrity: sha512-+PgYiS+AH5omy6L45ZLxybasauJaj3M8buoT83D+nzPmCayXlxUV9hydhciCKVyIg0B/v0BtXPDE1uGqNwCPpg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
@@ -4649,8 +4512,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@rolldown/binding-win32-x64-msvc@1.2.12':
-    resolution: {integrity: sha512-WIw2haVKwjuYdXkHaoC0mF8Le71TuCBxjrdKqLbJGctbBABj+ClfmNvtbOnzpq3RokNo5+V1qhtSzJyXorsklQ==}
+  '@rolldown/binding-win32-x64-msvc@1.2.15':
+    resolution: {integrity: sha512-HFZd2QNQYn1JbIi+Hpd7H+r/lkWxcfIu28nirZ6eCn2LafuvmExMlb/P96Sfx5tf7pPArw39IdhmCF8vmV+NhQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -4831,8 +4694,8 @@ packages:
     engines: {node: '>=16'}
     deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
-  '@schematics/angular@22.2.3':
-    resolution: {integrity: sha512-DY8wv/LtNf3YD/EEoFdER4ihMyw5yywuOQEKasm4d2uBJ5peGIWV3LXJXXqD7b4WVC8xS1eUAjingyWfI9reHw==}
+  '@schematics/angular@22.2.4':
+    resolution: {integrity: sha512-3yXpeDsn780rk/Pm+2QjoGpvS03doyuB2i8jUt/tNtDatIIVoXUJak3kjPOK3TVorOJX/fTNMjMxDwQzvec2+w==}
     engines: {node: ^22.22.3 || ^24.15.0 || >=26.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
 
   '@scure/base@1.1.9':
@@ -6253,14 +6116,14 @@ packages:
     peerDependencies:
       react: ^18 || ^19
 
-  '@tanstack/react-virtual@3.14.21':
-    resolution: {integrity: sha512-wWE/ZJDNNDp18JHWy7n5PQooqerHePVkEEu6Op0twKQ2InF9DPhYMQptQY0syDEviMd3/r8D0OUvKJibDGm9HQ==}
+  '@tanstack/react-virtual@3.14.23':
+    resolution: {integrity: sha512-Oyy58qQwdaQieA+A4WUDtnh9D1rv5FZvGdw8og9Xeyh88V6HH94vMSyV5i9ATIbYNe9t5Ix0WXRo9NOTpHDkYw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/virtual-core@3.19.6':
-    resolution: {integrity: sha512-CsTW892z23gy7IyxYTTorVu1uZWB+0N349rSMgKz4rFLPpLza7F7TpcCKeI5iUAwYQCt8QUlOU67J+KXCxtpGw==}
+  '@tanstack/virtual-core@3.19.8':
+    resolution: {integrity: sha512-Oz/SYBo/aVPyQkwtOw7Q23myITUgFIof2glQqydYJAPL6mH2SkJDkvDKZTklB+7gv5jGLZQhyTcd7SO1A1EODQ==}
 
   '@testing-library/jest-dom@5.17.0':
     resolution: {integrity: sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==}
@@ -6673,6 +6536,9 @@ packages:
   '@types/node@22.7.5':
     resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==}
 
+  '@types/node@24.19.2':
+    resolution: {integrity: sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==}
+
   '@types/node@26.6.5':
     resolution: {integrity: sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==}
 
@@ -6931,15 +6797,15 @@ packages:
   '@vitest/utils@5.0.5':
     resolution: {integrity: sha512-/rBu7gzLDQI/SC79Tn98b5DwOgaHU/Gt4I9OVeP3YofzNaYtbImRCOJQmT1S6vOJg9gEIlWC+r3QxKkjuSa1nQ==}
 
-  '@wagmi/connectors@8.2.0':
-    resolution: {integrity: sha512-hPwdmePYjQqSWlw9JmzrzVgmw2PJ+NJsUQ/BuPBYbzBS8+cW5vWdqiaKLB4qTF9m+yr+zSp7u91KBgvOWz50og==}
+  '@wagmi/connectors@8.2.2':
+    resolution: {integrity: sha512-lueq1h2hNQhBqTFjG3iT0dNpkt4+G5s7mJq6I1zavX1B8bv+lHx3wowlXCpvTuLBmtchjDQzQB85uad0pIw4aA==}
     peerDependencies:
       '@base-org/account': ^2.5.1
       '@coinbase/wallet-sdk': ^4.3.6
       '@metamask/connect-evm': ^2.1.0
       '@safe-global/safe-apps-provider': ~0.18.6
       '@safe-global/safe-apps-sdk': ^9.1.0
-      '@wagmi/core': 3.6.5
+      '@wagmi/core': 3.6.7
       '@walletconnect/ethereum-provider': ^2.21.1
       accounts: ~0.18
       typescript: '>=5.9.3'
@@ -6962,8 +6828,8 @@ packages:
       typescript:
         optional: true
 
-  '@wagmi/core@3.6.5':
-    resolution: {integrity: sha512-zfKvLNT1V1+/RgrrUcRvteKx+V+Iv9ZHPWseIVKFA9mX5WE0H8J6zWZGWXSQCKbz5xGSUoatNFCkNFSzqQp+AA==}
+  '@wagmi/core@3.6.7':
+    resolution: {integrity: sha512-ktXipTQanp+Xn1cefFXRe/AsuSjKgU3S2K5D2LUukOt6NvoroHx724CFfxDlyMfd+X/Qg32gXxungFWqPc6unA==}
     peerDependencies:
       '@tanstack/query-core': '>=5.0.0'
       accounts: ~0.18
@@ -7265,8 +7131,8 @@ packages:
   '@yuku-toolchain/types@0.19.0':
     resolution: {integrity: sha512-tFkNbsP4WXX9UMUC5syJGdK9dPMLK0PPaIuXCcCYH75sZ8MrebfBZ2XvCILRTw8AgLivSSCfDa4R67iYBDa4Kg==}
 
-  '@zama-fhe/sdk@3.7.0':
-    resolution: {integrity: sha512-wHgHPdR/FOF6fePAkPrb5ZLTYYfTr7vLtf/GK9Z7PlpuzBGoHIbRE9b9R3/H/2QZCvJQHFX2biceaEIffzXowQ==}
+  '@zama-fhe/sdk@3.7.1':
+    resolution: {integrity: sha512-TDW76u6Tqu+/6tpwqJ3/fw2ZdUC/KAZ1WctuzDkncABbg0mOkM3xFyPyfsI7hfS6f4FnwdZKNlu0F4VdTVvJpg==}
     engines: {node: '>=22'}
     peerDependencies:
       '@tanstack/query-core': '>=5'
@@ -7393,6 +7259,11 @@ packages:
 
   ajv-formats@3.0.1:
     resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
 
   ajv@8.18.0:
     resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
@@ -8279,8 +8150,8 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
-  dependency-cruiser@18.6.0:
-    resolution: {integrity: sha512-It7NW5AmCDBCLMq7I91Nfu8VRKzrIE6S+M/FMQzALDceJ0B1PWRHo77q9YJg/HwyBBEWHVtOuTptIQki+xecOw==}
+  dependency-cruiser@18.7.0:
+    resolution: {integrity: sha512-WexT4OswA6Gy86ms2J7SJ4FJscN43dyS+i5skpbtXlPTFQW4yWbontjFip1TOBAVnc+U+9zdH0a56YTRZX/IGw==}
     engines: {node: ^22||^24||>=26}
     hasBin: true
 
@@ -8361,8 +8232,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  effect@4.0.5:
-    resolution: {integrity: sha512-BY4/28NlpOd99yzmV741xbVGmp+1U7tks4oB7F/Png64bTa5tm5eCA6W0RiXsnuLDDoJpjfVSo4Dnq4BZb/89Q==}
+  effect@4.1.0:
+    resolution: {integrity: sha512-lGx2MJJyrXA8RZb2UpQ/0Nkb5Utaimby7oD92+18noBxLPE85IFOvptdzau8dvcxAOwfwHo9iqapbKeFzqQM/Q==}
 
   electron-to-chromium@1.5.445:
     resolution: {integrity: sha512-iX7o1nF+qNb3Bv5mLYgqfgF9Znh9e/8MKXdmbb8Gv2Q47OKIzTwEPD1oda1HrgEwYatTLJj0wQjHvIFt8Db53Q==}
@@ -8702,8 +8573,8 @@ packages:
   fraction.js@5.3.4:
     resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
 
-  framer-motion@14.3.1:
-    resolution: {integrity: sha512-/6kjoSWyGsaUaHGaZehiqyVj0eJlY163TPKQCoTh0gHVr0JLyJE/NwCTqkLbXAnOOM00fLD/d92eh9mZfJaa6w==}
+  framer-motion@14.6.0:
+    resolution: {integrity: sha512-MzBgZxGgoHPfSLEXmo4o5XlZvb+nVRFdHtGjVhm6LMIEJKTt/8hNO023euL5mYyzc8llV/hQTfjnN68tNRHalw==}
     peerDependencies:
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
@@ -8931,11 +8802,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  i18next-browser-languagedetector@8.2.1:
-    resolution: {integrity: sha512-bZg8+4bdmaOiApD7N7BPT9W8MLZG+nPTOFlLiJiT8uzKXFjhxw4v2ierCXOwB5sFDMtuA5G4kgYZ0AznZxQ/cw==}
+  i18next-browser-languagedetector@8.2.3:
+    resolution: {integrity: sha512-0jSTK3ncpXj9MFdxRz+TVTKDkSvYH8ifB/OCmUdEMprvXC3vy7kEvdKpj0yYB72B0UKEHJLPMEeRVC/UXroWnw==}
 
-  i18next@26.5.2:
-    resolution: {integrity: sha512-6fIXt//2MZNok3tULyjnypxe3vbsy3pV1bVg8p2x3yKrzZvp7z3T+wXx/88LQsATRdhyJeAUAvUxEtxsHdJ29w==}
+  i18next@26.5.11:
+    resolution: {integrity: sha512-Wc0klBPKxqZ2tL2qdAnF8xvvnWgr1IMGSY2ikTiAvaFVbz7xiFARtkoU4RidBDw1SyziGROp0qxu6qnJ7l2Wug==}
     peerDependencies:
       typescript: ^5 || ^6 || ^7
     peerDependenciesMeta:
@@ -9333,52 +9204,52 @@ packages:
   jsc-safe-url@0.2.4:
     resolution: {integrity: sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q==}
 
-  jscpd-darwin-arm64@5.4.1:
-    resolution: {integrity: sha512-LXHVeH60C9BsozcVIMPmXWvj97KqFKbCJYmYG4hDwfwIwS1kz+uF7yiObckP6h2xo12pD88nI4XjWTB5frjZUw==}
+  jscpd-darwin-arm64@5.4.2:
+    resolution: {integrity: sha512-EGoPYQZqESW2kJfxKZrUYsYWhzq2Irk6sBQQWZ7VPAGj2wwk3n8HtDP2FnJOiHWZtSz55I8zQWldzIrD55B5Vw==}
     cpu: [arm64]
     os: [darwin]
 
-  jscpd-darwin-x64@5.4.1:
-    resolution: {integrity: sha512-Gqck4tcMZjv4IvYHU2Vcikb885zTADo5T/YfEqeu1i5W5tfFpLdViiTYrh5wbrW+uxBqC33gHpG1hy0xbGYknQ==}
+  jscpd-darwin-x64@5.4.2:
+    resolution: {integrity: sha512-/bz/rgoahqeK0p5r+KjeTTS59d7bZpMxD7hQ4CaQ0qKZWBZIyu7hRdExzJ7/KrCEJ5cmRogvXX1jhFqldYLNXw==}
     cpu: [x64]
     os: [darwin]
 
-  jscpd-linux-arm64-gnu@5.4.1:
-    resolution: {integrity: sha512-XUYZJZVxSY7JIBEoyOOMTgvJwmymkns4wG55tu6I/vRKXnS5QtaTESQfRLt6xj1+62aflAvr01FAhPAy+du6tA==}
+  jscpd-linux-arm64-gnu@5.4.2:
+    resolution: {integrity: sha512-YW/eX+mOYZmT/A3QEARYmJQoVQNV/cfecKCobNXZcD3mE57drpKHmJnvuL9uS85z0cUKWGCM57JVkVz6Y9oxxw==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  jscpd-linux-arm64-musl@5.4.1:
-    resolution: {integrity: sha512-h2sH8Bk++yBxWqq2QAy4fvPzXkw1vecDSyOmzLwPfnRQoQ2Q/EWxCNOrgJSb+SNMLWoHLLzfqx8m9wt2GG6a8w==}
+  jscpd-linux-arm64-musl@5.4.2:
+    resolution: {integrity: sha512-jOLTO8YVRz65NaeYNeXoIf13yOPWhbM61xKXpv51DXQ2BXce6XfgPaJVeDCOM5s+8mt6aDtq0BZ8zptNeqGuIw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  jscpd-linux-x64-gnu@5.4.1:
-    resolution: {integrity: sha512-UiC4YoGAVVLy6hPVz8A6cndo7W5br4FAO2hADnFeinhBPnXPu0QFh1q/s/8B3ldeQHQkpYd/l5cjqNBMrbm78w==}
+  jscpd-linux-x64-gnu@5.4.2:
+    resolution: {integrity: sha512-eAmKLxx+pIOEX4lZ342CCCjL5bvf+a3gdmaaVHXiGIx2Zr3zKkF32YkfuN2sCvCui5I/wnely80XsRvVVFO47Q==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  jscpd-linux-x64-musl@5.4.1:
-    resolution: {integrity: sha512-toAafl5roqfFotPrDJNMY9noNVZ9dReBqcO/nT5pJ8+7aq+opbscaLUcV4+8jxTq5btUD6CiO72+Fu+TyUZv3Q==}
+  jscpd-linux-x64-musl@5.4.2:
+    resolution: {integrity: sha512-ers9YFscD6DrmhyjBDXo/L+yBKcclHdWTFLMulYVGLcoGRKfBFhmK08MI3ajN/GMmCpJu7rkDYKL3egdfE8OIw==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  jscpd-windows-arm64-msvc@5.4.1:
-    resolution: {integrity: sha512-JLMga/NIwv/OPurPsXA2/d5OdWfdwrsBk2D4NhyKnrV/uNjo1BIi2zXztzDyTQVKMK/TEK6GPgLD143GG1fZ0A==}
+  jscpd-windows-arm64-msvc@5.4.2:
+    resolution: {integrity: sha512-kOhVw4cVhN8T9jr3OVThB3pPpbff0ITHTwpJ/+4EGzMkbf0y6QtPpHDzRgiHJj7u1FSTBXTI6VhPhDUhT/os1g==}
     cpu: [arm64]
     os: [win32]
 
-  jscpd-windows-x64-msvc@5.4.1:
-    resolution: {integrity: sha512-sN57Y9YP3ijrqc1IsWDceOFHUwbukg9/mU2NSDHTryKKc5CUvWz+o9GId8uKTiJIhkKfR/Ce5GKkCepTwB6kaw==}
+  jscpd-windows-x64-msvc@5.4.2:
+    resolution: {integrity: sha512-BuR5DCV7F/G5ukMEIzCrz43ea5C0t0ALcP7v+opOWefoi4aiQYCEmtoRwfXMM/zjOmNYmvJBDDfeH05U9uuzEg==}
     cpu: [x64]
     os: [win32]
 
-  jscpd@5.4.1:
-    resolution: {integrity: sha512-afUt+LSQMmzSPYrWZlNGTwj8X4tmwVJbMNmr92qxPf4uUF/naLwG7SQyMPEZtrHqGgzGxmAzNjiwlVdjls2MyQ==}
+  jscpd@5.4.2:
+    resolution: {integrity: sha512-bxZ1ObA4NyWBcM7Zh+QoGrdcMovbCxrDofFaLo2Lwgk/Axe/e45VYu8EM+mpPx2CpU/QGCoktONRnaRZl8Yq2w==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -9464,8 +9335,8 @@ packages:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
 
-  knip@6.42.0:
-    resolution: {integrity: sha512-lNypqHwi38RJQG8pVuItqzCDPMOfPbBExyFh8aM4yMJRHVU7t5OQAtEK4tDkaB3rLHetOcVMhRFAgv5Vn2CM0A==}
+  knip@6.43.0:
+    resolution: {integrity: sha512-8l3cCOg/EXoILO0qcSoMra49yQM91+lEIR4fu5Ko8rrArGX8xKdKZiGI9psPiY6rhLmfLERcMfFEByF0wli5CA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -9873,14 +9744,14 @@ packages:
   modern-ahocorasick@3.3.0:
     resolution: {integrity: sha512-OEuPxzKD4fG8Zx2dUX8jDP7ArNhRdlHhjLA00k+ZmtXe49Qb6+E/M/ViDYnXOZ9A3uRbRIb1eTKPesQGKd0USA==}
 
-  motion-dom@14.3.1:
-    resolution: {integrity: sha512-6gsjOAjXgZPoLLHNiBI1uBVNhSrIXSm6YBU8RsFM//byOvIys8YHPQE3VZqW3rWR021tcd3eT8pmV8zWTY9Jsg==}
+  motion-dom@14.6.0:
+    resolution: {integrity: sha512-lIojTl9aYSPIkeOOSzBliy1nNvpdO3JtVzW2WgTXQlOP4ZMuJhtWO3fP7OD4TVFwlRucdvxlDSMkL+fEQnQ52A==}
 
-  motion-utils@14.1.1:
-    resolution: {integrity: sha512-3VvN5Uvf8B6qG+OfOui6Nht5EWp+vLuU3IqcAj7ItZGKqtmTjCebl5sGZF7/08gEHRnEl1AP/fIwbcEyVrcQGQ==}
+  motion-utils@14.6.0:
+    resolution: {integrity: sha512-bZJo2AmQ2aOFkaato6VXrTbkPG0XhMzivWUWSaI59pxyllj8QMQUFZ84MYRQnPkK+7dr4KldyJwF2+RM0sdq/w==}
 
-  motion@14.3.1:
-    resolution: {integrity: sha512-u28lvaeSKrtfLGhofGjv6Bjs26FOgZS6XWXB4Lz8JdL1qj68sflITbsBGOFzqcoEI4OKG+npEau/1evgPNv7Eg==}
+  motion@14.6.0:
+    resolution: {integrity: sha512-qqaZbyubgk7x3zxjPgP1l3Br/KQXol/IIV1uqb358SoN4ApcqNuV7+wyDPg/XLErmuyQL5lL8JVI/fOmDsmBKQ==}
     peerDependencies:
       react: ^18.0.0 || ^19.0.0
       react-dom: ^18.0.0 || ^19.0.0
@@ -9974,8 +9845,8 @@ packages:
   neo-async@2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  next@16.4.2:
-    resolution: {integrity: sha512-r+oBJojfefUjOiWkBhXgLS+igxX/7BWyK59uHnyOyplMSLtBZ+QLP3okrdYTbrfrbrmNTVWLBPaHDX9KRaIt3w==}
+  next@16.4.3:
+    resolution: {integrity: sha512-OqxKTGi9u80FydydsMNYNjnuje9Au+kvHlt2GZ//ftdpDHm1dxKqAaENoOOTX5wKzn+9vaKUNIfZeyZUuLhCnA==}
     engines: {node: '>=20.9.0'}
     hasBin: true
     peerDependencies:
@@ -10194,8 +10065,8 @@ packages:
   outvariant@1.4.3:
     resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
 
-  ox@0.14.56:
-    resolution: {integrity: sha512-Feinlj+deWEam6RIwurRE+eHZ2N3hoUb3AAjQ10BmxRCYIymfqNkv0eZ+4ln4GkgDmSGLD2rGtTMqsFYSVDC6w==}
+  ox@0.14.57:
+    resolution: {integrity: sha512-CPF6aEFyAuqgL0x7VaFM0vI2/CUd5Qk8+BIL6OnViPw+gF07O/VAhqEPOPw5GYnYPwomIk8mD91gTcQ1RAtupA==}
     peerDependencies:
       typescript: '>=5.4.0'
     peerDependenciesMeta:
@@ -10238,8 +10109,8 @@ packages:
     resolution: {integrity: sha512-zwajKw1GUa57IOdafIS7/yOObGF2NihwIfZfs5yJTRprMSkiwhWOc/k+n8bwnUPbHr2/XsjfBO8KyTPaW3VpWg==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
-  oxc-parser@0.154.0:
-    resolution: {integrity: sha512-Gr/6fkjZwi937c4Tsz8y0iO4U0FLPkZI6JSVucLAIvQyqh379px7RS8ORIc0HOORbFjXZ6zyqWLl53qxhSeofw==}
+  oxc-parser@0.155.0:
+    resolution: {integrity: sha512-C/ReSf1JUFukK/zvk6jhcNibSssvas5+ktIzK7fbKVd3CedWe59C3QwHEOrEZj/4Rt9+xg0Jeis/Jv1F/KM1mw==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   oxc-resolver@11.24.2:
@@ -10614,8 +10485,8 @@ packages:
     peerDependencies:
       react: ^19.3.1
 
-  react-i18next@17.1.0:
-    resolution: {integrity: sha512-4VouOnTDyvhvqXx6WZ+s3/cgSiaLutILdYkO3P1Ms+4qcKR7At+JP4Vi7IeHkVLyVV+DmN1l23Pn73UcwSGGPA==}
+  react-i18next@17.1.9:
+    resolution: {integrity: sha512-OgYqIH13XHPlWTaaI795Dz+k2AdKnXcOxNQVnf750T8Ij0TYWp1nYvXRpoJBulPqlyk2OAbn1PM4tFKiIj/byA==}
     peerDependencies:
       i18next: '>= 26.2.0'
       react: '>= 16.8.0'
@@ -10706,13 +10577,19 @@ packages:
       '@types/react':
         optional: true
 
-  react-router@8.4.0:
-    resolution: {integrity: sha512-JtydAkBvU9UTEe5qNC+POhu+ZBNM7rlKY2IegwXc7Idj7xfRG16x5RZrw3mju+XlqBxfvb2ky9P3jUp9WyWC1g==}
+  react-router@8.5.0:
+    resolution: {integrity: sha512-9nEd/deifcTJIIcUaNIyQGkyXD0D6QVB9XD2O5GgHpP3xu3U5RXm87YQ8++Wn8JQWgMBM/5+PjWPM/7n7O7WHA==}
     engines: {node: '>=22.22.0'}
     peerDependencies:
+      '@types/react': '>=19.2.0'
+      '@types/react-dom': '>=19.2.0'
       react: '>=19.2.7'
       react-dom: '>=19.2.7'
     peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
       react-dom:
         optional: true
 
@@ -10895,8 +10772,8 @@ packages:
       rolldown:
         optional: true
 
-  rolldown@1.2.12:
-    resolution: {integrity: sha512-8wafseiaG80xmXSfqidUNqZcylTlhmPZZt+za2m+js2sFZ8dTNlhIOV2WcbIPx2hgwPBJpEUGFAMZ9bgBBLTSQ==}
+  rolldown@1.2.15:
+    resolution: {integrity: sha512-6odND+fel5zVw3I4Yc2e69gvguDnX0CAAGiNDZSq4ik5WUcaLrkD2GLuog0XcODbor31hZ5ayEMgVDno+KPV5g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -11719,8 +11596,8 @@ packages:
   uint8arrays@6.1.1:
     resolution: {integrity: sha512-iz7JN0XCSZYA111lhFG2Ui9EhFvTNekqSRHw3lvMHq+dzwWy1OQftxFQREEh4rffU0oSoXdQHsk2TiHKVm4fsA==}
 
-  unbash@6.0.0:
-    resolution: {integrity: sha512-vD5CvvFLVQDhXdNyNEPPa/tHPCK3HLySddOine+OZLDYIH1cMImGNgnw9+NkizToaPsFsQlwiyPGMiK+uwtYVw==}
+  unbash@6.0.1:
+    resolution: {integrity: sha512-0db9eS5iqybux41zLkX69nk90KTci7F7eZ+gXzEG/Q7E0tAqEBhRh5fkZvk1N7jT7QkGWqq34i8SFGPFEe1V8A==}
     engines: {node: '>=14'}
 
   uncrypto@0.1.3:
@@ -11732,6 +11609,9 @@ packages:
   undici-types@6.19.8:
     resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
 
+  undici-types@7.24.6:
+    resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==}
+
   undici-types@7.28.0:
     resolution: {integrity: sha512-LJAfY+2w6HGeT8d8J1wNQsUGUEGio6NWWpwdwurQe4f6oojzCFuGLizl1KSve4irsTxyLly1QhEeE6iapdaIvQ==}
 
@@ -12018,8 +11898,8 @@ packages:
       typescript:
         optional: true
 
-  viem@2.57.7:
-    resolution: {integrity: sha512-x3UqqrcQuESaRVK6a0BvNmoNP0SVhu913uxEAxYLJx1lNYnj6ylTntfUdakCUKjk1+T+63gkdwFGJQ2O5C/nRw==}
+  viem@2.57.11:
+    resolution: {integrity: sha512-kvcBGXzIGmZu3GqaA83ZOLzVC57YO7WCgQrGcUHNKqZ8Cjqc9vV//uGna4Nhv0NGHn2gekw1FNdSvQePNnYePQ==}
     peerDependencies:
       typescript: '>=5.0.4'
     peerDependenciesMeta:
@@ -12036,13 +11916,13 @@ packages:
     peerDependencies:
       vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  vite@8.3.4:
-    resolution: {integrity: sha512-IftLE8phJhdNRIGNEV4JCCvfNScoZQVfcXaN8TQropWGJtOHcu+iAB9pHcuGvmEb/kddw0LBe/jS8ztdC6xdiQ==}
+  vite@8.3.5:
+    resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
-      '@vitejs/devtools': ^0.7.1
+      '@vitejs/devtools': ^0.7.1 || ^0.8.0
       esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
       less: ^4.0.0
@@ -12144,8 +12024,8 @@ packages:
     resolution: {integrity: sha512-4Nsy8K5Tr6SPDH9jhKJOHf7ChDrc1zufZTVSF7x72hwuEXBqxqk9G6cK+K2NRUtB3iELRJqjXb4JPDMBjMTl2Q==}
     engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
 
-  wagmi@3.7.7:
-    resolution: {integrity: sha512-J9YTRKwOVt+L135nMiitwGALrJqpXFhLX8AZzbECWeAQ1aI9Uz8Pz0GGMqtbKe7xJtmOx838OChT7YkMs9k8OA==}
+  wagmi@3.7.9:
+    resolution: {integrity: sha512-WE+tdZsQrsHPPV6yEKgBELM1LpxPLxWtpvUv8hS9KlRZtCLA1lyJQHJtGdSZWfPy8QdjYV2xI3yIrm0XjceK5w==}
     peerDependencies:
       '@tanstack/react-query': '>=5.0.0'
       react: '>=18'
@@ -12521,14 +12401,14 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.13
       '@jridgewell/trace-mapping': 0.3.31
 
-  '@angular-devkit/architect@0.2202.3(chokidar@5.0.0)':
+  '@angular-devkit/architect@0.2202.4(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.2.3(chokidar@5.0.0)
+      '@angular-devkit/core': 22.2.4(chokidar@5.0.0)
       rxjs: 7.8.2
     transitivePeerDependencies:
       - chokidar
 
-  '@angular-devkit/core@22.2.3(chokidar@5.0.0)':
+  '@angular-devkit/core@22.2.4(chokidar@5.0.0)':
     dependencies:
       ajv: 8.20.0
       ajv-formats: 3.0.1
@@ -12539,9 +12419,9 @@ snapshots:
     optionalDependencies:
       chokidar: 5.0.0
 
-  '@angular-devkit/schematics@22.2.3(chokidar@5.0.0)':
+  '@angular-devkit/schematics@22.2.4(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.2.3(chokidar@5.0.0)
+      '@angular-devkit/core': 22.2.4(chokidar@5.0.0)
       jsonc-parser: 3.3.1
       magic-string: 1.4.1
       ora: 9.4.1
@@ -12549,16 +12429,16 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@angular/build@22.2.3(@angular/compiler-cli@22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3))(@angular/compiler@22.2.3)(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(@angular/platform-browser@22.2.3(@angular/common@22.2.3(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2)))(@types/node@26.6.5)(jiti@2.7.0)(less@4.2.2)(postcss@8.5.31)(rollup@4.53.3)(supports-color@8.1.1)(terser@5.48.0)(tslib@2.8.1)(tsx@4.23.15)(typescript@6.0.3)(vitest@5.0.5)(yaml@2.9.1)':
+  '@angular/build@22.2.4(@angular/compiler-cli@22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3))(@angular/compiler@22.2.3)(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(@angular/platform-browser@22.2.3(@angular/common@22.2.3(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2))(rxjs@7.8.2))(@angular/core@22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2)))(@types/node@24.19.2)(jiti@2.7.0)(less@4.2.2)(postcss@8.5.31)(rollup@4.53.3)(supports-color@8.1.1)(terser@5.48.0)(tslib@2.8.1)(tsx@4.23.15)(typescript@6.0.3)(vitest@5.0.5)(yaml@2.9.1)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@angular-devkit/architect': 0.2202.3(chokidar@5.0.0)
+      '@angular-devkit/architect': 0.2202.4(chokidar@5.0.0)
       '@angular/compiler': 22.2.3
       '@angular/compiler-cli': 22.2.3(@angular/compiler@22.2.3)(typescript@6.0.3)
       '@babel/core': 8.0.5
-      '@inquirer/confirm': 6.3.2(@types/node@26.6.5)
+      '@inquirer/confirm': 6.3.2(@types/node@24.19.2)
       '@parcel/watcher': 2.6.0
-      '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitejs/plugin-basic-ssl': 2.3.0(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       beasties: 0.5.4
       browserslist: 4.29.3
       chokidar: 5.0.0
@@ -12580,7 +12460,7 @@ snapshots:
       tinyglobby: 0.2.17
       tslib: 2.8.1
       typescript: 6.0.3
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
       xxhash-wasm: 1.1.0
     optionalDependencies:
       '@angular/core': 22.2.3(@angular/compiler@22.2.3)(rxjs@7.8.2)
@@ -12589,7 +12469,7 @@ snapshots:
       lmdb: 3.5.6
       postcss: 8.5.31
       rollup: 4.53.3
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
     transitivePeerDependencies:
       - '@types/node'
       - '@vitejs/devtools'
@@ -12602,15 +12482,15 @@ snapshots:
       - tsx
       - yaml
 
-  '@angular/cli@22.2.3(@types/node@26.6.5)(chokidar@5.0.0)':
+  '@angular/cli@22.2.4(@types/node@24.19.2)(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/architect': 0.2202.3(chokidar@5.0.0)
-      '@angular-devkit/core': 22.2.3(chokidar@5.0.0)
-      '@angular-devkit/schematics': 22.2.3(chokidar@5.0.0)
-      '@inquirer/prompts': 8.7.2(@types/node@26.6.5)
-      '@listr2/prompt-adapter-inquirer': 4.2.7(@inquirer/prompts@8.7.2(@types/node@26.6.5))(@types/node@26.6.5)(listr2@11.1.0)
+      '@angular-devkit/architect': 0.2202.4(chokidar@5.0.0)
+      '@angular-devkit/core': 22.2.4(chokidar@5.0.0)
+      '@angular-devkit/schematics': 22.2.4(chokidar@5.0.0)
+      '@inquirer/prompts': 8.7.2(@types/node@24.19.2)
+      '@listr2/prompt-adapter-inquirer': 4.2.7(@inquirer/prompts@8.7.2(@types/node@24.19.2))(@types/node@24.19.2)(listr2@11.1.0)
       '@modelcontextprotocol/server': 2.3.1
-      '@schematics/angular': 22.2.3(chokidar@5.0.0)
+      '@schematics/angular': 22.2.4(chokidar@5.0.0)
       jsonc-parser: 3.3.1
       listr2: 11.1.0
       npm-package-arg: 14.0.0
@@ -13071,7 +12951,7 @@ snapshots:
       idb-keyval: 6.2.1
       ox: 0.6.9(typescript@6.0.3)(zod@3.25.76)
       preact: 10.24.2
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       zustand: 5.0.3(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(use-sync-external-store@1.4.0(react@19.3.1))
     transitivePeerDependencies:
       - '@types/react'
@@ -13094,39 +12974,47 @@ snapshots:
       multiformats: 13.4.2
       uint8arrays: 5.1.1
 
-  '@biomejs/biome@2.5.15':
+  '@biomejs/biome@2.6.3':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.5.15
-      '@biomejs/cli-darwin-x64': 2.5.15
-      '@biomejs/cli-linux-arm64': 2.5.15
-      '@biomejs/cli-linux-arm64-musl': 2.5.15
-      '@biomejs/cli-linux-x64': 2.5.15
-      '@biomejs/cli-linux-x64-musl': 2.5.15
-      '@biomejs/cli-win32-arm64': 2.5.15
-      '@biomejs/cli-win32-x64': 2.5.15
+      '@biomejs/cli-android-arm64': 2.6.3
+      '@biomejs/cli-android-x64': 2.6.3
+      '@biomejs/cli-darwin-arm64': 2.6.3
+      '@biomejs/cli-darwin-x64': 2.6.3
+      '@biomejs/cli-linux-arm64': 2.6.3
+      '@biomejs/cli-linux-arm64-musl': 2.6.3
+      '@biomejs/cli-linux-x64': 2.6.3
+      '@biomejs/cli-linux-x64-musl': 2.6.3
+      '@biomejs/cli-win32-arm64': 2.6.3
+      '@biomejs/cli-win32-x64': 2.6.3
 
-  '@biomejs/cli-darwin-arm64@2.5.15':
+  '@biomejs/cli-android-arm64@2.6.3':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.5.15':
+  '@biomejs/cli-android-x64@2.6.3':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.5.15':
+  '@biomejs/cli-darwin-arm64@2.6.3':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.5.15':
+  '@biomejs/cli-darwin-x64@2.6.3':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.5.15':
+  '@biomejs/cli-linux-arm64-musl@2.6.3':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.5.15':
+  '@biomejs/cli-linux-arm64@2.6.3':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.5.15':
+  '@biomejs/cli-linux-x64-musl@2.6.3':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.5.15':
+  '@biomejs/cli-linux-x64@2.6.3':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.6.3':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.6.3':
     optional: true
 
   '@blazediff/core@1.10.0': {}
@@ -13342,7 +13230,7 @@ snapshots:
       jose: 6.2.3
       md5: 2.3.0
       uncrypto: 0.1.3
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       zod: 3.25.76
     transitivePeerDependencies:
       - bufferutil
@@ -13360,7 +13248,7 @@ snapshots:
       idb-keyval: 6.2.1
       ox: 0.6.9(typescript@6.0.3)(zod@3.25.76)
       preact: 10.24.2
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       zustand: 5.0.3(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(use-sync-external-store@1.4.0(react@19.3.1))
     transitivePeerDependencies:
       - '@types/react'
@@ -13917,78 +13805,78 @@ snapshots:
       '@leichtgewicht/ip-codec': 2.0.5
       utf8-codec: 1.0.0
 
-  '@effect/atom-react@4.0.5(effect@4.0.5)(react@19.3.1)(scheduler@0.28.0)':
+  '@effect/atom-react@4.1.0(effect@4.1.0)(react@19.3.1)(scheduler@0.28.0)':
     dependencies:
-      effect: 4.0.5
+      effect: 4.1.0
       react: 19.3.1
       scheduler: 0.28.0
 
-  '@effect/openapi-generator@4.0.5(@effect/platform-node@4.0.5(bufferutil@4.0.9)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@5.0.10))(effect@4.0.5)(encoding@0.1.13)':
+  '@effect/openapi-generator@4.1.0(@effect/platform-node@4.1.0(bufferutil@4.0.9)(effect@4.1.0)(redis@6.2.1)(utf-8-validate@5.0.10))(effect@4.1.0)(encoding@0.1.13)':
     dependencies:
-      '@effect/platform-node': 4.0.5(bufferutil@4.0.9)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@5.0.10)
-      effect: 4.0.5
+      '@effect/platform-node': 4.1.0(bufferutil@4.0.9)(effect@4.1.0)(redis@6.2.1)(utf-8-validate@5.0.10)
+      effect: 4.1.0
       swagger2openapi: 7.0.8(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
 
-  '@effect/platform-browser@4.0.5(effect@4.0.5)':
+  '@effect/platform-browser@4.1.0(effect@4.1.0)':
     dependencies:
-      effect: 4.0.5
+      effect: 4.1.0
 
-  '@effect/platform-node-shared@4.0.5(bufferutil@4.0.9)(effect@4.0.5)(utf-8-validate@5.0.10)':
+  '@effect/platform-node-shared@4.1.0(bufferutil@4.0.9)(effect@4.1.0)(utf-8-validate@5.0.10)':
     dependencies:
       '@types/ws': 8.18.2
-      effect: 4.0.5
+      effect: 4.1.0
       ws: 8.22.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/platform-node@4.0.5(bufferutil@4.0.9)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@5.0.10)':
+  '@effect/platform-node@4.1.0(bufferutil@4.0.9)(effect@4.1.0)(redis@6.2.1)(utf-8-validate@5.0.10)':
     dependencies:
-      '@effect/platform-node-shared': 4.0.5(bufferutil@4.0.9)(effect@4.0.5)(utf-8-validate@5.0.10)
-      effect: 4.0.5
+      '@effect/platform-node-shared': 4.1.0(bufferutil@4.0.9)(effect@4.1.0)(utf-8-validate@5.0.10)
+      effect: 4.1.0
       redis: 6.2.1
       undici: 8.12.2
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/tsgo-darwin-arm64@0.56.0':
+  '@effect/tsgo-darwin-arm64@0.63.0':
     optional: true
 
-  '@effect/tsgo-darwin-x64@0.56.0':
+  '@effect/tsgo-darwin-x64@0.63.0':
     optional: true
 
-  '@effect/tsgo-linux-arm64@0.56.0':
+  '@effect/tsgo-linux-arm64@0.63.0':
     optional: true
 
-  '@effect/tsgo-linux-arm@0.56.0':
+  '@effect/tsgo-linux-arm@0.63.0':
     optional: true
 
-  '@effect/tsgo-linux-x64@0.56.0':
+  '@effect/tsgo-linux-x64@0.63.0':
     optional: true
 
-  '@effect/tsgo-win32-arm64@0.56.0':
+  '@effect/tsgo-win32-arm64@0.63.0':
     optional: true
 
-  '@effect/tsgo-win32-x64@0.56.0':
+  '@effect/tsgo-win32-x64@0.63.0':
     optional: true
 
-  '@effect/tsgo@0.56.0':
+  '@effect/tsgo@0.63.0':
     optionalDependencies:
-      '@effect/tsgo-darwin-arm64': 0.56.0
-      '@effect/tsgo-darwin-x64': 0.56.0
-      '@effect/tsgo-linux-arm': 0.56.0
-      '@effect/tsgo-linux-arm64': 0.56.0
-      '@effect/tsgo-linux-x64': 0.56.0
-      '@effect/tsgo-win32-arm64': 0.56.0
-      '@effect/tsgo-win32-x64': 0.56.0
+      '@effect/tsgo-darwin-arm64': 0.63.0
+      '@effect/tsgo-darwin-x64': 0.63.0
+      '@effect/tsgo-linux-arm': 0.63.0
+      '@effect/tsgo-linux-arm64': 0.63.0
+      '@effect/tsgo-linux-x64': 0.63.0
+      '@effect/tsgo-win32-arm64': 0.63.0
+      '@effect/tsgo-win32-x64': 0.63.0
 
-  '@effect/vitest@4.0.5(effect@4.0.5)(vitest@5.0.5)':
+  '@effect/vitest@4.1.0(effect@4.1.0)(vitest@5.0.5)':
     dependencies:
-      effect: 4.0.5
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      effect: 4.1.0
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
 
   '@emnapi/core@1.11.2':
     dependencies:
@@ -14161,7 +14049,7 @@ snapshots:
 
   '@exodus/schemasafe@1.3.0': {}
 
-  '@fhevm/sdk@0.13.2(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
+  '@fhevm/sdk@0.13.2(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
     dependencies:
       '@noble/curves': 2.0.1
       '@noble/hashes': 2.0.1
@@ -14169,7 +14057,7 @@ snapshots:
     optionalDependencies:
       ethers: 6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       typescript: 6.0.3
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
 
   '@fivebinaries/coin-selection@3.0.0':
     dependencies:
@@ -14394,133 +14282,133 @@ snapshots:
 
   '@inquirer/ansi@2.0.9': {}
 
-  '@inquirer/checkbox@5.2.6(@types/node@26.6.5)':
+  '@inquirer/checkbox@5.2.6(@types/node@24.19.2)':
     dependencies:
       '@inquirer/ansi': 2.0.9
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
       '@inquirer/figures': 2.0.9
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/confirm@6.3.2(@types/node@26.6.5)':
+  '@inquirer/confirm@6.3.2(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.1.1(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.1.1(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/confirm@6.3.3(@types/node@26.6.5)':
+  '@inquirer/confirm@6.3.3(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/core@12.0.4(@types/node@26.6.5)':
+  '@inquirer/core@12.0.4(@types/node@24.19.2)':
     dependencies:
       '@inquirer/ansi': 2.0.9
       '@inquirer/figures': 2.0.9
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
       cli-width: 4.1.0
       fast-wrap-ansi: 0.2.2
       mute-stream: 3.0.0
       signal-exit: 4.1.0
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/editor@5.3.4(@types/node@26.6.5)':
+  '@inquirer/editor@5.3.4(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/external-editor': 3.0.6(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/external-editor': 3.0.6(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/expand@5.1.6(@types/node@26.6.5)':
+  '@inquirer/expand@5.1.6(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/external-editor@3.0.6(@types/node@26.6.5)':
+  '@inquirer/external-editor@3.0.6(@types/node@24.19.2)':
     dependencies:
       chardet: 2.2.0
       iconv-lite: 0.7.3
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
   '@inquirer/figures@2.0.9': {}
 
-  '@inquirer/input@5.1.7(@types/node@26.6.5)':
+  '@inquirer/input@5.1.7(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/number@4.2.4(@types/node@26.6.5)':
+  '@inquirer/number@4.2.4(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/password@5.2.3(@types/node@26.6.5)':
+  '@inquirer/password@5.2.3(@types/node@24.19.2)':
     dependencies:
       '@inquirer/ansi': 2.0.9
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/prompts@8.7.2(@types/node@26.6.5)':
+  '@inquirer/prompts@8.7.2(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/checkbox': 5.2.6(@types/node@26.6.5)
-      '@inquirer/confirm': 6.3.3(@types/node@26.6.5)
-      '@inquirer/editor': 5.3.4(@types/node@26.6.5)
-      '@inquirer/expand': 5.1.6(@types/node@26.6.5)
-      '@inquirer/input': 5.1.7(@types/node@26.6.5)
-      '@inquirer/number': 4.2.4(@types/node@26.6.5)
-      '@inquirer/password': 5.2.3(@types/node@26.6.5)
-      '@inquirer/rawlist': 5.3.6(@types/node@26.6.5)
-      '@inquirer/search': 4.3.4(@types/node@26.6.5)
-      '@inquirer/select': 5.2.6(@types/node@26.6.5)
+      '@inquirer/checkbox': 5.2.6(@types/node@24.19.2)
+      '@inquirer/confirm': 6.3.3(@types/node@24.19.2)
+      '@inquirer/editor': 5.3.4(@types/node@24.19.2)
+      '@inquirer/expand': 5.1.6(@types/node@24.19.2)
+      '@inquirer/input': 5.1.7(@types/node@24.19.2)
+      '@inquirer/number': 4.2.4(@types/node@24.19.2)
+      '@inquirer/password': 5.2.3(@types/node@24.19.2)
+      '@inquirer/rawlist': 5.3.6(@types/node@24.19.2)
+      '@inquirer/search': 4.3.4(@types/node@24.19.2)
+      '@inquirer/select': 5.2.6(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/rawlist@5.3.6(@types/node@26.6.5)':
+  '@inquirer/rawlist@5.3.6(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/search@4.3.4(@types/node@26.6.5)':
+  '@inquirer/search@4.3.4(@types/node@24.19.2)':
     dependencies:
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
       '@inquirer/figures': 2.0.9
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/select@5.2.6(@types/node@26.6.5)':
+  '@inquirer/select@5.2.6(@types/node@24.19.2)':
     dependencies:
       '@inquirer/ansi': 2.0.9
-      '@inquirer/core': 12.0.4(@types/node@26.6.5)
+      '@inquirer/core': 12.0.4(@types/node@24.19.2)
       '@inquirer/figures': 2.0.9
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/type@4.1.1(@types/node@26.6.5)':
+  '@inquirer/type@4.1.1(@types/node@24.19.2)':
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
-  '@inquirer/type@4.2.0(@types/node@26.6.5)':
+  '@inquirer/type@4.2.0(@types/node@24.19.2)':
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
 
   '@ioredis/commands@1.5.1':
     optional: true
@@ -14551,7 +14439,7 @@ snapshots:
     dependencies:
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       jest-mock: 29.7.0
     optional: true
 
@@ -14563,7 +14451,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.3.0
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
       jest-util: 29.7.0
@@ -14611,7 +14499,7 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       '@types/yargs': 17.0.35
       chalk: 4.1.2
     optional: true
@@ -14954,16 +14842,16 @@ snapshots:
 
   '@ledgerhq/logs@6.19.0': {}
 
-  '@ledgerhq/wallet-api-client@1.16.0(@ton/crypto@3.3.0)(encoding@0.1.13)':
+  '@ledgerhq/wallet-api-client@1.17.0(@ton/crypto@3.3.0)(encoding@0.1.13)':
     dependencies:
       '@ledgerhq/hw-transport': 6.36.0
-      '@ledgerhq/wallet-api-core': 2.1.0(@ton/crypto@3.3.0)(encoding@0.1.13)
+      '@ledgerhq/wallet-api-core': 2.2.0(@ton/crypto@3.3.0)(encoding@0.1.13)
       bignumber.js: 9.3.1
     transitivePeerDependencies:
       - '@ton/crypto'
       - encoding
 
-  '@ledgerhq/wallet-api-core@2.1.0(@ton/crypto@3.3.0)(encoding@0.1.13)':
+  '@ledgerhq/wallet-api-core@2.2.0(@ton/crypto@3.3.0)(encoding@0.1.13)':
     dependencies:
       '@stacks/transactions': 6.17.0(encoding@0.1.13)
       '@ton/core': 0.62.1(@ton/crypto@3.3.0)
@@ -14984,10 +14872,10 @@ snapshots:
       progress-events: 1.1.0
       uint8arraylist: 3.0.2
 
-  '@listr2/prompt-adapter-inquirer@4.2.7(@inquirer/prompts@8.7.2(@types/node@26.6.5))(@types/node@26.6.5)(listr2@11.1.0)':
+  '@listr2/prompt-adapter-inquirer@4.2.7(@inquirer/prompts@8.7.2(@types/node@24.19.2))(@types/node@24.19.2)(listr2@11.1.0)':
     dependencies:
-      '@inquirer/prompts': 8.7.2(@types/node@26.6.5)
-      '@inquirer/type': 4.2.0(@types/node@26.6.5)
+      '@inquirer/prompts': 8.7.2(@types/node@24.19.2)
+      '@inquirer/type': 4.2.0(@types/node@24.19.2)
       listr2: 11.1.0
     transitivePeerDependencies:
       - '@types/node'
@@ -15240,10 +15128,10 @@ snapshots:
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4':
     optional: true
 
-  '@msw/playwright@0.7.0(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(supports-color@7.2.0)':
+  '@msw/playwright@0.7.0(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(supports-color@7.2.0)':
     dependencies:
       '@mswjs/interceptors': 0.45.7(supports-color@7.2.0)
-      msw: 3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      msw: 3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       outvariant: 1.4.3
     transitivePeerDependencies:
       - supports-color
@@ -15481,30 +15369,30 @@ snapshots:
       near-api-js: 5.1.1(encoding@0.1.13)
       rxjs: 7.8.1
 
-  '@next/env@16.4.2': {}
+  '@next/env@16.4.3': {}
 
-  '@next/swc-darwin-arm64@16.4.2':
+  '@next/swc-darwin-arm64@16.4.3':
     optional: true
 
-  '@next/swc-darwin-x64@16.4.2':
+  '@next/swc-darwin-x64@16.4.3':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@16.4.2':
+  '@next/swc-linux-arm64-gnu@16.4.3':
     optional: true
 
-  '@next/swc-linux-arm64-musl@16.4.2':
+  '@next/swc-linux-arm64-musl@16.4.3':
     optional: true
 
-  '@next/swc-linux-x64-gnu@16.4.2':
+  '@next/swc-linux-x64-gnu@16.4.3':
     optional: true
 
-  '@next/swc-linux-x64-musl@16.4.2':
+  '@next/swc-linux-x64-musl@16.4.3':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@16.4.2':
+  '@next/swc-win32-arm64-msvc@16.4.3':
     optional: true
 
-  '@next/swc-win32-x64-msvc@16.4.2':
+  '@next/swc-win32-x64-msvc@16.4.3':
     optional: true
 
   '@ngraveio/bc-ur@1.1.13':
@@ -15590,124 +15478,122 @@ snapshots:
   '@oxc-parser/binding-android-arm-eabi@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-android-arm-eabi@0.154.0':
+  '@oxc-parser/binding-android-arm-eabi@0.155.0':
     optional: true
 
   '@oxc-parser/binding-android-arm64@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-android-arm64@0.154.0':
+  '@oxc-parser/binding-android-arm64@0.155.0':
     optional: true
 
   '@oxc-parser/binding-darwin-arm64@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-arm64@0.154.0':
+  '@oxc-parser/binding-darwin-arm64@0.155.0':
     optional: true
 
   '@oxc-parser/binding-darwin-x64@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-x64@0.154.0':
+  '@oxc-parser/binding-darwin-x64@0.155.0':
     optional: true
 
   '@oxc-parser/binding-freebsd-x64@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-freebsd-x64@0.154.0':
+  '@oxc-parser/binding-freebsd-x64@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm-gnueabihf@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.154.0':
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm-musleabihf@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.154.0':
+  '@oxc-parser/binding-linux-arm-musleabihf@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm64-gnu@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.154.0':
+  '@oxc-parser/binding-linux-arm64-gnu@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-arm64-musl@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-musl@0.154.0':
+  '@oxc-parser/binding-linux-arm64-musl@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-ppc64-gnu@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.154.0':
+  '@oxc-parser/binding-linux-ppc64-gnu@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-riscv64-gnu@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.154.0':
+  '@oxc-parser/binding-linux-riscv64-gnu@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-riscv64-musl@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.154.0':
+  '@oxc-parser/binding-linux-riscv64-musl@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-s390x-gnu@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.154.0':
+  '@oxc-parser/binding-linux-s390x-gnu@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-x64-gnu@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-gnu@0.154.0':
+  '@oxc-parser/binding-linux-x64-gnu@0.155.0':
     optional: true
 
   '@oxc-parser/binding-linux-x64-musl@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-musl@0.154.0':
+  '@oxc-parser/binding-linux-x64-musl@0.155.0':
     optional: true
 
   '@oxc-parser/binding-openharmony-arm64@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-openharmony-arm64@0.154.0':
+  '@oxc-parser/binding-openharmony-arm64@0.155.0':
     optional: true
 
   '@oxc-parser/binding-win32-arm64-msvc@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.154.0':
+  '@oxc-parser/binding-win32-arm64-msvc@0.155.0':
     optional: true
 
   '@oxc-parser/binding-win32-ia32-msvc@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.154.0':
+  '@oxc-parser/binding-win32-ia32-msvc@0.155.0':
     optional: true
 
   '@oxc-parser/binding-win32-x64-msvc@0.150.0':
     optional: true
 
-  '@oxc-parser/binding-win32-x64-msvc@0.154.0':
+  '@oxc-parser/binding-win32-x64-msvc@0.155.0':
     optional: true
 
   '@oxc-project/types@0.149.0': {}
 
   '@oxc-project/types@0.150.0': {}
 
-  '@oxc-project/types@0.152.0': {}
-
-  '@oxc-project/types@0.154.0': {}
+  '@oxc-project/types@0.155.0': {}
 
   '@oxc-resolver/binding-android-arm-eabi@11.24.2':
     optional: true
@@ -16549,7 +16435,7 @@ snapshots:
     dependencies:
       big.js: 6.2.2
       dayjs: 1.11.13
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.22.4)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.22.4)
     transitivePeerDependencies:
       - bufferutil
       - typescript
@@ -16560,7 +16446,7 @@ snapshots:
     dependencies:
       big.js: 6.2.2
       dayjs: 1.11.13
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     transitivePeerDependencies:
       - bufferutil
       - typescript
@@ -16573,7 +16459,7 @@ snapshots:
       '@reown/appkit-wallet': 1.8.24(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)
       '@walletconnect/universal-provider': 2.23.7(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(bufferutil@4.0.9)(encoding@0.1.13)(ioredis@5.10.1(supports-color@7.2.0))(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       valtio: 2.1.7(@types/react@19.3.0)(react@19.3.1)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -16734,7 +16620,7 @@ snapshots:
       '@walletconnect/logger': 3.0.2
       '@walletconnect/universal-provider': 2.23.7(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(bufferutil@4.0.9)(encoding@0.1.13)(ioredis@5.10.1(supports-color@7.2.0))(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       valtio: 2.1.7(@types/react@19.3.0)(react@19.3.1)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     optionalDependencies:
       '@base-org/account': 2.4.0(@types/react@19.3.0)(bufferutil@4.0.9)(debug@4.4.3(supports-color@7.2.0))(fastestsmallesttextencoderdecoder@1.0.22)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(utf-8-validate@5.0.10)(zod@3.25.76)
       '@coinbase/wallet-sdk': 4.3.6(@types/react@19.3.0)(bufferutil@4.0.9)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(utf-8-validate@5.0.10)(zod@3.25.76)
@@ -16797,7 +16683,7 @@ snapshots:
       bs58: 6.0.0
       semver: 7.7.2
       valtio: 2.1.7(@types/react@19.3.0)(react@19.3.1)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     optionalDependencies:
       '@lit/react': 1.0.8(@types/react@19.3.0)
     transitivePeerDependencies:
@@ -16832,114 +16718,114 @@ snapshots:
       - utf-8-validate
       - zod
 
-  '@rolldown/binding-android-arm-eabi@1.2.12':
+  '@rolldown/binding-android-arm-eabi@1.2.15':
     optional: true
 
   '@rolldown/binding-android-arm-eabi@1.2.8':
     optional: true
 
-  '@rolldown/binding-android-arm64@1.2.12':
+  '@rolldown/binding-android-arm64@1.2.15':
     optional: true
 
   '@rolldown/binding-android-arm64@1.2.8':
     optional: true
 
-  '@rolldown/binding-darwin-arm64@1.2.12':
+  '@rolldown/binding-darwin-arm64@1.2.15':
     optional: true
 
   '@rolldown/binding-darwin-arm64@1.2.8':
     optional: true
 
-  '@rolldown/binding-darwin-x64@1.2.12':
+  '@rolldown/binding-darwin-x64@1.2.15':
     optional: true
 
   '@rolldown/binding-darwin-x64@1.2.8':
     optional: true
 
-  '@rolldown/binding-freebsd-x64@1.2.12':
+  '@rolldown/binding-freebsd-x64@1.2.15':
     optional: true
 
   '@rolldown/binding-freebsd-x64@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-arm-gnueabihf@1.2.12':
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-arm-gnueabihf@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-arm64-gnu@1.2.12':
+  '@rolldown/binding-linux-arm64-gnu@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-arm64-gnu@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-arm64-musl@1.2.12':
+  '@rolldown/binding-linux-arm64-musl@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-arm64-musl@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-ppc64-gnu@1.2.12':
+  '@rolldown/binding-linux-ppc64-gnu@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-ppc64-gnu@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-s390x-gnu@1.2.12':
+  '@rolldown/binding-linux-s390x-gnu@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-s390x-gnu@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-x64-gnu@1.2.12':
+  '@rolldown/binding-linux-x64-gnu@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-x64-gnu@1.2.8':
     optional: true
 
-  '@rolldown/binding-linux-x64-musl@1.2.12':
+  '@rolldown/binding-linux-x64-musl@1.2.15':
     optional: true
 
   '@rolldown/binding-linux-x64-musl@1.2.8':
     optional: true
 
-  '@rolldown/binding-openharmony-arm64@1.2.12':
+  '@rolldown/binding-openharmony-arm64@1.2.15':
     optional: true
 
   '@rolldown/binding-openharmony-arm64@1.2.8':
     optional: true
 
-  '@rolldown/binding-win32-arm64-msvc@1.2.12':
+  '@rolldown/binding-win32-arm64-msvc@1.2.15':
     optional: true
 
   '@rolldown/binding-win32-arm64-msvc@1.2.8':
     optional: true
 
-  '@rolldown/binding-win32-x64-msvc@1.2.12':
+  '@rolldown/binding-win32-x64-msvc@1.2.15':
     optional: true
 
   '@rolldown/binding-win32-x64-msvc@1.2.8':
     optional: true
 
-  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@babel/core': 7.29.7(supports-color@7.2.0)
       picomatch: 4.0.7
-      rolldown: 1.2.12
+      rolldown: 1.2.15
     optionalDependencies:
       '@babel/runtime': 7.29.7
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     optional: true
 
-  '@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@babel/core': 8.0.5
       picomatch: 4.0.7
-      rolldown: 1.2.12
+      rolldown: 1.2.15
     optionalDependencies:
       '@babel/runtime': 7.29.7
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     optional: true
 
   '@rolldown/pluginutils@1.0.1': {}
@@ -17039,7 +16925,7 @@ snapshots:
   '@safe-global/safe-apps-sdk@9.1.0(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)':
     dependencies:
       '@safe-global/safe-gateway-typescript-sdk': 3.22.9
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     transitivePeerDependencies:
       - bufferutil
       - typescript
@@ -17048,10 +16934,10 @@ snapshots:
 
   '@safe-global/safe-gateway-typescript-sdk@3.22.9': {}
 
-  '@schematics/angular@22.2.3(chokidar@5.0.0)':
+  '@schematics/angular@22.2.4(chokidar@5.0.0)':
     dependencies:
-      '@angular-devkit/core': 22.2.3(chokidar@5.0.0)
-      '@angular-devkit/schematics': 22.2.3(chokidar@5.0.0)
+      '@angular-devkit/core': 22.2.4(chokidar@5.0.0)
+      '@angular-devkit/schematics': 22.2.4(chokidar@5.0.0)
       jsonc-parser: 3.3.1
       oxc-parser: 0.150.0
       typescript: 6.0.3
@@ -19060,13 +18946,13 @@ snapshots:
       '@tanstack/query-core': 5.104.1
       react: 19.3.1
 
-  '@tanstack/react-virtual@3.14.21(react-dom@19.3.1(react@19.3.1))(react@19.3.1)':
+  '@tanstack/react-virtual@3.14.23(react-dom@19.3.1(react@19.3.1))(react@19.3.1)':
     dependencies:
-      '@tanstack/virtual-core': 3.19.6
+      '@tanstack/virtual-core': 3.19.8
       react: 19.3.1
       react-dom: 19.3.1(react@19.3.1)
 
-  '@tanstack/virtual-core@3.19.6': {}
+  '@tanstack/virtual-core@3.19.8': {}
 
   '@testing-library/jest-dom@5.17.0':
     dependencies:
@@ -19702,7 +19588,7 @@ snapshots:
 
   '@types/graceful-fs@4.1.9':
     dependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
     optional: true
 
   '@types/istanbul-lib-coverage@2.0.6': {}
@@ -19744,6 +19630,10 @@ snapshots:
     dependencies:
       undici-types: 6.19.8
 
+  '@types/node@24.19.2':
+    dependencies:
+      undici-types: 7.24.6
+
   '@types/node@26.6.5':
     dependencies:
       undici-types: 8.9.0
@@ -19856,12 +19746,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vanilla-extract/compiler@0.7.2(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)':
+  '@vanilla-extract/compiler@0.7.2(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)':
     dependencies:
       '@vanilla-extract/css': 1.21.3
       '@vanilla-extract/integration': 8.0.10(supports-color@7.2.0)
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
-      vite-node: 6.0.0(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite-node: 6.0.0(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - '@vitejs/devtools'
@@ -19924,11 +19814,11 @@ snapshots:
     dependencies:
       '@vanilla-extract/css': 1.21.3
 
-  '@vanilla-extract/vite-plugin@5.2.6(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(yaml@2.9.1)':
+  '@vanilla-extract/vite-plugin@5.2.6(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(yaml@2.9.1)':
     dependencies:
-      '@vanilla-extract/compiler': 0.7.2(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      '@vanilla-extract/compiler': 0.7.2(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(supports-color@7.2.0)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
       '@vanilla-extract/integration': 8.0.10(supports-color@7.2.0)
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - '@vitejs/devtools'
@@ -19945,48 +19835,48 @@ snapshots:
       - tsx
       - yaml
 
-  '@vitejs/plugin-basic-ssl@2.3.0(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@vitejs/plugin-basic-ssl@2.3.0(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
-  '@vitejs/plugin-react@6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@vitejs/plugin-react@6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@rolldown/pluginutils': 1.0.1
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     optionalDependencies:
-      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7(supports-color@7.2.0))(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       babel-plugin-react-compiler: 1.0.0
       oxc-transform-react: 0.152.0
 
-  '@vitejs/plugin-react@6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@vitejs/plugin-react@6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(babel-plugin-react-compiler@1.0.0)(oxc-transform-react@0.152.0)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@rolldown/pluginutils': 1.0.1
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     optionalDependencies:
-      '@rolldown/plugin-babel': 0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.12)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@rolldown/plugin-babel': 0.2.3(@babel/core@8.0.5)(@babel/runtime@7.29.7)(rolldown@1.2.15)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       babel-plugin-react-compiler: 1.0.0
       oxc-transform-react: 0.152.0
 
-  '@vitest/browser-playwright@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
+  '@vitest/browser-playwright@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
     dependencies:
-      '@vitest/browser': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/browser': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       playwright: 1.64.1
       tinyrainbow: 3.2.0
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/browser-playwright@5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
+  '@vitest/browser-playwright@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
     dependencies:
-      '@vitest/browser': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/browser': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       playwright: 1.64.1
       tinyrainbow: 3.2.0
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
     transitivePeerDependencies:
       - bufferutil
       - msw
@@ -19994,17 +19884,17 @@ snapshots:
       - vite
     optional: true
 
-  '@vitest/browser@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
+  '@vitest/browser@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
     dependencies:
       '@blazediff/core': 1.10.0
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       '@vitest/ui': 5.0.5(vitest@5.0.5)
       '@vitest/utils': 5.0.5
       magic-string: 1.4.3
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.2.0
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       ws: 8.22.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
@@ -20012,17 +19902,17 @@ snapshots:
       - utf-8-validate
       - vite
 
-  '@vitest/browser@5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
+  '@vitest/browser@5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)':
     dependencies:
       '@blazediff/core': 1.10.0
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       '@vitest/ui': 5.0.5(vitest@5.0.5)
       '@vitest/utils': 5.0.5
       magic-string: 1.4.3
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.2.0
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       ws: 8.22.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
@@ -20031,25 +19921,25 @@ snapshots:
       - vite
     optional: true
 
-  '@vitest/mocker@5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@vitest/mocker@5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       '@vitest/spy': 5.0.5
       estree-walker: 3.0.3
       magic-string: 1.4.3
     optionalDependencies:
-      msw: 3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      msw: 3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
-  '@vitest/mocker@5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
+  '@vitest/mocker@5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))':
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       '@vitest/spy': 5.0.5
       estree-walker: 3.0.3
       magic-string: 1.4.3
     optionalDependencies:
-      msw: 3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      msw: 3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
   '@vitest/pretty-format@5.0.5':
     dependencies:
@@ -20065,7 +19955,7 @@ snapshots:
       pathe: 2.0.3
       sirv: 3.0.2
       tinyrainbow: 3.2.0
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
 
   '@vitest/utils@5.0.5':
     dependencies:
@@ -20073,10 +19963,10 @@ snapshots:
       convert-source-map: 2.0.0
       tinyrainbow: 3.2.0
 
-  '@wagmi/connectors@8.2.0(ccc3908e9a555c9170ef551eb25b7d5c)':
+  '@wagmi/connectors@8.2.2(7b87e3b381d314f5a60bd372f1c72c0f)':
     dependencies:
-      '@wagmi/core': 3.6.5(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      '@wagmi/core': 3.6.7(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     optionalDependencies:
       '@coinbase/wallet-sdk': 4.3.6(@types/react@19.3.0)(bufferutil@4.0.9)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(utf-8-validate@5.0.10)(zod@3.25.76)
       '@safe-global/safe-apps-provider': 0.18.6(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
@@ -20084,11 +19974,11 @@ snapshots:
       '@walletconnect/ethereum-provider': 2.21.1(@react-native-async-storage/async-storage@1.24.0(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10)))(@types/react@19.3.0)(bufferutil@4.0.9)(debug@4.4.3(supports-color@7.2.0))(encoding@0.1.13)(fastestsmallesttextencoderdecoder@1.0.22)(immer@11.1.15)(ioredis@5.10.1(supports-color@7.2.0))(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(utf-8-validate@5.0.10)(zod@3.25.76)
       typescript: 6.0.3
 
-  '@wagmi/core@3.6.5(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
+  '@wagmi/core@3.6.7(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
     dependencies:
       eventemitter3: 5.0.1
       mipd: 0.0.7(typescript@6.0.3)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
       zustand: 5.0.0(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(use-sync-external-store@1.4.0(react@19.3.1))
     optionalDependencies:
       '@tanstack/query-core': 5.104.1
@@ -21553,14 +21443,14 @@ snapshots:
 
   '@yuku-toolchain/types@0.19.0': {}
 
-  '@zama-fhe/sdk@3.7.0(@tanstack/query-core@5.104.1)(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
+  '@zama-fhe/sdk@3.7.1(@tanstack/query-core@5.104.1)(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))':
     dependencies:
-      '@fhevm/sdk': 0.13.2(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
+      '@fhevm/sdk': 0.13.2(ethers@6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10))(typescript@6.0.3)(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
       zod: 4.6.6
     optionalDependencies:
       '@tanstack/query-core': 5.104.1
       ethers: 6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     transitivePeerDependencies:
       - typescript
 
@@ -22230,7 +22120,7 @@ snapshots:
 
   chrome-launcher@0.15.2(supports-color@7.2.0):
     dependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2(supports-color@7.2.0)
@@ -22240,7 +22130,7 @@ snapshots:
 
   chromium-edge-launcher@0.2.0(supports-color@7.2.0):
     dependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       escape-string-regexp: 4.0.0
       is-wsl: 2.2.0
       lighthouse-logger: 1.4.2(supports-color@7.2.0)
@@ -22680,7 +22570,7 @@ snapshots:
 
   depd@2.0.0: {}
 
-  dependency-cruiser@18.6.0:
+  dependency-cruiser@18.7.0:
     dependencies:
       acorn: 8.19.0
       acorn-jsx: 5.3.2(acorn@8.19.0)
@@ -22780,7 +22670,7 @@ snapshots:
   ee-first@1.1.1:
     optional: true
 
-  effect@4.0.5: {}
+  effect@4.1.0: {}
 
   electron-to-chromium@1.5.445: {}
 
@@ -23142,10 +23032,10 @@ snapshots:
 
   fraction.js@5.3.4: {}
 
-  framer-motion@14.3.1(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
+  framer-motion@14.6.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
     dependencies:
-      motion-dom: 14.3.1
-      motion-utils: 14.1.1
+      motion-dom: 14.6.0
+      motion-utils: 14.6.0
       tslib: 2.8.1
     optionalDependencies:
       react: 19.3.1
@@ -23413,11 +23303,11 @@ snapshots:
 
   husky@9.1.7: {}
 
-  i18next-browser-languagedetector@8.2.1:
+  i18next-browser-languagedetector@8.2.3:
     dependencies:
       '@babel/runtime': 7.29.7
 
-  i18next@26.5.2(typescript@6.0.3):
+  i18next@26.5.11(typescript@6.0.3):
     optionalDependencies:
       typescript: 6.0.3
 
@@ -23702,7 +23592,7 @@ snapshots:
       '@jest/environment': 29.7.0
       '@jest/fake-timers': 29.7.0
       '@jest/types': 29.6.3
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       jest-mock: 29.7.0
       jest-util: 29.7.0
     optional: true
@@ -23714,7 +23604,7 @@ snapshots:
     dependencies:
       '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.9
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -23763,7 +23653,7 @@ snapshots:
   jest-mock@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       jest-util: 29.7.0
     optional: true
 
@@ -23781,7 +23671,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -23809,7 +23699,7 @@ snapshots:
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -23847,40 +23737,40 @@ snapshots:
   jsc-safe-url@0.2.4:
     optional: true
 
-  jscpd-darwin-arm64@5.4.1:
+  jscpd-darwin-arm64@5.4.2:
     optional: true
 
-  jscpd-darwin-x64@5.4.1:
+  jscpd-darwin-x64@5.4.2:
     optional: true
 
-  jscpd-linux-arm64-gnu@5.4.1:
+  jscpd-linux-arm64-gnu@5.4.2:
     optional: true
 
-  jscpd-linux-arm64-musl@5.4.1:
+  jscpd-linux-arm64-musl@5.4.2:
     optional: true
 
-  jscpd-linux-x64-gnu@5.4.1:
+  jscpd-linux-x64-gnu@5.4.2:
     optional: true
 
-  jscpd-linux-x64-musl@5.4.1:
+  jscpd-linux-x64-musl@5.4.2:
     optional: true
 
-  jscpd-windows-arm64-msvc@5.4.1:
+  jscpd-windows-arm64-msvc@5.4.2:
     optional: true
 
-  jscpd-windows-x64-msvc@5.4.1:
+  jscpd-windows-x64-msvc@5.4.2:
     optional: true
 
-  jscpd@5.4.1:
+  jscpd@5.4.2:
     optionalDependencies:
-      jscpd-darwin-arm64: 5.4.1
-      jscpd-darwin-x64: 5.4.1
-      jscpd-linux-arm64-gnu: 5.4.1
-      jscpd-linux-arm64-musl: 5.4.1
-      jscpd-linux-x64-gnu: 5.4.1
-      jscpd-linux-x64-musl: 5.4.1
-      jscpd-windows-arm64-msvc: 5.4.1
-      jscpd-windows-x64-msvc: 5.4.1
+      jscpd-darwin-arm64: 5.4.2
+      jscpd-darwin-x64: 5.4.2
+      jscpd-linux-arm64-gnu: 5.4.2
+      jscpd-linux-arm64-musl: 5.4.2
+      jscpd-linux-x64-gnu: 5.4.2
+      jscpd-linux-x64-musl: 5.4.2
+      jscpd-windows-arm64-msvc: 5.4.2
+      jscpd-windows-x64-msvc: 5.4.2
 
   jsdom@30.1.3(@noble/hashes@2.4.0):
     dependencies:
@@ -23975,18 +23865,18 @@ snapshots:
 
   kleur@3.0.3: {}
 
-  knip@6.42.0:
+  knip@6.43.0:
     dependencies:
       formatly: 0.11.4
       get-tsconfig: 4.14.3
       jiti: 2.7.0
-      oxc-parser: 0.154.0
+      oxc-parser: 0.155.0
       oxc-resolver: 11.24.2
       picomatch: 4.0.7
       smol-toml: 1.9.0
       strip-json-comments: 5.0.3
       tinyglobby: 0.2.17
-      unbash: 6.0.0
+      unbash: 6.0.1
       yaml: 2.9.1
       zod: 4.6.6
 
@@ -24525,15 +24415,15 @@ snapshots:
 
   modern-ahocorasick@3.3.0: {}
 
-  motion-dom@14.3.1:
+  motion-dom@14.6.0:
     dependencies:
-      motion-utils: 14.1.1
+      motion-utils: 14.6.0
 
-  motion-utils@14.1.1: {}
+  motion-utils@14.6.0: {}
 
-  motion@14.3.1(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
+  motion@14.6.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
     dependencies:
-      framer-motion: 14.3.1(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
+      framer-motion: 14.6.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1)
       tslib: 2.8.1
     optionalDependencies:
       react: 19.3.1
@@ -24562,9 +24452,9 @@ snapshots:
       msgpackr-extract: 3.0.4
     optional: true
 
-  msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
-      '@inquirer/confirm': 6.3.3(@types/node@26.6.5)
+      '@inquirer/confirm': 6.3.3(@types/node@24.19.2)
       '@msw/url': 0.1.2
       '@mswjs/interceptors': 0.45.7(supports-color@7.2.0)
       cookie: 2.0.1
@@ -24579,14 +24469,14 @@ snapshots:
     optionalDependencies:
       graphql: 16.14.2
       typescript: 6.0.3
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
 
-  msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
-      '@inquirer/confirm': 6.3.3(@types/node@26.6.5)
+      '@inquirer/confirm': 6.3.3(@types/node@24.19.2)
       '@msw/url': 0.1.2
       '@mswjs/interceptors': 0.45.7(supports-color@8.1.1)
       cookie: 2.0.1
@@ -24601,7 +24491,7 @@ snapshots:
     optionalDependencies:
       graphql: 16.14.2
       typescript: 6.0.3
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -24662,9 +24552,9 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  next@16.4.2(@babel/core@7.29.7(supports-color@8.1.1))(@types/node@26.6.5)(babel-plugin-react-compiler@1.0.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(sass@1.104.1):
+  next@16.4.3(@babel/core@7.29.7(supports-color@8.1.1))(@types/node@24.19.2)(babel-plugin-react-compiler@1.0.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(sass@1.104.1):
     dependencies:
-      '@next/env': 16.4.2
+      '@next/env': 16.4.3
       '@swc/helpers': 0.5.23
       baseline-browser-mapping: 2.11.27
       caniuse-lite: 1.0.30001814
@@ -24673,17 +24563,17 @@ snapshots:
       react-dom: 19.3.1(react@19.3.1)
       styled-jsx: 5.1.6(@babel/core@7.29.7(supports-color@8.1.1))(react@19.3.1)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 16.4.2
-      '@next/swc-darwin-x64': 16.4.2
-      '@next/swc-linux-arm64-gnu': 16.4.2
-      '@next/swc-linux-arm64-musl': 16.4.2
-      '@next/swc-linux-x64-gnu': 16.4.2
-      '@next/swc-linux-x64-musl': 16.4.2
-      '@next/swc-win32-arm64-msvc': 16.4.2
-      '@next/swc-win32-x64-msvc': 16.4.2
+      '@next/swc-darwin-arm64': 16.4.3
+      '@next/swc-darwin-x64': 16.4.3
+      '@next/swc-linux-arm64-gnu': 16.4.3
+      '@next/swc-linux-arm64-musl': 16.4.3
+      '@next/swc-linux-x64-gnu': 16.4.3
+      '@next/swc-linux-x64-musl': 16.4.3
+      '@next/swc-win32-arm64-msvc': 16.4.3
+      '@next/swc-win32-x64-msvc': 16.4.3
       babel-plugin-react-compiler: 1.0.0
       sass: 1.104.1
-      sharp: 0.35.5(@types/node@26.6.5)
+      sharp: 0.35.5(@types/node@24.19.2)
     transitivePeerDependencies:
       - '@babel/core'
       - '@types/node'
@@ -24928,7 +24818,7 @@ snapshots:
 
   outvariant@1.4.3: {}
 
-  ox@0.14.56(typescript@6.0.3)(zod@3.22.4):
+  ox@0.14.57(typescript@6.0.3)(zod@3.22.4):
     dependencies:
       '@adraffy/ens-normalize': 1.11.1
       '@noble/ciphers': 1.3.0
@@ -24943,7 +24833,7 @@ snapshots:
     transitivePeerDependencies:
       - zod
 
-  ox@0.14.56(typescript@6.0.3)(zod@3.25.76):
+  ox@0.14.57(typescript@6.0.3)(zod@3.25.76):
     dependencies:
       '@adraffy/ens-normalize': 1.11.1
       '@noble/ciphers': 1.3.0
@@ -25041,29 +24931,29 @@ snapshots:
       '@oxc-parser/binding-win32-ia32-msvc': 0.150.0
       '@oxc-parser/binding-win32-x64-msvc': 0.150.0
 
-  oxc-parser@0.154.0:
-    dependencies:
-      '@oxc-project/types': 0.154.0
-    optionalDependencies:
-      '@oxc-parser/binding-android-arm-eabi': 0.154.0
-      '@oxc-parser/binding-android-arm64': 0.154.0
-      '@oxc-parser/binding-darwin-arm64': 0.154.0
-      '@oxc-parser/binding-darwin-x64': 0.154.0
-      '@oxc-parser/binding-freebsd-x64': 0.154.0
-      '@oxc-parser/binding-linux-arm-gnueabihf': 0.154.0
-      '@oxc-parser/binding-linux-arm-musleabihf': 0.154.0
-      '@oxc-parser/binding-linux-arm64-gnu': 0.154.0
-      '@oxc-parser/binding-linux-arm64-musl': 0.154.0
-      '@oxc-parser/binding-linux-ppc64-gnu': 0.154.0
-      '@oxc-parser/binding-linux-riscv64-gnu': 0.154.0
-      '@oxc-parser/binding-linux-riscv64-musl': 0.154.0
-      '@oxc-parser/binding-linux-s390x-gnu': 0.154.0
-      '@oxc-parser/binding-linux-x64-gnu': 0.154.0
-      '@oxc-parser/binding-linux-x64-musl': 0.154.0
-      '@oxc-parser/binding-openharmony-arm64': 0.154.0
-      '@oxc-parser/binding-win32-arm64-msvc': 0.154.0
-      '@oxc-parser/binding-win32-ia32-msvc': 0.154.0
-      '@oxc-parser/binding-win32-x64-msvc': 0.154.0
+  oxc-parser@0.155.0:
+    dependencies:
+      '@oxc-project/types': 0.155.0
+    optionalDependencies:
+      '@oxc-parser/binding-android-arm-eabi': 0.155.0
+      '@oxc-parser/binding-android-arm64': 0.155.0
+      '@oxc-parser/binding-darwin-arm64': 0.155.0
+      '@oxc-parser/binding-darwin-x64': 0.155.0
+      '@oxc-parser/binding-freebsd-x64': 0.155.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.155.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.155.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.155.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.155.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.155.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.155.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.155.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.155.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.155.0
+      '@oxc-parser/binding-linux-x64-musl': 0.155.0
+      '@oxc-parser/binding-openharmony-arm64': 0.155.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.155.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.155.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.155.0
 
   oxc-resolver@11.24.2:
     optionalDependencies:
@@ -25515,11 +25405,11 @@ snapshots:
       react: 19.3.1
       scheduler: 0.28.0
 
-  react-i18next@17.1.0(i18next@26.5.2(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10))(react@19.3.1)(typescript@6.0.3):
+  react-i18next@17.1.9(i18next@26.5.11(typescript@6.0.3))(react-dom@19.3.1(react@19.3.1))(react-native@0.81.1(@babel/core@7.29.7(supports-color@7.2.0))(@types/react@19.3.0)(bufferutil@4.0.9)(react@19.3.1)(supports-color@7.2.0)(utf-8-validate@5.0.10))(react@19.3.1)(typescript@6.0.3):
     dependencies:
       '@babel/runtime': 7.29.7
       html-parse-stringify: 4.0.1
-      i18next: 26.5.2(typescript@6.0.3)
+      i18next: 26.5.11(typescript@6.0.3)
       react: 19.3.1
       use-sync-external-store: 1.6.0(react@19.3.1)
     optionalDependencies:
@@ -25635,12 +25525,14 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.3.0
 
-  react-router@8.4.0(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
+  react-router@8.5.0(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1):
     dependencies:
       '@remix-run/route-pattern': 0.22.1
       cookie-es: 3.1.1
       react: 19.3.1
     optionalDependencies:
+      '@types/react': 19.3.0
+      '@types/react-dom': 19.3.0(@types/react@19.3.0)
       react-dom: 19.3.1(react@19.3.1)
 
   react-style-singleton@2.2.3(@types/react@19.3.0)(react@19.3.1):
@@ -25838,32 +25730,32 @@ snapshots:
       - bufferutil
       - utf-8-validate
 
-  rolldown-string@0.3.1(rolldown@1.2.12):
+  rolldown-string@0.3.1(rolldown@1.2.15):
     dependencies:
       magic-string: 1.4.3
     optionalDependencies:
-      rolldown: 1.2.12
+      rolldown: 1.2.15
 
-  rolldown@1.2.12:
+  rolldown@1.2.15:
     dependencies:
-      '@oxc-project/types': 0.152.0
+      '@oxc-project/types': 0.155.0
       '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rolldown/binding-android-arm-eabi': 1.2.12
-      '@rolldown/binding-android-arm64': 1.2.12
-      '@rolldown/binding-darwin-arm64': 1.2.12
-      '@rolldown/binding-darwin-x64': 1.2.12
-      '@rolldown/binding-freebsd-x64': 1.2.12
-      '@rolldown/binding-linux-arm-gnueabihf': 1.2.12
-      '@rolldown/binding-linux-arm64-gnu': 1.2.12
-      '@rolldown/binding-linux-arm64-musl': 1.2.12
-      '@rolldown/binding-linux-ppc64-gnu': 1.2.12
-      '@rolldown/binding-linux-s390x-gnu': 1.2.12
-      '@rolldown/binding-linux-x64-gnu': 1.2.12
-      '@rolldown/binding-linux-x64-musl': 1.2.12
-      '@rolldown/binding-openharmony-arm64': 1.2.12
-      '@rolldown/binding-win32-arm64-msvc': 1.2.12
-      '@rolldown/binding-win32-x64-msvc': 1.2.12
+      '@rolldown/binding-android-arm-eabi': 1.2.15
+      '@rolldown/binding-android-arm64': 1.2.15
+      '@rolldown/binding-darwin-arm64': 1.2.15
+      '@rolldown/binding-darwin-x64': 1.2.15
+      '@rolldown/binding-freebsd-x64': 1.2.15
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.15
+      '@rolldown/binding-linux-arm64-gnu': 1.2.15
+      '@rolldown/binding-linux-arm64-musl': 1.2.15
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.15
+      '@rolldown/binding-linux-s390x-gnu': 1.2.15
+      '@rolldown/binding-linux-x64-gnu': 1.2.15
+      '@rolldown/binding-linux-x64-musl': 1.2.15
+      '@rolldown/binding-openharmony-arm64': 1.2.15
+      '@rolldown/binding-win32-arm64-msvc': 1.2.15
+      '@rolldown/binding-win32-x64-msvc': 1.2.15
 
   rolldown@1.2.8:
     dependencies:
@@ -26207,7 +26099,7 @@ snapshots:
       charenc: 0.0.2
       crypt: 0.0.2
 
-  sharp@0.35.5(@types/node@26.6.5):
+  sharp@0.35.5(@types/node@24.19.2):
     dependencies:
       '@img/colour': 1.1.0
       detect-libc: 2.1.2
@@ -26238,7 +26130,7 @@ snapshots:
       '@img/sharp-win32-arm64': 0.35.5
       '@img/sharp-win32-ia32': 0.35.5
       '@img/sharp-win32-x64': 0.35.5
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
     optional: true
 
   shebang-command@2.0.0:
@@ -26827,7 +26719,7 @@ snapshots:
     dependencies:
       multiformats: 14.0.4
 
-  unbash@6.0.0: {}
+  unbash@6.0.1: {}
 
   uncrypto@0.1.3: {}
 
@@ -26835,6 +26727,8 @@ snapshots:
 
   undici-types@6.19.8: {}
 
+  undici-types@7.24.6: {}
+
   undici-types@7.28.0: {}
 
   undici-types@8.11.2: {}
@@ -26854,12 +26748,12 @@ snapshots:
   unpipe@1.0.0:
     optional: true
 
-  unplugin-macros@0.23.3(esbuild@0.28.2)(rolldown@1.2.12)(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  unplugin-macros@0.23.3(esbuild@0.28.2)(rolldown@1.2.15)(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
       import-without-cache: 0.4.1
       magic-string-ast: 2.1.1
-      rolldown-string: 0.3.1(rolldown@1.2.12)
-      unplugin: 3.4.0(esbuild@0.28.2)(rolldown@1.2.12)(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      rolldown-string: 0.3.1(rolldown@1.2.15)
+      unplugin: 3.4.0(esbuild@0.28.2)(rolldown@1.2.15)(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       yuku-analyzer: 0.19.0
       yuku-ast: 0.19.0
       yuku-parser: 0.19.0
@@ -26875,16 +26769,16 @@ snapshots:
       - vite
       - webpack
 
-  unplugin@3.4.0(esbuild@0.28.2)(rolldown@1.2.12)(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  unplugin@3.4.0(esbuild@0.28.2)(rolldown@1.2.15)(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
       '@jridgewell/remapping': 2.3.5
       picomatch: 4.0.7
       webpack-virtual-modules: 0.6.2
     optionalDependencies:
       esbuild: 0.28.2
-      rolldown: 1.2.12
+      rolldown: 1.2.15
       rollup: 4.53.3
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
 
   unstorage@1.17.5(idb-keyval@6.2.6)(ioredis@5.10.1(supports-color@7.2.0)):
     dependencies:
@@ -27058,7 +26952,7 @@ snapshots:
       - utf-8-validate
       - zod
 
-  viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.22.4):
+  viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.22.4):
     dependencies:
       '@noble/curves': 1.9.1
       '@noble/hashes': 1.8.0
@@ -27066,7 +26960,7 @@ snapshots:
       '@scure/bip39': 1.6.0
       abitype: 1.2.3(typescript@6.0.3)(zod@3.22.4)
       isows: 1.0.7(ws@8.21.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))
-      ox: 0.14.56(typescript@6.0.3)(zod@3.22.4)
+      ox: 0.14.57(typescript@6.0.3)(zod@3.22.4)
       ws: 8.21.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     optionalDependencies:
       typescript: 6.0.3
@@ -27075,7 +26969,7 @@ snapshots:
       - utf-8-validate
       - zod
 
-  viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76):
+  viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76):
     dependencies:
       '@noble/curves': 1.9.1
       '@noble/hashes': 1.8.0
@@ -27083,7 +26977,7 @@ snapshots:
       '@scure/bip39': 1.6.0
       abitype: 1.2.3(typescript@6.0.3)(zod@3.25.76)
       isows: 1.0.7(ws@8.21.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))
-      ox: 0.14.56(typescript@6.0.3)(zod@3.25.76)
+      ox: 0.14.57(typescript@6.0.3)(zod@3.25.76)
       ws: 8.21.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     optionalDependencies:
       typescript: 6.0.3
@@ -27092,13 +26986,13 @@ snapshots:
       - utf-8-validate
       - zod
 
-  vite-node@6.0.0(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1):
+  vite-node@6.0.0(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1):
     dependencies:
       cac: 7.0.0
       es-module-lexer: 2.3.2
       obug: 2.1.4
       pathe: 2.0.3
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - '@vitejs/devtools'
@@ -27113,23 +27007,23 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-node-polyfills@0.28.0(rollup@4.53.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  vite-plugin-node-polyfills@0.28.0(rollup@4.53.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
       '@rollup/plugin-inject': 5.0.5(rollup@4.53.3)
       node-stdlib-browser: 1.3.1
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
     transitivePeerDependencies:
       - rollup
 
-  vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1):
+  vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1):
     dependencies:
       lightningcss: 1.33.0
       picomatch: 4.0.7
       postcss: 8.5.31
-      rolldown: 1.2.12
+      rolldown: 1.2.15
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 26.6.5
+      '@types/node': 24.19.2
       esbuild: 0.28.2
       fsevents: 2.3.3
       jiti: 2.7.0
@@ -27144,15 +27038,15 @@ snapshots:
     dependencies:
       react: 19.3.1
       react-dom: 19.3.1(react@19.3.1)
-      vitest: 5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      vitest: 5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
     optionalDependencies:
       '@types/react': 19.3.0
       '@types/react-dom': 19.3.0(@types/react@19.3.0)
 
-  vitest@5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  vitest@5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
       '@types/chai': 5.2.3
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       chai: 6.3.0
       es-module-lexer: 2.3.2
       expect-type: 1.4.0
@@ -27163,20 +27057,20 @@ snapshots:
       tinybench: 6.2.2
       tinyexec: 1.3.1
       tinyglobby: 0.2.17
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
       why-is-node-running: 3.2.1
     optionalDependencies:
-      '@types/node': 26.6.5
-      '@vitest/browser-playwright': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
+      '@types/node': 24.19.2
+      '@vitest/browser-playwright': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@7.2.0)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
       '@vitest/ui': 5.0.5(vitest@5.0.5)
       jsdom: 30.1.3(@noble/hashes@2.4.0)
     transitivePeerDependencies:
       - msw
 
-  vitest@5.0.5(@types/node@26.6.5)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
+  vitest@5.0.5(@types/node@24.19.2)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(jsdom@30.1.3(@noble/hashes@2.4.0))(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)):
     dependencies:
       '@types/chai': 5.2.3
-      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
+      '@vitest/mocker': 5.0.5(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))
       chai: 6.3.0
       es-module-lexer: 2.3.2
       expect-type: 1.4.0
@@ -27187,11 +27081,11 @@ snapshots:
       tinybench: 6.2.2
       tinyexec: 1.3.1
       tinyglobby: 0.2.17
-      vite: 8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
+      vite: 8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)
       why-is-node-running: 3.2.1
     optionalDependencies:
-      '@types/node': 26.6.5
-      '@vitest/browser-playwright': 5.0.5(msw@3.0.3(@types/node@26.6.5)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(vite@8.3.4(@types/node@26.6.5)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
+      '@types/node': 24.19.2
+      '@vitest/browser-playwright': 5.0.5(bufferutil@4.0.9)(msw@3.0.3(@types/node@24.19.2)(graphql@16.14.2)(supports-color@8.1.1)(typescript@6.0.3)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1)))(playwright@1.64.1)(utf-8-validate@5.0.10)(vite@8.3.5(@types/node@24.19.2)(esbuild@0.28.2)(jiti@2.7.0)(less@4.2.2)(sass-embedded@1.104.1)(sass@1.104.1)(terser@5.48.0)(tsx@4.23.15)(yaml@2.9.1))(vitest@5.0.5)
       '@vitest/ui': 5.0.5(vitest@5.0.5)
       jsdom: 30.1.3(@noble/hashes@2.4.0)
     transitivePeerDependencies:
@@ -27206,14 +27100,14 @@ snapshots:
     dependencies:
       xml-name-validator: 5.0.0
 
-  wagmi@3.7.7(99b8730116978f49449686857a28056d):
+  wagmi@3.7.9(640e0b218d143fe9b3ac1890c799c254):
     dependencies:
       '@tanstack/react-query': 5.104.1(react@19.3.1)
-      '@wagmi/connectors': 8.2.0(ccc3908e9a555c9170ef551eb25b7d5c)
-      '@wagmi/core': 3.6.5(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
+      '@wagmi/connectors': 8.2.2(7b87e3b381d314f5a60bd372f1c72c0f)
+      '@wagmi/core': 3.6.7(@tanstack/query-core@5.104.1)(@types/react@19.3.0)(immer@11.1.15)(react@19.3.1)(typescript@6.0.3)(use-sync-external-store@1.4.0(react@19.3.1))(viem@2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76))
       react: 19.3.1
       use-sync-external-store: 1.4.0(react@19.3.1)
-      viem: 2.57.7(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
+      viem: 2.57.11(bufferutil@4.0.9)(typescript@6.0.3)(utf-8-validate@5.0.10)(zod@3.25.76)
     optionalDependencies:
       typescript: 6.0.3
     transitivePeerDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 621c22865..ff780dce6 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -22,15 +22,15 @@ allowBuilds:
   utf-8-validate: false
 
 catalog:
-  "@angular/build": 22.2.3
-  "@angular/cli": 22.2.3
+  "@angular/build": 22.2.4
+  "@angular/cli": 22.2.4
   "@angular/common": 22.2.3
   "@angular/compiler": 22.2.3
   "@angular/compiler-cli": 22.2.3
   "@angular/core": 22.2.3
   "@angular/platform-browser": 22.2.3
   "@ast-grep/cli": 0.51.0
-  "@biomejs/biome": ^2.5.15
+  "@biomejs/biome": ^2.6.3
   "@commitlint/cli": ^21.2.4
   "@commitlint/config-conventional": ^21.2.4
   # @cosmos-kit/core 2.18 depends on @cosmjs 0.36 and cosmjs-types 0.10; newer lines duplicate its types.
@@ -41,14 +41,14 @@ catalog:
   "@cosmos-kit/leap-extension": 2.17.1
   "@cosmos-kit/leap-metamask-cosmos-snap": 0.17.1
   "@creit-tech/stellar-wallets-kit": jsr:2.7.1
-  "@effect/atom-react": 4.0.5
-  "@effect/openapi-generator": 4.0.5
-  "@effect/platform-browser": 4.0.5
-  "@effect/platform-node": 4.0.5
-  "@effect/tsgo": 0.56.0
-  "@effect/vitest": 4.0.5
-  "@ledgerhq/wallet-api-client": ^1.16.0
-  "@ledgerhq/wallet-api-core": ^2.1.0
+  "@effect/atom-react": 4.1.0
+  "@effect/openapi-generator": 4.1.0
+  "@effect/platform-browser": 4.1.0
+  "@effect/platform-node": 4.1.0
+  "@effect/tsgo": 0.63.0
+  "@effect/vitest": 4.1.0
+  "@ledgerhq/wallet-api-client": ^1.17.0
+  "@ledgerhq/wallet-api-core": ^2.2.0
   "@luno-kit/core": ^0.0.13
   "@meshsdk/wallet": 1.9.1
   "@msw/playwright": ^0.7.0
@@ -70,14 +70,14 @@ catalog:
   "@solana/wallet-standard-wallet-adapter-base": ^1.1.7
   # The Solana wallet adapters peer on @solana/web3.js ^1.99.0.
   "@solana/web3.js": ^1.99.0
-  "@tanstack/react-virtual": ^3.14.21
+  "@tanstack/react-virtual": ^3.14.23
   "@ton/core": ^0.63.1
   "@tonconnect/ui": ^5.0.1
   "@tronweb3/tronwallet-abstract-adapter": ^1.3.0
   "@tronweb3/tronwallet-adapter-bitkeep": ^1.3.0
   "@tronweb3/tronwallet-adapter-ledger": ^1.1.15
   "@tronweb3/tronwallet-adapter-tronlink": ^1.3.0
-  "@types/node": ^26.6.5
+  "@types/node": ^24.19.2
   "@types/react": 19.3.0
   "@types/react-dom": 19.3.0
   "@types/react-is": ^19.3.0
@@ -95,7 +95,7 @@ catalog:
   "@walletconnect/sign-client": 2.26.0
   # Must equal the exact version @reown/appkit depends on: createAppKit types its universalProvider option against it.
   "@walletconnect/universal-provider": 2.23.7
-  "@zama-fhe/sdk": 3.7.0
+  "@zama-fhe/sdk": 3.7.1
   aria-hidden: ^1.2.6
   autoprefixer: ^10.6.1
   bignumber.js: ^11.1.5
@@ -106,31 +106,31 @@ catalog:
   clsx: ^2.1.1
   # Held with @cosmjs for @cosmos-kit/core 2.18 (see the @cosmjs note).
   cosmjs-types: ^0.10.1
-  dependency-cruiser: ^18.6.0
-  effect: 4.0.5
+  dependency-cruiser: ^18.7.0
+  effect: 4.1.0
   esbuild: ^0.28.2
   husky: ^9.1.7
-  i18next: ^26.5.2
-  i18next-browser-languagedetector: ^8.2.1
-  jscpd: 5.4.1
+  i18next: ^26.5.11
+  i18next-browser-languagedetector: ^8.2.3
+  jscpd: 5.4.2
   jsdom: ^30.1.3
-  knip: ^6.42.0
+  knip: ^6.43.0
   mipd: ^0.0.7
   mixpanel-browser: ^2.84.0
-  motion: 14.3.1
+  motion: 14.6.0
   msw: ^3.0.3
-  next: ^16.4.2
+  next: ^16.4.3
   # Must satisfy the @vitejs/plugin-react peer range.
   oxc-transform-react: ^0.152.0
   playwright: ^1.64.1
   postcss: ^8.5.31
   react: ^19.3.1
   react-dom: ^19.3.1
-  react-i18next: ^17.1.0
+  react-i18next: ^17.1.9
   react-is: ^19.3.1
   react-loading-skeleton: ^3.5.0
   react-remove-scroll: ^2.7.2
-  react-router: ^8.4.0
+  react-router: ^8.5.0
   recharts: ^3.10.1
   rxjs: ~7.8.0
   scheduler: ">=0.25.0 <0.29.0"
@@ -140,12 +140,12 @@ catalog:
   # @angular/compiler-cli and @angular/build 22 peer on typescript >=6.0 <6.1.
   typescript: ~6.0.3
   unplugin-macros: ^0.23.3
-  viem: ^2.57.7
-  vite: ^8.3.4
+  viem: ^2.57.11
+  vite: ^8.3.5
   vite-plugin-node-polyfills: ^0.28.0
   vitest: 5.0.5
   vitest-browser-react: ^2.3.0
-  wagmi: 3.7.7
+  wagmi: 3.7.9
   yaml: ^2.9.1
 
 minimumReleaseAge: 4320
@@ -159,7 +159,7 @@ minimumReleaseAgeExclude:
 overrides:
   "@reown/appkit": 1.8.24
   # @angular/build pins vite 8.3.0 (GHSA-587h-7wmj-h5pm, fixed in 8.3.3).
-  "@angular/build>vite": ^8.3.4
+  "@angular/build>vite": ^8.3.5
   # chain-registry's own range would drift onto the new schema (see the chain-registry catalog note).
   "chain-registry>@chain-registry/types": 0.50.410
 
diff --git a/tools/ast-grep/rule-tests/no-unbranded-domain-identifier-test.yml b/tools/ast-grep/rule-tests/no-unbranded-domain-identifier-test.yml
new file mode 100644
index 000000000..c98c6bfb0
--- /dev/null
+++ b/tools/ast-grep/rule-tests/no-unbranded-domain-identifier-test.yml
@@ -0,0 +1,20 @@
+id: no-unbranded-domain-identifier
+valid:
+  - 'const Model = Schema.Struct({ yieldId: YieldId })'
+  - 'const Model = Schema.Struct({ address: TokenAddress, network: Network })'
+  - 'const Model = Schema.Struct({ id: Schema.NonEmptyString.pipe(Schema.brand("ModelId")) })'
+  - 'const Model = Schema.Struct({ ownerAddress: Schema.optional(WalletAddress) })'
+  - 'const Model = Schema.Struct({ network: Schema.Literals(["ethereum", "solana"]) })'
+  - 'const Model = Schema.Struct({ name: Schema.String, symbol: Schema.NonEmptyString })'
+  - 'const Model = Schema.Struct({ description: Schema.optional(Schema.String) })'
+  - 'const Model = Schema.Struct({ keyboard: Schema.String, identity: Schema.String })'
+invalid:
+  - 'const Model = Schema.Struct({ yieldId: Schema.String })'
+  - 'const Model = Schema.Struct({ id: Schema.NonEmptyString })'
+  - 'const Model = Schema.Struct({ address: Schema.String })'
+  - 'const Model = Schema.Struct({ ownerAddress: Schema.NonEmptyString })'
+  - 'const Model = Schema.Struct({ transactionHash: Schema.String })'
+  - 'const Model = Schema.Struct({ hash: Schema.optional(Schema.String) })'
+  - 'const Model = Schema.Struct({ network: Schema.String })'
+  - 'const Model = Schema.Struct({ balanceKey: Schema.NullOr(Schema.String) })'
+  - 'const Model = Schema.Struct({ "validatorAddress": Schema.optionalKey(Schema.NonEmptyString) })'
diff --git a/tools/ast-grep/rules/no-unbranded-domain-identifier.yml b/tools/ast-grep/rules/no-unbranded-domain-identifier.yml
new file mode 100644
index 000000000..03902a9c8
--- /dev/null
+++ b/tools/ast-grep/rules/no-unbranded-domain-identifier.yml
@@ -0,0 +1,32 @@
+id: no-unbranded-domain-identifier
+language: Tsx
+severity: error
+message: Use a brand (`Schema.NonEmptyString.pipe(Schema.brand(...))`) or a literal union for identifier-like domain fields, not an unbranded string schema.
+note: Identifier-like fields are `id`, `network`, `hash`, `address`, or names ending in `Id`, `Key`, `Address`, `Hash`, or `Network`.
+files:
+  - packages/widget/src/domain/**/*.ts
+utils:
+  unbranded-string:
+    regex: ^Schema\.(?:String|NonEmptyString)$
+  optional-unbranded-string:
+    kind: call_expression
+    all:
+      - has:
+          field: function
+          regex: ^Schema\.(?:optional|optionalKey|NullOr|UndefinedOr|NullishOr|OptionFromNullOr|OptionFromOptional|OptionFromOptionalKey|OptionFromUndefinedOr|OptionFromNullishOr)$
+      - has:
+          field: arguments
+          has:
+            nthChild: 1
+            matches: unbranded-string
+rule:
+  kind: pair
+  all:
+    - has:
+        field: key
+        regex: ^["']?(?:id|network|hash|address|\w*(?:Id|Key|Address|Hash|Network))["']?$
+    - has:
+        field: value
+        any:
+          - matches: unbranded-string
+          - matches: optional-unbranded-string
diff --git a/tools/setup-mise.sh b/tools/setup-mise.sh
index 5f2a93460..1bf6d9565 100755
--- a/tools/setup-mise.sh
+++ b/tools/setup-mise.sh
@@ -8,7 +8,7 @@
 #
 # POSIX sh only: this file is sourced into whatever shell the caller uses.
 
-MISE_SETUP_VERSION=v2026.10.14
+MISE_SETUP_VERSION=v2026.10.19
 
 export PATH="$HOME/.local/bin:${MISE_DATA_DIR:-$HOME/.local/share/mise}/shims:$PATH"
 
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 6a86bb6be..6b658681c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -8,6 +8,7 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
     "moduleResolution": "Bundler",
@@ -20,6 +21,7 @@
     /* Linting */
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true
   }
 }