From d59bca6c1bfa94d012a300785f84ff0173855266 Mon Sep 17 00:00:00 2001
From: Darek <dariusz@euler.xyz>
Date: Thu, 3 Sep 2026 12:14:22 +0200
Subject: [PATCH 01/12] fix: bind source-funded repay reviews to snapshots

- reuse warmed intents only when click-time semantics match
- bind source and target positions into direct and batch review
- cover deferred source changes with regression tests
---
 components/BatchContents.vue                  |   6 +-
 components/BatchReviewModal.vue               |  20 +--
 .../operation/OperationReviewModal.vue        |  50 +++++---
 composables/repay/useCollateralSwapRepay.ts   |  97 ++++++++------
 composables/repay/useSavingsRepay.ts          | 119 +++++++++++-------
 composables/useExecutionReview.ts             |  49 +++++---
 composables/useTxBatch.ts                     |   9 +-
 docs/transaction-building.md                  |   2 +
 .../planning/requirements.ts                  |  30 +++++
 pages/position/[number]/repay.vue             |  48 +++----
 .../useCollateralSwapRepay.test.ts            |  87 ++++++++++++-
 tests/composables/useExecutionReview.test.ts  |  43 ++++++-
 tests/composables/useSavingsRepay.test.ts     |  62 ++++++++-
 tests/composables/useTxBatch.test.ts          |  11 +-
 .../reviewed-execution/intent-factory.test.ts |  21 +++-
 tests/reviewed-execution/inventory.test.ts    |  12 +-
 tests/utils/position-tag.test.ts              |  21 ++++
 utils/positionTag.ts                          |  29 +++++
 18 files changed, 560 insertions(+), 156 deletions(-)
 create mode 100644 tests/utils/position-tag.test.ts
 create mode 100644 utils/positionTag.ts

diff --git a/components/BatchContents.vue b/components/BatchContents.vue
index 54cd053b9..183a61acf 100644
--- a/components/BatchContents.vue
+++ b/components/BatchContents.vue
@@ -31,9 +31,9 @@ const modal = useModal()
 const openEntryReview = (entry: BatchEntry) => {
   if (!entry.review) return
   modal.open(OperationReviewModal, {
-    // Forward the entry's sub-account so the review shows the same "Position N"
-    // pill as the batch operations list (entry.review itself doesn't carry it).
-    props: { ...entry.review, subAccount: entry.subAccount, plan: entryPlans.value[entry.id], hideExecute: true },
+    // Forward account context so position-funded operations identify both the
+    // target and the distinct account supplying assets or shares.
+    props: { ...entry.review, subAccount: entry.subAccount, sourceSubAccount: entry.sourceSubAccount, plan: entryPlans.value[entry.id], hideExecute: true },
   })
 }
 
diff --git a/components/BatchReviewModal.vue b/components/BatchReviewModal.vue
index bd6872df9..81df5951d 100644
--- a/components/BatchReviewModal.vue
+++ b/components/BatchReviewModal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { getAddress } from 'viem'
-import { flattenBatchEntries, getSubAccountId, type TransactionPlan } from '@eulerxyz/euler-v2-sdk'
+import { flattenBatchEntries, type TransactionPlan } from '@eulerxyz/euler-v2-sdk'
 import { buildModifiedPositionKeySets, buildRemovedPositionKeySets, filterPositionKeysByOwner, useTxBatch } from '~/composables/useTxBatch'
 import { useTokenSymbolResolver } from '~/composables/useTokenSymbolResolver'
 import { useVaultRegistry } from '~/composables/useVaultRegistry'
@@ -18,6 +18,7 @@ import type { PreparedExecutionReview } from '~/composables/useReviewedExecution
 import { submissionResultMessage } from '~/features/reviewed-execution/coordinator/coordinator'
 import { finalizeSuccessfulSubmission } from '~/features/reviewed-execution/review/submission-completion'
 import { useToast } from '~/components/ui/composables/useToast'
+import { getPositionTag, getSourcePositionTag } from '~/utils/positionTag'
 
 // Whole-batch review: required approvals, then the operations as rows that roll
 // down to their details, the net wallet changes, a Tenderly simulation link,
@@ -74,15 +75,10 @@ const ownerSubAccountKey = computed(() => {
 // Sub-account → tag. Sub-account 0 is the main account (Earn deposits / base
 // collateral), labelled "Deposits"; numbered borrow positions are "Position N".
 const positionTag = (subAccount?: string): string | undefined => {
-  if (!subAccount || !owner.value) return undefined
-  try {
-    const idx = getSubAccountId(getAddress(owner.value), getAddress(subAccount))
-    return idx === 0 ? 'Deposits' : `Position ${idx}`
-  }
-  catch {
-    return undefined
-  }
+  return getPositionTag(owner.value, subAccount)
 }
+const sourcePositionTag = (sourceSubAccount?: string, targetSubAccount?: string): string | undefined =>
+  getSourcePositionTag(owner.value, sourceSubAccount, targetSubAccount)
 
 type ReviewWithSteps = StepDecodingContext & {
   displayPlan?: TransactionPlan
@@ -629,6 +625,12 @@ const onCloseRequested = () => {
                   :failed="!!layers[index + 1]?.failed"
                 />
                 <BatchOperationLabel :entry="entry" />
+                <span
+                  v-if="sourcePositionTag(entry.sourceSubAccount, entry.subAccount)"
+                  class="shrink-0 text-h6 text-content-secondary bg-card py-2 px-8 rounded-8 border border-line-default"
+                >
+                  {{ sourcePositionTag(entry.sourceSubAccount, entry.subAccount) }}
+                </span>
                 <span
                   v-if="positionTag(entry.subAccount)"
                   class="shrink-0 text-h6 text-content-secondary bg-card py-2 px-8 rounded-8 border border-line-default"
diff --git a/components/entities/operation/OperationReviewModal.vue b/components/entities/operation/OperationReviewModal.vue
index 33628c8ee..a691e54cd 100644
--- a/components/entities/operation/OperationReviewModal.vue
+++ b/components/entities/operation/OperationReviewModal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { VaultAsset } from '~/types/asset'
-import { encodeFunctionData, getAddress, type Address, type Hash, type StateOverride } from 'viem'
-import { flattenBatchEntries, getEulerLabelProductByVault, getSubAccountId, type SwapperMode, type TransactionPlan, type TransactionPlanPrepared } from '@eulerxyz/euler-v2-sdk'
+import { encodeFunctionData, type Address, type Hash, type StateOverride } from 'viem'
+import { flattenBatchEntries, getEulerLabelProductByVault, type SwapperMode, type TransactionPlan, type TransactionPlanPrepared } from '@eulerxyz/euler-v2-sdk'
 import { buildPlanMarketLabel, buildTransactionPlanDisplaySteps, type DisplayStep, type StepDecodingContext, type StepKnownAsset, type StepKnownSwapOutput } from '~/utils/stepDecoding'
 import { useVaultRegistry } from '~/composables/useVaultRegistry'
 import { getEulerSdkForChain } from '~/composables/useEulerSdk'
@@ -15,6 +15,7 @@ import type { PlainTxRequest } from '~/utils/migrationAuthorizationTxs'
 import { isPlanBundleable } from '~/utils/transaction-plan-calls'
 import { buildTenderlySimulationPayload, tenderlyPayloadMatchesReviewedRequests } from '~/utils/tenderly-plan'
 import type { EoaRequest, SafeCall, SignatureSlot } from '~/features/reviewed-execution/domain/reviewed-execution'
+import { getPositionTag, getSourcePositionTag } from '~/utils/positionTag'
 
 const emits = defineEmits(['close', 'confirm'])
 
@@ -25,7 +26,7 @@ interface REULUnlockInfo {
   daysUntilMaturity: number
 }
 
-const { type, asset, assetIconUrl, reulUnlockInfo, amount, reviewId, reviewDigest, reviewedAccount, reviewedWalletKind, reviewedRequests, reviewedSignatureSlots, externalSubmitting, plan, prepared, calldataPrepared, calldataUsesPlaceholderSignatures, calldataWrapCalls, tenderlyPrepared, tenderlyPlan, tenderlyStateOverrides, displayPlan, signatureSteps: providedSignatureSteps, postSteps, swapFromAsset, swapFromAmount, swapToAsset, swapToAmount, swapMode, swapEstimatedSide, supplyingAssetForBorrow, supplyingAmount, transferAmounts, vaultAmounts, knownAssets, swapQuoteOutputs, confirmLabel: providedConfirmLabel, submittingLabel, quoteFetchedAt, hideExecute, readOnly, subAccount, marketLabel, allowConfirmWithoutPlan } = defineProps<{
+const { type, asset, assetIconUrl, reulUnlockInfo, amount, reviewId, reviewDigest, reviewedAccount, reviewedWalletKind, reviewedRequests, reviewedSignatureSlots, externalSubmitting, plan, prepared, calldataPrepared, calldataUsesPlaceholderSignatures, calldataWrapCalls, tenderlyPrepared, tenderlyPlan, tenderlyStateOverrides, displayPlan, signatureSteps: providedSignatureSteps, postSteps, swapFromAsset, swapFromAmount, swapToAsset, swapToAmount, swapMode, swapEstimatedSide, supplyingAssetForBorrow, supplyingAmount, transferAmounts, vaultAmounts, knownAssets, swapQuoteOutputs, confirmLabel: providedConfirmLabel, submittingLabel, quoteFetchedAt, hideExecute, readOnly, subAccount, sourceSubAccount, marketLabel, allowConfirmWithoutPlan } = defineProps<{
   type?: 'supply' | 'withdraw' | 'borrow' | 'repay' | 'swap' | 'transfer' | 'refinance' | 'migration' | 'reward' | 'brevis-reward' | 'fuul-reward' | 'turtle-reward' | 'reul-unlock' | 'disableCollateral' | 'swap-supply' | 'swap-withdraw' | 'swap-borrow'
   asset: VaultAsset
   assetIconUrl?: string
@@ -75,6 +76,8 @@ const { type, asset, assetIconUrl, reulUnlockInfo, amount, reviewId, reviewDiges
   reviewedSignatureSlots?: readonly SignatureSlot[]
   externalSubmitting?: boolean
   subAccount?: string
+  /** Distinct Euler account supplying assets or shares for this operation. */
+  sourceSubAccount?: string
   hasBorrows?: boolean
   transferAmounts?: Record<string, string>
   knownAssets?: StepKnownAsset[]
@@ -249,15 +252,13 @@ const market = computed<string | undefined>(() => {
 // main account ("Deposits"); numbered borrow positions are "Position N".
 const positionTag = computed<string | undefined>(() => {
   const ownerAddr = effectiveAddress.value || ''
-  if (!subAccount || !ownerAddr) return undefined
-  try {
-    const idx = getSubAccountId(getAddress(ownerAddr), getAddress(subAccount))
-    return idx === 0 ? 'Deposits' : `Position ${idx}`
-  }
-  catch {
-    return undefined
-  }
+  return getPositionTag(ownerAddr, subAccount)
 })
+const sourcePositionTag = computed(() => getSourcePositionTag(
+  effectiveAddress.value || '',
+  sourceSubAccount,
+  subAccount,
+))
 
 const displaySteps = computed((): DisplayStep[] => {
   // Wallet-signature rows always render in the signature section, never among
@@ -437,18 +438,29 @@ const confirmLabel = computed(() => {
            so the operation reads in the context of the position it acts on. -->
       <div class="flex flex-col gap-10">
         <div
-          v-if="hideExecute && (market || positionTag)"
+          v-if="sourcePositionTag || (hideExecute && (market || positionTag))"
           class="flex items-center justify-between gap-8 px-12"
         >
           <div class="min-w-0 flex-1">
-            <BatchMarketLabel :market="market" />
+            <BatchMarketLabel
+              v-if="hideExecute"
+              :market="market"
+            />
+          </div>
+          <div class="flex shrink-0 items-center gap-6">
+            <span
+              v-if="sourcePositionTag"
+              class="text-h6 text-content-secondary bg-card py-2 px-8 rounded-8 border border-line-default"
+            >
+              {{ sourcePositionTag }}
+            </span>
+            <span
+              v-if="positionTag && (hideExecute || sourcePositionTag)"
+              class="text-h6 text-content-secondary bg-card py-2 px-8 rounded-8 border border-line-default"
+            >
+              {{ positionTag }}
+            </span>
           </div>
-          <span
-            v-if="hideExecute && positionTag"
-            class="shrink-0 text-h6 text-content-secondary bg-card py-2 px-8 rounded-8 border border-line-default"
-          >
-            {{ positionTag }}
-          </span>
         </div>
         <div
           v-if="signatureSteps.length || displaySteps.length || postExecutionSteps.length"
diff --git a/composables/repay/useCollateralSwapRepay.ts b/composables/repay/useCollateralSwapRepay.ts
index 7e8f6b34b..7dd2efc55 100644
--- a/composables/repay/useCollateralSwapRepay.ts
+++ b/composables/repay/useCollateralSwapRepay.ts
@@ -33,6 +33,7 @@ import { COWSWAP_ORDER_DEADLINE_SECONDS, getCowSwapChainConfig, getCowSwapQuoteO
 import { type CowSwapClosePositionExecuteParams, useCowSwapClosePositionExecution, useCowSwapOrderStatus, openCowSwapReviewModal } from '~/composables/cowswap'
 import { formatNumber, trimTrailingZeros } from '~/utils/string-utils'
 import { getEulerSdkFresh } from '~/composables/useEulerSdk'
+import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 interface UseCollateralSwapRepayOptions {
   position: Ref<PortfolioBorrowPosition<VaultEntity> | undefined>
@@ -52,6 +53,9 @@ interface UseCollateralSwapRepayOptions {
 interface CollateralSwapRepayPlanSnapshot {
   sourceVault?: EVault
   sourceAccount?: Address
+  targetAccount?: Address
+  borrowVault?: EVault
+  currentDebt?: bigint
   amount?: string
   debtAmount?: string
   direction?: SwapperMode
@@ -582,14 +586,15 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
     snapshot: CollateralSwapRepayPlanSnapshot = {},
   ): Promise<TransactionPlan> {
     const source = snapshot.sourceVault ?? sourceVault.value
-    if (!position.value || !borrowVault.value || !source) {
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const subAccount = snapshot.targetAccount ?? position.value?.subAccount as Address | undefined
+    if (!subAccount || !liability || !source) {
       throw new Error('Position or vaults not loaded')
     }
 
-    const subAccount = position.value.subAccount as Address
     const sourceAccount = snapshot.sourceAccount ?? selectedSourceAccount.value ?? subAccount
     const isCrossPosition = normalizeAddressOrEmpty(sourceAccount) !== normalizeAddressOrEmpty(subAccount)
-    if (isCrossPosition && normalizeAddressOrEmpty(source.address) !== normalizeAddressOrEmpty(borrowVault.value.address)) {
+    if (isCrossPosition && normalizeAddressOrEmpty(source.address) !== normalizeAddressOrEmpty(liability.address)) {
       throw new Error('Cross-position collateral repayment requires the exact liability vault')
     }
     const sameAsset = snapshot.isSameAsset ?? core.isSameAsset.value
@@ -601,9 +606,9 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
 
     if (sameAsset) {
       const debtNano = debtAmountInput
-        ? valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        ? valueToNano(debtAmountInput, liability.asset.decimals)
         : valueToNano(amountInput, source.asset.decimals)
-      const currentDebtVal = getCurrentDebt()
+      const currentDebtVal = snapshot.currentDebt ?? getCurrentDebt()
       isFullRepay = debtNano >= currentDebtVal
       liabilityAmount = isFullRepay ? maxUint256 : debtNano
     }
@@ -613,18 +618,18 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
         throw new Error('No quote selected')
       }
       swapMode = snapshot.direction ?? core.direction.value
-      const currentDebt = getCurrentDebt()
+      const currentDebt = snapshot.currentDebt ?? getCurrentDebt()
       let targetDebt = 0n
       if (swapMode === SwapperMode.TARGET_DEBT && debtAmountInput) {
-        const debtAmountNano = valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        const debtAmountNano = valueToNano(debtAmountInput, liability.asset.decimals)
         targetDebt = debtAmountNano >= currentDebt ? 0n : currentDebt - debtAmountNano
       }
       isFullRepay = targetDebt === 0n && swapMode === SwapperMode.TARGET_DEBT
     }
 
     return planRepayFromSource({
-      liabilityVault: borrowVault.value.address as Address,
-      liabilityAsset: borrowVault.value.asset.address as Address,
+      liabilityVault: liability.address as Address,
+      liabilityAsset: liability.asset.address as Address,
       liabilityAmount,
       receiver: subAccount,
       fromVault: source.address as Address,
@@ -641,11 +646,12 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
     snapshot: CollateralSwapRepayPlanSnapshot = {},
   ) {
     const source = snapshot.sourceVault ?? sourceVault.value
-    if (!position.value || !borrowVault.value || !source) throw new Error('Position or vaults not loaded')
-    const subAccount = position.value.subAccount as Address
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const subAccount = snapshot.targetAccount ?? position.value?.subAccount as Address | undefined
+    if (!subAccount || !liability || !source) throw new Error('Position or vaults not loaded')
     const sourceAccount = snapshot.sourceAccount ?? selectedSourceAccount.value ?? subAccount
     const isCrossPosition = normalizeAddressOrEmpty(sourceAccount) !== normalizeAddressOrEmpty(subAccount)
-    if (isCrossPosition && normalizeAddressOrEmpty(source.address) !== normalizeAddressOrEmpty(borrowVault.value.address)) {
+    if (isCrossPosition && normalizeAddressOrEmpty(source.address) !== normalizeAddressOrEmpty(liability.address)) {
       throw new Error('Cross-position collateral repayment requires the exact liability vault')
     }
     const sameAsset = snapshot.isSameAsset ?? core.isSameAsset.value
@@ -653,15 +659,15 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
     const debtAmountInput = snapshot.debtAmount ?? core.debtAmount.value
     if (sameAsset) {
       const debtNano = debtAmountInput
-        ? valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        ? valueToNano(debtAmountInput, liability.asset.decimals)
         : valueToNano(amountInput, source.asset.decimals)
-      const isFullRepay = debtNano >= getCurrentDebt()
+      const isFullRepay = debtNano >= (snapshot.currentDebt ?? getCurrentDebt())
       return createIntent({
         kind: 'repay',
         planner: 'repay-from-deposit',
         args: {
-          liabilityVault: borrowVault.value.address as Address,
-          liabilityAsset: borrowVault.value.asset.address as Address,
+          liabilityVault: liability.address as Address,
+          liabilityAsset: liability.asset.address as Address,
           liabilityAmount: isFullRepay ? maxUint256 : debtNano,
           receiver: subAccount,
           fromVault: source.address as Address,
@@ -675,10 +681,10 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
     const swapQuote = quote || core.quotes.selectedQuote.value
     if (!swapQuote) throw new Error('No quote selected')
     const swapperMode = snapshot.direction ?? core.direction.value
-    const currentDebt = getCurrentDebt()
+    const currentDebt = snapshot.currentDebt ?? getCurrentDebt()
     let targetDebt = 0n
     if (swapperMode === SwapperMode.TARGET_DEBT && debtAmountInput) {
-      const debtAmountNano = valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+      const debtAmountNano = valueToNano(debtAmountInput, liability.asset.decimals)
       targetDebt = debtAmountNano >= currentDebt ? 0n : currentDebt - debtAmountNano
     }
     const cleanupOnMax = targetDebt === 0n && swapperMode === SwapperMode.TARGET_DEBT
@@ -832,12 +838,39 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
 
     isPreparing.value = true
     try {
-      const quoteIntents = core.quotes.selectedQuoteCard.value?.quote === core.quotes.selectedQuote.value
+      // Seal every value that can affect intent, preflight, or presentation
+      // before the first await. Exact intent-keyed preparation can still adopt
+      // a warmed result; a different snapshot produces a different intent and
+      // therefore rebuilds instead of reusing stale work.
+      const targetAccount = position.value.subAccount as Address
+      const sourceAccount = selectedSourceAccount.value ?? targetAccount
+      const quote = core.isSameAsset.value ? undefined : core.quotes.selectedQuote.value ?? undefined
+      const snapshot: CollateralSwapRepayPlanSnapshot = Object.freeze({
+        sourceVault: sourceVault.value,
+        sourceAccount,
+        targetAccount,
+        borrowVault: borrowVault.value,
+        currentDebt: getCurrentDebt(),
+        amount: core.amount.value,
+        debtAmount: core.debtAmount.value,
+        direction: core.direction.value,
+        isSameAsset: core.isSameAsset.value,
+      })
+      const quoteFetchedAt = core.quotes.effectiveQuoteFetchedAt.value
+      const planAccountSnapshot = planAccount.value
+      const quoteIntents = quote && core.quotes.selectedQuoteCard.value?.quote === quote
         ? core.quotes.selectedQuoteCard.value.intents
         : undefined
-      const intents = quoteIntents?.length ? quoteIntents : [createRepayIntent()]
+      const currentIntents = [createRepayIntent(quote, snapshot)]
+      const intents = selectMatchingPreparedIntents(quoteIntents, currentIntents)
+      const inputDisplay = getRepaySwapReviewInputAmount({
+        amount: snapshot.amount!,
+        quote,
+        sourceDecimals: snapshot.sourceVault!.asset.decimals,
+        swapperMode: snapshot.direction!,
+      })
       try {
-        plan.value = await buildRepayPlan()
+        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
       }
       catch (e) {
         logWarn('collateralSwapRepay/buildPlan', e)
@@ -849,26 +882,20 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
         if (!ok) return
       }
 
-      const inputDisplay = getRepaySwapReviewInputAmount({
-        amount: core.amount.value,
-        quote: core.quotes.selectedQuote.value,
-        sourceDecimals: sourceVault.value.asset.decimals,
-        swapperMode: core.direction.value,
-      })
-
       if (!plan.value) return
       await openReviewState(intents, {
         presentationKind: 'repay',
         review: {
           type: 'repay',
-          asset: sourceVault.value.asset,
+          asset: snapshot.sourceVault!.asset,
           amount: inputDisplay,
-          quoteFetchedAt: !core.isSameAsset.value ? core.quotes.effectiveQuoteFetchedAt.value : null,
-          swapToAsset: !core.isSameAsset.value ? borrowVault.value.asset : undefined,
-          swapToAmount: !core.isSameAsset.value ? core.debtAmount.value : undefined,
-          swapMode: !core.isSameAsset.value ? core.direction.value : undefined,
-          subAccount: position.value?.subAccount,
-          hasBorrows: (position.value?.borrowed || 0n) > 0n,
+          quoteFetchedAt: !snapshot.isSameAsset ? quoteFetchedAt : null,
+          swapToAsset: !snapshot.isSameAsset ? snapshot.borrowVault!.asset : undefined,
+          swapToAmount: !snapshot.isSameAsset ? snapshot.debtAmount : undefined,
+          swapMode: !snapshot.isSameAsset ? snapshot.direction : undefined,
+          subAccount: snapshot.targetAccount,
+          sourceSubAccount: snapshot.sourceAccount,
+          hasBorrows: snapshot.currentDebt! > 0n,
           submittingLabel: 'Submitting...',
         },
         onSucceeded: () => finalizeExecutionUi(),
diff --git a/composables/repay/useSavingsRepay.ts b/composables/repay/useSavingsRepay.ts
index bb55aa226..9c6b85521 100644
--- a/composables/repay/useSavingsRepay.ts
+++ b/composables/repay/useSavingsRepay.ts
@@ -21,6 +21,7 @@ import { createRaceGuard } from '~/utils/race-guard'
 import { findBlockingDisabledOp, OP_REPAY_WITH_SHARES, OP_SKIM, OP_TRANSFER, OP_WITHDRAW, type PlannedOp } from '~/utils/vault-hooks'
 import { getPlanHookDisabledWarning, getUtilisationWarning, type VaultWarning } from '~/composables/useVaultWarnings'
 import type { CollateralApySnapshot } from '~/composables/usePositionCollateralApy'
+import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 interface UseSavingsRepayOptions {
   position: Ref<PortfolioBorrowPosition<VaultEntity> | undefined>
@@ -43,6 +44,10 @@ interface UseSavingsRepayOptions {
 interface SavingsRepayPlanSnapshot {
   sourceVault?: EVault
   sourceSubAccount?: string
+  sourceAccount?: Address
+  targetAccount?: Address
+  borrowVault?: EVault
+  currentDebt?: bigint
   amount?: string
   debtAmount?: string
   direction?: SwapperMode
@@ -395,13 +400,16 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
     snapshot: SavingsRepayPlanSnapshot = {},
   ): Promise<TransactionPlan> => {
     const source = snapshot.sourceVault ?? sourceVault.value
-    if (!position.value || !borrowVault.value || !source) {
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const receiver = snapshot.targetAccount ?? position.value?.subAccount as Address | undefined
+    if (!receiver || !liability || !source) {
       throw new Error('Position or vaults not loaded')
     }
 
     const sourceSubAccount = snapshot.sourceSubAccount ?? selectedSavingSubAccount.value
-    const savingsPos = getSavingsPosition(source.address, sourceSubAccount)
-    if (!savingsPos) {
+    const sourceAccount = snapshot.sourceAccount
+      ?? getSavingsPosition(source.address, sourceSubAccount)?.subAccount as Address | undefined
+    if (!sourceAccount) {
       throw new Error('Savings position not found')
     }
     const sameAsset = snapshot.isSameAsset ?? core.isSameAsset.value
@@ -415,9 +423,9 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
 
     if (sameAsset) {
       const debtNano = debtAmountInput
-        ? valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        ? valueToNano(debtAmountInput, liability.asset.decimals)
         : valueToNano(amountInput, source.asset.decimals)
-      const currentDebtVal = getCurrentDebt()
+      const currentDebtVal = snapshot.currentDebt ?? getCurrentDebt()
       isFullRepay = debtNano >= currentDebtVal
       liabilityAmount = isFullRepay ? maxUint256 : debtNano
     }
@@ -427,22 +435,22 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
         throw new Error('No quote selected')
       }
       swapMode = snapshot.direction ?? core.direction.value
-      const currentDebt = getCurrentDebt()
+      const currentDebt = snapshot.currentDebt ?? getCurrentDebt()
       let targetDebt = 0n
       if (swapMode === SwapperMode.TARGET_DEBT && debtAmountInput) {
-        const debtAmountNano = valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        const debtAmountNano = valueToNano(debtAmountInput, liability.asset.decimals)
         targetDebt = debtAmountNano >= currentDebt ? 0n : currentDebt - debtAmountNano
       }
       isFullRepay = targetDebt === 0n && swapMode === SwapperMode.TARGET_DEBT
     }
 
     return planRepayFromSource({
-      liabilityVault: borrowVault.value.address as Address,
-      liabilityAsset: borrowVault.value.asset.address as Address,
+      liabilityVault: liability.address as Address,
+      liabilityAsset: liability.asset.address as Address,
       liabilityAmount,
-      receiver: position.value.subAccount as Address,
+      receiver,
       fromVault: source.address as Address,
-      fromAccount: savingsPos.subAccount as Address,
+      fromAccount: sourceAccount,
       swapQuote: sameAsset ? undefined : swapQuote,
       swapperMode: swapMode,
       cleanupOnMax: isFullRepay,
@@ -455,26 +463,27 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
     snapshot: SavingsRepayPlanSnapshot = {},
   ) => {
     const source = snapshot.sourceVault ?? sourceVault.value
-    if (!position.value || !borrowVault.value || !source) throw new Error('Position or vaults not loaded')
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const receiver = snapshot.targetAccount ?? position.value?.subAccount as Address | undefined
+    if (!receiver || !liability || !source) throw new Error('Position or vaults not loaded')
     const sourceSubAccount = snapshot.sourceSubAccount ?? selectedSavingSubAccount.value
-    const savingsPos = getSavingsPosition(source.address, sourceSubAccount)
-    if (!savingsPos) throw new Error('Savings position not found')
-    const receiver = position.value.subAccount as Address
-    const fromAccount = savingsPos.subAccount as Address
+    const fromAccount = snapshot.sourceAccount
+      ?? getSavingsPosition(source.address, sourceSubAccount)?.subAccount as Address | undefined
+    if (!fromAccount) throw new Error('Savings position not found')
     const sameAsset = snapshot.isSameAsset ?? core.isSameAsset.value
     const amountInput = snapshot.amount ?? core.amount.value
     const debtAmountInput = snapshot.debtAmount ?? core.debtAmount.value
     if (sameAsset) {
       const debtNano = debtAmountInput
-        ? valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+        ? valueToNano(debtAmountInput, liability.asset.decimals)
         : valueToNano(amountInput, source.asset.decimals)
-      const isFullRepay = debtNano >= getCurrentDebt()
+      const isFullRepay = debtNano >= (snapshot.currentDebt ?? getCurrentDebt())
       return createIntent({
         kind: 'repay',
         planner: 'repay-from-deposit',
         args: {
-          liabilityVault: borrowVault.value.address as Address,
-          liabilityAsset: borrowVault.value.asset.address as Address,
+          liabilityVault: liability.address as Address,
+          liabilityAsset: liability.asset.address as Address,
           liabilityAmount: isFullRepay ? maxUint256 : debtNano,
           receiver,
           fromVault: source.address as Address,
@@ -488,10 +497,10 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
     const swapQuote = quote ?? core.quotes.selectedQuote.value ?? undefined
     if (!swapQuote) throw new Error('No quote selected')
     const swapperMode = snapshot.direction ?? core.direction.value
-    const currentDebt = getCurrentDebt()
+    const currentDebt = snapshot.currentDebt ?? getCurrentDebt()
     let targetDebt = 0n
     if (swapperMode === SwapperMode.TARGET_DEBT && debtAmountInput) {
-      const debtAmountNano = valueToNano(debtAmountInput, borrowVault.value.asset.decimals)
+      const debtAmountNano = valueToNano(debtAmountInput, liability.asset.decimals)
       targetDebt = debtAmountNano >= currentDebt ? 0n : currentDebt - debtAmountNano
     }
     const cleanupOnMax = targetDebt === 0n && swapperMode === SwapperMode.TARGET_DEBT
@@ -510,12 +519,44 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
 
     isPreparing.value = true
     try {
-      const quoteIntents = core.quotes.selectedQuoteCard.value?.quote === core.quotes.selectedQuote.value
+      const targetAccount = position.value.subAccount as Address
+      const selectedSavings = getSavingsPosition(sourceVault.value.address, selectedSavingSubAccount.value)
+      if (!selectedSavings) return
+      const quote = core.isSameAsset.value ? undefined : core.quotes.selectedQuote.value ?? undefined
+      const snapshot: SavingsRepayPlanSnapshot = Object.freeze({
+        sourceVault: sourceVault.value,
+        sourceSubAccount: selectedSavingSubAccount.value,
+        sourceAccount: selectedSavings.subAccount as Address,
+        targetAccount,
+        borrowVault: borrowVault.value,
+        currentDebt: getCurrentDebt(),
+        amount: core.amount.value,
+        debtAmount: core.debtAmount.value,
+        direction: core.direction.value,
+        isSameAsset: core.isSameAsset.value,
+      })
+      const quoteFetchedAt = core.quotes.effectiveQuoteFetchedAt.value
+      const positionSupplied = position.value.supplied
+      const collateralSnapshot = collateralVault.value
+      const planAccountSnapshot = planAccount.value
+      const quoteIntents = quote && core.quotes.selectedQuoteCard.value?.quote === quote
         ? core.quotes.selectedQuoteCard.value.intents
         : undefined
-      const intents = quoteIntents?.length ? quoteIntents : [createRepayIntent()]
+      const currentIntents = [createRepayIntent(quote, snapshot)]
+      const intents = selectMatchingPreparedIntents(quoteIntents, currentIntents)
+      const transferAmounts: Record<string, string> = {}
+      if (collateralSnapshot && positionSupplied) {
+        const addr = collateralSnapshot.address.toLowerCase()
+        transferAmounts[addr] = nanoToValue(positionSupplied, collateralSnapshot.shares.decimals).toString()
+      }
+      const inputDisplay = getRepaySwapReviewInputAmount({
+        amount: snapshot.amount!,
+        quote,
+        sourceDecimals: snapshot.sourceVault!.asset.decimals,
+        swapperMode: snapshot.direction!,
+      })
       try {
-        plan.value = await buildRepayPlan()
+        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
       }
       catch (e) {
         logWarn('savingsRepay/buildPlan', e)
@@ -527,32 +568,20 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
         if (!ok) return
       }
 
-      const transferAmounts: Record<string, string> = {}
-      if (collateralVault.value && position.value?.supplied) {
-        const addr = collateralVault.value.address.toLowerCase()
-        transferAmounts[addr] = nanoToValue(position.value.supplied, collateralVault.value.shares.decimals).toString()
-      }
-
-      const inputDisplay = getRepaySwapReviewInputAmount({
-        amount: core.amount.value,
-        quote: core.quotes.selectedQuote.value,
-        sourceDecimals: sourceVault.value.asset.decimals,
-        swapperMode: core.direction.value,
-      })
-
       if (!plan.value) return
       await openReviewState(intents, {
         presentationKind: 'repay',
         review: {
           type: 'repay',
-          asset: sourceVault.value.asset,
+          asset: snapshot.sourceVault!.asset,
           amount: inputDisplay,
-          quoteFetchedAt: !core.isSameAsset.value ? core.quotes.effectiveQuoteFetchedAt.value : null,
-          swapToAsset: !core.isSameAsset.value ? borrowVault.value.asset : undefined,
-          swapToAmount: !core.isSameAsset.value ? core.debtAmount.value : undefined,
-          swapMode: !core.isSameAsset.value ? core.direction.value : undefined,
-          subAccount: position.value?.subAccount,
-          hasBorrows: (position.value?.borrowed || 0n) > 0n,
+          quoteFetchedAt: !snapshot.isSameAsset ? quoteFetchedAt : null,
+          swapToAsset: !snapshot.isSameAsset ? snapshot.borrowVault!.asset : undefined,
+          swapToAmount: !snapshot.isSameAsset ? snapshot.debtAmount : undefined,
+          swapMode: !snapshot.isSameAsset ? snapshot.direction : undefined,
+          subAccount: snapshot.targetAccount,
+          sourceSubAccount: snapshot.sourceAccount,
+          hasBorrows: snapshot.currentDebt! > 0n,
           transferAmounts,
           submittingLabel: 'Submitting...',
         },
diff --git a/composables/useExecutionReview.ts b/composables/useExecutionReview.ts
index 248541f6d..d3666be2f 100644
--- a/composables/useExecutionReview.ts
+++ b/composables/useExecutionReview.ts
@@ -21,6 +21,21 @@ export interface OpenExecutionReviewOptions {
   onFailed?: (cause: unknown) => void | Promise<void>
 }
 
+const clonePresentationValue = (value: unknown): unknown => {
+  if (value === null || typeof value !== 'object') return value
+  if (Array.isArray(value)) return Object.freeze(value.map(clonePresentationValue))
+  const captured: Record<string, unknown> = {}
+  for (const [key, entry] of Object.entries(value)) {
+    if (entry === undefined || typeof entry === 'function' || key === 'onConfirm') continue
+    captured[key] = clonePresentationValue(entry)
+  }
+  return Object.freeze(captured)
+}
+
+/** Snapshot presentation data synchronously at the review-launch boundary. */
+export const captureReviewPresentation = (review: ReviewPresentation): ReviewPresentation =>
+  clonePresentationValue(review) as ReviewPresentation
+
 /**
  * The only operation-review launcher for in-scope transaction plans. It binds
  * the unchanged handcrafted presentation to an opaque reviewed execution identity; the
@@ -36,19 +51,25 @@ export const useExecutionReview = () => {
     intents: readonly OperationIntent[],
     options: OpenExecutionReviewOptions,
   ): Promise<{ reviewId: Hash, reviewDigest: Hash }> => {
+    // Callers may keep editing reactive form state while preparation awaits.
+    // Only this synchronous copy is bound to and rendered by the review.
+    const capturedOptions: OpenExecutionReviewOptions = {
+      ...options,
+      review: captureReviewPresentation(options.review),
+    }
     if (isSpyMode.value) {
       const prepared = await execution.prepareReadOnly(intents, {
-        presentationKind: options.presentationKind,
-        presentationInputs: options.review,
+        presentationKind: capturedOptions.presentationKind,
+        presentationInputs: capturedOptions.review,
       })
       modal.open(OperationReviewModal, {
         props: {
-          ...options.review,
+          ...capturedOptions.review,
           plan: undefined,
           prepared: prepared.prepared,
           calldataPrepared: prepared.prepared,
-          tenderlyPrepared: options.tenderlyPrepared ?? prepared.prepared,
-          tenderlyStateOverrides: options.tenderlyStateOverrides,
+          tenderlyPrepared: capturedOptions.tenderlyPrepared ?? prepared.prepared,
+          tenderlyStateOverrides: capturedOptions.tenderlyStateOverrides,
           reviewedAccount: prepared.execution.requestSet.wallet.account,
           reviewedWalletKind: prepared.execution.requestSet.wallet.walletKind,
           reviewedRequests: prepared.execution.requestSet.requests,
@@ -62,8 +83,8 @@ export const useExecutionReview = () => {
       }
     }
     const prepared = await execution.prepare(intents, {
-      presentationKind: options.presentationKind,
-      presentationInputs: options.review,
+      presentationKind: capturedOptions.presentationKind,
+      presentationInputs: capturedOptions.review,
     })
     const reviewId = prepared.execution.reviewId
     const reviewDigest = prepared.execution.reviewDigest
@@ -72,19 +93,19 @@ export const useExecutionReview = () => {
         reviewId,
         reviewDigest,
         review: {
-          ...options.review,
+          ...capturedOptions.review,
           plan: undefined,
           prepared: prepared.prepared,
           calldataPrepared: prepared.prepared,
-          tenderlyPrepared: options.tenderlyPrepared ?? prepared.prepared,
-          tenderlyStateOverrides: options.tenderlyStateOverrides,
+          tenderlyPrepared: capturedOptions.tenderlyPrepared ?? prepared.prepared,
+          tenderlyStateOverrides: capturedOptions.tenderlyStateOverrides,
         },
-        onConfirmed: options.onConfirmed,
-        onResult: options.onResult,
+        onConfirmed: capturedOptions.onConfirmed,
+        onResult: capturedOptions.onResult,
         onSucceeded: async (result: SubmissionResult) => {
-          await options.onSucceeded?.(result)
+          await capturedOptions.onSucceeded?.(result)
         },
-        onFailed: options.onFailed,
+        onFailed: capturedOptions.onFailed,
       },
     })
     return { reviewId, reviewDigest }
diff --git a/composables/useTxBatch.ts b/composables/useTxBatch.ts
index 9dab0810d..a33470582 100644
--- a/composables/useTxBatch.ts
+++ b/composables/useTxBatch.ts
@@ -86,6 +86,8 @@ export interface BatchEntry {
    *  batch rows show the same "Position N" tag as the portfolio. New positions
    *  (fresh deposits) leave this undefined and render no tag. */
   subAccount?: Address
+  /** Distinct Euler account supplying assets or shares for the operation. */
+  sourceSubAccount?: Address
   /** Additional sub-accounts intentionally modified by this entry. Used when a
    *  position-scoped operation also moves balances to the owner account. */
   affectedSubAccounts?: Address[]
@@ -2345,7 +2347,12 @@ export const useTxBatch = () => {
   const getBatchIntents = (): readonly OperationIntent[] =>
     draftEntries.value.map(entry => entry.intent)
 
-  const batchPresentationInputs = () => entries.value.map(entry => ({ id: entry.id, review: entry.review }))
+  const batchPresentationInputs = () => entries.value.map(entry => ({
+    id: entry.id,
+    review: entry.review,
+    subAccount: entry.subAccount,
+    sourceSubAccount: entry.sourceSubAccount,
+  }))
 
   const startBatchExecutionPreparation = (cartGeneration: number): Promise<PreparedExecutionReview> => {
     batchGenerationPublisher.assertCurrent(cartGeneration)
diff --git a/docs/transaction-building.md b/docs/transaction-building.md
index 6cb7e6c4b..a76d0cdf6 100644
--- a/docs/transaction-building.md
+++ b/docs/transaction-building.md
@@ -148,6 +148,8 @@ The complete reviewed execution and the visible operation review serve different
 
 Operation review components receive only their existing display inputs plus an opaque reviewed execution binding. They do not receive an execution closure and cannot sign or submit. Acceptance binds the current presentation digest and intent revisions to the sealed reviewed execution; submission uses the reviewed execution's materialized request vector through the coordinator.
 
+Position-funded operations show the distinct supplying Euler account as `From Position N` or `From Deposits`, alongside the target position context. Both account labels are captured presentation inputs bound to the reviewed intent set.
+
 Do not synthesize generic rows or expose internal targets, selectors, plugin calls, request digests, simulation classifications, cleanup metadata, or authorization machinery. Existing approval and signature presentation remains operation-specific. Unknown or undecodable production calls fail internal sealing instead of creating a fallback review row.
 
 Pyth updates are completely invisible in review. Preview fees, maximum fees, feed IDs, payload hashes, publish times, freshness rules, execution-time refresh behavior, and refresh failures are internal reviewed execution data. A failed refresh follows the existing transaction-preparation error behavior and does not add a Pyth-specific review field or notice.
diff --git a/features/reviewed-execution/planning/requirements.ts b/features/reviewed-execution/planning/requirements.ts
index bab947072..6586555fa 100644
--- a/features/reviewed-execution/planning/requirements.ts
+++ b/features/reviewed-execution/planning/requirements.ts
@@ -36,6 +36,36 @@ const collectNamedAddresses = (value: unknown, key: string | undefined, target:
 export const intentSetDigest = (intents: readonly OperationIntent[]): Hash =>
   canonicalDigest('operation-intent-set-v1', toCanonicalValue(intents))
 
+const intentSemanticsDigest = (intents: readonly OperationIntent[]): Hash =>
+  canonicalDigest('operation-intent-semantics-v1', toCanonicalValue(intents.map(intent => ({
+    schemaVersion: intent.schemaVersion,
+    revision: intent.revision,
+    kind: intent.kind,
+    chainId: intent.chainId,
+    account: intent.account,
+    subAccounts: intent.subAccounts,
+    planner: intent.planner,
+    constraints: intent.constraints,
+    metadata: {
+      source: intent.metadata.source,
+      quoteId: intent.metadata.quoteId,
+      quoteCalldataDigest: intent.metadata.quoteCalldataDigest,
+    },
+  }))))
+
+/**
+ * Adopt warmed intent DTOs only when they describe the exact current form
+ * semantics. Intent IDs and creation timestamps are deliberately excluded: a
+ * freshly captured equivalent intent must still be able to use warmed work.
+ */
+export const selectMatchingPreparedIntents = (
+  prepared: readonly OperationIntent[] | undefined,
+  current: readonly OperationIntent[],
+): readonly OperationIntent[] =>
+  prepared?.length === current.length && intentSemanticsDigest(prepared) === intentSemanticsDigest(current)
+    ? prepared
+    : current
+
 export const collectPlanningRequirements = (intents: readonly OperationIntent[]): Readonly<PlanningRequirements> => {
   if (!intents.length) throw new Error('Cannot collect requirements for an empty intent set')
   const owner = getAddress(intents[0].account)
diff --git a/pages/position/[number]/repay.vue b/pages/position/[number]/repay.vue
index 2b0f12a9f..f1ef924fd 100644
--- a/pages/position/[number]/repay.vue
+++ b/pages/position/[number]/repay.vue
@@ -20,6 +20,7 @@ import { isOperationBlocked } from '~/utils/operationGuardRegistry'
 import type { DisabledReasonInfo } from '~/components/entities/vault/form/types'
 import { isRoeStateApplicable, resolvePositionRoeCollateralVaults, resolveRoeCollateralVaultsByAddresses } from '~/utils/position-roe'
 import { COWSWAP_BATCH_UNSUPPORTED_REASON, isCowProviderOrQuote } from '~/entities/cowswap'
+import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 const _route = useRoute()
 const _router = useRouter()
@@ -250,13 +251,14 @@ const addToBatchWithoutWarnings = async () => {
       const quoteIntents = walletSwap.quotes.selectedQuoteCard.value?.quote === quote
         ? walletSwap.quotes.selectedQuoteCard.value.intents
         : undefined
+      const currentIntent = walletSwap.createRepayIntent(quote, {
+        selectedAsset: swapAsset,
+        direction: swapDirection,
+        isFullRepay: isClosing,
+      })
       await addBatchEntry({
         label: `Repay-swap ${inSymbol} → ${borrowSymbol}`,
-        intent: quoteIntents?.[0] ?? walletSwap.createRepayIntent(quote, {
-          selectedAsset: swapAsset,
-          direction: swapDirection,
-          isFullRepay: isClosing,
-        }),
+        intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
         subAccount: position.value.subAccount as Address,
         affectedSubAccounts: getFullRepayAffectedSubAccounts(isClosing),
         nameOverride: `Repay ${borrowSymbol}`,
@@ -303,17 +305,19 @@ const addToBatchWithoutWarnings = async () => {
     const quoteIntents = quote && collateral.quotes.selectedQuoteCard.value?.quote === quote
       ? collateral.quotes.selectedQuoteCard.value.intents
       : undefined
+    const currentIntent = collateral.createRepayIntent(quote, {
+      sourceVault,
+      sourceAccount,
+      amount: sourceAmount,
+      debtAmount: sourceDebtAmount,
+      direction: sourceDirection,
+      isSameAsset,
+    })
     await addBatchEntry({
       label: `Repay from ${srcSymbol} collateral → ${borrowSymbol}`,
-      intent: quoteIntents?.[0] ?? collateral.createRepayIntent(quote, {
-        sourceVault,
-        sourceAccount,
-        amount: sourceAmount,
-        debtAmount: sourceDebtAmount,
-        direction: sourceDirection,
-        isSameAsset,
-      }),
+      intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
       subAccount: position.value.subAccount as Address,
+      sourceSubAccount: sourceAccount,
       affectedSubAccounts: collateral.isCrossPositionSource.value
         ? getAffectedSubAccounts(position.value.subAccount, sourceAccount)
         : getFullRepayAffectedSubAccounts(isClosing),
@@ -339,17 +343,19 @@ const addToBatchWithoutWarnings = async () => {
     const quoteIntents = quote && savings.quotes.selectedQuoteCard.value?.quote === quote
       ? savings.quotes.selectedQuoteCard.value.intents
       : undefined
+    const currentIntent = savings.createRepayIntent(quote, {
+      sourceVault,
+      sourceSubAccount,
+      amount: sourceAmount,
+      debtAmount: sourceDebtAmount,
+      direction: sourceDirection,
+      isSameAsset,
+    })
     await addBatchEntry({
       label: `Repay from ${srcSymbol} savings → ${borrowSymbol}`,
-      intent: quoteIntents?.[0] ?? savings.createRepayIntent(quote, {
-        sourceVault,
-        sourceSubAccount,
-        amount: sourceAmount,
-        debtAmount: sourceDebtAmount,
-        direction: sourceDirection,
-        isSameAsset,
-      }),
+      intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
       subAccount: position.value.subAccount as Address,
+      sourceSubAccount: sourceSubAccount as Address | undefined,
       affectedSubAccounts: getFullRepayAffectedSubAccounts(isClosing, sourceSubAccount),
       review: { type: 'repay', asset: sourceVault.asset, amount: sourceAmount, swapToAsset: borrowVault.value.asset, quoteFetchedAt: isSameAsset ? null : savings.quotes.effectiveQuoteFetchedAt.value },
     })
diff --git a/tests/composables/useCollateralSwapRepay.test.ts b/tests/composables/useCollateralSwapRepay.test.ts
index 031666eed..f88ab385a 100644
--- a/tests/composables/useCollateralSwapRepay.test.ts
+++ b/tests/composables/useCollateralSwapRepay.test.ts
@@ -4,9 +4,10 @@ import { SwapperMode, type Account, type EVault, type IHasVaultAddress, type Por
 import type { Address } from 'viem'
 import { useCollateralSwapRepay } from '~/composables/repay/useCollateralSwapRepay'
 
-const { USER, SOURCE_ACCOUNT, SOURCE_VAULT, sourceVault, borrowVault, position, sourcePosition, planAccount, mocks } = vi.hoisted(() => {
+const { USER, SOURCE_ACCOUNT, SECOND_SOURCE_ACCOUNT, SOURCE_VAULT, sourceVault, borrowVault, position, sourcePosition, planAccount, mocks } = vi.hoisted(() => {
   const USER = '0x0000000000000000000000000000000000000001' as Address
   const SOURCE_ACCOUNT = '0x0000000000000000000000000000000000000006' as Address
+  const SECOND_SOURCE_ACCOUNT = '0x0000000000000000000000000000000000000007' as Address
   const SOURCE_VAULT = '0x0000000000000000000000000000000000000002' as Address
   const SOURCE_ASSET = '0x0000000000000000000000000000000000000003' as Address
   const BORROW_VAULT = '0x0000000000000000000000000000000000000004' as Address
@@ -72,6 +73,7 @@ const { USER, SOURCE_ACCOUNT, SOURCE_VAULT, sourceVault, borrowVault, position,
   return {
     USER,
     SOURCE_ACCOUNT,
+    SECOND_SOURCE_ACCOUNT,
     SOURCE_VAULT,
     sourceVault,
     borrowVault,
@@ -81,6 +83,7 @@ const { USER, SOURCE_ACCOUNT, SOURCE_VAULT, sourceVault, borrowVault, position,
     mocks: {
       getCollateralApySnapshot: vi.fn(),
       createIntent: vi.fn(),
+      openReview: vi.fn(),
       planRepayFromSource: vi.fn(),
       crossPositionItems: [] as Array<Record<string, unknown>>,
       quoteInstances: [] as Array<{
@@ -211,11 +214,12 @@ describe('useCollateralSwapRepay', () => {
 
   beforeEach(() => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: mocks.createIntent }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    vi.stubGlobal('useExecutionReview', () => ({ open: mocks.openReview }))
     vi.clearAllMocks()
     mocks.quoteInstances.length = 0
     mocks.crossPositionItems.length = 0
     mocks.createIntent.mockImplementation(input => input)
+    mocks.openReview.mockResolvedValue({})
     mocks.planRepayFromSource.mockResolvedValue([])
     mocks.getCollateralApySnapshot.mockResolvedValue({
       supplyUsd: 1_000,
@@ -403,4 +407,83 @@ describe('useCollateralSwapRepay', () => {
       subAccounts: [USER, SOURCE_ACCOUNT],
     }))
   })
+
+  it('keeps intent, preflight, and review on one source snapshot when selection changes mid-preparation', async () => {
+    const selectionId = `${SOURCE_ACCOUNT.toLowerCase()}:${borrowVault.address.toLowerCase()}`
+    const secondSelectionId = `${SECOND_SOURCE_ACCOUNT.toLowerCase()}:${borrowVault.address.toLowerCase()}`
+    for (const [id, sourceAccount] of [
+      [selectionId, SOURCE_ACCOUNT],
+      [secondSelectionId, SECOND_SOURCE_ACCOUNT],
+    ] as const) {
+      mocks.crossPositionItems.push({
+        id,
+        vault: borrowVault,
+        sourceAccount,
+        assets: 2_500n,
+        shares: 2_500n,
+        option: {
+          selectionId: id,
+          type: 'vault',
+          amount: 2_500,
+          price: 2_500,
+          vaultAddress: borrowVault.address,
+          subAccount: sourceAccount,
+        },
+      })
+    }
+
+    let resolveSimulation: ((result: boolean) => void) | undefined
+    const runSimulation = vi.fn(() => new Promise<boolean>((resolve) => {
+      resolveSimulation = resolve
+    }))
+    const repay = scope.run(() => useCollateralSwapRepay({
+      position: shallowRef<PortfolioBorrowPosition<VaultEntity> | undefined>(position),
+      borrowVault: computed(() => borrowVault),
+      collateralVault: computed(() => sourceVault),
+      formTab: ref('collateral'),
+      plan: ref<TransactionPlan | null>(null),
+      isSubmitting: ref(false),
+      isPreparing: ref(false),
+      slippage: ref(0.5),
+      clearSimulationError: vi.fn(),
+      runSimulation,
+      getCurrentDebt: () => position.borrowed,
+      isEligibleForLiquidation: computed(() => false),
+    }))!
+
+    repay.initVault(sourceVault)
+    repay.onSourceVaultChange(0)
+    repay.amount.value = '2000'
+    await nextTick()
+    expect(repay.amount.value).toBe('2000')
+    const submitting = repay.submit()
+    await vi.waitFor(() => expect(runSimulation).toHaveBeenCalled())
+    repay.onSourceVaultChange(1)
+    repay.amount.value = '1000'
+    await nextTick()
+    resolveSimulation?.(true)
+    await submitting
+
+    expect(mocks.planRepayFromSource).toHaveBeenCalledWith(expect.objectContaining({
+      receiver: USER,
+      fromVault: borrowVault.address,
+      fromAccount: SOURCE_ACCOUNT,
+    }))
+    expect(mocks.openReview).toHaveBeenCalledWith([
+      expect.objectContaining({
+        args: expect.objectContaining({
+          receiver: USER,
+          fromVault: borrowVault.address,
+          fromAccount: SOURCE_ACCOUNT,
+        }),
+      }),
+    ], expect.objectContaining({
+      review: expect.objectContaining({
+        amount: '2000',
+        subAccount: USER,
+        sourceSubAccount: SOURCE_ACCOUNT,
+      }),
+    }))
+    expect(repay.selectedSourceAccount.value).toBe(SECOND_SOURCE_ACCOUNT)
+  })
 })
diff --git a/tests/composables/useExecutionReview.test.ts b/tests/composables/useExecutionReview.test.ts
index 3179e2fa3..bf6e7796c 100644
--- a/tests/composables/useExecutionReview.test.ts
+++ b/tests/composables/useExecutionReview.test.ts
@@ -59,7 +59,7 @@ describe('useExecutionReview', () => {
 
     expect(prepare).toHaveBeenCalledWith([], {
       presentationKind: 'migration',
-      presentationInputs: review,
+      presentationInputs: expect.objectContaining(review),
     })
     expect(modalOpen).toHaveBeenCalledOnce()
     expect(modalOpen.mock.calls[0]?.[1].props.review).toMatchObject({
@@ -71,6 +71,47 @@ describe('useExecutionReview', () => {
     })
   })
 
+  it('captures presentation inputs before asynchronous preparation', async () => {
+    let resolvePrepare: ((value: {
+      execution: { reviewId: Hash, reviewDigest: Hash }
+      prepared: TransactionPlanPrepared
+    }) => void) | undefined
+    const executablePrepared = { chainId: 1, plan: [{ type: 'executable' }] } as unknown as TransactionPlanPrepared
+    const prepare = vi.fn(() => new Promise<{
+      execution: { reviewId: Hash, reviewDigest: Hash }
+      prepared: TransactionPlanPrepared
+    }>((resolve) => {
+      resolvePrepare = resolve
+    }))
+    vi.stubGlobal('useReviewedExecution', () => ({ prepare }))
+    const review = {
+      asset: { address: '0x2000000000000000000000000000000000000000', symbol: 'USDC', decimals: 6 },
+      amount: '1',
+      type: 'repay',
+    }
+
+    const opening = useExecutionReview().open([], {
+      presentationKind: 'repay',
+      review,
+    })
+    review.amount = '2'
+    review.asset.symbol = 'DAI'
+    resolvePrepare?.({ execution: { reviewId, reviewDigest }, prepared: executablePrepared })
+    await opening
+
+    expect(prepare).toHaveBeenCalledWith([], {
+      presentationKind: 'repay',
+      presentationInputs: expect.objectContaining({
+        amount: '1',
+        asset: expect.objectContaining({ symbol: 'USDC' }),
+      }),
+    })
+    expect(modalOpen.mock.calls[0]?.[1].props.review).toMatchObject({
+      amount: '1',
+      asset: { symbol: 'USDC' },
+    })
+  })
+
   it('opens a non-executable prepared preview in spy mode', async () => {
     isSpyMode.value = true
     const readOnlyPrepared = { chainId: 1, plan: [{ type: 'preview' }] } as unknown as TransactionPlanPrepared
diff --git a/tests/composables/useSavingsRepay.test.ts b/tests/composables/useSavingsRepay.test.ts
index a3c607fff..bfd804854 100644
--- a/tests/composables/useSavingsRepay.test.ts
+++ b/tests/composables/useSavingsRepay.test.ts
@@ -61,6 +61,8 @@ const { USER, SAVINGS_USER_B, VAULT, sameVault, borrowVault, planAccount, mocks
         reset: ReturnType<typeof vi.fn>
       }>,
       getSavingsPosition: vi.fn(),
+      createIntent: vi.fn(),
+      openReview: vi.fn(),
       planRepayFromSource: vi.fn(),
       runSimulation: vi.fn(),
       getCollateralApySnapshot: vi.fn(),
@@ -230,12 +232,14 @@ const position = {
 
 describe('useSavingsRepay', () => {
   beforeEach(() => {
-    vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    vi.stubGlobal('useOperationIntentFactory', () => ({ create: mocks.createIntent }))
+    vi.stubGlobal('useExecutionReview', () => ({ open: mocks.openReview }))
     vi.clearAllMocks()
     mocks.swapQuoteOptions.length = 0
     mocks.swapQuoteInstances.length = 0
     mocks.healthOptions.length = 0
+    mocks.createIntent.mockImplementation(input => input)
+    mocks.openReview.mockResolvedValue({})
     mocks.planRepayFromSource.mockResolvedValue({ type: 'repay-plan' } as unknown as TransactionPlan)
     mocks.getCollateralApySnapshot.mockResolvedValue({
       supplyUsd: 0,
@@ -558,4 +562,58 @@ describe('useSavingsRepay', () => {
       },
     ))
   })
+
+  it('keeps a selected savings account bound to intent and review during deferred simulation', async () => {
+    let resolveSimulation: ((result: boolean) => void) | undefined
+    mocks.runSimulation.mockImplementationOnce(() => new Promise<boolean>((resolve) => {
+      resolveSimulation = resolve
+    }))
+    const repay = useSavingsRepay({
+      position: shallowRef<PortfolioBorrowPosition<VaultEntity> | undefined>(position),
+      borrowVault: computed(() => sameVault),
+      collateralVault: computed(() => sameVault),
+      formTab: ref('savings'),
+      plan: ref(null),
+      isSubmitting: ref(false),
+      isPreparing: ref(false),
+      slippage: ref(0.5),
+      oraclePriceRatio: computed(() => 1),
+      clearSimulationError: vi.fn(),
+      runSimulation: mocks.runSimulation,
+      getCurrentDebt: () => position.borrowed,
+      collateralSupplyApy: computed(() => 0),
+      borrowApy: computed(() => 0),
+      borrowRewardApy: computed(() => 0),
+    })
+
+    repay.initVault()
+    repay.onSourceVaultChange(1)
+    repay.amount.value = '100'
+    const submitting = repay.submit()
+    await vi.waitFor(() => expect(mocks.runSimulation).toHaveBeenCalled())
+    repay.onSourceVaultChange(0)
+    repay.amount.value = '50'
+    resolveSimulation?.(true)
+    await submitting
+
+    expect(mocks.planRepayFromSource).toHaveBeenCalledWith(expect.objectContaining({
+      receiver: USER,
+      fromAccount: SAVINGS_USER_B,
+    }))
+    expect(mocks.openReview).toHaveBeenCalledWith([
+      expect.objectContaining({
+        args: expect.objectContaining({
+          receiver: USER,
+          fromAccount: SAVINGS_USER_B,
+        }),
+      }),
+    ], expect.objectContaining({
+      review: expect.objectContaining({
+        amount: '100',
+        subAccount: USER,
+        sourceSubAccount: SAVINGS_USER_B,
+      }),
+    }))
+    expect(repay.selectedSavingSubAccount.value).toBe(USER)
+  })
 })
diff --git a/tests/composables/useTxBatch.test.ts b/tests/composables/useTxBatch.test.ts
index 4cd5f5c90..996fed335 100644
--- a/tests/composables/useTxBatch.test.ts
+++ b/tests/composables/useTxBatch.test.ts
@@ -1473,9 +1473,18 @@ describe('useTxBatch execution errors', () => {
     const warmed = { execution: { reviewId: '0x01' }, previewPlan: [], prepared: {} }
     executionMocks.prepare.mockResolvedValue(warmed as never)
 
-    await batch.addEntry({ intent, label: 'Supply USDC', subAccount, review: { type: 'supply' } })
+    await batch.addEntry({ intent, label: 'Supply USDC', subAccount, sourceSubAccount: owner, review: { type: 'supply' } })
     await vi.waitFor(() => expect(executionMocks.prepare).toHaveBeenCalledOnce())
 
+    expect(executionMocks.prepare).toHaveBeenCalledWith([intent], expect.objectContaining({
+      presentationInputs: [{
+        id: intent.intentId,
+        review: { type: 'supply' },
+        subAccount,
+        sourceSubAccount: owner,
+      }],
+    }))
+
     await expect(batch.prepareBatchExecutionReview()).resolves.toBe(warmed)
     expect(executionMocks.prepare).toHaveBeenCalledOnce()
   })
diff --git a/tests/reviewed-execution/intent-factory.test.ts b/tests/reviewed-execution/intent-factory.test.ts
index f509a5e52..099c4e89e 100644
--- a/tests/reviewed-execution/intent-factory.test.ts
+++ b/tests/reviewed-execution/intent-factory.test.ts
@@ -1,7 +1,7 @@
 import { getAddress, isAddress, zeroAddress } from 'viem'
 import { describe, expect, it } from 'vitest'
 import { createOperationIntent } from '~/features/reviewed-execution/domain/factory'
-import { collectPlanningRequirements } from '~/features/reviewed-execution/planning/requirements'
+import { collectPlanningRequirements, selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 import { TEST_ACCOUNT, TEST_TOKEN, TEST_VAULT } from './fixtures'
 import { makeSwapQuote } from './swap-quote.test-fixture'
 
@@ -99,4 +99,23 @@ describe('operation intent factory', () => {
       ...requirements.assets,
     ]).not.toContain(zeroAddress)
   })
+
+  it('adopts warmed intents only when their execution semantics match the clicked form', () => {
+    const create = (amount: bigint, createdAt: number, intentId: string) => createOperationIntent({
+      kind: 'deposit',
+      planner: 'deposit',
+      args: { vaultAddress: TEST_VAULT, assetAddress: TEST_TOKEN, amount },
+      chainId: 1,
+      account: TEST_ACCOUNT,
+      source: 'test',
+      createdAt,
+      intentId,
+    })
+    const warmed = [create(12n, 1, 'intent-warmed')]
+    const equivalentClick = [create(12n, 2, 'intent-click')]
+    const changedClick = [create(13n, 3, 'intent-changed')]
+
+    expect(selectMatchingPreparedIntents(warmed, equivalentClick)).toBe(warmed)
+    expect(selectMatchingPreparedIntents(warmed, changedClick)).toBe(changedClick)
+  })
 })
diff --git a/tests/reviewed-execution/inventory.test.ts b/tests/reviewed-execution/inventory.test.ts
index 62c4a2f27..481c6f546 100644
--- a/tests/reviewed-execution/inventory.test.ts
+++ b/tests/reviewed-execution/inventory.test.ts
@@ -194,8 +194,8 @@ describe('Stage A transaction inventory', () => {
 
 describe('review compatibility fixtures', () => {
   const fixtures = [
-    { path: 'components/entities/operation/OperationReviewModal.vue', templateOnly: true, sha256: 'a6b35defabe1c9610b482e63c9c5d9c77b1ffcbd2b78c5d67a4f96516c8a1f2d' },
-    { path: 'components/BatchReviewModal.vue', templateOnly: true, sha256: '14a568abd87d8fe644749c84a5f63396276d098db123f2cffb9853c18d06d9cd' },
+    { path: 'components/entities/operation/OperationReviewModal.vue', templateOnly: true, sha256: 'a440cb822e6dd8d581a30b3ae6f1dc81cbbe1131c092396bfba16b43e52e147c' },
+    { path: 'components/BatchReviewModal.vue', templateOnly: true, sha256: 'ab044f518c5fec9e2e47cd2b8765d5cbc96b56991b81ad0d21f2110fb77f538e' },
     { path: 'utils/stepDecoding.ts', templateOnly: false, sha256: '6b91c9d294290692982531800909cfbb9827125a916b85ce7febc8d0fd48e8e6' },
     { path: 'utils/batchReviewDisplay.ts', templateOnly: false, sha256: 'c8e892115e9bba21ad695b5cdd158e6b69d8aefc9ceb3c5aaae2faf17128ade4' },
   ] as const
@@ -216,4 +216,12 @@ describe('review compatibility fixtures', () => {
 
     expect(templates).not.toMatch(/pyth|feed\s*id|payload\s*hash|max(?:imum)?\s*fee|freshness/i)
   })
+
+  it('shows a distinct supplying position in direct and batch review', () => {
+    const direct = read('components/entities/operation/OperationReviewModal.vue')
+    const batch = read('components/BatchReviewModal.vue')
+
+    expect(direct).toContain('{{ sourcePositionTag }}')
+    expect(batch).toContain('sourcePositionTag(entry.sourceSubAccount, entry.subAccount)')
+  })
 })
diff --git a/tests/utils/position-tag.test.ts b/tests/utils/position-tag.test.ts
new file mode 100644
index 000000000..be73f7bc1
--- /dev/null
+++ b/tests/utils/position-tag.test.ts
@@ -0,0 +1,21 @@
+import { describe, expect, it } from 'vitest'
+import { getSubAccountAddress } from '@eulerxyz/euler-v2-sdk'
+import { getSourcePositionTag } from '~/utils/positionTag'
+
+const OWNER = '0x0000000000000000000000000000000000000001'
+const POSITION_ONE = getSubAccountAddress(OWNER, 1)
+const POSITION_TWO = getSubAccountAddress(OWNER, 2)
+
+describe('position review tags', () => {
+  it('identifies a distinct supplying position', () => {
+    expect(getSourcePositionTag(OWNER, POSITION_TWO, POSITION_ONE)).toBe('From Position 2')
+  })
+
+  it('identifies deposits used to fund another position', () => {
+    expect(getSourcePositionTag(OWNER, OWNER, POSITION_ONE)).toBe('From Deposits')
+  })
+
+  it('omits a source label when the operation uses its target position', () => {
+    expect(getSourcePositionTag(OWNER, POSITION_ONE, POSITION_ONE)).toBeUndefined()
+  })
+})
diff --git a/utils/positionTag.ts b/utils/positionTag.ts
new file mode 100644
index 000000000..71cf0c66c
--- /dev/null
+++ b/utils/positionTag.ts
@@ -0,0 +1,29 @@
+import { getAddress } from 'viem'
+import { getSubAccountId } from '@eulerxyz/euler-v2-sdk'
+
+export const getPositionTag = (owner?: string, subAccount?: string): string | undefined => {
+  if (!owner || !subAccount) return undefined
+  try {
+    const index = getSubAccountId(getAddress(owner), getAddress(subAccount))
+    return index === 0 ? 'Deposits' : `Position ${index}`
+  }
+  catch {
+    return undefined
+  }
+}
+
+export const getSourcePositionTag = (
+  owner?: string,
+  sourceSubAccount?: string,
+  targetSubAccount?: string,
+): string | undefined => {
+  if (!owner || !sourceSubAccount) return undefined
+  try {
+    if (targetSubAccount && getAddress(sourceSubAccount) === getAddress(targetSubAccount)) return undefined
+  }
+  catch {
+    return undefined
+  }
+  const sourceTag = getPositionTag(owner, sourceSubAccount)
+  return sourceTag ? `From ${sourceTag}` : undefined
+}

From 44c10d62715e17a48f686ff00f09010340b8954b Mon Sep 17 00:00:00 2001
From: Darek <dariusz@euler.xyz>
Date: Thu, 3 Sep 2026 12:49:11 +0200
Subject: [PATCH 02/12] fix: bind all transaction reviews to action snapshots

---
 .../portfolio/PortfolioSdkRewardItem.vue      |  41 ++---
 .../entities/reward/RewardUnlockItem.vue      |  27 ++-
 composables/borrow/useBorrowForm.ts           | 137 ++++++++-------
 composables/borrow/useMultiplyForm.ts         | 135 +++++++-------
 composables/position/useCollateralForm.ts     | 123 +++++++------
 composables/repay/useCollateralSwapRepay.ts   |  37 ++--
 composables/repay/useSavingsRepay.ts          |  37 ++--
 composables/repay/useWalletRepay.ts           |  35 ++--
 composables/repay/useWalletSwapRepay.ts       | 108 +++++++-----
 composables/useExecutionReview.ts             |  71 +++++---
 composables/useOperationIntentFactory.ts      |  19 +-
 composables/useSwapPageLogic.ts               |  84 ++++-----
 composables/useTxBatch.ts                     |  21 ++-
 docs/transaction-building.md                  |   2 +
 pages/borrow/[collateral]/[borrow]/index.vue  |   2 +-
 pages/earn/[vault]/[subAccount]/withdraw.vue  |  54 +++---
 pages/earn/[vault]/index.vue                  |  40 +++--
 pages/lend/[vault]/[subAccount]/swap.vue      |  20 ++-
 pages/lend/[vault]/[subAccount]/withdraw.vue  |  99 ++++++-----
 pages/lend/[vault]/index.vue                  | 166 +++++++++---------
 pages/position/[number]/borrow/index.vue      |  39 ++--
 pages/position/[number]/borrow/swap.vue       |  79 +++++----
 pages/position/[number]/index.vue             |  27 +--
 pages/position/[number]/migrate.vue           |  11 +-
 pages/position/[number]/multiply.vue          | 162 ++++++++---------
 pages/position/[number]/repay.vue             |  10 +-
 pages/position/[number]/supply.vue            |  16 +-
 pages/position/[number]/withdraw.vue          |  16 +-
 tests/composables/useBorrowForm.test.ts       |  11 +-
 tests/composables/useCollateralForm.test.ts   |   8 +-
 .../useCollateralSwapRepay.test.ts            |   8 +-
 tests/composables/useExecutionReview.test.ts  |  47 ++++-
 tests/composables/useMultiplyForm.test.ts     |  14 +-
 .../useOperationIntentFactory.test.ts         |  22 ++-
 tests/composables/useSavingsRepay.test.ts     |   8 +-
 tests/composables/useSwapPageLogic.test.ts    |  10 +-
 tests/composables/useTxBatch.test.ts          |  42 +++++
 tests/composables/useWalletRepay.test.ts      |   4 +-
 tests/composables/useWalletSwapRepay.test.ts  |   8 +-
 tests/reviewed-execution/inventory.test.ts    |  12 +-
 40 files changed, 1060 insertions(+), 752 deletions(-)

diff --git a/components/entities/portfolio/PortfolioSdkRewardItem.vue b/components/entities/portfolio/PortfolioSdkRewardItem.vue
index db8514a95..f5c0aed38 100644
--- a/components/entities/portfolio/PortfolioSdkRewardItem.vue
+++ b/components/entities/portfolio/PortfolioSdkRewardItem.vue
@@ -40,7 +40,7 @@ const { buildClaimRewardPlan, refreshRewards } = useSdkRewards()
 const { refreshLocks } = useREULLocks()
 const { addEntry: addBatchEntry, entries: batchEntries, entryCount, clearBatch } = useTxBatch()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { getTokenByAddress } = useTokenList()
 const { isSpyMode } = useSpyMode()
 const { settings } = useUserSettings()
@@ -164,26 +164,8 @@ const onClaimClick = async () => {
   try {
     await ensureWalletOnClaimChain()
 
-    try {
-      plan.value = await buildClaimRewardPlan(reward)
-    }
-    catch (e) {
-      logWarn('PortfolioSdkRewardItem/buildPlan', e)
-      plan.value = null
-    }
-
-    if (plan.value) {
-      const ok = await runSimulation(plan.value)
-      if (!ok) return
-    }
-    if (isREULBatchBlocked.value) {
-      error('Clear the current batch before claiming rEUL')
-      return
-    }
-
     const intent = createRewardIntent()
-
-    await openReviewState([intent], {
+    const reviewLaunch = captureReviewState([intent], {
       presentationKind: planKind.value,
       review: {
         type: planKind.value,
@@ -205,6 +187,25 @@ const onClaimClick = async () => {
         logWarn('PortfolioSdkRewardItem/claim', cause)
       },
     })
+
+    try {
+      plan.value = await buildClaimRewardPlan(reward)
+    }
+    catch (e) {
+      logWarn('PortfolioSdkRewardItem/buildPlan', e)
+      plan.value = null
+    }
+
+    if (plan.value) {
+      const ok = await runSimulation(plan.value)
+      if (!ok) return
+    }
+    if (isREULBatchBlocked.value) {
+      error('Clear the current batch before claiming rEUL')
+      return
+    }
+
+    await reviewLaunch.open()
   }
   catch (e) {
     logWarn('PortfolioSdkRewardItem/onClaimClick', e)
diff --git a/components/entities/reward/RewardUnlockItem.vue b/components/entities/reward/RewardUnlockItem.vue
index 5d0d7e1df..6cd61f798 100644
--- a/components/entities/reward/RewardUnlockItem.vue
+++ b/components/entities/reward/RewardUnlockItem.vue
@@ -19,7 +19,7 @@ const { getTokenByAddress } = useTokenList()
 const { buildUnlockREULPlan, reulTokenContractAddress, eulTokenContractAddress, refreshLocks } = useREULLocks()
 const { entryCount, clearBatch } = useTxBatch()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { chainId: siteChainId } = useEulerAddresses()
 const { chainId: walletChainId, switchChain } = useWagmi()
 const { runSimulation, simulationError } = useTransactionPlanSimulation()
@@ -147,6 +147,17 @@ const onUnlockClick = async () => {
       constraints: [{ kind: 'remainder-loss', token: tokenAddress as Address, maximumLoss: reviewedLock.amountToBeBurned }],
       source: 'components/entities/reward/RewardUnlockItem.vue',
     })
+    const reviewLaunch = captureReviewState([intent], {
+      presentationKind: 'reul-unlock',
+      review: getReviewProps(reviewedLock),
+      onSucceeded: async () => {
+        await refreshLocks(true)
+      },
+      onFailed: (cause) => {
+        error('Transaction failed')
+        logWarn('RewardUnlockItem/unlock', cause)
+      },
+    })
 
     const preparation = await prepareREULUnlockPlan(
       reviewedLock,
@@ -169,19 +180,7 @@ const onUnlockClick = async () => {
       return
     }
 
-    await openReviewState([intent], {
-      presentationKind: 'reul-unlock',
-      review: {
-        ...getReviewProps(reviewedLock),
-      },
-      onSucceeded: async () => {
-        await refreshLocks(true)
-      },
-      onFailed: (cause) => {
-        error('Transaction failed')
-        logWarn('RewardUnlockItem/unlock', cause)
-      },
-    })
+    await reviewLaunch.open()
   }
   catch (e) {
     await showPreparationError(e)
diff --git a/composables/borrow/useBorrowForm.ts b/composables/borrow/useBorrowForm.ts
index 6a08510e4..e6a5461d2 100644
--- a/composables/borrow/useBorrowForm.ts
+++ b/composables/borrow/useBorrowForm.ts
@@ -37,6 +37,7 @@ import { getLayeredVault } from '~/composables/useLayeredVaults'
 // re-simulates asynchronously (after the form may have been reset), so the plan
 // must be built from these captured values rather than the live reactive refs.
 export interface BorrowBatchSnapshot {
+  chainId: number
   subAccount: Address
   collateralVault: EVault
   borrowVault: EVault
@@ -50,6 +51,8 @@ export interface BorrowBatchSnapshot {
   quote?: SwapQuote
 }
 
+type BorrowFormSnapshot = Omit<BorrowBatchSnapshot, 'subAccount'>
+
 export interface UseBorrowFormOptions {
   pair: Ref<AnyBorrowVaultPair | undefined>
   borrowVault: ComputedRef<EVault | undefined>
@@ -97,8 +100,8 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
   const modal = useModal()
   const { error } = useToast()
   const { planBorrow, planSwapAndBorrow, prepareTransactionPlan, prefetchPluginData, preloadSubAccountSnapshot } = useEulerTx()
-  const { open: openReviewState } = useExecutionReview()
-  const { create: createIntent } = useOperationIntentFactory()
+  const { capture: captureReviewState } = useExecutionReview()
+  const { capture: captureIntentFactory, create: createIntent } = useOperationIntentFactory()
   const { account: planAccount } = usePlanAccount()
   const { isConnected, isSpyMode, effectiveAddress } = useEffectiveAddress()
   const { chainId } = useEulerAddresses()
@@ -952,7 +955,7 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
       if (!snap.quote || !snap.selectedAsset) throw new Error('No swap quote available')
       const isNative = isNativeCurrencyAddress(snap.selectedAsset.address)
       const inputAmount = valueToNano(snap.collateralAmount || '0', snap.selectedAsset.decimals)
-      const wrappedAddress = isNative ? resolveWrappedNativeAddress(chainId.value!) : null
+      const wrappedAddress = isNative ? resolveWrappedNativeAddress(snap.chainId) : null
       if (isNative && !wrappedAddress) throw new Error('Wrapped native token not found')
       const borrowAmountNano = valueToNano(snap.borrowAmount || '0', snap.borrowVault.shares.decimals)
       return planSwapAndBorrow({
@@ -1014,21 +1017,24 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
             asset: snap.collateralVault.asset.address as Address,
             amount: collateralAmountForPlan,
             wrappedNativeInfo: snap.isBorrowNativeWrap
-              ? { wrappedTokenAddress: resolveWrappedNativeAddress(chainId.value!)!, nativeAmount: collateralAmountForPlan }
+              ? { wrappedTokenAddress: resolveWrappedNativeAddress(snap.chainId)!, nativeAmount: collateralAmountForPlan }
               : undefined,
           },
         })
   }
 
-  const createBorrowIntent = (snap: BorrowBatchSnapshot) => {
+  const createBorrowIntent = (
+    snap: BorrowBatchSnapshot,
+    createCapturedIntent = createIntent,
+  ) => {
     const subAccount = snap.subAccount
     if (snap.needsSwap) {
       if (!snap.quote || !snap.selectedAsset) throw new Error('No swap quote available')
       const isNative = isNativeCurrencyAddress(snap.selectedAsset.address)
       const inputAmount = valueToNano(snap.collateralAmount || '0', snap.selectedAsset.decimals)
-      const wrappedAddress = isNative ? resolveWrappedNativeAddress(chainId.value!) : null
+      const wrappedAddress = isNative ? resolveWrappedNativeAddress(snap.chainId) : null
       if (isNative && !wrappedAddress) throw new Error('Wrapped native token not found')
-      return createIntent({
+      return createCapturedIntent({
         kind: 'borrow',
         planner: 'swap-and-borrow',
         args: {
@@ -1058,7 +1064,7 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
         ? snap.savingCollateral.shares
         : snap.collateralVault.convertToShares(collateralAmount)
     }
-    return createIntent({
+    return createCapturedIntent({
       kind: 'borrow',
       planner: 'borrow',
       args: {
@@ -1076,7 +1082,7 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
               asset: snap.collateralVault.asset.address as Address,
               amount: collateralAmount,
               wrappedNativeInfo: snap.isBorrowNativeWrap
-                ? { wrappedTokenAddress: resolveWrappedNativeAddress(chainId.value!)!, nativeAmount: collateralAmount }
+                ? { wrappedTokenAddress: resolveWrappedNativeAddress(snap.chainId)!, nativeAmount: collateralAmount }
                 : undefined,
             },
       },
@@ -1085,10 +1091,10 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
     })
   }
 
-  const captureBorrowSnapshot = (subAccount: Address): BorrowBatchSnapshot => {
+  const captureBorrowFormSnapshot = (): BorrowFormSnapshot => {
     if (!collateralVault.value || !borrowVault.value) throw new Error('Borrow vaults are not loaded')
     return {
-      subAccount,
+      chainId: chainId.value!,
       collateralVault: collateralVault.value,
       borrowVault: borrowVault.value,
       collateralAmount: collateralAmount.value,
@@ -1102,6 +1108,11 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
     }
   }
 
+  const captureBorrowSnapshot = (
+    subAccount: Address,
+    formSnapshot: BorrowFormSnapshot = captureBorrowFormSnapshot(),
+  ): BorrowBatchSnapshot => ({ subAccount, ...formSnapshot })
+
   const submit = async () => {
     if (isOperationBlocked.value) return
     if (isPreparing.value || isGeoBlocked.value || isBorrowRestricted.value || isBorrowSwapRestricted.value || isBorrowPayWithBlocked.value) return
@@ -1115,20 +1126,47 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
       if (!borrowVault.value || !collateralVault.value) {
         return
       }
+      const formSnapshot = captureBorrowFormSnapshot()
+      const planAccountSnapshot = planAccount.value
+      const capturedChainId = chainId.value!
+      const createSubmitIntent = captureIntentFactory()
+      const quoteFetchedAt = borrowSwapEffectiveQuoteFetchedAt.value
+      const estimatedCollateral = borrowSwapEstimatedCollateral.value
 
       // Swap & borrow path
-      if (borrowNeedsSwap.value && borrowSwapEffectiveQuote.value) {
+      if (formSnapshot.needsSwap && formSnapshot.quote) {
         const subAccount = (await resolvePendingSubAccount()) as Address
-        const snapshot = captureBorrowSnapshot(subAccount)
+        const snapshot = captureBorrowSnapshot(subAccount, formSnapshot)
         // The quote preview may have been prepared before the quote-derived
         // borrow amount settled. Re-capture the authoritative submit snapshot;
         // preview caches are optimizations only, and reviewed execution always
         // recompiles from this fresh DTO.
-        const intents = [createBorrowIntent(snapshot)]
+        const intents = [createBorrowIntent(snapshot, createSubmitIntent)]
+        const isNativeSwap = snapshot.selectedAsset && isNativeCurrencyAddress(snapshot.selectedAsset.address)
+        const reviewAsset = isNativeSwap
+          ? (resolveWrappedNativeAsset(capturedChainId) || snapshot.selectedAsset!)
+          : (snapshot.selectedAsset || snapshot.collateralVault.asset)
+        const reviewLaunch = captureReviewState(intents, {
+          presentationKind: 'swap-borrow',
+          review: {
+            type: 'swap-borrow' as const,
+            asset: reviewAsset,
+            amount: snapshot.collateralAmount,
+            quoteFetchedAt,
+            swapToAsset: snapshot.collateralVault.asset,
+            swapToAmount: estimatedCollateral,
+            swapMode: SwapperMode.EXACT_IN,
+            submittingLabel: 'Submitting...',
+          },
+          onSucceeded: () => finalizeExecutionUi(),
+          onFailed: (cause) => {
+            logWarn('borrow/send', cause)
+            error('Transaction failed')
+          },
+        })
         try {
-          const account = planAccount.value
-          await ensureBorrowSubAccountSnapshot(account, subAccount)
-          plan.value = await buildBorrowPlan(snapshot, account)
+          await ensureBorrowSubAccountSnapshot(planAccountSnapshot, subAccount)
+          plan.value = await buildBorrowPlan(snapshot, planAccountSnapshot)
         }
         catch (e) {
           logWarn('borrow/buildSwapPlan', e)
@@ -1142,40 +1180,34 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
           }
         }
 
-        const isNativeSwap = borrowSelectedAsset.value && isNativeCurrencyAddress(borrowSelectedAsset.value.address)
-        const reviewAsset = isNativeSwap
-          ? (resolveWrappedNativeAsset(chainId.value!) || borrowSelectedAsset.value!)
-          : (borrowSelectedAsset.value || collateralVault.value.asset)
         if (!plan.value) return
-        await openReviewState(intents, {
-          presentationKind: 'swap-borrow',
-          review: {
-            type: 'swap-borrow' as const,
-            asset: reviewAsset,
-            amount: collateralAmount.value,
-            quoteFetchedAt: borrowSwapEffectiveQuoteFetchedAt.value,
-            swapToAsset: collateralVault.value.asset,
-            swapToAmount: borrowSwapEstimatedCollateral.value,
-            swapMode: SwapperMode.EXACT_IN,
-            submittingLabel: 'Submitting...',
-          },
-          onSucceeded: () => finalizeExecutionUi(),
-          onFailed: (cause) => {
-            logWarn('borrow/send', cause)
-            error('Transaction failed')
-          },
-        })
+        await reviewLaunch.open()
         return
       }
 
       // Standard borrow path
       const subAccountAddr = (await resolvePendingSubAccount()) as Address
-      const snapshot = captureBorrowSnapshot(subAccountAddr)
-      const intent = createBorrowIntent(snapshot)
+      const snapshot = captureBorrowSnapshot(subAccountAddr, formSnapshot)
+      const intent = createBorrowIntent(snapshot, createSubmitIntent)
+      const reviewLaunch = captureReviewState([intent], {
+        presentationKind: 'borrow',
+        review: {
+          type: 'borrow',
+          asset: snapshot.borrowVault.asset,
+          amount: snapshot.borrowAmount,
+          supplyingAssetForBorrow: snapshot.collateralVault.asset,
+          supplyingAmount: snapshot.collateralAmount,
+          submittingLabel: 'Submitting...',
+        },
+        onSucceeded: () => finalizeExecutionUi(),
+        onFailed: (cause) => {
+          logWarn('borrow/send', cause)
+          error('Transaction failed')
+        },
+      })
       try {
-        const account = planAccount.value
-        await ensureBorrowSubAccountSnapshot(account, subAccountAddr)
-        plan.value = await buildBorrowPlan(snapshot, account)
+        await ensureBorrowSubAccountSnapshot(planAccountSnapshot, subAccountAddr)
+        plan.value = await buildBorrowPlan(snapshot, planAccountSnapshot)
       }
       catch (e) {
         logWarn('borrow/buildPlan', e)
@@ -1190,22 +1222,7 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
       }
 
       if (!plan.value) return
-      await openReviewState([intent], {
-        presentationKind: 'borrow',
-        review: {
-          type: 'borrow',
-          asset: borrowVault.value?.asset,
-          amount: borrowAmount.value,
-          supplyingAssetForBorrow: collateralVault.value?.asset,
-          supplyingAmount: collateralAmount.value,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: () => finalizeExecutionUi(),
-        onFailed: (cause) => {
-          logWarn('borrow/send', cause)
-          error('Transaction failed')
-        },
-      })
+      await reviewLaunch.open()
     }
     finally {
       isPreparing.value = false
diff --git a/composables/borrow/useMultiplyForm.ts b/composables/borrow/useMultiplyForm.ts
index 123f453cb..90ff8ccf7 100644
--- a/composables/borrow/useMultiplyForm.ts
+++ b/composables/borrow/useMultiplyForm.ts
@@ -88,8 +88,8 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
 
   const { error } = useToast()
   const { planMultiply, prepareTransactionPlan, prefetchPluginData, preloadSubAccountSnapshot } = useEulerTx()
-  const { open: openReviewState } = useExecutionReview()
-  const { create: createIntent } = useOperationIntentFactory()
+  const { capture: captureReviewState } = useExecutionReview()
+  const { capture: captureIntentFactory, create: createIntent } = useOperationIntentFactory()
   const { isConnected, isSpyMode, effectiveAddress } = useEffectiveAddress()
   // State-override knobs: skip balance probing (form validates "Not enough
   // balance"), pass current wallet snapshot, and pre-prime slot hints when the
@@ -264,7 +264,10 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
     })
   }
 
-  const createMultiplyIntent = (snap: MultiplyBatchSnapshot) => {
+  const createMultiplyIntent = (
+    snap: MultiplyBatchSnapshot,
+    createCapturedIntent = createIntent,
+  ) => {
     const supplyAmountNano = valueToNano(snap.inputAmount || '0', snap.supplyVault.asset.decimals)
     let supplyShares: bigint | undefined
     if (snap.isSavingCollateral && snap.savingFrom) {
@@ -281,7 +284,7 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
       collateralAsset: snap.supplyVault.asset.address as Address,
       collateralShareSource,
     }
-    return createIntent({
+    return createCapturedIntent({
       kind: 'borrow',
       planner: snap.quote ? 'multiply-with-swap' : 'multiply-same-asset',
       args: snap.quote
@@ -1264,18 +1267,31 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
       if (!multiplyInputAmount.value || multiplyDebtAmountNano.value <= 0n) return
       if (multiplyErrorText.value) return
 
-      const supplyAmountNano = valueToNano(multiplyInputAmount.value || '0', multiplySupplyVault.value.asset.decimals)
+      const supplyVaultSnapshot = multiplySupplyVault.value
+      const longVaultSnapshot = multiplyLongVault.value
+      const shortVaultSnapshot = multiplyShortVault.value
+      const inputAmountSnapshot = multiplyInputAmount.value
+      const shortAmountSnapshot = multiplyShortAmount.value
+      const longAmountSnapshot = multiplyLongAmount.value
+      const isSavingCollateralSnapshot = isMultiplySavingCollateral.value
+      const savingPositionSnapshot = multiplySavingPosition.value
+      const savingBalanceSnapshot = multiplySavingBalance.value
+      const planAccountSnapshot = planAccount.value
+      const quoteFetchedAt = multiplyEffectiveQuoteFetchedAt.value
+      const selectedQuoteCardSnapshot = multiplySelectedQuoteCard.value
+      const createSubmitIntent = captureIntentFactory()
+      const supplyAmountNano = valueToNano(inputAmountSnapshot || '0', supplyVaultSnapshot.asset.decimals)
       let supplySharesAmount: bigint | undefined
-      if (isMultiplySavingCollateral.value) {
-        if (!multiplySavingPosition.value) {
+      if (isSavingCollateralSnapshot) {
+        if (!savingPositionSnapshot) {
           error('No savings balance for selected collateral')
           return
         }
-        if (multiplySavingPosition.value.assets === supplyAmountNano) {
-          supplySharesAmount = multiplySavingBalance.value
+        if (savingPositionSnapshot.assets === supplyAmountNano) {
+          supplySharesAmount = savingBalanceSnapshot
         }
         else {
-          supplySharesAmount = multiplySupplyVault.value.convertToShares(supplyAmountNano)
+          supplySharesAmount = supplyVaultSnapshot.convertToShares(supplyAmountNano)
         }
         if (!supplySharesAmount || supplySharesAmount <= 0n) {
           error('Unable to resolve savings amount')
@@ -1285,7 +1301,7 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
       const debtAmount = multiplyDebtAmountNano.value
       if (!supplyAmountNano || debtAmount <= 0n) return
 
-      const isSameAsset = normalizeAddress(multiplyLongVault.value.asset.address) === normalizeAddress(multiplyShortVault.value.asset.address)
+      const isSameAsset = normalizeAddress(longVaultSnapshot.asset.address) === normalizeAddress(shortVaultSnapshot.asset.address)
       const quote = isSameAsset ? null : multiplySelectedQuote.value
       if (!isSameAsset && !quote) return
 
@@ -1300,64 +1316,83 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
         return
       }
 
-      const collateralShareSource = isMultiplySavingCollateral.value
+      const collateralShareSource = isSavingCollateralSnapshot
         && supplySharesAmount
-        && multiplySavingPosition.value
+        && savingPositionSnapshot
         ? {
-            from: multiplySavingPosition.value.subAccount as Address,
+            from: savingPositionSnapshot.subAccount as Address,
             shares: supplySharesAmount,
           }
         : undefined
-      const collateralAmount = isMultiplySavingCollateral.value ? 0n : supplyAmountNano
+      const collateralAmount = isSavingCollateralSnapshot ? 0n : supplyAmountNano
       const snapshot: MultiplyBatchSnapshot = {
         subAccount: subAccount as Address,
-        supplyVault: multiplySupplyVault.value,
-        longVault: multiplyLongVault.value,
-        shortVault: multiplyShortVault.value,
-        inputAmount: multiplyInputAmount.value,
+        supplyVault: supplyVaultSnapshot,
+        longVault: longVaultSnapshot,
+        shortVault: shortVaultSnapshot,
+        inputAmount: inputAmountSnapshot,
         debtAmount,
-        isSavingCollateral: isMultiplySavingCollateral.value,
-        savingFrom: multiplySavingPosition.value?.subAccount as Address | undefined,
-        savingAssets: multiplySavingPosition.value?.assets,
-        savingShares: multiplySavingPosition.value?.shares,
+        isSavingCollateral: isSavingCollateralSnapshot,
+        savingFrom: savingPositionSnapshot?.subAccount as Address | undefined,
+        savingAssets: savingPositionSnapshot?.assets,
+        savingShares: savingPositionSnapshot?.shares,
         quote: quote ?? undefined,
       }
-      const matchingCard = quote && multiplySelectedQuoteCard.value?.quote === quote
+      const matchingCard = quote && selectedQuoteCardSnapshot?.quote === quote
         && quote.accountIn?.toLowerCase() === subAccount.toLowerCase()
-        ? multiplySelectedQuoteCard.value
+        ? selectedQuoteCardSnapshot
         : null
-      const intents = matchingCard?.intents?.length
-        ? matchingCard.intents
-        : [createMultiplyIntent(snapshot)]
+      const currentIntents = [createMultiplyIntent(snapshot, createSubmitIntent)]
+      const reviewLaunch = captureReviewState(currentIntents, {
+        presentationKind: 'borrow',
+        review: {
+          type: 'borrow',
+          asset: shortVaultSnapshot.asset,
+          amount: shortAmountSnapshot || formatUnits(debtAmount, Number(shortVaultSnapshot.asset.decimals)),
+          quoteFetchedAt: quote ? quoteFetchedAt : null,
+          supplyingAssetForBorrow: supplyVaultSnapshot.asset,
+          supplyingAmount: inputAmountSnapshot,
+          swapToAsset: quote ? longVaultSnapshot.asset : undefined,
+          swapToAmount: quote ? longAmountSnapshot : undefined,
+          swapMode: quote ? SwapperMode.EXACT_IN : undefined,
+          subAccount,
+          submittingLabel: 'Submitting...',
+        },
+        onSucceeded: () => finalizeExecutionUi(),
+        onFailed: (cause) => {
+          logWarn('multiply/send', cause)
+          error('Transaction failed')
+        },
+      }, matchingCard?.intents)
 
       try {
         // Best case: the selected quote was lazily prepared in the background
         // when the user picked it, so we already have an envelope on the card.
         // Skip planMultiply + prepareTransactionPlan entirely.
-        if (planAccount.value) {
+        if (planAccountSnapshot) {
           try {
-            await preloadSubAccountSnapshot(planAccount.value, subAccount as Address)
+            await preloadSubAccountSnapshot(planAccountSnapshot, subAccount as Address)
           }
           catch (e) {
             logWarn('multiply/review/preloadSubAccountSnapshot', e)
           }
         }
-        if (matchingCard?.preparedPlan) {
+        if (matchingCard?.preparedPlan && reviewLaunch.usesPreparedIntents) {
           // Lazy-prepared envelope is available — short-circuit prepare entirely.
           multiplyPlan.value = matchingCard.plan ?? null
           preparedMultiplyPlan.value = matchingCard.preparedPlan as TransactionPlanPrepared
         }
         else {
           // Reuse the raw plan from the selected quote card when possible.
-          const cachedPlan = matchingCard?.plan
-          const account = planAccount.value
+          const cachedPlan = reviewLaunch.usesPreparedIntents ? matchingCard?.plan : undefined
+          const account = planAccountSnapshot
           multiplyPlan.value = cachedPlan ?? await profAsync('review', 'planMultiply', () => planMultiply({
-            collateralVault: multiplySupplyVault.value!.address as Address,
+            collateralVault: supplyVaultSnapshot.address as Address,
             collateralAmount,
-            collateralAsset: multiplySupplyVault.value!.asset.address as Address,
+            collateralAsset: supplyVaultSnapshot.asset.address as Address,
             collateralShareSource,
-            longVault: multiplyLongVault.value!.address as Address,
-            liabilityVault: multiplyShortVault.value!.address as Address,
+            longVault: longVaultSnapshot.address as Address,
+            liabilityVault: shortVaultSnapshot.address as Address,
             liabilityAmount: debtAmount,
             receiver: subAccount as Address,
             swapQuote: quote ?? undefined,
@@ -1365,7 +1400,7 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
             account,
             subAccountSnapshotApplied: Boolean(account),
           }))
-          preparedMultiplyPlan.value = await profAsync('review', 'prepareTransactionPlan', () => prepareTransactionPlan(multiplyPlan.value!, { account, intents }))
+          preparedMultiplyPlan.value = await profAsync('review', 'prepareTransactionPlan', () => prepareTransactionPlan(multiplyPlan.value!, { account, intents: reviewLaunch.intents }))
         }
       }
       catch (e) {
@@ -1375,33 +1410,13 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
       }
 
       if (preparedMultiplyPlan.value) {
-        const ok = await profAsync('review', 'runPreparedSimulation', () => runMultiplySimulation(preparedMultiplyPlan.value!, buildMultiplyStateOverrideOptions(), undefined, intents))
+        const ok = await profAsync('review', 'runPreparedSimulation', () => runMultiplySimulation(preparedMultiplyPlan.value!, buildMultiplyStateOverrideOptions(), undefined, reviewLaunch.intents))
         if (!ok) return
       }
 
       profMark('review', 'submitMultiply.modalOpen')
       if (!multiplyPlan.value) return
-      await openReviewState(intents, {
-        presentationKind: 'borrow',
-        review: {
-          type: 'borrow',
-          asset: multiplyShortVault.value.asset,
-          amount: multiplyShortAmount.value || formatUnits(debtAmount, Number(multiplyShortVault.value.asset.decimals)),
-          quoteFetchedAt: quote ? multiplyEffectiveQuoteFetchedAt.value : null,
-          supplyingAssetForBorrow: multiplySupplyVault.value.asset,
-          supplyingAmount: multiplyInputAmount.value,
-          swapToAsset: quote ? multiplyLongVault.value.asset : undefined,
-          swapToAmount: quote ? multiplyLongAmount.value : undefined,
-          swapMode: quote ? SwapperMode.EXACT_IN : undefined,
-          subAccount,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: () => finalizeExecutionUi(),
-        onFailed: (cause) => {
-          logWarn('multiply/send', cause)
-          error('Transaction failed')
-        },
-      })
+      await reviewLaunch.open()
     }
     finally {
       isMultiplyPreparing.value = false
diff --git a/composables/position/useCollateralForm.ts b/composables/position/useCollateralForm.ts
index 24721b4eb..55aa08953 100644
--- a/composables/position/useCollateralForm.ts
+++ b/composables/position/useCollateralForm.ts
@@ -126,7 +126,7 @@ export const useCollateralForm = (options: UseCollateralFormOptions) => {
   const { error } = useToast()
   const submitLabel = options.reviewLabel
   const { prepareTransactionPlan, prefetchPluginData } = useEulerTx()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   const usePreparedPipeline = options.usePreparedPipeline ?? true
   // `effectiveBalance` is form-validated in `isSubmitDisabled`. In supply mode that
   // is the wallet ERC20 balance, so `noBalanceOverride: true` saves a balanceOf
@@ -971,23 +971,32 @@ export const useCollateralForm = (options: UseCollateralFormOptions) => {
     }
   }
 
-  const buildRawPlan = async (): Promise<TransactionPlan | null> => {
-    if (!collateralVault.value?.address || !asset.value?.address) return null
-    if (options.needsSwap.value && swapEffectiveQuote.value) {
-      return options.buildSwapPlan(swapEffectiveQuote.value, {
-        vaultAddress: collateralVault.value.address,
-        amountNano: valueToNano(amount.value || '0', asset.value.decimals),
-        slippage: swapSlippage.value,
-        subAccount: position.value?.subAccount,
-        account: planAccount.value,
+  const buildRawPlan = async (snapshot: {
+    vaultAddress: string
+    assetAddress: string
+    assetDecimals: number
+    amount: string
+    needsSwap: boolean
+    quote?: SwapQuote
+    slippage: number
+    subAccount?: string
+    account?: Account<IHasVaultAddress>
+  }): Promise<TransactionPlan | null> => {
+    if (snapshot.needsSwap && snapshot.quote) {
+      return options.buildSwapPlan(snapshot.quote, {
+        vaultAddress: snapshot.vaultAddress,
+        amountNano: valueToNano(snapshot.amount || '0', snapshot.assetDecimals),
+        slippage: snapshot.slippage,
+        subAccount: snapshot.subAccount,
+        account: snapshot.account,
       })
     }
     return options.buildDirectPlan({
-      vaultAddress: collateralVault.value.address,
-      assetAddress: asset.value.address,
-      amountNano: valueToNano(amount.value || '0', asset.value.decimals),
-      subAccount: position.value?.subAccount,
-      account: planAccount.value,
+      vaultAddress: snapshot.vaultAddress,
+      assetAddress: snapshot.assetAddress,
+      amountNano: valueToNano(snapshot.amount || '0', snapshot.assetDecimals),
+      subAccount: snapshot.subAccount,
+      account: snapshot.account,
     })
   }
 
@@ -1011,29 +1020,66 @@ export const useCollateralForm = (options: UseCollateralFormOptions) => {
       || isInputAssetBlocked.value
       || isOutputAssetBlocked.value
       || isOutputAssetRestricted.value) return
+    if (!collateralVault.value?.address || !asset.value?.address) return
+
+    const needsSwap = options.needsSwap.value
+    const quote = needsSwap ? swapEffectiveQuote.value ?? undefined : undefined
+    const reviewAsset = options.getReviewAsset(needsSwap)
+    if (!reviewAsset) return
+    const snapshot = Object.freeze({
+      vaultAddress: collateralVault.value.address,
+      assetAddress: asset.value.address,
+      assetDecimals: asset.value.decimals,
+      amount: amount.value,
+      needsSwap,
+      quote,
+      slippage: swapSlippage.value,
+      subAccount: position.value?.subAccount,
+      hasBorrows: (position.value?.borrowed || 0n) > 0n,
+      account: planAccount.value,
+      reviewType: needsSwap ? options.swapReviewType : options.reviewType,
+      reviewAsset,
+      swapToAsset: needsSwap ? options.getSwapToAsset() : undefined,
+      swapToAmount: needsSwap ? swapEstimatedOutput.value : undefined,
+      quoteFetchedAt: needsSwap ? swapEffectiveQuoteFetchedAt.value : null,
+    })
+    const currentIntents = [options.createReviewIntent(quote)]
+    const preparedSwapPlan = usePreparedPipeline && needsSwap ? getSelectedPreparedSwapPlan() : null
+    const reviewLaunch = captureReviewState(currentIntents, {
+      presentationKind: snapshot.reviewType,
+      review: {
+        type: snapshot.reviewType,
+        asset: snapshot.reviewAsset,
+        amount: snapshot.amount,
+        quoteFetchedAt: snapshot.quoteFetchedAt,
+        subAccount: snapshot.subAccount,
+        hasBorrows: snapshot.hasBorrows,
+        swapToAsset: snapshot.swapToAsset,
+        swapToAmount: snapshot.swapToAmount,
+        swapMode: snapshot.needsSwap ? SwapperMode.EXACT_IN : undefined,
+        submittingLabel: 'Submitting...',
+      },
+      onSucceeded: () => finalizeExecutionUi(options.onAfterSend),
+      onFailed: (cause) => {
+        logWarn('collateral/send', cause)
+        error('Transaction failed')
+      },
+    }, preparedSwapPlan?.intents)
     isPreparing.value = true
     try {
       await guardWithPriceImpact(async () => {
-        if (!collateralVault.value?.address || !asset.value?.address) return
-
         plan.value = null
         preparedPlan.value = null
-        let intents: readonly OperationIntent[]
         try {
-          const preparedSwapPlan = usePreparedPipeline ? getSelectedPreparedSwapPlan() : null
-          if (preparedSwapPlan) {
+          if (preparedSwapPlan && reviewLaunch.usesPreparedIntents) {
             plan.value = preparedSwapPlan.plan
             preparedPlan.value = preparedSwapPlan.prepared
-            intents = preparedSwapPlan.intents?.length
-              ? preparedSwapPlan.intents
-              : [options.createReviewIntent(swapEffectiveQuote.value ?? undefined)]
           }
           else {
-            intents = [options.createReviewIntent(options.needsSwap.value ? swapEffectiveQuote.value ?? undefined : undefined)]
-            const rawPlan = await buildRawPlan()
+            const rawPlan = await buildRawPlan(snapshot)
             plan.value = rawPlan
             if (rawPlan && usePreparedPipeline) {
-              preparedPlan.value = await prepareTransactionPlan(rawPlan, { account: planAccount.value, intents })
+              preparedPlan.value = await prepareTransactionPlan(rawPlan, { account: snapshot.account, intents: reviewLaunch.intents })
             }
           }
         }
@@ -1052,7 +1098,7 @@ export const useCollateralForm = (options: UseCollateralFormOptions) => {
 
         if (usePreparedPipeline) {
           if (!preparedPlan.value) return
-          const ok = await runPreparedSimulation(preparedPlan.value, buildCollateralStateOverrideOptions(), undefined, intents)
+          const ok = await runPreparedSimulation(preparedPlan.value, buildCollateralStateOverrideOptions(), undefined, reviewLaunch.intents)
           if (!ok) return
         }
         else if (plan.value) {
@@ -1060,29 +1106,8 @@ export const useCollateralForm = (options: UseCollateralFormOptions) => {
           if (!ok) return
         }
 
-        const reviewAsset = options.getReviewAsset(options.needsSwap.value)
-        const reviewType = options.needsSwap.value ? options.swapReviewType : options.reviewType
         if (!plan.value) return
-        await openReviewState(intents, {
-          presentationKind: reviewType,
-          review: {
-            type: reviewType,
-            asset: reviewAsset,
-            amount: amount.value,
-            quoteFetchedAt: options.needsSwap.value ? swapEffectiveQuoteFetchedAt.value : null,
-            subAccount: position.value?.subAccount,
-            hasBorrows: (position.value?.borrowed || 0n) > 0n,
-            swapToAsset: options.needsSwap.value ? options.getSwapToAsset() : undefined,
-            swapToAmount: options.needsSwap.value ? swapEstimatedOutput.value : undefined,
-            swapMode: options.needsSwap.value ? SwapperMode.EXACT_IN : undefined,
-            submittingLabel: 'Submitting...',
-          },
-          onSucceeded: () => finalizeExecutionUi(options.onAfterSend),
-          onFailed: (cause) => {
-            logWarn('collateral/send', cause)
-            error('Transaction failed')
-          },
-        })
+        await reviewLaunch.open()
       })
     }
     finally {
diff --git a/composables/repay/useCollateralSwapRepay.ts b/composables/repay/useCollateralSwapRepay.ts
index 7dd2efc55..5d792890a 100644
--- a/composables/repay/useCollateralSwapRepay.ts
+++ b/composables/repay/useCollateralSwapRepay.ts
@@ -33,7 +33,6 @@ import { COWSWAP_ORDER_DEADLINE_SECONDS, getCowSwapChainConfig, getCowSwapQuoteO
 import { type CowSwapClosePositionExecuteParams, useCowSwapClosePositionExecution, useCowSwapOrderStatus, openCowSwapReviewModal } from '~/composables/cowswap'
 import { formatNumber, trimTrailingZeros } from '~/utils/string-utils'
 import { getEulerSdkFresh } from '~/composables/useEulerSdk'
-import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 interface UseCollateralSwapRepayOptions {
   position: Ref<PortfolioBorrowPosition<VaultEntity> | undefined>
@@ -83,7 +82,7 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
   const { isConnected, address, isSpyMode, effectiveAddress } = useEffectiveAddress()
   const { planRepayFromSource, prefetchPluginData } = useEulerTx()
   const { create: createIntent } = useOperationIntentFactory()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   // Collateral-swap repay consumes vault collateral, not wallet ERC20 — safe to
   // skip balance overrides. Slot hints + wallet snapshot still help allowance
   // overrides without firing the balance branch.
@@ -862,28 +861,13 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
         ? core.quotes.selectedQuoteCard.value.intents
         : undefined
       const currentIntents = [createRepayIntent(quote, snapshot)]
-      const intents = selectMatchingPreparedIntents(quoteIntents, currentIntents)
       const inputDisplay = getRepaySwapReviewInputAmount({
         amount: snapshot.amount!,
         quote,
         sourceDecimals: snapshot.sourceVault!.asset.decimals,
         swapperMode: snapshot.direction!,
       })
-      try {
-        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
-      }
-      catch (e) {
-        logWarn('collateralSwapRepay/buildPlan', e)
-        plan.value = null
-      }
-
-      if (plan.value) {
-        const ok = await runSimulation(plan.value, buildRepayStateOverrideOptions())
-        if (!ok) return
-      }
-
-      if (!plan.value) return
-      await openReviewState(intents, {
+      const reviewLaunch = captureReviewState(currentIntents, {
         presentationKind: 'repay',
         review: {
           type: 'repay',
@@ -903,7 +887,22 @@ export const useCollateralSwapRepay = (options: UseCollateralSwapRepayOptions) =
           error('Transaction failed')
           logWarn('collateralSwapRepay/send', cause)
         },
-      })
+      }, quoteIntents)
+      try {
+        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
+      }
+      catch (e) {
+        logWarn('collateralSwapRepay/buildPlan', e)
+        plan.value = null
+      }
+
+      if (plan.value) {
+        const ok = await runSimulation(plan.value, buildRepayStateOverrideOptions())
+        if (!ok) return
+      }
+
+      if (!plan.value) return
+      await reviewLaunch.open()
     }
     finally {
       isPreparing.value = false
diff --git a/composables/repay/useSavingsRepay.ts b/composables/repay/useSavingsRepay.ts
index 9c6b85521..5d9eddf3f 100644
--- a/composables/repay/useSavingsRepay.ts
+++ b/composables/repay/useSavingsRepay.ts
@@ -21,7 +21,6 @@ import { createRaceGuard } from '~/utils/race-guard'
 import { findBlockingDisabledOp, OP_REPAY_WITH_SHARES, OP_SKIM, OP_TRANSFER, OP_WITHDRAW, type PlannedOp } from '~/utils/vault-hooks'
 import { getPlanHookDisabledWarning, getUtilisationWarning, type VaultWarning } from '~/composables/useVaultWarnings'
 import type { CollateralApySnapshot } from '~/composables/usePositionCollateralApy'
-import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 interface UseSavingsRepayOptions {
   position: Ref<PortfolioBorrowPosition<VaultEntity> | undefined>
@@ -77,7 +76,7 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
   const { isConnected, isSpyMode, effectiveAddress } = useEffectiveAddress()
   const { planRepayFromSource, prefetchPluginData } = useEulerTx()
   const { create: createIntent } = useOperationIntentFactory()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   const { account: planAccount } = usePlanAccount()
   const { getVault: registryGetVault } = useVaultRegistry()
   const { finalizeExecutionUi } = useTxFinalization()
@@ -543,7 +542,6 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
         ? core.quotes.selectedQuoteCard.value.intents
         : undefined
       const currentIntents = [createRepayIntent(quote, snapshot)]
-      const intents = selectMatchingPreparedIntents(quoteIntents, currentIntents)
       const transferAmounts: Record<string, string> = {}
       if (collateralSnapshot && positionSupplied) {
         const addr = collateralSnapshot.address.toLowerCase()
@@ -555,21 +553,7 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
         sourceDecimals: snapshot.sourceVault!.asset.decimals,
         swapperMode: snapshot.direction!,
       })
-      try {
-        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
-      }
-      catch (e) {
-        logWarn('savingsRepay/buildPlan', e)
-        plan.value = null
-      }
-
-      if (plan.value) {
-        const ok = await runSimulation(plan.value)
-        if (!ok) return
-      }
-
-      if (!plan.value) return
-      await openReviewState(intents, {
+      const reviewLaunch = captureReviewState(currentIntents, {
         presentationKind: 'repay',
         review: {
           type: 'repay',
@@ -590,7 +574,22 @@ export const useSavingsRepay = (options: UseSavingsRepayOptions) => {
           error('Transaction failed')
           logWarn('savingsRepay/send', cause)
         },
-      })
+      }, quoteIntents)
+      try {
+        plan.value = await buildRepayPlan(quote, planAccountSnapshot, snapshot)
+      }
+      catch (e) {
+        logWarn('savingsRepay/buildPlan', e)
+        plan.value = null
+      }
+
+      if (plan.value) {
+        const ok = await runSimulation(plan.value)
+        if (!ok) return
+      }
+
+      if (!plan.value) return
+      await reviewLaunch.open()
     }
     finally {
       isPreparing.value = false
diff --git a/composables/repay/useWalletRepay.ts b/composables/repay/useWalletRepay.ts
index 0156a7a40..7df0b2fae 100644
--- a/composables/repay/useWalletRepay.ts
+++ b/composables/repay/useWalletRepay.ts
@@ -65,7 +65,7 @@ export const useWalletRepay = (options: UseWalletRepayOptions) => {
 
   const { error } = useToast()
   const { planRepayFromWallet } = useEulerTx()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   const { create: createIntent } = useOperationIntentFactory()
   const { account: planAccount } = usePlanAccount()
   const { primeSlotHintsFor } = useStateOverrideOptions()
@@ -186,6 +186,22 @@ export const useWalletRepay = (options: UseWalletRepayOptions) => {
         source: 'position/repay-wallet:review',
         subAccounts: [args.receiver],
       })
+      const reviewLaunch = captureReviewState([intent], {
+        presentationKind: 'repay',
+        review: {
+          type: 'repay',
+          asset: borrowVault.value.asset,
+          amount: amount.value,
+          subAccount: args.receiver,
+          hasBorrows: currentDebt > 0n,
+          submittingLabel: 'Submitting...',
+        },
+        onSucceeded: () => finalizeExecutionUi(),
+        onFailed: (cause) => {
+          error('Transaction failed')
+          logWarn('walletRepay/send', cause)
+        },
+      })
 
       try {
         plan.value = await planRepayFromWallet({ ...args, account: planAccount.value })
@@ -201,22 +217,7 @@ export const useWalletRepay = (options: UseWalletRepayOptions) => {
       }
 
       if (!plan.value) return
-      await openReviewState([intent], {
-        presentationKind: 'repay',
-        review: {
-          type: 'repay',
-          asset: borrowVault.value.asset,
-          amount: amount.value,
-          subAccount: position.value?.subAccount,
-          hasBorrows: (position.value?.borrowed || 0n) > 0n,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: () => finalizeExecutionUi(),
-        onFailed: (cause) => {
-          error('Transaction failed')
-          logWarn('walletRepay/send', cause)
-        },
-      })
+      await reviewLaunch.open()
     }
     finally {
       isPreparing.value = false
diff --git a/composables/repay/useWalletSwapRepay.ts b/composables/repay/useWalletSwapRepay.ts
index ad4abc34b..6c27ab0e8 100644
--- a/composables/repay/useWalletSwapRepay.ts
+++ b/composables/repay/useWalletSwapRepay.ts
@@ -54,6 +54,9 @@ interface UseWalletSwapRepayOptions {
 
 interface WalletSwapRepayPlanSnapshot {
   selectedAsset?: VaultAsset
+  borrowVault?: EVault
+  repayAccount?: Address
+  chainId?: number
   direction?: SwapperMode
   isFullRepay?: boolean
 }
@@ -78,7 +81,7 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
   const { error } = useToast()
   const { planSwapAndRepay, prefetchPluginData } = useEulerTx()
   const { create: createIntent } = useOperationIntentFactory()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   // EXACT_IN validates wallet balance up front (`isSubmitDisabled` line ~306);
   // TARGET_DEBT lets the simulator surface real wallet insufficiency rather
   // than forging it. Skip balance overrides + keep slot hints + wallet
@@ -884,7 +887,9 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
   ): Promise<TransactionPlan> {
     const swapQuote = quote || quotes.selectedQuote.value
     const repaymentAsset = snapshot.selectedAsset ?? selectedAsset.value
-    if (!position.value || !borrowVault.value || !collateralVault.value || !swapQuote || !repaymentAsset) {
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const repayAccount = snapshot.repayAccount ?? position.value?.subAccount as Address | undefined
+    if (!liability || !repayAccount || !swapQuote || !repaymentAsset) {
       throw new Error('Missing data for swap repay plan')
     }
 
@@ -892,7 +897,7 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
     const inputAmount = getSwapInputAmount(swapQuote, swapMode)
 
     const isNative = isNativeCurrencyAddress(repaymentAsset.address)
-    const wrappedAddress = isNative ? resolveWrappedNativeAddress(chainId.value!) : null
+    const wrappedAddress = isNative ? resolveWrappedNativeAddress(snapshot.chainId ?? chainId.value!) : null
     if (isNative && !wrappedAddress) {
       throw new Error('Wrapped native token not found')
     }
@@ -902,8 +907,8 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
       swapQuote,
       amount: inputAmount,
       tokenIn: (wrappedAddress || repaymentAsset.address) as Address,
-      liabilityVault: borrowVault.value.address as Address,
-      repayAccount: (position.value.subAccount || effectiveAddress.value || zeroAddress) as Address,
+      liabilityVault: liability.address as Address,
+      repayAccount,
       isMax: repayAll,
       cleanupOnMax: repayAll,
       wrappedNativeInfo: isNative && wrappedAddress
@@ -919,15 +924,17 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
   ) {
     const swapQuote = quote || quotes.selectedQuote.value
     const repaymentAsset = snapshot.selectedAsset ?? selectedAsset.value
-    if (!position.value || !borrowVault.value || !swapQuote || !repaymentAsset) {
+    const liability = snapshot.borrowVault ?? borrowVault.value
+    const repayAccount = snapshot.repayAccount
+      ?? (position.value?.subAccount || effectiveAddress.value || zeroAddress) as Address
+    if (!liability || !swapQuote || !repaymentAsset) {
       throw new Error('Missing data for swap repay intent')
     }
     const swapMode = snapshot.direction ?? direction.value
     const inputAmount = getSwapInputAmount(swapQuote, swapMode)
     const isNative = isNativeCurrencyAddress(repaymentAsset.address)
-    const wrappedAddress = isNative ? resolveWrappedNativeAddress(chainId.value!) : null
+    const wrappedAddress = isNative ? resolveWrappedNativeAddress(snapshot.chainId ?? chainId.value!) : null
     if (isNative && !wrappedAddress) throw new Error('Wrapped native token not found')
-    const repayAccount = (position.value.subAccount || effectiveAddress.value || zeroAddress) as Address
     const repayAll = snapshot.isFullRepay ?? isFullRepay.value
     return createIntent({
       kind: 'repay',
@@ -936,7 +943,7 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
         swapQuote,
         amount: inputAmount,
         tokenIn: (wrappedAddress || repaymentAsset.address) as Address,
-        liabilityVault: borrowVault.value.address as Address,
+        liabilityVault: liability.address as Address,
         repayAccount,
         isMax: repayAll,
         cleanupOnMax: repayAll,
@@ -958,49 +965,50 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
 
     isPreparing.value = true
     try {
-      const quoteIntents = quotes.selectedQuoteCard.value?.quote === quotes.selectedQuote.value
+      const quote = quotes.selectedQuote.value
+      const capturedAmount = amount.value
+      const capturedDebtAmount = debtAmount.value
+      const capturedDirection = direction.value
+      const capturedDebt = position.value.borrowed || 0n
+      const capturedChainId = chainId.value!
+      const snapshot: WalletSwapRepayPlanSnapshot = Object.freeze({
+        selectedAsset: selectedAsset.value,
+        borrowVault: borrowVault.value,
+        repayAccount: position.value.subAccount as Address,
+        chainId: capturedChainId,
+        direction: capturedDirection,
+        isFullRepay: isFullRepay.value,
+      })
+      const quoteIntents = quotes.selectedQuoteCard.value?.quote === quote
         ? quotes.selectedQuoteCard.value.intents
         : undefined
-      const intents = quoteIntents?.length ? quoteIntents : [createRepayIntent()]
-      try {
-        plan.value = await buildRepayPlan()
-      }
-      catch (e) {
-        logWarn('walletSwapRepay/buildPlan', e)
-        plan.value = null
-        error('Unable to prepare transaction')
-        return
-      }
-
-      if (!plan.value) return
-
-      const ok = await runSimulation(plan.value, buildRepayStateOverrideOptions())
-      if (!ok) return
-
-      // For review modal: show input token as primary asset, borrow asset as swap target
+      const currentIntents = [createRepayIntent(quote, snapshot)]
       const inputDisplay = getRepaySwapReviewInputAmount({
-        amount: amount.value,
-        quote: quotes.selectedQuote.value,
-        sourceDecimals: selectedAsset.value.decimals,
-        swapperMode: direction.value,
+        amount: capturedAmount,
+        quote,
+        sourceDecimals: snapshot.selectedAsset!.decimals,
+        swapperMode: capturedDirection,
       })
-
-      const isNativeRepay = isNativeCurrencyAddress(selectedAsset.value.address)
+      const isNativeRepay = isNativeCurrencyAddress(snapshot.selectedAsset!.address)
       const reviewAsset = isNativeRepay
-        ? (resolveWrappedNativeAsset(chainId.value!) || selectedAsset.value)
-        : selectedAsset.value
-      await openReviewState(intents, {
+        ? (resolveWrappedNativeAsset(capturedChainId) || snapshot.selectedAsset!)
+        : snapshot.selectedAsset!
+      const minimumOutput = BigInt(quote.amountOutMin || 0)
+      const estimatedOutput = minimumOutput > 0n
+        ? formatUnits(minimumOutput, Number(snapshot.borrowVault!.asset.decimals))
+        : ''
+      const reviewLaunch = captureReviewState(currentIntents, {
         presentationKind: 'repay',
         review: {
           type: 'repay',
           asset: reviewAsset,
           amount: inputDisplay,
           quoteFetchedAt: quotes.effectiveQuoteFetchedAt.value,
-          swapToAsset: borrowVault.value.asset,
-          swapToAmount: direction.value === SwapperMode.TARGET_DEBT ? debtAmount.value : swapEstimatedOutput.value,
-          swapMode: direction.value,
-          subAccount: position.value?.subAccount,
-          hasBorrows: (position.value?.borrowed || 0n) > 0n,
+          swapToAsset: snapshot.borrowVault!.asset,
+          swapToAmount: capturedDirection === SwapperMode.TARGET_DEBT ? capturedDebtAmount : estimatedOutput,
+          swapMode: capturedDirection,
+          subAccount: snapshot.repayAccount,
+          hasBorrows: capturedDebt > 0n,
           submittingLabel: 'Submitting...',
         },
         onSucceeded: () => finalizeExecutionUi(),
@@ -1008,7 +1016,23 @@ export const useWalletSwapRepay = (options: UseWalletSwapRepayOptions) => {
           error('Transaction failed')
           logWarn('walletSwapRepay/send', cause)
         },
-      })
+      }, quoteIntents)
+      try {
+        plan.value = await buildRepayPlan(quote, planAccount.value, snapshot)
+      }
+      catch (e) {
+        logWarn('walletSwapRepay/buildPlan', e)
+        plan.value = null
+        error('Unable to prepare transaction')
+        return
+      }
+
+      if (!plan.value) return
+
+      const ok = await runSimulation(plan.value, buildRepayStateOverrideOptions())
+      if (!ok) return
+
+      await reviewLaunch.open()
     }
     finally {
       isPreparing.value = false
diff --git a/composables/useExecutionReview.ts b/composables/useExecutionReview.ts
index d3666be2f..cc00fc143 100644
--- a/composables/useExecutionReview.ts
+++ b/composables/useExecutionReview.ts
@@ -3,6 +3,8 @@ import type { TransactionPlanPrepared } from '@eulerxyz/euler-v2-sdk'
 import { OperationReviewModal, ReviewedOperationModal } from '#components'
 import { useModal } from '~/components/ui/composables/useModal'
 import type { OperationIntent } from '~/features/reviewed-execution/domain/intents'
+import { deepFreezeSerializable } from '~/features/reviewed-execution/domain/canonical'
+import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 import type { SubmissionResult } from '~/features/reviewed-execution/coordinator/coordinator'
 
 export interface ReviewPresentation extends Record<string, unknown> {
@@ -21,6 +23,14 @@ export interface OpenExecutionReviewOptions {
   onFailed?: (cause: unknown) => void | Promise<void>
 }
 
+export interface CapturedExecutionReview {
+  /** Immutable click-time intent set used for authoritative preparation. */
+  intents: readonly OperationIntent[]
+  /** True only when the warmed intent set was semantically identical. */
+  usesPreparedIntents: boolean
+  open: () => Promise<{ reviewId: Hash, reviewDigest: Hash }>
+}
+
 const clonePresentationValue = (value: unknown): unknown => {
   if (value === null || typeof value !== 'object') return value
   if (Array.isArray(value)) return Object.freeze(value.map(clonePresentationValue))
@@ -47,29 +57,23 @@ export const useExecutionReview = () => {
   const execution = useReviewedExecution()
   const { isSpyMode } = useEffectiveAddress()
 
-  const open = async (
+  const openCaptured = async (
     intents: readonly OperationIntent[],
     options: OpenExecutionReviewOptions,
   ): Promise<{ reviewId: Hash, reviewDigest: Hash }> => {
-    // Callers may keep editing reactive form state while preparation awaits.
-    // Only this synchronous copy is bound to and rendered by the review.
-    const capturedOptions: OpenExecutionReviewOptions = {
-      ...options,
-      review: captureReviewPresentation(options.review),
-    }
     if (isSpyMode.value) {
       const prepared = await execution.prepareReadOnly(intents, {
-        presentationKind: capturedOptions.presentationKind,
-        presentationInputs: capturedOptions.review,
+        presentationKind: options.presentationKind,
+        presentationInputs: options.review,
       })
       modal.open(OperationReviewModal, {
         props: {
-          ...capturedOptions.review,
+          ...options.review,
           plan: undefined,
           prepared: prepared.prepared,
           calldataPrepared: prepared.prepared,
-          tenderlyPrepared: capturedOptions.tenderlyPrepared ?? prepared.prepared,
-          tenderlyStateOverrides: capturedOptions.tenderlyStateOverrides,
+          tenderlyPrepared: options.tenderlyPrepared ?? prepared.prepared,
+          tenderlyStateOverrides: options.tenderlyStateOverrides,
           reviewedAccount: prepared.execution.requestSet.wallet.account,
           reviewedWalletKind: prepared.execution.requestSet.wallet.walletKind,
           reviewedRequests: prepared.execution.requestSet.requests,
@@ -83,8 +87,8 @@ export const useExecutionReview = () => {
       }
     }
     const prepared = await execution.prepare(intents, {
-      presentationKind: capturedOptions.presentationKind,
-      presentationInputs: capturedOptions.review,
+      presentationKind: options.presentationKind,
+      presentationInputs: options.review,
     })
     const reviewId = prepared.execution.reviewId
     const reviewDigest = prepared.execution.reviewDigest
@@ -93,23 +97,46 @@ export const useExecutionReview = () => {
         reviewId,
         reviewDigest,
         review: {
-          ...capturedOptions.review,
+          ...options.review,
           plan: undefined,
           prepared: prepared.prepared,
           calldataPrepared: prepared.prepared,
-          tenderlyPrepared: capturedOptions.tenderlyPrepared ?? prepared.prepared,
-          tenderlyStateOverrides: capturedOptions.tenderlyStateOverrides,
+          tenderlyPrepared: options.tenderlyPrepared ?? prepared.prepared,
+          tenderlyStateOverrides: options.tenderlyStateOverrides,
         },
-        onConfirmed: capturedOptions.onConfirmed,
-        onResult: capturedOptions.onResult,
+        onConfirmed: options.onConfirmed,
+        onResult: options.onResult,
         onSucceeded: async (result: SubmissionResult) => {
-          await capturedOptions.onSucceeded?.(result)
+          await options.onSucceeded?.(result)
         },
-        onFailed: capturedOptions.onFailed,
+        onFailed: options.onFailed,
       },
     })
     return { reviewId, reviewDigest }
   }
 
-  return { open }
+  /**
+   * Seal intent and presentation state synchronously at the trusted form-action
+   * boundary. Warmed intent DTOs are retained only when their transaction
+   * semantics exactly match the freshly captured click-time intents.
+   */
+  const capture = (
+    currentIntents: readonly OperationIntent[],
+    options: OpenExecutionReviewOptions,
+    preparedIntents?: readonly OperationIntent[],
+  ): CapturedExecutionReview => {
+    const selectedIntents = selectMatchingPreparedIntents(preparedIntents, currentIntents)
+    const intents = deepFreezeSerializable(selectedIntents) as readonly OperationIntent[]
+    const capturedOptions: OpenExecutionReviewOptions = Object.freeze({
+      ...options,
+      review: captureReviewPresentation(options.review),
+    })
+    return Object.freeze({
+      intents,
+      usesPreparedIntents: preparedIntents !== undefined && selectedIntents === preparedIntents,
+      open: () => openCaptured(intents, capturedOptions),
+    })
+  }
+
+  return { capture }
 }
diff --git a/composables/useOperationIntentFactory.ts b/composables/useOperationIntentFactory.ts
index 33145da78..44f54df3b 100644
--- a/composables/useOperationIntentFactory.ts
+++ b/composables/useOperationIntentFactory.ts
@@ -28,14 +28,19 @@ export const useOperationIntentFactory = () => {
   const { chainId: browsedChainId } = useEulerAddresses()
   const chainId = computed(() => wagmiChainId.value ?? browsedChainId.value)
 
-  const create = (input: ConnectedOperationIntentInput): Readonly<OperationIntent> => {
+  const capture = () => {
     if (!effectiveAddress.value || !chainId.value) throw new Error('Wallet is not connected')
-    return createOperationIntent({
-      ...input,
-      account: getAddress(effectiveAddress.value),
-      chainId: chainId.value,
-    })
+    const account = getAddress(effectiveAddress.value)
+    const capturedChainId = chainId.value
+    return (input: ConnectedOperationIntentInput): Readonly<OperationIntent> =>
+      createOperationIntent({
+        ...input,
+        account,
+        chainId: capturedChainId,
+      })
   }
 
-  return { create }
+  const create = (input: ConnectedOperationIntentInput): Readonly<OperationIntent> => capture()(input)
+
+  return { capture, create }
 }
diff --git a/composables/useSwapPageLogic.ts b/composables/useSwapPageLogic.ts
index 4503d10a3..19b88d13b 100644
--- a/composables/useSwapPageLogic.ts
+++ b/composables/useSwapPageLogic.ts
@@ -103,7 +103,7 @@ export const useSwapPageLogic = (options: UseSwapPageLogicOptions) => {
   const { isConnected } = useWagmi()
   const { isSpyMode } = useSpyMode()
   const { prepareTransactionPlan, prefetchPluginData } = useEulerTx()
-  const { open: openReviewState } = useExecutionReview()
+  const { capture: captureReviewState } = useExecutionReview()
   const modal = useModal()
   const { error: showError } = useToast()
   const { runSimulation, runPreparedSimulation, simulationError, clearSimulationError } = useTransactionPlanSimulation()
@@ -514,37 +514,60 @@ export const useSwapPageLogic = (options: UseSwapPageLogicOptions) => {
   }
 
   const currentPlanAccount = () => getPlanAccount?.() ?? defaultPlanAccount.value
-  const currentPlanContext = (): SwapQuotePlanContext => {
-    const account = currentPlanAccount()
-    return typeof account === 'string' ? {} : { account }
-  }
 
   // ── Submit flow ────────────────────────────────────────────────────────
   const submit = async () => {
     if (isOperationBlocked.value) return
     if (isPreparing.value || isGeoBlocked.value) return
+    if (isSubmitting.value || !fromVault.value) return
+    const sameAsset = isSameAsset.value
+    const selectedQuoteSnapshot = sameAsset ? undefined : selectedQuote.value ?? undefined
+    if (!sameAsset && !selectedQuoteSnapshot) return
+    const fromAsset = fromVault.value.asset
+    const toAsset = toVault.value?.asset
+    const capturedFromAmount = fromAmount.value
+    const capturedToAmount = toAmount.value
+    const capturedQuoteFetchedAt = effectiveQuoteFetchedAt.value
+    const planAccountSnapshot = currentPlanAccount()
+    const preparedQuotePlan = getSelectedPreparedQuotePlan()
+    const currentIntents = [createReviewIntent(selectedQuoteSnapshot)]
+    const showSwapAmounts = sameAssetModalType === 'transfer' || !sameAsset
+    const reviewLaunch = captureReviewState(currentIntents, {
+      presentationKind: sameAsset ? sameAssetModalType : 'swap',
+      review: {
+        type: sameAsset ? sameAssetModalType : 'swap',
+        asset: fromAsset,
+        amount: capturedFromAmount,
+        swapToAsset: showSwapAmounts ? toAsset : undefined,
+        swapToAmount: showSwapAmounts ? capturedToAmount : undefined,
+        swapMode: showSwapAmounts ? swapperMode : undefined,
+        swapEstimatedSide: showSwapAmounts ? reviewSwapEstimatedSide : undefined,
+        quoteFetchedAt: !sameAsset ? capturedQuoteFetchedAt : null,
+        submittingLabel: 'Submitting...',
+      },
+      onSucceeded: () => {
+        setTimeout(() => {
+          router.replace({ path: redirectPath, query: { network: route.query.network } })
+        }, 400)
+      },
+      onFailed: (cause) => {
+        showError('Transaction failed')
+        logWarn('swap/send', cause)
+      },
+    }, preparedQuotePlan?.intents)
     isPreparing.value = true
     try {
       await guardWithPriceImpact(async () => {
-        if (isSubmitting.value || !fromVault.value) return
-        if (!isSameAsset.value && !selectedQuote.value) return
-
         preparedPlan.value = null
         plan.value = null
-        let intents: readonly OperationIntent[]
         try {
-          const preparedQuotePlan = getSelectedPreparedQuotePlan()
-          if (preparedQuotePlan) {
+          if (preparedQuotePlan && reviewLaunch.usesPreparedIntents) {
             plan.value = preparedQuotePlan.plan
             preparedPlan.value = preparedQuotePlan.prepared
-            intents = preparedQuotePlan.intents?.length
-              ? preparedQuotePlan.intents
-              : [createReviewIntent(selectedQuote.value ?? undefined)]
           }
           else {
-            intents = [createReviewIntent(isSameAsset.value ? undefined : selectedQuote.value ?? undefined)]
-            plan.value = await buildPlan(undefined, currentPlanContext())
-            preparedPlan.value = await prepareTransactionPlan(plan.value, { account: currentPlanAccount(), intents })
+            plan.value = await buildPlan(selectedQuoteSnapshot, typeof planAccountSnapshot === 'string' ? {} : { account: planAccountSnapshot })
+            preparedPlan.value = await prepareTransactionPlan(plan.value, { account: planAccountSnapshot, intents: reviewLaunch.intents })
           }
         }
         catch (e) {
@@ -556,7 +579,7 @@ export const useSwapPageLogic = (options: UseSwapPageLogicOptions) => {
         }
 
         if (preparedPlan.value) {
-          const ok = await runPreparedSimulation(preparedPlan.value, buildSwapStateOverrideOptions(), undefined, intents)
+          const ok = await runPreparedSimulation(preparedPlan.value, buildSwapStateOverrideOptions(), undefined, reviewLaunch.intents)
           if (!ok) return
         }
         else if (plan.value) {
@@ -564,31 +587,8 @@ export const useSwapPageLogic = (options: UseSwapPageLogicOptions) => {
           if (!ok) return
         }
 
-        const showSwapAmounts = sameAssetModalType === 'transfer' || !isSameAsset.value
         if (!plan.value) return
-        await openReviewState(intents, {
-          presentationKind: isSameAsset.value ? sameAssetModalType : 'swap',
-          review: {
-            type: isSameAsset.value ? sameAssetModalType : 'swap',
-            asset: fromVault.value.asset,
-            amount: fromAmount.value,
-            swapToAsset: showSwapAmounts ? toVault.value?.asset : undefined,
-            swapToAmount: showSwapAmounts ? toAmount.value : undefined,
-            swapMode: showSwapAmounts ? swapperMode : undefined,
-            swapEstimatedSide: showSwapAmounts ? reviewSwapEstimatedSide : undefined,
-            quoteFetchedAt: !isSameAsset.value ? effectiveQuoteFetchedAt.value : null,
-            submittingLabel: 'Submitting...',
-          },
-          onSucceeded: () => {
-            setTimeout(() => {
-              router.replace({ path: redirectPath, query: { network: route.query.network } })
-            }, 400)
-          },
-          onFailed: (cause) => {
-            showError('Transaction failed')
-            logWarn('swap/send', cause)
-          },
-        })
+        await reviewLaunch.open()
       })
     }
     finally {
diff --git a/composables/useTxBatch.ts b/composables/useTxBatch.ts
index a33470582..612f074ff 100644
--- a/composables/useTxBatch.ts
+++ b/composables/useTxBatch.ts
@@ -33,8 +33,9 @@ import { formatSimulationFailure } from '~/utils/tx-errors'
 import { logWarn } from '~/utils/errorHandling'
 import { buildVisiblePortfolioPositionFilter } from '~/utils/portfolioPositionFilter'
 import type { BatchDraftEntry, OperationIntent } from '~/features/reviewed-execution/domain/intents'
+import { deepFreezeSerializable } from '~/features/reviewed-execution/domain/canonical'
 import { GenerationPublisher } from '~/features/reviewed-execution/planning/cache'
-import { intentSetDigest } from '~/features/reviewed-execution/planning/requirements'
+import { intentSetDigest, selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 export interface BatchWalletChange {
   token: string
@@ -117,7 +118,10 @@ export interface CapturedBatchCompletion {
 }
 
 type BatchEntryInputBase = Omit<BatchEntry, 'id' | 'plan' | 'preparing' | 'preparationError'>
-export type BatchEntryInput = BatchEntryInputBase
+export type BatchEntryInput = BatchEntryInputBase & {
+  /** Optional warmed DTO; adopted only when it matches the fresh intent exactly. */
+  preparedIntent?: OperationIntent
+}
 
 export interface BatchLayer {
   /** Simulated account snapshot after this layer's entry (layer 0 = real). */
@@ -2197,8 +2201,13 @@ export const useTxBatch = () => {
     if (pendingAddSignatures.has(signature)) return
     pendingAddSignatures.add(signature)
 
-    const { intent, ...presentation } = entry
-    const entryId = entry.intent.intentId
+    const { intent: currentIntent, preparedIntent, ...presentation } = entry
+    const selectedIntent = selectMatchingPreparedIntents(
+      preparedIntent ? [preparedIntent] : undefined,
+      [currentIntent],
+    )[0]!
+    const intent = deepFreezeSerializable(selectedIntent) as OperationIntent
+    const entryId = intent.intentId
     const capturedOwner = owner.value
     const capturedChainId = chainId.value
     registerReviewAssetMeta(presentation.review)
@@ -2215,7 +2224,7 @@ export const useTxBatch = () => {
       logBatchDiag('addEntry:building', {
         label: entry.label,
         subAccount: entry.subAccount,
-        intentId: entry.intent.intentId,
+        intentId: intent.intentId,
       })
       // Account-free entries never reach `getEntryPlanningAccount`, so seed layer 0
       // from the prefetched base here too — otherwise resimulate would refetch it.
@@ -2231,7 +2240,7 @@ export const useTxBatch = () => {
           // The simulator will surface the normal account-loading error later.
         }
       }
-      const preview = await compilePreviewForSimulation([entry.intent], await getEntryPlanningAccount())
+      const preview = await compilePreviewForSimulation([intent], await getEntryPlanningAccount())
       const plan = preview.plan
       const cid = chainId.value
       if (cid) {
diff --git a/docs/transaction-building.md b/docs/transaction-building.md
index a76d0cdf6..d472014d2 100644
--- a/docs/transaction-building.md
+++ b/docs/transaction-building.md
@@ -148,6 +148,8 @@ The complete reviewed execution and the visible operation review serve different
 
 Operation review components receive only their existing display inputs plus an opaque reviewed execution binding. They do not receive an execution closure and cannot sign or submit. Acceptance binds the current presentation digest and intent revisions to the sealed reviewed execution; submission uses the reviewed execution's materialized request vector through the coordinator.
 
+Every direct form constructs its fresh intent set and handcrafted presentation from one immutable review-action snapshot before subsequent price-impact checks, planning, preparation, or simulation can yield. A flow that must first resolve an authoritative prerequisite, such as a new sub-account or refreshed migration position, snapshots all user-editable inputs before that await and combines only those captured inputs with the resolved prerequisite. A warmed intent set and its prepared work are reused only when their transaction semantics exactly match the action snapshot; a mismatch compiles the captured intent instead. Batch adds apply the same rule centrally: each caller supplies a fresh add-time intent and may separately offer a warmed intent candidate.
+
 Position-funded operations show the distinct supplying Euler account as `From Position N` or `From Deposits`, alongside the target position context. Both account labels are captured presentation inputs bound to the reviewed intent set.
 
 Do not synthesize generic rows or expose internal targets, selectors, plugin calls, request digests, simulation classifications, cleanup metadata, or authorization machinery. Existing approval and signature presentation remains operation-specific. Unknown or undecodable production calls fail internal sealing instead of creating a fallback review row.
diff --git a/pages/borrow/[collateral]/[borrow]/index.vue b/pages/borrow/[collateral]/[borrow]/index.vue
index 56b476640..21a4f53ce 100644
--- a/pages/borrow/[collateral]/[borrow]/index.vue
+++ b/pages/borrow/[collateral]/[borrow]/index.vue
@@ -336,7 +336,7 @@ const addMultiplyToBatch = async () => {
     const quoteIntents = snap.quote
       ? multiply.multiplyQuoteCardsSorted.value.find(card => card.quote === snap.quote)?.intents
       : undefined
-    await addBatchEntry({ intent: quoteIntents?.[0] ?? multiply.createMultiplyIntent(snap), label: `Multiply → ${longVault.asset.symbol}`, subAccount, multiply: true, review: { type: 'borrow', asset: shortVault.asset, amount: multiply.multiplyInputAmount.value, swapToAsset: longVault.asset, quoteFetchedAt: sameAsset ? null : multiply.multiplyEffectiveQuoteFetchedAt.value } })
+    await addBatchEntry({ intent: multiply.createMultiplyIntent(snap), preparedIntent: quoteIntents?.[0], label: `Multiply → ${longVault.asset.symbol}`, subAccount, multiply: true, review: { type: 'borrow', asset: shortVault.asset, amount: multiply.multiplyInputAmount.value, swapToAsset: longVault.asset, quoteFetchedAt: sameAsset ? null : multiply.multiplyEffectiveQuoteFetchedAt.value } })
     redirectAfterAdd('/portfolio', { subAccount })
   })
 }
diff --git a/pages/earn/[vault]/[subAccount]/withdraw.vue b/pages/earn/[vault]/[subAccount]/withdraw.vue
index 2a2f1c7b2..1a6db55f2 100644
--- a/pages/earn/[vault]/[subAccount]/withdraw.vue
+++ b/pages/earn/[vault]/[subAccount]/withdraw.vue
@@ -19,7 +19,7 @@ const route = useRoute()
 const { error } = useToast()
 const { planWithdrawOrRedeem } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: planAccount } = usePlanAccount()
@@ -139,6 +139,7 @@ const submit = async () => {
     }
 
     const capturedAmount = amount.value
+    const capturedAsset = asset.value
     const isMax = FixedPoint.fromValue(assetsBalance.value, asset.value?.decimals).lte(amountFixed.value)
     const owner = (subAccount.value ?? effectiveAddress.value!) as `0x${string}`
     const plannerArgs = isMax
@@ -151,6 +152,31 @@ const submit = async () => {
       source: 'pages/earn/[vault]/[subAccount]/withdraw.vue',
       subAccounts: [owner],
     })
+    const reviewLaunch = captureReviewState([intent], {
+      presentationKind: 'withdraw',
+      review: {
+        type: 'withdraw',
+        asset: capturedAsset,
+        amount: capturedAmount,
+        submittingLabel: 'Submitting...',
+      },
+      onSucceeded: () => {
+        setTimeout(() => {
+          router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
+        }, 400)
+      },
+      onFailed: (cause) => {
+        error('Transaction failed')
+        console.error('Transaction error:', cause)
+        void reportClientEvent({
+          event: 'tx_execute_failed',
+          flow: 'earn_withdraw',
+          phase: 'execute',
+          operationType: 'withdraw',
+          vaultAddress,
+        }, cause)
+      },
+    })
 
     try {
       plan.value = await planWithdrawOrRedeem({
@@ -182,31 +208,7 @@ const submit = async () => {
       }
     }
 
-    await openReviewState([intent], {
-      presentationKind: 'withdraw',
-      review: {
-        type: 'withdraw',
-        asset: asset.value,
-        amount: capturedAmount,
-        submittingLabel: 'Submitting...',
-      },
-      onSucceeded: () => {
-        setTimeout(() => {
-          router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
-        }, 400)
-      },
-      onFailed: (cause) => {
-        error('Transaction failed')
-        console.error('Transaction error:', cause)
-        void reportClientEvent({
-          event: 'tx_execute_failed',
-          flow: 'earn_withdraw',
-          phase: 'execute',
-          operationType: 'withdraw',
-          vaultAddress,
-        }, cause)
-      },
-    })
+    await reviewLaunch.open()
   }
   finally {
     isPreparing.value = false
diff --git a/pages/earn/[vault]/index.vue b/pages/earn/[vault]/index.vue
index 497110c5a..46c03bc62 100644
--- a/pages/earn/[vault]/index.vue
+++ b/pages/earn/[vault]/index.vue
@@ -21,7 +21,7 @@ const modal = useModal()
 const { error } = useToast()
 const { planDeposit } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: planAccount } = usePlanAccount()
@@ -160,6 +160,7 @@ const submit = async () => {
     }
 
     const capturedAmount = amount.value
+    const capturedAsset = asset.value
     const plannerArgs = {
       vaultAddress: vaultAddress as Address,
       assetAddress: asset.value.address as Address,
@@ -171,27 +172,11 @@ const submit = async () => {
       args: plannerArgs,
       source: 'pages/earn/[vault]/index.vue',
     })
-
-    try {
-      plan.value = await planDeposit({ ...plannerArgs, account: planAccount.value })
-    }
-    catch (e) {
-      console.warn('[OperationReviewModal] failed to build plan', e)
-      plan.value = null
-    }
-
-    if (plan.value) {
-      const ok = await runSimulation(plan.value)
-      if (!ok) {
-        return
-      }
-    }
-
-    await openReviewState([intent], {
+    const reviewLaunch = captureReviewState([intent], {
       presentationKind: 'supply',
       review: {
         type: 'supply',
-        asset: asset.value,
+        asset: capturedAsset,
         amount: capturedAmount,
         submittingLabel: 'Submitting...',
       },
@@ -206,6 +191,23 @@ const submit = async () => {
         console.warn(cause)
       },
     })
+
+    try {
+      plan.value = await planDeposit({ ...plannerArgs, account: planAccount.value })
+    }
+    catch (e) {
+      console.warn('[OperationReviewModal] failed to build plan', e)
+      plan.value = null
+    }
+
+    if (plan.value) {
+      const ok = await runSimulation(plan.value)
+      if (!ok) {
+        return
+      }
+    }
+
+    await reviewLaunch.open()
   }
   finally {
     isPreparing.value = false
diff --git a/pages/lend/[vault]/[subAccount]/swap.vue b/pages/lend/[vault]/[subAccount]/swap.vue
index 4a15beb35..661b5a173 100644
--- a/pages/lend/[vault]/[subAccount]/swap.vue
+++ b/pages/lend/[vault]/[subAccount]/swap.vue
@@ -384,17 +384,19 @@ const addToBatch = async () => {
     const label = sameAsset
       ? `Migrate ${fromAmount.value} ${from.asset.symbol} → ${to.asset.symbol}`
       : `Swap ${fromAmount.value} ${from.asset.symbol} → ${to.asset.symbol}`
+    const intent = createIntent({
+      kind: sameAsset ? 'refinance' : 'collateral',
+      planner: sameAsset ? 'migrate-same-asset-collateral' : 'swap-collateral',
+      args: sameAsset
+        ? { fromVault: fromAddr, toVault: toAddr, amount, positionAccount, toAsset: toAssetAddr, isMax, maxShares }
+        : { swapQuote, swapperMode: SwapperMode.EXACT_IN },
+      source: 'lend/swap:add-to-batch',
+      subAccounts: [positionAccount],
+    })
     await addBatchEntry({
       label,
-      intent: quoteIntents?.[0] ?? createIntent({
-        kind: sameAsset ? 'refinance' : 'collateral',
-        planner: sameAsset ? 'migrate-same-asset-collateral' : 'swap-collateral',
-        args: sameAsset
-          ? { fromVault: fromAddr, toVault: toAddr, amount, positionAccount, toAsset: toAssetAddr, isMax, maxShares }
-          : { swapQuote, swapperMode: SwapperMode.EXACT_IN },
-        source: 'lend/swap:add-to-batch',
-        subAccounts: [positionAccount],
-      }),
+      intent,
+      preparedIntent: quoteIntents?.[0],
       subAccount: positionAccount,
       review: { type: 'swap', asset: from.asset, amount: fromAmount.value, swapToAsset: to.asset, swapMode: SwapperMode.EXACT_IN, quoteFetchedAt: sameAsset ? null : effectiveQuoteFetchedAt.value },
     })
diff --git a/pages/lend/[vault]/[subAccount]/withdraw.vue b/pages/lend/[vault]/[subAccount]/withdraw.vue
index 6ae206f69..428206466 100644
--- a/pages/lend/[vault]/[subAccount]/withdraw.vue
+++ b/pages/lend/[vault]/[subAccount]/withdraw.vue
@@ -42,7 +42,7 @@ const { error } = useToast()
 useFullBalances()
 const { planWithdrawOrRedeem, prepareTransactionPlan, prefetchPluginData } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: cachedAccount } = useFreshAccount()
@@ -484,21 +484,52 @@ const updateBalance = () => {
 const submit = async () => {
   if (isOperationBlocked.value) return
   if (isPreparing.value || isOutputAssetBlocked.value || isOutputAssetRestricted.value) return
+  if (!asset.value?.address) return
+  const capturedAsset = asset.value
+  const capturedAmount = amount.value
+  const isMax = FixedPoint.fromValue(assetsBalance.value, capturedAsset.decimals).lte(amountFixed.value)
+  const owner = (subAccount.value ?? effectiveAddress.value!) as Address
+  const needsSwapSnapshot = needsSwap.value
+  const swapQuote = needsSwapSnapshot ? (swapSelectedQuote.value ?? undefined) : undefined
+  if (needsSwapSnapshot && !swapQuote) return
+  const quoteIntents = swapQuote && !isMax && swapSelectedQuoteCard.value?.quote === swapQuote
+    ? swapSelectedQuoteCard.value.intents
+    : undefined
+  const currentIntents = [createWithdrawIntent(swapQuote, isMax)]
+  const reviewType = needsSwapSnapshot ? 'swap-withdraw' as const : 'withdraw' as const
+  const planAccountSnapshot = cachedAccount.value
+  const sharesSnapshot = sharesBalance.value
+  const assetsSnapshot = amountFixed.value.value
+  const reviewLaunch = captureReviewState(currentIntents, {
+    presentationKind: reviewType,
+    review: {
+      type: reviewType,
+      asset: capturedAsset,
+      amount: capturedAmount,
+      quoteFetchedAt: needsSwapSnapshot ? swapEffectiveQuoteFetchedAt.value : null,
+      swapToAsset: needsSwapSnapshot ? selectedOutputAsset.value : undefined,
+      swapToAmount: needsSwapSnapshot ? swapEstimatedOutput.value : undefined,
+      swapMode: needsSwapSnapshot ? SwapperMode.EXACT_IN : undefined,
+      submittingLabel: 'Submitting...',
+    },
+    onSucceeded: async () => {
+      await invalidateSdkQueries(['queryTokenBalances', 'queryBalanceOf', 'queryNativeBalance'])
+      updateBalance()
+      amount.value = ''
+      preparedPlan.value = null
+      resetSwapQuoteState()
+      setTimeout(() => {
+        router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
+      }, 400)
+    },
+    onFailed: (cause) => {
+      error('Transaction failed')
+      console.warn(cause)
+    },
+  }, quoteIntents)
   isPreparing.value = true
   try {
     await guardWithPriceImpact(async () => {
-      if (!asset.value?.address) {
-        return
-      }
-
-      const isMax = FixedPoint.fromValue(assetsBalance.value, asset.value?.decimals).lte(amountFixed.value)
-      const owner = (subAccount.value ?? effectiveAddress.value!) as Address
-      const swapQuote = needsSwap.value ? (swapSelectedQuote.value ?? undefined) : undefined
-      const quoteIntents = swapQuote && !isMax && swapSelectedQuoteCard.value?.quote === swapQuote
-        ? swapSelectedQuoteCard.value.intents
-        : undefined
-      const intents = quoteIntents?.length ? quoteIntents : [createWithdrawIntent(swapQuote, isMax)]
-
       preparedPlan.value = null
       let rawPlan: TransactionPlan
       try {
@@ -506,17 +537,17 @@ const submit = async () => {
           vaultAddress: vaultAddress as Address,
           owner,
           isMax,
-          shares: sharesBalance.value,
-          assets: amountFixed.value.value,
+          shares: sharesSnapshot,
+          assets: assetsSnapshot,
           swapQuote,
           // Pass the race-replaced cached Account so planWithdraw/planRedeem
           // skip the per-click freshPlanContext.fetchAccount round-trip.
-          account: cachedAccount.value,
+          account: planAccountSnapshot,
         })
         // Run plugins + approval resolution ONCE so simulate/execute (and the
         // modal's display steps) all see the same enriched plan. Without this
         // the SDK would re-run plugins inside simulate, the modal, and execute.
-        preparedPlan.value = await prepareTransactionPlan(rawPlan, { account: cachedAccount.value, intents })
+        preparedPlan.value = await prepareTransactionPlan(rawPlan, { account: planAccountSnapshot, intents: reviewLaunch.intents })
       }
       catch (e) {
         console.warn('[lend/withdraw] failed to build/prepare plan', e)
@@ -525,37 +556,10 @@ const submit = async () => {
       }
 
       // `preparedPlan.value` is non-null here — the try block either set it or returned.
-      const ok = await runPreparedSimulation(preparedPlan.value!, undefined, undefined, intents)
+      const ok = await runPreparedSimulation(preparedPlan.value!, undefined, undefined, reviewLaunch.intents)
       if (!ok) return
 
-      const reviewType = needsSwap.value ? 'swap-withdraw' as const : 'withdraw' as const
-      await openReviewState(intents, {
-        presentationKind: reviewType,
-        review: {
-          type: reviewType,
-          asset: asset.value,
-          amount: amount.value,
-          quoteFetchedAt: needsSwap.value ? swapEffectiveQuoteFetchedAt.value : null,
-          swapToAsset: needsSwap.value ? selectedOutputAsset.value : undefined,
-          swapToAmount: needsSwap.value ? swapEstimatedOutput.value : undefined,
-          swapMode: needsSwap.value ? SwapperMode.EXACT_IN : undefined,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: async () => {
-          await invalidateSdkQueries(['queryTokenBalances', 'queryBalanceOf', 'queryNativeBalance'])
-          updateBalance()
-          amount.value = ''
-          preparedPlan.value = null
-          resetSwapQuoteState()
-          setTimeout(() => {
-            router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
-          }, 400)
-        },
-        onFailed: (cause) => {
-          error('Transaction failed')
-          console.warn(cause)
-        },
-      })
+      await reviewLaunch.open()
     })
   }
   finally {
@@ -594,7 +598,8 @@ const addToBatch = async () => {
         : undefined
       await addBatchEntry({
         label: `Withdraw-swap ${amountLabel} ${asset.value.symbol} → ${outputAsset?.symbol ?? ''}`,
-        intent: quoteIntents?.[0] ?? createWithdrawIntent(quote, false),
+        intent: createWithdrawIntent(quote, false),
+        preparedIntent: quoteIntents?.[0],
         subAccount: ownerAddr,
         review: { type: 'swap-withdraw', asset: asset.value, amount: amountLabel, swapToAsset: outputAsset, swapToAmount: outputAmount, quoteFetchedAt: swapEffectiveQuoteFetchedAt.value },
       })
diff --git a/pages/lend/[vault]/index.vue b/pages/lend/[vault]/index.vue
index 309370e58..d4acef672 100644
--- a/pages/lend/[vault]/index.vue
+++ b/pages/lend/[vault]/index.vue
@@ -77,7 +77,7 @@ const reviewSupplyLabel = 'Review Supply'
 useFullBalances()
 const { planDeposit, planDepositWithSwap, prepareTransactionPlan } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: planAccount } = usePlanAccount()
@@ -540,26 +540,74 @@ function createSupplyIntent(quote?: SwapQuote) {
 const submit = async () => {
   if (isOperationBlocked.value) return
   if (isPreparing.value || reviewSupplyDisabled.value) return
+  if (!asset.value?.address) return
+
+  const needsSwapSnapshot = needsSwap.value
+  const quote = needsSwapSnapshot ? swapEffectiveQuote.value ?? undefined : undefined
+  if (needsSwapSnapshot && !quote) return
+  const capturedAmount = amount.value
+  const capturedAsset = asset.value
+  const capturedChainId = chainId.value!
+  const inputAsset = needsSwapSnapshot ? selectedAsset.value : capturedAsset
+  if (!inputAsset) return
+  const inputAmount = valueToNano(capturedAmount || '0', inputAsset.decimals)
+  const isNative = isNativeCurrencyAddress(inputAsset.address)
+  const wrappedAddress = isNative ? resolveWrappedNativeAddress(capturedChainId) : null
+  if (isNative && !wrappedAddress) return
+  const directWrappedAddress = !needsSwapSnapshot && isNativeWrap.value
+    ? resolveWrappedNativeAddress(capturedChainId)
+    : null
+  const planAccountSnapshot = planAccount.value
+  const currentIntents = [createSupplyIntent(quote)]
+  const quoteIntents = quote && swapSelectedQuoteCard.value?.quote === quote
+    ? swapSelectedQuoteCard.value.intents
+    : undefined
+  const reviewType = needsSwapSnapshot ? 'swap-supply' as const : 'supply' as const
+  const reviewAsset = needsSwapSnapshot && isNative
+    ? (resolveWrappedNativeAsset(capturedChainId) || inputAsset)
+    : inputAsset
+  const reviewLaunch = captureReviewState(currentIntents, {
+    presentationKind: reviewType,
+    review: {
+      type: reviewType,
+      asset: reviewAsset,
+      amount: capturedAmount,
+      quoteFetchedAt: needsSwapSnapshot ? swapEffectiveQuoteFetchedAt.value : null,
+      swapToAsset: needsSwapSnapshot ? capturedAsset : undefined,
+      swapToAmount: needsSwapSnapshot ? swapEstimatedOutput.value : undefined,
+      swapMode: needsSwapSnapshot ? SwapperMode.EXACT_IN : undefined,
+      submittingLabel: 'Submitting...',
+    },
+    onSucceeded: async () => {
+      await updateEstimates()
+      setTimeout(() => {
+        router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
+      }, 400)
+    },
+    onFailed: (cause) => {
+      error('Transaction failed')
+      console.warn(cause)
+      void reportClientEvent({
+        event: 'tx_execute_failed',
+        flow: needsSwapSnapshot ? 'lend_swap_supply' : 'lend_supply',
+        phase: 'execute',
+        chainId: capturedChainId,
+        operationType: reviewType,
+        vaultAddress,
+        assetAddress: capturedAsset.address,
+        quoteProvider: needsSwapSnapshot ? swapRoutedVia.value ?? undefined : undefined,
+      }, cause)
+    },
+  }, quoteIntents)
   isPreparing.value = true
   clearSimulationError()
   try {
     await guardWithPriceImpact(async () => {
-      if (!asset.value?.address) {
-        return
-      }
-
       preparedPlan.value = null
-      let intents: readonly ReturnType<typeof createIntent>[] = []
       try {
-        if (needsSwap.value && swapEffectiveQuote.value) {
-          const inputAsset = selectedAsset.value
-          if (!inputAsset) throw new Error('No selected asset')
-          const inputAmount = valueToNano(amount.value || '0', inputAsset.decimals)
-          const isNative = isNativeCurrencyAddress(inputAsset.address)
-          const wrappedAddress = isNative ? resolveWrappedNativeAddress(chainId.value!) : null
-          if (isNative && !wrappedAddress) throw new Error('Wrapped native token not found')
+        if (needsSwapSnapshot && quote) {
           const args = {
-            swapQuote: swapEffectiveQuote.value,
+            swapQuote: quote,
             amount: inputAmount,
             tokenIn: (wrappedAddress || inputAsset.address) as Address,
             enableCollateral: false,
@@ -567,111 +615,66 @@ const submit = async () => {
               ? { wrappedTokenAddress: wrappedAddress, nativeAmount: inputAmount }
               : undefined,
           }
-          const quoteIntents = swapSelectedQuoteCard.value?.quote === swapEffectiveQuote.value
-            ? swapSelectedQuoteCard.value.intents
-            : undefined
-          intents = quoteIntents?.length ? quoteIntents : [createSupplyIntent(swapEffectiveQuote.value)]
-          plan.value = await planDepositWithSwap({ ...args, account: planAccount.value })
+          plan.value = await planDepositWithSwap({ ...args, account: planAccountSnapshot })
         }
         else {
-          const supplyAmount = valueToNano(amount.value || '0', asset.value.decimals)
-          const wrappedAddr = isNativeWrap.value ? resolveWrappedNativeAddress(chainId.value!) : null
           const args = {
             vaultAddress: vaultAddress as Address,
-            assetAddress: asset.value.address as Address,
-            amount: supplyAmount,
-            wrappedNativeInfo: isNativeWrap.value && wrappedAddr
-              ? { wrappedTokenAddress: wrappedAddr, nativeAmount: supplyAmount }
+            assetAddress: capturedAsset.address as Address,
+            amount: inputAmount,
+            wrappedNativeInfo: directWrappedAddress
+              ? { wrappedTokenAddress: directWrappedAddress, nativeAmount: inputAmount }
               : undefined,
           }
-          intents = [createSupplyIntent()]
-          plan.value = await planDeposit({ ...args, account: planAccount.value })
+          plan.value = await planDeposit({ ...args, account: planAccountSnapshot })
         }
       }
       catch (e) {
         console.warn('[OperationReviewModal] failed to build plan', e)
         void reportClientEvent({
           event: 'tx_plan_build_failed',
-          flow: needsSwap.value ? 'lend_swap_supply' : 'lend_supply',
+          flow: needsSwapSnapshot ? 'lend_swap_supply' : 'lend_supply',
           phase: 'build',
-          chainId: chainId.value,
-          operationType: needsSwap.value ? 'swap-supply' : 'supply',
+          chainId: capturedChainId,
+          operationType: reviewType,
           vaultAddress,
-          assetAddress: asset.value.address,
-          quoteProvider: needsSwap.value ? swapRoutedVia.value ?? undefined : undefined,
+          assetAddress: capturedAsset.address,
+          quoteProvider: needsSwapSnapshot ? swapRoutedVia.value ?? undefined : undefined,
         }, e)
         plan.value = null
       }
 
-      if (plan.value && intents.length) {
+      if (plan.value) {
         try {
           preparedPlan.value = await prepareTransactionPlan(plan.value, {
-            account: planAccount.value,
+            account: planAccountSnapshot,
             prefetch: lendPluginPrefetch,
-            intents,
+            intents: reviewLaunch.intents,
           })
         }
         catch (e) {
           console.warn('[OperationReviewModal] failed to prepare plan', e)
           void reportClientEvent({
             event: 'tx_plan_prepare_failed',
-            flow: needsSwap.value ? 'lend_swap_supply' : 'lend_supply',
+            flow: needsSwapSnapshot ? 'lend_swap_supply' : 'lend_supply',
             phase: 'prepare',
-            chainId: chainId.value,
-            operationType: needsSwap.value ? 'swap-supply' : 'supply',
+            chainId: capturedChainId,
+            operationType: reviewType,
             vaultAddress,
-            assetAddress: asset.value.address,
-            quoteProvider: needsSwap.value ? swapRoutedVia.value ?? undefined : undefined,
+            assetAddress: capturedAsset.address,
+            quoteProvider: needsSwapSnapshot ? swapRoutedVia.value ?? undefined : undefined,
           }, e)
           simulationError.value = await getTxErrorMessage(e)
           return
         }
 
-        const ok = await runPreparedSimulation(preparedPlan.value, buildLendStateOverrideOptions(), undefined, intents)
+        const ok = await runPreparedSimulation(preparedPlan.value, buildLendStateOverrideOptions(), undefined, reviewLaunch.intents)
         if (!ok) {
           return
         }
       }
 
-      const isNativeSwap = needsSwap.value && selectedAsset.value && isNativeCurrencyAddress(selectedAsset.value.address)
-      const reviewAsset = isNativeSwap
-        ? (resolveWrappedNativeAsset(chainId.value!) || selectedAsset.value!)
-        : needsSwap.value && selectedAsset.value ? selectedAsset.value : asset.value
-      const reviewType = needsSwap.value ? 'swap-supply' as const : 'supply' as const
-      if (!intents.length) return
-      await openReviewState(intents, {
-        presentationKind: reviewType,
-        review: {
-          type: reviewType,
-          asset: reviewAsset,
-          amount: amount.value,
-          quoteFetchedAt: needsSwap.value ? swapEffectiveQuoteFetchedAt.value : null,
-          swapToAsset: needsSwap.value ? asset.value : undefined,
-          swapToAmount: needsSwap.value ? swapEstimatedOutput.value : undefined,
-          swapMode: needsSwap.value ? SwapperMode.EXACT_IN : undefined,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: async () => {
-          await updateEstimates()
-          setTimeout(() => {
-            router.replace({ path: '/portfolio/saving', query: { network: route.query.network } })
-          }, 400)
-        },
-        onFailed: (cause) => {
-          error('Transaction failed')
-          console.warn(cause)
-          void reportClientEvent({
-            event: 'tx_execute_failed',
-            flow: needsSwap.value ? 'lend_swap_supply' : 'lend_supply',
-            phase: 'execute',
-            chainId: chainId.value,
-            operationType: needsSwap.value ? 'swap-supply' : 'supply',
-            vaultAddress,
-            assetAddress: asset.value?.address,
-            quoteProvider: needsSwap.value ? swapRoutedVia.value ?? undefined : undefined,
-          }, cause)
-        },
-      })
+      await reviewLaunch.open()
     })
   }
   finally {
@@ -710,7 +713,8 @@ const addToBatch = async () => {
         : undefined
       await addBatchEntry({
         label: `Deposit ${asset.value.symbol}`,
-        intent: quoteIntents?.[0] ?? createSupplyIntent(quote),
+        intent: createSupplyIntent(quote),
+        preparedIntent: quoteIntents?.[0],
         subAccount: effectiveAddress.value as Address | undefined,
         review: { type: 'swap-supply', asset: swapAsset, amount: swapAmount, swapToAsset: asset.value, swapToAmount: swapOutput, swapMode: SwapperMode.EXACT_IN, quoteFetchedAt: swapEffectiveQuoteFetchedAt.value },
       })
diff --git a/pages/position/[number]/borrow/index.vue b/pages/position/[number]/borrow/index.vue
index 6183f08ba..b7fd33244 100644
--- a/pages/position/[number]/borrow/index.vue
+++ b/pages/position/[number]/borrow/index.vue
@@ -46,7 +46,7 @@ const _route = useRoute()
 const { error } = useToast()
 const { planBorrow } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: planAccount } = usePlanAccount()
@@ -438,28 +438,13 @@ const submit = async () => {
       source: 'pages/position/[number]/borrow/index.vue',
       subAccounts: [plannerArgs.borrowAccount],
     })
-    try {
-      plan.value = await planBorrow({ ...plannerArgs, account: planAccount.value })
-    }
-    catch (e) {
-      console.warn('[OperationReviewModal] failed to build plan', e)
-      plan.value = null
-    }
-
-    if (plan.value) {
-      const ok = await runSimulation(plan.value)
-      if (!ok) {
-        return
-      }
-    }
-
-    await openReviewState([intent], {
+    const reviewLaunch = captureReviewState([intent], {
       presentationKind: 'borrow',
       review: {
         type: 'borrow',
-        asset: borrowVault.value?.asset,
+        asset: borrowVault.value.asset,
         amount: capturedAmount,
-        subAccount: position.value?.subAccount,
+        subAccount: plannerArgs.borrowAccount,
         hasBorrows: (position.value?.borrowed || 0n) > 0n,
         submittingLabel: 'Submitting...',
       },
@@ -474,6 +459,22 @@ const submit = async () => {
         error('Transaction failed')
       },
     })
+    try {
+      plan.value = await planBorrow({ ...plannerArgs, account: planAccount.value })
+    }
+    catch (e) {
+      console.warn('[OperationReviewModal] failed to build plan', e)
+      plan.value = null
+    }
+
+    if (plan.value) {
+      const ok = await runSimulation(plan.value)
+      if (!ok) {
+        return
+      }
+    }
+
+    await reviewLaunch.open()
   }
   finally {
     isPreparing.value = false
diff --git a/pages/position/[number]/borrow/swap.vue b/pages/position/[number]/borrow/swap.vue
index cb2802430..c16972e09 100644
--- a/pages/position/[number]/borrow/swap.vue
+++ b/pages/position/[number]/borrow/swap.vue
@@ -111,7 +111,7 @@ const {
   prepareTransactionPlan,
   prefetchPluginData,
 } = useEulerTx()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { create: createIntent } = useOperationIntentFactory()
 const { createMigrationIntent } = useMigrationIntentFactory()
 const { signaturesEnabled } = useSignaturePreference()
@@ -3326,6 +3326,9 @@ watch(() => cowSwapOrderStatus.orderStatus.value, (status) => {
 const reviewInboundExternalMigration = async () => {
   const reviewAsset = externalDebtAsset.value ?? externalCollateralAsset.value
   if (isOperationBlocked.value || directInboundMigrationDisabledReason.value || !canReviewInboundExternalMigration.value || !reviewAsset) return
+  const quoteFetchedAt = effectiveQuoteFetchedAt.value
+  const knownAssets = externalMigrationKnownAssets.value
+  const swapQuoteOutputs = externalMigrationSwapQuoteOutputs.value
   isPreparing.value = true
   clearSimulationError()
   try {
@@ -3333,7 +3336,7 @@ const reviewInboundExternalMigration = async () => {
     const preview = await prepareInboundExternalMigrationPreview()
     inboundExternalAuthorizationConnector.value = preview.authorizationRequest ? preview.input.source.connectorId : null
     const intent = createInboundMigrationIntent(preview)
-    await openReviewState([intent], {
+    const reviewLaunch = captureReviewState([intent], {
       presentationKind: 'migration',
       tenderlyPrepared: preview.tenderlySimulation.prepared,
       tenderlyStateOverrides: preview.tenderlySimulation.stateOverrides,
@@ -3345,9 +3348,9 @@ const reviewInboundExternalMigration = async () => {
         postSteps: buildInboundExternalMigrationRevokeSteps(preview.authorizationRequest, preview.useSignatures, preview.bundledReview),
         calldataUsesPlaceholderSignatures: preview.useSignatures && !!preview.authorizationRequest,
         allowConfirmWithoutPlan: true,
-        quoteFetchedAt: effectiveQuoteFetchedAt.value,
-        knownAssets: externalMigrationKnownAssets.value,
-        swapQuoteOutputs: externalMigrationSwapQuoteOutputs.value,
+        quoteFetchedAt,
+        knownAssets,
+        swapQuoteOutputs,
         submittingLabel: 'Migrating...',
       },
       onResult: (result) => {
@@ -3364,6 +3367,7 @@ const reviewInboundExternalMigration = async () => {
       },
       onFailed: (cause) => { showError(cause instanceof Error ? cause.message : 'Migration failed') },
     })
+    await reviewLaunch.open()
   }
   catch (err) {
     logWarn('externalMigration/review', err)
@@ -3540,23 +3544,54 @@ const submit = async () => {
     return
   }
   if (isPreparing.value || isGeoBlocked.value || isSubmitDisabled.value) return
+  const useCowSwap = isSelectedCollateralCowSwapProvider.value
+  let refinanceInput: ReturnType<typeof buildRefinanceInput> | undefined
+  let intent: ReturnType<typeof createRefinanceIntent> | undefined
+  let reviewLaunch: ReturnType<typeof captureReviewState> | undefined
+  const planAccountSnapshot = currentPlanAccount()
+  if (!useCowSwap) {
+    if (!sourceDebtVault.value) return
+    const sourceDebtVaultSnapshot = sourceDebtVault.value
+    refinanceInput = buildRefinanceInput()
+    intent = createRefinanceIntent(refinanceInput, 'position/refinance')
+    reviewLaunch = captureReviewState([intent], {
+      presentationKind: 'refinance',
+      review: {
+        type: 'refinance',
+        asset: sourceDebtVaultSnapshot.asset,
+        amount: formatVaultAmount(currentDebt.value, sourceDebtVaultSnapshot),
+        quoteFetchedAt: effectiveQuoteFetchedAt.value,
+        vaultAmounts: refinanceVaultAmounts.value,
+        ...refinanceSwapReviewInfo.value,
+        submittingLabel: 'Submitting...',
+      },
+      onSucceeded: () => {
+        setTimeout(() => {
+          router.replace({ path: '/portfolio', query: { network: route.query.network } })
+        }, 400)
+      },
+      onFailed: (cause) => {
+        showError('Transaction failed')
+        logWarn('refinance/send', cause)
+      },
+    })
+  }
   isPreparing.value = true
   try {
     await guardWithPriceImpact(async () => {
       if (isSubmitDisabled.value || !sourceDebtVault.value) return
 
-      if (isSelectedCollateralCowSwapProvider.value) {
+      if (useCowSwap) {
         await submitCowSwapCollateralSwap()
         return
       }
+      if (!refinanceInput || !intent || !reviewLaunch) return
 
       preparedPlan.value = null
       plan.value = null
-      const refinanceInput = buildRefinanceInput()
-      const intent = createRefinanceIntent(refinanceInput, 'position/refinance')
       try {
-        plan.value = await planRefinancePosition({ ...refinanceInput, account: currentPlanAccount() })
-        preparedPlan.value = await prepareTransactionPlan(plan.value, { account: currentPlanAccount(), intents: [intent] })
+        plan.value = await planRefinancePosition({ ...refinanceInput, account: planAccountSnapshot })
+        preparedPlan.value = await prepareTransactionPlan(plan.value, { account: planAccountSnapshot, intents: reviewLaunch.intents })
       }
       catch (e) {
         logWarn('refinance/buildPlan', e)
@@ -3565,32 +3600,12 @@ const submit = async () => {
       }
 
       const ok = preparedPlan.value
-        ? await runPreparedSimulation(preparedPlan.value, buildRefinanceStateOverrideOptions(), undefined, [intent])
+        ? await runPreparedSimulation(preparedPlan.value, buildRefinanceStateOverrideOptions(), undefined, reviewLaunch.intents)
         : await runSimulation(plan.value, buildRefinanceStateOverrideOptions())
       if (!ok) return
 
       if (!plan.value) return
-      await openReviewState([intent], {
-        presentationKind: 'refinance',
-        review: {
-          type: 'refinance',
-          asset: sourceDebtVault.value.asset,
-          amount: formatVaultAmount(currentDebt.value, sourceDebtVault.value),
-          quoteFetchedAt: effectiveQuoteFetchedAt.value,
-          vaultAmounts: refinanceVaultAmounts.value,
-          ...refinanceSwapReviewInfo.value,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: () => {
-          setTimeout(() => {
-            router.replace({ path: '/portfolio', query: { network: route.query.network } })
-          }, 400)
-        },
-        onFailed: (cause) => {
-          showError('Transaction failed')
-          logWarn('refinance/send', cause)
-        },
-      })
+      await reviewLaunch.open()
     })
   }
   finally {
diff --git a/pages/position/[number]/index.vue b/pages/position/[number]/index.vue
index 3669a7cfe..3c155a058 100644
--- a/pages/position/[number]/index.vue
+++ b/pages/position/[number]/index.vue
@@ -35,7 +35,7 @@ const { getSupplyRewardApy, getBorrowRewardApy, hasSupplyRewards, hasBorrowRewar
 const { getTokenCategoryTags } = useTokenList()
 const { planTransfer } = useEulerTx()
 const { create: createIntent } = useOperationIntentFactory()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { account: planAccount } = usePlanAccount()
 const {
   runSimulation: runDisableCollateralSimulation,
@@ -692,23 +692,13 @@ const disableCollateral = async (vault: EVault) => {
         source: 'pages/position/[number]/index.vue',
         subAccounts: [subAccount, owner],
       })
-      plan = await planTransfer({ ...plannerArgs, account: planAccount.value })
-
-      if (plan) {
-        const ok = await runDisableCollateralSimulation(plan)
-        if (!ok) {
-          disableCollateralErrorVault.value = getAddress(vault.address)
-          return
-        }
-      }
-
-      await openReviewState([intent], {
+      const reviewLaunch = captureReviewState([intent], {
         presentationKind: 'disableCollateral',
         review: {
           type: 'disableCollateral',
           asset: borrowVault.value!.asset,
           amount: '0',
-          subAccount: position.value?.subAccount,
+          subAccount,
           hasBorrows: (position.value?.borrowed || 0n) > 0n,
           submittingLabel: 'Submitting...',
         },
@@ -722,6 +712,17 @@ const disableCollateral = async (vault: EVault) => {
           console.warn(cause)
         },
       })
+      plan = await planTransfer({ ...plannerArgs, account: planAccount.value })
+
+      if (plan) {
+        const ok = await runDisableCollateralSimulation(plan)
+        if (!ok) {
+          disableCollateralErrorVault.value = getAddress(vault.address)
+          return
+        }
+      }
+
+      await reviewLaunch.open()
     }
     catch (e) {
       console.warn('[OperationReviewModal] failed to build plan', e)
diff --git a/pages/position/[number]/migrate.vue b/pages/position/[number]/migrate.vue
index df9b60d0f..4846d65f1 100644
--- a/pages/position/[number]/migrate.vue
+++ b/pages/position/[number]/migrate.vue
@@ -126,7 +126,7 @@ const {
 const { redirectAfterAdd } = useBatchRedirect()
 const { scheduleExternalMigrationRefreshes } = useExternalMigrationRefresh()
 const { simulationError, clearSimulationError } = useTransactionPlanSimulation()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { createMigrationIntent } = useMigrationIntentFactory()
 
 const positionIndex = usePositionIndex()
@@ -863,19 +863,21 @@ watch([targets, outgoingPreviewBaseKey], ([targetList, baseKey]) => {
 
 async function reviewMigration(target: OutgoingMigrationTarget) {
   if (reviewingTargetId.value || !canReviewTarget(target) || !sourceDebtVault.value) return
+  const sourceDebtVaultSnapshot = sourceDebtVault.value
+  const debtAmount = formatVaultAmount(currentDebt.value, sourceDebtVaultSnapshot)
   reviewingTargetId.value = target.id
   clearSimulationError()
   try {
     const preview = await prepareOutgoingMigrationPreview(target)
     const intent = createOutgoingMigrationIntent(preview)
-    await openReviewState([intent], {
+    const reviewLaunch = captureReviewState([intent], {
       presentationKind: 'migration',
       tenderlyPrepared: preview.tenderlySimulation.prepared,
       tenderlyStateOverrides: preview.tenderlySimulation.stateOverrides,
       review: {
         type: 'migration',
-        asset: sourceDebtVault.value.asset,
-        amount: formatVaultAmount(currentDebt.value, sourceDebtVault.value),
+        asset: sourceDebtVaultSnapshot.asset,
+        amount: debtAmount,
         signatureSteps: buildSignatureSteps(preview.input.target, preview.authorizationRequest, preview.useSignatures, preview.bundledReview),
         postSteps: buildRevokeSteps(preview.authorizationRequest, preview.useSignatures, preview.bundledReview),
         calldataUsesPlaceholderSignatures: preview.useSignatures && !!preview.authorizationRequest,
@@ -895,6 +897,7 @@ async function reviewMigration(target: OutgoingMigrationTarget) {
       },
       onFailed: (cause) => { showError(cause instanceof Error ? cause.message : 'Migration failed') },
     })
+    await reviewLaunch.open()
   }
   catch (err) {
     logWarn('positionMigration/review', err)
diff --git a/pages/position/[number]/multiply.vue b/pages/position/[number]/multiply.vue
index f336b1d52..cff7996e2 100644
--- a/pages/position/[number]/multiply.vue
+++ b/pages/position/[number]/multiply.vue
@@ -43,7 +43,7 @@ const { address, isConnected } = useWagmi()
 const { isSpyMode } = useSpyMode()
 const { isPositionsLoading, isPositionsLoaded, refreshAllPositions, getPositionBySubAccountIndex } = useEulerAccount()
 const { planMultiply, prepareTransactionPlan, prefetchPluginData, preloadSubAccountSnapshot } = useEulerTx()
-const { open: openReviewState } = useExecutionReview()
+const { capture: captureReviewState } = useExecutionReview()
 const { create: createIntent } = useOperationIntentFactory()
 const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
@@ -798,8 +798,7 @@ const onRefreshMultiplyQuotes = () => {
 
 let multiplySubAccountSnapshotKey: string | null = null
 let multiplySubAccountSnapshotPromise: Promise<boolean> | null = null
-const ensureMultiplySubAccountSnapshot = (subAccount: Address): Promise<boolean> => {
-  const account = planAccount.value
+const ensureMultiplySubAccountSnapshot = (subAccount: Address, account = planAccount.value): Promise<boolean> => {
   if (!account) return Promise.resolve(false)
   const key = `${account.chainId}:${normalizeAddress(subAccount)}`
   if (multiplySubAccountSnapshotKey !== key) {
@@ -865,9 +864,10 @@ const addToBatch = async () => {
     const quoteIntents = quote
       ? multiplyQuoteCardsSorted.value.find(card => card.quote === quote)?.intents
       : undefined
-    const intent = quoteIntents?.[0] ?? createMultiplyIntent(quote)
+    const intent = createMultiplyIntent(quote)
     await addBatchEntry({
       intent,
+      preparedIntent: quoteIntents?.[0],
       label: `Multiply → ${multiplyLongVault.value!.asset.symbol}`,
       subAccount: receiver,
       multiply: true,
@@ -933,56 +933,84 @@ const onMultiplierInput = () => {
 const submitMultiply = async () => {
   if (isOperationBlocked.value) return
   if (isPreparing.value || isGeoBlocked.value || isMultiplyRestricted.value) return
+  if (isSubmitting.value || (!isConnected.value && !isSpyMode.value)) return
+  if (!multiplySupplyVault.value || !multiplyLongVault.value || !multiplyShortVault.value) return
+  const supplyVaultSnapshot = multiplySupplyVault.value
+  const longVaultSnapshot = multiplyLongVault.value
+  const shortVaultSnapshot = multiplyShortVault.value
+  const debtAmount = multiplyDebtAmountNano.value
+  if (debtAmount <= 0n || multiplyErrorText.value) return
+  const subAccount = multiplySubAccount.value
+  if (!subAccount) {
+    error('Unable to resolve position')
+    return
+  }
+  const isSameAsset = normalizeAddress(longVaultSnapshot.asset.address) === normalizeAddress(shortVaultSnapshot.asset.address)
+  const quote = isSameAsset ? undefined : multiplySelectedQuote.value ?? undefined
+  if (!isSameAsset && !quote) return
+  const quoteIntents = quote && multiplySelectedQuoteCard.value?.quote === quote
+    ? multiplySelectedQuoteCard.value.intents
+    : undefined
+  const currentIntents = [createMultiplyIntent(quote)]
+  const reviewBorrowAmount = trimTrailingZeros(formatUnits(debtAmount, Number(shortVaultSnapshot.asset.decimals)))
+  const reviewSwapToAmount = quote
+    ? trimTrailingZeros(formatUnits(BigInt(quote.amountOut || 0), Number(longVaultSnapshot.asset.decimals)))
+    : undefined
+  const planAccountSnapshot = planAccount.value
+  const capturedChainId = chainId.value
+  const reviewLaunch = captureReviewState(currentIntents, {
+    presentationKind: 'borrow',
+    review: {
+      type: 'borrow',
+      asset: shortVaultSnapshot.asset,
+      amount: reviewBorrowAmount,
+      quoteFetchedAt: quote ? multiplyEffectiveQuoteFetchedAt.value : null,
+      swapToAsset: quote ? longVaultSnapshot.asset : undefined,
+      swapToAmount: reviewSwapToAmount,
+      swapMode: quote ? SwapperMode.EXACT_IN : undefined,
+      subAccount,
+      submittingLabel: 'Submitting...',
+    },
+    onSucceeded: () => {
+      refreshAllPositions(eulerLensAddresses.value, address.value || '')
+      setTimeout(() => {
+        router.replace({ path: '/portfolio', query: { network: route.query.network } })
+      }, 400)
+    },
+    onFailed: (cause) => {
+      console.warn(cause)
+      error('Transaction failed')
+      void reportClientEvent({
+        event: 'tx_execute_failed',
+        flow: 'multiply',
+        phase: 'execute',
+        chainId: capturedChainId,
+        operationType: 'multiply',
+        vaultAddress: longVaultSnapshot.address,
+        assetAddress: longVaultSnapshot.asset.address,
+        quoteProvider: multiplyRoutedVia.value ?? undefined,
+      }, cause)
+    },
+  }, quoteIntents)
   isPreparing.value = true
   try {
     await guardWithPriceImpact(async () => {
-      if (isSubmitting.value || (!isConnected.value && !isSpyMode.value)) {
-        return
-      }
-      if (!multiplySupplyVault.value || !multiplyLongVault.value || !multiplyShortVault.value) {
-        return
-      }
-      const debtAmount = multiplyDebtAmountNano.value
-      if (debtAmount <= 0n) {
-        return
-      }
-      if (multiplyErrorText.value) {
-        return
-      }
-      const subAccount = multiplySubAccount.value
-      if (!subAccount) {
-        error('Unable to resolve position')
-        return
-      }
-
-      const isSameAsset = normalizeAddress(multiplyLongVault.value.asset.address) === normalizeAddress(multiplyShortVault.value.asset.address)
-      const quote = isSameAsset ? null : multiplySelectedQuote.value
-      if (!isSameAsset && !quote) {
-        return
-      }
-
-      const quoteIntents = multiplySelectedQuoteCard.value?.quote === quote
-        ? multiplySelectedQuoteCard.value.intents
-        : undefined
-      const intents = quoteIntents?.length ? quoteIntents : [createMultiplyIntent(quote ?? undefined)]
-
       try {
-        const account = planAccount.value
-        const subAccountSnapshotApplied = await ensureMultiplySubAccountSnapshot(subAccount as Address)
+        const subAccountSnapshotApplied = await ensureMultiplySubAccountSnapshot(subAccount as Address, planAccountSnapshot)
         plan.value = await planMultiply({
-          collateralVault: multiplySupplyVault.value.address as Address,
+          collateralVault: supplyVaultSnapshot.address as Address,
           collateralAmount: 0n,
-          collateralAsset: multiplySupplyVault.value.asset.address as Address,
-          longVault: multiplyLongVault.value.address as Address,
-          liabilityVault: multiplyShortVault.value.address as Address,
+          collateralAsset: supplyVaultSnapshot.asset.address as Address,
+          longVault: longVaultSnapshot.address as Address,
+          liabilityVault: shortVaultSnapshot.address as Address,
           liabilityAmount: debtAmount,
           receiver: subAccount as Address,
-          swapQuote: quote ?? undefined,
+          swapQuote: quote,
           swapperMode: SwapperMode.EXACT_IN,
-          account,
+          account: planAccountSnapshot,
           subAccountSnapshotApplied,
         })
-        preparedPlan.value = await prepareTransactionPlan(plan.value, { account, intents })
+        preparedPlan.value = await prepareTransactionPlan(plan.value, { account: planAccountSnapshot, intents: reviewLaunch.intents })
       }
       catch (e) {
         console.warn('[Multiply] failed to build plan', e)
@@ -990,10 +1018,10 @@ const submitMultiply = async () => {
           event: 'tx_plan_build_failed',
           flow: 'multiply',
           phase: 'build',
-          chainId: chainId.value,
+          chainId: capturedChainId,
           operationType: 'multiply',
-          vaultAddress: multiplyLongVault.value.address,
-          assetAddress: multiplyLongVault.value.asset.address,
+          vaultAddress: longVaultSnapshot.address,
+          assetAddress: longVaultSnapshot.asset.address,
           quoteProvider: multiplyRoutedVia.value ?? undefined,
         }, e)
         plan.value = null
@@ -1001,52 +1029,14 @@ const submitMultiply = async () => {
       }
 
       if (preparedPlan.value) {
-        const ok = await runMultiplySimulation(preparedPlan.value, undefined, undefined, intents)
+        const ok = await runMultiplySimulation(preparedPlan.value, undefined, undefined, reviewLaunch.intents)
         if (!ok) {
           return
         }
       }
 
-      const reviewBorrowAmount = trimTrailingZeros(formatUnits(debtAmount, Number(multiplyShortVault.value.asset.decimals)))
-      const reviewSwapToAmount = quote
-        ? trimTrailingZeros(formatUnits(BigInt(quote.amountOut || 0), Number(multiplyLongVault.value.asset.decimals)))
-        : undefined
-
       if (!plan.value) return
-      await openReviewState(intents, {
-        presentationKind: 'borrow',
-        review: {
-          type: 'borrow',
-          asset: multiplyShortVault.value.asset,
-          amount: reviewBorrowAmount,
-          quoteFetchedAt: quote ? multiplyEffectiveQuoteFetchedAt.value : null,
-          swapToAsset: quote ? multiplyLongVault.value.asset : undefined,
-          swapToAmount: reviewSwapToAmount,
-          swapMode: quote ? SwapperMode.EXACT_IN : undefined,
-          subAccount,
-          submittingLabel: 'Submitting...',
-        },
-        onSucceeded: () => {
-          refreshAllPositions(eulerLensAddresses.value, address.value || '')
-          setTimeout(() => {
-            router.replace({ path: '/portfolio', query: { network: route.query.network } })
-          }, 400)
-        },
-        onFailed: (cause) => {
-          console.warn(cause)
-          error('Transaction failed')
-          void reportClientEvent({
-            event: 'tx_execute_failed',
-            flow: 'multiply',
-            phase: 'execute',
-            chainId: chainId.value,
-            operationType: 'multiply',
-            vaultAddress: multiplyLongVault.value?.address,
-            assetAddress: multiplyLongVault.value?.asset.address,
-            quoteProvider: multiplyRoutedVia.value ?? undefined,
-          }, cause)
-        },
-      })
+      await reviewLaunch.open()
     })
   }
   finally {
diff --git a/pages/position/[number]/repay.vue b/pages/position/[number]/repay.vue
index f1ef924fd..e465c48a2 100644
--- a/pages/position/[number]/repay.vue
+++ b/pages/position/[number]/repay.vue
@@ -20,7 +20,6 @@ import { isOperationBlocked } from '~/utils/operationGuardRegistry'
 import type { DisabledReasonInfo } from '~/components/entities/vault/form/types'
 import { isRoeStateApplicable, resolvePositionRoeCollateralVaults, resolveRoeCollateralVaultsByAddresses } from '~/utils/position-roe'
 import { COWSWAP_BATCH_UNSUPPORTED_REASON, isCowProviderOrQuote } from '~/entities/cowswap'
-import { selectMatchingPreparedIntents } from '~/features/reviewed-execution/planning/requirements'
 
 const _route = useRoute()
 const _router = useRouter()
@@ -258,7 +257,8 @@ const addToBatchWithoutWarnings = async () => {
       })
       await addBatchEntry({
         label: `Repay-swap ${inSymbol} → ${borrowSymbol}`,
-        intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
+        intent: currentIntent,
+        preparedIntent: quoteIntents?.[0],
         subAccount: position.value.subAccount as Address,
         affectedSubAccounts: getFullRepayAffectedSubAccounts(isClosing),
         nameOverride: `Repay ${borrowSymbol}`,
@@ -315,7 +315,8 @@ const addToBatchWithoutWarnings = async () => {
     })
     await addBatchEntry({
       label: `Repay from ${srcSymbol} collateral → ${borrowSymbol}`,
-      intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
+      intent: currentIntent,
+      preparedIntent: quoteIntents?.[0],
       subAccount: position.value.subAccount as Address,
       sourceSubAccount: sourceAccount,
       affectedSubAccounts: collateral.isCrossPositionSource.value
@@ -353,7 +354,8 @@ const addToBatchWithoutWarnings = async () => {
     })
     await addBatchEntry({
       label: `Repay from ${srcSymbol} savings → ${borrowSymbol}`,
-      intent: selectMatchingPreparedIntents(quoteIntents, [currentIntent])[0]!,
+      intent: currentIntent,
+      preparedIntent: quoteIntents?.[0],
       subAccount: position.value.subAccount as Address,
       sourceSubAccount: sourceSubAccount as Address | undefined,
       affectedSubAccounts: getFullRepayAffectedSubAccounts(isClosing, sourceSubAccount),
diff --git a/pages/position/[number]/supply.vue b/pages/position/[number]/supply.vue
index e6d754c3e..9f9577c96 100644
--- a/pages/position/[number]/supply.vue
+++ b/pages/position/[number]/supply.vue
@@ -263,15 +263,17 @@ const addToBatch = async () => {
       const tokenIn = (wrappedAddress || sel.address) as Address
       const wrappedNativeInfo = isNative && wrappedAddress ? { wrappedTokenAddress: wrappedAddress, nativeAmount: inputAmount } : undefined
       const quoteIntents = form.swapQuoteCardsSorted.value.find(card => card.quote === quote)?.intents
+      const intent = createIntent({
+        kind: 'deposit',
+        planner: 'deposit-with-swap',
+        args: { swapQuote: quote, amount: inputAmount, tokenIn, wrappedNativeInfo },
+        source: 'position/supply:add-to-batch',
+        subAccounts: [pos.subAccount as Address],
+      })
       await addBatchEntry({
         label: `Swap-supply ${form.amount.value} ${sel.symbol} → ${a.symbol}`,
-        intent: quoteIntents?.[0] ?? createIntent({
-          kind: 'deposit',
-          planner: 'deposit-with-swap',
-          args: { swapQuote: quote, amount: inputAmount, tokenIn, wrappedNativeInfo },
-          source: 'position/supply:add-to-batch',
-          subAccounts: [pos.subAccount as Address],
-        }),
+        intent,
+        preparedIntent: quoteIntents?.[0],
         subAccount: pos.subAccount as Address,
         review: { type: 'swap-supply', asset: sel, amount: form.amount.value, swapToAsset: a, quoteFetchedAt: form.swapEffectiveQuoteFetchedAt.value },
       })
diff --git a/pages/position/[number]/withdraw.vue b/pages/position/[number]/withdraw.vue
index 05e6e8b0b..009d33f4c 100644
--- a/pages/position/[number]/withdraw.vue
+++ b/pages/position/[number]/withdraw.vue
@@ -225,15 +225,17 @@ const addToBatch = async () => {
       const quote = form.swapEffectiveQuote.value
       if (!quote) return
       const quoteIntents = form.swapQuoteCardsSorted.value.find(card => card.quote === quote)?.intents
+      const intent = createIntent({
+        kind: 'withdraw',
+        planner: 'withdraw-and-swap',
+        args: { swapQuote: quote, vaultAddress, assets, owner },
+        source: 'position/withdraw:add-to-batch',
+        subAccounts: [owner],
+      })
       await addBatchEntry({
         label: `Withdraw-swap ${form.amount.value} ${a.symbol} → ${selectedOutputAsset.value?.symbol ?? ''}`,
-        intent: quoteIntents?.[0] ?? createIntent({
-          kind: 'withdraw',
-          planner: 'withdraw-and-swap',
-          args: { swapQuote: quote, vaultAddress, assets, owner },
-          source: 'position/withdraw:add-to-batch',
-          subAccounts: [owner],
-        }),
+        intent,
+        preparedIntent: quoteIntents?.[0],
         subAccount: pos.subAccount as Address,
         review: { type: 'swap-withdraw', asset: a, amount: form.amount.value, swapToAsset: selectedOutputAsset.value, quoteFetchedAt: form.swapEffectiveQuoteFetchedAt.value },
       })
diff --git a/tests/composables/useBorrowForm.test.ts b/tests/composables/useBorrowForm.test.ts
index 4532e73c1..1310ea13b 100644
--- a/tests/composables/useBorrowForm.test.ts
+++ b/tests/composables/useBorrowForm.test.ts
@@ -275,9 +275,16 @@ describe('useBorrowForm savings collateral', () => {
       constraints: [],
       metadata: { createdAt: intentSequence, source: input.source },
     }))
-    vi.stubGlobal('useOperationIntentFactory', () => ({ create: mocks.createIntent }))
+    vi.stubGlobal('useOperationIntentFactory', () => ({
+      capture: () => mocks.createIntent,
+      create: mocks.createIntent,
+    }))
     vi.stubGlobal('useExecutionReview', () => ({
-      open: mocks.openReview,
+      capture: (intents: unknown[], options: unknown) => ({
+        intents,
+        usesPreparedIntents: false,
+        open: () => mocks.openReview(intents, options),
+      }),
     }))
     vi.stubGlobal('useEulerTx', () => ({
       planBorrow: mocks.planBorrow,
diff --git a/tests/composables/useCollateralForm.test.ts b/tests/composables/useCollateralForm.test.ts
index 510f5290b..ed77d6a02 100644
--- a/tests/composables/useCollateralForm.test.ts
+++ b/tests/composables/useCollateralForm.test.ts
@@ -304,7 +304,13 @@ const makeForm = (overrides: Partial<UseCollateralFormOptions> = {}) => {
 describe('useCollateralForm', () => {
   beforeEach(async () => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], _options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: vi.fn(),
+      }),
+    }))
     vi.clearAllMocks()
     mocks.getCollateralApySnapshot.mockResolvedValue({ supplyUsd: 0, weightedSupplyApy: null })
     mocks.getBorrowRewardApyForCollaterals.mockReturnValue(0)
diff --git a/tests/composables/useCollateralSwapRepay.test.ts b/tests/composables/useCollateralSwapRepay.test.ts
index f88ab385a..4cc8e3be0 100644
--- a/tests/composables/useCollateralSwapRepay.test.ts
+++ b/tests/composables/useCollateralSwapRepay.test.ts
@@ -214,7 +214,13 @@ describe('useCollateralSwapRepay', () => {
 
   beforeEach(() => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: mocks.createIntent }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: mocks.openReview }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: () => mocks.openReview(preparedIntents ?? currentIntents, options),
+      }),
+    }))
     vi.clearAllMocks()
     mocks.quoteInstances.length = 0
     mocks.crossPositionItems.length = 0
diff --git a/tests/composables/useExecutionReview.test.ts b/tests/composables/useExecutionReview.test.ts
index bf6e7796c..7bddce7de 100644
--- a/tests/composables/useExecutionReview.test.ts
+++ b/tests/composables/useExecutionReview.test.ts
@@ -1,7 +1,8 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Hash, StateOverride } from 'viem'
+import type { Address, Hash, StateOverride } from 'viem'
 import type { TransactionPlanPrepared } from '@eulerxyz/euler-v2-sdk'
 import { useExecutionReview } from '~/composables/useExecutionReview'
+import type { OperationIntent } from '~/features/reviewed-execution/domain/intents'
 
 const { modalOpen, operationModal, reviewedOperationModal, isSpyMode } = vi.hoisted(() => ({
   modalOpen: vi.fn(),
@@ -20,6 +21,19 @@ vi.mock('~/components/ui/composables/useModal', () => ({
 
 const reviewId = `0x${'1'.repeat(64)}` as Hash
 const reviewDigest = `0x${'2'.repeat(64)}` as Hash
+const owner = '0x1000000000000000000000000000000000000000' as Address
+const intent = (intentId: string, amount: string): OperationIntent => ({
+  schemaVersion: 1,
+  intentId,
+  revision: 1,
+  kind: 'deposit',
+  chainId: 1,
+  account: owner,
+  subAccounts: [owner],
+  planner: { name: 'deposit', args: { amount } },
+  constraints: [],
+  metadata: { createdAt: 1, source: 'test' },
+})
 
 describe('useExecutionReview', () => {
   beforeEach(() => {
@@ -50,12 +64,12 @@ describe('useExecutionReview', () => {
       type: 'migration',
     }
 
-    await useExecutionReview().open([], {
+    await useExecutionReview().capture([], {
       presentationKind: 'migration',
       review,
       tenderlyPrepared,
       tenderlyStateOverrides,
-    })
+    }).open()
 
     expect(prepare).toHaveBeenCalledWith([], {
       presentationKind: 'migration',
@@ -90,12 +104,13 @@ describe('useExecutionReview', () => {
       type: 'repay',
     }
 
-    const opening = useExecutionReview().open([], {
+    const launch = useExecutionReview().capture([], {
       presentationKind: 'repay',
       review,
     })
     review.amount = '2'
     review.asset.symbol = 'DAI'
+    const opening = launch.open()
     resolvePrepare?.({ execution: { reviewId, reviewDigest }, prepared: executablePrepared })
     await opening
 
@@ -112,6 +127,26 @@ describe('useExecutionReview', () => {
     })
   })
 
+  it('uses warmed intent DTOs only when their transaction semantics match the click', () => {
+    vi.stubGlobal('useReviewedExecution', () => ({ prepare: vi.fn() }))
+    const review = {
+      asset: { address: '0x2000000000000000000000000000000000000000', symbol: 'USDC', decimals: 6 },
+      amount: '1',
+    }
+    const prepared = intent('prepared', '1')
+    const equivalentCurrent = intent('current', '1')
+    const changedCurrent = intent('changed', '2')
+    const executionReview = useExecutionReview()
+
+    const matching = executionReview.capture([equivalentCurrent], { presentationKind: 'supply', review }, [prepared])
+    const changed = executionReview.capture([changedCurrent], { presentationKind: 'supply', review }, [prepared])
+
+    expect(matching.usesPreparedIntents).toBe(true)
+    expect(matching.intents).toEqual([prepared])
+    expect(changed.usesPreparedIntents).toBe(false)
+    expect(changed.intents).toEqual([changedCurrent])
+  })
+
   it('opens a non-executable prepared preview in spy mode', async () => {
     isSpyMode.value = true
     const readOnlyPrepared = { chainId: 1, plan: [{ type: 'preview' }] } as unknown as TransactionPlanPrepared
@@ -149,10 +184,10 @@ describe('useExecutionReview', () => {
       type: 'repay',
     }
 
-    await useExecutionReview().open([], {
+    await useExecutionReview().capture([], {
       presentationKind: 'repay',
       review,
-    })
+    }).open()
 
     expect(prepare).not.toHaveBeenCalled()
     expect(prepareReadOnly).toHaveBeenCalledWith([], {
diff --git a/tests/composables/useMultiplyForm.test.ts b/tests/composables/useMultiplyForm.test.ts
index c21447196..0c65b38ff 100644
--- a/tests/composables/useMultiplyForm.test.ts
+++ b/tests/composables/useMultiplyForm.test.ts
@@ -222,8 +222,18 @@ const makeForm = (vault: EVault) => useMultiplyForm({
 
 describe('useMultiplyForm cap validation', () => {
   beforeEach(() => {
-    vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    const createIntent = vi.fn()
+    vi.stubGlobal('useOperationIntentFactory', () => ({
+      capture: () => createIntent,
+      create: createIntent,
+    }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], _options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: vi.fn(),
+      }),
+    }))
     vi.clearAllMocks()
     mocks.getProjectedRatesBatch.mockImplementation(async (requests: unknown[]) => requests.map(() => ({ supplyAPY: 0n, borrowAPY: 0n })))
     mocks.getAssetUsdValueForEstimate.mockResolvedValue(0)
diff --git a/tests/composables/useOperationIntentFactory.test.ts b/tests/composables/useOperationIntentFactory.test.ts
index 87891febb..74d68a4b8 100644
--- a/tests/composables/useOperationIntentFactory.test.ts
+++ b/tests/composables/useOperationIntentFactory.test.ts
@@ -10,12 +10,14 @@ const VAULT = getAddress('0x3000000000000000000000000000000000000000')
 describe('useOperationIntentFactory', () => {
   const walletChainId = ref<number | undefined>()
   const browsedChainId = ref(1)
+  const effectiveAddress = ref<Address | undefined>(ACCOUNT)
 
   beforeEach(() => {
     walletChainId.value = undefined
     browsedChainId.value = 1
+    effectiveAddress.value = ACCOUNT
     vi.stubGlobal('computed', computed)
-    vi.stubGlobal('useEffectiveAddress', () => ({ effectiveAddress: ref<Address | undefined>(ACCOUNT) }))
+    vi.stubGlobal('useEffectiveAddress', () => ({ effectiveAddress }))
     vi.stubGlobal('useWagmi', () => ({ chainId: walletChainId }))
     vi.stubGlobal('useEulerAddresses', () => ({ chainId: browsedChainId }))
   })
@@ -52,4 +54,22 @@ describe('useOperationIntentFactory', () => {
 
     expect(intent.chainId).toBe(8453)
   })
+
+  it('captures wallet and chain context for intent creation after an await', () => {
+    const capturedCreate = useOperationIntentFactory().capture()
+    walletChainId.value = 8453
+    effectiveAddress.value = getAddress('0x4000000000000000000000000000000000000000')
+
+    const intent = capturedCreate({
+      kind: 'deposit',
+      planner: 'deposit',
+      args: { vaultAddress: VAULT, assetAddress: ASSET, amount: 1n },
+      source: 'test:captured-context',
+      intentId: 'intent:captured-context',
+      createdAt: 1,
+    })
+
+    expect(intent.account).toBe(ACCOUNT)
+    expect(intent.chainId).toBe(1)
+  })
 })
diff --git a/tests/composables/useSavingsRepay.test.ts b/tests/composables/useSavingsRepay.test.ts
index bfd804854..c9c77f791 100644
--- a/tests/composables/useSavingsRepay.test.ts
+++ b/tests/composables/useSavingsRepay.test.ts
@@ -233,7 +233,13 @@ const position = {
 describe('useSavingsRepay', () => {
   beforeEach(() => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: mocks.createIntent }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: mocks.openReview }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: () => mocks.openReview(preparedIntents ?? currentIntents, options),
+      }),
+    }))
     vi.clearAllMocks()
     mocks.swapQuoteOptions.length = 0
     mocks.swapQuoteInstances.length = 0
diff --git a/tests/composables/useSwapPageLogic.test.ts b/tests/composables/useSwapPageLogic.test.ts
index 5951f3580..4398234fd 100644
--- a/tests/composables/useSwapPageLogic.test.ts
+++ b/tests/composables/useSwapPageLogic.test.ts
@@ -163,7 +163,13 @@ describe('useSwapPageLogic', () => {
     vi.stubGlobal('useDebounceFn', (fn: unknown) => fn)
     vi.stubGlobal('formatSmartAmount', (value: string) => value)
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: captured.reviewOpen }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: () => captured.reviewOpen(preparedIntents ?? currentIntents, options),
+      }),
+    }))
   })
 
   afterEach(() => {
@@ -322,7 +328,7 @@ describe('useSwapPageLogic', () => {
 
     expect(buildPlan).toHaveBeenCalledTimes(1)
     expect(captured.prepareTransactionPlan).toHaveBeenCalledTimes(1)
-    expect(buildPlan).toHaveBeenCalledWith(undefined, { account: captured.planAccount })
+    expect(buildPlan).toHaveBeenCalledWith(captured.selectedQuote.value, { account: captured.planAccount })
     expect(captured.prepareTransactionPlan).toHaveBeenCalledWith(rawPlan, { account: captured.planAccount, intents: [intent] })
     expect(captured.runPreparedSimulation).toHaveBeenCalledWith(prepared, {}, undefined, [intent])
     expect(captured.reviewOpen).toHaveBeenCalledWith([intent], expect.objectContaining({ presentationKind: 'swap' }))
diff --git a/tests/composables/useTxBatch.test.ts b/tests/composables/useTxBatch.test.ts
index 996fed335..3b331fd23 100644
--- a/tests/composables/useTxBatch.test.ts
+++ b/tests/composables/useTxBatch.test.ts
@@ -1467,6 +1467,48 @@ describe('useTxBatch execution errors', () => {
     expect(batch.entries.value[0]?.preparing).toBe(false)
   })
 
+  it('adopts a warmed batch intent only when it matches the add-time intent', async () => {
+    const batch = useTxBatch()
+    const preparedIntent = intentFor([] as TransactionPlan, [subAccount])
+    const currentIntent = intentFor([] as TransactionPlan, [subAccount])
+
+    await batch.addEntry({
+      intent: currentIntent,
+      preparedIntent,
+      label: 'Supply USDC',
+      subAccount,
+    })
+
+    expect(batch.draftEntries.value[0]).toMatchObject({
+      intentId: preparedIntent.intentId,
+      intent: preparedIntent,
+    })
+    expect(executionMocks.compilePreview).toHaveBeenCalledWith([preparedIntent], expect.anything())
+  })
+
+  it('rebuilds a batch entry from the add-time intent when warmed semantics are stale', async () => {
+    const batch = useTxBatch()
+    const preparedIntent = intentFor([] as TransactionPlan, [subAccount])
+    const currentBase = intentFor([] as TransactionPlan, [subAccount])
+    const currentIntent: OperationIntent = {
+      ...currentBase,
+      planner: { ...currentBase.planner, args: { amount: '2' } },
+    }
+
+    await batch.addEntry({
+      intent: currentIntent,
+      preparedIntent,
+      label: 'Supply USDC',
+      subAccount,
+    })
+
+    expect(batch.draftEntries.value[0]).toMatchObject({
+      intentId: currentIntent.intentId,
+      intent: currentIntent,
+    })
+    expect(executionMocks.compilePreview).toHaveBeenCalledWith([currentIntent], expect.anything())
+  })
+
   it('adopts the exact generation-bound whole-cart preparation warmed after add', async () => {
     const batch = useTxBatch()
     const intent = intentFor([] as TransactionPlan, [subAccount])
diff --git a/tests/composables/useWalletRepay.test.ts b/tests/composables/useWalletRepay.test.ts
index fc4294149..8b8d76568 100644
--- a/tests/composables/useWalletRepay.test.ts
+++ b/tests/composables/useWalletRepay.test.ts
@@ -67,7 +67,9 @@ const position = {
 describe('useWalletRepay projected Net APY', () => {
   beforeEach(() => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (intents: unknown[]) => ({ intents, usesPreparedIntents: false, open: vi.fn() }),
+    }))
     vi.clearAllMocks()
     rewardsVersion.value = 0
     getCollateralApySnapshot.mockImplementation(async (_position, _vault, options?: { liabilityRateDelta?: unknown }) => ({
diff --git a/tests/composables/useWalletSwapRepay.test.ts b/tests/composables/useWalletSwapRepay.test.ts
index 5b7134dbf..3fbc9e48d 100644
--- a/tests/composables/useWalletSwapRepay.test.ts
+++ b/tests/composables/useWalletSwapRepay.test.ts
@@ -195,7 +195,13 @@ const makeCollateralSnapshot = (projected: boolean) => ({
 describe('useWalletSwapRepay', () => {
   beforeEach(() => {
     vi.stubGlobal('useOperationIntentFactory', () => ({ create: vi.fn() }))
-    vi.stubGlobal('useExecutionReview', () => ({ open: vi.fn() }))
+    vi.stubGlobal('useExecutionReview', () => ({
+      capture: (currentIntents: unknown[], _options: unknown, preparedIntents?: unknown[]) => ({
+        intents: preparedIntents ?? currentIntents,
+        usesPreparedIntents: !!preparedIntents,
+        open: vi.fn(),
+      }),
+    }))
     vi.clearAllMocks()
     mocks.swapQuoteOptions.length = 0
     mocks.quoteStates.length = 0
diff --git a/tests/reviewed-execution/inventory.test.ts b/tests/reviewed-execution/inventory.test.ts
index 481c6f546..084320527 100644
--- a/tests/reviewed-execution/inventory.test.ts
+++ b/tests/reviewed-execution/inventory.test.ts
@@ -67,9 +67,9 @@ describe('Stage A transaction inventory', () => {
     expect(production).not.toMatch(/executionService\s*\.\s*planLiquidation\s*\(/)
   })
 
-  it('freezes the current review launch inventory', () => {
+  it('freezes the current review launch inventory at synchronous capture boundaries', () => {
     const candidates = ['pages', 'components', 'composables'].flatMap(listProductionSources)
-    const pattern = /modal\.open\((?:OperationReviewModal|BatchReviewModal)|\bopen(?:Eager)?ReviewState\s*\(/g
+    const pattern = /modal\.open\((?:OperationReviewModal|BatchReviewModal)|\bcaptureReviewState\s*\(/g
     const discovered = candidates
       .map(source => ({ source, expectedOccurrences: count(read(source), pattern) }))
       .filter(row => row.expectedOccurrences > 0)
@@ -84,6 +84,14 @@ describe('Stage A transaction inventory', () => {
       const actual = count(source, pattern)
       expect(actual, row.source).toBe(row.expectedOccurrences)
     }
+
+    const directReviewSources = REVIEW_SOURCE_INVENTORY
+      .map(row => row.source)
+      .filter(source => source !== 'components/BatchContents.vue' && source !== 'composables/useExecutionReview.ts')
+    for (const source of directReviewSources) {
+      expect(read(source), source).toMatch(/\{\s*capture:\s*captureReviewState\s*\}\s*=\s*useExecutionReview\(\)/)
+    }
+    expect(read('composables/useExecutionReview.ts')).not.toMatch(/return\s*\{\s*capture\s*,\s*open\s*\}/)
   })
 
   it('keeps operation authority explicit and independent of SDK object identity', () => {

From 3d8264746bf3a163833a87cb96f1ea174d1c9e78 Mon Sep 17 00:00:00 2001
From: Darek <dariusz@euler.xyz>
Date: Thu, 3 Sep 2026 17:10:50 +0200
Subject: [PATCH 03/12] fix: repair migration batch review

---
 composables/useMigrationIntentFactory.ts      |  5 ++-
 pages/position/[number]/borrow/swap.vue       | 36 +++++++++++++------
 pages/position/[number]/migrate.vue           | 11 +++---
 .../useMigrationIntentFactory.test.ts         | 31 ++++++++++++++++
 tests/reviewed-execution/inventory.test.ts    | 18 ++++++++++
 5 files changed, 84 insertions(+), 17 deletions(-)
 create mode 100644 tests/composables/useMigrationIntentFactory.test.ts

diff --git a/composables/useMigrationIntentFactory.ts b/composables/useMigrationIntentFactory.ts
index d8574bc63..9db98e40c 100644
--- a/composables/useMigrationIntentFactory.ts
+++ b/composables/useMigrationIntentFactory.ts
@@ -46,9 +46,12 @@ export const useMigrationIntentFactory = () => {
     const rawDeadline = typedDeadline?.kind === 'typedData'
       ? (typedDeadline.typedData.message as Record<string, unknown>).deadline
       : undefined
+    const plannerDeadline = input.args.deadline
     const deadline = typeof rawDeadline === 'bigint'
       ? rawDeadline
-      : BigInt(Math.floor(Date.now() / 1000) + 60 * 60)
+      : typeof plannerDeadline === 'bigint'
+        ? plannerDeadline
+        : BigInt(Math.floor(Date.now() / 1000) + 60 * 60)
     if (deadline > BigInt(Number.MAX_SAFE_INTEGER)) throw new Error('Migration deadline is out of range')
     const args = {
       ...input.args,
diff --git a/pages/position/[number]/borrow/swap.vue b/pages/position/[number]/borrow/swap.vue
index c16972e09..c2a15f5f7 100644
--- a/pages/position/[number]/borrow/swap.vue
+++ b/pages/position/[number]/borrow/swap.vue
@@ -395,11 +395,10 @@ const subAccount = computed<Address>(() =>
 const cowSwapOwner = computed<Address>(() =>
   (address.value || (isSpyMode.value ? spyAddress.value : undefined) || zeroAddress) as Address,
 )
-// Migration authorization must be signed by a real connected wallet. Spy mode
-// stays read-only (discovery/preview) and cannot sign, so it must not satisfy
-// the review/execute gate — otherwise a spy-only user passes "Connect wallet to
-// migrate" and fails later at signing.
-const hasConnectedWallet = computed(() => isConnected.value)
+// A connected wallet can review and execute migrations. Spy mode can prepare
+// the same review through the read-only execution path, while confirmation
+// remains unavailable in the review modal.
+const hasMigrationReviewContext = computed(() => isConnected.value || isSpyMode.value)
 
 const hasDebtChange = computed(() =>
   isExternalSourceRoute.value ? !!targetDebtVault.value && !!externalDebtAsset.value : !!targetDebtVault.value && !!sourceDebtVault.value,
@@ -2452,7 +2451,7 @@ const canAddToBatch = computed(() => {
   return true
 })
 const isSubmitDisabled = computed(() => {
-  if (!isConnected.value) return false
+  if (!hasMigrationReviewContext.value) return false
   if (isLoading.value || isExternalPositionsLoading.value || isSubmitting.value) return true
   if (validationError.value) return true
   if (!hasAllRequiredQuotes.value) return true
@@ -2583,7 +2582,7 @@ const effectiveQuoteFetchedAt = computed(() => {
 
 const inboundMigrationDisabledReason = computed(() => {
   if (!isExternalSourceRoute.value) return null
-  if (!hasConnectedWallet.value) return 'Connect wallet to migrate'
+  if (!hasMigrationReviewContext.value) return 'Connect wallet to migrate'
   if (isExternalPositionsLoading.value) return 'Loading external position'
   if (externalPositionsError.value && !externalPosition.value) return externalPositionsError.value
   if (!externalPosition.value) return 'External position not found'
@@ -2625,6 +2624,7 @@ type InboundExternalMigrationInput = {
   owner: Address
   position: MigrationPosition
   eulerTarget: EulerMigrationTarget
+  deadline: bigint
   collateralSwapQuote?: SwapQuote
   debtSwapQuote?: SwapQuote
 }
@@ -2673,6 +2673,12 @@ const swapQuotePreviewKey = (quote: SwapQuote | null | undefined): string => {
     quote.amountOut,
     quote.amountOutMin,
     quote.slippage,
+    quote.swap.swapperAddress,
+    quote.swap.swapperData,
+    quote.verify.verifierAddress,
+    quote.verify.verifierData,
+    quote.verify.deadline,
+    String(quote.transferOutputToReceiver ?? false),
     selectedQuoteProviderKey(quote),
   ].join(':')
 }
@@ -2748,7 +2754,15 @@ const buildInboundExternalMigrationInput = async (): Promise<InboundExternalMigr
       ? getSwapInputAmount(debtSwapQuote, SwapperMode.TARGET_DEBT)
       : inboundBorrowAmountWithBuffer.value
   }
-  const input: InboundExternalMigrationInput = { source, owner, position, eulerTarget }
+  // The connector uses one deadline for authorization and final verification.
+  // A skim collateral quote commits its exact deadline inside verifierData, so
+  // that value must also be used when the migration intent is recompiled.
+  const deadline = BigInt(
+    collateralSwapQuote?.verify.deadline
+    ?? debtSwapQuote?.verify.deadline
+    ?? Math.floor(Date.now() / 1000) + 60 * 60,
+  )
+  const input: InboundExternalMigrationInput = { source, owner, position, eulerTarget, deadline }
   if (collateralSwapQuote) input.collateralSwapQuote = collateralSwapQuote
   if (debtSwapQuote) input.debtSwapQuote = debtSwapQuote
   return input
@@ -2767,7 +2781,6 @@ const getInboundExternalMigrationAuthorizationRequest = async (
     throw new Error('Migration inputs are incomplete')
   }
   const migrationChainId = input.position.chainId
-  const deadline = BigInt(Math.floor(Date.now() / 1000) + 60 * 60)
   return getMigrationAuthorization({
     direction: 'external-to-euler',
     connectorId: input.source.connectorId,
@@ -2780,7 +2793,7 @@ const getInboundExternalMigrationAuthorizationRequest = async (
     // Without signatures the connectors return msg.sender grants to send as
     // their own transactions instead of an EIP-712 message to sign.
     authorizationKind: useSignatures ? 'typedData' : 'transaction',
-    deadline,
+    deadline: input.deadline,
   })
 }
 
@@ -2807,6 +2820,7 @@ const buildInboundExternalMigrationCalldataPreview = async (
     positionRef: input.source.ref,
     target: input.eulerTarget,
     authorization,
+    deadline: input.deadline,
     removeAuthorizationAfterMigration: shouldRemoveInboundExternalAuthorization(input.source.connectorId, useSignatures),
     collateralSwapQuote: input.collateralSwapQuote,
     debtSwapQuote: input.debtSwapQuote,
@@ -2839,6 +2853,7 @@ const buildInboundExternalMigrationSimulationResult = async (
     positionRef: input.source.ref,
     target: input.eulerTarget,
     authorizationRequest,
+    deadline: input.deadline,
     removeAuthorizationAfterMigration: shouldRemoveInboundExternalAuthorization(input.source.connectorId, useSignatures),
     collateralSwapQuote: input.collateralSwapQuote,
     debtSwapQuote: input.debtSwapQuote,
@@ -3395,6 +3410,7 @@ const createInboundMigrationIntent = (preview: InboundExternalMigrationPreview)
       target: input.eulerTarget,
       collateralSwapQuote: input.collateralSwapQuote,
       debtSwapQuote: input.debtSwapQuote,
+      deadline: input.deadline,
       removeAuthorizationAfterMigration: shouldRemoveInboundExternalAuthorization(input.source.connectorId, useSignatures),
       operationName: `${input.source.connectorId}ToEulerMigration`,
       authorizationKind: useSignatures ? 'typedData' : 'transaction',
diff --git a/pages/position/[number]/migrate.vue b/pages/position/[number]/migrate.vue
index 4846d65f1..1b17e6d66 100644
--- a/pages/position/[number]/migrate.vue
+++ b/pages/position/[number]/migrate.vue
@@ -195,11 +195,10 @@ const positionDetailsFallback = computed(() => {
   const search = query.toString()
   return `/position/${positionIndex}${search ? `?${search}` : ''}`
 })
-// Migration authorization must be signed by a real connected wallet. Spy mode
-// stays read-only (discovery/preview) and cannot sign, so it must not satisfy
-// the review/execute gate — otherwise a spy-only user passes "Connect wallet to
-// migrate" and fails later at signing.
-const hasConnectedWallet = computed(() => isConnected.value)
+// A connected wallet can review and execute migrations. Spy mode can prepare
+// the same review through the read-only execution path, while confirmation
+// remains unavailable in the review modal.
+const hasMigrationReviewContext = computed(() => isConnected.value || isSpyMode.value)
 const migrationOwner = computed<Address | undefined>(() => {
   const raw = isSpyMode.value ? spyAddress.value : address.value
   if (!raw) return undefined
@@ -576,7 +575,7 @@ async function loadTargetLiquidityUsd() {
 
 function getTargetDisabledReason(target: OutgoingMigrationTarget | undefined) {
   if (pageDisabledReason.value) return pageDisabledReason.value
-  if (!hasConnectedWallet.value) return 'Connect wallet to migrate'
+  if (!hasMigrationReviewContext.value) return 'Connect wallet to migrate'
   if (isTargetsLoading.value) return 'Loading migration targets'
   if (targetsError.value && !target) return targetsError.value
   if (hasLoadedTargets.value && !target) return 'No compatible migration target'
diff --git a/tests/composables/useMigrationIntentFactory.test.ts b/tests/composables/useMigrationIntentFactory.test.ts
new file mode 100644
index 000000000..dea3b2af0
--- /dev/null
+++ b/tests/composables/useMigrationIntentFactory.test.ts
@@ -0,0 +1,31 @@
+import { getAddress, type Address } from 'viem'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { OperationIntent } from '~/features/reviewed-execution/domain/intents'
+import { useMigrationIntentFactory } from '~/composables/useMigrationIntentFactory'
+
+const ACCOUNT = getAddress('0x1000000000000000000000000000000000000000')
+
+describe('useMigrationIntentFactory', () => {
+  afterEach(() => {
+    vi.unstubAllGlobals()
+  })
+
+  it('preserves the explicit plan deadline when authorization uses transactions', () => {
+    vi.stubGlobal('useOperationIntentFactory', () => ({
+      create: (input: Record<string, unknown>) => ({
+        ...input,
+        planner: { name: input.planner, args: input.args },
+      }) as unknown as OperationIntent,
+    }))
+    const deadline = 2_000_000_000n
+
+    const intent = useMigrationIntentFactory().createMigrationIntent({
+      args: { direction: 'external-to-euler', deadline },
+      source: 'test:migration',
+      subAccounts: [ACCOUNT as Address],
+      bounds: [],
+    })
+
+    expect(intent.planner.args.deadline).toBe(deadline)
+  })
+})
diff --git a/tests/reviewed-execution/inventory.test.ts b/tests/reviewed-execution/inventory.test.ts
index 48776a9f4..cb3934381 100644
--- a/tests/reviewed-execution/inventory.test.ts
+++ b/tests/reviewed-execution/inventory.test.ts
@@ -161,6 +161,24 @@ describe('Stage A transaction inventory', () => {
     expect(source).not.toMatch(/reviewingTargetId\.value\s*\|\|\s*isOperationBlocked\.value/)
   })
 
+  it('allows migration review preparation in spy mode while execution stays read-only', () => {
+    const inbound = read('pages/position/[number]/borrow/swap.vue')
+    const outbound = read('pages/position/[number]/migrate.vue')
+    const directReview = read('composables/useExecutionReview.ts')
+    const batchReview = read('composables/useTxBatch.ts')
+
+    for (const source of [inbound, outbound]) {
+      expect(source).toContain('const hasMigrationReviewContext = computed(() => isConnected.value || isSpyMode.value)')
+      expect(source).toContain('if (!hasMigrationReviewContext.value) return \'Connect wallet to migrate\'')
+    }
+    expect(inbound).toContain('collateralSwapQuote?.verify.deadline')
+    expect(inbound).toContain('deadline: input.deadline')
+    expect(inbound).toContain('quote.verify.verifierData')
+    expect(inbound).toContain('quote.verify.deadline')
+    expect(directReview).toContain('const prepared = await execution.prepareReadOnly(intents, {')
+    expect(batchReview).toContain('const prepare = readOnly ? executionService.prepareReadOnly : executionService.prepare')
+  })
+
   it('keeps a conclusively cancelled review retryable and closes other failed reviews', () => {
     const modalSource = read('components/entities/reviewed-execution/ReviewedOperationModal.vue')
     const executionSource = read('composables/useReviewedExecution.ts')

From cb766127575781590ab64a7ac537a5a62a7af6c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Sep 2026 05:21:07 +0000
Subject: [PATCH 04/12] chore(deps): bump the all-updates group with 11 updates

Bumps the all-updates group with 11 updates:

| Package | From | To |
| --- | --- | --- |
| [@tanstack/vue-query](https://github.com/TanStack/query/tree/HEAD/packages/vue-query) | `5.102.2` | `5.102.8` |
| [@wagmi/core](https://github.com/wevm/wagmi/tree/HEAD/packages/core) | `3.6.4` | `3.6.5` |
| [@wagmi/vue](https://github.com/wevm/wagmi/tree/HEAD/packages/vue) | `0.5.29` | `0.5.30` |
| [axios](https://github.com/axios/axios) | `1.19.0` | `1.20.0` |
| [viem](https://github.com/wevm/viem) | `2.55.19` | `2.56.0` |
| [vue](https://github.com/vuejs/core) | `3.5.41` | `3.5.42` |
| [vue-router](https://github.com/vuejs/router) | `5.2.0` | `5.3.0` |
| [wagmi](https://github.com/wevm/wagmi/tree/HEAD/packages/react) | `3.7.6` | `3.7.7` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `26.2.0` | `26.4.0` |
| [lint-staged](https://github.com/lint-staged/lint-staged) | `17.3.0` | `17.4.1` |
| [simple-git-hooks](https://github.com/toplenboren/simple-git-hooks) | `2.13.1` | `2.14.0` |


Updates `@tanstack/vue-query` from 5.102.2 to 5.102.8
- [Release notes](https://github.com/TanStack/query/releases)
- [Changelog](https://github.com/TanStack/query/blob/main/packages/vue-query/CHANGELOG.md)
- [Commits](https://github.com/TanStack/query/commits/@tanstack/vue-query@5.102.8/packages/vue-query)

Updates `@wagmi/core` from 3.6.4 to 3.6.5
- [Release notes](https://github.com/wevm/wagmi/releases)
- [Changelog](https://github.com/wevm/wagmi/blob/main/packages/core/CHANGELOG.md)
- [Commits](https://github.com/wevm/wagmi/commits/@wagmi/core@3.6.5/packages/core)

Updates `@wagmi/vue` from 0.5.29 to 0.5.30
- [Release notes](https://github.com/wevm/wagmi/releases)
- [Changelog](https://github.com/wevm/wagmi/blob/main/packages/vue/CHANGELOG.md)
- [Commits](https://github.com/wevm/wagmi/commits/@wagmi/vue@0.5.30/packages/vue)

Updates `axios` from 1.19.0 to 1.20.0
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.19.0...v1.20.0)

Updates `viem` from 2.55.19 to 2.56.0
- [Release notes](https://github.com/wevm/viem/releases)
- [Commits](https://github.com/wevm/viem/compare/viem@2.55.19...viem@2.56.0)

Updates `vue` from 3.5.41 to 3.5.42
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/compare/v3.5.41...v3.5.42)

Updates `vue-router` from 5.2.0 to 5.3.0
- [Release notes](https://github.com/vuejs/router/releases)
- [Commits](https://github.com/vuejs/router/compare/v5.2.0...v5.3.0)

Updates `wagmi` from 3.7.6 to 3.7.7
- [Release notes](https://github.com/wevm/wagmi/releases)
- [Changelog](https://github.com/wevm/wagmi/blob/main/packages/react/CHANGELOG.md)
- [Commits](https://github.com/wevm/wagmi/commits/wagmi@3.7.7/packages/react)

Updates `@types/node` from 26.2.0 to 26.4.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `lint-staged` from 17.3.0 to 17.4.1
- [Release notes](https://github.com/lint-staged/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lint-staged/lint-staged/compare/v17.3.0...v17.4.1)

Updates `simple-git-hooks` from 2.13.1 to 2.14.0
- [Release notes](https://github.com/toplenboren/simple-git-hooks/releases)
- [Changelog](https://github.com/toplenboren/simple-git-hooks/blob/master/CHANGELOG.md)
- [Commits](https://github.com/toplenboren/simple-git-hooks/compare/2.13.1...2.14.0)

---
updated-dependencies:
- dependency-name: "@tanstack/vue-query"
  dependency-version: 5.102.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-updates
- dependency-name: "@wagmi/core"
  dependency-version: 3.6.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-updates
- dependency-name: "@wagmi/vue"
  dependency-version: 0.5.30
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-updates
- dependency-name: axios
  dependency-version: 1.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-updates
- dependency-name: viem
  dependency-version: 2.56.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-updates
- dependency-name: vue
  dependency-version: 3.5.42
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-updates
- dependency-name: vue-router
  dependency-version: 5.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-updates
- dependency-name: wagmi
  dependency-version: 3.7.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-updates
- dependency-name: "@types/node"
  dependency-version: 26.4.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all-updates
- dependency-name: lint-staged
  dependency-version: 17.4.1
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all-updates
- dependency-name: simple-git-hooks
  dependency-version: 2.14.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 396 +++++++++++++++++++++++-----------------------
 package.json      |  22 +--
 2 files changed, 210 insertions(+), 208 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1df4ffc98..daee5b9f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,32 +15,32 @@
         "@nuxt/eslint": "1.17.0",
         "@reown/appkit": "1.8.23",
         "@reown/appkit-adapter-wagmi": "1.8.23",
-        "@tanstack/vue-query": "5.102.2",
+        "@tanstack/vue-query": "5.102.8",
         "@vueuse/nuxt": "14.4.0",
-        "@wagmi/core": "3.6.4",
-        "@wagmi/vue": "0.5.29",
-        "axios": "1.19.0",
+        "@wagmi/core": "3.6.5",
+        "@wagmi/vue": "0.5.30",
+        "axios": "1.20.0",
         "chart.js": "4.5.1",
         "chartjs-plugin-annotation": "3.1.0",
         "luxon": "3.7.2",
         "modern-normalize": "3.0.1",
         "nuxt": "4.5.2",
         "pino": "10.3.1",
-        "viem": "2.55.19",
-        "vue": "3.5.41",
+        "viem": "2.56.0",
+        "vue": "3.5.42",
         "vue-chartjs": "5.3.4",
-        "vue-router": "5.2.0",
-        "wagmi": "3.7.6"
+        "vue-router": "5.3.0",
+        "wagmi": "3.7.7"
       },
       "devDependencies": {
         "@nuxtjs/tailwindcss": "6.14.0",
         "@types/luxon": "3.7.5",
-        "@types/node": "26.2.0",
+        "@types/node": "26.4.0",
         "eslint": "10.9.1",
-        "lint-staged": "17.3.0",
+        "lint-staged": "17.4.1",
         "playwright": "1.62.1",
         "sass": "1.103.1",
-        "simple-git-hooks": "2.13.1",
+        "simple-git-hooks": "2.14.0",
         "tailwindcss": "3.4.19",
         "typescript": "5.9.3",
         "vitest": "4.1.11",
@@ -596,6 +596,32 @@
         }
       }
     },
+    "node_modules/@coinbase/cdp-sdk/node_modules/axios": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
+      "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "follow-redirects": "^1.16.0",
+        "form-data": "^4.0.6",
+        "https-proxy-agent": "^5.0.1",
+        "proxy-from-env": "^2.1.0"
+      }
+    },
+    "node_modules/@coinbase/cdp-sdk/node_modules/axios-retry": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
+      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "is-retry-allowed": "^2.2.0"
+      },
+      "peerDependencies": {
+        "axios": "0.x || 1.x"
+      }
+    },
     "node_modules/@coinbase/wallet-sdk": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/@coinbase/wallet-sdk/-/wallet-sdk-4.3.6.tgz",
@@ -5514,9 +5540,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.102.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.102.2.tgz",
-      "integrity": "sha512-zQ5794PXBlV5Wl7N23SR1/Ss+wPE/h2Ye4XlKpm3omN8i8b/Fd4DAdqpLS2AXj5M/RMObt3k5qy3E7kzt/AvBA==",
+      "version": "5.102.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.102.8.tgz",
+      "integrity": "sha512-ZNjkJ33CqvPNec/6lZBnHqLc3EVGPZ9ySLhYahU9TcuRFdmwXewuj0c4hwSWcGHqEUwcSrKeZ+oGcvPBqXcQcg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -5552,13 +5578,13 @@
       }
     },
     "node_modules/@tanstack/vue-query": {
-      "version": "5.102.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.102.2.tgz",
-      "integrity": "sha512-0e03XpSNJ0eWbwvS9lDiSzpkEIRRMeOTinNo2LD500M+5kSm2KjpuWkTP79fmHIJHuYvUfmfvwjjDN3q9yX44Q==",
+      "version": "5.102.8",
+      "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.102.8.tgz",
+      "integrity": "sha512-W3Q6Od3FbdttACuavgbICKMFgYCPobvuMiO8tIpqMP073QnREVSaO4ZPqrFqosIbFKikiQTmZhEEbYR9bPsWLA==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/match-sorter-utils": "^8.19.4",
-        "@tanstack/query-core": "5.102.2",
+        "@tanstack/query-core": "5.102.8",
         "@vue/devtools-api": "^6.6.3",
         "vue-demi": "^0.14.10"
       },
@@ -5649,12 +5675,6 @@
       "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "license": "MIT"
     },
-    "node_modules/@types/jsesc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jsesc/-/jsesc-2.5.1.tgz",
-      "integrity": "sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw==",
-      "license": "MIT"
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -5669,9 +5689,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "26.2.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.2.0.tgz",
-      "integrity": "sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==",
+      "version": "26.4.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.4.0.tgz",
+      "integrity": "sha512-faiGnoIrLH/V8cibOMEAZ8pMw6oXqSukl29ra4mN8GdaB2ZewzeaLj+INpV5N+Z1eKWzY+IzaIZH2EIR6YZRNQ==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -6652,39 +6672,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.41.tgz",
-      "integrity": "sha512-q0Xtv/F9w2YO/7htQhtiL+Ev2WCJbe5N2hc+XfgyKkEKqWpSxknmT8QOuGdEKNdjPq0c3F7rNpFkTo3Kfrm7pg==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.42.tgz",
+      "integrity": "sha512-2Ye1ilMtKXxl8qZUrQ5j0CdgenFp/HFQmta6rfRyfEsTG69L6Wk+tWuNoHYHMx9E8tF2Slvdg1FuwDvAXdy1LQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.29.8",
-        "@vue/shared": "3.5.41",
+        "@vue/shared": "3.5.42",
         "entities": "^7.0.1",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.41.tgz",
-      "integrity": "sha512-oKacVfNglLvGjnS6BXOlGL7EyG2h8X03pqXCjzotRZUaXGjbrTJUnVAQjrCqUnS+lyu31nwQjZY/d817GmCnfw==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.42.tgz",
+      "integrity": "sha512-qbhQZEFmycr+ni/qyuccS4sucNN7VAbDfbkvNxWOX2VfgFm90MNs3/UhRNKoPMEIVn0F8gdlYjLPvqxHwHeQOA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.41",
-        "@vue/shared": "3.5.41"
+        "@vue/compiler-core": "3.5.42",
+        "@vue/shared": "3.5.42"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.41.tgz",
-      "integrity": "sha512-XJhip7R2wy6vX3knCxdZN4KracFaZUef58s1KYewqluedHIJaPIVfXoYT7MF1F8nCvv6k8bWWxDC8opMkg1VTQ==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.42.tgz",
+      "integrity": "sha512-fkCAFB4okcAANGMThboWnScp/gzWjU0ZSkVnjTIiplmMDq2uq0tIB3j+xVu4rhv5rvOgBySCysudmbMd6xRRqw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.29.8",
-        "@vue/compiler-core": "3.5.41",
-        "@vue/compiler-dom": "3.5.41",
-        "@vue/compiler-ssr": "3.5.41",
-        "@vue/shared": "3.5.41",
+        "@vue/compiler-core": "3.5.42",
+        "@vue/compiler-dom": "3.5.42",
+        "@vue/compiler-ssr": "3.5.42",
+        "@vue/shared": "3.5.42",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.21",
         "postcss": "^8.5.19",
@@ -6692,13 +6712,13 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.41.tgz",
-      "integrity": "sha512-U3v5OejKEGqOI0Wy0+Sz7hGuIFZHA4LSXzrNM3IMIeDyJEBBfTpX26n3SDgToRpP2bLc9FfI2j/kSgcJ8Emq5A==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.42.tgz",
+      "integrity": "sha512-xmLk3wLkbizPAiLyomjgFFosf2ys9b5Ghb+oh/k2tnvipNz8OFrQOiTcWCzyK7MpBp9KkyGtfvgfLUivbmuGYA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.41",
-        "@vue/shared": "3.5.41"
+        "@vue/compiler-dom": "3.5.42",
+        "@vue/shared": "3.5.42"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -6764,51 +6784,51 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.41.tgz",
-      "integrity": "sha512-rznsqKM0np0x18EjzF8x88MpEhdNsffbvFbckLL5+oUKz1BxAImEmO7J1ArRYSyo6aQaVoBDp7jEkT91OOxydA==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.42.tgz",
+      "integrity": "sha512-TzNNfKpb7hDxbQltwAut8VDQA5YP+BuRlxntHUuRjyKwlMvmAPbs3unhCvieijifY6vFfVBwsS7wG/C7uq+bEQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.41"
+        "@vue/shared": "3.5.42"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.41.tgz",
-      "integrity": "sha512-Vcry58hiAKwGen9Z1jUZE0feFsNArPCMOImYI8el48A9Idf6DuQYD0U05zZIF2Iad1hGhPSvcbBbAOhNr55fhg==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.42.tgz",
+      "integrity": "sha512-9uACtuHs7vJGkm5Bp3xu4xRDLFTIYy5DgxpToVjqGIAhAEKwQfsaLvKINhM6nFVp6bZPRFGdDqd1g52MqKsotA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.41",
-        "@vue/shared": "3.5.41"
+        "@vue/reactivity": "3.5.42",
+        "@vue/shared": "3.5.42"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.41.tgz",
-      "integrity": "sha512-3vVBahVBS9+U6cmXBLyb8nE6/yYo4J/CGI9eVFs3KiMc0YHuudwKyShTD65jtJy/L9PUUxNAFu4cj4LiJ0UFbw==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.42.tgz",
+      "integrity": "sha512-rsCmhiWLaRxGltLwhlCWyYkFn7WAbKRh0q17eZ1A6Dq6eqc2ACQ61IIryxz0LrsvCzHSilLA9JHovVwM8CNE2g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.41",
-        "@vue/runtime-core": "3.5.41",
-        "@vue/shared": "3.5.41",
+        "@vue/reactivity": "3.5.42",
+        "@vue/runtime-core": "3.5.42",
+        "@vue/shared": "3.5.42",
         "csstype": "^3.2.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.41.tgz",
-      "integrity": "sha512-n6hx/pNFfbD6SuyeuMVkvqox8bwf/ET9JlA/kAz/imw8sw++wkqKe2mHX5KutjPpbKE4Z56yTHszoOjGMI9igQ==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.42.tgz",
+      "integrity": "sha512-2++5dUyYS4gvo7xQXSECUDhB7TS0aOl5SeVfC5qSq1Jgfhjvegw1zqhwTIR3imZ+QYPJQw9gfcFvXGAjGZ7ajQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.41",
-        "@vue/runtime-dom": "3.5.41",
-        "@vue/shared": "3.5.41"
+        "@vue/compiler-ssr": "3.5.42",
+        "@vue/runtime-dom": "3.5.42",
+        "@vue/shared": "3.5.42"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.41.tgz",
-      "integrity": "sha512-IOnwSCma8j+9xJT6b8H0dEYidC80NsYmNMlZxRsukYcSoGaDBohog5hDxzeUXdFeGWFA++vWvxqOmrr96VlqMA==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.42.tgz",
+      "integrity": "sha512-2rPxex1jQf4jvl9MOHl6YaXCPcrNqz/FstMOEh3QWY+/OME9nQTvl9WYeCwhW7AFjaR0SnngZGlp/wkR6rkI6g==",
       "license": "MIT"
     },
     "node_modules/@vueuse/core": {
@@ -6927,9 +6947,9 @@
       }
     },
     "node_modules/@wagmi/core": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-3.6.4.tgz",
-      "integrity": "sha512-YERJ+vbFZw3UI6p4KoFU5DkxkqmtzBq5lddpgVAvcu5Tz7kSicKVA3DMCWvjVAFsikNdZYIs39FIkMGWfzpSMQ==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-3.6.5.tgz",
+      "integrity": "sha512-zfKvLNT1V1+/RgrrUcRvteKx+V+Iv9ZHPWseIVKFA9mX5WE0H8J6zWZGWXSQCKbz5xGSUoatNFCkNFSzqQp+AA==",
       "license": "MIT",
       "dependencies": {
         "eventemitter3": "5.0.1",
@@ -6941,7 +6961,7 @@
       },
       "peerDependencies": {
         "@tanstack/query-core": ">=5.0.0",
-        "accounts": "~0.14",
+        "accounts": "~0.18",
         "typescript": ">=5.9.3",
         "viem": "2.x"
       },
@@ -6987,13 +7007,13 @@
       }
     },
     "node_modules/@wagmi/vue": {
-      "version": "0.5.29",
-      "resolved": "https://registry.npmjs.org/@wagmi/vue/-/vue-0.5.29.tgz",
-      "integrity": "sha512-ephIPjs1sIieuo0/MfsQm8pBgi2Qrejm3DMPHOFSsZwcx11s6TS1wuFoEyg7Wgbmroo9DYd6zjBv86uLsk4CSQ==",
+      "version": "0.5.30",
+      "resolved": "https://registry.npmjs.org/@wagmi/vue/-/vue-0.5.30.tgz",
+      "integrity": "sha512-WSEHOabHg28uX0Q7L9OknqdyBBRCO2hZGLtLZbKIs0XUIJOjI3nK2yQlxH0rEMvulqnmc80T+zDVj7MrPE5s8A==",
       "license": "MIT",
       "dependencies": {
-        "@wagmi/connectors": "8.1.0",
-        "@wagmi/core": "3.6.4"
+        "@wagmi/connectors": "8.2.0",
+        "@wagmi/core": "3.6.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/wevm"
@@ -7942,9 +7962,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz",
-      "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz",
+      "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.16.0",
@@ -7953,19 +7973,6 @@
         "proxy-from-env": "^2.1.0"
       }
     },
-    "node_modules/axios-retry": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz",
-      "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==",
-      "license": "Apache-2.0",
-      "optional": true,
-      "dependencies": {
-        "is-retry-allowed": "^2.2.0"
-      },
-      "peerDependencies": {
-        "axios": "0.x || 1.x"
-      }
-    },
     "node_modules/b4a": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.1.tgz",
@@ -12321,15 +12328,15 @@
       "license": "MIT"
     },
     "node_modules/lint-staged": {
-      "version": "17.3.0",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.3.0.tgz",
-      "integrity": "sha512-woZS3vNe3UKqBaLPvbLOtKRY4tLANpWQhom12MGWqC8Mh1lCOO+WgSwmX2amjJAqTY9BkXYW87fCUH5H9Ph6xw==",
+      "version": "17.4.1",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.4.1.tgz",
+      "integrity": "sha512-FmJeudcalbSfg1du+JCfvi5vS6Qt08KgbfLWiHinbef+2JJwUZwAWVoaO1AcJVUTWPfk0t30PMQNwPAeCzYQ+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "picomatch": "^4.0.5",
+        "picomatch": "^4.0.7",
         "string-argv": "^0.3.2",
-        "tinyexec": "^1.2.4"
+        "tinyexec": "^1.3.0"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -13759,9 +13766,9 @@
       "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
-      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+      "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -15907,9 +15914,9 @@
       }
     },
     "node_modules/simple-git-hooks": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/simple-git-hooks/-/simple-git-hooks-2.13.1.tgz",
-      "integrity": "sha512-WszCLXwT4h2k1ufIXAgsbiTOazqqevFCIncOuUBZJ91DdvWcC5+OFkluWRQPrcuSYd8fjq+o2y1QfWqYMoAToQ==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/simple-git-hooks/-/simple-git-hooks-2.14.0.tgz",
+      "integrity": "sha512-kkTORPAuxQz2g1QUuN0J8yGWT28tjGBfPOdJ4xT7Vbeu30veKUZQIoID2qGgCDAakaQn59UeZJJ4cFGB8PVP2A==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -16761,9 +16768,9 @@
       }
     },
     "node_modules/tinyexec": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
-      "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz",
+      "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==",
       "license": "MIT",
       "engines": {
         "node": ">=18"
@@ -17529,9 +17536,9 @@
       }
     },
     "node_modules/viem": {
-      "version": "2.55.19",
-      "resolved": "https://registry.npmjs.org/viem/-/viem-2.55.19.tgz",
-      "integrity": "sha512-4QPIX0eYPLsOBk53NKswVMkQoxuP7GlOBnB4wM6dkDokREO4QENNc3bmyPKK1PBTViXh0TPJCHLjIuU20Qi3fg==",
+      "version": "2.56.0",
+      "resolved": "https://registry.npmjs.org/viem/-/viem-2.56.0.tgz",
+      "integrity": "sha512-JmkgIk4jN+im4oguLxwPv19pwSaGH9kcGSq25Ilm55106ULBBMNR3eWKKA0wZoeyLPSHIiOwZ4sGceEYEIq7LA==",
       "funding": [
         {
           "type": "github",
@@ -18005,16 +18012,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.41",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.41.tgz",
-      "integrity": "sha512-2laE0p+aK+/AOPG/XL/WepOs/GlK755LJ1XECi9kDUrz1FKNw8rb2Xzlw9JS1rqEV55nb0ttsKxVlTCcd+R5cg==",
+      "version": "3.5.42",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.42.tgz",
+      "integrity": "sha512-4RyHQTbQvOPs3MfvUO1Sg0YRrKNnA0mAVtvpd12Tg1fKDN7OHBUl1IqSn8zGJjK9nI3NkNp8cgTpVrSZC5TTcA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.41",
-        "@vue/compiler-sfc": "3.5.41",
-        "@vue/runtime-dom": "3.5.41",
-        "@vue/server-renderer": "3.5.41",
-        "@vue/shared": "3.5.41"
+        "@vue/compiler-dom": "3.5.42",
+        "@vue/compiler-sfc": "3.5.42",
+        "@vue/runtime-dom": "3.5.42",
+        "@vue/server-renderer": "3.5.42",
+        "@vue/shared": "3.5.42"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -18080,17 +18087,16 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.2.0.tgz",
-      "integrity": "sha512-QAC5i0LEb1GLG0LXDQmHu8L7FX12j0KwU/JTKmLQUJMrn04gQdKP6Du+p0QwpHb3iy71vBlqnHQ8WAfOSAWhqw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.3.0.tgz",
+      "integrity": "sha512-a2PBXX9yfkS58JzSJALUffgDa09lEzKmCcEnLaepoIr88L+9hEnsgEQkcadJGID+vtHa0gFpVo064zmylA9fcg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/generator": "^8.0.0",
         "@vue-macros/common": "^3.1.3",
         "@vue/devtools-api": "^8.1.5",
         "ast-walker-scope": "^0.9.0",
         "chokidar": "^5.0.0",
-        "json5": "^2.2.3",
+        "confbox": "^0.2.4",
         "local-pkg": "^1.2.1",
         "magic-string": "^0.30.21",
         "mlly": "^1.8.2",
@@ -18101,8 +18107,7 @@
         "scule": "^1.3.0",
         "tinyglobby": "^0.2.17",
         "unplugin": "^3.3.0",
-        "unplugin-utils": "^0.3.2",
-        "yaml": "^2.9.0"
+        "unplugin-utils": "^0.3.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
@@ -18129,69 +18134,6 @@
         }
       }
     },
-    "node_modules/vue-router/node_modules/@babel/generator": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0.tgz",
-      "integrity": "sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^8.0.0",
-        "@babel/types": "^8.0.0",
-        "@jridgewell/gen-mapping": "^0.3.12",
-        "@jridgewell/trace-mapping": "^0.3.28",
-        "@types/jsesc": "^2.5.0",
-        "jsesc": "^3.0.2"
-      },
-      "engines": {
-        "node": "^22.18.0 || >=24.11.0"
-      }
-    },
-    "node_modules/vue-router/node_modules/@babel/helper-string-parser": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0.tgz",
-      "integrity": "sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==",
-      "license": "MIT",
-      "engines": {
-        "node": "^22.18.0 || >=24.11.0"
-      }
-    },
-    "node_modules/vue-router/node_modules/@babel/helper-validator-identifier": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.4.tgz",
-      "integrity": "sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==",
-      "license": "MIT",
-      "engines": {
-        "node": "^22.18.0 || >=24.11.0"
-      }
-    },
-    "node_modules/vue-router/node_modules/@babel/parser": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.4.tgz",
-      "integrity": "sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^8.0.4"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": "^22.18.0 || >=24.11.0"
-      }
-    },
-    "node_modules/vue-router/node_modules/@babel/types": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.4.tgz",
-      "integrity": "sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-string-parser": "^8.0.0",
-        "@babel/helper-validator-identifier": "^8.0.4"
-      },
-      "engines": {
-        "node": "^22.18.0 || >=24.11.0"
-      }
-    },
     "node_modules/vue-router/node_modules/@vue/devtools-api": {
       "version": "8.1.5",
       "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.5.tgz",
@@ -18219,13 +18161,13 @@
       }
     },
     "node_modules/wagmi": {
-      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-3.7.6.tgz",
-      "integrity": "sha512-Zm/ppGHV6GYX9by3ERs1KVcNqpMZ4Vdno48Avdz9U+3QCjC5iFatOwruA9IMOl8poL7n/pJGQOcR1xj8N5c69w==",
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-3.7.7.tgz",
+      "integrity": "sha512-J9YTRKwOVt+L135nMiitwGALrJqpXFhLX8AZzbECWeAQ1aI9Uz8Pz0GGMqtbKe7xJtmOx838OChT7YkMs9k8OA==",
       "license": "MIT",
       "dependencies": {
-        "@wagmi/connectors": "8.1.0",
-        "@wagmi/core": "3.6.4",
+        "@wagmi/connectors": "8.2.0",
+        "@wagmi/core": "3.6.5",
         "use-sync-external-store": "1.4.0"
       },
       "funding": {
@@ -18290,6 +18232,66 @@
         }
       }
     },
+    "node_modules/wagmi/node_modules/@wagmi/core": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-3.6.4.tgz",
+      "integrity": "sha512-YERJ+vbFZw3UI6p4KoFU5DkxkqmtzBq5lddpgVAvcu5Tz7kSicKVA3DMCWvjVAFsikNdZYIs39FIkMGWfzpSMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "5.0.1",
+        "mipd": "0.0.7",
+        "zustand": "5.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/wevm"
+      },
+      "peerDependencies": {
+        "@tanstack/query-core": ">=5.0.0",
+        "accounts": "~0.14",
+        "typescript": ">=5.9.3",
+        "viem": "2.x"
+      },
+      "peerDependenciesMeta": {
+        "@tanstack/query-core": {
+          "optional": true
+        },
+        "accounts": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/wagmi/node_modules/@wagmi/core/node_modules/zustand": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.0.tgz",
+      "integrity": "sha512-LE+VcmbartOPM+auOjCCLQOsQ05zUTp8RkgwRzefUk+2jISdMMFnxvyTjA4YNWr5ZGXYbVsEMZosttuxUBkojQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20.0"
+      },
+      "peerDependencies": {
+        "@types/react": ">=18.0.0",
+        "immer": ">=9.0.6",
+        "react": ">=18.0.0",
+        "use-sync-external-store": ">=1.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "immer": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        },
+        "use-sync-external-store": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/web-worker": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.5.0.tgz",
diff --git a/package.json b/package.json
index 3ad911323..07511412a 100644
--- a/package.json
+++ b/package.json
@@ -42,32 +42,32 @@
     "@nuxt/eslint": "1.17.0",
     "@reown/appkit": "1.8.23",
     "@reown/appkit-adapter-wagmi": "1.8.23",
-    "@tanstack/vue-query": "5.102.2",
+    "@tanstack/vue-query": "5.102.8",
     "@vueuse/nuxt": "14.4.0",
-    "@wagmi/core": "3.6.4",
-    "@wagmi/vue": "0.5.29",
-    "axios": "1.19.0",
+    "@wagmi/core": "3.6.5",
+    "@wagmi/vue": "0.5.30",
+    "axios": "1.20.0",
     "chart.js": "4.5.1",
     "chartjs-plugin-annotation": "3.1.0",
     "luxon": "3.7.2",
     "modern-normalize": "3.0.1",
     "nuxt": "4.5.2",
     "pino": "10.3.1",
-    "viem": "2.55.19",
-    "vue": "3.5.41",
+    "viem": "2.56.0",
+    "vue": "3.5.42",
     "vue-chartjs": "5.3.4",
-    "vue-router": "5.2.0",
-    "wagmi": "3.7.6"
+    "vue-router": "5.3.0",
+    "wagmi": "3.7.7"
   },
   "devDependencies": {
     "@nuxtjs/tailwindcss": "6.14.0",
     "@types/luxon": "3.7.5",
-    "@types/node": "26.2.0",
+    "@types/node": "26.4.0",
     "eslint": "10.9.1",
-    "lint-staged": "17.3.0",
+    "lint-staged": "17.4.1",
     "playwright": "1.62.1",
     "sass": "1.103.1",
-    "simple-git-hooks": "2.13.1",
+    "simple-git-hooks": "2.14.0",
     "tailwindcss": "3.4.19",
     "typescript": "5.9.3",
     "vitest": "4.1.11",

From 36d2c2a72fef2d0bc50eef8a9318d2d85a1c76a2 Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Mon, 7 Sep 2026 10:04:17 +0100
Subject: [PATCH 05/12] fix: align Wagmi connector override

Resolve the updated Wagmi packages against connectors 8.2.0 so the lockfile uses a single compatible core version.
---
 package-lock.json | 90 ++++++++---------------------------------------
 package.json      |  2 +-
 2 files changed, 16 insertions(+), 76 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index daee5b9f0..dedff1f3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3412,9 +3412,9 @@
       }
     },
     "node_modules/@reown/appkit-adapter-wagmi/node_modules/@wagmi/connectors": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.1.0.tgz",
-      "integrity": "sha512-ASlHXq9NC4pp617lalZdlPuPnZUhFeWNEKQfm3ngVSQKd4S2is5XXG4v3EOAhcxdLjSk1AMfGXlHgk5tX2WCZg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.2.0.tgz",
+      "integrity": "sha512-hPwdmePYjQqSWlw9JmzrzVgmw2PJ+NJsUQ/BuPBYbzBS8+cW5vWdqiaKLB4qTF9m+yr+zSp7u91KBgvOWz50og==",
       "license": "MIT",
       "optional": true,
       "funding": {
@@ -3426,9 +3426,9 @@
         "@metamask/connect-evm": "^2.1.0",
         "@safe-global/safe-apps-provider": "~0.18.6",
         "@safe-global/safe-apps-sdk": "^9.1.0",
-        "@wagmi/core": "3.6.4",
+        "@wagmi/core": "3.6.5",
         "@walletconnect/ethereum-provider": "^2.21.1",
-        "accounts": "~0.14",
+        "accounts": "~0.18",
         "typescript": ">=5.9.3",
         "viem": "2.x"
       },
@@ -7035,9 +7035,9 @@
       }
     },
     "node_modules/@wagmi/vue/node_modules/@wagmi/connectors": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.1.0.tgz",
-      "integrity": "sha512-ASlHXq9NC4pp617lalZdlPuPnZUhFeWNEKQfm3ngVSQKd4S2is5XXG4v3EOAhcxdLjSk1AMfGXlHgk5tX2WCZg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.2.0.tgz",
+      "integrity": "sha512-hPwdmePYjQqSWlw9JmzrzVgmw2PJ+NJsUQ/BuPBYbzBS8+cW5vWdqiaKLB4qTF9m+yr+zSp7u91KBgvOWz50og==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/wevm"
@@ -7048,9 +7048,9 @@
         "@metamask/connect-evm": "^2.1.0",
         "@safe-global/safe-apps-provider": "~0.18.6",
         "@safe-global/safe-apps-sdk": "^9.1.0",
-        "@wagmi/core": "3.6.4",
+        "@wagmi/core": "3.6.5",
         "@walletconnect/ethereum-provider": "^2.21.1",
-        "accounts": "~0.14",
+        "accounts": "~0.18",
         "typescript": ">=5.9.3",
         "viem": "2.x"
       },
@@ -18186,9 +18186,9 @@
       }
     },
     "node_modules/wagmi/node_modules/@wagmi/connectors": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.1.0.tgz",
-      "integrity": "sha512-ASlHXq9NC4pp617lalZdlPuPnZUhFeWNEKQfm3ngVSQKd4S2is5XXG4v3EOAhcxdLjSk1AMfGXlHgk5tX2WCZg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-8.2.0.tgz",
+      "integrity": "sha512-hPwdmePYjQqSWlw9JmzrzVgmw2PJ+NJsUQ/BuPBYbzBS8+cW5vWdqiaKLB4qTF9m+yr+zSp7u91KBgvOWz50og==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/wevm"
@@ -18199,9 +18199,9 @@
         "@metamask/connect-evm": "^2.1.0",
         "@safe-global/safe-apps-provider": "~0.18.6",
         "@safe-global/safe-apps-sdk": "^9.1.0",
-        "@wagmi/core": "3.6.4",
+        "@wagmi/core": "3.6.5",
         "@walletconnect/ethereum-provider": "^2.21.1",
-        "accounts": "~0.14",
+        "accounts": "~0.18",
         "typescript": ">=5.9.3",
         "viem": "2.x"
       },
@@ -18232,66 +18232,6 @@
         }
       }
     },
-    "node_modules/wagmi/node_modules/@wagmi/core": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-3.6.4.tgz",
-      "integrity": "sha512-YERJ+vbFZw3UI6p4KoFU5DkxkqmtzBq5lddpgVAvcu5Tz7kSicKVA3DMCWvjVAFsikNdZYIs39FIkMGWfzpSMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "eventemitter3": "5.0.1",
-        "mipd": "0.0.7",
-        "zustand": "5.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/wevm"
-      },
-      "peerDependencies": {
-        "@tanstack/query-core": ">=5.0.0",
-        "accounts": "~0.14",
-        "typescript": ">=5.9.3",
-        "viem": "2.x"
-      },
-      "peerDependenciesMeta": {
-        "@tanstack/query-core": {
-          "optional": true
-        },
-        "accounts": {
-          "optional": true
-        },
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/wagmi/node_modules/@wagmi/core/node_modules/zustand": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.0.tgz",
-      "integrity": "sha512-LE+VcmbartOPM+auOjCCLQOsQ05zUTp8RkgwRzefUk+2jISdMMFnxvyTjA4YNWr5ZGXYbVsEMZosttuxUBkojQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.20.0"
-      },
-      "peerDependencies": {
-        "@types/react": ">=18.0.0",
-        "immer": ">=9.0.6",
-        "react": ">=18.0.0",
-        "use-sync-external-store": ">=1.2.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "immer": {
-          "optional": true
-        },
-        "react": {
-          "optional": true
-        },
-        "use-sync-external-store": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/web-worker": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.5.0.tgz",
diff --git a/package.json b/package.json
index 07511412a..cf0ca7652 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
   },
   "overrides": {
     "@base-org/account": "2.5.1",
-    "@wagmi/connectors": "8.1.0",
+    "@wagmi/connectors": "8.2.0",
     "serialize-javascript": "7.1.0",
     "ws": "8.21.3",
     "@coinbase/cdp-sdk": {

From 6ef969276c773916856fa032106fe1d8104374f7 Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Mon, 7 Sep 2026 14:51:18 +0100
Subject: [PATCH 06/12] fix: align environment documentation with current
 configuration

Remove the unused Stablewatch example and document active settings, source precedence, announcement retirement, and Nuxt 4. Correct configuration comments without changing runtime behavior.
---
 .env.example               | 14 +++++++++-----
 README.md                  | 14 +++++++++-----
 docs/README.md             |  2 +-
 docs/announcement-modal.md |  8 ++++----
 docs/architecture.md       |  6 +++---
 docs/development-guide.md  |  8 ++++----
 docs/getting-started.md    |  2 +-
 server/plugins/csp.ts      |  8 +++++---
 utils/chain-env.ts         |  2 +-
 9 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/.env.example b/.env.example
index 83954d643..7d8c285e5 100644
--- a/.env.example
+++ b/.env.example
@@ -52,9 +52,9 @@ NUXT_PUBLIC_SWAP_API_URL="https://swap-dev.euler.finance"
 # Pyth Hermes authentication (server-side only, required for Pyth-backed markets)
 PYTH_API_KEY=
 
-# Stablewatch intrinsic APY (server-side only, optional)
-# If not set, Stablewatch APY data will not be fetched even if tokens are configured.
-STABLEWATCH_API_KEY=
+# Merkl authentication (server-side only, optional)
+# Sends X-API-Key through /api/internal/proxy/merkl for an increased upstream quota.
+MERKL_API_KEY=
 
 # Tenderly simulation (server-side only, optional)
 TENDERLY_ACCESS_KEY=
@@ -129,6 +129,8 @@ NUXT_PUBLIC_CONFIG_TELEGRAM_URL=
 NUXT_PUBLIC_CONFIG_GITHUB_URL="https://github.com/euler-xyz"
 NUXT_PUBLIC_CONFIG_APP_TITLE="Euler Lite"
 NUXT_PUBLIC_CONFIG_APP_DESCRIPTION="Lightweight interface for Euler Finance."
+# Custom logo URL (optional). LOGO_URL takes precedence at server startup.
+NUXT_PUBLIC_CONFIG_LOGO_URL=
 # Absolute URL to a social share image (og:image / twitter:image).
 # Recommended: 1200x630 or larger (2400x1260), PNG or JPG. Must be publicly
 # reachable — X, Slack, Discord fetch it directly. Empty = no preview image.
@@ -153,6 +155,7 @@ NUXT_PUBLIC_CONFIG_ENABLE_EARN_PAGE="true"
 NUXT_PUBLIC_CONFIG_ENABLE_LEND_PAGE="true"
 NUXT_PUBLIC_CONFIG_ENABLE_EXPLORE_PAGE="true"
 NUXT_PUBLIC_CONFIG_ENABLE_APP_TITLE="true"
+NUXT_PUBLIC_CONFIG_ENABLE_POWERED_BY_EULER="true"
 
 # Incentives provider flags — all enabled by default
 NUXT_PUBLIC_CONFIG_ENABLE_MERKL="true"
@@ -161,8 +164,9 @@ NUXT_PUBLIC_CONFIG_ENABLE_FUUL="true"
 NUXT_PUBLIC_CONFIG_ENABLE_TURTLE="true"
 
 # One-time announcement modal (optional). Populate any content field to show it
-# after onboarding. Short CONFIG_ANNOUNCEMENT_* names are also accepted at
-# runtime for Doppler-injected deployments.
+# after onboarding. At server startup, short CONFIG_ANNOUNCEMENT_* names take
+# precedence over the corresponding NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_* names.
+# Clear both naming forms for all four fields to disable the announcement.
 NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_TITLE=
 NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_BODY=
 # Newline-delimited text or JSON array string, e.g. '["First","Second"]'.
diff --git a/README.md b/README.md
index 4971871c5..51bfa9b9c 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Euler Lite uses the [Euler V2 SDK](https://github.com/euler-xyz/euler-sdks) for
 | `DEPRECATED_CHAINS` | — | Comma-separated chain IDs shown collapsed in the chain selector and skipped by startup warm-cache cycles. |
 | `ONCHAIN_SDK_CHAINS` | — | Comma-separated chain IDs pinned to the onchain SDK adapter config for chain-aware browser reads and the server vault snapshot, bypassing V3. Independent of `DEPRECATED_CHAINS`; list a chain in both to deprecate it and route it onchain. |
 | `EVAULT_FETCH_CHUNK_CHAINS` | — | Comma-separated chain IDs whose EVault list reads are split into small sequential SDK calls. Use for RPC/lens endpoints that fail under larger concurrent onchain EVault fetches. |
-| `EULER_SDK_EULER_INTERFACES_BRANCH` | `master` | Euler interfaces branch used for runtime ABIs and `EulerChains.json`. When set, it takes precedence over `NUXT_PUBLIC_CONFIG_EULER_CHAINS_URL`. |
+| `EULER_SDK_EULER_INTERFACES_BRANCH` | `master` | Euler interfaces branch used for runtime ABIs and `EulerChains.json`. Explicit `NUXT_PUBLIC_CONFIG_EULER_CHAINS_URL` and `NUXT_PUBLIC_CONFIG_EULER_ABIS_BASE_URL` overrides take precedence over the branch for their respective manifests. |
 
 `fallback` uses V3 first and on-chain reads second. If no V3 URL is configured, Lite passes `disableV3: true` to the SDK so fallback reads go straight on-chain.
 
@@ -75,18 +75,19 @@ Euler Lite uses the [Euler V2 SDK](https://github.com/euler-xyz/euler-sdks) for
 | Variable | Description |
 | -------- | ----------- |
 | `CORS_ALLOWED_ORIGINS` | Comma-separated allowlist for `/api/*`; falls back to `NUXT_PUBLIC_APP_URL`. |
+| `FIRST_PARTY_COOKIE_SECRET` | Optional server-only secret that keeps the internal API marker cookie stable across replicas and deploys. Defaults to a value derived from `NUXT_PUBLIC_APP_URL` or `RAILWAY_PUBLIC_DOMAIN`. |
 | `CSP_EXTRA_CONNECT_SRC` | Extra `connect-src` origins for development or staging endpoints. |
 | `DEV_GEO_COUNTRY` | Local/preview country fallback when Cloudflare geo headers are absent. Do not set in production behind Cloudflare. |
 | `ADDRESS_SCREENING_URI` / `ADDRESS_SCREENING_API_KEY` | Server-side data-v3 compliance endpoint + restricted API key, proxied by `/api/internal/screen-address` (also serves first-party `*.euler.finance` SPAs). Both unset ⇒ screening disabled (all addresses pass) — except in production (`DOPPLER_ENVIRONMENT=prd`), where missing configuration fails closed; only one set ⇒ fails closed everywhere. URI must be https (localhost http allowed for dev). |
-| `STABLEWATCH_API_KEY` | Optional server-side Stablewatch key for intrinsic APY data. |
 | `MERKL_API_KEY` | Optional server-side Merkl key. The Merkl API works anonymously (10 req/sec shared across all users via `/api/internal/proxy/merkl`); set this to send `X-API-Key` upstream for a higher quota. Server-only — never exposed to the browser. |
 | `TENDERLY_ACCESS_KEY`, `TENDERLY_ACCOUNT_SLUG`, `TENDERLY_PROJECT_SLUG` | Optional Tenderly simulation configuration. |
 | `FUUL_API_URL` or `NUXT_PUBLIC_FUUL_API_URL` | Optional Fuul API upstream override. |
 | `INCENTRA_API_URL` or `NUXT_PUBLIC_INCENTRA_API_URL` | Optional Incentra/Brevis API upstream override. |
+| `TURTLE_EARN_API_URL` or `NUXT_PUBLIC_TURTLE_EARN_API_URL` | Optional Turtle reward-proof upstream override; defaults to `https://earn.turtle.xyz/v1`. |
 
 #### Branding & Feature Flags
 
-These use Nuxt's `runtimeConfig` and are set via `NUXT_PUBLIC_CONFIG_*` env vars:
+These settings use `NUXT_PUBLIC_CONFIG_*` env vars. Branding and announcement values are read by the server at startup and injected into `window.__APP_CONFIG__`; links and feature flags use Nuxt's public `runtimeConfig`. The server proxy handlers resolve the upstream source overrides.
 
 | Variable                                    | Default                                    | Description                                           |
 | ------------------------------------------- | ------------------------------------------ | ----------------------------------------------------- |
@@ -97,7 +98,8 @@ These use Nuxt's `runtimeConfig` and are set via `NUXT_PUBLIC_CONFIG_*` env vars
 | `NUXT_PUBLIC_CONFIG_LABELS_REPO`            | `euler-xyz/euler-labels`                   | GitHub labels repo                                    |
 | `NUXT_PUBLIC_CONFIG_LABELS_REPO_BRANCH`     | `master`                                   | Branch to fetch labels from                           |
 | `NUXT_PUBLIC_CONFIG_LABELS_BASE_URL`        | —                                          | S3/CDN base URL for labels (overrides repo/branch)    |
-| `NUXT_PUBLIC_CONFIG_EULER_CHAINS_URL`       | —                                          | URL for EulerChains.json, used when no Euler interfaces branch is configured |
+| `NUXT_PUBLIC_CONFIG_EULER_CHAINS_URL`       | —                                          | Explicit URL for EulerChains.json; takes precedence over the Euler interfaces branch |
+| `NUXT_PUBLIC_CONFIG_EULER_ABIS_BASE_URL` | — | Base URL serving `{contract}.json` for runtime ABIs; takes precedence over the Euler interfaces branch. |
 | `NUXT_PUBLIC_CONFIG_DOCS_URL`               | —                                          | Documentation link                                    |
 | `NUXT_PUBLIC_CONFIG_STARGATE_URL`           | —                                          | Stargate link                                         |
 | `NUXT_PUBLIC_CONFIG_TOS_URL`                | —                                          | Terms of Service link                                 |
@@ -115,9 +117,11 @@ These use Nuxt's `runtimeConfig` and are set via `NUXT_PUBLIC_CONFIG_*` env vars
 | `NUXT_PUBLIC_CONFIG_ENABLE_ENTITY_BRANDING` | `true`                                     | Show entity branding                                  |
 | `NUXT_PUBLIC_CONFIG_ENABLE_VAULT_TYPE`      | `true`                                     | Show vault type labels                                |
 | `NUXT_PUBLIC_CONFIG_ENABLE_APP_TITLE`       | `true`                                     | Show app title in the navbar                          |
+| `NUXT_PUBLIC_CONFIG_ENABLE_POWERED_BY_EULER` | `true` | Show the Powered by Euler branding in the navbar |
 | `NUXT_PUBLIC_CONFIG_ENABLE_MERKL`           | `true`                                     | Enable Merkl rewards integration                      |
 | `NUXT_PUBLIC_CONFIG_ENABLE_INCENTRA`        | `true`                                     | Enable Incentra rewards integration                   |
 | `NUXT_PUBLIC_CONFIG_ENABLE_FUUL`            | `true`                                     | Enable Fuul rewards integration                       |
+| `NUXT_PUBLIC_CONFIG_ENABLE_TURTLE` | `true` | Enable Turtle rewards integration |
 | `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_TITLE`     | —                                          | Optional one-time modal title; any announcement content field enables the modal |
 | `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_BODY`      | —                                          | Optional one-time modal body text                     |
 | `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_ITEMS`     | —                                          | Optional newline-delimited or JSON-array bullet items |
@@ -125,7 +129,7 @@ These use Nuxt's `runtimeConfig` and are set via `NUXT_PUBLIC_CONFIG_*` env vars
 | `NUXT_PUBLIC_CONFIG_UNISWAP_TOKEN_LIST_URL` | `https://tokens.uniswap.org`               | Uniswap token list for swap selector                  |
 | `NUXT_PUBLIC_CONFIG_DEFILLAMA_TOKEN_LIST_URL` | `https://d3g10bzo9rdluh.cloudfront.net`  | DefiLlama token list for swap selector                |
 
-Runtime deployments can also set the short `CONFIG_ANNOUNCEMENT_*` names. They are injected through `window.__APP_CONFIG__` at server startup and can change without rebuilding static assets. See [Announcement Modal](./docs/announcement-modal.md) for rollout and dismissal behavior.
+At server startup, short `CONFIG_ANNOUNCEMENT_*` names take precedence over the corresponding `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` names. Both are read at runtime and can change after a server restart without rebuilding static assets. To disable an announcement, clear both naming forms for all four content fields. See [Announcement Modal](./docs/announcement-modal.md) for rollout and dismissal behavior.
 
 #### Chain Configuration
 
diff --git a/docs/README.md b/docs/README.md
index 9cdeb9de5..e86d52468 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -170,7 +170,7 @@ Welcome to the documentation for the Euler Lite project. This documentation is d
 
 ## 🏛️ Key Technologies
 
-- **Frontend**: Nuxt.js 3, Vue 3, TypeScript
+- **Frontend**: Nuxt.js 4, Vue 3, TypeScript
 - **Blockchain**: Multiple EVM chains
 - **DeFi Protocol**: Euler Finance
 - **Wallet Integration**: Wagmi / Reown (EVM wallets)
diff --git a/docs/announcement-modal.md b/docs/announcement-modal.md
index 9bab38a30..cea420c9b 100644
--- a/docs/announcement-modal.md
+++ b/docs/announcement-modal.md
@@ -15,9 +15,9 @@ Lite can show a one-time, deployment-controlled announcement after onboarding. I
 
 ## Configuration
 
-Set any content field to enable the modal. Short names are read at server startup for Doppler/runtime injection; `NUXT_PUBLIC_` names are build-time fallbacks for static deployments.
+Set any content field to enable the modal. At server startup, the first non-empty value wins: the short name first, then its `NUXT_PUBLIC_` alias. Both naming forms support runtime injection. When `window.__APP_CONFIG__` is unavailable, the client reads Nuxt public runtime config populated through the `NUXT_PUBLIC_` names.
 
-| Runtime env var | Build-time fallback | Notes |
+| Preferred runtime env var | Runtime alias / public config fallback | Notes |
 |---|---|---|
 | `CONFIG_ANNOUNCEMENT_TITLE` | `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_TITLE` | Modal title. Defaults to `Announcement` only if omitted. |
 | `CONFIG_ANNOUNCEMENT_BODY` | `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_BODY` | Paragraph text. Trimmed. |
@@ -61,8 +61,8 @@ If the URL is rejected and no other content is configured, the announcement is d
 ## Operational Notes
 
 - Use the short `CONFIG_ANNOUNCEMENT_*` names for deployments where Doppler or another secret manager injects env vars at container startup. They do not require a rebuild because `server/plugins/app-config.ts` reads them when Nitro starts.
-- Use `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` only when the app is built as static assets or when build-time public runtime config is the intended source.
-- To retire an announcement, unset all four content vars and restart/redeploy the server.
+- `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` names also work at server startup when the corresponding short name is unset or empty. They also populate the public runtime config fallback.
+- To retire an announcement, clear both `CONFIG_ANNOUNCEMENT_*` and `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` naming forms for all four content fields, then restart/redeploy the server. For static assets that use the public config fallback, rebuild with the fields cleared.
 - To force the current announcement to reappear in a browser during local testing, clear `localStorage["announcement-seen-token"]`.
 
 ## Troubleshooting
diff --git a/docs/architecture.md b/docs/architecture.md
index 4eab2c08a..8f19ac972 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -94,7 +94,7 @@ The application follows Vue 3's Composition API pattern, organizing code into lo
 
 ```
 ┌─────────────────────────────────────────────────────────────────┐
-│                        Nuxt.js 3                                │
+│                        Nuxt.js 4                                │
 ├─────────────────────────────────────────────────────────────────┤
 │                    Vue 3 + Composition API                      │
 ├─────────────────────────────────────────────────────────────────┤
@@ -131,9 +131,9 @@ The application follows Vue 3's Composition API pattern, organizing code into lo
 
 ## 🎯 Key Architectural Decisions
 
-### 1. Nuxt.js 3 Framework
+### 1. Nuxt.js 4 Framework
 
-**Why Nuxt.js 3?**
+**Why Nuxt.js 4?**
 
 - **SSR Disabled**: Client-side only SPA, SSR is not needed
 - **Auto-imports**: Reduces boilerplate and improves developer experience
diff --git a/docs/development-guide.md b/docs/development-guide.md
index 80a683e98..310ab1ed0 100644
--- a/docs/development-guide.md
+++ b/docs/development-guide.md
@@ -69,9 +69,9 @@ CI=true npm run test:run
 
 ## Environment variables
 
-Configuration is split into two mechanisms:
+Configuration is split into three mechanisms:
 
-1. **`useEnvConfig()`** (`composables/useEnvConfig.ts`) — API URLs, Pyth, Reown, branding, and deployment announcements. Injected at runtime via `server/plugins/app-config.ts` into `window.__APP_CONFIG__`, with `NUXT_PUBLIC_*` values as build-time fallbacks. Browser V3 data services use the same-origin `/api/internal/v3` proxy. The proxy reads `V3_API_URL`, `EULER_SDK_V3_API_URL`, or `NUXT_PUBLIC_V3_API_URL` for the upstream URL and `EULER_SDK_V3_API_KEY` for the optional server-side API key.
+1. **`useEnvConfig()`** (`composables/useEnvConfig.ts`) — API URLs, Pyth, Reown, branding, and deployment announcements. Injected at runtime via `server/plugins/app-config.ts` into `window.__APP_CONFIG__`, with Nuxt public runtime config as a fallback when the injected config is unavailable. Browser V3 data services use the same-origin `/api/internal/v3` proxy. The proxy reads `V3_API_URL`, `EULER_SDK_V3_API_URL`, or `NUXT_PUBLIC_V3_API_URL` for the upstream URL and `EULER_SDK_V3_API_KEY` for the optional server-side API key.
 
 2. **Nuxt `runtimeConfig`** (`useDeployConfig()`) — social links, feature flags, label source URLs, and static deployment fallbacks. Set via `NUXT_PUBLIC_CONFIG_*` env vars. Includes `NUXT_PUBLIC_CONFIG_LABELS_BASE_URL` and `NUXT_PUBLIC_CONFIG_EULER_CHAINS_URL` for configuring upstream data sources. Both are fetched through server-side proxy endpoints with 5-minute caching — see [Server-Side Data Proxies](#server-side-data-proxies) below.
 
@@ -81,7 +81,7 @@ See the [README](../README.md) for the full env var reference.
 
 Dev HTTPS: `HTTPS_KEY`, `HTTPS_CERT` (optional).
 
-Announcement modal content can be supplied as runtime `CONFIG_ANNOUNCEMENT_TITLE`, `CONFIG_ANNOUNCEMENT_BODY`, `CONFIG_ANNOUNCEMENT_ITEMS`, and `CONFIG_ANNOUNCEMENT_URL` values, or as `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` build-time fallbacks. See [Announcement Modal](./announcement-modal.md) for examples, dismissal behavior, and URL constraints.
+Announcement modal content is read at server startup from `CONFIG_ANNOUNCEMENT_TITLE`, `CONFIG_ANNOUNCEMENT_BODY`, `CONFIG_ANNOUNCEMENT_ITEMS`, and `CONFIG_ANNOUNCEMENT_URL`, falling back to the corresponding `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` names. The prefixed names also populate the public runtime config fallback. See [Announcement Modal](./announcement-modal.md) for examples, dismissal behavior, and URL constraints.
 
 ## Server-Side Data Proxies
 
@@ -144,7 +144,7 @@ The `/api/internal/pyth/updates` endpoint proxies Pyth Hermes price update reque
 
 ## Conventions
 
-- Vue 3 + Nuxt 3 with Composition API.
+- Vue 3 + Nuxt 4 with Composition API.
 - Composables named as `useXxx.ts` and colocated in `composables/`.
 - Prefer referencing on-chain data via helpers in `entities/` and state via `composables/`.
 
diff --git a/docs/getting-started.md b/docs/getting-started.md
index cce292038..507671835 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -18,7 +18,7 @@ Welcome to the Euler Lite project! This guide will help you get up and running w
 
 ### Frontend Framework
 
-- **Nuxt.js 3**: Full-stack Vue.js framework
+- **Nuxt.js 4**: Full-stack Vue.js framework
 - **Vue 3**: Progressive JavaScript framework with Composition API
 - **TypeScript**: Type-safe JavaScript development
 - **SCSS**: Advanced CSS preprocessing with custom design system
diff --git a/server/plugins/csp.ts b/server/plugins/csp.ts
index 9c88b42d5..bdf1abd87 100644
--- a/server/plugins/csp.ts
+++ b/server/plugins/csp.ts
@@ -64,7 +64,9 @@ function scanDynamicEnvUrls(): string[] {
   const urls: string[] = []
   for (const [key, value] of Object.entries(process.env)) {
     if (!value) continue
-    // RPC_URL_<chainId> — wagmi uses these directly on the client.
+    // Include configured RPC upstream origins in the allowlist. The browser
+    // transport uses /api/internal/rpc/{chainId}, then the chain's public RPC
+    // fallback (plugins/00.wagmi.ts); it does not receive these upstream URLs.
     // Subgraph URLs are intentionally absent: all subgraph traffic is
     // same-origin via /api/internal/proxy/subgraph/{chainId}, so no connect-src is
     // needed for the upstream.
@@ -100,12 +102,12 @@ function parseChainPublicRpcOrigins(): string[] {
 
 /** Derive CSP origins from URL env vars so deployers don't need to duplicate them. */
 function parseEnvOrigins(): { connect: string[] } {
-  // Labels, oracle checks, and token lists are proxied through server /api/*
+  // Labels, V3 oracle assessments, and token lists use same-origin /api/internal/*
   // endpoints, so their origins are not needed in connect-src.
   const connectVars = [
     env('SWAP_API_URL', 'NUXT_PUBLIC_SWAP_API_URL'),
     // Pyth Hermes is proxied through /api/internal/pyth/updates — no external origin needed
-    // Dynamic per-chain URLs (RPC for wagmi, subgraph for GraphQL)
+    // Configured RPC upstream origins
     ...scanDynamicEnvUrls(),
   ]
 
diff --git a/utils/chain-env.ts b/utils/chain-env.ts
index 8ac7db868..15ee665af 100644
--- a/utils/chain-env.ts
+++ b/utils/chain-env.ts
@@ -5,7 +5,7 @@
  * (plugins, API handlers) and client-side code executed during SSR
  * (e.g. `useChainConfig` on the server branch) import from a single
  * source of truth. The convention is:
- *   - `RPC_URL_<chainId>` — enables a chain (presence, not value, matters)
+ *   - `RPC_URL_<chainId>` — a non-empty HTTP(S) URL enables a known chain
  *
  * The per-chain subgraph URL (`SUBGRAPH_URL_<chainId>`, legacy
  * `NUXT_PUBLIC_SUBGRAPH_URI_<chainId>`) is resolved server-side only, inside

From 625ec450c9f956e5e90420c33bd62a53df84f194 Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Mon, 7 Sep 2026 15:26:39 +0100
Subject: [PATCH 07/12] fix: clarify announcement configuration deployment
 scope

Document restart behavior for Nitro deployments and rebuild requirements for static public-config fallback values.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 51bfa9b9c..26756b298 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ These settings use `NUXT_PUBLIC_CONFIG_*` env vars. Branding and announcement va
 | `NUXT_PUBLIC_CONFIG_UNISWAP_TOKEN_LIST_URL` | `https://tokens.uniswap.org`               | Uniswap token list for swap selector                  |
 | `NUXT_PUBLIC_CONFIG_DEFILLAMA_TOKEN_LIST_URL` | `https://d3g10bzo9rdluh.cloudfront.net`  | DefiLlama token list for swap selector                |
 
-At server startup, short `CONFIG_ANNOUNCEMENT_*` names take precedence over the corresponding `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` names. Both are read at runtime and can change after a server restart without rebuilding static assets. To disable an announcement, clear both naming forms for all four content fields. See [Announcement Modal](./docs/announcement-modal.md) for rollout and dismissal behavior.
+At server startup, short `CONFIG_ANNOUNCEMENT_*` names take precedence over the corresponding `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` names. In Nitro-served deployments, both naming forms are read at server startup, so updates require a server restart without rebuilding client assets. Generated/static deployments must rebuild when `NUXT_PUBLIC_CONFIG_ANNOUNCEMENT_*` fallback values change. To disable an announcement, clear both naming forms for all four content fields. See [Announcement Modal](./docs/announcement-modal.md) for rollout and dismissal behavior.
 
 #### Chain Configuration
 

From 1f1a0daef496c9028e3686e5f83fa8d6eeb20d9d Mon Sep 17 00:00:00 2001
From: Girts <girts@euler.xyz>
Date: Tue, 8 Sep 2026 10:04:15 +0300
Subject: [PATCH 08/12] Update distroless image

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 87442bc0d..012fa621b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ ENV NODE_OPTIONS=--max-old-space-size=4096
 RUN npm run build
 
 # ── Production stage (distroless: no shell, no tools, non-root) ──
-FROM gcr.io/distroless/nodejs24-debian12:nonroot AS production
+FROM gcr.io/distroless/nodejs24-debian13:nonroot AS production
 
 ENV MODE=production
 ENV NODE_ENV=production

From feefe82f6946008c87fa21eb1c300bce798ff874 Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Tue, 8 Sep 2026 09:47:49 +0100
Subject: [PATCH 09/12] fix: correct vault verification chain and failure
 handling

Use the selected app chain for vault verification, preserve unavailable label state with retry, and share Earn disclaimer consent with the operation guard. Cover chain mismatch, request failures, recovery, and form prerequisites.
---
 app.vue                                       | 11 ++-
 .../entities/vault/form/VaultFormSubmit.vue   | 44 +++++++---
 composables/guards/useUnverifiedVaultGuard.ts | 65 ++++++++++++---
 composables/useEulerLabels.ts                 | 21 ++++-
 composables/useOperationGuard.ts              |  3 +-
 docs/server-side-caching.md                   |  2 +
 docs/vault-labels-and-verification.md         | 10 ++-
 .../reviewed-execution/policy/app-policy.ts   |  8 +-
 pages/earn/[vault]/index.vue                  | 48 ++++++-----
 server/api/internal/labels/[file].get.ts      | 18 ++---
 tests/components/VaultFormSubmit.test.ts      | 72 +++++++++++++++++
 tests/composables/useEulerLabels.test.ts      | 28 +++++++
 tests/composables/useOperationGuard.test.ts   | 81 +++++++++++++++++++
 .../useUnverifiedVaultGuard.test.ts           | 54 +++++++++++++
 .../app-policy-vault-context.test.ts          |  9 +++
 tests/server/labels-fetch-failure.test.ts     | 25 ++++++
 tests/utils/euler-labels-fetch.test.ts        | 36 +++++++++
 utils/euler-labels-fetch.ts                   | 20 +++++
 18 files changed, 498 insertions(+), 57 deletions(-)
 create mode 100644 tests/components/VaultFormSubmit.test.ts
 create mode 100644 tests/composables/useOperationGuard.test.ts
 create mode 100644 tests/server/labels-fetch-failure.test.ts
 create mode 100644 tests/utils/euler-labels-fetch.test.ts
 create mode 100644 utils/euler-labels-fetch.ts

diff --git a/app.vue b/app.vue
index 691790cd7..91891a3de 100644
--- a/app.vue
+++ b/app.vue
@@ -14,7 +14,7 @@ let isAnnouncementOpen = false
 const { loadEulerConfig, chainId } = useEulerAddresses()
 const { loadVaults, isReady: isVaultsReady, resetVaultsState, refreshVaults, setShowAllLabelEntries } = useVaults()
 const { loadTokenList, isLoaded: isTokenListLoaded } = useTokenList()
-const { loadLabels } = useEulerLabels()
+const { loadLabels, retryLabels, isReady: isLabelsReady, isLoading: isLabelsLoading, loadError: labelsLoadError } = useEulerLabels()
 const { loadCountry } = useGeoBlock()
 const { updateBalances, resetBalances } = useWallets()
 const { isConnected, address } = useWagmi()
@@ -217,6 +217,15 @@ onUnmounted(() => {
       :class="isMenuVisible ? 'pb-[98px]' : 'pb-16'"
     >
       <div class="w-full max-w-container mx-16 mobile:px-16 mobile:mx-0">
+        <UiAlert
+          v-if="labelsLoadError && !isLabelsReady"
+          class="mb-16"
+          title="Vault verification unavailable"
+          :description="labelsLoadError"
+          variant="error"
+          :action-text="isLabelsLoading ? 'Retrying…' : 'Retry'"
+          @action="retryLabels"
+        />
         <NuxtLayout>
           <NuxtPage
             :keepalive="{ include: ['ExplorePage', 'EarnPage', 'LendPage', 'BorrowPage', 'PortfolioPage'] }"
diff --git a/components/entities/vault/form/VaultFormSubmit.vue b/components/entities/vault/form/VaultFormSubmit.vue
index 637aa537c..74a79334c 100644
--- a/components/entities/vault/form/VaultFormSubmit.vue
+++ b/components/entities/vault/form/VaultFormSubmit.vue
@@ -267,7 +267,38 @@ const handleAddToBatch = () => {
          primary action becomes "Add to batch" (Option B) rather than a disabled
          execute button + a separate "+". Direct execute resumes once the batch
          is cleared (link below). -->
-      <template v-if="batchBlocksDirect && supportsBatch">
+      <template v-if="!hasActiveSession || needToSwitchChain">
+        <UiButton
+          type="button"
+          size="large"
+          :variant="needToSwitchChain ? 'red' : 'primary'"
+          @click="onClick"
+        >
+          {{ needToSwitchChain ? 'Switch chain' : 'Connect wallet' }}
+        </UiButton>
+      </template>
+      <template v-else-if="unverifiedVaultGuard?.isVerificationLoading">
+        <UiButton
+          size="large"
+          disabled
+          loading
+        >
+          Checking vault verification
+        </UiButton>
+      </template>
+      <template v-else-if="unverifiedVaultGuard?.verificationError">
+        <p class="text-content-secondary">
+          {{ unverifiedVaultGuard.verificationError }}
+        </p>
+        <UiButton
+          type="button"
+          size="large"
+          @click="unverifiedVaultGuard.retryVerification()"
+        >
+          Retry verification
+        </UiButton>
+      </template>
+      <template v-else-if="batchBlocksDirect && supportsBatch">
         <UiButton
           size="large"
           variant="primary"
@@ -348,18 +379,11 @@ const handleAddToBatch = () => {
           v-bind="$attrs"
           size="large"
           type="submit"
-          :variant="needToSwitchChain ? 'red' : 'primary'"
+          variant="primary"
           :loading="isLoading"
           :disabled="_disabled"
-          @click="onClick"
         >
-          <template v-if="needToSwitchChain">
-            Switch chain
-          </template>
-          <slot v-else-if="hasActiveSession" />
-          <template v-else>
-            Connect wallet
-          </template>
+          <slot />
         </UiButton>
       </template>
 
diff --git a/composables/guards/useUnverifiedVaultGuard.ts b/composables/guards/useUnverifiedVaultGuard.ts
index 39c327669..7863af001 100644
--- a/composables/guards/useUnverifiedVaultGuard.ts
+++ b/composables/guards/useUnverifiedVaultGuard.ts
@@ -6,6 +6,9 @@ import { recordUnverifiedVaultAcknowledgement, unverifiedVaultAcknowledgementKey
 
 export interface UnverifiedVaultGuardState {
   isAcknowledgmentRequired: boolean
+  isVerificationLoading: boolean
+  verificationError: string | undefined
+  retryVerification: () => Promise<void>
   acknowledgeRisk: () => void
 }
 
@@ -28,15 +31,47 @@ export const useUnverifiedVaultGuard = (
     isEarnVaultOwnerVerified,
   } = useVaults()
 
+  const { isReady: labelsReady, loadError: labelsError, retryLabels } = useEulerLabels()
+  const isResolvingVaults = ref(false)
   const acknowledgedContextKey = ref('')
   const blockerKey = `unverified-vault:${++unverifiedVaultGuardSequence}`
   let resolutionGeneration = 0
 
-  watch([vaultAddresses, context.chainId], async ([addresses, activeChainId]) => {
+  const resolveVaults = async () => {
     const generation = ++resolutionGeneration
-    await Promise.all(addresses.map(address => getOrFetch(address)))
-    if (generation !== resolutionGeneration || context.chainId.value !== activeChainId) return
-  }, { immediate: true })
+    const activeChainId = context.chainId.value
+    isResolvingVaults.value = true
+    try {
+      await Promise.all(vaultAddresses.value.map(address => getOrFetch(address)))
+    }
+    finally {
+      if (generation === resolutionGeneration && context.chainId.value === activeChainId) {
+        isResolvingVaults.value = false
+      }
+    }
+  }
+  watch([vaultAddresses, context.chainId], resolveVaults, { immediate: true })
+
+  const hasVaultMetadata = computed(() => {
+    void registryVersion.value
+    return vaultAddresses.value.every((address) => {
+      const entry = get(address)
+      return !!entry && !!context.chainId.value && entry.vault.chainId === context.chainId.value
+    })
+  })
+  const isVerificationReady = computed(() => labelsReady.value && hasVaultMetadata.value)
+  const isVerificationLoading = computed(() =>
+    (!labelsReady.value && !labelsError.value) || (!hasVaultMetadata.value && isResolvingVaults.value),
+  )
+  const verificationError = computed(() => {
+    if (!labelsReady.value && labelsError.value) return labelsError.value
+    if (!hasVaultMetadata.value && !isResolvingVaults.value) return 'Unable to load vault verification. Please retry.'
+    return undefined
+  })
+  const retryVerification = async () => {
+    if (!labelsReady.value) await retryLabels()
+    await resolveVaults()
+  }
 
   const hasCanonicalVerification = (address: string): boolean => {
     const entry = get(address)
@@ -57,7 +92,9 @@ export const useUnverifiedVaultGuard = (
   const unverifiedVaultAddresses = computed(() => {
     void registryVersion.value
     getEulerLabelsVersion()
-    return vaultAddresses.value.filter(address => !hasCanonicalVerification(address))
+    return isVerificationReady.value
+      ? vaultAddresses.value.filter(address => !hasCanonicalVerification(address))
+      : []
   })
   const hasUnverifiedVault = computed(() => unverifiedVaultAddresses.value.length > 0)
 
@@ -75,7 +112,7 @@ export const useUnverifiedVaultGuard = (
 
   const acknowledgeRisk = () => {
     const acknowledgement = acknowledgementContext.value
-    if (!acknowledgement.chainId || !context.account.value) return
+    if (!isVerificationReady.value || !acknowledgement.chainId || !context.account.value) return
     recordUnverifiedVaultAcknowledgement({
       ...acknowledgement,
       account: context.account.value,
@@ -83,9 +120,15 @@ export const useUnverifiedVaultGuard = (
     acknowledgedContextKey.value = contextKey.value
   }
 
-  watch(isAcknowledgmentRequired, (required) => {
-    if (required) {
-      registerOperationBlocker(blockerKey, 'Unverified vault risk acknowledgment required')
+  const blockReason = computed(() => {
+    if (verificationError.value) return verificationError.value
+    if (!isVerificationReady.value) return 'Checking vault verification'
+    if (isAcknowledgmentRequired.value) return 'Unverified vault risk acknowledgment required'
+    return undefined
+  })
+  watch(blockReason, (reason) => {
+    if (reason) {
+      registerOperationBlocker(blockerKey, reason)
     }
     else {
       unregisterOperationBlocker(blockerKey)
@@ -93,11 +136,15 @@ export const useUnverifiedVaultGuard = (
   }, { immediate: true })
 
   onUnmounted(() => {
+    resolutionGeneration++
     unregisterOperationBlocker(blockerKey)
   })
 
   const guardState = reactive({
     isAcknowledgmentRequired,
+    isVerificationLoading,
+    verificationError,
+    retryVerification,
     acknowledgeRisk,
   })
   provide('unverified-vault-guard', guardState)
diff --git a/composables/useEulerLabels.ts b/composables/useEulerLabels.ts
index 4470ec558..fe71aae36 100644
--- a/composables/useEulerLabels.ts
+++ b/composables/useEulerLabels.ts
@@ -20,6 +20,7 @@ import { useEulerOracleAdapters } from '~/composables/useEulerOracleAdapters'
 import { erc4626AssetAbi } from '~/abis/erc4626'
 import { buildBatchItem, evcBatchCall } from '~/utils/multicall'
 import { normalizeAddress } from '~/utils/normalizeAddress'
+import { fetchEulerLabelsDataStrict } from '~/utils/euler-labels-fetch'
 
 const LABEL_QUERY_NAMES = [
   'queryEulerLabelsEntities',
@@ -52,6 +53,8 @@ const labelsChainId = ref<number | null>(null)
 const labelsVersion = ref(0)
 const isLoading = ref(false)
 const isReady = ref(false)
+const loadError = ref<string | undefined>()
+let hasSuccessfulSnapshot = false
 const pendingLabelsFetches = new Map<number, Promise<EulerLabelsData>>()
 let labelsLoadGeneration = 0
 let wrapPairProbeGeneration = 0
@@ -81,6 +84,8 @@ export const __setEulerLabelsDataForTest = (data: Partial<EulerLabelsData> = {})
     assetPatternRules: data.assetPatternRules ?? [],
   } as unknown as EulerLabelsData, null)
   isReady.value = true
+  hasSuccessfulSnapshot = true
+  loadError.value = undefined
   isLoading.value = false
 }
 
@@ -116,7 +121,7 @@ const getLabelsFetch = (chainId: number, forceRefresh: boolean) => {
     }
 
     const sdk = await getEulerSdk()
-    return sdk.eulerLabelsService.fetchEulerLabelsData(chainId)
+    return fetchEulerLabelsDataStrict(sdk.eulerLabelsService, chainId)
   })()
 
   pendingLabelsFetches.set(chainId, fetchPromise)
@@ -136,10 +141,12 @@ const loadLabels = async (forceRefresh = false): Promise<void> => {
 
   isReady.value = false
   isLoading.value = true
+  loadError.value = undefined
   const probeGeneration = ++wrapPairProbeGeneration
   Object.keys(wrapPairs).forEach(key => Reflect.deleteProperty(wrapPairs, key))
 
   if (labelsChainId.value !== chainId && isCurrentLoad()) {
+    hasSuccessfulSnapshot = false
     setLabelsData(createEmptyEulerLabelsData(), chainId)
   }
 
@@ -149,12 +156,14 @@ const loadLabels = async (forceRefresh = false): Promise<void> => {
     const data = await fetchPromise
     if (isCurrentLoad()) {
       setLabelsData(data, chainId)
+      hasSuccessfulSnapshot = true
     }
     if (isCurrentLoad()) {
       void probeWrapPairs(chainId, generation, probeGeneration)
     }
   }
   catch (e) {
+    if (isCurrentLoad()) loadError.value = 'Unable to load vault verification. Please retry.'
     logWarn('labels/load', e)
   }
   finally {
@@ -163,11 +172,17 @@ const loadLabels = async (forceRefresh = false): Promise<void> => {
     }
     if (isCurrentLoad()) {
       isLoading.value = false
-      isReady.value = true
+      isReady.value = hasSuccessfulSnapshot
     }
   }
 }
 
+const retryLabels = async () => {
+  if (isLoading.value) return
+  await loadLabels(true)
+  if (isReady.value) await useVaults().loadVaults()
+}
+
 const WRAP_PAIR_PROBE_BATCH_SIZE = 25
 
 const probeWrapPairs = async (startChainId: number, loadGeneration: number, probeGeneration: number) => {
@@ -250,6 +265,7 @@ export const useEulerLabels = () => {
   return {
     isLoading,
     isReady,
+    loadError,
     verifiedVaultAddresses,
     products,
     entities,
@@ -259,6 +275,7 @@ export const useEulerLabels = () => {
     oracleAssessmentsAvailable: oracleAdapters.oracleAssessmentsAvailable,
     earnVaults,
     loadLabels,
+    retryLabels,
     loadOracleAdapter: oracleAdapters.loadOracleAdapter,
     loadOracleAdapters: oracleAdapters.loadOracleAdapters,
     loadAllOracleAdapters: oracleAdapters.loadAllOracleAdapters,
diff --git a/composables/useOperationGuard.ts b/composables/useOperationGuard.ts
index ac1d6068d..e3b678174 100644
--- a/composables/useOperationGuard.ts
+++ b/composables/useOperationGuard.ts
@@ -11,6 +11,7 @@ import { isVaultKeyring } from '~/utils/eulerLabelsUtils'
 export const useOperationGuard = (vaultAddresses: Ref<(string | undefined)[]> | (string | undefined)[]) => {
   const { address: userAddress } = useWagmi()
   const chainId = useChainId()
+  const { chainId: appChainId } = useEulerAddresses()
   const route = useRoute()
   const operation = computed(() => String(route.name ?? route.path))
 
@@ -25,7 +26,7 @@ export const useOperationGuard = (vaultAddresses: Ref<(string | undefined)[]> |
   // --- Unverified vault guard ---
   const unverifiedVaultGuard = useUnverifiedVaultGuard(addresses, {
     account: userAddress,
-    chainId,
+    chainId: appChainId,
     operation,
   })
 
diff --git a/docs/server-side-caching.md b/docs/server-side-caching.md
index 3b2cb2a81..6025165e0 100644
--- a/docs/server-side-caching.md
+++ b/docs/server-side-caching.md
@@ -76,6 +76,8 @@ Two endpoints, same `refreshLabelFile` engine:
 
 Both endpoints write to and fall back on the same in-memory TTL cache, but only the query-shape handler reads through it. It checks `cache.get()` first (and uses the `getOrRefresh` helper for the `assets.json` union), so a fresh entry short-circuits without touching upstream. The path-shape handler calls `refreshLabelFile` directly, and that function is the force-refresh primitive — it skips the fresh-entry check and only deduplicates while a fetch is in flight. Every path-shape request therefore reaches upstream unless it coincides with an in-flight fetch for the same key, so the warm-cache entry acts as a stale fallback on that route rather than as a read-through cache. Since the SDK's default template targets the path shape, that is the route most label traffic takes. Warm callers (`warm-cache.ts`, `vaults-cache.ts`) use `refreshLabelFile` intentionally — see [Warm-Cache Plugin](#warm-cache-plugin) for why. The path handler's file header documents the shared TTL cache / upstream-fetch pipeline and that this route force-refreshes rather than reading through.
 
+Missing label files (HTTP 403/404) return a cached empty payload. Transient failures serve stale labels when available or return HTTP 503; they never turn an unavailable verification list into a successful empty result.
+
 Upstream is resolved by `NUXT_PUBLIC_CONFIG_LABELS_BASE_URL` if set, else `NUXT_PUBLIC_CONFIG_LABELS_REPO` + `NUXT_PUBLIC_CONFIG_LABELS_REPO_BRANCH` → GitHub raw.
 
 ### V3 proxy
diff --git a/docs/vault-labels-and-verification.md b/docs/vault-labels-and-verification.md
index 740114f25..246dd965e 100644
--- a/docs/vault-labels-and-verification.md
+++ b/docs/vault-labels-and-verification.md
@@ -17,7 +17,7 @@ Labels originate from the [euler-labels](https://github.com/euler-xyz/euler-labe
 | `points.json` | `GET /api/internal/labels/points.json?chainId=X` | `[]` |
 | `earn-vaults.json` | `GET /api/internal/labels/earn-vaults.json?chainId=X` | `[]` |
 
-All label files are optional — any chain may legitimately ship without a given file. When upstream reports the file absent (HTTP 404 or 403), the proxy returns the type-appropriate empty payload (`{}` for object-shaped files, `[]` for array-shaped files) with HTTP 200 and caches it for 5 minutes. Transient upstream failures (5xx, timeouts) serve stale cached data when available; they do not persist an empty shape into the cache. Non-404 upstream statuses are reported through `reportStatus`, which logs on *transitions* rather than once per refresh: the first observation of a given status warns, an unchanged status stays silent on later refreshes, and a return to `ok` logs a recovery. A persistent outage therefore surfaces once and then goes quiet until it changes.
+All label files are optional — any chain may legitimately ship without a given file. When upstream reports the file absent (HTTP 404 or 403), the proxy returns the type-appropriate empty payload (`{}` for object-shaped files, `[]` for array-shaped files) with HTTP 200 and caches it for 5 minutes. Transient upstream failures (5xx, timeouts, invalid responses) serve stale cached data when available and return HTTP 503 otherwise. They do not return or cache a successful empty shape. Non-404 upstream statuses are reported through `reportStatus`, which logs on *transitions* rather than once per refresh: the first observation of a given status warns, an unchanged status stays silent on later refreshes, and a return to `ok` logs a recovery. A persistent outage therefore surfaces once and then goes quiet until it changes.
 
 Oracle adapter identity and health assessments come from Data V3 through the SDK and Lite's same-origin V3 proxy. Detail views load an assessment per adapter; discovery loads the paginated chain catalogue. The UI uses V3's explicit `recognized` identity verdict and server-computed `checksStatus`, preserving `unknown` and `not_applicable` finding outcomes.
 
@@ -38,6 +38,8 @@ So the 5-minute TTL is not what bounds upstream traffic on the SDK's path. On th
 
 The browsing SDK applies a separate 5-minute stale window to its five label queries, so revisiting a chain may reuse SDK-cached data without an upstream request. This cache does not bypass the composable's current-chain publication guard. Call `loadLabels(true)` when an explicit refresh is required; it starts a new composable-level fetch (it does not join `pendingLabelsFetches`) and invalidates all five SDK label queries before calling the SDK. At the transport layer that invalidation does not cancel an already-running `fetchQuery` for the same key — TanStack joins the pending promise — so a force refresh can still receive the older in-flight SDK result. The monotonic load generation still decides which response may publish.
 
+Verification requires successful entity, product, and Earn label requests before the SDK normalizes the snapshot. Optional point-reward failures do not block verification. An initial failure leaves labels unavailable with a retry action; a failed same-chain refresh retains the last successful snapshot. The retry invalidates SDK label queries and reloads vault discovery after labels recover.
+
 **Address normalization**: All addresses from labels are checksummed via `getAddress()` before storage, ensuring consistent lookups regardless of input casing.
 
 ---
@@ -281,6 +283,12 @@ The `useEulerLabels` composable builds a set of verified vault addresses from th
 
 The full "is this vault verified?" verdict (used by the UI to render markets, and by the `/api/public/is-known` endpoint) additionally requires the on-chain governor to match a declared entity address. See `utils/vault/governor-verification.ts` for the shared rule, and the "Programmatic verification lookup" section below for the public endpoint.
 
+### Operation warnings and consent
+
+Operation guards verify vaults against the app's selected chain and the shared governor/owner rules. Wallet connection and chain switching remain available before other form gates. While labels or vault metadata are unresolved, operations remain blocked with a loading state or a retry action.
+
+The Earn deposit page opens its automatic disclaimer only for a resolved unverified vault when the wallet is connected to the selected chain. Accepting it records the same account, chain, operation, and vault-set acknowledgment used by the submit button and final execution policy. The popup closes when acknowledgment is no longer required or the page unmounts. Final execution policy also requires available verification labels for operations involving vaults.
+
 ### Governance hydration guard (SDK 2.0)
 
 SDK 2.0 `EVault` instances always **own** the `governorAdmin` property (the constructor assigns it even when governance was never fetched). An `in`-operator or "property exists" check therefore passes on every real instance and can misread a lazily-hydrated vault as "governance resolved to nothing", producing false **Unknown risk manager** badges in discovery / market graph UI.
diff --git a/features/reviewed-execution/policy/app-policy.ts b/features/reviewed-execution/policy/app-policy.ts
index c0d0e359f..d72fbb47c 100644
--- a/features/reviewed-execution/policy/app-policy.ts
+++ b/features/reviewed-execution/policy/app-policy.ts
@@ -8,7 +8,7 @@ import {
   unverifiedVaultAcknowledgementKey,
   type UnverifiedVaultAcknowledgementContext,
 } from './acknowledgements'
-import { getEulerLabelsVersion } from '~/composables/useEulerLabels'
+import { getEulerLabelsVersion, useEulerLabels } from '~/composables/useEulerLabels'
 import { isOperationBlockerKey, operationBlockerEntries } from '~/utils/operationGuardRegistry'
 import { collectPlanningRequirements } from '~/features/reviewed-execution/planning/requirements'
 import { isVaultBlockedByCountry, isVaultRestrictedByCountry, useGeoBlock } from '~/composables/useGeoBlock'
@@ -35,7 +35,6 @@ export const resolveAppPolicy = async (
   const expiresAt = now + 5 * 60_000
   const { get, getOrFetch, getVault, isVerifiedVault } = useVaultRegistry()
   const { getTokenByAddress } = useTokenList()
-  const labelsVersion = getEulerLabelsVersion()
   const { country } = useGeoBlock()
   const approvalSpenders = new Set(requestSet.effects.flatMap(node => node.effect.kind === 'approval' ? [getAddress(node.effect.spender).toLowerCase()] : []))
   const migrationAuthorities = new Set(requestSet.effects.flatMap(node => node.effect.kind === 'migration-authorization' ? [getAddress(node.effect.target).toLowerCase()] : []))
@@ -62,6 +61,10 @@ export const resolveAppPolicy = async (
       exactVaults.push({ address, vault: entry.vault as EVault | EulerEarn | SecuritizeCollateralVault, type: entry.type })
     }
 
+    if (requirements.vaults.length && !useEulerLabels().isReady.value) {
+      throw new Error('Vault verification is unavailable')
+    }
+
     const simpleExitPlanners = new Set(['withdraw', 'redeem', 'repay-from-wallet', 'repay-from-deposit', 'repay-with-swap', 'swap-and-repay', 'cleanup', 'reward-claim', 'reul-unlock'])
     const hardGeoRequired = intents.some(intent => !simpleExitPlanners.has(intent.planner.name))
     const softGeoRequired = intents.some(intent =>
@@ -93,6 +96,7 @@ export const resolveAppPolicy = async (
     return isVaultGovernorVerified(entry.vault as EVault)
   }
 
+  const labelsVersion = getEulerLabelsVersion()
   const results: PolicyResultInput[] = []
   for (const requirement of collectPolicyRequirements(requestSet)) {
     let version = 'policy'
diff --git a/pages/earn/[vault]/index.vue b/pages/earn/[vault]/index.vue
index 497110c5a..49085c2b0 100644
--- a/pages/earn/[vault]/index.vue
+++ b/pages/earn/[vault]/index.vue
@@ -26,8 +26,7 @@ const { addEntry: addBatchEntry } = useTxBatch()
 const { redirectAfterAdd } = useBatchRedirect()
 const { account: planAccount } = usePlanAccount()
 const { getEarnVault, updateEarnVault } = useVaults()
-const { isReady: isLabelsReady } = useEulerLabels()
-const { isConnected, address } = useWagmi()
+const { isConnected, address, chainId: walletChainId } = useWagmi()
 const { isSpyMode } = useSpyMode()
 const { chainId } = useEulerAddresses()
 const { primeSlotHintsFor } = useStateOverrideOptions()
@@ -41,7 +40,7 @@ const shareLinkQuery = computed(() => {
 const { getBalance } = useWallets()
 const { runSimulation, simulationError, clearSimulationError } = useTransactionPlanSimulation()
 const vaultAddress = route.params.vault as string
-useOperationGuard([vaultAddress])
+const { unverifiedVaultGuard } = useOperationGuard([vaultAddress])
 const { name } = useEulerProductOfVault(vaultAddress)
 const { settings } = useUserSettings()
 const enableIntrinsicApy = computed(() => settings.value.enableIntrinsicApy)
@@ -98,25 +97,8 @@ const refreshEarnVault = async (address: string, silent = false) => {
 // Non-blocking to avoid Suspense + pageTransition crash on direct navigation
 ;(async () => {
   try {
-    // Wait for labels so `verified` is set correctly on direct navigation.
-    // Otherwise getEarnVault falls through to a direct fetch with empty
-    // earnVaultAddresses and returns verified: false.
-    if (!isLabelsReady.value) {
-      await until(isLabelsReady).toBe(true)
-    }
     applyLoadedVault(await getEarnVault(vaultAddress))
 
-    if (!useVaultRegistry().isVerifiedVault(vault.value.address)) {
-      modal.open(VaultUnverifiedDisclaimerModal, {
-        isNotClosable: true,
-        props: {
-          cancelAction: () => {
-            router.replace('/')
-          },
-        },
-      })
-    }
-
     void refreshEarnVault(vault.value.address, true)
   }
   catch (e) {
@@ -124,6 +106,32 @@ const refreshEarnVault = async (address: string, silent = false) => {
     logWarn('[earn] failed to load vault', e)
   }
 })()
+let warningModalId: number | undefined
+watch(
+  () => !!vault.value && isConnected.value && walletChainId.value === chainId.value
+    && unverifiedVaultGuard.isAcknowledgmentRequired,
+  (required) => {
+    if (required && warningModalId === undefined) {
+      warningModalId = modal.open(VaultUnverifiedDisclaimerModal, {
+        isNotClosable: true,
+        onClose: () => { warningModalId = undefined },
+        props: {
+          acceptAction: unverifiedVaultGuard.acknowledgeRisk,
+          cancelAction: () => router.replace('/'),
+        },
+      })
+    }
+    else if (!required && warningModalId !== undefined) {
+      modal.close(warningModalId)
+      warningModalId = undefined
+    }
+  },
+  { immediate: true },
+)
+onUnmounted(() => {
+  if (warningModalId !== undefined) modal.close(warningModalId)
+})
+
 const errorText = computed(() => {
   if (balance.value < valueToNano(amount.value, asset.value?.decimals)) {
     return 'Not enough balance'
diff --git a/server/api/internal/labels/[file].get.ts b/server/api/internal/labels/[file].get.ts
index 1a3e35789..5d221ff6a 100644
--- a/server/api/internal/labels/[file].get.ts
+++ b/server/api/internal/labels/[file].get.ts
@@ -16,10 +16,8 @@ export type LabelFile = typeof LABEL_FILES[number]
 /** Scope for a label fetch: a chain ID for per-chain files, or 'all' for cross-chain rules. */
 export type LabelScope = number | 'all'
 
-// All label files are optional: any chain may legitimately ship without a given
-// file (new chains, test deployments, etc.). Missing or failing upstream fetches
-// resolve to a type-appropriate empty payload so clients degrade to "no data"
-// uniformly rather than splitting into a required/optional matrix.
+// Missing files resolve to a type-appropriate empty payload. Transient failures
+// require a usable cached response or return an error so verification can retry.
 const EMPTY_SHAPES: Record<LabelFile, unknown> = {
   'products.json': {},
   'entities.json': {},
@@ -137,9 +135,8 @@ function getUpstreamUrl(scope: LabelScope, file: string): string {
  * requests skip upstream entirely. Reserved for the absent-file cases
  * (404 and 403 — see below), where the file is legitimately not published
  * for this scope. For other failures (transient 5xx, network errors,
- * JSON parse, validation) return empty but DON'T persist — otherwise a
- * single upstream blip pins the empty allowlist for 5 minutes, making
- * every verified vault appear unverified.
+ * JSON parse, validation), serve stale data if available or return HTTP 503.
+ * A transient failure must not become a successful empty verification list.
  */
 export function refreshLabelFile(scope: LabelScope, file: LabelFile): Promise<unknown> {
   const key = `${scope}:${file}`
@@ -148,7 +145,8 @@ export function refreshLabelFile(scope: LabelScope, file: LabelFile): Promise<un
     const stale = cache.getStale(key)
     if (stale) return stale
     const empty = EMPTY_SHAPES[file]
-    if (persist) cache.set(key, empty)
+    if (!persist) throw createError({ statusCode: 503, statusMessage: 'Vault labels are temporarily unavailable' })
+    cache.set(key, empty)
     return empty
   }
 
@@ -168,9 +166,7 @@ export function refreshLabelFile(scope: LabelScope, file: LabelFile): Promise<un
           reportStatus('labels', statusKey, `absent-${resp.status}`)
           return fallback(true)
         }
-        reportStatus('labels', statusKey, `http-${resp.status}`,
-          `${file} upstream returned ${resp.status} for scope ${scope}; treating as absent`)
-        return fallback(false)
+        throw new Error(`${file} upstream returned ${resp.status} for scope ${scope}`)
       }
 
       const data: unknown = await resp.json()
diff --git a/tests/components/VaultFormSubmit.test.ts b/tests/components/VaultFormSubmit.test.ts
new file mode 100644
index 000000000..ea5360387
--- /dev/null
+++ b/tests/components/VaultFormSubmit.test.ts
@@ -0,0 +1,72 @@
+import { createSSRApp, defineComponent, h, nextTick, ref } from 'vue'
+import { renderToString } from '@vue/server-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import VaultFormSubmit from '~/components/entities/vault/form/VaultFormSubmit.vue'
+import type { UnverifiedVaultGuardState } from '~/composables/guards/useUnverifiedVaultGuard'
+
+vi.mock('#components', () => ({ AcknowledgeTermsModal: {}, VaultUnverifiedDisclaimerModal: {} }))
+vi.mock('~/components/ui/composables/useModal', () => ({ useModal: () => ({ open: vi.fn() }) }))
+vi.mock('~/composables/useStateOverrideOptions', () => ({
+  useStateOverrideResolution: () => ({ isResolvingStateOverrideHints: ref(false) }),
+}))
+vi.mock('@floating-ui/vue', () => ({
+  useFloating: () => ({ floatingStyles: {}, update: vi.fn() }),
+  flip: vi.fn(), offset: vi.fn(), shift: vi.fn(),
+}))
+
+const connected = ref(false)
+const walletChain = ref(1)
+const renderSubmit = (guard: Partial<UnverifiedVaultGuardState>) => {
+  const app = createSSRApp({
+    render: () => h(VaultFormSubmit, { disabled: true }, { default: () => 'Deposit' }),
+  })
+  app.provide('unverified-vault-guard', guard)
+  app.component('UiButton', defineComponent({
+    inheritAttrs: false,
+    setup: (_, { attrs, slots }) => () => h('button', attrs, slots.default?.()),
+  }))
+  for (const name of ['SvgIcon', 'KeyringAlert', 'KeyringVerificationFlow']) {
+    app.component(name, { render: () => h('span') })
+  }
+  return renderToString(app)
+}
+
+describe('vault form verification prerequisites', () => {
+  beforeEach(() => {
+    connected.value = false
+    walletChain.value = 1
+    vi.stubGlobal('nextTick', nextTick)
+    vi.stubGlobal('useUserSettings', () => ({ settings: ref({ enableAdvancedMode: false }) }))
+    vi.stubGlobal('useWagmi', () => ({
+      isConnected: connected, chainId: walletChain, switchChain: vi.fn(), connect: vi.fn(),
+    }))
+    vi.stubGlobal('useSpyMode', () => ({ isSpyMode: ref(false) }))
+    vi.stubGlobal('useEulerAddresses', () => ({ chainId: ref(143) }))
+    vi.stubGlobal('useTxBatch', () => ({ entryCount: ref(0), clearBatch: vi.fn() }))
+  })
+  afterEach(() => vi.unstubAllGlobals())
+
+  it('offers an enabled Connect wallet action before an unverified acknowledgement', async () => {
+    const html = await renderSubmit({ isAcknowledgmentRequired: true })
+    expect(html).toContain('Connect wallet')
+    expect(html).not.toContain('Acknowledge Unverified Vault Risk')
+    expect(html).not.toMatch(/<button[^>]*disabled/)
+  })
+
+  it('offers an enabled Switch chain action while verification is unavailable', async () => {
+    connected.value = true
+    const html = await renderSubmit({ verificationError: 'Temporary failure' })
+    expect(html).toContain('Switch chain')
+    expect(html).not.toContain('Retry verification')
+    expect(html).not.toMatch(/<button[^>]*disabled/)
+  })
+
+  it('shows loading and retry states once wallet prerequisites are met', async () => {
+    connected.value = true
+    walletChain.value = 143
+    expect(await renderSubmit({ isVerificationLoading: true })).toContain('Checking vault verification')
+    const html = await renderSubmit({ verificationError: 'Temporary failure' })
+    expect(html).toContain('Retry verification')
+    expect(html).not.toContain('Acknowledge Unverified Vault Risk')
+  })
+})
diff --git a/tests/composables/useEulerLabels.test.ts b/tests/composables/useEulerLabels.test.ts
index 6794393f3..a505c9392 100644
--- a/tests/composables/useEulerLabels.test.ts
+++ b/tests/composables/useEulerLabels.test.ts
@@ -46,6 +46,10 @@ vi.mock('~/composables/useEulerSdk', () => ({
   })),
 }))
 
+vi.mock('~/utils/euler-labels-fetch', () => ({
+  fetchEulerLabelsDataStrict: (_service: unknown, chainId: number) => mocks.fetchEulerLabelsData(chainId),
+}))
+
 vi.mock('~/composables/useEulerOracleAdapters', () => ({
   useEulerOracleAdapters: () => ({
     oracleAdapters: {},
@@ -113,6 +117,30 @@ describe('useEulerLabels chain-scoped loading', () => {
     vi.unstubAllGlobals()
   })
 
+  it('keeps a failed initial load unavailable and retries the same chain', async () => {
+    mocks.fetchEulerLabelsData.mockRejectedValueOnce(new Error('temporary outage'))
+    const labels = useEulerLabels()
+    await labels.loadLabels()
+    expect(labels.isReady.value).toBe(false)
+    expect(labels.loadError.value).toContain('Unable to load')
+    mocks.fetchEulerLabelsData.mockResolvedValueOnce(labelsFor('recovered'))
+    await labels.loadLabels()
+    expect(mocks.fetchEulerLabelsData).toHaveBeenCalledTimes(2)
+    expect(labels.isReady.value).toBe(true)
+    expect(labels.loadError.value).toBeUndefined()
+    expect(currentProductKeys()).toEqual(['recovered'])
+  })
+
+  it('retains a successful same-chain snapshot when a refresh fails', async () => {
+    mocks.fetchEulerLabelsData.mockResolvedValueOnce(labelsFor('cached'))
+    const labels = useEulerLabels()
+    await labels.loadLabels()
+    mocks.fetchEulerLabelsData.mockRejectedValueOnce(new Error('temporary outage'))
+    await labels.loadLabels(true)
+    expect(labels.isReady.value).toBe(true)
+    expect(currentProductKeys()).toEqual(['cached'])
+  })
+
   it('starts a separate fetch for a new chain and ignores the stale response', async () => {
     const chainOne = deferred<EulerLabelsData>()
     const chainTwo = deferred<EulerLabelsData>()
diff --git a/tests/composables/useOperationGuard.test.ts b/tests/composables/useOperationGuard.test.ts
new file mode 100644
index 000000000..e12895e29
--- /dev/null
+++ b/tests/composables/useOperationGuard.test.ts
@@ -0,0 +1,81 @@
+import { createRenderer, h, nextTick, ref } from 'vue'
+import { createConfig, http } from '@wagmi/core'
+import { WagmiPlugin } from '@wagmi/vue'
+import { mainnet, monad } from 'viem/chains'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { useOperationGuard } from '~/composables/useOperationGuard'
+
+vi.mock('~/composables/useEulerLabels', () => ({ getEulerLabelsVersion: () => 1 }))
+vi.mock('~/composables/guards/useTosGuard', () => ({ useTosGuard: () => ({}) }))
+vi.mock('~/utils/eulerLabelsUtils', () => ({ isVaultKeyring: () => false }))
+vi.mock('~/composables/useKeyring', () => ({
+  useKeyring: () => ({
+    isVerificationRequired: ref(false),
+    credentialData: ref(null),
+    hookTarget: ref(null),
+    policyId: ref(undefined),
+    keyringContractAddress: ref(undefined),
+    rpcUrl: ref(undefined),
+  }),
+}))
+
+describe('operation verification chain', () => {
+  afterEach(() => vi.unstubAllGlobals())
+
+  it('verifies a Monad Earn vault while disconnected Wagmi still defaults to Ethereum', async () => {
+    const vault = { address: '0x00000000000000000000000000000000000000a1', chainId: 143 }
+    const verifyOwner = vi.fn(() => true)
+    vi.stubGlobal('useWagmi', () => ({ address: ref(undefined) }))
+    vi.stubGlobal('useEulerAddresses', () => ({ chainId: ref(143) }))
+    vi.stubGlobal('useRoute', () => ({ name: 'earn-vault' }))
+    vi.stubGlobal('useEulerLabels', () => ({
+      isReady: ref(true), loadError: ref(undefined), retryLabels: vi.fn(),
+    }))
+    vi.stubGlobal('useVaultRegistry', () => ({
+      get: () => ({ type: 'earn', vault }),
+      getOrFetch: async () => vault,
+      registryVersion: ref(1),
+    }))
+    vi.stubGlobal('useVaults', () => ({ isEarnVaultOwnerVerified: verifyOwner }))
+    const config = createConfig({
+      chains: [mainnet, monad],
+      transports: { 1: http(), 143: http() },
+      storage: null,
+    })
+    const renderer = createRenderer({
+      patchProp: () => undefined,
+      insert: () => undefined,
+      remove: () => undefined,
+      createElement: (type: string) => ({ type }),
+      createText: (text: string) => ({ text }),
+      createComment: (text: string) => ({ text }),
+      setText: () => undefined,
+      setElementText: () => undefined,
+      parentNode: () => null,
+      nextSibling: () => null,
+      insertStaticContent: () => undefined as never,
+    })
+    let state: ReturnType<typeof useOperationGuard> | undefined
+    const app = renderer.createApp({
+      setup() {
+        state = useOperationGuard([vault.address])
+        return () => h('span')
+      },
+    })
+    app.use(WagmiPlugin, { config, reconnectOnMount: false })
+    app.mount({ type: 'root' })
+    try {
+      await nextTick()
+      expect(config.state.chainId).toBe(1)
+      expect(verifyOwner).toHaveBeenCalledWith(vault)
+      expect(state?.unverifiedVaultGuard.isAcknowledgmentRequired).toBe(false)
+      expect(state?.unverifiedVaultGuard.verificationError).toBeUndefined()
+      config.setState(previous => ({ ...previous, chainId: 143 }))
+      await nextTick()
+      expect(state?.unverifiedVaultGuard.isAcknowledgmentRequired).toBe(false)
+    }
+    finally {
+      app.unmount()
+    }
+  })
+})
diff --git a/tests/composables/useUnverifiedVaultGuard.test.ts b/tests/composables/useUnverifiedVaultGuard.test.ts
index 0c4482784..5a53bb3bf 100644
--- a/tests/composables/useUnverifiedVaultGuard.test.ts
+++ b/tests/composables/useUnverifiedVaultGuard.test.ts
@@ -9,6 +9,9 @@ const ACCOUNT = '0x00000000000000000000000000000000000000b1'
 const registryVersion = ref(0)
 const entries = new Map<string, { type: 'evk', vault: { chainId: number, address: string } }>()
 const verifyEVault = vi.fn()
+const labelsReady = ref(true)
+const labelsError = ref<string | undefined>()
+const retryLabels = vi.fn()
 
 vi.mock('~/composables/useEulerLabels', () => ({
   getEulerLabelsVersion: () => 1,
@@ -55,6 +58,10 @@ const mountGuard = (options?: { chainId?: Ref<number | undefined>, account?: Ref
 describe('useUnverifiedVaultGuard canonical context', () => {
   beforeEach(() => {
     entries.clear()
+    labelsReady.value = true
+    labelsError.value = undefined
+    retryLabels.mockReset()
+    vi.stubGlobal('useEulerLabels', () => ({ isReady: labelsReady, loadError: labelsError, retryLabels }))
     registryVersion.value = 0
     verifyEVault.mockReset()
     vi.stubGlobal('useVaultRegistry', () => ({
@@ -100,6 +107,53 @@ describe('useUnverifiedVaultGuard canonical context', () => {
     await nextTick()
 
     expect(verifyEVault).not.toHaveBeenCalled()
+    expect(mounted.state.isAcknowledgmentRequired).toBe(false)
+    expect(operationBlockerEntries.value.length).toBeGreaterThan(0)
+    mounted.app.unmount()
+  })
+  it('blocks unresolved labels without asking the user to acknowledge missing data', async () => {
+    entries.set(VAULT.toLowerCase(), { type: 'evk', vault: { chainId: 1, address: VAULT } })
+    labelsReady.value = false
+    const mounted = mountGuard()
+    await nextTick()
+    expect(mounted.state.isVerificationLoading).toBe(true)
+    expect(mounted.state.isAcknowledgmentRequired).toBe(false)
+    mounted.state.acknowledgeRisk()
+    labelsError.value = 'Temporary verification failure'
+    await nextTick()
+    expect(mounted.state.verificationError).toBe('Temporary verification failure')
+    expect(mounted.state.isAcknowledgmentRequired).toBe(false)
+    retryLabels.mockImplementation(async () => {
+      labelsReady.value = true
+      labelsError.value = undefined
+    })
+    verifyEVault.mockReturnValue(false)
+    await mounted.state.retryVerification()
+    expect(mounted.state.isAcknowledgmentRequired).toBe(true)
+    mounted.app.unmount()
+  })
+
+  it('removes the acknowledgement requirement when canonical verification recovers', async () => {
+    entries.set(VAULT.toLowerCase(), { type: 'evk', vault: { chainId: 1, address: VAULT } })
+    verifyEVault.mockReturnValue(false)
+    const mounted = mountGuard()
+    expect(mounted.state.isAcknowledgmentRequired).toBe(true)
+    verifyEVault.mockReturnValue(true)
+    registryVersion.value++
+    await nextTick()
+    expect(mounted.state.isAcknowledgmentRequired).toBe(false)
+    expect(operationBlockerEntries.value).toEqual([])
+    mounted.app.unmount()
+  })
+
+  it('invalidates acknowledgement after an account change', async () => {
+    entries.set(VAULT.toLowerCase(), { type: 'evk', vault: { chainId: 1, address: VAULT } })
+    verifyEVault.mockReturnValue(false)
+    const mounted = mountGuard()
+    mounted.state.acknowledgeRisk()
+    expect(mounted.state.isAcknowledgmentRequired).toBe(false)
+    mounted.account.value = '0x00000000000000000000000000000000000000c1'
+    await nextTick()
     expect(mounted.state.isAcknowledgmentRequired).toBe(true)
     mounted.app.unmount()
   })
diff --git a/tests/reviewed-execution/app-policy-vault-context.test.ts b/tests/reviewed-execution/app-policy-vault-context.test.ts
index bf63f2623..49f65eb1e 100644
--- a/tests/reviewed-execution/app-policy-vault-context.test.ts
+++ b/tests/reviewed-execution/app-policy-vault-context.test.ts
@@ -7,6 +7,7 @@ import { makeReviewedExecution, TEST_ACCOUNT, TEST_TOKEN, TEST_VAULT } from './f
 import { makeSwapQuote } from './swap-quote.test-fixture'
 
 const geo = vi.hoisted(() => ({
+  labelsReady: { value: true },
   country: { value: 'US' as string | null | undefined },
   blocked: vi.fn(),
   restricted: vi.fn(),
@@ -20,6 +21,7 @@ vi.mock('~/composables/useGeoBlock', () => ({
 
 vi.mock('~/composables/useEulerLabels', () => ({
   getEulerLabelsVersion: () => 1,
+  useEulerLabels: () => ({ isReady: geo.labelsReady }),
 }))
 
 const TARGET_VAULT = getAddress('0x5000000000000000000000000000000000000000')
@@ -58,6 +60,7 @@ const swapIntent = () => {
 describe('final two-vault swap policy', () => {
   beforeEach(() => {
     clearUnverifiedVaultAcknowledgements()
+    geo.labelsReady.value = true
     geo.country.value = 'US'
     geo.blocked.mockReset().mockReturnValue(false)
     geo.restricted.mockReset().mockReturnValue(false)
@@ -85,6 +88,12 @@ describe('final two-vault swap policy', () => {
     vi.unstubAllGlobals()
   })
 
+  it('rejects final vault policy while verification labels are unavailable', async () => {
+    geo.labelsReady.value = false
+    await expect(resolveAppPolicy(makeReviewedExecution().requestSet, 100, [swapIntent()]))
+      .rejects.toThrow('Vault verification is unavailable')
+  })
+
   it('applies the regional restriction to the quote target vault', async () => {
     geo.restricted.mockImplementation((address: string) => getAddress(address) === TARGET_VAULT)
 
diff --git a/tests/server/labels-fetch-failure.test.ts b/tests/server/labels-fetch-failure.test.ts
new file mode 100644
index 000000000..13137898e
--- /dev/null
+++ b/tests/server/labels-fetch-failure.test.ts
@@ -0,0 +1,25 @@
+import { describe, expect, it, vi } from 'vitest'
+import { fetchWithTimeout } from '~/server/utils/fetchWithTimeout'
+import { refreshLabelFile } from '~/server/api/internal/labels/[file].get'
+
+vi.mock('~/server/utils/fetchWithTimeout', () => ({ fetchWithTimeout: vi.fn() }))
+
+describe('label proxy failure handling', () => {
+  it('returns an error for a transient failure without a usable cache', async () => {
+    vi.mocked(fetchWithTimeout).mockResolvedValueOnce(new Response('', { status: 503 }))
+    await expect(refreshLabelFile(9001, 'earn-vaults.json')).rejects.toMatchObject({ statusCode: 503 })
+  })
+
+  it('serves cached labels during an upstream outage', async () => {
+    const data = ['0x00000000000000000000000000000000000000A1']
+    vi.mocked(fetchWithTimeout).mockResolvedValueOnce(Response.json(data))
+    expect(await refreshLabelFile(9002, 'earn-vaults.json')).toEqual(data)
+    vi.mocked(fetchWithTimeout).mockRejectedValueOnce(new Error('network error'))
+    expect(await refreshLabelFile(9002, 'earn-vaults.json')).toEqual(data)
+  })
+
+  it('keeps genuinely absent files valid and empty', async () => {
+    vi.mocked(fetchWithTimeout).mockResolvedValueOnce(new Response('', { status: 404 }))
+    expect(await refreshLabelFile(9003, 'earn-vaults.json')).toEqual([])
+  })
+})
diff --git a/tests/utils/euler-labels-fetch.test.ts b/tests/utils/euler-labels-fetch.test.ts
new file mode 100644
index 000000000..2102f4ed4
--- /dev/null
+++ b/tests/utils/euler-labels-fetch.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it, vi } from 'vitest'
+import { EulerLabelsService } from '@eulerxyz/euler-v2-sdk'
+import { fetchEulerLabelsDataStrict } from '~/utils/euler-labels-fetch'
+
+const VAULT = '0x00000000000000000000000000000000000000A1'
+const createService = () => new EulerLabelsService({
+  fetchEulerLabelsEntities: async () => ({}),
+  fetchEulerLabelsProducts: async () => ({}),
+  fetchEulerLabelsEarnVaults: async () => [VAULT],
+  fetchEulerLabelsPoints: async () => [],
+  fetchEulerLabelsAssets: async () => [],
+})
+
+describe('verification label fetching', () => {
+  it.each(['fetchEulerLabelsEntities', 'fetchEulerLabelsProducts', 'fetchEulerLabelsEarnVaults'] as const)(
+    'propagates %s failure instead of normalizing an empty result',
+    async (method) => {
+      const service = createService()
+      vi.spyOn(service, method).mockRejectedValue(new Error('upstream unavailable'))
+      await expect(fetchEulerLabelsDataStrict(service, 143)).rejects.toThrow('upstream unavailable')
+    },
+  )
+
+  it('keeps SDK normalization and accepts a successfully empty label list', async () => {
+    const service = createService()
+    expect((await fetchEulerLabelsDataStrict(service, 143)).earnVaults).toHaveLength(1)
+    vi.spyOn(service, 'fetchEulerLabelsEarnVaults').mockResolvedValue([])
+    expect((await fetchEulerLabelsDataStrict(service, 143)).earnVaults).toEqual([])
+  })
+
+  it('does not require optional point-reward labels for verification', async () => {
+    const service = createService()
+    vi.spyOn(service, 'fetchEulerLabelsPoints').mockRejectedValue(new Error('points unavailable'))
+    expect((await fetchEulerLabelsDataStrict(service, 143)).earnVaults).toHaveLength(1)
+  })
+})
diff --git a/utils/euler-labels-fetch.ts b/utils/euler-labels-fetch.ts
new file mode 100644
index 000000000..73b03a649
--- /dev/null
+++ b/utils/euler-labels-fetch.ts
@@ -0,0 +1,20 @@
+import { EulerLabelsService, type IEulerLabelsService } from '@eulerxyz/euler-v2-sdk'
+
+/** Load verification inputs successfully before asking the SDK to normalize them. */
+export const fetchEulerLabelsDataStrict = async (service: IEulerLabelsService, chainId: number) => {
+  const [entities, products, earnVaults, points, assets] = await Promise.all([
+    service.fetchEulerLabelsEntities(chainId),
+    service.fetchEulerLabelsProducts(chainId),
+    service.fetchEulerLabelsEarnVaults(chainId),
+    service.fetchEulerLabelsPoints(chainId).catch(() => []),
+    service.fetchEulerLabelsAssets(chainId),
+  ])
+
+  return new EulerLabelsService({
+    fetchEulerLabelsEntities: async () => entities,
+    fetchEulerLabelsProducts: async () => products,
+    fetchEulerLabelsEarnVaults: async () => earnVaults,
+    fetchEulerLabelsPoints: async () => points,
+    fetchEulerLabelsAssets: async () => assets,
+  }).fetchEulerLabelsData(chainId)
+}

From 1f48297f2aeb82e2660f1beac5608b38ce73ab3b Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Tue, 8 Sep 2026 10:19:09 +0100
Subject: [PATCH 10/12] fix: gate fallback vault policy on verification
 readiness

Require ready labels for vault policy subjects even when intents are omitted or empty. Preserve allowlisted direct-call targets without vault dependencies and cover rejection, recovery, and explicit vault constraints.
---
 .../reviewed-execution/policy/app-policy.ts   | 13 +++++++++
 .../app-policy-vault-context.test.ts          | 28 +++++++++++++++++++
 .../preparation-service.test.ts               | 14 +++++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/features/reviewed-execution/policy/app-policy.ts b/features/reviewed-execution/policy/app-policy.ts
index d72fbb47c..61609b68f 100644
--- a/features/reviewed-execution/policy/app-policy.ts
+++ b/features/reviewed-execution/policy/app-policy.ts
@@ -41,6 +41,16 @@ export const resolveAppPolicy = async (
   const pythFeeds = new Set(requestSet.pythRefreshSlots.flatMap(slot => slot.requiredFeedIds.map(feed => feed.toLowerCase())))
   const tosEffectDigest = canonicalDigest('tos-policy-effects-v1', toCanonicalValue(requestSet.effects.filter(node => node.effect.kind === 'tos-call').map(node => node.effect)))
 
+  // Allowlisted direct-call targets alone do not establish vault dependencies.
+  const vaultLabelSubjects = new Set(requestSet.effects.flatMap(node => node.policySubjects
+    .filter(subject => subject.kind === 'vault-or-contract'
+      && !(node.effect.kind === 'direct-call' && node.simulation.kind === 'not-state-simulated'
+        && getAddress(subject.value) === getAddress(node.effect.target)))
+    .map(subject => getAddress(subject.value))))
+  for (const constraint of requestSet.constraints) {
+    if ('vault' in constraint) vaultLabelSubjects.add(getAddress(constraint.vault))
+  }
+
   let exactVaults: Array<{ address: Address, vault: EVault | EulerEarn | SecuritizeCollateralVault, type: 'evk' | 'earn' | 'securitize' }> | undefined
   let intentsByOperation: Map<string, OperationIntent[]> | undefined
   if (intents?.length) {
@@ -137,6 +147,9 @@ export const resolveAppPolicy = async (
       const address = addressOfSubject(requirement.subject)
       if (!address) throw new Error('Vault/contract policy subject is malformed')
       const vault = getVault(address)
+      if ((vault || vaultLabelSubjects.has(address)) && !useEulerLabels().isReady.value) {
+        throw new Error('Vault verification is unavailable')
+      }
       if (vault) {
         if (!vault.asset?.address || !vault.type) throw new Error(`Vault metadata is incomplete for ${address}`)
         if (!labelsVersion) throw new Error('Euler labels policy metadata is unavailable')
diff --git a/tests/reviewed-execution/app-policy-vault-context.test.ts b/tests/reviewed-execution/app-policy-vault-context.test.ts
index 49f65eb1e..5ca8a1271 100644
--- a/tests/reviewed-execution/app-policy-vault-context.test.ts
+++ b/tests/reviewed-execution/app-policy-vault-context.test.ts
@@ -94,6 +94,34 @@ describe('final two-vault swap policy', () => {
       .rejects.toThrow('Vault verification is unavailable')
   })
 
+  it.each([
+    ['omitted', true],
+    ['empty', true],
+    ['omitted', false],
+    ['empty', false],
+  ] as const)('requires ready labels with %s intents and metadata present=%s', async (intentMode, metadataPresent) => {
+    if (!metadataPresent) {
+      vi.stubGlobal('useVaultRegistry', () => ({
+        getVault: () => undefined,
+        isVerifiedVault: () => false,
+      }))
+    }
+    const requestSet = makeReviewedExecution().requestSet
+    const resolve = () => intentMode === 'omitted'
+      ? resolveAppPolicy(requestSet, 100)
+      : resolveAppPolicy(requestSet, 100, [])
+
+    geo.labelsReady.value = false
+    await expect(resolve()).rejects.toThrow('Vault verification is unavailable')
+
+    geo.labelsReady.value = true
+    await expect(resolve()).resolves.toMatchObject({
+      results: expect.arrayContaining([
+        expect.objectContaining({ concern: 'vault-metadata', result: expect.objectContaining({ state: 'allowed' }) }),
+      ]),
+    })
+  })
+
   it('applies the regional restriction to the quote target vault', async () => {
     geo.restricted.mockImplementation((address: string) => getAddress(address) === TARGET_VAULT)
 
diff --git a/tests/reviewed-execution/preparation-service.test.ts b/tests/reviewed-execution/preparation-service.test.ts
index 7b80d599b..d76d02904 100644
--- a/tests/reviewed-execution/preparation-service.test.ts
+++ b/tests/reviewed-execution/preparation-service.test.ts
@@ -19,7 +19,11 @@ import { screenAddress } from '~/services/screening'
 
 vi.mock('~/services/vpn', () => ({ detectVpn: vi.fn(async () => false) }))
 vi.mock('~/services/screening', () => ({ screenAddress: vi.fn(async () => false) }))
-vi.mock('~/composables/useEulerLabels', () => ({ getEulerLabelsVersion: vi.fn(() => 1) }))
+const labelsState = vi.hoisted(() => ({ isReady: { value: true } }))
+vi.mock('~/composables/useEulerLabels', () => ({
+  getEulerLabelsVersion: vi.fn(() => 1),
+  useEulerLabels: () => labelsState,
+}))
 
 const ACCOUNT = getAddress('0x1000000000000000000000000000000000000000')
 const TOKEN = getAddress('0x2000000000000000000000000000000000000000')
@@ -43,6 +47,7 @@ const allowed = (): PolicyState => ({ state: 'allowed', version: 'v1', observedA
 let currentVault: { address: typeof VAULT, type?: string, asset?: { address?: typeof TOKEN, symbol?: string, decimals?: number } } | undefined
 
 beforeEach(() => {
+  labelsState.isReady.value = true
   currentVault = { address: VAULT, type: 'evault', asset: { address: TOKEN, symbol: 'TEST', decimals: 18 } }
   vi.mocked(getEulerLabelsVersion).mockReturnValue(1)
   vi.mocked(detectVpn).mockReset().mockResolvedValue(false)
@@ -293,6 +298,7 @@ describe('authoritative reviewed execution preparation', () => {
   })
 
   it('does not require Euler labels for a reviewed direct call with no vault subject', async () => {
+    labelsState.isReady.value = false
     vi.mocked(getEulerLabelsVersion).mockReturnValue(0)
     const rewardIntent: OperationIntent = {
       schemaVersion: 1,
@@ -328,6 +334,12 @@ describe('authoritative reviewed execution preparation', () => {
     })
 
     await expect(resolveAppPolicy(requestSet, 100)).resolves.toMatchObject({ schemaVersion: 1 })
+
+    const withVaultConstraint = {
+      ...requestSet,
+      constraints: [...requestSet.constraints, { kind: 'share-bound' as const, vault: AAVE_POOL, maximumShares: 1n }],
+    }
+    await expect(resolveAppPolicy(withVaultConstraint, 100)).rejects.toThrow('Vault verification is unavailable')
   })
 
   it.each([

From 2e54b2515f7dc0e6dbad25512928a500c480bbae Mon Sep 17 00:00:00 2001
From: Seranged <80223622+Seranged@users.noreply.github.com>
Date: Tue, 8 Sep 2026 10:51:56 +0100
Subject: [PATCH 11/12] fix: preserve dismiss-only Earn browsing warning

Keep explicit risk acknowledgment in the form while the automatic Earn notice only dismisses. Document the separate consent behavior.
---
 docs/vault-labels-and-verification.md | 2 +-
 pages/earn/[vault]/index.vue          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/vault-labels-and-verification.md b/docs/vault-labels-and-verification.md
index 246dd965e..e2665ea56 100644
--- a/docs/vault-labels-and-verification.md
+++ b/docs/vault-labels-and-verification.md
@@ -287,7 +287,7 @@ The full "is this vault verified?" verdict (used by the UI to render markets, an
 
 Operation guards verify vaults against the app's selected chain and the shared governor/owner rules. Wallet connection and chain switching remain available before other form gates. While labels or vault metadata are unresolved, operations remain blocked with a loading state or a retry action.
 
-The Earn deposit page opens its automatic disclaimer only for a resolved unverified vault when the wallet is connected to the selected chain. Accepting it records the same account, chain, operation, and vault-set acknowledgment used by the submit button and final execution policy. The popup closes when acknowledgment is no longer required or the page unmounts. Final execution policy also requires available verification labels for operations involving vaults.
+The Earn deposit page opens its automatic disclaimer only for a resolved unverified vault when the wallet is connected to the selected chain. Clicking Yes dismisses the browsing notice. The form's explicit risk button records the account, chain, operation, and vault-set acknowledgment required by final execution policy. The popup closes when acknowledgment is no longer required or the page unmounts. Final execution policy also requires available verification labels for operations involving vaults.
 
 ### Governance hydration guard (SDK 2.0)
 
diff --git a/pages/earn/[vault]/index.vue b/pages/earn/[vault]/index.vue
index 49085c2b0..8215023b8 100644
--- a/pages/earn/[vault]/index.vue
+++ b/pages/earn/[vault]/index.vue
@@ -116,7 +116,7 @@ watch(
         isNotClosable: true,
         onClose: () => { warningModalId = undefined },
         props: {
-          acceptAction: unverifiedVaultGuard.acknowledgeRisk,
+          // The form collects risk acknowledgment separately from this browsing notice.
           cancelAction: () => router.replace('/'),
         },
       })

From ef3fb1940d1c81254c8e3fb557141d0c8995a712 Mon Sep 17 00:00:00 2001
From: Darek <dariusz@euler.xyz>
Date: Tue, 8 Sep 2026 14:33:10 +0200
Subject: [PATCH 12/12] fix: preserve batch entry identities and savings review
 sources

---
 composables/borrow/useBorrowForm.ts          |  2 +
 composables/borrow/useMultiplyForm.ts        |  1 +
 composables/useTxBatch.ts                    |  7 ++-
 pages/borrow/[collateral]/[borrow]/index.vue |  4 +-
 tests/composables/useBorrowForm.test.ts      | 31 +++++++++++
 tests/composables/useMultiplyForm.test.ts    | 45 ++++++++++++++-
 tests/composables/useTxBatch.test.ts         | 58 ++++++++++++++++++--
 7 files changed, 138 insertions(+), 10 deletions(-)

diff --git a/composables/borrow/useBorrowForm.ts b/composables/borrow/useBorrowForm.ts
index e6a5461d2..09744065e 100644
--- a/composables/borrow/useBorrowForm.ts
+++ b/composables/borrow/useBorrowForm.ts
@@ -1197,6 +1197,8 @@ export const useBorrowForm = (options: UseBorrowFormOptions) => {
           amount: snapshot.borrowAmount,
           supplyingAssetForBorrow: snapshot.collateralVault.asset,
           supplyingAmount: snapshot.collateralAmount,
+          subAccount: snapshot.subAccount,
+          sourceSubAccount: snapshot.isSavingCollateral ? snapshot.savingCollateral?.subAccount : undefined,
           submittingLabel: 'Submitting...',
         },
         onSucceeded: () => finalizeExecutionUi(),
diff --git a/composables/borrow/useMultiplyForm.ts b/composables/borrow/useMultiplyForm.ts
index 90ff8ccf7..508d8a254 100644
--- a/composables/borrow/useMultiplyForm.ts
+++ b/composables/borrow/useMultiplyForm.ts
@@ -1356,6 +1356,7 @@ export const useMultiplyForm = (options: UseMultiplyFormOptions) => {
           swapToAmount: quote ? longAmountSnapshot : undefined,
           swapMode: quote ? SwapperMode.EXACT_IN : undefined,
           subAccount,
+          sourceSubAccount: collateralShareSource?.from,
           submittingLabel: 'Submitting...',
         },
         onSucceeded: () => finalizeExecutionUi(),
diff --git a/composables/useTxBatch.ts b/composables/useTxBatch.ts
index 612f074ff..d9290bf8c 100644
--- a/composables/useTxBatch.ts
+++ b/composables/useTxBatch.ts
@@ -2206,7 +2206,12 @@ export const useTxBatch = () => {
       preparedIntent ? [preparedIntent] : undefined,
       [currentIntent],
     )[0]!
-    const intent = deepFreezeSerializable(selectedIntent) as OperationIntent
+    const intent = deepFreezeSerializable({
+      ...selectedIntent,
+      intentId: currentIntent.intentId,
+      revision: currentIntent.revision,
+      metadata: currentIntent.metadata,
+    }) as OperationIntent
     const entryId = intent.intentId
     const capturedOwner = owner.value
     const capturedChainId = chainId.value
diff --git a/pages/borrow/[collateral]/[borrow]/index.vue b/pages/borrow/[collateral]/[borrow]/index.vue
index 21a4f53ce..b304e96fa 100644
--- a/pages/borrow/[collateral]/[borrow]/index.vue
+++ b/pages/borrow/[collateral]/[borrow]/index.vue
@@ -289,7 +289,7 @@ const addToBatch = async () => {
     // cleared values (an empty amount builds a no-op borrow).
     const snap = borrow.captureBorrowSnapshot(subAccount)
     const label = `Borrow ${snap.borrowAmount} ${bVault.asset.symbol}`
-    await addBatchEntry({ intent: borrow.createBorrowIntent(snap), label, subAccount, review: { type: 'borrow', asset: bVault.asset, amount: snap.borrowAmount, quoteFetchedAt: snap.needsSwap ? borrow.borrowSwapEffectiveQuoteFetchedAt.value : null } })
+    await addBatchEntry({ intent: borrow.createBorrowIntent(snap), label, subAccount, sourceSubAccount: snap.isSavingCollateral && !snap.needsSwap ? snap.savingCollateral?.subAccount as Address | undefined : undefined, review: { type: 'borrow', asset: bVault.asset, amount: snap.borrowAmount, quoteFetchedAt: snap.needsSwap ? borrow.borrowSwapEffectiveQuoteFetchedAt.value : null } })
     borrow.collateralAmount.value = ''
     borrow.borrowAmount.value = ''
     redirectAfterAdd('/portfolio', { subAccount })
@@ -336,7 +336,7 @@ const addMultiplyToBatch = async () => {
     const quoteIntents = snap.quote
       ? multiply.multiplyQuoteCardsSorted.value.find(card => card.quote === snap.quote)?.intents
       : undefined
-    await addBatchEntry({ intent: multiply.createMultiplyIntent(snap), preparedIntent: quoteIntents?.[0], label: `Multiply → ${longVault.asset.symbol}`, subAccount, multiply: true, review: { type: 'borrow', asset: shortVault.asset, amount: multiply.multiplyInputAmount.value, swapToAsset: longVault.asset, quoteFetchedAt: sameAsset ? null : multiply.multiplyEffectiveQuoteFetchedAt.value } })
+    await addBatchEntry({ intent: multiply.createMultiplyIntent(snap), preparedIntent: quoteIntents?.[0], label: `Multiply → ${longVault.asset.symbol}`, subAccount, sourceSubAccount: snap.isSavingCollateral ? snap.savingFrom : undefined, multiply: true, review: { type: 'borrow', asset: shortVault.asset, amount: multiply.multiplyInputAmount.value, swapToAsset: longVault.asset, quoteFetchedAt: sameAsset ? null : multiply.multiplyEffectiveQuoteFetchedAt.value } })
     redirectAfterAdd('/portfolio', { subAccount })
   })
 }
diff --git a/tests/composables/useBorrowForm.test.ts b/tests/composables/useBorrowForm.test.ts
index 031a4bb8a..9e8efb4c9 100644
--- a/tests/composables/useBorrowForm.test.ts
+++ b/tests/composables/useBorrowForm.test.ts
@@ -450,6 +450,37 @@ describe('useBorrowForm savings collateral', () => {
     expect(mocks.openReview).toHaveBeenCalled()
   })
 
+  it('keeps the reviewed savings source bound to the borrow intent during preparation', async () => {
+    const form = makeForm(shallowRef([
+      makeSavingsPosition(SUB_ACCOUNT_A, 100n, 90n),
+      makeSavingsPosition(SUB_ACCOUNT_B, 250n, 240n),
+    ]))
+    form.onChangeCollateral(1)
+    form.collateralAmount.value = '5'
+    form.borrowAmount.value = '1'
+    let releasePlan!: () => void
+    mocks.planBorrow.mockImplementationOnce(() => new Promise((resolve) => {
+      releasePlan = () => resolve([{ type: 'evcBatch', items: [] }])
+    }))
+    mocks.runSimulation.mockResolvedValue(true)
+
+    const submitting = form.submit()
+    await vi.waitFor(() => expect(releasePlan).toBeTypeOf('function'))
+    form.onChangeCollateral(2)
+    releasePlan()
+    await submitting
+
+    expect(mocks.openReview).toHaveBeenCalledWith([
+      expect.objectContaining({
+        planner: expect.objectContaining({
+          args: expect.objectContaining({ borrowAccount: USER, collateral: expect.objectContaining({ from: SUB_ACCOUNT_A }) }),
+        }),
+      }),
+    ], expect.objectContaining({
+      review: expect.objectContaining({ subAccount: USER, sourceSubAccount: SUB_ACCOUNT_A }),
+    }))
+  })
+
   it('recaptures direct and batch quote-backed intents after the borrow amount settles', async () => {
     const form = makeForm(shallowRef([]))
     const payToken = {
diff --git a/tests/composables/useMultiplyForm.test.ts b/tests/composables/useMultiplyForm.test.ts
index 0c65b38ff..cd9f93640 100644
--- a/tests/composables/useMultiplyForm.test.ts
+++ b/tests/composables/useMultiplyForm.test.ts
@@ -53,6 +53,7 @@ const { USER, makeVault, planAccount, mocks } = vi.hoisted(() => {
       fetchSingleBalance: vi.fn(async () => 100n),
       runPreparedSimulation: vi.fn(),
       modalOpen: vi.fn(),
+      openReview: vi.fn(async (..._args: unknown[]) => undefined),
       getSupplyCapWarning: vi.fn(() => ({
         level: 'info',
         title: 'Supply cap reached',
@@ -228,10 +229,10 @@ describe('useMultiplyForm cap validation', () => {
       create: createIntent,
     }))
     vi.stubGlobal('useExecutionReview', () => ({
-      capture: (currentIntents: unknown[], _options: unknown, preparedIntents?: unknown[]) => ({
+      capture: (currentIntents: unknown[], options: unknown, preparedIntents?: unknown[]) => ({
         intents: preparedIntents ?? currentIntents,
         usesPreparedIntents: !!preparedIntents,
-        open: vi.fn(),
+        open: () => mocks.openReview(preparedIntents ?? currentIntents, options),
       }),
     }))
     vi.clearAllMocks()
@@ -365,6 +366,46 @@ describe('useMultiplyForm cap validation', () => {
     expect(requests[0]?.cashDelta).toBe(1n)
   })
 
+  it('keeps the reviewed savings source bound to the multiply plan during preparation', async () => {
+    const vault = makeVault(0, 0)
+    const sourceSubAccount = '0x0000000000000000000000000000000000000011'
+    const nextSourceSubAccount = '0x0000000000000000000000000000000000000022'
+    vi.stubGlobal('useEulerAccount', () => ({
+      depositPositions: ref([sourceSubAccount, nextSourceSubAccount].map(subAccount => ({
+        vault,
+        subAccount,
+        assets: 100n,
+        shares: 90n,
+      }))),
+    }))
+    const form = makeForm(vault)
+    form.initMultiplySupplyVault(vault)
+    form.isMultiplySavingCollateral.value = true
+    form.multiplySelectedSavingSubAccount.value = sourceSubAccount
+    form.multiplyInputAmount.value = '5'
+    form.multiplier.value = 2
+    let releasePlan!: () => void
+    mocks.planMultiply.mockImplementationOnce(() => new Promise((resolve) => {
+      releasePlan = () => resolve([{ type: 'evcBatch', items: [] }])
+    }))
+    mocks.prepareTransactionPlan.mockResolvedValue({ plan: [] })
+    mocks.runPreparedSimulation.mockResolvedValue(true)
+
+    const submitting = form.submitMultiply()
+    await vi.waitFor(() => expect(releasePlan).toBeTypeOf('function'))
+    form.multiplySelectedSavingSubAccount.value = nextSourceSubAccount
+    releasePlan()
+    await submitting
+
+    expect(mocks.planMultiply).toHaveBeenCalledWith(expect.objectContaining({
+      receiver: USER,
+      collateralShareSource: { from: sourceSubAccount, shares: 5n },
+    }))
+    expect(mocks.openReview).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({
+      review: expect.objectContaining({ subAccount: USER, sourceSubAccount }),
+    }))
+  })
+
   it('derives projected Net APY, ROE, and rate transitions from one breakdown', async () => {
     const rateUnit = 10n ** 25n
     mocks.getAssetUsdValueForEstimate.mockResolvedValue(100)
diff --git a/tests/composables/useTxBatch.test.ts b/tests/composables/useTxBatch.test.ts
index c60508585..7d84260fe 100644
--- a/tests/composables/useTxBatch.test.ts
+++ b/tests/composables/useTxBatch.test.ts
@@ -13,8 +13,11 @@ import {
 } from '~/composables/batchPrefetchState'
 import { activeLayerVaultsRef } from '~/composables/useLayeredVaults'
 import type { OperationIntent } from '~/features/reviewed-execution/domain/intents'
+import { createOperationIntent } from '~/features/reviewed-execution/domain/factory'
+import { validateIntentSet } from '~/features/reviewed-execution/domain/validators'
 import type { SignatureSlot } from '~/features/reviewed-execution/domain/reviewed-execution'
 import { finalizeSuccessfulSubmission } from '~/features/reviewed-execution/review/submission-completion'
+import { makeSwapQuote } from '../reviewed-execution/swap-quote.test-fixture'
 
 vi.mock('~/composables/useEulerSdk', () => ({
   getEulerSdkFresh: vi.fn(),
@@ -55,7 +58,7 @@ const executionMocks = {
     const plan = await compilePreviewMock(intents, account)
     return { reviewedPlan: plan, plan }
   }),
-  prepare: vi.fn(async () => { throw new Error('authoritative preparation not configured in batch unit test') }),
+  prepare: vi.fn(async (_intents: readonly OperationIntent[]) => { throw new Error('authoritative preparation not configured in batch unit test') }),
   prepareReadOnly: vi.fn(async () => { throw new Error('read-only preparation not configured in batch unit test') }),
 }
 const scheduleExternalMigrationRefreshes = vi.fn()
@@ -1467,7 +1470,7 @@ describe('useTxBatch execution errors', () => {
     expect(batch.entries.value[0]?.preparing).toBe(false)
   })
 
-  it('adopts a warmed batch intent only when it matches the add-time intent', async () => {
+  it('keeps the add-time identity when adopting matching warmed batch semantics', async () => {
     const batch = useTxBatch()
     const preparedIntent = intentFor([] as TransactionPlan, [subAccount])
     const currentIntent = intentFor([] as TransactionPlan, [subAccount])
@@ -1480,10 +1483,55 @@ describe('useTxBatch execution errors', () => {
     })
 
     expect(batch.draftEntries.value[0]).toMatchObject({
-      intentId: preparedIntent.intentId,
-      intent: preparedIntent,
+      intentId: currentIntent.intentId,
+      revision: currentIntent.revision,
+      intent: currentIntent,
+    })
+    expect(executionMocks.compilePreview).toHaveBeenCalledWith([currentIntent], expect.anything())
+    expect(batch.entries.value[0]?.intent.metadata.createdAt).toBe(currentIntent.metadata.createdAt)
+  })
+
+  it('prepares repeated adds of one warmed quote and removes only the selected row', async () => {
+    const batch = useTxBatch()
+    const quote = makeSwapQuote()
+    const createIntent = (intentId: string, createdAt: number) => createOperationIntent({
+      kind: 'deposit',
+      planner: 'deposit-with-swap',
+      args: { swapQuote: quote, amount: 10n, tokenIn: quote.tokenIn.address },
+      chainId: 1,
+      account: owner,
+      subAccounts: [subAccount],
+      source: 'test',
+      intentId,
+      createdAt,
     })
-    expect(executionMocks.compilePreview).toHaveBeenCalledWith([preparedIntent], expect.anything())
+    const preparedIntent = createIntent('warm', 1)
+    const firstIntent = createIntent('first-add', 2)
+    const secondIntent = createIntent('second-add', 3)
+    const preparedReview = { execution: { reviewId: '0x01' }, previewPlan: [], prepared: {} }
+    executionMocks.prepare.mockImplementation(async (intents) => {
+      validateIntentSet(intents)
+      return preparedReview as never
+    })
+
+    await batch.addEntry({ intent: firstIntent, preparedIntent, label: 'Supply USDC', subAccount, review: { amount: '10' } })
+    await vi.waitFor(() => expect(batch.layers.value).toHaveLength(2))
+    await batch.addEntry({ intent: secondIntent, preparedIntent, label: 'Supply USDC', subAccount, review: { amount: '10.0' } })
+
+    await expect(batch.prepareBatchExecutionReview()).resolves.toBe(preparedReview)
+    expect(executionMocks.prepare).toHaveBeenLastCalledWith([firstIntent, secondIntent], expect.objectContaining({
+      presentationInputs: [
+        expect.objectContaining({ id: firstIntent.intentId, review: { amount: '10' } }),
+        expect.objectContaining({ id: secondIntent.intentId, review: { amount: '10.0' } }),
+      ],
+    }))
+    expect(batch.entries.value.map(entry => entry.id)).toEqual([firstIntent.intentId, secondIntent.intentId])
+    batch.removeEntry(firstIntent.intentId)
+
+    expect(batch.entries.value).toHaveLength(1)
+    expect(batch.entries.value[0]).toMatchObject({ id: secondIntent.intentId, intent: secondIntent, review: { amount: '10.0' } })
+    await expect(batch.prepareBatchExecutionReview()).resolves.toBe(preparedReview)
+    expect(preparedIntent).toEqual(createIntent('warm', 1))
   })
 
   it('rebuilds a batch entry from the add-time intent when warmed semantics are stale', async () => {