diff --git a/src/app/farm/[poolId]/PoolDetailClient.tsx b/src/app/farm/[poolId]/PoolDetailClient.tsx
index b1d4f22..7be5552 100644
--- a/src/app/farm/[poolId]/PoolDetailClient.tsx
+++ b/src/app/farm/[poolId]/PoolDetailClient.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useMemo, useRef, useState } from "react";
 import NextLink from "next/link";
+import TransactionConfirmModal from "@/components/TransactionConfirmModal/TransactionConfirmModal";
 import {
   Alert,
   AlertIcon,
@@ -209,6 +210,11 @@ export default function PoolDetailClient({ poolId }: { poolId: string }) {
   const displayAmount = parseFloat(rawAmount);
   const amountValid = Number.isFinite(displayAmount) && displayAmount > 0;
   const isPending = isDepositPending(flow.step);
+  const lockPeriodLabel = pool
+    ? pool.minLockPeriod >= 86400
+      ? `${Math.floor(pool.minLockPeriod / 86400)} day${Math.floor(pool.minLockPeriod / 86400) > 1 ? "s" : ""}`
+      : `${Math.floor(pool.minLockPeriod / 3600)} hour${Math.floor(pool.minLockPeriod / 3600) > 1 ? "s" : ""}`
+    : "";
 
   if (error) {
     return (
@@ -507,50 +513,6 @@ export default function PoolDetailClient({ poolId }: { poolId: string }) {
                 )}
               </Button>
 
-              {showConfirmation && (
-                <Alert status="warning" borderRadius="2xl" bg="app.warningBg" color="app.warningFg" fontSize="sm" p={4}>
-                  <Flex direction="column" gap={3} w="full">
-                    <Flex align="flex-start" gap={2}>
-                      <AlertIcon color="app.warningFg" mt={0.5} />
-                      <Box flex="1">
-                        <Text fontWeight="semibold" mb={1}>
-                          Confirm Lock Transaction
-                        </Text>
-                        <Text fontSize="xs">
-                          You are about to lock {displayAmount} {pool?.asset.code ?? ""} for a minimum period of{" "}
-                          {pool
-                            ? pool.minLockPeriod >= 86400
-                              ? `${Math.floor(pool.minLockPeriod / 86400)} day${Math.floor(pool.minLockPeriod / 86400) > 1 ? "s" : ""}`
-                              : `${Math.floor(pool.minLockPeriod / 3600)} hour${Math.floor(pool.minLockPeriod / 3600) > 1 ? "s" : ""}`
-                            : ""}
-                          . This action cannot be reversed until the lock period expires.
-                        </Text>
-                      </Box>
-                    </Flex>
-                    <Flex gap={2} justify="flex-end">
-                      <Button
-                        size="sm"
-                        variant="ghost"
-                        onClick={handleCancelLock}
-                        isDisabled={isPending}
-                      >
-                        Cancel
-                      </Button>
-                      <Button
-                        size="sm"
-                        bg="app.accent"
-                        color="app.onAccent"
-                        _hover={{ opacity: 0.9 }}
-                        onClick={handleConfirmLock}
-                        isDisabled={isPending}
-                      >
-                        Confirm Lock
-                      </Button>
-                    </Flex>
-                  </Flex>
-                </Alert>
-              )}
-
               {flow.step === "error" && (
                 <Button variant="ghost" size="sm" color="app.muted" onClick={flow.reset}>
                   Try again
@@ -559,6 +521,20 @@ export default function PoolDetailClient({ poolId }: { poolId: string }) {
             </Flex>
           </ModalBody>
         </ModalContent>
+        <TransactionConfirmModal
+          isOpen={showConfirmation}
+          onClose={handleCancelLock}
+          onConfirm={handleConfirmLock}
+          title="Confirm Lock"
+          description="Review the details below. You'll be asked to sign this transaction in Freighter."
+          details={[
+            { label: "Pool", value: pool?.asset.code ?? poolId },
+            { label: "Lock amount", value: `${displayAmount} ${pool?.asset.code ?? ""}` },
+            { label: "Minimum lock period", value: lockPeriodLabel },
+          ]}
+          warning={`This action cannot be reversed until the ${lockPeriodLabel} lock period expires.`}
+          confirmLabel="Confirm Lock"
+        />
       </Modal>
     </Flex>
   );
diff --git a/src/app/farm/page.tsx b/src/app/farm/page.tsx
index 2f00a8c..201b80e 100644
--- a/src/app/farm/page.tsx
+++ b/src/app/farm/page.tsx
@@ -5,6 +5,7 @@ import ConnectWalletButton from "@/components/ConnectWalletButton/ConnectWalletB
 import UnlockModal from "@/components/UnlockModal/UnlockModal";
 import BoostModal from "@/components/BoostModal/BoostModal";
 import Breadcrumbs from "@/components/Breadcrumbs/Breadcrumbs";
+import TransactionConfirmModal from "@/components/TransactionConfirmModal/TransactionConfirmModal";
 import { EarningRow, MetricColumn } from "@/app/farm/EarningRow";
 import { FarmPoolRow } from "@/app/farm/FarmPoolRow";
 import {
@@ -95,6 +96,7 @@ function DepositModal({
 }) {
   const { publicKey, walletApi, isConnected, isNetworkMismatch } = useStellarWallet();
   const [amount, setAmount] = useState("");
+  const [isConfirmOpen, setIsConfirmOpen] = useState(false);
 
   const selectedContractAddress = farm?.contractAddress || farm?.id || "";
   const balanceQuery = useStellarBalance(publicKey ?? undefined);
@@ -156,6 +158,7 @@ function DepositModal({
   useEffect(() => {
     if (isOpen) {
       setAmount("");
+      setIsConfirmOpen(false);
       flow.reset();
     }
     // Reset only when the modal opens or the selected pool changes.
@@ -178,6 +181,11 @@ function DepositModal({
     await flow.execute(numericAmount);
   };
 
+  const handleConfirmDeposit = () => {
+    setIsConfirmOpen(false);
+    void handleSubmit();
+  };
+
   // Auto-close the modal after a successful deposit (#416).
   useEffect(() => {
     if (flow.step === "success") {
@@ -361,7 +369,7 @@ function DepositModal({
               color="app.onAccent"
               _hover={{ opacity: isPending ? 1 : 0.9 }}
               isDisabled={!canSubmit}
-              onClick={() => void handleSubmit()}
+              onClick={() => setIsConfirmOpen(true)}
               w="full"
             >
               {isPending ? (
@@ -389,6 +397,24 @@ function DepositModal({
           </Flex>
         </ModalBody>
       </ModalContent>
+      <TransactionConfirmModal
+        isOpen={isConfirmOpen}
+        onClose={() => setIsConfirmOpen(false)}
+        onConfirm={handleConfirmDeposit}
+        title="Confirm Deposit"
+        description="Review the details below. You'll be asked to sign this transaction in Freighter."
+        details={[
+          { label: "Pool", value: farm.name },
+          { label: "Deposit amount", value: `${trimmedAmount} ${farm.symbol}` },
+          { label: "Minimum lock period", value: lockPeriod },
+          {
+            label: "Estimated Soroban fee",
+            value: feePreview.data ? `${feePreview.data.feePreview} stroops` : "Unavailable",
+          },
+        ]}
+        warning={`Deposited funds stay locked for at least ${lockPeriod} and can't be withdrawn before then.`}
+        confirmLabel="Confirm Deposit"
+      />
     </Modal>
   );
 }
diff --git a/src/components/BoostModal/BoostModal.tsx b/src/components/BoostModal/BoostModal.tsx
index 0fb7f53..bccac9f 100644
--- a/src/components/BoostModal/BoostModal.tsx
+++ b/src/components/BoostModal/BoostModal.tsx
@@ -4,6 +4,7 @@ import {
     poolContractId,
     stellarNetwork,
 } from "@/config";
+import TransactionConfirmModal from "@/components/TransactionConfirmModal/TransactionConfirmModal";
 import { useStellarWallet } from "@/context/StellarWalletContext";
 import { useSetBoost } from "@/hooks/useSorobanQuery";
 import { trackEvent } from "@/lib/analytics";
@@ -46,6 +47,7 @@ export default function BoostModal() {
     const [allocation, setAllocation] = useState(currentBoost);
     const [step, setStep] = useState<BoostStep>("idle");
     const [error, setError] = useState<string | null>(null);
+    const [isConfirmOpen, setIsConfirmOpen] = useState(false);
     const sliderThumbRef = useRef<HTMLDivElement>(null);
 
     const selectedPoolContractId = position?.contractAddress || poolContractId;
@@ -55,6 +57,7 @@ export default function BoostModal() {
             setAllocation(position.boostAllocation ?? 0);
             setStep("idle");
             setError(null);
+            setIsConfirmOpen(false);
         }
     }, [isBoost, position]);
 
@@ -69,6 +72,11 @@ export default function BoostModal() {
     const allocationChanged = allocation !== currentBoost;
     const isProcessing = step === "submitting";
 
+    const handleConfirmBoost = () => {
+        setIsConfirmOpen(false);
+        void handleSetBoost();
+    };
+
     const handleSetBoost = async () => {
         if (!publicKey) {
             setError("Connect your Freighter wallet to set boost.");
@@ -263,7 +271,7 @@ export default function BoostModal() {
                                 color="app.onAccent"
                                 _hover={{ opacity: 0.9 }}
                                 isDisabled={!hasStake || !allocationChanged || isProcessing || isNetworkMismatch}
-                                onClick={() => void handleSetBoost()}
+                                onClick={() => setIsConfirmOpen(true)}
                                 w="full"
                             >
                                 {isProcessing ? (
@@ -279,6 +287,21 @@ export default function BoostModal() {
                     )}
                 </ModalBody>
             </ModalContent>
+            <TransactionConfirmModal
+                isOpen={isConfirmOpen}
+                onClose={() => setIsConfirmOpen(false)}
+                onConfirm={handleConfirmBoost}
+                title="Confirm Boost Change"
+                description="Review the details below. You'll be asked to sign this transaction in Freighter."
+                details={[
+                    { label: "Pool", value: position.name },
+                    { label: "Current boost", value: `${currentBoost}%` },
+                    { label: "New boost", value: `${allocation}%` },
+                    { label: "Your stake", value: `${position.stake} ${position.symbol}` },
+                ]}
+                warning="This allocation applies to all future credit emissions until you change it."
+                confirmLabel="Confirm Boost"
+            />
         </Modal>
     );
 }
diff --git a/src/components/TransactionConfirmModal/TransactionConfirmModal.test.tsx b/src/components/TransactionConfirmModal/TransactionConfirmModal.test.tsx
new file mode 100644
index 0000000..ac8dfc7
--- /dev/null
+++ b/src/components/TransactionConfirmModal/TransactionConfirmModal.test.tsx
@@ -0,0 +1,63 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { ChakraProvider } from "@chakra-ui/react";
+import { describe, expect, it, vi } from "vitest";
+import TransactionConfirmModal, {
+  type TransactionConfirmModalProps,
+} from "./TransactionConfirmModal";
+
+function renderModal(overrides: Partial<TransactionConfirmModalProps> = {}) {
+  const props: TransactionConfirmModalProps = {
+    isOpen: true,
+    onClose: vi.fn(),
+    onConfirm: vi.fn(),
+    title: "Confirm Deposit",
+    details: [
+      { label: "Pool", value: "XLM Pool" },
+      { label: "Deposit amount", value: "25 XLM" },
+    ],
+    warning: "Funds stay locked for 7 days.",
+    confirmLabel: "Confirm Deposit",
+    ...overrides,
+  };
+  render(
+    <ChakraProvider>
+      <TransactionConfirmModal {...props} />
+    </ChakraProvider>,
+  );
+  return props;
+}
+
+describe("TransactionConfirmModal", () => {
+  it("renders the transaction details and warning", () => {
+    renderModal();
+
+    expect(screen.getByRole("alertdialog")).toBeTruthy();
+    expect(screen.getByText("XLM Pool")).toBeTruthy();
+    expect(screen.getByText("25 XLM")).toBeTruthy();
+    expect(screen.getByText("Funds stay locked for 7 days.")).toBeTruthy();
+  });
+
+  it("calls onConfirm when the confirm button is clicked", () => {
+    const props = renderModal();
+
+    fireEvent.click(screen.getByRole("button", { name: "Confirm Deposit" }));
+
+    expect(props.onConfirm).toHaveBeenCalledTimes(1);
+    expect(props.onClose).not.toHaveBeenCalled();
+  });
+
+  it("calls onClose without confirming when cancelled", () => {
+    const props = renderModal();
+
+    fireEvent.click(screen.getByRole("button", { name: "Cancel" }));
+
+    expect(props.onClose).toHaveBeenCalledTimes(1);
+    expect(props.onConfirm).not.toHaveBeenCalled();
+  });
+
+  it("renders nothing when closed", () => {
+    renderModal({ isOpen: false });
+
+    expect(screen.queryByRole("alertdialog")).toBeNull();
+  });
+});
diff --git a/src/components/TransactionConfirmModal/TransactionConfirmModal.tsx b/src/components/TransactionConfirmModal/TransactionConfirmModal.tsx
new file mode 100644
index 0000000..2fcdda2
--- /dev/null
+++ b/src/components/TransactionConfirmModal/TransactionConfirmModal.tsx
@@ -0,0 +1,135 @@
+"use client";
+
+import {
+    AlertDialog,
+    AlertDialogBody,
+    AlertDialogContent,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogOverlay,
+    Box,
+    Button,
+    Flex,
+    Text,
+} from "@chakra-ui/react";
+import { useRef, type ReactNode } from "react";
+
+export interface TransactionDetail {
+    label: string;
+    value: ReactNode;
+}
+
+export interface TransactionConfirmModalProps {
+    isOpen: boolean;
+    onClose: () => void;
+    onConfirm: () => void;
+    title: string;
+    description?: ReactNode;
+    details: TransactionDetail[];
+    /** Extra caution shown above the actions, e.g. irreversibility notes. */
+    warning?: ReactNode;
+    confirmLabel?: string;
+    cancelLabel?: string;
+}
+
+/**
+ * Last-chance review step shown before a transaction is handed to Freighter.
+ * Focus starts on Cancel so a stray Enter press can't submit by accident.
+ */
+export default function TransactionConfirmModal({
+    isOpen,
+    onClose,
+    onConfirm,
+    title,
+    description,
+    details,
+    warning,
+    confirmLabel = "Confirm",
+    cancelLabel = "Cancel",
+}: TransactionConfirmModalProps) {
+    const cancelRef = useRef<HTMLButtonElement>(null);
+
+    return (
+        <AlertDialog
+            isOpen={isOpen}
+            onClose={onClose}
+            leastDestructiveRef={cancelRef}
+            isCentered
+            lockScrollAcrossViewports
+            returnFocusOnClose
+        >
+            <AlertDialogOverlay backdropFilter="blur(3px)" />
+            <AlertDialogContent
+                bg="app.surface"
+                color="app.text"
+                borderRadius="3xl"
+                mx={{ base: 4, md: "auto" }}
+            >
+                <AlertDialogHeader textAlign="center">{title}</AlertDialogHeader>
+                <AlertDialogBody>
+                    <Flex direction="column" gap={4}>
+                        {description && (
+                            <Text fontSize="sm" color="app.muted">
+                                {description}
+                            </Text>
+                        )}
+                        <Box
+                            as="dl"
+                            border="1px solid"
+                            borderColor="app.border"
+                            borderRadius="2xl"
+                            p={3}
+                        >
+                            {details.map((detail) => (
+                                <Flex
+                                    key={detail.label}
+                                    justify="space-between"
+                                    fontSize="sm"
+                                    py={1}
+                                    gap={4}
+                                >
+                                    <Text as="dt" color="app.muted">
+                                        {detail.label}
+                                    </Text>
+                                    <Text as="dd" textAlign="right" fontWeight="semibold">
+                                        {detail.value}
+                                    </Text>
+                                </Flex>
+                            ))}
+                        </Box>
+                        {warning && (
+                            <Box
+                                borderRadius="2xl"
+                                bg="app.warningBg"
+                                color="app.warningFg"
+                                fontSize="xs"
+                                p={3}
+                            >
+                                {warning}
+                            </Box>
+                        )}
+                    </Flex>
+                </AlertDialogBody>
+                <AlertDialogFooter gap={2}>
+                    <Button
+                        ref={cancelRef}
+                        variant="ghost"
+                        borderRadius="2xl"
+                        onClick={onClose}
+                    >
+                        {cancelLabel}
+                    </Button>
+                    <Button
+                        borderRadius="2xl"
+                        bg="app.accent"
+                        color="app.onAccent"
+                        _hover={{ opacity: 0.9 }}
+                        onClick={onConfirm}
+                    >
+                        {confirmLabel}
+                    </Button>
+                </AlertDialogFooter>
+            </AlertDialogContent>
+        </AlertDialog>
+    );
+}
diff --git a/src/components/UnlockModal/UnlockModal.test.tsx b/src/components/UnlockModal/UnlockModal.test.tsx
index 01138e7..980983f 100644
--- a/src/components/UnlockModal/UnlockModal.test.tsx
+++ b/src/components/UnlockModal/UnlockModal.test.tsx
@@ -219,6 +219,7 @@ describe('UnlockModal', () => {
 
     const button = screen.getByRole('button', { name: /Unlock with Freighter/i });
     fireEvent.click(button);
+    fireEvent.click(await screen.findByRole('button', { name: /Confirm Unlock/i }));
 
     // Wait for the modal to show success state — the Badge text
     await waitFor(() => {
@@ -248,6 +249,7 @@ describe('UnlockModal', () => {
 
     const button = screen.getByRole('button', { name: /Unlock with Freighter/i });
     fireEvent.click(button);
+    fireEvent.click(await screen.findByRole('button', { name: /Confirm Unlock/i }));
 
     await waitFor(() => {
       expect(screen.getByText(/Insufficient balance/i)).toBeTruthy();
@@ -260,6 +262,23 @@ describe('UnlockModal', () => {
     });
   });
 
+  it('requires confirmation before submitting the unlock', async () => {
+    renderWithProviders(createElement(UnlockModal));
+    fireEvent.change(screen.getByPlaceholderText('Amount'), { target: { value: '50' } });
+
+    fireEvent.click(screen.getByRole('button', { name: /Unlock with Freighter/i }));
+
+    expect(await screen.findByText('Confirm Unlock', { selector: 'header' })).toBeTruthy();
+    expect(screen.getByText('50 XLM')).toBeTruthy();
+    expect(unlockAssets).not.toHaveBeenCalled();
+
+    fireEvent.click(screen.getByRole('button', { name: /^Cancel$/i }));
+    await waitFor(() => {
+      expect(screen.queryByRole('button', { name: /Confirm Unlock/i })).toBeNull();
+    });
+    expect(unlockAssets).not.toHaveBeenCalled();
+  });
+
   describe('Escape key (#516)', () => {
     function mockStore(close: () => void) {
       vi.mocked(useFarmStore).mockImplementation((selector: (state: FarmStore) => unknown) =>
diff --git a/src/components/UnlockModal/UnlockModal.tsx b/src/components/UnlockModal/UnlockModal.tsx
index 3d46641..3c75bfc 100644
--- a/src/components/UnlockModal/UnlockModal.tsx
+++ b/src/components/UnlockModal/UnlockModal.tsx
@@ -4,6 +4,7 @@ import {
     poolContractId,
     stellarNetwork,
 } from "@/config";
+import TransactionConfirmModal from "@/components/TransactionConfirmModal/TransactionConfirmModal";
 import { useErrorHandler } from "@/context/ErrorContext";
 import { useStellarWallet } from "@/context/StellarWalletContext";
 import { useCountdown } from "@/hooks/useCountdown";
@@ -72,6 +73,7 @@ export default function UnlockModal() {
   const [step, setStep] = useState<UnlockStep>("idle");
   const [error, setError] = useState<string | null>(null);
   const [txHash, setTxHash] = useState<string | null>(null);
+  const [isConfirmOpen, setIsConfirmOpen] = useState(false);
   const amountInputRef = useRef<HTMLInputElement>(null);
   const selectedPoolContractId = position?.contractAddress || poolContractId;
 
@@ -101,7 +103,7 @@ export default function UnlockModal() {
       setStep("idle");
       setError(null);
       setTxHash(null);
-
+      setIsConfirmOpen(false);
     }
   }, [isUnlock, position]);
 
@@ -127,6 +129,11 @@ export default function UnlockModal() {
     numericDailyRate,
   );
 
+  const handleConfirmUnlock = () => {
+    setIsConfirmOpen(false);
+    void handleUnlock();
+  };
+
   const handleUnlock = async () => {
     if (!publicKey || !walletApi) {
       setError("Connect your Freighter wallet to unlock.");
@@ -549,7 +556,7 @@ export default function UnlockModal() {
                 color="app.onAccent"
                 _hover={{ opacity: 0.9 }}
                 isDisabled={!canUnlock || !amountValid || isProcessing || isNetworkMismatch}
-                onClick={() => void handleUnlock()}
+                onClick={() => setIsConfirmOpen(true)}
                 w="full"
               >
                 {isProcessing ? (
@@ -565,6 +572,29 @@ export default function UnlockModal() {
           )}
         </ModalBody>
       </ModalContent>
+      <TransactionConfirmModal
+        isOpen={isConfirmOpen}
+        onClose={() => setIsConfirmOpen(false)}
+        onConfirm={handleConfirmUnlock}
+        title="Confirm Unlock"
+        description="Review the details below. You'll be asked to sign this transaction in Freighter."
+        details={[
+          { label: "Pool", value: position.name },
+          { label: "Unlock amount", value: `${numericAmount} ${position.symbol}` },
+          { label: "Remaining stake", value: `${remainingStake.toFixed(4)} ${position.symbol}` },
+          { label: "New daily rate", value: `${newDailyRate.toFixed(6)} credits/day` },
+          {
+            label: "Estimated Soroban fee",
+            value: feePreview.data ? `${feePreview.data.feePreview} stroops` : "Unavailable",
+          },
+        ]}
+        warning={
+          numericAmount < position.lockedAmount
+            ? "Unlocked assets stop earning credits once the transaction confirms."
+            : "This closes your entire position. Unlocked assets stop earning credits once the transaction confirms."
+        }
+        confirmLabel="Confirm Unlock"
+      />
     </Modal>
   );
 }