Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/app/(mobile-ui)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
'use client'

import { MarqueeWrapper } from '@/components/Global/MarqueeWrapper'
import { useRouter } from 'next/navigation'
import { HandThumbsUp } from '@/assets'
import Image from 'next/image'
import GuestLoginModal from '@/components/Global/GuestLoginModal'
import PeanutLoading from '@/components/Global/PeanutLoading'
import TopNavbar from '@/components/Global/TopNavbar'
Expand All @@ -20,6 +17,7 @@ import PullToRefresh from 'pulltorefreshjs'
import { useEffect, useMemo, useState } from 'react'
import { twMerge } from 'tailwind-merge'
import '../../styles/globals.css'
import { Banner } from '@/components/Global/Banner'

const publicPathRegex = /^\/(request\/pay|claim|pay\/.+$)/

Expand Down Expand Up @@ -104,7 +102,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
{/* Main content area */}
<div className="flex w-full flex-1 flex-col">
{/* Only show banner if not on landing page */}
{pathName !== '/' && (
{/* {pathName !== '/' && (
<button onClick={() => router.push('/support')} className="w-full cursor-pointer">
<MarqueeWrapper backgroundColor="bg-primary-1" direction="left">
<span className="z-10 mx-4 flex items-center gap-2 text-sm font-semibold">
Expand All @@ -113,7 +111,11 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
</span>
</MarqueeWrapper>
</button>
)}
)} */}

{/* temp show maintainace banner */}
{pathName !== '/' && <Banner />}

{/* Fixed top navbar */}
{showFullPeanutWallet && (
<div className="sticky top-0 z-10 w-full">
Expand Down
8 changes: 7 additions & 1 deletion src/app/(setup)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { setupActions } from '@/redux/slices/setup-slice'
import { useEffect } from 'react'
import { setupSteps } from '../../components/Setup/Setup.consts'
import '../../styles/globals.css'
import { Banner } from '@/components/Global/Banner'

const SetupLayout = ({ children }: { children?: React.ReactNode }) => {
const dispatch = useAppDispatch()
Expand All @@ -19,7 +20,12 @@ const SetupLayout = ({ children }: { children?: React.ReactNode }) => {
dispatch(setupActions.setSteps(filteredSteps))
}, [isPWA])

return <>{children}</>
return (
<>
<Banner />
{children}
</>
)
}

export default SetupLayout
3 changes: 2 additions & 1 deletion src/config/routesUnderMaintenance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export const MAINTAINABLE_ROUTES = {
// Static configuration - edit this file to change maintenance state
const config: MaintenanceConfig = {
routes: [
MAINTAINABLE_ROUTES.CASHOUT, // Routes under maintenance
// MAINTAINABLE_ROUTES.CASHOUT, // Routes under maintenance
'/', // put all routes under maintenance
],
}

Expand Down
Loading