diff --git a/src/components/Claim/Claim.tsx b/src/components/Claim/Claim.tsx
index cb8817537..644027734 100644
--- a/src/components/Claim/Claim.tsx
+++ b/src/components/Claim/Claim.tsx
@@ -110,8 +110,6 @@ export const Claim = ({}) => {
                     return chain
                 })
 
-                setSelectedChainID(filteredXchainDetails[0].chainId)
-                setSelectedTokenAddress(filteredXchainDetails[0].tokens[0].address)
                 return filteredXchainDetails
             } else {
                 return undefined
@@ -133,34 +131,35 @@ export const Claim = ({}) => {
             })
 
             setClaimLinkData(linkDetails)
+            setSelectedChainID(linkDetails.chainId)
+            setSelectedTokenAddress(linkDetails.tokenAddress)
+
             if (linkDetails.claimed) {
                 setLinkState(_consts.claimLinkStateType.ALREADY_CLAIMED)
+                return
+            }
+
+            const crossChainDetails = await getCrossChainDetails(linkDetails)
+            setCrossChainDetails(crossChainDetails)
+            const tokenPrice = await utils.fetchTokenPrice(linkDetails.tokenAddress.toLowerCase(), linkDetails.chainId)
+            tokenPrice && setTokenPrice(tokenPrice?.price)
+
+            if (address) {
+                setRecipient({ name: '', address })
+
+                const estimatedPoints = await estimatePoints({
+                    address: address ?? '',
+                    chainId: linkDetails.chainId,
+                    amountUSD: Number(linkDetails.tokenAmount) * (tokenPrice?.price ?? 0),
+                    actionType: ActionType.CLAIM,
+                })
+                setEstimatedPoints(estimatedPoints)
+            }
+
+            if (address && linkDetails.senderAddress === address) {
+                setLinkState(_consts.claimLinkStateType.CLAIM_SENDER)
             } else {
-                const crossChainDetails = await getCrossChainDetails(linkDetails)
-                setCrossChainDetails(crossChainDetails)
-                const tokenPrice = await utils.fetchTokenPrice(
-                    linkDetails.tokenAddress.toLowerCase(),
-                    linkDetails.chainId
-                )
-                tokenPrice && setTokenPrice(tokenPrice?.price)
-
-                if (address) {
-                    setRecipient({ name: '', address })
-
-                    const estimatedPoints = await estimatePoints({
-                        address: address ?? '',
-                        chainId: linkDetails.chainId,
-                        amountUSD: Number(linkDetails.tokenAmount) * (tokenPrice?.price ?? 0),
-                        actionType: ActionType.CLAIM,
-                    })
-                    setEstimatedPoints(estimatedPoints)
-                }
-
-                if (address && linkDetails.senderAddress === address) {
-                    setLinkState(_consts.claimLinkStateType.CLAIM_SENDER)
-                } else {
-                    setLinkState(_consts.claimLinkStateType.CLAIM)
-                }
+                setLinkState(_consts.claimLinkStateType.CLAIM)
             }
         } catch (error) {
             setLinkState(_consts.claimLinkStateType.NOT_FOUND)
diff --git a/src/components/Claim/Link/Initial.view.tsx b/src/components/Claim/Link/Initial.view.tsx
index eb2fcd347..9d03acf37 100644
--- a/src/components/Claim/Link/Initial.view.tsx
+++ b/src/components/Claim/Link/Initial.view.tsx
@@ -9,9 +9,16 @@ import useClaimLink from '../useClaimLink'
 import * as context from '@/context'
 import Loading from '@/components/Global/Loading'
 import * as consts from '@/constants'
-import * as utils from '@/utils'
+import {
+    areTokenAddressesEqual,
+    saveClaimedLinkToLocalStorage,
+    ErrorHandler,
+    getBridgeTokenName,
+    getBridgeChainName,
+    checkifImageType,
+    formatTokenAmount,
+} from '@/utils'
 import MoreInfo from '@/components/Global/MoreInfo'
-import TokenSelectorXChain from '@/components/Global/TokenSelector/TokenSelectorXChain'
 import { getSquidRouteRaw } from '@squirrel-labs/peanut-sdk'
 import * as _interfaces from '../Claim.interfaces'
 import * as _utils from '../Claim.utils'
@@ -27,6 +34,7 @@ import {
 } from '@/components/Offramp/Offramp.consts'
 import { TOOLTIPS } from '@/constants/tooltips'
 import AddressLink from '@/components/Global/AddressLink'
+import TokenSelector from '@/components/Global/TokenSelector/TokenSelector'
 
 export const InitialClaimLinkView = ({
     onNext,
@@ -62,9 +70,16 @@ export const InitialClaimLinkView = ({
     const [inputChanging, setInputChanging] = useState<boolean>(false)
 
     const { setLoadingState, loadingState, isLoading } = useContext(context.loadingStateContext)
-    const { selectedChainID, selectedTokenAddress, refetchXchainRoute, setRefetchXchainRoute } = useContext(
-        context.tokenSelectorContext
-    )
+    const {
+        selectedChainID,
+        setSelectedChainID,
+        selectedTokenAddress,
+        setSelectedTokenAddress,
+        refetchXchainRoute,
+        setRefetchXchainRoute,
+        isXChain,
+        setIsXChain,
+    } = useContext(context.tokenSelectorContext)
     const mappedData: _interfaces.CombinedType[] = _utils.mapToIPeanutChainDetailsArray(crossChainDetails)
     const { claimLink } = useClaimLink()
     const { open } = useWeb3Modal()
@@ -98,7 +113,7 @@ export const InitialClaimLinkView = ({
             })
 
             if (claimTxHash) {
-                utils.saveClaimedLinkToLocalStorage({
+                saveClaimedLinkToLocalStorage({
                     address: address ?? '',
                     data: {
                         ...claimLinkData,
@@ -117,7 +132,7 @@ export const InitialClaimLinkView = ({
                 throw new Error('Error claiming link')
             }
         } catch (error) {
-            const errorString = utils.ErrorHandler(error)
+            const errorString = ErrorHandler(error)
             setErrorState({
                 showError: true,
                 errorMessage: errorString,
@@ -134,8 +149,8 @@ export const InitialClaimLinkView = ({
                 errorMessage: '',
             })
             setLoadingState('Fetching route')
-            let tokenName = utils.getBridgeTokenName(claimLinkData.chainId, claimLinkData.tokenAddress)
-            let chainName = utils.getBridgeChainName(claimLinkData.chainId)
+            let tokenName = getBridgeTokenName(claimLinkData.chainId, claimLinkData.tokenAddress)
+            let chainName = getBridgeChainName(claimLinkData.chainId)
 
             if (tokenPrice) {
                 const cashoutUSDAmount = Number(claimLinkData.tokenAmount) * tokenPrice
@@ -153,8 +168,7 @@ export const InitialClaimLinkView = ({
                 }
             }
 
-            if (tokenName && chainName) {
-            } else {
+            if (!tokenName || !chainName) {
                 if (!crossChainDetails) {
                     setErrorState({
                         showError: true,
@@ -277,6 +291,19 @@ export const InitialClaimLinkView = ({
         }
     }, [address])
 
+    useEffect(() => {
+        if (
+            selectedChainID === claimLinkData.chainId &&
+            areTokenAddressesEqual(selectedTokenAddress, claimLinkData.tokenAddress)
+        ) {
+            setIsXChain(false)
+            setSelectedRoute(null)
+            setHasFetchedRoute(false)
+        } else {
+            setIsXChain(true)
+        }
+    }, [selectedChainID, selectedTokenAddress, claimLinkData.chainId, claimLinkData.tokenAddress])
+
     useEffect(() => {
         if (refetchXchainRoute) {
             setIsXchainLoading(true)
@@ -299,10 +326,12 @@ export const InitialClaimLinkView = ({
                     route.fromChain === claimLinkData.chainId &&
                     route.fromToken.toLowerCase() === claimLinkData.tokenAddress.toLowerCase() &&
                     route.toChain === selectedChainID &&
-                    utils.areTokenAddressesEqual(route.toToken, selectedTokenAddress)
+                    areTokenAddressesEqual(route.toToken, selectedTokenAddress)
             )
             if (existingRoute) {
                 setSelectedRoute(existingRoute)
+            } else if (!isXChain) {
+                setHasFetchedRoute(false)
             } else {
                 const tokenAmount = Math.floor(
                     Number(claimLinkData.tokenAmount) * Math.pow(10, claimLinkData.tokenDecimals)
@@ -357,7 +386,7 @@ export const InitialClaimLinkView = ({
                 {(attachment.message || attachment.attachmentUrl) && (
                     <>
                         <div
-                            className={`flex w-full items-center justify-center gap-2 ${utils.checkifImageType(fileType) ? ' flex-row' : ' flex-col'}`}
+                            className={`flex w-full items-center justify-center gap-2 ${checkifImageType(fileType) ? ' flex-row' : ' flex-col'}`}
                         >
                             {attachment.message && (
                                 <label className="max-w-full text-h8">
@@ -385,7 +414,7 @@ export const InitialClaimLinkView = ({
                     </label>
                     {tokenPrice ? (
                         <label className="text-h2">
-                            $ {utils.formatTokenAmount(Number(claimLinkData.tokenAmount) * tokenPrice)}
+                            $ {formatTokenAmount(Number(claimLinkData.tokenAmount) * tokenPrice)}
                         </label>
                     ) : (
                         <label className="text-h2 ">
@@ -394,81 +423,15 @@ export const InitialClaimLinkView = ({
                     )}
                 </div>
                 <div className="flex w-full flex-col items-start justify-center gap-3 px-2">
-                    <TokenSelectorXChain
-                        data={mappedData}
-                        chainName={
-                            hasFetchedRoute
-                                ? selectedRoute
-                                    ? mappedData.find((chain) => chain.chainId === selectedRoute.route.params.toChain)
-                                          ?.name
-                                    : mappedData.find((data) => data.chainId === selectedChainID)?.name
-                                : consts.supportedPeanutChains.find((chain) => chain.chainId === claimLinkData.chainId)
-                                      ?.name
-                        }
-                        tokenSymbol={
-                            hasFetchedRoute
-                                ? selectedRoute
-                                    ? selectedRoute.route.estimate.toToken.symbol
-                                    : mappedData
-                                          .find((data) => data.chainId === selectedChainID)
-                                          ?.tokens?.find((token) =>
-                                              utils.areTokenAddressesEqual(token.address, selectedTokenAddress)
-                                          )?.symbol
-                                : claimLinkData.tokenSymbol
-                        }
-                        tokenLogoUrl={
-                            hasFetchedRoute
-                                ? selectedRoute
-                                    ? selectedRoute.route.estimate.toToken.logoURI
-                                    : mappedData
-                                          .find((data) => data.chainId === selectedChainID)
-                                          ?.tokens?.find((token) =>
-                                              utils.areTokenAddressesEqual(token.address, selectedTokenAddress)
-                                          )?.logoURI
-                                : consts.peanutTokenDetails
-                                      .find((chain) => chain.chainId === claimLinkData.chainId)
-                                      ?.tokens.find((token) =>
-                                          utils.areTokenAddressesEqual(token.address, claimLinkData.tokenAddress)
-                                      )?.logoURI
-                        }
-                        chainLogoUrl={
-                            hasFetchedRoute
-                                ? selectedRoute
-                                    ? crossChainDetails?.find(
-                                          (chain) => chain.chainId === selectedRoute.route.params.toChain
-                                      )?.chainIconURI
-                                    : mappedData.find((data) => data.chainId === selectedChainID)?.icon.url
-                                : consts.supportedPeanutChains.find((chain) => chain.chainId === claimLinkData.chainId)
-                                      ?.icon.url
-                        }
-                        tokenAmount={
-                            hasFetchedRoute
-                                ? selectedRoute
-                                    ? utils.formatTokenAmount(
-                                          utils.formatAmountWithDecimals({
-                                              amount: selectedRoute.route.estimate.toAmountMin,
-                                              decimals: selectedRoute.route.estimate.toToken.decimals,
-                                          }),
-                                          4
-                                      )
-                                    : undefined
-                                : claimLinkData.tokenAmount
-                        }
-                        isLoading={isXchainLoading}
-                        routeError={errorState.errorMessage === 'No route found for the given token pair.'}
-                        routeFound={selectedRoute ? true : false}
-                        onReset={() => {
-                            setSelectedRoute(null)
-                            setHasFetchedRoute(false)
-                            setErrorState({
-                                showError: false,
-                                errorMessage: '',
-                            })
-                        }}
-                        isStatic={
-                            recipientType === 'iban' || recipientType === 'us' || !crossChainDetails ? true : false
-                        }
-                    />
+                    {recipientType !== 'iban' && recipientType !== 'us' && (
+                        <TokenSelector
+                            shouldBeConnected={false}
+                            onReset={() => {
+                                setSelectedChainID(claimLinkData.chainId)
+                                setSelectedTokenAddress(claimLinkData.tokenAddress)
+                            }}
+                        />
+                    )}
                     <GeneralRecipientInput
                         className=""
                         placeholder="wallet address / ENS / IBAN / US account number"
diff --git a/src/components/Global/TokenSelector/TokenSelectorXChain.tsx b/src/components/Global/TokenSelector/TokenSelectorXChain.tsx
deleted file mode 100644
index 71fe2d239..000000000
--- a/src/components/Global/TokenSelector/TokenSelectorXChain.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-'use client'
-
-import { useContext, useEffect, useMemo, useRef, useState } from 'react'
-import Modal from '../Modal'
-import Search from '../Search'
-import ChainSelector from '../ChainSelector'
-import { useBalance } from '@/hooks/useBalance'
-import { peanutTokenDetails, supportedPeanutChains } from '@/constants'
-import * as context from '@/context'
-import * as utils from '@/utils'
-import * as components from './Components'
-import * as _consts from './TokenSelector.consts'
-import * as consts from '@/constants'
-import Icon from '../Icon'
-
-const TokenSelectorXChain = ({
-    classNameButton,
-    data,
-    tokenSymbol,
-    chainName,
-    tokenLogoUrl,
-    chainLogoUrl,
-    tokenAmount,
-    isLoading,
-    routeError,
-    routeFound,
-    onReset,
-    isStatic = false,
-}: _consts.TokenSelectorXChainProps) => {
-    const [visible, setVisible] = useState(false)
-    const [filterValue, setFilterValue] = useState('')
-    const focusButtonRef = useRef<HTMLButtonElement>(null)
-
-    const { balances } = useBalance()
-    const { selectedChainID, selectedTokenAddress, setSelectedTokenAddress, setRefetchXchainRoute } = useContext(
-        context.tokenSelectorContext
-    )
-
-    const _tokensToDisplay = useMemo(() => {
-        let _tokens
-        if (data) {
-            _tokens = data.find((detail) => detail.chainId === selectedChainID)?.tokens || []
-        } else {
-            _tokens = peanutTokenDetails.find((detail) => detail.chainId === selectedChainID)?.tokens || []
-        }
-
-        //Filtering on name and symbol
-        if (filterValue && filterValue.length > 0) {
-            _tokens = _tokens.filter(
-                (token) =>
-                    token.name.toLowerCase().includes(filterValue.toLowerCase()) ||
-                    token.symbol.toLowerCase().includes(filterValue.toLowerCase())
-            )
-            return _tokens
-        }
-
-        //only return the first 6 tokens if not filtering
-        return _tokens
-    }, [filterValue, selectedChainID])
-
-    function setToken(address: string): void {
-        setRefetchXchainRoute(true)
-        setSelectedTokenAddress(address)
-        setTimeout(() => {
-            setFilterValue('')
-        }, 1000)
-        setVisible(false)
-    }
-
-    useEffect(() => {
-        if (focusButtonRef.current) {
-            focusButtonRef.current.focus()
-        }
-    }, [visible])
-
-    return (
-        <>
-            <button
-                className={` flex h-18 w-full max-w-96 flex-row items-center border border-n-1 px-4 py-2  disabled:cursor-not-allowed disabled:hover:bg-white dark:border-white ${!isStatic ? ' cursor-pointer justify-between hover:bg-n-3/10' : ' cursor-default justify-center '} ${classNameButton} ${routeError ? 'border-red' : 'border-n-1'}`}
-                onClick={() => {
-                    !isStatic && !routeFound && setVisible(true)
-                }}
-                disabled={isLoading}
-            >
-                {isLoading ? (
-                    <div className={'flex flex-row items-center justify-center gap-4'}>
-                        <div className="relative h-6 w-6">
-                            <div className="absolute left-0 top-0 h-6 w-6 animate-colorPulse rounded-full bg-slate-700" />
-                            <div className="absolute -top-1 left-3 h-4 w-4 animate-colorPulse rounded-full rounded-full bg-slate-700" />
-                        </div>
-                        <div className="h-3 w-52 animate-colorPulse rounded-full bg-slate-700"></div>
-                    </div>
-                ) : (
-                    <>
-                        <div className={'flex flex-row items-center justify-center gap-4'}>
-                            <div className="relative h-8 w-8">
-                                <img
-                                    src={tokenLogoUrl}
-                                    className="absolute left-0 top-0 h-8 w-8 rounded-full"
-                                    alt="logo"
-                                />
-                                <img
-                                    src={chainLogoUrl}
-                                    className="absolute -top-2 left-4 h-6 w-6  rounded-full"
-                                    alt="logo"
-                                />
-                            </div>
-                            <div className="flex flex-col items-start justify-center gap-1">
-                                <div className="inline-block w-full overflow-hidden overflow-ellipsis whitespace-nowrap text-start text-h7">
-                                    {tokenAmount && tokenAmount} {tokenSymbol} on {chainName}
-                                </div>
-                            </div>
-                        </div>
-                        {!isStatic && (
-                            <div className="flex flex-row items-center justify-center gap-2">
-                                {!routeFound ? (
-                                    <div className="block">
-                                        <Icon
-                                            name={'arrow-bottom'}
-                                            className={`h-12 w-12 transition-transform dark:fill-white ${visible ? 'rotate-180 ' : ''}`}
-                                        />
-                                    </div>
-                                ) : (
-                                    <div
-                                        className="block"
-                                        onClick={() => {
-                                            onReset && onReset()
-                                        }}
-                                    >
-                                        <Icon
-                                            name={'close'}
-                                            className={`h-10 w-10 transition-transform dark:fill-white`}
-                                        />
-                                    </div>
-                                )}
-                            </div>
-                        )}
-                    </>
-                )}
-            </button>
-
-            <Modal
-                visible={visible}
-                onClose={() => {
-                    setVisible(false)
-                }}
-                title={'Select Token'}
-                classNameWrapperDiv="px-5 pb-7 pt-8"
-            >
-                <div className="flex h-full w-full flex-col gap-4">
-                    <div className="flex w-full flex-row gap-4">
-                        <button className="sr-only" autoFocus ref={focusButtonRef} />
-                        <Search
-                            className="w-full"
-                            placeholder="Search by token name"
-                            value={filterValue}
-                            onChange={(e: any) => setFilterValue(e.target.value)}
-                            onSubmit={() => {}}
-                            medium
-                            border
-                        />
-                        <ChainSelector chainsToDisplay={data} />
-                    </div>
-
-                    {filterValue.length > 0
-                        ? components.tokenDisplay(_tokensToDisplay, setToken, balances, selectedChainID)
-                        : components.simpleTokenDisplay(_tokensToDisplay, setToken)}
-                </div>
-            </Modal>
-        </>
-    )
-}
-
-export default TokenSelectorXChain
diff --git a/src/context/tokenSelector.context.tsx b/src/context/tokenSelector.context.tsx
index 7b8782f2d..8681cac2d 100644
--- a/src/context/tokenSelector.context.tsx
+++ b/src/context/tokenSelector.context.tsx
@@ -114,6 +114,7 @@ export const TokenContextProvider = ({ children }: { children: React.ReactNode }
         if (selectedTokenAddress && selectedChainID) {
             setIsFetchingTokenData(true)
             setSelectedTokenData(undefined)
+            setRefetchXchainRoute(true)
             setSelectedTokenPrice(undefined)
             setSelectedTokenDecimals(undefined)
             setInputDenomination('TOKEN')