diff --git a/src/components/Acknowledgement/Acknowledgement.tsx b/src/components/Acknowledgement/Acknowledgement.tsx
index 7c841f46c0d..b039c7b54c2 100644
--- a/src/components/Acknowledgement/Acknowledgement.tsx
+++ b/src/components/Acknowledgement/Acknowledgement.tsx
@@ -1,86 +1,25 @@
-import type { BoxProps, ComponentWithAs, IconProps, ThemeTypings } from '@chakra-ui/react'
-import { Box, Button, Checkbox, Link, useColorModeValue } from '@chakra-ui/react'
-import type { AnimationDefinition, MotionStyle } from 'framer-motion'
-import { AnimatePresence, motion } from 'framer-motion'
+import type { ComponentWithAs, IconProps, ThemeTypings } from '@chakra-ui/react'
+import {
+  Box,
+  Button,
+  Checkbox,
+  Link,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalOverlay,
+  useColorModeValue,
+} from '@chakra-ui/react'
 import type { InterpolationOptions } from 'node-polyglot'
-import type { PropsWithChildren } from 'react'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { FiAlertTriangle } from 'react-icons/fi'
 import { useTranslate } from 'react-polyglot'
 import { StreamIcon } from 'components/Icons/Stream'
 import { RawText, Text } from 'components/Text'
 import { formatSecondsToDuration } from 'lib/utils/time'
 
