diff --git a/apps/web/src/views/Swap/V3Swap/components/RoutesBreakdown.tsx b/apps/web/src/views/Swap/V3Swap/components/RoutesBreakdown.tsx index ebb1cf95f61ef..aa33ffc9d6bba 100644 --- a/apps/web/src/views/Swap/V3Swap/components/RoutesBreakdown.tsx +++ b/apps/web/src/views/Swap/V3Swap/components/RoutesBreakdown.tsx @@ -12,13 +12,14 @@ import { RouteDisplayEssentials, RouteDisplayModal } from './RouteDisplayModal' interface Props { routes?: RouteDisplayEssentials[] + wrapperStyle?: React.CSSProperties } const RouteInfoContainer = styled(RowBetween)` padding: 4px 24px 0; ` -export const RoutesBreakdown = memo(function RoutesBreakdown({ routes = [] }: Props) { +export const RoutesBreakdown = memo(function RoutesBreakdown({ routes = [], wrapperStyle }: Props) { const [wallchainStatus] = useWallchainStatus() const { t } = useTranslation() const routeDisplayModal = useModalV2() @@ -32,7 +33,7 @@ export const RoutesBreakdown = memo(function RoutesBreakdown({ routes = [] }: Pr return ( <> - + {deferWallchainStatus === 'found' ? t('Bonus Route') : t('Route')} @@ -69,12 +70,12 @@ export const RoutesBreakdown = memo(function RoutesBreakdown({ routes = [] }: Pr ) }) -export const XRoutesBreakdown = memo(function XRoutesBreakdown() { +export const XRoutesBreakdown = memo(function XRoutesBreakdown({ wrapperStyle }: Props) { const { t } = useTranslation() return ( <> - + {t('Route')} diff --git a/apps/web/src/views/SwapSimplify/V4Swap/RefreshButton.tsx b/apps/web/src/views/SwapSimplify/V4Swap/RefreshButton.tsx new file mode 100644 index 0000000000000..a41131100e84b --- /dev/null +++ b/apps/web/src/views/SwapSimplify/V4Swap/RefreshButton.tsx @@ -0,0 +1,22 @@ +import { ChainId } from '@pancakeswap/sdk' +import { IconButton } from '@pancakeswap/uikit' + +import RefreshIcon from 'components/Svg/RefreshIcon' +import { CHAIN_REFRESH_TIME } from 'config/constants/exchange' + +export const RefreshButton: React.FC<{ refreshDisabled: boolean; onRefresh: () => void; chainId?: ChainId }> = ({ + refreshDisabled, + onRefresh, + chainId, +}) => { + return ( + + + + ) +} diff --git a/apps/web/src/views/SwapSimplify/V4Swap/TradeDetails.tsx b/apps/web/src/views/SwapSimplify/V4Swap/TradeDetails.tsx index ce6fa6c4be64b..08ea39b0c2dbc 100644 --- a/apps/web/src/views/SwapSimplify/V4Swap/TradeDetails.tsx +++ b/apps/web/src/views/SwapSimplify/V4Swap/TradeDetails.tsx @@ -66,7 +66,11 @@ export const TradeDetails = memo(function TradeDetails({ loaded, order }: Props) hasStablePair={hasStablePool} gasTokenSelector={isPaymasterAvailable && } /> - {isXOrder(order) ? : } + {isXOrder(order) ? ( + + ) : ( + + )} ) diff --git a/apps/web/src/views/SwapSimplify/V4Swap/index.tsx b/apps/web/src/views/SwapSimplify/V4Swap/index.tsx index b11dd4920d732..a8b477e36535d 100644 --- a/apps/web/src/views/SwapSimplify/V4Swap/index.tsx +++ b/apps/web/src/views/SwapSimplify/V4Swap/index.tsx @@ -1,10 +1,8 @@ import { SmartRouter } from '@pancakeswap/smart-router/evm' -import { FlexGap, IconButton } from '@pancakeswap/uikit' +import { FlexGap } from '@pancakeswap/uikit' import { useUserSlippage } from '@pancakeswap/utils/user' import { SwapUIV2 } from '@pancakeswap/widgets-internal' import { RiskDetailsPanel, useShouldRiskPanelDisplay } from 'components/AccessRisk/SwapRevampRiskDisplay' -import RefreshIcon from 'components/Svg/RefreshIcon' -import { CHAIN_REFRESH_TIME } from 'config/constants/exchange' import { useCurrency } from 'hooks/Tokens' import { useActiveChainId } from 'hooks/useActiveChainId' import { useCurrencyUsdPrice } from 'hooks/useCurrencyUsdPrice' @@ -22,6 +20,7 @@ import { ButtonAndDetailsPanel } from './ButtonAndDetailsPanel' import { CommitButton } from './CommitButton' import { FormMain } from './FormMainV4' import { PricingAndSlippage } from './PricingAndSlippage' +import { RefreshButton } from './RefreshButton' import { SwapSelection } from './SwapSelectionTab' import { TradeDetails } from './TradeDetails' @@ -147,26 +146,16 @@ export function V4SwapForm() { onClick={(e) => { e.stopPropagation() }} + justifyContent="center" + alignItems="center" > - - - + } tradeDetails={} shouldRenderDetails={Boolean(executionPrice) && Boolean(bestOrder) && !isWrapping} /> - {/* */} ) }