diff --git a/.agents/skills/oneshot-embedded-wallet/SKILL.md b/.agents/skills/oneshot-embedded-wallet/SKILL.md
index 35aac78..aae79a9 100644
--- a/.agents/skills/oneshot-embedded-wallet/SKILL.md
+++ b/.agents/skills/oneshot-embedded-wallet/SKILL.md
@@ -111,12 +111,26 @@ await proxy.rpc("configure", options);
 | `copy.personalSign.rejectLabel` | string | Reject button |
 | `copy.personalSign.signLabel` | string | Sign button |
 | `copy.typedData.title` | string | EIP-712 modal title |
-| `copy.typedData.accountLabel` | string | Account field label |
+| `copy.typedData.body` | string | Intro paragraph |
+| `copy.typedData.networkLabel` | string | Network summary row label |
+| `copy.typedData.requestFromLabel` | string | Requesting domain row label |
+| `copy.typedData.accountLabel` | string | Signing account row label |
+| `copy.typedData.interactingWithLabel` | string | Verifying contract row label |
 | `copy.typedData.primaryTypeLabel` | string | Primary type label |
-| `copy.typedData.domainLabel` | string | Domain label |
-| `copy.typedData.messageLabel` | string | Message label |
+| `copy.typedData.messageSectionLabel` | string | Message card heading |
+| `copy.typedData.signingHint` | string | Hint shown while signing |
 | `copy.typedData.rejectLabel` | string | Reject button |
 | `copy.typedData.signLabel` | string | Sign button |
+| `copy.grantExecutionPermission.title` | string | ERC-20 periodic grant modal title |
+| `copy.grantExecutionPermission.permissionKindLabel` | string | Summary card eyebrow |
+| `copy.grantExecutionPermission.amountLabel` | string | Summary amount row |
+| `copy.grantExecutionPermission.transferWindowLabel` | string | Summary cadence row |
+| `copy.grantExecutionPermission.toLabel` | string | Delegate summary row |
+| `copy.grantExecutionPermission.viewOnExplorerLabel` | string | Delegate explorer link a11y |
+| `copy.grantExecutionPermission.justificationLabel` | string | Host justification in terms card |
+| `copy.grantExecutionPermission.advancedLabel` | string | Toggle for Unix start field |
+| `copy.grantExecutionPermission.grantLabel` | string | Grant button |
+| `copy.grantExecutionPermission.rejectLabel` | string | Reject button |
 | `copy.credentialOffer.title` | string | offer modal title |
 | `copy.credentialOffer.body` | string | supports `{issuerName}` `{issuerId}` |
 | `copy.credentialOffer.offeredHeading` | string | offered list heading |
@@ -389,8 +403,8 @@ EIP-7715 host RPCs: `wallet_requestExecutionPermissions`, `wallet_revokeExecutio
 | `permission.type` | Chains (v1) | Purpose |
 |-------------------|-------------|---------|
 | `erc20-token-periodic` | All relayer chains | Periodic ERC-20 `transfer` budget (`ScopeType.Erc20PeriodTransfer`) |
-| `lifi-swap-approve` | Base (`0x2105`) | One-time `approve(inputToken → LiFi Diamond)` onboarding |
-| `lifi-swap-periodic` | Base (`0x2105`) | Periodic LiFi swap via `LiFiSwapEnforcer` (`0x47472E8AA7012D1c23336aa28514AE94389318f5`) |
+| `lifi-swap-approve` | Arc (`0x13b2`), Base (`0x2105`), Ethereum (`0x1`) | One-time `approve(inputToken → LiFi Diamond)` onboarding |
+| `lifi-swap-periodic` | Arc, Base, Ethereum mainnet | Periodic LiFi swap via `LiFiSwapEnforcer` proxy (`0x29fcBBa852439616c4D614A2fa6411E42b760153`) |
 
 **`erc20-token-periodic` / `lifi-swap-periodic` amounts:** Hosts should pass `periodAmount` (hex atoms) to prefill the grant form. Playground demos default to **10 USDC** (`0x989680`).
 
diff --git a/.github/workflows/Deploy Dev.yaml b/.github/workflows/Deploy Dev.yaml
index 0da3bff..c227225 100644
--- a/.github/workflows/Deploy Dev.yaml	
+++ b/.github/workflows/Deploy Dev.yaml	
@@ -55,11 +55,8 @@ jobs:
           gcloud --quiet auth configure-docker $GAR_LOCATION-docker.pkg.dev
 
       - name: Build Wallet
-        env:
-          CLOUDSMITH_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
         run: |-
           docker build \
-            --secret id=cloudsmith_token,env=CLOUDSMITH_TOKEN \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:$GITHUB_SHA" \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:${GITHUB_REF##*/}" \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:latest" \
diff --git a/.github/workflows/Deploy Prod.yaml b/.github/workflows/Deploy Prod.yaml
index 0811ddd..0ba27c3 100644
--- a/.github/workflows/Deploy Prod.yaml	
+++ b/.github/workflows/Deploy Prod.yaml	
@@ -53,11 +53,8 @@ jobs:
           gcloud --quiet auth configure-docker $GAR_LOCATION-docker.pkg.dev
 
       - name: Build Wallet
-        env:
-          CLOUDSMITH_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
         run: |-
           docker build \
-            --secret id=cloudsmith_token,env=CLOUDSMITH_TOKEN \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:$GITHUB_SHA" \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:${GITHUB_REF##*/}" \
             --tag "$GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/$PRODUCT_NAME/oneshot-wallet:latest" \
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index e87ec79..0000000
--- a/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-@crcl-main:registry=https://npm.cloudsmith.io/circle/common-private/
-//npm.cloudsmith.io/circle/common-private/:_authToken=${CLOUDSMITH_TOKEN}
diff --git a/AGENTS.md b/AGENTS.md
index 4806eae..a3c0686 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -25,7 +25,7 @@ Prefer **clean code over backwards compatibility**. Do not add legacy redirects,
 
 Test Host Layer: `host/` (`npm run dev:host`). Browser extension: `extension/` (`npm run dev:extension`) — see [`extension/README.md`](extension/README.md). Branding / host config via Host RPC `configure`, not in-wallet debug knobs.
 
-Fiat onramp: Asset Details **Buy** and host RPC `onramp({ chainId?, amount? })` open `OnrampView` (Circle AppKit). Sessions come from Relayer `POST /wallet/onramp` — never put the Circle kit key in this SPA. When Branding is nested in a Host iframe (`window.self !== window.top`), UI prefers `openWindow` (prefetch session, then a sync click) because Transak `frame-ancestors` cannot authorize arbitrary hosts. Top-level Branding uses `mountIframe`. Override with `localStorage.circlePopup = "true"|"false"`. Cloudsmith: set `CLOUDSMITH_TOKEN` before `npm install` (see README).
+Fiat onramp: Asset Details **Buy** and host RPC `onramp({ chainId?, amount? })` open `OnrampView` (Circle AppKit). Sessions come from Relayer `POST /wallet/onramp` — never put the Circle kit key in this SPA. When Branding is nested in a Host iframe (`window.self !== window.top`), UI prefers `openWindow` (prefetch session, then a sync click) because Transak `frame-ancestors` cannot authorize arbitrary hosts. Top-level Branding uses `mountIframe`. Override with `localStorage.circlePopup = "true"|"false"`. Circle App Kit is the public npm package `@circle-fin/app-kit`.
 
 CCTP bridge: Asset Details **Bridge** (native USDC with `useCCTPBridge`) and host RPC `bridge({ amount?, sourceChainId?, destinationChainId? })` open `CCTPBridge`. Source omit → session chain. Burns via `TokenMessengerV2.depositForBurnWithHook` + `cctp-forward` hook through the EIP-7710 relayer (same USDC fee as Send). Destination mint is Circle’s Forwarding Service — no dest-chain signature, no native gas, no BridgeKit.
 
diff --git a/Dockerfile b/Dockerfile
index 78f54aa..c57ef0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,13 +5,8 @@ WORKDIR /app
 
 COPY package.json package-lock.json ./
 COPY host/package.json ./host/
-COPY .npmrc ./
 
-# Circle @crcl-main/* requires CLOUDSMITH_TOKEN BuildKit secret
-RUN --mount=type=secret,id=cloudsmith_token \
-  CLOUDSMITH_TOKEN="$(cat /run/secrets/cloudsmith_token)" \
-  npm ci \
-  && rm -f .npmrc
+RUN npm ci
 
 COPY index.html vite.config.ts tsconfig.json tsconfig.node.json components.json ./
 COPY src ./src
diff --git a/README.md b/README.md
index 05c049b..aa0dc29 100644
--- a/README.md
+++ b/README.md
@@ -29,21 +29,6 @@ Production deliverable: a static **nginx** Docker image (no server-side runtime)
 
 ## Setup
 
-Circle’s private AppKit canary requires Cloudsmith auth. The repo includes `.npmrc`;
-export your token before installing:
-
-```bash
-# Linux / macOS
-export CLOUDSMITH_TOKEN=<your-cloudsmith-token>
-```
-
-```powershell
-# Windows PowerShell
-$env:CLOUDSMITH_TOKEN = "<your-cloudsmith-token>"
-```
-
-CI Docker builds expect GitHub Actions secret `CLOUDSMITH_TOKEN`.
-
 ```bash
 npm install
 cp .env.example .env  # set NGROK_AUTHTOKEN (and optional NGROK_DOMAIN)