-const initialProps = { opacity: 0 }
-const animateProps = { opacity: 1 }
-const exitProps = { opacity: 0, transition: { duration: 0.5 } }
-const transitionProps = { delay: 0.2, duration: 0.1 }
-const motionStyle: MotionStyle = {
-  backgroundColor: 'var(--chakra-colors-blanket)',
-  position: 'absolute',
-  top: 0,
-  bottom: 0,
-  left: 0,
-  right: 0,
-  zIndex: 4,
-}
-
-const AcknowledgementOverlay: React.FC<PropsWithChildren> = ({ children }) => {
-  return (
-    <motion.div
-      key='overlay'
-      style={motionStyle}
-      initial={initialProps}
-      animate={animateProps}
-      exit={exitProps}
-      transition={transitionProps}
-    >
-      {children}
-    </motion.div>
-  )
-}
-
-const popoverVariants = {
-  initial: {
-    y: '100%',
-  },
-  animate: {
-    y: 0,
-    transition: {
-      type: 'spring',
-      bounce: 0.2,
-      duration: 0.55,
-    },
-  },
-  exit: {
-    y: '100%',
-    opacity: 0,
-    transition: {
-      duration: 0.2,
-    },
-  },
-}
-
-const popoverStyle: MotionStyle = {
-  backgroundColor: 'var(--chakra-colors-background-surface-overlay-base)',
-  position: 'absolute',
-  borderTopLeftRadius: 'var(--chakra-radii-2xl)',
-  borderTopRightRadius: 'var(--chakra-radii-2xl)',
-  bottom: 0,
-  left: 0,
-  right: 0,
-  zIndex: 5,
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'center',
-  paddingLeft: '2rem',
-  paddingRight: '2rem',
-  paddingBottom: '2rem',
-  paddingTop: '4rem',
-}
-
 type AcknowledgementProps = {
-  children: React.ReactNode
   content?: JSX.Element
   message: string | JSX.Element
   onAcknowledge: (() => void) | undefined
@@ -91,7 +30,6 @@ type AcknowledgementProps = {
   buttonTranslation?: string | [string, InterpolationOptions]
   icon?: ComponentWithAs<'svg', IconProps>
   disableButton?: boolean
-  boxProps?: BoxProps
 }
 
 type StreamingAcknowledgementProps = Omit<AcknowledgementProps, 'message'> & {
@@ -100,10 +38,8 @@ type StreamingAcknowledgementProps = Omit<AcknowledgementProps, 'message'> & {
 type ArbitrumAcknowledgementProps = Omit<AcknowledgementProps, 'message'>
 
 const cancelHoverProps = { bg: 'rgba(255, 255, 255, 0.2)' }
-const boxBorderRadius = { base: 'none', md: 'xl' }
 
 export const Acknowledgement = ({
-  children,
   content,
   message,
   onAcknowledge,
@@ -114,10 +50,8 @@ export const Acknowledgement = ({
   buttonTranslation,
   disableButton,
   icon: CustomIcon,
-  boxProps,
 }: AcknowledgementProps) => {
   const translate = useTranslate()
-  const [isShowing, setIsShowing] = useState(false)
 
   const understandHoverProps = useMemo(
     () => ({ bg: `${buttonColorScheme}.600` }),
@@ -135,88 +69,51 @@ export const Acknowledgement = ({
     setShouldShowAcknowledgement(false)
   }, [setShouldShowAcknowledgement])
 
-  const handleAnimationComplete = useCallback((def: AnimationDefinition) => {
-    if (def === 'exit') {
-      setIsShowing(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    // enters with overflow: hidden
-    // exit after animation complete return to overflow: visible
-    if (shouldShowAcknowledgement) {
-      setIsShowing(true)
-    }
-  }, [shouldShowAcknowledgement])
-
   return (
-    <Box
-      position={boxProps?.position ?? 'relative'}
-      borderRadius={boxBorderRadius}
-      overflow={isShowing ? 'hidden' : 'visible'}
-      width={'100%'}
-      {...boxProps}
-    >
-      <AnimatePresence mode='wait' initial={false}>
-        {shouldShowAcknowledgement && (
-          <AcknowledgementOverlay>
-            <motion.div
-              layout
-              key='message'
-              variants={popoverVariants}
-              initial='initial'
-              animate='animate'
-              exit='exit'
-              style={popoverStyle}
-              onAnimationComplete={handleAnimationComplete}
-            >
-              {CustomIcon ? (
-                <CustomIcon color={`${iconColorScheme}.500`} boxSize='80px' mb={4} />
-              ) : (
-                <Box as={FiAlertTriangle} color={`${iconColorScheme}.500`} size='80px' mb={4} />
-              )}
-              <Text
-                translation={'warningAcknowledgement.attention'}
-                fontWeight='semibold'
-                fontSize='2xl'
-              />
-              <Box
-                textAlign={'center'}
-                maxWidth='100%'
-                mb={8}
-                fontWeight='medium'
-                color='text.subtle'
-              >
-                <RawText>{message}</RawText>
-                {content}
-              </Box>
-              <Button
-                size='lg'
-                mb={2}
-                colorScheme={buttonColorScheme}
-                width='full'
-                onClick={handleAcknowledge}
-                isDisabled={disableButton}
-                _hover={understandHoverProps}
-              >
-                <Text translation={buttonTranslation ?? 'warningAcknowledgement.understand'} />
-              </Button>
-              <Button
-                size='lg'
-                width='full'
-                colorScheme='gray'
-                onClick={handleCancel}
-                _hover={cancelHoverProps}
-              >
-                {translate('common.cancel')}
-              </Button>
-            </motion.div>
-          </AcknowledgementOverlay>
-        )}
-      </AnimatePresence>
-
-      {children}
-    </Box>
+    <Modal isOpen={shouldShowAcknowledgement} onClose={handleCancel}>
+      <ModalOverlay />
+      <ModalContent>
+        <ModalBody paddingTop='2rem' display='flex' flexDirection='column' alignItems='center'>
+          {CustomIcon ? (
+            <CustomIcon color={`${iconColorScheme}.500`} boxSize='80px' mb={4} />
+          ) : (
+            <Box as={FiAlertTriangle} color={`${iconColorScheme}.500`} size='80px' mb={4} />
+          )}
+          <Text
+            translation={'warningAcknowledgement.attention'}
+            fontWeight='semibold'
+            fontSize='2xl'
+          />
+          <Box textAlign={'center'} maxWidth='100%' fontWeight='medium' color='text.subtle'>
+            <RawText>{message}</RawText>
+            {content}
+          </Box>
+        </ModalBody>
+
+        <ModalFooter display='flex' flexDirection='column' alignItems='center'>
+          <Button
+            size='lg'
+            mb={2}
+            colorScheme={buttonColorScheme}
+            width='full'
+            onClick={handleAcknowledge}
+            isDisabled={disableButton}
+            _hover={understandHoverProps}
+          >
+            <Text translation={buttonTranslation ?? 'warningAcknowledgement.understand'} />
+          </Button>
+          <Button
+            size='lg'
+            width='full'
+            colorScheme='gray'
+            onClick={handleCancel}
+            _hover={cancelHoverProps}
+          >
+            {translate('common.cancel')}
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
   )
 }
 
diff --git a/src/components/MultiHopTrade/components/LimitOrder/LimitOrder.tsx b/src/components/MultiHopTrade/components/LimitOrder/LimitOrder.tsx
index d378f512cb9..8db0a52def1 100644
--- a/src/components/MultiHopTrade/components/LimitOrder/LimitOrder.tsx
+++ b/src/components/MultiHopTrade/components/LimitOrder/LimitOrder.tsx
@@ -29,10 +29,6 @@ import { useAccountIds } from '../../hooks/useAccountIds'
 import { SharedTradeInput } from '../SharedTradeInput/SharedTradeInput'
 
 const votingPowerParams: { feeModel: ParameterModel } = { feeModel: 'SWAPPER' }
-const acknowledgementBoxProps = {
-  display: 'flex',
-  justifyContent: 'center',
-}
 
 type LimitOrderProps = {
   tradeInputRef: React.MutableRefObject<HTMLDivElement | null>
@@ -157,13 +153,13 @@ export const LimitOrder = ({ isCompact, tradeInputRef, onChangeTab }: LimitOrder
   )
 
   return (
-    <WarningAcknowledgement
-      message={warningAcknowledgementMessage}
-      onAcknowledge={handleWarningAcknowledgementSubmit}
-      shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
-      setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-      boxProps={acknowledgementBoxProps}
-    >
+    <>
+      <WarningAcknowledgement
+        message={warningAcknowledgementMessage}
+        onAcknowledge={handleWarningAcknowledgementSubmit}
+        shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
+      />
       <SharedTradeInput
         activeQuote={activeQuote}
         buyAmountAfterFeesCryptoPrecision={buyAmountAfterFeesCryptoPrecision}
@@ -189,6 +185,6 @@ export const LimitOrder = ({ isCompact, tradeInputRef, onChangeTab }: LimitOrder
         setSellAssetAccountId={setSellAssetAccountId}
         onChangeTab={onChangeTab}
       />
-    </WarningAcknowledgement>
+    </>
   )
 }
diff --git a/src/components/MultiHopTrade/components/MultiHopTradeConfirm/MultiHopTradeConfirm.tsx b/src/components/MultiHopTrade/components/MultiHopTradeConfirm/MultiHopTradeConfirm.tsx
index d6e7f6a573f..24795f80c49 100644
--- a/src/components/MultiHopTrade/components/MultiHopTradeConfirm/MultiHopTradeConfirm.tsx
+++ b/src/components/MultiHopTrade/components/MultiHopTradeConfirm/MultiHopTradeConfirm.tsx
@@ -111,40 +111,39 @@ export const MultiHopTradeConfirm = memo(() => {
           onAcknowledge={handleTradeConfirm}
           shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
           setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-        >
-          <CardHeader px={6} pt={4}>
-            <WithBackButton onBack={handleBack}>
-              <Heading textAlign='center' fontSize='md'>
-                <Text
-                  translation={
-                    [TradeExecutionState.Initializing, TradeExecutionState.Previewing].includes(
-                      confirmedTradeExecutionState,
-                    )
-                      ? 'trade.confirmDetails'
-                      : 'trade.trade'
-                  }
-                />
-              </Heading>
-            </WithBackButton>
-          </CardHeader>
-          {isTradeComplete ? (
-            <TradeSuccess handleBack={handleBack}>
-              <Hops isFirstHopOpen isSecondHopOpen />
-            </TradeSuccess>
-          ) : (
-            <>
-              <CardBody py={0} px={0}>
-                <Hops
-                  isFirstHopOpen={isFirstHopOpen}
-                  isSecondHopOpen={isSecondHopOpen}
-                  onToggleFirstHop={onToggleFirstHop}
-                  onToggleSecondHop={onToggleSecondHop}
-                />
-              </CardBody>
-              <Footer isLoading={isLoading} handleSubmit={handleSubmit} />
-            </>
-          )}
-        </WarningAcknowledgement>
+        />
+        <CardHeader px={6} pt={4}>
+          <WithBackButton onBack={handleBack}>
+            <Heading textAlign='center' fontSize='md'>
+              <Text
+                translation={
+                  [TradeExecutionState.Initializing, TradeExecutionState.Previewing].includes(
+                    confirmedTradeExecutionState,
+                  )
+                    ? 'trade.confirmDetails'
+                    : 'trade.trade'
+                }
+              />
+            </Heading>
+          </WithBackButton>
+        </CardHeader>
+        {isTradeComplete ? (
+          <TradeSuccess handleBack={handleBack}>
+            <Hops isFirstHopOpen isSecondHopOpen />
+          </TradeSuccess>
+        ) : (
+          <>
+            <CardBody py={0} px={0}>
+              <Hops
+                isFirstHopOpen={isFirstHopOpen}
+                isSecondHopOpen={isSecondHopOpen}
+                onToggleFirstHop={onToggleFirstHop}
+                onToggleSecondHop={onToggleSecondHop}
+              />
+            </CardBody>
+            <Footer isLoading={isLoading} handleSubmit={handleSubmit} />
+          </>
+        )}
       </Card>
     </TradeSlideTransition>
   )
diff --git a/src/components/MultiHopTrade/components/TradeInput/TradeInput.tsx b/src/components/MultiHopTrade/components/TradeInput/TradeInput.tsx
index 8f0735ecceb..7d46a056ebb 100644
--- a/src/components/MultiHopTrade/components/TradeInput/TradeInput.tsx
+++ b/src/components/MultiHopTrade/components/TradeInput/TradeInput.tsx
@@ -50,10 +50,6 @@ import { CollapsibleQuoteList } from './components/CollapsibleQuoteList'
 import { TradeSettingsMenu } from './components/TradeSettingsMenu'
 
 const votingPowerParams: { feeModel: ParameterModel } = { feeModel: 'SWAPPER' }
-const acknowledgementBoxProps = {
-  display: 'flex',
-  justifyContent: 'center',
-}
 
 const STREAM_ACKNOWLEDGEMENT_MINIMUM_TIME_THRESHOLD = 1_000 * 60 * 5
 
@@ -270,52 +266,46 @@ export const TradeInput = ({ isCompact, tradeInputRef, onChangeTab }: TradeInput
         onAcknowledge={handleFormSubmit}
         shouldShowAcknowledgement={shouldShowArbitrumBridgeAcknowledgement}
         setShouldShowAcknowledgement={setShouldShowArbitrumBridgeAcknowledgement}
-        boxProps={acknowledgementBoxProps}
-      >
-        <StreamingAcknowledgement
-          onAcknowledge={handleFormSubmit}
-          shouldShowAcknowledgement={shouldShowStreamingAcknowledgement}
-          setShouldShowAcknowledgement={setShouldShowStreamingAcknowledgement}
-          estimatedTimeMs={
-            tradeQuoteStep?.estimatedExecutionTimeMs ? tradeQuoteStep.estimatedExecutionTimeMs : 0
-          }
-          boxProps={acknowledgementBoxProps}
-        >
-          <WarningAcknowledgement
-            message={warningAcknowledgementMessage}
-            onAcknowledge={handleWarningAcknowledgementSubmit}
-            shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
-            setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-            boxProps={acknowledgementBoxProps}
-          >
-            <SharedTradeInput
-              activeQuote={activeQuote}
-              buyAmountAfterFeesCryptoPrecision={buyAmountAfterFeesCryptoPrecision}
-              buyAmountAfterFeesUserCurrency={buyAmountAfterFeesUserCurrency}
-              buyAsset={buyAsset}
-              hasUserEnteredAmount={hasUserEnteredAmount}
-              headerRightContent={headerRightContent}
-              buyAssetAccountId={buyAssetAccountId}
-              sellAssetAccountId={sellAssetAccountId}
-              isCompact={isCompact}
-              isLoading={isLoading}
-              manualReceiveAddress={manualReceiveAddress}
-              sellAsset={sellAsset}
-              sideComponent={CollapsibleQuoteList}
-              tradeInputRef={tradeInputRef}
-              tradeInputTab={TradeInputTab.Trade}
-              walletReceiveAddress={walletReceiveAddress}
-              handleSwitchAssets={handleSwitchAssets}
-              onSubmit={handleTradeQuoteConfirm}
-              setBuyAsset={setBuyAsset}
-              setBuyAssetAccountId={setBuyAssetAccountId}
-              setSellAsset={setSellAsset}
-              setSellAssetAccountId={setSellAssetAccountId}
-              onChangeTab={onChangeTab}
-            />
-          </WarningAcknowledgement>
-        </StreamingAcknowledgement>
-      </ArbitrumBridgeAcknowledgement>
+      />
+      <StreamingAcknowledgement
+        onAcknowledge={handleFormSubmit}
+        shouldShowAcknowledgement={shouldShowStreamingAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowStreamingAcknowledgement}
+        estimatedTimeMs={
+          tradeQuoteStep?.estimatedExecutionTimeMs ? tradeQuoteStep.estimatedExecutionTimeMs : 0
+        }
+      />
+      <WarningAcknowledgement
+        message={warningAcknowledgementMessage}
+        onAcknowledge={handleWarningAcknowledgementSubmit}
+        shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
+      />
+      <SharedTradeInput
+        activeQuote={activeQuote}
+        buyAmountAfterFeesCryptoPrecision={buyAmountAfterFeesCryptoPrecision}
+        buyAmountAfterFeesUserCurrency={buyAmountAfterFeesUserCurrency}
+        buyAsset={buyAsset}
+        hasUserEnteredAmount={hasUserEnteredAmount}
+        headerRightContent={headerRightContent}
+        buyAssetAccountId={buyAssetAccountId}
+        sellAssetAccountId={sellAssetAccountId}
+        isCompact={isCompact}
+        isLoading={isLoading}
+        manualReceiveAddress={manualReceiveAddress}
+        sellAsset={sellAsset}
+        sideComponent={CollapsibleQuoteList}
+        tradeInputRef={tradeInputRef}
+        tradeInputTab={TradeInputTab.Trade}
+        walletReceiveAddress={walletReceiveAddress}
+        handleSwitchAssets={handleSwitchAssets}
+        onSubmit={handleTradeQuoteConfirm}
+        setBuyAsset={setBuyAsset}
+        setBuyAssetAccountId={setBuyAssetAccountId}
+        setSellAsset={setSellAsset}
+        setSellAssetAccountId={setSellAssetAccountId}
+        onChangeTab={onChangeTab}
+      />
     </MessageOverlay>
   )
 }
diff --git a/src/components/TradeAssetSearch/TradeAssetSearch.tsx b/src/components/TradeAssetSearch/TradeAssetSearch.tsx
index 0ebfd5fd260..8b9299a79ba 100644
--- a/src/components/TradeAssetSearch/TradeAssetSearch.tsx
+++ b/src/components/TradeAssetSearch/TradeAssetSearch.tsx
@@ -187,12 +187,13 @@ export const TradeAssetSearch: FC<TradeAssetSearchProps> = ({
   }, [])
 
   return (
-    <CustomAssetAcknowledgement
-      asset={assetToImport}
-      handleAssetClick={handleAssetClick}
-      shouldShowWarningAcknowledgement={shouldShowWarningAcknowledgement}
-      setShouldShowWarningAcknowledgement={setShouldShowWarningAcknowledgement}
-    >
+    <>
+      <CustomAssetAcknowledgement
+        asset={assetToImport}
+        handleAssetClick={handleAssetClick}
+        shouldShowWarningAcknowledgement={shouldShowWarningAcknowledgement}
+        setShouldShowWarningAcknowledgement={setShouldShowWarningAcknowledgement}
+      />
       <Stack
         gap={4}
         px={4}
@@ -242,6 +243,6 @@ export const TradeAssetSearch: FC<TradeAssetSearchProps> = ({
           onAssetClick={handleAssetClick}
         />
       )}
-    </CustomAssetAcknowledgement>
+    </>
   )
 }
diff --git a/src/components/TradeAssetSearch/components/CustomAssetAcknowledgement.tsx b/src/components/TradeAssetSearch/components/CustomAssetAcknowledgement.tsx
index 98d356ea5e4..58485610fc6 100644
--- a/src/components/TradeAssetSearch/components/CustomAssetAcknowledgement.tsx
+++ b/src/components/TradeAssetSearch/components/CustomAssetAcknowledgement.tsx
@@ -13,7 +13,7 @@ import {
 import { fromAssetId } from '@shapeshiftoss/caip'
 import type { Asset } from '@shapeshiftoss/types'
 import type * as CSS from 'csstype'
-import { type PropsWithChildren, useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { WarningAcknowledgement } from 'components/Acknowledgement/Acknowledgement'
 import { AssetIcon } from 'components/AssetIcon'
@@ -33,7 +33,7 @@ type CustomAssetAcknowledgementProps = {
   handleAssetClick: (asset: Asset) => void
   shouldShowWarningAcknowledgement: boolean
   setShouldShowWarningAcknowledgement: (shouldShow: boolean) => void
-} & PropsWithChildren
+}
 
 const extractAndCapitalizeDomain = (url: string): string => {
   try {
@@ -53,7 +53,6 @@ const extractAndCapitalizeDomain = (url: string): string => {
 }
 
 export const CustomAssetAcknowledgement: React.FC<CustomAssetAcknowledgementProps> = ({
-  children,
   asset,
   handleAssetClick,
   shouldShowWarningAcknowledgement,
@@ -170,8 +169,6 @@ export const CustomAssetAcknowledgement: React.FC<CustomAssetAcknowledgementProp
       setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
       disableButton={!hasAcknowledged}
       content={Content}
-    >
-      {children}
-    </WarningAcknowledgement>
+    />
   )
 }
diff --git a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx
index 842e8403d77..93544091ef6 100644
--- a/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx
+++ b/src/features/defi/providers/thorchain-savers/components/ThorchainSaversManager/Deposit/components/Deposit.tsx
@@ -1,11 +1,9 @@
-import type { ResponsiveValue } from '@chakra-ui/react'
 import { Skeleton, useToast } from '@chakra-ui/react'
 import type { AccountId } from '@shapeshiftoss/caip'
 import { fromAccountId, fromAssetId, thorchainAssetId, toAssetId } from '@shapeshiftoss/caip'
 import { ContractType, getOrCreateContractByType } from '@shapeshiftoss/contracts'
 import type { Asset } from '@shapeshiftoss/types'
 import { useQueryClient } from '@tanstack/react-query'
-import type * as CSS from 'csstype'
 import type { DepositValues } from 'features/defi/components/Deposit/Deposit'
 import { Deposit as ReusableDeposit } from 'features/defi/components/Deposit/Deposit'
 import type {
@@ -78,9 +76,6 @@ type DepositProps = StepComponentProps & {
 }
 
 const percentOptions = [0.25, 0.5, 0.75, 1]
-const infoAcknowledgementBoxProps = {
-  position: 'static' as ResponsiveValue<CSS.Property.Position>,
-}
 
 export const Deposit: React.FC<DepositProps> = ({
   accountId,
@@ -855,19 +850,19 @@ export const Deposit: React.FC<DepositProps> = ({
   if (!state || !contextDispatch || !opportunityData) return null
 
   return (
-    <InfoAcknowledgement
-      message={translate('defi.liquidityLockupWarning', {
-        time: formatSecondsToDuration(
-          isRunePool
-            ? thorchainMimirTimes?.runePoolDepositMaturityTime ?? 0
-            : thorchainMimirTimes?.liquidityLockupTime ?? 0,
-        ),
-      })}
-      onAcknowledge={handleAcknowledge}
-      shouldShowAcknowledgement={shouldShowInfoAcknowledgement}
-      setShouldShowAcknowledgement={setShouldShowInfoAcknowledgement}
-      boxProps={infoAcknowledgementBoxProps}
-    >
+    <>
+      <InfoAcknowledgement
+        message={translate('defi.liquidityLockupWarning', {
+          time: formatSecondsToDuration(
+            isRunePool
+              ? thorchainMimirTimes?.runePoolDepositMaturityTime ?? 0
+              : thorchainMimirTimes?.liquidityLockupTime ?? 0,
+          ),
+        })}
+        onAcknowledge={handleAcknowledge}
+        shouldShowAcknowledgement={shouldShowInfoAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowInfoAcknowledgement}
+      />
       <ReusableDeposit
         accountId={accountId}
         onAccountIdChange={handleAccountIdChange}
@@ -926,6 +921,6 @@ export const Deposit: React.FC<DepositProps> = ({
           </>
         ) : null}
       </ReusableDeposit>
-    </InfoAcknowledgement>
+    </>
   )
 }
diff --git a/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx b/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
index 04a936dd15f..b7f33370295 100644
--- a/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
+++ b/src/pages/Lending/Pool/components/Borrow/BorrowInput.tsx
@@ -501,141 +501,73 @@ export const BorrowInput = ({
         onAcknowledge={onSubmit}
         shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
         setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-      >
-        <Stack spacing={0}>
-          <TradeAssetInput
-            accountId={collateralAccountId}
-            assetId={collateralAssetId}
-            assetSymbol={collateralAsset.symbol}
-            assetIcon={collateralAsset.icon}
-            onChange={handleDepositInputChange}
-            onToggleIsFiat={toggleCollateralAssetIsFiat}
-            isFiat={collateralAssetIsFiat}
-            cryptoAmount={depositAmountCryptoPrecision ?? '0'}
-            fiatAmount={fiatDepositAmount ?? '0'}
-            isAccountSelectionDisabled={isAccountSelectionDisabled}
-            isSendMaxDisabled={false}
-            percentOptions={percentOptions}
-            showInputSkeleton={false}
-            showFiatSkeleton={false}
-            label={translate('lending.depositAsset', { asset: collateralAsset.symbol })}
-            onAccountIdChange={handleCollateralAccountIdChange}
-            formControlProps={formControlProps}
-            layout='inline'
-            labelPostFix={collateralAssetSelectComponent}
+      />
+      <Stack spacing={0}>
+        <TradeAssetInput
+          accountId={collateralAccountId}
+          assetId={collateralAssetId}
+          assetSymbol={collateralAsset.symbol}
+          assetIcon={collateralAsset.icon}
+          onChange={handleDepositInputChange}
+          onToggleIsFiat={toggleCollateralAssetIsFiat}
+          isFiat={collateralAssetIsFiat}
+          cryptoAmount={depositAmountCryptoPrecision ?? '0'}
+          fiatAmount={fiatDepositAmount ?? '0'}
+          isAccountSelectionDisabled={isAccountSelectionDisabled}
+          isSendMaxDisabled={false}
+          percentOptions={percentOptions}
+          showInputSkeleton={false}
+          showFiatSkeleton={false}
+          label={translate('lending.depositAsset', { asset: collateralAsset.symbol })}
+          onAccountIdChange={handleCollateralAccountIdChange}
+          formControlProps={formControlProps}
+          layout='inline'
+          labelPostFix={collateralAssetSelectComponent}
+        />
+        <Flex alignItems='center' justifyContent='center' my={-2}>
+          <Divider />
+          <IconButton
+            isRound
+            size='sm'
+            position='relative'
+            variant='outline'
+            borderColor='border.base'
+            zIndex={1}
+            aria-label={translate('lending.switchAssets')}
+            icon={swapIcon}
           />
-          <Flex alignItems='center' justifyContent='center' my={-2}>
-            <Divider />
-            <IconButton
-              isRound
-              size='sm'
-              position='relative'
-              variant='outline'
-              borderColor='border.base'
-              zIndex={1}
-              aria-label={translate('lending.switchAssets')}
-              icon={swapIcon}
-            />
-            <Divider />
-          </Flex>
-          <TradeAssetInput
-            assetId={borrowAsset?.assetId ?? ''}
-            assetSymbol={borrowAsset.symbol}
-            assetIcon={borrowAsset.icon}
-            cryptoAmount={lendingQuoteData?.quoteBorrowedAmountCryptoPrecision ?? '0'}
-            fiatAmount={lendingQuoteData?.quoteBorrowedAmountUserCurrency ?? '0'}
-            isReadOnly
-            onToggleIsFiat={toggleBorrowAssetIsFiat}
-            isFiat={borrowAssetIsFiat}
-            isSendMaxDisabled={false}
-            percentOptions={percentOptions}
-            showInputSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
-            showFiatSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
-            label={translate('lending.borrow')}
-            onAccountIdChange={handleBorrowAccountIdChange}
-            formControlProps={formControlProps}
-            layout='inline'
-            labelPostFix={borrowAssetSelectComponent}
+          <Divider />
+        </Flex>
+        <TradeAssetInput
+          assetId={borrowAsset?.assetId ?? ''}
+          assetSymbol={borrowAsset.symbol}
+          assetIcon={borrowAsset.icon}
+          cryptoAmount={lendingQuoteData?.quoteBorrowedAmountCryptoPrecision ?? '0'}
+          fiatAmount={lendingQuoteData?.quoteBorrowedAmountUserCurrency ?? '0'}
+          isReadOnly
+          onToggleIsFiat={toggleBorrowAssetIsFiat}
+          isFiat={borrowAssetIsFiat}
+          isSendMaxDisabled={false}
+          percentOptions={percentOptions}
+          showInputSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
+          showFiatSkeleton={isLendingQuoteLoading || isLendingQuoteRefetching}
+          label={translate('lending.borrow')}
+          onAccountIdChange={handleBorrowAccountIdChange}
+          formControlProps={formControlProps}
+          layout='inline'
+          labelPostFix={borrowAssetSelectComponent}
+        />
+        <Collapse in={isLendingQuoteSuccess}>
+          <LoanSummary
+            confirmedQuote={confirmedQuote}
+            isLoading={isLendingQuoteLoading || isLendingQuoteRefetching}
+            collateralAssetId={collateralAssetId}
+            collateralAccountId={collateralAccountId}
+            debtOccuredAmountUserCurrency={lendingQuoteData?.quoteDebtAmountUserCurrency ?? '0'}
+            depositAmountCryptoPrecision={depositAmountCryptoPrecision ?? '0'}
+            borrowAssetId={borrowAsset?.assetId ?? ''}
+            borrowAccountId={borrowAccountId}
           />
-          <Collapse in={isLendingQuoteSuccess}>
-            <LoanSummary
-              confirmedQuote={confirmedQuote}
-              isLoading={isLendingQuoteLoading || isLendingQuoteRefetching}
-              collateralAssetId={collateralAssetId}
-              collateralAccountId={collateralAccountId}
-              debtOccuredAmountUserCurrency={lendingQuoteData?.quoteDebtAmountUserCurrency ?? '0'}
-              depositAmountCryptoPrecision={depositAmountCryptoPrecision ?? '0'}
-              borrowAssetId={borrowAsset?.assetId ?? ''}
-              borrowAccountId={borrowAccountId}
-            />
-            <CardFooter
-              borderTopWidth={1}
-              borderColor='border.subtle'
-              flexDir='column'
-              gap={4}
-              px={6}
-              py={4}
-              bg='background.surface.raised.accent'
-            >
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('common.slippage')}</Row.Label>
-                <Row.Value>
-                  <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                    <Amount.Crypto
-                      value={lendingQuoteData?.quoteSlippageBorrowedAssetCryptoPrecision ?? '0'}
-                      symbol={borrowAsset.symbol}
-                    />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('common.gasFee')}</Row.Label>
-                <Row.Value>
-                  <Skeleton
-                    isLoaded={
-                      isEstimatedFeesDataSuccess &&
-                      isLendingQuoteSuccess &&
-                      !isLendingQuoteRefetching
-                    }
-                  >
-                    <Amount.Fiat value={estimatedFeesData?.txFeeFiat ?? '0'} />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-              {isSweepNeeded && (
-                <Row fontSize='sm' fontWeight='medium'>
-                  <HelperTooltip label={translate('modals.send.consolidate.tooltip')}>
-                    <Row.Label>{translate('modals.send.consolidate.consolidateFunds')}</Row.Label>
-                  </HelperTooltip>
-                  <Row.Value>
-                    <Skeleton
-                      isLoaded={Boolean(isEstimatedSweepFeesDataSuccess && estimatedSweepFeesData)}
-                    >
-                      <Amount.Fiat value={estimatedSweepFeesData?.txFeeFiat ?? '0'} />
-                    </Skeleton>
-                  </Row.Value>
-                </Row>
-              )}
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('common.fees')}</Row.Label>
-                <Row.Value>
-                  <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                    <Amount.Fiat value={lendingQuoteData?.quoteTotalFeesFiatUserCurrency ?? '0'} />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
-                <Row.Value>
-                  <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
-                    <RawText fontWeight='bold'>
-                      {prettyMilliseconds(lendingQuoteData?.quoteTotalTimeMs ?? 0)}
-                    </RawText>
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-            </CardFooter>
-          </Collapse>
           <CardFooter
             borderTopWidth={1}
             borderColor='border.subtle'
@@ -644,43 +576,106 @@ export const BorrowInput = ({
             px={6}
             py={4}
             bg='background.surface.raised.accent'
-            borderBottomRadius='xl'
           >
-            <Button
-              size='lg-multiline'
-              colorScheme={isLendingQuoteError || quoteErrorTranslation ? 'red' : 'blue'}
-              mx={-2}
-              onClick={handleBorrowSubmit}
-              isLoading={
-                isPoolDataLoading ||
+            <Row fontSize='sm' fontWeight='medium'>
+              <Row.Label>{translate('common.slippage')}</Row.Label>
+              <Row.Value>
+                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
+                  <Amount.Crypto
+                    value={lendingQuoteData?.quoteSlippageBorrowedAssetCryptoPrecision ?? '0'}
+                    symbol={borrowAsset.symbol}
+                  />
+                </Skeleton>
+              </Row.Value>
+            </Row>
+            <Row fontSize='sm' fontWeight='medium'>
+              <Row.Label>{translate('common.gasFee')}</Row.Label>
+              <Row.Value>
+                <Skeleton
+                  isLoaded={
+                    isEstimatedFeesDataSuccess && isLendingQuoteSuccess && !isLendingQuoteRefetching
+                  }
+                >
+                  <Amount.Fiat value={estimatedFeesData?.txFeeFiat ?? '0'} />
+                </Skeleton>
+              </Row.Value>
+            </Row>
+            {isSweepNeeded && (
+              <Row fontSize='sm' fontWeight='medium'>
+                <HelperTooltip label={translate('modals.send.consolidate.tooltip')}>
+                  <Row.Label>{translate('modals.send.consolidate.consolidateFunds')}</Row.Label>
+                </HelperTooltip>
+                <Row.Value>
+                  <Skeleton
+                    isLoaded={Boolean(isEstimatedSweepFeesDataSuccess && estimatedSweepFeesData)}
+                  >
+                    <Amount.Fiat value={estimatedSweepFeesData?.txFeeFiat ?? '0'} />
+                  </Skeleton>
+                </Row.Value>
+              </Row>
+            )}
+            <Row fontSize='sm' fontWeight='medium'>
+              <Row.Label>{translate('common.fees')}</Row.Label>
+              <Row.Value>
+                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
+                  <Amount.Fiat value={lendingQuoteData?.quoteTotalFeesFiatUserCurrency ?? '0'} />
+                </Skeleton>
+              </Row.Value>
+            </Row>
+            <Row fontSize='sm' fontWeight='medium'>
+              <Row.Label>{translate('bridge.waitTimeLabel')}</Row.Label>
+              <Row.Value>
+                <Skeleton isLoaded={isLendingQuoteSuccess && !isLendingQuoteRefetching}>
+                  <RawText fontWeight='bold'>
+                    {prettyMilliseconds(lendingQuoteData?.quoteTotalTimeMs ?? 0)}
+                  </RawText>
+                </Skeleton>
+              </Row.Value>
+            </Row>
+          </CardFooter>
+        </Collapse>
+        <CardFooter
+          borderTopWidth={1}
+          borderColor='border.subtle'
+          flexDir='column'
+          gap={4}
+          px={6}
+          py={4}
+          bg='background.surface.raised.accent'
+          borderBottomRadius='xl'
+        >
+          <Button
+            size='lg-multiline'
+            colorScheme={isLendingQuoteError || quoteErrorTranslation ? 'red' : 'blue'}
+            mx={-2}
+            onClick={handleBorrowSubmit}
+            isLoading={
+              isPoolDataLoading ||
+              isLendingQuoteLoading ||
+              isLendingQuoteRefetching ||
+              isEstimatedFeesDataLoading ||
+              isEstimatedSweepFeesDataLoading ||
+              isEstimatedSweepFeesDataLoading ||
+              isAddressByteCodeLoading ||
+              isSweepNeededLoading
+            }
+            isDisabled={Boolean(
+              isHardCapReached ||
+                !isThorchainLendingBorrowEnabled ||
+                bnOrZero(depositAmountCryptoPrecision).isZero() ||
+                isLendingQuoteError ||
                 isLendingQuoteLoading ||
                 isLendingQuoteRefetching ||
+                quoteErrorTranslation ||
+                isEstimatedFeesDataError ||
                 isEstimatedFeesDataLoading ||
-                isEstimatedSweepFeesDataLoading ||
-                isEstimatedSweepFeesDataLoading ||
-                isAddressByteCodeLoading ||
-                isSweepNeededLoading
-              }
-              isDisabled={Boolean(
-                isHardCapReached ||
-                  !isThorchainLendingBorrowEnabled ||
-                  bnOrZero(depositAmountCryptoPrecision).isZero() ||
-                  isLendingQuoteError ||
-                  isLendingQuoteLoading ||
-                  isLendingQuoteRefetching ||
-                  quoteErrorTranslation ||
-                  isEstimatedFeesDataError ||
-                  isEstimatedFeesDataLoading ||
-                  disableSmartContractDeposit,
-              )}
-            >
-              {quoteErrorTranslation
-                ? translate(quoteErrorTranslation)
-                : translate('lending.borrow')}
-            </Button>
-          </CardFooter>
-        </Stack>
-      </WarningAcknowledgement>
+                disableSmartContractDeposit,
+            )}
+          >
+            {quoteErrorTranslation ? translate(quoteErrorTranslation) : translate('lending.borrow')}
+          </Button>
+        </CardFooter>
+      </Stack>
     </SlideTransition>
   )
 }
diff --git a/src/pages/RFOX/components/Stake/StakeInput.tsx b/src/pages/RFOX/components/Stake/StakeInput.tsx
index 9a80f6b03ba..b3ec083218e 100644
--- a/src/pages/RFOX/components/Stake/StakeInput.tsx
+++ b/src/pages/RFOX/components/Stake/StakeInput.tsx
@@ -480,114 +480,113 @@ export const StakeInput: React.FC<StakeInputProps & StakeRouteProps> = ({
         shouldShowAcknowledgement={showWarning}
         setShouldShowAcknowledgement={setShowWarning}
         buttonTranslation={'common.yes'}
-      >
-        <FormProvider {...methods}>
-          <Stack>
-            {headerComponent}
-            <TradeAssetInput
-              amountFieldInputRules={amountFieldInputRules}
-              assetId={selectedAsset?.assetId}
-              accountId={selectedAssetAccountId}
-              assetSymbol={selectedAsset?.symbol ?? ''}
-              assetIcon={selectedAsset?.icon ?? ''}
-              percentOptions={percentOptions}
-              isAccountSelectionDisabled
-              // Since we disable AccountId selection at asset-selection in profit of top-level page account dropdown,
-              // this *is* effectively disabled, however, onAccountIdChange *needs* to be a noop, or else the top-level
-              // dropdown will break, as this component calls onAccountIdChange once on first render - regardless of whether account selection is disabled or not
-              onAccountIdChange={noop}
-              onToggleIsFiat={handleToggleIsFiat}
-              onChange={handleAmountChange}
-              isFiat={isFiat}
-              formControlProps={formControlProps}
-              layout='stacked'
-              label={translate('transactionRow.amount')}
-              labelPostFix={assetSelectComponent}
-              isSendMaxDisabled={false}
-              cryptoAmount={amountCryptoPrecision}
-              fiatAmount={amountUserCurrency}
-            />
-            <FormDivider />
-            <AddressSelection
-              selectedAddress={runeAddress}
-              onRuneAddressChange={handleRuneAddressChange}
-              setStepIndex={setStepIndex}
-            />
-            <Collapse in={collapseIn}>
-              {stakingAssetAccountId && (
-                <StakeSummary
-                  stakingAssetId={stakingAssetId}
-                  stakingAssetAccountId={stakingAssetAccountId}
-                  stakingAmountCryptoPrecision={amountCryptoPrecision}
-                />
+      />
+      <FormProvider {...methods}>
+        <Stack>
+          {headerComponent}
+          <TradeAssetInput
+            amountFieldInputRules={amountFieldInputRules}
+            assetId={selectedAsset?.assetId}
+            accountId={selectedAssetAccountId}
+            assetSymbol={selectedAsset?.symbol ?? ''}
+            assetIcon={selectedAsset?.icon ?? ''}
+            percentOptions={percentOptions}
+            isAccountSelectionDisabled
+            // Since we disable AccountId selection at asset-selection in profit of top-level page account dropdown,
+            // this *is* effectively disabled, however, onAccountIdChange *needs* to be a noop, or else the top-level
+            // dropdown will break, as this component calls onAccountIdChange once on first render - regardless of whether account selection is disabled or not
+            onAccountIdChange={noop}
+            onToggleIsFiat={handleToggleIsFiat}
+            onChange={handleAmountChange}
+            isFiat={isFiat}
+            formControlProps={formControlProps}
+            layout='stacked'
+            label={translate('transactionRow.amount')}
+            labelPostFix={assetSelectComponent}
+            isSendMaxDisabled={false}
+            cryptoAmount={amountCryptoPrecision}
+            fiatAmount={amountUserCurrency}
+          />
+          <FormDivider />
+          <AddressSelection
+            selectedAddress={runeAddress}
+            onRuneAddressChange={handleRuneAddressChange}
+            setStepIndex={setStepIndex}
+          />
+          <Collapse in={collapseIn}>
+            {stakingAssetAccountId && (
+              <StakeSummary
+                stakingAssetId={stakingAssetId}
+                stakingAssetAccountId={stakingAssetAccountId}
+                stakingAmountCryptoPrecision={amountCryptoPrecision}
+              />
+            )}
+            <CardFooter
+              borderTopWidth={1}
+              borderColor='border.subtle'
+              flexDir='column'
+              gap={4}
+              px={6}
+              py={4}
+              bg='background.surface.raised.accent'
+            >
+              {isGetApprovalFeesEnabled && (
+                <Row fontSize='sm' fontWeight='medium'>
+                  <Row.Label>{translate('common.approvalFee')}</Row.Label>
+                  <Row.Value>
+                    <Skeleton isLoaded={Boolean(!isGetApprovalFeesLoading && approvalFees)}>
+                      <Amount.Fiat value={approvalFees?.txFeeFiat ?? 0} />
+                    </Skeleton>
+                  </Row.Value>
+                </Row>
               )}
-              <CardFooter
-                borderTopWidth={1}
-                borderColor='border.subtle'
-                flexDir='column'
-                gap={4}
-                px={6}
-                py={4}
-                bg='background.surface.raised.accent'
-              >
-                {isGetApprovalFeesEnabled && (
-                  <Row fontSize='sm' fontWeight='medium'>
-                    <Row.Label>{translate('common.approvalFee')}</Row.Label>
-                    <Row.Value>
-                      <Skeleton isLoaded={Boolean(!isGetApprovalFeesLoading && approvalFees)}>
-                        <Amount.Fiat value={approvalFees?.txFeeFiat ?? 0} />
-                      </Skeleton>
-                    </Row.Value>
-                  </Row>
-                )}
-                {isGetStakeFeesEnabled && (
-                  <Row fontSize='sm' fontWeight='medium'>
-                    <Row.Label>{translate('common.gasFee')}</Row.Label>
-                    <Row.Value>
-                      <Skeleton isLoaded={Boolean(!isStakeFeesLoading && stakeFees)}>
-                        <Amount.Fiat value={stakeFees?.txFeeFiat ?? 0} />
-                      </Skeleton>
-                    </Row.Value>
-                  </Row>
-                )}
-              </CardFooter>
-            </Collapse>
-          </Stack>
-          <CardFooter
-            borderTopWidth={1}
-            borderColor='border.subtle'
-            flexDir='column'
-            gap={4}
-            px={6}
-            bg='background.surface.raised.accent'
-            borderBottomRadius='xl'
-          >
-            <ButtonWalletPredicate
-              isValidWallet={Boolean(isChainSupportedByWallet || isAccountsMetadataLoading)}
-              isDisabled={Boolean(
-                errors.amountFieldInput ||
-                  (!runeAddress && !currentRuneAddress) ||
-                  !isValidStakingAmount ||
-                  !(isStakeFeesSuccess || isGetApprovalFeesSuccess) ||
-                  isAccountsMetadataLoading ||
-                  !cooldownPeriod,
+              {isGetStakeFeesEnabled && (
+                <Row fontSize='sm' fontWeight='medium'>
+                  <Row.Label>{translate('common.gasFee')}</Row.Label>
+                  <Row.Value>
+                    <Skeleton isLoaded={Boolean(!isStakeFeesLoading && stakeFees)}>
+                      <Amount.Fiat value={stakeFees?.txFeeFiat ?? 0} />
+                    </Skeleton>
+                  </Row.Value>
+                </Row>
               )}
-              size='lg'
-              mx={-2}
-              onClick={handleWarning}
-              isLoading={isGetApprovalFeesLoading || isStakeFeesLoading}
-              colorScheme={
-                Boolean(errors.amountFieldInput || errors.manualRuneAddress) &&
-                !isAccountsMetadataLoading
-                  ? 'red'
-                  : 'blue'
-              }
-            >
-              {submitButtonText}
-            </ButtonWalletPredicate>
-          </CardFooter>
-        </FormProvider>
-      </InfoAcknowledgement>
+            </CardFooter>
+          </Collapse>
+        </Stack>
+        <CardFooter
+          borderTopWidth={1}
+          borderColor='border.subtle'
+          flexDir='column'
+          gap={4}
+          px={6}
+          bg='background.surface.raised.accent'
+          borderBottomRadius='xl'
+        >
+          <ButtonWalletPredicate
+            isValidWallet={Boolean(isChainSupportedByWallet || isAccountsMetadataLoading)}
+            isDisabled={Boolean(
+              errors.amountFieldInput ||
+                (!runeAddress && !currentRuneAddress) ||
+                !isValidStakingAmount ||
+                !(isStakeFeesSuccess || isGetApprovalFeesSuccess) ||
+                isAccountsMetadataLoading ||
+                !cooldownPeriod,
+            )}
+            size='lg'
+            mx={-2}
+            onClick={handleWarning}
+            isLoading={isGetApprovalFeesLoading || isStakeFeesLoading}
+            colorScheme={
+              Boolean(errors.amountFieldInput || errors.manualRuneAddress) &&
+              !isAccountsMetadataLoading
+                ? 'red'
+                : 'blue'
+            }
+          >
+            {submitButtonText}
+          </ButtonWalletPredicate>
+        </CardFooter>
+      </FormProvider>
     </SlideTransition>
   )
 }
diff --git a/src/pages/RFOX/components/Unstake/UnstakeInput.tsx b/src/pages/RFOX/components/Unstake/UnstakeInput.tsx
index d0902db1a3f..98f7cad56cd 100644
--- a/src/pages/RFOX/components/Unstake/UnstakeInput.tsx
+++ b/src/pages/RFOX/components/Unstake/UnstakeInput.tsx
@@ -329,119 +329,113 @@ export const UnstakeInput: React.FC<UnstakeRouteProps & UnstakeInputProps> = ({
         onAcknowledge={handleSubmit}
         shouldShowAcknowledgement={showWarning}
         setShouldShowAcknowledgement={setShowWarning}
-      >
-        <FormProvider {...methods}>
-          <Stack>
-            {headerComponent}
-            <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
-              <Stack>
-                <AmountSlider
-                  sliderValue={sliderValue}
-                  handlePercentageSliderChange={handlePercentageSliderChange}
-                  onPercentageClick={handlePercentageClick}
-                  handlePercentageSliderChangeEnd={handlePercentageSliderChangeEnd}
-                >
-                  <Flex
-                    width='full'
-                    justifyContent='space-between'
-                    fontSize='xs'
-                    color='text.subtle'
-                  >
-                    <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
-                      <Amount.Fiat value={0} />
-                    </Skeleton>
-                    <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
-                      {/* Actually defined at display time, see isLoaded above */}
-                      <Amount.Fiat value={userStakingBalanceUserCurrency ?? 0} />
+      />
+      <FormProvider {...methods}>
+        <Stack>
+          {headerComponent}
+          <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
+            <Stack>
+              <AmountSlider
+                sliderValue={sliderValue}
+                handlePercentageSliderChange={handlePercentageSliderChange}
+                onPercentageClick={handlePercentageClick}
+                handlePercentageSliderChangeEnd={handlePercentageSliderChangeEnd}
+              >
+                <Flex width='full' justifyContent='space-between' fontSize='xs' color='text.subtle'>
+                  <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
+                    <Amount.Fiat value={0} />
+                  </Skeleton>
+                  <Skeleton isLoaded={isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}>
+                    {/* Actually defined at display time, see isLoaded above */}
+                    <Amount.Fiat value={userStakingBalanceUserCurrency ?? 0} />
+                  </Skeleton>
+                </Flex>
+              </AmountSlider>
+            </Stack>
+          </Skeleton>
+          <FormDivider />
+          <TradeAssetInput
+            amountFieldInputRules={amountFieldInputRules}
+            assetIcon={stakingAsset?.icon ?? ''}
+            assetId={stakingAssetId}
+            assetSymbol={stakingAsset?.symbol ?? ''}
+            cryptoAmount={amountCryptoPrecision}
+            fiatAmount={amountUserCurrency}
+            formControlProps={formControlProps}
+            // TODO(gomes): bring me back when multi account is implemented
+            isAccountSelectionDisabled
+            isAccountSelectionHidden
+            isFiat={isFiat}
+            isReadOnly
+            isSendMaxDisabled={true}
+            layout='stacked'
+            onAccountIdChange={handleAccountIdChange}
+            onToggleIsFiat={handleToggleIsFiat}
+            percentOptions={percentOptions}
+            rightComponent={ReadOnlyAsset}
+            showInputSkeleton={!isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}
+          />
+
+          <Collapse in={hasEnteredValue}>
+            {stakingAssetAccountId && (
+              <UnstakeSummary
+                amountCryptoPrecision={amountCryptoPrecision ?? 0}
+                stakingAssetAccountId={stakingAssetAccountId}
+                stakingAssetId={stakingAssetId}
+                isLoading={!isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}
+              />
+            )}
+            <CardFooter
+              borderTopWidth={1}
+              borderColor='border.subtle'
+              flexDir='column'
+              gap={4}
+              px={6}
+              py={4}
+              bg='background.surface.raised.accent'
+            >
+              {isGetUnstakeFeesEnabled && (
+                <Row fontSize='sm' fontWeight='medium'>
+                  <Row.Label>{translate('common.gasFee')}</Row.Label>
+                  <Row.Value>
+                    <Skeleton isLoaded={Boolean(!isUnstakeFeesLoading && unstakeFees)}>
+                      <Amount.Fiat value={unstakeFees?.txFeeFiat ?? 0} />
                     </Skeleton>
-                  </Flex>
-                </AmountSlider>
-              </Stack>
-            </Skeleton>
-            <FormDivider />
-            <TradeAssetInput
-              amountFieldInputRules={amountFieldInputRules}
-              assetIcon={stakingAsset?.icon ?? ''}
-              assetId={stakingAssetId}
-              assetSymbol={stakingAsset?.symbol ?? ''}
-              cryptoAmount={amountCryptoPrecision}
-              fiatAmount={amountUserCurrency}
-              formControlProps={formControlProps}
-              // TODO(gomes): bring me back when multi account is implemented
-              isAccountSelectionDisabled
-              isAccountSelectionHidden
-              isFiat={isFiat}
-              isReadOnly
-              isSendMaxDisabled={true}
-              layout='stacked'
-              onAccountIdChange={handleAccountIdChange}
-              onToggleIsFiat={handleToggleIsFiat}
-              percentOptions={percentOptions}
-              rightComponent={ReadOnlyAsset}
-              showInputSkeleton={!isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}
-            />
-
-            <Collapse in={hasEnteredValue}>
-              {stakingAssetAccountId && (
-                <UnstakeSummary
-                  amountCryptoPrecision={amountCryptoPrecision ?? 0}
-                  stakingAssetAccountId={stakingAssetAccountId}
-                  stakingAssetId={stakingAssetId}
-                  isLoading={!isUserBalanceStakingBalanceOfCryptoBaseUnitSuccess}
-                />
+                  </Row.Value>
+                </Row>
               )}
-              <CardFooter
-                borderTopWidth={1}
-                borderColor='border.subtle'
-                flexDir='column'
-                gap={4}
-                px={6}
-                py={4}
-                bg='background.surface.raised.accent'
-              >
-                {isGetUnstakeFeesEnabled && (
-                  <Row fontSize='sm' fontWeight='medium'>
-                    <Row.Label>{translate('common.gasFee')}</Row.Label>
-                    <Row.Value>
-                      <Skeleton isLoaded={Boolean(!isUnstakeFeesLoading && unstakeFees)}>
-                        <Amount.Fiat value={unstakeFees?.txFeeFiat ?? 0} />
-                      </Skeleton>
-                    </Row.Value>
-                  </Row>
-                )}
-              </CardFooter>
-            </Collapse>
-          </Stack>
-          <CardFooter
-            borderTopWidth={1}
-            borderColor='border.subtle'
-            flexDir='column'
-            gap={4}
-            px={6}
-            bg='background.surface.raised.accent'
-            borderBottomRadius='xl'
+            </CardFooter>
+          </Collapse>
+        </Stack>
+        <CardFooter
+          borderTopWidth={1}
+          borderColor='border.subtle'
+          flexDir='column'
+          gap={4}
+          px={6}
+          bg='background.surface.raised.accent'
+          borderBottomRadius='xl'
+        >
+          <ButtonWalletPredicate
+            isValidWallet={Boolean(isChainSupportedByWallet)}
+            isDisabled={Boolean(
+              !hasEnteredValue ||
+                !isUnstakeFeesSuccess ||
+                Boolean(errors.amountFieldInput) ||
+                !cooldownPeriod,
+            )}
+            size='lg'
+            mx={-2}
+            onClick={handleWarning}
+            colorScheme={Boolean(errors.amountFieldInput) ? 'red' : 'blue'}
+            isLoading={isUnstakeFeesLoading}
           >
-            <ButtonWalletPredicate
-              isValidWallet={Boolean(isChainSupportedByWallet)}
-              isDisabled={Boolean(
-                !hasEnteredValue ||
-                  !isUnstakeFeesSuccess ||
-                  Boolean(errors.amountFieldInput) ||
-                  !cooldownPeriod,
-              )}
-              size='lg'
-              mx={-2}
-              onClick={handleWarning}
-              colorScheme={Boolean(errors.amountFieldInput) ? 'red' : 'blue'}
-              isLoading={isUnstakeFeesLoading}
-            >
-              {errors.amountFieldInput?.message ||
-                chainNotSupportedByWalletCopy ||
-                translate('RFOX.unstake')}
-            </ButtonWalletPredicate>
-          </CardFooter>
-        </FormProvider>
-      </WarningAcknowledgement>
+            {errors.amountFieldInput?.message ||
+              chainNotSupportedByWalletCopy ||
+              translate('RFOX.unstake')}
+          </ButtonWalletPredicate>
+        </CardFooter>
+      </FormProvider>
     </SlideTransition>
   )
 }
diff --git a/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx b/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
index b136feb1ed2..962000ef1ad 100644
--- a/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
+++ b/src/pages/ThorChainLP/components/AddLiquidity/AddLiquidityInput.tsx
@@ -1492,160 +1492,154 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
         onAcknowledge={handleDepositSubmit}
         shouldShowAcknowledgement={shouldShowInfoAcknowledgement}
         setShouldShowAcknowledgement={setShouldShowInfoAcknowledgement}
-      >
-        <WarningAcknowledgement
-          message={translate('warningAcknowledgement.highSlippageDeposit', {
-            slippagePercentage: bnOrZero(slippageDecimalPercentage)
-              .times(100)
-              .toFixed(2)
-              .toString(),
-          })}
-          onAcknowledge={handleSubmit}
-          shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
-          setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
-        >
-          {renderHeader}
-          <Stack divider={divider} spacing={4} pb={4}>
-            {pairSelect}
-            <Stack>
-              <FormLabel mb={0} px={6} fontSize='sm'>
-                {translate('pools.depositAmounts')}
-              </FormLabel>
-              {!opportunityId && activeOpportunityId && (
-                <LpType
-                  assetId={poolAsset.assetId}
-                  opportunityId={activeOpportunityId}
-                  onAsymSideChange={handleAsymSideChange}
-                  isDeposit={true}
-                  hasAsymRunePosition={hasAsymRunePosition}
-                  hasAsymAssetPosition={hasAsymAssetPosition}
-                  hasSymPosition={hasSymPosition}
-                  amountsByPosition={amountsByPosition}
-                />
-              )}
-              {tradeAssetInputs}
-            </Stack>
-          </Stack>
-          <Collapse in={hasUserEnteredValue}>
-            <PoolSummary
+      />
+      <WarningAcknowledgement
+        message={translate('warningAcknowledgement.highSlippageDeposit', {
+          slippagePercentage: bnOrZero(slippageDecimalPercentage).times(100).toFixed(2).toString(),
+        })}
+        onAcknowledge={handleSubmit}
+        shouldShowAcknowledgement={shouldShowWarningAcknowledgement}
+        setShouldShowAcknowledgement={setShouldShowWarningAcknowledgement}
+      />
+      {renderHeader}
+      <Stack divider={divider} spacing={4} pb={4}>
+        {pairSelect}
+        <Stack>
+          <FormLabel mb={0} px={6} fontSize='sm'>
+            {translate('pools.depositAmounts')}
+          </FormLabel>
+          {!opportunityId && activeOpportunityId && (
+            <LpType
               assetId={poolAsset.assetId}
-              runePerAsset={runePerAsset}
-              shareOfPoolDecimalPercent={shareOfPoolDecimalPercent}
-              isLoading={isSlippageLoading}
+              opportunityId={activeOpportunityId}
+              onAsymSideChange={handleAsymSideChange}
+              isDeposit={true}
+              hasAsymRunePosition={hasAsymRunePosition}
+              hasAsymAssetPosition={hasAsymAssetPosition}
+              hasSymPosition={hasSymPosition}
+              amountsByPosition={amountsByPosition}
             />
-            <CardFooter
-              borderTopWidth={1}
-              borderColor='border.subtle'
-              flexDir='column'
-              gap={4}
-              px={6}
-              py={4}
-              bg='background.surface.raised.accent'
-            >
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('common.slippage')}</Row.Label>
-                <Row.Value>
-                  <Skeleton isLoaded={!isSlippageLoading}>
-                    <Amount.Fiat value={slippageFiatUserCurrency ?? ''} />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-              <Row fontSize='sm' fontWeight='medium'>
-                <Row.Label>{translate('common.gasFee')}</Row.Label>
-                <Row.Value>
-                  <Skeleton isLoaded={Boolean(confirmedQuote)}>
-                    <Amount.Fiat value={confirmedQuote?.totalGasFeeFiatUserCurrency ?? 0} />
-                  </Skeleton>
-                </Row.Value>
-              </Row>
-              <Row fontSize='sm' fontWeight='medium' isLoading={Boolean(!confirmedQuote)}>
-                <Row.Label display='flex'>
-                  <Text translation={shapeshiftFeeTranslation} />
-                  {bnOrZero(confirmedQuote?.feeAmountFiatUserCurrency).gt(0) && (
-                    <RawText>{`(${confirmedQuote?.feeBps ?? 0} bps)`}</RawText>
-                  )}
-                </Row.Label>
-                <Row.Value onClick={toggleFeeModal} _hover={shapeShiftFeeModalRowHover}>
-                  <Flex alignItems='center' gap={2}>
-                    {bnOrZero(confirmedQuote?.feeAmountFiatUserCurrency).gt(0) ? (
-                      <>
-                        <Amount.Fiat value={confirmedQuote?.feeAmountFiatUserCurrency ?? 0} />
-                        <QuestionIcon />
-                      </>
-                    ) : (
-                      <>
-                        <Text translation='trade.free' fontWeight='semibold' color={greenColor} />
-                        <QuestionIcon color={greenColor} />
-                      </>
-                    )}
-                  </Flex>
-                </Row.Value>
-              </Row>
-            </CardFooter>
-          </Collapse>
-          <CardFooter
-            borderTopWidth={1}
-            borderColor='border.subtle'
-            flexDir='column'
-            gap={4}
-            px={6}
-            bg='background.surface.raised.accent'
-            borderBottomRadius='xl'
-          >
-            {incompleteAlert}
-            {maybeOpportunityNotSupportedExplainer}
-            {maybeAlert}
-
-            <ButtonWalletPredicate
-              isValidWallet={Boolean(walletSupportsOpportunity)}
-              mx={-2}
-              size='lg'
-              colorScheme={errorCopy ? 'red' : 'blue'}
-              isDisabled={Boolean(
-                disabledSymDepositAfterRune ||
-                  isTradingActive === false ||
-                  !isThorchainLpDepositEnabled ||
-                  !confirmedQuote ||
-                  isVotingPowerLoading ||
-                  !hasEnoughAssetBalance ||
-                  !hasEnoughRuneBalance ||
-                  isApprovalTxPending ||
-                  (isSweepNeededEnabled && isSweepNeeded === undefined && !isApprovalRequired) ||
-                  isSweepNeededError ||
-                  isEstimatedPoolAssetFeesDataError ||
-                  isEstimatedRuneFeesDataError ||
-                  isSmartContractAccountAddress ||
-                  bnOrZero(actualAssetDepositAmountCryptoPrecision)
-                    .plus(bnOrZero(actualRuneDepositAmountCryptoPrecision))
-                    .isZero() ||
-                  notEnoughFeeAssetError ||
-                  notEnoughRuneFeeError,
+          )}
+          {tradeAssetInputs}
+        </Stack>
+      </Stack>
+      <Collapse in={hasUserEnteredValue}>
+        <PoolSummary
+          assetId={poolAsset.assetId}
+          runePerAsset={runePerAsset}
+          shareOfPoolDecimalPercent={shareOfPoolDecimalPercent}
+          isLoading={isSlippageLoading}
+        />
+        <CardFooter
+          borderTopWidth={1}
+          borderColor='border.subtle'
+          flexDir='column'
+          gap={4}
+          px={6}
+          py={4}
+          bg='background.surface.raised.accent'
+        >
+          <Row fontSize='sm' fontWeight='medium'>
+            <Row.Label>{translate('common.slippage')}</Row.Label>
+            <Row.Value>
+              <Skeleton isLoaded={!isSlippageLoading}>
+                <Amount.Fiat value={slippageFiatUserCurrency ?? ''} />
+              </Skeleton>
+            </Row.Value>
+          </Row>
+          <Row fontSize='sm' fontWeight='medium'>
+            <Row.Label>{translate('common.gasFee')}</Row.Label>
+            <Row.Value>
+              <Skeleton isLoaded={Boolean(confirmedQuote)}>
+                <Amount.Fiat value={confirmedQuote?.totalGasFeeFiatUserCurrency ?? 0} />
+              </Skeleton>
+            </Row.Value>
+          </Row>
+          <Row fontSize='sm' fontWeight='medium' isLoading={Boolean(!confirmedQuote)}>
+            <Row.Label display='flex'>
+              <Text translation={shapeshiftFeeTranslation} />
+              {bnOrZero(confirmedQuote?.feeAmountFiatUserCurrency).gt(0) && (
+                <RawText>{`(${confirmedQuote?.feeBps ?? 0} bps)`}</RawText>
               )}
-              isLoading={
-                (poolAssetTxFeeCryptoBaseUnit === undefined &&
-                  isEstimatedPoolAssetFeesDataLoading) ||
-                isVotingPowerLoading ||
-                isTradingActiveLoading ||
-                isSmartContractAccountAddressLoading ||
-                allowanceCryptoBaseUnitResult.isLoading ||
-                isApprovalTxPending ||
-                (isSweepNeeded === undefined && isSweepNeededLoading && !isApprovalRequired) ||
-                (runeTxFeeCryptoBaseUnit === undefined && isEstimatedPoolAssetFeesDataLoading) ||
-                isThorchainMimirTimesLoading
-              }
-              onClick={handleClick}
-            >
-              {confirmCopy}
-            </ButtonWalletPredicate>
-          </CardFooter>
-          <FeeModal
-            isOpen={showFeeModal}
-            onClose={toggleFeeModal}
-            inputAmountUsd={confirmedQuote?.totalAmountUsd}
-            feeModel='THORCHAIN_LP'
-          />
-        </WarningAcknowledgement>
-      </InfoAcknowledgement>
+            </Row.Label>
+            <Row.Value onClick={toggleFeeModal} _hover={shapeShiftFeeModalRowHover}>
+              <Flex alignItems='center' gap={2}>
+                {bnOrZero(confirmedQuote?.feeAmountFiatUserCurrency).gt(0) ? (
+                  <>
+                    <Amount.Fiat value={confirmedQuote?.feeAmountFiatUserCurrency ?? 0} />
+                    <QuestionIcon />
+                  </>
+                ) : (
+                  <>
+                    <Text translation='trade.free' fontWeight='semibold' color={greenColor} />
+                    <QuestionIcon color={greenColor} />
+                  </>
+                )}
+              </Flex>
+            </Row.Value>
+          </Row>
+        </CardFooter>
+      </Collapse>
+      <CardFooter
+        borderTopWidth={1}
+        borderColor='border.subtle'
+        flexDir='column'
+        gap={4}
+        px={6}
+        bg='background.surface.raised.accent'
+        borderBottomRadius='xl'
+      >
+        {incompleteAlert}
+        {maybeOpportunityNotSupportedExplainer}
+        {maybeAlert}
+
+        <ButtonWalletPredicate
+          isValidWallet={Boolean(walletSupportsOpportunity)}
+          mx={-2}
+          size='lg'
+          colorScheme={errorCopy ? 'red' : 'blue'}
+          isDisabled={Boolean(
+            disabledSymDepositAfterRune ||
+              isTradingActive === false ||
+              !isThorchainLpDepositEnabled ||
+              !confirmedQuote ||
+              isVotingPowerLoading ||
+              !hasEnoughAssetBalance ||
+              !hasEnoughRuneBalance ||
+              isApprovalTxPending ||
+              (isSweepNeededEnabled && isSweepNeeded === undefined && !isApprovalRequired) ||
+              isSweepNeededError ||
+              isEstimatedPoolAssetFeesDataError ||
+              isEstimatedRuneFeesDataError ||
+              isSmartContractAccountAddress ||
+              bnOrZero(actualAssetDepositAmountCryptoPrecision)
+                .plus(bnOrZero(actualRuneDepositAmountCryptoPrecision))
+                .isZero() ||
+              notEnoughFeeAssetError ||
+              notEnoughRuneFeeError,
+          )}
+          isLoading={
+            (poolAssetTxFeeCryptoBaseUnit === undefined && isEstimatedPoolAssetFeesDataLoading) ||
+            isVotingPowerLoading ||
+            isTradingActiveLoading ||
+            isSmartContractAccountAddressLoading ||
+            allowanceCryptoBaseUnitResult.isLoading ||
+            isApprovalTxPending ||
+            (isSweepNeeded === undefined && isSweepNeededLoading && !isApprovalRequired) ||
+            (runeTxFeeCryptoBaseUnit === undefined && isEstimatedPoolAssetFeesDataLoading) ||
+            isThorchainMimirTimesLoading
+          }
+          onClick={handleClick}
+        >
+          {confirmCopy}
+        </ButtonWalletPredicate>
+      </CardFooter>
+      <FeeModal
+        isOpen={showFeeModal}
+        onClose={toggleFeeModal}
+        inputAmountUsd={confirmedQuote?.totalAmountUsd}
+        feeModel='THORCHAIN_LP'
+      />
     </SlideTransition>
   )
 }