diff --git a/packages/stores/src/account/base.ts b/packages/stores/src/account/base.ts
index b09fc7b4ac..ba5a5ab90d 100644
--- a/packages/stores/src/account/base.ts
+++ b/packages/stores/src/account/base.ts
@@ -216,7 +216,7 @@ export class AccountStore<Injects extends Record<string, any>[] = []> {
     makeObservable(this);
 
     autorun(async () => {
-      const isOneClickTradingEnabled = await this.getShouldUseOneClickTrading();
+      const isOneClickTradingEnabled = await this.isOneClickTradingEnabled();
       const oneClickTradingInfo = await this.getOneClickTradingInfo();
       const hasUsedOneClickTrading = await this.getHasUsedOneClickTrading();
       runInAction(() => {
@@ -1472,7 +1472,7 @@ export class AccountStore<Injects extends Record<string, any>[] = []> {
   }: {
     messages: readonly EncodeObject[];
   }): Promise<boolean> {
-    const isOneClickTradingEnabled = await this.isOneCLickTradingEnabled();
+    const isOneClickTradingEnabled = await this.isOneClickTradingEnabled();
     const oneClickTradingInfo = await this.getOneClickTradingInfo();
 
     if (!oneClickTradingInfo || !isOneClickTradingEnabled) {
@@ -1535,7 +1535,7 @@ export class AccountStore<Injects extends Record<string, any>[] = []> {
     });
   }
 
-  async isOneCLickTradingEnabled(): Promise<boolean> {
+  async isOneClickTradingEnabled(): Promise<boolean> {
     const oneClickTradingInfo = await this.getOneClickTradingInfo();
 
     if (isNil(oneClickTradingInfo)) return false;
diff --git a/packages/web/.env b/packages/web/.env
index d0f78286ff..cf30c16291 100644
--- a/packages/web/.env
+++ b/packages/web/.env
@@ -48,4 +48,7 @@ TWITTER_API_URL=https://api.twitter.com/
 BLOCKAID_BASE_URL=http://api.blockaid.io:80
 # BLOCKAID_API_KEY=
 
-NEXT_PUBLIC_SPEND_LIMIT_CONTRACT_ADDRESS=osmo10xqv8rlpkflywm92k5wdmplzy7khtasl9c2c08psmvlu543k724sy94k74
\ No newline at end of file
+NEXT_PUBLIC_SPEND_LIMIT_CONTRACT_ADDRESS=osmo10xqv8rlpkflywm92k5wdmplzy7khtasl9c2c08psmvlu543k724sy94k74
+
+# Disable TRPC logs in development
+# NEXT_PUBLIC_TRPC_LOGS=off
diff --git a/packages/web/components/alert/__tests__/prettify.spec.ts b/packages/web/components/alert/__tests__/prettify.spec.ts
index 68a35e5f09..90e0bb343c 100644
--- a/packages/web/components/alert/__tests__/prettify.spec.ts
+++ b/packages/web/components/alert/__tests__/prettify.spec.ts
@@ -1,6 +1,11 @@
+import { Dec } from "@keplr-wallet/unit";
 import cases from "jest-in-case";
 
-import { isOverspendErrorMessage, isRejectedTxErrorMessage } from "../prettify";
+import {
+  getParametersFromOverspendErrorMessage,
+  isOverspendErrorMessage,
+  isRejectedTxErrorMessage,
+} from "../prettify";
 
 cases(
   "isOverspendErrorMessage",
@@ -45,6 +50,53 @@ cases(
   ]
 );
 
+cases(
+  "getParametersFromOverspendErrorMessage",
+  ({ message, result }) => {
+    expect(getParametersFromOverspendErrorMessage(message)).toEqual(result);
+  },
+  [
+    {
+      name: "should extract parameters from valid overspend error message",
+      message:
+        "Fetch error. Spend limit error: Overspend: 2000000 has been spent but limit is 1000000.",
+      result: {
+        wouldSpendTotal: new Dec("2000000", 6),
+        limit: new Dec("1000000", 6),
+      },
+    },
+    {
+      name: "should extract parameters from complex overspend error message",
+      message:
+        "Fetch error. execution blocked by authenticator (account = osmo1sh8lreekwcytxpqr6lxmw5cl7kdrfsdfat2ujlvz, authenticator id = 208, msg index = 0, msg type url = /osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn): Spend limit error: Overspend: 50065777 has been spent but limit is 1000000: execute wasm contract failed",
+      result: {
+        wouldSpendTotal: new Dec("50065777", 6),
+        limit: new Dec("1000000", 6),
+      },
+    },
+    {
+      name: "should handle empty message",
+      message: "",
+      result: undefined,
+    },
+    {
+      name: "should handle undefined message",
+      message: undefined,
+      result: undefined,
+    },
+    {
+      name: "should return undefined for non-overspend error message",
+      message: "execution succeeded",
+      result: undefined,
+    },
+    {
+      name: "should return undefined for invalid overspend error format",
+      message: "Spend limit error: Invalid format",
+      result: undefined,
+    },
+  ]
+);
+
 cases(
   "isRejectedTxErrorMessage",
   ({ message, result }) => {
diff --git a/packages/web/components/alert/prettify.ts b/packages/web/components/alert/prettify.ts
index 7b53c3ea30..7f4038cdfd 100644
--- a/packages/web/components/alert/prettify.ts
+++ b/packages/web/components/alert/prettify.ts
@@ -1,5 +1,5 @@
 import { AppCurrency } from "@keplr-wallet/types";
-import { CoinPretty, Int } from "@keplr-wallet/unit";
+import { CoinPretty, Dec, Int } from "@keplr-wallet/unit";
 import {
   isInsufficientFeeError,
   isSlippageErrorMessage,
@@ -27,6 +27,34 @@ const regexRejectedTx = /Request rejected/;
 const regexOverspendError =
   /Spend limit error: Overspend: (\d+) has been spent but limit is (\d+)/;
 
+export function getParametersFromOverspendErrorMessage(
+  message: string | undefined
+): { wouldSpendTotal: Dec; limit: Dec } | undefined {
+  if (!message) return;
+
+  const match = message.match(regexOverspendError);
+  if (!match) return;
+
+  const [, wouldSpendTotal, limit] = match;
+
+  if (!wouldSpendTotal || !limit) return;
+
+  try {
+    // Validate that extracted values are valid numbers
+    if (isNaN(Number(wouldSpendTotal)) || isNaN(Number(limit))) {
+      return;
+    }
+
+    return {
+      wouldSpendTotal: new Dec(wouldSpendTotal, 6),
+      limit: new Dec(limit, 6),
+    };
+  } catch (error) {
+    console.error("Failed to parse overspend error parameters:", error);
+    return;
+  }
+}
+
 export function isOverspendErrorMessage({
   message,
 }: {
diff --git a/packages/web/components/one-click-trading/one-click-remaining-time.tsx b/packages/web/components/one-click-trading/one-click-remaining-time.tsx
index c4ffe12bff..d2fc8146e7 100644
--- a/packages/web/components/one-click-trading/one-click-remaining-time.tsx
+++ b/packages/web/components/one-click-trading/one-click-remaining-time.tsx
@@ -8,7 +8,8 @@ import { humanizeTime } from "~/utils/date";
 
 export const OneClickTradingRemainingTime: FunctionComponent<{
   className?: string;
-}> = ({ className }) => {
+  useShortTimeUnits?: boolean;
+}> = ({ className, useShortTimeUnits }) => {
   const { oneClickTradingInfo, isOneClickTradingExpired } =
     useOneClickTradingSession();
   const { t } = useTranslation();
@@ -24,7 +25,8 @@ export const OneClickTradingRemainingTime: FunctionComponent<{
         humanizeTime(
           dayjs.unix(
             unixNanoSecondsToSeconds(oneClickTradingInfo.sessionPeriod.end)
-          )
+          ),
+          useShortTimeUnits
         )
       );
     };
@@ -39,7 +41,7 @@ export const OneClickTradingRemainingTime: FunctionComponent<{
     );
 
     return () => clearInterval(intervalId);
-  }, [oneClickTradingInfo]);
+  }, [oneClickTradingInfo, useShortTimeUnits]);
 
   if (isOneClickTradingExpired) {
     return (
diff --git a/packages/web/components/one-click-trading/one-click-trading-settings.tsx b/packages/web/components/one-click-trading/one-click-trading-settings.tsx
index 84940d2219..a29fc5d18f 100644
--- a/packages/web/components/one-click-trading/one-click-trading-settings.tsx
+++ b/packages/web/components/one-click-trading/one-click-trading-settings.tsx
@@ -1,4 +1,4 @@
-import { Dec, PricePretty } from "@keplr-wallet/unit";
+import { Dec } from "@keplr-wallet/unit";
 import { makeRemoveAuthenticatorMsg } from "@osmosis-labs/tx";
 import { OneClickTradingTransactionParams } from "@osmosis-labs/types";
 import { noop, runIfFn } from "@osmosis-labs/utils";
@@ -26,15 +26,16 @@ import { Button, buttonVariants, GoBackButton } from "~/components/ui/button";
 import { Switch } from "~/components/ui/switch";
 import { EventName } from "~/config";
 import {
+  OneClickTradingParamsChanges,
   useAmplitudeAnalytics,
   useDisclosure,
   useOneClickTradingSession,
   useTranslation,
 } from "~/hooks";
+import { formatSpendLimit } from "~/hooks/one-click-trading/use-one-click-trading-session-manager";
 import { useEstimateTxFees } from "~/hooks/use-estimate-tx-fees";
 import { ModalBase, ModalCloseButton } from "~/modals";
 import { useStore } from "~/stores";
-import { trimPlaceholderZeros } from "~/utils/number";
 import { api } from "~/utils/trpc";
 
 type Classes = "root";
@@ -45,14 +46,13 @@ enum SettingsScreens {
   SessionPeriod = "sessionPeriod",
 }
 
-interface OneClickTradingSettingsProps {
+type BaseOneClickTradingSettingsProps = {
   classes?: Partial<Record<Classes, string>>;
   onGoBack: () => void;
   transaction1CTParams: OneClickTradingTransactionParams | undefined;
   setTransaction1CTParams: Dispatch<
     SetStateAction<OneClickTradingTransactionParams | undefined>
   >;
-  onStartTrading: () => void;
   onEndSession?: () => void;
   onClose: () => void;
   isLoading?: boolean;
@@ -60,7 +60,37 @@ interface OneClickTradingSettingsProps {
   isEndingSession?: boolean;
   hideBackButton?: boolean;
   hasExistingSession?: boolean;
-}
+};
+
+type StandaloneProps = BaseOneClickTradingSettingsProps & {
+  /**
+   * Whether component is in standalone mode.
+   * When true or undefined, the component acts as a full settings page with start/edit functionality
+   */
+  standalone?: true;
+  /** Required callback when user clicks start/edit trading button */
+  onStartTrading: () => void;
+  /** In standalone mode the changes are tracked internally. Initial changes are not accepted */
+  externalChanges?: undefined;
+  /** Not needed in standalone mode */
+  setExternalChanges?: Dispatch<SetStateAction<OneClickTradingParamsChanges>>;
+};
+
+type NonStandaloneProps = BaseOneClickTradingSettingsProps & {
+  /**
+   * Whether component is in standalone mode.
+   * When false, the component acts as a settings panel within another component
+   */
+  standalone: false;
+  /** Start trading callback is not allowed in non-standalone mode */
+  onStartTrading?: never;
+  /** Initial changes to be applied to the settings */
+  externalChanges: OneClickTradingParamsChanges;
+  /** Callback to set initial changes */
+  setExternalChanges: (value: OneClickTradingParamsChanges) => void;
+};
+
+type OneClickTradingSettingsProps = StandaloneProps | NonStandaloneProps;
 
 /**
  * Compares the changes between two sets of OneClickTradingTransactionParams.
@@ -70,26 +100,28 @@ export function compare1CTTransactionParams({
   prevParams,
   nextParams,
 }: {
-  prevParams: OneClickTradingTransactionParams;
-  nextParams: OneClickTradingTransactionParams;
-}): Array<"spendLimit" | "resetPeriod" | "sessionPeriod"> {
-  let changes = new Set<"spendLimit" | "resetPeriod" | "sessionPeriod">();
+  prevParams?: OneClickTradingTransactionParams;
+  nextParams?: OneClickTradingTransactionParams;
+}): OneClickTradingParamsChanges {
+  let changes: OneClickTradingParamsChanges = [];
 
   if (prevParams?.spendLimit.toString() !== nextParams?.spendLimit.toString()) {
-    changes.add("spendLimit");
+    changes.push("spendLimit");
   }
 
   if (prevParams?.sessionPeriod.end !== nextParams?.sessionPeriod.end) {
-    changes.add("sessionPeriod");
+    changes.push("sessionPeriod");
   }
 
-  return Array.from(changes);
-}
+  if (prevParams?.isOneClickEnabled !== nextParams?.isOneClickEnabled) {
+    changes.push("isEnabled");
+  }
+
+  if (prevParams?.networkFeeLimit !== nextParams?.networkFeeLimit) {
+    changes.push("networkFeeLimit");
+  }
 
-function formatSpendLimit(spendLimit: PricePretty | undefined) {
-  return `${spendLimit?.symbol}${trimPlaceholderZeros(
-    spendLimit?.toDec().toString(2) ?? ""
-  )}`;
+  return changes;
 }
 
 export const OneClickTradingSettings = ({
@@ -105,11 +137,16 @@ export const OneClickTradingSettings = ({
   hasExistingSession,
   onEndSession,
   onClose,
+  standalone = true,
+  externalChanges = [],
+  setExternalChanges,
 }: OneClickTradingSettingsProps) => {
   const { t } = useTranslation();
-  const [changes, setChanges] = useState<
-    Array<"spendLimit" | "resetPeriod" | "sessionPeriod">
-  >([]);
+
+  const [changes, setChanges] = useState<OneClickTradingParamsChanges>([]);
+
+  const [initialChanges, setInitialChanges] =
+    useState<OneClickTradingParamsChanges>([]);
   const [initialTransaction1CTParams, setInitialTransaction1CTParams] =
     useState<OneClickTradingTransactionParams>();
 
@@ -147,7 +184,9 @@ export const OneClickTradingSettings = ({
   useEffect(() => {
     if (!transaction1CTParams || initialTransaction1CTParams) return;
     setInitialTransaction1CTParams(transaction1CTParams);
-  }, [initialTransaction1CTParams, transaction1CTParams]);
+    setChanges(externalChanges);
+    setInitialChanges(externalChanges);
+  }, [externalChanges, initialTransaction1CTParams, transaction1CTParams]);
 
   const {
     isOpen: isDiscardDialogOpen,
@@ -170,11 +209,30 @@ export const OneClickTradingSettings = ({
   ) => {
     setTransaction1CTParamsProp((prevParams) => {
       const nextParams = runIfFn(newParamsOrFn, prevParams);
+
+      if (!initialTransaction1CTParams || !nextParams) {
+        console.error("Transaction params are undefined");
+        return prevParams;
+      }
+
       setChanges(
-        compare1CTTransactionParams({
-          prevParams: initialTransaction1CTParams!,
-          nextParams: nextParams!,
-        })
+        Array.from(
+          new Set([
+            /**
+             * Spreading the changes and then merging with the new changes
+             * ensures that the changes from the previous modal open are not overwritten
+             *
+             * If I have already made a change, and returned to the review order modal,
+             * then I start editing again I expect my previous changes to be in the state
+             * and the previously changed parameters displayed the same way as current change
+             */
+            ...changes,
+            ...compare1CTTransactionParams({
+              prevParams: initialTransaction1CTParams!,
+              nextParams: nextParams!,
+            }),
+          ])
+        )
       );
 
       return nextParams;
@@ -193,6 +251,8 @@ export const OneClickTradingSettings = ({
         )} / ${formatSpendLimit(initialTransaction1CTParams.spendLimit)}`
       : undefined;
 
+  const changesWithoutIsEnabled = changes.filter((c) => c !== "isEnabled");
+
   return (
     <>
       <DiscardChangesConfirmationModal
@@ -211,8 +271,13 @@ export const OneClickTradingSettings = ({
       {onClose && (
         <ModalCloseButton
           onClick={() => {
-            if (changes.length > 0) {
-              return openCloseConfirmDialog();
+            if (standalone) {
+              if (changesWithoutIsEnabled.length > 0) {
+                return openCloseConfirmDialog();
+              }
+            } else {
+              setTransaction1CTParams(initialTransaction1CTParams);
+              setExternalChanges?.(initialChanges);
             }
 
             onClose();
@@ -228,7 +293,7 @@ export const OneClickTradingSettings = ({
                   <GoBackButton
                     className="absolute left-7 top-7"
                     onClick={() => {
-                      if (changes.length > 0) {
+                      if (standalone && changesWithoutIsEnabled.length > 0) {
                         return onOpenDiscardDialog();
                       }
                       onGoBack();
@@ -268,46 +333,51 @@ export const OneClickTradingSettings = ({
                 </div>
 
                 <div className="flex flex-col gap-0">
-                  <SettingRow
-                    title={t("oneClickTrading.settings.enableTitle")}
-                    onClick={() => {
-                      if (hasExistingSession) onEndSession?.();
-                      setTransaction1CTParams((params) => {
-                        if (!params) throw new Error("1CT Params is undefined");
-
-                        const nextValue = !params.isOneClickEnabled;
-                        if (nextValue) {
-                          logEvent([
-                            EventName.OneClickTrading.enableOneClickTrading,
-                          ]);
-                        }
-
-                        return {
-                          ...params,
-                          isOneClickEnabled: nextValue,
-                        };
-                      });
-                    }}
-                    content={
-                      <div className="flex items-center gap-3">
-                        {hasExistingSession && isEndingSession && (
-                          <p className="text-wosmongton-200">
-                            {t("oneClickTrading.settings.endingSession")}
-                          </p>
-                        )}
-                        {(isLoading || isEndingSession) && (
-                          <Spinner className="text-wosmongton-200" />
-                        )}{" "}
-                        <Switch
-                          disabled={isSendingTx || isEndingSession || isLoading}
-                          checked={
-                            transaction1CTParams?.isOneClickEnabled ?? false
+                  {standalone && (
+                    <SettingRow
+                      title={t("oneClickTrading.settings.enableTitle")}
+                      onClick={() => {
+                        if (hasExistingSession) onEndSession?.();
+                        setTransaction1CTParams((params) => {
+                          if (!params)
+                            throw new Error("1CT Params is undefined");
+
+                          const nextValue = !params.isOneClickEnabled;
+                          if (nextValue) {
+                            logEvent([
+                              EventName.OneClickTrading.enableOneClickTrading,
+                            ]);
                           }
-                        />
-                      </div>
-                    }
-                    isDisabled={isSendingTx || isEndingSession}
-                  />
+
+                          return {
+                            ...params,
+                            isOneClickEnabled: nextValue,
+                          };
+                        });
+                      }}
+                      content={
+                        <div className="flex items-center gap-3">
+                          {hasExistingSession && isEndingSession && (
+                            <p className="text-wosmongton-200">
+                              {t("oneClickTrading.settings.endingSession")}
+                            </p>
+                          )}
+                          {(isLoading || isEndingSession) && (
+                            <Spinner className="text-wosmongton-200" />
+                          )}{" "}
+                          <Switch
+                            disabled={
+                              isSendingTx || isEndingSession || isLoading
+                            }
+                            checked={
+                              transaction1CTParams?.isOneClickEnabled ?? false
+                            }
+                          />
+                        </div>
+                      }
+                      isDisabled={isSendingTx || isEndingSession}
+                    />
+                  )}
                   <SettingRow
                     title={t("oneClickTrading.settings.spendLimitTitle")}
                     onClick={() => setCurrentScreen(SettingsScreens.SpendLimit)}
@@ -378,8 +448,9 @@ export const OneClickTradingSettings = ({
                   />
                 </div>
 
-                {hasExistingSession &&
-                  changes.length > 0 &&
+                {standalone &&
+                  hasExistingSession &&
+                  changes.filter((c) => c !== "isEnabled").length > 0 &&
                   (!isSendingTx || !isEndingSession) && (
                     <div className="px-8">
                       <Button
@@ -392,7 +463,8 @@ export const OneClickTradingSettings = ({
                     </div>
                   )}
 
-                {!hasExistingSession &&
+                {standalone &&
+                  !hasExistingSession &&
                   transaction1CTParams?.isOneClickEnabled && (
                     <div className="px-8">
                       <Button
@@ -405,7 +477,8 @@ export const OneClickTradingSettings = ({
                     </div>
                   )}
 
-                {isOneClickTradingEnabled &&
+                {standalone &&
+                  isOneClickTradingEnabled &&
                   (isLoadingEstimateRemoveTx || !!estimateRemoveTxData) && (
                     <div className="flex flex-col gap-2">
                       <SkeletonLoader
diff --git a/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx b/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx
index b4c7e7bd9c..3cbe9362a8 100644
--- a/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx
+++ b/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx
@@ -15,7 +15,7 @@ export const ProfileOneClickTradingSettings = ({
   onClose: () => void;
 }) => {
   const { accountStore, chainStore } = useStore();
-  const { oneClickTradingInfo, isOneClickTradingEnabled } =
+  const { oneClickTradingInfo, isOneClickTradingEnabled, isLoadingInfo } =
     useOneClickTradingSession();
   const account = accountStore.getWallet(chainStore.osmosis.chainId);
 
@@ -49,7 +49,6 @@ export const ProfileOneClickTradingSettings = ({
   const {
     transaction1CTParams,
     setTransaction1CTParams,
-    isLoading: isLoading1CTParams,
     spendLimitTokenDecimals,
     reset: reset1CTParams,
   } = useOneClickTradingParams({
@@ -62,7 +61,7 @@ export const ProfileOneClickTradingSettings = ({
       transaction1CTParams={transaction1CTParams}
       setTransaction1CTParams={setTransaction1CTParams}
       isLoading={
-        isLoading1CTParams ||
+        isLoadingInfo ||
         (shouldFetchSessionAuthenticator
           ? isLoadingSessionAuthenticator
           : false)
diff --git a/packages/web/components/one-click-trading/screens/session-period-screen.tsx b/packages/web/components/one-click-trading/screens/session-period-screen.tsx
index 48d9ceeea4..efd59a251c 100644
--- a/packages/web/components/one-click-trading/screens/session-period-screen.tsx
+++ b/packages/web/components/one-click-trading/screens/session-period-screen.tsx
@@ -14,12 +14,12 @@ export function getSessionPeriodTranslationKey(
   input: OneClickTradingHumanizedSessionPeriod
 ) {
   const timeMappings = {
-    "5min": "oneClickTrading.settings.sessionPeriodScreen.periods.5min",
-    "10min": "oneClickTrading.settings.sessionPeriodScreen.periods.10min",
-    "30min": "oneClickTrading.settings.sessionPeriodScreen.periods.30min",
-    "1hour": "oneClickTrading.settings.sessionPeriodScreen.periods.1hour",
-    "3hours": "oneClickTrading.settings.sessionPeriodScreen.periods.3hours",
-    "12hours": "oneClickTrading.settings.sessionPeriodScreen.periods.12hours",
+    "5min": "oneClickTrading.sessionPeriods.5min",
+    "10min": "oneClickTrading.sessionPeriods.10min",
+    "30min": "oneClickTrading.sessionPeriods.30min",
+    "1hour": "oneClickTrading.sessionPeriods.1hour",
+    "3hours": "oneClickTrading.sessionPeriods.3hours",
+    "12hours": "oneClickTrading.sessionPeriods.12hours",
   };
   const mapped = timeMappings[input];
   if (!mapped) throw new Error(`No mapping for ${input}`);
diff --git a/packages/web/components/swap-tool/index.tsx b/packages/web/components/swap-tool/index.tsx
index 378148b098..b36c07ba7d 100644
--- a/packages/web/components/swap-tool/index.tsx
+++ b/packages/web/components/swap-tool/index.tsx
@@ -8,7 +8,6 @@ import { observer } from "mobx-react-lite";
 import { parseAsBoolean, useQueryState } from "nuqs";
 import {
   FunctionComponent,
-  ReactNode,
   useCallback,
   useEffect,
   useMemo,
@@ -17,6 +16,7 @@ import {
 } from "react";
 import { useMeasure, useMount } from "react-use";
 
+import { isOverspendErrorMessage } from "~/components/alert/prettify";
 import { Icon } from "~/components/assets";
 import {
   AssetFieldset,
@@ -48,7 +48,6 @@ import {
   useDynamicSlippageConfig,
   useSwap,
 } from "~/hooks/use-swap";
-import { useGlobalIs1CTIntroModalScreen } from "~/modals";
 import { AddFundsModal } from "~/modals/add-funds";
 import { ReviewOrder } from "~/modals/review-order";
 import { TokenSelectModalLimit } from "~/modals/token-select-modal-limit";
@@ -92,7 +91,6 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
     const { isLoading: isWalletLoading, onOpenWalletSelect } =
       useWalletSelect();
     const featureFlags = useFeatureFlags();
-    const [, setIs1CTIntroModalScreen] = useGlobalIs1CTIntroModalScreen();
     const { isOneClickTradingEnabled } = useOneClickTradingSession();
     const [isSendingTx, setIsSendingTx] = useState(false);
     const [quoteType, setQuoteType] = useState<QuoteDirection>("out-given-in");
@@ -219,7 +217,7 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
     const [showSwapReviewModal, setShowSwapReviewModal] = useState(false);
 
     // user action
-    const sendSwapTx = () => {
+    const sendSwapTx = useCallback(() => {
       if (!swapState.inAmountInput.amount) return;
 
       let valueUsd = Number(
@@ -283,7 +281,14 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
           onRequestModalClose?.();
           setShowSwapReviewModal(false);
         });
-    };
+    }, [
+      swapState,
+      page,
+      logEvent,
+      resetSlippage,
+      onSwapSuccess,
+      onRequestModalClose,
+    ]);
 
     const isSwapToolLoading =
       isWalletLoading ||
@@ -295,8 +300,6 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
       buttonText = t(...tError(swapState.error));
     } else if (showPriceImpactWarning) {
       buttonText = t("swap.buttonError");
-    } else if (swapState.hasOverSpendLimitError) {
-      buttonText = t("swap.continueAnyway");
     } else if (
       !!swapState.networkFeeError &&
       swapState.isSlippageOverBalance &&
@@ -307,24 +310,6 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
       buttonText = t("swap.button");
     }
 
-    let warningText: string | ReactNode;
-    if (swapState.hasOverSpendLimitError) {
-      warningText = (
-        <span>
-          {t("swap.warning.exceedsSpendLimit")}{" "}
-          <Button
-            variant="link"
-            className="!inline !h-auto !px-0 !py-0 text-wosmongton-300"
-            onClick={() => {
-              setIs1CTIntroModalScreen("settings-no-back-button");
-            }}
-          >
-            {t("swap.warning.increaseSpendLimit")}
-          </Button>
-        </span>
-      );
-    }
-
     const isLoadingMaxButton =
       featureFlags.swapToolSimulateFee &&
       !isNil(account?.address) &&
@@ -341,7 +326,16 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
           !Boolean(swapState.quote) ||
           isSwapToolLoading ||
           Boolean(swapState.error) ||
-          Boolean(swapState.networkFeeError)));
+          Boolean(
+            swapState.networkFeeError &&
+              /**
+               * We can increase spend limit from the review order modal
+               * so the decision to disable the button should be made there
+               */
+              !isOverspendErrorMessage({
+                message: swapState.networkFeeError.message,
+              })
+          )));
 
     const showTokenSelectRecommendedTokens = isNil(forceSwapInPoolId);
 
@@ -626,16 +620,6 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
               </AssetFieldset>
             </div>
           </div>
-          {!isNil(warningText) && (
-            <div
-              className={classNames(
-                "body2 flex animate-[fadeIn_0.3s_ease-in-out_0s] items-center justify-center rounded-xl border border-rust-600 px-3 py-2 text-center text-rust-500",
-                swapState.isLoadingNetworkFee && "animate-pulse"
-              )}
-            >
-              {warningText}
-            </div>
-          )}
           {swapButton ?? (
             <div className="flex w-full pb-3">
               <Button
@@ -764,6 +748,7 @@ export const SwapTool: FunctionComponent<SwapToolProps> = observer(
           gasAmount={swapState.networkFee?.gasUsdValueToPay}
           isGasLoading={swapState.isLoadingNetworkFee}
           gasError={swapState.networkFeeError}
+          overspendErrorParams={swapState.overspendErrorParams}
           quoteType={swapState.quoteType}
         />
         <AddFundsModal
diff --git a/packages/web/hooks/mutations/one-click-trading/use-remove-one-click-trading-session.ts b/packages/web/hooks/mutations/one-click-trading/use-remove-one-click-trading-session.ts
index 990fa7eefd..785ff814ae 100644
--- a/packages/web/hooks/mutations/one-click-trading/use-remove-one-click-trading-session.ts
+++ b/packages/web/hooks/mutations/one-click-trading/use-remove-one-click-trading-session.ts
@@ -54,6 +54,7 @@ export const useRemoveOneClickTradingSession = ({
 
       if (oneClickTradingInfo?.authenticatorId === authenticatorId) {
         accountStore.setOneClickTradingInfo(undefined);
+        accountStore.setShouldUseOneClickTrading({ nextValue: false });
         displayToast(
           {
             titleTranslationKey:
diff --git a/packages/web/hooks/one-click-trading/__tests__/use-one-click-trading-params.spec.ts b/packages/web/hooks/one-click-trading/__tests__/use-one-click-trading-params.spec.ts
new file mode 100644
index 0000000000..f3c9687f08
--- /dev/null
+++ b/packages/web/hooks/one-click-trading/__tests__/use-one-click-trading-params.spec.ts
@@ -0,0 +1,261 @@
+import { Dec, PricePretty } from "@keplr-wallet/unit";
+import { DEFAULT_VS_CURRENCY } from "@osmosis-labs/server";
+import { OneClickTradingInfo } from "@osmosis-labs/stores";
+import {
+  OneClickTradingHumanizedSessionPeriod,
+  OneClickTradingTransactionParams,
+} from "@osmosis-labs/types";
+import {
+  OneClickTradingMaxGasLimit,
+  unixSecondsToNanoSeconds,
+} from "@osmosis-labs/utils";
+import { act, renderHook } from "@testing-library/react";
+import dayjs from "dayjs";
+
+import {
+  getParametersFromOneClickTradingInfo,
+  useOneClickTradingParams,
+} from "~/hooks/one-click-trading/use-one-click-trading-params";
+
+// Default values from TRPC router
+const DEFAULT_SPEND_LIMIT = 5_000;
+const DEFAULT_SESSION_PERIOD: OneClickTradingHumanizedSessionPeriod = "1hour";
+const DEFAULT_USDC_DECIMALS = 6;
+
+const defaultOneClickTradingInfo: OneClickTradingInfo = {
+  networkFeeLimit: "100000",
+  humanizedSessionPeriod:
+    "1hour" satisfies OneClickTradingHumanizedSessionPeriod,
+  spendLimit: {
+    amount: "1000000",
+    decimals: DEFAULT_USDC_DECIMALS,
+  },
+  authenticatorId: "test-id",
+  publicKey: "test-key",
+  sessionKey: "test-session",
+  userOsmoAddress: "test-address",
+  sessionStartedAtUnix: Date.now(),
+  allowedMessages: [],
+  hasSeenExpiryToast: false,
+  sessionPeriod: {
+    end: unixSecondsToNanoSeconds(dayjs().add(1, "hour").unix()),
+  },
+};
+
+const defaultApiResponse: Pick<
+  OneClickTradingTransactionParams,
+  "networkFeeLimit" | "spendLimit" | "sessionPeriod"
+> & {
+  spendLimitTokenDecimals: number;
+} = {
+  spendLimit: new PricePretty(
+    DEFAULT_VS_CURRENCY,
+    new Dec(DEFAULT_SPEND_LIMIT)
+  ),
+  spendLimitTokenDecimals: DEFAULT_USDC_DECIMALS,
+  networkFeeLimit: OneClickTradingMaxGasLimit,
+  sessionPeriod: {
+    end: DEFAULT_SESSION_PERIOD,
+  },
+};
+
+// msw-trpc did not deserialize the spendLimit prop, so we mock it here
+jest.mock("~/utils/trpc", () => ({
+  api: {
+    local: {
+      oneClickTrading: {
+        getParameters: {
+          useQuery: () => ({
+            data: defaultApiResponse,
+            isLoading: false,
+            isError: false,
+          }),
+        },
+      },
+    },
+  },
+}));
+
+describe("useOneClickTradingParams", () => {
+  describe("initialization", () => {
+    it("should initialize with default TRPC params when no oneClickTradingInfo provided", async () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      expect(
+        result.current.transaction1CTParams
+      ).toEqual<OneClickTradingTransactionParams>({
+        ...defaultApiResponse,
+        isOneClickEnabled: false,
+      });
+      expect(
+        result.current.initialTransaction1CTParams
+      ).toEqual<OneClickTradingTransactionParams>({
+        ...defaultApiResponse,
+        isOneClickEnabled: false,
+      });
+      expect(result.current.changes).toHaveLength(0);
+      expect(result.current.spendLimitTokenDecimals).toBe(
+        DEFAULT_USDC_DECIMALS
+      );
+    });
+
+    it("should initialize with provided oneClickTradingInfo", () => {
+      const { result } = renderHook(() =>
+        useOneClickTradingParams({
+          oneClickTradingInfo: defaultOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+
+      expect(
+        result.current.transaction1CTParams
+      ).toEqual<OneClickTradingTransactionParams>(
+        getParametersFromOneClickTradingInfo({
+          oneClickTradingInfo: defaultOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+
+      expect(
+        result.current.initialTransaction1CTParams
+      ).toEqual<OneClickTradingTransactionParams>(
+        getParametersFromOneClickTradingInfo({
+          oneClickTradingInfo: defaultOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+    });
+  });
+
+  describe("parameter changes", () => {
+    it("should track spend limit changes", () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          spendLimit: new PricePretty(DEFAULT_VS_CURRENCY, new Dec(1000)),
+        });
+      });
+
+      expect(result.current.changes).toContain("spendLimit");
+    });
+
+    it("should track session period changes", () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          sessionPeriod: { end: "12hours" },
+        });
+      });
+
+      expect(result.current.changes).toContain("sessionPeriod");
+    });
+
+    it("should track isOneClickEnabled changes", () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          isOneClickEnabled: true,
+        });
+      });
+
+      expect(result.current.changes).toContain("isEnabled");
+    });
+
+    it("should not duplicate change types in changes array", () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          spendLimit: new PricePretty(DEFAULT_VS_CURRENCY, new Dec(1000)),
+        });
+      });
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          spendLimit: new PricePretty(DEFAULT_VS_CURRENCY, new Dec(2000)),
+        });
+      });
+
+      expect(result.current.changes).toEqual(["spendLimit"]);
+      expect(result.current.changes.length).toBe(1);
+    });
+
+    it("should reset to default API response values", () => {
+      const { result } = renderHook(() => useOneClickTradingParams());
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          networkFeeLimit: "200000",
+          sessionPeriod: { end: "12hours" },
+        });
+      });
+
+      expect(result.current.changes).toHaveLength(2);
+
+      act(() => {
+        result.current.reset();
+      });
+
+      expect(result.current.changes).toHaveLength(0);
+      expect(
+        result.current.transaction1CTParams
+      ).toEqual<OneClickTradingTransactionParams>({
+        ...defaultApiResponse,
+        isOneClickEnabled: false,
+      });
+    });
+
+    it("should reset to provided oneClickTradingInfo values", () => {
+      const modifiedOneClickTradingInfo = {
+        ...defaultOneClickTradingInfo,
+        networkFeeLimit: "200000",
+        humanizedSessionPeriod:
+          "12hours" as OneClickTradingHumanizedSessionPeriod,
+      };
+
+      const { result } = renderHook(() =>
+        useOneClickTradingParams({
+          oneClickTradingInfo: modifiedOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+
+      act(() => {
+        result.current.setTransaction1CTParams({
+          ...result.current.transaction1CTParams!,
+          networkFeeLimit: "300000",
+          sessionPeriod: { end: "3hours" },
+        });
+      });
+
+      expect(result.current.changes).toHaveLength(2);
+
+      act(() => {
+        result.current.reset();
+      });
+
+      expect(result.current.changes).toHaveLength(0);
+      expect(result.current.transaction1CTParams).toEqual(
+        getParametersFromOneClickTradingInfo({
+          oneClickTradingInfo: modifiedOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+      expect(result.current.initialTransaction1CTParams).toEqual(
+        getParametersFromOneClickTradingInfo({
+          oneClickTradingInfo: modifiedOneClickTradingInfo,
+          defaultIsOneClickEnabled: true,
+        })
+      );
+    });
+  });
+});
diff --git a/packages/web/hooks/one-click-trading/index.ts b/packages/web/hooks/one-click-trading/index.ts
index 0220091b16..cfcdaf671a 100644
--- a/packages/web/hooks/one-click-trading/index.ts
+++ b/packages/web/hooks/one-click-trading/index.ts
@@ -1,2 +1,3 @@
 export * from "./use-one-click-trading-params";
 export * from "./use-one-click-trading-session";
+export * from "./use-one-click-trading-session-manager";
diff --git a/packages/web/hooks/one-click-trading/use-one-click-trading-params.ts b/packages/web/hooks/one-click-trading/use-one-click-trading-params.ts
index 58938b7524..1db6f10bec 100644
--- a/packages/web/hooks/one-click-trading/use-one-click-trading-params.ts
+++ b/packages/web/hooks/one-click-trading/use-one-click-trading-params.ts
@@ -2,9 +2,16 @@ import { Dec, DecUtils, PricePretty } from "@keplr-wallet/unit";
 import { DEFAULT_VS_CURRENCY } from "@osmosis-labs/server";
 import { OneClickTradingInfo } from "@osmosis-labs/stores";
 import { OneClickTradingTransactionParams } from "@osmosis-labs/types";
-import { OneClickTradingMaxGasLimit } from "@osmosis-labs/utils";
-import { useCallback, useEffect, useState } from "react";
+import { OneClickTradingMaxGasLimit, runIfFn } from "@osmosis-labs/utils";
+import {
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from "react";
 
+import { compare1CTTransactionParams } from "~/components/one-click-trading/one-click-trading-settings";
 import { api } from "~/utils/trpc";
 
 export function getParametersFromOneClickTradingInfo({
@@ -39,90 +46,115 @@ export function getParametersFromOneClickTradingInfo({
  * allowing for easy access and modification within components. If `oneClickTradingInfo` is provided, it uses
  * this to set initial parameters. Otherwise, it fetches the default parameters from the application's API.
  *
- * The hook also provides a mechanism to reset the parameters to their initial values, which
- * can be either the custom parameters passed at initialization or the fetched default parameters.
+ * The hook provides a mechanism to reset the parameters to their initial values and tracks changes
+ * to the parameters when `trackChanges` is true, comparing them against the initial values.
  *
  * This hook is primarily intended for the one click trading settings modal.
  */
-export const useOneClickTradingParams = ({
+export function useOneClickTradingParams({
   oneClickTradingInfo,
   defaultIsOneClickEnabled = false,
 }: {
   oneClickTradingInfo?: OneClickTradingInfo;
   defaultIsOneClickEnabled?: boolean;
-} = {}) => {
-  const {
-    data: defaultTransaction1CTParams,
-    isLoading,
-    isError,
-  } = api.local.oneClickTrading.getParameters.useQuery();
+} = {}) {
+  const { data: defaultParams, isLoading } =
+    api.local.oneClickTrading.getParameters.useQuery();
 
-  const [transaction1CTParams, setTransaction1CTParams] = useState<
+  const [draftParams, setDraftParams] = useState<
     OneClickTradingTransactionParams | undefined
-  >(
-    oneClickTradingInfo
-      ? getParametersFromOneClickTradingInfo({
-          oneClickTradingInfo,
-          defaultIsOneClickEnabled,
-        })
-      : undefined
+  >();
+  const [currentParams, setCurrentParams] = useState<
+    OneClickTradingTransactionParams | undefined
+  >();
+
+  const [changes, setChanges] = useState<OneClickTradingParamsChanges>([]);
+
+  const sessionOrDefaultParams = useMemo(
+    () =>
+      oneClickTradingInfo
+        ? getParametersFromOneClickTradingInfo({
+            oneClickTradingInfo,
+            defaultIsOneClickEnabled,
+          })
+        : defaultParams,
+    [oneClickTradingInfo, defaultIsOneClickEnabled, defaultParams]
   );
-  const [initialTransaction1CTParams, setInitialTransaction1CTParams] =
-    useState<OneClickTradingTransactionParams | undefined>();
+
+  const sessionOrDefaultWithEnabled = useMemo(
+    () =>
+      sessionOrDefaultParams && {
+        ...sessionOrDefaultParams,
+        isOneClickEnabled: defaultIsOneClickEnabled,
+      },
+    [sessionOrDefaultParams, defaultIsOneClickEnabled]
+  );
+
+  const reset = useCallback(() => {
+    setCurrentParams(sessionOrDefaultWithEnabled);
+    setDraftParams(sessionOrDefaultWithEnabled);
+    setChanges([]);
+  }, [sessionOrDefaultWithEnabled]);
 
   useEffect(() => {
-    const paramsToSet = oneClickTradingInfo
-      ? getParametersFromOneClickTradingInfo({
-          oneClickTradingInfo,
-          defaultIsOneClickEnabled,
-        })
-      : defaultTransaction1CTParams;
+    if (!sessionOrDefaultWithEnabled) return;
+
+    if (!currentParams || !draftParams) {
+      reset();
+      return;
+    }
 
-    if (!paramsToSet || transaction1CTParams) return;
+    const hasChanges = changes.length > 0;
+    const wouldChange =
+      compare1CTTransactionParams({
+        prevParams: draftParams,
+        nextParams: sessionOrDefaultWithEnabled,
+      }).length > 0;
 
-    const nextTransaction1CTParams = {
-      isOneClickEnabled: defaultIsOneClickEnabled,
-      ...paramsToSet,
-    };
-    setTransaction1CTParams(nextTransaction1CTParams);
-    setInitialTransaction1CTParams(nextTransaction1CTParams);
+    if (!hasChanges && wouldChange) {
+      reset();
+    }
   }, [
-    defaultIsOneClickEnabled,
-    defaultTransaction1CTParams,
-    oneClickTradingInfo,
-    transaction1CTParams,
+    sessionOrDefaultParams,
+    draftParams,
+    sessionOrDefaultWithEnabled,
+    changes.length,
+    reset,
+    currentParams,
   ]);
 
-  const reset = useCallback(() => {
-    const paramsToSet = oneClickTradingInfo
-      ? getParametersFromOneClickTradingInfo({
-          oneClickTradingInfo,
-          defaultIsOneClickEnabled,
+  const setTransaction1CTParamsWithChanges = useCallback(
+    (
+      newDraftOrFn: SetStateAction<OneClickTradingTransactionParams | undefined>
+    ) => {
+      if (!currentParams) reset();
+
+      const nextDraftParams = runIfFn(newDraftOrFn, draftParams);
+
+      setDraftParams(nextDraftParams);
+
+      setChanges(() =>
+        compare1CTTransactionParams({
+          prevParams: currentParams,
+          nextParams: nextDraftParams,
         })
-      : defaultTransaction1CTParams;
-    if (!paramsToSet && !initialTransaction1CTParams) return;
-
-    const nextTransaction1CTParams = paramsToSet
-      ? {
-          isOneClickEnabled: defaultIsOneClickEnabled,
-          ...paramsToSet,
-        }
-      : initialTransaction1CTParams;
-    setTransaction1CTParams(nextTransaction1CTParams);
-  }, [
-    defaultIsOneClickEnabled,
-    defaultTransaction1CTParams,
-    initialTransaction1CTParams,
-    oneClickTradingInfo,
-  ]);
+      );
+    },
+    [currentParams, reset, draftParams]
+  );
 
   return {
-    transaction1CTParams,
-    setTransaction1CTParams,
-    spendLimitTokenDecimals:
-      defaultTransaction1CTParams?.spendLimitTokenDecimals,
+    changes,
+    initialTransaction1CTParams: currentParams,
+    transaction1CTParams: draftParams,
+    spendLimitTokenDecimals: defaultParams?.spendLimitTokenDecimals,
     isLoading,
-    isError,
     reset,
+    setChanges,
+    setTransaction1CTParams: setTransaction1CTParamsWithChanges,
   };
-};
+}
+
+export type OneClickTradingParamsChanges = Array<
+  "spendLimit" | "sessionPeriod" | "isEnabled" | "networkFeeLimit"
+>;
diff --git a/packages/web/hooks/one-click-trading/use-one-click-trading-session-manager.ts b/packages/web/hooks/one-click-trading/use-one-click-trading-session-manager.ts
new file mode 100644
index 0000000000..c6b0db29bf
--- /dev/null
+++ b/packages/web/hooks/one-click-trading/use-one-click-trading-session-manager.ts
@@ -0,0 +1,317 @@
+import { Dec, PricePretty } from "@keplr-wallet/unit";
+import { OneClickTradingInfo } from "@osmosis-labs/stores";
+import { OneClickTradingTransactionParams } from "@osmosis-labs/types";
+import { useCallback, useEffect, useMemo, useRef } from "react";
+
+import { displayErrorRemovingSessionToast } from "~/components/alert/one-click-trading-toasts";
+import { isRejectedTxErrorMessage } from "~/components/alert/prettify";
+import { EventName } from "~/config/analytics-events";
+import { useCreateOneClickTradingSession } from "~/hooks/mutations/one-click-trading";
+import { useRemoveOneClickTradingSession } from "~/hooks/mutations/one-click-trading/use-remove-one-click-trading-session";
+import { useOneClickTradingParams } from "~/hooks/one-click-trading/use-one-click-trading-params";
+import { useOneClickTradingSession } from "~/hooks/one-click-trading/use-one-click-trading-session";
+import { useAmplitudeAnalytics } from "~/hooks/use-amplitude-analytics";
+import { useStore } from "~/stores";
+import { trimPlaceholderZeros } from "~/utils/number";
+import { api } from "~/utils/trpc";
+
+export function useOneClickTradingSessionManager({
+  onCommit,
+}: {
+  onCommit: () => void;
+}) {
+  const { logEvent } = useAmplitudeAnalytics();
+
+  const { accountStore, chainStore } = useStore();
+
+  const {
+    isOneClickTradingEnabled: isEnabled,
+    isOneClickTradingExpired: isExpired,
+    oneClickTradingInfo: info,
+    isLoadingInfo,
+  } = useOneClickTradingSession();
+
+  const {
+    initialTransaction1CTParams: initialTransactionParams,
+    transaction1CTParams: transactionParams,
+    setTransaction1CTParams: setTransactionParams,
+    spendLimitTokenDecimals,
+    reset: resetParams,
+    changes,
+    setChanges,
+  } = useOneClickTradingParams({
+    oneClickTradingInfo: info,
+    defaultIsOneClickEnabled: isEnabled ?? false,
+  });
+
+  const shouldSend1CTTx = useMemo(() => {
+    // Turn on or off: The session status have changed either turned on or off explicitly
+    if (
+      transactionParams?.isOneClickEnabled !==
+      initialTransactionParams?.isOneClickEnabled
+    ) {
+      return true;
+    }
+
+    // Modify: The session was already on, wasn't turned off and the params have changed
+    if (
+      transactionParams?.isOneClickEnabled &&
+      initialTransactionParams?.isOneClickEnabled &&
+      changes.length > 0
+    ) {
+      return true;
+    }
+
+    return false;
+  }, [transactionParams, initialTransactionParams, changes]);
+
+  const {
+    wouldExceedSpendLimit,
+    remainingSpendLimit,
+    sessionAuthenticator,
+    isLoading: isLoadingRemainingSpendLimit,
+  } = useOneClickRemainingSpendLimit({
+    enabled: isEnabled,
+    transactionParams,
+    oneClickTradingInfo: info,
+  });
+
+  const isLoading = isLoadingInfo || isLoadingRemainingSpendLimit;
+
+  const createSession = useCreateOneClickTradingSession();
+  const removeSession = useRemoveOneClickTradingSession();
+
+  const onCommitRef = useRef(onCommit);
+  const isEnabledRef = useRef(isEnabled);
+  useEffect(() => {
+    onCommitRef.current = onCommit;
+    isEnabledRef.current = isEnabled;
+  }, [onCommit, isEnabled]);
+
+  const startSession = useCallback(() => {
+    if (!transactionParams) return;
+
+    const rollbackCreateSession = () => {
+      setTransactionParams({
+        ...(initialTransactionParams ?? transactionParams),
+        isOneClickEnabled: false,
+      });
+    };
+
+    createSession.mutate(
+      {
+        spendLimitTokenDecimals,
+        transaction1CTParams: transactionParams,
+        walletRepo: accountStore.getWalletRepo(chainStore.osmosis.chainId),
+        /**
+         * If the user has an existing session, remove it and add the new one.
+         */
+        additionalAuthenticatorsToRemove: sessionAuthenticator
+          ? [BigInt(sessionAuthenticator.id)]
+          : undefined,
+      },
+      {
+        onSuccess: async () => {
+          // Wait for isEnabled to be updated before committing
+          await new Promise<void>((resolve, reject) => {
+            let retries = 0;
+            const maxRetries = 10; // 1 second
+            const checkIsEnabled = () => {
+              if (isEnabledRef.current) {
+                resolve();
+              } else if (retries >= maxRetries) {
+                reject(
+                  new Error(
+                    "Timed out waiting for one-click trading to be enabled"
+                  )
+                );
+              } else {
+                retries++;
+                setTimeout(checkIsEnabled, 100);
+              }
+            };
+            checkIsEnabled();
+          });
+          onCommitRef.current();
+          logEvent([EventName.OneClickTrading.enableOneClickTrading]);
+        },
+        onError: () => {
+          rollbackCreateSession();
+          onCommitRef.current();
+        },
+      }
+    );
+  }, [
+    transactionParams,
+    createSession,
+    spendLimitTokenDecimals,
+    accountStore,
+    chainStore.osmosis.chainId,
+    sessionAuthenticator,
+    setTransactionParams,
+    initialTransactionParams,
+    logEvent,
+  ]);
+
+  const stopSession = useCallback(() => {
+    if (!transactionParams) return;
+
+    const rollbackRemoveSession = () => {
+      setTransactionParams({
+        ...(initialTransactionParams ?? transactionParams),
+        isOneClickEnabled: true,
+      });
+    };
+
+    if (!info) {
+      displayErrorRemovingSessionToast();
+      rollbackRemoveSession();
+      throw new Error("oneClickTradingInfo is undefined");
+    }
+
+    removeSession.mutate(
+      {
+        authenticatorId: info?.authenticatorId,
+      },
+      {
+        onError: (e) => {
+          const error = e as Error;
+          rollbackRemoveSession();
+          if (!isRejectedTxErrorMessage({ message: error?.message })) {
+            displayErrorRemovingSessionToast();
+          }
+          onCommitRef.current();
+        },
+        onSettled: () => {
+          onCommitRef.current();
+        },
+      }
+    );
+  }, [
+    info,
+    initialTransactionParams,
+    removeSession,
+    setTransactionParams,
+    transactionParams,
+  ]);
+
+  const commitSessionChange = useCallback(() => {
+    if (!shouldSend1CTTx) {
+      onCommitRef.current();
+      return;
+    }
+
+    if (!transactionParams) return;
+
+    if (transactionParams.isOneClickEnabled) {
+      startSession();
+    } else {
+      stopSession();
+    }
+  }, [shouldSend1CTTx, transactionParams, startSession, stopSession]);
+
+  return {
+    isEnabled,
+    isExpired,
+    isLoading,
+    commitSessionChangeIsLoading:
+      createSession.isLoading || removeSession.isLoading,
+    changes,
+    setChanges,
+    transactionParams,
+    wouldExceedSpendLimit,
+    remainingSpendLimit,
+    setTransactionParams,
+    commitSessionChange,
+    resetParams,
+  };
+}
+
+export function useOneClickRemainingSpendLimit({
+  enabled = true,
+  transactionParams,
+  oneClickTradingInfo,
+}: {
+  enabled?: boolean;
+  transactionParams?: OneClickTradingTransactionParams;
+  oneClickTradingInfo?: OneClickTradingInfo;
+}) {
+  const { accountStore, chainStore } = useStore();
+  const account = accountStore.getWallet(chainStore.osmosis.chainId);
+
+  const shouldFetchExistingSessionAuthenticator =
+    !!account?.address && !!oneClickTradingInfo;
+
+  const { data: sessionAuthenticator, isLoading } =
+    api.local.oneClickTrading.getSessionAuthenticator.useQuery(
+      {
+        userOsmoAddress: account?.address ?? "",
+        publicKey: oneClickTradingInfo?.publicKey ?? "",
+      },
+      {
+        enabled: enabled && shouldFetchExistingSessionAuthenticator,
+        cacheTime: 15_000, // 15 seconds
+        staleTime: 15_000, // 15 seconds
+        retry: false,
+      }
+    );
+
+  const { data: amountSpentData } =
+    api.local.oneClickTrading.getAmountSpent.useQuery(
+      {
+        authenticatorId: oneClickTradingInfo?.authenticatorId ?? "",
+        userOsmoAddress: oneClickTradingInfo?.userOsmoAddress ?? "",
+      },
+      {
+        enabled: enabled && !!oneClickTradingInfo,
+      }
+    );
+
+  const remainingSpendLimit = useMemo(
+    () =>
+      transactionParams?.spendLimit && amountSpentData?.amountSpent
+        ? formatSpendLimit(
+            transactionParams.spendLimit.sub(amountSpentData.amountSpent)
+          )
+        : undefined,
+    [transactionParams, amountSpentData]
+  );
+
+  const wouldExceedSpendLimit = useCallback(
+    ({
+      wantToSpend,
+      maybeWouldSpendTotal,
+    }: {
+      wantToSpend: Dec;
+      maybeWouldSpendTotal?: Dec;
+    }) => {
+      if (wantToSpend.isZero()) return false;
+
+      const spendLimit = transactionParams?.spendLimit?.toDec() ?? new Dec(0);
+      const amountSpent = amountSpentData?.amountSpent?.toDec() ?? new Dec(0);
+      /**
+       * If we have simulation results then we use the exact amount that would be spent
+       * if not we provide a fallback by adding already spent amount and the next spending
+       * (the fallback ignores the fact that for some tokens, the value is not included in the spend limit)
+       */
+      const wouldSpend = maybeWouldSpendTotal ?? amountSpent.add(wantToSpend);
+
+      return wouldSpend.gt(spendLimit);
+    },
+    [amountSpentData, transactionParams]
+  );
+
+  return {
+    amountSpent: amountSpentData?.amountSpent,
+    remainingSpendLimit,
+    wouldExceedSpendLimit,
+    sessionAuthenticator,
+    isLoading,
+  };
+}
+
+export function formatSpendLimit(price: PricePretty | undefined) {
+  return `${price?.symbol}${trimPlaceholderZeros(
+    price?.toDec().toString(2) ?? ""
+  )}`;
+}
diff --git a/packages/web/hooks/one-click-trading/use-one-click-trading-session.ts b/packages/web/hooks/one-click-trading/use-one-click-trading-session.ts
index 5d4ca6f4c0..badca7c9d5 100644
--- a/packages/web/hooks/one-click-trading/use-one-click-trading-session.ts
+++ b/packages/web/hooks/one-click-trading/use-one-click-trading-session.ts
@@ -39,7 +39,7 @@ export const useOneClickTradingSession = ({
     }
 
     const info = await accountStore.getOneClickTradingInfo();
-    const isEnabled = await accountStore.isOneCLickTradingEnabled();
+    const isEnabled = await accountStore.isOneClickTradingEnabled();
     setIsExpired(await accountStore.isOneClickTradingExpired());
 
     if (info?.userOsmoAddress !== account?.address) {
@@ -48,6 +48,12 @@ export const useOneClickTradingSession = ({
     }
 
     return { info, isEnabled, isExpired };
+    /**
+     * accountStore.oneClickTradingInfo is a computed value from the mobx store
+     * and we need to include it as a dependency to retrigger session refresh
+     * when the oneClickTradingInfo changes
+     */
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     accountStore,
     isExpired,
diff --git a/packages/web/hooks/use-estimate-tx-fees.ts b/packages/web/hooks/use-estimate-tx-fees.ts
index b4ab8d7033..f1785bb330 100644
--- a/packages/web/hooks/use-estimate-tx-fees.ts
+++ b/packages/web/hooks/use-estimate-tx-fees.ts
@@ -91,7 +91,11 @@ export function useEstimateTxFees({
   const wallet = accountStore.getWallet(chainId);
 
   const queryResult = useQuery<QueryResult, Error, QueryResult, string[]>({
-    queryKey: ["estimate-tx-fees", superjson.stringify(messages)],
+    queryKey: [
+      "estimate-tx-fees",
+      superjson.stringify(messages),
+      superjson.stringify(signOptions),
+    ],
     queryFn: () => {
       if (!wallet) throw new Error(`No wallet found for chain ID: ${chainId}`);
       return estimateTxFeesQueryFn({
diff --git a/packages/web/hooks/use-swap.tsx b/packages/web/hooks/use-swap.tsx
index 489c9caeef..be2714e38f 100644
--- a/packages/web/hooks/use-swap.tsx
+++ b/packages/web/hooks/use-swap.tsx
@@ -29,12 +29,15 @@ import {
 } from "@osmosis-labs/utils";
 import { createTRPCReact } from "@trpc/react-query";
 import { parseAsString, useQueryState } from "nuqs";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "react-toastify";
 import { useAsync } from "react-use";
 
 import { displayToast, ToastType } from "~/components/alert";
-import { isOverspendErrorMessage } from "~/components/alert/prettify";
+import {
+  getParametersFromOverspendErrorMessage,
+  isOverspendErrorMessage,
+} from "~/components/alert/prettify";
 import { Button } from "~/components/ui/button";
 import { RecommendedSwapDenoms } from "~/config";
 import { AssetLists } from "~/config/generated/asset-lists";
@@ -355,6 +358,11 @@ export function useSwap(
     isOneClickTradingEnabled,
   ]);
 
+  const overspendErrorParams = useMemo(() => {
+    if (!hasOverSpendLimitError) return;
+    return getParametersFromOverspendErrorMessage(networkFeeError?.message);
+  }, [networkFeeError?.message, hasOverSpendLimitError]);
+
   const isSlippageOverBalance = useMemo(() => {
     if (
       quoteType === "out-given-in" ||
@@ -371,11 +379,44 @@ export function useSwap(
     return balance.toDec().lt(amountWithSlippage);
   }, [inAmountInput.balance, inAmountInput.amount, maxSlippage, quoteType]);
 
+  /**
+   * Create refs so we can wait for them to finish in the sendTradeTokenInTx function
+   * This is a safety measure to prevent signed swaps from failing due to stale gas amount
+   * e.g. after enabling 1CT session the gas estimation needs to be updated before sending the swap
+   */
+  const isLoadingNetworkFeeRef = useRef(isLoadingNetworkFee);
+  const networkFeeErrorRef = useRef(networkFeeError);
+  useEffect(() => {
+    networkFeeErrorRef.current = networkFeeError;
+    isLoadingNetworkFeeRef.current = isLoadingNetworkFee;
+  }, [isLoadingNetworkFee, networkFeeError]);
+
   /** Send trade token in transaction. */
   const sendTradeTokenInTx = useCallback(
     () =>
       new Promise<"multiroute" | "multihop" | "exact-in">(
         async (resolve, reject) => {
+          // Wait for network fee to load, retry up to 10 times
+          let retries = 0;
+          while (isLoadingNetworkFeeRef.current && retries < 10) {
+            if (networkFeeErrorRef.current) {
+              return reject(new Error(networkFeeErrorRef.current.message));
+            }
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            retries++;
+          }
+
+          // After retries, check if still loading
+          if (isLoadingNetworkFeeRef.current) {
+            return reject(
+              new Error("Network fee is still loading after 1 second")
+            );
+          }
+
+          if (networkFeeErrorRef.current) {
+            return reject(new Error(networkFeeErrorRef.current.message));
+          }
+
           if (!maxSlippage)
             return reject(new Error("Max slippage is not defined."));
           if (!inAmountInput.amount || !outAmountInput.amount)
@@ -409,6 +450,17 @@ export function useSwap(
             );
           }
 
+          // Note about One-Click Trading (1CT) synchronization:
+          //
+          // When 1CT is enabled via the swap modal, there's a timing mismatch between
+          // the local state (isOneClickTradingEnabled) and the account store state.
+          //
+          // As a result:
+          // 1. The first swap after enabling 1CT will require manual signing
+          // 2. Subsequent swaps will use 1CT automatically
+          //
+          // This occurs because 1CT transactions require more gas, which makes
+          // our current quote's gas estimation incorrect and low. This results in out of gas error.
           const messageCanBeSignedWithOneClickTrading = !isNil(quote?.messages)
             ? isOneClickTradingEnabled &&
               (await accountStore.shouldBeSignedWithOneClickTrading({
@@ -740,6 +792,7 @@ export function useSwap(
     hasOverSpendLimitError,
     isSlippageOverBalance,
     quoteType,
+    overspendErrorParams,
   };
 }
 
diff --git a/packages/web/localizations/de.json b/packages/web/localizations/de.json
index 89e824c99a..9c8fcbd2e4 100644
--- a/packages/web/localizations/de.json
+++ b/packages/web/localizations/de.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Neu"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-Klick-Handelslimit",
+      "enableTitle": "Starten Sie den 1-Klick-Handel",
+      "enableDescription": "Schneller und einfacher handeln",
+      "paramsDescription": "{sessionLength} Sitzung mit {lossProtectionLimit} Verlustschutzlimit",
+      "defaultSpendLimit": "5.000 USD",
+      "change": "Ändern",
+      "edit": "Bearbeiten",
+      "exceeded": "Übertroffen",
+      "exceededTooltip": {
+        "title": "Überschreitet die aktuelle Verlustschutzgrenze",
+        "body": "Sie müssen diese Transaktion in Ihrem Wallet manuell genehmigen."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 Minuten",
+      "10min": "10 Minuten",
+      "30min": "30 Minuten",
+      "1hour": "1 Stunde",
+      "3hours": "3 Stunden",
+      "12hours": "12 Stunden"
+    },
     "settings": {
       "header": "1-Klick-Handel",
       "description": "Mit 1-Click Trading können Sie sicher auf diesem Gerät handeln, ohne jede Transaktion in Ihrem Wallet signieren zu müssen.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Sitzungszeitraum",
-        "description": "Legen Sie eine Dauer fest, um den 1-Klick-Handel auf diesem Gerät zu ermöglichen.",
-        "periods": {
-          "5min": "5 Minuten",
-          "10min": "10 Minuten",
-          "30min": "30 Minuten",
-          "1hour": "1 Stunde",
-          "3hours": "3 Stunden",
-          "12hours": "12 Stunden"
-        }
+        "description": "Legen Sie eine Dauer fest, um den 1-Klick-Handel auf diesem Gerät zu ermöglichen."
       },
       "discardChanges": {
         "title": "Änderungen verwerfen?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Spread-Faktor",
     "showDetails": "Zeige Details",
     "hideDetails": "Verstecken",
-    "continueAnyway": "Mache trotzdem weiter",
-    "warning": {
-      "exceedsSpendLimit": "Dieser Tausch überschreitet Ihr verbleibendes Ausgabenlimit für 1-Click-Handel.",
-      "increaseSpendLimit": "Ausgabenlimit erhöhen"
-    },
     "settings": {
       "slippage": "Rutschtoleranz"
     },
@@ -1085,6 +1094,16 @@
     "day": "Tag",
     "days": "Tage"
   },
+  "timeUnitsShort": {
+    "second": "Sek.",
+    "seconds": "Sek.",
+    "minute": "Min",
+    "minutes": "Min",
+    "hour": "Std",
+    "hours": "Std",
+    "day": "Tag",
+    "days": "Tag"
+  },
   "transactions": {
     "noRecent": "Keine aktuellen Transfers",
     "recentShownHere": "Einzahlungen und Auszahlungen der letzten 3 Tage auf diesem Gerät (zwischen bestimmten Netzwerken) werden hier angezeigt.",
diff --git a/packages/web/localizations/en.json b/packages/web/localizations/en.json
index 76bd54a901..341cf3a707 100644
--- a/packages/web/localizations/en.json
+++ b/packages/web/localizations/en.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "New"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-Click Trading limit",
+      "enableTitle": "Start 1-Click Trading",
+      "enableDescription": "Quicker, easier trading",
+      "paramsDescription": "{sessionLength} session with {spendLimit} loss protection limit",
+      "defaultSpendLimit": "$5,000 USD",
+      "change": "Change",
+      "edit": "Edit",
+      "exceeded": "Exceeded",
+      "exceededTooltip": {
+        "title": "Exceeds current loss-protection limit",
+        "body": "You will have to manually approve this transaction in your wallet."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minutes",
+      "10min": "10 minutes",
+      "30min": "30 minutes",
+      "1hour": "1 hour",
+      "3hours": "3 hours",
+      "12hours": "12 hours"
+    },
     "settings": {
       "header": "1-Click Trading",
       "description": "1-Click Trading lets you securely trade on this device without the hassle of signing every transaction in your wallet.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Session period",
-        "description": "Set a duration to allow 1-Click Trading on this device.",
-        "periods": {
-          "5min": "5 minutes",
-          "10min": "10 minutes",
-          "30min": "30 minutes",
-          "1hour": "1 hour",
-          "3hours": "3 hours",
-          "12hours": "12 hours"
-        }
+        "description": "Set a duration to allow 1-Click Trading on this device."
       },
       "discardChanges": {
         "title": "Discard Changes?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Spread Factor",
     "showDetails": "Show details",
     "hideDetails": "Hide",
-    "continueAnyway": "Continue Anyway",
-    "warning": {
-      "exceedsSpendLimit": "This swap exceeds your remaining spend limit for 1-Click Trading.",
-      "increaseSpendLimit": "Increase spend limit"
-    },
     "settings": {
       "slippage": "Slippage tolerance"
     },
@@ -1085,6 +1094,16 @@
     "day": "day",
     "days": "days"
   },
+  "timeUnitsShort": {
+    "second": "sec",
+    "seconds": "sec",
+    "minute": "min",
+    "minutes": "min",
+    "hour": "hr",
+    "hours": "hr",
+    "day": "day",
+    "days": "day"
+  },
   "transactions": {
     "noRecent": "No recent transactions",
     "recentShownHere": "Recent swaps, deposits and withdrawals will appear here.",
diff --git a/packages/web/localizations/es.json b/packages/web/localizations/es.json
index 048148c21f..4c43bee6ae 100644
--- a/packages/web/localizations/es.json
+++ b/packages/web/localizations/es.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Nuevo"
     },
+    "reviewOrder": {
+      "recapRowTitle": "Límite de negociación con un solo clic",
+      "enableTitle": "Comience a operar con un solo clic",
+      "enableDescription": "Comercio más rápido y sencillo",
+      "paramsDescription": "Sesión {sessionLength} con límite de protección contra pérdidas {lossProtectionLimit}",
+      "defaultSpendLimit": "$5,000 USD",
+      "change": "Cambiar",
+      "edit": "Editar",
+      "exceeded": "Excedido",
+      "exceededTooltip": {
+        "title": "Supera el límite actual de protección contra pérdidas",
+        "body": "Tendrá que aprobar manualmente esta transacción en su billetera."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minutos",
+      "10min": "10 minutos",
+      "30min": "30 minutos",
+      "1hour": "1 hora",
+      "3hours": "3 horas",
+      "12hours": "12 horas"
+    },
     "settings": {
       "header": "Comercio con 1 clic",
       "description": "1-Click Trading le permite operar de forma segura en este dispositivo sin la molestia de firmar cada transacción en su billetera.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Período de sesión",
-        "description": "Establezca una duración para permitir el comercio con 1 clic en este dispositivo.",
-        "periods": {
-          "5min": "5 minutos",
-          "10min": "10 minutos",
-          "30min": "30 minutos",
-          "1hour": "1 hora",
-          "3hours": "3 horas",
-          "12hours": "12 horas"
-        }
+        "description": "Establezca una duración para permitir el comercio con 1 clic en este dispositivo."
       },
       "discardChanges": {
         "title": "¿Descartar los cambios?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Factor de dispersión",
     "showDetails": "Mostrar detalles",
     "hideDetails": "Esconder",
-    "continueAnyway": "De todas maneras, continúe",
-    "warning": {
-      "exceedsSpendLimit": "Este intercambio excede su límite de gasto restante para 1-Click Trading.",
-      "increaseSpendLimit": "Aumentar el límite de gasto"
-    },
     "settings": {
       "slippage": "Tolerancia de deslizamiento"
     },
@@ -1085,6 +1094,16 @@
     "day": "día",
     "days": "días"
   },
+  "timeUnitsShort": {
+    "second": "segundo",
+    "seconds": "segundo",
+    "minute": "mín.",
+    "minutes": "mín.",
+    "hour": "hora",
+    "hours": "hora",
+    "day": "día",
+    "days": "día"
+  },
   "transactions": {
     "noRecent": "Sin transferencias recientes",
     "recentShownHere": "Los depósitos y retiros de los últimos 3 días en este dispositivo (entre ciertas redes) aparecerán aquí.",
diff --git a/packages/web/localizations/fa.json b/packages/web/localizations/fa.json
index 33eed3172e..1955956bc4 100644
--- a/packages/web/localizations/fa.json
+++ b/packages/web/localizations/fa.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "جدید"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-روی محدودیت معاملاتی کلیک کنید",
+      "enableTitle": "شروع تجارت با 1 کلیک",
+      "enableDescription": "تجارت سریع تر و راحت تر",
+      "paramsDescription": "جلسه {sessionLength} با محدودیت محافظت از دست دادن {lossProtectionLimit}",
+      "defaultSpendLimit": "5000 دلار آمریکا",
+      "change": "تغییر دهید",
+      "edit": "ویرایش کنید",
+      "exceeded": "فراتر رفت",
+      "exceededTooltip": {
+        "title": "از حد حفاظت از ضرر فعلی فراتر می رود",
+        "body": "شما باید به صورت دستی این تراکنش را در کیف پول خود تأیید کنید."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 دقیقه",
+      "10min": "10 دقیقه",
+      "30min": "30 دقیقه",
+      "1hour": "1 ساعت",
+      "3hours": "3 ساعت",
+      "12hours": "12 ساعت"
+    },
     "settings": {
       "header": "1- روی تجارت کلیک کنید",
       "description": "1-Click Trading به شما امکان می دهد بدون دردسر امضای هر تراکنش در کیف پول خود، با خیال راحت در این دستگاه معامله کنید.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "دوره جلسه",
-        "description": "مدت زمانی را تنظیم کنید تا امکان معامله با 1 کلیک در این دستگاه فراهم شود.",
-        "periods": {
-          "5min": "5 دقیقه",
-          "10min": "10 دقیقه",
-          "30min": "30 دقیقه",
-          "1hour": "1 ساعت",
-          "3hours": "3 ساعت",
-          "12hours": "12 ساعت"
-        }
+        "description": "مدت زمانی را تنظیم کنید تا امکان معامله با 1 کلیک در این دستگاه فراهم شود."
       },
       "discardChanges": {
         "title": "لغو تغییرات؟",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "فاکتور گسترش",
     "showDetails": "نمایش جزئیات",
     "hideDetails": "پنهان شدن",
-    "continueAnyway": "ادامه دادن به هر طریق",
-    "warning": {
-      "exceedsSpendLimit": "این مبادله از حد باقیمانده هزینه شما برای تجارت 1 کلیک بیشتر است.",
-      "increaseSpendLimit": "افزایش سقف هزینه"
-    },
     "settings": {
       "slippage": "تغیرات قابل قبول"
     },
@@ -1085,6 +1094,16 @@
     "day": "روز",
     "days": "روز"
   },
+  "timeUnitsShort": {
+    "second": "ثانیه",
+    "seconds": "ثانیه",
+    "minute": "دقیقه",
+    "minutes": "دقیقه",
+    "hour": "ساعت",
+    "hours": "ساعت",
+    "day": "روز",
+    "days": "روز"
+  },
   "transactions": {
     "noRecent": "بدون نقل و انتقالات اخیر",
     "recentShownHere": "واریزها و برداشت‌ها در 3 روز گذشته در این دستگاه (بین شبکه‌های خاص) در اینجا ظاهر می‌شوند.",
diff --git a/packages/web/localizations/fr.json b/packages/web/localizations/fr.json
index 9debead1e0..6fdcc15660 100644
--- a/packages/web/localizations/fr.json
+++ b/packages/web/localizations/fr.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Nouveau"
     },
+    "reviewOrder": {
+      "recapRowTitle": "Limite de trading en 1 clic",
+      "enableTitle": "Commencez à trader en 1 clic",
+      "enableDescription": "Des échanges plus rapides et plus faciles",
+      "paramsDescription": "Session {sessionLength} avec limite de protection contre les pertes {lossProtectionLimit}",
+      "defaultSpendLimit": "5 000 USD",
+      "change": "Changement",
+      "edit": "Modifier",
+      "exceeded": "Dépassé",
+      "exceededTooltip": {
+        "title": "Dépasse la limite actuelle de protection contre les pertes",
+        "body": "Vous devrez approuver manuellement cette transaction dans votre portefeuille."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minutes",
+      "10min": "10 minutes",
+      "30min": "30 minutes",
+      "1hour": "1 heure",
+      "3hours": "3 heures",
+      "12hours": "12 heures"
+    },
     "settings": {
       "header": "Trading en 1 clic",
       "description": "Le trading en 1 clic vous permet de négocier en toute sécurité sur cet appareil sans avoir à signer chaque transaction dans votre portefeuille.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Période de séance",
-        "description": "Définissez une durée pour autoriser le trading en 1 clic sur cet appareil.",
-        "periods": {
-          "5min": "5 minutes",
-          "10min": "10 minutes",
-          "30min": "30 minutes",
-          "1hour": "1 heure",
-          "3hours": "3 heures",
-          "12hours": "12 heures"
-        }
+        "description": "Définissez une durée pour autoriser le trading en 1 clic sur cet appareil."
       },
       "discardChanges": {
         "title": "Annuler les modifications?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Facteur de propagation",
     "showDetails": "Afficher les détails",
     "hideDetails": "Cacher",
-    "continueAnyway": "Continuer quand même",
-    "warning": {
-      "exceedsSpendLimit": "Cet échange dépasse votre limite de dépenses restantes pour le trading en 1 clic.",
-      "increaseSpendLimit": "Augmenter la limite de dépenses"
-    },
     "settings": {
       "slippage": "Tolérance de glissement"
     },
@@ -1085,6 +1094,16 @@
     "day": "jour",
     "days": "jours"
   },
+  "timeUnitsShort": {
+    "second": "seconde",
+    "seconds": "seconde",
+    "minute": "min",
+    "minutes": "min",
+    "hour": "heure",
+    "hours": "heure",
+    "day": "jour",
+    "days": "jour"
+  },
   "transactions": {
     "noRecent": "Aucun transfert récent",
     "recentShownHere": "Les dépôts et retraits des 3 derniers jours sur cet appareil (entre certains réseaux) apparaîtront ici.",
diff --git a/packages/web/localizations/gu.json b/packages/web/localizations/gu.json
index 0c55483f47..7e4faee8b4 100644
--- a/packages/web/localizations/gu.json
+++ b/packages/web/localizations/gu.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "નવી"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-ક્લિક કરો ટ્રેડિંગ મર્યાદા",
+      "enableTitle": "1-ક્લિક ટ્રેડિંગ શરૂ કરો",
+      "enableDescription": "ઝડપી, સરળ વેપાર",
+      "paramsDescription": "{sessionLength} સત્ર સાથે {lossProtectionLimit} નુકશાન સુરક્ષા મર્યાદા",
+      "defaultSpendLimit": "$5,000 USD",
+      "change": "બદલો",
+      "edit": "સંપાદિત કરો",
+      "exceeded": "વટાવી ગયો",
+      "exceededTooltip": {
+        "title": "વર્તમાન નુકશાન-રક્ષણ મર્યાદા ઓળંગે છે",
+        "body": "તમારે તમારા વૉલેટમાં આ વ્યવહારને મેન્યુઅલી મંજૂર કરવો પડશે."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 મિનિટ",
+      "10min": "10 મિનિટ",
+      "30min": "30 મિનિટ",
+      "1hour": "1 કલાક",
+      "3hours": "3 કલાક",
+      "12hours": "12 કલાક"
+    },
     "settings": {
       "header": "1-ક્લિક કરો ટ્રેડિંગ",
       "description": "1-ક્લિક ટ્રેડિંગ તમને તમારા વૉલેટમાં દરેક ટ્રાન્ઝેક્શન પર સહી કરવાની ઝંઝટ વિના આ ઉપકરણ પર સુરક્ષિત રીતે વેપાર કરવા દે છે.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "સત્રનો સમયગાળો",
-        "description": "આ ઉપકરણ પર 1-ક્લિક ટ્રેડિંગને મંજૂરી આપવા માટે સમયગાળો સેટ કરો.",
-        "periods": {
-          "5min": "5 મિનિટ",
-          "10min": "10 મિનીટ",
-          "30min": "30 મિનિટ",
-          "1hour": "1 કલાક",
-          "3hours": "3 કલાક",
-          "12hours": "12 કલાક"
-        }
+        "description": "આ ઉપકરણ પર 1-ક્લિક ટ્રેડિંગને મંજૂરી આપવા માટે સમયગાળો સેટ કરો."
       },
       "discardChanges": {
         "title": "ફેરફારોને અવગણો?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "સ્પ્રેડ ફેક્ટર",
     "showDetails": "વિગતો બતાવો",
     "hideDetails": "છુપાવો",
-    "continueAnyway": "કોઈપણ રીતે ચાલુ રાખો",
-    "warning": {
-      "exceedsSpendLimit": "આ સ્વેપ 1-ક્લિક ટ્રેડિંગ માટે તમારી બાકીની ખર્ચ મર્યાદાને ઓળંગે છે.",
-      "increaseSpendLimit": "ખર્ચ મર્યાદા વધારો"
-    },
     "settings": {
       "slippage": "સ્લિપેજ સહનશીલતા"
     },
@@ -1085,6 +1094,16 @@
     "day": "દિવસ",
     "days": "દિવસો"
   },
+  "timeUnitsShort": {
+    "second": "સેકન્ડ",
+    "seconds": "સેકન્ડ",
+    "minute": "મિનિટ",
+    "minutes": "મિનિટ",
+    "hour": "કલાક",
+    "hours": "કલાક",
+    "day": "દિવસ",
+    "days": "દિવસ"
+  },
   "transactions": {
     "noRecent": "કોઈ તાજેતરના ટ્રાન્સફર નથી",
     "recentShownHere": "આ ઉપકરણ પર છેલ્લા 3 દિવસમાં જમા અને ઉપાડ (ચોક્કસ નેટવર્ક્સ વચ્ચે) અહીં દેખાશે.",
diff --git a/packages/web/localizations/hi.json b/packages/web/localizations/hi.json
index a9d8c1d0fd..f3b4f4b299 100644
--- a/packages/web/localizations/hi.json
+++ b/packages/web/localizations/hi.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "नया"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-क्लिक ट्रेडिंग सीमा",
+      "enableTitle": "1-क्लिक ट्रेडिंग शुरू करें",
+      "enableDescription": "तीव्र एवं आसान व्यापार",
+      "paramsDescription": "{sessionLength} सत्र {lossProtectionLimit} हानि सुरक्षा सीमा के साथ",
+      "defaultSpendLimit": "$5,000 अमरीकी डॉलर",
+      "change": "परिवर्तन",
+      "edit": "संपादन करना",
+      "exceeded": "पार हो गई",
+      "exceededTooltip": {
+        "title": "वर्तमान हानि-सुरक्षा सीमा पार हो गई",
+        "body": "आपको अपने वॉलेट में इस लेनदेन को मैन्युअल रूप से अनुमोदित करना होगा।"
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 मिनट",
+      "10min": "10 मिनटों",
+      "30min": "30 मिनट",
+      "1hour": "1 घंटा",
+      "3hours": "3 घंटे",
+      "12hours": "12 घंटे"
+    },
     "settings": {
       "header": "1-ट्रेडिंग पर क्लिक करें",
       "description": "1-क्लिक ट्रेडिंग आपको अपने वॉलेट में प्रत्येक लेनदेन पर हस्ताक्षर करने की परेशानी के बिना इस डिवाइस पर सुरक्षित रूप से व्यापार करने की सुविधा देता है।",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "सत्र अवधि",
-        "description": "इस डिवाइस पर 1-क्लिक ट्रेडिंग की अनुमति देने के लिए एक अवधि निर्धारित करें।",
-        "periods": {
-          "5min": "5 मिनट",
-          "10min": "10 मिनटों",
-          "30min": "30 मिनट",
-          "1hour": "1 घंटा",
-          "3hours": "3 घंटे",
-          "12hours": "12 घंटे"
-        }
+        "description": "इस डिवाइस पर 1-क्लिक ट्रेडिंग की अनुमति देने के लिए एक अवधि निर्धारित करें।"
       },
       "discardChanges": {
         "title": "परिवर्तनों को निरस्त करें?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "प्रसार कारक",
     "showDetails": "प्रदर्शन का विवरण",
     "hideDetails": "छिपाना",
-    "continueAnyway": "फिर भी जारी रखें",
-    "warning": {
-      "exceedsSpendLimit": "यह स्वैप 1-क्लिक ट्रेडिंग के लिए आपकी शेष खर्च सीमा से अधिक है।",
-      "increaseSpendLimit": "खर्च सीमा बढ़ाएँ"
-    },
     "settings": {
       "slippage": "फिसलन सहनशीलता"
     },
@@ -1085,6 +1094,16 @@
     "day": "दिन",
     "days": "दिन"
   },
+  "timeUnitsShort": {
+    "second": "सेकंड",
+    "seconds": "सेकंड",
+    "minute": "मिन",
+    "minutes": "मिन",
+    "hour": "मानव संसाधन",
+    "hours": "मानव संसाधन",
+    "day": "दिन",
+    "days": "दिन"
+  },
   "transactions": {
     "noRecent": "कोई हालिया स्थानांतरण नहीं",
     "recentShownHere": "इस डिवाइस पर पिछले 3 दिनों में की गई जमा और निकासी (कुछ नेटवर्कों के बीच) यहां दिखाई देंगी।",
diff --git a/packages/web/localizations/ja.json b/packages/web/localizations/ja.json
index 764bd43837..976041257c 100644
--- a/packages/web/localizations/ja.json
+++ b/packages/web/localizations/ja.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "新しい"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1クリック取引制限",
+      "enableTitle": "ワンクリック取引を開始",
+      "enableDescription": "より速く、より簡単に取引",
+      "paramsDescription": "{sessionLength}セッション、 {lossProtectionLimit}損失保護制限",
+      "defaultSpendLimit": "5,000米ドル",
+      "change": "変化",
+      "edit": "編集",
+      "exceeded": "超過",
+      "exceededTooltip": {
+        "title": "現在の損失保護限度額を超えています",
+        "body": "この取引はウォレットで手動で承認する必要があります。"
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5分",
+      "10min": "10分",
+      "30min": "30分",
+      "1hour": "1時間",
+      "3hours": "3時間",
+      "12hours": "12時間"
+    },
     "settings": {
       "header": "1クリック取引",
       "description": "1-Click Trading を使用すると、ウォレット内のすべての取引に署名する手間をかけずに、このデバイスで安全に取引できます。",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "会期",
-        "description": "このデバイスで 1-Click 取引を許可する期間を設定します。",
-        "periods": {
-          "5min": "5分",
-          "10min": "10分",
-          "30min": "30分",
-          "1hour": "1時間",
-          "3hours": "3時間",
-          "12hours": "12時間"
-        }
+        "description": "このデバイスで 1-Click 取引を許可する期間を設定します。"
       },
       "discardChanges": {
         "title": "変更を破棄？",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "スプレッドファクター",
     "showDetails": "詳細を表示",
     "hideDetails": "隠れる",
-    "continueAnyway": "とにかく続けます",
-    "warning": {
-      "exceedsSpendLimit": "このスワップは、1-Click 取引の残りの支出制限を超えています。",
-      "increaseSpendLimit": "支出制限を増やす"
-    },
     "settings": {
       "slippage": "滑り許容差"
     },
@@ -1085,6 +1094,16 @@
     "day": "日",
     "days": "日"
   },
+  "timeUnitsShort": {
+    "second": "秒",
+    "seconds": "秒",
+    "minute": "分",
+    "minutes": "分",
+    "hour": "時間",
+    "hours": "時間",
+    "day": "日",
+    "days": "日"
+  },
   "transactions": {
     "noRecent": "最近の送金はありません",
     "recentShownHere": "このデバイスでの過去 3 日間の入金と出金 (特定のネットワーク間) がここに表示されます。",
diff --git a/packages/web/localizations/ko.json b/packages/web/localizations/ko.json
index d965e27530..b7dea19fec 100644
--- a/packages/web/localizations/ko.json
+++ b/packages/web/localizations/ko.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "새로운"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-클릭 거래 한도",
+      "enableTitle": "1-클릭 트레이딩 시작",
+      "enableDescription": "더 빠르고 쉬운 거래",
+      "paramsDescription": "{sessionLength} 세션과 {lossProtectionLimit} 손실 보호 한도",
+      "defaultSpendLimit": "5,000달러",
+      "change": "변화",
+      "edit": "편집하다",
+      "exceeded": "초과했습니다",
+      "exceededTooltip": {
+        "title": "현재 손실 보호 한도를 초과합니다.",
+        "body": "지갑에서 이 거래를 수동으로 승인해야 합니다."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5분",
+      "10min": "10분",
+      "30min": "30분",
+      "1hour": "1시간",
+      "3hours": "3시간",
+      "12hours": "12시간"
+    },
     "settings": {
       "header": "1-클릭 거래",
       "description": "1-클릭 거래를 사용하면 지갑의 모든 거래에 서명하는 번거로움 없이 이 장치에서 안전하게 거래할 수 있습니다.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "세션 기간",
-        "description": "이 장치에서 1-클릭 거래를 허용하는 기간을 설정하세요.",
-        "periods": {
-          "5min": "5 분",
-          "10min": "10 분",
-          "30min": "30 분",
-          "1hour": "1 시간",
-          "3hours": "3 시간",
-          "12hours": "12 시간"
-        }
+        "description": "이 장치에서 1-클릭 거래를 허용하는 기간을 설정하세요."
       },
       "discardChanges": {
         "title": "변경 사항을 취소?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "스프레드 팩터",
     "showDetails": "세부정보 표시",
     "hideDetails": "숨다",
-    "continueAnyway": "계속 진행",
-    "warning": {
-      "exceedsSpendLimit": "이 교환은 1-클릭 거래에 대한 남은 지출 한도를 초과합니다.",
-      "increaseSpendLimit": "지출 한도 늘리기"
-    },
     "settings": {
       "slippage": "슬리피지 허용치"
     },
@@ -1085,6 +1094,16 @@
     "day": "낮",
     "days": "날"
   },
+  "timeUnitsShort": {
+    "second": "비서",
+    "seconds": "비서",
+    "minute": "분",
+    "minutes": "분",
+    "hour": "시간",
+    "hours": "시간",
+    "day": "낮",
+    "days": "낮"
+  },
   "transactions": {
     "noRecent": "최근 이적 없음",
     "recentShownHere": "지난 3일 동안 이 기기(특정 네트워크 간)의 입출금 내역이 여기에 표시됩니다.",
diff --git a/packages/web/localizations/pl.json b/packages/web/localizations/pl.json
index 8992b8ad2b..3448276ca7 100644
--- a/packages/web/localizations/pl.json
+++ b/packages/web/localizations/pl.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Nowy"
     },
+    "reviewOrder": {
+      "recapRowTitle": "Limit handlu jednym kliknięciem",
+      "enableTitle": "Rozpocznij handel jednym kliknięciem",
+      "enableDescription": "Szybszy, łatwiejszy handel",
+      "paramsDescription": "{sessionLength} sesja z {lossProtectionLimit} limitem ochrony przed stratami",
+      "defaultSpendLimit": "5000 dolarów amerykańskich",
+      "change": "Zmiana",
+      "edit": "Redagować",
+      "exceeded": "Przekroczony",
+      "exceededTooltip": {
+        "title": "Przekracza aktualny limit ochrony przed stratami",
+        "body": "Będziesz musiał ręcznie zatwierdzić tę transakcję w swoim portfelu."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minut",
+      "10min": "10 minut",
+      "30min": "30 minut",
+      "1hour": "1 godzina",
+      "3hours": "3 godziny",
+      "12hours": "12 godzin"
+    },
     "settings": {
       "header": "Handel jednym kliknięciem",
       "description": "Handel 1-Click pozwala bezpiecznie handlować na tym urządzeniu bez konieczności podpisywania każdej transakcji w portfelu.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Okres sesji",
-        "description": "Ustaw czas trwania transakcji jednym kliknięciem na tym urządzeniu.",
-        "periods": {
-          "5min": "5 minut",
-          "10min": "10 minut",
-          "30min": "30 minut",
-          "1hour": "1 godzina",
-          "3hours": "3 godziny",
-          "12hours": "12 godzin"
-        }
+        "description": "Ustaw czas trwania transakcji jednym kliknięciem na tym urządzeniu."
       },
       "discardChanges": {
         "title": "Odrzucać zmiany?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Współczynnik rozrzutu",
     "showDetails": "Pokaż szczegóły",
     "hideDetails": "Ukrywać",
-    "continueAnyway": "Kontynuować mimo to",
-    "warning": {
-      "exceedsSpendLimit": "Ta zamiana przekracza pozostały limit wydatków w ramach handlu jednym kliknięciem.",
-      "increaseSpendLimit": "Zwiększ limit wydatków"
-    },
     "settings": {
       "slippage": "Tolerowane odchylenie"
     },
@@ -1085,6 +1094,16 @@
     "day": "dzień",
     "days": "dni"
   },
+  "timeUnitsShort": {
+    "second": "sek.",
+    "seconds": "sek.",
+    "minute": "min",
+    "minutes": "min",
+    "hour": "godz.",
+    "hours": "godz.",
+    "day": "dzień",
+    "days": "dzień"
+  },
   "transactions": {
     "noRecent": "Brak ostatnich transferów",
     "recentShownHere": "Tutaj pojawią się wpłaty i wypłaty z ostatnich 3 dni na tym urządzeniu (między określonymi sieciami).",
diff --git a/packages/web/localizations/pt-br.json b/packages/web/localizations/pt-br.json
index 8613046c51..158a7e088f 100644
--- a/packages/web/localizations/pt-br.json
+++ b/packages/web/localizations/pt-br.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Novo"
     },
+    "reviewOrder": {
+      "recapRowTitle": "Limite de negociação de 1 clique",
+      "enableTitle": "Comece a negociar com 1 clique",
+      "enableDescription": "Negociação mais rápida e fácil",
+      "paramsDescription": "{sessionLength} sessão com limite de proteção contra perdas {lossProtectionLimit}",
+      "defaultSpendLimit": "US$ 5.000",
+      "change": "Mudar",
+      "edit": "Editar",
+      "exceeded": "Excedido",
+      "exceededTooltip": {
+        "title": "Excede o limite atual de proteção contra perdas",
+        "body": "Você terá que aprovar manualmente esta transação em sua carteira."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minutos",
+      "10min": "10 minutos",
+      "30min": "30 minutos",
+      "1hour": "1 hora",
+      "3hours": "3 horas",
+      "12hours": "12 horas"
+    },
     "settings": {
       "header": "Negociação em 1 clique",
       "description": "A negociação com 1 clique permite que você negocie com segurança neste dispositivo, sem o incômodo de assinar todas as transações em sua carteira.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Período da sessão",
-        "description": "Defina uma duração para permitir a negociação em 1 clique neste dispositivo.",
-        "periods": {
-          "5min": "5 minutos",
-          "10min": "10 minutos",
-          "30min": "30 minutos",
-          "1hour": "1 hora",
-          "3hours": "3 horas",
-          "12hours": "12 horas"
-        }
+        "description": "Defina uma duração para permitir a negociação em 1 clique neste dispositivo."
       },
       "discardChanges": {
         "title": "Descartar mudanças?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Fator de propagação",
     "showDetails": "Mostrar detalhes",
     "hideDetails": "Esconder",
-    "continueAnyway": "Continue de qualquer maneira",
-    "warning": {
-      "exceedsSpendLimit": "Esta troca excede o limite de gastos restantes para negociação em 1 clique.",
-      "increaseSpendLimit": "Aumentar o limite de gastos"
-    },
     "settings": {
       "slippage": "Tolerância de spread"
     },
@@ -1085,6 +1094,16 @@
     "day": "dia",
     "days": "dias"
   },
+  "timeUnitsShort": {
+    "second": "segundo",
+    "seconds": "segundo",
+    "minute": "mínimo",
+    "minutes": "mínimo",
+    "hour": "hora",
+    "hours": "hora",
+    "day": "dia",
+    "days": "dia"
+  },
   "transactions": {
     "noRecent": "Nenhuma transferência recente",
     "recentShownHere": "Os depósitos e saques nos últimos 3 dias neste dispositivo (entre determinadas redes) aparecerão aqui.",
diff --git a/packages/web/localizations/ro.json b/packages/web/localizations/ro.json
index b63e0818dc..3b41518688 100644
--- a/packages/web/localizations/ro.json
+++ b/packages/web/localizations/ro.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Nou"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-Faceți clic pe Limită de tranzacționare",
+      "enableTitle": "Începeți tranzacționarea cu 1 clic",
+      "enableDescription": "Tranzacționare mai rapidă și mai ușoară",
+      "paramsDescription": "Sesiune {sessionLength} {spendLimit}",
+      "defaultSpendLimit": "5.000 USD",
+      "change": "Schimba",
+      "edit": "Edita",
+      "exceeded": "Depășit",
+      "exceededTooltip": {
+        "title": "Depășește limita curentă de protecție împotriva pierderilor",
+        "body": "Va trebui să aprobați manual această tranzacție în portofel."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 minute",
+      "10min": "10 minute",
+      "30min": "30 de minute",
+      "1hour": "1 oră",
+      "3hours": "3 ore",
+      "12hours": "12 ore"
+    },
     "settings": {
       "header": "1-Click Trading",
       "description": "Tranzacționarea cu 1 clic vă permite să tranzacționați în siguranță pe acest dispozitiv, fără bătaia de cap de a semna fiecare tranzacție din portofel.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Perioada de sesiune",
-        "description": "Setați o durată pentru a permite tranzacționarea cu 1 clic pe acest dispozitiv.",
-        "periods": {
-          "5min": "5 minute",
-          "10min": "10 minute",
-          "30min": "30 minute",
-          "1hour": "1 oră",
-          "3hours": "3 ore",
-          "12hours": "12 ore"
-        }
+        "description": "Setați o durată pentru a permite tranzacționarea cu 1 clic pe acest dispozitiv."
       },
       "discardChanges": {
         "title": "Renunțați la modificări?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Factorul de răspândire",
     "showDetails": "Arata detaliile",
     "hideDetails": "Ascunde",
-    "continueAnyway": "Continua oricum",
-    "warning": {
-      "exceedsSpendLimit": "Acest schimb depășește limita de cheltuieli rămasă pentru tranzacționarea cu 1 clic.",
-      "increaseSpendLimit": "Creșteți limita de cheltuieli"
-    },
     "settings": {
       "slippage": "Toleranta modificare pret"
     },
@@ -1085,6 +1094,16 @@
     "day": "zi",
     "days": "zile"
   },
+  "timeUnitsShort": {
+    "second": "sec",
+    "seconds": "sec",
+    "minute": "min",
+    "minutes": "min",
+    "hour": "hr",
+    "hours": "hr",
+    "day": "zi",
+    "days": "zi"
+  },
   "transactions": {
     "noRecent": "Fără transferuri recente",
     "recentShownHere": "Depunerile și retragerile din ultimele 3 zile pe acest dispozitiv (între anumite rețele) vor apărea aici.",
diff --git a/packages/web/localizations/ru.json b/packages/web/localizations/ru.json
index 0faace8611..a9a9e5425b 100644
--- a/packages/web/localizations/ru.json
+++ b/packages/web/localizations/ru.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Новый"
     },
+    "reviewOrder": {
+      "recapRowTitle": "Лимит торговли в 1 клик",
+      "enableTitle": "Начните торговлю в 1 клик",
+      "enableDescription": "Более быстрая и простая торговля",
+      "paramsDescription": "{sessionLength} сессия с {spendLimit} лимит защиты от потерь",
+      "defaultSpendLimit": "5000 долларов США",
+      "change": "Изменять",
+      "edit": "Редактировать",
+      "exceeded": "Превышен",
+      "exceededTooltip": {
+        "title": "Превышает текущий лимит защиты от потерь",
+        "body": "Вам придется вручную одобрить эту транзакцию в своем кошельке."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 минут",
+      "10min": "10 минут",
+      "30min": "30 минут",
+      "1hour": "1 час",
+      "3hours": "3 часа",
+      "12hours": "12 часов"
+    },
     "settings": {
       "header": "Торговля в 1 клик",
       "description": "1-Click Trading позволяет вам безопасно торговать на этом устройстве без необходимости подписывать каждую транзакцию в своем кошельке.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Период сессии",
-        "description": "Установите продолжительность, чтобы разрешить торговлю в один клик на этом устройстве.",
-        "periods": {
-          "5min": "5 минут",
-          "10min": "10 минут",
-          "30min": "30 минут",
-          "1hour": "1 час",
-          "3hours": "3 часа",
-          "12hours": "12 часов"
-        }
+        "description": "Установите продолжительность, чтобы разрешить торговлю в один клик на этом устройстве."
       },
       "discardChanges": {
         "title": "Отменить изменения?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Фактор распространения",
     "showDetails": "Показать детали",
     "hideDetails": "Скрывать",
-    "continueAnyway": "Продолжай в любом случае",
-    "warning": {
-      "exceedsSpendLimit": "Этот обмен превышает оставшийся лимит расходов для торговли в один клик.",
-      "increaseSpendLimit": "Увеличить лимит расходов"
-    },
     "settings": {
       "slippage": "Допуск проскальзывания"
     },
@@ -1085,6 +1094,16 @@
     "day": "день",
     "days": "дней"
   },
+  "timeUnitsShort": {
+    "second": "сек",
+    "seconds": "сек",
+    "minute": "мин",
+    "minutes": "мин",
+    "hour": "час",
+    "hours": "час",
+    "day": "день",
+    "days": "день"
+  },
   "transactions": {
     "noRecent": "Нет недавних переводов",
     "recentShownHere": "Здесь будут отображаться депозиты и выводы средств на этом устройстве за последние 3 дня (между определенными сетями).",
diff --git a/packages/web/localizations/tr.json b/packages/web/localizations/tr.json
index 1dfea31066..3927e35393 100644
--- a/packages/web/localizations/tr.json
+++ b/packages/web/localizations/tr.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "Yeni"
     },
+    "reviewOrder": {
+      "recapRowTitle": "1-Tıkla İşlem limiti",
+      "enableTitle": "1-Tıkla İşlem Başlat",
+      "enableDescription": "Daha hızlı, daha kolay ticaret",
+      "paramsDescription": "{sessionLength} oturumu {spendLimit} kayıp koruma sınırıyla",
+      "defaultSpendLimit": "5.000 ABD doları",
+      "change": "Değiştirmek",
+      "edit": "Düzenlemek",
+      "exceeded": "Aşıldı",
+      "exceededTooltip": {
+        "title": "Mevcut kayıp koruma sınırını aşar",
+        "body": "Bu işlemi cüzdanınızda manuel olarak onaylamanız gerekecektir."
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 dakika",
+      "10min": "10 dakika",
+      "30min": "30 dakika",
+      "1hour": "1 saat",
+      "3hours": "3 saat",
+      "12hours": "12 saat"
+    },
     "settings": {
       "header": "Tek Tıklamayla Ticaret",
       "description": "Tek Tıklamayla Ticaret, cüzdanınızdaki her işlemi imzalama zahmetine girmeden bu cihazda güvenli bir şekilde ticaret yapmanızı sağlar.",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "Oturum dönemi",
-        "description": "Bu cihazda Tek Tıklamayla Ticarete izin vermek için bir süre ayarlayın.",
-        "periods": {
-          "5min": "5 dakika",
-          "10min": "10 dakika",
-          "30min": "30 dakika",
-          "1hour": "1 saat",
-          "3hours": "3 saat",
-          "12hours": "12 saat"
-        }
+        "description": "Bu cihazda Tek Tıklamayla Ticarete izin vermek için bir süre ayarlayın."
       },
       "discardChanges": {
         "title": "Değişiklikleri gözardı et?",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "Yayılma Faktörü",
     "showDetails": "Detayları göster",
     "hideDetails": "Saklamak",
-    "continueAnyway": "Her halükarda devam et",
-    "warning": {
-      "exceedsSpendLimit": "Bu takas, Tek Tıklamayla Ticaret için kalan harcama limitinizi aşıyor.",
-      "increaseSpendLimit": "Harcama sınırını artırın"
-    },
     "settings": {
       "slippage": "Slipaj toleransı"
     },
@@ -1085,6 +1094,16 @@
     "day": "gün",
     "days": "günler"
   },
+  "timeUnitsShort": {
+    "second": "saniye",
+    "seconds": "saniye",
+    "minute": "dakika",
+    "minutes": "dakika",
+    "hour": "saat",
+    "hours": "saat",
+    "day": "gün",
+    "days": "gün"
+  },
   "transactions": {
     "noRecent": "Yakın zamanda transfer yok",
     "recentShownHere": "Bu cihaza son 3 gün içinde yapılan para yatırma ve çekme işlemleri (belirli ağlar arasında) burada görünecektir.",
diff --git a/packages/web/localizations/zh-cn.json b/packages/web/localizations/zh-cn.json
index 1bf7a0d50b..2a3b8c79c6 100644
--- a/packages/web/localizations/zh-cn.json
+++ b/packages/web/localizations/zh-cn.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "新的"
     },
+    "reviewOrder": {
+      "recapRowTitle": "一键交易限制",
+      "enableTitle": "开始一键交易",
+      "enableDescription": "交易更快捷、更轻松",
+      "paramsDescription": "{sessionLength}会话，具有{spendLimit}损失保护限制",
+      "defaultSpendLimit": "5,000 美元",
+      "change": "改变",
+      "edit": "编辑",
+      "exceeded": "超出",
+      "exceededTooltip": {
+        "title": "超过当前损失保护限制",
+        "body": "您必须在钱包中手动批准此交易。"
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5 分钟",
+      "10min": "10 分钟",
+      "30min": "30 分钟",
+      "1hour": "1 小时",
+      "3hours": "3 小时",
+      "12hours": "12 小时"
+    },
     "settings": {
       "header": "一键交易",
       "description": "一键交易让您可以在此设备上安全地进行交易，而无需在钱包中签署每笔交易。",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "会议期间",
-        "description": "设置允许在此设备上进行一键交易的持续时间。",
-        "periods": {
-          "5min": "5分钟",
-          "10min": "10分钟",
-          "30min": "30分钟",
-          "1hour": "1小时",
-          "3hours": "3小时",
-          "12hours": "12小时"
-        }
+        "description": "设置允许在此设备上进行一键交易的持续时间。"
       },
       "discardChanges": {
         "title": "放弃更改？",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "扩频因子",
     "showDetails": "显示详细资料",
     "hideDetails": "隐藏",
-    "continueAnyway": "无论如何继续",
-    "warning": {
-      "exceedsSpendLimit": "此交换超出了您一键交易的剩余支出限额。",
-      "increaseSpendLimit": "提高支出限额"
-    },
     "settings": {
       "slippage": "滑点上限"
     },
@@ -1085,6 +1094,16 @@
     "day": "天",
     "days": "天"
   },
+  "timeUnitsShort": {
+    "second": "秒",
+    "seconds": "秒",
+    "minute": "分钟",
+    "minutes": "分钟",
+    "hour": "時間",
+    "hours": "時間",
+    "day": "天",
+    "days": "天"
+  },
   "transactions": {
     "noRecent": "最近没有转会",
     "recentShownHere": "此设备（某些网络之间）过去 3 天的存款和取款将显示在这里。",
diff --git a/packages/web/localizations/zh-hk.json b/packages/web/localizations/zh-hk.json
index dc1c560571..9f4263a37d 100644
--- a/packages/web/localizations/zh-hk.json
+++ b/packages/web/localizations/zh-hk.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "新的"
     },
+    "reviewOrder": {
+      "recapRowTitle": "一鍵交易限額",
+      "enableTitle": "開始一鍵交易",
+      "enableDescription": "交易更快、更輕鬆",
+      "paramsDescription": "{sessionLength}會話，具有{spendLimit}丟失保護限制",
+      "defaultSpendLimit": "5,000 美元",
+      "change": "改變",
+      "edit": "編輯",
+      "exceeded": "超過",
+      "exceededTooltip": {
+        "title": "超過當前損失保護限制",
+        "body": "您必須在錢包中手動批准此交易。"
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5分鐘",
+      "10min": "10分鐘",
+      "30min": "30分鐘",
+      "1hour": "1小時",
+      "3hours": "3小時",
+      "12hours": "12小時"
+    },
     "settings": {
       "header": "一鍵交易",
       "description": "一鍵交易讓您可以在此裝置上安全地進行交易，而無需在錢包中簽署每筆交易。",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "會議期間",
-        "description": "設定允許在此裝置上進行一鍵交易的持續時間。",
-        "periods": {
-          "5min": "5分鐘",
-          "10min": "10分鐘",
-          "30min": "30分鐘",
-          "1hour": "1小時",
-          "3hours": "3小時",
-          "12hours": "12小時"
-        }
+        "description": "設定允許在此裝置上進行一鍵交易的持續時間。"
       },
       "discardChanges": {
         "title": "放棄更改？",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "擴頻因子",
     "showDetails": "顯示詳細資料",
     "hideDetails": "隱藏",
-    "continueAnyway": "無論如何繼續",
-    "warning": {
-      "exceedsSpendLimit": "此交換超出了您一鍵交易的剩餘支出限額。",
-      "increaseSpendLimit": "提高支出限額"
-    },
     "settings": {
       "slippage": "允許嘅滑價"
     },
@@ -1085,6 +1094,16 @@
     "day": "天",
     "days": "天"
   },
+  "timeUnitsShort": {
+    "second": "秒",
+    "seconds": "秒",
+    "minute": "分分鐘",
+    "minutes": "分分鐘",
+    "hour": "小時",
+    "hours": "小時",
+    "day": "天",
+    "days": "天"
+  },
   "transactions": {
     "noRecent": "最近沒有轉帳",
     "recentShownHere": "此處將顯示過去 3 天在此裝置上（某些網路之間）的存款和提款。",
diff --git a/packages/web/localizations/zh-tw.json b/packages/web/localizations/zh-tw.json
index e5a9654e9d..98c55ed453 100644
--- a/packages/web/localizations/zh-tw.json
+++ b/packages/web/localizations/zh-tw.json
@@ -383,6 +383,28 @@
     "floatingBanner": {
       "newPill": "新的"
     },
+    "reviewOrder": {
+      "recapRowTitle": "一鍵交易限額",
+      "enableTitle": "開始一鍵交易",
+      "enableDescription": "交易更快、更輕鬆",
+      "paramsDescription": "{sessionLength}會話，具有{spendLimit}丟失保護限制",
+      "defaultSpendLimit": "5,000 美元",
+      "change": "改變",
+      "edit": "編輯",
+      "exceeded": "超過",
+      "exceededTooltip": {
+        "title": "超過當前損失保護限制",
+        "body": "您必須在錢包中手動批准此交易。"
+      }
+    },
+    "sessionPeriods": {
+      "5min": "5分鐘",
+      "10min": "10分鐘",
+      "30min": "30分鐘",
+      "1hour": "1小時",
+      "3hours": "3小時",
+      "12hours": "12小時"
+    },
     "settings": {
       "header": "一鍵交易",
       "description": "一鍵交易讓您可以在此裝置上安全地進行交易，而無需在錢包中簽署每筆交易。",
@@ -402,15 +424,7 @@
       },
       "sessionPeriodScreen": {
         "title": "會議期間",
-        "description": "設定允許在此裝置上進行一鍵交易的持續時間。",
-        "periods": {
-          "5min": "5分鐘",
-          "10min": "10分鐘",
-          "30min": "30分鐘",
-          "1hour": "1小時",
-          "3hours": "3小時",
-          "12hours": "12小時"
-        }
+        "description": "設定允許在此裝置上進行一鍵交易的持續時間。"
       },
       "discardChanges": {
         "title": "放棄更改？",
@@ -691,11 +705,6 @@
     "routerTooltipSpreadFactor": "擴頻因子",
     "showDetails": "顯示詳細資料",
     "hideDetails": "隱藏",
-    "continueAnyway": "無論如何繼續",
-    "warning": {
-      "exceedsSpendLimit": "此交換超出了您一鍵交易的剩餘支出限額。",
-      "increaseSpendLimit": "提高支出限額"
-    },
     "settings": {
       "slippage": "允許的滑價"
     },
@@ -1085,6 +1094,16 @@
     "day": "天",
     "days": "天"
   },
+  "timeUnitsShort": {
+    "second": "秒",
+    "seconds": "秒",
+    "minute": "分分鐘",
+    "minutes": "分分鐘",
+    "hour": "小時",
+    "hours": "小時",
+    "day": "天",
+    "days": "天"
+  },
   "transactions": {
     "noRecent": "最近沒有轉帳",
     "recentShownHere": "此處將顯示過去 3 天在此裝置上（某些網路之間）的存款和提款。",
diff --git a/packages/web/modals/review-order.tsx b/packages/web/modals/review-order.tsx
index 932fcb905c..19df7ef69f 100644
--- a/packages/web/modals/review-order.tsx
+++ b/packages/web/modals/review-order.tsx
@@ -8,6 +8,7 @@ import {
 import { DEFAULT_VS_CURRENCY } from "@osmosis-labs/server";
 import { ObservableSlippageConfig } from "@osmosis-labs/stores";
 import { QuoteDirection } from "@osmosis-labs/tx";
+import { OneClickTradingTransactionParams } from "@osmosis-labs/types";
 import classNames from "classnames";
 import Image from "next/image";
 import { parseAsString, useQueryState } from "nuqs";
@@ -16,20 +17,29 @@ import AutosizeInput from "react-input-autosize";
 
 import { Icon } from "~/components/assets";
 import { Button } from "~/components/buttons";
+import { OneClickTradingRemainingTime } from "~/components/one-click-trading/one-click-remaining-time";
+import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings";
 import { GenericDisclaimer } from "~/components/tooltip/generic-disclaimer";
+import { Button as UIButton } from "~/components/ui/button";
 import { RecapRow } from "~/components/ui/recap-row";
 import { Skeleton } from "~/components/ui/skeleton";
+import { Switch } from "~/components/ui/switch";
 import { EventName, EventPage } from "~/config/analytics-events";
 import {
   Breakpoint,
+  MultiLanguageT,
+  OneClickTradingParamsChanges,
   useAmplitudeAnalytics,
-  useOneClickTradingSession,
+  useFeatureFlags,
+  useOneClickTradingSessionManager,
   useTranslation,
   useWindowSize,
 } from "~/hooks";
 import { isValidNumericalRawInput } from "~/hooks/input/use-amount-input";
+import { useIsCosmosNewAccount } from "~/hooks/use-is-cosmos-new-account";
 import { useSwap } from "~/hooks/use-swap";
 import { ModalBase } from "~/modals";
+import { useStore } from "~/stores";
 import {
   formatFiatPrice,
   formatPretty,
@@ -63,11 +73,12 @@ interface ReviewOrderProps {
   page?: EventPage;
   quoteType?: QuoteDirection;
   isBeyondOppositePrice?: boolean;
+  overspendErrorParams?: ReturnType<typeof useSwap>["overspendErrorParams"];
 }
 
 export function ReviewOrder({
   isOpen,
-  onClose,
+  onClose: onCloseProp,
   confirmAction,
   isConfirmationDisabled,
   slippageConfig,
@@ -92,13 +103,48 @@ export function ReviewOrder({
   page,
   isBeyondOppositePrice = false,
   quoteType,
+  overspendErrorParams,
 }: ReviewOrderProps) {
   const { t } = useTranslation();
   const { logEvent } = useAmplitudeAnalytics();
   const [manualSlippage, setManualSlippage] = useState("");
   const [isEditingSlippage, setIsEditingSlippage] = useState(false);
   const [tab] = useQueryState("tab", parseAsString.withDefault("swap"));
-  const { isOneClickTradingEnabled } = useOneClickTradingSession();
+
+  const [showOneClickTradingSettings, setShowOneClickTradingSettings] =
+    useState(false);
+
+  const featureFlags = useFeatureFlags();
+  const { accountStore } = useStore();
+  const wallet = accountStore.getWallet(accountStore.osmosisChainId);
+  const { isNewAccount } = useIsCosmosNewAccount({ address: wallet?.address });
+  const show1CT = featureFlags.oneClickTrading && !isNewAccount;
+
+  const {
+    isEnabled: is1CTEnabled,
+    changes: transaction1CTParamsChanges,
+    setChanges: setTransaction1CTParamsChanges,
+    transactionParams: transaction1CTParams,
+    remainingSpendLimit: remaining1CTSpendLimit,
+    wouldExceedSpendLimit: wouldExceedSpendLimit1CT,
+    setTransactionParams: setTransaction1CTParams,
+    commitSessionChange: commit1CTSessionChange,
+    resetParams: reset1CTParams,
+    commitSessionChangeIsLoading: commit1CTSessionChangeIsLoading,
+  } = useOneClickTradingSessionManager({
+    onCommit: () => {
+      confirmAction();
+      onClose();
+    },
+  });
+
+  const wouldExceedSpendLimit = useMemo(() => {
+    return wouldExceedSpendLimit1CT({
+      wantToSpend: fiatAmountWithSlippage?.toDec() ?? new Dec(0),
+      maybeWouldSpendTotal: overspendErrorParams?.wouldSpendTotal,
+    });
+  }, [overspendErrorParams, fiatAmountWithSlippage, wouldExceedSpendLimit1CT]);
+
   const [orderType] = useQueryState(
     "type",
     parseAsString.withDefault("market")
@@ -176,10 +222,10 @@ export function ReviewOrder({
   const gasFeeError = useMemo(() => {
     if (!!gasAmount && !gasError) return;
 
-    return isOneClickTradingEnabled
+    return is1CTEnabled
       ? t("swap.gas.oneClickTradingError")
       : t("swap.gas.error");
-  }, [gasAmount, isOneClickTradingEnabled, gasError, t]);
+  }, [gasAmount, is1CTEnabled, gasError, t]);
 
   const GasEstimation = useMemo(() => {
     return !!gasFeeError ? (
@@ -210,481 +256,684 @@ export function ReviewOrder({
     );
   }, [gasAmount, isGasLoading, gasFeeError, isMobile, t]);
 
+  const onClose = useCallback(() => {
+    reset1CTParams();
+    onCloseProp();
+  }, [onCloseProp, reset1CTParams]);
+
   return (
     <ModalBase
       isOpen={isOpen}
       onRequestClose={onClose}
       hideCloseButton
-      className="w-[512px] rounded-2xl !p-0 sm:h-full sm:max-h-[100vh] sm:!rounded-none"
+      className={
+        show1CT && showOneClickTradingSettings
+          ? "relative max-h-screen overflow-hidden"
+          : "w-[512px] rounded-2xl !p-0 sm:h-full sm:max-h-[100vh] sm:!rounded-none"
+      }
     >
-      <div className="flex h-auto w-full flex-col bg-osmoverse-850">
-        <div className="relative flex h-20 items-center justify-center p-4">
-          <h6>{title}</h6>
-          <button
-            onClick={onClose}
-            className="absolute right-4 flex h-12 w-12 items-center justify-center rounded-full bg-osmoverse-800"
-          >
-            <Icon id="thin-x" className="text-wosmongton-200" />
-          </button>
+      {show1CT && showOneClickTradingSettings && (
+        <div className="flex flex-col items-center overflow-hidden">
+          <OneClickTradingSettings
+            externalChanges={transaction1CTParamsChanges}
+            setExternalChanges={setTransaction1CTParamsChanges}
+            onGoBack={() => setShowOneClickTradingSettings(false)}
+            onClose={() => setShowOneClickTradingSettings(false)}
+            transaction1CTParams={transaction1CTParams}
+            setTransaction1CTParams={setTransaction1CTParams}
+            standalone={false}
+          />
         </div>
-        <div
-          className={classNames("flex flex-col px-8", {
-            "pb-8": !diffGteSlippage,
-          })}
-        >
-          {orderType === "limit" && tab !== "swap" && (
-            <div className="sm:caption flex flex-col rounded-t-2xl border border-osmoverse-700 px-4 py-2">
-              <div className="flex items-center gap-4">
-                <div className="flex h-10 min-w-10 items-center justify-center">
-                  {(tab === "buy" && !isBeyondOppositePrice) ||
-                  (tab === "sell" && isBeyondOppositePrice) ? (
-                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none">
-                      <path
-                        fillRule="evenodd"
-                        clipRule="evenodd"
-                        d="M15 15C15 14.4477 15.4477 14 16 14H18.5858L12.5 7.91421L9.20711 11.2071C9.01957 11.3946 8.76522 11.5 8.5 11.5C8.23478 11.5 7.98043 11.3946 7.79289 11.2071L2.29289 5.70711C1.90237 5.31658 1.90237 4.68342 2.29289 4.29289C2.68342 3.90237 3.31658 3.90237 3.70711 4.29289L8.5 9.08579L11.7929 5.79289C12.1834 5.40237 12.8166 5.40237 13.2071 5.79289L20 12.5858V10C20 9.44772 20.4477 9 21 9C21.5523 9 22 9.44772 22 10V15C22 15.5523 21.5523 16 21 16H16C15.4477 16 15 15.5523 15 15ZM3 20C2.44772 20 2 20.4477 2 21C2 21.5523 2.44772 22 3 22H21C21.5523 22 22 21.5523 22 21C22 20.4477 21.5523 20 21 20H3Z"
-                        fill="#958FC0"
+      )}
+      {!showOneClickTradingSettings && (
+        <div className="flex h-auto w-full flex-col bg-osmoverse-850">
+          <div className="relative flex h-20 items-center justify-center p-4">
+            <h6>{title}</h6>
+            <button
+              onClick={onClose}
+              className="absolute right-4 flex h-12 w-12 items-center justify-center rounded-full bg-osmoverse-800"
+            >
+              <Icon id="thin-x" className="text-wosmongton-200" />
+            </button>
+          </div>
+          <div
+            className={classNames("flex flex-col px-8", {
+              "pb-8": !diffGteSlippage,
+            })}
+          >
+            {orderType === "limit" && tab !== "swap" && (
+              <div className="sm:caption flex flex-col rounded-t-2xl border border-osmoverse-700 px-4 py-2">
+                <div className="flex items-center gap-4">
+                  <div className="flex h-10 min-w-10 items-center justify-center">
+                    {(tab === "buy" && !isBeyondOppositePrice) ||
+                    (tab === "sell" && isBeyondOppositePrice) ? (
+                      <svg
+                        width="24"
+                        height="24"
+                        viewBox="0 0 24 24"
+                        fill="none"
+                      >
+                        <path
+                          fillRule="evenodd"
+                          clipRule="evenodd"
+                          d="M15 15C15 14.4477 15.4477 14 16 14H18.5858L12.5 7.91421L9.20711 11.2071C9.01957 11.3946 8.76522 11.5 8.5 11.5C8.23478 11.5 7.98043 11.3946 7.79289 11.2071L2.29289 5.70711C1.90237 5.31658 1.90237 4.68342 2.29289 4.29289C2.68342 3.90237 3.31658 3.90237 3.70711 4.29289L8.5 9.08579L11.7929 5.79289C12.1834 5.40237 12.8166 5.40237 13.2071 5.79289L20 12.5858V10C20 9.44772 20.4477 9 21 9C21.5523 9 22 9.44772 22 10V15C22 15.5523 21.5523 16 21 16H16C15.4477 16 15 15.5523 15 15ZM3 20C2.44772 20 2 20.4477 2 21C2 21.5523 2.44772 22 3 22H21C21.5523 22 22 21.5523 22 21C22 20.4477 21.5523 20 21 20H3Z"
+                          fill="#958FC0"
+                        />
+                      </svg>
+                    ) : (
+                      <Icon
+                        id="trade"
+                        width={24}
+                        height={24}
+                        className="text-osmoverse-400"
                       />
-                    </svg>
-                  ) : (
-                    <Icon
-                      id="trade"
-                      width={24}
-                      height={24}
-                      className="text-osmoverse-400"
-                    />
+                    )}
+                  </div>
+                  <span className="flex-1 text-osmoverse-300">
+                    {t("limitOrders.priceReaches", {
+                      denom: baseDenom ?? "",
+                      price: limitPriceFiat
+                        ? formatPretty(
+                            limitPriceFiat,
+                            getPriceExtendedFormatOptions(
+                              limitPriceFiat.toDec()
+                            )
+                          )
+                        : "",
+                    })}
+                  </span>
+                  {percentAdjusted && (
+                    <div className="flex items-center">
+                      <div className="flex h-6 w-6 items-center justify-center">
+                        {!percentAdjusted.isZero() && (
+                          <Icon
+                            id="triangle-down"
+                            width={11}
+                            height={6}
+                            className={classNames({
+                              "rotate-180 text-bullish-400":
+                                (tab === "buy" && isBeyondOppositePrice) ||
+                                (tab === "sell" && !isBeyondOppositePrice),
+                              "rotate-0 text-rust-500":
+                                (tab === "buy" && !isBeyondOppositePrice) ||
+                                (tab === "sell" && isBeyondOppositePrice),
+                            })}
+                          />
+                        )}
+                      </div>
+                      <span>
+                        {formatPretty(percentAdjusted.mul(new Dec(100)).abs(), {
+                          maxDecimals: 3,
+                        })}
+                        %
+                      </span>
+                    </div>
                   )}
                 </div>
-                <span className="flex-1 text-osmoverse-300">
-                  {t("limitOrders.priceReaches", {
-                    denom: baseDenom ?? "",
-                    price: limitPriceFiat
-                      ? formatPretty(
-                          limitPriceFiat,
-                          getPriceExtendedFormatOptions(limitPriceFiat.toDec())
-                        )
-                      : "",
-                  })}
-                </span>
-                {percentAdjusted && (
-                  <div className="flex items-center">
-                    <div className="flex h-6 w-6 items-center justify-center">
-                      {!percentAdjusted.isZero() && (
-                        <Icon
-                          id="triangle-down"
-                          width={11}
-                          height={6}
-                          className={classNames({
-                            "rotate-180 text-bullish-400":
-                              (tab === "buy" && isBeyondOppositePrice) ||
-                              (tab === "sell" && !isBeyondOppositePrice),
-                            "rotate-0 text-rust-500":
-                              (tab === "buy" && !isBeyondOppositePrice) ||
-                              (tab === "sell" && isBeyondOppositePrice),
-                          })}
-                        />
-                      )}
-                    </div>
-                    <span>
-                      {formatPretty(percentAdjusted.mul(new Dec(100)).abs(), {
-                        maxDecimals: 3,
-                      })}
-                      %
-                    </span>
-                  </div>
-                )}
               </div>
-            </div>
-          )}
-          <div
-            className={classNames(
-              "flex flex-col rounded-b-2xl border border-osmoverse-700 p-2",
-              {
-                "rounded-t-2xl": orderType !== "limit",
-                "border-t-0": orderType === "limit",
-              }
             )}
-          >
-            <div className="flex items-end justify-between p-2">
-              <div className="flex items-center gap-4">
-                {fromAsset && (
-                  <Image
-                    src={fromAsset.coinImageUrl ?? ""}
-                    alt={`${fromAsset.coinDenom} image`}
-                    width={40}
-                    height={40}
-                    className="h-10 w-10"
-                  />
-                )}
-                <div className="flex flex-col">
-                  <p className="sm:caption text-osmoverse-300">
-                    {tab === "buy"
-                      ? t("limitOrders.pay")
-                      : t("limitOrders.sell")}
-                  </p>
-                  {inAmountToken && (
-                    <span className="subtitle1 sm:subtitle2">
-                      {formatPretty(inAmountToken)}
-                    </span>
+            <div
+              className={classNames(
+                "flex flex-col rounded-b-2xl border border-osmoverse-700 p-2",
+                {
+                  "rounded-t-2xl": orderType !== "limit",
+                  "border-t-0": orderType === "limit",
+                }
+              )}
+            >
+              <div className="flex items-end justify-between p-2">
+                <div className="flex items-center gap-4">
+                  {fromAsset && (
+                    <Image
+                      src={fromAsset.coinImageUrl ?? ""}
+                      alt={`${fromAsset.coinDenom} image`}
+                      width={40}
+                      height={40}
+                      className="h-10 w-10"
+                    />
                   )}
+                  <div className="flex flex-col">
+                    <p className="sm:caption text-osmoverse-300">
+                      {tab === "buy"
+                        ? t("limitOrders.pay")
+                        : t("limitOrders.sell")}
+                    </p>
+                    {inAmountToken && (
+                      <span className="subtitle1 sm:subtitle2">
+                        {formatPretty(inAmountToken)}
+                      </span>
+                    )}
+                  </div>
                 </div>
-              </div>
-              <div className="sm:subtitle2 flex flex-col items-end">
-                {formatFiatPrice(
-                  inAmountFiat ?? new PricePretty(DEFAULT_VS_CURRENCY, 0)
-                )}
-              </div>
-            </div>
-            <div className="flex items-center justify-between p-2">
-              <div className="flex items-center gap-4">
-                <div className="flex h-10 w-10 items-center justify-center">
-                  <Icon
-                    id="arrow-down"
-                    className="h-6 w-6 text-osmoverse-400"
-                  />
+                <div className="sm:subtitle2 flex flex-col items-end">
+                  {formatFiatPrice(
+                    inAmountFiat ?? new PricePretty(DEFAULT_VS_CURRENCY, 0)
+                  )}
                 </div>
               </div>
-            </div>
-            <div className="flex items-end justify-between p-2">
-              <div className="flex items-center gap-4">
-                {toAsset && (
-                  <Image
-                    src={toAsset.coinImageUrl ?? ""}
-                    alt={`${toAsset.coinDenom} image`}
-                    width={40}
-                    height={40}
-                    className="h-10 w-10"
-                  />
-                )}
-                <div className="flex flex-col">
-                  <p className="sm:caption text-osmoverse-300">
-                    {tab === "sell"
-                      ? t("limitOrders.receive")
-                      : t("portfolio.buy")}
-                  </p>
-                  <span className="subtitle1 sm:subtitle2">
-                    {expectedOutput && (
-                      <>
-                        {formatPretty(expectedOutput.toDec(), {
-                          minimumSignificantDigits: 6,
-                          maximumSignificantDigits: 6,
-                          maxDecimals: 10,
-                          notation: "standard",
-                        })}{" "}
-                        {toAsset?.coinDenom}
-                      </>
-                    )}
-                  </span>
+              <div className="flex items-center justify-between p-2">
+                <div className="flex items-center gap-4">
+                  <div className="flex h-10 w-10 items-center justify-center">
+                    <Icon
+                      id="arrow-down"
+                      className="h-6 w-6 text-osmoverse-400"
+                    />
+                  </div>
                 </div>
               </div>
-              <div className="flex flex-col items-end">
-                <p className="inline-flex flex-col items-end">
-                  {outputDifference && (
-                    <span
-                      className={classNames(
-                        "body2 sm:caption",
-                        showOutputDifferenceWarning
-                          ? "text-rust-400"
-                          : "text-osmoverse-300"
-                      )}
-                    >{`${
-                      outputDifference.toDec().isPositive() ? "-" : "+"
-                    }${new RatePretty(outputDifference.toDec().abs())}`}</span>
+              <div className="flex items-end justify-between p-2">
+                <div className="flex items-center gap-4">
+                  {toAsset && (
+                    <Image
+                      src={toAsset.coinImageUrl ?? ""}
+                      alt={`${toAsset.coinDenom} image`}
+                      width={40}
+                      height={40}
+                      className="h-10 w-10"
+                    />
                   )}
-                  <span className="sm:subtitle2">
-                    {formatFiatPrice(
-                      expectedOutputFiat ??
-                        new PricePretty(DEFAULT_VS_CURRENCY, 0)
+                  <div className="flex flex-col">
+                    <p className="sm:caption text-osmoverse-300">
+                      {tab === "sell"
+                        ? t("limitOrders.receive")
+                        : t("portfolio.buy")}
+                    </p>
+                    <span className="subtitle1 sm:subtitle2">
+                      {expectedOutput && (
+                        <>
+                          {formatPretty(expectedOutput.toDec(), {
+                            minimumSignificantDigits: 6,
+                            maximumSignificantDigits: 6,
+                            maxDecimals: 10,
+                            notation: "standard",
+                          })}{" "}
+                          {toAsset?.coinDenom}
+                        </>
+                      )}
+                    </span>
+                  </div>
+                </div>
+                <div className="flex flex-col items-end">
+                  <p className="inline-flex flex-col items-end">
+                    {outputDifference && (
+                      <span
+                        className={classNames(
+                          "body2 sm:caption",
+                          showOutputDifferenceWarning
+                            ? "text-rust-400"
+                            : "text-osmoverse-300"
+                        )}
+                      >{`${
+                        outputDifference.toDec().isPositive() ? "-" : "+"
+                      }${new RatePretty(
+                        outputDifference.toDec().abs()
+                      )}`}</span>
                     )}
-                  </span>
-                </p>
+                    <span className="sm:subtitle2">
+                      {formatFiatPrice(
+                        expectedOutputFiat ??
+                          new PricePretty(DEFAULT_VS_CURRENCY, 0)
+                      )}
+                    </span>
+                  </p>
+                </div>
               </div>
             </div>
-          </div>
-          <div className="flex flex-col">
-            <div
-              className={classNames("flex flex-col py-3", {
-                "text-rust-400": isBeyondOppositePrice,
-              })}
-            >
-              <RecapRow
-                left={t("limitOrders.orderType")}
-                right={
-                  <GenericDisclaimer
-                    disabled={!isBeyondOppositePrice}
-                    title={
-                      <span className="caption">
-                        {tab === "buy"
-                          ? t("limitOrders.aboveMarket.title")
-                          : t("limitOrders.belowMarket.title")}
-                      </span>
-                    }
-                    body={
-                      <span className="text-caption text-osmoverse-300">
-                        {tab === "buy"
-                          ? t("limitOrders.aboveMarket.description")
-                          : t("limitOrders.belowMarket.description")}
-                      </span>
-                    }
-                  >
-                    <div className="sm:caption flex items-center justify-center">
-                      {isBeyondOppositePrice && (
-                        <Icon
-                          id="alert-circle"
-                          className="mr-2"
-                          width={16}
-                          height={16}
-                        />
-                      )}
-                      {orderType === "limit"
-                        ? t("limitOrders.limit")
-                        : t("limitOrders.market")}
-                    </div>
-                  </GenericDisclaimer>
-                }
-              />
-              {slippageConfig && orderType === "market" && (
-                <div className="flex flex-col gap-3">
+            <div className="flex flex-col">
+              <div
+                className={classNames("flex flex-col py-3", {
+                  "text-rust-400": isBeyondOppositePrice,
+                })}
+              >
+                <RecapRow
+                  left={t("limitOrders.orderType")}
+                  right={
+                    <GenericDisclaimer
+                      disabled={!isBeyondOppositePrice}
+                      title={
+                        <span className="caption">
+                          {tab === "buy"
+                            ? t("limitOrders.aboveMarket.title")
+                            : t("limitOrders.belowMarket.title")}
+                        </span>
+                      }
+                      body={
+                        <span className="text-caption text-osmoverse-300">
+                          {tab === "buy"
+                            ? t("limitOrders.aboveMarket.description")
+                            : t("limitOrders.belowMarket.description")}
+                        </span>
+                      }
+                    >
+                      <div className="sm:caption flex items-center justify-center">
+                        {isBeyondOppositePrice && (
+                          <Icon
+                            id="alert-circle"
+                            className="mr-2"
+                            width={16}
+                            height={16}
+                          />
+                        )}
+                        {orderType === "limit"
+                          ? t("limitOrders.limit")
+                          : t("limitOrders.market")}
+                      </div>
+                    </GenericDisclaimer>
+                  }
+                />
+
+                {show1CT && is1CTEnabled && (
                   <RecapRow
-                    left={t("swap.settings.slippage")}
+                    left={t("oneClickTrading.reviewOrder.recapRowTitle")}
                     right={
-                      <div className="flex items-center justify-end">
-                        <div
-                          className={classNames(
-                            "flex w-fit items-center justify-center overflow-hidden rounded-lg py-1.5 pl-2 text-center transition-all sm:-my-0.5 sm:h-7",
-                            {
-                              "border-2 border-solid border-wosmongton-300 bg-osmoverse-900 pr-2":
-                                isEditingSlippage,
-                            }
-                          )}
-                        >
-                          <AutosizeInput
-                            type="text"
-                            inputMode="decimal"
-                            minWidth={30}
-                            placeholder={
-                              slippageConfig?.defaultManualSlippage + "%"
-                            }
-                            className="sm:caption w-fit bg-transparent px-0"
-                            inputClassName={classNames(
-                              "!bg-transparent focus:text-center text-right placeholder:text-wosmongton-300 transition-all focus-visible:outline-none",
+                      <OneClickTradingActiveSessionParamsEdit
+                        transactionParams={transaction1CTParams}
+                        changes={transaction1CTParamsChanges}
+                        onClick={() => setShowOneClickTradingSettings(true)}
+                        remainingSpendLimit={remaining1CTSpendLimit}
+                        wouldExceedSpendLimit={wouldExceedSpendLimit}
+                      />
+                    }
+                  />
+                )}
+                {slippageConfig && orderType === "market" && (
+                  <div className="flex flex-col gap-3">
+                    <RecapRow
+                      left={t("swap.settings.slippage")}
+                      right={
+                        <div className="flex items-center justify-end">
+                          <div
+                            className={classNames(
+                              "flex w-fit items-center justify-center overflow-hidden rounded-lg py-1.5 pl-2 text-center transition-all sm:-my-0.5 sm:h-7",
                               {
-                                "text-rust-400 placeholder:text-rust-400":
-                                  isManualSlippageTooHigh,
+                                "border-2 border-solid border-wosmongton-300 bg-osmoverse-900 pr-2":
+                                  isEditingSlippage,
                               }
                             )}
-                            value={manualSlippage}
-                            onFocus={() => {
-                              slippageConfig?.setIsManualSlippage(true);
-                              setIsEditingSlippage(true);
-                            }}
-                            onBlur={() => {
-                              if (
-                                isManualSlippageTooHigh &&
-                                +manualSlippage > 50
-                              ) {
-                                handleManualSlippageChange(
-                                  (+manualSlippage).toString().split("")[0]
-                                );
+                          >
+                            <AutosizeInput
+                              type="text"
+                              inputMode="decimal"
+                              minWidth={30}
+                              placeholder={
+                                slippageConfig?.defaultManualSlippage + "%"
                               }
-                              setIsEditingSlippage(false);
-                            }}
-                            onChange={(e) => {
-                              handleManualSlippageChange(e.target.value);
-
-                              logEvent([
-                                EventName.Swap.slippageToleranceSet,
+                              className="sm:caption w-fit bg-transparent px-0"
+                              inputClassName={classNames(
+                                "!bg-transparent focus:text-center text-right placeholder:text-wosmongton-300 transition-all focus-visible:outline-none",
                                 {
-                                  fromToken: fromAsset?.coinDenom,
-                                  toToken: toAsset?.coinDenom,
-                                  isOnHome: true,
-                                  percentage:
-                                    slippageConfig?.slippage.toString(),
-                                  page,
-                                },
-                              ]);
-                            }}
+                                  "text-rust-400 placeholder:text-rust-400":
+                                    isManualSlippageTooHigh,
+                                }
+                              )}
+                              value={manualSlippage}
+                              onFocus={() => {
+                                slippageConfig?.setIsManualSlippage(true);
+                                setIsEditingSlippage(true);
+                              }}
+                              onBlur={() => {
+                                if (
+                                  isManualSlippageTooHigh &&
+                                  +manualSlippage > 50
+                                ) {
+                                  handleManualSlippageChange(
+                                    (+manualSlippage).toString().split("")[0]
+                                  );
+                                }
+                                setIsEditingSlippage(false);
+                              }}
+                              onChange={(e) => {
+                                handleManualSlippageChange(e.target.value);
+
+                                logEvent([
+                                  EventName.Swap.slippageToleranceSet,
+                                  {
+                                    fromToken: fromAsset?.coinDenom,
+                                    toToken: toAsset?.coinDenom,
+                                    isOnHome: true,
+                                    percentage:
+                                      slippageConfig?.slippage.toString(),
+                                    page,
+                                  },
+                                ]);
+                              }}
+                            />
+                            {manualSlippage !== "" && (
+                              <span
+                                className={classNames({
+                                  "text-rust-400": isManualSlippageTooHigh,
+                                })}
+                              >
+                                %
+                              </span>
+                            )}
+                          </div>
+                        </div>
+                      }
+                    />
+                    {isManualSlippageTooHigh && (
+                      <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-rust-500 p-5">
+                        <Icon
+                          id="alert-triangle"
+                          width={24}
+                          height={24}
+                          className="text-rust-400"
+                        />
+                        <div className="flex flex-col gap-1">
+                          <span className="body2 sm:caption">
+                            {t(
+                              "limitOrders.errors.tradeMayResultInLossOfValue"
+                            )}
+                          </span>
+                          <span className="body2 sm:caption text-osmoverse-300">
+                            {t("limitOrders.lowerSlippageToleranceRecommended")}
+                          </span>
+                        </div>
+                      </div>
+                    )}
+                    {isManualSlippageTooLow && (
+                      <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-osmoverse-alpha-800/[.54] p-5">
+                        <svg
+                          width="24"
+                          height="24"
+                          viewBox="0 0 24 24"
+                          fill="none"
+                          xmlns="http://www.w3.org/2000/svg"
+                        >
+                          <path
+                            fillRule="evenodd"
+                            clipRule="evenodd"
+                            d="M12 22.5C17.799 22.5 22.5 17.799 22.5 12C22.5 6.20101 17.799 1.5 12 1.5C6.20101 1.5 1.5 6.20101 1.5 12C1.5 17.799 6.20101 22.5 12 22.5ZM12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24ZM13.5 7.49976C13.5 8.32818 12.8284 8.99976 12 8.99976C11.1716 8.99976 10.5 8.32818 10.5 7.49976C10.5 6.67133 11.1716 5.99976 12 5.99976C12.8284 5.99976 13.5 6.67133 13.5 7.49976ZM11.25 10.4998C10.8358 10.4998 10.5 10.8355 10.5 11.2498V17.2498C10.5 17.664 10.8358 17.9998 11.25 17.9998H12.75C13.1642 17.9998 13.5 17.664 13.5 17.2498V11.2498C13.5 10.8355 13.1642 10.4998 12.75 10.4998H11.25Z"
+                            fill="#736CA3"
                           />
-                          {manualSlippage !== "" && (
-                            <span
-                              className={classNames({
-                                "text-rust-400": isManualSlippageTooHigh,
-                              })}
-                            >
-                              %
-                            </span>
-                          )}
+                        </svg>
+                        <div className="flex flex-col gap-1">
+                          <span className="body2 sm:caption">
+                            {t("limitOrders.errors.tradeMayNotExecuted")}
+                          </span>
+                          <span className="body2 sm:caption text-osmoverse-300">
+                            {t("limitOrders.tryHigherSlippage")}
+                          </span>
                         </div>
                       </div>
+                    )}
+                  </div>
+                )}
+                {orderType === "market" && (
+                  <hr className="my-2 text-osmoverse-700" />
+                )}
+                {orderType === "market" ? (
+                  <RecapRow
+                    left={
+                      quoteType === "out-given-in"
+                        ? t("receiveAtLeast")
+                        : t("payAtMost")
+                    }
+                    right={
+                      <span className="sm:caption">
+                        {amountWithSlippage &&
+                          fiatAmountWithSlippage &&
+                          toAsset && (
+                            <span className="text-osmoverse-100">
+                              {formatPretty(amountWithSlippage, {
+                                maxDecimals: 6,
+                              })}{" "}
+                              {quoteType === "out-given-in"
+                                ? toAsset.coinDenom
+                                : fromAsset?.coinDenom}
+                            </span>
+                          )}{" "}
+                        {fiatAmountWithSlippage && (
+                          <span className="text-osmoverse-300">
+                            (~
+                            {formatPretty(fiatAmountWithSlippage, {
+                              ...getPriceExtendedFormatOptions(
+                                fiatAmountWithSlippage.toDec()
+                              ),
+                            })}
+                            )
+                          </span>
+                        )}
+                      </span>
                     }
                   />
-                  {isManualSlippageTooHigh && (
-                    <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-rust-500 p-5">
-                      <Icon
-                        id="alert-triangle"
-                        width={24}
-                        height={24}
-                        className="text-rust-400"
-                      />
-                      <div className="flex flex-col gap-1">
-                        <span className="body2 sm:caption">
-                          {t("limitOrders.errors.tradeMayResultInLossOfValue")}
-                        </span>
-                        <span className="body2 sm:caption text-osmoverse-300">
-                          {t("limitOrders.lowerSlippageToleranceRecommended")}
-                        </span>
-                      </div>
-                    </div>
-                  )}
-                  {isManualSlippageTooLow && (
-                    <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-osmoverse-alpha-800/[.54] p-5">
-                      <svg
-                        width="24"
-                        height="24"
-                        viewBox="0 0 24 24"
-                        fill="none"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          fillRule="evenodd"
-                          clipRule="evenodd"
-                          d="M12 22.5C17.799 22.5 22.5 17.799 22.5 12C22.5 6.20101 17.799 1.5 12 1.5C6.20101 1.5 1.5 6.20101 1.5 12C1.5 17.799 6.20101 22.5 12 22.5ZM12 24C18.6274 24 24 18.6274 24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24ZM13.5 7.49976C13.5 8.32818 12.8284 8.99976 12 8.99976C11.1716 8.99976 10.5 8.32818 10.5 7.49976C10.5 6.67133 11.1716 5.99976 12 5.99976C12.8284 5.99976 13.5 6.67133 13.5 7.49976ZM11.25 10.4998C10.8358 10.4998 10.5 10.8355 10.5 11.2498V17.2498C10.5 17.664 10.8358 17.9998 11.25 17.9998H12.75C13.1642 17.9998 13.5 17.664 13.5 17.2498V11.2498C13.5 10.8355 13.1642 10.4998 12.75 10.4998H11.25Z"
-                          fill="#736CA3"
-                        />
-                      </svg>
-                      <div className="flex flex-col gap-1">
-                        <span className="body2 sm:caption">
-                          {t("limitOrders.errors.tradeMayNotExecuted")}
-                        </span>
-                        <span className="body2 sm:caption text-osmoverse-300">
-                          {t("limitOrders.tryHigherSlippage")}
-                        </span>
-                      </div>
-                    </div>
-                  )}
-                </div>
-              )}
-              {orderType === "market" && (
-                <hr className="my-2 text-osmoverse-700" />
-              )}
-              {orderType === "market" ? (
+                ) : (
+                  <RecapRow
+                    left={t("tradeFee")}
+                    right={
+                      <span className="sm:caption text-bullish-400">
+                        {t("transfer.free")}
+                      </span>
+                    }
+                  />
+                )}
                 <RecapRow
-                  left={
-                    quoteType === "out-given-in"
-                      ? t("receiveAtLeast")
-                      : t("payAtMost")
-                  }
+                  left={t("swap.gas.additionalNetworkFee")}
                   right={
-                    <span className="sm:caption">
-                      {amountWithSlippage &&
-                        fiatAmountWithSlippage &&
-                        toAsset && (
-                          <span className="text-osmoverse-100">
-                            {formatPretty(amountWithSlippage, {
-                              maxDecimals: 6,
-                            })}{" "}
-                            {quoteType === "out-given-in"
-                              ? toAsset.coinDenom
-                              : fromAsset?.coinDenom}
-                          </span>
-                        )}{" "}
-                      {fiatAmountWithSlippage && (
-                        <span className="text-osmoverse-300">
-                          (~
-                          {formatPretty(fiatAmountWithSlippage, {
-                            ...getPriceExtendedFormatOptions(
-                              fiatAmountWithSlippage.toDec()
-                            ),
-                          })}
-                          )
-                        </span>
-                      )}
-                    </span>
+                    // Do not show skeleton unless there has been no estimation/error yet
+                    !!gasAmount || !!gasError ? (
+                      GasEstimation
+                    ) : (
+                      <Skeleton className="h-5 w-16" />
+                    )
                   }
                 />
-              ) : (
-                <RecapRow
-                  left={t("tradeFee")}
-                  right={
-                    <span className="sm:caption text-bullish-400">
-                      {t("transfer.free")}
+              </div>
+              {isBeyondOppositePrice && orderType === "limit" && (
+                <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-rust-500 p-5">
+                  <Icon
+                    id="alert-triangle"
+                    width={24}
+                    height={24}
+                    className="text-rust-400"
+                  />
+                  <div className="body2 sm:caption flex flex-col gap-1">
+                    <span>
+                      {tab === "buy"
+                        ? t("limitOrders.aboveMarket.title")
+                        : t("limitOrders.belowMarket.title")}
+                    </span>
+                    <span className="text-osmoverse-300">
+                      {tab === "buy"
+                        ? t("limitOrders.aboveMarket.description")
+                        : t("limitOrders.belowMarket.description")}
                     </span>
+                  </div>
+                </div>
+              )}
+              {show1CT && !is1CTEnabled && (
+                <OneClickTradingPanel
+                  t={t}
+                  transactionParams={transaction1CTParams}
+                  onClick={() =>
+                    setTransaction1CTParams((prev) => {
+                      if (!prev) return;
+
+                      return {
+                        ...prev,
+                        isOneClickEnabled: !prev.isOneClickEnabled,
+                      };
+                    })
                   }
+                  onParamsChange={() => setShowOneClickTradingSettings(true)}
                 />
               )}
-              <RecapRow
-                left={t("swap.gas.additionalNetworkFee")}
-                right={
-                  // Do not show skeleton unless there has been no estimation/error yet
-                  !!gasAmount || !!gasError ? (
-                    GasEstimation
-                  ) : (
-                    <Skeleton className="h-5 w-16" />
-                  )
-                }
-              />
+              {!diffGteSlippage && (
+                <div className="flex w-full justify-between gap-3 pt-3">
+                  <Button
+                    mode="primary"
+                    onClick={commit1CTSessionChange}
+                    disabled={
+                      isConfirmationDisabled ||
+                      commit1CTSessionChangeIsLoading ||
+                      wouldExceedSpendLimit
+                    }
+                    className="body2 sm:caption !rounded-2xl"
+                  >
+                    <h6>{t("limitOrders.confirm")}</h6>
+                  </Button>
+                </div>
+              )}
             </div>
-            {isBeyondOppositePrice && orderType === "limit" && (
-              <div className="flex items-start gap-3 rounded-3x4pxlinset border-2 border-solid border-rust-500 p-5">
-                <Icon
-                  id="alert-triangle"
-                  width={24}
-                  height={24}
-                  className="text-rust-400"
-                />
-                <div className="body2 sm:caption flex flex-col gap-1">
-                  <span>
-                    {tab === "buy"
-                      ? t("limitOrders.aboveMarket.title")
-                      : t("limitOrders.belowMarket.title")}
-                  </span>
-                  <span className="text-osmoverse-300">
-                    {tab === "buy"
-                      ? t("limitOrders.aboveMarket.description")
-                      : t("limitOrders.belowMarket.description")}
-                  </span>
+          </div>
+          {diffGteSlippage && (
+            <div className="flex w-full px-5 pb-8">
+              <div className="flex w-full items-center justify-between gap-3 rounded-2xl bg-osmoverse-800 p-3">
+                <div className="flex h-6 w-6 items-center justify-center">
+                  <Icon
+                    id="alert-triangle"
+                    className="text-ammelia-400"
+                    width={20}
+                    height={17}
+                  />
                 </div>
-              </div>
-            )}
-            {!diffGteSlippage && (
-              <div className="flex w-full justify-between gap-3 pt-3">
+                <span className="subtitle1 w-full">
+                  {t("limitOrders.quoteUpdated")}
+                </span>
                 <Button
                   mode="primary"
-                  onClick={confirmAction}
-                  disabled={isConfirmationDisabled}
-                  className="body2 sm:caption !rounded-2xl"
+                  onClick={restart}
+                  className="body2 w-fit !rounded-2xl"
                 >
-                  <h6>{t("limitOrders.confirm")}</h6>
+                  <h6>{t("limitOrders.accept")}</h6>
                 </Button>
               </div>
-            )}
-          </div>
+            </div>
+          )}
         </div>
-        {diffGteSlippage && (
-          <div className="flex w-full px-5 pb-8">
-            <div className="flex w-full items-center justify-between gap-3 rounded-2xl bg-osmoverse-800 p-3">
-              <div className="flex h-6 w-6 items-center justify-center">
-                <Icon
-                  id="alert-triangle"
-                  className="text-ammelia-400"
-                  width={20}
-                  height={17}
-                />
-              </div>
-              <span className="subtitle1 w-full">
-                {t("limitOrders.quoteUpdated")}
-              </span>
-              <Button
-                mode="primary"
-                onClick={() => restart}
-                className="body2 w-fit !rounded-2xl"
-              >
-                <h6>{t("limitOrders.accept")}</h6>
-              </Button>
+      )}
+    </ModalBase>
+  );
+}
+
+const OneClickTradingPanel = ({
+  t,
+  transactionParams,
+  onClick,
+  onParamsChange,
+}: {
+  t: MultiLanguageT;
+  transactionParams: OneClickTradingTransactionParams | undefined;
+  onClick: () => void;
+  onParamsChange: () => void;
+}) => {
+  return (
+    <>
+      <div className="flex flex-col my-3">
+        <div
+          className="flex gap-4 rounded-2xl bg-osmoverse-alpha-800 px-4 py-3"
+          onClick={onClick}
+        >
+          <Image
+            src="/images/1ct-rounded-rectangle.svg"
+            alt="1ct rounded rectangle icon"
+            width={48}
+            height={48}
+            className="self-start rounded-none"
+          />
+          <div className="flex flex-col gap-1">
+            <div className="flex flex-col gap-1">
+              <p className="subtitle1">
+                {t("oneClickTrading.reviewOrder.enableTitle")}
+              </p>
+
+              <p className="text-body2 font-body2 text-osmoverse-300">
+                {t("oneClickTrading.reviewOrder.enableDescription")}
+              </p>
             </div>
           </div>
+          <div className="flex items-center justify-center ml-auto">
+            <Switch checked={transactionParams?.isOneClickEnabled ?? false} />
+          </div>
+        </div>
+        {transactionParams?.isOneClickEnabled && (
+          <p className="text-body2 font-body2 text-osmoverse-300">
+            {t("oneClickTrading.reviewOrder.paramsDescription", {
+              sessionLength: t(
+                `oneClickTrading.sessionPeriods.${
+                  transactionParams?.sessionPeriod.end ?? "1hour"
+                }`
+              ),
+              spendLimit:
+                transactionParams?.spendLimit.toString() ??
+                t("oneClickTrading.reviewOrder.defaultSpendLimit"),
+            })}
+            {" · "}
+            <UIButton
+              variant="link"
+              size="md"
+              className="text-wosmongton-300 px-0 py-0"
+              onClick={onParamsChange}
+            >
+              {t("oneClickTrading.reviewOrder.change")}
+            </UIButton>
+          </p>
         )}
       </div>
-    </ModalBase>
+    </>
   );
-}
+};
+
+const OneClickTradingActiveSessionParamsEdit = ({
+  onClick,
+  changes = [],
+  transactionParams,
+  remainingSpendLimit,
+  wouldExceedSpendLimit,
+}: {
+  remainingSpendLimit?: string;
+  changes: OneClickTradingParamsChanges;
+  transactionParams: OneClickTradingTransactionParams | undefined;
+  onClick: () => void;
+  wouldExceedSpendLimit?: boolean;
+}) => {
+  const { t } = useTranslation();
+
+  return wouldExceedSpendLimit ? (
+    <>
+      <div className="flex items-center gap-2">
+        <UIButton
+          variant="secondary-outline"
+          onClick={onClick}
+          size="xsm"
+          className="text-wosmongton-500 rounded-3xl"
+        >
+          {t("oneClickTrading.reviewOrder.edit")}
+        </UIButton>
+        <GenericDisclaimer
+          title={t("oneClickTrading.reviewOrder.exceededTooltip.title")}
+          body={t("oneClickTrading.reviewOrder.exceededTooltip.body")}
+        >
+          <span className="body2 text-rust-400">
+            {t("oneClickTrading.reviewOrder.exceeded")}
+          </span>
+        </GenericDisclaimer>
+      </div>
+    </>
+  ) : (
+    <UIButton
+      variant="link"
+      size="md"
+      className="text-wosmongton-300 px-0 py-0"
+      onClick={onClick}
+    >
+      <span className="body1 text-wosmongton-200 whitespace-nowrap">
+        {changes.includes("spendLimit") ? (
+          <span className="text-bullish-400">
+            {transactionParams?.spendLimit.toString()}
+          </span>
+        ) : (
+          <span> {remainingSpendLimit} </span>
+        )}
+        {" / "}
+        {changes.includes("sessionPeriod") ? (
+          <span className="text-bullish-400">
+            {transactionParams?.sessionPeriod.end}
+          </span>
+        ) : (
+          <OneClickTradingRemainingTime className="inline" useShortTimeUnits />
+        )}
+      </span>
+    </UIButton>
+  );
+};
diff --git a/packages/web/public/images/1ct-rounded-rectangle.svg b/packages/web/public/images/1ct-rounded-rectangle.svg
new file mode 100644
index 0000000000..475eb0481d
--- /dev/null
+++ b/packages/web/public/images/1ct-rounded-rectangle.svg
@@ -0,0 +1,5 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none"
+  xmlns="http://www.w3.org/2000/svg">
+  <rect width="48" height="48" rx="16" fill="#CA2EBD"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.7218 32.6329L10.5 10.498L32.6349 19.7198L23.8111 22.7168C23.9376 22.7578 24.0566 22.8286 24.157 22.9291L31.9832 30.7552C32.3227 31.0948 32.3227 31.6454 31.9832 31.9849C31.6436 32.3245 31.093 32.3245 30.7534 31.9849L22.9273 24.1588C22.8278 24.0593 22.7574 23.9417 22.7162 23.8166L19.7218 32.6329ZM26.3865 35.3832C26.7261 35.0436 27.2767 35.0436 27.6163 35.3832L30.6163 38.3832C30.9559 38.7228 30.9559 39.2733 30.6163 39.6129C30.2767 39.9525 29.7261 39.9525 29.3865 39.6129L26.3865 36.6129C26.047 36.2733 26.047 35.7228 26.3865 35.3832ZM36.6164 26.3832C36.2768 26.0436 35.7262 26.0436 35.3866 26.3832C35.047 26.7228 35.047 27.2733 35.3866 27.6129L38.3866 30.6129C38.7262 30.9525 39.2768 30.9525 39.6164 30.6129C39.956 30.2733 39.956 29.7228 39.6164 29.3832L36.6164 26.3832Z" fill="#F8DEF3"/>
+</svg>
diff --git a/packages/web/utils/date.ts b/packages/web/utils/date.ts
index 92e3542b0d..c0885f39ac 100644
--- a/packages/web/utils/date.ts
+++ b/packages/web/utils/date.ts
@@ -1,6 +1,9 @@
 import dayjs from "dayjs";
 
-export function humanizeTime(date: dayjs.Dayjs): {
+export function humanizeTime(
+  date: dayjs.Dayjs,
+  useShortTimeUnits = false
+): {
   value: number | string;
   unitTranslationKey: string;
 } {
@@ -10,7 +13,13 @@ export function humanizeTime(date: dayjs.Dayjs): {
     return {
       value: Math.max(secondsDiff, 0),
       unitTranslationKey:
-        secondsDiff === 1 ? "timeUnits.second" : "timeUnits.seconds",
+        secondsDiff === 1
+          ? useShortTimeUnits
+            ? "timeUnitsShort.second"
+            : "timeUnits.second"
+          : useShortTimeUnits
+          ? "timeUnitsShort.seconds"
+          : "timeUnits.seconds",
     };
   }
 
@@ -19,7 +28,13 @@ export function humanizeTime(date: dayjs.Dayjs): {
     return {
       value: minutesDiff,
       unitTranslationKey:
-        minutesDiff === 1 ? "timeUnits.minute" : "timeUnits.minutes",
+        minutesDiff === 1
+          ? useShortTimeUnits
+            ? "timeUnitsShort.minute"
+            : "timeUnits.minute"
+          : useShortTimeUnits
+          ? "timeUnitsShort.minutes"
+          : "timeUnits.minutes",
     };
   }
 
@@ -28,7 +43,13 @@ export function humanizeTime(date: dayjs.Dayjs): {
     return {
       value: hoursDiff,
       unitTranslationKey:
-        hoursDiff === 1 ? "timeUnits.hour" : "timeUnits.hours",
+        hoursDiff === 1
+          ? useShortTimeUnits
+            ? "timeUnitsShort.hour"
+            : "timeUnits.hour"
+          : useShortTimeUnits
+          ? "timeUnitsShort.hours"
+          : "timeUnits.hours",
     };
   }
 
@@ -36,7 +57,14 @@ export function humanizeTime(date: dayjs.Dayjs): {
   if (daysDiff < 30) {
     return {
       value: daysDiff,
-      unitTranslationKey: daysDiff === 1 ? "timeUnits.day" : "timeUnits.days",
+      unitTranslationKey:
+        daysDiff === 1
+          ? useShortTimeUnits
+            ? "timeUnitsShort.day"
+            : "timeUnits.day"
+          : useShortTimeUnits
+          ? "timeUnitsShort.days"
+          : "timeUnits.days",
     };
   }
 
diff --git a/packages/web/utils/trpc.ts b/packages/web/utils/trpc.ts
index 0262453604..77b1146a0e 100644
--- a/packages/web/utils/trpc.ts
+++ b/packages/web/utils/trpc.ts
@@ -121,8 +121,9 @@ export const api = createTRPCNext<AppRouter>({
       links: [
         loggerLink({
           enabled: (opts) =>
-            process.env.NODE_ENV === "development" ||
-            (opts.direction === "down" && opts.result instanceof Error),
+            process.env.NEXT_PUBLIC_TRPC_LOGS !== "off" &&
+            (process.env.NODE_ENV === "development" ||
+              (opts.direction === "down" && opts.result instanceof Error)),
         }),
         /**
          * Split calls to the node server and the edge server.