diff --git a/src/app/(walletConnected)/layout.tsx b/src/app/(walletConnected)/layout.tsx
deleted file mode 100644
index ee6302b..0000000
--- a/src/app/(walletConnected)/layout.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-'use client'
-
-import { useWallet } from '@bbachain/wallet-adapter-react'
-import { CiWallet } from 'react-icons/ci'
-
-import ThemeImage from '@/components/common/ThemeImage'
-import { Button } from '@/components/ui/button'
-import { Card, CardContent, CardFooter, CardHeader, CardTitle } from '@/components/ui/card'
-import { useWalletListDialog } from '@/stores/walletDialog'
-
-export default function WalletConnectedLayout({ children }: { children: React.ReactNode }) {
-	const { publicKey: address } = useWallet()
-	const { openWalletList } = useWalletListDialog()
-
-	if (!address)
-		return (
-			<div className="h-min-screen px-4 h-full w-full flex justify-center">
-				<Card className="md:w-[564px] w-full h-full border-hover-green border-[1px] rounded-[16px] md:p-6 p-3 drop-shadow-lg">
-					<CardHeader className="p-0">
-						<CardTitle className="md:text-4xl text-xl text-center">Wallet Not Connected</CardTitle>
-					</CardHeader>
-					<CardContent className="px-0 py-8 flex flex-col space-y-2.5 justify-center items-center">
-						<ThemeImage
-							lightSrc={'/wallet-not-connected-light.svg'}
-							darkSrc={'/wallet-not-connected-dark.svg'}
-							quality={45}
-							priority
-							width={218}
-							height={218}
-							alt="wallet not connected logo"
-						/>
-						<p className="text-center text-sm text-main-black">
-							Please connect your wallet to use the Quick Token <br /> Generator and access
-							features.
-						</p>
-					</CardContent>
-					<CardFooter className="p-0">
-						<Button
-							type="button"
-							onClick={openWalletList}
-							className="bg-main-green hover:bg-hover-green w-full h-12 text-main-white py-3 rounded-[45px] text-lg font-normal"
-						>
-							<CiWallet width={18} height={18} />
-							Connect Wallet
-						</Button>
-					</CardFooter>
-				</Card>
-			</div>
-		)
-
-	return <div className="h-min-screen h-full w-full">{children}</div>
-}
diff --git a/src/app/(walletConnected)/liquidity-pools/create-pool/page.tsx b/src/app/liquidity-pools/create-pool/page.tsx
similarity index 93%
rename from src/app/(walletConnected)/liquidity-pools/create-pool/page.tsx
rename to src/app/liquidity-pools/create-pool/page.tsx
index 2327834..30c9eef 100644
--- a/src/app/(walletConnected)/liquidity-pools/create-pool/page.tsx
+++ b/src/app/liquidity-pools/create-pool/page.tsx
@@ -1,16 +1,17 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { ChevronDown, ArrowLeft, ArrowRight, Info, Loader2, AlertCircle } from 'lucide-react'
 import Image from 'next/image'
 import { useEffect, useState, useCallback } from 'react'
 import { useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
+import { CiWallet } from 'react-icons/ci'
 import { FaChartArea } from 'react-icons/fa'
 import { FaPlus } from 'react-icons/fa6'
 import { IoSettings } from 'react-icons/io5'
 
-import { NoBalanceAlert } from '@/components/common/Alert'
 import { Button } from '@/components/ui/button'
 import {
 	Card,
@@ -41,10 +42,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
 import LPSuccessDialog from '@/features/liquidityPool/components/LPSuccessDialog'
 import { useCreatePool } from '@/features/liquidityPool/services'
 import { TCreatePoolPayload, MintInfo } from '@/features/liquidityPool/types'
-import {
-	isBBAPool,
-	getBBAPositionInPool,
-} from '@/features/liquidityPool/utils'
+import { isBBAPool, getBBAPositionInPool } from '@/features/liquidityPool/utils'
 import { createPoolValidation } from '@/features/liquidityPool/validation'
 import { LoadingDialog } from '@/features/nfts/components/StatusDialog'
 import SwapItem from '@/features/swap/components/SwapItem'
@@ -57,8 +55,8 @@ import { getCoinGeckoId } from '@/lib/token'
 import { formatTokenBalance } from '@/lib/token'
 import { cn } from '@/lib/utils'
 import { useGetTokenBalanceByMint } from '@/services/wallet'
-import { useGetBBABalance } from '@/services/wallet'
 import { useErrorDialog } from '@/stores/errorDialog'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
 // Enhanced step configuration
 const createPoolSteps = [
@@ -159,11 +157,9 @@ function TokenSelectionCard({
 }
 
 export default function CreatePool() {
-	// Hooks
 	const getTokensQuery = useGetTradeableTokens()
 	const createPoolMutation = useCreatePool()
-	const getBalanceQuery = useGetBBABalance()
-	const { openErrorDialog } = useErrorDialog()
+	const openErrorDialog = useErrorDialog((state) => state.openErrorDialog)
 
 	// Form setup
 	const form = useForm<TCreatePoolPayload>({
@@ -183,6 +179,10 @@ export default function CreatePool() {
 		}
 	})
 
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
+
 	// States
 	const [currentStep, setCurrentStep] = useState<number>(0)
 	const [isTokenDialogOpen, setIsTokenDialogOpen] = useState<boolean>(false)
@@ -193,7 +193,6 @@ export default function CreatePool() {
 	const createPoolResponse = createPoolMutation.data?.data
 	const selectedBaseToken = form.watch('baseToken')
 	const selectedQuoteToken = form.watch('quoteToken')
-	const isNoBalance = getBalanceQuery.isError || !getBalanceQuery.data || getBalanceQuery.data === 0
 
 	// BBA Pool Detection
 	const isBBAPoolPair =
@@ -404,8 +403,8 @@ export default function CreatePool() {
 		(value: string) => {
 			form.setValue('baseTokenAmount', value, { shouldValidate: true })
 
-			if(value === '') return resetTokenAmounts()
-			
+			if (value === '') return resetTokenAmounts()
+
 			// Auto-calculate quote amount if both tokens and initial price are set
 			const initialPrice = parseFloat(form.getValues('initialPrice'))
 			if (initialPrice && value && selectedBaseToken && selectedQuoteToken) {
@@ -436,20 +435,14 @@ export default function CreatePool() {
 		[form, resetTokenAmounts, selectedBaseToken, selectedQuoteToken]
 	)
 
-	// Show loading state for tokens
-
 	return (
 		<div className="max-w-4xl mx-auto md:px-0 px-[15px] flex flex-col space-y-14">
-			{/* Show balance alert if needed */}
-			{isNoBalance && <NoBalanceAlert />}
-
 			<div className="text-center flex flex-col space-y-3 ">
 				<h1 className="md:text-[45px] text-xl font-bold text-main-black">Create Liquidity Pool</h1>
 				<p className="text-xs md:text-lg text-dark-grey">
 					Create a new liquidity pool for token trading on BBAChain
 				</p>
 			</div>
-
 			<Form {...form}>
 				<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4 md:space-y-6">
 					{/* Progress Line */}
@@ -1028,45 +1021,59 @@ export default function CreatePool() {
 							)}
 
 							{/* Navigation Buttons */}
-							<CardFooter className="flex justify-between items-center w-full py-0 md:px-3 px-0">
-								<Button
-									type="button"
-									variant="ghost"
-									onClick={onPrev}
-									disabled={currentStep === 0 || createPoolMutation.isPending}
-									className="flex items-center space-x-2 py-1 px-3 h-10 max-w-28 w-full text-sm md:text-base"
-								>
-									<ArrowLeft className="w-3 h-3 md:w-4 md:h-4" />
-									<span className="hidden sm:inline">Previous</span>
-									<span className="sm:hidden">Prev</span>
-								</Button>
-								<Button
-									type="button"
-									onClick={onNext}
-									disabled={
-										createPoolMutation.isPending || (currentStep === 3 && !form.formState.isValid)
-									}
-									className="flex items-center rounded-[26px] space-x-2 py-1 px-3 h-10 max-w-36 w-full text-sm md:text-base bg-main-green hover:bg-hover-green disabled:opacity-50 disabled:cursor-not-allowed"
-								>
-									{createPoolMutation.isPending ? (
-										<>
-											<Loader2 className="w-3 h-3 md:w-4 md:h-4 animate-spin" />
-											<span className="hidden sm:inline">Creating Pool...</span>
-											<span className="sm:hidden">Creating...</span>
-										</>
-									) : currentStep === createPoolSteps.length - 1 ? (
-										<>
-											<span>Create Pool</span>
-											<ArrowRight className="w-3 h-3 md:w-4 md:h-4" />
-										</>
-									) : (
-										<>
-											<span className="hidden sm:inline">Next</span>
-											<span className="sm:hidden">Next</span>
-											<ArrowRight className="w-3 h-3 md:w-4 md:h-4" />
-										</>
-									)}
-								</Button>
+							<CardFooter className="flex justify-between items-center w-full py-0 px-0">
+								{isWalletConnected ? (
+									<>
+										<Button
+											type="button"
+											variant="ghost"
+											onClick={onPrev}
+											disabled={currentStep === 0 || createPoolMutation.isPending}
+											className="flex items-center space-x-2 py-1 px-3 h-10 max-w-28 w-full text-sm md:text-base"
+										>
+											<ArrowLeft className="w-3 h-3 md:w-4 md:h-4" />
+											<span className="hidden sm:inline">Previous</span>
+											<span className="sm:hidden">Prev</span>
+										</Button>
+										<Button
+											type="button"
+											onClick={onNext}
+											disabled={
+												createPoolMutation.isPending ||
+												(currentStep === 3 && !form.formState.isValid)
+											}
+											className="flex items-center rounded-[26px] space-x-2 py-1 px-3 h-10 max-w-36 w-full text-sm md:text-base bg-main-green hover:bg-hover-green disabled:opacity-50 disabled:cursor-not-allowed"
+										>
+											{createPoolMutation.isPending ? (
+												<>
+													<Loader2 className="w-3 h-3 md:w-4 md:h-4 animate-spin" />
+													<span className="hidden sm:inline">Creating Pool...</span>
+													<span className="sm:hidden">Creating...</span>
+												</>
+											) : currentStep === createPoolSteps.length - 1 ? (
+												<>
+													<span>Create Pool</span>
+													<ArrowRight className="w-3 h-3 md:w-4 md:h-4" />
+												</>
+											) : (
+												<>
+													<span className="hidden sm:inline">Next</span>
+													<span className="sm:hidden">Next</span>
+													<ArrowRight className="w-3 h-3 md:w-4 md:h-4" />
+												</>
+											)}
+										</Button>
+									</>
+								) : (
+									<Button
+										type="button"
+										onClick={openWalletList}
+										className="bg-main-green hover:bg-hover-green w-full h-10 text-main-white py-3 rounded-[45px] text-lg font-normal"
+									>
+										<CiWallet width={18} height={18} />
+										Connect Wallet
+									</Button>
+								)}
 							</CardFooter>
 						</Card>
 					</section>
diff --git a/src/app/(walletConnected)/liquidity-pools/deposit/[poolId]/page.tsx b/src/app/liquidity-pools/deposit/page.tsx
similarity index 87%
rename from src/app/(walletConnected)/liquidity-pools/deposit/[poolId]/page.tsx
rename to src/app/liquidity-pools/deposit/page.tsx
index cd9a4f6..2a47c03 100644
--- a/src/app/(walletConnected)/liquidity-pools/deposit/[poolId]/page.tsx
+++ b/src/app/liquidity-pools/deposit/page.tsx
@@ -1,10 +1,12 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { Loader2 } from 'lucide-react'
 import Image from 'next/image'
-import { useRouter } from 'next/navigation'
+import { useRouter, useSearchParams } from 'next/navigation'
 import { useState, useEffect } from 'react'
 import toast from 'react-hot-toast'
+import { CiWallet } from 'react-icons/ci'
 import { HiOutlineArrowNarrowLeft } from 'react-icons/hi'
 import { HiOutlineAdjustmentsHorizontal } from 'react-icons/hi2'
 import { IoCheckmarkCircle } from 'react-icons/io5'
@@ -30,6 +32,7 @@ import { useGetTokenPriceByCoinGeckoId } from '@/features/tokens/services'
 import { formatTokenBalance, getCoinGeckoId } from '@/lib/token'
 import { cn } from '@/lib/utils'
 import { useGetTokenBalanceByMint } from '@/services/wallet'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
 const initialTokeProps: MintInfo = {
 	chainId: 101,
@@ -43,8 +46,9 @@ const initialTokeProps: MintInfo = {
 	extensions: {}
 }
 
-export default function LiquidityPoolDeposit({ params }: { params: { poolId: string } }) {
-	const poolId = params.poolId
+export default function LiquidityPoolDeposit() {
+	const searchParams = useSearchParams()
+	const poolId = searchParams.get('poolId') ?? ''
 	const router = useRouter()
 
 	const getPoolByIdQuery = useGetPoolById({ poolId })
@@ -53,6 +57,10 @@ export default function LiquidityPoolDeposit({ params }: { params: { poolId: str
 	const getUserPoolStats = useGetUserPoolStats({ pool: poolDetailData })
 	const userStatsData = getUserPoolStats.data?.data
 
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+
 	const [fromAmount, setFromAmount] = useState<string>('')
 	const [toAmount, setToAmount] = useState<string>('')
 	const [slippage, setSlippage] = useState<number>(1)
@@ -320,14 +328,16 @@ export default function LiquidityPoolDeposit({ params }: { params: { poolId: str
 						<Button
 							type="button"
 							size="lg"
-							className={cn(
-								'rounded-[26px] h-12 text-lg font-medium text-main-white py-3 w-full transition-all',
-								canDeposit ? 'bg-main-green hover:bg-hover-green ' : 'bg-light-grey'
-							)}
-							disabled={!canDeposit}
-							onClick={handleDeposit}
+							className="rounded-[26px] bg-main-green hover:bg-hover-green h-12 text-lg font-medium text-main-white py-3 w-full transition-all"
+							disabled={isWalletConnected && !canDeposit}
+							onClick={!isWalletConnected ? openWalletList : handleDeposit}
 						>
-							{depositMutation.isPending ? (
+							{!isWalletConnected ? (
+								<div className="flex items-center gap-2">
+									<CiWallet width={18} height={18} />
+									Connect Wallet
+								</div>
+							) : depositMutation.isPending ? (
 								<div className="flex items-center gap-2">
 									<Loader2 className="animate-spin" />
 									Depositing...
@@ -406,25 +416,33 @@ export default function LiquidityPoolDeposit({ params }: { params: { poolId: str
 					</Card>
 					<Card className="md:w-80 w-full border-hover-green border-[1px] rounded-[12px] p-6 drop-shadow-lg">
 						<CardContent className="p-0 flex flex-col space-y-[18px]">
-							<div className="flex justify-between items-center font-normal text-sm text-dark-grey">
-								<h4>My Position</h4>
-								{getUserPoolStats.isLoading ? (
-									<Skeleton className="h-4 w-12" />
-								) : (
-									<p>${userStatsData?.userReserveTotalPrice.toLocaleString()}</p>
-								)}
-							</div>
-							<div className="flex flex-col space-y-3 text-dark-grey">
-								<h3 className="text-main-black">LP Token Balances</h3>
-								<div className="flex items-center justify-between">
-									<h4>Staked/Unstaked</h4>
-									{getUserPoolStats.isLoading ? (
-										<Skeleton className="h-4 w-12" />
-									) : (
-										<p>{userStatsData?.userLPToken} LP</p>
-									)}
-								</div>
-							</div>
+							{isWalletConnected ? (
+								<>
+									<div className="flex justify-between items-center font-normal text-sm text-dark-grey">
+										<h4>My Position</h4>
+										{getUserPoolStats.isLoading ? (
+											<Skeleton className="h-4 w-12" />
+										) : (
+											<p>${userStatsData?.userReserveTotalPrice.toLocaleString()}</p>
+										)}
+									</div>
+									<div className="flex flex-col space-y-3 text-dark-grey">
+										<h3 className="text-main-black">LP Token Balances</h3>
+										<div className="flex items-center justify-between">
+											<h4>Staked/Unstaked</h4>
+											{getUserPoolStats.isLoading ? (
+												<Skeleton className="h-4 w-12" />
+											) : (
+												<p>{userStatsData?.userLPToken} LP</p>
+											)}
+										</div>
+									</div>
+								</>
+							) : (
+								<p className="text-sm">
+									Please connect your wallet to see your position on this pool
+								</p>
+							)}
 						</CardContent>
 					</Card>
 				</div>
diff --git a/src/app/(walletConnected)/liquidity-pools/detail/[poolId]/page.tsx b/src/app/liquidity-pools/detail/page.tsx
similarity index 80%
rename from src/app/(walletConnected)/liquidity-pools/detail/[poolId]/page.tsx
rename to src/app/liquidity-pools/detail/page.tsx
index b2e6002..113bccc 100644
--- a/src/app/(walletConnected)/liquidity-pools/detail/[poolId]/page.tsx
+++ b/src/app/liquidity-pools/detail/page.tsx
@@ -3,8 +3,8 @@
 import { useWallet } from '@bbachain/wallet-adapter-react'
 import Image from 'next/image'
 import Link from 'next/link'
-import { useRouter } from 'next/navigation'
-import { useEffect, useState } from 'react'
+import { useRouter, useSearchParams } from 'next/navigation'
+import { useEffect, useMemo, useState } from 'react'
 import { AiOutlineInfo } from 'react-icons/ai'
 import { HiOutlineArrowNarrowLeft } from 'react-icons/hi'
 import { IoIosSwap } from 'react-icons/io'
@@ -132,10 +132,12 @@ function StatsItem({
 const tabsTriggerClass =
 	'flex-1 w-full h-full rounded-md p-1.5 text-sm font-normal data-[state=active]:bg-main-green hover:bg-main-green data-[state=active]:text-main-white data-[state=inactive]:text-box hover:!text-main-white'
 
-export default function PoolDetail({ params }: { params: { poolId: string } }) {
+export default function PoolDetail() {
 	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
 	const router = useRouter()
-	const poolId = params.poolId
+	const searchParams = useSearchParams()
+	const poolId = searchParams.get('poolId') ?? ''
 
 	const [isOwnerTab, setIsOwnerTab] = useState<boolean>(false)
 	const isMobile = useIsMobile()
@@ -161,9 +163,10 @@ export default function PoolDetail({ params }: { params: { poolId: string } }) {
 	)
 
 	// owner spesific data by address
-	const ownerTransactions = ownerAddress
-		? transactions.filter((tx) => tx.ownerAddress === ownerAddress.toBase58())
-		: []
+	const ownerTransactions =
+		isOwnerTab && isWalletConnected && ownerAddress
+			? transactions.filter((tx) => tx.ownerAddress === ownerAddress.toBase58())
+			: []
 	const getUserStats = useGetUserPoolStats({ pool })
 	const userStats = getUserStats.data?.data
 
@@ -181,7 +184,7 @@ export default function PoolDetail({ params }: { params: { poolId: string } }) {
 		}
 	}, [getTransactionsByPoolId.error, getTransactionsByPoolId.isError])
 
-	if (getPoolById.isLoading || getTransactionsByPoolId.isLoading || getUserStats.isLoading)
+	if (getPoolById.isLoading || getTransactionsByPoolId.isLoading)
 		return (
 			<div className="w-full mx-auto 2xl:max-w-7xl lg:max-w-5xl md:max-w-2xl px-[15px]">
 				<Button
@@ -277,7 +280,7 @@ export default function PoolDetail({ params }: { params: { poolId: string } }) {
 							Swap
 						</Link>
 						<Link
-							href={`/liquidity-pools/deposit/${poolId}`}
+							href={`/liquidity-pools/deposit?poolId=${poolId}`}
 							className={cn(
 								buttonVariants({ size: 'lg', variant: 'default' }),
 								'bg-main-green hover:bg-hover-green px-6 py-3 text-main-white font-medium text-lg rounded-[26px]'
@@ -426,64 +429,75 @@ export default function PoolDetail({ params }: { params: { poolId: string } }) {
 						</div>
 					</TabsContent>
 					<TabsContent value="my-stats">
-						<div className="flex flex-col md:space-y-3 space-y-1.5">
-							<section className="flex items-center space-x-2">
-								<h3 className="lg:text-lg md:text-base text-sm text-dark-grey">Your Deposits</h3>
-								<Tooltip>
-									<TooltipTrigger asChild>
-										<Button
-											aria-label="info button"
-											variant="outline"
-											className="border-main-green rounded-full bg-transparent w-4 h-4 [&_svg]:size-3"
-											size="icon"
-										>
-											<AiOutlineInfo className="text-main-green" />
-										</Button>
-									</TooltipTrigger>
-									<TooltipContent className="bg-main-white">
-										<p className="text-xs text-dark-grey">
-											Total value of tokens currently you deposit in this pool, displayed per token.
-										</p>
-									</TooltipContent>
-								</Tooltip>
-							</section>
-							<PoolAmountBar
-								mintAAmount={userStats?.userReserveA ?? 0}
-								mintBAmount={userStats?.userReserveB ?? 0}
-								mintASymbol={pool?.mintA?.symbol ?? ''}
-								mintBSymbol={pool?.mintB?.symbol ?? ''}
-								isLoading={getUserStats.isRefetching}
-							/>
-						</div>
-						<div className="md:mt-6 mt-3 grid grid-cols-2 lg:flex lg:gap-y-0 gap-y-3  items-center justify-between">
-							<StatsItem
-								isLoading={getUserStats.isRefetching}
-								title="My Pool Share (%)"
-								info="This is the percentage of the total liquidity pool that you currently own."
-								content={`${((userStats?.userShare ?? 0) * 100).toFixed(2)}%`}
-							/>
-							<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
-							<StatsItem
-								isLoading={getUserStats.isRefetching}
-								title="My Liquidity Value"
-								info="The estimated dollar value of the tokens you've contributed to this pool."
-								content={`$${userStats?.userReserveTotalPrice.toLocaleString() ?? 0}`}
-							/>
-							<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
-							<StatsItem
-								isLoading={getUserStats.isRefetching}
-								title="LP Tokens Held"
-								info="The total number of LP (liquidity provider) tokens you own — including both staked and unstaked."
-								content={`${userStats?.userLPToken.toLocaleString() ?? 0} LP`}
-							/>
-							<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
-							<StatsItem
-								isLoading={getUserStats.isRefetching}
-								title="Fee Earnings(24h)"
-								info="Total amount you've earned from trading fees within the last 24 hours."
-								content={`$${userStats?.dailyFeeEarnings.toFixed(3) ?? 0}`}
-							/>
-						</div>
+						{isWalletConnected ? (
+							<>
+								<div className="flex flex-col md:space-y-3 space-y-1.5">
+									<section className="flex items-center space-x-2">
+										<h3 className="lg:text-lg md:text-base text-sm text-dark-grey">
+											Your Deposits
+										</h3>
+										<Tooltip>
+											<TooltipTrigger asChild>
+												<Button
+													aria-label="info button"
+													variant="outline"
+													className="border-main-green rounded-full bg-transparent w-4 h-4 [&_svg]:size-3"
+													size="icon"
+												>
+													<AiOutlineInfo className="text-main-green" />
+												</Button>
+											</TooltipTrigger>
+											<TooltipContent className="bg-main-white">
+												<p className="text-xs text-dark-grey">
+													Total value of tokens currently you deposit in this pool, displayed per
+													token.
+												</p>
+											</TooltipContent>
+										</Tooltip>
+									</section>
+									<PoolAmountBar
+										mintAAmount={userStats?.userReserveA ?? 0}
+										mintBAmount={userStats?.userReserveB ?? 0}
+										mintASymbol={pool?.mintA?.symbol ?? ''}
+										mintBSymbol={pool?.mintB?.symbol ?? ''}
+										isLoading={getUserStats.isRefetching}
+									/>
+								</div>
+								<div className="md:mt-6 mt-3 grid grid-cols-2 lg:flex lg:gap-y-0 gap-y-3  items-center justify-between">
+									<StatsItem
+										isLoading={getUserStats.isRefetching}
+										title="My Pool Share (%)"
+										info="This is the percentage of the total liquidity pool that you currently own."
+										content={`${((userStats?.userShare ?? 0) * 100).toFixed(2)}%`}
+									/>
+									<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
+									<StatsItem
+										isLoading={getUserStats.isRefetching}
+										title="My Liquidity Value"
+										info="The estimated dollar value of the tokens you've contributed to this pool."
+										content={`$${userStats?.userReserveTotalPrice.toLocaleString() ?? 0}`}
+									/>
+									<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
+									<StatsItem
+										isLoading={getUserStats.isRefetching}
+										title="LP Tokens Held"
+										info="The total number of LP (liquidity provider) tokens you own — including both staked and unstaked."
+										content={`${userStats?.userLPToken.toLocaleString() ?? 0} LP`}
+									/>
+									<hr className="w-px h-12 lg:block hidden bg-light-grey border-0" />
+									<StatsItem
+										isLoading={getUserStats.isRefetching}
+										title="Fee Earnings(24h)"
+										info="Total amount you've earned from trading fees within the last 24 hours."
+										content={`$${userStats?.dailyFeeEarnings.toFixed(3) ?? 0}`}
+									/>
+								</div>
+							</>
+						) : (
+							<div className="text-center flex justify-center items-center">
+								<p>Please connect your wallet to see your stats</p>
+							</div>
+						)}
 					</TabsContent>
 				</Tabs>
 			</div>
@@ -495,6 +509,11 @@ export default function PoolDetail({ params }: { params: { poolId: string } }) {
 					<TransactionDataTable
 						columns={transactionColumn}
 						data={isOwnerTab ? ownerTransactions : transactions}
+						NoDataMessage={
+							isOwnerTab && !isWalletConnected
+								? 'Please connect your wallet to see your latest transaction'
+								: undefined
+						}
 					/>
 				)}
 			</div>
diff --git a/src/app/(walletConnected)/liquidity-pools/page.tsx b/src/app/liquidity-pools/page.tsx
similarity index 92%
rename from src/app/(walletConnected)/liquidity-pools/page.tsx
rename to src/app/liquidity-pools/page.tsx
index b0ab5aa..3f28dcd 100644
--- a/src/app/(walletConnected)/liquidity-pools/page.tsx
+++ b/src/app/liquidity-pools/page.tsx
@@ -61,7 +61,6 @@ function EmptyPoolsState() {
 
 export default function LiquidityPools() {
 	const getPoolsQuery = useGetPools()
-	const getBalanceQuery = useGetBBABalance()
 	const { openErrorDialog } = useErrorDialog()
 	const isMobile = useIsMobile()
 
@@ -69,7 +68,6 @@ export default function LiquidityPools() {
 		if (getPoolsQuery.isSuccess && getPoolsQuery.data) console.log(getPoolsQuery.data?.data)
 	}, [getPoolsQuery.data, getPoolsQuery.isSuccess])
 
-	const isNoBalance = getBalanceQuery.isError || !getBalanceQuery.data || getBalanceQuery.data === 0
 	const allPoolsData = getPoolsQuery.data ? formatOnchainPoolsForUI(getPoolsQuery.data.data) : []
 
 	const statisticData = [
@@ -100,12 +98,6 @@ export default function LiquidityPools() {
 		}
 	}, [getPoolsQuery.isError, getPoolsQuery.error, openErrorDialog])
 
-	// Handle balance errors with toast
-	useEffect(() => {
-		if (getBalanceQuery.isError && getBalanceQuery.error) {
-			toast.error('Failed to load wallet balance')
-		}
-	}, [getBalanceQuery.isError, getBalanceQuery.error])
 
 	return (
 		<div className="xl:px-48 md:px-16 px-[15px] flex flex-col lg:space-y-14 md:space-y-9 space-y-6">
@@ -132,8 +124,6 @@ export default function LiquidityPools() {
 					<span>Create Pool</span>
 				</Link>
 			</div>
-			{/* Balance Alert */}
-			{isNoBalance && <NoBalanceAlert />}
 
 			{/* Pools Section */}
 			<div className="flex flex-col md:space-y-14 space-y-4">
diff --git a/src/app/(walletConnected)/nfts/[address]/page.tsx b/src/app/nfts/[address]/page.tsx
similarity index 100%
rename from src/app/(walletConnected)/nfts/[address]/page.tsx
rename to src/app/nfts/[address]/page.tsx
diff --git a/src/app/(walletConnected)/nfts/collection/create/page.tsx b/src/app/nfts/collection/create/page.tsx
similarity index 82%
rename from src/app/(walletConnected)/nfts/collection/create/page.tsx
rename to src/app/nfts/collection/create/page.tsx
index 067e370..9d18fbf 100644
--- a/src/app/(walletConnected)/nfts/collection/create/page.tsx
+++ b/src/app/nfts/collection/create/page.tsx
@@ -1,12 +1,13 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { ChevronRight, Loader2 } from 'lucide-react'
+import { ChevronRight } from 'lucide-react'
 import Image from 'next/image'
 import { useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
+import { CiWallet } from 'react-icons/ci'
 
-import { NoBalanceAlert } from '@/components/common/Alert'
 import { Button } from '@/components/ui/button'
 import {
 	Card,
@@ -33,8 +34,8 @@ import {
 import { useCreateCollection, useValidateOffChainMetadata } from '@/features/nfts/services'
 import { TCreateCollectionPayload, TCreateNFTDialogProps } from '@/features/nfts/types'
 import { CreateCollectionValidation } from '@/features/nfts/validation'
-import { useGetBBABalance } from '@/services/wallet'
 import { useErrorDialog } from '@/stores/errorDialog'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
 type FieldName = keyof TCreateCollectionPayload
 
@@ -51,8 +52,10 @@ export default function CreateCollection() {
 
 	const createCollectionMutation = useCreateCollection()
 	const validateMetadataMutation = useValidateOffChainMetadata()
-	const getBalanceQuery = useGetBBABalance()
-	const isNoBalance = getBalanceQuery.isError || !getBalanceQuery.data || getBalanceQuery.data === 0
+
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
 
 	const [step, setStep] = useState<number>(0)
 	const [isSuccessDialogMetadata, setIsSuccessDialogMetadata] = useState<boolean>(false)
@@ -164,11 +167,6 @@ export default function CreateCollection() {
 					mintAddress: createCollectionMutation.data?.data.mintAddress ?? ''
 				}}
 			/>
-			{isNoBalance && (
-				<div className="mb-7">
-					<NoBalanceAlert />
-				</div>
-			)}
 			<h1 className="text-center md:text-[55px] md:mb-9 mb-6 leading-tight text-xl font-bold text-main-black">
 				Create NFT Collection
 			</h1>
@@ -248,15 +246,26 @@ export default function CreateCollection() {
 										</FormItem>
 									)}
 								/>
-								<CardFooter className="flex p-0 justify-end">
+								{isWalletConnected ? (
+									<CardFooter className="flex p-0 justify-end">
+										<Button
+											type="submit"
+											className="bg-main-green w-[261px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										>
+											Create Collection NFT
+											<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										</Button>
+									</CardFooter>
+								) : (
 									<Button
-										type="submit"
-										className="bg-main-green w-[261px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										type="button"
+										onClick={openWalletList}
+										className="w-full bg-main-green hover:bg-hover-green text-main-white md:text-lg text-base h-12 rounded-[43px]"
 									>
-										Create Collection NFT
-										<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										<CiWallet width={18} height={18} />
+										Connect Wallet
 									</Button>
-								</CardFooter>
+								)}
 							</CardContent>
 						</Card>
 					)}
@@ -289,16 +298,27 @@ export default function CreateCollection() {
 										</FormItem>
 									)}
 								/>
-								<CardFooter className="flex p-0 justify-end">
+								{isWalletConnected ? (
+									<CardFooter className="flex p-0 justify-end">
+										<Button
+											type="button"
+											onClick={onValidateMetata}
+											className="bg-main-green w-[122px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										>
+											Next
+											<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										</Button>
+									</CardFooter>
+								) : (
 									<Button
 										type="button"
-										onClick={onValidateMetata}
-										className="bg-main-green w-[122px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										onClick={openWalletList}
+										className="w-full bg-main-green hover:bg-hover-green text-main-white md:text-lg text-base h-12 rounded-[43px]"
 									>
-										Next
-										<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										<CiWallet width={18} height={18} />
+										Connect Wallet
 									</Button>
-								</CardFooter>
+								)}
 							</CardContent>
 						</Card>
 					)}
diff --git a/src/app/(walletConnected)/nfts/create/page.tsx b/src/app/nfts/create/page.tsx
similarity index 85%
rename from src/app/(walletConnected)/nfts/create/page.tsx
rename to src/app/nfts/create/page.tsx
index 48b08a8..38e1384 100644
--- a/src/app/(walletConnected)/nfts/create/page.tsx
+++ b/src/app/nfts/create/page.tsx
@@ -1,15 +1,16 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { zodResolver } from '@hookform/resolvers/zod'
-import { ChevronRight, Loader2 } from 'lucide-react'
-import { useSearchParams, useRouter } from 'next/navigation'
+import { ChevronRight } from 'lucide-react'
+import { useSearchParams } from 'next/navigation'
 import { useEffect, useMemo, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
+import { CiWallet } from 'react-icons/ci'
 import { HiOutlineArrowNarrowLeft } from 'react-icons/hi'
 import { capitalCase } from 'text-case'
 
-import { NoBalanceAlert } from '@/components/common/Alert'
 import { Button } from '@/components/ui/button'
 import {
 	Card,
@@ -41,6 +42,7 @@ import { TCreateNFTPayload, TCreateNFTDialogProps } from '@/features/nfts/types'
 import { CreateNFTValidation } from '@/features/nfts/validation'
 import { useGetBBABalance } from '@/services/wallet'
 import { useErrorDialog } from '@/stores/errorDialog'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
 const initialDialogContent: TCreateNFTDialogProps = {
 	title: '',
@@ -63,7 +65,10 @@ export default function CreateNFT() {
 	const getCollectionQuery = useGetCollections()
 	const validateMetadataMutation = useValidateOffChainMetadata()
 	const getBalanceQuery = useGetBBABalance()
-	const isNoBalance = getBalanceQuery.isError || !getBalanceQuery.data || getBalanceQuery.data === 0
+
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
 
 	const [step, setStep] = useState<'upload' | 'preview'>('upload')
 	const [isCreateCollection, setIsCreateCollection] = useState<boolean>(false)
@@ -190,11 +195,6 @@ export default function CreateNFT() {
 				description={successDialogProps.description}
 			/>
 			<CreateCollectionDialog isOpen={isCreateCollection} onOpenChange={setIsCreateCollection} />
-			{isNoBalance && (
-				<div className="mb-7">
-					<NoBalanceAlert />
-				</div>
-			)}
 			{step === 'preview' && (
 				<div>
 					<Button
@@ -264,12 +264,23 @@ export default function CreateNFT() {
 							/>
 						</div>
 						<div className="flex justify-center">
-							<Button
-								type="submit"
-								className="md:w-[350px] rounded-[48px] md:h-[55px] h-[43px] text-base md:text-xl py-3 w-full text-main-white bg-main-green"
-							>
-								Mint NFT
-							</Button>
+							{isWalletConnected ? (
+								<Button
+									type="submit"
+									className="md:w-[350px] rounded-[48px] md:h-[55px] h-[43px] text-base md:text-xl py-3 w-full text-main-white bg-main-green"
+								>
+									Mint NFT
+								</Button>
+							) : (
+								<Button
+									type="button"
+									onClick={openWalletList}
+									className="w-full bg-main-green hover:bg-hover-green text-main-white md:text-lg text-base h-12 rounded-[43px]"
+								>
+									<CiWallet width={18} height={18} />
+									Connect Wallet
+								</Button>
+							)}
 						</div>
 					</form>
 				</div>
@@ -311,15 +322,26 @@ export default function CreateNFT() {
 										</FormItem>
 									)}
 								/>
-								<CardFooter className="flex p-0 justify-end">
+								{isWalletConnected ? (
+									<CardFooter className="flex p-0 justify-end">
+										<Button
+											type="submit"
+											className="bg-main-green w-[229px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										>
+											Preview Metadata
+											<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										</Button>
+									</CardFooter>
+								) : (
 									<Button
-										type="submit"
-										className="bg-main-green w-[229px] text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[48px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-lg text-base"
+										type="button"
+										onClick={openWalletList}
+										className="w-full bg-main-green hover:bg-hover-green text-main-white md:text-lg text-base h-12 rounded-[43px]"
 									>
-										Preview Metadata
-										<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+										<CiWallet width={18} height={18} />
+										Connect Wallet
 									</Button>
-								</CardFooter>
+								)}
 							</CardContent>
 						</Card>
 					</form>
diff --git a/src/app/(walletConnected)/nfts/page.tsx b/src/app/nfts/page.tsx
similarity index 79%
rename from src/app/(walletConnected)/nfts/page.tsx
rename to src/app/nfts/page.tsx
index 305db26..ca55e4b 100644
--- a/src/app/(walletConnected)/nfts/page.tsx
+++ b/src/app/nfts/page.tsx
@@ -1,9 +1,11 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { ColumnDef } from '@tanstack/react-table'
 import { useEffect } from 'react'
 import toast from 'react-hot-toast'
 
+import WalletNotConnectedCard from '@/components/common/WalletNotConnectedCard'
 import { type NftCardProps } from '@/features/nfts/components/NFTCard'
 import NFTList from '@/features/nfts/components/NFTList'
 import { useGetNFTs } from '@/features/nfts/services'
@@ -41,6 +43,9 @@ export default function NFTs() {
 	const getNFTQuery = useGetNFTs()
 	const nftMetadata = getNFTQuery.data ? mapToNFTPropsList(getNFTQuery.data.data) : []
 
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+
 	useEffect(() => {
 		if (getNFTQuery.isError && getNFTQuery.error) toast.error(getNFTQuery.error.message)
 	}, [getNFTQuery.error, getNFTQuery.isError])
@@ -50,7 +55,10 @@ export default function NFTs() {
 			<h1 className="text-center md:text-[55px] leading-tight text-xl font-bold text-main-black">
 				My NFTs
 			</h1>
-			<NFTList data={nftMetadata} columns={columns} isLoading={getNFTQuery.isPending} />
+			{isWalletConnected && (
+				<NFTList data={nftMetadata} columns={columns} isLoading={getNFTQuery.isPending} />
+			)}
+			{!isWalletConnected && <WalletNotConnectedCard />}
 		</div>
 	)
 }
diff --git a/src/app/(walletConnected)/swap/page.tsx b/src/app/swap/page.tsx
similarity index 94%
rename from src/app/(walletConnected)/swap/page.tsx
rename to src/app/swap/page.tsx
index b17b779..9f5c97a 100644
--- a/src/app/(walletConnected)/swap/page.tsx
+++ b/src/app/swap/page.tsx
@@ -1,11 +1,13 @@
 'use client'
 
 import { NATIVE_MINT } from '@bbachain/spl-token'
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { Loader2 } from 'lucide-react'
 import Image from 'next/image'
 import { useSearchParams, useRouter } from 'next/navigation'
 import { useCallback, useEffect, useState } from 'react'
 import toast from 'react-hot-toast'
+import { CiWallet } from 'react-icons/ci'
 import { IoMdSettings } from 'react-icons/io'
 
 import { Button } from '@/components/ui/button'
@@ -22,6 +24,7 @@ import { formatTokenBalance, getCoinGeckoId } from '@/lib/token'
 import { cn } from '@/lib/utils'
 import { useGetTokenBalanceByMint } from '@/services/wallet'
 import { USDT_MINT } from '@/staticData/tokens'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
 const initialTradeableToken: TTradeableTokenProps = {
 	address: '',
@@ -33,6 +36,11 @@ const initialTradeableToken: TTradeableTokenProps = {
 export default function Swap() {
 	const searchParams = useSearchParams()
 	const router = useRouter()
+
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
+
 	const [amountIn, setAmountIn] = useState<string>('')
 	const [fromTokenProps, setFromTokenProps] = useState<TTradeableTokenProps>(initialTradeableToken)
 	const [toTokenProps, setToTokenProps] = useState<TTradeableTokenProps>(initialTradeableToken)
@@ -232,7 +240,8 @@ export default function Swap() {
 	}
 
 	const buttonDisplay = useCallback(() => {
-		if (executeSwapMutation.isPending) return 'Swapping...'
+		if (!isWalletConnected) return 'Connect Wallet'
+		else if (executeSwapMutation.isPending) return 'Swapping...'
 		else if (isSwapQuoteLoading) return 'Computing...'
 		else if (!isTokenPairValid) return 'Select Different Tokens'
 		else if (!isInputPositive) return 'Enter Valid Amount'
@@ -241,6 +250,7 @@ export default function Swap() {
 		else if (isQuoteError) return 'Failed to Get Quote'
 		else return 'Swap'
 	}, [
+		isWalletConnected,
 		executeSwapMutation.isPending,
 		isBalanceEnough,
 		isInputPositive,
@@ -405,17 +415,17 @@ export default function Swap() {
 
 				<CardFooter className="pt-[18px] !px-0 !pb-0">
 					<Button
-						disabled={!isValid || isSwapQuoteLoading || executeSwapMutation.isPending}
+						disabled={
+							isWalletConnected && (!isValid || isSwapQuoteLoading || executeSwapMutation.isPending)
+						}
 						type="button"
-						onClick={handleSwap}
-						className={cn(
-							'rounded-[48px] md:h-[55px] h-12 text-base md:text-xl py-3 w-full text-main-white bg-main-green hover:bg-hover-green',
-							!isValid && 'hover:cursor-not-allowed'
-						)}
+						onClick={!isWalletConnected ? openWalletList : handleSwap}
+						className="rounded-[48px] md:h-[55px] h-12 text-base md:text-xl py-3 w-full text-main-white bg-main-green hover:bg-hover-green"
 					>
-						{(isSwapQuoteLoading || executeSwapMutation.isPending) && (
+						{isWalletConnected && (isSwapQuoteLoading || executeSwapMutation.isPending) && (
 							<Loader2 className="animate-spin mr-2" />
 						)}
+						{!isWalletConnected && <CiWallet width={18} height={18} />}
 						{buttonDisplay()}
 					</Button>
 				</CardFooter>
diff --git a/src/app/(walletConnected)/tokens/[address]/page.tsx b/src/app/tokens/[address]/page.tsx
similarity index 100%
rename from src/app/(walletConnected)/tokens/[address]/page.tsx
rename to src/app/tokens/[address]/page.tsx
diff --git a/src/app/(walletConnected)/tokens/create/page.tsx b/src/app/tokens/create/page.tsx
similarity index 90%
rename from src/app/(walletConnected)/tokens/create/page.tsx
rename to src/app/tokens/create/page.tsx
index 1f37294..e89a407 100644
--- a/src/app/(walletConnected)/tokens/create/page.tsx
+++ b/src/app/tokens/create/page.tsx
@@ -1,11 +1,12 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { Loader2, ChevronRight, ChevronLeft } from 'lucide-react'
 import { useEffect, useRef, useState } from 'react'
 import { useForm } from 'react-hook-form'
+import { CiWallet } from 'react-icons/ci'
 
-import { NoBalanceAlert } from '@/components/common/Alert'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import {
@@ -29,7 +30,6 @@ import CreateTokenOverview from '@/features/tokens/components/form/TokenOverview
 import { useCreateToken } from '@/features/tokens/services'
 import { TCreateTokenDataResponse, TCreateTokenPayload } from '@/features/tokens/types'
 import { CreateTokenValidation } from '@/features/tokens/validation'
-import { useGetBBABalance } from '@/services/wallet'
 import { useErrorDialog } from '@/stores/errorDialog'
 
 type FieldName = keyof TCreateTokenPayload
@@ -73,10 +73,11 @@ export default function CreateToken() {
 		}
 	})
 
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+
 	const watchTokenSupply = form.watch('supply')
 	const createTokenMutation = useCreateToken()
-	const getBalanceQuery = useGetBBABalance()
-	const isNoBalance = getBalanceQuery.isError || !getBalanceQuery.data || getBalanceQuery.data === 0
 
 	const [currentStep, setCurrentStep] = useState<number>(0)
 	const [isSuccessOpen, setIsSuccessOpen] = useState<boolean>(false)
@@ -86,7 +87,7 @@ export default function CreateToken() {
 
 	const fileInputRef = useRef<HTMLInputElement | null>(null)
 
-	const { openErrorDialog } = useErrorDialog()
+	const openErrorDialog = useErrorDialog((state) => state.openErrorDialog)
 
 	const onNext = async () => {
 		const fields = createTokenSteps[currentStep].fields
@@ -207,7 +208,6 @@ export default function CreateToken() {
 				onSubmit={form.handleSubmit(onSubmit)}
 				className="xl:px-48 md:px-16 px-4 w-full flex flex-col lg:space-y-14 md:space-y-9 space-y-3"
 			>
-				{isNoBalance && <NoBalanceAlert />}
 				<h1 className="text-center md:text-5xl leading-tight text-xl font-bold text-main-black">
 					QUICK TOKEN GENERATOR
 				</h1>
@@ -436,29 +436,35 @@ export default function CreateToken() {
 						<CreateTokenOverview {...form.getValues()} image_link={previewIcon ?? ''} />
 					</div>
 				)}
-
-				<section className="flex w-full justify-end space-x-2.5">
-					{currentStep > 0 && (
+				{isWalletConnected ? (
+					<section className="flex w-full justify-end space-x-2.5">
+						{currentStep > 0 && (
+							<Button
+								type="button"
+								onClick={onPrev}
+								className="dark:bg-white bg-[#67676759] flex justify-center items-center text-center text-main-white md:h-[62px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-[27px] text-base"
+							>
+								<ChevronLeft className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+								<p className="md:min-w-[72px] min-w-[46px]">Back</p>
+							</Button>
+						)}
 						<Button
 							type="button"
-							onClick={onPrev}
-							className="dark:bg-white bg-[#67676759] flex justify-center items-center text-center text-main-white md:h-[62px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-[27px] text-base"
+							onClick={onNext}
+							className="bg-main-green text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[62px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-[27px] text-base"
 						>
-							<ChevronLeft className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
-							<p className="md:min-w-[72px] min-w-[46px]">Back</p>
+							<p className="md:min-w-[72px] min-w-[46px]">
+								{currentStep === createTokenSteps.length - 1 ? 'Create Your Token' : 'Next'}
+							</p>
+							<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
 						</Button>
-					)}
-					<Button
-						type="button"
-						onClick={onNext}
-						className="bg-main-green text-center flex justify-center items-center hover:bg-hover-green text-main-white md:h-[62px] h-[34px] md:px-6 md:py-3 p-3 rounded-[43px] md:text-[27px] text-base"
-					>
-						<p className="md:min-w-[72px] min-w-[46px]">
-							{currentStep === createTokenSteps.length - 1 ? 'Create Your Token' : 'Next'}
-						</p>
-						<ChevronRight className="md:min-w-[30px] min-w-[10px] min-h-[30px]" />
+					</section>
+				) : (
+					<Button type='button' className="bg-main-green hover:bg-hover-green text-center h-14 w-full text-base rounded-[43px]">
+						<CiWallet width={18} height={18} />
+						Connect Wallet
 					</Button>
-				</section>
+				)}
 			</form>
 		</Form>
 	)
diff --git a/src/app/(walletConnected)/tokens/page.tsx b/src/app/tokens/page.tsx
similarity index 54%
rename from src/app/(walletConnected)/tokens/page.tsx
rename to src/app/tokens/page.tsx
index 139f783..49a2616 100644
--- a/src/app/(walletConnected)/tokens/page.tsx
+++ b/src/app/tokens/page.tsx
@@ -1,9 +1,11 @@
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { Plus } from 'lucide-react'
 import Link from 'next/link'
 import { useState } from 'react'
 
+import WalletNotConnectedCard from '@/components/common/WalletNotConnectedCard'
 import { buttonVariants } from '@/components/ui/button'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { TokenListColumns, TokenListProps } from '@/features/tokens/components/Columns'
@@ -34,6 +36,9 @@ export default function Tokens() {
 	const getTokenDataQuery = useGetTokens()
 	const getLPTokenDataQuery = useGetLPTokens()
 
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+
 	const tokenData = getTokenDataQuery.data
 		? mapToTokenListPropsList(getTokenDataQuery.data.data)
 		: []
@@ -42,7 +47,9 @@ export default function Tokens() {
 		: []
 
 	const isLoading =
-		getTokenDataQuery.isPending || (activeTab === 'lp-tokens' && getLPTokenDataQuery.isPending)
+		isWalletConnected &&
+		((activeTab === 'tokens' && getTokenDataQuery.isPending) ||
+			(activeTab === 'lp-tokens' && getLPTokenDataQuery.isPending))
 
 	return (
 		<div className="xl:px-48 md:px-16 px-4 flex flex-col w-full h-full items-center lg:space-y-14 md:space-y-9 space-y-3">
@@ -64,33 +71,32 @@ export default function Tokens() {
 					<span>Create Token</span>
 				</Link>
 			</div>
-			<Tabs value={activeTab} onValueChange={setActiveTab} className="w-full">
-				<TabsList className="flex w-full justify-center space-x-6 md:mb-10 mb-5 p-0 bg-transparent">
-					<TabsTrigger
-						value="tokens"
-						className="relative p-2.5 md:max-w-36 bg-transparent border-none shadow-none font-medium text-xl text-main-black hover:text-main-green hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-[2px] hover:after:w-full hover:after:bg-main-green  data-[state=active]:shadow-none data-[state=active]:text-main-green data-[state=active]:after:absolute data-[state=active]:after:bottom-0 data-[state=active]:after:left-0 data-[state=active]:after:h-[2px] data-[state=active]:after:w-full data-[state=active]:after:bg-main-green"
-					>
-						Regular Tokens
-					</TabsTrigger>
-					<TabsTrigger
-						value="lp-tokens"
-						className="relative p-2.5 md:max-w-36 bg-transparent border-none shadow-none font-medium text-xl text-main-black hover:text-main-green hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-[2px] hover:after:w-full hover:after:bg-main-green  data-[state=active]:shadow-none data-[state=active]:text-main-green data-[state=active]:after:absolute data-[state=active]:after:bottom-0 data-[state=active]:after:left-0 data-[state=active]:after:h-[2px] data-[state=active]:after:w-full data-[state=active]:after:bg-main-green"
-					>
-						LP Tokens
-					</TabsTrigger>
-				</TabsList>
-
-				<TabsContent value="tokens">
-					<TokenListTable
-						onRefresh={() => getTokenDataQuery.refetch()}
-						isRefreshing={getTokenDataQuery.isRefetching}
-						isLoading={isLoading}
-						columns={TokenListColumns}
-						data={tokenData}
-					/>
-				</TabsContent>
-				<TabsContent value="lp-tokens">
-					{lpTokenData.length > 0 ? (
+			{isWalletConnected && (
+				<Tabs value={activeTab} onValueChange={setActiveTab} className="w-full">
+					<TabsList className="flex w-full justify-center space-x-6 md:mb-10 mb-5 p-0 bg-transparent">
+						<TabsTrigger
+							value="tokens"
+							className="relative p-2.5 md:max-w-36 bg-transparent border-none shadow-none font-medium text-xl text-main-black hover:text-main-green hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-[2px] hover:after:w-full hover:after:bg-main-green  data-[state=active]:shadow-none data-[state=active]:text-main-green data-[state=active]:after:absolute data-[state=active]:after:bottom-0 data-[state=active]:after:left-0 data-[state=active]:after:h-[2px] data-[state=active]:after:w-full data-[state=active]:after:bg-main-green"
+						>
+							Regular Tokens
+						</TabsTrigger>
+						<TabsTrigger
+							value="lp-tokens"
+							className="relative p-2.5 md:max-w-36 bg-transparent border-none shadow-none font-medium text-xl text-main-black hover:text-main-green hover:after:absolute hover:after:bottom-0 hover:after:left-0 hover:after:h-[2px] hover:after:w-full hover:after:bg-main-green  data-[state=active]:shadow-none data-[state=active]:text-main-green data-[state=active]:after:absolute data-[state=active]:after:bottom-0 data-[state=active]:after:left-0 data-[state=active]:after:h-[2px] data-[state=active]:after:w-full data-[state=active]:after:bg-main-green"
+						>
+							LP Tokens
+						</TabsTrigger>
+					</TabsList>
+					<TabsContent value="tokens">
+						<TokenListTable
+							onRefresh={() => getTokenDataQuery.refetch()}
+							isRefreshing={getTokenDataQuery.isRefetching}
+							isLoading={isLoading}
+							columns={TokenListColumns}
+							data={tokenData}
+						/>
+					</TabsContent>
+					<TabsContent value="lp-tokens">
 						<TokenListTable
 							withoutAction
 							onRefresh={() => getLPTokenDataQuery.refetch()}
@@ -99,16 +105,10 @@ export default function Tokens() {
 							columns={TokenListColumns}
 							data={lpTokenData}
 						/>
-					) : (
-						<div className="text-center py-8">
-							<p className="text-gray-500">No LP tokens found</p>
-							<p className="text-sm text-gray-400 mt-2">
-								LP tokens are earned when you provide liquidity to pools
-							</p>
-						</div>
-					)}
-				</TabsContent>
-			</Tabs>
+					</TabsContent>
+				</Tabs>
+			)}
+			{!isWalletConnected && <WalletNotConnectedCard />}
 		</div>
 	)
 }
diff --git a/src/app/(walletConnected)/wrapping/page.tsx b/src/app/wrapping/page.tsx
similarity index 98%
rename from src/app/(walletConnected)/wrapping/page.tsx
rename to src/app/wrapping/page.tsx
index 450905f..dac1c7f 100644
--- a/src/app/(walletConnected)/wrapping/page.tsx
+++ b/src/app/wrapping/page.tsx
@@ -25,7 +25,7 @@ export default function Wrapping() {
 	const generalInvalid = inputAmount === '' || Number(inputAmount) <= 0 || !isAmountPositive
 	const isWrapInvalid = generalInvalid || Number(inputAmount) > BBABalance
 	const isUnwrapInvalid = generalInvalid || Number(inputAmount) > WBBABalance
-	const { openErrorDialog } = useErrorDialog()
+	const openErrorDialog = useErrorDialog((state) => state.openErrorDialog)
 
 	const onWrapBBA = () => wrapBBAMutation.mutate({ amount: Number(inputAmount) })
 	const onUnwrapWBBA = () => unwrapWBBAMutation.mutate({ amount: Number(inputAmount) })
diff --git a/src/components/common/WalletNotConnectedCard.tsx b/src/components/common/WalletNotConnectedCard.tsx
new file mode 100644
index 0000000..f84eb61
--- /dev/null
+++ b/src/components/common/WalletNotConnectedCard.tsx
@@ -0,0 +1,41 @@
+import { CiWallet } from 'react-icons/ci'
+
+import ThemeImage from '@/components/common/ThemeImage'
+import { Button } from '@/components/ui/button'
+import {Card, CardHeader, CardTitle, CardContent, CardFooter} from '@/components/ui/card'
+import { useWalletListDialog } from '@/stores/walletDialog'
+
+export default function WalletNotConnectedCard() {
+    const openWalletList = useWalletListDialog((state) => state.openWalletList)
+	return (
+		<Card className="md:w-[564px] mx-auto w-full h-full border-hover-green border-[1px] rounded-[16px] md:p-6 p-3 drop-shadow-lg">
+			<CardHeader className="p-0">
+				<CardTitle className="md:text-4xl text-xl text-center">Wallet Not Connected</CardTitle>
+			</CardHeader>
+			<CardContent className="px-0 py-8 flex flex-col space-y-2.5 justify-center items-center">
+				<ThemeImage
+					lightSrc={'/wallet-not-connected-light.svg'}
+					darkSrc={'/wallet-not-connected-dark.svg'}
+					quality={45}
+					priority
+					width={218}
+					height={218}
+					alt="wallet not connected logo"
+				/>
+				<p className="text-center text-sm text-main-black">
+					Please connect your wallet to use the Quick Token <br /> Generator and access features.
+				</p>
+			</CardContent>
+			<CardFooter className="p-0">
+				<Button
+					type="button"
+					onClick={openWalletList}
+					className="bg-main-green hover:bg-hover-green w-full h-12 text-main-white py-3 rounded-[45px] text-lg font-normal"
+				>
+					<CiWallet width={18} height={18} />
+					Connect Wallet
+				</Button>
+			</CardFooter>
+		</Card>
+	)
+}
diff --git a/src/features/liquidityPool/components/DataTable.tsx b/src/features/liquidityPool/components/DataTable.tsx
index 21f4b79..9c59560 100644
--- a/src/features/liquidityPool/components/DataTable.tsx
+++ b/src/features/liquidityPool/components/DataTable.tsx
@@ -867,7 +867,7 @@ export function DataTable<TData, TValue>({
 												'h-16',
 												index === table.getRowModel().rows.length - 1 && 'border-b-0'
 											)}
-											onClick={() => router.push(`/liquidity-pools/detail/${id}`)}
+											onClick={() => router.push(`/liquidity-pools/detail?poolId=${id}`)}
 										>
 											{row.getVisibleCells().map((cell) => (
 												<TableCell key={cell.id} className="py-3">
@@ -887,7 +887,7 @@ export function DataTable<TData, TValue>({
 														Swap
 													</Link>
 													<Link
-														href={`/liquidity-pools/deposit/${id}`}
+														href={`/liquidity-pools/deposit?poolId=${id}`}
 														onClick={(e) => e.stopPropagation()}
 														className={cn(
 															buttonVariants({ variant: 'default', size: 'lg' }),
diff --git a/src/features/liquidityPool/components/TransactionDataTable.tsx b/src/features/liquidityPool/components/TransactionDataTable.tsx
index bc7687d..85ac588 100644
--- a/src/features/liquidityPool/components/TransactionDataTable.tsx
+++ b/src/features/liquidityPool/components/TransactionDataTable.tsx
@@ -8,9 +8,10 @@ import { cn } from '@/lib/utils'
 interface TransactionDataTableProps<TData, TValue> {
 	columns: ColumnDef<TData, TValue>[]
 	data: TData[]
+	NoDataMessage?: string
 }
 
-export function TransactionDataTable<TData, TValue>({ columns, data }: TransactionDataTableProps<TData, TValue>) {
+export function TransactionDataTable<TData, TValue>({ columns, data, NoDataMessage }: TransactionDataTableProps<TData, TValue>) {
 	const table = useReactTable({
 		data,
 		columns,
@@ -63,7 +64,7 @@ export function TransactionDataTable<TData, TValue>({ columns, data }: Transacti
 							) : (
 								<TableRow>
 									<TableCell colSpan={columns.length} className="text-center pt-4">
-										No results.
+										{NoDataMessage ? NoDataMessage : 'No Data'}
 									</TableCell>
 								</TableRow>
 							)}
diff --git a/src/features/liquidityPool/services.ts b/src/features/liquidityPool/services.ts
index b6a24ef..7c3a91b 100644
--- a/src/features/liquidityPool/services.ts
+++ b/src/features/liquidityPool/services.ts
@@ -241,7 +241,7 @@ export const useGetUserPoolStats = ({ pool }: { pool: TOnchainPoolData | null |
 				data
 			}
 		},
-		enabled: !!pool,
+		enabled: !!pool && !!ownerAddress,
 		refetchInterval: 300000,
 		staleTime: 60000
 	})
diff --git a/src/features/swap/components/SwapItem.tsx b/src/features/swap/components/SwapItem.tsx
index ddd0928..2215a4a 100644
--- a/src/features/swap/components/SwapItem.tsx
+++ b/src/features/swap/components/SwapItem.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 'use client'
 
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { IoIosArrowDown } from 'react-icons/io'
 import { capitalCase } from 'text-case'
 
@@ -34,8 +35,10 @@ export default function SwapItem({
 	setTokenProps,
 	setInputAmount
 }: SwapItemProps) {
-	const onMaxClick = () => setInputAmount(balance.toString())
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
 
+	const onMaxClick = () => setInputAmount(balance.toString())
 	return (
 		<div className="bg-box rounded-[10px] p-2.5 flex flex-col space-y-1.5">
 			{!noTitle && <h5 className="text-xs text-main-black">{capitalCase(type)}</h5>}
@@ -87,18 +90,18 @@ export default function SwapItem({
 							type="button"
 							className="px-1 text-dark-grey text-xs font-normal"
 							onClick={onMaxClick}
-							disabled={isTokenLoading}
+							disabled={!isWalletConnected || isTokenLoading}
 						>
 							Max
 						</Button>
 					)}
 				</div>
 			</section>
-			<section className="w-full flex justify-between">
+			<section className="w-full relative">
 				<div className="flex items-center space-x-1 text-xs text-main-black">
 					<p>Balance:</p>
 					{isTokenLoading ? (
-						<Skeleton className='h-4 w-14' />
+						<Skeleton className="h-4 w-14" />
 					) : (
 						<p>
 							{balance.toLocaleString(undefined, {
@@ -109,7 +112,7 @@ export default function SwapItem({
 						</p>
 					)}
 				</div>
-				<p className="text-dark-grey text-xs">
+				<p className="absolute right-0 top-0 text-dark-grey text-xs">
 					≈${' '}
 					{price.toLocaleString(undefined, {
 						minimumFractionDigits: 2,
diff --git a/src/features/tokens/components/DataTable.tsx b/src/features/tokens/components/DataTable.tsx
index 2c48297..866c342 100644
--- a/src/features/tokens/components/DataTable.tsx
+++ b/src/features/tokens/components/DataTable.tsx
@@ -51,6 +51,7 @@ import { cn } from '@/lib/utils'
 interface DataTableProps<TData, TValue> {
 	columns: ColumnDef<TData, TValue>[]
 	data: TData[]
+	noDataMessage?: string
 	onRefresh?: () => void
 	isLoading?: boolean
 	isRefreshing?: boolean
@@ -60,6 +61,7 @@ interface DataTableProps<TData, TValue> {
 export function DataTable<TData, TValue>({
 	columns,
 	data,
+	noDataMessage,
 	onRefresh,
 	isLoading,
 	isRefreshing,
@@ -286,7 +288,7 @@ export function DataTable<TData, TValue>({
 								) : (
 									<TableRow>
 										<TableCell colSpan={columns.length} className="text-center pt-4">
-											No results.
+											{noDataMessage ? noDataMessage : 'No data.'}
 										</TableCell>
 									</TableRow>
 								)}
diff --git a/src/features/tokens/services.ts b/src/features/tokens/services.ts
index 2cd94a1..0724faf 100644
--- a/src/features/tokens/services.ts
+++ b/src/features/tokens/services.ts
@@ -95,7 +95,8 @@ export const useGetTokens = () => {
 				message: `Successfully get token with address ${ownerAddress.toBase58()}`,
 				data: filteredTokenData
 			}
-		}
+		},
+		enabled: !!ownerAddress
 	})
 }
 
diff --git a/src/features/wrapping/components/WrapBalanceItem.tsx b/src/features/wrapping/components/WrapBalanceItem.tsx
index 14b7284..3947610 100644
--- a/src/features/wrapping/components/WrapBalanceItem.tsx
+++ b/src/features/wrapping/components/WrapBalanceItem.tsx
@@ -1,3 +1,6 @@
+'use client'
+
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import Image from 'next/image'
 
 import { Skeleton } from '@/components/ui/skeleton'
@@ -12,17 +15,27 @@ interface WrapBalanceItemProps {
 export default function WrapBalanceItem({ type, balance, isLoading }: WrapBalanceItemProps) {
 	const isWBBA = type === 'WBBA'
 	const isMobile = useIsMobile()
+
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
 	return (
 		<section className="w-full flex space-between items-center md:p-5 p-3 bg-box-3 border border-box-2 rounded-[8px]">
 			<section className="flex flex-col w-full space-y-3">
 				<h4 className="text-main-black md:text-lg text-sm font-normal">{`${type} Balance`}</h4>
-				{isLoading ? (
-					<Skeleton className="w-24 h-8" />
-				) : (
-					<p className="text-main-black md:text-2xl text-xl font-semibold">{`${balance.toLocaleString(undefined, {
-						minimumFractionDigits: 0,
-						maximumFractionDigits: 6
-					})} ${type}`}</p>
+				{!isWalletConnected && (
+					<p className="text-main-black md:text-base text-sm">
+						Please connect your wallet to see your balance
+					</p>
+				)}
+				{isWalletConnected && isLoading && <Skeleton className="w-24 h-8" />}
+				{isWalletConnected && !isLoading && (
+					<p className="text-main-black md:text-2xl text-xl font-semibold">{`${balance.toLocaleString(
+						undefined,
+						{
+							minimumFractionDigits: 0,
+							maximumFractionDigits: 6
+						}
+					)} ${type}`}</p>
 				)}
 			</section>
 			<Image
diff --git a/src/features/wrapping/components/WrapContentCard.tsx b/src/features/wrapping/components/WrapContentCard.tsx
index 24eb47d..b0b8c53 100644
--- a/src/features/wrapping/components/WrapContentCard.tsx
+++ b/src/features/wrapping/components/WrapContentCard.tsx
@@ -1,12 +1,14 @@
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import { Loader2 } from 'lucide-react'
-import { Dispatch, SetStateAction } from 'react'
-import toast from 'react-hot-toast'
+import React, { Dispatch, SetStateAction } from 'react'
+import { CiWallet } from 'react-icons/ci'
 import { FaArrowDownLong, FaArrowRightLong } from 'react-icons/fa6'
 
 import { Button } from '@/components/ui/button'
+import WrapInputItem from '@/features/wrapping/components/WrapInputItem'
 import { useIsMobile } from '@/hooks/isMobile'
+import { useWalletListDialog } from '@/stores/walletDialog'
 
-import WrapInputItem from './WrapInputItem'
 
 interface WrapContentProps {
 	base: 'BBA' | 'WBBA'
@@ -32,6 +34,11 @@ export default function WrapContent({
 	onAction
 }: WrapContentProps) {
 	const isMobile = useIsMobile()
+
+	const { publicKey: ownerAddress } = useWallet()
+	const openWalletList = useWalletListDialog((state) => state.openWalletList)
+	const isWalletConnected = Boolean(ownerAddress)
+
 	return (
 		<div className="flex flex-col md:space-y-[18px] space-y-3">
 			{/* Input Section */}
@@ -74,16 +81,26 @@ export default function WrapContent({
 			<Button
 				size="lg"
 				className="rounded-[26px] bg-main-green hover:bg-hover-green h-12 w-full font-medium text-lg text-main-white"
-				disabled={isInvalid || isLoading}
+				disabled={isWalletConnected && (isInvalid || isLoading)}
 				type="button"
-				onClick={isInvalid ? () => toast.error('Invalid input') : onAction}
+				onClick={!isWalletConnected ? openWalletList : onAction}
 			>
-				{isLoading && <Loader2 className="animate-spin" />}
-				{base === 'BBA' ? 'Wrap' : 'Unwrap'} {base}{' '}
-				<span>
-					<FaArrowRightLong />
-				</span>{' '}
-				{target}
+				{!isWalletConnected && (
+					<>
+						<CiWallet width={18} height={18} />
+						Connect Wallet
+					</>
+				)}
+				{isWalletConnected && isLoading && <Loader2 className="animate-spin" />}
+				{isWalletConnected && (
+					<>
+						{base === 'WBBA' ? 'Unwrap' : 'wrap'} {base}
+						<span>
+							<FaArrowRightLong />
+						</span>{' '}
+						{target}
+					</>
+				)}
 			</Button>
 		</div>
 	)
diff --git a/src/features/wrapping/components/WrapInputItem.tsx b/src/features/wrapping/components/WrapInputItem.tsx
index 15c29c9..9a682d3 100644
--- a/src/features/wrapping/components/WrapInputItem.tsx
+++ b/src/features/wrapping/components/WrapInputItem.tsx
@@ -1,3 +1,4 @@
+import { useWallet } from '@bbachain/wallet-adapter-react'
 import Image from 'next/image'
 import { Dispatch, SetStateAction } from 'react'
 
@@ -25,7 +26,9 @@ export default function WrapInputItem({
 }: WrapInputItemProps) {
 	const isWBBA = type === 'WBBA'
 	const isMobile = useIsMobile()
-	const isBalanceNotEnough = isBase && Number(amount) > balance
+	const { publicKey: ownerAddress } = useWallet()
+	const isWalletConnected = Boolean(ownerAddress)
+	const isBalanceNotEnough = isWalletConnected && isBase && Number(amount) > balance
 	const isAmountPositive = Number(amount) >= 0
 	const isInValid = isBalanceNotEnough || !isAmountPositive
 
@@ -62,7 +65,7 @@ export default function WrapInputItem({
 								type="button"
 								size="sm"
 								className="px-1 absolute left-20 -top-1 text-dark-grey text-xs font-normal"
-								disabled={isBalanceNotEnough}
+								disabled={!isWalletConnected || isBalanceNotEnough}
 								onClick={
 									isBalanceNotEnough
 										? () => {
diff --git a/src/services/wallet.tsx b/src/services/wallet.tsx
index b03ad3a..4b67723 100644
--- a/src/services/wallet.tsx
+++ b/src/services/wallet.tsx
@@ -51,7 +51,7 @@ export function useGetTokenBalanceByMint({ mintAddress }: { mintAddress: string
 	const { publicKey: ownerAddress } = useWallet()
 	const { connection } = useConnection()
 	return useQuery<number>({
-		queryKey: [SERVICES_KEY.WALLET.GET_TOKEN_BALANCE_BY_MINT, mintAddress],
+		queryKey: [SERVICES_KEY.WALLET.GET_TOKEN_BALANCE_BY_MINT, mintAddress, ownerAddress?.toBase58()],
 		queryFn: async () => {
 			if (!ownerAddress) throw new Error('No wallet connected')