diff --git a/host/src/components/WalletConfiguratorTextTabSigningSections.tsx b/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
index ea03d96..a76ef81 100644
--- a/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
+++ b/host/src/components/WalletConfiguratorTextTabSigningSections.tsx
@@ -219,6 +219,12 @@ export function WalletConfiguratorTextTabSigningSections({
             value={form.typedTitle}
             onChange={(value) => patch("typedTitle", value)}
           />
+          <BodyField
+            id="typed-body"
+            label="Body"
+            value={form.typedBody}
+            onChange={(value) => patch("typedBody", value)}
+          />
           <TextField
             id="typed-sign"
             label="Sign"
@@ -231,6 +237,12 @@ export function WalletConfiguratorTextTabSigningSections({
             value={form.typedReject}
             onChange={(value) => patch("typedReject", value)}
           />
+          <TextField
+            id="typed-signing-hint"
+            label="Signing hint"
+            value={form.typedSigningHint}
+            onChange={(value) => patch("typedSigningHint", value)}
+          />
         </AccordionContent>
       </AccordionItem>
 
@@ -243,36 +255,18 @@ export function WalletConfiguratorTextTabSigningSections({
             value={form.siweTitle}
             onChange={(value) => patch("siweTitle", value)}
           />
-          <TextField
+          <BodyField
             id="siwe-body"
-            label="Body"
+            label="Body ({domain})"
             value={form.siweBody}
             onChange={(value) => patch("siweBody", value)}
           />
-          <TextField
-            id="siwe-estimated-changes"
-            label="Estimated changes label"
-            value={form.siweEstimatedChangesLabel}
-            onChange={(value) => patch("siweEstimatedChangesLabel", value)}
-          />
-          <TextField
-            id="siwe-no-changes"
-            label="No changes label"
-            value={form.siweNoChangesLabel}
-            onChange={(value) => patch("siweNoChangesLabel", value)}
-          />
           <TextField
             id="siwe-network"
             label="Network label"
             value={form.siweNetworkLabel}
             onChange={(value) => patch("siweNetworkLabel", value)}
           />
-          <TextField
-            id="siwe-request-from"
-            label="Request from label"
-            value={form.siweRequestFromLabel}
-            onChange={(value) => patch("siweRequestFromLabel", value)}
-          />
           <TextField
             id="siwe-signing-in-with"
             label="Signing in with label"
@@ -291,6 +285,42 @@ export function WalletConfiguratorTextTabSigningSections({
             value={form.siweUriLabel}
             onChange={(value) => patch("siweUriLabel", value)}
           />
+          <TextField
+            id="siwe-version"
+            label="Version label"
+            value={form.siweVersionLabel}
+            onChange={(value) => patch("siweVersionLabel", value)}
+          />
+          <TextField
+            id="siwe-nonce"
+            label="Nonce label"
+            value={form.siweNonceLabel}
+            onChange={(value) => patch("siweNonceLabel", value)}
+          />
+          <TextField
+            id="siwe-issued-at"
+            label="Issued at label"
+            value={form.siweIssuedAtLabel}
+            onChange={(value) => patch("siweIssuedAtLabel", value)}
+          />
+          <TextField
+            id="siwe-expiration"
+            label="Expiration time label"
+            value={form.siweExpirationTimeLabel}
+            onChange={(value) => patch("siweExpirationTimeLabel", value)}
+          />
+          <TextField
+            id="siwe-not-before"
+            label="Not before label"
+            value={form.siweNotBeforeLabel}
+            onChange={(value) => patch("siweNotBeforeLabel", value)}
+          />
+          <TextField
+            id="siwe-resources"
+            label="Resources label"
+            value={form.siweResourcesLabel}
+            onChange={(value) => patch("siweResourcesLabel", value)}
+          />
           <TextField
             id="siwe-reject"
             label="Reject"
@@ -299,7 +329,7 @@ export function WalletConfiguratorTextTabSigningSections({
           />
           <TextField
             id="siwe-sign"
-            label="Confirm"
+            label="Sign in"
             value={form.siweSignLabel}
             onChange={(value) => patch("siweSignLabel", value)}
           />
diff --git a/host/src/components/WalletConfiguratorTextTabWalletSections.tsx b/host/src/components/WalletConfiguratorTextTabWalletSections.tsx
index 26f0a2f..9374783 100644
--- a/host/src/components/WalletConfiguratorTextTabWalletSections.tsx
+++ b/host/src/components/WalletConfiguratorTextTabWalletSections.tsx
@@ -171,6 +171,54 @@ export function WalletConfiguratorTextTabWalletSections({
             value={form.confirmTransferReject}
             onChange={(value) => patch("confirmTransferReject", value)}
           />
+          <TextField
+            id="onramp-title"
+            label="Onramp title"
+            value={form.onrampTitle}
+            onChange={(value) => patch("onrampTitle", value)}
+          />
+          <BodyField
+            id="onramp-body"
+            label="Onramp body ({token}, {network})"
+            value={form.onrampBody}
+            onChange={(value) => patch("onrampBody", value)}
+          />
+          <TextField
+            id="onramp-destination-label"
+            label="Onramp destination label"
+            value={form.onrampDestinationLabel}
+            onChange={(value) => patch("onrampDestinationLabel", value)}
+          />
+          <TextField
+            id="onramp-close"
+            label="Onramp close"
+            value={form.onrampCloseLabel}
+            onChange={(value) => patch("onrampCloseLabel", value)}
+          />
+          <TextField
+            id="onramp-open"
+            label="Onramp open"
+            value={form.onrampOpenLabel}
+            onChange={(value) => patch("onrampOpenLabel", value)}
+          />
+          <TextField
+            id="onramp-reopen"
+            label="Onramp reopen"
+            value={form.onrampReopenLabel}
+            onChange={(value) => patch("onrampReopenLabel", value)}
+          />
+          <BodyField
+            id="onramp-popup-ready"
+            label="Onramp popup ready hint"
+            value={form.onrampPopupReadyBody}
+            onChange={(value) => patch("onrampPopupReadyBody", value)}
+          />
+          <BodyField
+            id="onramp-popup-opened"
+            label="Onramp popup opened hint"
+            value={form.onrampPopupOpenedBody}
+            onChange={(value) => patch("onrampPopupOpenedBody", value)}
+          />
           <TextField
             id="transfer-tokens-title"
             label="Transfer modal title"
@@ -225,6 +273,26 @@ export function WalletConfiguratorTextTabWalletSections({
             value={form.grantPermissionTitle}
             onChange={(value) => patch("grantPermissionTitle", value)}
           />
+          <TextField
+            id="grant-permission-kind"
+            label="Grant permission kind (eyebrow)"
+            value={form.grantPermissionKindLabel}
+            onChange={(value) => patch("grantPermissionKindLabel", value)}
+          />
+          <TextField
+            id="grant-permission-amount-label"
+            label="Grant amount row label"
+            value={form.grantPermissionAmountLabel}
+            onChange={(value) => patch("grantPermissionAmountLabel", value)}
+          />
+          <TextField
+            id="grant-permission-window-label"
+            label="Grant transfer window label"
+            value={form.grantPermissionTransferWindowLabel}
+            onChange={(value) =>
+              patch("grantPermissionTransferWindowLabel", value)
+            }
+          />
           <TextField
             id="grant-permission-grant"
             label="Grant permission confirm"
diff --git a/host/src/constants/signDemo.ts b/host/src/constants/signDemo.ts
index 5f4b228..1634ae7 100644
--- a/host/src/constants/signDemo.ts
+++ b/host/src/constants/signDemo.ts
@@ -4,7 +4,7 @@ export const DEFAULT_EIP712_TYPED_DATA = {
   domain: {
     name: "Ether Mail",
     version: "1",
-    chainId: 421614,
+    chainId: 84532,
     verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
   },
   types: {
diff --git a/host/src/styleForm.ts b/host/src/styleForm.ts
index e1d3ccd..47c113d 100644
--- a/host/src/styleForm.ts
+++ b/host/src/styleForm.ts
@@ -74,21 +74,32 @@ export interface IStyleFormState {
   signLabel: string;
   signReject: string;
 
-  // Text — Typed data
+  // Text — Typed data (EIP-712)
   typedTitle: string;
+  typedBody: string;
+  typedNetworkLabel: string;
+  typedRequestFromLabel: string;
+  typedAccountLabel: string;
+  typedInteractingWithLabel: string;
+  typedPrimaryTypeLabel: string;
+  typedMessageSectionLabel: string;
   typedSignLabel: string;
   typedReject: string;
+  typedSigningHint: string;
 
   // Text — SIWE (EIP-4361)
   siweTitle: string;
   siweBody: string;
-  siweEstimatedChangesLabel: string;
-  siweNoChangesLabel: string;
   siweNetworkLabel: string;
-  siweRequestFromLabel: string;
   siweSigningInWithLabel: string;
   siweMessageLabel: string;
   siweUriLabel: string;
+  siweVersionLabel: string;
+  siweNonceLabel: string;
+  siweIssuedAtLabel: string;
+  siweExpirationTimeLabel: string;
+  siweNotBeforeLabel: string;
+  siweResourcesLabel: string;
   siweRejectLabel: string;
   siweSignLabel: string;
   siweSigningHint: string;
@@ -160,6 +171,18 @@ export interface IStyleFormState {
   confirmTransferConfirm: string;
   confirmTransferReject: string;
 
+  // Text — Circle onramp (Buy)
+  onrampTitle: string;
+  onrampBody: string;
+  onrampDestinationLabel: string;
+  onrampCloseLabel: string;
+  onrampOpenLabel: string;
+  onrampReopenLabel: string;
+  onrampLoadingLabel: string;
+  onrampPreparingLabel: string;
+  onrampPopupReadyBody: string;
+  onrampPopupOpenedBody: string;
+
   // Text — Transfer tokens (in-wallet send)
   transferTokensTitle: string;
   transferTokensSend: string;
@@ -177,6 +200,12 @@ export interface IStyleFormState {
 
   // Text — EIP-7715 grant / cancel
   grantPermissionTitle: string;
+  grantPermissionKindLabel: string;
+  grantPermissionAmountLabel: string;
+  grantPermissionTransferWindowLabel: string;
+  grantPermissionJustificationLabel: string;
+  grantPermissionViewOnExplorerLabel: string;
+  grantPermissionAdvancedLabel: string;
   grantPermissionGrant: string;
   grantPermissionReject: string;
   cancelDelegationTitle: string;
@@ -298,21 +327,32 @@ export const ACME_PRESET: IStyleFormState = {
   signTitle: "Approve signature",
   signLabel: "Sign",
   signReject: "Reject",
-  typedTitle: "Approve typed data",
+  typedTitle: "Signature request",
+  typedBody: "Review request details before you confirm.",
+  typedNetworkLabel: "Network",
+  typedRequestFromLabel: "Request from",
+  typedAccountLabel: "Account",
+  typedInteractingWithLabel: "Interacting with",
+  typedPrimaryTypeLabel: "Primary type",
+  typedMessageSectionLabel: "Message",
   typedSignLabel: "Sign",
   typedReject: "Reject",
+  typedSigningHint: "Confirm in the signing panel…",
   siweTitle: "Sign-in request",
   siweBody:
-    "A site wants you to sign in by proving you own this account. This will not spend tokens or change on-chain balances.",
-  siweEstimatedChangesLabel: "Estimated changes",
-  siweNoChangesLabel: "No changes",
+    "{domain} is requesting to sign in with your Ethereum account. This will not spend tokens or change on-chain balances.",
   siweNetworkLabel: "Network",
-  siweRequestFromLabel: "Request from",
   siweSigningInWithLabel: "Signing in with",
   siweMessageLabel: "Message",
   siweUriLabel: "URI",
+  siweVersionLabel: "Version",
+  siweNonceLabel: "Nonce",
+  siweIssuedAtLabel: "Issued at",
+  siweExpirationTimeLabel: "Expiration time",
+  siweNotBeforeLabel: "Not before",
+  siweResourcesLabel: "Resources",
   siweRejectLabel: "Cancel",
-  siweSignLabel: "Confirm",
+  siweSignLabel: "Sign in",
   siweSigningHint: "Confirm in the signing panel…",
   txTitle: "Approve transaction",
   txSignLabel: "Sign",
@@ -372,6 +412,19 @@ export const ACME_PRESET: IStyleFormState = {
     "{domain} is requesting to send tokens from your wallet. Review the amount and recipient before confirming.",
   confirmTransferConfirm: "Confirm",
   confirmTransferReject: "Reject",
+  onrampTitle: "Onramp with Circle",
+  onrampBody:
+    "Purchase {token} on {network} with Circle Onramp. Pay with card or bank transfer—you receive {token} 1-to-1.",
+  onrampDestinationLabel: "To",
+  onrampCloseLabel: "Close",
+  onrampOpenLabel: "Start now",
+  onrampReopenLabel: "Reopen onramp",
+  onrampLoadingLabel: "Loading onramp…",
+  onrampPreparingLabel: "Preparing onramp…",
+  onrampPopupReadyBody:
+    "Tap Start now to continue in a new window. Your browser may block the window if you wait too long after this screen appears.",
+  onrampPopupOpenedBody:
+    "Complete your purchase in the Circle window, then close this screen.",
   transferTokensTitle: "Send",
   transferTokensSend: "Send",
   transferTokensCancel: "Cancel",
@@ -383,7 +436,13 @@ export const ACME_PRESET: IStyleFormState = {
   sendNativeTokenCancel: "Cancel",
   sendNativeTokenMax: "Max",
   sendNativeTokenFee: "Estimated network fee",
-  grantPermissionTitle: "Grant spending permission",
+  grantPermissionTitle: "Permission Request",
+  grantPermissionKindLabel: "Periodic Spending Permission",
+  grantPermissionAmountLabel: "Periodic Budget",
+  grantPermissionTransferWindowLabel: "Budget Refresh Period",
+  grantPermissionJustificationLabel: "Justification",
+  grantPermissionViewOnExplorerLabel: "View on explorer",
+  grantPermissionAdvancedLabel: "Advanced",
   grantPermissionGrant: "Grant",
   grantPermissionReject: "Reject",
   cancelDelegationTitle: "Cancel permission",
@@ -482,22 +541,24 @@ export const DEFAULTS_PRESET: IStyleFormState = {
     "Accept the Terms of Service and Privacy Policy to continue.",
   signTitle: "Sign message",
   signLabel: "Sign",
-  typedTitle: "Sign typed data",
-  typedSignLabel: "Sign",
+  typedTitle: "Signature request",
   txTitle: "Send transaction",
   txSignLabel: "Sign",
   siweTitle: "Sign-in request",
   siweBody:
-    "A site wants you to sign in by proving you own this account. This will not spend tokens or change on-chain balances.",
-  siweEstimatedChangesLabel: "Estimated changes",
-  siweNoChangesLabel: "No changes",
+    "{domain} is requesting to sign in with your Ethereum account. This will not spend tokens or change on-chain balances.",
   siweNetworkLabel: "Network",
-  siweRequestFromLabel: "Request from",
   siweSigningInWithLabel: "Signing in with",
   siweMessageLabel: "Message",
   siweUriLabel: "URI",
+  siweVersionLabel: "Version",
+  siweNonceLabel: "Nonce",
+  siweIssuedAtLabel: "Issued at",
+  siweExpirationTimeLabel: "Expiration time",
+  siweNotBeforeLabel: "Not before",
+  siweResourcesLabel: "Resources",
   siweRejectLabel: "Cancel",
-  siweSignLabel: "Confirm",
+  siweSignLabel: "Sign in",
   siweSigningHint: "Confirm in the signing panel…",
   credOfferTitle: "Accept credential offer?",
   credOfferBody: "",
@@ -550,6 +611,19 @@ export const DEFAULTS_PRESET: IStyleFormState = {
     "{domain} is requesting to send tokens from your wallet. Review the amount and recipient before confirming.",
   confirmTransferConfirm: "Confirm",
   confirmTransferReject: "Reject",
+  onrampTitle: "Onramp with Circle",
+  onrampBody:
+    "Purchase {token} on {network} with Circle Onramp. Pay with card or bank transfer—you receive {token} 1-to-1.",
+  onrampDestinationLabel: "To",
+  onrampCloseLabel: "Close",
+  onrampOpenLabel: "Start now",
+  onrampReopenLabel: "Reopen onramp",
+  onrampLoadingLabel: "Loading onramp…",
+  onrampPreparingLabel: "Preparing onramp…",
+  onrampPopupReadyBody:
+    "Tap Start now to continue in a new window. Your browser may block the window if you wait too long after this screen appears.",
+  onrampPopupOpenedBody:
+    "Complete your purchase in the Circle window, then close this screen.",
   transferTokensTitle: "Send",
   transferTokensSend: "Send",
   transferTokensCancel: "Cancel",
@@ -561,7 +635,13 @@ export const DEFAULTS_PRESET: IStyleFormState = {
   sendNativeTokenCancel: "Cancel",
   sendNativeTokenMax: "Max",
   sendNativeTokenFee: "Estimated network fee",
-  grantPermissionTitle: "Grant spending permission",
+  grantPermissionTitle: "Permission Request",
+  grantPermissionKindLabel: "Periodic Spending Permission",
+  grantPermissionAmountLabel: "Periodic Budget",
+  grantPermissionTransferWindowLabel: "Budget Refresh Period",
+  grantPermissionJustificationLabel: "Justification",
+  grantPermissionViewOnExplorerLabel: "View on explorer",
+  grantPermissionAdvancedLabel: "Advanced",
   grantPermissionGrant: "Grant",
   grantPermissionReject: "Reject",
   cancelDelegationTitle: "Cancel permission",
@@ -758,20 +838,31 @@ function buildNestedCopyFromForm(form: IStyleFormState): Record<string, unknown>
 
   const typedData: Record<string, string> = {};
   put(typedData, "title", form.typedTitle);
+  put(typedData, "body", form.typedBody);
+  put(typedData, "networkLabel", form.typedNetworkLabel);
+  put(typedData, "requestFromLabel", form.typedRequestFromLabel);
+  put(typedData, "accountLabel", form.typedAccountLabel);
+  put(typedData, "interactingWithLabel", form.typedInteractingWithLabel);
+  put(typedData, "primaryTypeLabel", form.typedPrimaryTypeLabel);
+  put(typedData, "messageSectionLabel", form.typedMessageSectionLabel);
   put(typedData, "signLabel", form.typedSignLabel);
   put(typedData, "rejectLabel", form.typedReject);
+  put(typedData, "signingHint", form.typedSigningHint);
   if (Object.keys(typedData).length > 0) copy.typedData = typedData;
 
   const siwe: Record<string, string> = {};
   put(siwe, "title", form.siweTitle);
   put(siwe, "body", form.siweBody);
-  put(siwe, "estimatedChangesLabel", form.siweEstimatedChangesLabel);
-  put(siwe, "noChangesLabel", form.siweNoChangesLabel);
   put(siwe, "networkLabel", form.siweNetworkLabel);
-  put(siwe, "requestFromLabel", form.siweRequestFromLabel);
   put(siwe, "signingInWithLabel", form.siweSigningInWithLabel);
   put(siwe, "messageLabel", form.siweMessageLabel);
   put(siwe, "uriLabel", form.siweUriLabel);
+  put(siwe, "versionLabel", form.siweVersionLabel);
+  put(siwe, "nonceLabel", form.siweNonceLabel);
+  put(siwe, "issuedAtLabel", form.siweIssuedAtLabel);
+  put(siwe, "expirationTimeLabel", form.siweExpirationTimeLabel);
+  put(siwe, "notBeforeLabel", form.siweNotBeforeLabel);
+  put(siwe, "resourcesLabel", form.siweResourcesLabel);
   put(siwe, "rejectLabel", form.siweRejectLabel);
   put(siwe, "signLabel", form.siweSignLabel);
   put(siwe, "signingHint", form.siweSigningHint);
@@ -794,6 +885,21 @@ function buildNestedCopyFromForm(form: IStyleFormState): Record<string, unknown>
     copy.confirmTransfer = confirmTransfer;
   }
 
+  const onramp: Record<string, string> = {};
+  put(onramp, "title", form.onrampTitle);
+  put(onramp, "body", form.onrampBody);
+  put(onramp, "destinationLabel", form.onrampDestinationLabel);
+  put(onramp, "closeLabel", form.onrampCloseLabel);
+  put(onramp, "openLabel", form.onrampOpenLabel);
+  put(onramp, "reopenLabel", form.onrampReopenLabel);
+  put(onramp, "loadingLabel", form.onrampLoadingLabel);
+  put(onramp, "preparingLabel", form.onrampPreparingLabel);
+  put(onramp, "popupReadyBody", form.onrampPopupReadyBody);
+  put(onramp, "popupOpenedBody", form.onrampPopupOpenedBody);
+  if (Object.keys(onramp).length > 0) {
+    copy.onramp = onramp;
+  }
+
   const transferTokens: Record<string, string> = {};
   put(transferTokens, "title", form.transferTokensTitle);
   put(transferTokens, "sendLabel", form.transferTokensSend);
@@ -817,6 +923,32 @@ function buildNestedCopyFromForm(form: IStyleFormState): Record<string, unknown>
 
   const grantExecutionPermission: Record<string, string> = {};
   put(grantExecutionPermission, "title", form.grantPermissionTitle);
+  put(
+    grantExecutionPermission,
+    "permissionKindLabel",
+    form.grantPermissionKindLabel,
+  );
+  put(grantExecutionPermission, "amountLabel", form.grantPermissionAmountLabel);
+  put(
+    grantExecutionPermission,
+    "transferWindowLabel",
+    form.grantPermissionTransferWindowLabel,
+  );
+  put(
+    grantExecutionPermission,
+    "justificationLabel",
+    form.grantPermissionJustificationLabel,
+  );
+  put(
+    grantExecutionPermission,
+    "viewOnExplorerLabel",
+    form.grantPermissionViewOnExplorerLabel,
+  );
+  put(
+    grantExecutionPermission,
+    "advancedLabel",
+    form.grantPermissionAdvancedLabel,
+  );
   put(grantExecutionPermission, "grantLabel", form.grantPermissionGrant);
   put(grantExecutionPermission, "rejectLabel", form.grantPermissionReject);
   if (Object.keys(grantExecutionPermission).length > 0) {
diff --git a/package-lock.json b/package-lock.json
index bb942f5..acbb8d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@1shotapi/ows-signer-utils": "^0.6.2",
         "@1shotapi/ows-types": "^0.8.0",
         "@1shotapi/ows-wallet-utils": "^0.5.1",
-        "@crcl-main/app-kit": "^1.14.0-canary-feature-onramp-kit-sdk.1789055534",
+        "@circle-fin/app-kit": "^1.15.2",
         "@fontsource-variable/geist": "^5.3.0",
         "@metamask/smart-accounts-kit": "^2.0.0",
         "@reown/walletkit": "^1.5.6",
@@ -1025,103 +1025,18 @@
         "win32"
       ]
     },
-    "node_modules/@coral-xyz/anchor": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@coral-xyz/anchor/-/anchor-0.31.1.tgz",
-      "integrity": "sha512-QUqpoEK+gi2S6nlYc2atgT2r41TT3caWr/cPUEL8n8Md9437trZ68STknq897b82p5mW0XrTBNOzRbmIRJtfsA==",
-      "license": "(MIT OR Apache-2.0)",
-      "dependencies": {
-        "@coral-xyz/anchor-errors": "^0.31.1",
-        "@coral-xyz/borsh": "^0.31.1",
-        "@noble/hashes": "^1.3.1",
-        "@solana/web3.js": "^1.69.0",
-        "bn.js": "^5.1.2",
-        "bs58": "^4.0.1",
-        "buffer-layout": "^1.2.2",
-        "camelcase": "^6.3.0",
-        "cross-fetch": "^3.1.5",
-        "eventemitter3": "^4.0.7",
-        "pako": "^2.0.3",
-        "superstruct": "^0.15.4",
-        "toml": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=17"
-      }
-    },
-    "node_modules/@coral-xyz/anchor-errors": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@coral-xyz/anchor-errors/-/anchor-errors-0.31.1.tgz",
-      "integrity": "sha512-NhNEku4F3zzUSBtrYz84FzYWm48+9OvmT1Hhnwr6GnPQry2dsEqH/ti/7ASjjpoFTWRnPXrjAIT1qM6Isop+LQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@coral-xyz/anchor/node_modules/base-x": {
-      "version": "3.0.11",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.11.tgz",
-      "integrity": "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/@coral-xyz/anchor/node_modules/bs58": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
-      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
-      "license": "MIT",
-      "dependencies": {
-        "base-x": "^3.0.2"
-      }
-    },
-    "node_modules/@coral-xyz/anchor/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@coral-xyz/anchor/node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "license": "MIT"
-    },
-    "node_modules/@coral-xyz/borsh": {
-      "version": "0.31.1",
-      "resolved": "https://registry.npmjs.org/@coral-xyz/borsh/-/borsh-0.31.1.tgz",
-      "integrity": "sha512-9N8AU9F0ubriKfNE3g1WF0/4dtlGXoBN/hd1PvbNBamBNwRgHxH4P+o3Zt7rSEloW1HUs6LfZEchlx9fW7POYw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "bn.js": "^5.1.2",
-        "buffer-layout": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@solana/web3.js": "^1.69.0"
-      }
-    },
-    "node_modules/@crcl-main/app-kit": {
-      "version": "1.14.0-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/app-kit/-/app-kit-1.14.0-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-04GjiZqTZAiNz+KXvafEk/4TS3pXEWfZPk6HUoyKzIwpMsz8JD6ixNeBy4wuBLEcSCNSJd1A9IF25AWoHKODZQ==",
-      "dependencies": {
+    "node_modules/@circle-fin/app-kit": {
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/@circle-fin/app-kit/-/app-kit-1.15.2.tgz",
+      "integrity": "sha512-7+MaJVcdUJ5Mr1Tonz5/b56gm1F1K2HML04iOimMUmKT3q3mfixNKztAZVH2bv+K6ZXMHXQ0SkI7ZYraOPsseg==",
+      "dependencies": {
+        "@circle-fin/bridge-kit": "1.15.1",
+        "@circle-fin/earn-kit": "1.7.0",
+        "@circle-fin/onramp-kit": "1.0.1",
+        "@circle-fin/provider-gateway-v1": "1.5.0",
+        "@circle-fin/swap-kit": "1.7.0",
+        "@circle-fin/unified-balance-kit": "1.7.0",
         "@coral-xyz/anchor": "^0.31.1",
-        "@crcl-main/bridge-kit": "1.14.1-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/earn-kit": "1.6.1-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/onramp-kit": "0.0.1-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/provider-gateway-v1": "1.4.0-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/swap-kit": "1.6.1-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/unified-balance-kit": "1.6.0-canary-feature-onramp-kit-sdk.1789055534",
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
         "@ethersproject/bytes": "^5.8.0",
@@ -1140,7 +1055,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/app-kit/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/app-kit/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1152,7 +1067,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/app-kit/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/app-kit/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1164,7 +1079,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/app-kit/node_modules/pino": {
+    "node_modules/@circle-fin/app-kit/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1186,7 +1101,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/app-kit/node_modules/zod": {
+    "node_modules/@circle-fin/app-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1195,13 +1110,14 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/bridge-kit": {
-      "version": "1.14.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/bridge-kit/-/bridge-kit-1.14.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-oBze4ODsutrppjkhL0jq1JtxdFFgo4qYDSK3yScrDiE3CcohyOom5S8MvN/QY72xUteQKzCiDgXWpQqsB7PaSQ==",
+    "node_modules/@circle-fin/bridge-kit": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/@circle-fin/bridge-kit/-/bridge-kit-1.15.1.tgz",
+      "integrity": "sha512-CnMoBmZJL4NXYDZ11uHxdQJ+9/h9JQSJPOXmFw0EJRn45m0NqWJFWJgyOH+1Kmt8csDOcBgNLWii4WSn3wS4qA==",
       "dependencies": {
-        "@crcl-main/provider-cctp-v2": "1.13.0-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/provider-fee-v1": "0.3.0-canary-feature-onramp-kit-sdk.1789055534",
+        "@circle-fin/provider-cctp-v2": "^1.14.0",
+        "@circle-fin/provider-cctpx": "^1.0.0",
+        "@circle-fin/provider-fee-v1": "^0.3.1",
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
         "@ethersproject/bytes": "^5.8.0",
@@ -1216,7 +1132,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/bridge-kit/node_modules/pino": {
+    "node_modules/@circle-fin/bridge-kit/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1238,7 +1154,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/bridge-kit/node_modules/zod": {
+    "node_modules/@circle-fin/bridge-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1247,12 +1163,12 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/earn-kit": {
-      "version": "1.6.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/earn-kit/-/earn-kit-1.6.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-5YwMUf2PK8VsFlOoQv38ykp8gDxWbVqQkHFCgb9OaqfHmmPn9f/xwQDdluvAkuA85pj2UI9iJKc00VZyT50a5g==",
+    "node_modules/@circle-fin/earn-kit": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/earn-kit/-/earn-kit-1.7.0.tgz",
+      "integrity": "sha512-Yb04OT4UEX6IJoCApkWuuB6VTL8+dJpyvKb0ZcAKokKKvvnr8SwuWUlx1yYqd2x6Y9GJR6GyfYz5PZx1zyZiQA==",
       "dependencies": {
-        "@crcl-main/provider-earn-service": "1.5.1-canary-feature-onramp-kit-sdk.1789055534",
+        "@circle-fin/provider-earn-service": "^1.6.0",
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
         "@ethersproject/bytes": "^5.8.0",
@@ -1268,7 +1184,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/earn-kit/node_modules/pino": {
+    "node_modules/@circle-fin/earn-kit/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1290,7 +1206,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/earn-kit/node_modules/zod": {
+    "node_modules/@circle-fin/earn-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1299,10 +1215,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/onramp-kit": {
-      "version": "0.0.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/onramp-kit/-/onramp-kit-0.0.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-xEpJA3oRgNGOKAZaDcjobmEZnxfDunFjNeWH3gZzCJJrj4mboNHPJVOJMpHPLOErfSBuilZcU+sQuvrwAJ0OrA==",
+    "node_modules/@circle-fin/onramp-kit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@circle-fin/onramp-kit/-/onramp-kit-1.0.1.tgz",
+      "integrity": "sha512-N8Mok3ybsEFl2+ZoDmAjjAPpqasQQu6FHIqPMwIups0eqaOEvu7I+GCg3P+wxelqm9eQLSZORXt6tUcUH9Ojzg==",
       "dependencies": {
         "pino": "10.1.0",
         "zod": "3.25.67"
@@ -1311,7 +1227,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/onramp-kit/node_modules/pino": {
+    "node_modules/@circle-fin/onramp-kit/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1333,7 +1249,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/onramp-kit/node_modules/zod": {
+    "node_modules/@circle-fin/onramp-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1342,10 +1258,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/provider-cctp-v2": {
-      "version": "1.13.0-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/provider-cctp-v2/-/provider-cctp-v2-1.13.0-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-Q6HmGkmeGee4OqogbJ9cP/hgfIlj2NNIHh03F5i20Oq8FGag81jbFlaSGTNzMTFMyRSy//zyc8vSANkmeBY2tA==",
+    "node_modules/@circle-fin/provider-cctp-v2": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-cctp-v2/-/provider-cctp-v2-1.14.0.tgz",
+      "integrity": "sha512-AX4fQueRft5TfS6XnYjPkHa6El+Dyf7Q2SyifLC6sfOT1kh2FdMvPKc4cWMdn5cBVQczDXlgXiP+PlOSrpK2qw==",
       "dependencies": {
         "@coral-xyz/anchor": "^0.31.1",
         "@ethersproject/abi": "^5.8.0",
@@ -1372,7 +1288,7 @@
         }
       }
     },
-    "node_modules/@crcl-main/provider-cctp-v2/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/provider-cctp-v2/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1384,7 +1300,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-cctp-v2/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/provider-cctp-v2/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1396,7 +1312,57 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-cctp-v2/node_modules/pino": {
+    "node_modules/@circle-fin/provider-cctp-v2/node_modules/pino": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
+      "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
+      "license": "MIT",
+      "dependencies": {
+        "@pinojs/redact": "^0.4.0",
+        "atomic-sleep": "^1.0.0",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pino-std-serializers": "^7.0.0",
+        "process-warning": "^5.0.0",
+        "quick-format-unescaped": "^4.0.3",
+        "real-require": "^0.2.0",
+        "safe-stable-stringify": "^2.3.1",
+        "sonic-boom": "^4.0.1",
+        "thread-stream": "^3.0.0"
+      },
+      "bin": {
+        "pino": "bin.js"
+      }
+    },
+    "node_modules/@circle-fin/provider-cctp-v2/node_modules/zod": {
+      "version": "3.25.67",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
+      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/@circle-fin/provider-cctpx": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-cctpx/-/provider-cctpx-1.0.1.tgz",
+      "integrity": "sha512-mGbnNJTAj4H26NAZxZr8RyxQtMS2nNwWsl1hDzXau0OQARKieCQV/GIwhDXeVI+BzfgBbFLnQOtrAmkWV3owVA==",
+      "dependencies": {
+        "@ethersproject/abi": "^5.8.0",
+        "@ethersproject/address": "^5.8.0",
+        "@ethersproject/bytes": "^5.8.0",
+        "@ethersproject/units": "^5.8.0",
+        "@solana/web3.js": "^1.98.4",
+        "abitype": "^1.1.0",
+        "bs58": "6.0.0",
+        "pino": "10.1.0",
+        "zod": "3.25.67"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@circle-fin/provider-cctpx/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1418,7 +1384,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/provider-cctp-v2/node_modules/zod": {
+    "node_modules/@circle-fin/provider-cctpx/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1427,10 +1393,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/provider-earn-service": {
-      "version": "1.5.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/provider-earn-service/-/provider-earn-service-1.5.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-YwP9w5ly42cgW1GngCxCfVqLZh0s1INa2ZpzxgKEzsetKUvvIPhyVjGulY7czYeGj5KKHYZ2ZXQqrC9T5qLSpQ==",
+    "node_modules/@circle-fin/provider-earn-service": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-earn-service/-/provider-earn-service-1.6.0.tgz",
+      "integrity": "sha512-XPhnAMHfANPdA/ENtF87xykKrp2TUezTc/jzJYzdagwV4JKpNmKN8XdJOUFNekS3QEff+ab7jyC131VywUrzIQ==",
       "dependencies": {
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
@@ -1447,7 +1413,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/provider-earn-service/node_modules/pino": {
+    "node_modules/@circle-fin/provider-earn-service/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1469,7 +1435,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/provider-earn-service/node_modules/zod": {
+    "node_modules/@circle-fin/provider-earn-service/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1478,10 +1444,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/provider-fee-v1": {
-      "version": "0.3.0-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/provider-fee-v1/-/provider-fee-v1-0.3.0-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-3TFMhB3BQgP632LEN7ZK1GiqeX2aTtwEXR7FdksKOjPwTCrfrzvH9D76aYGzLn4SBR9tV+nQjIQnzJwz5GWz8Q==",
+    "node_modules/@circle-fin/provider-fee-v1": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-fee-v1/-/provider-fee-v1-0.3.1.tgz",
+      "integrity": "sha512-KHWU3pj7RLIw1QQ7EJE4SWaJbmEtuz0Vs9RjANWBkC+sI/PjxnzCTEOraFdNAK3QpxftZoDX21dqT6v/a0c4YA==",
       "dependencies": {
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
@@ -1494,7 +1460,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/provider-fee-v1/node_modules/zod": {
+    "node_modules/@circle-fin/provider-fee-v1/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1503,10 +1469,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/provider-gateway-v1": {
-      "version": "1.4.0-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/provider-gateway-v1/-/provider-gateway-v1-1.4.0-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-dGq3koCcmVP+Zh1ez0dupDN/Sb0bMt7h+WfWQJGpMcJao/dfGjf3Dx8X366CWgxlYM/emD0RVPEYw7UcakJVxw==",
+    "node_modules/@circle-fin/provider-gateway-v1": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-gateway-v1/-/provider-gateway-v1-1.5.0.tgz",
+      "integrity": "sha512-NiEISO6jKbc4fmDG1Qhd5vma5VA3S1o7uz/U4hW9L/5nAnW5LZJfO1SrfX1jHQfgnmvY79qR3Q7Qi0TGDbuzIg==",
       "dependencies": {
         "@coral-xyz/anchor": "^0.31.1",
         "@ethersproject/abi": "^5.8.0",
@@ -1526,7 +1492,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/provider-gateway-v1/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/provider-gateway-v1/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1538,7 +1504,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-gateway-v1/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/provider-gateway-v1/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1550,7 +1516,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-gateway-v1/node_modules/pino": {
+    "node_modules/@circle-fin/provider-gateway-v1/node_modules/pino": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
       "integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
@@ -1572,7 +1538,7 @@
         "pino": "bin.js"
       }
     },
-    "node_modules/@crcl-main/provider-gateway-v1/node_modules/zod": {
+    "node_modules/@circle-fin/provider-gateway-v1/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1581,10 +1547,10 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/provider-stablecoin-service-swap": {
-      "version": "1.5.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/provider-stablecoin-service-swap/-/provider-stablecoin-service-swap-1.5.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-lgwYtOhKQ61kHOtkoV5YtPzLjSx5xrUrE2UwK4K0q84ecoMF6oS6r4q6SHNeopVHxakaDMHVM7ZHUghLGz2KEA==",
+    "node_modules/@circle-fin/provider-stablecoin-service-swap": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/provider-stablecoin-service-swap/-/provider-stablecoin-service-swap-1.6.0.tgz",
+      "integrity": "sha512-WVA6LY4rYgSCXoVd0ukbTQXjX9RwbKzoq8IJzr9kqSKUllTMMrf449G94WUZKVihSUGs4uPUkhlDBDH2ZVwRng==",
       "dependencies": {
         "@coral-xyz/anchor": "^0.31.1",
         "@ethersproject/address": "^5.8.0",
@@ -1601,7 +1567,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/provider-stablecoin-service-swap/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/provider-stablecoin-service-swap/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1613,7 +1579,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-stablecoin-service-swap/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/provider-stablecoin-service-swap/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1625,7 +1591,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/provider-stablecoin-service-swap/node_modules/zod": {
+    "node_modules/@circle-fin/provider-stablecoin-service-swap/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1634,13 +1600,13 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/swap-kit": {
-      "version": "1.6.1-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/swap-kit/-/swap-kit-1.6.1-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-I6VqJ5oml3Rh2SnE/VHm/B17KFFNx6naMuYv1Hgaem783e7812lSlWZ17dwxMz2wnJ2/CNzzM6vrrMn0BOQkSQ==",
+    "node_modules/@circle-fin/swap-kit": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/swap-kit/-/swap-kit-1.7.0.tgz",
+      "integrity": "sha512-kzACxFS+x7QEtFNE/UBe9A+RjeUDN5vKws6ztXA5XaBlazIqIMQwvXNfAiBlCtBmcYTLihsAKA7RARBiwQ9SaQ==",
       "dependencies": {
+        "@circle-fin/provider-stablecoin-service-swap": "^1.6.0",
         "@coral-xyz/anchor": "^0.31.1",
-        "@crcl-main/provider-stablecoin-service-swap": "1.5.1-canary-feature-onramp-kit-sdk.1789055534",
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
         "@ethersproject/bytes": "^5.8.0",
@@ -1656,7 +1622,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/swap-kit/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/swap-kit/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1668,7 +1634,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/swap-kit/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/swap-kit/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1680,7 +1646,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/swap-kit/node_modules/zod": {
+    "node_modules/@circle-fin/swap-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1689,15 +1655,15 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
-    "node_modules/@crcl-main/unified-balance-kit": {
-      "version": "1.6.0-canary-feature-onramp-kit-sdk.1789055534",
-      "resolved": "https://npm.cloudsmith.io/circle/common-private/@crcl-main/unified-balance-kit/-/unified-balance-kit-1.6.0-canary-feature-onramp-kit-sdk.1789055534.tgz",
-      "integrity": "sha512-fFOiusRzjGdXcti/bOkMu1aPYQowtC9VJ9QxCaBjfoIT8hf/szl9k/i0DAEpFZeTWRcOiiGznH8orM/hjoNF1A==",
+    "node_modules/@circle-fin/unified-balance-kit": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@circle-fin/unified-balance-kit/-/unified-balance-kit-1.7.0.tgz",
+      "integrity": "sha512-VEp7bUhQLs2x7yc9+Ll39inxRsOXJJBDvn585ur1YcGlqo3tKoAZ+lCB6mLplTDC3xjnSxKijKBE81Rga8l4Bg==",
       "dependencies": {
+        "@circle-fin/provider-cctp-v2": "1.14.0",
+        "@circle-fin/provider-fee-v1": "0.3.1",
+        "@circle-fin/provider-gateway-v1": "1.5.0",
         "@coral-xyz/anchor": "^0.31.1",
-        "@crcl-main/provider-cctp-v2": "1.13.0-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/provider-fee-v1": "0.3.0-canary-feature-onramp-kit-sdk.1789055534",
-        "@crcl-main/provider-gateway-v1": "1.4.0-canary-feature-onramp-kit-sdk.1789055534",
         "@ethersproject/abi": "^5.8.0",
         "@ethersproject/address": "^5.8.0",
         "@ethersproject/bytes": "^5.8.0",
@@ -1714,7 +1680,7 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@crcl-main/unified-balance-kit/node_modules/@noble/curves": {
+    "node_modules/@circle-fin/unified-balance-kit/node_modules/@noble/curves": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
       "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
@@ -1726,7 +1692,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/unified-balance-kit/node_modules/@noble/hashes": {
+    "node_modules/@circle-fin/unified-balance-kit/node_modules/@noble/hashes": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
       "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
@@ -1738,7 +1704,7 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@crcl-main/unified-balance-kit/node_modules/uuid": {
+    "node_modules/@circle-fin/unified-balance-kit/node_modules/uuid": {
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-14.0.2.tgz",
       "integrity": "sha512-xZe/16rV4aa+HGSOCiY2YeLT1OybRLrrkL/Rqaq7p7GMVXjFh+6wN4oMYgjFmnSnhY8t6Xpdl2l9qmnHYuMHwQ==",
@@ -1751,7 +1717,7 @@
         "uuid": "dist-node/bin/uuid"
       }
     },
-    "node_modules/@crcl-main/unified-balance-kit/node_modules/zod": {
+    "node_modules/@circle-fin/unified-balance-kit/node_modules/zod": {
       "version": "3.25.67",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
       "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
@@ -1760,6 +1726,91 @@
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
+    "node_modules/@coral-xyz/anchor": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@coral-xyz/anchor/-/anchor-0.31.1.tgz",
+      "integrity": "sha512-QUqpoEK+gi2S6nlYc2atgT2r41TT3caWr/cPUEL8n8Md9437trZ68STknq897b82p5mW0XrTBNOzRbmIRJtfsA==",
+      "license": "(MIT OR Apache-2.0)",
+      "dependencies": {
+        "@coral-xyz/anchor-errors": "^0.31.1",
+        "@coral-xyz/borsh": "^0.31.1",
+        "@noble/hashes": "^1.3.1",
+        "@solana/web3.js": "^1.69.0",
+        "bn.js": "^5.1.2",
+        "bs58": "^4.0.1",
+        "buffer-layout": "^1.2.2",
+        "camelcase": "^6.3.0",
+        "cross-fetch": "^3.1.5",
+        "eventemitter3": "^4.0.7",
+        "pako": "^2.0.3",
+        "superstruct": "^0.15.4",
+        "toml": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=17"
+      }
+    },
+    "node_modules/@coral-xyz/anchor-errors": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@coral-xyz/anchor-errors/-/anchor-errors-0.31.1.tgz",
+      "integrity": "sha512-NhNEku4F3zzUSBtrYz84FzYWm48+9OvmT1Hhnwr6GnPQry2dsEqH/ti/7ASjjpoFTWRnPXrjAIT1qM6Isop+LQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@coral-xyz/anchor/node_modules/base-x": {
+      "version": "3.0.11",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.11.tgz",
+      "integrity": "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/@coral-xyz/anchor/node_modules/bs58": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
+      "license": "MIT",
+      "dependencies": {
+        "base-x": "^3.0.2"
+      }
+    },
+    "node_modules/@coral-xyz/anchor/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@coral-xyz/anchor/node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
+    },
+    "node_modules/@coral-xyz/borsh": {
+      "version": "0.31.1",
+      "resolved": "https://registry.npmjs.org/@coral-xyz/borsh/-/borsh-0.31.1.tgz",
+      "integrity": "sha512-9N8AU9F0ubriKfNE3g1WF0/4dtlGXoBN/hd1PvbNBamBNwRgHxH4P+o3Zt7rSEloW1HUs6LfZEchlx9fW7POYw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bn.js": "^5.1.2",
+        "buffer-layout": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@solana/web3.js": "^1.69.0"
+      }
+    },
     "node_modules/@dotenvx/dotenvx": {
       "version": "1.75.1",
       "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.75.1.tgz",
@@ -1954,21 +2005,21 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@emnapi/core": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
-      "integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==",
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
+      "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/wasi-threads": "1.2.2",
+        "@emnapi/wasi-threads": "1.2.3",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
-      "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
+      "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -1977,9 +2028,9 @@
       }
     },
     "node_modules/@emnapi/wasi-threads": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
-      "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
+      "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -4479,6 +4530,40 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@emnapi/core": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
+      "integrity": "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.2",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz",
+      "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
+      "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
       "version": "11.24.2",
       "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.24.2.tgz",
@@ -7479,27 +7564,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
-      "version": "1.11.1",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.2",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
-      "version": "1.11.1",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
       "version": "1.2.2",
       "dev": true,
@@ -9118,20 +9182,6 @@
         "node": ">=4.5"
       }
     },
-    "node_modules/bufferutil": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.1.0.tgz",
-      "integrity": "sha512-ZMANVnAixE6AWWnPzlW2KpUrxhm9woycYvPOo67jWHyFowASTEd9s+QN1EIMsSDtwhIxN4sWE1jotpuDUIgyIw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "node-gyp-build": "^4.3.0"
-      },
-      "engines": {
-        "node": ">=6.14.2"
-      }
-    },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
diff --git a/package.json b/package.json
index 266a27e..4bbe18d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "lint": "tsc -p tsconfig.json --noEmit",
     "test": "tsx --tsconfig tsconfig.test.json --test \"test/**/*.test.ts\"",
     "preview": "vite preview",
-    "dockerize": "docker build --secret id=cloudsmith_token,env=CLOUDSMITH_TOKEN -t oneshot-wallet .",
+    "dockerize": "docker build -t oneshot-wallet .",
     "doctor": "npx react-doctor@latest"
   },
   "dependencies": {
@@ -30,7 +30,7 @@
     "@1shotapi/ows-signer-utils": "^0.6.2",
     "@1shotapi/ows-types": "^0.8.0",
     "@1shotapi/ows-wallet-utils": "^0.5.1",
-    "@crcl-main/app-kit": "^1.14.0-canary-feature-onramp-kit-sdk.1789055534",
+    "@circle-fin/app-kit": "^1.15.2",
     "@fontsource-variable/geist": "^5.3.0",
     "@metamask/smart-accounts-kit": "^2.0.0",
     "@reown/walletkit": "^1.5.6",
diff --git a/skills/oneshot-embedded-wallet/SKILL.md b/skills/oneshot-embedded-wallet/SKILL.md
index ae368ad..11113e7 100644
--- a/skills/oneshot-embedded-wallet/SKILL.md
+++ b/skills/oneshot-embedded-wallet/SKILL.md
@@ -111,12 +111,26 @@ await proxy.rpc("configure", options);
 | `copy.personalSign.rejectLabel` | string | Reject button |
 | `copy.personalSign.signLabel` | string | Sign button |
 | `copy.typedData.title` | string | EIP-712 modal title |
-| `copy.typedData.accountLabel` | string | Account field label |
+| `copy.typedData.body` | string | Intro paragraph |
+| `copy.typedData.networkLabel` | string | Network summary row label |
+| `copy.typedData.requestFromLabel` | string | Requesting domain row label |
+| `copy.typedData.accountLabel` | string | Signing account row label |
+| `copy.typedData.interactingWithLabel` | string | Verifying contract row label |
 | `copy.typedData.primaryTypeLabel` | string | Primary type label |
-| `copy.typedData.domainLabel` | string | Domain label |
-| `copy.typedData.messageLabel` | string | Message label |
+| `copy.typedData.messageSectionLabel` | string | Message card heading |
+| `copy.typedData.signingHint` | string | Hint shown while signing |
 | `copy.typedData.rejectLabel` | string | Reject button |
 | `copy.typedData.signLabel` | string | Sign button |
+| `copy.grantExecutionPermission.title` | string | ERC-20 periodic grant modal title |
+| `copy.grantExecutionPermission.permissionKindLabel` | string | Summary card eyebrow |
+| `copy.grantExecutionPermission.amountLabel` | string | Summary amount row |
+| `copy.grantExecutionPermission.transferWindowLabel` | string | Summary cadence row |
+| `copy.grantExecutionPermission.toLabel` | string | Delegate summary row |
+| `copy.grantExecutionPermission.viewOnExplorerLabel` | string | Delegate explorer link a11y |
+| `copy.grantExecutionPermission.justificationLabel` | string | Host justification in terms card |
+| `copy.grantExecutionPermission.advancedLabel` | string | Toggle for Unix start field |
+| `copy.grantExecutionPermission.grantLabel` | string | Grant button |
+| `copy.grantExecutionPermission.rejectLabel` | string | Reject button |
 | `copy.credentialOffer.title` | string | offer modal title |
 | `copy.credentialOffer.body` | string | supports `{issuerName}` `{issuerId}` |
 | `copy.credentialOffer.offeredHeading` | string | offered list heading |
@@ -356,8 +370,8 @@ EIP-7715 host RPCs: `wallet_requestExecutionPermissions`, `wallet_revokeExecutio
 | `permission.type` | Chains (v1) | Purpose |
 |-------------------|-------------|---------|
 | `erc20-token-periodic` | All relayer chains | Periodic ERC-20 `transfer` budget (`ScopeType.Erc20PeriodTransfer`) |
-| `lifi-swap-approve` | Base (`0x2105`) | One-time `approve(inputToken → LiFi Diamond)` onboarding |
-| `lifi-swap-periodic` | Base (`0x2105`) | Periodic LiFi swap via `LiFiSwapEnforcer` (`0x47472E8AA7012D1c23336aa28514AE94389318f5`) |
+| `lifi-swap-approve` | Arc (`0x13b2`), Base (`0x2105`), Ethereum (`0x1`) | One-time `approve(inputToken → LiFi Diamond)` onboarding |
+| `lifi-swap-periodic` | Arc, Base, Ethereum mainnet | Periodic LiFi swap via `LiFiSwapEnforcer` proxy (`0x29fcBBa852439616c4D614A2fa6411E42b760153`) |
 
 **`erc20-token-periodic` / `lifi-swap-periodic` amounts:** Hosts should pass `periodAmount` (hex atoms) to prefill the grant form. Playground demos default to **10 USDC** (`0x989680`).
 
diff --git a/src/assets/images/platforms/circle-logo-stacked.svg b/src/assets/images/platforms/circle-logo-stacked.svg
new file mode 100644
index 0000000..fadb576
--- /dev/null
+++ b/src/assets/images/platforms/circle-logo-stacked.svg
@@ -0,0 +1,41 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="273.2798" height="360.4099" viewBox="0 0 273.2798 360.4099">
+  <defs>
+    <style>
+      .a730f4de-df3b-4f7b-805b-8f946059be38 {
+        fill: #3d3652;
+      }
+
+      .ee8bb3c4-4743-49cb-8785-9b72d0111e9a {
+        fill: url(#f29c9f26-2a48-4906-9b61-82403e183f59);
+      }
+
+      .b82907bf-60d2-4561-a709-d11e0ff5d666 {
+        fill: url(#b4f536bd-611a-44ab-a3e4-30a7d72c83cb);
+      }
+    </style>
+    <linearGradient id="f29c9f26-2a48-4906-9b61-82403e183f59" data-name="New Gradient Swatch 15" x1="88.5375" y1="281.4676" x2="280.5383" y2="89.4669" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ad87ff"/>
+      <stop offset="1" stop-color="#5fbfff"/>
+    </linearGradient>
+    <linearGradient id="b4f536bd-611a-44ab-a3e4-30a7d72c83cb" x1="0.2501" y1="108.7069" x2="230.1388" y2="108.7069" gradientUnits="userSpaceOnUse">
+      <stop offset="0.0034" stop-color="#68d7fa"/>
+      <stop offset="1" stop-color="#7ef1b3"/>
+    </linearGradient>
+  </defs>
+  <g id="fc7d5888-acb6-4d14-a720-bee348ff8875" data-name="Layer 2">
+    <g id="bc0cdac7-90b9-4950-82bc-0caab8aecea5" data-name="Layer 2">
+      <g>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M44.1088,345.5387l-.029-.026a2.56,2.56,0,0,0-3.2827.0477c-3.1881,2.4734-6.8782,4.762-12.2506,4.762-9.8308,0-17.8287-8.2908-17.8287-18.4816,0-10.2329,7.9651-18.5579,17.7544-18.5579a19.1464,19.1464,0,0,1,12.212,4.7383,2.51,2.51,0,0,0,1.96.8542,2.2238,2.2238,0,0,0,1.6235-.8895l3.2837-3.38a2.612,2.612,0,0,0,.7838-1.9314,2.6544,2.6544,0,0,0-.92-1.9034c-5.8183-5.0819-11.685-7.3483-19.02-7.3483a28.4936,28.4936,0,0,0,0,56.9868,26.8511,26.8511,0,0,0,19.1549-7.7068,2.8347,2.8347,0,0,0,.8078-2.05,2.3212,2.3212,0,0,0-.74-1.6622Z"/>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M67.6815,304.1823H62.7048a2.6791,2.6791,0,0,0-2.6061,2.6148v50.2384a2.68,2.68,0,0,0,2.6061,2.6157h4.9767a2.68,2.68,0,0,0,2.6061-2.6157V306.7971A2.6792,2.6792,0,0,0,67.6815,304.1823Z"/>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M127.0687,321.5954a17.5337,17.5337,0,0,0-17.6124-17.4131H88.9453a2.6134,2.6134,0,0,0-2.6061,2.6148v50.2384a2.6136,2.6136,0,0,0,2.6061,2.6157h4.9014a2.68,2.68,0,0,0,2.6071-2.6157V338.8574H105.94l9.7053,19.4633a2.55,2.55,0,0,0,2.2567,1.3305h5.8821a2.5936,2.5936,0,0,0,2.2924-1.24,2.7418,2.7418,0,0,0,.0222-2.6881l-9.7314-18.1583C122.983,334.42,127.0687,328.3462,127.0687,321.5954Zm-10.1889.152a8.2422,8.2422,0,0,1-8.0267,8.2363H96.6044V313.8905h12.2487A8.0493,8.0493,0,0,1,116.88,321.7474Z"/>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M180.517,345.5387l-.0289-.026a2.56,2.56,0,0,0-3.2828.0477c-3.1881,2.4734-6.88,4.762-12.2506,4.762-9.8308,0-17.83-8.2908-17.83-18.4816,0-10.2329,7.9641-18.5579,17.7534-18.5579a19.1451,19.1451,0,0,1,12.2139,4.7383,2.5134,2.5134,0,0,0,1.96.8542,2.224,2.224,0,0,0,1.6225-.8895l3.2847-3.38a2.615,2.615,0,0,0,.7837-1.9309,2.6472,2.6472,0,0,0-.92-1.9034c-5.8184-5.0819-11.685-7.3483-19.02-7.3483a28.4936,28.4936,0,0,0,0,56.9868,26.8536,26.8536,0,0,0,19.1559-7.7078,2.83,2.83,0,0,0,.8059-2.0487,2.3144,2.3144,0,0,0-.74-1.6626Z"/>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M225.9568,350.2466h-19.261V306.7971a2.6791,2.6791,0,0,0-2.6061-2.6148H199.112a2.6134,2.6134,0,0,0-2.6061,2.6148v50.2384a2.6136,2.6136,0,0,0,2.6061,2.6157h26.8448a2.6145,2.6145,0,0,0,2.6071-2.6157v-4.1736A2.6144,2.6144,0,0,0,225.9568,350.2466Z"/>
+        <path class="a730f4de-df3b-4f7b-805b-8f946059be38" d="M270.6727,313.6627a2.6145,2.6145,0,0,0,2.6071-2.6157v-4.25a2.6143,2.6143,0,0,0-2.6071-2.6148H240.51a2.6134,2.6134,0,0,0-2.6061,2.6148v50.2384a2.6136,2.6136,0,0,0,2.6061,2.6157h30.1632a2.6145,2.6145,0,0,0,2.6071-2.6157v-4.1736a2.6144,2.6144,0,0,0-2.6071-2.6153H248.018V336.2774h18.96a2.6144,2.6144,0,0,0,2.607-2.6158v-4.2489a2.68,2.68,0,0,0-2.607-2.6157h-18.96V313.6627Z"/>
+      </g>
+      <g>
+        <path class="ee8bb3c4-4743-49cb-8785-9b72d0111e9a" d="M255.093,68.7454l-5.9089-10.327a6.0617,6.0617,0,0,0-9.5477-1.2759L226.1321,70.6467a6.0841,6.0841,0,0,0-.752,7.6492,105.7605,105.7605,0,0,1,11.7531,24.213l.0361-.036A106.1235,106.1235,0,0,1,136.64,242.4707a105.0582,105.0582,0,0,1-49.7172-12.3425l22.888-22.8868a75.7849,75.7849,0,0,0,95.0211-103.8707,6.074,6.074,0,0,0-9.7614-1.6623L181.362,115.4169a6.0617,6.0617,0,0,0-1.6165,5.6653l1.15,4.9227a45.4346,45.4346,0,0,1-66.7623,49.8645l-6.0322-3.4554a6.0618,6.0618,0,0,0-7.2993.9734L44.9154,229.2712a6.0618,6.0618,0,0,0,.5978,9.0969l8.232,6.3118a135.1006,135.1006,0,0,0,82.8947,28.1c75.2062,0,136.39-61.1848,136.39-136.39A136.4113,136.4113,0,0,0,255.093,68.7454Z"/>
+        <path class="b82907bf-60d2-4561-a709-d11e0ff5d666" d="M219.5334,28.1A135.1033,135.1033,0,0,0,136.64,0C61.4337,0,.25,61.1842.25,136.39a136.4059,136.4059,0,0,0,17.9355,67.6455l5.9088,10.3266a6.0617,6.0617,0,0,0,9.5477,1.2758l13.5021-13.5021a6.0843,6.0843,0,0,0,.7531-7.6477,105.9988,105.9988,0,0,1-11.7537-24.2144l-.0332.0332A106.1238,106.1238,0,0,1,136.64,30.3088a105.0576,105.0576,0,0,1,49.716,12.3432L163.4691,65.5387A75.7449,75.7449,0,0,0,60.8678,136.39c0,1.2645.0459,2.5308.11,3.7968.0207.4105.0485.82.0758,1.23q.0994,1.4826.2569,2.9629a76.0417,76.0417,0,0,0,7.1414,25.0252,6.0733,6.0733,0,0,0,9.7613,1.662l13.7033-13.7034a6.0618,6.0618,0,0,0,1.6166-5.6652l-1.15-4.9233A45.4339,45.4339,0,0,1,159.1442,96.91l6.0332,3.4567a6.0617,6.0617,0,0,0,7.3-.9733l55.8861-55.885a6.0618,6.0618,0,0,0-.598-9.097Z"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/circle/onrampTypes.ts b/src/circle/onrampTypes.ts
index 5c2b61d..2f67736 100644
--- a/src/circle/onrampTypes.ts
+++ b/src/circle/onrampTypes.ts
@@ -6,4 +6,6 @@ export type IOnrampOpenRequest = {
   chainId?: number;
   amount?: string;
   tokenSymbol?: string;
+  tokenAddress?: EVMAccountAddress;
+  iconUrl?: string;
 };
diff --git a/src/components/AssetDetails.tsx b/src/components/AssetDetails.tsx
index f7f72f9..9c78da5 100644
--- a/src/components/AssetDetails.tsx
+++ b/src/components/AssetDetails.tsx
@@ -124,6 +124,8 @@ export function AssetDetails({ asset: assetProp }: IAssetDetailsProps) {
       destinationAddress: evmAddress,
       chainId: Number(BigInt(asset.chainId)),
       tokenSymbol: asset.symbol,
+      tokenAddress: asset.address,
+      iconUrl: asset.iconUrl,
     })
       .catch(() => {
         /* user closed or mint failed — OnrampView surfaces errors */
diff --git a/src/components/ConsentSummaryRow.tsx b/src/components/ConsentSummaryRow.tsx
new file mode 100644
index 0000000..843e665
--- /dev/null
+++ b/src/components/ConsentSummaryRow.tsx
@@ -0,0 +1,21 @@
+import type { ReactNode } from "react";
+
+/** Label-left / value-right row for consent summary cards (typed data, permissions). */
+export function ConsentSummaryRow({
+  label,
+  children,
+}: {
+  label: string;
+  children: ReactNode;
+}) {
+  return (
+    <div className="flex items-center justify-between gap-3">
+      <dt className="text-muted-foreground shrink-0 text-xs font-medium tracking-wide uppercase">
+        {label}
+      </dt>
+      <dd className="m-0 flex min-w-0 items-center justify-end gap-2">
+        {children}
+      </dd>
+    </div>
+  );
+}
diff --git a/src/components/Eip712FieldTree.tsx b/src/components/Eip712FieldTree.tsx
new file mode 100644
index 0000000..d90231f
--- /dev/null
+++ b/src/components/Eip712FieldTree.tsx
@@ -0,0 +1,115 @@
+import type { ReactNode } from "react";
+import {
+  formatEip712Primitive,
+  humanizeEip712Key,
+  isEip712NestedValue,
+  isEvmAddressString,
+} from "../lib/utils/eip712Display";
+import { truncateAddress } from "../lib/utils/identityDisplay";
+
+const MAX_DEPTH = 12;
+
+export type IEip712FieldTreeProps = {
+  value: unknown;
+  depth?: number;
+  label?: string;
+};
+
+/** Renders a resolved EIP-712 `message` as nested label / value rows. */
+export function Eip712FieldTree({
+  value,
+  depth = 0,
+  label,
+}: IEip712FieldTreeProps) {
+  if (depth > MAX_DEPTH) {
+    return (
+      <Eip712PrimitiveRow
+        label={label ?? "Value"}
+        value={formatEip712Primitive(value)}
+      />
+    );
+  }
+
+  if (Array.isArray(value)) {
+    return (
+      <Eip712Group label={label}>
+        {value.map((item, index) => (
+          <Eip712FieldTree
+            key={String(index)}
+            value={item}
+            depth={depth + 1}
+            label={String(index)}
+          />
+        ))}
+      </Eip712Group>
+    );
+  }
+
+  if (isEip712NestedValue(value)) {
+    return (
+      <Eip712Group label={label}>
+        {Object.keys(value as Record<string, unknown>).map((key) => (
+          <Eip712FieldTree
+            key={key}
+            value={(value as Record<string, unknown>)[key]}
+            depth={depth + 1}
+            label={humanizeEip712Key(key)}
+          />
+        ))}
+      </Eip712Group>
+    );
+  }
+
+  return (
+    <Eip712PrimitiveRow
+      label={label ?? "Value"}
+      value={formatEip712Primitive(value)}
+    />
+  );
+}
+
+function Eip712Group({
+  label,
+  children,
+}: {
+  label?: string;
+  children: ReactNode;
+}) {
+  if (!label) {
+    return <div className="flex flex-col">{children}</div>;
+  }
+  return (
+    <div className="py-1 first:pt-0 last:pb-0">
+      <p className="text-foreground m-0 text-xs font-semibold">{label}</p>
+      <div className="border-border mt-1 flex flex-col border-l pl-3">
+        {children}
+      </div>
+    </div>
+  );
+}
+
+function Eip712PrimitiveRow({
+  label,
+  value,
+}: {
+  label: string;
+  value: string;
+}) {
+  if (!value) {
+    return null;
+  }
+  const isAddress = isEvmAddressString(value);
+  return (
+    <div className="flex items-baseline justify-between gap-3 py-1">
+      <span className="text-muted-foreground shrink-0 text-xs font-medium tracking-wide uppercase">
+        {label}
+      </span>
+      <span
+        className={`min-w-0 truncate text-right text-sm ${isAddress ? "font-mono" : ""}`}
+        title={value}
+      >
+        {isAddress ? truncateAddress(value) : value}
+      </span>
+    </div>
+  );
+}
diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
index 9b8d09a..0c78c0e 100644
--- a/src/components/Modal.tsx
+++ b/src/components/Modal.tsx
@@ -20,7 +20,7 @@ export type ModalAction = {
 export type ModalPresentation = "page" | "overlay";
 
 export type ModalProps = {
-  title: string;
+  title: ReactNode;
   children: ReactNode;
   actions?: ModalAction[];
   /** Escape / overlay dismiss. Omit to lock until an action. */
diff --git a/src/components/ModalHost.tsx b/src/components/ModalHost.tsx
index c8335d9..f390c72 100644
--- a/src/components/ModalHost.tsx
+++ b/src/components/ModalHost.tsx
@@ -22,9 +22,7 @@ import { AddAssetModal } from "./modals/AddAssetModal";
 import { OpenCreateTabModal } from "./modals/OpenCreateTabModal";
 import { OnrampView } from "./OnrampView";
 import { CCTPBridge } from "./modals/CCTPBridge";
-import { GrantExecutionPermissionModal } from "./modals/GrantExecutionPermissionModal";
-import { GrantLiFiSwapPermissionModal } from "./modals/GrantLiFiSwapPermissionModal";
-import { GrantLiFiApprovePermissionModal } from "./modals/GrantLiFiApprovePermissionModal";
+import { GrantPermissionConsentModal } from "./modals/GrantPermissionConsentModal";
 import { CancelDelegationModal } from "./modals/CancelDelegationModal";
 
 export function ModalHost() {
@@ -103,25 +101,9 @@ export function ModalHost() {
           onResolve={activeModal.resolve}
         />
       );
-    case "grantExecutionPermission":
+    case "grantExecutionPermissions":
       return (
-        <GrantExecutionPermissionModal
-          request={activeModal.request}
-          onResolve={activeModal.resolve}
-          onReject={activeModal.reject}
-        />
-      );
-    case "grantLiFiSwapPermission":
-      return (
-        <GrantLiFiSwapPermissionModal
-          request={activeModal.request}
-          onResolve={activeModal.resolve}
-          onReject={activeModal.reject}
-        />
-      );
-    case "grantLiFiApprovePermission":
-      return (
-        <GrantLiFiApprovePermissionModal
+        <GrantPermissionConsentModal
           request={activeModal.request}
           onResolve={activeModal.resolve}
           onReject={activeModal.reject}
@@ -174,6 +156,8 @@ export function ModalHost() {
           chainId={activeModal.request.chainId}
           amount={activeModal.request.amount}
           tokenSymbol={activeModal.request.tokenSymbol}
+          tokenAddress={activeModal.request.tokenAddress}
+          iconUrl={activeModal.request.iconUrl}
           onClose={() => activeModal.resolve()}
         />
       );
diff --git a/src/components/OnrampView.tsx b/src/components/OnrampView.tsx
index c77c53d..113d469 100644
--- a/src/components/OnrampView.tsx
+++ b/src/components/OnrampView.tsx
@@ -1,20 +1,34 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef, useState, type ReactNode } from "react";
 import type {
   AppKitOnrampOperations,
   OnrampSession,
   OnrampWidget,
-} from "@crcl-main/app-kit";
-import type { EVMAccountAddress } from "@1shotapi/ows-types";
+} from "@circle-fin/app-kit";
+import {
+  ChainUtils,
+  EVMAccountAddress,
+  EVMChainId,
+  type EVMAccountAddress as EVMAccountAddressType,
+} from "@1shotapi/ows-types";
+import { zeroAddress } from "viem";
 import { Modal, type ModalAction } from "./Modal";
 import { useCircle } from "../circle/CircleContext";
 import { circleChainLabelFromChainId } from "../circle/circleChains";
 import { isCirclePopupPreferred } from "../circle/circlePopup";
 import type { IOnrampOpenRequest } from "../circle/onrampTypes";
+import { useStyle } from "../style/StyleProvider";
+import { useWallet } from "../wallet/WalletProvider";
+import { useWalletSessionStore } from "../wallet/sessionStore";
+import { AssetIdentityMark } from "./AssetIdentityMark";
+import { CopyableText } from "./CopyableText";
+import circleLogoStacked from "../assets/images/platforms/circle-logo-stacked.svg";
 
 export type IOnrampViewProps = IOnrampOpenRequest & {
   onClose: () => void;
 };
 
+const PLACEHOLDER_TOKEN_ADDRESS = EVMAccountAddress(zeroAddress);
+
 /**
  * Full-screen Circle AppKit onramp inside the Branding Layer shell.
  * Nested in a Host iframe (or `localStorage.circlePopup === "true"`): popup
@@ -23,12 +37,20 @@ export type IOnrampViewProps = IOnrampOpenRequest & {
  */
 export function OnrampView({
   destinationAddress,
-  chainId,
+  chainId: chainIdProp,
   amount,
-  tokenSymbol,
+  tokenSymbol: tokenSymbolProp,
+  tokenAddress: tokenAddressProp,
+  iconUrl: iconUrlProp,
   onClose,
 }: IOnrampViewProps) {
   const circle = useCircle();
+  const { style } = useStyle();
+  const { resolveChain, knownAssetRepository } = useWallet();
+  const sessionChainId = useWalletSessionStore((state) => state.chainId);
+  const copy = style.copy.onramp;
+  const accountCopy = style.copy.account;
+
   const usePopup = isCirclePopupPreferred();
   const containerRef = useRef<HTMLDivElement | null>(null);
   const widgetRef = useRef<OnrampWidget | null>(null);
@@ -38,12 +60,70 @@ export function OnrampView({
   const [loading, setLoading] = useState(true);
   const [popupReady, setPopupReady] = useState(false);
   const [popupOpened, setPopupOpened] = useState(false);
+  const [catalogTokenAddress, setCatalogTokenAddress] = useState<
+    EVMAccountAddressType | null
+  >(null);
+  const [catalogIconUrl, setCatalogIconUrl] = useState<string | undefined>();
+
+  const effectiveEvmChainId = resolveEffectiveEvmChainId(
+    chainIdProp,
+    sessionChainId,
+  );
+  const tokenSymbol = (tokenSymbolProp?.trim() || "USDC").toUpperCase();
+  const chain = effectiveEvmChainId
+    ? resolveChain(effectiveEvmChainId)
+    : null;
+  const networkLabel = chain?.label ?? "your network";
+  const body = copy.body
+    .replaceAll("{token}", tokenSymbol)
+    .replaceAll("{network}", networkLabel);
+
+  const tokenAddress =
+    tokenAddressProp ?? catalogTokenAddress ?? PLACEHOLDER_TOKEN_ADDRESS;
+  const iconUrl = iconUrlProp ?? catalogIconUrl;
+
+  useEffect(() => {
+    if (tokenAddressProp || !effectiveEvmChainId) {
+      setCatalogTokenAddress(null);
+      setCatalogIconUrl(undefined);
+      return;
+    }
+
+    let cancelled = false;
+    void knownAssetRepository
+      .getOnrampAsset(effectiveEvmChainId, tokenSymbol)
+      .then((asset) => {
+        if (cancelled) return;
+        if (asset) {
+          setCatalogTokenAddress(asset.address);
+          setCatalogIconUrl(asset.iconUrl);
+        } else {
+          setCatalogTokenAddress(null);
+          setCatalogIconUrl(undefined);
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setCatalogTokenAddress(null);
+          setCatalogIconUrl(undefined);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [
+    effectiveEvmChainId,
+    knownAssetRepository,
+    tokenAddressProp,
+    tokenSymbol,
+  ]);
 
   useEffect(() => {
     let cancelled = false;
     const body = buildSessionBody({
       destinationAddress,
-      chainId,
+      chainId: chainIdProp ?? decimalChainIdFromEvm(effectiveEvmChainId),
       amount,
       tokenSymbol,
     });
@@ -136,7 +216,15 @@ export function OnrampView({
       widgetRef.current?.close();
       widgetRef.current = null;
     };
-  }, [amount, chainId, circle, destinationAddress, tokenSymbol, usePopup]);
+  }, [
+    amount,
+    chainIdProp,
+    circle,
+    destinationAddress,
+    effectiveEvmChainId,
+    tokenSymbol,
+    usePopup,
+  ]);
 
   const openPopup = () => {
     const onramp = onrampRef.current;
@@ -155,13 +243,16 @@ export function OnrampView({
         void (async () => {
           try {
             const url = await circle.getSessionUrl();
-            const body = buildSessionBody({
+            const sessionBody = buildSessionBody({
               destinationAddress,
-              chainId,
+              chainId: chainIdProp ?? decimalChainIdFromEvm(effectiveEvmChainId),
               amount,
               tokenSymbol,
             });
-            sessionRef.current = await onramp.fetchSession({ url, body });
+            sessionRef.current = await onramp.fetchSession({
+              url,
+              body: sessionBody,
+            });
             setLoading(false);
             setPopupReady(true);
           } catch (err: unknown) {
@@ -188,51 +279,103 @@ export function OnrampView({
     setPopupOpened(true);
   };
 
-  const actions: ModalAction[] = [];
+  const actions: ModalAction[] = [
+    { label: copy.closeLabel, onClick: onClose, variant: "secondary" },
+  ];
   if (usePopup && popupReady) {
     actions.push({
-      label: popupOpened ? "Reopen onramp" : "Open onramp",
+      label: popupOpened ? copy.reopenLabel : copy.openLabel,
       onClick: openPopup,
       variant: "primary",
+      autoFocus: true,
     });
   }
-  actions.push({ label: "Close", onClick: onClose, variant: "secondary" });
+
+  const statusMessage = (() => {
+    if (error) return null;
+    if (loading) {
+      return usePopup ? copy.preparingLabel : copy.loadingLabel;
+    }
+    if (usePopup && popupReady && !popupOpened) {
+      return copy.popupReadyBody;
+    }
+    if (usePopup && popupOpened) {
+      return copy.popupOpenedBody;
+    }
+    return null;
+  })();
 
   return (
     <Modal
-      title="Buy"
+      title={
+        <span className="inline-flex items-center gap-2.5">
+          <img
+            src={circleLogoStacked}
+            alt=""
+            className="h-8 w-auto shrink-0"
+            aria-hidden
+          />
+          <span>{copy.title}</span>
+        </span>
+      }
       onBackdropDismiss={onClose}
       contentClassName="z-50"
       actions={actions}
     >
-      <div className="flex min-h-0 flex-1 flex-col gap-3">
+      <div className="text-foreground flex min-h-0 flex-1 flex-col gap-5">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed text-pretty">
+          {renderOnrampBody(body, tokenSymbol)}
+        </p>
+
+        {effectiveEvmChainId ? (
+          <div className="flex items-center gap-4">
+            <AssetIdentityMark
+              chainId={effectiveEvmChainId}
+              address={tokenAddress}
+              symbol={tokenSymbol}
+              iconUrl={iconUrl}
+              chainLogoUrl={chain?.logoUrl}
+            />
+            <div className="flex min-w-0 flex-col gap-1.5">
+              <span className="text-xl font-semibold tracking-tight">
+                {amount ? `${amount} ` : ""}
+                {tokenSymbol}
+              </span>
+              {chain ? (
+                <span className="bg-muted text-muted-foreground w-fit rounded-full px-2.5 py-0.5 text-[0.65rem] font-semibold uppercase tracking-wide">
+                  {chain.label}
+                </span>
+              ) : null}
+            </div>
+          </div>
+        ) : null}
+
+        <div className="flex flex-col gap-1.5">
+          <span className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
+            {copy.destinationLabel}
+          </span>
+          <CopyableText
+            text={String(destinationAddress)}
+            truncate
+            copyLabel={accountCopy.copyAddressLabel}
+            copiedLabel={accountCopy.addressCopiedLabel}
+            copyFailedLabel={accountCopy.addressCopyFailedLabel}
+          />
+        </div>
+
         {error ? (
           <p className="text-destructive m-0 text-sm" role="alert">
             {error}
           </p>
         ) : null}
-        {loading && !error ? (
-          <p className="text-muted-foreground m-0 text-sm">
-            {usePopup ? "Preparing onramp…" : "Loading onramp…"}
-          </p>
-        ) : null}
-        {usePopup && popupReady && !popupOpened && !error ? (
-          <p className="text-muted-foreground m-0 text-sm">
-            Circle opens in a popup (required when the wallet is host-iframed, or
-            for local/ngrok CSP bypass). Click Open onramp — browsers block
-            popups after an async delay.
-          </p>
-        ) : null}
-        {usePopup && popupOpened && !error ? (
-          <p className="text-muted-foreground m-0 text-sm">
-            Onramp opened in a popup. Complete the purchase there, then close
-            this dialog.
-          </p>
+        {statusMessage ? (
+          <p className="text-muted-foreground m-0 text-sm">{statusMessage}</p>
         ) : null}
+
         {!usePopup ? (
           <div
             ref={containerRef}
-            className="bg-background min-h-[720px] w-full flex-1"
+            className="bg-background min-h-[480px] w-full flex-1"
             aria-label="Circle onramp"
           />
         ) : null}
@@ -241,6 +384,51 @@ export function OnrampView({
   );
 }
 
+function resolveEffectiveEvmChainId(
+  chainIdProp: number | undefined,
+  sessionChainId: ReturnType<typeof useWalletSessionStore.getState>["chainId"],
+): EVMChainId | null {
+  if (chainIdProp != null && Number.isFinite(chainIdProp)) {
+    return EVMChainId(`0x${chainIdProp.toString(16)}` as `0x${string}`);
+  }
+  if (ChainUtils.isEVMChainId(sessionChainId)) {
+    return sessionChainId;
+  }
+  return null;
+}
+
+function decimalChainIdFromEvm(chainId: EVMChainId | null): number | undefined {
+  if (!chainId) {
+    return undefined;
+  }
+  return Number(BigInt(chainId));
+}
+
+/** Keep “{token} 1-to-1” on one line even when hosts customize `copy.onramp.body`. */
+function renderOnrampBody(text: string, tokenSymbol: string): ReactNode {
+  const oneToOne = "1[\u2011-]to[\u2011-]1";
+  const tokenUnit = `${escapeRegExp(tokenSymbol)}\\s+${oneToOne}`;
+  const pattern = new RegExp(`(${tokenUnit}|${oneToOne})`, "gi");
+  const isNoBreakPart = new RegExp(`^(${tokenUnit}|${oneToOne})$`, "i");
+  const parts = text.split(pattern);
+  if (parts.length === 1) {
+    return text;
+  }
+  return parts.map((part, index) =>
+    isNoBreakPart.test(part) ? (
+      <span key={index} className="whitespace-nowrap">
+        {part}
+      </span>
+    ) : (
+      part
+    ),
+  );
+}
+
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function buildSessionBody(request: {
   destinationAddress: EVMAccountAddress;
   chainId?: number;
diff --git a/src/components/PaymentFeePicker.tsx b/src/components/PaymentFeePicker.tsx
index 3cd8d95..dd70b54 100644
--- a/src/components/PaymentFeePicker.tsx
+++ b/src/components/PaymentFeePicker.tsx
@@ -1,7 +1,11 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { EVMAccountAddress, EVMChainId } from "@1shotapi/ows-types";
 import { formatUnits } from "viem";
-import type { IPaymentQuote, IPaymentTokenOption } from "../lib/interfaces/business";
+import type {
+  IPaymentQuote,
+  IPaymentTokenOption,
+  ITransactionWork,
+} from "../lib/interfaces/business";
 import type { IFinalRelayerFee } from "../lib/types/domain/RelayerSendUi";
 import { useWallet } from "../wallet/WalletProvider";
 import { AssetIcon } from "./AssetIcon";
@@ -19,6 +23,8 @@ export type IPaymentFeePickerMode = "estimate" | "final";
 export interface IPaymentFeePickerProps {
   chainId: EVMChainId;
   ownerAddress: EVMAccountAddress;
+  /** ExactCalldata work used for unsigned `relayer_estimate7710Transaction`. */
+  work: ITransactionWork | ITransactionWork[];
   quote: IPaymentQuote | null;
   error: string | null;
   loading: boolean;
@@ -66,12 +72,13 @@ function PaymentTokenRow({
 
 /**
  * Loads payment-token options (USDC preferred) and shows a live fee quote
- * with auto-refresh. Exact fee is settled by `relayer_estimate7710Transaction`
- * at submit; use mode `final` to show the relayer-settled amount.
+ * from unsigned `relayer_estimate7710Transaction`. Use mode `final` after the
+ * signed estimate settles the amount at submit.
  */
 export function PaymentFeePicker({
   chainId,
   ownerAddress,
+  work,
   quote,
   error,
   loading,
@@ -90,15 +97,34 @@ export function PaymentFeePicker({
     onQuoteChangeRef.current = onQuoteChange;
   }, [onQuoteChange]);
 
+  const workKey = useMemo(() => {
+    const items = Array.isArray(work) ? work : [work];
+    return items
+      .map(
+        (item) =>
+          `${String(item.to)}:${String(item.data || "0x")}:${item.value ?? 0n}`,
+      )
+      .join("|");
+  }, [work]);
+
   const getNewQuote = useCallback(async (): Promise<string> => {
-    const next = await transactionService.quotePayment(
-      chainId,
-      ownerAddress,
-      preferredToken,
-    );
-    onQuoteChangeRef.current(next, null);
-    return next.feeFormatted;
-  }, [chainId, ownerAddress, preferredToken, transactionService]);
+    try {
+      const next = await transactionService.quotePayment(
+        chainId,
+        ownerAddress,
+        work,
+        preferredToken,
+      );
+      onQuoteChangeRef.current(next, null);
+      return next.feeFormatted;
+    } catch (err: unknown) {
+      onQuoteChangeRef.current(
+        null,
+        err instanceof Error ? err.message : "Failed to quote fee",
+      );
+      throw err;
+    }
+  }, [chainId, ownerAddress, preferredToken, transactionService, work]);
 
   async function onSelectToken(token: EVMAccountAddress): Promise<void> {
     setSelectBusy(true);
@@ -107,6 +133,7 @@ export function PaymentFeePicker({
       const next = await transactionService.quotePayment(
         chainId,
         ownerAddress,
+        work,
         token,
       );
       onQuoteChange(next, null);
@@ -149,7 +176,7 @@ export function PaymentFeePicker({
             <span>{feeDisplay}</span>
           ) : (
             <QuoteCountdown
-              key={preferredToken ? String(preferredToken) : "default"}
+              key={`${preferredToken ? String(preferredToken) : "default"}:${workKey}`}
               getNewQuote={getNewQuote}
               paused={paused || isLoading}
             />
diff --git a/src/components/RelayerConfirmModalChrome.tsx b/src/components/RelayerConfirmModalChrome.tsx
index 0bea72d..b729464 100644
--- a/src/components/RelayerConfirmModalChrome.tsx
+++ b/src/components/RelayerConfirmModalChrome.tsx
@@ -1,4 +1,5 @@
 import type { EVMAccountAddress, EVMChainId } from "@1shotapi/ows-types";
+import type { ITransactionWork } from "../lib/interfaces/business";
 import { PaymentFeePicker } from "./PaymentFeePicker";
 import type { useRelayerConfirmSubmit } from "./useRelayerConfirmSubmit";
 
@@ -8,10 +9,12 @@ type RelayerSubmitState = ReturnType<typeof useRelayerConfirmSubmit>;
 export function RelayerConfirmModalChrome({
   chainId,
   ownerAddress,
+  work,
   submit,
 }: {
   chainId: EVMChainId;
   ownerAddress: EVMAccountAddress;
+  work: ITransactionWork | ITransactionWork[];
   submit: RelayerSubmitState;
 }) {
   return (
@@ -24,6 +27,7 @@ export function RelayerConfirmModalChrome({
       <PaymentFeePicker
         chainId={chainId}
         ownerAddress={ownerAddress}
+        work={work}
         quote={submit.quote}
         error={submit.quoteError}
         loading={false}
diff --git a/src/components/delegations/DelegationsList.tsx b/src/components/delegations/DelegationsList.tsx
index 60f1da1..b0232dc 100644
--- a/src/components/delegations/DelegationsList.tsx
+++ b/src/components/delegations/DelegationsList.tsx
@@ -9,6 +9,7 @@ import type { IDelegationSummary } from "../../lib/types/domain/StoredDelegation
 import type { DelegationId } from "../../lib/types/primitives/DelegationId";
 import { useStyle } from "../../style/StyleProvider";
 import { useWallet } from "../../wallet/WalletProvider";
+import { faviconUrl, truncateAddress } from "../../lib/utils/identityDisplay";
 
 function fillTemplate(
   template: string,
@@ -17,11 +18,6 @@ function fillTemplate(
   return template.replace(/\{(\w+)\}/g, (_, key: string) => vars[key] ?? "");
 }
 
-function truncateAddress(address: string): string {
-  if (address.length <= 13) return address;
-  return `${address.slice(0, 6)}…${address.slice(-4)}`;
-}
-
 function formatDuration(seconds: number): string {
   if (seconds % 86_400 === 0) {
     const days = seconds / 86_400;
@@ -38,10 +34,6 @@ function formatDuration(seconds: number): string {
   return seconds === 1 ? "1 second" : `${seconds} seconds`;
 }
 
-function faviconUrl(domain: string): string {
-  return `https://www.google.com/s2/favicons?domain=${encodeURIComponent(domain)}&sz=32`;
-}
-
 interface IDelegationGroup {
   hostDomain: string;
   rows: IDelegationSummary[];
diff --git a/src/components/modals/CCTPBridge.tsx b/src/components/modals/CCTPBridge.tsx
index 94bf4bb..16cac04 100644
--- a/src/components/modals/CCTPBridge.tsx
+++ b/src/components/modals/CCTPBridge.tsx
@@ -354,6 +354,8 @@ export function CCTPBridge({
           owner: request.ownerAddress,
         });
         setIrisQuote(next);
+        setPaymentQuote(next.paymentQuote);
+        setPaymentError(null);
         if (!opts.silent) {
           setPhase("quoted");
         }
@@ -793,6 +795,7 @@ export function CCTPBridge({
           <PaymentFeePicker
             chainId={request.sourceChainId}
             ownerAddress={request.ownerAddress}
+            work={irisQuote.relayerWork}
             quote={paymentQuote}
             error={paymentError}
             loading={false}
diff --git a/src/components/modals/CancelDelegationModal.tsx b/src/components/modals/CancelDelegationModal.tsx
index a93737f..9ac03e0 100644
--- a/src/components/modals/CancelDelegationModal.tsx
+++ b/src/components/modals/CancelDelegationModal.tsx
@@ -96,6 +96,7 @@ export function CancelDelegationModal({
       <RelayerConfirmModalChrome
         chainId={request.chainId}
         ownerAddress={request.ownerAddress}
+        work={request.work}
         submit={submit}
       />
     </Modal>
diff --git a/src/components/modals/GrantExecutionPermissionModal.tsx b/src/components/modals/GrantExecutionPermissionModal.tsx
deleted file mode 100644
index 56b53c7..0000000
--- a/src/components/modals/GrantExecutionPermissionModal.tsx
+++ /dev/null
@@ -1,396 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import {
-  EVMAccountAddress,
-  OwsUserRejectedError,
-  type IExecutionPermission,
-} from "@1shotapi/ows-types";
-import { formatUnits, getAddress, hexToBigInt, parseUnits } from "viem";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { ERC20_TOKEN_PERIODIC } from "../../lib/interfaces/business/IDelegationService";
-import { EAssetType } from "../../lib/types/enum/EAssetType";
-import { useStyle } from "../../style/StyleProvider";
-import type {
-  IGrantExecutionPermissionRequest,
-  IGrantExecutionPermissionResult,
-} from "../../wallet/modalTypes";
-import { useWallet } from "../../wallet/WalletProvider";
-import { Modal } from "../Modal";
-import { TokenAmountInput } from "../TokenAmountInput";
-import { CopyableText } from "../CopyableText";
-
-function readTokenAddress(data: Record<string, unknown>): string | null {
-  const raw = data.tokenAddress ?? data.token;
-  return typeof raw === "string" ? raw : null;
-}
-
-function readAmountAtoms(data: Record<string, unknown>): bigint | null {
-  const raw = data.periodAmount ?? data.amount;
-  if (raw === undefined || raw === null) return null;
-  try {
-    if (typeof raw === "bigint") return raw;
-    if (typeof raw === "number") return BigInt(raw);
-    if (typeof raw === "string") {
-      const trimmed = raw.trim();
-      if (trimmed.startsWith("0x") || trimmed.startsWith("0X")) {
-        return hexToBigInt(trimmed as `0x${string}`);
-      }
-      return BigInt(trimmed);
-    }
-  } catch {
-    return null;
-  }
-  return null;
-}
-
-function readInitialMemo(data: Record<string, unknown>): string {
-  const raw = data.justification;
-  return typeof raw === "string" ? raw : "";
-}
-
-function readDuration(data: Record<string, unknown>): string {
-  const raw = data.periodDuration ?? data.period ?? data.duration;
-  if (typeof raw === "number" || typeof raw === "string") {
-    return String(raw);
-  }
-  return "86400";
-}
-
-function readStart(data: Record<string, unknown>): string {
-  const raw = data.startDate ?? data.start;
-  if (typeof raw === "number" || typeof raw === "string") {
-    return String(raw);
-  }
-  return "";
-}
-
-/**
- * Host EIP-7715 grant consent — editable period fields when adjustment allowed.
- */
-export function GrantExecutionPermissionModal({
-  request,
-  onResolve,
-  onReject,
-}: {
-  request: IGrantExecutionPermissionRequest;
-  onResolve: (result: IGrantExecutionPermissionResult) => void;
-  onReject: (error: unknown) => void;
-}) {
-  const { style } = useStyle();
-  const copy = style.copy.grantExecutionPermission;
-  const { account } = style.copy;
-  const { listTrackedAssets, resolveChain, getKnownAsset } = useWallet();
-  const permission = request.request.permission;
-  const adjustable = permission.isAdjustmentAllowed !== false;
-  const initialToken = readTokenAddress(permission.data);
-
-  const [tokenOptions, setTokenOptions] = useState<
-    Array<{ address: string; symbol: string; decimals: number; label: string }>
-  >([]);
-  const [tokenAddress, setTokenAddress] = useState(initialToken ?? "");
-  const [amountText, setAmountText] = useState("");
-  const [durationText, setDurationText] = useState(
-    readDuration(permission.data),
-  );
-  const [startText, setStartText] = useState(readStart(permission.data));
-  const [memo, setMemo] = useState(() => readInitialMemo(permission.data));
-  const userEditedAmount = useRef(false);
-
-  useEffect(() => {
-    let cancelled = false;
-    void listTrackedAssets().then(async (assets) => {
-      if (cancelled) return;
-      const onChain = assets.filter(
-        (a) =>
-          a.type === EAssetType.Erc20 &&
-          String(a.chainId).toLowerCase() ===
-            String(request.request.chainId).toLowerCase(),
-      );
-      const options = onChain.map((a) => ({
-        address: getAddress(String(a.address)),
-        symbol: a.symbol,
-        decimals: a.decimals ?? 6,
-        label: `${a.symbol} (${a.name})`,
-      }));
-      if (
-        initialToken &&
-        !options.some(
-          (o) => o.address.toLowerCase() === initialToken.toLowerCase(),
-        )
-      ) {
-        try {
-          const known = await getKnownAsset(
-            request.request.chainId,
-            EVMAccountAddress(getAddress(initialToken as `0x${string}`)),
-          );
-          options.unshift({
-            address: getAddress(initialToken as `0x${string}`),
-            symbol: known?.symbol ?? "TOKEN",
-            decimals: known?.decimals ?? 6,
-            label: known ? `${known.symbol} (${known.name})` : initialToken,
-          });
-        } catch {
-          // leave options as-is
-        }
-      }
-      if (cancelled) return;
-      setTokenOptions(options);
-      if (!tokenAddress && options[0]) {
-        setTokenAddress(options[0].address);
-      }
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [
-    initialToken,
-    getKnownAsset,
-    listTrackedAssets,
-    request.request.chainId,
-    request.request.to,
-    tokenAddress,
-  ]);
-
-  const selected = useMemo(() => {
-    const match = tokenOptions.find(
-      (o) => o.address.toLowerCase() === tokenAddress.toLowerCase(),
-    );
-    return match ?? { address: tokenAddress, symbol: "TOKEN", decimals: 6, label: tokenAddress };
-  }, [tokenAddress, tokenOptions]);
-
-  useEffect(() => {
-    userEditedAmount.current = false;
-    setMemo(readInitialMemo(permission.data));
-    setDurationText(readDuration(permission.data));
-    setStartText(readStart(permission.data));
-    setTokenAddress(initialToken ?? "");
-  }, [
-    initialToken,
-    permission.data,
-    request.request.chainId,
-    request.request.to,
-  ]);
-
-  useEffect(() => {
-    if (!tokenAddress || userEditedAmount.current) return;
-    const atoms = readAmountAtoms(permission.data);
-    if (atoms === null) return;
-    try {
-      setAmountText(formatUnits(atoms, selected.decimals));
-    } catch {
-      setAmountText("");
-    }
-  }, [
-    permission.data,
-    request.request.chainId,
-    request.request.to,
-    selected.decimals,
-    tokenAddress,
-  ]);
-
-  const amountError = useMemo(() => {
-    const trimmed = amountText.trim();
-    if (!trimmed) return null;
-    try {
-      const parsed = parseUnits(trimmed, selected.decimals);
-      if (parsed <= 0n) return copy.invalidAmountError;
-      return null;
-    } catch {
-      return copy.invalidAmountError;
-    }
-  }, [amountText, copy.invalidAmountError, selected.decimals]);
-
-  const durationError = useMemo(() => {
-    const trimmed = durationText.trim();
-    if (!trimmed) return null;
-    const n = Number(trimmed);
-    if (!Number.isFinite(n) || n < 1 || !Number.isInteger(n)) {
-      return copy.invalidDurationError;
-    }
-    return null;
-  }, [copy.invalidDurationError, durationText]);
-
-  const formReady =
-    Boolean(tokenAddress) &&
-    amountText.trim() !== "" &&
-    amountError === null &&
-    durationText.trim() !== "" &&
-    durationError === null;
-
-  const chainLabel =
-    resolveChain(request.request.chainId)?.label ?? request.chainName;
-
-  const body = copy.body
-    .replace("{domain}", request.domain)
-    .replace("{to}", request.request.to)
-    .replace("{chainName}", chainLabel)
-    .replace("{permissionType}", permission.type);
-
-  const reject = () => {
-    onReject(new OwsUserRejectedError("User rejected the permission request"));
-  };
-
-  const grant = () => {
-    if (!formReady) return;
-    const periodAmount = parseUnits(amountText.trim(), selected.decimals);
-    const periodDuration = Number(durationText.trim());
-    const startTrimmed = startText.trim();
-    const data: Record<string, unknown> = {
-      tokenAddress: EVMAccountAddress(
-        getAddress(tokenAddress as `0x${string}`),
-      ),
-      periodAmount: `0x${periodAmount.toString(16)}`,
-      periodDuration,
-    };
-    if (startTrimmed) {
-      data.startDate = Number(startTrimmed);
-    }
-    const nextPermission: IExecutionPermission = {
-      type: ERC20_TOKEN_PERIODIC,
-      isAdjustmentAllowed: permission.isAdjustmentAllowed,
-      data,
-    };
-    onResolve({ permission: nextPermission, memo: memo.trim() });
-  };
-
-  return (
-    <Modal
-      title={copy.title}
-      onBackdropDismiss={reject}
-      actions={[
-        {
-          label: copy.rejectLabel,
-          variant: "secondary",
-          onClick: reject,
-        },
-        {
-          label:
-            request.batchIndex < request.batchCount - 1
-              ? copy.nextLabel
-              : copy.grantLabel,
-          variant: "primary",
-          autoFocus: true,
-          disabled: !formReady,
-          onClick: grant,
-        },
-      ]}
-    >
-      <p className="text-muted-foreground m-0 text-sm">{body}</p>
-      <dl className="mt-3 flex flex-col gap-2 text-sm">
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.hostLabel}
-          </dt>
-          <dd className="text-foreground m-0">{request.domain}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.toLabel}
-          </dt>
-          <dd className="m-0 min-w-0">
-            <CopyableText
-              text={request.request.to}
-              truncate
-              copyLabel={account.copyAddressLabel}
-              copiedLabel={account.addressCopiedLabel}
-              copyFailedLabel={account.addressCopyFailedLabel}
-            />
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.chainLabel}
-          </dt>
-          <dd className="text-foreground m-0">{chainLabel}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.permissionTypeLabel}
-          </dt>
-          <dd className="text-foreground m-0 font-mono text-xs">
-            {permission.type}
-          </dd>
-        </div>
-      </dl>
-
-      <div className="mt-4 flex flex-col gap-3">
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="grant-token">{copy.tokenLabel}</Label>
-          {adjustable && tokenOptions.length > 0 ? (
-            <select
-              id="grant-token"
-              className="border-input bg-background h-9 w-full rounded-md border px-3 text-sm"
-              value={tokenAddress}
-              onChange={(event) => setTokenAddress(event.target.value)}
-            >
-              {tokenOptions.map((option) => (
-                <option key={option.address} value={option.address}>
-                  {option.label}
-                </option>
-              ))}
-            </select>
-          ) : (
-            <p className="m-0 break-all font-mono text-xs">{tokenAddress || "—"}</p>
-          )}
-        </div>
-
-        <TokenAmountInput
-          label={copy.periodAmountLabel}
-          placeholder={copy.periodAmountPlaceholder}
-          symbol={selected.symbol}
-          value={amountText}
-          onChange={(value) => {
-            userEditedAmount.current = true;
-            setAmountText(value);
-          }}
-          disabled={!adjustable}
-          error={amountError}
-        />
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="grant-duration">{copy.periodDurationLabel}</Label>
-          <Input
-            id="grant-duration"
-            inputMode="numeric"
-            disabled={!adjustable}
-            placeholder={copy.periodDurationPlaceholder}
-            value={durationText}
-            onChange={(event) => setDurationText(event.target.value)}
-            aria-invalid={Boolean(durationError)}
-          />
-          <p className="text-muted-foreground m-0 text-xs">
-            {copy.periodDurationHint}
-          </p>
-          {durationError ? (
-            <p className="text-destructive m-0 text-xs" role="alert">
-              {durationError}
-            </p>
-          ) : null}
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="grant-start">{copy.startLabel}</Label>
-          <Input
-            id="grant-start"
-            inputMode="numeric"
-            disabled={!adjustable}
-            value={startText}
-            onChange={(event) => setStartText(event.target.value)}
-          />
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="grant-memo">{copy.memoLabel}</Label>
-          <Textarea
-            id="grant-memo"
-            placeholder={copy.memoPlaceholder}
-            value={memo}
-            onChange={(event) => setMemo(event.target.value)}
-            rows={2}
-          />
-        </div>
-      </div>
-    </Modal>
-  );
-}
diff --git a/src/components/modals/GrantLiFiApprovePermissionModal.tsx b/src/components/modals/GrantLiFiApprovePermissionModal.tsx
deleted file mode 100644
index 3505b89..0000000
--- a/src/components/modals/GrantLiFiApprovePermissionModal.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { useEffect, useState } from "react";
-import {
-  EVMAccountAddress,
-  OwsUserRejectedError,
-  type IExecutionPermission,
-} from "@1shotapi/ows-types";
-import { getAddress } from "viem";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { LIFI_SWAP_APPROVE } from "../../lib/interfaces/business/IDelegationService";
-import { EAssetType } from "../../lib/types/enum/EAssetType";
-import { useStyle } from "../../style/StyleProvider";
-import type {
-  IGrantExecutionPermissionRequest,
-  IGrantExecutionPermissionResult,
-} from "../../wallet/modalTypes";
-import { useWallet } from "../../wallet/WalletProvider";
-import { Modal } from "../Modal";
-import { CopyableText } from "../CopyableText";
-
-function readString(data: Record<string, unknown>, ...keys: string[]): string {
-  for (const key of keys) {
-    const raw = data[key];
-    if (typeof raw === "string" && raw.trim() !== "") return raw;
-  }
-  return "";
-}
-
-/**
- * Host EIP-7715 LiFi approve onboarding consent — one-time approve(token, diamond).
- */
-export function GrantLiFiApprovePermissionModal({
-  request,
-  onResolve,
-  onReject,
-}: {
-  request: IGrantExecutionPermissionRequest;
-  onResolve: (result: IGrantExecutionPermissionResult) => void;
-  onReject: (error: unknown) => void;
-}) {
-  const { style } = useStyle();
-  const copy = style.copy.grantLiFiApprovePermission;
-  const { account } = style.copy;
-  const { listTrackedAssets, resolveChain } = useWallet();
-  const permission = request.request.permission;
-  const adjustable = permission.isAdjustmentAllowed !== false;
-  const data = permission.data;
-
-  const initialToken = readString(data, "tokenAddress", "inputToken");
-  const spender = readString(data, "spender", "lifiDiamond");
-  const [tokenOptions, setTokenOptions] = useState<
-    Array<{ address: string; symbol: string; label: string }>
-  >([]);
-  const [tokenAddress, setTokenAddress] = useState(initialToken);
-  const [memo, setMemo] = useState("");
-
-  useEffect(() => {
-    setMemo("");
-    setTokenAddress(initialToken);
-  }, [data, initialToken, request.request.chainId, request.request.to]);
-
-  useEffect(() => {
-    let cancelled = false;
-    void listTrackedAssets().then((assets) => {
-      if (cancelled) return;
-      const onChain = assets.filter(
-        (a) =>
-          a.type === EAssetType.Erc20 &&
-          String(a.chainId).toLowerCase() ===
-            String(request.request.chainId).toLowerCase(),
-      );
-      const options = onChain.map((a) => ({
-        address: getAddress(String(a.address)),
-        symbol: a.symbol,
-        label: `${a.symbol} (${a.name})`,
-      }));
-      if (
-        initialToken &&
-        !options.some(
-          (o) => o.address.toLowerCase() === initialToken.toLowerCase(),
-        )
-      ) {
-        try {
-          options.unshift({
-            address: getAddress(initialToken as `0x${string}`),
-            symbol: "TOKEN",
-            label: initialToken,
-          });
-        } catch {
-          /* leave options as-is */
-        }
-      }
-      setTokenOptions(options);
-      if (!tokenAddress && options[0]) {
-        setTokenAddress(options[0].address);
-      }
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [
-    initialToken,
-    listTrackedAssets,
-    request.request.chainId,
-    request.request.to,
-    tokenAddress,
-  ]);
-
-  const formReady = Boolean(tokenAddress) && Boolean(spender);
-
-  const chainLabel =
-    resolveChain(request.request.chainId)?.label ?? request.chainName;
-
-  const body = copy.body
-    .replace("{domain}", request.domain)
-    .replace("{to}", request.request.to)
-    .replace("{chainName}", chainLabel)
-    .replace("{permissionType}", permission.type);
-
-  const reject = () => {
-    onReject(new OwsUserRejectedError("User rejected the permission request"));
-  };
-
-  const grant = () => {
-    if (!formReady) return;
-    const nextPermission: IExecutionPermission = {
-      type: LIFI_SWAP_APPROVE,
-      isAdjustmentAllowed: permission.isAdjustmentAllowed,
-      data: {
-        tokenAddress: EVMAccountAddress(
-          getAddress(tokenAddress as `0x${string}`),
-        ),
-        spender: EVMAccountAddress(getAddress(spender as `0x${string}`)),
-      },
-    };
-    onResolve({ permission: nextPermission, memo: memo.trim() });
-  };
-
-  return (
-    <Modal
-      title={copy.title}
-      onBackdropDismiss={reject}
-      actions={[
-        {
-          label: copy.rejectLabel,
-          variant: "secondary",
-          onClick: reject,
-        },
-        {
-          label:
-            request.batchIndex < request.batchCount - 1
-              ? copy.nextLabel
-              : copy.grantLabel,
-          variant: "primary",
-          autoFocus: true,
-          disabled: !formReady,
-          onClick: grant,
-        },
-      ]}
-    >
-      <p className="text-muted-foreground m-0 text-sm">{body}</p>
-      <p className="text-destructive m-0 mt-2 text-xs" role="note">
-        {copy.warning}
-      </p>
-
-      <dl className="mt-3 flex flex-col gap-2 text-sm">
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.hostLabel}
-          </dt>
-          <dd className="text-foreground m-0">{request.domain}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.toLabel}
-          </dt>
-          <dd className="m-0 min-w-0">
-            <CopyableText
-              text={request.request.to}
-              truncate
-              copyLabel={account.copyAddressLabel}
-              copiedLabel={account.addressCopiedLabel}
-              copyFailedLabel={account.addressCopyFailedLabel}
-            />
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.chainLabel}
-          </dt>
-          <dd className="text-foreground m-0">{chainLabel}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.permissionTypeLabel}
-          </dt>
-          <dd className="text-foreground m-0 font-mono text-xs">
-            {permission.type}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.spenderLabel}
-          </dt>
-          <dd className="m-0 min-w-0 font-mono text-xs break-all">
-            {spender || "—"}
-          </dd>
-        </div>
-      </dl>
-
-      <div className="mt-4 flex flex-col gap-3">
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-approve-token">{copy.tokenLabel}</Label>
-          {adjustable && tokenOptions.length > 0 ? (
-            <select
-              id="lifi-approve-token"
-              className="border-input bg-background h-9 w-full rounded-md border px-3 text-sm"
-              value={tokenAddress}
-              onChange={(event) => setTokenAddress(event.target.value)}
-            >
-              {tokenOptions.map((option) => (
-                <option key={option.address} value={option.address}>
-                  {option.label}
-                </option>
-              ))}
-            </select>
-          ) : (
-            <p className="m-0 break-all font-mono text-xs">
-              {tokenAddress || "—"}
-            </p>
-          )}
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-approve-memo">{copy.memoLabel}</Label>
-          <Textarea
-            id="lifi-approve-memo"
-            placeholder={copy.memoPlaceholder}
-            value={memo}
-            onChange={(event) => setMemo(event.target.value)}
-            rows={2}
-          />
-        </div>
-      </div>
-    </Modal>
-  );
-}
diff --git a/src/components/modals/GrantLiFiSwapPermissionModal.tsx b/src/components/modals/GrantLiFiSwapPermissionModal.tsx
deleted file mode 100644
index 869b958..0000000
--- a/src/components/modals/GrantLiFiSwapPermissionModal.tsx
+++ /dev/null
@@ -1,490 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import {
-  EVMAccountAddress,
-  OwsUserRejectedError,
-  type IExecutionPermission,
-} from "@1shotapi/ows-types";
-import { formatUnits, getAddress, hexToBigInt, isHex, parseUnits } from "viem";
-import { Input } from "@/components/ui/input";
-import { Label } from "@/components/ui/label";
-import { Textarea } from "@/components/ui/textarea";
-import { LIFI_SWAP_PERIODIC } from "../../lib/interfaces/business/IDelegationService";
-import { EAssetType } from "../../lib/types/enum/EAssetType";
-import { useStyle } from "../../style/StyleProvider";
-import type {
-  IGrantExecutionPermissionRequest,
-  IGrantExecutionPermissionResult,
-} from "../../wallet/modalTypes";
-import { useWallet } from "../../wallet/WalletProvider";
-import { Modal } from "../Modal";
-import { TokenAmountInput } from "../TokenAmountInput";
-import { CopyableText } from "../CopyableText";
-
-function readString(data: Record<string, unknown>, ...keys: string[]): string {
-  for (const key of keys) {
-    const raw = data[key];
-    if (typeof raw === "string" && raw.trim() !== "") return raw;
-    if (typeof raw === "number" && Number.isFinite(raw)) return String(raw);
-  }
-  return "";
-}
-
-function readAmountAtoms(data: Record<string, unknown>): bigint | null {
-  const raw = data.periodAmount ?? data.amount;
-  if (raw === undefined || raw === null) return null;
-  try {
-    if (typeof raw === "bigint") return raw;
-    if (typeof raw === "number") return BigInt(raw);
-    if (typeof raw === "string") {
-      const trimmed = raw.trim();
-      if (trimmed.startsWith("0x") || trimmed.startsWith("0X")) {
-        return hexToBigInt(trimmed as `0x${string}`);
-      }
-      return BigInt(trimmed);
-    }
-  } catch {
-    return null;
-  }
-  return null;
-}
-
-function truncateMiddle(value: string, head = 10, tail = 8): string {
-  if (value.length <= head + tail + 1) return value;
-  return `${value.slice(0, head)}…${value.slice(-tail)}`;
-}
-
-/**
- * Host EIP-7715 LiFi swap grant consent — periodic input budget + pinned route.
- */
-export function GrantLiFiSwapPermissionModal({
-  request,
-  onResolve,
-  onReject,
-}: {
-  request: IGrantExecutionPermissionRequest;
-  onResolve: (result: IGrantExecutionPermissionResult) => void;
-  onReject: (error: unknown) => void;
-}) {
-  const { style } = useStyle();
-  const copy = style.copy.grantLiFiSwapPermission;
-  const { account } = style.copy;
-  const { listTrackedAssets, resolveChain, liFiUtils, getKnownAsset } =
-    useWallet();
-  const permission = request.request.permission;
-  const adjustable = permission.isAdjustmentAllowed !== false;
-  const data = permission.data;
-
-  const initialToken = readString(data, "tokenAddress", "inputToken");
-  const [tokenOptions, setTokenOptions] = useState<
-    Array<{ address: string; symbol: string; decimals: number; label: string }>
-  >([]);
-  const [tokenAddress, setTokenAddress] = useState(initialToken);
-  const [amountText, setAmountText] = useState("");
-  const [durationText, setDurationText] = useState(
-    readString(data, "periodDuration", "period", "duration") || "86400",
-  );
-  const [startText, setStartText] = useState(
-    readString(data, "startDate", "start"),
-  );
-  const [slippageText, setSlippageText] = useState(
-    readString(data, "slippageBps") || String(liFiUtils.defaultSlippageBps),
-  );
-  const [memo, setMemo] = useState("");
-  const userEditedAmount = useRef(false);
-
-  const lifiDiamond = readString(data, "lifiDiamond");
-  const quoteSigner = readString(data, "quoteSigner");
-  const outputAssetId = readString(data, "outputAssetId");
-  const outputRecipient = readString(data, "outputRecipient");
-  const destinationChainId = readString(data, "destinationChainId");
-
-  useEffect(() => {
-    let cancelled = false;
-    void listTrackedAssets().then(async (assets) => {
-      if (cancelled) return;
-      const onChain = assets.filter(
-        (a) =>
-          a.type === EAssetType.Erc20 &&
-          String(a.chainId).toLowerCase() ===
-            String(request.request.chainId).toLowerCase(),
-      );
-      const options = onChain.map((a) => ({
-        address: getAddress(String(a.address)),
-        symbol: a.symbol,
-        decimals: a.decimals ?? 6,
-        label: `${a.symbol} (${a.name})`,
-      }));
-      if (
-        initialToken &&
-        !options.some(
-          (o) => o.address.toLowerCase() === initialToken.toLowerCase(),
-        )
-      ) {
-        try {
-          const known = await getKnownAsset(
-            request.request.chainId,
-            EVMAccountAddress(getAddress(initialToken as `0x${string}`)),
-          );
-          options.unshift({
-            address: getAddress(initialToken as `0x${string}`),
-            symbol: known?.symbol ?? "TOKEN",
-            decimals: known?.decimals ?? 6,
-            label: known ? `${known.symbol} (${known.name})` : initialToken,
-          });
-        } catch {
-          /* leave options as-is */
-        }
-      }
-      if (cancelled) return;
-      setTokenOptions(options);
-      if (!tokenAddress && options[0]) {
-        setTokenAddress(options[0].address);
-      }
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [
-    getKnownAsset,
-    initialToken,
-    listTrackedAssets,
-    request.request.chainId,
-    request.request.to,
-    tokenAddress,
-  ]);
-
-  const selected = useMemo(() => {
-    const match = tokenOptions.find(
-      (o) => o.address.toLowerCase() === tokenAddress.toLowerCase(),
-    );
-    return (
-      match ?? {
-        address: tokenAddress,
-        symbol: "TOKEN",
-        decimals: 6,
-        label: tokenAddress,
-      }
-    );
-  }, [tokenAddress, tokenOptions]);
-
-  useEffect(() => {
-    userEditedAmount.current = false;
-    setMemo("");
-    setTokenAddress(initialToken);
-  }, [data, initialToken, request.request.chainId, request.request.to]);
-
-  useEffect(() => {
-    if (!tokenAddress || userEditedAmount.current) return;
-    const atoms = readAmountAtoms(data);
-    if (atoms === null) return;
-    try {
-      setAmountText(formatUnits(atoms, selected.decimals));
-    } catch {
-      setAmountText("");
-    }
-  }, [
-    data,
-    request.request.chainId,
-    request.request.to,
-    selected.decimals,
-    tokenAddress,
-  ]);
-
-  const amountError = useMemo(() => {
-    const trimmed = amountText.trim();
-    if (!trimmed) return null;
-    try {
-      const parsed = parseUnits(trimmed, selected.decimals);
-      if (parsed <= 0n) return copy.invalidAmountError;
-      return null;
-    } catch {
-      return copy.invalidAmountError;
-    }
-  }, [amountText, copy.invalidAmountError, selected.decimals]);
-
-  const durationError = useMemo(() => {
-    const trimmed = durationText.trim();
-    if (!trimmed) return null;
-    const n = Number(trimmed);
-    if (!Number.isFinite(n) || n < 1 || !Number.isInteger(n)) {
-      return copy.invalidDurationError;
-    }
-    return null;
-  }, [copy.invalidDurationError, durationText]);
-
-  const slippageError = useMemo(() => {
-    const trimmed = slippageText.trim();
-    if (!trimmed) return null;
-    const n = Number(trimmed);
-    if (!Number.isFinite(n) || !Number.isInteger(n) || n < 0 || n >= 10_000) {
-      return copy.invalidSlippageError;
-    }
-    return null;
-  }, [copy.invalidSlippageError, slippageText]);
-
-  const pinsValid =
-    Boolean(lifiDiamond) &&
-    Boolean(quoteSigner) &&
-    isHex(outputAssetId) &&
-    (outputAssetId.length - 2) / 2 === 32 &&
-    isHex(outputRecipient) &&
-    (outputRecipient.length - 2) / 2 === 32 &&
-    Boolean(destinationChainId);
-
-  const formReady =
-    Boolean(tokenAddress) &&
-    amountText.trim() !== "" &&
-    amountError === null &&
-    durationText.trim() !== "" &&
-    durationError === null &&
-    slippageText.trim() !== "" &&
-    slippageError === null &&
-    pinsValid;
-
-  const chainLabel =
-    resolveChain(request.request.chainId)?.label ?? request.chainName;
-
-  const body = copy.body
-    .replace("{domain}", request.domain)
-    .replace("{to}", request.request.to)
-    .replace("{chainName}", chainLabel)
-    .replace("{permissionType}", permission.type);
-
-  const reject = () => {
-    onReject(new OwsUserRejectedError("User rejected the permission request"));
-  };
-
-  const grant = () => {
-    if (!formReady) return;
-    const periodAmount = parseUnits(amountText.trim(), selected.decimals);
-    const periodDuration = Number(durationText.trim());
-    const slippageBps = Number(slippageText.trim());
-    const startTrimmed = startText.trim();
-    const nextData: Record<string, unknown> = {
-      lifiDiamond: EVMAccountAddress(
-        getAddress(lifiDiamond as `0x${string}`),
-      ),
-      tokenAddress: EVMAccountAddress(
-        getAddress(tokenAddress as `0x${string}`),
-      ),
-      outputAssetId,
-      outputRecipient,
-      destinationChainId,
-      quoteSigner: EVMAccountAddress(
-        getAddress(quoteSigner as `0x${string}`),
-      ),
-      periodAmount: `0x${periodAmount.toString(16)}`,
-      periodDuration,
-      slippageBps,
-    };
-    if (startTrimmed) {
-      nextData.startDate = Number(startTrimmed);
-    }
-    const nextPermission: IExecutionPermission = {
-      type: LIFI_SWAP_PERIODIC,
-      isAdjustmentAllowed: permission.isAdjustmentAllowed,
-      data: nextData,
-    };
-    onResolve({ permission: nextPermission, memo: memo.trim() });
-  };
-
-  return (
-    <Modal
-      title={copy.title}
-      onBackdropDismiss={reject}
-      actions={[
-        {
-          label: copy.rejectLabel,
-          variant: "secondary",
-          onClick: reject,
-        },
-        {
-          label:
-            request.batchIndex < request.batchCount - 1
-              ? copy.nextLabel
-              : copy.grantLabel,
-          variant: "primary",
-          autoFocus: true,
-          disabled: !formReady,
-          onClick: grant,
-        },
-      ]}
-    >
-      <p className="text-muted-foreground m-0 text-sm">{body}</p>
-      <p className="text-muted-foreground m-0 mt-2 text-xs">{copy.quoteNote}</p>
-
-      <dl className="mt-3 flex flex-col gap-2 text-sm">
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.hostLabel}
-          </dt>
-          <dd className="text-foreground m-0">{request.domain}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.toLabel}
-          </dt>
-          <dd className="m-0 min-w-0">
-            <CopyableText
-              text={request.request.to}
-              truncate
-              copyLabel={account.copyAddressLabel}
-              copiedLabel={account.addressCopiedLabel}
-              copyFailedLabel={account.addressCopyFailedLabel}
-            />
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.chainLabel}
-          </dt>
-          <dd className="text-foreground m-0">{chainLabel}</dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.permissionTypeLabel}
-          </dt>
-          <dd className="text-foreground m-0 font-mono text-xs">
-            {permission.type}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.lifiDiamondLabel}
-          </dt>
-          <dd className="m-0 min-w-0 font-mono text-xs break-all">
-            {lifiDiamond || "—"}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.quoteSignerLabel}
-          </dt>
-          <dd className="m-0 min-w-0 font-mono text-xs break-all">
-            {quoteSigner || "—"}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.outputAssetLabel}
-          </dt>
-          <dd className="text-foreground m-0 font-mono text-xs">
-            {outputAssetId ? truncateMiddle(outputAssetId) : "—"}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.outputRecipientLabel}
-          </dt>
-          <dd className="text-foreground m-0 font-mono text-xs">
-            {outputRecipient ? truncateMiddle(outputRecipient) : "—"}
-          </dd>
-        </div>
-        <div className="flex flex-col gap-0.5">
-          <dt className="text-muted-foreground text-xs font-medium uppercase">
-            {copy.destinationChainLabel}
-          </dt>
-          <dd className="text-foreground m-0">{destinationChainId || "—"}</dd>
-        </div>
-      </dl>
-
-      <div className="mt-4 flex flex-col gap-3">
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-swap-token">{copy.tokenLabel}</Label>
-          {adjustable && tokenOptions.length > 0 ? (
-            <select
-              id="lifi-swap-token"
-              className="border-input bg-background h-9 w-full rounded-md border px-3 text-sm"
-              value={tokenAddress}
-              onChange={(event) => setTokenAddress(event.target.value)}
-            >
-              {tokenOptions.map((option) => (
-                <option key={option.address} value={option.address}>
-                  {option.label}
-                </option>
-              ))}
-            </select>
-          ) : (
-            <p className="m-0 break-all font-mono text-xs">
-              {tokenAddress || "—"}
-            </p>
-          )}
-        </div>
-
-        <TokenAmountInput
-          label={copy.periodAmountLabel}
-          placeholder={copy.periodAmountPlaceholder}
-          symbol={selected.symbol}
-          value={amountText}
-          onChange={(value) => {
-            userEditedAmount.current = true;
-            setAmountText(value);
-          }}
-          disabled={!adjustable}
-          error={amountError}
-        />
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-swap-duration">{copy.periodDurationLabel}</Label>
-          <Input
-            id="lifi-swap-duration"
-            inputMode="numeric"
-            disabled={!adjustable}
-            placeholder={copy.periodDurationPlaceholder}
-            value={durationText}
-            onChange={(event) => setDurationText(event.target.value)}
-            aria-invalid={Boolean(durationError)}
-          />
-          <p className="text-muted-foreground m-0 text-xs">
-            {copy.periodDurationHint}
-          </p>
-          {durationError ? (
-            <p className="text-destructive m-0 text-xs" role="alert">
-              {durationError}
-            </p>
-          ) : null}
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-swap-slippage">{copy.slippageLabel}</Label>
-          <Input
-            id="lifi-swap-slippage"
-            inputMode="numeric"
-            disabled={!adjustable}
-            value={slippageText}
-            onChange={(event) => setSlippageText(event.target.value)}
-            aria-invalid={Boolean(slippageError)}
-          />
-          <p className="text-muted-foreground m-0 text-xs">{copy.slippageHint}</p>
-          {slippageError ? (
-            <p className="text-destructive m-0 text-xs" role="alert">
-              {slippageError}
-            </p>
-          ) : null}
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-swap-start">{copy.startLabel}</Label>
-          <Input
-            id="lifi-swap-start"
-            inputMode="numeric"
-            disabled={!adjustable}
-            value={startText}
-            onChange={(event) => setStartText(event.target.value)}
-          />
-        </div>
-
-        <div className="flex flex-col gap-1.5">
-          <Label htmlFor="lifi-swap-memo">{copy.memoLabel}</Label>
-          <Textarea
-            id="lifi-swap-memo"
-            placeholder={copy.memoPlaceholder}
-            value={memo}
-            onChange={(event) => setMemo(event.target.value)}
-            rows={2}
-          />
-        </div>
-      </div>
-    </Modal>
-  );
-}
diff --git a/src/components/modals/GrantPermissionConsentModal.tsx b/src/components/modals/GrantPermissionConsentModal.tsx
new file mode 100644
index 0000000..4dd9e0e
--- /dev/null
+++ b/src/components/modals/GrantPermissionConsentModal.tsx
@@ -0,0 +1,116 @@
+import { useMemo } from "react";
+import { OwsUserRejectedError } from "@1shotapi/ows-types";
+import { readHostMemoOrJustification } from "../../lib/utils/delegationDisplay";
+import { useStyle } from "../../style/StyleProvider";
+import type {
+  IGrantExecutionPermissionResult,
+  IGrantExecutionPermissionsBatchRequest,
+} from "../../wallet/modalTypes";
+import { useWallet } from "../../wallet/WalletProvider";
+import { Modal } from "../Modal";
+import {
+  PermissionGrantHostCard,
+  PermissionGrantHostContextRows,
+} from "./PermissionGrantConsentLayout";
+import {
+  buildPermissionGrantResult,
+  PermissionGrantTermsSection,
+  usePermissionBatchAllValid,
+} from "./permissionGrantTerms";
+
+/**
+ * EIP-7715 grant consent for one or more permissions — one host card, stacked terms cards.
+ */
+export function GrantPermissionConsentModal({
+  request,
+  onResolve,
+  onReject,
+}: {
+  request: IGrantExecutionPermissionsBatchRequest;
+  onResolve: (results: IGrantExecutionPermissionResult[]) => void;
+  onReject: (error: unknown) => void;
+}) {
+  const { style } = useStyle();
+  const shellCopy = style.copy.grantExecutionPermission;
+  const { resolveChain } = useWallet();
+
+  const hostContext = request.items[0];
+  if (!hostContext) {
+    return null;
+  }
+
+  const chain = resolveChain(hostContext.request.chainId);
+  const chainLabel = chain?.label ?? hostContext.chainName;
+  const delegateAddress = String(hostContext.request.to);
+  const delegateExplorerUrl = chain?.addressExplorerUrl(delegateAddress);
+
+  const hostMessage = useMemo(() => {
+    for (const item of request.items) {
+      const message = readHostMemoOrJustification(
+        item.request.permission.data as Record<string, unknown>,
+      );
+      if (message) return message;
+    }
+    return undefined;
+  }, [request.items]);
+
+  const allValid = usePermissionBatchAllValid(request.items);
+
+  const reject = () => {
+    onReject(new OwsUserRejectedError("User rejected the permission request"));
+  };
+
+  const grant = () => {
+    if (!allValid) return;
+    onResolve(
+      request.items.map((item) =>
+        buildPermissionGrantResult(item.grantKind, item.request),
+      ),
+    );
+  };
+
+  return (
+    <Modal
+      title={shellCopy.title}
+      onBackdropDismiss={reject}
+      actions={[
+        {
+          label: shellCopy.rejectLabel,
+          variant: "secondary",
+          onClick: reject,
+        },
+        {
+          label: shellCopy.grantLabel,
+          variant: "primary",
+          autoFocus: true,
+          disabled: !allValid,
+          onClick: grant,
+        },
+      ]}
+    >
+      <div className="flex flex-col gap-3">
+        <PermissionGrantHostCard
+          domain={request.domain}
+          message={hostMessage}
+        >
+          <PermissionGrantHostContextRows
+            toLabel={shellCopy.toLabel}
+            chainLabel={shellCopy.chainLabel}
+            viewOnExplorerLabel={shellCopy.viewOnExplorerLabel}
+            delegateAddress={delegateAddress}
+            delegateExplorerUrl={delegateExplorerUrl}
+            chainLogoUrl={chain?.logoUrl}
+            chainDisplayLabel={chainLabel}
+          />
+        </PermissionGrantHostCard>
+        {request.items.map((item, index) => (
+          <PermissionGrantTermsSection
+            key={`${item.grantKind}-${index}`}
+            grantKind={item.grantKind}
+            executionRequest={item.request}
+          />
+        ))}
+      </div>
+    </Modal>
+  );
+}
diff --git a/src/components/modals/PermissionGrantConsentLayout.tsx b/src/components/modals/PermissionGrantConsentLayout.tsx
new file mode 100644
index 0000000..6dbaf9a
--- /dev/null
+++ b/src/components/modals/PermissionGrantConsentLayout.tsx
@@ -0,0 +1,119 @@
+import type { ReactNode } from "react";
+import { ExternalLinkIcon } from "lucide-react";
+import { faviconUrl, truncateAddress } from "../../lib/utils/identityDisplay";
+import { ConsentSummaryRow } from "../ConsentSummaryRow";
+import { SafeAssetImage } from "../SafeAssetImage";
+
+const grantCardClassName =
+  "border-border flex flex-col gap-2.5 rounded-md border px-3 py-2.5";
+
+/** Host context: requesting app URL and optional justification. */
+export function PermissionGrantHostCard({
+  domain,
+  message,
+  children,
+}: {
+  domain: string;
+  message?: string;
+  /** Request-level rows (e.g. delegate account, network). */
+  children?: ReactNode;
+}) {
+  return (
+    <div className={grantCardClassName}>
+      <div className="flex min-w-0 items-center gap-2">
+        <SafeAssetImage
+          src={faviconUrl(domain)}
+          className="size-4 shrink-0 rounded-sm"
+        />
+        <span className="truncate text-sm font-semibold" title={domain}>
+          {domain}
+        </span>
+      </div>
+      {message ? (
+        <p className="text-muted-foreground m-0 text-sm leading-snug text-pretty">
+          {message}
+        </p>
+      ) : null}
+      {children ? (
+        <dl className="border-border m-0 flex flex-col gap-2.5 border-t pt-2.5">
+          {children}
+        </dl>
+      ) : null}
+    </div>
+  );
+}
+
+/** Shared request-level rows (delegate + source network) for all permission types. */
+export function PermissionGrantHostContextRows({
+  toLabel,
+  chainLabel,
+  viewOnExplorerLabel,
+  delegateAddress,
+  delegateExplorerUrl,
+  chainLogoUrl,
+  chainDisplayLabel,
+}: {
+  toLabel: string;
+  chainLabel: string;
+  viewOnExplorerLabel: string;
+  delegateAddress: string;
+  delegateExplorerUrl: string | undefined;
+  chainLogoUrl: string | undefined;
+  chainDisplayLabel: string;
+}) {
+  return (
+    <>
+      <ConsentSummaryRow label={toLabel}>
+        {delegateExplorerUrl ? (
+          <a
+            href={delegateExplorerUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="text-primary flex min-w-0 items-center gap-1 font-mono text-sm underline underline-offset-2"
+            title={delegateAddress}
+            aria-label={`${viewOnExplorerLabel}: ${delegateAddress}`}
+          >
+            <span className="truncate">{truncateAddress(delegateAddress)}</span>
+            <ExternalLinkIcon className="size-3.5 shrink-0" aria-hidden />
+          </a>
+        ) : (
+          <span className="truncate font-mono text-sm" title={delegateAddress}>
+            {truncateAddress(delegateAddress)}
+          </span>
+        )}
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={chainLabel}>
+        <SafeAssetImage
+          src={chainLogoUrl}
+          className="size-5 shrink-0 rounded-full object-cover"
+        />
+        <span className="truncate text-sm font-medium">{chainDisplayLabel}</span>
+      </ConsentSummaryRow>
+    </>
+  );
+}
+
+/** Permission terms: user-facing permission name and read-only summary rows. */
+export function PermissionGrantTermsCard({
+  kindLabel,
+  intro,
+  children,
+}: {
+  kindLabel: string;
+  intro?: string;
+  children: ReactNode;
+}) {
+  return (
+    <div className={grantCardClassName}>
+      <p className="text-primary m-0 text-[0.65rem] font-semibold tracking-wide uppercase">
+        {kindLabel}
+      </p>
+      {intro ? (
+        <p className="text-muted-foreground m-0 text-sm leading-snug text-pretty">
+          {intro}
+        </p>
+      ) : null}
+      <dl className="m-0 flex flex-col gap-2.5">{children}</dl>
+    </div>
+  );
+}
diff --git a/src/components/modals/SignModals.tsx b/src/components/modals/SignModals.tsx
index d3793b9..462fcf6 100644
--- a/src/components/modals/SignModals.tsx
+++ b/src/components/modals/SignModals.tsx
@@ -5,13 +5,13 @@ import type {
 } from "@1shotapi/ows-signer-utils";
 import {
   ConversionUtils,
-  EVMChainId,
   HexString,
   OwsUserRejectedError,
   type EVMSignatureHex,
   type EVMTransactionHash,
 } from "@1shotapi/ows-types";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
+import { ExternalLinkIcon } from "lucide-react";
 import type { TypedDataDefinition } from "viem";
 import type { ISiweFields } from "../../lib/types/domain/SiweFields";
 import type {
@@ -24,6 +24,25 @@ import { useWallet } from "../../wallet/WalletProvider";
 import { Modal } from "../Modal";
 import { AssetIdentityMark } from "../AssetIdentityMark";
 import { CopyableText } from "../CopyableText";
+import { SafeAssetImage } from "../SafeAssetImage";
+import {
+  isSiweUriRedundant,
+  resolveSiweEvmChainId,
+} from "../../lib/utils/siweDisplay";
+import {
+  domainFieldEntries,
+  formatEip712Primitive,
+  humanizeEip712Key,
+  isEvmAddressString,
+  readDomainChainId,
+  readVerifyingContract,
+} from "../../lib/utils/eip712Display";
+import {
+  faviconUrl,
+  truncateAddress,
+} from "../../lib/utils/identityDisplay";
+import { ConsentSummaryRow } from "../ConsentSummaryRow";
+import { Eip712FieldTree } from "../Eip712FieldTree";
 import { RelayerConfirmModalChrome } from "../RelayerConfirmModalChrome";
 import { useRelayerConfirmSubmit } from "../useRelayerConfirmSubmit";
 
@@ -144,7 +163,15 @@ export function SiweModal({
 
   const accountAddress =
     fields.address?.trim() || String(request.address);
-  const networkLabel = resolveSiweNetworkLabel(fields.chainId, resolveChain);
+  const body = siwe.body.replaceAll("{domain}", fields.domain);
+  const evmChainId = resolveSiweEvmChainId(fields.chainId);
+  const chain = evmChainId ? resolveChain(evmChainId) : null;
+  const networkDisplay =
+    (chain?.label ?? fields.chainId.trim()) || "Unknown network";
+  const showUri =
+    Boolean(fields.uri?.trim()) &&
+    !isSiweUriRedundant(fields.uri, fields.domain);
+  const statement = fields.statement?.trim();
 
   const cancel = () => {
     signGenerationRef.current += 1;
@@ -205,43 +232,116 @@ export function SiweModal({
           : undefined
       }
     >
-      <p className="text-muted-foreground mb-4 m-0 text-[0.9rem]">{siwe.body}</p>
-
-      <div className="border-border mb-4 rounded-md border px-3 py-2">
-        <p className="text-muted-foreground m-0 text-[0.8rem] font-medium">
-          {siwe.estimatedChangesLabel}
+      <div className="text-foreground flex flex-col gap-4">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed text-pretty">
+          {body}
         </p>
-        <p className="m-0 mt-1 text-[0.9rem]">{siwe.noChangesLabel}</p>
-      </div>
 
-      <SiweDetailRow label={siwe.networkLabel} value={networkLabel} />
-      <SiweDetailRow label={siwe.requestFromLabel} value={fields.domain} />
-      <div className="mb-4">
-        <FieldLabel>{siwe.signingInWithLabel}</FieldLabel>
-        <CopyableText
-          text={accountAddress}
-          truncate
-          copyLabel={accountCopy.copyAddressLabel}
-          copiedLabel={accountCopy.addressCopiedLabel}
-          copyFailedLabel={accountCopy.addressCopyFailedLabel}
-        />
-      </div>
+        <div
+          className={`flex items-center gap-3 ${fields.domain.trim() ? "justify-between" : "justify-start"}`}
+        >
+          <div className="flex shrink-0 items-center gap-2">
+            <NetworkIdentityMark
+              label={networkDisplay}
+              logoUrl={chain?.logoUrl}
+              size="sm"
+            />
+            <span
+              className="bg-muted text-muted-foreground rounded-full px-2.5 py-0.5 text-[0.65rem] font-semibold uppercase tracking-wide"
+              title={siwe.networkLabel}
+            >
+              {networkDisplay}
+            </span>
+          </div>
+          {fields.domain.trim() ? (
+            <span
+              className="border-border text-foreground min-w-0 max-w-[55%] truncate rounded-full border px-2.5 py-1 text-sm font-medium"
+              title={fields.domain}
+            >
+              {fields.domain}
+            </span>
+          ) : null}
+        </div>
 
-      <div className="border-border mb-1 rounded-md border px-3 py-3">
-        <FieldLabel>{siwe.messageLabel}</FieldLabel>
-        <p className="m-0 mb-3 whitespace-pre-wrap text-[0.9rem]">
-          {fields.statement?.trim() || siwe.body}
-        </p>
-        {fields.uri ? (
-          <>
-            <FieldLabel>{siwe.uriLabel}</FieldLabel>
-            <p className="m-0 break-all font-mono text-[0.8rem]">{fields.uri}</p>
-          </>
-        ) : null}
+        <div className="flex flex-col gap-1.5">
+          <span className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
+            {siwe.signingInWithLabel}
+          </span>
+          <CopyableText
+            text={accountAddress}
+            truncate
+            copyLabel={accountCopy.copyAddressLabel}
+            copiedLabel={accountCopy.addressCopiedLabel}
+            copyFailedLabel={accountCopy.addressCopyFailedLabel}
+          />
+        </div>
+
+        <div className="border-border rounded-md border px-3 py-2.5">
+          {statement ? (
+            <div className="mb-2 last:mb-0">
+              <SiweSectionLabel>{siwe.messageLabel}</SiweSectionLabel>
+              <p className="text-foreground m-0 whitespace-pre-wrap text-sm leading-snug">
+                {statement}
+              </p>
+            </div>
+          ) : null}
+          <div className="grid grid-cols-1 gap-x-4 gap-y-2 sm:grid-cols-2">
+            {showUri ? (
+              <SiweMetadataRow label={siwe.uriLabel} value={fields.uri} compact />
+            ) : null}
+            {fields.version ? (
+              <SiweMetadataRow
+                label={siwe.versionLabel}
+                value={fields.version}
+                compact
+              />
+            ) : null}
+            {fields.nonce ? (
+              <SiweMetadataRow
+                label={siwe.nonceLabel}
+                value={fields.nonce}
+                compact
+              />
+            ) : null}
+            {fields.issuedAt ? (
+              <SiweMetadataRow
+                label={siwe.issuedAtLabel}
+                value={fields.issuedAt}
+                compact
+              />
+            ) : null}
+            {fields.expirationTime ? (
+              <SiweMetadataRow
+                label={siwe.expirationTimeLabel}
+                value={fields.expirationTime}
+                compact
+              />
+            ) : null}
+            {fields.notBefore ? (
+              <SiweMetadataRow
+                label={siwe.notBeforeLabel}
+                value={fields.notBefore}
+                compact
+              />
+            ) : null}
+          </div>
+          {fields.resources && fields.resources.length > 0 ? (
+            <div className="mt-2 first:mt-0">
+              <SiweSectionLabel>{siwe.resourcesLabel}</SiweSectionLabel>
+              <ul className="text-foreground m-0 list-disc pl-5 text-sm leading-relaxed">
+                {fields.resources.map((resource) => (
+                  <li key={resource} className="break-all">
+                    {resource}
+                  </li>
+                ))}
+              </ul>
+            </div>
+          ) : null}
+        </div>
       </div>
 
       {phase === "signing" ? (
-        <p className="text-muted-foreground mt-4 m-0 text-[0.9rem]">
+        <p className="text-muted-foreground mt-4 m-0 text-sm">
           {siwe.signingHint}
         </p>
       ) : null}
@@ -249,39 +349,60 @@ export function SiweModal({
   );
 }
 
-function SiweDetailRow({ label, value }: { label: string; value: string }) {
+function SiweSectionLabel({ children }: { children: string }) {
   return (
-    <div className="mb-3">
-      <FieldLabel>{label}</FieldLabel>
-      <p className="m-0 break-all text-[0.9rem]">{value}</p>
-    </div>
+    <span className="text-muted-foreground mb-1.5 block text-xs font-medium tracking-wide uppercase">
+      {children}
+    </span>
   );
 }
 
-function resolveSiweNetworkLabel(
-  chainIdRaw: string,
-  resolveChain: (
-    chainId: EVMChainId,
-  ) => { label: string } | null,
-): string {
-  const normalized = normalizeChainIdHex(chainIdRaw);
-  if (normalized) {
-    const match = resolveChain(EVMChainId(normalized as `0x${string}`));
-    if (match) return match.label;
-  }
-  return chainIdRaw.trim() || "Unknown network";
+function SiweMetadataRow({
+  label,
+  value,
+  compact = false,
+}: {
+  label: string;
+  value: string;
+  compact?: boolean;
+}) {
+  return (
+    <div className={compact ? "min-w-0" : "mt-3 first:mt-0"}>
+      <SiweSectionLabel>{label}</SiweSectionLabel>
+      <p className="text-foreground m-0 break-all text-sm leading-snug">
+        {value}
+      </p>
+    </div>
+  );
 }
 
-function normalizeChainIdHex(raw: string): string | null {
-  const trimmed = raw.trim();
-  if (!trimmed) return null;
-  if (/^0x[0-9a-fA-F]+$/.test(trimmed)) {
-    return `0x${BigInt(trimmed).toString(16)}`;
-  }
-  if (/^\d+$/.test(trimmed)) {
-    return `0x${BigInt(trimmed).toString(16)}`;
-  }
-  return null;
+function NetworkIdentityMark({
+  label,
+  logoUrl,
+  size = "md",
+}: {
+  label: string;
+  logoUrl?: string;
+  size?: "sm" | "md";
+}) {
+  const letter = (label.trim()[0] ?? "?").toUpperCase();
+  const box = size === "sm" ? "size-12" : "size-16";
+  const text = size === "sm" ? "text-xl" : "text-2xl";
+  return (
+    <div className={`relative shrink-0 ${box}`} aria-hidden>
+      <SafeAssetImage
+        src={logoUrl}
+        className={`${box} rounded-full object-cover`}
+        fallback={
+          <div
+            className={`bg-muted text-foreground flex ${box} items-center justify-center rounded-full font-semibold ${text}`}
+          >
+            {letter}
+          </div>
+        }
+      />
+    </div>
+  );
 }
 
 export function TypedDataModal({
@@ -293,14 +414,44 @@ export function TypedDataModal({
   onResolve: (signature: EVMSignatureHex) => void;
   onReject: (error: unknown) => void;
 }) {
-  const { getSigner } = useWallet();
+  const { getSigner, resolveChain, configProvider } = useWallet();
   const { style } = useStyle();
   const { typedData: copy } = style.copy;
   const { typedData } = request;
   const [phase, setPhase] = useState<"confirm" | "signing">("confirm");
+  const [hostDomain, setHostDomain] = useState("");
   /** Bumped on cancel and each startSign so stale in-flight ops cannot settle. */
   const signGenerationRef = useRef(0);
 
+  useEffect(() => {
+    void configProvider.getConfig().then((config) => {
+      setHostDomain(String(config.hostDomain));
+    });
+  }, [configProvider]);
+
+  const domainChainRaw = readDomainChainId(typedData.domain);
+  const evmChainId = domainChainRaw
+    ? resolveSiweEvmChainId(domainChainRaw)
+    : null;
+  const chain = evmChainId ? resolveChain(evmChainId) : null;
+  const networkDisplay =
+    chain?.label ??
+    (domainChainRaw ? `Chain ${domainChainRaw.trim()}` : "Unknown network");
+  const verifyingContract = readVerifyingContract(typedData.domain);
+  const contractExplorerUrl =
+    chain && verifyingContract && isEvmAddressString(verifyingContract)
+      ? chain.addressExplorerUrl(verifyingContract)
+      : null;
+  /** Domain separator fields other than chain / contract (e.g. `Ether Mail · v1`). */
+  const domainSummary = domainFieldEntries(typedData.domain)
+    .filter(({ key }) => key !== "verifyingContract")
+    .map(({ key, value }) => {
+      const text = formatEip712Primitive(value);
+      return text ? `${humanizeEip712Key(key)}: ${text}` : "";
+    })
+    .filter(Boolean)
+    .join(" · ");
+
   const cancel = () => {
     signGenerationRef.current += 1;
     onReject(new OwsUserRejectedError("User rejected the signing request"));
@@ -351,23 +502,96 @@ export function TypedDataModal({
           : undefined
       }
     >
-      <FieldLabel>{copy.accountLabel}</FieldLabel>
-      <p className="mb-3 break-all font-mono text-[0.8rem]">{request.address}</p>
-      <LabeledBlock
-        label={copy.primaryTypeLabel}
-        content={typedData.primaryType}
-      />
-      <LabeledBlock
-        label={copy.domainLabel}
-        content={formatJson(typedData.domain)}
-      />
-      <LabeledBlock
-        label={copy.messageLabel}
-        content={formatJson(typedData.message)}
-      />
+      <div className="text-foreground flex flex-col gap-3">
+        <p className="text-muted-foreground m-0 text-sm leading-relaxed text-pretty">
+          {copy.body}
+        </p>
+
+        <dl className="border-border m-0 flex flex-col gap-2.5 rounded-md border px-3 py-2.5">
+          <ConsentSummaryRow label={copy.networkLabel}>
+            <SafeAssetImage
+              src={chain?.logoUrl}
+              className="size-5 shrink-0 rounded-full object-cover"
+            />
+            <span className="truncate text-sm font-medium">
+              {networkDisplay}
+            </span>
+          </ConsentSummaryRow>
+
+          <ConsentSummaryRow label={copy.accountLabel}>
+            <span
+              className="truncate font-mono text-sm"
+              title={String(request.address)}
+            >
+              {truncateAddress(String(request.address))}
+            </span>
+          </ConsentSummaryRow>
+
+          {hostDomain.trim() ? (
+            <ConsentSummaryRow label={copy.requestFromLabel}>
+              <SafeAssetImage
+                src={faviconUrl(hostDomain)}
+                className="size-4 shrink-0 rounded-sm"
+              />
+              <span className="truncate text-sm font-medium" title={hostDomain}>
+                {hostDomain}
+              </span>
+            </ConsentSummaryRow>
+          ) : null}
+
+          {verifyingContract ? (
+            <ConsentSummaryRow label={copy.interactingWithLabel}>
+              {contractExplorerUrl ? (
+                <a
+                  href={contractExplorerUrl}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-primary flex min-w-0 items-center gap-1 font-mono text-sm underline underline-offset-2"
+                  title={verifyingContract}
+                >
+                  <span className="truncate">
+                    {truncateAddress(verifyingContract)}
+                  </span>
+                  <ExternalLinkIcon className="size-3.5 shrink-0" aria-hidden />
+                </a>
+              ) : (
+                <span
+                  className="truncate font-mono text-sm"
+                  title={verifyingContract}
+                >
+                  {truncateAddress(verifyingContract)}
+                </span>
+              )}
+            </ConsentSummaryRow>
+          ) : null}
+        </dl>
+
+        <div className="border-border rounded-md border px-3 py-2.5">
+          <div className="mb-2 flex items-baseline justify-between gap-3">
+            <span className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
+              {copy.messageSectionLabel}
+            </span>
+            <span
+              className="bg-muted text-muted-foreground shrink-0 rounded-full px-2 py-0.5 text-[0.65rem] font-semibold tracking-wide uppercase"
+              title={copy.primaryTypeLabel}
+            >
+              {typedData.primaryType}
+            </span>
+          </div>
+          {domainSummary ? (
+            <p className="text-muted-foreground m-0 mb-2 truncate text-xs">
+              {domainSummary}
+            </p>
+          ) : null}
+          <div className="max-h-[min(40vh,280px)] overflow-y-auto pr-1">
+            <Eip712FieldTree value={typedData.message} />
+          </div>
+        </div>
+      </div>
+
       {phase === "signing" ? (
-        <p className="text-muted-foreground mt-4 m-0 text-[0.9rem]">
-          Confirm in the signing panel…
+        <p className="text-muted-foreground mt-4 m-0 text-sm">
+          {copy.signingHint}
         </p>
       ) : null}
     </Modal>
@@ -498,6 +722,16 @@ export function SendTransactionModal({
         <RelayerConfirmModalChrome
           chainId={request.chainId}
           ownerAddress={request.address}
+          work={{
+            to: request.to!,
+            data: request.data,
+            value:
+              request.value &&
+              String(request.value) !== "0x0" &&
+              String(request.value) !== "0x"
+                ? BigInt(String(request.value))
+                : undefined,
+          }}
           submit={relayerSubmit}
         />
       ) : legacyPhase === "signing" ? (
@@ -660,6 +894,7 @@ export function ConfirmTransferModal({
         <RelayerConfirmModalChrome
           chainId={request.chainId}
           ownerAddress={request.ownerAddress}
+          work={request.work}
           submit={submit}
         />
       ) : legacyPhase === "signing" ? (
@@ -695,18 +930,6 @@ function LabeledBlock({ label, content }: { label: string; content: string }) {
   );
 }
 
-function formatJson(value: unknown): string {
-  try {
-    return JSON.stringify(
-      value,
-      (_key, v) => (typeof v === "bigint" ? v.toString() : v),
-      2,
-    );
-  } catch {
-    return String(value);
-  }
-}
-
 function formatMessageForDisplay(message: string): string {
   if (message.startsWith("0x") && message.length > 2) {
     try {
diff --git a/src/components/modals/TransferTokensModal.tsx b/src/components/modals/TransferTokensModal.tsx
index 98229da..b4463a8 100644
--- a/src/components/modals/TransferTokensModal.tsx
+++ b/src/components/modals/TransferTokensModal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import {
   encodeFunctionData,
   erc20Abi,
@@ -13,7 +13,7 @@ import {
 } from "@1shotapi/ows-types";
 import type { TrackedAsset } from "../../lib/types/domain";
 import { EAssetType } from "../../lib/types/enum/EAssetType";
-import type { IPaymentQuote } from "../../lib/interfaces/business";
+import type { IPaymentQuote, ITransactionWork } from "../../lib/interfaces/business";
 import { useStyle } from "../../style/StyleProvider";
 import { chainTechnologyFor } from "../../wallet/activeAddress";
 import { useLiveTrackedBalance } from "../../wallet/useLiveTrackedBalance";
@@ -111,6 +111,46 @@ export function TransferTokensModal({
     [amount, balance, decimals, copy],
   );
 
+  const relayerWork = useMemo((): ITransactionWork | null => {
+    if (
+      !useRelayer ||
+      asset.type !== EAssetType.Erc20 ||
+      !recipient ||
+      !amount.trim() ||
+      amountError
+    ) {
+      return null;
+    }
+    let parsed: bigint;
+    try {
+      parsed = parseUnits(amount.trim(), decimals);
+    } catch {
+      return null;
+    }
+    if (parsed <= 0n) {
+      return null;
+    }
+    return {
+      to: asset.address,
+      data: HexString(
+        encodeFunctionData({
+          abi: erc20Abi,
+          functionName: "transfer",
+          args: [recipient as EVMAccountAddress, parsed],
+        }) as Hex,
+      ),
+      value: 0n,
+    };
+  }, [
+    amount,
+    amountError,
+    asset.address,
+    asset.type,
+    decimals,
+    recipient,
+    useRelayer,
+  ]);
+
   const onQuoteChange = useCallback(
     (next: IPaymentQuote | null, error: string | null) => {
       setQuote(next);
@@ -119,6 +159,12 @@ export function TransferTokensModal({
     [],
   );
 
+  // Drop stale quotes whenever ExactCalldata work changes (or becomes incomplete).
+  useEffect(() => {
+    setQuote(null);
+    setQuoteError(null);
+  }, [relayerWork]);
+
   const canSubmit = useMemo(() => {
     if (busy || asset.type !== EAssetType.Erc20) {
       return false;
@@ -270,10 +316,11 @@ export function TransferTokensModal({
           invalidAddressError={copy.invalidAddressError}
           disabled={busy}
         />
-        {useRelayer && evmAddress ? (
+        {useRelayer && evmAddress && relayerWork ? (
           <PaymentFeePicker
             chainId={asset.chainId}
             ownerAddress={evmAddress}
+            work={relayerWork}
             quote={quote}
             error={quoteError}
             loading={false}
diff --git a/src/components/modals/permissionGrantTerms/ExplorerAddressLink.tsx b/src/components/modals/permissionGrantTerms/ExplorerAddressLink.tsx
new file mode 100644
index 0000000..79084b7
--- /dev/null
+++ b/src/components/modals/permissionGrantTerms/ExplorerAddressLink.tsx
@@ -0,0 +1,33 @@
+import { ExternalLinkIcon } from "lucide-react";
+import { truncateAddress } from "../../../lib/utils/identityDisplay";
+
+export function ExplorerAddressLink({
+  address,
+  explorerUrl,
+  ariaLabel,
+}: {
+  address: string;
+  explorerUrl: string | undefined;
+  ariaLabel: string;
+}) {
+  if (explorerUrl) {
+    return (
+      <a
+        href={explorerUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+        className="text-primary flex min-w-0 items-center gap-1 font-mono text-sm underline underline-offset-2"
+        title={address}
+        aria-label={ariaLabel}
+      >
+        <span className="truncate">{truncateAddress(address)}</span>
+        <ExternalLinkIcon className="size-3.5 shrink-0" aria-hidden />
+      </a>
+    );
+  }
+  return (
+    <span className="truncate font-mono text-sm" title={address}>
+      {truncateAddress(address)}
+    </span>
+  );
+}
diff --git a/src/components/modals/permissionGrantTerms/erc20PeriodicTerms.tsx b/src/components/modals/permissionGrantTerms/erc20PeriodicTerms.tsx
new file mode 100644
index 0000000..24cdacf
--- /dev/null
+++ b/src/components/modals/permissionGrantTerms/erc20PeriodicTerms.tsx
@@ -0,0 +1,188 @@
+import { useEffect, useMemo, useState } from "react";
+import { EVMAccountAddress, type IExecutionPermissionRequest } from "@1shotapi/ows-types";
+import { formatUnits, getAddress } from "viem";
+import { ERC20_TOKEN_PERIODIC } from "../../../lib/interfaces/business/IDelegationService";
+import { EAssetType } from "../../../lib/types/enum/EAssetType";
+import {
+  formatUnixSecondsLabel,
+  humanizePeriodDuration,
+  parsePeriodDurationSeconds,
+  readHostMemoOrJustification,
+  readPermissionAmountAtoms,
+  readPermissionPeriodDurationText,
+  readPermissionStartText,
+  resolvePermissionEndUnixSeconds,
+} from "../../../lib/utils/delegationDisplay";
+import { resolveAssetIconUrl } from "../../../lib/utils/tokenIcons";
+import { useStyle } from "../../../style/StyleProvider";
+import type { IGrantExecutionPermissionResult } from "../../../wallet/modalTypes";
+import { useWallet } from "../../../wallet/WalletProvider";
+import { ConsentSummaryRow } from "../../ConsentSummaryRow";
+import { SafeAssetImage } from "../../SafeAssetImage";
+import { PermissionGrantTermsCard } from "../PermissionGrantConsentLayout";
+
+function readTokenAddress(data: Record<string, unknown>): string | null {
+  const raw = data.tokenAddress ?? data.token;
+  return typeof raw === "string" ? raw : null;
+}
+
+export function isErc20PeriodicPermissionValid(
+  executionRequest: IExecutionPermissionRequest,
+): boolean {
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+  const tokenAddress = readTokenAddress(permissionData);
+  const amountAtoms = readPermissionAmountAtoms(permissionData);
+  const durationSeconds = parsePeriodDurationSeconds(
+    readPermissionPeriodDurationText(permissionData),
+  );
+  return (
+    Boolean(tokenAddress) &&
+    amountAtoms !== null &&
+    amountAtoms > 0n &&
+    durationSeconds !== null
+  );
+}
+
+export function buildErc20PeriodicGrantResult(
+  executionRequest: IExecutionPermissionRequest,
+): IGrantExecutionPermissionResult {
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+  return {
+    permission: {
+      type: ERC20_TOKEN_PERIODIC,
+      isAdjustmentAllowed: executionRequest.permission.isAdjustmentAllowed,
+      data: permissionData,
+    },
+    memo: readHostMemoOrJustification(permissionData),
+  };
+}
+
+export function Erc20PeriodicPermissionTerms({
+  executionRequest,
+}: {
+  executionRequest: IExecutionPermissionRequest;
+}) {
+  const copy = useStyle().style.copy.grantExecutionPermission;
+  const { listTrackedAssets, getKnownAsset } = useWallet();
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+  const tokenAddress = readTokenAddress(permissionData);
+
+  const [tokenSymbol, setTokenSymbol] = useState("TOKEN");
+  const [tokenDecimals, setTokenDecimals] = useState(6);
+  const [tokenIconUrl, setTokenIconUrl] = useState<string | undefined>();
+
+  useEffect(() => {
+    if (!tokenAddress) return;
+    let cancelled = false;
+    const chainId = executionRequest.chainId;
+    const checksummed = getAddress(tokenAddress as `0x${string}`);
+
+    void (async () => {
+      const assets = await listTrackedAssets();
+      if (cancelled) return;
+      const tracked = assets.find(
+        (a) =>
+          a.type === EAssetType.Erc20 &&
+          String(a.chainId).toLowerCase() === String(chainId).toLowerCase() &&
+          getAddress(String(a.address)).toLowerCase() === checksummed.toLowerCase(),
+      );
+      if (tracked) {
+        setTokenSymbol(tracked.symbol);
+        setTokenDecimals(tracked.decimals ?? 6);
+        setTokenIconUrl(
+          resolveAssetIconUrl(
+            chainId,
+            EVMAccountAddress(checksummed),
+            tracked.symbol,
+            tracked.iconUrl,
+          ),
+        );
+        return;
+      }
+      try {
+        const known = await getKnownAsset(
+          chainId,
+          EVMAccountAddress(checksummed),
+        );
+        if (cancelled) return;
+        if (known) {
+          setTokenSymbol(known.symbol);
+          setTokenDecimals(known.decimals ?? 6);
+          setTokenIconUrl(
+            resolveAssetIconUrl(
+              chainId,
+              EVMAccountAddress(checksummed),
+              known.symbol,
+              known.iconUrl,
+            ),
+          );
+        } else {
+          setTokenIconUrl(undefined);
+        }
+      } catch {
+        setTokenIconUrl(undefined);
+      }
+    })();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [executionRequest.chainId, getKnownAsset, listTrackedAssets, tokenAddress]);
+
+  const amountAtoms = readPermissionAmountAtoms(permissionData);
+  const durationSeconds = parsePeriodDurationSeconds(
+    readPermissionPeriodDurationText(permissionData),
+  );
+  const startDisplay = formatUnixSecondsLabel(
+    readPermissionStartText(permissionData) || undefined,
+  );
+  const endDisplay = formatUnixSecondsLabel(
+    resolvePermissionEndUnixSeconds({
+      rules: executionRequest.rules,
+      permissionData,
+    }) ?? undefined,
+  );
+
+  const summaryAmount = useMemo(() => {
+    if (amountAtoms === null || amountAtoms <= 0n) return null;
+    try {
+      return `${formatUnits(amountAtoms, tokenDecimals)} ${tokenSymbol}`;
+    } catch {
+      return null;
+    }
+  }, [amountAtoms, tokenDecimals, tokenSymbol]);
+
+  const summaryWindow =
+    durationSeconds === null
+      ? "—"
+      : humanizePeriodDuration(durationSeconds);
+
+  return (
+    <PermissionGrantTermsCard kindLabel={copy.permissionKindLabel}>
+      <ConsentSummaryRow label={copy.amountLabel}>
+        {tokenIconUrl ? (
+          <SafeAssetImage
+            src={tokenIconUrl}
+            className="size-5 shrink-0 rounded-full object-cover"
+          />
+        ) : null}
+        <span className="truncate text-sm font-medium">
+          {summaryAmount ?? "—"}
+        </span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.transferWindowLabel}>
+        <span className="truncate text-sm font-medium">{summaryWindow}</span>
+      </ConsentSummaryRow>
+      {startDisplay ? (
+        <ConsentSummaryRow label={copy.startLabel}>
+          <span className="truncate text-sm font-medium">{startDisplay}</span>
+        </ConsentSummaryRow>
+      ) : null}
+      {endDisplay ? (
+        <ConsentSummaryRow label={copy.endLabel}>
+          <span className="truncate text-sm font-medium">{endDisplay}</span>
+        </ConsentSummaryRow>
+      ) : null}
+    </PermissionGrantTermsCard>
+  );
+}
diff --git a/src/components/modals/permissionGrantTerms/index.tsx b/src/components/modals/permissionGrantTerms/index.tsx
new file mode 100644
index 0000000..368350b
--- /dev/null
+++ b/src/components/modals/permissionGrantTerms/index.tsx
@@ -0,0 +1,112 @@
+import type { IExecutionPermissionRequest } from "@1shotapi/ows-types";
+import {
+  LIFI_SWAP_APPROVE,
+  LIFI_SWAP_PERIODIC,
+  ERC20_TOKEN_PERIODIC,
+} from "../../../lib/interfaces/business/IDelegationService";
+import type {
+  GrantPermissionModalKind,
+  IGrantExecutionPermissionResult,
+} from "../../../wallet/modalTypes";
+import { useWallet } from "../../../wallet/WalletProvider";
+import {
+  buildErc20PeriodicGrantResult,
+  Erc20PeriodicPermissionTerms,
+  isErc20PeriodicPermissionValid,
+} from "./erc20PeriodicTerms";
+import {
+  buildLiFiApproveGrantResult,
+  isLiFiApprovePermissionValid,
+  LiFiApprovePermissionTerms,
+} from "./lifiApproveTerms";
+import {
+  buildLiFiSwapGrantResult,
+  isLiFiSwapPermissionValid,
+  LiFiSwapPermissionTerms,
+} from "./lifiSwapTerms";
+
+export function PermissionGrantTermsSection({
+  grantKind,
+  executionRequest,
+}: {
+  grantKind: GrantPermissionModalKind;
+  executionRequest: IExecutionPermissionRequest;
+}) {
+  switch (grantKind) {
+    case "grantExecutionPermission":
+      return (
+        <Erc20PeriodicPermissionTerms executionRequest={executionRequest} />
+      );
+    case "grantLiFiSwapPermission":
+      return <LiFiSwapPermissionTerms executionRequest={executionRequest} />;
+    case "grantLiFiApprovePermission":
+      return <LiFiApprovePermissionTerms executionRequest={executionRequest} />;
+    default: {
+      const _exhaustive: never = grantKind;
+      return _exhaustive;
+    }
+  }
+}
+
+export function isPermissionGrantItemValid(
+  grantKind: GrantPermissionModalKind,
+  executionRequest: IExecutionPermissionRequest,
+  defaultSlippageBps: number,
+): boolean {
+  const permissionType = executionRequest.permission.type;
+  switch (grantKind) {
+    case "grantExecutionPermission":
+      return (
+        permissionType === ERC20_TOKEN_PERIODIC &&
+        isErc20PeriodicPermissionValid(executionRequest)
+      );
+    case "grantLiFiSwapPermission":
+      return (
+        permissionType === LIFI_SWAP_PERIODIC &&
+        isLiFiSwapPermissionValid(executionRequest, defaultSlippageBps)
+      );
+    case "grantLiFiApprovePermission":
+      return (
+        permissionType === LIFI_SWAP_APPROVE &&
+        isLiFiApprovePermissionValid(executionRequest)
+      );
+    default: {
+      const _exhaustive: never = grantKind;
+      return _exhaustive;
+    }
+  }
+}
+
+export function buildPermissionGrantResult(
+  grantKind: GrantPermissionModalKind,
+  executionRequest: IExecutionPermissionRequest,
+): IGrantExecutionPermissionResult {
+  switch (grantKind) {
+    case "grantExecutionPermission":
+      return buildErc20PeriodicGrantResult(executionRequest);
+    case "grantLiFiSwapPermission":
+      return buildLiFiSwapGrantResult(executionRequest);
+    case "grantLiFiApprovePermission":
+      return buildLiFiApproveGrantResult(executionRequest);
+    default: {
+      const _exhaustive: never = grantKind;
+      return _exhaustive;
+    }
+  }
+}
+
+export function usePermissionBatchAllValid(
+  items: ReadonlyArray<{
+    grantKind: GrantPermissionModalKind;
+    request: IExecutionPermissionRequest;
+  }>,
+): boolean {
+  const { liFiUtils } = useWallet();
+  return items.every((item) =>
+    isPermissionGrantItemValid(
+      item.grantKind,
+      item.request,
+      liFiUtils.defaultSlippageBps,
+    ),
+  );
+}
diff --git a/src/components/modals/permissionGrantTerms/lifiApproveTerms.tsx b/src/components/modals/permissionGrantTerms/lifiApproveTerms.tsx
new file mode 100644
index 0000000..c8fd1f6
--- /dev/null
+++ b/src/components/modals/permissionGrantTerms/lifiApproveTerms.tsx
@@ -0,0 +1,164 @@
+import { useEffect, useMemo, useState } from "react";
+import { EVMAccountAddress, type IExecutionPermissionRequest } from "@1shotapi/ows-types";
+import { getAddress } from "viem";
+import {
+  parseLiFiApproveData,
+} from "../../../lib/implementations/business/DelegationService";
+import { LIFI_SWAP_APPROVE } from "../../../lib/interfaces/business/IDelegationService";
+import { EAssetType } from "../../../lib/types/enum/EAssetType";
+import { readHostMemoOrJustification } from "../../../lib/utils/delegationDisplay";
+import { resolveAssetIconUrl } from "../../../lib/utils/tokenIcons";
+import { useStyle } from "../../../style/StyleProvider";
+import type { IGrantExecutionPermissionResult } from "../../../wallet/modalTypes";
+import { useWallet } from "../../../wallet/WalletProvider";
+import { ConsentSummaryRow } from "../../ConsentSummaryRow";
+import { SafeAssetImage } from "../../SafeAssetImage";
+import { PermissionGrantTermsCard } from "../PermissionGrantConsentLayout";
+import { ExplorerAddressLink } from "./ExplorerAddressLink";
+
+export function isLiFiApprovePermissionValid(
+  executionRequest: IExecutionPermissionRequest,
+): boolean {
+  try {
+    parseLiFiApproveData(executionRequest.permission.data);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function buildLiFiApproveGrantResult(
+  executionRequest: IExecutionPermissionRequest,
+): IGrantExecutionPermissionResult {
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+  return {
+    permission: {
+      type: LIFI_SWAP_APPROVE,
+      isAdjustmentAllowed: executionRequest.permission.isAdjustmentAllowed,
+      data: permissionData,
+    },
+    memo: readHostMemoOrJustification(permissionData),
+  };
+}
+
+export function LiFiApprovePermissionTerms({
+  executionRequest,
+}: {
+  executionRequest: IExecutionPermissionRequest;
+}) {
+  const copy = useStyle().style.copy.grantLiFiApprovePermission;
+  const { listTrackedAssets, resolveChain, getKnownAsset } = useWallet();
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+
+  const parsedApprove = useMemo(() => {
+    try {
+      return parseLiFiApproveData(permissionData);
+    } catch {
+      return null;
+    }
+  }, [permissionData]);
+
+  const tokenAddress = parsedApprove
+    ? String(parsedApprove.tokenAddress)
+    : "";
+  const spender = parsedApprove ? String(parsedApprove.spender) : "";
+
+  const [tokenSymbol, setTokenSymbol] = useState("TOKEN");
+  const [tokenIconUrl, setTokenIconUrl] = useState<string | undefined>();
+
+  useEffect(() => {
+    if (!tokenAddress) return;
+    let cancelled = false;
+    const chainId = executionRequest.chainId;
+    let checksummed: `0x${string}`;
+    try {
+      checksummed = getAddress(tokenAddress as `0x${string}`);
+    } catch {
+      return;
+    }
+
+    void (async () => {
+      const assets = await listTrackedAssets();
+      if (cancelled) return;
+      const tracked = assets.find(
+        (a) =>
+          a.type === EAssetType.Erc20 &&
+          String(a.chainId).toLowerCase() === String(chainId).toLowerCase() &&
+          getAddress(String(a.address)).toLowerCase() === checksummed.toLowerCase(),
+      );
+      if (tracked) {
+        setTokenSymbol(tracked.symbol);
+        setTokenIconUrl(
+          resolveAssetIconUrl(
+            chainId,
+            EVMAccountAddress(checksummed),
+            tracked.symbol,
+            tracked.iconUrl,
+          ),
+        );
+        return;
+      }
+      try {
+        const known = await getKnownAsset(
+          chainId,
+          EVMAccountAddress(checksummed),
+        );
+        if (cancelled) return;
+        if (known) {
+          setTokenSymbol(known.symbol);
+          setTokenIconUrl(
+            resolveAssetIconUrl(
+              chainId,
+              EVMAccountAddress(checksummed),
+              known.symbol,
+              known.iconUrl,
+            ),
+          );
+        } else {
+          setTokenIconUrl(undefined);
+        }
+      } catch {
+        setTokenIconUrl(undefined);
+      }
+    })();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [executionRequest.chainId, getKnownAsset, listTrackedAssets, tokenAddress]);
+
+  const chain = resolveChain(executionRequest.chainId);
+  const spenderExplorerUrl = spender
+    ? chain?.addressExplorerUrl(spender)
+    : undefined;
+
+  return (
+    <PermissionGrantTermsCard
+      kindLabel={copy.permissionKindLabel}
+      intro={copy.warning}
+    >
+      <ConsentSummaryRow label={copy.tokenLabel}>
+        {tokenIconUrl ? (
+          <SafeAssetImage
+            src={tokenIconUrl}
+            className="size-5 shrink-0 rounded-full object-cover"
+          />
+        ) : null}
+        <span className="truncate text-sm font-medium">
+          {tokenAddress ? tokenSymbol : "—"}
+        </span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.spenderLabel}>
+        {spender ? (
+          <ExplorerAddressLink
+            address={spender}
+            explorerUrl={spenderExplorerUrl}
+            ariaLabel={`${copy.viewOnExplorerLabel}: ${spender}`}
+          />
+        ) : (
+          <span className="text-sm font-medium">—</span>
+        )}
+      </ConsentSummaryRow>
+    </PermissionGrantTermsCard>
+  );
+}
diff --git a/src/components/modals/permissionGrantTerms/lifiSwapTerms.tsx b/src/components/modals/permissionGrantTerms/lifiSwapTerms.tsx
new file mode 100644
index 0000000..66625bc
--- /dev/null
+++ b/src/components/modals/permissionGrantTerms/lifiSwapTerms.tsx
@@ -0,0 +1,292 @@
+import { useEffect, useMemo, useState } from "react";
+import { EVMAccountAddress, type IExecutionPermissionRequest } from "@1shotapi/ows-types";
+import { formatUnits, getAddress } from "viem";
+import { parseLiFiSwapData } from "../../../lib/implementations/business/DelegationService";
+import { LIFI_SWAP_PERIODIC } from "../../../lib/interfaces/business/IDelegationService";
+import { EAssetType } from "../../../lib/types/enum/EAssetType";
+import {
+  formatSlippageBpsLabel,
+  formatUnixSecondsLabel,
+  humanizePeriodDuration,
+  readHostMemoOrJustification,
+  readPermissionStartText,
+  resolvePermissionEndUnixSeconds,
+  truncateMiddle,
+} from "../../../lib/utils/delegationDisplay";
+import { resolveAssetIconUrl } from "../../../lib/utils/tokenIcons";
+import { useStyle } from "../../../style/StyleProvider";
+import type { IGrantExecutionPermissionResult } from "../../../wallet/modalTypes";
+import { useWallet } from "../../../wallet/WalletProvider";
+import { ConsentSummaryRow } from "../../ConsentSummaryRow";
+import { SafeAssetImage } from "../../SafeAssetImage";
+import { PermissionGrantTermsCard } from "../PermissionGrantConsentLayout";
+import { ExplorerAddressLink } from "./ExplorerAddressLink";
+
+function readString(data: Record<string, unknown>, ...keys: string[]): string {
+  for (const key of keys) {
+    const raw = data[key];
+    if (typeof raw === "string" && raw.trim() !== "") return raw.trim();
+    if (typeof raw === "number" && Number.isFinite(raw)) return String(raw);
+  }
+  return "";
+}
+
+export function isLiFiSwapPermissionValid(
+  executionRequest: IExecutionPermissionRequest,
+  defaultSlippageBps: number,
+): boolean {
+  try {
+    parseLiFiSwapData(executionRequest.permission.data, defaultSlippageBps);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function buildLiFiSwapGrantResult(
+  executionRequest: IExecutionPermissionRequest,
+): IGrantExecutionPermissionResult {
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+  return {
+    permission: {
+      type: LIFI_SWAP_PERIODIC,
+      isAdjustmentAllowed: executionRequest.permission.isAdjustmentAllowed,
+      data: permissionData,
+    },
+    memo: readHostMemoOrJustification(permissionData),
+  };
+}
+
+export function LiFiSwapPermissionTerms({
+  executionRequest,
+}: {
+  executionRequest: IExecutionPermissionRequest;
+}) {
+  const copy = useStyle().style.copy.grantLiFiSwapPermission;
+  const { listTrackedAssets, resolveChain, getKnownAsset, liFiUtils } =
+    useWallet();
+  const permissionData = executionRequest.permission.data as Record<string, unknown>;
+
+  const parsedSwap = useMemo(() => {
+    try {
+      return parseLiFiSwapData(
+        permissionData,
+        liFiUtils.defaultSlippageBps,
+      );
+    } catch {
+      return null;
+    }
+  }, [liFiUtils.defaultSlippageBps, permissionData]);
+
+  const tokenAddress = parsedSwap
+    ? getAddress(parsedSwap.tokenAddress)
+    : readString(permissionData, "tokenAddress", "inputToken");
+
+  const [tokenSymbol, setTokenSymbol] = useState("TOKEN");
+  const [tokenDecimals, setTokenDecimals] = useState(6);
+  const [tokenIconUrl, setTokenIconUrl] = useState<string | undefined>();
+
+  useEffect(() => {
+    if (!tokenAddress) return;
+    let cancelled = false;
+    const chainId = executionRequest.chainId;
+    let checksummed: `0x${string}`;
+    try {
+      checksummed = getAddress(tokenAddress as `0x${string}`);
+    } catch {
+      return;
+    }
+
+    void (async () => {
+      const assets = await listTrackedAssets();
+      if (cancelled) return;
+      const tracked = assets.find(
+        (a) =>
+          a.type === EAssetType.Erc20 &&
+          String(a.chainId).toLowerCase() === String(chainId).toLowerCase() &&
+          getAddress(String(a.address)).toLowerCase() === checksummed.toLowerCase(),
+      );
+      if (tracked) {
+        setTokenSymbol(tracked.symbol);
+        setTokenDecimals(tracked.decimals ?? 6);
+        setTokenIconUrl(
+          resolveAssetIconUrl(
+            chainId,
+            EVMAccountAddress(checksummed),
+            tracked.symbol,
+            tracked.iconUrl,
+          ),
+        );
+        return;
+      }
+      try {
+        const known = await getKnownAsset(
+          chainId,
+          EVMAccountAddress(checksummed),
+        );
+        if (cancelled) return;
+        if (known) {
+          setTokenSymbol(known.symbol);
+          setTokenDecimals(known.decimals ?? 6);
+          setTokenIconUrl(
+            resolveAssetIconUrl(
+              chainId,
+              EVMAccountAddress(checksummed),
+              known.symbol,
+              known.iconUrl,
+            ),
+          );
+        } else {
+          setTokenIconUrl(undefined);
+        }
+      } catch {
+        setTokenIconUrl(undefined);
+      }
+    })();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [executionRequest.chainId, getKnownAsset, listTrackedAssets, tokenAddress]);
+
+  const summaryAmount = useMemo(() => {
+    if (!parsedSwap || parsedSwap.periodAmount <= 0n) return null;
+    try {
+      return `${formatUnits(parsedSwap.periodAmount, tokenDecimals)} ${tokenSymbol}`;
+    } catch {
+      return null;
+    }
+  }, [parsedSwap, tokenDecimals, tokenSymbol]);
+
+  const summaryWindow = parsedSwap
+    ? humanizePeriodDuration(parsedSwap.periodDuration)
+    : "—";
+
+  const slippageDisplay = parsedSwap
+    ? formatSlippageBpsLabel(parsedSwap.slippageBps)
+    : null;
+
+  const startDisplay = formatUnixSecondsLabel(
+    readPermissionStartText(permissionData) ||
+      (parsedSwap ? String(parsedSwap.startDate) : undefined),
+  );
+
+  const endDisplay = formatUnixSecondsLabel(
+    resolvePermissionEndUnixSeconds({
+      rules: executionRequest.rules,
+      permissionData,
+    }) ?? undefined,
+  );
+
+  const sourceChain = resolveChain(executionRequest.chainId);
+
+  const destChainIdRaw = readString(permissionData, "destinationChainId");
+  const destChainHex =
+    destChainIdRaw === ""
+      ? null
+      : destChainIdRaw.startsWith("0x") || destChainIdRaw.startsWith("0X")
+        ? destChainIdRaw
+        : /^\d+$/.test(destChainIdRaw)
+          ? `0x${BigInt(destChainIdRaw).toString(16)}`
+          : null;
+  const destChain = destChainHex
+    ? resolveChain(destChainHex as never)
+    : undefined;
+  const destinationLabel = destChain?.label ?? (destChainIdRaw || "—");
+
+  const outputAssetId = readString(permissionData, "outputAssetId");
+  const outputRecipient = readString(permissionData, "outputRecipient");
+  const lifiDiamond = readString(permissionData, "lifiDiamond");
+  const quoteSigner = readString(permissionData, "quoteSigner");
+
+  const diamondExplorerUrl = lifiDiamond
+    ? sourceChain?.addressExplorerUrl(lifiDiamond)
+    : undefined;
+  const quoteSignerExplorerUrl = quoteSigner
+    ? sourceChain?.addressExplorerUrl(quoteSigner)
+    : undefined;
+
+  return (
+    <PermissionGrantTermsCard
+      kindLabel={copy.permissionKindLabel}
+      intro={copy.quoteNote}
+    >
+      <ConsentSummaryRow label={copy.amountLabel}>
+        {tokenIconUrl ? (
+          <SafeAssetImage
+            src={tokenIconUrl}
+            className="size-5 shrink-0 rounded-full object-cover"
+          />
+        ) : null}
+        <span className="truncate text-sm font-medium">
+          {summaryAmount ?? "—"}
+        </span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.transferWindowLabel}>
+        <span className="truncate text-sm font-medium">{summaryWindow}</span>
+      </ConsentSummaryRow>
+      {slippageDisplay ? (
+        <ConsentSummaryRow label={copy.slippageLabel}>
+          <span className="truncate text-sm font-medium">{slippageDisplay}</span>
+        </ConsentSummaryRow>
+      ) : null}
+      <ConsentSummaryRow label={copy.outputAssetLabel}>
+        <span
+          className="truncate font-mono text-sm font-medium"
+          title={outputAssetId || undefined}
+        >
+          {outputAssetId ? truncateMiddle(outputAssetId) : "—"}
+        </span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.outputRecipientLabel}>
+        <span
+          className="truncate font-mono text-sm font-medium"
+          title={outputRecipient || undefined}
+        >
+          {outputRecipient ? truncateMiddle(outputRecipient) : "—"}
+        </span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.destinationChainLabel}>
+        {destChain?.logoUrl ? (
+          <SafeAssetImage
+            src={destChain.logoUrl}
+            className="size-5 shrink-0 rounded-full object-cover"
+          />
+        ) : null}
+        <span className="truncate text-sm font-medium">{destinationLabel}</span>
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.lifiDiamondLabel}>
+        {lifiDiamond ? (
+          <ExplorerAddressLink
+            address={lifiDiamond}
+            explorerUrl={diamondExplorerUrl}
+            ariaLabel={`${copy.viewOnExplorerLabel}: ${lifiDiamond}`}
+          />
+        ) : (
+          <span className="text-sm font-medium">—</span>
+        )}
+      </ConsentSummaryRow>
+      <ConsentSummaryRow label={copy.quoteSignerLabel}>
+        {quoteSigner ? (
+          <ExplorerAddressLink
+            address={quoteSigner}
+            explorerUrl={quoteSignerExplorerUrl}
+            ariaLabel={`${copy.viewOnExplorerLabel}: ${quoteSigner}`}
+          />
+        ) : (
+          <span className="text-sm font-medium">—</span>
+        )}
+      </ConsentSummaryRow>
+      {startDisplay ? (
+        <ConsentSummaryRow label={copy.startLabel}>
+          <span className="truncate text-sm font-medium">{startDisplay}</span>
+        </ConsentSummaryRow>
+      ) : null}
+      {endDisplay ? (
+        <ConsentSummaryRow label={copy.endLabel}>
+          <span className="truncate text-sm font-medium">{endDisplay}</span>
+        </ConsentSummaryRow>
+      ) : null}
+    </PermissionGrantTermsCard>
+  );
+}
diff --git a/src/lib/implementations/business/BridgeService.ts b/src/lib/implementations/business/BridgeService.ts
index 949e1ba..d965aee 100644
--- a/src/lib/implementations/business/BridgeService.ts
+++ b/src/lib/implementations/business/BridgeService.ts
@@ -62,10 +62,15 @@ export class BridgeService implements IBridgeService {
       params.speed,
       params.amountAtoms,
     );
-    const paymentQuote = await this.transactionUtils.quotePayment(
+    const contracts = this.cctpUtils.getContracts(
+      sourceRoute.domain,
+      sourceRoute.networkType,
+    );
+    const allowance = await this.readAllowance(
       params.sourceChainId,
-      params.owner,
       sourceUsdc.address,
+      params.owner,
+      contracts.tokenMessengerV2,
     );
     const burnCalldata = this.cctpUtils.encodeDepositForBurnWithHook({
       totalBurn: fees.totalBurn,
@@ -75,6 +80,24 @@ export class BridgeService implements IBridgeService {
       maxFee: fees.maxFee,
       minFinalityThreshold: fees.minFinalityThreshold,
     });
+    const approveData = this.cctpUtils.encodeUsdcApprove(
+      contracts.tokenMessengerV2,
+      fees.totalBurn,
+    );
+    const relayerWork = this.cctpUtils.buildRelayerWork({
+      allowance,
+      totalBurn: fees.totalBurn,
+      usdcAddress: sourceUsdc.address,
+      tokenMessenger: contracts.tokenMessengerV2,
+      approveData,
+      burnData: burnCalldata,
+    });
+    const paymentQuote = await this.transactionUtils.quotePayment(
+      params.sourceChainId,
+      params.owner,
+      relayerWork,
+      sourceUsdc.address,
+    );
 
     return {
       sourceChainId: params.sourceChainId,
@@ -92,6 +115,7 @@ export class BridgeService implements IBridgeService {
       netReceivedAtoms: params.amountAtoms,
       paymentQuote,
       burnCalldata,
+      relayerWork,
     };
   }
 
diff --git a/src/lib/implementations/business/DelegationService.ts b/src/lib/implementations/business/DelegationService.ts
index 697def2..17c03c3 100644
--- a/src/lib/implementations/business/DelegationService.ts
+++ b/src/lib/implementations/business/DelegationService.ts
@@ -41,11 +41,13 @@ import type { LocalAccount } from "viem/accounts";
 import type { IChainRepository } from "../../interfaces/data/IChainRepository";
 import type { IDelegationRepository } from "../../interfaces/data/IDelegationRepository";
 import type {
+  IBuildCancelWorkParams,
   ICancelDelegationParams,
   ICancelDelegationResult,
   ICreateExecutionPermissionsParams,
   IDelegationService,
 } from "../../interfaces/business/IDelegationService";
+import type { ITransactionWork } from "../../interfaces/business/ITransactionService";
 import {
   ERC20_TOKEN_PERIODIC,
   LIFI_SWAP_APPROVE,
@@ -218,11 +220,47 @@ export class DelegationService implements IDelegationService {
     }
   }
 
+  async buildCancelWork(
+    params: IBuildCancelWorkParams,
+  ): Promise<ITransactionWork> {
+    const resolved = await this.resolveCancelDelegation(params);
+    return resolved.work;
+  }
+
   async cancelDelegation(
     params: ICancelDelegationParams,
   ): Promise<ICancelDelegationResult> {
     const chain = await this.requireRelayerChain(params.chainId);
+    const { stored, work } = await this.resolveCancelDelegation(params);
+
+    const result = await this.transactionUtils.sendViaRelayer({
+      chainId: params.chainId,
+      work,
+      paymentToken: params.paymentToken,
+      feeAtoms: params.feeAtoms,
+      relayerUrl: chain.relayerUrl,
+      prefetchRelayerVaultAssertion: true,
+      retainDisplayDuringSubmit: true,
+      onAwaitingConfirmation: params.onAwaitingConfirmation,
+      onFinalFeeRequired: params.onFinalFeeRequired,
+    });
+
+    let deletedDelegationId: ICancelDelegationResult["deletedDelegationId"];
+    if (stored) {
+      await this.delegationRepository.deleteDelegation(
+        stored.delegationId,
+      );
+      deletedDelegationId = stored.delegationId;
+    }
+
+    return { ...result, deletedDelegationId };
+  }
 
+  private async resolveCancelDelegation(params: {
+    chainId: EVMChainId;
+    stored?: IStoredDelegation;
+    permissionContext?: HexString;
+  }): Promise<{ stored?: IStoredDelegation; work: ITransactionWork }> {
     let stored = params.stored;
     let mmDelegation: Delegation;
 
@@ -250,31 +288,14 @@ export class DelegationService implements IDelegationService {
       delegation: mmDelegation,
     }) as Hex;
 
-    const result = await this.transactionUtils.sendViaRelayer({
-      chainId: params.chainId,
+    return {
+      stored,
       work: {
         to: EVMAccountAddress(getAddress(environment.DelegationManager)),
         data: HexString(disableCalldata),
         value: 0n,
       },
-      paymentToken: params.paymentToken,
-      feeAtoms: params.feeAtoms,
-      relayerUrl: chain.relayerUrl,
-      prefetchRelayerVaultAssertion: true,
-      retainDisplayDuringSubmit: true,
-      onAwaitingConfirmation: params.onAwaitingConfirmation,
-      onFinalFeeRequired: params.onFinalFeeRequired,
-    });
-
-    let deletedDelegationId: ICancelDelegationResult["deletedDelegationId"];
-    if (stored) {
-      await this.delegationRepository.deleteDelegation(
-        stored.delegationId,
-      );
-      deletedDelegationId = stored.delegationId;
-    }
-
-    return { ...result, deletedDelegationId };
+    };
   }
 
   async getSupportedExecutionPermissions(): Promise<SupportedExecutionPermissions> {
diff --git a/src/lib/implementations/business/TransactionService.ts b/src/lib/implementations/business/TransactionService.ts
index 88d013e..679d761 100644
--- a/src/lib/implementations/business/TransactionService.ts
+++ b/src/lib/implementations/business/TransactionService.ts
@@ -54,11 +54,13 @@ export class TransactionService implements ITransactionService {
   quotePayment(
     chainId: EVMChainId,
     owner: EVMAccountAddress,
+    work: ITransactionWork | ITransactionWork[],
     preferredToken?: EVMAccountAddress,
   ): Promise<IPaymentQuote> {
     return this.options.transactionUtils.quotePayment(
       chainId,
       owner,
+      work,
       preferredToken,
     );
   }
diff --git a/src/lib/implementations/business/utils/LiFiUtils.ts b/src/lib/implementations/business/utils/LiFiUtils.ts
index 58b9be5..6609712 100644
--- a/src/lib/implementations/business/utils/LiFiUtils.ts
+++ b/src/lib/implementations/business/utils/LiFiUtils.ts
@@ -19,15 +19,26 @@ const TERMS_LENGTH = 284;
 const DEFAULT_SLIPPAGE_BPS = 50;
 
 /**
- * LiFiSwapEnforcer deployments keyed by source chain.
- * @see https://github.com/1Shot-API/delegation-framework/tree/deployment/Base/scripts/lifi-swap
+ * LiFiSwapEnforcer v3 TransparentUpgradeableProxy (caveat enforcer for new grants).
+ * Same CREATE2 address on Arc, Base, and Ethereum mainnet.
+ * @see delegation-framework documents/Deployments.md (v3 upgradeable, 2026-09-18)
  */
-const ENFORCER_BY_CHAIN: ReadonlyMap<string, EVMContractAddress> = new Map([
-  [
-    String(EChain.Base).toLowerCase(),
-    EVMContractAddress("0x47472E8AA7012D1c23336aa28514AE94389318f5"),
-  ],
-]);
+export const LIFI_SWAP_ENFORCER_PROXY = EVMContractAddress(
+  "0x29fcBBa852439616c4D614A2fa6411E42b760153",
+);
+
+const LIFI_SWAP_ENFORCER_CHAINS = [
+  EChain.Arc,
+  EChain.Base,
+  EChain.Ethereum,
+] as const;
+
+const ENFORCER_BY_CHAIN: ReadonlyMap<string, EVMContractAddress> = new Map(
+  LIFI_SWAP_ENFORCER_CHAINS.map((chainId) => [
+    String(chainId).toLowerCase(),
+    LIFI_SWAP_ENFORCER_PROXY,
+  ]),
+);
 
 /**
  * LiFiSwapEnforcer deployments and terms encoding.
diff --git a/src/lib/implementations/business/utils/TransactionUtils.ts b/src/lib/implementations/business/utils/TransactionUtils.ts
index 4ce4a7c..ed790e2 100644
--- a/src/lib/implementations/business/utils/TransactionUtils.ts
+++ b/src/lib/implementations/business/utils/TransactionUtils.ts
@@ -68,12 +68,29 @@ import "../../utils/registerSmartAccountsEnvironments";
 const STATELESS_DELEGATOR_IMPL =
   "0x63c0c19a282a1B52b07dD5a65b58948A07DAE32B" as const;
 
+/**
+ * 65-byte zero signature for `relayer_estimate7710Transaction` unsigned
+ * estimates. Valid ECDSA length so the DelegatorEstimateShim's
+ * ECDSA.tryRecover pays ecrecover precompile gas (prefer over bytes32(0)).
+ */
+export const PLACEHOLDER_DELEGATION_SIGNATURE_65_ZERO =
+  "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" as const;
+
 /** IndexedDB key for the client delegation-binding value (not localStorage). */
 const DELEGATION_BINDING_IDB_KEY = "oneshot.dbind";
 const LEGACY_DELEGATION_SECRET_KEY = "oneshot.delegationSecret";
 const POLL_MS = 1000;
 const MAX_POLL_ATTEMPTS = 180;
 
+type ExactCalldataDelegationArgs = {
+  smartAccount: Awaited<ReturnType<typeof toMetaMaskSmartAccount>>;
+  delegate: EVMAccountAddress;
+  target: EVMAccountAddress;
+  value: bigint;
+  callData: Hex;
+  chainIdNumber: number;
+};
+
 export type TransactionUtilsOptions = {
   chainRepository: IChainRepository;
   relayerRepository: IOneshotRelayerRepository;
@@ -219,8 +236,14 @@ export class TransactionUtils implements ITransactionUtils {
   async quotePayment(
     chainId: EVMChainId,
     owner: EVMAccountAddress,
+    work: ITransactionWork | ITransactionWork[],
     preferredToken?: EVMAccountAddress,
   ): Promise<IPaymentQuote> {
+    const workItems = Array.isArray(work) ? work : [work];
+    if (workItems.length === 0) {
+      throw new Error("quotePayment requires at least one work item");
+    }
+
     const chain = await this.requireRelayerChain(chainId);
     const capabilities = await this.options.relayerRepository.getCapabilities(
       chain.relayerUrl,
@@ -250,10 +273,99 @@ export class TransactionUtils implements ITransactionUtils {
       throw new Error("No relayer payment token with a positive balance");
     }
 
-    // Confirm UI uses a conservative mock (≥ typical $0.01 minFee). The real fee
-    // comes from relayer_estimate7710Transaction at submit — not getFeeData
-    // (whose minFee is a human decimal string, not atoms).
-    const feeAtoms = makeTokenAmount(parseUnits("0.01", selected.decimals));
+    // Seed fee ExactCalldata with typical minFee; estimate returns the real
+    // requiredPaymentAmount (often higher on Ethereum).
+    const seedFeeAtoms = makeTokenAmount(
+      parseUnits("0.01", selected.decimals),
+    );
+
+    const chainIdNumber = Number(BigInt(chainId));
+    const viemAccount = await this.getViemAccount(owner);
+    const smartAccount = await toMetaMaskSmartAccount({
+      client: client as never,
+      implementation: Implementation.Stateless7702,
+      address: owner,
+      signer: { account: viemAccount },
+    });
+
+    const feeCalldata = HexStringCompat(
+      encodeFunctionData({
+        abi: erc20Abi,
+        functionName: "transfer",
+        args: [capabilities.feeCollector, seedFeeAtoms],
+      }),
+    );
+
+    const feeDelegation = this.createUnsignedExactCalldataDelegation({
+      smartAccount,
+      delegate: capabilities.targetAddress,
+      target: selected.address,
+      value: 0n,
+      callData: feeCalldata,
+      chainIdNumber,
+    });
+    const workDelegations = workItems.map((item) =>
+      this.createUnsignedExactCalldataDelegation({
+        smartAccount,
+        delegate: capabilities.targetAddress,
+        target: item.to,
+        value: item.value ?? 0n,
+        callData: (item.data || "0x") as Hex,
+        chainIdNumber,
+      }),
+    );
+
+    const params: IRelayer7710Params = {
+      chainId: chainIdNumber.toString(10),
+      transactions: [
+        {
+          permissionContext: [toRelayerJson(feeDelegation)],
+          executions: [
+            {
+              target: selected.address,
+              value: "0",
+              data: feeCalldata as HexString,
+            },
+          ],
+        },
+        ...workItems.map((item, index) => {
+          const value = item.value ?? 0n;
+          return {
+            permissionContext: [toRelayerJson(workDelegations[index])],
+            executions: [
+              {
+                target: item.to,
+                value: value === 0n ? "0" : `0x${value.toString(16)}`,
+                data: (item.data || "0x") as HexString,
+              },
+            ],
+          };
+        }),
+      ],
+    };
+
+    console.debug(
+      "[business/TransactionUtils] quotePayment unsigned estimate",
+      {
+        chainId,
+        paymentToken: selected.address,
+        workCount: workItems.length,
+      },
+    );
+
+    const estimate =
+      await this.options.relayerRepository.estimate7710Transaction(
+        chain.relayerUrl,
+        params,
+      );
+
+    if (!estimate.success || !estimate.requiredPaymentAmount) {
+      throw new Error(
+        estimate.error ?? "relayer_estimate7710Transaction failed",
+      );
+    }
+
+    const feeAtoms = tokenAmountFromAtomString(estimate.requiredPaymentAmount);
 
     return {
       tokens,
@@ -559,7 +671,7 @@ export class TransactionUtils implements ITransactionUtils {
       if (
         estimate.success &&
         estimate.requiredPaymentAmount &&
-        tokenAmountFromAtomString(estimate.requiredPaymentAmount) !== feeAtoms
+        tokenAmountFromAtomString(estimate.requiredPaymentAmount) > feeAtoms
       ) {
         feeAtoms = tokenAmountFromAtomString(estimate.requiredPaymentAmount);
         const paymentTokenMeta = capabilities.tokens.find(
@@ -604,6 +716,8 @@ export class TransactionUtils implements ITransactionUtils {
         // mint a new quote while leaving feeAtoms at required₁ — payment/context
         // mismatch under rising gas. Match the UI fee-bump path (no re-estimate).
       }
+      // If signed required ≤ quoted feeAtoms, keep the already-signed fee
+      // ExactCalldata (slight overpay is fine; no AdjustFee ceremony).
 
       if (!estimate.success) {
         throw new Error(
@@ -659,25 +773,23 @@ export class TransactionUtils implements ITransactionUtils {
         throw pollError;
       }
     } catch (error) {
-      // ensureDisplay may have left the flyout open; hideDisplay is idempotent.
-      await this.options.owsProvider.hideDisplay();
+      // Host-initiated sends collapse the flyout on failure; in-wallet flows
+      // (TransferTokensModal, cancel) keep the open display.
+      if (!retainDisplayDuringSubmit) {
+        await this.options.owsProvider.hideDisplay();
+      }
       throw error;
     }
   }
 
-  private async createAndSignExactCalldataDelegation(args: {
-    smartAccount: Awaited<ReturnType<typeof toMetaMaskSmartAccount>>;
-    delegate: EVMAccountAddress;
-    target: EVMAccountAddress;
-    value: bigint;
-    callData: Hex;
-    chainIdNumber: number;
-  }): Promise<unknown> {
+  private createExactCalldataDelegation(
+    args: ExactCalldataDelegationArgs,
+  ): ReturnType<typeof createDelegation> {
     const { smartAccount, delegate, target, value, callData } = args;
     const salt = randomSalt32();
     const selector = methodSelector(callData);
 
-    const delegation = createDelegation({
+    return createDelegation({
       to: getAddress(delegate),
       from: smartAccount.address,
       environment: smartAccount.environment,
@@ -690,6 +802,23 @@ export class TransactionUtils implements ITransactionUtils {
         valueLte: { maxValue: value },
       },
     });
+  }
+
+  private createUnsignedExactCalldataDelegation(
+    args: ExactCalldataDelegationArgs,
+  ): unknown {
+    const delegation = this.createExactCalldataDelegation(args);
+    return {
+      ...delegation,
+      signature: PLACEHOLDER_DELEGATION_SIGNATURE_65_ZERO,
+    };
+  }
+
+  private async createAndSignExactCalldataDelegation(
+    args: ExactCalldataDelegationArgs,
+  ): Promise<unknown> {
+    const { smartAccount } = args;
+    const delegation = this.createExactCalldataDelegation(args);
 
     // Callers must already have the flyout open (SignHelper.withDisplay for
     // eth_sendTransaction, plus sendViaRelayer.ensureDisplay for size). Do not
diff --git a/src/lib/implementations/data/HardcodedKnownAssetRepository.ts b/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
index d03739c..94e7bd0 100644
--- a/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
+++ b/src/lib/implementations/data/HardcodedKnownAssetRepository.ts
@@ -15,6 +15,7 @@ import { makeTrackedAssetId } from "@/lib/types/primitives";
 import {
   RELAYER_KNOWN_ASSETS,
   getCctpBridgeAsset as lookupCctpBridgeAsset,
+  getOnrampAsset as lookupOnrampAsset,
 } from "./relayerKnownAssets";
 import { HardcodedChainRepository } from "./HardcodedChainRepository";
 import { registerKnownAssetIconResolver } from "../../utils/tokenIcons";
@@ -125,6 +126,13 @@ export class HardcodedKnownAssetRepository implements IKnownAssetRepository {
     return lookupCctpBridgeAsset(chainId);
   }
 
+  async getOnrampAsset(
+    chainId: EVMChainIdType,
+    symbol?: string,
+  ): Promise<KnownAsset | null> {
+    return lookupOnrampAsset(chainId, symbol);
+  }
+
   async resolveForTracking(
     chainId: EVMChainIdType,
     address: EVMAccountAddressType,
diff --git a/src/lib/implementations/data/relayerKnownAssets.ts b/src/lib/implementations/data/relayerKnownAssets.ts
index 0d188dd..6267952 100644
--- a/src/lib/implementations/data/relayerKnownAssets.ts
+++ b/src/lib/implementations/data/relayerKnownAssets.ts
@@ -383,4 +383,21 @@ export function getCctpBridgeAsset(
   );
 }
 
+/** Circle onramp Buy asset on `chainId` (defaults to USDC). */
+export function getOnrampAsset(
+  chainId: EVMChainIdType,
+  symbol = "USDC",
+): KnownAsset | null {
+  const chainKey = String(chainId).toLowerCase();
+  const token = symbol.trim().toUpperCase();
+  return (
+    RELAYER_KNOWN_ASSETS.find(
+      (asset) =>
+        asset.canBuy &&
+        String(asset.chainId).toLowerCase() === chainKey &&
+        asset.symbol.toUpperCase() === token,
+    ) ?? null
+  );
+}
+
 registerKnownAssetIconResolver(getKnownAssetIconUrl);
diff --git a/src/lib/implementations/utils/CircleProvider.ts b/src/lib/implementations/utils/CircleProvider.ts
index 57c3194..d6c956b 100644
--- a/src/lib/implementations/utils/CircleProvider.ts
+++ b/src/lib/implementations/utils/CircleProvider.ts
@@ -1,4 +1,4 @@
-import { AppKit } from "@crcl-main/app-kit";
+import { AppKit } from "@circle-fin/app-kit";
 import type { ICircleProvider } from "../../interfaces/utils/ICircleProvider";
 import type { IConfigProvider } from "../../interfaces/utils/IConfigProvider";
 
diff --git a/src/lib/interfaces/business/IBridgeService.ts b/src/lib/interfaces/business/IBridgeService.ts
index b58472f..ca71b40 100644
--- a/src/lib/interfaces/business/IBridgeService.ts
+++ b/src/lib/interfaces/business/IBridgeService.ts
@@ -8,7 +8,7 @@ import type { ECctpTransferSpeed } from "../../types/enum/ECctpTransferSpeed";
 import type { KnownAsset } from "../../types/domain/KnownAsset";
 import type { SupportedChain } from "../../types/domain/SupportedChain";
 import type { ICctpInFlightBurn } from "../data/ICircleRepository";
-import type { IPaymentQuote } from "./ITransactionService";
+import type { IPaymentQuote, ITransactionWork } from "./ITransactionService";
 import type { TokenAmount } from "../../types/primitives";
 
 export interface ICctpQuoteParams {
@@ -35,6 +35,8 @@ export interface ICctpBridgeQuote {
   netReceivedAtoms: bigint;
   paymentQuote: IPaymentQuote;
   burnCalldata: HexString;
+  /** Approve (if needed) + burn ExactCalldata for fee estimate / submit. */
+  relayerWork: ITransactionWork[];
 }
 
 export interface ICctpBridgePayment {
diff --git a/src/lib/interfaces/business/IDelegationService.ts b/src/lib/interfaces/business/IDelegationService.ts
index de4d128..785f56e 100644
--- a/src/lib/interfaces/business/IDelegationService.ts
+++ b/src/lib/interfaces/business/IDelegationService.ts
@@ -12,6 +12,7 @@ import type { IStoredDelegation } from "../../types/domain/StoredDelegation";
 import type { DelegationId } from "../../types/primitives/DelegationId";
 import type { IRelayerSendUiCallbacks } from "../../types/domain/RelayerSendUi";
 import type { TokenAmount } from "../../types/primitives";
+import type { ITransactionWork } from "./ITransactionService";
 
 /** Phase-1 EIP-7715 permission type (ERC-20 period transfer). */
 export const ERC20_TOKEN_PERIODIC = "erc20-token-periodic" as const;
@@ -56,6 +57,12 @@ export interface ICancelDelegationParams extends IRelayerSendUiCallbacks {
   permissionContext?: HexString;
 }
 
+export type IBuildCancelWorkParams = {
+  chainId: EVMChainId;
+  stored?: IStoredDelegation;
+  permissionContext?: HexString;
+};
+
 export interface ICancelDelegationResult extends ISendTransactionResult {
   /** Set when a known vault entry was deleted after on-chain cancel. */
   deletedDelegationId?: DelegationId;
@@ -72,6 +79,9 @@ export interface IDelegationService {
     params: ICreateExecutionPermissionsParams,
   ): Promise<IStoredDelegation[]>;
 
+  /** ExactCalldata work for unsigned fee estimate before cancel confirm. */
+  buildCancelWork(params: IBuildCancelWorkParams): Promise<ITransactionWork>;
+
   cancelDelegation(
     params: ICancelDelegationParams,
   ): Promise<ICancelDelegationResult>;
diff --git a/src/lib/interfaces/business/ITransactionService.ts b/src/lib/interfaces/business/ITransactionService.ts
index 2b78ad1..f7191f4 100644
--- a/src/lib/interfaces/business/ITransactionService.ts
+++ b/src/lib/interfaces/business/ITransactionService.ts
@@ -60,11 +60,13 @@ export interface ITransactionService {
   /**
    * Prefer USDC with balance, then USDT, else first token with balance.
    * When `preferredToken` is set, use it if present in capabilities.
-   * Returns a mock fee for confirm UI; submit uses `relayer_estimate7710Transaction`.
+   * Quotes via unsigned `relayer_estimate7710Transaction` (placeholder
+   * signatures) so confirm UI shows an accurate fee before passkey sign.
    */
   quotePayment(
     chainId: EVMChainId,
     owner: EVMAccountAddress,
+    work: ITransactionWork | ITransactionWork[],
     preferredToken?: EVMAccountAddress,
   ): Promise<IPaymentQuote>;
 
diff --git a/src/lib/interfaces/business/index.ts b/src/lib/interfaces/business/index.ts
index 2aafa10..00b4f47 100644
--- a/src/lib/interfaces/business/index.ts
+++ b/src/lib/interfaces/business/index.ts
@@ -22,6 +22,7 @@ export type {
 } from "./IBitcoinService";
 export { IBitcoinServiceType } from "./IBitcoinService";
 export type {
+  IBuildCancelWorkParams,
   ICancelDelegationParams,
   ICancelDelegationResult,
   ICreateExecutionPermissionParams,
diff --git a/src/lib/interfaces/business/utils/ITransactionUtils.ts b/src/lib/interfaces/business/utils/ITransactionUtils.ts
index ccdab05..1f9f65a 100644
--- a/src/lib/interfaces/business/utils/ITransactionUtils.ts
+++ b/src/lib/interfaces/business/utils/ITransactionUtils.ts
@@ -32,11 +32,14 @@ export interface ITransactionUtils {
 
   /**
    * Prefer USDC with balance, then USDT, else first token with balance.
-   * Mock fee for confirm UI; submit uses `relayer_estimate7710Transaction`.
+   * Builds unsigned ExactCalldata fee+work delegations (placeholder
+   * signatures) and calls `relayer_estimate7710Transaction` so the confirm
+   * UI shows `requiredPaymentAmount` before any passkey ceremony.
    */
   quotePayment(
     chainId: EVMChainId,
     owner: EVMAccountAddress,
+    work: ITransactionWork | ITransactionWork[],
     preferredToken?: EVMAccountAddress,
   ): Promise<IPaymentQuote>;
 
diff --git a/src/lib/interfaces/data/IKnownAssetRepository.ts b/src/lib/interfaces/data/IKnownAssetRepository.ts
index 8f219a9..bc3f0c9 100644
--- a/src/lib/interfaces/data/IKnownAssetRepository.ts
+++ b/src/lib/interfaces/data/IKnownAssetRepository.ts
@@ -10,6 +10,12 @@ export interface IKnownAssetRepository {
   /** Native Circle USDC on `chainId` when the catalog marks `useCCTPBridge`. */
   getCctpBridgeAsset(chainId: EVMChainId): Promise<KnownAsset | null>;
 
+  /** Buyable stable on `chainId` for Circle onramp (defaults to USDC). */
+  getOnrampAsset(
+    chainId: EVMChainId,
+    symbol?: string,
+  ): Promise<KnownAsset | null>;
+
   /**
    * Catalog hit or on-chain ERC-20 probe → NewTrackedAsset.
    * Throws if the address is not a contract or not ERC-20.
diff --git a/src/lib/interfaces/utils/ICircleProvider.ts b/src/lib/interfaces/utils/ICircleProvider.ts
index a1b43cf..6fd00cf 100644
--- a/src/lib/interfaces/utils/ICircleProvider.ts
+++ b/src/lib/interfaces/utils/ICircleProvider.ts
@@ -1,4 +1,4 @@
-import type { AppKit } from "@crcl-main/app-kit";
+import type { AppKit } from "@circle-fin/app-kit";
 
 /**
  * Utility-level Circle AppKit lifecycle. Lazily constructs a single AppKit and
diff --git a/src/lib/types/domain/RelayerSendUi.ts b/src/lib/types/domain/RelayerSendUi.ts
index ea2e5d2..240e7e1 100644
--- a/src/lib/types/domain/RelayerSendUi.ts
+++ b/src/lib/types/domain/RelayerSendUi.ts
@@ -17,6 +17,10 @@ export type IRelayerSendUiCallbacks = {
   onFinalFeeRequired?: (fee: IFinalRelayerFee) => Promise<void>;
   /** After passkey ceremonies, before relayer submit/poll. */
   onAwaitingConfirmation?: () => void;
-  /** Keep the flyout open through submit/poll (in-wallet cancel flows). */
+  /**
+   * Keep the flyout open through submit/poll and on error.
+   * Use for in-wallet flows (TransferTokensModal, cancel); omit for host
+   * eth_sendTransaction so the wallet collapses after the last passkey.
+   */
   retainDisplayDuringSubmit?: boolean;
 };
diff --git a/src/lib/utils/delegationDisplay.ts b/src/lib/utils/delegationDisplay.ts
new file mode 100644
index 0000000..4184dcb
--- /dev/null
+++ b/src/lib/utils/delegationDisplay.ts
@@ -0,0 +1,246 @@
+import type { IExecutionPermissionRule } from "@1shotapi/ows-types";
+import { hexToBigInt, parseUnits } from "viem";
+
+const SECONDS_PER_HOUR = 3600;
+const SECONDS_PER_DAY = 86_400;
+const SECONDS_PER_WEEK = 604_800;
+
+/** Human-readable reset cadence for periodic permissions. */
+export function humanizePeriodDuration(seconds: number): string {
+  if (!Number.isFinite(seconds) || seconds < 1 || !Number.isInteger(seconds)) {
+    return "—";
+  }
+  if (seconds === SECONDS_PER_DAY) return "Daily";
+  if (seconds === SECONDS_PER_WEEK) return "Weekly";
+  if (seconds % SECONDS_PER_DAY === 0) {
+    const days = seconds / SECONDS_PER_DAY;
+    return days === 1 ? "Every day" : `Every ${days} days`;
+  }
+  if (seconds % SECONDS_PER_HOUR === 0) {
+    const hours = seconds / SECONDS_PER_HOUR;
+    return hours === 1 ? "Every hour" : `Every ${hours} hours`;
+  }
+  return `Every ${seconds} seconds`;
+}
+
+/** Summary amount for grant UI; null when input is empty or invalid. */
+export function formatPermissionAmount(
+  amountText: string,
+  symbol: string,
+  decimals: number,
+): string | null {
+  const trimmed = amountText.trim();
+  if (!trimmed) return null;
+  try {
+    const parsed = parseUnits(trimmed, decimals);
+    if (parsed <= 0n) return null;
+    return `${trimmed} ${symbol}`;
+  } catch {
+    return null;
+  }
+}
+
+export function parsePeriodDurationSeconds(durationText: string): number | null {
+  const trimmed = durationText.trim();
+  if (!trimmed) return null;
+  const n = Number(trimmed);
+  if (!Number.isFinite(n) || n < 1 || !Number.isInteger(n)) {
+    return null;
+  }
+  return n;
+}
+
+function parseUnixSeconds(unix: string | number | undefined): number | null {
+  if (unix === undefined || unix === null) return null;
+  const trimmed = String(unix).trim();
+  if (!trimmed) return null;
+  const n = Number(trimmed);
+  if (!Number.isFinite(n) || n < 0 || !Number.isInteger(n)) return null;
+  return n;
+}
+
+/** Locale date/time for optional permission start (Unix seconds). */
+export function formatUnixSecondsLabel(
+  unix: string | number | undefined,
+  locale?: string,
+): string | null {
+  const seconds = parseUnixSeconds(unix);
+  if (seconds === null) return null;
+  const date = new Date(seconds * 1000);
+  if (Number.isNaN(date.getTime())) return null;
+  return date.toLocaleString(locale, {
+    dateStyle: "short",
+    timeStyle: "short",
+  });
+}
+
+/** Value for `<input type="datetime-local">` from Unix seconds (local timezone). */
+export function unixSecondsToDatetimeLocalInput(
+  unix: string | number | undefined,
+): string {
+  const seconds = parseUnixSeconds(unix);
+  if (seconds === null) return "";
+  const date = new Date(seconds * 1000);
+  if (Number.isNaN(date.getTime())) return "";
+  date.setSeconds(0, 0);
+  const pad = (part: number) => String(part).padStart(2, "0");
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}T${pad(date.getHours())}:${pad(date.getMinutes())}`;
+}
+
+/** Parse `datetime-local` input to Unix seconds, or null if empty/invalid. */
+export function datetimeLocalInputToUnixSeconds(value: string): number | null {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  const ms = Date.parse(trimmed);
+  if (Number.isNaN(ms)) return null;
+  return Math.floor(ms / 1000);
+}
+
+const PERMISSION_END_DATA_KEYS = [
+  "endDate",
+  "endTime",
+  "expiry",
+  "expiresAt",
+  "expiration",
+] as const;
+
+const EXPIRY_RULE_DATA_KEYS = [
+  "expiry",
+  "expiresAt",
+  "expiration",
+  "timestamp",
+  "end",
+] as const;
+
+const LIFETIME_DATA_KEYS = [
+  "lifetimeSeconds",
+  "lifetime",
+  "permissionDuration",
+  "totalDuration",
+] as const;
+
+function readUnixSecondsField(
+  record: Record<string, unknown>,
+  keys: readonly string[],
+): number | null {
+  for (const key of keys) {
+    const n = parseUnixSeconds(record[key] as string | number | undefined);
+    if (n !== null) return n;
+  }
+  return null;
+}
+
+/**
+ * Unix seconds when the permission ends, if the host specified a finite lifetime
+ * (EIP-7715 `expiry` rule and/or explicit end / start + lifetime on permission data).
+ */
+export function resolvePermissionEndUnixSeconds(args: {
+  rules?: readonly IExecutionPermissionRule[];
+  permissionData?: Record<string, unknown>;
+}): number | null {
+  const { rules, permissionData } = args;
+
+  if (permissionData) {
+    const direct = readUnixSecondsField(
+      permissionData,
+      PERMISSION_END_DATA_KEYS,
+    );
+    if (direct !== null) return direct;
+
+    const start = readUnixSecondsField(permissionData, ["startDate", "start"]);
+    const lifetimeRaw = LIFETIME_DATA_KEYS.map((k) => permissionData[k]).find(
+      (v) => typeof v === "number" || typeof v === "string",
+    );
+    if (start !== null && lifetimeRaw !== undefined) {
+      const lifetime = Number(lifetimeRaw);
+      if (
+        Number.isFinite(lifetime) &&
+        lifetime > 0 &&
+        Number.isInteger(lifetime)
+      ) {
+        return start + lifetime;
+      }
+    }
+  }
+
+  if (rules) {
+    for (const rule of rules) {
+      if (rule.type !== "expiry") continue;
+      const fromRule = readUnixSecondsField(rule.data, EXPIRY_RULE_DATA_KEYS);
+      if (fromRule !== null) return fromRule;
+    }
+  }
+
+  return null;
+}
+
+/** Host memo or justification from permission `data` (vault memo on grant). */
+export function readHostMemoOrJustification(
+  data: Record<string, unknown>,
+): string {
+  const memo = data.memo;
+  if (typeof memo === "string" && memo.trim()) {
+    return memo.trim();
+  }
+  const justification = data.justification;
+  if (typeof justification === "string" && justification.trim()) {
+    return justification.trim();
+  }
+  return "";
+}
+
+/** `periodAmount` / `amount` from permission data as wei atoms, or null. */
+export function readPermissionAmountAtoms(
+  data: Record<string, unknown>,
+): bigint | null {
+  const raw = data.periodAmount ?? data.amount;
+  if (raw === undefined || raw === null) return null;
+  try {
+    if (typeof raw === "bigint") return raw;
+    if (typeof raw === "number") return BigInt(raw);
+    if (typeof raw === "string") {
+      const trimmed = raw.trim();
+      if (trimmed.startsWith("0x") || trimmed.startsWith("0X")) {
+        return hexToBigInt(trimmed as `0x${string}`);
+      }
+      return BigInt(trimmed);
+    }
+  } catch {
+    return null;
+  }
+  return null;
+}
+
+export function readPermissionPeriodDurationText(
+  data: Record<string, unknown>,
+): string {
+  const raw = data.periodDuration ?? data.period ?? data.duration;
+  if (typeof raw === "number" || typeof raw === "string") {
+    return String(raw);
+  }
+  return "";
+}
+
+export function readPermissionStartText(data: Record<string, unknown>): string {
+  const raw = data.startDate ?? data.start;
+  if (typeof raw === "number" || typeof raw === "string") {
+    return String(raw);
+  }
+  return "";
+}
+
+/** Human-readable max slippage from basis points (e.g. 50 → "0.5%"). */
+export function formatSlippageBpsLabel(bps: number): string | null {
+  if (!Number.isFinite(bps) || bps < 0 || bps >= 10_000 || !Number.isInteger(bps)) {
+    return null;
+  }
+  const pct = bps / 100;
+  const formatted =
+    pct % 1 === 0 ? String(pct) : pct.toFixed(2).replace(/\.?0+$/, "");
+  return `${formatted}%`;
+}
+
+export function truncateMiddle(value: string, head = 10, tail = 8): string {
+  if (value.length <= head + tail + 1) return value;
+  return `${value.slice(0, head)}…${value.slice(-tail)}`;
+}
diff --git a/src/lib/utils/eip712Display.ts b/src/lib/utils/eip712Display.ts
new file mode 100644
index 0000000..d84c33a
--- /dev/null
+++ b/src/lib/utils/eip712Display.ts
@@ -0,0 +1,117 @@
+const EVM_ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
+
+/** Present EIP-712 field keys for consent UI labels. */
+export function humanizeEip712Key(key: string): string {
+  const trimmed = key.trim();
+  if (!trimmed) {
+    return "";
+  }
+  const withSpaces = trimmed
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .replace(/_/g, " ")
+    .toLowerCase();
+  return withSpaces.charAt(0).toUpperCase() + withSpaces.slice(1);
+}
+
+export function isEvmAddressString(value: string): boolean {
+  return EVM_ADDRESS_RE.test(value.trim());
+}
+
+export function formatEip712Primitive(value: unknown): string {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+  if (typeof value === "boolean") {
+    return value ? "true" : "false";
+  }
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? String(value) : "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+
+export function isEip712NestedValue(value: unknown): value is object {
+  return value !== null && typeof value === "object";
+}
+
+/** Read `chainId` from an EIP-712 domain object for network resolution. */
+export function readDomainChainId(domain: unknown): string | null {
+  if (!domain || typeof domain !== "object") {
+    return null;
+  }
+  const raw = (domain as Record<string, unknown>).chainId;
+  if (raw === null || raw === undefined) {
+    return null;
+  }
+  if (typeof raw === "bigint") {
+    return raw.toString();
+  }
+  if (typeof raw === "number" && Number.isFinite(raw)) {
+    return String(raw);
+  }
+  if (typeof raw === "string" && raw.trim()) {
+    return raw.trim();
+  }
+  return null;
+}
+
+export type IEip712DomainField = {
+  key: string;
+  value: unknown;
+};
+
+/** Domain rows in stable EIP-712 order; omits empty values and `chainId` (shown via network row). */
+export function domainFieldEntries(domain: unknown): IEip712DomainField[] {
+  if (!domain || typeof domain !== "object") {
+    return [];
+  }
+  const record = domain as Record<string, unknown>;
+  const order = ["name", "version", "verifyingContract", "salt"] as const;
+  const entries: IEip712DomainField[] = [];
+  for (const key of order) {
+    if (!(key in record)) {
+      continue;
+    }
+    const value = record[key];
+    if (value === null || value === undefined) {
+      continue;
+    }
+    if (typeof value === "string" && !value.trim()) {
+      continue;
+    }
+    entries.push({ key, value });
+  }
+  for (const key of Object.keys(record)) {
+    if (key === "chainId" || order.includes(key as (typeof order)[number])) {
+      continue;
+    }
+    const value = record[key];
+    if (value === null || value === undefined) {
+      continue;
+    }
+    entries.push({ key, value });
+  }
+  return entries;
+}
+
+export function readVerifyingContract(domain: unknown): string | null {
+  if (!domain || typeof domain !== "object") {
+    return null;
+  }
+  const raw = (domain as Record<string, unknown>).verifyingContract;
+  if (typeof raw !== "string") {
+    return null;
+  }
+  const trimmed = raw.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
diff --git a/src/lib/utils/identityDisplay.ts b/src/lib/utils/identityDisplay.ts
new file mode 100644
index 0000000..589c7da
--- /dev/null
+++ b/src/lib/utils/identityDisplay.ts
@@ -0,0 +1,10 @@
+/** Middle-truncated address for compact rows (full value stays in `title`). */
+export function truncateAddress(address: string): string {
+  if (address.length <= 13) return address;
+  return `${address.slice(0, 6)}…${address.slice(-4)}`;
+}
+
+/** Favicon for a requesting host domain; loaded through `SafeAssetImage`. */
+export function faviconUrl(domain: string): string {
+  return `https://www.google.com/s2/favicons?domain=${encodeURIComponent(domain)}&sz=64`;
+}
diff --git a/src/lib/utils/siweDisplay.ts b/src/lib/utils/siweDisplay.ts
new file mode 100644
index 0000000..2bd775d
--- /dev/null
+++ b/src/lib/utils/siweDisplay.ts
@@ -0,0 +1,47 @@
+import { EVMChainId } from "@1shotapi/ows-types";
+
+/** Lowercase host for SIWE origin comparison (strips port). */
+export function normalizeSiweHost(value: string): string {
+  const trimmed = value.trim().toLowerCase();
+  if (!trimmed) {
+    return "";
+  }
+  try {
+    const withScheme = trimmed.includes("://") ? trimmed : `https://${trimmed}`;
+    const url = new URL(withScheme);
+    return url.hostname.toLowerCase();
+  } catch {
+    const withoutPort = trimmed.split(":")[0] ?? trimmed;
+    return withoutPort.replace(/^\[/, "").replace(/\]$/, "");
+  }
+}
+
+/** True when the SIWE URI points at the same host as `domain` (path/query ignored). */
+export function isSiweUriRedundant(uri: string, domain: string): boolean {
+  const uriHost = normalizeSiweHost(uri);
+  const domainHost = normalizeSiweHost(domain);
+  if (!uriHost || !domainHost) {
+    return false;
+  }
+  return uriHost === domainHost;
+}
+
+/** Parse decimal or hex chain id from EIP-4361 fields into `EVMChainId`, or null. */
+export function resolveSiweEvmChainId(chainIdRaw: string): EVMChainId | null {
+  const trimmed = chainIdRaw.trim();
+  if (!trimmed) {
+    return null;
+  }
+  let decimal: number;
+  if (/^0x[0-9a-fA-F]+$/i.test(trimmed)) {
+    decimal = Number(BigInt(trimmed));
+  } else if (/^\d+$/.test(trimmed)) {
+    decimal = Number(trimmed);
+  } else {
+    return null;
+  }
+  if (!Number.isFinite(decimal) || decimal < 0) {
+    return null;
+  }
+  return EVMChainId(`0x${decimal.toString(16)}` as `0x${string}`);
+}
diff --git a/src/style/applyStyle.ts b/src/style/applyStyle.ts
index 4b5b1cd..15728e4 100644
--- a/src/style/applyStyle.ts
+++ b/src/style/applyStyle.ts
@@ -50,6 +50,10 @@ export function mergeStyle(
         ...current.copy.confirmTransfer,
         ...patch.copy?.confirmTransfer,
       },
+      onramp: {
+        ...current.copy.onramp,
+        ...patch.copy?.onramp,
+      },
       transferTokens: {
         ...current.copy.transferTokens,
         ...patch.copy?.transferTokens,
@@ -217,6 +221,7 @@ function cloneDefaultStyle(): IResolvedStyle {
       typedData: { ...DEFAULT_STYLE.copy.typedData },
       sendTransaction: { ...DEFAULT_STYLE.copy.sendTransaction },
       confirmTransfer: { ...DEFAULT_STYLE.copy.confirmTransfer },
+      onramp: { ...DEFAULT_STYLE.copy.onramp },
       transferTokens: { ...DEFAULT_STYLE.copy.transferTokens },
       sendNativeToken: { ...DEFAULT_STYLE.copy.sendNativeToken },
       cctpBridge: { ...DEFAULT_STYLE.copy.cctpBridge },
diff --git a/src/style/configureSchemas.ts b/src/style/configureSchemas.ts
index ce964f8..4dd4177 100644
--- a/src/style/configureSchemas.ts
+++ b/src/style/configureSchemas.ts
@@ -75,13 +75,16 @@ export const styleCopyPersonalSignSchema = z.strictObject({
 export const styleCopySiweSchema = z.strictObject({
   title: z.string(),
   body: z.string(),
-  estimatedChangesLabel: z.string(),
-  noChangesLabel: z.string(),
   networkLabel: z.string(),
-  requestFromLabel: z.string(),
   signingInWithLabel: z.string(),
   messageLabel: z.string(),
   uriLabel: z.string(),
+  versionLabel: z.string(),
+  nonceLabel: z.string(),
+  issuedAtLabel: z.string(),
+  expirationTimeLabel: z.string(),
+  notBeforeLabel: z.string(),
+  resourcesLabel: z.string(),
   rejectLabel: z.string(),
   signLabel: z.string(),
   signingHint: z.string(),
@@ -89,12 +92,16 @@ export const styleCopySiweSchema = z.strictObject({
 
 export const styleCopyTypedDataSchema = z.strictObject({
   title: z.string(),
+  body: z.string(),
+  networkLabel: z.string(),
+  requestFromLabel: z.string(),
   accountLabel: z.string(),
+  interactingWithLabel: z.string(),
   primaryTypeLabel: z.string(),
-  domainLabel: z.string(),
-  messageLabel: z.string(),
+  messageSectionLabel: z.string(),
   rejectLabel: z.string(),
   signLabel: z.string(),
+  signingHint: z.string(),
 });
 
 export const styleCopySendTransactionSchema = z.strictObject({
@@ -120,6 +127,19 @@ export const styleCopyConfirmTransferSchema = z.strictObject({
   confirmLabel: z.string(),
 });
 
+export const styleCopyOnrampSchema = z.strictObject({
+  title: z.string(),
+  body: z.string(),
+  destinationLabel: z.string(),
+  closeLabel: z.string(),
+  openLabel: z.string(),
+  reopenLabel: z.string(),
+  loadingLabel: z.string(),
+  preparingLabel: z.string(),
+  popupReadyBody: z.string(),
+  popupOpenedBody: z.string(),
+});
+
 export const styleCopyTransferTokensSchema = z.strictObject({
   title: z.string(),
   body: z.string(),
@@ -213,6 +233,12 @@ export const styleCopyCctpBridgeSchema = z.strictObject({
 export const styleCopyGrantExecutionPermissionSchema = z.strictObject({
   title: z.string(),
   body: z.string(),
+  permissionKindLabel: z.string(),
+  amountLabel: z.string(),
+  transferWindowLabel: z.string(),
+  justificationLabel: z.string(),
+  viewOnExplorerLabel: z.string(),
+  advancedLabel: z.string(),
   hostLabel: z.string(),
   toLabel: z.string(),
   chainLabel: z.string(),
@@ -224,6 +250,7 @@ export const styleCopyGrantExecutionPermissionSchema = z.strictObject({
   periodDurationPlaceholder: z.string(),
   periodDurationHint: z.string(),
   startLabel: z.string(),
+  endLabel: z.string(),
   memoLabel: z.string(),
   memoPlaceholder: z.string(),
   invalidAmountError: z.string(),
@@ -237,6 +264,11 @@ export const styleCopyGrantLiFiSwapPermissionSchema = z.strictObject({
   title: z.string(),
   body: z.string(),
   quoteNote: z.string(),
+  permissionKindLabel: z.string(),
+  amountLabel: z.string(),
+  transferWindowLabel: z.string(),
+  endLabel: z.string(),
+  viewOnExplorerLabel: z.string(),
   hostLabel: z.string(),
   toLabel: z.string(),
   chainLabel: z.string(),
@@ -269,6 +301,8 @@ export const styleCopyGrantLiFiApprovePermissionSchema = z.strictObject({
   title: z.string(),
   body: z.string(),
   warning: z.string(),
+  permissionKindLabel: z.string(),
+  viewOnExplorerLabel: z.string(),
   hostLabel: z.string(),
   toLabel: z.string(),
   chainLabel: z.string(),
@@ -485,6 +519,7 @@ export const styleCopyResolvedSchema = z.strictObject({
   typedData: styleCopyTypedDataSchema,
   sendTransaction: styleCopySendTransactionSchema,
   confirmTransfer: styleCopyConfirmTransferSchema,
+  onramp: styleCopyOnrampSchema,
   transferTokens: styleCopyTransferTokensSchema,
   sendNativeToken: styleCopySendNativeTokenSchema,
   cctpBridge: styleCopyCctpBridgeSchema,
@@ -532,6 +567,7 @@ export const styleCopyPatchSchema = z.strictObject({
   typedData: styleCopyTypedDataSchema.partial().optional(),
   sendTransaction: styleCopySendTransactionSchema.partial().optional(),
   confirmTransfer: styleCopyConfirmTransferSchema.partial().optional(),
+  onramp: styleCopyOnrampSchema.partial().optional(),
   transferTokens: styleCopyTransferTokensSchema.partial().optional(),
   sendNativeToken: styleCopySendNativeTokenSchema.partial().optional(),
   cctpBridge: styleCopyCctpBridgeSchema.partial().optional(),
@@ -594,6 +630,7 @@ export type IStyleCopySendTransaction = z.infer<
 export type IStyleCopyConfirmTransfer = z.infer<
   typeof styleCopyConfirmTransferSchema
 >;
+export type IStyleCopyOnramp = z.infer<typeof styleCopyOnrampSchema>;
 export type IStyleCopyTransferTokens = z.infer<
   typeof styleCopyTransferTokensSchema
 >;
diff --git a/src/style/defaults.ts b/src/style/defaults.ts
index cf24893..ea57f9c 100644
--- a/src/style/defaults.ts
+++ b/src/style/defaults.ts
@@ -77,26 +77,33 @@ export const DEFAULT_STYLE: IResolvedStyle = {
     },
     siwe: {
       title: "Sign-in request",
-      body: "A site wants you to sign in by proving you own this account. This will not spend tokens or change on-chain balances.",
-      estimatedChangesLabel: "Estimated changes",
-      noChangesLabel: "No changes",
+      body: "{domain} is requesting to sign in with your Ethereum account. This will not spend tokens or change on-chain balances.",
       networkLabel: "Network",
-      requestFromLabel: "Request from",
       signingInWithLabel: "Signing in with",
       messageLabel: "Message",
       uriLabel: "URI",
+      versionLabel: "Version",
+      nonceLabel: "Nonce",
+      issuedAtLabel: "Issued at",
+      expirationTimeLabel: "Expiration time",
+      notBeforeLabel: "Not before",
+      resourcesLabel: "Resources",
       rejectLabel: "Cancel",
-      signLabel: "Confirm",
+      signLabel: "Sign in",
       signingHint: "Confirm in the signing panel…",
     },
     typedData: {
-      title: "Sign typed data",
+      title: "Signature request",
+      body: "Review request details before you confirm.",
+      networkLabel: "Network",
+      requestFromLabel: "Request from",
       accountLabel: "Account",
+      interactingWithLabel: "Interacting with",
       primaryTypeLabel: "Primary type",
-      domainLabel: "Domain",
-      messageLabel: "Message",
+      messageSectionLabel: "Message",
       rejectLabel: "Reject",
       signLabel: "Sign",
+      signingHint: "Confirm in the signing panel…",
     },
     sendTransaction: {
       title: "Send transaction",
@@ -119,6 +126,20 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       rejectLabel: "Reject",
       confirmLabel: "Confirm",
     },
+    onramp: {
+      title: "Onramp with Circle",
+      body: "Purchase {token} on {network} with Circle Onramp. Pay with card or bank transfer—you receive {token} 1-to-1.",
+      destinationLabel: "To",
+      closeLabel: "Close",
+      openLabel: "Start now",
+      reopenLabel: "Reopen onramp",
+      loadingLabel: "Loading onramp…",
+      preparingLabel: "Preparing onramp…",
+      popupReadyBody:
+        "Tap Start now to continue in a new window. Your browser may block the window if you wait too long after this screen appears.",
+      popupOpenedBody:
+        "Complete your purchase in the Circle window, then close this screen.",
+    },
     transferTokens: {
       title: "Send",
       body: "Enter the recipient and amount to send.",
@@ -209,10 +230,16 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       doneLabel: "Done",
     },
     grantExecutionPermission: {
-      title: "Grant spending permission",
+      title: "Permission Request",
       body: "{domain} wants a periodic ERC-20 spending permission for {to} on {chainName}.",
+      permissionKindLabel: "Periodic Spending Permission",
+      amountLabel: "Periodic Budget",
+      transferWindowLabel: "Budget Refresh Period",
+      justificationLabel: "Justification",
+      viewOnExplorerLabel: "View on explorer",
+      advancedLabel: "Advanced",
       hostLabel: "App",
-      toLabel: "Delegate",
+      toLabel: "Delegate Account",
       chainLabel: "Network",
       permissionTypeLabel: "Permission",
       tokenLabel: "Token",
@@ -221,7 +248,8 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       periodDurationLabel: "Period duration (seconds)",
       periodDurationPlaceholder: "86400",
       periodDurationHint: "How often the allowance resets (e.g. 86400 = 1 day).",
-      startLabel: "Start (Unix seconds, optional)",
+      startLabel: "Start Time",
+      endLabel: "End Time",
       memoLabel: "Memo",
       memoPlaceholder: "Note for your records",
       invalidAmountError: "Enter a valid period amount.",
@@ -231,12 +259,17 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       grantLabel: "Grant",
     },
     grantLiFiSwapPermission: {
-      title: "Grant LiFi swap permission",
+      title: "Permission Request",
       body: "{domain} wants a periodic LiFi swap permission for {to} on {chainName}.",
       quoteNote:
         "Each swap still requires a signed quote from the quote signer within these terms.",
+      permissionKindLabel: "Periodic Swap Permission",
+      amountLabel: "Periodic Budget",
+      transferWindowLabel: "Budget Refresh Period",
+      endLabel: "End Time",
+      viewOnExplorerLabel: "View on explorer",
       hostLabel: "App",
-      toLabel: "Delegate",
+      toLabel: "Delegate Account",
       chainLabel: "Network",
       permissionTypeLabel: "Permission",
       tokenLabel: "Input token",
@@ -245,8 +278,8 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       periodDurationLabel: "Period duration (seconds)",
       periodDurationPlaceholder: "86400",
       periodDurationHint: "How often the input budget resets (e.g. 86400 = 1 day).",
-      startLabel: "Start (Unix seconds, optional)",
-      slippageLabel: "Max slippage (bps)",
+      startLabel: "Start Time",
+      slippageLabel: "Max slippage",
       slippageHint: "Basis points; 50 = 0.5%. Must be less than 10000.",
       lifiDiamondLabel: "Via LiFi Diamond",
       quoteSignerLabel: "Quotes signed by",
@@ -263,12 +296,14 @@ export const DEFAULT_STYLE: IResolvedStyle = {
       grantLabel: "Grant",
     },
     grantLiFiApprovePermission: {
-      title: "Grant LiFi approve permission",
+      title: "Permission Request",
       body: "{domain} wants permission for {to} to approve the LiFi Diamond to spend a token on {chainName}.",
       warning:
         "This lets the delegate call approve for the spender. The approved amount is not capped by this permission.",
+      permissionKindLabel: "Swap Token Approval",
+      viewOnExplorerLabel: "View on explorer",
       hostLabel: "App",
-      toLabel: "Delegate",
+      toLabel: "Delegate Account",
       chainLabel: "Network",
       permissionTypeLabel: "Permission",
       tokenLabel: "Token",
diff --git a/src/style/index.ts b/src/style/index.ts
index d6b973f..2e90679 100644
--- a/src/style/index.ts
+++ b/src/style/index.ts
@@ -13,6 +13,7 @@ export type {
   IStyleCopyTypedData,
   IStyleCopySendTransaction,
   IStyleCopyConfirmTransfer,
+  IStyleCopyOnramp,
   IStyleCopyTransferTokens,
   IStyleCopySendNativeToken,
   IStyleCopyCctpBridge,
diff --git a/src/style/types.ts b/src/style/types.ts
index 3cfd367..b89484e 100644
--- a/src/style/types.ts
+++ b/src/style/types.ts
@@ -17,6 +17,7 @@ export type {
   IStyleCopyTypedData,
   IStyleCopySendTransaction,
   IStyleCopyConfirmTransfer,
+  IStyleCopyOnramp,
   IStyleCopyTransferTokens,
   IStyleCopySendNativeToken,
   IStyleCopyCctpBridge,
diff --git a/src/wallet/WalletProvider.tsx b/src/wallet/WalletProvider.tsx
index 32baa10..7bdd806 100644
--- a/src/wallet/WalletProvider.tsx
+++ b/src/wallet/WalletProvider.tsx
@@ -572,7 +572,12 @@ export function WalletProvider({ children }: { children: ReactNode }) {
           const result = await transactionService.sendTransaction(
             chainId,
             { to, data, value },
-            payment,
+            {
+              ...payment,
+              // Flyout is already open for in-wallet Send — do not requestHide
+              // after passkey (host eth_sendTransaction defaults to hide).
+              retainDisplayDuringSubmit: true,
+            },
           );
           await onSigningAuthenticated();
           return result.transactionHash;
@@ -695,6 +700,10 @@ export function WalletProvider({ children }: { children: ReactNode }) {
       if (!owner) {
         throw new Error("Wallet address is required to cancel a permission");
       }
+      const cancelWork = await delegationService.buildCancelWork({
+        chainId: stored.chainId,
+        stored,
+      });
       const transactionHash = await pushModal<EVMTransactionHash>(
         ({ id, resolve, reject }) => ({
           id,
@@ -704,6 +713,7 @@ export function WalletProvider({ children }: { children: ReactNode }) {
             chainName: chain.label,
             chainId: stored.chainId,
             ownerAddress: owner,
+            work: cancelWork,
           },
           execute: async (payment: IRelayerConfirmSendResult, ui) => {
             const result = await delegationService.cancelDelegation({
diff --git a/src/wallet/modalTypes.ts b/src/wallet/modalTypes.ts
index 00660b4..36e93a4 100644
--- a/src/wallet/modalTypes.ts
+++ b/src/wallet/modalTypes.ts
@@ -22,6 +22,7 @@ import type {
 } from "../circle/cctpBridgeTypes";
 import type { TokenAmount } from "../lib/types/primitives";
 import type { IRelayerSendUiCallbacks } from "../lib/types/domain/RelayerSendUi";
+import type { ITransactionWork } from "../lib/interfaces/business/ITransactionService";
 
 export type WalletSetupChoice = "login" | "create" | "import" | "cancel";
 
@@ -37,6 +38,8 @@ export interface IConfirmTransferRequest {
   chainId: EVMChainId;
   ownerAddress: EVMAccountAddress;
   useRelayer: boolean;
+  /** ExactCalldata work for unsigned fee estimate (host send payload). */
+  work: ITransactionWork;
 }
 
 /** Relayer payment selection from TX confirm UI (before execute). */
@@ -55,15 +58,22 @@ export type IRelayerConfirmSendResult = {
 /** Result from TX confirm when canceling or selecting payment (legacy shape). */
 export type IConfirmSendResult = false | IConfirmSendPayment;
 
-/** Host EIP-7715 grant consent — attenuated permission + memo for vault. */
-export interface IGrantExecutionPermissionRequest {
+export type GrantPermissionModalKind =
+  | "grantExecutionPermission"
+  | "grantLiFiSwapPermission"
+  | "grantLiFiApprovePermission";
+
+/** One permission in a grant consent batch. */
+export interface IGrantExecutionPermissionsBatchItem {
   request: IExecutionPermissionRequest;
-  domain: string;
   chainName: string;
-  /** 0-based index within the current `wallet_requestExecutionPermissions` batch. */
-  batchIndex: number;
-  /** Total permissions in the batch (always ≥ 1). */
-  batchCount: number;
+  grantKind: GrantPermissionModalKind;
+}
+
+/** Host EIP-7715 grant consent — single or compound permission requests. */
+export interface IGrantExecutionPermissionsBatchRequest {
+  domain: string;
+  items: IGrantExecutionPermissionsBatchItem[];
 }
 
 export type IGrantExecutionPermissionResult = {
@@ -77,6 +87,8 @@ export interface ICancelDelegationConfirmRequest {
   chainName: string;
   chainId: EVMChainId;
   ownerAddress: EVMAccountAddress;
+  /** ExactCalldata work for unsigned fee estimate. */
+  work: ITransactionWork;
 }
 
 export type ModalRequest =
@@ -160,23 +172,9 @@ export type ModalRequest =
     }
   | {
       id: string;
-      kind: "grantExecutionPermission";
-      request: IGrantExecutionPermissionRequest;
-      resolve: (result: IGrantExecutionPermissionResult) => void;
-      reject: (error: unknown) => void;
-    }
-  | {
-      id: string;
-      kind: "grantLiFiSwapPermission";
-      request: IGrantExecutionPermissionRequest;
-      resolve: (result: IGrantExecutionPermissionResult) => void;
-      reject: (error: unknown) => void;
-    }
-  | {
-      id: string;
-      kind: "grantLiFiApprovePermission";
-      request: IGrantExecutionPermissionRequest;
-      resolve: (result: IGrantExecutionPermissionResult) => void;
+      kind: "grantExecutionPermissions";
+      request: IGrantExecutionPermissionsBatchRequest;
+      resolve: (results: IGrantExecutionPermissionResult[]) => void;
       reject: (error: unknown) => void;
     }
   | {
diff --git a/src/wallet/useWalletBoot.ts b/src/wallet/useWalletBoot.ts
index c379e5c..7c88fd5 100644
--- a/src/wallet/useWalletBoot.ts
+++ b/src/wallet/useWalletBoot.ts
@@ -371,63 +371,66 @@ export function useWalletBoot({
 
                 const domain = transactionUtils.resolveHostDomain();
                 const { hostDomain } = await configProvider.getConfig();
-                const batchCount = prepared.length;
-                const approvedItems = [];
-
-                for (let batchIndex = 0; batchIndex < prepared.length; batchIndex++) {
-                  const { request, chain, grantKind } = prepared[batchIndex]!;
-                  const started = performance.now();
-                  const account = analyticsAccountAddress();
-                  try {
-                    const approved =
-                      await ask<IGrantExecutionPermissionResult>(
-                        ({ id, resolve, reject }) => ({
-                          id,
-                          kind: grantKind,
-                          request: {
+                const signStartedBatch = performance.now();
+                const account = analyticsAccountAddress();
+                let approvedResults: IGrantExecutionPermissionResult[];
+                try {
+                  approvedResults =
+                    await ask<IGrantExecutionPermissionResult[]>(
+                      ({ id, resolve, reject }) => ({
+                        id,
+                        kind: "grantExecutionPermissions",
+                        request: {
+                          domain,
+                          items: prepared.map(({ request, chain, grantKind }) => ({
                             request,
-                            domain,
                             chainName: chain.label,
-                            batchIndex,
-                            batchCount,
-                          },
-                          resolve,
-                          reject,
-                        }),
-                      );
-                    approvedItems.push({
-                      request,
-                      permission: approved.permission,
-                      memo: approved.memo,
-                    });
-                  } catch (error: unknown) {
-                    const durationMs = Math.round(performance.now() - started);
-                    if (isAnalyticsCancelled(error)) {
-                      eventBus.emitAnalytics(
-                        new DelegationCreateCancelledEvent(
-                          hostDomain,
-                          account,
-                          request.chainId,
-                          durationMs,
-                        ),
-                      );
-                    } else {
-                      eventBus.emitAnalytics(
-                        new DelegationCreateFailedEvent(
-                          hostDomain,
-                          account,
-                          request.chainId,
-                          analyticsErrorCode(error),
-                          durationMs,
-                        ),
-                      );
-                    }
-                    throw error;
+                            grantKind,
+                          })),
+                        },
+                        resolve,
+                        reject,
+                      }),
+                    );
+                } catch (error: unknown) {
+                  const durationMs = Math.round(
+                    performance.now() - signStartedBatch,
+                  );
+                  const chainId =
+                    prepared[0]?.request.chainId ?? requests[0]!.chainId;
+                  if (isAnalyticsCancelled(error)) {
+                    eventBus.emitAnalytics(
+                      new DelegationCreateCancelledEvent(
+                        hostDomain,
+                        account,
+                        chainId,
+                        durationMs,
+                      ),
+                    );
+                  } else {
+                    eventBus.emitAnalytics(
+                      new DelegationCreateFailedEvent(
+                        hostDomain,
+                        account,
+                        chainId,
+                        analyticsErrorCode(error),
+                        durationMs,
+                      ),
+                    );
                   }
+                  throw error;
                 }
 
+                const approvedItems = prepared.map((item, index) => {
+                  const approved = approvedResults[index]!;
+                  return {
+                    request: item.request,
+                    permission: approved.permission,
+                    memo: approved.memo,
+                  };
+                });
+
                 const signStarted = performance.now();
-                const account = analyticsAccountAddress();
                 try {
                   const storedList =
                     await delegationService.createExecutionPermissions({
@@ -499,6 +502,11 @@ export function useWalletBoot({
                     "Wallet address is required to cancel a permission",
                   );
                 }
+                const cancelWork = await delegationService.buildCancelWork({
+                  chainId,
+                  ...(stored ? { stored } : {}),
+                  permissionContext: params.permissionContext,
+                });
                 const domain =
                   stored?.hostDomain ??
                   transactionUtils.resolveHostDomain();
@@ -517,6 +525,7 @@ export function useWalletBoot({
                           chainName: chain.label,
                           chainId,
                           ownerAddress: owner,
+                          work: cancelWork,
                         },
                         execute: async (payment: IRelayerConfirmSendResult, ui) => {
                           const result = await delegationService.cancelDelegation({
@@ -812,6 +821,16 @@ export function useWalletBoot({
               };
 
               let hash: EVMTransactionHash;
+              const valueRaw = String(request.value);
+              const workValue =
+                valueRaw && valueRaw !== "0x0" && valueRaw !== "0x"
+                  ? BigInt(valueRaw)
+                  : undefined;
+              const sendWork = {
+                to: request.to!,
+                data: request.data,
+                value: workValue,
+              };
               if (transfer) {
                 const known = await knownAssetRepository.getKnownAsset(
                   request.chainId,
@@ -849,6 +868,7 @@ export function useWalletBoot({
                       chainId: request.chainId,
                       ownerAddress: request.address,
                       useRelayer,
+                      work: sendWork,
                     },
                     execute: executeSend,
                     resolve,
diff --git a/test/lib/utils/LiFiUtils.test.ts b/test/lib/utils/LiFiUtils.test.ts
new file mode 100644
index 0000000..796f1e0
--- /dev/null
+++ b/test/lib/utils/LiFiUtils.test.ts
@@ -0,0 +1,55 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  LiFiUtils,
+  LIFI_SWAP_ENFORCER_PROXY,
+} from "@/lib/implementations/business/utils/LiFiUtils.ts";
+import { EChain } from "@/lib/types/enum/EChain.ts";
+
+describe("LiFiUtils.resolveSwapEnforcer", () => {
+  const utils = new LiFiUtils();
+
+  it("returns v3 proxy on Arc, Base, and Ethereum", () => {
+    for (const chainId of [EChain.Arc, EChain.Base, EChain.Ethereum]) {
+      assert.equal(utils.resolveSwapEnforcer(chainId), LIFI_SWAP_ENFORCER_PROXY);
+    }
+  });
+
+  it("matches chain id case-insensitively", () => {
+    assert.equal(
+      utils.resolveSwapEnforcer("0x2105"),
+      LIFI_SWAP_ENFORCER_PROXY,
+    );
+    assert.equal(
+      utils.resolveSwapEnforcer("0X2105"),
+      LIFI_SWAP_ENFORCER_PROXY,
+    );
+  });
+
+  it("returns null for unsupported chains", () => {
+    assert.equal(utils.resolveSwapEnforcer(EChain.Polygon), null);
+    assert.equal(utils.resolveSwapEnforcer("0x89"), null);
+  });
+});
+
+describe("LiFiUtils.encodeTerms", () => {
+  const utils = new LiFiUtils();
+
+  it("packs 284-byte terms", () => {
+    const encoded = utils.encodeTerms({
+      lifiDiamond: "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
+      inputToken: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+      outputAssetId:
+        "0x0000000000000000000000000000000000000000000000000000000000000002",
+      outputRecipient:
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+      destinationChainId: 8453n,
+      quoteSigner: "0x0000000000000000000000000000000000000001",
+      periodAmount: 1_000_000n,
+      periodDuration: 86_400n,
+      startDate: 1_700_000_000n,
+      slippageBps: 50n,
+    });
+    assert.equal((encoded.length - 2) / 2, 284);
+  });
+});
diff --git a/test/lib/utils/delegationDisplay.test.ts b/test/lib/utils/delegationDisplay.test.ts
new file mode 100644
index 0000000..f5e8ce1
--- /dev/null
+++ b/test/lib/utils/delegationDisplay.test.ts
@@ -0,0 +1,98 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  datetimeLocalInputToUnixSeconds,
+  formatPermissionAmount,
+  formatSlippageBpsLabel,
+  formatUnixSecondsLabel,
+  humanizePeriodDuration,
+  parsePeriodDurationSeconds,
+  resolvePermissionEndUnixSeconds,
+  unixSecondsToDatetimeLocalInput,
+} from "@/lib/utils/delegationDisplay.ts";
+
+describe("humanizePeriodDuration", () => {
+  it("maps common periods", () => {
+    assert.equal(humanizePeriodDuration(86_400), "Daily");
+    assert.equal(humanizePeriodDuration(604_800), "Weekly");
+  });
+
+  it("handles multi-day periods", () => {
+    assert.equal(humanizePeriodDuration(172_800), "Every 2 days");
+  });
+});
+
+describe("formatPermissionAmount", () => {
+  it("formats valid amounts", () => {
+    assert.equal(formatPermissionAmount("1.5", "USDC", 6), "1.5 USDC");
+  });
+
+  it("returns null for invalid input", () => {
+    assert.equal(formatPermissionAmount("", "USDC", 6), null);
+    assert.equal(formatPermissionAmount("abc", "USDC", 6), null);
+  });
+});
+
+describe("parsePeriodDurationSeconds", () => {
+  it("parses integer seconds", () => {
+    assert.equal(parsePeriodDurationSeconds("86400"), 86_400);
+  });
+});
+
+describe("formatUnixSecondsLabel", () => {
+  it("formats unix seconds", () => {
+    const label = formatUnixSecondsLabel(1_700_000_000, "en-US");
+    assert.ok(label && label.length > 0);
+  });
+
+  it("returns null for empty", () => {
+    assert.equal(formatUnixSecondsLabel(""), null);
+  });
+});
+
+describe("formatSlippageBpsLabel", () => {
+  it("formats basis points as percent", () => {
+    assert.equal(formatSlippageBpsLabel(50), "0.5%");
+    assert.equal(formatSlippageBpsLabel(100), "1%");
+  });
+
+  it("returns null for invalid bps", () => {
+    assert.equal(formatSlippageBpsLabel(10_000), null);
+  });
+});
+
+describe("resolvePermissionEndUnixSeconds", () => {
+  it("reads expiry rule", () => {
+    assert.equal(
+      resolvePermissionEndUnixSeconds({
+        rules: [{ type: "expiry", data: { expiry: 1_700_100_000 } }],
+      }),
+      1_700_100_000,
+    );
+  });
+
+  it("computes start plus lifetime on permission data", () => {
+    assert.equal(
+      resolvePermissionEndUnixSeconds({
+        permissionData: {
+          startDate: 1_700_000_000,
+          lifetimeSeconds: 86_400,
+        },
+      }),
+      1_700_086_400,
+    );
+  });
+
+  it("returns null when no finite end is specified", () => {
+    assert.equal(resolvePermissionEndUnixSeconds({}), null);
+  });
+});
+
+describe("datetime-local start helpers", () => {
+  it("round-trips through datetime-local input", () => {
+    const unix = 1_700_004_000;
+    const local = unixSecondsToDatetimeLocalInput(unix);
+    assert.ok(local.includes("T"));
+    assert.equal(datetimeLocalInputToUnixSeconds(local), unix);
+  });
+});
diff --git a/test/lib/utils/eip712Display.test.ts b/test/lib/utils/eip712Display.test.ts
new file mode 100644
index 0000000..9d9230b
--- /dev/null
+++ b/test/lib/utils/eip712Display.test.ts
@@ -0,0 +1,64 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  domainFieldEntries,
+  formatEip712Primitive,
+  humanizeEip712Key,
+  isEvmAddressString,
+  readDomainChainId,
+  readVerifyingContract,
+} from "@/lib/utils/eip712Display.ts";
+
+describe("humanizeEip712Key", () => {
+  it("splits camelCase", () => {
+    assert.equal(humanizeEip712Key("verifyingContract"), "Verifying contract");
+  });
+});
+
+describe("isEvmAddressString", () => {
+  it("matches 20-byte hex addresses", () => {
+    assert.equal(
+      isEvmAddressString("0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"),
+      true,
+    );
+    assert.equal(isEvmAddressString("not-an-address"), false);
+  });
+});
+
+describe("formatEip712Primitive", () => {
+  it("stringifies bigint", () => {
+    assert.equal(formatEip712Primitive(421614n), "421614");
+  });
+});
+
+describe("readDomainChainId", () => {
+  it("reads numeric chain id", () => {
+    assert.equal(readDomainChainId({ chainId: 421614 }), "421614");
+  });
+});
+
+describe("domainFieldEntries", () => {
+  it("omits chainId and empty fields", () => {
+    const entries = domainFieldEntries({
+      name: "Ether Mail",
+      version: "1",
+      chainId: 421614,
+      verifyingContract: "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+    });
+    assert.deepEqual(
+      entries.map((entry) => entry.key),
+      ["name", "version", "verifyingContract"],
+    );
+  });
+});
+
+describe("readVerifyingContract", () => {
+  it("returns trimmed contract address", () => {
+    assert.equal(
+      readVerifyingContract({
+        verifyingContract: " 0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC ",
+      }),
+      "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+    );
+  });
+});
diff --git a/test/lib/utils/siweDisplay.test.ts b/test/lib/utils/siweDisplay.test.ts
new file mode 100644
index 0000000..3fbeafd
--- /dev/null
+++ b/test/lib/utils/siweDisplay.test.ts
@@ -0,0 +1,50 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+  isSiweUriRedundant,
+  normalizeSiweHost,
+  resolveSiweEvmChainId,
+} from "@/lib/utils/siweDisplay.ts";
+
+describe("normalizeSiweHost", () => {
+  it("strips scheme and path", () => {
+    assert.equal(
+      normalizeSiweHost("https://app.example.com/login"),
+      "app.example.com",
+    );
+  });
+
+  it("normalizes bare domain", () => {
+    assert.equal(normalizeSiweHost("localhost:3000"), "localhost");
+  });
+});
+
+describe("isSiweUriRedundant", () => {
+  it("treats matching hosts as redundant", () => {
+    assert.equal(
+      isSiweUriRedundant("https://example.com/login", "example.com"),
+      true,
+    );
+    assert.equal(
+      isSiweUriRedundant("https://app.example.com", "app.example.com"),
+      true,
+    );
+  });
+
+  it("shows URI when hosts differ", () => {
+    assert.equal(
+      isSiweUriRedundant("https://auth.example.com", "app.example.com"),
+      false,
+    );
+  });
+});
+
+describe("resolveSiweEvmChainId", () => {
+  it("parses decimal chain id", () => {
+    assert.equal(String(resolveSiweEvmChainId("5042")), "0x13b2");
+  });
+
+  it("parses hex chain id", () => {
+    assert.equal(String(resolveSiweEvmChainId("0x1")), "0x1");
+  });
+});