diff --git a/packages/app/src/app/(with-sidebar)/bridge/transaction-history/page.tsx b/packages/app/src/app/(with-sidebar)/bridge/transaction-history/page.tsx new file mode 100644 index 00000000..e7270ac4 --- /dev/null +++ b/packages/app/src/app/(with-sidebar)/bridge/transaction-history/page.tsx @@ -0,0 +1,14 @@ +import { PathnameEnum } from '@/bridge/constants'; + +import BridgePageWrapper from '../BridgePageWrapper'; +import { generateMetadata } from '../page'; + +type Props = { + searchParams: { [key: string]: string | string[] | undefined }; +}; + +export { generateMetadata }; + +export default async function BridgeBuyPage({ searchParams }: Props) { + return ; +} diff --git a/packages/arb-token-bridge-ui/src/components/MainContent/MainContent.tsx b/packages/arb-token-bridge-ui/src/components/MainContent/MainContent.tsx index 9db18eaa..8e881258 100644 --- a/packages/arb-token-bridge-ui/src/components/MainContent/MainContent.tsx +++ b/packages/arb-token-bridge-ui/src/components/MainContent/MainContent.tsx @@ -20,21 +20,18 @@ import { ArbitrumStats, statsLocalStorageKey } from './ArbitrumStats'; export function MainContent() { const pathname = usePathname(); const [isArbitrumStatsVisible] = useLocalStorage(statsLocalStorageKey); - const [{ tab, disabledFeatures }] = useArbQueryParams(); + const [{ disabledFeatures }] = useArbQueryParams(); const showBuyPanel = isOnrampFeatureEnabled({ disabledFeatures }); const selectedTab = useMemo(() => { - if (showBuyPanel) { - // `tab` from useArbQueryParams will never be 0 when showBuyPanel is true - // because we use /buy and don't use ?tab=buy - // so we need to hardcode to return 0 rather than `tab` - if (pathname === PathnameEnum.BUY) { - return 0; - } - return tab; + if (pathname === PathnameEnum.BUY) { + return 0; } - return Math.max(0, tab - 1); - }, [showBuyPanel, tab, pathname]); + if (pathname === PathnameEnum.TX_HISTORY) { + return showBuyPanel ? 2 : 1; + } + return showBuyPanel ? 1 : 0; + }, [showBuyPanel, pathname]); useBalanceUpdater(); diff --git a/packages/arb-token-bridge-ui/src/components/TopNavBar.tsx b/packages/arb-token-bridge-ui/src/components/TopNavBar.tsx index 854669f6..6fe863ee 100644 --- a/packages/arb-token-bridge-ui/src/components/TopNavBar.tsx +++ b/packages/arb-token-bridge-ui/src/components/TopNavBar.tsx @@ -8,8 +8,7 @@ import { twMerge } from 'tailwind-merge'; import { PathnameEnum } from '../constants'; import { useArbQueryParams } from '../hooks/useArbQueryParams'; -import { useMode } from '../hooks/useMode'; -import { TabParamEnum, isOnrampFeatureEnabled } from '../util/queryParamUtils'; +import { isOnrampFeatureEnabled } from '../util/queryParamUtils'; import { useTransactionReminderInfo } from './TransactionHistory/useTransactionReminderInfo'; function StyledTab({ @@ -25,14 +24,13 @@ function StyledTab({ }>) { const pathname = usePathname(); const isBuyTab = pathname === PathnameEnum.BUY; - const { embedMode } = useMode(); return ( history icon Txn History{' '} diff --git a/packages/arb-token-bridge-ui/src/constants.ts b/packages/arb-token-bridge-ui/src/constants.ts index 74fcc651..973b8be4 100644 --- a/packages/arb-token-bridge-ui/src/constants.ts +++ b/packages/arb-token-bridge-ui/src/constants.ts @@ -35,6 +35,7 @@ export const PORTAL_API_ENDPOINT = 'https://portal.arbitrum.io'; export enum PathnameEnum { BRIDGE = '/bridge', BUY = '/bridge/buy', + TX_HISTORY = '/bridge/transaction-history', EMBED = '/bridge/embed', EMBED_BUY = '/bridge/embed/buy', }