diff --git a/public/game/peanut-game.html b/public/game/peanut-game.html
index 2dabff7f5..6399a107a 100644
--- a/public/game/peanut-game.html
+++ b/public/game/peanut-game.html
@@ -4,7 +4,7 @@
         <meta name="description" content="Peanut game based on Chrome Dino game" />
         <meta property="og:title" content="Peanut tries to escape hungry squirrels" />
         <meta property="og:type" content="article" />
-        <meta property="og:url" content="https://peanut.me" />
+        <meta property="og:url" content="http://www.peanut.me" />
 
         <meta name="twitter:site" content="@joinpeanut" />
         <meta name="twitter:creator" content="@joinpeanut" />
diff --git a/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx b/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
index 7792da50f..4915aa8e6 100644
--- a/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
+++ b/src/app/(mobile-ui)/add-money/[country]/bank/page.tsx
@@ -10,7 +10,7 @@ import { useWallet } from '@/hooks/wallet/useWallet'
 import { formatAmount } from '@/utils'
 import { countryData } from '@/components/AddMoney/consts'
 import { InitiateKYCModal } from '@/components/Kyc'
-import { BridgeKycStatus } from '@/utils/bridge-accounts.utils'
+import { KYCStatus } from '@/utils/bridge-accounts.utils'
 import { useWebSocket } from '@/hooks/useWebSocket'
 import { useAuth } from '@/context/authContext'
 import { useCreateOnramp } from '@/hooks/useCreateOnramp'
@@ -37,7 +37,7 @@ export default function OnrampBankPage() {
     const [isRiskAccepted, setIsRiskAccepted] = useState<boolean>(false)
 
     const [isKycModalOpen, setIsKycModalOpen] = useState(false)
-    const [liveKycStatus, setLiveKycStatus] = useState<BridgeKycStatus | undefined>(undefined)
+    const [liveKycStatus, setLiveKycStatus] = useState<KYCStatus | undefined>(undefined)
     const { amountToOnramp: amountFromContext, setAmountToOnramp, setError, error, setOnrampData } = useOnrampFlow()
     const formRef = useRef<{ handleSubmit: () => void }>(null)
     const [isUpdatingUser, setIsUpdatingUser] = useState(false)
@@ -58,15 +58,15 @@ export default function OnrampBankPage() {
         username: user?.user.username ?? undefined,
         autoConnect: !!user?.user.username,
         onKycStatusUpdate: (newStatus) => {
-            setLiveKycStatus(newStatus as BridgeKycStatus)
+            setLiveKycStatus(newStatus as KYCStatus)
         },
     })
 
     useEffect(() => {
-        if (user?.user.bridgeKycStatus) {
-            setLiveKycStatus(user.user.bridgeKycStatus as BridgeKycStatus)
+        if (user?.user.kycStatus) {
+            setLiveKycStatus(user.user.kycStatus as KYCStatus)
         }
-    }, [user?.user.bridgeKycStatus])
+    }, [user?.user.kycStatus])
 
     useEffect(() => {
         fetchUser()
@@ -84,7 +84,7 @@ export default function OnrampBankPage() {
     useEffect(() => {
         if (user === null) return // wait for user to be fetched
         if (step === 'loading') {
-            const currentKycStatus = liveKycStatus || user?.user.bridgeKycStatus
+            const currentKycStatus = liveKycStatus || user?.user.kycStatus
             const isUserKycVerified = currentKycStatus === 'approved'
 
             if (!isUserKycVerified) {
@@ -216,7 +216,7 @@ export default function OnrampBankPage() {
             if (!user?.user.userId) throw new Error('User not found')
             const result = await updateUserById({
                 userId: user.user.userId,
-                fullName: data.fullName,
+                fullName: `${data.firstName} ${data.lastName}`,
                 email: data.email,
             })
             if (result.error) {
@@ -246,7 +246,8 @@ export default function OnrampBankPage() {
 
     const initialUserDetails: Partial<UserDetailsFormData> = useMemo(
         () => ({
-            fullName: user?.user.fullName ?? '',
+            firstName: user?.user.fullName ? firstName : '',
+            lastName: user?.user.fullName ? lastName : '',
             email: user?.user.email ?? '',
         }),
         [user?.user.fullName, user?.user.email, firstName, lastName]
diff --git a/src/app/(mobile-ui)/history/page.tsx b/src/app/(mobile-ui)/history/page.tsx
index 77441810d..35feb7f5c 100644
--- a/src/app/(mobile-ui)/history/page.tsx
+++ b/src/app/(mobile-ui)/history/page.tsx
@@ -65,14 +65,10 @@ const HistoryPage = () => {
     const combinedAndSortedEntries = useMemo(() => {
         const entries: Array<any> = [...allEntries]
 
-        if (
-            user?.user?.bridgeKycStatus &&
-            user.user.bridgeKycStatus !== 'not_started' &&
-            user.user.bridgeKycStartedAt
-        ) {
+        if (user?.user?.kycStatus && user.user.kycStatus !== 'not_started' && user.user.kycStartedAt) {
             entries.push({
                 isKyc: true,
-                timestamp: user.user.bridgeKycStartedAt,
+                timestamp: user.user.kycStartedAt,
                 uuid: 'kyc-status-item',
             })
         }
@@ -96,7 +92,7 @@ const HistoryPage = () => {
         return (
             <div className="mx-auto mt-6 w-full space-y-3 md:max-w-2xl">
                 <h2 className="text-base font-bold">Transactions</h2>{' '}
-                <EmptyState icon="alert" title="Error loading transactions!" description="Please contact support." />
+                <EmptyState icon="alert" title="Error loading transactions!" description="Please try again later" />
             </div>
         )
     }
diff --git a/src/app/(mobile-ui)/home/page.tsx b/src/app/(mobile-ui)/home/page.tsx
index da82c0312..295bad12d 100644
--- a/src/app/(mobile-ui)/home/page.tsx
+++ b/src/app/(mobile-ui)/home/page.tsx
@@ -1,19 +1,21 @@
 'use client'
 
+import { PeanutArmHoldingBeer } from '@/assets'
 import { Button, ButtonSize, ButtonVariant } from '@/components/0_Bruddle'
 import PageContainer from '@/components/0_Bruddle/PageContainer'
+import Card from '@/components/Global/Card'
 import { Icon } from '@/components/Global/Icons/Icon'
 import IOSInstallPWAModal from '@/components/Global/IOSInstallPWAModal'
 import Loading from '@/components/Global/Loading'
 import PeanutLoading from '@/components/Global/PeanutLoading'
-//import RewardsModal from '@/components/Global/RewardsModal'
+import RewardsModal from '@/components/Global/RewardsModal'
 import HomeHistory from '@/components/Home/HomeHistory'
-//import RewardsCardModal from '@/components/Home/RewardsCardModal'
+import RewardsCardModal from '@/components/Home/RewardsCardModal'
 import { SearchUsers } from '@/components/SearchUsers'
 import { UserHeader } from '@/components/UserHeader'
 import { useAuth } from '@/context/authContext'
 import { useWallet } from '@/hooks/wallet/useWallet'
-import { useUserStore } from '@/redux/hooks'
+import { useUserStore, useWalletStore } from '@/redux/hooks'
 import {
     formatExtendedNumber,
     getUserPreferences,
@@ -23,6 +25,7 @@ import {
     saveToLocalStorage,
 } from '@/utils'
 import { useDisconnect } from '@reown/appkit/react'
+import Image from 'next/image'
 import Link from 'next/link'
 import { useEffect, useMemo, useState } from 'react'
 import { twMerge } from 'tailwind-merge'
@@ -37,16 +40,16 @@ import { PEANUT_WALLET_TOKEN_DECIMALS } from '@/constants'
 import { PostSignupActionManager } from '@/components/Global/PostSignupActionManager'
 import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
 import { useClaimBankFlow } from '@/context/ClaimBankFlowContext'
-import { useDeviceType, DeviceType } from '@/hooks/useGetDeviceType'
 
 const BALANCE_WARNING_THRESHOLD = parseInt(process.env.NEXT_PUBLIC_BALANCE_WARNING_THRESHOLD ?? '500')
 const BALANCE_WARNING_EXPIRY = parseInt(process.env.NEXT_PUBLIC_BALANCE_WARNING_EXPIRY ?? '1814400') // 21 days in seconds
 
 export default function Home() {
-    const { balance, address, isFetchingBalance } = useWallet()
+    const { balance, address, isFetchingBalance, isFetchingRewardBalance } = useWallet()
+    const { rewardWalletBalance } = useWalletStore()
+    const [isRewardsModalOpen, setIsRewardsModalOpen] = useState(false)
     const { resetFlow: resetClaimBankFlow } = useClaimBankFlow()
     const { resetWithdrawFlow } = useWithdrawFlow()
-    const { deviceType } = useDeviceType()
     const [isBalanceHidden, setIsBalanceHidden] = useState(() => {
         const prefs = getUserPreferences()
         return prefs?.balanceHidden ?? false
@@ -86,7 +89,6 @@ export default function Home() {
     }, [resetClaimBankFlow, resetWithdrawFlow])
 
     useEffect(() => {
-        if (isFetchingUser) return
         // We have some users that didn't have the peanut wallet created
         // correctly, so we need to create it
         if (address && user && !user.accounts.some((a) => a.type === AccountType.PEANUT_WALLET)) {
@@ -96,7 +98,7 @@ export default function Home() {
                 userId: user.user.userId,
             })
         }
-    }, [user, address, isFetchingUser])
+    }, [user, address, addAccount])
 
     // always reset external wallet connection on home page
     useEffect(() => {
@@ -108,7 +110,9 @@ export default function Home() {
     // effect for showing iOS PWA Install modal
     useEffect(() => {
         if (typeof window !== 'undefined') {
-            const isIOS = deviceType === DeviceType.IOS
+            const isIOS =
+                /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+                (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1)
             const isStandalone = window.matchMedia('(display-mode: standalone)').matches
             const hasSeenModalThisSession = sessionStorage.getItem('hasSeenIOSPWAPromptThisSession')
             const redirectUrl = getFromLocalStorage('redirect')
@@ -127,7 +131,7 @@ export default function Home() {
                 setShowIOSPWAInstallModal(false)
             }
         }
-    }, [user?.hasPwaInstalled, isPostSignupActionModalVisible, deviceType])
+    }, [user?.hasPwaInstalled, isPostSignupActionModalVisible])
 
     // effect for showing balance warning modal
     useEffect(() => {
@@ -212,7 +216,7 @@ export default function Home() {
                     <UserHeader
                         username={username!}
                         fullName={userFullName}
-                        isVerified={user?.user.bridgeKycStatus === 'approved'}
+                        isVerified={user?.user.kycStatus === 'approved'}
                     />
                     <SearchUsers />
                 </div>
@@ -241,14 +245,19 @@ export default function Home() {
                     </ActionButtonGroup>
                 </div>
 
+                {/* Rewards Card - only shows if balance is non-zero */}
+                <div onClick={() => setIsRewardsModalOpen(true)} className="cursor-pointer">
+                    <RewardsCard
+                        balance={Math.floor(Number(rewardWalletBalance) ?? 0).toString() ?? '0'}
+                        isFetchingRewardBalance={isFetchingRewardBalance}
+                    />
+                </div>
+
                 <HomeHistory username={username ?? undefined} />
-                {/* Render the new Rewards Modal
                 <RewardsModal />
-                */}
 
-                {/* Render the new Rewards Card Modal
+                {/* Render the new Rewards Card Modal */}
                 <RewardsCardModal visible={isRewardsModalOpen} onClose={() => setIsRewardsModalOpen(false)} />
-                */}
             </div>
             {/* iOS PWA Install Modal */}
             <IOSInstallPWAModal visible={showIOSPWAInstallModal} onClose={() => setShowIOSPWAInstallModal(false)} />
@@ -405,3 +414,41 @@ function ActionButton({ label, action, variant = 'primary-soft', size = 'small'
 function ActionButtonGroup({ children }: { children: React.ReactNode }) {
     return <div className="flex items-center justify-normal gap-4">{children}</div>
 }
+
+function RewardsCard({
+    balance,
+    isFetchingRewardBalance,
+}: {
+    balance: string | undefined
+    isFetchingRewardBalance: boolean
+}) {
+    if (!balance || balance === '0') return null
+
+    return (
+        <div className="mt-6 space-y-3">
+            <h2 className="font-bold">Rewards</h2>
+            <Card position="single">
+                <div className="flex w-full items-center justify-between font-roboto">
+                    <div className="flex items-center gap-3">
+                        <div
+                            className={
+                                'flex size-8 items-center justify-center rounded-full border border-black bg-white py-2.5 pl-3 pr-0.5'
+                            }
+                        >
+                            <Image
+                                src={PeanutArmHoldingBeer}
+                                alt="Peanut arm holding beer"
+                                className={twMerge('size-6 object-contain')}
+                                width={24}
+                                height={24}
+                            />
+                        </div>
+
+                        <span className="text-sm font-medium">Beers</span>
+                    </div>
+                    <span className="text-sm font-medium">{isFetchingRewardBalance ? <Loading /> : balance}</span>
+                </div>
+            </Card>
+        </div>
+    )
+}
diff --git a/src/app/(mobile-ui)/layout.tsx b/src/app/(mobile-ui)/layout.tsx
index 948fb93ec..f886bb3fd 100644
--- a/src/app/(mobile-ui)/layout.tsx
+++ b/src/app/(mobile-ui)/layout.tsx
@@ -20,8 +20,6 @@ import PullToRefresh from 'pulltorefreshjs'
 import { useEffect, useMemo, useState } from 'react'
 import { twMerge } from 'tailwind-merge'
 import '../../styles/globals.css'
-import SupportDrawer from '@/components/Global/SupportDrawer'
-import { useSupportModalContext } from '@/context/SupportModalContext'
 
 // Allow access to some public paths without authentication
 const publicPathRegex = /^\/(request\/pay|claim|pay\/.+$|support)/
@@ -33,7 +31,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
     const [isReady, setIsReady] = useState(false)
     const [hasToken, setHasToken] = useState(false)
     const isUserLoggedIn = !!user?.user.userId || false
-    const { setIsSupportModalOpen } = useSupportModalContext()
+
     const isHome = pathName === '/home'
     const isHistory = pathName === '/history'
     const isSupport = pathName === '/support'
@@ -111,7 +109,7 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
                 <div className="flex w-full flex-1 flex-col">
                     {/* Only show banner if not on landing page */}
                     {pathName !== '/' && (
-                        <button onClick={() => setIsSupportModalOpen(true)} className="w-full cursor-pointer">
+                        <button onClick={() => router.push('/support')} className="w-full cursor-pointer">
                             <MarqueeWrapper backgroundColor="bg-primary-1" direction="left">
                                 <span className="z-10 mx-4 flex items-center gap-2 text-sm font-semibold">
                                     Peanut is in beta! Thank you for being an early user, share your feedback here
@@ -171,8 +169,6 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
 
             {/* Modal */}
             <GuestLoginModal />
-
-            <SupportDrawer />
         </div>
     )
 }
diff --git a/src/app/(mobile-ui)/profile/exchange-rate/page.tsx b/src/app/(mobile-ui)/profile/exchange-rate/page.tsx
deleted file mode 100644
index f1ec7be9d..000000000
--- a/src/app/(mobile-ui)/profile/exchange-rate/page.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client'
-
-import PageContainer from '@/components/0_Bruddle/PageContainer'
-import ExchangeRateWidget from '@/components/Global/ExchangeRateWidget'
-import NavHeader from '@/components/Global/NavHeader'
-import { useRouter } from 'next/navigation'
-
-export default function ExchangeRatePage() {
-    const router = useRouter()
-
-    return (
-        <PageContainer className="flex flex-col">
-            <NavHeader title="Exchange rate & fees" onPrev={() => router.replace('/profile')} />
-            <div className="m-auto">
-                <ExchangeRateWidget
-                    ctaIcon="arrow-down"
-                    ctaLabel="Add money to try it"
-                    ctaAction={() => router.push('/add-money')}
-                />
-            </div>
-        </PageContainer>
-    )
-}
diff --git a/src/app/(mobile-ui)/withdraw/[country]/bank/page.tsx b/src/app/(mobile-ui)/withdraw/[country]/bank/page.tsx
index 0c452f09c..6054a03dd 100644
--- a/src/app/(mobile-ui)/withdraw/[country]/bank/page.tsx
+++ b/src/app/(mobile-ui)/withdraw/[country]/bank/page.tsx
@@ -12,7 +12,7 @@ import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { AccountType, Account } from '@/interfaces'
 import { formatIban, shortenAddressLong, isTxReverted } from '@/utils/general.utils'
-import { useParams, useRouter } from 'next/navigation'
+import { useRouter } from 'next/navigation'
 import { useEffect, useState } from 'react'
 import DirectSuccessView from '@/components/Payment/Views/Status.payment.view'
 import { ErrorHandler, getBridgeChainName } from '@/utils'
@@ -20,7 +20,6 @@ import { getOfframpCurrencyConfig } from '@/utils/bridge.utils'
 import { createOfframp, confirmOfframp } from '@/app/actions/offramp'
 import { useAuth } from '@/context/authContext'
 import ExchangeRate from '@/components/ExchangeRate'
-import countryCurrencyMappings from '@/constants/countryCurrencyMapping'
 
 type View = 'INITIAL' | 'SUCCESS'
 
@@ -31,14 +30,6 @@ export default function WithdrawBankPage() {
     const router = useRouter()
     const [isLoading, setIsLoading] = useState(false)
     const [view, setView] = useState<View>('INITIAL')
-    const params = useParams()
-    const country = params.country as string
-
-    const nonEuroCurrency = countryCurrencyMappings.find(
-        (currency) =>
-            country.toLowerCase() === currency.country.toLowerCase() ||
-            currency.path?.toLowerCase() === country.toLowerCase()
-    )?.currencyCode
 
     useEffect(() => {
         if (!bankAccount) {
@@ -235,7 +226,7 @@ export default function WithdrawBankPage() {
                                 <PaymentInfoRow label={'Routing Number'} value={getBicAndRoutingNumber()} />
                             </>
                         )}
-                        <ExchangeRate accountType={bankAccount.type} nonEuroCurrency={nonEuroCurrency} />
+                        <ExchangeRate accountType={bankAccount.type} />
                         <PaymentInfoRow hideBottomBorder label="Fee" value={`$ 0.00`} />
                     </Card>
                     {error.showError ? (
diff --git a/src/app/(mobile-ui)/withdraw/crypto/page.tsx b/src/app/(mobile-ui)/withdraw/crypto/page.tsx
index 0d870c91c..891dbacaa 100644
--- a/src/app/(mobile-ui)/withdraw/crypto/page.tsx
+++ b/src/app/(mobile-ui)/withdraw/crypto/page.tsx
@@ -281,6 +281,7 @@ export default function WithdrawCryptoPage() {
     // reset withdraw flow when this component unmounts
     useEffect(() => {
         return () => {
+            resetWithdrawFlow()
             resetPaymentInitiator()
             resetTokenContextProvider() // reset token selector context to make sure previously selected token is not cached
         }
@@ -366,9 +367,6 @@ export default function WithdrawCryptoPage() {
                                 address={withdrawData.address}
                             />
                         }
-                        onComplete={() => {
-                            resetWithdrawFlow()
-                        }}
                     />
                 </>
             )}
diff --git a/src/app/(mobile-ui)/withdraw/page.tsx b/src/app/(mobile-ui)/withdraw/page.tsx
index a59cfd80f..3dd1d4a42 100644
--- a/src/app/(mobile-ui)/withdraw/page.tsx
+++ b/src/app/(mobile-ui)/withdraw/page.tsx
@@ -27,7 +27,6 @@ export default function WithdrawPage() {
         error,
         setUsdAmount,
         resetWithdrawFlow,
-        setShowAllWithdrawMethods,
     } = useWithdrawFlow()
 
     // choose the first screen: if an amount already exists we jump straight to the method list
@@ -75,7 +74,6 @@ export default function WithdrawPage() {
     useEffect(() => {
         if (amountFromContext && parseFloat(amountFromContext) > 0) {
             setStep('selectMethod')
-
             if (!rawTokenAmount) {
                 setRawTokenAmount(amountFromContext)
             }
@@ -89,13 +87,6 @@ export default function WithdrawPage() {
         }
     }, [amountFromContext, step])
 
-    useEffect(() => {
-        // If amount is available (i.e) user clicked back from select method view, show all methods
-        if (amountFromContext) {
-            setShowAllWithdrawMethods(true)
-        }
-    }, [])
-
     const validateAmount = useCallback(
         (amountStr: string): boolean => {
             if (!amountStr) {
diff --git a/src/app/(setup)/setup/page.tsx b/src/app/(setup)/setup/page.tsx
index 76f3b43f8..325a62f8a 100644
--- a/src/app/(setup)/setup/page.tsx
+++ b/src/app/(setup)/setup/page.tsx
@@ -40,7 +40,7 @@ export default function SetupPage() {
             // check for native passkey support
             let passkeySupport = true
             try {
-                passkeySupport = await PublicKeyCredential.isConditionalMediationAvailable()
+                passkeySupport = await PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable()
             } catch (e) {
                 passkeySupport = false
                 console.error('Error checking passkey support:', e)
diff --git a/src/app/[...recipient]/client.tsx b/src/app/[...recipient]/client.tsx
index 810197c26..eada41455 100644
--- a/src/app/[...recipient]/client.tsx
+++ b/src/app/[...recipient]/client.tsx
@@ -6,6 +6,7 @@ import ConfirmPaymentView from '@/components/Payment/Views/Confirm.payment.view'
 import ValidationErrorView, { ValidationErrorViewProps } from '@/components/Payment/Views/Error.validation.view'
 import InitialPaymentView from '@/components/Payment/Views/Initial.payment.view'
 import DirectSuccessView from '@/components/Payment/Views/Status.payment.view'
+import PintaReqPaySuccessView from '@/components/PintaReqPay/Views/Success.pinta.view'
 import PublicProfile from '@/components/Profile/components/PublicProfile'
 import { TransactionDetailsReceipt } from '@/components/TransactionDetails/TransactionDetailsReceipt'
 import { TransactionDetails } from '@/components/TransactionDetails/transactionTransformer'
@@ -26,13 +27,11 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { fetchTokenPrice } from '@/app/actions/tokens'
 import { GenericBanner } from '@/components/Global/Banner'
-import { RequestFulfillmentBankFlowStep, useRequestFulfillmentFlow } from '@/context/RequestFulfillmentFlowContext'
+import { useRequestFulfillmentFlow } from '@/context/RequestFulfillmentFlowContext'
 import ExternalWalletFulfilManager from '@/components/Request/views/ExternalWalletFulfilManager'
 import ActionList from '@/components/Common/ActionList'
 import NavHeader from '@/components/Global/NavHeader'
 import { ReqFulfillBankFlowManager } from '@/components/Request/views/ReqFulfillBankFlowManager'
-import SupportCTA from '@/components/Global/SupportCTA'
-import { BankRequestType, useDetermineBankRequestType } from '@/hooks/useDetermineBankRequestType'
 
 export type PaymentFlow = 'request_pay' | 'external_wallet' | 'direct_pay' | 'withdraw'
 interface Props {
@@ -49,7 +48,7 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
     const [error, setError] = useState<ValidationErrorViewProps | null>(null)
     const [isUrlParsed, setIsUrlParsed] = useState(false)
     const [isRequestDetailsFetching, setIsRequestDetailsFetching] = useState(false)
-    const { user, isFetchingUser } = useAuth()
+    const { user } = useAuth()
     const searchParams = useSearchParams()
     const chargeId = searchParams.get('chargeId')
     const requestId = searchParams.get('id')
@@ -62,13 +61,7 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
     const [currencyAmount, setCurrencyAmount] = useState<string>('')
     const { isDrawerOpen, selectedTransaction, openTransactionDetails } = useTransactionDetailsDrawer()
     const [isLinkCancelling, setisLinkCancelling] = useState(false)
-    const {
-        showExternalWalletFulfilMethods,
-        showRequestFulfilmentBankFlowManager,
-        setShowRequestFulfilmentBankFlowManager,
-        setFlowStep: setRequestFulfilmentBankFlowStep,
-    } = useRequestFulfillmentFlow()
-    const { requestType } = useDetermineBankRequestType(chargeDetails?.requestLink.recipientAccount.userId ?? '')
+    const { showExternalWalletFulfilMethods, showRequestFulfilmentBankFlowManager } = useRequestFulfillmentFlow()
 
     // determine if the current user is the recipient of the transaction
     const isCurrentUserRecipient = chargeDetails?.requestLink.recipientAccount?.userId === user?.user.userId
@@ -346,7 +339,7 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
                 amountDisplay: '$ 0.00',
             },
             currency: usdAmount ? { amount: usdAmount, code: 'USD' } : undefined,
-            isVerified: counterparty?.user?.bridgeKycStatus === 'approved',
+            isVerified: counterparty?.user?.kycStatus === 'approved',
             haveSentMoneyToUser: counterparty?.userId ? interactions[counterparty.userId] || false : false,
         }
 
@@ -391,21 +384,6 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
         }
     }, [transactionForDrawer, currentView, dispatch, openTransactionDetails, isExternalWalletFlow, chargeId])
 
-    // Send to bank step if its mentioned in the URL and guest KYC is not needed
-    useEffect(() => {
-        const stepFromURL = searchParams.get('step')
-        if (
-            parsedPaymentData &&
-            chargeDetails &&
-            requestType !== BankRequestType.GuestKycNeeded &&
-            stepFromURL === 'bank'
-        ) {
-            setShowRequestFulfilmentBankFlowManager(true)
-
-            setRequestFulfilmentBankFlowStep(RequestFulfillmentBankFlowStep.BankCountryList)
-        }
-    }, [searchParams, parsedPaymentData, chargeDetails, requestType])
-
     let showActionList = flow !== 'direct_pay'
 
     if (flow === 'direct_pay' && !user) {
@@ -459,6 +437,19 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
         )
     }
 
+    // pinta token payment flow
+    if (parsedPaymentData?.token?.symbol === 'PNT') {
+        return (
+            <div className={twMerge('mx-auto h-full w-full space-y-8 self-center')}>
+                <div>
+                    {currentView === 'INITIAL' && <InitialPaymentView {...parsedPaymentData} isPintaReq={true} />}
+                    {currentView === 'CONFIRM' && <ConfirmPaymentView isPintaReq={true} />}
+                    {currentView === 'STATUS' && <PintaReqPaySuccessView />}
+                </div>
+            </div>
+        )
+    }
+    // default payment flow
     return (
         <div className={twMerge('mx-auto min-h-[inherit] w-full space-y-8 self-center')}>
             {!user && parsedPaymentData?.recipient?.recipientType !== 'USERNAME' && (
@@ -504,6 +495,7 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
             {currentView === 'CONFIRM' && (
                 <ConfirmPaymentView
                     key={`confirm-${flow}`}
+                    isPintaReq={parsedPaymentData?.token?.symbol === 'PNT'}
                     currencyAmount={currencyCode && currencyAmount ? `${currencySymbol} ${currencyAmount}` : undefined}
                     isExternalWalletFlow={isExternalWalletFlow}
                     isDirectUsdPayment={isDirectPay}
@@ -511,7 +503,9 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
             )}
             {currentView === 'STATUS' && (
                 <>
-                    {isDrawerOpen && selectedTransaction?.id === transactionForDrawer?.id ? (
+                    {parsedPaymentData?.token?.symbol === 'PNT' ? (
+                        <PintaReqPaySuccessView />
+                    ) : isDrawerOpen && selectedTransaction?.id === transactionForDrawer?.id ? (
                         <div className="flex min-h-[inherit] flex-col justify-between gap-8">
                             <NavHeader disableBackBtn={!user?.user.userId} title="Receipt" />
                             <TransactionDetailsReceipt
@@ -537,9 +531,6 @@ export default function PaymentPage({ recipient, flow = 'request_pay' }: Props)
                     )}
                 </>
             )}
-
-            {/* Show only to guest users */}
-            {!user && !isFetchingUser && <SupportCTA />}
         </div>
     )
 }
diff --git a/src/app/[...recipient]/error.tsx b/src/app/[...recipient]/error.tsx
index 363fdd47d..194db40b7 100644
--- a/src/app/[...recipient]/error.tsx
+++ b/src/app/[...recipient]/error.tsx
@@ -3,11 +3,9 @@
 import { Button, Card } from '@/components/0_Bruddle'
 import { useEffect } from 'react'
 import { useRouter } from 'next/navigation'
-import { useSupportModalContext } from '@/context/SupportModalContext'
 
 export default function PaymentError({ error, reset }: { error: Error & { digest?: string }; reset: () => void }) {
     const router = useRouter()
-    const { setIsSupportModalOpen } = useSupportModalContext()
 
     useEffect(() => {
         console.error(error)
@@ -25,7 +23,7 @@ export default function PaymentError({ error, reset }: { error: Error & { digest
                 <Button onClick={reset} variant="purple">
                     Try again
                 </Button>
-                <Button onClick={() => setIsSupportModalOpen(true)} variant="transparent" className="text-sm underline">
+                <Button onClick={() => router.push('/support')} variant="transparent" className="text-sm underline">
                     Contact Support
                 </Button>
             </Card.Content>
diff --git a/src/app/actions/types/users.types.ts b/src/app/actions/types/users.types.ts
index 79811164a..922384d86 100644
--- a/src/app/actions/types/users.types.ts
+++ b/src/app/actions/types/users.types.ts
@@ -9,7 +9,7 @@ export enum BridgeEndorsementType {
 export interface InitiateKycResponse {
     kycLink: string
     tosLink?: string
-    bridgeKycStatus: string
+    kycStatus: string
     tosStatus?: string
     error?: string // will be present on rejections
     reasons?: Array<{
diff --git a/src/app/api/auto-claim/route.ts b/src/app/api/auto-claim/route.ts
deleted file mode 100644
index 7c00ad546..000000000
--- a/src/app/api/auto-claim/route.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server'
-import { fetchWithSentry } from '@/utils'
-import { PEANUT_API_URL } from '@/constants'
-
-/**
- * API route for automated link claiming without requiring user interaction.
- *
- * This route serves as a workaround for Next.js server action limitations:
- * Server actions cannot be directly called within useEffect hooks, which is
- * necessary for our automatic claim flow. By exposing this as an API route
- * instead, we can make the claim request safely from client-side effects.
- */
-export async function POST(request: NextRequest) {
-    try {
-        const body = await request.json()
-        const { pubKey, recipient, password } = body
-
-        if (!pubKey || !recipient || !password) {
-            return NextResponse.json(
-                { error: 'Missing required parameters: pubKey, recipient, or password' },
-                { status: 400 }
-            )
-        }
-
-        const response = await fetchWithSentry(`${PEANUT_API_URL}/send-links/${pubKey}/claim`, {
-            method: 'POST',
-            headers: {
-                'api-key': process.env.PEANUT_API_KEY!,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                recipient,
-                password,
-            }),
-        })
-
-        if (!response.ok) {
-            return NextResponse.json(
-                { error: `Failed to claim link: ${response.statusText}` },
-                { status: response.status }
-            )
-        }
-
-        const responseText = await response.text()
-        console.log('response', responseText)
-        return new NextResponse(responseText, {
-            headers: {
-                'Content-Type': 'application/json',
-            },
-        })
-    } catch (error) {
-        console.error('Error claiming send link:', error)
-        return NextResponse.json({ error: 'Failed to claim send link' }, { status: 500 })
-    }
-}
diff --git a/src/app/api/health/backend/route.ts b/src/app/api/health/backend/route.ts
index d6918afbc..3d1333455 100644
--- a/src/app/api/health/backend/route.ts
+++ b/src/app/api/health/backend/route.ts
@@ -2,6 +2,10 @@ import { NextResponse } from 'next/server'
 import { PEANUT_API_URL } from '@/constants'
 import { fetchWithSentry } from '@/utils'
 
+export const dynamic = 'force-dynamic'
+export const revalidate = 0
+export const fetchCache = 'force-no-store'
+
 /**
  * Health check for Peanut API backend
  * Tests connectivity to the main peanut-api-ts backend service
@@ -30,6 +34,8 @@ export async function GET() {
             headers: {
                 'Content-Type': 'application/json',
             },
+            cache: 'no-store',
+            next: { revalidate: 0 },
         })
 
         const backendResponseTime = Date.now() - backendTestStart
@@ -41,26 +47,37 @@ export async function GET() {
 
         const totalResponseTime = Date.now() - startTime
 
-        return NextResponse.json({
-            status: 'healthy',
-            service: 'backend',
-            timestamp: new Date().toISOString(),
-            responseTime: totalResponseTime,
-            details: {
-                apiConnectivity: {
-                    status: 'healthy',
-                    responseTime: backendResponseTime,
-                    httpStatus: backendResponse.status,
-                    apiUrl: PEANUT_API_URL,
-                    testEndpoint: '/users/username/hugo',
-                    message: backendResponse.ok
-                        ? 'Backend responding normally'
-                        : backendResponse.status === 404
-                          ? 'Backend accessible (user not found as expected)'
-                          : 'Backend accessible',
+        return NextResponse.json(
+            {
+                status: 'healthy',
+                service: 'backend',
+                timestamp: new Date().toISOString(),
+                responseTime: totalResponseTime,
+                details: {
+                    apiConnectivity: {
+                        status: 'healthy',
+                        responseTime: backendResponseTime,
+                        httpStatus: backendResponse.status,
+                        apiUrl: PEANUT_API_URL,
+                        testEndpoint: '/users/username/hugo',
+                        message: backendResponse.ok
+                            ? 'Backend responding normally'
+                            : backendResponse.status === 404
+                              ? 'Backend accessible (user not found as expected)'
+                              : 'Backend accessible',
+                    },
                 },
             },
-        })
+            {
+                status: 200,
+                headers: {
+                    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                    Pragma: 'no-cache',
+                    Expires: '0',
+                    'Surrogate-Control': 'no-store',
+                },
+            }
+        )
     } catch (error) {
         const totalResponseTime = Date.now() - startTime
 
@@ -72,7 +89,15 @@ export async function GET() {
                 error: error instanceof Error ? error.message : 'Unknown error',
                 responseTime: totalResponseTime,
             },
-            { status: 500 }
+            {
+                status: 500,
+                headers: {
+                    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                    Pragma: 'no-cache',
+                    Expires: '0',
+                    'Surrogate-Control': 'no-store',
+                },
+            }
         )
     }
 }
diff --git a/src/app/api/health/route.ts b/src/app/api/health/route.ts
index f26de8529..58309883a 100644
--- a/src/app/api/health/route.ts
+++ b/src/app/api/health/route.ts
@@ -1,6 +1,10 @@
 import { NextResponse } from 'next/server'
 import { fetchWithSentry } from '@/utils'
 
+export const dynamic = 'force-dynamic'
+export const revalidate = 0
+export const fetchCache = 'force-no-store'
+
 /**
  * Overall health check endpoint
  * Aggregates health status from all individual service health checks
@@ -84,6 +88,8 @@ export async function GET() {
                     headers: {
                         'Content-Type': 'application/json',
                     },
+                    cache: 'no-store',
+                    next: { revalidate: 0 },
                 })
 
                 if (!response.ok) {
@@ -189,23 +195,42 @@ export async function GET() {
             // Send Discord notification asynchronously (don't await to avoid delaying the response)
             sendDiscordNotification(responseData).catch(console.error)
 
-            return NextResponse.json(responseData, { status: 500 })
+            return NextResponse.json(responseData, {
+                status: 500,
+                headers: {
+                    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                    Pragma: 'no-cache',
+                    Expires: '0',
+                    'Surrogate-Control': 'no-store',
+                },
+            })
         }
 
-        return NextResponse.json({
-            status: overallStatus,
-            service: 'peanut-protocol',
-            timestamp: new Date().toISOString(),
-            responseTime: totalResponseTime,
-            healthScore,
-            summary: results.summary,
-            services: results.services,
-            systemInfo: {
-                environment: process.env.NODE_ENV,
-                version: process.env.npm_package_version || 'unknown',
-                region: process.env.VERCEL_REGION || 'unknown',
+        return NextResponse.json(
+            {
+                status: overallStatus,
+                service: 'peanut-protocol',
+                timestamp: new Date().toISOString(),
+                responseTime: totalResponseTime,
+                healthScore,
+                summary: results.summary,
+                services: results.services,
+                systemInfo: {
+                    environment: process.env.NODE_ENV,
+                    version: process.env.npm_package_version || 'unknown',
+                    region: process.env.VERCEL_REGION || 'unknown',
+                },
             },
-        })
+            {
+                status: 200,
+                headers: {
+                    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                    Pragma: 'no-cache',
+                    Expires: '0',
+                    'Surrogate-Control': 'no-store',
+                },
+            }
+        )
     } catch (error) {
         const totalResponseTime = Date.now() - startTime
 
@@ -218,7 +243,15 @@ export async function GET() {
                 responseTime: totalResponseTime,
                 healthScore: 0,
             },
-            { status: 500 }
+            {
+                status: 500,
+                headers: {
+                    'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+                    Pragma: 'no-cache',
+                    Expires: '0',
+                    'Surrogate-Control': 'no-store',
+                },
+            }
         )
     }
 }
diff --git a/src/app/api/peanut/user/update-user/route.ts b/src/app/api/peanut/user/update-user/route.ts
index 99abbd366..3cfcd3cd3 100644
--- a/src/app/api/peanut/user/update-user/route.ts
+++ b/src/app/api/peanut/user/update-user/route.ts
@@ -1,5 +1,5 @@
 import * as consts from '@/constants'
-import { fetchWithSentry, BridgeKycStatus } from '@/utils'
+import { fetchWithSentry, KYCStatus } from '@/utils'
 import { cookies } from 'next/headers'
 import { NextRequest, NextResponse } from 'next/server'
 
@@ -7,7 +7,7 @@ type UserPayload = {
     userId: string
     username?: string
     bridge_customer_id?: string
-    bridgeKycStatus?: BridgeKycStatus
+    kycStatus?: KYCStatus
     telegramUsername?: string
     email?: string
     pushSubscriptionId?: string
@@ -15,7 +15,7 @@ type UserPayload = {
 }
 
 export async function POST(request: NextRequest) {
-    const { userId, username, bridge_customer_id, bridgeKycStatus, telegram, email, pushSubscriptionId, fullName } =
+    const { userId, username, bridge_customer_id, kycStatus, telegram, email, pushSubscriptionId, fullName } =
         await request.json()
 
     const apiKey = process.env.PEANUT_API_KEY
@@ -31,7 +31,7 @@ export async function POST(request: NextRequest) {
             userId,
             username,
             bridge_customer_id,
-            bridgeKycStatus: bridgeKycStatus,
+            kycStatus,
         }
 
         if (telegram) {
diff --git a/src/assets/illustrations/index.ts b/src/assets/illustrations/index.ts
index 88002e1ce..e04ba355b 100644
--- a/src/assets/illustrations/index.ts
+++ b/src/assets/illustrations/index.ts
@@ -6,7 +6,7 @@ export { default as Eyes } from './eyes.svg'
 export { default as HandThumbsUp } from './hand-thumbs-up.svg'
 export { default as HandToken } from './new-hand-token.svg'
 export { default as AboutPeanut } from './new-hero-description.svg'
-//export { default as PeanutArmHoldingBeer } from './peanut-arm-holding-beer.svg'
+export { default as PeanutArmHoldingBeer } from './peanut-arm-holding-beer.svg'
 export { default as PEANUT_LOGO_BLACK } from './peanut-logo-dark.svg'
 export { default as PeanutsBG } from './peanuts-bg.svg'
 export { default as Sparkle } from './sparkle.svg'
diff --git a/src/assets/peanut/index.ts b/src/assets/peanut/index.ts
index b447c6d76..67030828a 100644
--- a/src/assets/peanut/index.ts
+++ b/src/assets/peanut/index.ts
@@ -1,3 +1,4 @@
+export { default as PEANUTMAN_BEER } from './peanut-holding-beer.svg'
 export { default as PEANUTMAN_MOBILE } from './peanut-holding-mobile.svg'
 export { default as PEANUTMAN_PFP } from './peanut-pfp.svg'
 export { default as PEANUTMAN_RAISING_HANDS } from './peanut-raising-hands.svg'
diff --git a/src/components/AddMoney/UserDetailsForm.tsx b/src/components/AddMoney/UserDetailsForm.tsx
index 041d89e64..a1ace78f3 100644
--- a/src/components/AddMoney/UserDetailsForm.tsx
+++ b/src/components/AddMoney/UserDetailsForm.tsx
@@ -5,7 +5,8 @@ import BaseInput from '@/components/0_Bruddle/BaseInput'
 import ErrorAlert from '@/components/Global/ErrorAlert'
 
 export type UserDetailsFormData = {
-    fullName: string
+    firstName: string
+    lastName: string
     email: string
 }
 
@@ -26,7 +27,8 @@ export const UserDetailsForm = forwardRef<{ handleSubmit: () => void }, UserDeta
             formState: { errors, isValid, isValidating },
         } = useForm<UserDetailsFormData>({
             defaultValues: {
-                fullName: initialData?.fullName ?? '',
+                firstName: initialData?.firstName ?? '',
+                lastName: initialData?.lastName ?? '',
                 email: initialData?.email ?? '',
             },
             mode: 'onBlur',
@@ -92,7 +94,8 @@ export const UserDetailsForm = forwardRef<{ handleSubmit: () => void }, UserDeta
                         className="space-y-4"
                     >
                         <div className="w-full space-y-4">
-                            {renderInput('fullName', 'Full Name', { required: 'Full name is required' })}
+                            {renderInput('firstName', 'First Name', { required: 'First name is required' })}
+                            {renderInput('lastName', 'Last Name', { required: 'Last name is required' })}
                             {renderInput('email', 'E-mail', {
                                 required: 'Email is required',
                                 pattern: {
diff --git a/src/components/AddMoney/consts/index.ts b/src/components/AddMoney/consts/index.ts
index c4100d0d4..114b6fa45 100644
--- a/src/components/AddMoney/consts/index.ts
+++ b/src/components/AddMoney/consts/index.ts
@@ -144,7 +144,6 @@ export interface CountryData {
     description?: string
     path: string
     iso2?: string
-    iso3?: string
 }
 
 export interface DepositMethods extends CountryData {
@@ -268,8 +267,6 @@ export const countryData: CountryData[] = [
         title: 'Andorra',
         currency: 'EUR',
         path: 'andorra',
-        iso2: 'AD',
-        iso3: 'AND',
     },
     {
         id: 'AE',
@@ -277,8 +274,6 @@ export const countryData: CountryData[] = [
         title: 'United Arab Emirates',
         currency: 'AED',
         path: 'united-arab-emirates',
-        iso2: 'AE',
-        iso3: 'ARE',
     },
     {
         id: 'AG',
@@ -286,8 +281,6 @@ export const countryData: CountryData[] = [
         title: 'Antigua and Barbuda',
         currency: 'XCD',
         path: 'antigua-and-barbuda',
-        iso2: 'AG',
-        iso3: 'ATG',
     },
     {
         id: 'AI',
@@ -295,8 +288,6 @@ export const countryData: CountryData[] = [
         title: 'Anguilla',
         currency: 'XCD',
         path: 'anguilla',
-        iso2: 'AI',
-        iso3: 'AIA',
     },
     {
         id: 'AL',
@@ -304,8 +295,6 @@ export const countryData: CountryData[] = [
         title: 'Albania',
         currency: 'ALL',
         path: 'albania',
-        iso2: 'AL',
-        iso3: 'ALB',
     },
     {
         id: 'AM',
@@ -313,8 +302,6 @@ export const countryData: CountryData[] = [
         title: 'Armenia',
         currency: 'AMD',
         path: 'armenia',
-        iso2: 'AM',
-        iso3: 'ARM',
     },
     {
         id: 'AO',
@@ -322,8 +309,6 @@ export const countryData: CountryData[] = [
         title: 'Angola',
         currency: 'AOA',
         path: 'angola',
-        iso2: 'AO',
-        iso3: 'AGO',
     },
     {
         id: 'AQ',
@@ -331,8 +316,6 @@ export const countryData: CountryData[] = [
         title: 'Antarctica',
         currency: '',
         path: 'antarctica',
-        iso2: 'AQ',
-        iso3: 'ATA',
     },
     {
         id: 'AR',
@@ -340,8 +323,6 @@ export const countryData: CountryData[] = [
         title: 'Argentina',
         currency: 'ARS',
         path: 'argentina',
-        iso2: 'AR',
-        iso3: 'ARG',
     },
     {
         id: 'AS',
@@ -349,8 +330,6 @@ export const countryData: CountryData[] = [
         title: 'American Samoa',
         currency: 'USD',
         path: 'american-samoa',
-        iso2: 'AS',
-        iso3: 'ASM',
     },
     {
         id: 'AUT',
@@ -358,8 +337,6 @@ export const countryData: CountryData[] = [
         title: 'Austria',
         currency: 'EUR',
         path: 'austria',
-        iso2: 'AT',
-        iso3: 'AUT',
     },
     {
         id: 'AU',
@@ -367,8 +344,6 @@ export const countryData: CountryData[] = [
         title: 'Australia',
         currency: 'AUD',
         path: 'australia',
-        iso2: 'AU',
-        iso3: 'AUS',
     },
     {
         id: 'AW',
@@ -376,8 +351,6 @@ export const countryData: CountryData[] = [
         title: 'Aruba',
         currency: 'AWG',
         path: 'aruba',
-        iso2: 'AW',
-        iso3: 'ABW',
     },
     {
         id: 'ALA',
@@ -385,8 +358,6 @@ export const countryData: CountryData[] = [
         title: 'Åland',
         currency: 'EUR',
         path: 'aland',
-        iso2: 'AX',
-        iso3: 'ALA',
     },
     {
         id: 'AZ',
@@ -394,8 +365,6 @@ export const countryData: CountryData[] = [
         title: 'Azerbaijan',
         currency: 'AZN',
         path: 'azerbaijan',
-        iso2: 'AZ',
-        iso3: 'AZE',
     },
     {
         id: 'BA',
@@ -403,8 +372,6 @@ export const countryData: CountryData[] = [
         title: 'Bosnia and Herzegovina',
         currency: 'BAM',
         path: 'bosnia-and-herzegovina',
-        iso2: 'BA',
-        iso3: 'BIH',
     },
     {
         id: 'BB',
@@ -412,8 +379,6 @@ export const countryData: CountryData[] = [
         title: 'Barbados',
         currency: 'BBD',
         path: 'barbados',
-        iso2: 'BB',
-        iso3: 'BRB',
     },
     {
         id: 'BD',
@@ -421,8 +386,6 @@ export const countryData: CountryData[] = [
         title: 'Bangladesh',
         currency: 'BDT',
         path: 'bangladesh',
-        iso2: 'BD',
-        iso3: 'BGD',
     },
     {
         id: 'BEL',
@@ -430,8 +393,6 @@ export const countryData: CountryData[] = [
         title: 'Belgium',
         currency: 'EUR',
         path: 'belgium',
-        iso2: 'BE',
-        iso3: 'BEL',
     },
     {
         id: 'BF',
@@ -439,8 +400,6 @@ export const countryData: CountryData[] = [
         title: 'Burkina Faso',
         currency: 'XOF',
         path: 'burkina-faso',
-        iso2: 'BF',
-        iso3: 'BFA',
     },
     {
         id: 'BGR',
@@ -448,8 +407,6 @@ export const countryData: CountryData[] = [
         title: 'Bulgaria',
         currency: 'BGN',
         path: 'bulgaria',
-        iso2: 'BG',
-        iso3: 'BGR',
     },
     {
         id: 'BH',
@@ -457,8 +414,6 @@ export const countryData: CountryData[] = [
         title: 'Bahrain',
         currency: 'BHD',
         path: 'bahrain',
-        iso2: 'BH',
-        iso3: 'BHR',
     },
     {
         id: 'BI',
@@ -466,8 +421,6 @@ export const countryData: CountryData[] = [
         title: 'Burundi',
         currency: 'BIF',
         path: 'burundi',
-        iso2: 'BI',
-        iso3: 'BDI',
     },
     {
         id: 'BJ',
@@ -475,8 +428,6 @@ export const countryData: CountryData[] = [
         title: 'Benin',
         currency: 'XOF',
         path: 'benin',
-        iso2: 'BJ',
-        iso3: 'BEN',
     },
     {
         id: 'BL',
@@ -484,8 +435,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Barthélemy',
         currency: 'EUR',
         path: 'saint-barthélemy',
-        iso2: 'BL',
-        iso3: 'BLM',
     },
     {
         id: 'BM',
@@ -493,8 +442,6 @@ export const countryData: CountryData[] = [
         title: 'Bermuda',
         currency: 'BMD',
         path: 'bermuda',
-        iso2: 'BM',
-        iso3: 'BMU',
     },
     {
         id: 'BN',
@@ -502,8 +449,6 @@ export const countryData: CountryData[] = [
         title: 'Brunei',
         currency: 'BND',
         path: 'brunei',
-        iso2: 'BN',
-        iso3: 'BRN',
     },
     {
         id: 'BO',
@@ -511,8 +456,6 @@ export const countryData: CountryData[] = [
         title: 'Bolivia',
         currency: 'BOB',
         path: 'bolivia',
-        iso2: 'BO',
-        iso3: 'BOL',
     },
     {
         id: 'BQ',
@@ -520,8 +463,6 @@ export const countryData: CountryData[] = [
         title: 'Bonaire',
         currency: 'USD',
         path: 'bonaire',
-        iso2: 'BQ',
-        iso3: 'BES',
     },
     {
         id: 'BR',
@@ -529,8 +470,6 @@ export const countryData: CountryData[] = [
         title: 'Brazil',
         currency: 'BRL',
         path: 'brazil',
-        iso2: 'BR',
-        iso3: 'BRA',
     },
     {
         id: 'BS',
@@ -538,8 +477,6 @@ export const countryData: CountryData[] = [
         title: 'Bahamas',
         currency: 'BSD',
         path: 'bahamas',
-        iso2: 'BS',
-        iso3: 'BHS',
     },
     {
         id: 'BT',
@@ -547,8 +484,6 @@ export const countryData: CountryData[] = [
         title: 'Bhutan',
         currency: 'BTN',
         path: 'bhutan',
-        iso2: 'BT',
-        iso3: 'BTN',
     },
     {
         id: 'BV',
@@ -556,8 +491,6 @@ export const countryData: CountryData[] = [
         title: 'Bouvet Island',
         currency: 'NOK',
         path: 'bouvet-island',
-        iso2: 'BV',
-        iso3: 'BVT',
     },
     {
         id: 'BW',
@@ -565,8 +498,6 @@ export const countryData: CountryData[] = [
         title: 'Botswana',
         currency: 'BWP',
         path: 'botswana',
-        iso2: 'BW',
-        iso3: 'BWA',
     },
     {
         id: 'BZ',
@@ -574,8 +505,6 @@ export const countryData: CountryData[] = [
         title: 'Belize',
         currency: 'BZD',
         path: 'belize',
-        iso2: 'BZ',
-        iso3: 'BLZ',
     },
     {
         id: 'CA',
@@ -583,8 +512,6 @@ export const countryData: CountryData[] = [
         title: 'Canada',
         currency: 'CAD',
         path: 'canada',
-        iso2: 'CA',
-        iso3: 'CAN',
     },
     {
         id: 'CC',
@@ -592,8 +519,6 @@ export const countryData: CountryData[] = [
         title: 'Cocos (Keeling) Islands',
         currency: 'AUD',
         path: 'cocos-keeling-islands',
-        iso2: 'CC',
-        iso3: 'CCK',
     },
     {
         id: 'CD',
@@ -601,8 +526,6 @@ export const countryData: CountryData[] = [
         title: 'Democratic Republic of the Congo',
         currency: 'CDF',
         path: 'democratic-republic-of-the-congo',
-        iso2: 'CD',
-        iso3: 'COD',
     },
     {
         id: 'CF',
@@ -610,8 +533,6 @@ export const countryData: CountryData[] = [
         title: 'Central African Republic',
         currency: 'XAF',
         path: 'central-african-republic',
-        iso2: 'CF',
-        iso3: 'CAF',
     },
     {
         id: 'CG',
@@ -619,8 +540,6 @@ export const countryData: CountryData[] = [
         title: 'Republic of the Congo',
         currency: 'XAF',
         path: 'republic-of-the-congo',
-        iso2: 'CG',
-        iso3: 'COG',
     },
     {
         id: 'CHE',
@@ -628,8 +547,6 @@ export const countryData: CountryData[] = [
         title: 'Switzerland',
         currency: 'CHF',
         path: 'switzerland',
-        iso2: 'CH',
-        iso3: 'CHE',
     },
     {
         id: 'CI',
@@ -637,8 +554,6 @@ export const countryData: CountryData[] = [
         title: 'Ivory Coast',
         currency: 'XOF',
         path: 'ivory-coast',
-        iso2: 'CI',
-        iso3: 'CIV',
     },
     {
         id: 'CK',
@@ -646,8 +561,6 @@ export const countryData: CountryData[] = [
         title: 'Cook Islands',
         currency: 'NZD',
         path: 'cook-islands',
-        iso2: 'CK',
-        iso3: 'COK',
     },
     {
         id: 'CL',
@@ -655,8 +568,6 @@ export const countryData: CountryData[] = [
         title: 'Chile',
         currency: 'CLP',
         path: 'chile',
-        iso2: 'CL',
-        iso3: 'CHL',
     },
     {
         id: 'CM',
@@ -664,8 +575,6 @@ export const countryData: CountryData[] = [
         title: 'Cameroon',
         currency: 'XAF',
         path: 'cameroon',
-        iso2: 'CM',
-        iso3: 'CMR',
     },
     {
         id: 'CN',
@@ -673,8 +582,6 @@ export const countryData: CountryData[] = [
         title: 'China',
         currency: 'CNY',
         path: 'china',
-        iso2: 'CN',
-        iso3: 'CHN',
     },
     {
         id: 'CO',
@@ -682,8 +589,6 @@ export const countryData: CountryData[] = [
         title: 'Colombia',
         currency: 'COP',
         path: 'colombia',
-        iso2: 'CO',
-        iso3: 'COL',
     },
     {
         id: 'CR',
@@ -691,8 +596,6 @@ export const countryData: CountryData[] = [
         title: 'Costa Rica',
         currency: 'CRC',
         path: 'costa-rica',
-        iso2: 'CR',
-        iso3: 'CRI',
     },
     {
         id: 'CV',
@@ -700,8 +603,6 @@ export const countryData: CountryData[] = [
         title: 'Cape Verde',
         currency: 'CVE',
         path: 'cape-verde',
-        iso2: 'CV',
-        iso3: 'CPV',
     },
     {
         id: 'CW',
@@ -709,8 +610,6 @@ export const countryData: CountryData[] = [
         title: 'Curacao',
         currency: 'ANG',
         path: 'curacao',
-        iso2: 'CW',
-        iso3: 'CUW',
     },
     {
         id: 'CX',
@@ -718,8 +617,6 @@ export const countryData: CountryData[] = [
         title: 'Christmas Island',
         currency: 'AUD',
         path: 'christmas-island',
-        iso2: 'CX',
-        iso3: 'CXR',
     },
     {
         id: 'CYP',
@@ -727,8 +624,6 @@ export const countryData: CountryData[] = [
         title: 'Cyprus',
         currency: 'EUR',
         path: 'cyprus',
-        iso2: 'CY',
-        iso3: 'CYP',
     },
     {
         id: 'CZE',
@@ -736,8 +631,6 @@ export const countryData: CountryData[] = [
         title: 'Czechia',
         currency: 'CZK',
         path: 'czechia',
-        iso2: 'CZ',
-        iso3: 'CZE',
     },
     {
         id: 'DEU',
@@ -745,8 +638,6 @@ export const countryData: CountryData[] = [
         title: 'Germany',
         currency: 'EUR',
         path: 'germany',
-        iso2: 'DE',
-        iso3: 'DEU',
     },
     {
         id: 'DJ',
@@ -754,8 +645,6 @@ export const countryData: CountryData[] = [
         title: 'Djibouti',
         currency: 'DJF',
         path: 'djibouti',
-        iso2: 'DJ',
-        iso3: 'DJI',
     },
     {
         id: 'DNK',
@@ -763,8 +652,6 @@ export const countryData: CountryData[] = [
         title: 'Denmark',
         currency: 'DKK',
         path: 'denmark',
-        iso2: 'DK',
-        iso3: 'DNK',
     },
     {
         id: 'DM',
@@ -772,8 +659,6 @@ export const countryData: CountryData[] = [
         title: 'Dominica',
         currency: 'XCD',
         path: 'dominica',
-        iso2: 'DM',
-        iso3: 'DMA',
     },
     {
         id: 'DO',
@@ -781,8 +666,6 @@ export const countryData: CountryData[] = [
         title: 'Dominican Republic',
         currency: 'DOP',
         path: 'dominican-republic',
-        iso2: 'DO',
-        iso3: 'DOM',
     },
     {
         id: 'DZ',
@@ -790,8 +673,6 @@ export const countryData: CountryData[] = [
         title: 'Algeria',
         currency: 'DZD',
         path: 'algeria',
-        iso2: 'DZ',
-        iso3: 'DZA',
     },
     {
         id: 'EC',
@@ -799,8 +680,6 @@ export const countryData: CountryData[] = [
         title: 'Ecuador',
         currency: 'USD',
         path: 'ecuador',
-        iso2: 'EC',
-        iso3: 'ECU',
     },
     {
         id: 'EST',
@@ -808,8 +687,6 @@ export const countryData: CountryData[] = [
         title: 'Estonia',
         currency: 'EUR',
         path: 'estonia',
-        iso2: 'EE',
-        iso3: 'EST',
     },
     {
         id: 'EG',
@@ -817,8 +694,6 @@ export const countryData: CountryData[] = [
         title: 'Egypt',
         currency: 'EGP',
         path: 'egypt',
-        iso2: 'EG',
-        iso3: 'EGY',
     },
     {
         id: 'EH',
@@ -826,8 +701,6 @@ export const countryData: CountryData[] = [
         title: 'Western Sahara',
         currency: 'MAD',
         path: 'western-sahara',
-        iso2: 'EH',
-        iso3: 'ESH',
     },
     {
         id: 'ER',
@@ -835,8 +708,6 @@ export const countryData: CountryData[] = [
         title: 'Eritrea',
         currency: 'ERN',
         path: 'eritrea',
-        iso2: 'ER',
-        iso3: 'ERI',
     },
     {
         id: 'ESP',
@@ -844,8 +715,6 @@ export const countryData: CountryData[] = [
         title: 'Spain',
         currency: 'EUR',
         path: 'spain',
-        iso2: 'ES',
-        iso3: 'ESP',
     },
     {
         id: 'ET',
@@ -853,8 +722,6 @@ export const countryData: CountryData[] = [
         title: 'Ethiopia',
         currency: 'ETB',
         path: 'ethiopia',
-        iso2: 'ET',
-        iso3: 'ETH',
     },
     {
         id: 'FIN',
@@ -862,8 +729,6 @@ export const countryData: CountryData[] = [
         title: 'Finland',
         currency: 'EUR',
         path: 'finland',
-        iso2: 'FI',
-        iso3: 'FIN',
     },
     {
         id: 'FJ',
@@ -871,8 +736,6 @@ export const countryData: CountryData[] = [
         title: 'Fiji',
         currency: 'FJD',
         path: 'fiji',
-        iso2: 'FJ',
-        iso3: 'FJI',
     },
     {
         id: 'FK',
@@ -880,8 +743,6 @@ export const countryData: CountryData[] = [
         title: 'Falkland Islands',
         currency: 'FKP',
         path: 'falkland-islands',
-        iso2: 'FK',
-        iso3: 'FLK',
     },
     {
         id: 'FM',
@@ -889,8 +750,6 @@ export const countryData: CountryData[] = [
         title: 'Micronesia',
         currency: 'USD',
         path: 'micronesia',
-        iso2: 'FM',
-        iso3: 'FSM',
     },
     {
         id: 'FO',
@@ -898,8 +757,6 @@ export const countryData: CountryData[] = [
         title: 'Faroe Islands',
         currency: 'DKK',
         path: 'faroe-islands',
-        iso2: 'FO',
-        iso3: 'FRO',
     },
     {
         id: 'FRA',
@@ -907,8 +764,6 @@ export const countryData: CountryData[] = [
         title: 'France',
         currency: 'EUR',
         path: 'france',
-        iso2: 'FR',
-        iso3: 'FRA',
     },
     {
         id: 'GA',
@@ -916,8 +771,6 @@ export const countryData: CountryData[] = [
         title: 'Gabon',
         currency: 'XAF',
         path: 'gabon',
-        iso2: 'GA',
-        iso3: 'GAB',
     },
     {
         id: 'GBR',
@@ -926,7 +779,6 @@ export const countryData: CountryData[] = [
         currency: 'GBP',
         path: 'united-kingdom',
         iso2: 'GB',
-        iso3: 'GBR',
     },
     {
         id: 'GD',
@@ -934,8 +786,6 @@ export const countryData: CountryData[] = [
         title: 'Grenada',
         currency: 'XCD',
         path: 'grenada',
-        iso2: 'GD',
-        iso3: 'GRD',
     },
     {
         id: 'GE',
@@ -943,8 +793,6 @@ export const countryData: CountryData[] = [
         title: 'Georgia',
         currency: 'GEL',
         path: 'georgia',
-        iso2: 'GE',
-        iso3: 'GEO',
     },
     {
         id: 'GUF',
@@ -952,8 +800,6 @@ export const countryData: CountryData[] = [
         title: 'French Guiana',
         currency: 'EUR',
         path: 'french-guiana',
-        iso2: 'GF',
-        iso3: 'GUF',
     },
     {
         id: 'GG',
@@ -961,8 +807,6 @@ export const countryData: CountryData[] = [
         title: 'Guernsey',
         currency: 'GBP',
         path: 'guernsey',
-        iso2: 'GG',
-        iso3: 'GGY',
     },
     {
         id: 'GH',
@@ -970,8 +814,6 @@ export const countryData: CountryData[] = [
         title: 'Ghana',
         currency: 'GHS',
         path: 'ghana',
-        iso2: 'GH',
-        iso3: 'GHA',
     },
     {
         id: 'GI',
@@ -979,8 +821,6 @@ export const countryData: CountryData[] = [
         title: 'Gibraltar',
         currency: 'GIP',
         path: 'gibraltar',
-        iso2: 'GI',
-        iso3: 'GIB',
     },
     {
         id: 'GL',
@@ -988,8 +828,6 @@ export const countryData: CountryData[] = [
         title: 'Greenland',
         currency: 'DKK',
         path: 'greenland',
-        iso2: 'GL',
-        iso3: 'GRL',
     },
     {
         id: 'GM',
@@ -997,8 +835,6 @@ export const countryData: CountryData[] = [
         title: 'Gambia',
         currency: 'GMD',
         path: 'gambia',
-        iso2: 'GM',
-        iso3: 'GMB',
     },
     {
         id: 'GN',
@@ -1006,8 +842,6 @@ export const countryData: CountryData[] = [
         title: 'Guinea',
         currency: 'GNF',
         path: 'guinea',
-        iso2: 'GN',
-        iso3: 'GIN',
     },
     {
         id: 'GP',
@@ -1015,8 +849,6 @@ export const countryData: CountryData[] = [
         title: 'Guadeloupe',
         currency: 'EUR',
         path: 'guadeloupe',
-        iso2: 'GP',
-        iso3: 'GLP',
     },
     {
         id: 'GQ',
@@ -1024,8 +856,6 @@ export const countryData: CountryData[] = [
         title: 'Equatorial Guinea',
         currency: 'XAF',
         path: 'equatorial-guinea',
-        iso2: 'GQ',
-        iso3: 'GNQ',
     },
     {
         id: 'GR',
@@ -1033,8 +863,6 @@ export const countryData: CountryData[] = [
         title: 'Greece',
         currency: 'EUR',
         path: 'greece',
-        iso2: 'GR',
-        iso3: 'GRC',
     },
     {
         id: 'GS',
@@ -1042,8 +870,6 @@ export const countryData: CountryData[] = [
         title: 'South Georgia and the South Sandwich Islands',
         currency: 'GBP',
         path: 'south-georgia-and-the-south-sandwich-islands',
-        iso2: 'GS',
-        iso3: 'SGS',
     },
     {
         id: 'GT',
@@ -1051,8 +877,6 @@ export const countryData: CountryData[] = [
         title: 'Guatemala',
         currency: 'GTQ',
         path: 'guatemala',
-        iso2: 'GT',
-        iso3: 'GTM',
     },
     {
         id: 'GU',
@@ -1060,8 +884,6 @@ export const countryData: CountryData[] = [
         title: 'Guam',
         currency: 'USD',
         path: 'guam',
-        iso2: 'GU',
-        iso3: 'GUM',
     },
     {
         id: 'GW',
@@ -1069,8 +891,6 @@ export const countryData: CountryData[] = [
         title: 'Guinea-Bissau',
         currency: 'XOF',
         path: 'guinea-bissau',
-        iso2: 'GW',
-        iso3: 'GNB',
     },
     {
         id: 'GY',
@@ -1078,8 +898,6 @@ export const countryData: CountryData[] = [
         title: 'Guyana',
         currency: 'GYD',
         path: 'guyana',
-        iso2: 'GY',
-        iso3: 'GUY',
     },
     {
         id: 'HK',
@@ -1087,8 +905,6 @@ export const countryData: CountryData[] = [
         title: 'Hong Kong',
         currency: 'HKD',
         path: 'hong-kong',
-        iso2: 'HK',
-        iso3: 'HKG',
     },
     {
         id: 'HM',
@@ -1096,8 +912,6 @@ export const countryData: CountryData[] = [
         title: 'Heard Island and McDonald Islands',
         currency: 'AUD',
         path: 'heard-island-and-mcdonald-islands',
-        iso2: 'HM',
-        iso3: 'HMD',
     },
     {
         id: 'HN',
@@ -1105,8 +919,6 @@ export const countryData: CountryData[] = [
         title: 'Honduras',
         currency: 'HNL',
         path: 'honduras',
-        iso2: 'HN',
-        iso3: 'HND',
     },
     {
         id: 'HRV',
@@ -1114,8 +926,6 @@ export const countryData: CountryData[] = [
         title: 'Croatia',
         currency: 'EUR',
         path: 'croatia',
-        iso2: 'HR',
-        iso3: 'HRV',
     },
     {
         id: 'HT',
@@ -1123,8 +933,6 @@ export const countryData: CountryData[] = [
         title: 'Haiti',
         currency: 'HTG',
         path: 'haiti',
-        iso2: 'HT',
-        iso3: 'HTI',
     },
     {
         id: 'HUN',
@@ -1132,8 +940,6 @@ export const countryData: CountryData[] = [
         title: 'Hungary',
         currency: 'HUF',
         path: 'hungary',
-        iso2: 'HU',
-        iso3: 'HUN',
     },
     {
         id: 'ID',
@@ -1141,8 +947,6 @@ export const countryData: CountryData[] = [
         title: 'Indonesia',
         currency: 'IDR',
         path: 'indonesia',
-        iso2: 'ID',
-        iso3: 'IDN',
     },
     {
         id: 'IRL',
@@ -1150,8 +954,6 @@ export const countryData: CountryData[] = [
         title: 'Ireland',
         currency: 'EUR',
         path: 'ireland',
-        iso2: 'IE',
-        iso3: 'IRL',
     },
     {
         id: 'IL',
@@ -1159,8 +961,6 @@ export const countryData: CountryData[] = [
         title: 'Israel',
         currency: 'ILS',
         path: 'israel',
-        iso2: 'IL',
-        iso3: 'ISR',
     },
     {
         id: 'IM',
@@ -1168,8 +968,6 @@ export const countryData: CountryData[] = [
         title: 'Isle of Man',
         currency: 'GBP',
         path: 'isle-of-man',
-        iso2: 'IM',
-        iso3: 'IMN',
     },
     {
         id: 'IN',
@@ -1177,8 +975,6 @@ export const countryData: CountryData[] = [
         title: 'India',
         currency: 'INR',
         path: 'india',
-        iso2: 'IN',
-        iso3: 'IND',
     },
     {
         id: 'IO',
@@ -1186,8 +982,6 @@ export const countryData: CountryData[] = [
         title: 'British Indian Ocean Territory',
         currency: 'USD',
         path: 'british-indian-ocean-territory',
-        iso2: 'IO',
-        iso3: 'IOT',
     },
     {
         id: 'ISL',
@@ -1195,8 +989,6 @@ export const countryData: CountryData[] = [
         title: 'Iceland',
         currency: 'ISK',
         path: 'iceland',
-        iso2: 'IS',
-        iso3: 'ISL',
     },
     {
         id: 'ITA',
@@ -1204,8 +996,6 @@ export const countryData: CountryData[] = [
         title: 'Italy',
         currency: 'EUR',
         path: 'italy',
-        iso2: 'IT',
-        iso3: 'ITA',
     },
     {
         id: 'JE',
@@ -1213,8 +1003,6 @@ export const countryData: CountryData[] = [
         title: 'Jersey',
         currency: 'GBP',
         path: 'jersey',
-        iso2: 'JE',
-        iso3: 'JEY',
     },
     {
         id: 'JM',
@@ -1222,8 +1010,6 @@ export const countryData: CountryData[] = [
         title: 'Jamaica',
         currency: 'JMD',
         path: 'jamaica',
-        iso2: 'JM',
-        iso3: 'JAM',
     },
     {
         id: 'JO',
@@ -1231,8 +1017,6 @@ export const countryData: CountryData[] = [
         title: 'Jordan',
         currency: 'JOD',
         path: 'jordan',
-        iso2: 'JO',
-        iso3: 'JOR',
     },
     {
         id: 'JP',
@@ -1240,8 +1024,6 @@ export const countryData: CountryData[] = [
         title: 'Japan',
         currency: 'JPY',
         path: 'japan',
-        iso2: 'JP',
-        iso3: 'JPN',
     },
     {
         id: 'KE',
@@ -1249,8 +1031,6 @@ export const countryData: CountryData[] = [
         title: 'Kenya',
         currency: 'KES',
         path: 'kenya',
-        iso2: 'KE',
-        iso3: 'KEN',
     },
     {
         id: 'KG',
@@ -1258,8 +1038,6 @@ export const countryData: CountryData[] = [
         title: 'Kyrgyzstan',
         currency: 'KGS',
         path: 'kyrgyzstan',
-        iso2: 'KG',
-        iso3: 'KGZ',
     },
     {
         id: 'KH',
@@ -1267,8 +1045,6 @@ export const countryData: CountryData[] = [
         title: 'Cambodia',
         currency: 'KHR',
         path: 'cambodia',
-        iso2: 'KH',
-        iso3: 'KHM',
     },
     {
         id: 'KI',
@@ -1276,8 +1052,6 @@ export const countryData: CountryData[] = [
         title: 'Kiribati',
         currency: 'AUD',
         path: 'kiribati',
-        iso2: 'KI',
-        iso3: 'KIR',
     },
     {
         id: 'KM',
@@ -1285,8 +1059,6 @@ export const countryData: CountryData[] = [
         title: 'Comoros',
         currency: 'KMF',
         path: 'comoros',
-        iso2: 'KM',
-        iso3: 'COM',
     },
     {
         id: 'KN',
@@ -1294,8 +1066,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Kitts and Nevis',
         currency: 'XCD',
         path: 'saint-kitts-and-nevis',
-        iso2: 'KN',
-        iso3: 'KNA',
     },
     {
         id: 'KR',
@@ -1303,8 +1073,6 @@ export const countryData: CountryData[] = [
         title: 'South Korea',
         currency: 'KRW',
         path: 'south-korea',
-        iso2: 'KR',
-        iso3: 'KOR',
     },
     {
         id: 'KW',
@@ -1312,8 +1080,6 @@ export const countryData: CountryData[] = [
         title: 'Kuwait',
         currency: 'KWD',
         path: 'kuwait',
-        iso2: 'KW',
-        iso3: 'KWT',
     },
     {
         id: 'KY',
@@ -1321,8 +1087,6 @@ export const countryData: CountryData[] = [
         title: 'Cayman Islands',
         currency: 'KYD',
         path: 'cayman-islands',
-        iso2: 'KY',
-        iso3: 'CYM',
     },
     {
         id: 'KZ',
@@ -1330,8 +1094,6 @@ export const countryData: CountryData[] = [
         title: 'Kazakhstan',
         currency: 'KZT',
         path: 'kazakhstan',
-        iso2: 'KZ',
-        iso3: 'KAZ',
     },
     {
         id: 'LA',
@@ -1339,8 +1101,6 @@ export const countryData: CountryData[] = [
         title: 'Laos',
         currency: 'LAK',
         path: 'laos',
-        iso2: 'LA',
-        iso3: 'LAO',
     },
     {
         id: 'LB',
@@ -1348,8 +1108,6 @@ export const countryData: CountryData[] = [
         title: 'Lebanon',
         currency: 'LBP',
         path: 'lebanon',
-        iso2: 'LB',
-        iso3: 'LBN',
     },
     {
         id: 'LC',
@@ -1357,8 +1115,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Lucia',
         currency: 'XCD',
         path: 'saint-lucia',
-        iso2: 'LC',
-        iso3: 'LCA',
     },
     {
         id: 'LI',
@@ -1366,8 +1122,6 @@ export const countryData: CountryData[] = [
         title: 'Liechtenstein',
         currency: 'CHF',
         path: 'liechtenstein',
-        iso2: 'LI',
-        iso3: 'LIE',
     },
     {
         id: 'LK',
@@ -1375,8 +1129,6 @@ export const countryData: CountryData[] = [
         title: 'Sri Lanka',
         currency: 'LKR',
         path: 'sri-lanka',
-        iso2: 'LK',
-        iso3: 'LKA',
     },
     {
         id: 'LR',
@@ -1384,8 +1136,6 @@ export const countryData: CountryData[] = [
         title: 'Liberia',
         currency: 'LRD',
         path: 'liberia',
-        iso2: 'LR',
-        iso3: 'LBR',
     },
     {
         id: 'LS',
@@ -1393,8 +1143,6 @@ export const countryData: CountryData[] = [
         title: 'Lesotho',
         currency: 'LSL',
         path: 'lesotho',
-        iso2: 'LS',
-        iso3: 'LSO',
     },
     {
         id: 'LTU',
@@ -1402,8 +1150,6 @@ export const countryData: CountryData[] = [
         title: 'Lithuania',
         currency: 'EUR',
         path: 'lithuania',
-        iso2: 'LT',
-        iso3: 'LTU',
     },
     {
         id: 'LUX',
@@ -1411,8 +1157,6 @@ export const countryData: CountryData[] = [
         title: 'Luxembourg',
         currency: 'EUR',
         path: 'luxembourg',
-        iso2: 'LU',
-        iso3: 'LUX',
     },
     {
         id: 'LVA',
@@ -1420,8 +1164,6 @@ export const countryData: CountryData[] = [
         title: 'Latvia',
         currency: 'EUR',
         path: 'latvia',
-        iso2: 'LV',
-        iso3: 'LVA',
     },
     {
         id: 'LY',
@@ -1429,8 +1171,6 @@ export const countryData: CountryData[] = [
         title: 'Libya',
         currency: 'LYD',
         path: 'libya',
-        iso2: 'LY',
-        iso3: 'LBY',
     },
     {
         id: 'MA',
@@ -1438,8 +1178,6 @@ export const countryData: CountryData[] = [
         title: 'Morocco',
         currency: 'MAD',
         path: 'morocco',
-        iso2: 'MA',
-        iso3: 'MAR',
     },
     {
         id: 'MC',
@@ -1447,8 +1185,6 @@ export const countryData: CountryData[] = [
         title: 'Monaco',
         currency: 'EUR',
         path: 'monaco',
-        iso2: 'MC',
-        iso3: 'MCO',
     },
     {
         id: 'MD',
@@ -1456,8 +1192,6 @@ export const countryData: CountryData[] = [
         title: 'Moldova',
         currency: 'MDL',
         path: 'moldova',
-        iso2: 'MD',
-        iso3: 'MDA',
     },
     {
         id: 'ME',
@@ -1465,8 +1199,6 @@ export const countryData: CountryData[] = [
         title: 'Montenegro',
         currency: 'EUR',
         path: 'montenegro',
-        iso2: 'ME',
-        iso3: 'MNE',
     },
     {
         id: 'MAF',
@@ -1474,8 +1206,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Martin',
         currency: 'EUR',
         path: 'saint-martin',
-        iso2: 'MF',
-        iso3: 'MAF',
     },
     {
         id: 'MG',
@@ -1483,8 +1213,6 @@ export const countryData: CountryData[] = [
         title: 'Madagascar',
         currency: 'MGA',
         path: 'madagascar',
-        iso2: 'MG',
-        iso3: 'MDG',
     },
     {
         id: 'MH',
@@ -1492,8 +1220,6 @@ export const countryData: CountryData[] = [
         title: 'Marshall Islands',
         currency: 'USD',
         path: 'marshall-islands',
-        iso2: 'MH',
-        iso3: 'MHL',
     },
     {
         id: 'MK',
@@ -1501,8 +1227,6 @@ export const countryData: CountryData[] = [
         title: 'Macedonia',
         currency: 'MKD',
         path: 'macedonia',
-        iso2: 'MK',
-        iso3: 'MKD',
     },
     {
         id: 'ML',
@@ -1510,8 +1234,6 @@ export const countryData: CountryData[] = [
         title: 'Mali',
         currency: 'XOF',
         path: 'mali',
-        iso2: 'ML',
-        iso3: 'MLI',
     },
     {
         id: 'MN',
@@ -1519,8 +1241,6 @@ export const countryData: CountryData[] = [
         title: 'Mongolia',
         currency: 'MNT',
         path: 'mongolia',
-        iso2: 'MN',
-        iso3: 'MNG',
     },
     {
         id: 'MO',
@@ -1528,8 +1248,6 @@ export const countryData: CountryData[] = [
         title: 'Macao',
         currency: 'MOP',
         path: 'macao',
-        iso2: 'MO',
-        iso3: 'MAC',
     },
     {
         id: 'MP',
@@ -1537,8 +1255,6 @@ export const countryData: CountryData[] = [
         title: 'Northern Mariana Islands',
         currency: 'USD',
         path: 'northern-mariana-islands',
-        iso2: 'MP',
-        iso3: 'MNP',
     },
     {
         id: 'MTQ',
@@ -1546,8 +1262,6 @@ export const countryData: CountryData[] = [
         title: 'Martinique',
         currency: 'EUR',
         path: 'martinique',
-        iso2: 'MQ',
-        iso3: 'MTQ',
     },
     {
         id: 'MR',
@@ -1555,8 +1269,6 @@ export const countryData: CountryData[] = [
         title: 'Mauritania',
         currency: 'MRU',
         path: 'mauritania',
-        iso2: 'MR',
-        iso3: 'MRT',
     },
     {
         id: 'MS',
@@ -1564,8 +1276,6 @@ export const countryData: CountryData[] = [
         title: 'Montserrat',
         currency: 'XCD',
         path: 'montserrat',
-        iso2: 'MS',
-        iso3: 'MSR',
     },
     {
         id: 'MLT',
@@ -1573,8 +1283,6 @@ export const countryData: CountryData[] = [
         title: 'Malta',
         currency: 'EUR',
         path: 'malta',
-        iso2: 'MT',
-        iso3: 'MLT',
     },
     {
         id: 'MU',
@@ -1582,8 +1290,6 @@ export const countryData: CountryData[] = [
         title: 'Mauritius',
         currency: 'MUR',
         path: 'mauritius',
-        iso2: 'MU',
-        iso3: 'MUS',
     },
     {
         id: 'MV',
@@ -1591,8 +1297,6 @@ export const countryData: CountryData[] = [
         title: 'Maldives',
         currency: 'MVR',
         path: 'maldives',
-        iso2: 'MV',
-        iso3: 'MDV',
     },
     {
         id: 'MW',
@@ -1600,8 +1304,6 @@ export const countryData: CountryData[] = [
         title: 'Malawi',
         currency: 'MWK',
         path: 'malawi',
-        iso2: 'MW',
-        iso3: 'MWI',
     },
     {
         id: 'MX',
@@ -1609,8 +1311,6 @@ export const countryData: CountryData[] = [
         title: 'Mexico',
         currency: 'MXN',
         path: 'mexico',
-        iso2: 'MX',
-        iso3: 'MEX',
     },
     {
         id: 'MY',
@@ -1618,8 +1318,6 @@ export const countryData: CountryData[] = [
         title: 'Malaysia',
         currency: 'MYR',
         path: 'malaysia',
-        iso2: 'MY',
-        iso3: 'MYS',
     },
     {
         id: 'MZ',
@@ -1627,8 +1325,6 @@ export const countryData: CountryData[] = [
         title: 'Mozambique',
         currency: 'MZN',
         path: 'mozambique',
-        iso2: 'MZ',
-        iso3: 'MOZ',
     },
     {
         id: 'NA',
@@ -1636,8 +1332,6 @@ export const countryData: CountryData[] = [
         title: 'Namibia',
         currency: 'NAD',
         path: 'namibia',
-        iso2: 'NA',
-        iso3: 'NAM',
     },
     {
         id: 'NC',
@@ -1645,8 +1339,6 @@ export const countryData: CountryData[] = [
         title: 'New Caledonia',
         currency: 'XPF',
         path: 'new-caledonia',
-        iso2: 'NC',
-        iso3: 'NCL',
     },
     {
         id: 'NE',
@@ -1654,8 +1346,6 @@ export const countryData: CountryData[] = [
         title: 'Niger',
         currency: 'XOF',
         path: 'niger',
-        iso2: 'NE',
-        iso3: 'NER',
     },
     {
         id: 'NF',
@@ -1663,8 +1353,6 @@ export const countryData: CountryData[] = [
         title: 'Norfolk Island',
         currency: 'AUD',
         path: 'norfolk-island',
-        iso2: 'NF',
-        iso3: 'NFK',
     },
     {
         id: 'NG',
@@ -1672,8 +1360,6 @@ export const countryData: CountryData[] = [
         title: 'Nigeria',
         currency: 'NGN',
         path: 'nigeria',
-        iso2: 'NG',
-        iso3: 'NGA',
     },
     {
         id: 'NI',
@@ -1681,8 +1367,6 @@ export const countryData: CountryData[] = [
         title: 'Nicaragua',
         currency: 'NIO',
         path: 'nicaragua',
-        iso2: 'NI',
-        iso3: 'NIC',
     },
     {
         id: 'NLD',
@@ -1690,8 +1374,6 @@ export const countryData: CountryData[] = [
         title: 'Netherlands',
         currency: 'EUR',
         path: 'netherlands',
-        iso2: 'NL',
-        iso3: 'NLD',
     },
     {
         id: 'NOR',
@@ -1699,8 +1381,6 @@ export const countryData: CountryData[] = [
         title: 'Norway',
         currency: 'NOK',
         path: 'norway',
-        iso2: 'NO',
-        iso3: 'NOR',
     },
     {
         id: 'NP',
@@ -1708,8 +1388,6 @@ export const countryData: CountryData[] = [
         title: 'Nepal',
         currency: 'NPR',
         path: 'nepal',
-        iso2: 'NP',
-        iso3: 'NPL',
     },
     {
         id: 'NR',
@@ -1717,8 +1395,6 @@ export const countryData: CountryData[] = [
         title: 'Nauru',
         currency: 'AUD',
         path: 'nauru',
-        iso2: 'NR',
-        iso3: 'NRU',
     },
     {
         id: 'NU',
@@ -1726,8 +1402,6 @@ export const countryData: CountryData[] = [
         title: 'Niue',
         currency: 'NZD',
         path: 'niue',
-        iso2: 'NU',
-        iso3: 'NIU',
     },
     {
         id: 'NZ',
@@ -1735,8 +1409,6 @@ export const countryData: CountryData[] = [
         title: 'New Zealand',
         currency: 'NZD',
         path: 'new-zealand',
-        iso2: 'NZ',
-        iso3: 'NZL',
     },
     {
         id: 'OM',
@@ -1744,8 +1416,6 @@ export const countryData: CountryData[] = [
         title: 'Oman',
         currency: 'OMR',
         path: 'oman',
-        iso2: 'OM',
-        iso3: 'OMN',
     },
     {
         id: 'PA',
@@ -1753,8 +1423,6 @@ export const countryData: CountryData[] = [
         title: 'Panama',
         currency: 'PAB',
         path: 'panama',
-        iso2: 'PA',
-        iso3: 'PAN',
     },
     {
         id: 'PE',
@@ -1762,8 +1430,6 @@ export const countryData: CountryData[] = [
         title: 'Peru',
         currency: 'PEN',
         path: 'peru',
-        iso2: 'PE',
-        iso3: 'PER',
     },
     {
         id: 'PF',
@@ -1771,8 +1437,6 @@ export const countryData: CountryData[] = [
         title: 'French Polynesia',
         currency: 'XPF',
         path: 'french-polynesia',
-        iso2: 'PF',
-        iso3: 'PYF',
     },
     {
         id: 'PG',
@@ -1780,8 +1444,6 @@ export const countryData: CountryData[] = [
         title: 'Papua New Guinea',
         currency: 'PGK',
         path: 'papua-new-guinea',
-        iso2: 'PG',
-        iso3: 'PNG',
     },
     {
         id: 'PH',
@@ -1789,8 +1451,6 @@ export const countryData: CountryData[] = [
         title: 'Philippines',
         currency: 'PHP',
         path: 'philippines',
-        iso2: 'PH',
-        iso3: 'PHL',
     },
     {
         id: 'PK',
@@ -1798,8 +1458,6 @@ export const countryData: CountryData[] = [
         title: 'Pakistan',
         currency: 'PKR',
         path: 'pakistan',
-        iso2: 'PK',
-        iso3: 'PAK',
     },
     {
         id: 'PL',
@@ -1807,8 +1465,6 @@ export const countryData: CountryData[] = [
         title: 'Poland',
         currency: 'PLN',
         path: 'poland',
-        iso2: 'PL',
-        iso3: 'POL',
     },
     {
         id: 'PM',
@@ -1816,8 +1472,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Pierre and Miquelon',
         currency: 'EUR',
         path: 'saint-pierre-and-miquelon',
-        iso2: 'PM',
-        iso3: 'SPM',
     },
     {
         id: 'PN',
@@ -1825,8 +1479,6 @@ export const countryData: CountryData[] = [
         title: 'Pitcairn Islands',
         currency: 'NZD',
         path: 'pitcairn-islands',
-        iso2: 'PN',
-        iso3: 'PCN',
     },
     {
         id: 'PR',
@@ -1834,8 +1486,6 @@ export const countryData: CountryData[] = [
         title: 'Puerto Rico',
         currency: 'USD',
         path: 'puerto-rico',
-        iso2: 'PR',
-        iso3: 'PRI',
     },
     {
         id: 'PS',
@@ -1843,8 +1493,6 @@ export const countryData: CountryData[] = [
         title: 'Palestine',
         currency: 'ILS',
         path: 'palestine',
-        iso2: 'PS',
-        iso3: 'PSE',
     },
     {
         id: 'PRT',
@@ -1852,8 +1500,6 @@ export const countryData: CountryData[] = [
         title: 'Portugal',
         currency: 'EUR',
         path: 'portugal',
-        iso2: 'PT',
-        iso3: 'PRT',
     },
     {
         id: 'PW',
@@ -1861,8 +1507,6 @@ export const countryData: CountryData[] = [
         title: 'Palau',
         currency: 'USD',
         path: 'palau',
-        iso2: 'PW',
-        iso3: 'PLW',
     },
     {
         id: 'PY',
@@ -1870,8 +1514,6 @@ export const countryData: CountryData[] = [
         title: 'Paraguay',
         currency: 'PYG',
         path: 'paraguay',
-        iso2: 'PY',
-        iso3: 'PRY',
     },
     {
         id: 'QA',
@@ -1879,8 +1521,6 @@ export const countryData: CountryData[] = [
         title: 'Qatar',
         currency: 'QAR',
         path: 'qatar',
-        iso2: 'QA',
-        iso3: 'QAT',
     },
     {
         id: 'REU',
@@ -1888,8 +1528,6 @@ export const countryData: CountryData[] = [
         title: 'Réunion',
         currency: 'EUR',
         path: 'reunion',
-        iso2: 'RE',
-        iso3: 'REU',
     },
     {
         id: 'ROU',
@@ -1897,8 +1535,6 @@ export const countryData: CountryData[] = [
         title: 'Romania',
         currency: 'RON',
         path: 'romania',
-        iso2: 'RO',
-        iso3: 'ROU',
     },
     {
         id: 'RS',
@@ -1906,8 +1542,6 @@ export const countryData: CountryData[] = [
         title: 'Serbia',
         currency: 'RSD',
         path: 'serbia',
-        iso2: 'RS',
-        iso3: 'SRB',
     },
     {
         id: 'RW',
@@ -1915,8 +1549,6 @@ export const countryData: CountryData[] = [
         title: 'Rwanda',
         currency: 'RWF',
         path: 'rwanda',
-        iso2: 'RW',
-        iso3: 'RWA',
     },
     {
         id: 'SA',
@@ -1924,8 +1556,6 @@ export const countryData: CountryData[] = [
         title: 'Saudi Arabia',
         currency: 'SAR',
         path: 'saudi-arabia',
-        iso2: 'SA',
-        iso3: 'SAU',
     },
     {
         id: 'SB',
@@ -1933,8 +1563,6 @@ export const countryData: CountryData[] = [
         title: 'Solomon Islands',
         currency: 'SBD',
         path: 'solomon-islands',
-        iso2: 'SB',
-        iso3: 'SLB',
     },
     {
         id: 'SC',
@@ -1942,8 +1570,6 @@ export const countryData: CountryData[] = [
         title: 'Seychelles',
         currency: 'SCR',
         path: 'seychelles',
-        iso2: 'SC',
-        iso3: 'SYC',
     },
     {
         id: 'SD',
@@ -1951,8 +1577,6 @@ export const countryData: CountryData[] = [
         title: 'Sudan',
         currency: 'SDG',
         path: 'sudan',
-        iso2: 'SD',
-        iso3: 'SDN',
     },
     {
         id: 'SE',
@@ -1960,8 +1584,6 @@ export const countryData: CountryData[] = [
         title: 'Sweden',
         currency: 'SEK',
         path: 'sweden',
-        iso2: 'SE',
-        iso3: 'SWE',
     },
     {
         id: 'SG',
@@ -1969,8 +1591,6 @@ export const countryData: CountryData[] = [
         title: 'Singapore',
         currency: 'SGD',
         path: 'singapore',
-        iso2: 'SG',
-        iso3: 'SGP',
     },
     {
         id: 'SH',
@@ -1978,8 +1598,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Helena',
         currency: 'SHP',
         path: 'saint-helena',
-        iso2: 'SH',
-        iso3: 'SHN',
     },
     {
         id: 'SVN',
@@ -1987,8 +1605,6 @@ export const countryData: CountryData[] = [
         title: 'Slovenia',
         currency: 'EUR',
         path: 'slovenia',
-        iso2: 'SI',
-        iso3: 'SVN',
     },
     {
         id: 'SJ',
@@ -1996,8 +1612,6 @@ export const countryData: CountryData[] = [
         title: 'Svalbard and Jan Mayen',
         currency: 'NOK',
         path: 'svalbard-and-jan-mayen',
-        iso2: 'SJ',
-        iso3: 'SJM',
     },
     {
         id: 'SVK',
@@ -2005,8 +1619,6 @@ export const countryData: CountryData[] = [
         title: 'Slovakia',
         currency: 'EUR',
         path: 'slovakia',
-        iso2: 'SK',
-        iso3: 'SVK',
     },
     {
         id: 'SL',
@@ -2014,8 +1626,6 @@ export const countryData: CountryData[] = [
         title: 'Sierra Leone',
         currency: 'SLL',
         path: 'sierra-leone',
-        iso2: 'SL',
-        iso3: 'SLE',
     },
     {
         id: 'SM',
@@ -2023,8 +1633,6 @@ export const countryData: CountryData[] = [
         title: 'San Marino',
         currency: 'EUR',
         path: 'san-marino',
-        iso2: 'SM',
-        iso3: 'SMR',
     },
     {
         id: 'SN',
@@ -2032,8 +1640,6 @@ export const countryData: CountryData[] = [
         title: 'Senegal',
         currency: 'XOF',
         path: 'senegal',
-        iso2: 'SN',
-        iso3: 'SEN',
     },
     {
         id: 'SO',
@@ -2041,8 +1647,6 @@ export const countryData: CountryData[] = [
         title: 'Somalia',
         currency: 'SOS',
         path: 'somalia',
-        iso2: 'SO',
-        iso3: 'SOM',
     },
     {
         id: 'SR',
@@ -2050,8 +1654,6 @@ export const countryData: CountryData[] = [
         title: 'Suriname',
         currency: 'SRD',
         path: 'suriname',
-        iso2: 'SR',
-        iso3: 'SUR',
     },
     {
         id: 'SS',
@@ -2059,8 +1661,6 @@ export const countryData: CountryData[] = [
         title: 'South Sudan',
         currency: 'SSP',
         path: 'south-sudan',
-        iso2: 'SS',
-        iso3: 'SSD',
     },
     {
         id: 'ST',
@@ -2068,8 +1668,6 @@ export const countryData: CountryData[] = [
         title: 'São Tomé and Príncipe',
         currency: 'STD',
         path: 'sao-tome-and-principe',
-        iso2: 'ST',
-        iso3: 'STP',
     },
     {
         id: 'SV',
@@ -2077,8 +1675,6 @@ export const countryData: CountryData[] = [
         title: 'El Salvador',
         currency: 'USD',
         path: 'el-salvador',
-        iso2: 'SV',
-        iso3: 'SLV',
     },
     {
         id: 'SX',
@@ -2086,8 +1682,6 @@ export const countryData: CountryData[] = [
         title: 'Sint Maarten',
         currency: 'ANG',
         path: 'sint-maarten',
-        iso2: 'SX',
-        iso3: 'SXM',
     },
     {
         id: 'SZ',
@@ -2095,8 +1689,6 @@ export const countryData: CountryData[] = [
         title: 'Swaziland',
         currency: 'SZL',
         path: 'swaziland',
-        iso2: 'SZ',
-        iso3: 'SWZ',
     },
     {
         id: 'TC',
@@ -2104,8 +1696,6 @@ export const countryData: CountryData[] = [
         title: 'Turks and Caicos Islands',
         currency: 'USD',
         path: 'turks-and-caicos-islands',
-        iso2: 'TC',
-        iso3: 'TCA',
     },
     {
         id: 'TD',
@@ -2113,8 +1703,6 @@ export const countryData: CountryData[] = [
         title: 'Chad',
         currency: 'XAF',
         path: 'chad',
-        iso2: 'TD',
-        iso3: 'TCD',
     },
     {
         id: 'TF',
@@ -2122,8 +1710,6 @@ export const countryData: CountryData[] = [
         title: 'French Southern Territories',
         currency: 'EUR',
         path: 'french-southern-territories',
-        iso2: 'TF',
-        iso3: 'ATF',
     },
     {
         id: 'TG',
@@ -2131,8 +1717,6 @@ export const countryData: CountryData[] = [
         title: 'Togo',
         currency: 'XOF',
         path: 'togo',
-        iso2: 'TG',
-        iso3: 'TGO',
     },
     {
         id: 'TH',
@@ -2140,8 +1724,6 @@ export const countryData: CountryData[] = [
         title: 'Thailand',
         currency: 'THB',
         path: 'thailand',
-        iso2: 'TH',
-        iso3: 'THA',
     },
     {
         id: 'TJ',
@@ -2149,8 +1731,6 @@ export const countryData: CountryData[] = [
         title: 'Tajikistan',
         currency: 'TJS',
         path: 'tajikistan',
-        iso2: 'TJ',
-        iso3: 'TJK',
     },
     {
         id: 'TK',
@@ -2158,8 +1738,6 @@ export const countryData: CountryData[] = [
         title: 'Tokelau',
         currency: 'NZD',
         path: 'tokelau',
-        iso2: 'TK',
-        iso3: 'TKL',
     },
     {
         id: 'TL',
@@ -2167,8 +1745,6 @@ export const countryData: CountryData[] = [
         title: 'East Timor',
         currency: 'USD',
         path: 'east-timor',
-        iso2: 'TL',
-        iso3: 'TLS',
     },
     {
         id: 'TM',
@@ -2176,8 +1752,6 @@ export const countryData: CountryData[] = [
         title: 'Turkmenistan',
         currency: 'TMT',
         path: 'turkmenistan',
-        iso2: 'TM',
-        iso3: 'TKM',
     },
     {
         id: 'TN',
@@ -2185,8 +1759,6 @@ export const countryData: CountryData[] = [
         title: 'Tunisia',
         currency: 'TND',
         path: 'tunisia',
-        iso2: 'TN',
-        iso3: 'TUN',
     },
     {
         id: 'TO',
@@ -2194,8 +1766,6 @@ export const countryData: CountryData[] = [
         title: 'Tonga',
         currency: 'TOP',
         path: 'tonga',
-        iso2: 'TO',
-        iso3: 'TON',
     },
     {
         id: 'TR',
@@ -2203,8 +1773,6 @@ export const countryData: CountryData[] = [
         title: 'Turkey',
         currency: 'TRY',
         path: 'turkey',
-        iso2: 'TR',
-        iso3: 'TUR',
     },
     {
         id: 'TT',
@@ -2212,8 +1780,6 @@ export const countryData: CountryData[] = [
         title: 'Trinidad and Tobago',
         currency: 'TTD',
         path: 'trinidad-and-tobago',
-        iso2: 'TT',
-        iso3: 'TTO',
     },
     {
         id: 'TV',
@@ -2221,8 +1787,6 @@ export const countryData: CountryData[] = [
         title: 'Tuvalu',
         currency: 'AUD',
         path: 'tuvalu',
-        iso2: 'TV',
-        iso3: 'TUV',
     },
     {
         id: 'TW',
@@ -2230,8 +1794,6 @@ export const countryData: CountryData[] = [
         title: 'Taiwan',
         currency: 'TWD',
         path: 'taiwan',
-        iso2: 'TW',
-        iso3: 'TWN',
     },
     {
         id: 'TZ',
@@ -2239,8 +1801,6 @@ export const countryData: CountryData[] = [
         title: 'Tanzania',
         currency: 'TZS',
         path: 'tanzania',
-        iso2: 'TZ',
-        iso3: 'TZA',
     },
     {
         id: 'UA',
@@ -2248,8 +1808,6 @@ export const countryData: CountryData[] = [
         title: 'Ukraine',
         currency: 'UAH',
         path: 'ukraine',
-        iso2: 'UA',
-        iso3: 'UKR',
     },
     {
         id: 'UG',
@@ -2257,8 +1815,6 @@ export const countryData: CountryData[] = [
         title: 'Uganda',
         currency: 'UGX',
         path: 'uganda',
-        iso2: 'UG',
-        iso3: 'UGA',
     },
     {
         id: 'UM',
@@ -2266,8 +1822,6 @@ export const countryData: CountryData[] = [
         title: 'U.S. Minor Outlying Islands',
         currency: 'USD',
         path: 'u.s.-minor-outlying-islands',
-        iso2: 'UM',
-        iso3: 'UMI',
     },
     {
         id: 'US',
@@ -2275,8 +1829,6 @@ export const countryData: CountryData[] = [
         title: 'United States',
         currency: 'USD',
         path: 'usa',
-        iso2: 'US',
-        iso3: 'USA',
     },
     {
         id: 'UY',
@@ -2284,8 +1836,6 @@ export const countryData: CountryData[] = [
         title: 'Uruguay',
         currency: 'UYU',
         path: 'uruguay',
-        iso2: 'UY',
-        iso3: 'URY',
     },
     {
         id: 'UZ',
@@ -2293,8 +1843,6 @@ export const countryData: CountryData[] = [
         title: 'Uzbekistan',
         currency: 'UZS',
         path: 'uzbekistan',
-        iso2: 'UZ',
-        iso3: 'UZB',
     },
     {
         id: 'VA',
@@ -2302,8 +1850,6 @@ export const countryData: CountryData[] = [
         title: 'Vatican City',
         currency: 'EUR',
         path: 'vatican-city',
-        iso2: 'VA',
-        iso3: 'VAT',
     },
     {
         id: 'VC',
@@ -2311,8 +1857,6 @@ export const countryData: CountryData[] = [
         title: 'Saint Vincent and the Grenadines',
         currency: 'XCD',
         path: 'saint-vincent-and-the-grenadines',
-        iso2: 'VC',
-        iso3: 'VCT',
     },
     {
         id: 'VG',
@@ -2320,8 +1864,6 @@ export const countryData: CountryData[] = [
         title: 'British Virgin Islands',
         currency: 'USD',
         path: 'british-virgin-islands',
-        iso2: 'VG',
-        iso3: 'VGB',
     },
     {
         id: 'VI',
@@ -2329,8 +1871,6 @@ export const countryData: CountryData[] = [
         title: 'U.S. Virgin Islands',
         currency: 'USD',
         path: 'us-virgin-islands',
-        iso2: 'VI',
-        iso3: 'VIR',
     },
     {
         id: 'VN',
@@ -2338,8 +1878,6 @@ export const countryData: CountryData[] = [
         title: 'Vietnam',
         currency: 'VND',
         path: 'vietnam',
-        iso2: 'VN',
-        iso3: 'VNM',
     },
     {
         id: 'VU',
@@ -2347,8 +1885,6 @@ export const countryData: CountryData[] = [
         title: 'Vanuatu',
         currency: 'VUV',
         path: 'vanuatu',
-        iso2: 'VU',
-        iso3: 'VUT',
     },
     {
         id: 'WF',
@@ -2356,8 +1892,6 @@ export const countryData: CountryData[] = [
         title: 'Wallis and Futuna',
         currency: 'XPF',
         path: 'wallis-and-futuna',
-        iso2: 'WF',
-        iso3: 'WLF',
     },
     {
         id: 'WS',
@@ -2365,8 +1899,6 @@ export const countryData: CountryData[] = [
         title: 'Samoa',
         currency: 'WST',
         path: 'samoa',
-        iso2: 'WS',
-        iso3: 'WSM',
     },
     {
         id: 'XK',
@@ -2374,8 +1906,6 @@ export const countryData: CountryData[] = [
         title: 'Kosovo',
         currency: 'EUR',
         path: 'kosovo',
-        iso2: 'XK',
-        iso3: 'XKX',
     },
     {
         id: 'YE',
@@ -2383,8 +1913,6 @@ export const countryData: CountryData[] = [
         title: 'Yemen',
         currency: 'YER',
         path: 'yemen',
-        iso2: 'YE',
-        iso3: 'YEM',
     },
     {
         id: 'YT',
@@ -2392,8 +1920,6 @@ export const countryData: CountryData[] = [
         title: 'Mayotte',
         currency: 'EUR',
         path: 'mayotte',
-        iso2: 'YT',
-        iso3: 'MYT',
     },
     {
         id: 'ZA',
@@ -2401,8 +1927,6 @@ export const countryData: CountryData[] = [
         title: 'South Africa',
         currency: 'ZAR',
         path: 'south-africa',
-        iso2: 'ZA',
-        iso3: 'ZAF',
     },
     {
         id: 'ZM',
@@ -2410,8 +1934,6 @@ export const countryData: CountryData[] = [
         title: 'Zambia',
         currency: 'ZMW',
         path: 'zambia',
-        iso2: 'ZM',
-        iso3: 'ZMB',
     },
     {
         id: 'ZW',
@@ -2419,8 +1941,6 @@ export const countryData: CountryData[] = [
         title: 'Zimbabwe',
         currency: 'ZWL',
         path: 'zimbabwe',
-        iso2: 'ZW',
-        iso3: 'ZWE',
     },
 ]
 
diff --git a/src/components/AddWithdraw/AddWithdrawCountriesList.tsx b/src/components/AddWithdraw/AddWithdrawCountriesList.tsx
index 4b2a0ec55..70c6ab5fb 100644
--- a/src/components/AddWithdraw/AddWithdrawCountriesList.tsx
+++ b/src/components/AddWithdraw/AddWithdrawCountriesList.tsx
@@ -15,7 +15,7 @@ import { useEffect, useMemo, useRef, useState } from 'react'
 import { InitiateKYCModal } from '@/components/Kyc'
 import { DynamicBankAccountForm, IBankAccountDetails } from './DynamicBankAccountForm'
 import { addBankAccount, updateUserById } from '@/app/actions/users'
-import { BridgeKycStatus } from '@/utils/bridge-accounts.utils'
+import { KYCStatus } from '@/utils/bridge-accounts.utils'
 import { AddBankAccountPayload } from '@/app/actions/types/users.types'
 import { useWebSocket } from '@/hooks/useWebSocket'
 import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
@@ -24,8 +24,6 @@ import PeanutLoading from '../Global/PeanutLoading'
 import { getCountryCodeForWithdraw } from '@/utils/withdraw.utils'
 import { DeviceType, useDeviceType } from '@/hooks/useGetDeviceType'
 import CryptoMethodDrawer from '../AddMoney/components/CryptoMethodDrawer'
-import { useAppDispatch } from '@/redux/hooks'
-import { bankFormActions } from '@/redux/slices/bank-form-slice'
 
 interface AddWithdrawCountriesListProps {
     flow: 'add' | 'withdraw'
@@ -39,30 +37,27 @@ const AddWithdrawCountriesList = ({ flow }: AddWithdrawCountriesListProps) => {
     const { deviceType } = useDeviceType()
     const { user, fetchUser } = useAuth()
     const { setSelectedBankAccount, amountToWithdraw } = useWithdrawFlow()
-    const dispatch = useAppDispatch()
 
     // component level states
     const [view, setView] = useState<'list' | 'form'>('list')
     const [isKycModalOpen, setIsKycModalOpen] = useState(false)
     const formRef = useRef<{ handleSubmit: () => void }>(null)
-    const [liveKycStatus, setLiveKycStatus] = useState<BridgeKycStatus | undefined>(
-        user?.user?.bridgeKycStatus as BridgeKycStatus
-    )
+    const [liveKycStatus, setLiveKycStatus] = useState<KYCStatus | undefined>(user?.user?.kycStatus as KYCStatus)
     const [isDrawerOpen, setIsDrawerOpen] = useState(false)
 
     useWebSocket({
         username: user?.user.username ?? undefined,
         autoConnect: !!user?.user.username,
         onKycStatusUpdate: (newStatus) => {
-            setLiveKycStatus(newStatus as BridgeKycStatus)
+            setLiveKycStatus(newStatus as KYCStatus)
         },
     })
 
     useEffect(() => {
-        if (user?.user.bridgeKycStatus) {
-            setLiveKycStatus(user.user.bridgeKycStatus as BridgeKycStatus)
+        if (user?.user.kycStatus) {
+            setLiveKycStatus(user.user.kycStatus as KYCStatus)
         }
-    }, [user?.user.bridgeKycStatus])
+    }, [user?.user.kycStatus])
 
     useEffect(() => {
         fetchUser()
@@ -80,7 +75,7 @@ const AddWithdrawCountriesList = ({ flow }: AddWithdrawCountriesListProps) => {
         payload: AddBankAccountPayload,
         rawData: IBankAccountDetails
     ): Promise<{ error?: string }> => {
-        const currentKycStatus = liveKycStatus || user?.user.bridgeKycStatus
+        const currentKycStatus = liveKycStatus || user?.user.kycStatus
         const isUserKycVerified = currentKycStatus === 'approved'
 
         const hasNameOnLoad = !!user?.user.fullName
@@ -96,7 +91,7 @@ const AddWithdrawCountriesList = ({ flow }: AddWithdrawCountriesListProps) => {
                 return { error: result.error }
             }
             if (!result.data) {
-                return { error: 'Failed to process bank account. Please try again or contact support.' }
+                return { error: 'Failed to process bank account. Please try again.' }
             }
 
             // after successfully adding, we refetch user data to get the new account
@@ -230,8 +225,6 @@ const AddWithdrawCountriesList = ({ flow }: AddWithdrawCountriesListProps) => {
                 <NavHeader
                     title={flow === 'withdraw' ? 'Withdraw' : 'Add money'}
                     onPrev={() => {
-                        // clear DynamicBankAccountForm data
-                        dispatch(bankFormActions.clearFormData())
                         // ensure kyc modal isn't open so late success events don't flip view
                         setIsKycModalOpen(false)
                         setView('list')
diff --git a/src/components/AddWithdraw/DynamicBankAccountForm.tsx b/src/components/AddWithdraw/DynamicBankAccountForm.tsx
index 89936dcd6..eb44236b7 100644
--- a/src/components/AddWithdraw/DynamicBankAccountForm.tsx
+++ b/src/components/AddWithdraw/DynamicBankAccountForm.tsx
@@ -1,12 +1,12 @@
 'use client'
-import { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from 'react'
+import { forwardRef, useImperativeHandle, useMemo, useState } from 'react'
 import { useForm, Controller } from 'react-hook-form'
 import { useAuth } from '@/context/authContext'
 import { Button } from '@/components/0_Bruddle/Button'
 import { AddBankAccountPayload, BridgeAccountOwnerType, BridgeAccountType } from '@/app/actions/types/users.types'
 import BaseInput from '@/components/0_Bruddle/BaseInput'
 import { countryCodeMap } from '@/components/AddMoney/consts'
-import { useParams, useRouter } from 'next/navigation'
+import { useParams } from 'next/navigation'
 import { validateIban, validateBic, isValidRoutingNumber } from '@/utils/bridge-accounts.utils'
 import ErrorAlert from '@/components/Global/ErrorAlert'
 import { getBicFromIban } from '@/app/actions/ibanToBic'
@@ -14,10 +14,6 @@ import PeanutActionDetailsCard, { PeanutActionDetailsCardProps } from '../Global
 import { PEANUT_WALLET_TOKEN_SYMBOL } from '@/constants'
 import { useWithdrawFlow } from '@/context/WithdrawFlowContext'
 import { getCountryFromIban, validateMXCLabeAccount, validateUSBankAccount } from '@/utils/withdraw.utils'
-import useSavedAccounts from '@/hooks/useSavedAccounts'
-import { useAppDispatch, useAppSelector } from '@/redux/hooks'
-import { bankFormActions } from '@/redux/slices/bank-form-slice'
-import { useDebounce } from '@/hooks/useDebounce'
 
 const isIBANCountry = (country: string) => {
     return countryCodeMap[country.toUpperCase()] !== undefined
@@ -48,7 +44,6 @@ interface DynamicBankAccountFormProps {
     flow?: 'claim' | 'withdraw'
     actionDetailsProps?: Partial<PeanutActionDetailsCardProps>
     error: string | null
-    hideEmailInput?: boolean
 }
 
 export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, DynamicBankAccountFormProps>(
@@ -61,36 +56,25 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
             actionDetailsProps,
             countryName: countryNameFromProps,
             error,
-            hideEmailInput = false,
         },
         ref
     ) => {
-        const isMx = country.toUpperCase() === 'MX'
-        const isUs = country.toUpperCase() === 'USA'
-        const isIban = isUs || isMx ? false : isIBANCountry(country)
         const { user } = useAuth()
-        const dispatch = useAppDispatch()
         const [isSubmitting, setIsSubmitting] = useState(false)
         const [submissionError, setSubmissionError] = useState<string | null>(null)
+        const [showBicField, setShowBicField] = useState(false)
         const { country: countryNameParams } = useParams()
-        const { amountToWithdraw, setSelectedBankAccount } = useWithdrawFlow()
+        const { amountToWithdraw } = useWithdrawFlow()
         const [firstName, ...lastNameParts] = (user?.user.fullName ?? '').split(' ')
         const lastName = lastNameParts.join(' ')
-        const router = useRouter()
-        const savedAccounts = useSavedAccounts()
-        const [isCheckingBICValid, setisCheckingBICValid] = useState(false)
 
         let selectedCountry = (countryNameFromProps ?? (countryNameParams as string)).toLowerCase()
 
-        // Get persisted form data from Redux
-        const persistedFormData = useAppSelector((state) => state.bankForm.formData)
-
         const {
             control,
             handleSubmit,
             setValue,
             getValues,
-            watch,
             formState: { errors, isValid, isValidating, touchedFields },
         } = useForm<IBankAccountDetails>({
             defaultValues: {
@@ -106,28 +90,15 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                 state: '',
                 postalCode: '',
                 ...initialData,
-                ...persistedFormData, // Redux persisted data takes precedence
             },
             mode: 'onBlur',
             reValidateMode: 'onSubmit',
         })
 
-        // Watch BIC field value for debouncing
-        const bicValue = watch('bic')
-        const debouncedBicValue = useDebounce(bicValue, 500) // 500ms delay
-
         useImperativeHandle(ref, () => ({
             handleSubmit: handleSubmit(onSubmit),
         }))
 
-        // Trigger BIC validation when debounced value changes
-        useEffect(() => {
-            if (isIban && debouncedBicValue && debouncedBicValue.trim().length > 0) {
-                // Trigger validation for the BIC field
-                setValue('bic', debouncedBicValue, { shouldValidate: true })
-            }
-        }, [debouncedBicValue, isIban, setValue])
-
         const onSubmit = async (data: IBankAccountDetails) => {
             // If validation is still running, don't proceed
             if (isValidating) {
@@ -142,17 +113,6 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
 
             setIsSubmitting(true)
             try {
-                const existingAccount = savedAccounts.find(
-                    (account) => account.identifier === (data.accountNumber.toLowerCase() || data.clabe.toLowerCase())
-                )
-
-                // Skip adding account if the account already exists for the logged in user
-                if (existingAccount) {
-                    setSelectedBankAccount(existingAccount)
-                    router.push(`/withdraw/${country}/bank`)
-                    return
-                }
-
                 const isUs = country.toUpperCase() === 'USA'
                 const isMx = country.toUpperCase() === 'MX'
                 const isIban = isUs || isMx ? false : isIBANCountry(country)
@@ -169,6 +129,35 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                 let bic = data.bic || getValues('bic')
                 const iban = data.iban || getValues('iban')
 
+                // for IBAN countries, ensure BIC is available
+                if (isIban) {
+                    // if BIC field is shown but empty, don't proceed
+                    if (showBicField && !bic) {
+                        setSubmissionError('BIC is required')
+                        return
+                    }
+
+                    // if BIC field is not shown and no BIC available, try to get it automatically
+                    if (!showBicField && !bic) {
+                        try {
+                            const autoBic = await getBicFromIban(accountNumber)
+                            if (autoBic) {
+                                bic = autoBic
+                                // set the BIC value in the form without showing the field
+                                setValue('bic', autoBic, { shouldValidate: false })
+                            } else {
+                                setShowBicField(true)
+                                setSubmissionError('BIC is required')
+                                return
+                            }
+                        } catch (error) {
+                            setShowBicField(true)
+                            setSubmissionError('BIC is required')
+                            return
+                        }
+                    }
+                }
+
                 const payload: Partial<AddBankAccountPayload> = {
                     accountType,
                     accountNumber: accountNumber.replace(/\s/g, ''),
@@ -205,17 +194,6 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                 })
                 if (result.error) {
                     setSubmissionError(result.error)
-                    setIsSubmitting(false)
-                } else {
-                    // Save form data to Redux after successful submission
-                    const formDataToSave = {
-                        ...data,
-                        country,
-                        firstName: data.firstName.trim(),
-                        lastName: data.lastName.trim(),
-                    }
-                    dispatch(bankFormActions.setFormData(formDataToSave))
-                    setIsSubmitting(false)
                 }
             } catch (error: any) {
                 setSubmissionError(error.message)
@@ -224,6 +202,10 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
             }
         }
 
+        const isMx = country.toUpperCase() === 'MX'
+        const isUs = country.toUpperCase() === 'USA'
+        const isIban = isUs || isMx ? false : isIBANCountry(country)
+
         const renderInput = (
             name: keyof IBankAccountDetails,
             placeholder: string,
@@ -306,7 +288,6 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                         {flow === 'claim' &&
                             user?.user.userId &&
                             !user.user.email &&
-                            !hideEmailInput &&
                             renderInput('email', 'E-mail', {
                                 required: 'Email is required',
                             })}
@@ -317,7 +298,6 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                             </div>
                         )}
                         {flow !== 'claim' &&
-                            !hideEmailInput &&
                             !user?.user?.email &&
                             renderInput('email', 'E-mail', {
                                 required: 'Email is required',
@@ -352,17 +332,6 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                                     undefined,
                                     async (field) => {
                                         if (!field.value || field.value.trim().length === 0) return
-                                        const isValidIban = await validateIban(field.value)
-                                        if (isValidIban) {
-                                            try {
-                                                const autoBic = await getBicFromIban(field.value)
-                                                if (autoBic && !getValues('bic')) {
-                                                    setValue('bic', autoBic, { shouldValidate: true })
-                                                }
-                                            } catch {
-                                                console.log('Could not fetch BIC automatically.')
-                                            }
-                                        }
                                     }
                                 )
                               : renderInput(
@@ -377,6 +346,7 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                                 )}
 
                         {isIban &&
+                            showBicField &&
                             renderInput(
                                 'bic',
                                 'BIC',
@@ -384,15 +354,7 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                                     required: 'BIC is required',
                                     validate: async (value: string) => {
                                         if (!value || value.trim().length === 0) return 'BIC is required'
-
-                                        // Only validate if the value matches the debounced value (to prevent API calls on every keystroke)
-                                        if (value.trim() !== debouncedBicValue?.trim()) {
-                                            return true // Skip validation until debounced value is ready
-                                        }
-
-                                        setisCheckingBICValid(true)
                                         const isValid = await validateBic(value.trim())
-                                        setisCheckingBICValid(false)
                                         return isValid || 'Invalid BIC code'
                                     },
                                 },
@@ -433,8 +395,8 @@ export const DynamicBankAccountForm = forwardRef<{ handleSubmit: () => void }, D
                             variant="purple"
                             shadowSize="4"
                             className="!mt-4 w-full"
-                            loading={isSubmitting || isCheckingBICValid}
-                            disabled={isSubmitting || !isValid || isCheckingBICValid}
+                            loading={isSubmitting}
+                            disabled={isSubmitting || !isValid}
                         >
                             Review
                         </Button>
diff --git a/src/components/Claim/Claim.tsx b/src/components/Claim/Claim.tsx
index 1e4bbb46a..99bf282ca 100644
--- a/src/components/Claim/Claim.tsx
+++ b/src/components/Claim/Claim.tsx
@@ -25,10 +25,6 @@ import * as _consts from './Claim.consts'
 import FlowManager from './Link/FlowManager'
 import { type PeanutCrossChainRoute } from '@/services/swap'
 import { NotFoundClaimLink, WrongPasswordClaimLink, ClaimedView } from './Generic'
-import SupportCTA from '../Global/SupportCTA'
-import { twMerge } from 'tailwind-merge'
-import { ClaimBankFlowStep, useClaimBankFlow } from '@/context/ClaimBankFlowContext'
-import { useSearchParams } from 'next/navigation'
 
 export const Claim = ({}) => {
     const [step, setStep] = useState<_consts.IClaimScreenState>(_consts.INIT_VIEW_STATE)
@@ -70,9 +66,6 @@ export const Claim = ({}) => {
     const senderId = claimLinkData?.sender.userId
     const { interactions } = useUserInteractions(senderId ? [senderId] : [])
 
-    const { setFlowStep: setClaimBankFlowStep } = useClaimBankFlow()
-    const searchParams = useSearchParams()
-
     const transactionForDrawer: TransactionDetails | null = useMemo(() => {
         if (!claimLinkData) return null
 
@@ -129,7 +122,7 @@ export const Claim = ({}) => {
             peanutFeeDetails: {
                 amountDisplay: '$ 0.00',
             },
-            isVerified: claimLinkData.sender?.bridgeKycStatus === 'approved',
+            isVerified: claimLinkData.sender?.kycStatus === 'approved',
             haveSentMoneyToUser: claimLinkData.sender?.userId
                 ? interactions[claimLinkData.sender.userId] || false
                 : false,
@@ -261,19 +254,8 @@ export const Claim = ({}) => {
         }
     }, [linkState, transactionForDrawer])
 
-    // redirect to bank flow if user is KYC approved and step is bank
-    useEffect(() => {
-        const stepFromURL = searchParams.get('step')
-        if (user?.user.bridgeKycStatus === 'approved' && stepFromURL === 'bank') {
-            setClaimBankFlowStep(ClaimBankFlowStep.BankCountryList)
-        }
-    }, [user])
-
     return (
-        <PageContainer
-            alignItems="center"
-            className={twMerge('flex flex-col', !user && !isFetchingUser && 'min-h-[calc(100dvh-110px)]')}
-        >
+        <PageContainer alignItems="center">
             {linkState === _consts.claimLinkStateType.LOADING && <PeanutLoading />}
             {linkState === _consts.claimLinkStateType.CLAIM && (
                 <FlowManager
@@ -332,9 +314,6 @@ export const Claim = ({}) => {
                     onClose={() => checkLink(window.location.href)}
                 />
             )}
-
-            {/* Show only to guest users */}
-            {linkState !== _consts.claimLinkStateType.LOADING && !user && !isFetchingUser && <SupportCTA />}
         </PageContainer>
     )
 }
diff --git a/src/components/Claim/Link/Initial.view.tsx b/src/components/Claim/Link/Initial.view.tsx
index b3a5543b7..782352be4 100644
--- a/src/components/Claim/Link/Initial.view.tsx
+++ b/src/components/Claim/Link/Initial.view.tsx
@@ -11,7 +11,13 @@ import {
     usdcAddressOptimism,
 } from '@/components/Offramp/Offramp.consts'
 import { ActionType, estimatePoints } from '@/components/utils/utils'
-import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN, ROUTE_NOT_FOUND_ERROR } from '@/constants'
+import {
+    PEANUT_WALLET_CHAIN,
+    PEANUT_WALLET_TOKEN,
+    PINTA_WALLET_CHAIN,
+    PINTA_WALLET_TOKEN,
+    ROUTE_NOT_FOUND_ERROR,
+} from '@/constants'
 import { TRANSACTIONS } from '@/constants/query.consts'
 import { loadingStateContext, tokenSelectorContext } from '@/context'
 import { useAuth } from '@/context/authContext'
@@ -97,7 +103,7 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
         isXChain,
         setIsXChain,
     } = useContext(tokenSelectorContext)
-    const { claimLink, claimLinkXchain, removeParamStep } = useClaimLink()
+    const { claimLink, claimLinkXchain } = useClaimLink()
     const { isConnected: isPeanutWallet, address, fetchBalance } = useWallet()
     const router = useRouter()
     const { user } = useAuth()
@@ -120,8 +126,16 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
         }
     }, [claimLinkData, isPeanutWallet])
 
+    const isPeanutClaimOnlyMode = useMemo(() => {
+        return searchParams.get('t') === 'pnt'
+    }, [searchParams])
+
     const isPeanutChain = useMemo(() => {
-        return claimLinkData.chainId === PEANUT_WALLET_CHAIN.id.toString()
+        return (
+            claimLinkData.chainId === PEANUT_WALLET_CHAIN.id.toString() ||
+            (areEvmAddressesEqual(claimLinkData.tokenAddress, PINTA_WALLET_TOKEN) &&
+                claimLinkData.chainId === PINTA_WALLET_CHAIN.id.toString())
+        )
     }, [claimLinkData])
 
     // set token selector chain/token to peanut wallet chain/token if recipient type is username
@@ -143,7 +157,7 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
     }, [recipientType, claimLinkData.chainId, isPeanutChain, claimLinkData.tokenAddress])
 
     const handleClaimLink = useCallback(
-        async (bypassModal = false, autoClaim = false) => {
+        async (bypassModal = false) => {
             if (!isPeanutWallet && !bypassModal) {
                 setShowConfirmationModal(true)
                 return
@@ -161,11 +175,8 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
             try {
                 setLoadingState('Executing transaction')
                 if (isPeanutWallet) {
-                    if (autoClaim) {
-                        await sendLinksApi.autoClaimLink(user?.user.username ?? address, claimLinkData.link)
-                    } else {
-                        await sendLinksApi.claim(user?.user.username ?? address, claimLinkData.link)
-                    }
+                    await sendLinksApi.claim(user?.user.username ?? address, claimLinkData.link)
+
                     setClaimType('claim')
                     onCustom('SUCCESS')
                     fetchBalance()
@@ -318,7 +329,7 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
                     recipient: recipient.name ?? recipient.address,
                     password: '',
                 })
-                if (user?.user.bridgeKycStatus === 'approved') {
+                if (user?.user.kycStatus === 'approved') {
                     const account = user.accounts.find(
                         (account) =>
                             account.identifier.replaceAll(/\s/g, '').toLowerCase() ===
@@ -388,11 +399,10 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
         }
     }, [selectedChainID, selectedTokenAddress, claimLinkData.chainId, claimLinkData.tokenAddress])
 
-    // We may need this when we re add rewards via specific tokens
-    // If not, feel free to remove
     const isReward = useMemo(() => {
-        return false
-    }, [])
+        if (!claimLinkData.tokenAddress) return false
+        return areEvmAddressesEqual(claimLinkData.tokenAddress, PINTA_WALLET_TOKEN)
+    }, [claimLinkData.tokenAddress])
 
     const fetchRoute = useCallback(
         async (toToken?: string, toChain?: string) => {
@@ -613,14 +623,6 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
         }
     }
 
-    useEffect(() => {
-        const stepFromURL = searchParams.get('step')
-        if (user && claimLinkData.status !== 'CLAIMED' && stepFromURL === 'claim' && isPeanutWallet) {
-            removeParamStep()
-            handleClaimLink(false, true)
-        }
-    }, [user, searchParams, isPeanutWallet])
-
     if (claimBankFlowStep) {
         return <BankFlowManager {...props} />
     }
@@ -668,6 +670,7 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
                  */}
                 {recipientType !== 'iban' &&
                     recipientType !== 'us' &&
+                    !isPeanutClaimOnlyMode &&
                     claimBankFlowStep !== ClaimBankFlowStep.BankCountryList &&
                     !!claimToExternalWallet && (
                         <TokenSelector viewType="claim" disabled={recipientType === 'username'} />
@@ -675,29 +678,33 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
 
                 <div className="space-y-2">
                     {/* Alternative options section with divider */}
-                    {/* Manual Input Section - Always visible in non-peanut-only mode */}
-                    {!!claimToExternalWallet && (
-                        <GeneralRecipientInput
-                            placeholder="Enter a username, an address or ENS"
-                            recipient={recipient}
-                            onUpdate={(update: GeneralRecipientUpdate) => {
-                                setRecipient(update.recipient)
-                                if (!update.recipient.address) {
-                                    setRecipientType('address')
-                                    // Reset loading state when input is cleared
-                                    setLoadingState('Idle')
-                                } else {
-                                    setRecipientType(update.type)
-                                }
-                                setIsValidRecipient(update.isValid)
-                                setErrorState({
-                                    showError: !update.isValid,
-                                    errorMessage: update.errorMessage,
-                                })
-                                setInputChanging(update.isChanging)
-                            }}
-                            showInfoText={false}
-                        />
+                    {!isPeanutClaimOnlyMode && (
+                        <>
+                            {/* Manual Input Section - Always visible in non-peanut-only mode */}
+                            {!!claimToExternalWallet && (
+                                <GeneralRecipientInput
+                                    placeholder="Enter a username, an address or ENS"
+                                    recipient={recipient}
+                                    onUpdate={(update: GeneralRecipientUpdate) => {
+                                        setRecipient(update.recipient)
+                                        if (!update.recipient.address) {
+                                            setRecipientType('address')
+                                            // Reset loading state when input is cleared
+                                            setLoadingState('Idle')
+                                        } else {
+                                            setRecipientType(update.type)
+                                        }
+                                        setIsValidRecipient(update.isValid)
+                                        setErrorState({
+                                            showError: !update.isValid,
+                                            errorMessage: update.errorMessage,
+                                        })
+                                        setInputChanging(update.isChanging)
+                                    }}
+                                    showInfoText={false}
+                                />
+                            )}
+                        </>
                     )}
                     {recipientType === 'username' && !!claimToExternalWallet && (
                         <div className="text-xs text-grey-1">
@@ -725,7 +732,7 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
                             {getButtonText()}
                         </Button>
                     )}
-                    {!claimToExternalWallet && (
+                    {!isPeanutClaimOnlyMode && !claimToExternalWallet && (
                         <ActionList flow="claim" claimLinkData={claimLinkData} isLoggedIn={!!user?.user.userId} />
                     )}
                 </div>
@@ -773,13 +780,9 @@ export const InitialClaimLinkView = (props: IClaimScreenProps) => {
                 modalPanelClassName="max-w-md mx-8"
             />
             <GuestVerificationModal
-                redirectToVerification
                 secondaryCtaLabel="Claim with other method"
-                isOpen={showVerificationModal}
-                onClose={() => {
-                    removeParamStep()
-                    setShowVerificationModal(false)
-                }}
+                isOpen={showVerificationModal && !user}
+                onClose={() => setShowVerificationModal(false)}
                 description="The sender isn't verified, so please create an account and verify your identity to have the funds deposited to your bank."
             />
         </div>
diff --git a/src/components/Claim/Link/Onchain/Confirm.view.tsx b/src/components/Claim/Link/Onchain/Confirm.view.tsx
index 60bb0c161..7a572f307 100644
--- a/src/components/Claim/Link/Onchain/Confirm.view.tsx
+++ b/src/components/Claim/Link/Onchain/Confirm.view.tsx
@@ -23,6 +23,7 @@ import { useContext, useState, useMemo } from 'react'
 import { formatUnits } from 'viem'
 import * as _consts from '../../Claim.consts'
 import useClaimLink from '../../useClaimLink'
+import { PINTA_WALLET_TOKEN } from '@/constants'
 import { useAuth } from '@/context/authContext'
 import { sendLinksApi } from '@/services/sendLinks'
 
@@ -48,11 +49,10 @@ export const ConfirmClaimLinkView = ({
         errorMessage: string
     }>({ showError: false, errorMessage: '' })
 
-    // We may need this when we re add rewards via specific tokens
-    // If not, feel free to remove
     const isReward = useMemo(() => {
-        return false
-    }, [])
+        if (!claimLinkData.tokenAddress) return false
+        return areEvmAddressesEqual(claimLinkData.tokenAddress, PINTA_WALLET_TOKEN)
+    }, [claimLinkData.tokenAddress])
 
     // Determine which chain/token details to show – prefer the selectedRoute details if present,
     // otherwise fall back to what the user picked in the token selector.
diff --git a/src/components/Claim/Link/Onchain/Success.view.tsx b/src/components/Claim/Link/Onchain/Success.view.tsx
index 63cfa3e51..19447b4fd 100644
--- a/src/components/Claim/Link/Onchain/Success.view.tsx
+++ b/src/components/Claim/Link/Onchain/Success.view.tsx
@@ -14,9 +14,6 @@ import { useEffect, useMemo } from 'react'
 import type { Hash } from 'viem'
 import { formatUnits } from 'viem'
 import * as _consts from '../../Claim.consts'
-import Image from 'next/image'
-import { PEANUT_LOGO_BLACK, PEANUTMAN_LOGO } from '@/assets'
-import CreateAccountButton from '@/components/Global/CreateAccountButton'
 
 export const SuccessClaimLinkView = ({
     transactionHash,
@@ -132,7 +129,11 @@ export const SuccessClaimLinkView = ({
                 </Button>
             )
         }
-        return <CreateAccountButton onClick={() => router.push('/setup')} />
+        return (
+            <Button icon="user-plus" onClick={() => router.push('/setup')} shadowSize="4">
+                Create Account
+            </Button>
+        )
     }
 
     return (
diff --git a/src/components/Claim/Link/views/BankFlowManager.view.tsx b/src/components/Claim/Link/views/BankFlowManager.view.tsx
index a7adde123..52458af8c 100644
--- a/src/components/Claim/Link/views/BankFlowManager.view.tsx
+++ b/src/components/Claim/Link/views/BankFlowManager.view.tsx
@@ -26,10 +26,8 @@ import { CountryListRouter } from '@/components/Common/CountryListRouter'
 import NavHeader from '@/components/Global/NavHeader'
 import { InitiateKYCModal } from '@/components/Kyc'
 import { useWebSocket } from '@/hooks/useWebSocket'
-import { BridgeKycStatus } from '@/utils/bridge-accounts.utils'
+import { KYCStatus } from '@/utils/bridge-accounts.utils'
 import { getCountryCodeForWithdraw } from '@/utils/withdraw.utils'
-import { useAppDispatch } from '@/redux/hooks'
-import { bankFormActions } from '@/redux/slices/bank-form-slice'
 import { sendLinksApi } from '@/services/sendLinks'
 
 type BankAccountWithId = IBankAccountDetails &
@@ -68,16 +66,13 @@ export const BankFlowManager = (props: IClaimScreenProps) => {
     const savedAccounts = useSavedAccounts()
     const { isLoading, setLoadingState } = useContext(loadingStateContext)
     const { claimLink } = useClaimLink()
-    const dispatch = useAppDispatch()
 
     // local states for this component
     const [localBankDetails, setLocalBankDetails] = useState<BankAccountWithId | null>(null)
     const [receiverFullName, setReceiverFullName] = useState<string>('')
     const [error, setError] = useState<string | null>(null)
     const formRef = useRef<{ handleSubmit: () => void }>(null)
-    const [liveKycStatus, setLiveKycStatus] = useState<BridgeKycStatus | undefined>(
-        user?.user?.bridgeKycStatus as BridgeKycStatus
-    )
+    const [liveKycStatus, setLiveKycStatus] = useState<KYCStatus | undefined>(user?.user?.kycStatus as KYCStatus)
     const [isProcessingKycSuccess, setIsProcessingKycSuccess] = useState(false)
     const [offrampData, setOfframpData] = useState<TCreateOfframpResponse | null>(null)
 
@@ -86,16 +81,16 @@ export const BankFlowManager = (props: IClaimScreenProps) => {
         username: user?.user.username ?? undefined,
         autoConnect: !!user?.user.username,
         onKycStatusUpdate: (newStatus) => {
-            setLiveKycStatus(newStatus as BridgeKycStatus)
+            setLiveKycStatus(newStatus as KYCStatus)
         },
     })
 
     // effect to update live KYC status from user object
     useEffect(() => {
-        if (user?.user.bridgeKycStatus) {
-            setLiveKycStatus(user.user.bridgeKycStatus as BridgeKycStatus)
+        if (user?.user.kycStatus) {
+            setLiveKycStatus(user.user.kycStatus as KYCStatus)
         }
-    }, [user?.user.bridgeKycStatus])
+    }, [user?.user.kycStatus])
 
     /**
      * @name handleConfirmClaim
@@ -156,7 +151,7 @@ export const BankFlowManager = (props: IClaimScreenProps) => {
             }
 
             // handle error if user is not KYC approved
-            if (userForOfframp.bridgeKycStatus !== 'approved') throw new Error('User not KYC approved')
+            if (userForOfframp.kycStatus !== 'approved') throw new Error('User not KYC approved')
             if (!userForOfframp?.bridgeCustomerId) throw new Error('User bridge customer ID not found')
 
             // get payment rail and currency for the offramp
@@ -457,12 +452,11 @@ export const BankFlowManager = (props: IClaimScreenProps) => {
                     <div>
                         <NavHeader
                             title="Receive"
-                            onPrev={() => {
-                                dispatch(bankFormActions.clearFormData()) // clear DynamicBankAccountForm data
+                            onPrev={() =>
                                 savedAccounts.length > 0
                                     ? setClaimBankFlowStep(ClaimBankFlowStep.SavedAccountsList)
                                     : setClaimBankFlowStep(ClaimBankFlowStep.BankCountryList)
-                            }}
+                            }
                         />
                     </div>
                     <DynamicBankAccountForm
@@ -472,7 +466,6 @@ export const BankFlowManager = (props: IClaimScreenProps) => {
                         countryName={selectedCountry?.title ?? ''}
                         onSuccess={handleSuccess}
                         flow={'claim'}
-                        hideEmailInput={bankClaimType === BankClaimType.GuestBankClaim}
                         actionDetailsProps={{
                             transactionType: 'CLAIM_LINK_BANK_ACCOUNT',
                             recipientType: 'BANK_ACCOUNT',
diff --git a/src/components/Claim/Link/views/Confirm.bank-claim.view.tsx b/src/components/Claim/Link/views/Confirm.bank-claim.view.tsx
index e0df2d795..9c7fddeac 100644
--- a/src/components/Claim/Link/views/Confirm.bank-claim.view.tsx
+++ b/src/components/Claim/Link/views/Confirm.bank-claim.view.tsx
@@ -13,7 +13,8 @@ import { ClaimLinkData } from '@/services/sendLinks'
 import { formatUnits } from 'viem'
 import ExchangeRate from '@/components/ExchangeRate'
 import { AccountType } from '@/interfaces'
-import countryCurrencyMappings from '@/constants/countryCurrencyMapping'
+import { useCurrency } from '@/hooks/useCurrency'
+import { getCurrencySymbol } from '@/utils/bridge.utils'
 
 interface ConfirmBankClaimViewProps {
     onConfirm: () => void
@@ -59,9 +60,36 @@ export function ConfirmBankClaimView({
         [claimLinkData]
     )
 
-    const nonEuroCurrency = countryCurrencyMappings.find(
-        (currency) => countryCodeForFlag.toLowerCase() === currency.flagCode.toLowerCase()
-    )?.currencyCode
+    // determine display currency based on account type
+    const currencyCode = useMemo(() => {
+        if (accountType === AccountType.CLABE) return 'MXN'
+        if (accountType === AccountType.US) return 'USD'
+        return 'EUR'
+    }, [accountType])
+
+    // fetch exchange rate and symbol (USD -> local currency)
+    const { symbol: resolvedSymbol, price, isLoading: isLoadingCurrency } = useCurrency(currencyCode)
+
+    // fallback if conversion fails
+    const failedConversion = useMemo(() => {
+        return currencyCode !== 'USD' && !isLoadingCurrency && (!price || isNaN(price))
+    }, [currencyCode, isLoadingCurrency, price])
+
+    // display amount in local currency
+    const displayAmount = useMemo(() => {
+        if (currencyCode === 'USD') return usdAmount
+        if (isLoadingCurrency) return '-'
+        if (!price || isNaN(price)) return usdAmount
+        const converted = (Number(usdAmount) * price).toFixed(2)
+        return converted
+    }, [price, usdAmount, currencyCode, isLoadingCurrency])
+
+    const displaySymbol = useMemo(() => {
+        if (currencyCode === 'USD') return '$'
+        // fallback to $ if conversion fails
+        if (failedConversion) return '$'
+        return resolvedSymbol ?? getCurrencySymbol(currencyCode)
+    }, [currencyCode, resolvedSymbol, failedConversion])
 
     return (
         <div className="flex min-h-[inherit] flex-col justify-between gap-8 md:min-h-fit">
@@ -75,8 +103,10 @@ export function ConfirmBankClaimView({
                     transactionType="CLAIM_LINK_BANK_ACCOUNT"
                     recipientType="BANK_ACCOUNT"
                     recipientName={bankDetails.country}
-                    amount={usdAmount}
+                    amount={displayAmount}
                     tokenSymbol={claimLinkData.tokenSymbol}
+                    currencySymbol={displaySymbol}
+                    isLoading={isLoadingCurrency}
                 />
 
                 <Card className="rounded-sm">
@@ -91,7 +121,7 @@ export function ConfirmBankClaimView({
                     {bankDetails.routingNumber && (
                         <PaymentInfoRow label="Routing Number" value={bankDetails.routingNumber.toUpperCase()} />
                     )}
-                    <ExchangeRate accountType={accountType} nonEuroCurrency={nonEuroCurrency} />
+                    <ExchangeRate accountType={accountType} />
                     <PaymentInfoRow hideBottomBorder label="Fee" value={`$ 0.00`} />
                 </Card>
 
diff --git a/src/components/Claim/useClaimLink.tsx b/src/components/Claim/useClaimLink.tsx
index 4aeaf9b6c..d1d0197ce 100644
--- a/src/components/Claim/useClaimLink.tsx
+++ b/src/components/Claim/useClaimLink.tsx
@@ -11,14 +11,11 @@ import { useWallet } from '@/hooks/wallet/useWallet'
 import { isTestnetChain } from '@/utils'
 import * as Sentry from '@sentry/nextjs'
 import { useAccount } from 'wagmi'
-import { usePathname, useSearchParams } from 'next/navigation'
 
 const useClaimLink = () => {
     const { fetchBalance } = useWallet()
     const { chain: currentChain } = useAccount()
     const { switchChainAsync } = useSwitchChain()
-    const pathname = usePathname()
-    const searchParams = useSearchParams()
 
     const { setLoadingState } = useContext(loadingStateContext)
 
@@ -96,29 +93,10 @@ const useClaimLink = () => {
         }
     }
 
-    const addParamStep = (step: 'bank' | 'claim') => {
-        const params = new URLSearchParams(searchParams)
-        params.set('step', step)
-
-        const hash = window.location.hash
-        const newUrl = `${pathname}?${params.toString()}${hash}`
-        window.history.replaceState(null, '', newUrl)
-    }
-
-    const removeParamStep = () => {
-        const params = new URLSearchParams(searchParams)
-        params.delete('step')
-        const queryString = params.toString()
-        const newUrl = `${pathname}${queryString ? `?${queryString}` : ''}${window.location.hash}`
-        window.history.replaceState(null, '', newUrl)
-    }
-
     return {
         claimLink,
         claimLinkXchain,
         switchNetwork,
-        addParamStep,
-        removeParamStep,
     }
 }
 
diff --git a/src/components/Common/ActionList.tsx b/src/components/Common/ActionList.tsx
index 0233f0bf0..da6cf66a1 100644
--- a/src/components/Common/ActionList.tsx
+++ b/src/components/Common/ActionList.tsx
@@ -12,6 +12,7 @@ import Divider from '../0_Bruddle/Divider'
 import { Button } from '../0_Bruddle'
 import { PEANUT_LOGO_BLACK } from '@/assets/illustrations'
 import Image from 'next/image'
+import { saveRedirectUrl } from '@/utils'
 import { useRouter } from 'next/navigation'
 import { PEANUTMAN_LOGO } from '@/assets/peanut'
 import { BankClaimType, useDetermineBankClaimType } from '@/hooks/useDetermineBankClaimType'
@@ -23,7 +24,6 @@ import { BankRequestType, useDetermineBankRequestType } from '@/hooks/useDetermi
 import { GuestVerificationModal } from '../Global/GuestVerificationModal'
 import ActionListDaimoPayButton from './ActionListDaimoPayButton'
 import { ACTION_METHODS, PaymentMethod } from '@/constants/actionlist.consts'
-import useClaimLink from '../Claim/useClaimLink'
 
 interface IActionListProps {
     flow: 'claim' | 'request'
@@ -50,7 +50,6 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
     const { requestType } = useDetermineBankRequestType(requesterUserId)
     const savedAccounts = useSavedAccounts()
     const { usdAmount } = usePaymentStore()
-    const { addParamStep } = useClaimLink()
     const {
         setShowRequestFulfilmentBankFlowManager,
         setShowExternalWalletFulfilMethods,
@@ -61,7 +60,7 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
     const handleMethodClick = async (method: PaymentMethod) => {
         if (flow === 'claim' && claimLinkData) {
             const amountInUsd = parseFloat(formatUnits(claimLinkData.amount, claimLinkData.tokenDecimals))
-            if (method.id === 'bank' && amountInUsd < 5) {
+            if (method.id === 'bank' && amountInUsd < 2) {
                 setShowMinAmountError(true)
                 return
             }
@@ -69,7 +68,6 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
                 case 'bank':
                     {
                         if (claimType === BankClaimType.GuestKycNeeded) {
-                            addParamStep('bank')
                             setShowVerificationModal(true)
                         } else {
                             if (savedAccounts.length) {
@@ -95,7 +93,6 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
             switch (method.id) {
                 case 'bank':
                     if (requestType === BankRequestType.GuestKycNeeded) {
-                        addParamStep('bank')
                         setIsGuestVerificationModalOpen(true)
                     } else {
                         setShowRequestFulfilmentBankFlowManager(true)
@@ -139,7 +136,7 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
                 <Button
                     shadowSize="4"
                     onClick={() => {
-                        addParamStep('claim')
+                        saveRedirectUrl()
                         // push to setup page with redirect uri, to prevent the user from losing the flow context
                         const redirectUri = encodeURIComponent(
                             window.location.pathname + window.location.search + window.location.hash
@@ -176,7 +173,7 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
                 visible={showMinAmountError}
                 onClose={() => setShowMinAmountError(false)}
                 title="Minimum Amount "
-                description={'The minimum amount for a bank transaction is $5. Please try a different method.'}
+                description={'The minimum amount for a bank transaction is $2. Please try a different method.'}
                 icon="alert"
                 ctas={[{ text: 'Close', shadowSize: '4', onClick: () => setShowMinAmountError(false) }]}
                 iconContainerClassName="bg-yellow-400"
@@ -188,7 +185,6 @@ export default function ActionList({ claimLinkData, isLoggedIn, flow, requestLin
                 isOpen={isGuestVerificationModalOpen}
                 onClose={() => setIsGuestVerificationModalOpen(false)}
                 description="To fulfill this request using bank account, please create an account and verify your identity."
-                redirectToVerification
             />
         </div>
     )
diff --git a/src/components/Common/ActionListDaimoPayButton.tsx b/src/components/Common/ActionListDaimoPayButton.tsx
index 0b0b7d9a4..aec0a7ea2 100644
--- a/src/components/Common/ActionListDaimoPayButton.tsx
+++ b/src/components/Common/ActionListDaimoPayButton.tsx
@@ -34,7 +34,7 @@ const ActionListDaimoPayButton = () => {
 
         if (!parsedPaymentData) {
             console.error('Invalid payment data')
-            dispatch(paymentActions.setError('Something went wrong. Please try again or contact support.'))
+            dispatch(paymentActions.setError('Something went wrong. Please try again.'))
             return false
         }
 
@@ -45,6 +45,7 @@ const ActionListDaimoPayButton = () => {
         const payload: InitiatePaymentPayload = {
             recipient: parsedPaymentData?.recipient,
             tokenAmount,
+            isPintaReq: false, // explicitly set to false for non-PINTA requests
             requestId: requestId ?? undefined,
             chargeId: chargeDetails?.uuid,
             currency: currencyCode
@@ -68,12 +69,12 @@ const ActionListDaimoPayButton = () => {
             console.log('Charge created!!')
             return true
         } else if (result.status === 'Error') {
-            dispatch(paymentActions.setError('Something went wrong. Please try again or contact support.'))
+            dispatch(paymentActions.setError('Something went wrong. Please try again.'))
             console.error('Payment initiation failed:', result)
             return false
         } else {
             console.warn('Unexpected status from usePaymentInitiator:', result.status)
-            dispatch(paymentActions.setError('Something went wrong. Please try again or contact support.'))
+            dispatch(paymentActions.setError('Something went wrong. Please try again.'))
             return false
         }
     }, [
diff --git a/src/components/Common/SavedAccountsView.tsx b/src/components/Common/SavedAccountsView.tsx
index 876172ada..fca18a728 100644
--- a/src/components/Common/SavedAccountsView.tsx
+++ b/src/components/Common/SavedAccountsView.tsx
@@ -83,7 +83,7 @@ export function SavedAccountsMapping({
                     countryInfo = ALL_METHODS_DATA.find((c) => c.id === 'US')
                 } else {
                     countryInfo = details.countryName
-                        ? ALL_METHODS_DATA.find((c) => c.path.toLowerCase() === details.countryName?.toLowerCase())
+                        ? ALL_METHODS_DATA.find((c) => c.title.toLowerCase() === details.countryName?.toLowerCase())
                         : ALL_METHODS_DATA.find((c) => c.id === threeLetterCountryCode)
                 }
 
diff --git a/src/components/CrispChat.tsx b/src/components/CrispChat.tsx
index 529de6c59..05f55d660 100644
--- a/src/components/CrispChat.tsx
+++ b/src/components/CrispChat.tsx
@@ -1,13 +1,13 @@
 'use client'
 
 import Script from 'next/script'
-import { useSupportModalContext } from '@/context/SupportModalContext'
+import { useRouter } from 'next/navigation'
 
 export const CrispButton = ({ children, ...rest }: React.HTMLAttributes<HTMLButtonElement>) => {
-    const { setIsSupportModalOpen } = useSupportModalContext()
+    const router = useRouter()
 
     const handleClick = () => {
-        setIsSupportModalOpen(true)
+        router.push('/support')
     }
 
     return (
diff --git a/src/components/ExchangeRate/index.tsx b/src/components/ExchangeRate/index.tsx
index 761cc5c6a..6dc578008 100644
--- a/src/components/ExchangeRate/index.tsx
+++ b/src/components/ExchangeRate/index.tsx
@@ -1,21 +1,9 @@
 import { AccountType } from '@/interfaces'
 import { PaymentInfoRow } from '@/components/Payment/PaymentInfoRow'
 import useGetExchangeRate, { IExchangeRate } from '@/hooks/useGetExchangeRate'
-import { useExchangeRate } from '@/hooks/useExchangeRate'
 
-interface IExchangeRateProps extends Omit<IExchangeRate, 'enabled'> {
-    nonEuroCurrency?: string
-    sourceCurrency?: string
-}
-
-const ExchangeRate = ({ accountType, nonEuroCurrency, sourceCurrency = 'USD' }: IExchangeRateProps) => {
-    const { exchangeRate, isFetchingRate } = useGetExchangeRate({ accountType, enabled: !nonEuroCurrency })
-    const { exchangeRate: nonEruoExchangeRate, isLoading } = useExchangeRate({
-        sourceCurrency,
-        destinationCurrency: nonEuroCurrency || 'EUR',
-        initialSourceAmount: 1,
-        enabled: !!nonEuroCurrency,
-    })
+const ExchangeRate = ({ accountType }: IExchangeRate) => {
+    const { exchangeRate, isFetchingRate } = useGetExchangeRate({ accountType })
 
     const toCurrency = accountType === AccountType.IBAN ? 'EUR' : accountType === AccountType.CLABE ? 'MXN' : 'USD'
 
@@ -23,28 +11,13 @@ const ExchangeRate = ({ accountType, nonEuroCurrency, sourceCurrency = 'USD' }:
         return <PaymentInfoRow loading={isFetchingRate} label="Exchange Rate" value={`1 USD`} />
     }
 
-    let displayValue = '-'
-    let isLoadingRate = false
-    let moreInfoText = ''
-
-    if (nonEuroCurrency) {
-        displayValue = nonEruoExchangeRate
-            ? `1 ${sourceCurrency} = ${parseFloat(nonEruoExchangeRate.toString()).toFixed(4)} ${nonEuroCurrency}`
-            : '-'
-        isLoadingRate = isLoading
-        moreInfoText =
-            "This is an approximate value. The actual amount received may vary based on your bank's exchange rate"
-    } else {
-        displayValue = exchangeRate ? `1 USD = ${parseFloat(exchangeRate).toFixed(4)} ${toCurrency}` : '-'
-        isLoadingRate = isFetchingRate
-        moreInfoText = `Exchange rates apply when converting to ${toCurrency}`
-    }
+    const displayValue = exchangeRate ? `1 USD = ${parseFloat(exchangeRate).toFixed(4)} ${toCurrency}` : '-'
 
     return (
         <PaymentInfoRow
-            loading={isLoadingRate}
+            loading={isFetchingRate}
             label="Exchange Rate"
-            moreInfoText={moreInfoText}
+            moreInfoText={`Exchange rates apply when converting to ${toCurrency}`}
             value={displayValue}
         />
     )
diff --git a/src/components/Global/Banner/index.tsx b/src/components/Global/Banner/index.tsx
index 4e2a3ac31..cbb990377 100644
--- a/src/components/Global/Banner/index.tsx
+++ b/src/components/Global/Banner/index.tsx
@@ -1,12 +1,9 @@
-'use client'
-
-import { usePathname } from 'next/navigation'
+import { usePathname, useRouter } from 'next/navigation'
 import { MaintenanceBanner } from './MaintenanceBanner'
 import { MarqueeWrapper } from '../MarqueeWrapper'
 import config from '@/config/routesUnderMaintenance'
 import { HandThumbsUp } from '@/assets'
 import Image from 'next/image'
-import { useSupportModalContext } from '@/context/SupportModalContext'
 
 export function Banner() {
     const pathname = usePathname()
@@ -26,10 +23,10 @@ export function Banner() {
 }
 
 function FeedbackBanner() {
-    const { setIsSupportModalOpen } = useSupportModalContext()
+    const router = useRouter()
 
     const handleClick = () => {
-        setIsSupportModalOpen(true)
+        router.push('/support')
     }
 
     return (
diff --git a/src/components/Global/CreateAccountButton/index.tsx b/src/components/Global/CreateAccountButton/index.tsx
deleted file mode 100644
index f367ad66d..000000000
--- a/src/components/Global/CreateAccountButton/index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-'use client'
-
-import { PEANUT_LOGO_BLACK, PEANUTMAN_LOGO } from '@/assets'
-import { Button } from '@/components/0_Bruddle'
-import Image from 'next/image'
-import React from 'react'
-
-interface CreateAccountButtonProps {
-    onClick: () => void
-}
-
-const CreateAccountButton = ({ onClick }: CreateAccountButtonProps) => {
-    return (
-        <Button onClick={onClick} shadowSize="4">
-            <div>Create a</div>
-            <div className="flex items-center gap-1">
-                <Image src={PEANUTMAN_LOGO} alt="Peanut Logo" className="size-5" />
-                <Image src={PEANUT_LOGO_BLACK} alt="Peanut Logo" />
-            </div>
-            <div>account</div>
-        </Button>
-    )
-}
-
-export default CreateAccountButton
diff --git a/src/components/Global/DirectSendQR/__tests__/recognizeQr.test.ts b/src/components/Global/DirectSendQR/__tests__/recognizeQr.test.ts
index cd33061c3..faba20312 100644
--- a/src/components/Global/DirectSendQR/__tests__/recognizeQr.test.ts
+++ b/src/components/Global/DirectSendQR/__tests__/recognizeQr.test.ts
@@ -6,6 +6,7 @@ describe('recognizeQr', () => {
         ['https://peanut.example.org/link/abc', EQrType.PEANUT_URL],
         ['https://peanut.example.org/something-else', EQrType.PEANUT_URL],
         ['0x1234567890123456789012345678901234567890', EQrType.EVM_ADDRESS],
+        ['0x0ff60f43e8c04d57c7374537d8432da8fedbb41d', EQrType.PINTA_MERCHANT],
         ['vitalik.eth', EQrType.ENS_NAME],
         ['jota.peanut.me', EQrType.ENS_NAME],
         ['ethereum:0x1234567890123456789012345678901234567890?value=1e18', EQrType.EIP_681],
diff --git a/src/components/Global/DirectSendQR/index.tsx b/src/components/Global/DirectSendQR/index.tsx
index e92f242b6..0098213f0 100644
--- a/src/components/Global/DirectSendQR/index.tsx
+++ b/src/components/Global/DirectSendQR/index.tsx
@@ -254,6 +254,11 @@ export default function DirectSendQr({
                     redirectUrl = path
                 }
                 break
+            case EQrType.PINTA_MERCHANT:
+                {
+                    redirectUrl = `/${data}@polygon/PNT`
+                }
+                break
             case EQrType.EVM_ADDRESS:
                 {
                     toConfirmUrl = `/${data}`
diff --git a/src/components/Global/DirectSendQR/utils.ts b/src/components/Global/DirectSendQR/utils.ts
index 313b162ea..302a00071 100644
--- a/src/components/Global/DirectSendQR/utils.ts
+++ b/src/components/Global/DirectSendQR/utils.ts
@@ -1,9 +1,15 @@
 import { getTokenSymbol, validateEnsName, getTokenDecimals } from '@/utils'
 import { isAddress, formatUnits } from 'viem'
 
+// Constants
+const PINTA_MERCHANTS: Record<string, string> = {
+    '0x0ff60f43e8c04d57c7374537d8432da8fedbb41d': 'Casa Temple',
+}
+
 export enum EQrType {
     PEANUT_URL = 'PEANUT_URL',
     ENS_NAME = 'ENS_NAME',
+    PINTA_MERCHANT = 'PINTA_MERCHANT',
     EVM_ADDRESS = 'EVM_ADDRESS',
     URL = 'URL',
     EIP_681 = 'EIP_681',
@@ -68,7 +74,7 @@ export function recognizeQr(data: string): QrType | null {
         return EQrType.PEANUT_URL
     }
     if (isAddress(data)) {
-        return EQrType.EVM_ADDRESS
+        return PINTA_MERCHANTS[data] ? EQrType.PINTA_MERCHANT : EQrType.EVM_ADDRESS
     }
     if (validateEnsName(data)) {
         return EQrType.ENS_NAME
diff --git a/src/components/Global/ExchangeRateWidget/index.tsx b/src/components/Global/ExchangeRateWidget/index.tsx
deleted file mode 100644
index 1115d0061..000000000
--- a/src/components/Global/ExchangeRateWidget/index.tsx
+++ /dev/null
@@ -1,234 +0,0 @@
-import CurrencySelect from '@/components/LandingPage/CurrencySelect'
-import { countryCurrencyMappings } from '@/constants/countryCurrencyMapping'
-import { useDebounce } from '@/hooks/useDebounce'
-import { useExchangeRate } from '@/hooks/useExchangeRate'
-import Image from 'next/image'
-import { useRouter, useSearchParams } from 'next/navigation'
-import { FC, useCallback, useEffect, useMemo } from 'react'
-import { Icon, IconName } from '../Icons/Icon'
-import { Button } from '@/components/0_Bruddle'
-
-interface IExchangeRateWidgetProps {
-    ctaLabel: string
-    ctaIcon: IconName
-    ctaAction: () => void
-}
-
-const ExchangeRateWidget: FC<IExchangeRateWidgetProps> = ({ ctaLabel, ctaIcon, ctaAction }) => {
-    const searchParams = useSearchParams()
-    const router = useRouter()
-
-    // Get values from URL or use defaults
-    const sourceCurrency = searchParams.get('from') || 'USD'
-    const destinationCurrency = searchParams.get('to') || 'EUR'
-    const rawAmount = searchParams.get('amount')
-    const parsedAmount = rawAmount !== null ? Number(rawAmount) : 10
-    const urlSourceAmount = Number.isFinite(parsedAmount) && parsedAmount > 0 ? parsedAmount : 10
-
-    // Exchange rate hook handles all the conversion logic
-    const {
-        sourceAmount,
-        destinationAmount,
-        exchangeRate,
-        isLoading,
-        isError,
-        handleSourceAmountChange,
-        handleDestinationAmountChange,
-        getDestinationDisplayValue,
-    } = useExchangeRate({
-        sourceCurrency,
-        destinationCurrency,
-        initialSourceAmount: urlSourceAmount,
-    })
-
-    const debouncedSourceAmount = useDebounce(sourceAmount, 500)
-
-    // Function to update URL parameters
-    const updateUrlParams = useCallback(
-        (params: { from?: string; to?: string; amount?: number }) => {
-            const newSearchParams = new URLSearchParams(searchParams.toString())
-
-            if (params.from) newSearchParams.set('from', params.from)
-            if (params.to) newSearchParams.set('to', params.to)
-            if (params.amount !== undefined) newSearchParams.set('amount', params.amount.toString())
-
-            router.replace(`?${newSearchParams.toString()}`, { scroll: false })
-        },
-        [searchParams, router]
-    )
-
-    // Setter functions that update URL
-    const setSourceCurrency = useCallback(
-        (currency: string) => {
-            updateUrlParams({ from: currency })
-        },
-        [updateUrlParams]
-    )
-
-    const setDestinationCurrency = useCallback(
-        (currency: string) => {
-            updateUrlParams({ to: currency })
-        },
-        [updateUrlParams]
-    )
-
-    // Update URL when source amount changes (only for valid numbers)
-    useEffect(() => {
-        if (typeof debouncedSourceAmount === 'number' && debouncedSourceAmount !== urlSourceAmount) {
-            updateUrlParams({ amount: debouncedSourceAmount })
-        }
-    }, [debouncedSourceAmount, urlSourceAmount, updateUrlParams])
-
-    const sourceCurrencyFlag = useMemo(
-        () => countryCurrencyMappings.find((currency) => currency.currencyCode === sourceCurrency)?.flagCode,
-        [sourceCurrency]
-    )
-
-    const destinationCurrencyFlag = useMemo(
-        () => countryCurrencyMappings.find((currency) => currency.currencyCode === destinationCurrency)?.flagCode,
-        [destinationCurrency]
-    )
-
-    // Determine delivery time text based on destination currency
-    const deliveryTimeText = useMemo(() => {
-        return destinationCurrency === 'USD' ? 'Should arrive in hours.' : 'Should arrive in minutes.'
-    }, [destinationCurrency])
-
-    return (
-        <div className="btn btn-shadow-primary-4 mx-auto mt-12 flex h-fit w-full flex-col items-center justify-center gap-4 bg-white p-7 md:w-[420px]">
-            <div className="w-full">
-                <h2 className="text-left text-sm">You Send</h2>
-                <div className="btn btn-shadow-primary-4 mt-2 flex w-full items-center justify-center gap-4 bg-white p-4">
-                    {isLoading ? (
-                        <div className="flex w-full items-center">
-                            <div className="h-8 w-40 animate-pulse rounded-full bg-grey-2" />
-                        </div>
-                    ) : (
-                        <input
-                            min={0}
-                            placeholder="0"
-                            value={sourceAmount === '' ? '' : sourceAmount}
-                            onChange={(e) => {
-                                const inputValue = e.target.value
-                                if (inputValue === '') {
-                                    handleSourceAmountChange('')
-                                } else {
-                                    const value = parseFloat(inputValue)
-                                    handleSourceAmountChange(isNaN(value) ? '' : value)
-                                }
-                            }}
-                            type="number"
-                            className="w-full bg-transparent outline-none"
-                        />
-                    )}
-                    <CurrencySelect
-                        selectedCurrency={sourceCurrency}
-                        setSelectedCurrency={setSourceCurrency}
-                        // excludeCurrencies={[destinationCurrency]}
-                        trigger={
-                            <button className="flex w-32 items-center gap-2">
-                                <Image
-                                    src={`https://flagcdn.com/w320/${sourceCurrencyFlag}.png`}
-                                    alt={`${sourceCurrencyFlag} flag`}
-                                    width={160}
-                                    height={160}
-                                    className="size-4 rounded-full object-cover"
-                                />
-                                {sourceCurrency} <Icon name="chevron-down" className="text-gray-1" size={10} />
-                            </button>
-                        }
-                    />
-                </div>
-            </div>
-
-            <div className="w-full">
-                <h2 className="text-left text-sm">Recipient Gets</h2>
-                <div className="btn btn-shadow-primary-4 mt-2 flex w-full items-center justify-center gap-4 bg-white p-4">
-                    {isLoading ? (
-                        <div className="flex w-full items-center">
-                            <div className="h-8 w-40 animate-pulse rounded-full bg-grey-2" />
-                        </div>
-                    ) : (
-                        <input
-                            min={0}
-                            placeholder="0"
-                            value={getDestinationDisplayValue()}
-                            onChange={(e) => {
-                                const inputValue = e.target.value
-                                if (inputValue === '') {
-                                    handleDestinationAmountChange('', '')
-                                } else {
-                                    const value = parseFloat(inputValue)
-                                    handleDestinationAmountChange(inputValue, isNaN(value) ? '' : value)
-                                }
-                            }}
-                            type="number"
-                            className="w-full bg-transparent outline-none"
-                        />
-                    )}
-                    <CurrencySelect
-                        selectedCurrency={destinationCurrency}
-                        setSelectedCurrency={setDestinationCurrency}
-                        trigger={
-                            <button className="flex w-32 items-center gap-2">
-                                <Image
-                                    src={`https://flagcdn.com/w320/${destinationCurrencyFlag}.png`}
-                                    alt={`${destinationCurrencyFlag} flag`}
-                                    width={160}
-                                    height={160}
-                                    className="size-4 rounded-full object-cover"
-                                />
-                                {destinationCurrency} <Icon name="chevron-down" className="text-gray-1" size={10} />
-                            </button>
-                        }
-                    />
-                </div>
-            </div>
-
-            <div className="rounded-full bg-grey-4 px-2 py-[2px] text-xs font-bold text-gray-1">
-                {isLoading ? (
-                    <div className="mx-auto h-3 w-28 animate-pulse rounded-full bg-grey-2" />
-                ) : isError ? (
-                    <span>Rate currently unavailable</span>
-                ) : (
-                    <>
-                        1 {sourceCurrency} = {exchangeRate.toFixed(4)} {destinationCurrency}
-                    </>
-                )}
-            </div>
-
-            {typeof destinationAmount === 'number' && destinationAmount > 0 && (
-                <div className="flex w-full flex-col gap-3 rounded-sm border-[1.15px] border-black px-4 py-2">
-                    <div className="flex items-center justify-between">
-                        <h2 className="text-left text-sm font-normal">Bank fee</h2>
-                        <h2 className="text-left text-sm font-normal">Free!</h2>
-                    </div>
-
-                    <div className="flex items-center justify-between">
-                        <h2 className="text-left text-sm font-normal">Peanut fee</h2>
-                        <h2 className="text-left text-sm font-normal">Free!</h2>
-                    </div>
-                </div>
-            )}
-
-            <Button
-                onClick={ctaAction}
-                icon={ctaIcon}
-                iconSize={13}
-                shadowSize="4"
-                className="w-full text-base font-bold"
-            >
-                {ctaLabel}
-            </Button>
-
-            {typeof destinationAmount === 'number' && destinationAmount > 0 && (
-                <div className="flex items-center">
-                    <Icon name="info" className="text-gray-1" size={10} />
-                    <p className="text-xs text-gray-1">{deliveryTimeText}</p>
-                </div>
-            )}
-        </div>
-    )
-}
-
-export default ExchangeRateWidget
diff --git a/src/components/Global/GuestLoginCta/index.tsx b/src/components/Global/GuestLoginCta/index.tsx
index 121be04e7..bc51ca6bf 100644
--- a/src/components/Global/GuestLoginCta/index.tsx
+++ b/src/components/Global/GuestLoginCta/index.tsx
@@ -2,10 +2,10 @@ import { Button } from '@/components/0_Bruddle'
 import Divider from '@/components/0_Bruddle/Divider'
 import { useToast } from '@/components/0_Bruddle/Toast'
 import { useZeroDev } from '@/hooks/useZeroDev'
-import { sanitizeRedirectURL, saveRedirectUrl } from '@/utils'
+import { saveRedirectUrl } from '@/utils'
 import { useAppKit } from '@reown/appkit/react'
 import * as Sentry from '@sentry/nextjs'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useRouter } from 'next/navigation'
 import { useEffect } from 'react'
 
 interface GuestLoginCtaProps {
@@ -18,7 +18,6 @@ const GuestLoginCta = ({ hideConnectWallet = false, view }: GuestLoginCtaProps)
     const toast = useToast()
     const router = useRouter()
     const { open: openReownModal } = useAppKit()
-    const searchParams = useSearchParams()
 
     // If user already has a passkey address, auto-redirect to avoid double prompting
     useEffect(() => {
@@ -40,11 +39,6 @@ const GuestLoginCta = ({ hideConnectWallet = false, view }: GuestLoginCtaProps)
 
         try {
             await handleLogin()
-            const redirect_uri = searchParams.get('redirect_uri')
-            if (redirect_uri) {
-                const sanitizedRedirectUrl = sanitizeRedirectURL(redirect_uri)
-                router.push(sanitizedRedirectUrl)
-            }
         } catch (e) {
             toast.error('Error logging in')
             Sentry.captureException(e)
diff --git a/src/components/Global/GuestVerificationModal/index.tsx b/src/components/Global/GuestVerificationModal/index.tsx
index 279c45c32..54bd2dab3 100644
--- a/src/components/Global/GuestVerificationModal/index.tsx
+++ b/src/components/Global/GuestVerificationModal/index.tsx
@@ -9,7 +9,6 @@ interface GuestVerificationModalProps {
     isOpen: boolean
     onClose: () => void
     secondaryCtaLabel: string
-    redirectToVerification?: boolean
 }
 
 export const GuestVerificationModal = ({
@@ -17,7 +16,6 @@ export const GuestVerificationModal = ({
     onClose,
     description,
     secondaryCtaLabel,
-    redirectToVerification,
 }: GuestVerificationModalProps) => {
     const router = useRouter()
     return (
@@ -36,10 +34,6 @@ export const GuestVerificationModal = ({
                     className: 'md:py-2.5',
                     onClick: () => {
                         saveRedirectUrl()
-                        if (redirectToVerification) {
-                            router.push('/setup?redirect_uri=/profile/identity-verification')
-                            return
-                        }
                         router.push('/setup')
                     },
                 },
diff --git a/src/components/Global/Icons/Icon.tsx b/src/components/Global/Icons/Icon.tsx
index f132a4387..1d240cc46 100644
--- a/src/components/Global/Icons/Icon.tsx
+++ b/src/components/Global/Icons/Icon.tsx
@@ -120,7 +120,6 @@ export type IconName =
     | 'processing'
     | 'failed'
     | 'chevron-down'
-    | 'shield'
     | 'question-mark'
     | 'shield'
 
diff --git a/src/components/Global/IframeWrapper/index.tsx b/src/components/Global/IframeWrapper/index.tsx
index 2aa206a66..113f74020 100644
--- a/src/components/Global/IframeWrapper/index.tsx
+++ b/src/components/Global/IframeWrapper/index.tsx
@@ -5,7 +5,6 @@ import { Icon, IconName } from '../Icons/Icon'
 import ActionModal from '../ActionModal'
 import { useRouter } from 'next/navigation'
 import StartVerificationView from './StartVerificationView'
-import { useSupportModalContext } from '@/context/SupportModalContext'
 
 export type IFrameWrapperProps = {
     src: string
@@ -21,7 +20,6 @@ const IframeWrapper = ({ src, visible, onClose, closeConfirmMessage }: IFrameWra
     const [copied, setCopied] = useState(false)
     const [isVerificationStarted, setIsVerificationStarted] = useState(false)
     const router = useRouter()
-    const { setIsSupportModalOpen } = useSupportModalContext()
 
     const handleCopy = (textToCopy: string) => {
         navigator.clipboard.writeText(textToCopy).then(() => {
@@ -56,7 +54,7 @@ const IframeWrapper = ({ src, visible, onClose, closeConfirmMessage }: IFrameWra
                     {
                         text: 'Chat with support',
                         icon: 'peanut-support' as IconName,
-                        onClick: () => setIsSupportModalOpen(true),
+                        onClick: () => router.push('/support'),
                         variant: 'transparent' as ButtonVariant,
                         className: 'underline text-sm font-medium w-full fill-none h-fit mt-3',
                     },
@@ -140,11 +138,11 @@ const IframeWrapper = ({ src, visible, onClose, closeConfirmMessage }: IFrameWra
                             key={src}
                             src={src}
                             allow="camera;"
-                            style={{ width: '100%', height: '85%', border: 'none' }}
+                            style={{ width: '100%', height: '80%', border: 'none' }}
                             className="rounded-md"
                             sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-top-navigation-by-user-activation"
                         />
-                        <div className="flex h-[15%] w-full flex-col items-center justify-center gap-4 px-5">
+                        <div className="flex h-1/5 w-full flex-col items-center justify-center gap-4 px-5">
                             <Button
                                 variant={'purple'}
                                 className={`max-w-md`}
diff --git a/src/components/Global/Layout/index.tsx b/src/components/Global/Layout/index.tsx
index f738f8831..69b20c54f 100644
--- a/src/components/Global/Layout/index.tsx
+++ b/src/components/Global/Layout/index.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { GenericBanner } from '@/components/Global/Banner'
+import { Banner, GenericBanner } from '@/components/Global/Banner'
 import { ThemeProvider } from '@/config'
 import { useFooterVisibility } from '@/context/footerVisibility'
 import { Widget } from '@typeform/embed-react'
@@ -38,9 +38,9 @@ const Layout = ({ children, className }: LayoutProps) => {
                 <ThemeProvider>
                     <div className="relative">
                         <div className="flex min-h-screen flex-col ">
-                            {/* <Banner /> */}
+                            <Banner />
                             {/* @dev note: temp, remove banner later */}
-                            <GenericBanner message="Under maintenance" icon="⚠️" />
+                            {/* <GenericBanner message="Under maintenance" icon="⚠️" /> */}
                             <div className="flex grow justify-center">
                                 <div
                                     className={`4xl:max-w-full flex grow flex-col justify-center pb-2 pt-6 sm:mx-auto sm:px-16 md:px-5 lg:px-6 2xl:px-8 ${className}`}
diff --git a/src/components/Global/PeanutActionDetailsCard/index.tsx b/src/components/Global/PeanutActionDetailsCard/index.tsx
index b9049c536..51a5b9240 100644
--- a/src/components/Global/PeanutActionDetailsCard/index.tsx
+++ b/src/components/Global/PeanutActionDetailsCard/index.tsx
@@ -216,7 +216,13 @@ export default function PeanutActionDetailsCard({
                                 transactionType !== 'ADD_MONEY' &&
                                 !isClaimLinkBankAccount &&
                                 !(transactionType === 'CLAIM_LINK_BANK_ACCOUNT' && viewType === 'SUCCESS') &&
-                                ` ${tokenSymbol}`}
+                                ` ${
+                                    tokenSymbol.toLowerCase() === 'pnt'
+                                        ? Number(amount) === 1
+                                            ? 'Beer'
+                                            : 'Beers'
+                                        : tokenSymbol
+                                }`}
                         </h2>
                     )}
 
diff --git a/src/components/Global/PostSignupActionManager/index.tsx b/src/components/Global/PostSignupActionManager/index.tsx
index 5fb216350..16b2bfc8d 100644
--- a/src/components/Global/PostSignupActionManager/index.tsx
+++ b/src/components/Global/PostSignupActionManager/index.tsx
@@ -6,7 +6,6 @@ import { useEffect, useState } from 'react'
 import ActionModal from '../ActionModal'
 import { POST_SIGNUP_ACTIONS } from './post-signup-action.consts'
 import { IconName } from '../Icons/Icon'
-import { useAuth } from '@/context/authContext'
 
 export const PostSignupActionManager = ({
     onActionModalVisibilityChange,
@@ -22,12 +21,12 @@ export const PostSignupActionManager = ({
         action: () => void
     } | null>(null)
     const router = useRouter()
-    const { user } = useAuth()
 
-    const checkClaimModalAfterKYC = () => {
+    useEffect(() => {
         const redirectUrl = getFromLocalStorage('redirect')
-        if (user?.user.bridgeKycStatus === 'approved' && redirectUrl) {
+        if (redirectUrl) {
             const matchedAction = POST_SIGNUP_ACTIONS.find((action) => action.pathPattern.test(redirectUrl))
+
             if (matchedAction) {
                 setActionConfig({
                     ...matchedAction.config,
@@ -40,11 +39,7 @@ export const PostSignupActionManager = ({
                 setShowModal(true)
             }
         }
-    }
-
-    useEffect(() => {
-        checkClaimModalAfterKYC()
-    }, [router, user])
+    }, [router])
 
     useEffect(() => {
         onActionModalVisibilityChange(showModal)
@@ -59,7 +54,6 @@ export const PostSignupActionManager = ({
                 setShowModal(false)
                 localStorage.removeItem('redirect')
             }}
-            preventClose // Prevent closing the modal by clicking outside
             title={actionConfig.title}
             description={actionConfig.description}
             icon={actionConfig.icon as IconName}
diff --git a/src/components/Global/PostSignupActionManager/post-signup-action.consts.ts b/src/components/Global/PostSignupActionManager/post-signup-action.consts.ts
index 9682808a5..d84e5a27e 100644
--- a/src/components/Global/PostSignupActionManager/post-signup-action.consts.ts
+++ b/src/components/Global/PostSignupActionManager/post-signup-action.consts.ts
@@ -5,20 +5,10 @@ export const POST_SIGNUP_ACTIONS = [
         // this regex will match any path that contains the word "claim", this helps in determing if the user is coming from a claim link
         pathPattern: /claim/,
         config: {
-            title: 'Verification complete!',
-            description: `Your identity has been successfully verified. You can now claim money directly to your bank account.`,
-            cta: 'Claim to bank',
-            icon: 'check' as IconName,
-        },
-    },
-    {
-        // this regex will match any path that resembles the request link, this helps in determing if the user is coming from a request link
-        pathPattern: /^\/[^\/]+\/[^\/\?]+\?.*chargeId=/,
-        config: {
-            title: 'Verification complete!',
-            description: `Your identity has been successfully verified. You can now send the money your friend requested!`,
-            cta: 'Send it!',
-            icon: 'check' as IconName,
+            title: 'Claim your money',
+            description: `You're almost done! Tap Claim Funds to move the money into your new Peanut Wallet.`,
+            cta: 'Claim Funds',
+            icon: 'dollar' as IconName,
         },
     },
 ]
diff --git a/src/components/Global/RewardsModal/index.tsx b/src/components/Global/RewardsModal/index.tsx
index 063592735..6e6c7523e 100644
--- a/src/components/Global/RewardsModal/index.tsx
+++ b/src/components/Global/RewardsModal/index.tsx
@@ -1,4 +1,4 @@
-import { PEANUTMAN_RAISING_HANDS } from '@/assets'
+import { PEANUTMAN_BEER, PEANUTMAN_RAISING_HANDS } from '@/assets'
 import { Button } from '@/components/0_Bruddle'
 import { useAuth } from '@/context/authContext'
 import { rewardsApi } from '@/services/rewards'
@@ -177,7 +177,17 @@ const RewardsModal = () => {
                     style={{ transform: 'translateY(-80%)' }}
                 >
                     <div className="relative h-42 w-[90%] md:h-52">
-                        <Image src={PEANUTMAN_RAISING_HANDS} alt="Peanut Man" layout="fill" objectFit="contain" />
+                        <Image
+                            src={
+                                activeReward?.assetCode === REWARD_ASSET_TYPE.PNT ||
+                                activeReward?.assetCode === REWARD_ASSET_TYPE.DEPOSIT
+                                    ? PEANUTMAN_BEER
+                                    : PEANUTMAN_RAISING_HANDS
+                            }
+                            alt="Peanut Man"
+                            layout="fill"
+                            objectFit="contain"
+                        />
                     </div>
                 </div>
             </Modal>
diff --git a/src/components/Global/SupportCTA/index.tsx b/src/components/Global/SupportCTA/index.tsx
deleted file mode 100644
index 8942ea88f..000000000
--- a/src/components/Global/SupportCTA/index.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-'use client'
-
-import Link from 'next/link'
-
-const SupportCTA = () => {
-    return (
-        <div className="flex flex-col items-center justify-center border-t border-grey-1">
-            <Link href="/support" className="mt-2 cursor-pointer text-sm text-grey-1 underline underline-offset-2">
-                Need help with this transaction?
-            </Link>
-        </div>
-    )
-}
-
-export default SupportCTA
diff --git a/src/components/Global/SupportDrawer/index.tsx b/src/components/Global/SupportDrawer/index.tsx
deleted file mode 100644
index ab70bc705..000000000
--- a/src/components/Global/SupportDrawer/index.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useSupportModalContext } from '@/context/SupportModalContext'
-import { Drawer, DrawerContent } from '../Drawer'
-
-const SupportDrawer = () => {
-    const { isSupportModalOpen, setIsSupportModalOpen } = useSupportModalContext()
-    return (
-        <Drawer open={isSupportModalOpen} onOpenChange={setIsSupportModalOpen}>
-            <DrawerContent className="z-[999999] max-h-[85vh] w-screen pt-4">
-                <iframe
-                    src="https://go.crisp.chat/chat/embed/?website_id=916078be-a6af-4696-82cb-bc08d43d9125"
-                    className="h-[80vh] w-full"
-                />
-            </DrawerContent>
-        </Drawer>
-    )
-}
-
-export default SupportDrawer
diff --git a/src/components/Global/TokenAmountInput/index.tsx b/src/components/Global/TokenAmountInput/index.tsx
index bc3833434..39387c799 100644
--- a/src/components/Global/TokenAmountInput/index.tsx
+++ b/src/components/Global/TokenAmountInput/index.tsx
@@ -169,7 +169,7 @@ const TokenAmountInput = ({
     useEffect(() => {
         if (inputRef.current) {
             if (displayValue?.length !== 0) {
-                inputRef.current.style.width = `${displayValue?.length ?? 0}ch`
+                inputRef.current.style.width = `${(displayValue?.length ?? 0) + 1}ch`
             } else {
                 inputRef.current.style.width = `4ch`
             }
@@ -203,7 +203,7 @@ const TokenAmountInput = ({
             <div className="flex h-14 w-full flex-row items-center justify-center gap-1">
                 <label className={`text-h1 ${displayValue ? 'text-black' : 'text-gray-2'}`}>{displaySymbol}</label>
                 <input
-                    className={`h-12 max-w-80 bg-transparent text-center text-h1 outline-none transition-colors placeholder:text-h1 focus:border-primary-1 dark:border-white dark:bg-n-1 dark:text-white dark:placeholder:text-white/75 dark:focus:border-primary-1`}
+                    className={`h-12 w-[4ch] max-w-80 bg-transparent text-h1 outline-none transition-colors placeholder:text-h1 focus:border-primary-1 dark:border-white dark:bg-n-1 dark:text-white dark:placeholder:text-white/75 dark:focus:border-primary-1`}
                     placeholder={'0.00'}
                     onChange={(e) => {
                         const value = formatAmountWithoutComma(e.target.value)
diff --git a/src/components/Global/UnsupportedBrowserModal/index.tsx b/src/components/Global/UnsupportedBrowserModal/index.tsx
index 9813d480e..55685bf72 100644
--- a/src/components/Global/UnsupportedBrowserModal/index.tsx
+++ b/src/components/Global/UnsupportedBrowserModal/index.tsx
@@ -6,7 +6,6 @@ import { IconName } from '@/components/Global/Icons/Icon'
 import { copyTextToClipboardWithFallback } from '@/utils/general.utils'
 import { useEffect, useState, Suspense } from 'react'
 import { useSearchParams } from 'next/navigation'
-import { usePasskeySupport } from '@/hooks/usePasskeySupport'
 
 export const inAppSignatures = [
     'WebView',
@@ -47,13 +46,29 @@ const UnsupportedBrowserModalContent = ({
     const [showInAppBrowserModalViaDetection, setShowInAppBrowserModalViaDetection] = useState(false)
     const [copyButtonText, setCopyButtonText] = useState('Copy Link')
     const toast = useToast()
-    const { isSupported: isPasskeySupported } = usePasskeySupport()
 
     useEffect(() => {
-        if (!isPasskeySupported) {
-            setShowInAppBrowserModalViaDetection(true)
+        // in-app browser detection - only run if not manually triggered
+        if (typeof window !== 'undefined' && typeof navigator !== 'undefined') {
+            const ua = navigator.userAgent || navigator.vendor || (window as any).opera
+
+            let isLikelyInApp = inAppSignatures.some((sig) => new RegExp(sig, 'i').test(ua))
+
+            const isStandalonePWA = window.matchMedia('(display-mode: standalone)').matches
+            if (isStandalonePWA) {
+                isLikelyInApp = false
+            }
+
+            const isIOS = /iPad|iPhone|iPod/.test(ua) && !(window as any).MSStream
+            if (isIOS && !isLikelyInApp && !/Safari|CriOS|FxiOS|EdgiOS/.test(ua)) {
+                isLikelyInApp = true
+            }
+
+            if (isLikelyInApp) {
+                setShowInAppBrowserModalViaDetection(true)
+            }
         }
-    }, [isPasskeySupported])
+    }, [])
 
     if (!showInAppBrowserModalViaDetection && !visible) {
         return null
@@ -86,7 +101,7 @@ const UnsupportedBrowserModalContent = ({
                     toast.error('Failed to copy link.')
                 }
             },
-            className: 'bg-primary-1 hover:bg-primary-2 text-black sm:py-3',
+            className: 'bg-primary-1 hover:bg-primary-2 text-black',
             shadowSize: '4',
         },
         {
@@ -112,7 +127,6 @@ const UnsupportedBrowserModalContent = ({
             modalPanelClassName="max-w-md"
             contentContainerClassName="text-center"
             descriptionClassName="mb-0"
-            ctaClassName="flex-col sm:flex-col"
         />
     )
 }
diff --git a/src/components/Global/WalletNavigation/index.tsx b/src/components/Global/WalletNavigation/index.tsx
index 393a75046..ee5522da6 100644
--- a/src/components/Global/WalletNavigation/index.tsx
+++ b/src/components/Global/WalletNavigation/index.tsx
@@ -1,13 +1,11 @@
 import { PEANUT_LOGO } from '@/assets'
 import DirectSendQr from '@/components/Global/DirectSendQR'
 import { Icon, IconName, Icon as NavIcon } from '@/components/Global/Icons/Icon'
-import { useSupportModalContext } from '@/context/SupportModalContext'
 import { useUserStore } from '@/redux/hooks'
 import classNames from 'classnames'
 import Image from 'next/image'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
-import { useState } from 'react'
 
 type NavPathProps = {
     name: string
@@ -63,42 +61,38 @@ type MobileNavProps = {
     pathName: string
 }
 
-const MobileNav: React.FC<MobileNavProps> = ({ pathName }) => {
-    const { setIsSupportModalOpen } = useSupportModalContext()
+const MobileNav: React.FC<MobileNavProps> = ({ pathName }) => (
+    <div className="z-1 grid h-20 grid-cols-3 border-t border-black bg-background md:hidden">
+        {/* Home Link */}
+        <Link
+            href="/home"
+            translate="no"
+            className={classNames(
+                'notranslate mb-4 flex flex-col items-center justify-center object-contain hover:cursor-pointer',
+                { 'text-primary-1': pathName === '/home' }
+            )}
+        >
+            <NavIcon name="home" size={20} />
+            <span className="mx-auto mt-1 block text-center text-xs font-medium">Home</span>
+        </Link>
 
-    return (
-        <div className="z-1 grid h-20 grid-cols-3 border-t border-black bg-background md:hidden">
-            {/* Home Link */}
-            <Link
-                href="/home"
-                translate="no"
-                className={classNames(
-                    'notranslate mb-4 flex flex-col items-center justify-center object-contain hover:cursor-pointer',
-                    { 'text-primary-1': pathName === '/home' }
-                )}
-            >
-                <NavIcon name="home" size={20} />
-                <span className="mx-auto mt-1 block text-center text-xs font-medium">Home</span>
-            </Link>
-
-            {/* QR Button - Main Action */}
-            <DirectSendQr className="-translate-y-1/3 transform" />
+        {/* QR Button - Main Action */}
+        <DirectSendQr className="-translate-y-1/3 transform" />
 
-            {/* Support Link */}
-            <button
-                onClick={() => setIsSupportModalOpen(true)}
-                translate="no"
-                className={classNames(
-                    'notranslate mb-4 flex flex-col items-center justify-center object-contain  hover:cursor-pointer',
-                    { 'text-primary-1': pathName === '/support' }
-                )}
-            >
-                <NavIcon name="peanut-support" size={20} />
-                <span className="mx-auto mt-1 block pl-1 text-center text-xs font-medium">Support</span>
-            </button>
-        </div>
-    )
-}
+        {/* Support Link */}
+        <Link
+            href="/support"
+            translate="no"
+            className={classNames(
+                'notranslate mb-4 flex flex-col items-center justify-center object-contain  hover:cursor-pointer',
+                { 'text-primary-1': pathName === '/support' }
+            )}
+        >
+            <NavIcon name="peanut-support" size={20} />
+            <span className="mx-auto mt-1 block pl-1 text-center text-xs font-medium">Support</span>
+        </Link>
+    </div>
+)
 
 const WalletNavigation: React.FC = () => {
     const pathName = usePathname()
diff --git a/src/components/Home/HomeHistory.tsx b/src/components/Home/HomeHistory.tsx
index 7fe4ce4b8..5c5cc108d 100644
--- a/src/components/Home/HomeHistory.tsx
+++ b/src/components/Home/HomeHistory.tsx
@@ -15,7 +15,7 @@ import Card, { CardPosition, getCardPosition } from '../Global/Card'
 import EmptyState from '../Global/EmptyStates/EmptyState'
 import { KycStatusItem } from '../Kyc/KycStatusItem'
 import { isKycStatusItem, KycHistoryEntry } from '@/hooks/useKycFlow'
-import { BridgeKycStatus } from '@/utils'
+import { KYCStatus } from '@/utils'
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { useUserInteractions } from '@/hooks/useUserInteractions'
 
@@ -36,10 +36,10 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
         isError,
         error,
     } = useTransactionHistory({ mode, limit, username, filterMutualTxs, enabled: isLoggedIn })
-    const bridgeKycStatus: BridgeKycStatus = user?.user?.bridgeKycStatus || 'not_started'
+    const kycStatus: KYCStatus = user?.user?.kycStatus || 'not_started'
     // check if the username is the same as the current user
     const isSameUser = username === user?.user.username
-    const { fetchBalance } = useWallet()
+    const { fetchBalance, getRewardWalletBalance } = useWallet()
 
     // WebSocket for real-time updates
     const { historyEntries: wsHistoryEntries } = useWebSocket({
@@ -52,9 +52,10 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
                     (entry.type === EHistoryEntryType.REQUEST && entry.status.toUpperCase() === 'COMPLETED')
                 ) {
                     fetchBalance()
+                    getRewardWalletBalance()
                 }
             },
-            [fetchBalance]
+            [fetchBalance, getRewardWalletBalance]
         ),
     })
 
@@ -119,14 +120,14 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
             // and the user is viewing their own history
             if (
                 isSameUser &&
-                user?.user?.bridgeKycStatus &&
-                user.user.bridgeKycStatus !== 'not_started' &&
-                user.user.bridgeKycStartedAt &&
+                user?.user?.kycStatus &&
+                user.user.kycStatus !== 'not_started' &&
+                user.user.kycStartedAt &&
                 !isPublic
             ) {
                 entries.push({
                     isKyc: true,
-                    timestamp: user.user.bridgeKycStartedAt,
+                    timestamp: user.user.kycStartedAt,
                     uuid: 'kyc-status-item',
                 })
             }
@@ -175,7 +176,7 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
         return (
             <div className="mx-auto mt-6 w-full space-y-3 md:max-w-2xl">
                 <h2 className="text-base font-bold">Recent Transactions</h2>{' '}
-                <EmptyState icon="alert" title="Error loading transactions!" description="Please contact Support." />
+                <EmptyState icon="alert" title="Error loading transactions!" description="Please try again later" />
             </div>
         )
     }
@@ -184,7 +185,7 @@ const HomeHistory = ({ isPublic = false, username }: { isPublic?: boolean; usern
     if (!combinedEntries.length) {
         return (
             <div className="mx-auto mt-6 w-full space-y-3 md:max-w-2xl">
-                {isSameUser && bridgeKycStatus !== 'not_started' && (
+                {isSameUser && kycStatus !== 'not_started' && (
                     <div className="space-y-3">
                         <h2 className="text-base font-bold">Activity</h2>
                         <KycStatusItem position="single" />
diff --git a/src/components/Kyc/KycStatusDrawer.tsx b/src/components/Kyc/KycStatusDrawer.tsx
index cd43a6caf..f2ad81a1b 100644
--- a/src/components/Kyc/KycStatusDrawer.tsx
+++ b/src/components/Kyc/KycStatusDrawer.tsx
@@ -4,15 +4,15 @@ import { KycFailed } from './states/KycFailed'
 import { KycProcessing } from './states/KycProcessing'
 import PeanutLoading from '@/components/Global/PeanutLoading'
 import { Drawer, DrawerContent } from '../Global/Drawer'
-import { BridgeKycStatus } from '@/utils'
+import { KYCStatus } from '@/utils'
 import { getKycDetails } from '@/app/actions/users'
 import { useKycFlow } from '@/hooks/useKycFlow'
 import IFrameWrapper from '../Global/IframeWrapper'
 
 // a helper to categorize the kyc status from the user object
-const getKycStatusCategory = (bridgeKycStatus: BridgeKycStatus): 'processing' | 'completed' | 'failed' => {
+const getKycStatusCategory = (kycStatus: KYCStatus): 'processing' | 'completed' | 'failed' => {
     let category: 'processing' | 'completed' | 'failed'
-    switch (bridgeKycStatus) {
+    switch (kycStatus) {
         // note: not_started status is handled explicitly in KycStatusItem component
         case 'approved':
             category = 'completed'
@@ -32,20 +32,20 @@ const getKycStatusCategory = (bridgeKycStatus: BridgeKycStatus): 'processing' |
 interface KycStatusDrawerProps {
     isOpen: boolean
     onClose: () => void
-    bridgeKycStatus: BridgeKycStatus
-    bridgeKycStartedAt?: string
-    bridgeKycApprovedAt?: string
-    bridgeKycRejectedAt?: string
+    kycStatus: KYCStatus
+    kycStartedAt?: string
+    kycApprovedAt?: string
+    kycRejectedAt?: string
 }
 
 // this component determines which kyc state to show inside the drawer and fetches rejection reasons if the kyc has failed.
 export const KycStatusDrawer = ({
     isOpen,
     onClose,
-    bridgeKycStatus,
-    bridgeKycStartedAt,
-    bridgeKycApprovedAt,
-    bridgeKycRejectedAt,
+    kycStatus,
+    kycStartedAt,
+    kycApprovedAt,
+    kycRejectedAt,
 }: KycStatusDrawerProps) => {
     const [rejectionReason, setRejectionReason] = useState<string | null>(null)
     const [isLoading, setIsLoading] = useState(false)
@@ -56,7 +56,7 @@ export const KycStatusDrawer = ({
         isLoading: isKycFlowLoading,
     } = useKycFlow({ onKycSuccess: onClose })
 
-    const statusCategory = getKycStatusCategory(bridgeKycStatus)
+    const statusCategory = getKycStatusCategory(kycStatus)
 
     useEffect(() => {
         // if the drawer is open and the kyc has failed, fetch the reason
@@ -96,31 +96,25 @@ export const KycStatusDrawer = ({
 
         switch (statusCategory) {
             case 'processing':
-                return <KycProcessing bridgeKycStartedAt={bridgeKycStartedAt} />
+                return <KycProcessing kycStartedAt={kycStartedAt} />
             case 'completed':
-                return <KycCompleted bridgeKycApprovedAt={bridgeKycApprovedAt} />
+                return <KycCompleted kycApprovedAt={kycApprovedAt} />
             case 'failed':
-                return (
-                    <KycFailed
-                        reason={rejectionReason}
-                        bridgeKycRejectedAt={bridgeKycRejectedAt}
-                        onRetry={handleInitiateKyc}
-                    />
-                )
+                return <KycFailed reason={rejectionReason} kycRejectedAt={kycRejectedAt} onRetry={handleInitiateKyc} />
             default:
                 return null
         }
     }
 
     // don't render the drawer if the kyc status is unknown or not started
-    if (bridgeKycStatus === 'not_started') {
+    if (kycStatus === 'not_started') {
         return null
     }
 
     return (
         <>
             <Drawer open={isOpen} onOpenChange={onClose}>
-                <DrawerContent className="p-5 pb-12">{renderContent()}</DrawerContent>
+                <DrawerContent className="p-5">{renderContent()}</DrawerContent>
             </Drawer>
             <IFrameWrapper
                 visible={iframeOptions.visible || isKycFlowLoading}
diff --git a/src/components/Kyc/KycStatusItem.tsx b/src/components/Kyc/KycStatusItem.tsx
index bb0443751..4616351ce 100644
--- a/src/components/Kyc/KycStatusItem.tsx
+++ b/src/components/Kyc/KycStatusItem.tsx
@@ -5,7 +5,7 @@ import { useUserStore } from '@/redux/hooks'
 import AvatarWithBadge from '../Profile/AvatarWithBadge'
 import StatusBadge, { StatusType } from '../Global/Badges/StatusBadge'
 import { useWebSocket } from '@/hooks/useWebSocket'
-import { BridgeKycStatus, formatDate } from '@/utils'
+import { KYCStatus, formatDate } from '@/utils'
 import { HTMLAttributes } from 'react'
 import { twMerge } from 'tailwind-merge'
 
@@ -19,7 +19,7 @@ export const KycStatusItem = ({
 }) => {
     const { user } = useUserStore()
     const [isDrawerOpen, setIsDrawerOpen] = useState(false)
-    const [wsBridgeKycStatus, setWsBridgeKycStatus] = useState<BridgeKycStatus | undefined>(undefined)
+    const [wsKycStatus, setWsKycStatus] = useState<KYCStatus | undefined>(undefined)
 
     const handleCloseDrawer = useCallback(() => {
         setIsDrawerOpen(false)
@@ -30,26 +30,26 @@ export const KycStatusItem = ({
         username: user?.user.username ?? undefined,
         autoConnect: true,
         onKycStatusUpdate: (newStatus) => {
-            setWsBridgeKycStatus(newStatus as BridgeKycStatus)
+            setWsKycStatus(newStatus as KYCStatus)
         },
     })
 
-    const birdgeKycStatus = wsBridgeKycStatus || user?.user?.bridgeKycStatus
+    const kycStatus = wsKycStatus || user?.user?.kycStatus
 
     const subtitle = useMemo(() => {
-        const bridgeKycStartedAt = user?.user?.bridgeKycStartedAt
-        if (!bridgeKycStartedAt) {
+        const kycStartedAt = user?.user?.kycStartedAt
+        if (!kycStartedAt) {
             return 'Verification in progress'
         }
         try {
-            return `Submitted on ${formatDate(new Date(bridgeKycStartedAt)).split(' - ')[0]}`
+            return `Submitted on ${formatDate(new Date(kycStartedAt)).split(' - ')[0]}`
         } catch (error) {
-            console.error('Failed to parse bridgeKycStartedAt date:', error)
+            console.error('Failed to parse kycStartedAt date:', error)
             return 'Verification in progress'
         }
-    }, [user?.user?.bridgeKycStartedAt])
+    }, [user?.user?.kycStartedAt])
 
-    if (!birdgeKycStatus || birdgeKycStatus === 'not_started') {
+    if (!kycStatus || kycStatus === 'not_started') {
         return null
     }
 
@@ -74,10 +74,10 @@ export const KycStatusItem = ({
             <KycStatusDrawer
                 isOpen={isDrawerOpen}
                 onClose={handleCloseDrawer}
-                bridgeKycStatus={birdgeKycStatus}
-                bridgeKycStartedAt={user?.user?.bridgeKycStartedAt}
-                bridgeKycApprovedAt={user?.user?.bridgeKycApprovedAt}
-                bridgeKycRejectedAt={user?.user?.bridgeKycRejectedAt}
+                kycStatus={kycStatus}
+                kycStartedAt={user?.user?.kycStartedAt}
+                kycApprovedAt={user?.user?.kycApprovedAt}
+                kycRejectedAt={user?.user?.kycRejectedAt}
             />
         </>
     )
diff --git a/src/components/Kyc/index.tsx b/src/components/Kyc/index.tsx
index bef0cb809..937a0390f 100644
--- a/src/components/Kyc/index.tsx
+++ b/src/components/Kyc/index.tsx
@@ -3,8 +3,6 @@ import { useKycFlow } from '@/hooks/useKycFlow'
 import IframeWrapper from '@/components/Global/IframeWrapper'
 import { KycVerificationInProgressModal } from './KycVerificationInProgressModal'
 import { IconName } from '@/components/Global/Icons/Icon'
-import { saveRedirectUrl } from '@/utils'
-import useClaimLink from '../Claim/useClaimLink'
 
 interface KycModalFlowProps {
     isOpen: boolean
@@ -24,13 +22,10 @@ export const InitiateKYCModal = ({ isOpen, onClose, onKycSuccess, onManualClose,
         handleIframeClose,
         closeVerificationProgressModal,
     } = useKycFlow({ onKycSuccess, flow, onManualClose })
-    const { addParamStep } = useClaimLink()
 
     const handleVerifyClick = async () => {
-        addParamStep('bank')
         const result = await handleInitiateKyc()
         if (result?.success) {
-            saveRedirectUrl()
             onClose()
         }
     }
diff --git a/src/components/Kyc/states/KycCompleted.tsx b/src/components/Kyc/states/KycCompleted.tsx
index 4daf99c7c..bc76803af 100644
--- a/src/components/Kyc/states/KycCompleted.tsx
+++ b/src/components/Kyc/states/KycCompleted.tsx
@@ -5,16 +5,16 @@ import { useMemo } from 'react'
 import { formatDate } from '@/utils'
 
 // this component shows the kyc status when it's completed/approved.
-export const KycCompleted = ({ bridgeKycApprovedAt }: { bridgeKycApprovedAt?: string }) => {
+export const KycCompleted = ({ kycApprovedAt }: { kycApprovedAt?: string }) => {
     const verifiedOn = useMemo(() => {
-        if (!bridgeKycApprovedAt) return 'N/A'
+        if (!kycApprovedAt) return 'N/A'
         try {
-            return formatDate(new Date(bridgeKycApprovedAt))
+            return formatDate(new Date(kycApprovedAt))
         } catch (error) {
             console.error('Failed to parse kycCompletedAt date:', error)
             return 'N/A'
         }
-    }, [bridgeKycApprovedAt])
+    }, [kycApprovedAt])
 
     return (
         <div className="space-y-4">
diff --git a/src/components/Kyc/states/KycFailed.tsx b/src/components/Kyc/states/KycFailed.tsx
index 855680e28..6af9adb15 100644
--- a/src/components/Kyc/states/KycFailed.tsx
+++ b/src/components/Kyc/states/KycFailed.tsx
@@ -9,22 +9,22 @@ import { formatDate } from '@/utils'
 // it displays the reason for the failure and provides a retry button.
 export const KycFailed = ({
     reason,
-    bridgeKycRejectedAt,
+    kycRejectedAt,
     onRetry,
 }: {
     reason: string | null
-    bridgeKycRejectedAt?: string
+    kycRejectedAt?: string
     onRetry: () => void
 }) => {
     const rejectedOn = useMemo(() => {
-        if (!bridgeKycRejectedAt) return 'N/A'
+        if (!kycRejectedAt) return 'N/A'
         try {
-            return formatDate(new Date(bridgeKycRejectedAt))
+            return formatDate(new Date(kycRejectedAt))
         } catch (error) {
-            console.error('Failed to parse bridgeKycRejectedAt date:', error)
+            console.error('Failed to parse kycRejectedAt date:', error)
             return 'N/A'
         }
-    }, [bridgeKycRejectedAt])
+    }, [kycRejectedAt])
 
     return (
         <div className="space-y-4">
diff --git a/src/components/Kyc/states/KycProcessing.tsx b/src/components/Kyc/states/KycProcessing.tsx
index 74a2ad682..4340509ff 100644
--- a/src/components/Kyc/states/KycProcessing.tsx
+++ b/src/components/Kyc/states/KycProcessing.tsx
@@ -5,16 +5,16 @@ import { useMemo } from 'react'
 import { formatDate } from '@/utils'
 
 // this component shows the kyc status while it's being processed.
-export const KycProcessing = ({ bridgeKycStartedAt }: { bridgeKycStartedAt?: string }) => {
+export const KycProcessing = ({ kycStartedAt }: { kycStartedAt?: string }) => {
     const submittedOn = useMemo(() => {
-        if (!bridgeKycStartedAt) return 'N/A'
+        if (!kycStartedAt) return 'N/A'
         try {
-            return formatDate(new Date(bridgeKycStartedAt))
+            return formatDate(new Date(kycStartedAt))
         } catch (error) {
-            console.error('Failed to parse bridgeKycStartedAt date:', error)
+            console.error('Failed to parse kycStartedAt date:', error)
             return 'N/A'
         }
-    }, [bridgeKycStartedAt])
+    }, [kycStartedAt])
 
     return (
         <div className="space-y-4">
diff --git a/src/components/LandingPage/noFees.tsx b/src/components/LandingPage/noFees.tsx
index 6789b4083..2744e27ae 100644
--- a/src/components/LandingPage/noFees.tsx
+++ b/src/components/LandingPage/noFees.tsx
@@ -1,18 +1,84 @@
 'use client'
 
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, useCallback, useMemo } from 'react'
 import { motion } from 'framer-motion'
 import borderCloud from '@/assets/illustrations/border-cloud.svg'
 import noHiddenFees from '@/assets/illustrations/no-hidden-fees.svg'
 import { Star } from '@/assets'
 import Image from 'next/image'
-import ExchangeRateWidget from '../Global/ExchangeRateWidget'
-import { useRouter } from 'next/navigation'
+import { Button } from '../0_Bruddle'
+import CurrencySelect from './CurrencySelect'
+import { Icon } from '../Global/Icons/Icon'
+import { useDebounce } from '@/hooks/useDebounce'
+import { useExchangeRate } from '@/hooks/useExchangeRate'
+import { useSearchParams, useRouter } from 'next/navigation'
+import countryCurrencyMappings from '@/constants/countryCurrencyMapping'
 
 export function NoFees() {
-    const [screenWidth, setScreenWidth] = useState(typeof window !== 'undefined' ? window.innerWidth : 1200)
+    const searchParams = useSearchParams()
     const router = useRouter()
 
+    const [screenWidth, setScreenWidth] = useState(typeof window !== 'undefined' ? window.innerWidth : 1200)
+
+    // Get values from URL or use defaults
+    const sourceCurrency = searchParams.get('from') || 'USD'
+    const destinationCurrency = searchParams.get('to') || 'EUR'
+    const urlSourceAmount = searchParams.get('amount') ? parseFloat(searchParams.get('amount')!) : 10
+
+    // Exchange rate hook handles all the conversion logic
+    const {
+        sourceAmount,
+        destinationAmount,
+        exchangeRate,
+        isLoading,
+        isError,
+        handleSourceAmountChange,
+        handleDestinationAmountChange,
+        getDestinationDisplayValue,
+    } = useExchangeRate({
+        sourceCurrency,
+        destinationCurrency,
+        initialSourceAmount: urlSourceAmount,
+    })
+
+    const debouncedSourceAmount = useDebounce(sourceAmount, 500)
+
+    // Function to update URL parameters
+    const updateUrlParams = useCallback(
+        (params: { from?: string; to?: string; amount?: number }) => {
+            const newSearchParams = new URLSearchParams(searchParams.toString())
+
+            if (params.from) newSearchParams.set('from', params.from)
+            if (params.to) newSearchParams.set('to', params.to)
+            if (params.amount !== undefined) newSearchParams.set('amount', params.amount.toString())
+
+            router.replace(`?${newSearchParams.toString()}`, { scroll: false })
+        },
+        [searchParams, router]
+    )
+
+    // Setter functions that update URL
+    const setSourceCurrency = useCallback(
+        (currency: string) => {
+            updateUrlParams({ from: currency })
+        },
+        [updateUrlParams]
+    )
+
+    const setDestinationCurrency = useCallback(
+        (currency: string) => {
+            updateUrlParams({ to: currency })
+        },
+        [updateUrlParams]
+    )
+
+    // Update URL when source amount changes (only for valid numbers)
+    useEffect(() => {
+        if (typeof debouncedSourceAmount === 'number' && debouncedSourceAmount !== urlSourceAmount) {
+            updateUrlParams({ amount: debouncedSourceAmount })
+        }
+    }, [debouncedSourceAmount, urlSourceAmount, updateUrlParams])
+
     useEffect(() => {
         const handleResize = () => {
             setScreenWidth(window.innerWidth)
@@ -38,6 +104,23 @@ export function NoFees() {
         }
     }
 
+    const sourceCurrencyFlag = useMemo(
+        () => countryCurrencyMappings.find((currency) => currency.currencyCode === sourceCurrency)?.flagCode,
+        [sourceCurrency]
+    )
+
+    const destinationCurrencyFlag = useMemo(
+        () => countryCurrencyMappings.find((currency) => currency.currencyCode === destinationCurrency)?.flagCode,
+        [destinationCurrency]
+    )
+
+    // Determine delivery time text based on destination currency
+    const deliveryTimeText = useMemo(() => {
+        return destinationCurrency === 'USD'
+            ? 'Should arrive in hours. Estimate.'
+            : 'Should arrive in minutes. Estimate.'
+    }, [destinationCurrency])
+
     return (
         <section className="relative overflow-hidden bg-secondary-3 px-4 py-24 md:py-14">
             <div className="absolute left-0 top-0 h-full w-full overflow-hidden">
@@ -124,11 +207,140 @@ export function NoFees() {
                     />
                 </div>
 
-                <ExchangeRateWidget
-                    ctaIcon="arrow-up-right"
-                    ctaLabel="Send Money"
-                    ctaAction={() => router.push('/setup')}
-                />
+                <div className="btn btn-shadow-primary-4 mx-auto mt-12 flex h-fit w-full flex-col items-center justify-center gap-4 bg-white p-7 md:w-[420px]">
+                    <div className="w-full">
+                        <h2 className="text-left text-sm">You Send</h2>
+                        <div className="btn btn-shadow-primary-4 mt-2 flex w-full items-center justify-center gap-4 bg-white p-4">
+                            {isLoading ? (
+                                <div className="flex w-full items-center">
+                                    <div className="h-8 w-40 animate-pulse rounded-full bg-grey-2" />
+                                </div>
+                            ) : (
+                                <input
+                                    min={0}
+                                    placeholder="0"
+                                    value={sourceAmount === '' ? '' : sourceAmount}
+                                    onChange={(e) => {
+                                        const inputValue = e.target.value
+                                        if (inputValue === '') {
+                                            handleSourceAmountChange('')
+                                        } else {
+                                            const value = parseFloat(inputValue)
+                                            handleSourceAmountChange(isNaN(value) ? '' : value)
+                                        }
+                                    }}
+                                    type="number"
+                                    className="w-full bg-transparent outline-none"
+                                />
+                            )}
+                            <CurrencySelect
+                                selectedCurrency={sourceCurrency}
+                                setSelectedCurrency={setSourceCurrency}
+                                // excludeCurrencies={[destinationCurrency]}
+                                trigger={
+                                    <button className="flex w-32 items-center gap-2">
+                                        <Image
+                                            src={`https://flagcdn.com/w320/${sourceCurrencyFlag}.png`}
+                                            alt={`${sourceCurrencyFlag} flag`}
+                                            width={160}
+                                            height={160}
+                                            className="size-4 rounded-full object-cover"
+                                        />
+                                        {sourceCurrency} <Icon name="chevron-down" className="text-gray-1" size={10} />
+                                    </button>
+                                }
+                            />
+                        </div>
+                    </div>
+
+                    <div className="w-full">
+                        <h2 className="text-left text-sm">Recipient Gets</h2>
+                        <div className="btn btn-shadow-primary-4 mt-2 flex w-full items-center justify-center gap-4 bg-white p-4">
+                            {isLoading ? (
+                                <div className="flex w-full items-center">
+                                    <div className="h-8 w-40 animate-pulse rounded-full bg-grey-2" />
+                                </div>
+                            ) : (
+                                <input
+                                    min={0}
+                                    placeholder="0"
+                                    value={getDestinationDisplayValue()}
+                                    onChange={(e) => {
+                                        const inputValue = e.target.value
+                                        if (inputValue === '') {
+                                            handleDestinationAmountChange('', '')
+                                        } else {
+                                            const value = parseFloat(inputValue)
+                                            handleDestinationAmountChange(inputValue, isNaN(value) ? '' : value)
+                                        }
+                                    }}
+                                    type="number"
+                                    className="w-full bg-transparent outline-none"
+                                />
+                            )}
+                            <CurrencySelect
+                                selectedCurrency={destinationCurrency}
+                                setSelectedCurrency={setDestinationCurrency}
+                                trigger={
+                                    <button className="flex w-32 items-center gap-2">
+                                        <Image
+                                            src={`https://flagcdn.com/w320/${destinationCurrencyFlag}.png`}
+                                            alt={`${destinationCurrencyFlag} flag`}
+                                            width={160}
+                                            height={160}
+                                            className="size-4 rounded-full object-cover"
+                                        />
+                                        {destinationCurrency}{' '}
+                                        <Icon name="chevron-down" className="text-gray-1" size={10} />
+                                    </button>
+                                }
+                            />
+                        </div>
+                    </div>
+
+                    <div className="rounded-full bg-grey-4 px-2 py-[2px] text-xs font-bold text-gray-1">
+                        {isLoading ? (
+                            <div className="mx-auto h-3 w-28 animate-pulse rounded-full bg-grey-2" />
+                        ) : isError ? (
+                            <span>Rate currently unavailable</span>
+                        ) : (
+                            <>
+                                1 {sourceCurrency} = {exchangeRate.toFixed(4)} {destinationCurrency}
+                            </>
+                        )}
+                    </div>
+
+                    {typeof destinationAmount === 'number' && destinationAmount > 0 && (
+                        <div className="flex w-full flex-col gap-3 rounded-sm border-[1.15px] border-black px-4 py-2">
+                            <div className="flex items-center justify-between">
+                                <h2 className="text-left text-sm font-normal">Bank fee</h2>
+                                <h2 className="text-left text-sm font-normal">Free!</h2>
+                            </div>
+
+                            <div className="flex items-center justify-between">
+                                <h2 className="text-left text-sm font-normal">Peanut fee</h2>
+                                <h2 className="text-left text-sm font-normal">Free!</h2>
+                            </div>
+                        </div>
+                    )}
+
+                    <Button
+                        onClick={() => router.push('/setup')}
+                        icon="arrow-up-right"
+                        iconSize={13}
+                        shadowSize="4"
+                        className="w-full text-base font-bold"
+                    >
+                        Send Money
+                    </Button>
+
+                    {typeof destinationAmount === 'number' && destinationAmount > 0 && (
+                        <div className="flex items-center">
+                            <Icon name="info" className="text-gray-1" size={10} />
+                            <p className="text-xs text-gray-1">{deliveryTimeText}</p>
+                        </div>
+                    )}
+                </div>
             </div>
         </section>
     )
diff --git a/src/components/Payment/PaymentForm/index.tsx b/src/components/Payment/PaymentForm/index.tsx
index 1d1d2c07a..3415c9883 100644
--- a/src/components/Payment/PaymentForm/index.tsx
+++ b/src/components/Payment/PaymentForm/index.tsx
@@ -8,11 +8,15 @@ import ActionModal from '@/components/Global/ActionModal'
 import AddressLink from '@/components/Global/AddressLink'
 import ErrorAlert from '@/components/Global/ErrorAlert'
 import FileUploadInput from '@/components/Global/FileUploadInput'
+import FlowHeader from '@/components/Global/FlowHeader'
+import GuestLoginCta from '@/components/Global/GuestLoginCta'
 import { IconName } from '@/components/Global/Icons/Icon'
 import NavHeader from '@/components/Global/NavHeader'
 import TokenAmountInput from '@/components/Global/TokenAmountInput'
+import BeerInput from '@/components/PintaReqPay/BeerInput'
+import PintaReqViewWrapper from '@/components/PintaReqPay/PintaReqViewWrapper'
 import UserCard from '@/components/User/UserCard'
-import { PEANUT_WALLET_TOKEN, PEANUT_WALLET_TOKEN_DECIMALS } from '@/constants'
+import { PEANUT_WALLET_TOKEN, PEANUT_WALLET_TOKEN_DECIMALS, PINTA_WALLET_CHAIN, PINTA_WALLET_TOKEN } from '@/constants'
 import { tokenSelectorContext } from '@/context'
 import { useAuth } from '@/context/authContext'
 import { useRequestFulfillmentFlow } from '@/context/RequestFulfillmentFlowContext'
@@ -34,6 +38,7 @@ import { useUserByUsername } from '@/hooks/useUserByUsername'
 import { PaymentFlow } from '@/app/[...recipient]/client'
 
 export type PaymentFlowProps = {
+    isPintaReq?: boolean
     isExternalWalletFlow?: boolean
     /** Whether this is a direct USD payment flow (bypasses token conversion) */
     isDirectUsdPayment?: boolean
@@ -55,6 +60,7 @@ export const PaymentForm = ({
     amount,
     token,
     chain,
+    isPintaReq,
     currency,
     currencyAmount,
     setCurrencyAmount,
@@ -66,7 +72,14 @@ export const PaymentForm = ({
     const dispatch = useAppDispatch()
     const router = useRouter()
     const { user } = useAuth()
-    const { requestDetails, chargeDetails, daimoError, error: paymentStoreError, attachmentOptions } = usePaymentStore()
+    const {
+        requestDetails,
+        chargeDetails,
+        beerQuantity,
+        daimoError,
+        error: paymentStoreError,
+        attachmentOptions,
+    } = usePaymentStore()
     const { setShowExternalWalletFulfilMethods, setExternalWalletFulfilMethod } = useRequestFulfillmentFlow()
     const recipientUsername = !chargeDetails && recipient?.recipientType === 'USERNAME' ? recipient.identifier : null
     const { user: recipientUser } = useUserByUsername(recipientUsername)
@@ -75,8 +88,7 @@ export const PaymentForm = ({
         requestDetails?.recipientAccount?.userId ||
         chargeDetails?.requestLink.recipientAccount.userId ||
         recipientUser?.userId
-    const recipientKycStatus =
-        chargeDetails?.requestLink.recipientAccount.user?.bridgeKycStatus || recipientUser?.bridgeKycStatus
+    const recipientKycStatus = chargeDetails?.requestLink.recipientAccount.user?.kycStatus || recipientUser?.kycStatus
 
     const { interactions } = useUserInteractions(recipientUserId ? [recipientUserId] : [])
     const { isConnected: isPeanutWalletConnected, balance } = useWallet()
@@ -197,7 +209,7 @@ export const PaymentForm = ({
                     dispatch(paymentActions.setError(null))
                 }
             } else {
-                // regular send/pay
+                // regular send/pay or PINTA flow
                 if (isActivePeanutWallet && areEvmAddressesEqual(selectedTokenAddress, PEANUT_WALLET_TOKEN)) {
                     // peanut wallet payment
                     const walletNumeric = parseFloat(String(peanutWalletBalance).replace(/,/g, ''))
@@ -254,6 +266,7 @@ export const PaymentForm = ({
 
     // fetch token price
     useEffect(() => {
+        if (isPintaReq) return
         if (!requestDetails?.tokenAddress || !requestDetails?.chainId) return
 
         const getTokenPriceData = async () => {
@@ -282,11 +295,13 @@ export const PaymentForm = ({
         }
 
         getTokenPriceData()
-    }, [requestDetails])
+    }, [requestDetails, isPintaReq])
 
     const canInitiatePayment = useMemo<boolean>(() => {
         let amountIsSet = false
-        if (isActivePeanutWallet) {
+        if (isPintaReq) {
+            amountIsSet = beerQuantity > 0
+        } else if (isActivePeanutWallet) {
             amountIsSet = !!inputTokenAmount && parseFloat(inputTokenAmount) > 0
         } else {
             amountIsSet =
@@ -304,6 +319,8 @@ export const PaymentForm = ({
         usdValue,
         selectedTokenAddress,
         selectedChainID,
+        isPintaReq,
+        beerQuantity,
         isConnected,
         isActivePeanutWallet,
     ])
@@ -326,6 +343,43 @@ export const PaymentForm = ({
 
         if (!canInitiatePayment) return
 
+        // for PINTA requests, validate beer quantity first
+        if (isPintaReq) {
+            if (beerQuantity <= 0) {
+                dispatch(paymentActions.setError('Please select at least 1 beer to continue.'))
+                return
+            }
+
+            try {
+                const payload = {
+                    recipient: recipient,
+                    tokenAmount: beerQuantity.toString(),
+                    isPintaReq: true,
+                    requestId: requestId ?? undefined,
+                    chainId: PINTA_WALLET_CHAIN.id.toString(),
+                    tokenAddress: PINTA_WALLET_TOKEN,
+                }
+
+                console.log('Initiating PINTA payment with payload:', payload)
+
+                const result = await initiatePayment(payload)
+
+                if (result.status === 'Success') {
+                    dispatch(paymentActions.setView('STATUS'))
+                } else if (result.status === 'Charge Created') {
+                    dispatch(paymentActions.setView('CONFIRM'))
+                } else if (result.status === 'Error') {
+                    console.error('PINTA payment initiation failed:', result.error)
+                }
+                return
+            } catch (error) {
+                console.error('Failed to initiate PINTA payment:', error)
+                const errorString = ErrorHandler(error)
+                dispatch(paymentActions.setError(errorString))
+                return
+            }
+        }
+
         // regular payment flow
         if (!inputTokenAmount || parseFloat(inputTokenAmount) <= 0) {
             console.error('Invalid amount entered')
@@ -365,6 +419,7 @@ export const PaymentForm = ({
         const payload: InitiatePaymentPayload = {
             recipient: recipient,
             tokenAmount,
+            isPintaReq: false, // explicitly set to false for non-PINTA requests
             requestId: requestId ?? undefined,
             chargeId: chargeDetails?.uuid,
             currency,
@@ -398,8 +453,10 @@ export const PaymentForm = ({
         openReownModal,
         recipient,
         inputTokenAmount,
+        isPintaReq,
         requestId,
         initiatePayment,
+        beerQuantity,
         chargeDetails,
         isExternalWalletFlow,
         requestDetails,
@@ -459,6 +516,12 @@ export const PaymentForm = ({
         return undefined
     }
 
+    useEffect(() => {
+        if (isPintaReq && inputTokenAmount) {
+            dispatch(paymentActions.setBeerQuantity(Number(inputTokenAmount)))
+        }
+    }, [isPintaReq, inputTokenAmount, dispatch])
+
     useEffect(() => {
         if (!inputTokenAmount) return
         if (selectedTokenPrice) {
@@ -473,6 +536,14 @@ export const PaymentForm = ({
         }
     }, [amount, inputTokenAmount, initialSetupDone])
 
+    // Init beer quantity
+    useEffect(() => {
+        if (!inputTokenAmount) return
+        if (isPintaReq) {
+            dispatch(paymentActions.setBeerQuantity(Number(inputTokenAmount)))
+        }
+    }, [isPintaReq, inputTokenAmount])
+
     const isInsufficientBalanceError = useMemo(() => {
         return error?.includes("You don't have enough balance.")
     }, [error])
@@ -502,7 +573,13 @@ export const PaymentForm = ({
 
         if (flow === 'request_pay') return false
 
-        // fallback for other cases if not explicitly handled above
+        // logic for non-AddMoneyFlow / non-Pinta (Pinta has its own button logic)
+        if (!isPintaReq) {
+            if (!isConnected) return true // if not connected at all, disable (covers guest non-Peanut scenarios)
+
+            if (!selectedTokenAddress || !selectedChainID) return true // must have token/chain
+        }
+        // fallback for Pinta or other cases if not explicitly handled above
         return false
     }, [
         isProcessing,
@@ -514,8 +591,37 @@ export const PaymentForm = ({
         selectedChainID,
         isConnected,
         isActivePeanutWallet,
+        isPintaReq,
     ])
 
+    if (isPintaReq) {
+        return (
+            <div className="space-y-4">
+                {!!user && <FlowHeader />}
+                <PintaReqViewWrapper view="INITIAL">
+                    <BeerInput disabled={!!amount || !!requestDetails?.tokenAmount || isProcessing} />
+                    <div className="space-y-4">
+                        {!user ? (
+                            <GuestLoginCta hideConnectWallet view="CLAIM" />
+                        ) : (
+                            <Button
+                                shadowSize="4"
+                                variant="purple"
+                                onClick={handleInitiatePayment}
+                                disabled={beerQuantity === 0 || isProcessing}
+                                loading={isProcessing}
+                                className="w-full"
+                            >
+                                {getButtonText()}
+                            </Button>
+                        )}
+                        {error && <ErrorAlert description={error} />}
+                    </div>
+                </PintaReqViewWrapper>
+            </div>
+        )
+    }
+
     const recipientDisplayName = useMemo(() => {
         return recipient ? recipient.identifier : 'Unknown Recipient'
     }, [recipient])
diff --git a/src/components/Payment/Views/Confirm.payment.view.tsx b/src/components/Payment/Views/Confirm.payment.view.tsx
index 4dd41cdad..7e305dbbd 100644
--- a/src/components/Payment/Views/Confirm.payment.view.tsx
+++ b/src/components/Payment/Views/Confirm.payment.view.tsx
@@ -1,20 +1,24 @@
 'use client'
 
 import { Button } from '@/components/0_Bruddle'
+import Divider from '@/components/0_Bruddle/Divider'
 import ActionModal from '@/components/Global/ActionModal'
 import Card from '@/components/Global/Card'
 import DisplayIcon from '@/components/Global/DisplayIcon'
 import ErrorAlert from '@/components/Global/ErrorAlert'
+import FlowHeader from '@/components/Global/FlowHeader'
 import { IconName } from '@/components/Global/Icons/Icon'
 import NavHeader from '@/components/Global/NavHeader'
 import PeanutActionDetailsCard from '@/components/Global/PeanutActionDetailsCard'
 import PeanutLoading from '@/components/Global/PeanutLoading'
+import PeanutSponsored from '@/components/Global/PeanutSponsored'
+import PintaReqViewWrapper from '@/components/PintaReqPay/PintaReqViewWrapper'
 import { TRANSACTIONS } from '@/constants/query.consts'
 import { tokenSelectorContext } from '@/context'
 import { usePaymentInitiator } from '@/hooks/usePaymentInitiator'
 import { useTokenChainIcons } from '@/hooks/useTokenChainIcons'
 import { useWallet } from '@/hooks/wallet/useWallet'
-import { useAppDispatch, usePaymentStore } from '@/redux/hooks'
+import { useAppDispatch, usePaymentStore, useWalletStore } from '@/redux/hooks'
 import { paymentActions } from '@/redux/slices/payment-slice'
 import { chargesApi } from '@/services/charges'
 import { ErrorHandler, formatAmount, areEvmAddressesEqual, isStableCoin } from '@/utils'
@@ -35,6 +39,7 @@ import { captureMessage } from '@sentry/nextjs'
 import AddressLink from '@/components/Global/AddressLink'
 
 type ConfirmPaymentViewProps = {
+    isPintaReq?: boolean
     currency?: {
         code: string
         symbol: string
@@ -53,12 +58,14 @@ type ConfirmPaymentViewProps = {
  * transaction execution for various payment flows including cross-chain payments, direct USD
  * payments, and add money flows.
  *
+ * @param isPintaReq - Whether this is a Pinta request payment (beer payment flow)
  * @param currency - Currency details for display (code, symbol, price)
  * @param currencyAmount - Amount in the specified currency
  * @param isExternalWalletFlow - Whether this is an add money flow (deposit to wallet)
  * @param isDirectUsdPayment - Whether this is a direct payment, for xchain we dont care if a little less arrives
  */
 export default function ConfirmPaymentView({
+    isPintaReq = false,
     currency,
     currencyAmount,
     isExternalWalletFlow,
@@ -68,7 +75,7 @@ export default function ConfirmPaymentView({
     const dispatch = useAppDispatch()
     const searchParams = useSearchParams()
     const chargeIdFromUrl = searchParams.get('chargeId')
-    const { chargeDetails, parsedPaymentData, usdAmount } = usePaymentStore()
+    const { chargeDetails, parsedPaymentData, beerQuantity, usdAmount } = usePaymentStore()
     const {
         initiatePayment,
         prepareTransactionDetails,
@@ -86,6 +93,7 @@ export default function ConfirmPaymentView({
     const { selectedTokenData, selectedChainID } = useContext(tokenSelectorContext)
     const { isConnected: isPeanutWallet, fetchBalance, address: peanutWalletAddress } = useWallet()
     const { isConnected: isWagmiConnected, address: wagmiAddress } = useAccount()
+    const { rewardWalletBalance } = useWalletStore()
     const queryClient = useQueryClient()
     const [isRouteExpired, setIsRouteExpired] = useState(false)
 
@@ -161,9 +169,7 @@ export default function ConfirmPaymentView({
                     dispatch(paymentActions.setChargeDetails(null))
                 })
         } else if (!chargeIdFromUrl && !chargeDetails) {
-            dispatch(
-                paymentActions.setError('Payment details are missing. Please go back and try again or contact support.')
-            )
+            dispatch(paymentActions.setError('Payment details are missing. Please go back and try again.'))
         }
     }, [chargeIdFromUrl, chargeDetails, dispatch])
 
@@ -206,6 +212,10 @@ export default function ConfirmPaymentView({
     }, [handleRouteRefresh])
 
     const isConnected = useMemo(() => isPeanutWallet || isWagmiConnected, [isPeanutWallet, isWagmiConnected])
+    const isInsufficientRewardsBalance = useMemo(() => {
+        if (!isPintaReq) return false
+        return Number(rewardWalletBalance) < beerQuantity
+    }, [isPintaReq, rewardWalletBalance, beerQuantity])
 
     const isLoading = useMemo(
         () => isProcessing || isPreparingTx || isCalculatingFees || isEstimatingGas,
@@ -266,9 +276,15 @@ export default function ConfirmPaymentView({
     const handlePayment = useCallback(async () => {
         if (!chargeDetails || !parsedPaymentData) return
 
+        if (isPintaReq && beerQuantity <= 0) {
+            dispatch(paymentActions.setError('Please select at least 1 beer to continue.'))
+            return
+        }
+
         const result = await initiatePayment({
             recipient: parsedPaymentData.recipient,
-            tokenAmount: chargeDetails.tokenAmount,
+            tokenAmount: isPintaReq ? beerQuantity.toString() : chargeDetails.tokenAmount,
+            isPintaReq: isPintaReq,
             chargeId: chargeDetails.uuid,
             skipChargeCreation: true,
             currency,
@@ -289,6 +305,8 @@ export default function ConfirmPaymentView({
         initiatePayment,
         parsedPaymentData,
         dispatch,
+        isPintaReq,
+        beerQuantity,
         fetchBalance,
         queryClient,
         currency,
@@ -314,8 +332,9 @@ export default function ConfirmPaymentView({
         }
         if (isExternalWalletFlow) return buttonText
         if (isEstimatingGas || isCalculatingFees || isPreparingTx) return 'Send'
+        if (isPintaReq) return 'Confirm Payment'
         return 'Send'
-    }, [isProcessing, loadingStep, isPreparingTx, isEstimatingGas, isCalculatingFees, isExternalWalletFlow])
+    }, [isProcessing, loadingStep, isPreparingTx, isEstimatingGas, isCalculatingFees, isPintaReq, isExternalWalletFlow])
 
     const getIcon = useCallback((): IconName | undefined => {
         if (isExternalWalletFlow && headerTitle) return 'arrow-up-right'
@@ -352,6 +371,48 @@ export default function ConfirmPaymentView({
         )
     }
 
+    if (isPintaReq) {
+        return (
+            <div className="space-y-4">
+                <FlowHeader onPrev={handleGoBack} />
+                <PintaReqViewWrapper view="CONFIRM">
+                    <div className="flex flex-col items-center justify-center gap-3 pt-2">
+                        <div className="text-h8">You're paying for</div>
+                        <div className="space-y-2 text-center">
+                            <div className="text-h5 font-bold">
+                                {beerQuantity} {beerQuantity > 1 ? 'Beers' : 'Beer'}
+                            </div>
+                            <p className="text-xs font-normal">From your Beer Account</p>
+                        </div>
+                    </div>
+                    <PeanutSponsored />
+                    <Divider />
+                    <Button
+                        variant="purple"
+                        onClick={handlePayment}
+                        disabled={
+                            !isConnected ||
+                            isLoading ||
+                            isInsufficientRewardsBalance ||
+                            beerQuantity <= 0 ||
+                            isFeeEstimationError
+                        }
+                        loading={isLoading}
+                    >
+                        {getButtonText()}
+                    </Button>
+                    {beerQuantity <= 0 && <ErrorAlert description="Please select at least 1 beer to continue." />}
+                    {isInsufficientRewardsBalance && (
+                        <ErrorAlert
+                            description={`You do not have enough balance in your Beer Account to claim ${beerQuantity} beers.`}
+                        />
+                    )}
+                    {paymentError && <ErrorAlert description={paymentError} />}
+                </PintaReqViewWrapper>
+            </div>
+        )
+    }
+
     const minReceived = useMemo<string | null>(() => {
         if (!chargeDetails?.tokenDecimals || !requestedResolvedTokenSymbol) return null
         if (!xChainRoute) {
diff --git a/src/components/Payment/Views/Initial.payment.view.tsx b/src/components/Payment/Views/Initial.payment.view.tsx
index c3149fe11..6df7770c2 100644
--- a/src/components/Payment/Views/Initial.payment.view.tsx
+++ b/src/components/Payment/Views/Initial.payment.view.tsx
@@ -1,9 +1,12 @@
 import { PaymentForm, PaymentFormProps } from '../PaymentForm'
 
 export default function InitialPaymentView(props: PaymentFormProps) {
+    const isPintaReq = props.token?.symbol === 'PNT' || props.isPintaReq
+
     return (
         <PaymentForm
             {...props}
+            isPintaReq={isPintaReq}
             isExternalWalletFlow={props.isExternalWalletFlow}
             isDirectUsdPayment={props.isDirectUsdPayment}
         />
diff --git a/src/components/Payment/Views/Status.payment.view.tsx b/src/components/Payment/Views/Status.payment.view.tsx
index 1b16063d2..072280be1 100644
--- a/src/components/Payment/Views/Status.payment.view.tsx
+++ b/src/components/Payment/Views/Status.payment.view.tsx
@@ -1,9 +1,7 @@
 'use client'
-import { PEANUT_LOGO_BLACK, PEANUTMAN_LOGO } from '@/assets'
 import { Button } from '@/components/0_Bruddle'
 import AddressLink from '@/components/Global/AddressLink'
 import Card from '@/components/Global/Card'
-import CreateAccountButton from '@/components/Global/CreateAccountButton'
 import { Icon } from '@/components/Global/Icons/Icon'
 import NavHeader from '@/components/Global/NavHeader'
 import { SoundPlayer } from '@/components/Global/SoundPlayer'
@@ -20,7 +18,6 @@ import { paymentActions } from '@/redux/slices/payment-slice'
 import { ApiUser } from '@/services/users'
 import { formatAmount, getInitialsFromName, printableAddress } from '@/utils'
 import { useQueryClient } from '@tanstack/react-query'
-import Image from 'next/image'
 import { useRouter } from 'next/navigation'
 import { ReactNode, useEffect, useMemo } from 'react'
 import { useDispatch } from 'react-redux'
@@ -36,7 +33,6 @@ type DirectSuccessViewProps = {
     isExternalWalletFlow?: boolean
     isWithdrawFlow?: boolean
     redirectTo?: string
-    onComplete?: () => void
 }
 
 const DirectSuccessView = ({
@@ -50,7 +46,6 @@ const DirectSuccessView = ({
     isExternalWalletFlow,
     isWithdrawFlow,
     redirectTo = '/home',
-    onComplete,
 }: DirectSuccessViewProps) => {
     const router = useRouter()
     const { chargeDetails, parsedPaymentData, usdAmount, paymentDetails } = usePaymentStore()
@@ -164,7 +159,6 @@ const DirectSuccessView = ({
     }, [queryClient])
 
     const handleDone = () => {
-        onComplete?.()
         if (!!authUser?.user.userId) {
             // reset payment state when done
             router.push('/home')
@@ -190,7 +184,6 @@ const DirectSuccessView = ({
                         icon="cancel"
                         title={headerTitle}
                         onPrev={() => {
-                            onComplete?.()
                             router.push(redirectTo)
                         }}
                     />
@@ -237,7 +230,9 @@ const DirectSuccessView = ({
                             Back to home
                         </Button>
                     ) : (
-                        <CreateAccountButton onClick={() => router.push('/setup')} />
+                        <Button icon="user-plus" onClick={() => router.push('/setup')} shadowSize="4">
+                            Create Account
+                        </Button>
                     )}
                     {type === 'SEND' && !isExternalWalletFlow && !isWithdrawFlow && (
                         <Button
diff --git a/src/components/PintaReqPay/BeerInput.tsx b/src/components/PintaReqPay/BeerInput.tsx
new file mode 100644
index 000000000..5ca4ff3b0
--- /dev/null
+++ b/src/components/PintaReqPay/BeerInput.tsx
@@ -0,0 +1,60 @@
+import { useAppDispatch, usePaymentStore } from '@/redux/hooks'
+import { paymentActions } from '@/redux/slices/payment-slice'
+import { twMerge } from 'tailwind-merge'
+import { Button } from '../0_Bruddle'
+import Icon from '../Global/Icon'
+
+type BeerInputProps = {
+    min?: number
+    max?: number
+    disabled?: boolean
+}
+
+const BeerInput: React.FC<BeerInputProps> = ({ min = 1, max = 99, disabled = false }) => {
+    const { beerQuantity } = usePaymentStore()
+    const dispatch = useAppDispatch()
+
+    const increment = () => {
+        if (beerQuantity < max) dispatch(paymentActions.setBeerQuantity(Math.floor(beerQuantity + 1)))
+    }
+
+    const decrement = () => {
+        if (beerQuantity > min) dispatch(paymentActions.setBeerQuantity(Math.floor(beerQuantity - 1)))
+    }
+
+    // ensure beerQuantity is always a whole number
+    const displayQuantity = Math.floor(beerQuantity)
+
+    return (
+        <div className="relative flex w-full items-center justify-center border border-black p-3">
+            <div className={twMerge('mx-auto flex items-center gap-2', displayQuantity === 0 && 'text-gray-1')}>
+                <span className="text-h1">{displayQuantity}</span>
+                <span className="text-h5 font-bold">{displayQuantity > 1 ? 'Beers' : 'Beer'}</span>
+            </div>
+            {!disabled && (
+                <div className="absolute right-4 flex flex-col ">
+                    <Button
+                        size="medium"
+                        variant="transparent-dark"
+                        onClick={increment}
+                        className="w-12 p-0 hover:bg-gray-50"
+                        aria-label="Increase beer count"
+                    >
+                        <Icon name="arrow-bottom" className="h-10 w-10 rotate-180" />
+                    </Button>
+                    <Button
+                        size="medium"
+                        variant="transparent-dark"
+                        onClick={decrement}
+                        className="w-12 p-0 hover:bg-gray-50"
+                        aria-label="Decrease beer count"
+                    >
+                        <Icon name="arrow-bottom" className="h-5 w-5" />
+                    </Button>
+                </div>
+            )}
+        </div>
+    )
+}
+
+export default BeerInput
diff --git a/src/components/PintaReqPay/PintaReqViewWrapper.tsx b/src/components/PintaReqPay/PintaReqViewWrapper.tsx
new file mode 100644
index 000000000..59abcb4e5
--- /dev/null
+++ b/src/components/PintaReqPay/PintaReqViewWrapper.tsx
@@ -0,0 +1,40 @@
+import { Card } from '../0_Bruddle'
+interface PintaReqViewWrapperProps {
+    children: React.ReactNode
+    view: 'INITIAL' | 'CONFIRM' | 'SUCCESS' | 'ERROR'
+}
+
+const PintaReqViewWrapper = ({ children, view }: PintaReqViewWrapperProps) => {
+    const viewContentMap = {
+        INITIAL: {
+            title: 'Get your Beer',
+            description: 'Exchange your Pinta Tokens for cold beer at this bar. Each token gets you drink.',
+        },
+        CONFIRM: {
+            title: 'Get your Beer',
+            description: 'Exchange your Pinta Tokens for cold beer at this bar. Each token gets you drink.',
+        },
+        SUCCESS: {
+            title: 'Your beer is on its way!',
+            description: 'Enjoy it! Nothing goes better with a beer than a handful of Peanuts.',
+        },
+        ERROR: {
+            title: 'There was an error',
+            description: 'Please try again later.',
+        },
+    }
+
+    const { title, description } = viewContentMap[view] || viewContentMap.INITIAL
+
+    return (
+        <Card>
+            <Card.Header>
+                <Card.Title className="font-extrabold">{title}</Card.Title>
+                <Card.Description>{description}</Card.Description>
+            </Card.Header>
+            <Card.Content className="space-y-4">{children}</Card.Content>
+        </Card>
+    )
+}
+
+export default PintaReqViewWrapper
diff --git a/src/components/PintaReqPay/Views/Success.pinta.view.tsx b/src/components/PintaReqPay/Views/Success.pinta.view.tsx
new file mode 100644
index 000000000..69f3f6f71
--- /dev/null
+++ b/src/components/PintaReqPay/Views/Success.pinta.view.tsx
@@ -0,0 +1,98 @@
+import { Button } from '@/components/0_Bruddle'
+import Divider from '@/components/0_Bruddle/Divider'
+import FlowHeader from '@/components/Global/FlowHeader'
+import { useWallet } from '@/hooks/wallet/useWallet'
+import { useAppDispatch, useWalletStore } from '@/redux/hooks'
+import { paymentActions } from '@/redux/slices/payment-slice'
+import { walletActions } from '@/redux/slices/wallet-slice'
+import { chargesApi } from '@/services/charges'
+import Link from 'next/link'
+import { useSearchParams } from 'next/navigation'
+import { useEffect, useMemo, useState } from 'react'
+import PintaReqViewWrapper from '../PintaReqViewWrapper'
+
+const PintaReqPaySuccessView = () => {
+    const dispatch = useAppDispatch()
+    const { rewardWalletBalance } = useWalletStore()
+    const { getRewardWalletBalance } = useWallet()
+    const [isPooling, setIsPolling] = useState(true)
+    const remainingBeers = useMemo(() => Math.floor(Number(rewardWalletBalance)), [rewardWalletBalance])
+    const searchParams = useSearchParams()
+    const chargeId = searchParams.get('chargeId')
+
+    // poll for payment status
+    useEffect(() => {
+        let intervalId: NodeJS.Timeout | undefined
+
+        const pollStatus = async () => {
+            if (!chargeId) return
+
+            try {
+                const updatedCharge = await chargesApi.get(chargeId)
+                dispatch(paymentActions.setChargeDetails(updatedCharge))
+
+                // stop polling if payment is in final state
+                const finalStatus = updatedCharge.payments?.[0]?.status
+                if (finalStatus === 'SUCCESSFUL' || finalStatus === 'FAILED') {
+                    setIsPolling(false)
+                    if (intervalId) {
+                        clearInterval(intervalId)
+                    }
+
+                    // if successful, refetch the reward balance
+                    if (finalStatus === 'SUCCESSFUL') {
+                        const updatedBalance = await getRewardWalletBalance()
+                        dispatch(walletActions.setRewardWalletBalance(updatedBalance))
+                    }
+                }
+            } catch (error) {
+                console.error('Failed to fetch status:', error)
+                setIsPolling(false)
+                if (intervalId) {
+                    clearInterval(intervalId)
+                }
+            }
+        }
+
+        if (chargeId && isPooling) {
+            pollStatus()
+            intervalId = setInterval(pollStatus, 5000)
+        }
+
+        return () => {
+            if (intervalId) {
+                clearInterval(intervalId)
+            }
+        }
+    }, [chargeId, dispatch, isPooling, getRewardWalletBalance])
+
+    return (
+        <div>
+            <div className="space-y-4">
+                <FlowHeader
+                    onPrev={() => {
+                        dispatch(paymentActions.setView('CONFIRM'))
+                    }}
+                />
+
+                <PintaReqViewWrapper view="SUCCESS">
+                    <div className="flex flex-col items-center justify-center gap-3 pt-2">
+                        <div className="text-h8">You have</div>
+                        <div className="space-y-2 text-center">
+                            <div className="text-h5 font-bold">
+                                {remainingBeers} {remainingBeers > 1 ? 'Beers' : 'Beer'}
+                            </div>
+                            <p className="text-xs font-semibold">remaining</p>
+                        </div>
+                    </div>
+                    <Divider />
+                    <Link href={'/home'} className="block">
+                        <Button variant="purple">Back to home</Button>
+                    </Link>
+                </PintaReqViewWrapper>
+            </div>
+        </div>
+    )
+}
+
+export default PintaReqPaySuccessView
diff --git a/src/components/Profile/components/ProfileHeader.tsx b/src/components/Profile/components/ProfileHeader.tsx
index ad325af11..05b505f6d 100644
--- a/src/components/Profile/components/ProfileHeader.tsx
+++ b/src/components/Profile/components/ProfileHeader.tsx
@@ -29,12 +29,13 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
     haveSentMoneyToUser = false,
 }) => {
     const { user: authenticatedUser } = useAuth()
-    const isAuthenticatedUserVerified = authenticatedUser?.user.bridgeKycStatus === 'approved'
+    const isAuthenticatedUserVerified = authenticatedUser?.user.kycStatus === 'approved'
     const [isDrawerOpen, setIsDrawerOpen] = useState(false)
-    const isSelfProfile = authenticatedUser?.user.username?.toLowerCase() === username.toLowerCase()
 
     const profileUrl = `${BASE_URL}/${username}`
 
+    console.log('isVerified', isVerified)
+
     return (
         <>
             <div className={twMerge('flex flex-col items-center space-y-2', className)}>
@@ -48,7 +49,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
                     className="text-2xl font-bold"
                     iconSize={20}
                     haveSentMoneyToUser={haveSentMoneyToUser}
-                    isAuthenticatedUserVerified={isAuthenticatedUserVerified && isSelfProfile} // can be true only for self profile
+                    isAuthenticatedUserVerified={isAuthenticatedUserVerified}
                 />
                 {/* Username with share drawer */}
                 {showShareButton && (
diff --git a/src/components/Profile/components/ProfileMenuItem.tsx b/src/components/Profile/components/ProfileMenuItem.tsx
index 862864320..2254f5e48 100644
--- a/src/components/Profile/components/ProfileMenuItem.tsx
+++ b/src/components/Profile/components/ProfileMenuItem.tsx
@@ -1,7 +1,6 @@
 import StatusBadge from '@/components/Global/Badges/StatusBadge'
 import Card, { CardPosition } from '@/components/Global/Card'
 import { Icon, IconName } from '@/components/Global/Icons/Icon'
-import { Tooltip } from '@/components/Tooltip'
 import Link from 'next/link'
 import React from 'react'
 import { twMerge } from 'tailwind-merge'
@@ -16,8 +15,6 @@ interface ProfileMenuItemProps {
     isExternalLink?: boolean
     endIcon?: IconName
     endIconClassName?: string
-    showTooltip?: boolean
-    toolTipText?: string
 }
 
 const ProfileMenuItem: React.FC<ProfileMenuItemProps> = ({
@@ -30,19 +27,12 @@ const ProfileMenuItem: React.FC<ProfileMenuItemProps> = ({
     isExternalLink,
     endIcon,
     endIconClassName,
-    showTooltip = false,
-    toolTipText,
 }) => {
     const content = (
         <div className="flex items-center justify-between py-1">
             <div className="flex items-center gap-2">
                 <Icon name={icon} size={20} fill="black" />
                 <span className="text-base font-medium">{label}</span>
-                {showTooltip && (
-                    <Tooltip content={toolTipText}>
-                        <Icon name="info" size={14} fill="black" />
-                    </Tooltip>
-                )}
             </div>
 
             <div className="flex items-center">
diff --git a/src/components/Profile/components/PublicProfile.tsx b/src/components/Profile/components/PublicProfile.tsx
index 81bfa1181..54e2cf761 100644
--- a/src/components/Profile/components/PublicProfile.tsx
+++ b/src/components/Profile/components/PublicProfile.tsx
@@ -16,7 +16,6 @@ import { useRouter } from 'next/navigation'
 import Card from '@/components/Global/Card'
 import chillPeanutAnim from '@/animations/GIF_ALPHA_BACKGORUND/512X512_ALPHA_GIF_konradurban_01.gif'
 import { checkIfInternalNavigation } from '@/utils'
-import { useAuth } from '@/context/authContext'
 
 interface PublicProfileProps {
     username: string
@@ -30,8 +29,6 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ username, isLoggedIn = fa
     const [fullName, setFullName] = useState<string>(username)
     const [isKycVerified, setIsKycVerified] = useState<boolean>(false)
     const router = useRouter()
-    const { user } = useAuth()
-    const isSelfProfile = user?.user.username?.toLowerCase() === username.toLowerCase()
 
     // Handle send button click
     const handleSend = () => {
@@ -45,7 +42,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ username, isLoggedIn = fa
     useEffect(() => {
         usersApi.getByUsername(username).then((user) => {
             if (user?.fullName) setFullName(user.fullName)
-            if (user?.bridgeKycStatus === 'approved') setIsKycVerified(true)
+            if (user?.kycStatus === 'approved') setIsKycVerified(true)
             // to check if the logged in user has sent money to the profile user,
             // we check the amount that the profile user has received from the logged in user.
             if (user?.totalUsdReceivedFromCurrentUser) {
@@ -95,34 +92,32 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ username, isLoggedIn = fa
                 />
 
                 {/* Action Buttons */}
-                {!isSelfProfile && (
-                    <div className="flex items-center justify-normal gap-4">
+                <div className="flex items-center justify-normal gap-4">
+                    <Button
+                        onClick={handleSend}
+                        variant="purple"
+                        shadowSize="4"
+                        className="flex w-1/2 items-center justify-center gap-2 rounded-full py-3"
+                    >
+                        <div className="flex size-5 items-center justify-center">
+                            <Icon name="arrow-up-right" size={8} fill="black" />
+                        </div>
+                        <span className="font-bold">Send</span>
+                    </Button>
+
+                    <Link href={`/request/${username}`} className="w-1/2">
                         <Button
-                            onClick={handleSend}
                             variant="purple"
                             shadowSize="4"
-                            className="flex w-1/2 items-center justify-center gap-2 rounded-full py-3"
+                            className="flex items-center justify-center gap-2 rounded-full py-3"
                         >
                             <div className="flex size-5 items-center justify-center">
-                                <Icon name="arrow-up-right" size={8} fill="black" />
+                                <Icon name="arrow-down-left" size={8} fill="black" />
                             </div>
-                            <span className="font-bold">Send</span>
+                            <span className="font-bold">Request</span>
                         </Button>
-
-                        <Link href={`/request/${username}`} className="w-1/2">
-                            <Button
-                                variant="purple"
-                                shadowSize="4"
-                                className="flex items-center justify-center gap-2 rounded-full py-3"
-                            >
-                                <div className="flex size-5 items-center justify-center">
-                                    <Icon name="arrow-down-left" size={8} fill="black" />
-                                </div>
-                                <span className="font-bold">Request</span>
-                            </Button>
-                        </Link>
-                    </div>
-                )}
+                    </Link>
+                </div>
 
                 {/* Show create account box to guest users */}
                 {!isLoggedIn && (
diff --git a/src/components/Profile/components/ShowNameToggle.tsx b/src/components/Profile/components/ShowNameToggle.tsx
deleted file mode 100644
index e64bcf4eb..000000000
--- a/src/components/Profile/components/ShowNameToggle.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-'use client'
-
-import { updateUserById } from '@/app/actions/users'
-import Loading from '@/components/Global/Loading'
-import { useAuth } from '@/context/authContext'
-import { useState } from 'react'
-
-const ShowNameToggle = () => {
-    const { fetchUser, user } = useAuth()
-    const [isToggleLoading, setIsToggleLoading] = useState(false)
-    const [showFullName, setShowFullName] = useState(user?.user.showFullName ?? false)
-
-    const handleToggleChange = async () => {
-        if (isToggleLoading) return
-
-        setIsToggleLoading(true)
-        try {
-            setShowFullName(!showFullName)
-            await updateUserById({
-                userId: user?.user.userId,
-                showFullName: !showFullName,
-            })
-            await fetchUser()
-        } catch (error) {
-            console.error('Failed to update preferences:', error)
-        } finally {
-            setIsToggleLoading(false)
-        }
-    }
-    return (
-        <button
-            onClick={handleToggleChange}
-            disabled={isToggleLoading}
-            className={`relative inline-flex h-6 w-11 items-center rounded-full border border-black transition-colors duration-200 ease-in-out focus:outline-none ${
-                isToggleLoading ? 'cursor-not-allowed opacity-50' : 'cursor-pointer'
-            }`}
-        >
-            {isToggleLoading ? (
-                <div className="flex h-full w-full items-center justify-center">
-                    <Loading className="h-3 w-3" />
-                </div>
-            ) : (
-                <span
-                    className={`inline-block h-4 w-4 transform rounded-full bg-primary-1 transition-transform duration-200 ease-in-out ${
-                        showFullName ? 'translate-x-6' : 'translate-x-1'
-                    }`}
-                />
-            )}
-        </button>
-    )
-}
-
-export default ShowNameToggle
diff --git a/src/components/Profile/index.tsx b/src/components/Profile/index.tsx
index c2b6c3fef..e0b2f4c76 100644
--- a/src/components/Profile/index.tsx
+++ b/src/components/Profile/index.tsx
@@ -10,8 +10,6 @@ import { useRouter } from 'next/navigation'
 import { checkIfInternalNavigation } from '@/utils'
 import ActionModal from '../Global/ActionModal'
 import { useState } from 'react'
-import Card from '../Global/Card'
-import ShowNameToggle from './components/ShowNameToggle'
 
 export const Profile = () => {
     const { logoutUser, isLoggingOut, user } = useAuth()
@@ -25,7 +23,7 @@ export const Profile = () => {
     const fullName = user?.user.fullName || user?.user?.username || 'Anonymous User'
     const username = user?.user.username || 'anonymous'
 
-    const isKycApproved = user?.user.bridgeKycStatus === 'approved'
+    const isKycApproved = user?.user.kycStatus === 'approved'
 
     return (
         <div className="h-full w-full bg-background">
@@ -46,17 +44,18 @@ export const Profile = () => {
                 <ProfileHeader name={fullName || username} username={username} isVerified={isKycApproved} />
                 <div className="space-y-4">
                     {/* Menu Item - Invite Entry */}
-                    {/* Enable with Invites project. */}
-                    {/* <ProfileMenuItem
+                    <ProfileMenuItem
                         icon="smile"
                         label="Invite friends to Peanut"
                         href="https://docs.peanut.me/how-to-use-peanut-links/referrals"
                         position="single"
                         isExternalLink
-                    /> */}
+                    />
                     {/* Menu Items - First Group */}
                     <div>
                         <ProfileMenuItem icon="user" label="Personal details" href="/profile/edit" position="first" />
+                        {/* Enable with Account Management project. */}
+
                         <ProfileMenuItem
                             icon="shield"
                             label="Identity Verification"
@@ -71,23 +70,7 @@ export const Profile = () => {
                             position="middle"
                             endIcon={isKycApproved ? 'check' : undefined}
                             endIconClassName={isKycApproved ? 'text-success-3 size-4' : undefined}
-                            showTooltip
-                            toolTipText="No need to verify unless you want to move money to or from your bank."
                         />
-
-                        <Card className="p-4" position="middle">
-                            <div className="flex items-center justify-between py-1">
-                                <div className="flex items-center gap-2">
-                                    <Icon name={'eye'} size={20} fill="black" />
-                                    <span className="text-base font-medium">Show my full name</span>
-                                </div>
-
-                                <div className="flex items-center">
-                                    <ShowNameToggle />
-                                </div>
-                            </div>
-                        </Card>
-                        {/* Enable with Account Management project. */}
                         {/* <ProfileMenuItem
                             icon="bank"
                             label="Bank accounts"
@@ -99,18 +82,25 @@ export const Profile = () => {
                     </div>
                     {/* Menu Items - Second Group */}
                     <div>
-                        <ProfileMenuItem icon="currency" label="Currency" position="first" comingSoon />
+                        <ProfileMenuItem
+                            icon="fees"
+                            label="Fees"
+                            href="https://docs.peanut.me/fees"
+                            position="first"
+                            isExternalLink
+                        />
+                        <ProfileMenuItem icon="currency" label="Currency" position="middle" comingSoon />
                         <ProfileMenuItem
                             icon="exchange"
-                            label="Exchange rates and fees"
-                            href="/profile/exchange-rate"
+                            label="Exchange rates"
+                            href="/profile/exchange-rates"
                             position="last"
+                            comingSoon
                         />
                     </div>
                     {/* Logout Button */}
                     <div className="w-full pb-10">
                         <Button
-                            loading={isLoggingOut}
                             disabled={isLoggingOut}
                             variant="primary-soft"
                             shadowSize="4"
diff --git a/src/components/Profile/views/IdentityVerification.view.tsx b/src/components/Profile/views/IdentityVerification.view.tsx
index 370908758..2849b1761 100644
--- a/src/components/Profile/views/IdentityVerification.view.tsx
+++ b/src/components/Profile/views/IdentityVerification.view.tsx
@@ -9,7 +9,7 @@ import { KycVerificationInProgressModal } from '@/components/Kyc/KycVerification
 import { useAuth } from '@/context/authContext'
 import { useKycFlow } from '@/hooks/useKycFlow'
 import { useRouter } from 'next/navigation'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import React, { useMemo, useRef, useState } from 'react'
 
 const IdentityVerificationView = () => {
     const { user, fetchUser } = useAuth()
@@ -33,7 +33,8 @@ const IdentityVerificationView = () => {
 
     const initialUserDetails: Partial<UserDetailsFormData> = useMemo(
         () => ({
-            fullName: user?.user.fullName ?? '',
+            firstName: user?.user.fullName ? firstName : '',
+            lastName: user?.user.fullName ? lastName : '',
             email: user?.user.email ?? '',
         }),
         [user?.user.fullName, user?.user.email, firstName, lastName]
@@ -46,7 +47,7 @@ const IdentityVerificationView = () => {
             if (!user?.user.userId) throw new Error('User not found')
             const result = await updateUserById({
                 userId: user.user.userId,
-                fullName: data.fullName,
+                fullName: `${data.firstName} ${data.lastName}`,
                 email: data.email,
             })
             if (result.error) {
@@ -64,13 +65,6 @@ const IdentityVerificationView = () => {
         return {}
     }
 
-    // if kyc is already approved, redirect to profile
-    useEffect(() => {
-        if (user?.user.bridgeKycStatus === 'approved') {
-            router.replace('/profile')
-        }
-    }, [user])
-
     return (
         <div className="flex min-h-[inherit] flex-col">
             <NavHeader title="Identity Verification" onPrev={() => router.replace('/profile')} />
diff --git a/src/components/Profile/views/ProfileEdit.view.tsx b/src/components/Profile/views/ProfileEdit.view.tsx
index 0fd7a3c52..60a0b9636 100644
--- a/src/components/Profile/views/ProfileEdit.view.tsx
+++ b/src/components/Profile/views/ProfileEdit.view.tsx
@@ -112,7 +112,7 @@ export const ProfileEditView = () => {
         <div className="space-y-8">
             <NavHeader title="Edit Profile" onPrev={() => router.push('/profile')} />
 
-            <ProfileHeader name={fullName} username={username} isVerified={user?.user.bridgeKycStatus === 'approved'} />
+            <ProfileHeader name={fullName} username={username} isVerified={user?.user.kycStatus === 'approved'} />
 
             <div className="space-y-4">
                 <ProfileEditField
@@ -120,7 +120,6 @@ export const ProfileEditView = () => {
                     value={formData.name}
                     onChange={(value) => handleChange('name', value)}
                     placeholder="Add your name"
-                    disabled={user?.user.bridgeKycStatus === 'approved'}
                 />
 
                 <ProfileEditField
@@ -128,7 +127,6 @@ export const ProfileEditView = () => {
                     value={formData.surname}
                     onChange={(value) => handleChange('surname', value)}
                     placeholder="Add your surname"
-                    disabled={user?.user.bridgeKycStatus === 'approved'}
                 />
 
                 <ProfileEditField
diff --git a/src/components/Request/direct-request/views/Initial.direct.request.view.tsx b/src/components/Request/direct-request/views/Initial.direct.request.view.tsx
index 9548759b5..9d5bdcff9 100644
--- a/src/components/Request/direct-request/views/Initial.direct.request.view.tsx
+++ b/src/components/Request/direct-request/views/Initial.direct.request.view.tsx
@@ -209,7 +209,7 @@ const DirectRequestInitialView = ({ username }: DirectRequestInitialViewProps) =
                     recipientType={'USERNAME'}
                     username={recipientUser?.username || username}
                     fullName={recipientUser?.fullName}
-                    isVerified={recipientUser?.bridgeKycStatus === 'approved'}
+                    isVerified={recipientUser?.kycStatus === 'approved'}
                     haveSentMoneyToUser={recipientUser?.userId ? interactions[recipientUser.userId] || false : false}
                 />
 
@@ -279,7 +279,6 @@ const DirectRequestInitialView = ({ username }: DirectRequestInitialViewProps) =
                             disabled={isButtonDisabled || isButtonLoading}
                             loading={isButtonLoading}
                             icon="arrow-down-left"
-                            iconSize={12}
                         >
                             {isButtonLoading ? loadingState : 'Request'}
                         </Button>
diff --git a/src/components/Request/views/ReqFulfillBankFlowManager.tsx b/src/components/Request/views/ReqFulfillBankFlowManager.tsx
index 4ba9cdd2b..4e04f3663 100644
--- a/src/components/Request/views/ReqFulfillBankFlowManager.tsx
+++ b/src/components/Request/views/ReqFulfillBankFlowManager.tsx
@@ -126,7 +126,7 @@ export const ReqFulfillBankFlowManager = ({ parsedPaymentData }: { parsedPayment
             if (!user?.user.userId) throw new Error('User not found')
             const result = await updateUserById({
                 userId: user.user.userId,
-                fullName: `${data.fullName}`,
+                fullName: `${data.firstName} ${data.lastName}`,
                 email: data.email,
             })
             if (result.error) {
diff --git a/src/components/SearchUsers/SearchResults.tsx b/src/components/SearchUsers/SearchResults.tsx
index 7ca8cc0b6..42b0721bf 100644
--- a/src/components/SearchUsers/SearchResults.tsx
+++ b/src/components/SearchUsers/SearchResults.tsx
@@ -42,7 +42,7 @@ export const SearchResults = ({
                     <h2 className="mb-2 text-base font-bold">People</h2>
                     <div className="flex-1 overflow-y-auto">
                         {results.map((user, index) => {
-                            const isVerified = user.bridgeKycStatus === 'approved'
+                            const isVerified = user.kycStatus === 'approved'
                             const haveSentMoneyToUser = interactions[user.userId] || false
                             return (
                                 <SearchResultCard
@@ -101,7 +101,7 @@ export const SearchResults = ({
                     {recentTransactions.length > 0 ? (
                         <div className="flex-1 overflow-y-auto">
                             {recentTransactions.map((user, index) => {
-                                const isVerified = user.bridgeKycStatus === 'approved'
+                                const isVerified = user.kycStatus === 'approved'
                                 const haveSentMoneyToUser = interactions[user.userId] || false
                                 return (
                                     <SearchResultCard
diff --git a/src/components/Send/link/views/Success.link.send.view.tsx b/src/components/Send/link/views/Success.link.send.view.tsx
index fa93aa9b8..688d8258a 100644
--- a/src/components/Send/link/views/Success.link.send.view.tsx
+++ b/src/components/Send/link/views/Success.link.send.view.tsx
@@ -15,7 +15,7 @@ import { sendLinksApi } from '@/services/sendLinks'
 import { captureException } from '@sentry/nextjs'
 import { useQueryClient } from '@tanstack/react-query'
 import { useRouter } from 'next/navigation'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 
 const LinkSendSuccessView = () => {
     const dispatch = useAppDispatch()
@@ -27,14 +27,13 @@ const LinkSendSuccessView = () => {
     const [isLoading, setIsLoading] = useState<boolean>(false)
     const [showCancelLinkModal, setshowCancelLinkModal] = useState(false)
 
-    const [cancelLinkText, setCancelLinkText] = useState<'Cancelling' | 'Cancelled' | 'Cancel link'>('Cancel link')
-
-    useEffect(() => {
-        return () => {
-            // clear state on unmount
-            dispatch(sendFlowActions.resetSendFlow())
-        }
-    }, [dispatch])
+    if (isLoading) {
+        return (
+            <div className="flex w-full items-center justify-center">
+                <PeanutLoading coverFullScreen />
+            </div>
+        )
+    }
 
     return (
         <div className="flex  w-full flex-col justify-start space-y-8">
@@ -68,8 +67,7 @@ const LinkSendSuccessView = () => {
                             variant={'primary-soft'}
                             className="flex w-full items-center gap-1"
                             shadowSize="4"
-                            disabled={isLoading || cancelLinkText === 'Cancelled'}
-                            loading={isLoading}
+                            disabled={isLoading}
                         >
                             {!isLoading && (
                                 <div className="flex items-center">
@@ -79,7 +77,7 @@ const LinkSendSuccessView = () => {
                                     />
                                 </div>
                             )}
-                            <span>{cancelLinkText}</span>
+                            <span>Cancel link</span>
                         </Button>
                     </div>
                 )}
@@ -94,7 +92,6 @@ const LinkSendSuccessView = () => {
                     onClick={() => {
                         setIsLoading(true)
                         setshowCancelLinkModal(false)
-                        setCancelLinkText('Cancelling')
                         sendLinksApi
                             .claim(user!.user.username!, link)
                             .then(() => {
@@ -105,11 +102,10 @@ const LinkSendSuccessView = () => {
                                         .invalidateQueries({
                                             queryKey: ['transactions'],
                                         })
-                                        .then(async () => {
+                                        .then(() => {
                                             setIsLoading(false)
-                                            setCancelLinkText('Cancelled')
-                                            await new Promise((resolve) => setTimeout(resolve, 2000))
                                             router.push('/home')
+                                            dispatch(sendFlowActions.resetSendFlow())
                                         })
                                 }, 3000)
                             })
@@ -117,7 +113,6 @@ const LinkSendSuccessView = () => {
                                 captureException(error)
                                 console.error('Error claiming link:', error)
                                 setIsLoading(false)
-                                setCancelLinkText('Cancel link')
                             })
                     }}
                 />
diff --git a/src/components/Setup/Views/SetupPasskey.tsx b/src/components/Setup/Views/SetupPasskey.tsx
index b815e8814..7198563e6 100644
--- a/src/components/Setup/Views/SetupPasskey.tsx
+++ b/src/components/Setup/Views/SetupPasskey.tsx
@@ -5,12 +5,12 @@ import { useZeroDev } from '@/hooks/useZeroDev'
 import { useSetupFlow } from '@/hooks/useSetupFlow'
 import { useAuth } from '@/context/authContext'
 import { useEffect, useState } from 'react'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useRouter } from 'next/navigation'
 import * as Sentry from '@sentry/nextjs'
-import { WalletProviderType, AccountType } from '@/interfaces'
+import { WalletProviderType } from '@/interfaces'
 import { WebAuthnError } from '@simplewebauthn/browser'
 import Link from 'next/link'
-import { getFromLocalStorage, sanitizeRedirectURL } from '@/utils'
+import { getFromLocalStorage } from '@/utils'
 import { POST_SIGNUP_ACTIONS } from '@/components/Global/PostSignupActionManager/post-signup-action.consts'
 
 const SetupPasskey = () => {
@@ -18,15 +18,12 @@ const SetupPasskey = () => {
     const { username, telegramHandle } = useSetupStore()
     const { isLoading } = useSetupFlow()
     const { handleRegister, address } = useZeroDev()
-    const { user, isFetchingUser } = useAuth()
+    const { user } = useAuth()
     const { addAccount } = useAuth()
     const [error, setError] = useState<string | null>(null)
     const router = useRouter()
-    const searchParams = useSearchParams()
 
     useEffect(() => {
-        // Dont try to double add the account
-        if (isFetchingUser || user?.accounts.some((a) => a.type === AccountType.PEANUT_WALLET)) return
         if (address && user) {
             addAccount({
                 accountIdentifier: address,
@@ -35,13 +32,6 @@ const SetupPasskey = () => {
                 telegramHandle: telegramHandle.length > 0 ? telegramHandle : undefined,
             })
                 .then(() => {
-                    const redirect_uri = searchParams.get('redirect_uri')
-                    if (redirect_uri) {
-                        const sanitizedRedirectUrl = sanitizeRedirectURL(redirect_uri)
-                        router.push(sanitizedRedirectUrl)
-                        return
-                    }
-
                     const localStorageRedirect = getFromLocalStorage('redirect')
                     // redirect based on post signup action config
                     if (localStorageRedirect) {
@@ -67,15 +57,15 @@ const SetupPasskey = () => {
                     dispatch(setupActions.setLoading(false))
                 })
         }
-    }, [address, user, isFetchingUser])
+    }, [address, user])
 
     return (
         <div>
             <div className="flex h-full flex-col justify-between gap-11 p-0 md:min-h-32">
                 <div className="flex h-full flex-col justify-end gap-2 text-center">
                     <Button
-                        loading={isLoading || isFetchingUser}
-                        disabled={isLoading || isFetchingUser}
+                        loading={isLoading}
+                        disabled={isLoading}
                         onClick={async () => {
                             dispatch(setupActions.setLoading(true))
                             try {
diff --git a/src/components/Setup/Views/Signup.tsx b/src/components/Setup/Views/Signup.tsx
index 0efebf83d..d9e3b9e02 100644
--- a/src/components/Setup/Views/Signup.tsx
+++ b/src/components/Setup/Views/Signup.tsx
@@ -76,7 +76,7 @@ const SignupStep = () => {
                     return false
             }
         } catch (err) {
-            setError('Failed to check handle availability. Please try again or contact support.')
+            setError('Failed to check handle availability. Please try again.')
             return false
         }
     }
diff --git a/src/components/Setup/Views/Welcome.tsx b/src/components/Setup/Views/Welcome.tsx
index 6bde37fd7..fdd64f953 100644
--- a/src/components/Setup/Views/Welcome.tsx
+++ b/src/components/Setup/Views/Welcome.tsx
@@ -5,9 +5,9 @@ import { useToast } from '@/components/0_Bruddle/Toast'
 import { useAuth } from '@/context/authContext'
 import { useSetupFlow } from '@/hooks/useSetupFlow'
 import { useZeroDev } from '@/hooks/useZeroDev'
-import { getFromLocalStorage, sanitizeRedirectURL } from '@/utils'
+import { getFromLocalStorage } from '@/utils'
 import * as Sentry from '@sentry/nextjs'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { useRouter } from 'next/navigation'
 import { useEffect } from 'react'
 
 const WelcomeStep = () => {
@@ -16,16 +16,11 @@ const WelcomeStep = () => {
     const { user } = useAuth()
     const { push } = useRouter()
     const toast = useToast()
-    const searchParams = useSearchParams()
 
     useEffect(() => {
         if (!!user) {
             const localStorageRedirect = getFromLocalStorage('redirect')
-            const redirect_uri = searchParams.get('redirect_uri')
-            if (redirect_uri) {
-                const sanitizedRedirectUrl = sanitizeRedirectURL(redirect_uri)
-                push(sanitizedRedirectUrl)
-            } else if (localStorageRedirect) {
+            if (localStorageRedirect) {
                 localStorage.removeItem('redirect')
                 push(localStorageRedirect)
             } else {
diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx
index b7c665b01..0791de09d 100644
--- a/src/components/Tooltip/index.tsx
+++ b/src/components/Tooltip/index.tsx
@@ -80,10 +80,6 @@ export const Tooltip = ({
                 onMouseLeave={hideTooltip}
                 onFocus={showTooltip}
                 onBlur={hideTooltip}
-                onClick={(e) => {
-                    e.stopPropagation()
-                    visible ? hideTooltip() : showTooltip()
-                }}
             >
                 {children}
             </div>
diff --git a/src/components/TransactionDetails/TransactionCard.tsx b/src/components/TransactionDetails/TransactionCard.tsx
index 68918bd99..0a34e7688 100644
--- a/src/components/TransactionDetails/TransactionCard.tsx
+++ b/src/components/TransactionDetails/TransactionCard.tsx
@@ -65,7 +65,7 @@ const TransactionCard: React.FC<TransactionCardProps> = ({
     }
 
     const isLinkTx = transaction.extraDataForDrawer?.isLinkTransaction ?? false
-    const userNameForAvatar = transaction.fullName || transaction.userName
+    const userNameForAvatar = transaction.userName
     const avatarUrl = transaction.extraDataForDrawer?.rewardData?.avatarUrl
 
     let finalDisplayAmount = ''
diff --git a/src/components/TransactionDetails/TransactionDetailsDrawer.tsx b/src/components/TransactionDetails/TransactionDetailsDrawer.tsx
index 43b38b995..b793961b9 100644
--- a/src/components/TransactionDetails/TransactionDetailsDrawer.tsx
+++ b/src/components/TransactionDetails/TransactionDetailsDrawer.tsx
@@ -43,7 +43,7 @@ export const TransactionDetailsDrawer: React.FC<TransactionDetailsDrawerProps> =
                 }
             }}
         >
-            <DrawerContent className="py-5">
+            <DrawerContent className="p-5">
                 <TransactionDetailsReceipt
                     isLoading={isLoading}
                     transaction={transaction}
@@ -53,7 +53,6 @@ export const TransactionDetailsDrawer: React.FC<TransactionDetailsDrawerProps> =
                     transactionAmount={transactionAmount}
                     isModalOpen={isModalOpen}
                     setIsModalOpen={setIsModalOpen}
-                    className="px-5"
                 />
             </DrawerContent>
         </Drawer>
diff --git a/src/components/TransactionDetails/TransactionDetailsReceipt.tsx b/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
index 49f8ce77c..3bfb0be9c 100644
--- a/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
+++ b/src/components/TransactionDetails/TransactionDetailsReceipt.tsx
@@ -1,5 +1,3 @@
-'use client'
-
 import Card from '@/components/Global/Card'
 import { PaymentInfoRow } from '@/components/Payment/PaymentInfoRow'
 import { TransactionDetails } from '@/components/TransactionDetails/transactionTransformer'
@@ -29,8 +27,6 @@ import CancelSendLinkModal from '../Global/CancelSendLinkModal'
 import { twMerge } from 'tailwind-merge'
 import { isAddress } from 'viem'
 import { getBankAccountLabel, TransactionDetailsRowKey, transactionDetailsRowKeys } from './transaction-details.utils'
-import { useSupportModalContext } from '@/context/SupportModalContext'
-import { useRouter } from 'next/navigation'
 
 export const TransactionDetailsReceipt = ({
     transaction,
@@ -61,9 +57,6 @@ export const TransactionDetailsReceipt = ({
     const [showCancelLinkModal, setShowCancelLinkModal] = useState(isModalOpen)
     const [tokenData, setTokenData] = useState<{ symbol: string; icon: string } | null>(null)
     const [isTokenDataLoading, setIsTokenDataLoading] = useState(true)
-    const { setIsSupportModalOpen } = useSupportModalContext()
-    const router = useRouter()
-    const [cancelLinkText, setCancelLinkText] = useState<'Cancelling' | 'Cancelled' | 'Cancel link'>('Cancel link')
 
     useEffect(() => {
         setIsModalOpen?.(showCancelLinkModal)
@@ -283,16 +276,6 @@ export const TransactionDetailsReceipt = ({
         }
     }
 
-    // Show profile button only if txn is completed, not to/by a guest user and its a send/request/receive txn
-    const showUserProfileButton =
-        !!transaction &&
-        transaction.status === 'completed' &&
-        !!transaction.userName &&
-        !isAddress(transaction.userName) &&
-        (transaction.extraDataForDrawer?.transactionCardType === 'send' ||
-            transaction.extraDataForDrawer?.transactionCardType === 'request' ||
-            transaction.extraDataForDrawer?.transactionCardType === 'receive')
-
     return (
         <div ref={contentRef} className={twMerge('space-y-4', className)}>
             {/* show qr code at the top if applicable */}
@@ -531,14 +514,14 @@ export const TransactionDetailsReceipt = ({
                                         />
                                     </div>
                                 }
-                                hideBottomBorder={false} // Always show the border for the deposit message
+                                hideBottomBorder={shouldHideBorder('depositInstructions')}
                             />
 
                             {/* Toggle button for bank details */}
                             <div className="border-grey-11 border-b pb-3">
                                 <button
                                     onClick={() => setShowBankDetails(!showBankDetails)}
-                                    className="flex w-full items-center justify-between py-3 text-left text-sm font-normal text-black underline transition-colors"
+                                    className="flex w-full items-center justify-between py-3 text-left text-sm font-medium text-black underline transition-colors"
                                 >
                                     <span>{showBankDetails ? 'Hide bank details' : 'See bank details'}</span>
                                     <Icon
@@ -809,7 +792,7 @@ export const TransactionDetailsReceipt = ({
                         setIsLoading &&
                         onClose && (
                             <Button
-                                disabled={isLoading || cancelLinkText === 'Cancelled'}
+                                disabled={isLoading}
                                 onClick={() => setShowCancelLinkModal(true)}
                                 loading={isLoading}
                                 variant={'primary-soft'}
@@ -824,7 +807,7 @@ export const TransactionDetailsReceipt = ({
                                         />
                                     )}
                                 </div>
-                                <span>{cancelLinkText}</span>
+                                <span>Cancel link</span>
                             </Button>
                         )}
                 </div>
@@ -926,22 +909,6 @@ export const TransactionDetailsReceipt = ({
                 </div>
             )}
 
-            {showUserProfileButton && (
-                <div className="pr-1">
-                    <Button
-                        onClick={() => router.push(`/${transaction.userName}`)}
-                        shadowSize="4"
-                        variant={
-                            transaction.extraDataForDrawer?.transactionCardType === 'request'
-                                ? 'purple'
-                                : 'primary-soft'
-                        }
-                        className="flex w-full items-center gap-1"
-                    >
-                        Go to {transaction.userName} profile
-                    </Button>
-                </div>
-            )}
             {/* Cancel deposit button for bridge_onramp transactions in awaiting_funds state */}
             {transaction.direction === 'bank_deposit' &&
                 transaction.extraDataForDrawer?.originalType !== EHistoryEntryType.REQUEST &&
@@ -1029,13 +996,13 @@ export const TransactionDetailsReceipt = ({
                 )}
 
             {/* support link section */}
-            <button
-                onClick={() => setIsSupportModalOpen(true)}
-                className="flex w-full items-center justify-center gap-2 text-sm font-medium text-grey-1 underline transition-colors hover:text-black"
+            <Link
+                href={'/support'}
+                className="flex items-center justify-center gap-2 text-sm font-medium text-grey-1 underline transition-colors hover:text-black"
             >
                 <Icon name="peanut-support" size={16} className="text-grey-1" />
                 Issues with this transaction?
-            </button>
+            </Link>
 
             {/* Cancel Link Modal  */}
 
@@ -1046,7 +1013,6 @@ export const TransactionDetailsReceipt = ({
                     amount={amountDisplay}
                     onClick={() => {
                         setIsLoading(true)
-                        setCancelLinkText('Cancelling')
                         setShowCancelLinkModal(false)
                         sendLinksApi
                             .claim(user!.user.username!, transaction.extraDataForDrawer!.link!)
@@ -1058,10 +1024,8 @@ export const TransactionDetailsReceipt = ({
                                         .invalidateQueries({
                                             queryKey: [TRANSACTIONS],
                                         })
-                                        .then(async () => {
+                                        .then(() => {
                                             setIsLoading(false)
-                                            setCancelLinkText('Cancelled')
-                                            await new Promise((resolve) => setTimeout(resolve, 2000))
                                             onClose()
                                         })
                                 }, 3000)
@@ -1070,7 +1034,6 @@ export const TransactionDetailsReceipt = ({
                                 captureException(error)
                                 console.error('Error claiming link:', error)
                                 setIsLoading(false)
-                                setCancelLinkText('Cancel link')
                             })
                     }}
                 />
diff --git a/src/components/TransactionDetails/transactionTransformer.ts b/src/components/TransactionDetails/transactionTransformer.ts
index 90a0ea3cd..769bd3746 100644
--- a/src/components/TransactionDetails/transactionTransformer.ts
+++ b/src/components/TransactionDetails/transactionTransformer.ts
@@ -1,3 +1,4 @@
+import { PeanutArmHoldingBeer } from '@/assets'
 import { StatusType } from '@/components/Global/Badges/StatusBadge'
 import { TransactionType as TransactionCardType } from '@/components/TransactionDetails/TransactionCard'
 import { TransactionDirection } from '@/components/TransactionDetails/TransactionDetailsHeaderCard'
@@ -24,8 +25,14 @@ export type RewardData = {
     getSymbol: (amount: number | bigint) => string
     avatarUrl: string
 }
-// Configure reward tokens here
-export const REWARD_TOKENS: { [key: string]: RewardData } = {}
+export const REWARD_TOKENS: { [key: string]: RewardData } = {
+    '0x9ae69fdff2fa97e34b680752d8e70dfd529ea6ca': {
+        symbol: 'Beers',
+        formatAmount: (amount: number | bigint) => (Number(amount) === 1 ? '1 Beer' : `${amount.toString()} Beers`),
+        getSymbol: (amount: number | bigint) => (Number(amount) === 1 ? 'Beer' : 'Beers'),
+        avatarUrl: PeanutArmHoldingBeer,
+    },
+}
 
 /**
  * defines the structure of the data expected by the transaction details drawer component.
@@ -35,7 +42,6 @@ export interface TransactionDetails {
     id: string
     direction: TransactionDirection
     userName: string
-    fullName: string
     amount: number | bigint
     currency?: {
         amount: string
@@ -140,7 +146,6 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
     let uiStatus: StatusPillType = 'pending'
     let isLinkTx = false
     let isPeerActuallyUser = false
-    let fullName = '' // Full name of the user for PFP Avatar
 
     // determine direction, card type, peer name, and flags based on original type and user role
     switch (entry.type) {
@@ -150,13 +155,12 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
             transactionCardType = 'send'
             if (entry.userRole === EHistoryUserRole.SENDER) {
                 nameForDetails = entry.recipientAccount?.username ?? entry.recipientAccount?.identifier
-                fullName = entry.recipientAccount?.fullName ?? ''
             } else {
                 direction = 'receive'
                 transactionCardType = 'receive'
                 nameForDetails =
                     entry.senderAccount?.username ?? entry.senderAccount?.identifier ?? 'Requested via Link'
-                ;((fullName = entry.senderAccount?.fullName ?? ''), (isLinkTx = !entry.senderAccount)) // If the sender is not an user then it's a public link
+                isLinkTx = !entry.senderAccount // If the sender is not an user then it's a public link
             }
             break
         case EHistoryEntryType.SEND_LINK:
@@ -168,7 +172,6 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                     entry.recipientAccount?.username ||
                     entry.recipientAccount?.identifier ||
                     (entry.status === 'COMPLETED' ? 'You sent via link' : "You're sending via link")
-                fullName = entry.recipientAccount?.username ?? ''
                 isPeerActuallyUser = !!entry.recipientAccount?.isUser
                 isLinkTx = !isPeerActuallyUser
             } else if (entry.userRole === EHistoryUserRole.RECIPIENT) {
@@ -184,7 +187,6 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                     transactionCardType = 'receive'
                     nameForDetails =
                         entry.senderAccount?.username || entry.senderAccount?.identifier || 'Received via Link'
-                    fullName = entry.senderAccount?.fullName ?? ''
                     isPeerActuallyUser = !!entry.senderAccount?.isUser
                     isLinkTx = !isPeerActuallyUser
                 }
@@ -196,7 +198,6 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                 direction = 'claim_external'
                 transactionCardType = 'claim_external'
                 nameForDetails = entry.recipientAccount?.username || entry.recipientAccount?.identifier
-                fullName = entry.recipientAccount?.username ?? ''
             }
             break
         case EHistoryEntryType.REQUEST:
@@ -204,14 +205,12 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                 transactionCardType = 'bank_request_fulfillment'
                 direction = 'bank_request_fulfillment'
                 nameForDetails = entry.recipientAccount?.username ?? entry.recipientAccount?.identifier
-                fullName = entry.recipientAccount?.fullName ?? ''
                 isPeerActuallyUser = !!entry.recipientAccount?.isUser || !!entry.senderAccount?.isUser
             } else if (entry.userRole === EHistoryUserRole.RECIPIENT) {
                 direction = 'request_sent'
                 transactionCardType = 'request'
                 nameForDetails =
                     entry.senderAccount?.username || entry.senderAccount?.identifier || 'Requested via Link'
-                fullName = entry.senderAccount?.fullName ?? ''
                 isPeerActuallyUser = !!entry.senderAccount?.isUser
             } else {
                 if (
@@ -224,14 +223,12 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                         entry.recipientAccount?.username ||
                         entry.recipientAccount?.identifier ||
                         `Request From ${entry.recipientAccount?.username || entry.recipientAccount?.identifier}`
-                    fullName = entry.recipientAccount?.fullName ?? ''
                     isPeerActuallyUser = !!entry.recipientAccount?.isUser
                 } else {
                     direction = 'send'
                     transactionCardType = 'send'
                     nameForDetails =
                         entry.recipientAccount?.username || entry.recipientAccount?.identifier || 'Paid Request To'
-                    fullName = entry.recipientAccount?.fullName ?? ''
                     isPeerActuallyUser = !!entry.recipientAccount?.isUser
                 }
             }
@@ -267,7 +264,6 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
                         entry.recipientAccount?.username ??
                         entry.recipientAccount?.fullName ??
                         entry.recipientAccount?.identifier
-                    fullName = entry.recipientAccount?.fullName ?? ''
                     isPeerActuallyUser = true
                 } else {
                     // case 3: claimed by a guest. show as generic bank claim.
@@ -427,17 +423,11 @@ export function mapTransactionDataForDrawer(entry: HistoryEntry): MappedTransact
 
     const rewardData = REWARD_TOKENS[entry.tokenAddress?.toLowerCase()]
 
-    // If full name is empty, set it to same as nameForDetails as fallback
-    if (!fullName || fullName === '') {
-        fullName = nameForDetails
-    }
-
     // build the final transactiondetails object for the ui
     const transactionDetails: TransactionDetails = {
         id: entry.uuid,
         direction: direction,
         userName: nameForDetails,
-        fullName,
         amount: amount,
         currency: rewardData ? undefined : entry.currency,
         currencySymbol: `${entry.userRole === EHistoryUserRole.SENDER ? '-' : '+'}$`,
diff --git a/src/components/UserHeader/index.tsx b/src/components/UserHeader/index.tsx
index da538aae5..9a58d0120 100644
--- a/src/components/UserHeader/index.tsx
+++ b/src/components/UserHeader/index.tsx
@@ -68,7 +68,7 @@ export const VerifiedUserLabel = ({
 
     return (
         <div className="flex items-center gap-1.5">
-            <div className={twMerge('text-center text-sm font-semibold md:text-base', className)}>
+            <div className={twMerge('text-sm font-semibold md:text-base', className)}>
                 {isCryptoAddress ? printableAddress(name, 4, 4) : name}
             </div>
             {badge && (
diff --git a/src/constants/countryCurrencyMapping.ts b/src/constants/countryCurrencyMapping.ts
index 5c5e93f7a..07a86b6b1 100644
--- a/src/constants/countryCurrencyMapping.ts
+++ b/src/constants/countryCurrencyMapping.ts
@@ -4,7 +4,6 @@ export interface CountryCurrencyMapping {
     country: string
     flagCode: string
     comingSoon?: boolean
-    path?: string
 }
 
 export const countryCurrencyMappings: CountryCurrencyMapping[] = [
@@ -12,35 +11,23 @@ export const countryCurrencyMappings: CountryCurrencyMapping[] = [
     { currencyCode: 'EUR', currencyName: 'Euro', country: 'Eurozone', flagCode: 'eu' },
 
     // Non-Eurozone SEPA Countries
-    { currencyCode: 'BGN', currencyName: 'Bulgarian Lev', country: 'Bulgaria', flagCode: 'bg', path: 'bulgaria' },
-    {
-        currencyCode: 'CZK',
-        currencyName: 'Czech Koruna',
-        country: 'Czech Republic',
-        flagCode: 'cz',
-        path: 'czech-republic',
-    },
-    { currencyCode: 'DKK', currencyName: 'Danish Krone', country: 'Denmark', flagCode: 'dk', path: 'denmark' },
-    { currencyCode: 'HUF', currencyName: 'Hungarian Forint', country: 'Hungary', flagCode: 'hu', path: 'hungary' },
-    { currencyCode: 'ISK', currencyName: 'Icelandic Krona', country: 'Iceland', flagCode: 'is', path: 'iceland' },
-    { currencyCode: 'NOK', currencyName: 'Norwegian Krone', country: 'Norway', flagCode: 'no', path: 'norway' },
-    { currencyCode: 'PLN', currencyName: 'Polish Zloty', country: 'Poland', flagCode: 'pl', path: 'poland' },
-    { currencyCode: 'RON', currencyName: 'Romanian Leu', country: 'Romania', flagCode: 'ro', path: 'romania' },
-    { currencyCode: 'SEK', currencyName: 'Swedish Krona', country: 'Sweden', flagCode: 'se', path: 'sweden' },
-    { currencyCode: 'CHF', currencyName: 'Swiss Franc', country: 'Switzerland', flagCode: 'ch', path: 'switzerland' },
-    {
-        currencyCode: 'GBP',
-        currencyName: 'British Pound Sterling',
-        country: 'United Kingdom',
-        flagCode: 'gb',
-        path: 'united-kingdom',
-    },
+    { currencyCode: 'BGN', currencyName: 'Bulgarian Lev', country: 'Bulgaria', flagCode: 'bg' },
+    { currencyCode: 'CZK', currencyName: 'Czech Koruna', country: 'Czech Republic', flagCode: 'cz' },
+    { currencyCode: 'DKK', currencyName: 'Danish Krone', country: 'Denmark', flagCode: 'dk' },
+    { currencyCode: 'HUF', currencyName: 'Hungarian Forint', country: 'Hungary', flagCode: 'hu' },
+    { currencyCode: 'ISK', currencyName: 'Icelandic Krona', country: 'Iceland', flagCode: 'is' },
+    { currencyCode: 'NOK', currencyName: 'Norwegian Krone', country: 'Norway', flagCode: 'no' },
+    { currencyCode: 'PLN', currencyName: 'Polish Zloty', country: 'Poland', flagCode: 'pl' },
+    { currencyCode: 'RON', currencyName: 'Romanian Leu', country: 'Romania', flagCode: 'ro' },
+    { currencyCode: 'SEK', currencyName: 'Swedish Krona', country: 'Sweden', flagCode: 'se' },
+    { currencyCode: 'CHF', currencyName: 'Swiss Franc', country: 'Switzerland', flagCode: 'ch' },
+    { currencyCode: 'GBP', currencyName: 'British Pound Sterling', country: 'United Kingdom', flagCode: 'gb' },
 
     // USA
-    { currencyCode: 'USD', currencyName: 'US Dollar', country: 'United States', flagCode: 'us', path: 'usa' },
+    { currencyCode: 'USD', currencyName: 'US Dollar', country: 'United States', flagCode: 'us' },
 
     // Mexico
-    { currencyCode: 'MXN', currencyName: 'Mexican Peso', country: 'Mexico', flagCode: 'mx', path: 'mexico' },
+    { currencyCode: 'MXN', currencyName: 'Mexican Peso', country: 'Mexico', flagCode: 'mx' },
 
     // Coming Soon
     { currencyCode: 'BRL', currencyName: 'Brazilian Real', country: 'Brazil', flagCode: 'br', comingSoon: true },
diff --git a/src/constants/general.consts.ts b/src/constants/general.consts.ts
index 58b330664..9e2dc58ad 100644
--- a/src/constants/general.consts.ts
+++ b/src/constants/general.consts.ts
@@ -201,4 +201,4 @@ export const pathTitles: { [key: string]: string } = {
 export const STABLE_COINS = ['USDC', 'USDT', 'DAI', 'BUSD']
 
 export const ROUTE_NOT_FOUND_ERROR =
-    'No route found for this token pair. You can try with a different token pair, or contact support.'
+    'No route found for this token pair. You can try with a different token pair, or try again later'
diff --git a/src/constants/zerodev.consts.ts b/src/constants/zerodev.consts.ts
index 234c021e6..f14f08bb7 100644
--- a/src/constants/zerodev.consts.ts
+++ b/src/constants/zerodev.consts.ts
@@ -2,7 +2,7 @@ import { getEntryPoint, KERNEL_V3_1 } from '@zerodev/sdk/constants'
 import type { Chain, PublicClient } from 'viem'
 import { createPublicClient } from 'viem'
 import { getTransportWithFallback } from '@/app/actions/clients'
-import { arbitrum } from 'viem/chains'
+import { arbitrum, polygon } from 'viem/chains'
 
 // consts needed to define low level SDK kernel
 // as per: https://docs.zerodev.app/sdk/getting-started/tutorial-passkeys
@@ -23,10 +23,17 @@ export const PEANUT_WALLET_TOKEN_NAME = 'USD Coin'
 export const PEANUT_WALLET_TOKEN_IMG_URL =
     'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png'
 
+export const PINTA_WALLET_CHAIN = polygon
+export const PINTA_WALLET_TOKEN_DECIMALS = 10
+export const PINTA_WALLET_TOKEN = '0x9Ae69fDfF2FA97e34B680752D8E70dfD529Ea6ca'
+export const PINTA_WALLET_TOKEN_NAME = 'PINTA'
+export const PINTA_WALLET_TOKEN_SYMBOL = 'PNT'
+
 export const USDT_IN_MAINNET = '0xdac17f958d2ee523a2206206994597c13d831ec7'
 
 export const PEANUT_WALLET_SUPPORTED_TOKENS: Record<string, string[]> = {
     [PEANUT_WALLET_CHAIN.id.toString()]: [PEANUT_WALLET_TOKEN],
+    [PINTA_WALLET_CHAIN.id.toString()]: [PINTA_WALLET_TOKEN],
 }
 
 /**
@@ -39,11 +46,6 @@ export const USER_OP_ENTRY_POINT = getEntryPoint('0.7')
 export const ZERODEV_KERNEL_VERSION = KERNEL_V3_1
 export const USER_OPERATION_REVERT_REASON_TOPIC = '0x1c4fada7374c0a9ee8841fc38afe82932dc0f8e69012e927f061a8bae611a201'
 
-/**
- * This is a mapping of chain ID to the public client and chain details
- * This is for the standard chains supported in the app. For now Arbitrum, but
- * for example if we have rewards on other chains, we can add them here.
- */
 export const PUBLIC_CLIENTS_BY_CHAIN: Record<
     string,
     {
@@ -63,6 +65,17 @@ export const PUBLIC_CLIENTS_BY_CHAIN: Record<
         bundlerUrl: BUNDLER_URL,
         paymasterUrl: PAYMASTER_URL,
     },
+    [polygon.id]: {
+        client: createPublicClient({
+            transport: getTransportWithFallback(polygon.id),
+            chain: polygon,
+            pollingInterval: 2500,
+        }),
+        chain: polygon,
+        bundlerUrl: process.env.NEXT_PUBLIC_POLYGON_BUNDLER_URL!,
+        paymasterUrl: process.env.NEXT_PUBLIC_POLYGON_PAYMASTER_URL!,
+    },
 }
 
 export const peanutPublicClient = PUBLIC_CLIENTS_BY_CHAIN[PEANUT_WALLET_CHAIN.id].client
+export const pintaPublicClient = PUBLIC_CLIENTS_BY_CHAIN[PINTA_WALLET_CHAIN.id].client
diff --git a/src/context/ClaimBankFlowContext.tsx b/src/context/ClaimBankFlowContext.tsx
index b6f351fc6..bf44c6924 100644
--- a/src/context/ClaimBankFlowContext.tsx
+++ b/src/context/ClaimBankFlowContext.tsx
@@ -5,7 +5,7 @@ import { CountryData } from '../components/AddMoney/consts'
 import { TCreateOfframpResponse } from '@/services/services.types'
 import { Account, User } from '@/interfaces'
 import { IBankAccountDetails } from '@/components/AddWithdraw/DynamicBankAccountForm'
-import { BridgeKycStatus } from '@/utils/bridge-accounts.utils'
+import { KYCStatus } from '@/utils/bridge-accounts.utils'
 
 export enum ClaimBankFlowStep {
     SavedAccountsList = 'saved-accounts-list',
@@ -38,8 +38,8 @@ interface ClaimBankFlowContextType {
     setSavedAccounts: (accounts: Account[]) => void
     selectedBankAccount: Account | null
     setSelectedBankAccount: (account: Account | null) => void
-    senderKycStatus?: BridgeKycStatus
-    setSenderKycStatus: (status?: BridgeKycStatus) => void
+    senderKycStatus?: KYCStatus
+    setSenderKycStatus: (status?: KYCStatus) => void
     justCompletedKyc: boolean
     setJustCompletedKyc: (status: boolean) => void
 }
@@ -58,7 +58,7 @@ export const ClaimBankFlowContextProvider: React.FC<{ children: ReactNode }> = (
     const [bankDetails, setBankDetails] = useState<IBankAccountDetails | null>(null)
     const [savedAccounts, setSavedAccounts] = useState<Account[]>([])
     const [selectedBankAccount, setSelectedBankAccount] = useState<Account | null>(null)
-    const [senderKycStatus, setSenderKycStatus] = useState<BridgeKycStatus | undefined>()
+    const [senderKycStatus, setSenderKycStatus] = useState<KYCStatus | undefined>()
     const [justCompletedKyc, setJustCompletedKyc] = useState(false)
 
     const resetFlow = useCallback(() => {
diff --git a/src/context/SupportModalContext.tsx b/src/context/SupportModalContext.tsx
deleted file mode 100644
index d1e873157..000000000
--- a/src/context/SupportModalContext.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-'use client'
-
-import { createContext, useContext, useState, ReactNode } from 'react'
-
-interface SupportModalContextType {
-    isSupportModalOpen: boolean
-    setIsSupportModalOpen: (isOpen: boolean) => void
-}
-
-const SupportModalContext = createContext<SupportModalContextType | undefined>(undefined)
-
-export function SupportModalProvider({ children }: { children: ReactNode }) {
-    const [isSupportModalOpen, setIsSupportModalOpen] = useState(false)
-
-    return (
-        <SupportModalContext.Provider value={{ isSupportModalOpen, setIsSupportModalOpen }}>
-            {children}
-        </SupportModalContext.Provider>
-    )
-}
-
-export function useSupportModalContext() {
-    const context = useContext(SupportModalContext)
-    if (context === undefined) {
-        throw new Error('useSupportModal must be used within a SupportModalProvider')
-    }
-    return context
-}
diff --git a/src/context/contextProvider.tsx b/src/context/contextProvider.tsx
index 01dcb29c7..5fadffafb 100644
--- a/src/context/contextProvider.tsx
+++ b/src/context/contextProvider.tsx
@@ -8,7 +8,6 @@ import { TokenContextProvider } from './tokenSelector.context'
 import { WithdrawFlowContextProvider } from './WithdrawFlowContext'
 import { ClaimBankFlowContextProvider } from './ClaimBankFlowContext'
 import { RequestFulfilmentFlowContextProvider } from './RequestFulfillmentFlowContext'
-import { SupportModalProvider } from './SupportModalContext'
 
 export const ContextProvider = ({ children }: { children: React.ReactNode }) => {
     return (
@@ -21,9 +20,7 @@ export const ContextProvider = ({ children }: { children: React.ReactNode }) =>
                                 <ClaimBankFlowContextProvider>
                                     <RequestFulfilmentFlowContextProvider>
                                         <WithdrawFlowContextProvider>
-                                            <OnrampFlowContextProvider>
-                                                <SupportModalProvider>{children}</SupportModalProvider>
-                                            </OnrampFlowContextProvider>
+                                            <OnrampFlowContextProvider>{children}</OnrampFlowContextProvider>
                                         </WithdrawFlowContextProvider>
                                     </RequestFulfilmentFlowContextProvider>
                                 </ClaimBankFlowContextProvider>
diff --git a/src/hooks/useCreateOnramp.ts b/src/hooks/useCreateOnramp.ts
index 135ba8e7b..389919634 100644
--- a/src/hooks/useCreateOnramp.ts
+++ b/src/hooks/useCreateOnramp.ts
@@ -74,7 +74,7 @@ export const useCreateOnramp = (): UseCreateOnrampReturn => {
                 return onrampData
             } catch (error) {
                 console.error('Error creating onramp:', error)
-                setError('Failed to create bank transfer. Please try again or contact support.')
+                setError('Failed to create bank transfer. Please try again.')
                 throw error
             } finally {
                 setIsLoading(false)
diff --git a/src/hooks/useDetermineBankClaimType.ts b/src/hooks/useDetermineBankClaimType.ts
index 5ebce26da..6f05f8f59 100644
--- a/src/hooks/useDetermineBankClaimType.ts
+++ b/src/hooks/useDetermineBankClaimType.ts
@@ -26,7 +26,7 @@ export function useDetermineBankClaimType(senderUserId: string): {
     useEffect(() => {
         const determineBankClaimType = async () => {
             // check if receiver (logged in user) exists and is KYC approved
-            const receiverKycApproved = user?.user?.bridgeKycStatus === 'approved'
+            const receiverKycApproved = user?.user?.kycStatus === 'approved'
 
             if (receiverKycApproved) {
                 // condition 1: Receiver is KYC approved → UserBankClaim
@@ -46,7 +46,7 @@ export function useDetermineBankClaimType(senderUserId: string): {
 
             try {
                 const senderDetails = await getUserById(senderUserId)
-                const senderKycApproved = senderDetails?.bridgeKycStatus === 'approved'
+                const senderKycApproved = senderDetails?.kycStatus === 'approved'
 
                 if (senderKycApproved) {
                     // condition 3: Receiver not KYC approved BUT sender is → GuestBankClaim
diff --git a/src/hooks/useDetermineBankRequestType.ts b/src/hooks/useDetermineBankRequestType.ts
index 4b19e277a..e2a2746aa 100644
--- a/src/hooks/useDetermineBankRequestType.ts
+++ b/src/hooks/useDetermineBankRequestType.ts
@@ -25,7 +25,7 @@ export function useDetermineBankRequestType(requesterUserId: string): {
 
     useEffect(() => {
         const determineBankRequestType = async () => {
-            const payerKycApproved = user?.user?.bridgeKycStatus === 'approved'
+            const payerKycApproved = user?.user?.kycStatus === 'approved'
 
             if (payerKycApproved) {
                 setRequestType(BankRequestType.UserBankRequest)
@@ -43,7 +43,7 @@ export function useDetermineBankRequestType(requesterUserId: string): {
 
             try {
                 const requesterDetails = await getUserById(requesterUserId)
-                const requesterKycApproved = requesterDetails?.bridgeKycStatus === 'approved'
+                const requesterKycApproved = requesterDetails?.kycStatus === 'approved'
 
                 if (requesterKycApproved) {
                     setRequesterDetails(requesterDetails)
diff --git a/src/hooks/useExchangeRate.ts b/src/hooks/useExchangeRate.ts
index c5acba263..bc3a960ee 100644
--- a/src/hooks/useExchangeRate.ts
+++ b/src/hooks/useExchangeRate.ts
@@ -8,7 +8,6 @@ interface UseExchangeRateProps {
     sourceCurrency: string
     destinationCurrency: string
     initialSourceAmount?: number
-    enabled?: boolean
 }
 
 interface UseExchangeRateReturn {
@@ -27,7 +26,6 @@ export function useExchangeRate({
     sourceCurrency,
     destinationCurrency,
     initialSourceAmount = 10,
-    enabled = true,
 }: UseExchangeRateProps): UseExchangeRateReturn {
     // State
     const [sourceAmount, setSourceAmount] = useState<InputValue>(initialSourceAmount)
@@ -91,7 +89,6 @@ export function useExchangeRate({
         staleTime: 2 * 60 * 1000, // 2 minutes
         gcTime: 10 * 60 * 1000, // garbage collect after 10 minutes
         refetchOnWindowFocus: false,
-        enabled: enabled && !!sourceCurrency && !!destinationCurrency,
     })
 
     const exchangeRate = rateData?.rate ?? 0
diff --git a/src/hooks/useGetExchangeRate.tsx b/src/hooks/useGetExchangeRate.tsx
index c95c0db30..370b8a86a 100644
--- a/src/hooks/useGetExchangeRate.tsx
+++ b/src/hooks/useGetExchangeRate.tsx
@@ -4,16 +4,15 @@ import { useEffect, useState } from 'react'
 
 export interface IExchangeRate {
     accountType: AccountType
-    enabled?: boolean
 }
 
 /**
  * Used to get exchange rate for a given account type
  * @returns {string, boolean} The exchange rate for the given account type and a boolean indicating if the rate is being fetched
  */
-export default function useGetExchangeRate({ accountType, enabled = true }: IExchangeRate) {
+export default function useGetExchangeRate({ accountType }: IExchangeRate) {
     const [exchangeRate, setExchangeRate] = useState<string | null>(null)
-    const [isFetchingRate, setIsFetchingRate] = useState(enabled)
+    const [isFetchingRate, setIsFetchingRate] = useState(true)
 
     useEffect(() => {
         const fetchExchangeRate = async () => {
@@ -46,10 +45,9 @@ export default function useGetExchangeRate({ accountType, enabled = true }: IExc
                 setIsFetchingRate(false)
             }
         }
-        if (enabled) {
-            fetchExchangeRate()
-        }
-    }, [accountType, enabled])
+
+        fetchExchangeRate()
+    }, [accountType])
 
     return { exchangeRate, isFetchingRate }
 }
diff --git a/src/hooks/useKycFlow.ts b/src/hooks/useKycFlow.ts
index 7b0b887d2..d6e510c33 100644
--- a/src/hooks/useKycFlow.ts
+++ b/src/hooks/useKycFlow.ts
@@ -3,7 +3,7 @@ import { useRouter } from 'next/navigation'
 import { IFrameWrapperProps } from '@/components/Global/IframeWrapper'
 import { useWebSocket } from '@/hooks/useWebSocket'
 import { useUserStore } from '@/redux/hooks'
-import { BridgeKycStatus, convertPersonaUrl } from '@/utils'
+import { KYCStatus, convertPersonaUrl } from '@/utils'
 import { InitiateKycResponse } from '@/app/actions/types/users.types'
 import { getKycDetails } from '@/app/actions/users'
 
@@ -43,9 +43,7 @@ export const useKycFlow = ({ onKycSuccess, flow, onManualClose }: UseKycFlowOpti
     const [isLoading, setIsLoading] = useState(false)
     const [error, setError] = useState<string | null>(null)
     const [apiResponse, setApiResponse] = useState<InitiateKycResponse | null>(null)
-    const [liveKycStatus, setLiveKycStatus] = useState<BridgeKycStatus | undefined>(
-        user?.user?.bridgeKycStatus as BridgeKycStatus
-    )
+    const [liveKycStatus, setLiveKycStatus] = useState<KYCStatus | undefined>(user?.user?.kycStatus as KYCStatus)
 
     const [iframeOptions, setIframeOptions] = useState<Omit<IFrameWrapperProps, 'onClose'>>({
         src: '',
@@ -59,7 +57,7 @@ export const useKycFlow = ({ onKycSuccess, flow, onManualClose }: UseKycFlowOpti
         username: user?.user.username ?? undefined,
         autoConnect: true,
         onKycStatusUpdate: (newStatus) => {
-            setLiveKycStatus(newStatus as BridgeKycStatus)
+            setLiveKycStatus(newStatus as KYCStatus)
         },
         onTosUpdate: (data) => {
             if (data.accepted) {
@@ -111,7 +109,7 @@ export const useKycFlow = ({ onKycSuccess, flow, onManualClose }: UseKycFlowOpti
                         closeConfirmMessage: 'Are you sure? Your KYC progress will be lost.',
                     })
                 } else {
-                    const errorMsg = 'Could not retrieve verification links. Please contact support.'
+                    const errorMsg = 'Could not retrieve verification links. Please try again.'
                     setError(errorMsg)
                     return { success: false, error: errorMsg }
                 }
diff --git a/src/hooks/usePasskeySupport.ts b/src/hooks/usePasskeySupport.ts
deleted file mode 100644
index 81569f300..000000000
--- a/src/hooks/usePasskeySupport.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useState } from 'react'
-import { browserSupportsWebAuthn } from '@simplewebauthn/browser'
-
-export interface PasskeySupportResult {
-    isSupported: boolean
-    isLoading: boolean
-    error: string | null
-    browserSupported: boolean
-    conditionalMediationSupported: boolean
-    recheckSupport: () => void
-}
-
-/**
- * Hook to check if the current browser and device support passkeys (WebAuthn)
- * Includes both basic WebAuthn support and conditional mediation (passkey) support
- *
- * @returns {PasskeySupportResult} Object containing support status, loading state, error info, and recheck function
- */
-export function usePasskeySupport(): PasskeySupportResult {
-    const [isSupported, setIsSupported] = useState(false)
-    const [isLoading, setIsLoading] = useState(true)
-    const [error, setError] = useState<string | null>(null)
-    const [browserSupported, setBrowserSupported] = useState(false)
-    const [conditionalMediationSupported, setConditionalMediationSupported] = useState(false)
-
-    const checkSupport = useCallback(async () => {
-        setIsLoading(true)
-        setError(null)
-
-        try {
-            // Check basic WebAuthn support first
-            const basicWebAuthnSupport = browserSupportsWebAuthn()
-            setBrowserSupported(basicWebAuthnSupport)
-
-            if (!basicWebAuthnSupport) {
-                setIsSupported(false)
-                setConditionalMediationSupported(false)
-                return
-            }
-
-            // Check if running in a secure context (required for WebAuthn)
-            if (typeof window !== 'undefined' && !window.isSecureContext) {
-                setError('Passkeys require a secure context (HTTPS)')
-                setIsSupported(false)
-                setConditionalMediationSupported(false)
-                return
-            }
-
-            // Check passkey (conditional mediation) support
-            if (typeof window.PublicKeyCredential?.isConditionalMediationAvailable === 'function') {
-                try {
-                    const conditionalSupport = await window.PublicKeyCredential.isConditionalMediationAvailable()
-                    setConditionalMediationSupported(conditionalSupport)
-                    setIsSupported(conditionalSupport)
-                } catch (err) {
-                    console.warn('Error checking conditional mediation support:', err)
-                    setError('Unable to determine passkey support')
-                    setIsSupported(false)
-                    setConditionalMediationSupported(false)
-                }
-            } else {
-                // Fallback: if conditional mediation API is not available,
-                // assume passkeys are not supported but basic WebAuthn might be
-                setConditionalMediationSupported(false)
-                setIsSupported(false)
-            }
-        } catch (err) {
-            console.error('Error checking passkey support:', err)
-            setError('Failed to check passkey support')
-            setIsSupported(false)
-            setBrowserSupported(false)
-            setConditionalMediationSupported(false)
-        } finally {
-            setIsLoading(false)
-        }
-    }, [])
-
-    const recheckSupport = useCallback(() => {
-        checkSupport()
-    }, [checkSupport])
-
-    useEffect(() => {
-        // Only run on client side
-        if (typeof window === 'undefined') {
-            setIsLoading(false)
-            return
-        }
-
-        checkSupport()
-    }, [checkSupport])
-
-    return {
-        isSupported,
-        isLoading,
-        error,
-        browserSupported,
-        conditionalMediationSupported,
-        recheckSupport,
-    }
-}
diff --git a/src/hooks/usePaymentInitiator.ts b/src/hooks/usePaymentInitiator.ts
index d7cd7e8d2..e6f6360b6 100644
--- a/src/hooks/usePaymentInitiator.ts
+++ b/src/hooks/usePaymentInitiator.ts
@@ -1,4 +1,11 @@
-import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN } from '@/constants'
+import {
+    PEANUT_WALLET_CHAIN,
+    PEANUT_WALLET_TOKEN,
+    PINTA_WALLET_CHAIN,
+    PINTA_WALLET_TOKEN,
+    PINTA_WALLET_TOKEN_DECIMALS,
+    PINTA_WALLET_TOKEN_SYMBOL,
+} from '@/constants'
 import { tokenSelectorContext } from '@/context'
 import { useWallet } from '@/hooks/wallet/useWallet'
 import { ParsedURL } from '@/lib/url-parser/types/payment'
@@ -45,6 +52,7 @@ type LoadingStep = `${ELoadingStep}`
 export interface InitiatePaymentPayload {
     recipient: ParsedURL['recipient']
     tokenAmount: string
+    isPintaReq?: boolean
     chargeId?: string
     skipChargeCreation?: boolean
     requestId?: string // optional request ID from URL
@@ -316,8 +324,30 @@ export const usePaymentInitiator = () => {
                         throw new Error('Invalid request ID')
                     }
                 } else if (!requestDetails) {
-                    console.error('Request details not found and cannot create new one for this payment type.')
-                    throw new Error('Request details not found.')
+                    if (payload.isPintaReq && payload.recipient?.resolvedAddress) {
+                        console.log(
+                            'Request details missing, creating new Pinta request for:',
+                            payload.recipient.resolvedAddress
+                        )
+                        try {
+                            const request = await requestsApi.create({
+                                recipientAddress: payload.recipient.resolvedAddress,
+                                chainId: PINTA_WALLET_CHAIN.id.toString(),
+                                tokenAddress: PINTA_WALLET_TOKEN,
+                                tokenType: String(peanutInterfaces.EPeanutLinkType.erc20),
+                                tokenSymbol: PINTA_WALLET_TOKEN_SYMBOL,
+                                tokenDecimals: String(PINTA_WALLET_TOKEN_DECIMALS),
+                            })
+                            validRequestId = request.uuid
+                            console.log('Created new Pinta request:', validRequestId)
+                        } catch (creationError) {
+                            console.error('Failed to create Pinta request:', creationError)
+                            throw new Error('Failed to automatically create Pinta request.')
+                        }
+                    } else {
+                        console.error('Request details not found and cannot create new one for this payment type.')
+                        throw new Error('Request details not found.')
+                    }
                 } else {
                     validRequestId = requestDetails.uuid
                 }
@@ -327,10 +357,18 @@ export const usePaymentInitiator = () => {
                     throw new Error('Could not determine request ID')
                 }
 
-                const recipientChainId = requestDetails?.chainId ?? selectedChainID
-                const recipientTokenAddress = requestDetails?.tokenAddress ?? selectedTokenAddress
-                const recipientTokenSymbol = requestDetails?.tokenSymbol ?? selectedTokenData?.symbol ?? 'TOKEN'
-                const recipientTokenDecimals = requestDetails?.tokenDecimals ?? selectedTokenData?.decimals ?? 18
+                const recipientChainId = payload.isPintaReq
+                    ? PINTA_WALLET_CHAIN.id.toString()
+                    : (requestDetails?.chainId ?? selectedChainID)
+                const recipientTokenAddress = payload.isPintaReq
+                    ? PINTA_WALLET_TOKEN
+                    : (requestDetails?.tokenAddress ?? selectedTokenAddress)
+                const recipientTokenSymbol = payload.isPintaReq
+                    ? PINTA_WALLET_TOKEN_SYMBOL
+                    : (requestDetails?.tokenSymbol ?? selectedTokenData?.symbol ?? 'TOKEN')
+                const recipientTokenDecimals = payload.isPintaReq
+                    ? PINTA_WALLET_TOKEN_DECIMALS
+                    : (requestDetails?.tokenDecimals ?? selectedTokenData?.decimals ?? 18)
 
                 const localPrice =
                     payload.currencyAmount && payload.currency
@@ -345,9 +383,11 @@ export const usePaymentInitiator = () => {
                         chainId: recipientChainId,
                         tokenAmount: payload.tokenAmount,
                         tokenAddress: recipientTokenAddress,
-                        tokenType: isNativeCurrency(recipientTokenAddress)
-                            ? peanutInterfaces.EPeanutLinkType.native
-                            : peanutInterfaces.EPeanutLinkType.erc20,
+                        tokenType: payload.isPintaReq
+                            ? peanutInterfaces.EPeanutLinkType.erc20
+                            : isNativeCurrency(recipientTokenAddress)
+                              ? peanutInterfaces.EPeanutLinkType.native
+                              : peanutInterfaces.EPeanutLinkType.erc20,
                         tokenSymbol: recipientTokenSymbol,
                         tokenDecimals: Number(recipientTokenDecimals),
                         recipientAddress: payload.recipient?.resolvedAddress,
@@ -620,7 +660,8 @@ export const usePaymentInitiator = () => {
                 // 2. handle charge state
                 if (
                     chargeCreated &&
-                    (payload.isExternalWalletFlow ||
+                    (payload.isPintaReq ||
+                        payload.isExternalWalletFlow ||
                         !isPeanutWallet ||
                         (isPeanutWallet &&
                             (!areEvmAddressesEqual(determinedChargeDetails.tokenAddress, PEANUT_WALLET_TOKEN) ||
@@ -628,7 +669,11 @@ export const usePaymentInitiator = () => {
                 ) {
                     console.log(
                         `Charge created. Transitioning to Confirm view for: ${
-                            payload.isExternalWalletFlow ? 'Add Money Flow' : 'External Wallet'
+                            payload.isPintaReq
+                                ? 'Pinta Request'
+                                : payload.isExternalWalletFlow
+                                  ? 'Add Money Flow'
+                                  : 'External Wallet'
                         }.`
                     )
                     setLoadingStep('Charge Created')
@@ -655,7 +700,9 @@ export const usePaymentInitiator = () => {
                         throw new Error('Charge details missing for Add Money external payment.')
                     return await handleExternalWalletPayment(determinedChargeDetails)
                 } else if (isPeanutWallet && peanutWalletAddress) {
-                    console.log(`Executing Peanut Wallet transaction (chargeCreated: ${chargeCreated})`)
+                    console.log(
+                        `Executing Peanut Wallet transaction (chargeCreated: ${chargeCreated}, isPintaReq: ${payload.isPintaReq})`
+                    )
                     return await handlePeanutWalletPayment(determinedChargeDetails)
                 } else if (!isPeanutWallet) {
                     console.log('Handling payment for External Wallet (non-AddMoney, called from Confirm view).')
diff --git a/src/hooks/useRecentUsers.ts b/src/hooks/useRecentUsers.ts
index 32c369c5f..9e91d277a 100644
--- a/src/hooks/useRecentUsers.ts
+++ b/src/hooks/useRecentUsers.ts
@@ -23,7 +23,7 @@ export function useRecentUsers() {
                 userId: account.userId!,
                 username: account.username!,
                 fullName: account.fullName!,
-                bridgeKycStatus: entry.isVerified ? 'approved' : 'not_started',
+                kycStatus: entry.isVerified ? 'approved' : 'not_started',
             })
             return acc
         }, [])
diff --git a/src/hooks/wallet/useWallet.ts b/src/hooks/wallet/useWallet.ts
index b2a733513..27aff7278 100644
--- a/src/hooks/wallet/useWallet.ts
+++ b/src/hooks/wallet/useWallet.ts
@@ -1,18 +1,28 @@
 'use client'
 
-import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN, PEANUT_WALLET_TOKEN_DECIMALS, peanutPublicClient } from '@/constants'
+import {
+    PEANUT_WALLET_CHAIN,
+    PEANUT_WALLET_TOKEN,
+    PEANUT_WALLET_TOKEN_DECIMALS,
+    peanutPublicClient,
+    PINTA_WALLET_TOKEN,
+    PINTA_WALLET_TOKEN_DECIMALS,
+    pintaPublicClient,
+} from '@/constants'
 import { useAppDispatch, useWalletStore } from '@/redux/hooks'
 import { walletActions } from '@/redux/slices/wallet-slice'
+import { formatAmount } from '@/utils'
 import { interfaces as peanutInterfaces } from '@squirrel-labs/peanut-sdk'
 import { useCallback, useEffect, useState } from 'react'
 import type { Hex, Address } from 'viem'
-import { erc20Abi, parseUnits, encodeFunctionData } from 'viem'
+import { erc20Abi, formatUnits, parseUnits, encodeFunctionData, getAddress } from 'viem'
 import { useZeroDev } from '../useZeroDev'
 
 export const useWallet = () => {
     const dispatch = useAppDispatch()
     const { address, isKernelClientReady, handleSendUserOpEncoded } = useZeroDev()
     const [isFetchingBalance, setIsFetchingBalance] = useState(true)
+    const [isFetchingRewardBalance, setIsFetchingRewardBalance] = useState(true)
     const { balance } = useWalletStore()
 
     const sendMoney = useCallback(
@@ -70,10 +80,34 @@ export const useWallet = () => {
             })
     }, [address, dispatch])
 
+    const getRewardWalletBalance = useCallback(async () => {
+        if (!address) {
+            console.warn('Cannot fetch reward balance, address is undefined.')
+            return ''
+        }
+        await pintaPublicClient
+            .readContract({
+                address: PINTA_WALLET_TOKEN,
+                abi: erc20Abi,
+                functionName: 'balanceOf',
+                args: [getAddress(address)],
+            })
+            .then((balance) => {
+                const formatedBalance = formatAmount(formatUnits(balance, PINTA_WALLET_TOKEN_DECIMALS))
+                dispatch(walletActions.setRewardWalletBalance(formatedBalance))
+                setIsFetchingRewardBalance(false)
+            })
+            .catch((error) => {
+                console.error('Error fetching reward balance:', error)
+                setIsFetchingRewardBalance(false)
+            })
+    }, [address, dispatch])
+
     useEffect(() => {
         if (!address) return
         fetchBalance()
-    }, [address, fetchBalance])
+        getRewardWalletBalance()
+    }, [address, fetchBalance, getRewardWalletBalance])
 
     return {
         address: address!,
@@ -81,7 +115,9 @@ export const useWallet = () => {
         isConnected: isKernelClientReady,
         sendTransactions,
         sendMoney,
+        getRewardWalletBalance,
         fetchBalance,
         isFetchingBalance,
+        isFetchingRewardBalance,
     }
 }
diff --git a/src/interfaces/interfaces.ts b/src/interfaces/interfaces.ts
index b1670ba0b..e8a6b4256 100644
--- a/src/interfaces/interfaces.ts
+++ b/src/interfaces/interfaces.ts
@@ -1,4 +1,4 @@
-import { BridgeKycStatus } from '@/utils'
+import { KYCStatus } from '@/utils'
 import { interfaces as peanutInterfaces } from '@squirrel-labs/peanut-sdk'
 
 export type RecipientType = 'address' | 'ens' | 'iban' | 'us' | 'username'
@@ -226,17 +226,16 @@ export interface User {
     email: string
     profile_picture: string | null
     username: string | null
-    bridgeKycStatus: BridgeKycStatus
-    bridgeKycStartedAt?: string
-    bridgeKycApprovedAt?: string
-    bridgeKycRejectedAt?: string
+    kycStatus: KYCStatus
+    kycStartedAt?: string
+    kycApprovedAt?: string
+    kycRejectedAt?: string
     tosStatus?: string
     tosAcceptedAt?: string
     bridgeCustomerId: string | null
     fullName: string
     telegram: string | null
     hasPwAccess: boolean
-    showFullName: boolean
     createdAt: string
     accounts: Account[]
 }
diff --git a/src/lib/url-parser/parser.ts b/src/lib/url-parser/parser.ts
index 8821848b2..a4f135eb0 100644
--- a/src/lib/url-parser/parser.ts
+++ b/src/lib/url-parser/parser.ts
@@ -1,5 +1,5 @@
 import { getSquidChainsAndTokens } from '@/app/actions/squid'
-import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN } from '@/constants'
+import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN, PINTA_WALLET_TOKEN } from '@/constants'
 import { interfaces } from '@squirrel-labs/peanut-sdk'
 import { validateAmount } from '../validation/amount'
 import { validateAndResolveRecipient } from '../validation/recipient'
@@ -43,6 +43,10 @@ export function parseAmountAndToken(amountString: string): { amount?: string; to
     }
 }
 
+function mustBeInteger(tokenAddress: string): boolean {
+    return areEvmAddressesEqual(tokenAddress, PINTA_WALLET_TOKEN)
+}
+
 export enum EParseUrlError {
     INVALID_URL_FORMAT = 'Invalid URL format',
     INVALID_RECIPIENT = 'Invalid recipient',
@@ -147,6 +151,15 @@ export async function parsePaymentURL(
             if (!chainDetails && !isPeanutRecipient && tokenAndChainData.chain) {
                 chainDetails = tokenAndChainData.chain as interfaces.ISquidChain & { tokens: interfaces.ISquidToken[] }
             }
+
+            //validate reward amount
+            if (
+                parsedAmount?.amount &&
+                mustBeInteger(tokenDetails.address) &&
+                !Number.isInteger(Number(parsedAmount.amount))
+            ) {
+                return { parsedUrl: null, error: { message: EParseUrlError.INVALID_AMOUNT, recipient } }
+            }
         } else if (isPeanutRecipient) {
             tokenDetails = chainDetails?.tokens.find(
                 (t) => t.address.toLowerCase() === PEANUT_WALLET_TOKEN.toLowerCase()
diff --git a/src/lib/validation/token.ts b/src/lib/validation/token.ts
index 33d43ebf0..74c6548ef 100644
--- a/src/lib/validation/token.ts
+++ b/src/lib/validation/token.ts
@@ -1,13 +1,32 @@
 import { getSquidChainsAndTokens } from '@/app/actions/squid'
-import { PEANUT_WALLET_CHAIN, PEANUT_WALLET_TOKEN } from '@/constants'
+import {
+    PEANUT_WALLET_CHAIN,
+    PEANUT_WALLET_TOKEN,
+    PINTA_WALLET_TOKEN,
+    PINTA_WALLET_TOKEN_DECIMALS,
+    PINTA_WALLET_TOKEN_NAME,
+    PINTA_WALLET_TOKEN_SYMBOL,
+} from '@/constants'
 import { interfaces } from '@squirrel-labs/peanut-sdk'
 import { ChainValidationError } from '../url-parser/errors'
 import { POPULAR_CHAIN_NAME_VARIANTS } from '../url-parser/parser.consts'
 
-// This is used to support other tokens, specifically for reward tokens for
-// example, it was used to support beer token in polygon in early versions of the app
-// We keep the mapping for future configuration
-const EXTRA_TOKENS_BY_CHAIN: Record<string, interfaces.ISquidToken[]> = {}
+import { polygon } from 'viem/chains'
+
+const EXTRA_TOKENS_BY_CHAIN: Record<string, interfaces.ISquidToken[]> = {
+    [polygon.id.toString()]: [
+        {
+            active: true,
+            chainId: polygon.id.toString(),
+            address: PINTA_WALLET_TOKEN,
+            name: PINTA_WALLET_TOKEN_NAME,
+            symbol: PINTA_WALLET_TOKEN_SYMBOL,
+            decimals: PINTA_WALLET_TOKEN_DECIMALS,
+            logoURI: 'https://polygonscan.com/token/images/pintatoken_32.png',
+            usdPrice: 2.5,
+        },
+    ],
+}
 
 export async function getTokenAndChainDetails(
     tokenSymbol: string,
diff --git a/src/redux/constants/index.ts b/src/redux/constants/index.ts
index 6a9b137fb..402ab8e8f 100644
--- a/src/redux/constants/index.ts
+++ b/src/redux/constants/index.ts
@@ -4,4 +4,3 @@ export const ZERODEV_SLICE = 'zerodev_slice'
 export const PAYMENT_SLICE = 'payment_slice'
 export const AUTH_SLICE = 'auth_slice'
 export const SEND_FLOW_SLICE = 'send_flow_slice'
-export const BANK_FORM_SLICE = 'bank_form_slice'
diff --git a/src/redux/slices/bank-form-slice.ts b/src/redux/slices/bank-form-slice.ts
deleted file mode 100644
index 63ba5d908..000000000
--- a/src/redux/slices/bank-form-slice.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { BANK_FORM_SLICE } from '../constants'
-import { IBankFormState } from '../types/bank-form.types'
-import { IBankAccountDetails } from '@/components/AddWithdraw/DynamicBankAccountForm'
-
-const initialState: IBankFormState = {
-    formData: null,
-}
-
-const bankFormSlice = createSlice({
-    name: BANK_FORM_SLICE,
-    initialState,
-    reducers: {
-        setFormData(state, action: PayloadAction<Partial<IBankAccountDetails>>) {
-            state.formData = { ...(state.formData ?? {}), ...action.payload }
-        },
-        updateFormField(
-            state,
-            action: PayloadAction<{
-                field: keyof IBankAccountDetails
-                value: string
-            }>
-        ) {
-            const { field, value } = action.payload
-            if (!state.formData) {
-                state.formData = {}
-            }
-            state.formData[field] = value
-        },
-        clearFormData(state) {
-            state.formData = null
-        },
-    },
-})
-
-export const bankFormActions = bankFormSlice.actions
-export default bankFormSlice.reducer
diff --git a/src/redux/slices/payment-slice.ts b/src/redux/slices/payment-slice.ts
index 2823874a8..dafb9a5f0 100644
--- a/src/redux/slices/payment-slice.ts
+++ b/src/redux/slices/payment-slice.ts
@@ -20,6 +20,7 @@ const initialState: IPaymentState = {
     paymentDetails: null,
     resolvedAddress: null,
     error: null,
+    beerQuantity: 0,
     usdAmount: null,
     daimoError: null,
     isDaimoPaymentProcessing: false,
@@ -59,6 +60,9 @@ const paymentSlice = createSlice({
         setError: (state, action: PayloadAction<string | null>) => {
             state.error = action.payload
         },
+        setBeerQuantity: (state, action: PayloadAction<number>) => {
+            state.beerQuantity = action.payload
+        },
         setUsdAmount: (state, action: PayloadAction<string | null>) => {
             state.usdAmount = action.payload
         },
diff --git a/src/redux/slices/wallet-slice.ts b/src/redux/slices/wallet-slice.ts
index be72d7595..a3c5d013c 100644
--- a/src/redux/slices/wallet-slice.ts
+++ b/src/redux/slices/wallet-slice.ts
@@ -5,6 +5,7 @@ import { PayloadAction } from '@reduxjs/toolkit'
 
 const initialState: WalletUIState = {
     signInModalVisible: false,
+    rewardWalletBalance: '',
     balance: undefined,
 }
 
@@ -18,6 +19,9 @@ const walletSlice = createSlice({
         setBalance: (state, action: PayloadAction<bigint>) => {
             state.balance = action.payload.toString()
         },
+        setRewardWalletBalance: (state, action) => {
+            state.rewardWalletBalance = action.payload
+        },
     },
 })
 
diff --git a/src/redux/store.ts b/src/redux/store.ts
index a3672945b..a793aa76f 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -5,7 +5,6 @@ import setupReducer from './slices/setup-slice'
 import userReducer from './slices/user-slice'
 import walletReducer from './slices/wallet-slice'
 import zeroDevReducer from './slices/zerodev-slice'
-import bankFormReducer from './slices/bank-form-slice'
 
 const store = configureStore({
     reducer: {
@@ -15,7 +14,6 @@ const store = configureStore({
         payment: paymentReducer,
         user: userReducer,
         sendFlow: sendFlowReducer,
-        bankForm: bankFormReducer,
     },
     // disable redux serialization checks
     middleware: (getDefaultMiddleware) =>
diff --git a/src/redux/types/bank-form.types.ts b/src/redux/types/bank-form.types.ts
deleted file mode 100644
index d6503e6c5..000000000
--- a/src/redux/types/bank-form.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IBankAccountDetails } from '@/components/AddWithdraw/DynamicBankAccountForm'
-
-export type BankFormFlow = 'claim' | 'withdraw'
-
-export interface IBankFormState {
-    formData: Partial<IBankAccountDetails> | null
-}
diff --git a/src/redux/types/payment.types.ts b/src/redux/types/payment.types.ts
index 377193501..d1a315eda 100644
--- a/src/redux/types/payment.types.ts
+++ b/src/redux/types/payment.types.ts
@@ -15,6 +15,7 @@ export interface IPaymentState {
     createdChargeDetails: TCharge | null
     resolvedAddress: string | null
     error: string | null
+    beerQuantity: number
     usdAmount: string | null
     daimoError: string | null
     isDaimoPaymentProcessing: boolean
diff --git a/src/redux/types/wallet.types.ts b/src/redux/types/wallet.types.ts
index fc1947fc6..d7caade9a 100644
--- a/src/redux/types/wallet.types.ts
+++ b/src/redux/types/wallet.types.ts
@@ -1,4 +1,5 @@
 export interface WalletUIState {
     signInModalVisible: boolean
+    rewardWalletBalance: string
     balance: string | undefined
 }
diff --git a/src/services/sendLinks.ts b/src/services/sendLinks.ts
index 04b72d56e..1f22698d8 100644
--- a/src/services/sendLinks.ts
+++ b/src/services/sendLinks.ts
@@ -31,7 +31,7 @@ export type SendLink = {
         userId: string
         username: string
         fullName: string
-        bridgeKycStatus: string
+        kycStatus: string
         accounts: {
             identifier: string
             type: string
@@ -46,7 +46,7 @@ export type SendLink = {
             userId: string
             username: string
             fullName: string
-            bridgeKycStatus: string
+            kycStatus: string
             accounts: {
                 identifier: string
                 type: string
@@ -205,41 +205,6 @@ export const sendLinksApi = {
         return await claimSendLink(pubKey, recipient, params.password)
     },
 
-    /**
-     * Automaticaly claim a send link without the need of the recipient to click the claim button - Calls the Next.js API route
-     *
-     * @param recipient - The recipient's address or username
-     * @param link - The link to claim
-     * @returns The claim link data
-     */
-    autoClaimLink: async (recipient: string, link: string): Promise<SendLink> => {
-        try {
-            const params = getParamsFromLink(link)
-            const pubKey = generateKeysFromString(params.password).address
-            const response = await fetch(`/api/auto-claim`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    pubKey,
-                    recipient,
-                    password: params.password,
-                }),
-            })
-
-            if (!response.ok) {
-                const errText = await response.text()
-                throw new Error(`HTTP error! status: ${response.status}, message: ${errText}`)
-            }
-
-            const text = await response.text()
-            const result: SendLink = jsonParse(text)
-            return result
-        } catch (error) {
-            console.error('Failed to automatically claim link:', error)
-            throw error
-        }
-    },
-
     /**
      * associates a logged-in user with a claim transaction.
      * this is called after an external wallet claim is successful.
diff --git a/src/services/services.types.ts b/src/services/services.types.ts
index 87e55ab63..56f5c03ac 100644
--- a/src/services/services.types.ts
+++ b/src/services/services.types.ts
@@ -144,7 +144,7 @@ export interface Payment {
         type: string
         user: {
             username: string
-            bridgeKycStatus?: string
+            kycStatus?: string
         } | null
     }
 }
@@ -200,10 +200,10 @@ export interface TRequestChargeResponse {
             identifier: string
             type: string
             username?: string
-            bridgeKycStatus?: string
+            kycStatus?: string
             user: {
                 username: string
-                bridgeKycStatus?: string
+                kycStatus?: string
             }
         }
     }
diff --git a/src/services/users.ts b/src/services/users.ts
index 3fde5794e..fef1f9fb1 100644
--- a/src/services/users.ts
+++ b/src/services/users.ts
@@ -27,10 +27,10 @@ export type ApiUser = {
     lastName: string
     totalUsdSentToCurrentUser: string
     totalUsdReceivedFromCurrentUser: string
-    bridgeKycStatus: string
+    kycStatus: string
 }
 
-export type RecentUser = Pick<ApiUser, 'userId' | 'username' | 'fullName' | 'bridgeKycStatus'>
+export type RecentUser = Pick<ApiUser, 'userId' | 'username' | 'fullName' | 'kycStatus'>
 
 export interface UserSearchResponse {
     users: Array<ApiUser>
diff --git a/src/utils/bridge-accounts.utils.ts b/src/utils/bridge-accounts.utils.ts
index 0c24a2ed7..443e8cffa 100644
--- a/src/utils/bridge-accounts.utils.ts
+++ b/src/utils/bridge-accounts.utils.ts
@@ -31,7 +31,7 @@ export const convertPersonaUrl = (url: string) => {
     return `https://bridge.withpersona.com/widget?environment=production&inquiry-template-id=${templateId}&fields[iqt_token=${iqtToken}&iframe-origin=${origin}&redirect-uri=${origin}&fields[developer_id]=${developerId}&reference-id=${referenceId}`
 }
 
-export type BridgeKycStatus = 'not_started' | 'under_review' | 'approved' | 'rejected' | 'incomplete'
+export type KYCStatus = 'not_started' | 'under_review' | 'approved' | 'rejected' | 'incomplete'
 
 export async function validateIban(iban: string): Promise<boolean> {
     return isIBAN(iban.replace(/\s+/g, ''))
diff --git a/src/utils/general.utils.ts b/src/utils/general.utils.ts
index 21951c791..9b6c833c1 100644
--- a/src/utils/general.utils.ts
+++ b/src/utils/general.utils.ts
@@ -1,5 +1,14 @@
 import * as consts from '@/constants'
-import { PEANUT_WALLET_SUPPORTED_TOKENS, STABLE_COINS, USER_OPERATION_REVERT_REASON_TOPIC } from '@/constants'
+import {
+    PEANUT_WALLET_SUPPORTED_TOKENS,
+    PINTA_WALLET_CHAIN,
+    PINTA_WALLET_TOKEN,
+    PINTA_WALLET_TOKEN_DECIMALS,
+    PINTA_WALLET_TOKEN_NAME,
+    PINTA_WALLET_TOKEN_SYMBOL,
+    STABLE_COINS,
+    USER_OPERATION_REVERT_REASON_TOPIC,
+} from '@/constants'
 import * as interfaces from '@/interfaces'
 import { AccountType } from '@/interfaces'
 import * as Sentry from '@sentry/nextjs'
@@ -1002,6 +1011,13 @@ export function getTokenDetails({ tokenAddress, chainId }: { tokenAddress: Addre
           decimals: number
       }
     | undefined {
+    if (chainId === PINTA_WALLET_CHAIN.id.toString() && areEvmAddressesEqual(tokenAddress, PINTA_WALLET_TOKEN)) {
+        return {
+            symbol: PINTA_WALLET_TOKEN_SYMBOL,
+            name: PINTA_WALLET_TOKEN_NAME,
+            decimals: PINTA_WALLET_TOKEN_DECIMALS,
+        }
+    }
     const chainTokens = consts.peanutTokenDetails.find((c) => c.chainId === chainId)?.tokens
     if (!chainTokens) return undefined
     const tokenDetails = chainTokens.find((token) => areEvmAddressesEqual(token.address, tokenAddress))
@@ -1169,6 +1185,9 @@ export function getRequestLink(
 
 // for now it works
 export function getTokenLogo(tokenSymbol: string): string {
+    if (tokenSymbol.toLowerCase() === 'pnt') {
+        return 'https://polygonscan.com/token/images/pintatoken_32.png'
+    }
     return `https://raw.githubusercontent.com/0xsquid/assets/main/images/tokens/${tokenSymbol.toLowerCase()}.svg`
 }
 
@@ -1194,22 +1213,7 @@ export function isStableCoin(tokenSymbol: string): boolean {
 
 export const saveRedirectUrl = () => {
     const currentUrl = new URL(window.location.href)
-    const relativeUrl = currentUrl.href.replace(currentUrl.origin, '')
-    saveToLocalStorage('redirect', relativeUrl)
-}
-
-export const sanitizeRedirectURL = (redirectUrl: string): string => {
-    try {
-        const u = new URL(redirectUrl, window.location.origin)
-        if (u.origin === window.location.origin) {
-            return u.pathname + u.search + u.hash
-        }
-    } catch {
-        if (redirectUrl.startsWith('/')) {
-            return redirectUrl
-        }
-    }
-    return redirectUrl
+    saveToLocalStorage('redirect', `${currentUrl.pathname}${currentUrl.search}${currentUrl.hash}`)
 }
 
 export const formatPaymentStatus = (status: string): string => {
diff --git a/src/utils/sdkErrorHandler.utils.tsx b/src/utils/sdkErrorHandler.utils.tsx
index f54dbe950..e66673b1f 100644
--- a/src/utils/sdkErrorHandler.utils.tsx
+++ b/src/utils/sdkErrorHandler.utils.tsx
@@ -12,36 +12,36 @@ export const ErrorHandler = (error: any) => {
             case peanut.interfaces.ESignAndSubmitTx.ERROR_INSUFFICIENT_NATIVE_TOKEN:
                 return 'Insufficient funds to complete the transaction.'
             case peanut.interfaces.ECreateLinkStatusCodes.ERROR_GETTING_LINKS_FROM_TX:
-                return 'Something went wrong while getting the links from the transaction. Please contact support.'
+                return 'Something went wrong while getting the links from the transaction. Please try again later.'
             case peanut.interfaces.ECreateLinkStatusCodes.ERROR_SIGNING_AND_SUBMITTING_TX:
-                return 'Something went wrong while signing and submitting the transaction. Please contact support.'
+                return 'Something went wrong while signing and submitting the transaction. Please try again later.'
             case peanut.interfaces.ECreateLinkStatusCodes.ERROR_PREPARING_TX:
-                return 'Something went wrong while preparing the transaction. Please contact support.'
+                return 'Something went wrong while preparing the transaction. Please try again later.'
             case peanut.interfaces.EClaimLinkStatusCodes.ERROR:
-                return 'Something went wrong while claiming. Please contact support.'
+                return 'Something went wrong while claiming. Please try again later.'
             case peanut.interfaces.EGetLinkFromTxStatusCodes.ERROR_GETTING_TX_RECEIPT_FROM_HASH:
-                return 'Something went wrong while getting the transaction receipt from hash. Please contact support.'
+                return 'Something went wrong while getting the transaction receipt from hash. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_ESTIMATING_GAS_LIMIT:
-                return 'Something went wrong while estimating gas limit. Please contact support.'
+                return 'Something went wrong while estimating gas limit. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_GETTING_TX_COUNT:
-                return 'Something went wrong while getting the transaction count. Please contact support.'
+                return 'Something went wrong while getting the transaction count. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_MAKING_DEPOSIT:
-                return 'Something went wrong while making the deposit. Please contact support.'
+                return 'Something went wrong while making the deposit. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_PREPARING_APPROVE_ERC1155_TX:
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_PREPARING_APPROVE_ERC20_TX:
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_PREPARING_APPROVE_ERC721_TX:
-                return 'Something went wrong while preparing the approval transaction. Please contact support.'
+                return 'Something went wrong while preparing the approval transaction. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_SETTING_FEE_OPTIONS:
-                return 'Something went wrong while setting the fee options. Please contact support.'
+                return 'Something went wrong while setting the fee options. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_GETTING_DEFAULT_PROVIDER:
-                return 'Something went wrong while getting the default provider. Please contact support.'
+                return 'Something went wrong while getting the default provider. Please try again later.'
             case peanut.interfaces.EPrepareCreateTxsStatusCodes.ERROR_VALIDATING_LINK_DETAILS:
-                return 'Something went wrong while validating the link details. Please contact support.'
+                return 'Something went wrong while validating the link details. Please try again later.'
             case peanut.interfaces.ESignAndSubmitTx.ERROR_BROADCASTING_TX:
-                return 'Something went wrong while broadcasting the transaction. Please contact support.'
+                return 'Something went wrong while broadcasting the transaction. Please try again later.'
 
             default:
-                return 'Something went wrong. Please contact support.'
+                return 'Something went wrong. Please try again later.'
         }
     } else {
         console.log(error.toString())
diff --git a/src/utils/sentry.utils.ts b/src/utils/sentry.utils.ts
index d69bcedbb..786aebbbb 100644
--- a/src/utils/sentry.utils.ts
+++ b/src/utils/sentry.utils.ts
@@ -8,21 +8,6 @@ const getErrorLevelFromStatus = (status: number): Sentry.SeverityLevel => {
     return 'info'
 }
 
-const sanitizeHeaders = (headers: any): any => {
-    if (!headers) return headers
-
-    const sanitized = { ...headers }
-    const sensitiveHeaders = ['authorization', 'cookie', 'x-auth-token', 'api-key']
-
-    for (const key of Object.keys(sanitized)) {
-        if (sensitiveHeaders.includes(key.toLowerCase())) {
-            sanitized[key] = '[REDACTED]'
-        }
-    }
-
-    return sanitized
-}
-
 export const fetchWithSentry = async (url: string, options: RequestInit = {}): Promise<Response> => {
     // Sanitize URL for fingerprinting by replacing IDs with placeholders
     const sanitizeUrl = (url: string) => {
@@ -57,7 +42,7 @@ export const fetchWithSentry = async (url: string, options: RequestInit = {}): P
                     extra: {
                         url,
                         method,
-                        requestHeaders: sanitizeHeaders(options.headers || {}),
+                        requestHeaders: options.headers || {},
                         requestBody: options.body || null,
                         status: response.status,
                         response: errorContent,
@@ -90,7 +75,7 @@ export const fetchWithSentry = async (url: string, options: RequestInit = {}): P
                 extra: {
                     url,
                     method: options.method || 'GET',
-                    requestHeaders: sanitizeHeaders(options.headers || {}),
+                    requestHeaders: options.headers || {},
                     requestBody: options.body || null,
                     errorMessage,
                     errorName,
diff --git a/src/utils/withdraw.utils.ts b/src/utils/withdraw.utils.ts
index 16fb4d27a..75a2b90eb 100644
--- a/src/utils/withdraw.utils.ts
+++ b/src/utils/withdraw.utils.ts
@@ -13,7 +13,7 @@ export const getCountryFromIban = (iban: string): string | null => {
     const countryCode = cleanIban.substring(0, 2)
 
     // Try to find country by 2-letter code directly in countryData
-    let country = countryData.find((c) => c.type === 'country' && (c.id === countryCode || c.iso2 === countryCode))
+    let country = countryData.find((c) => c.type === 'country' && (c.id === countryCode || c.iso2 === countryCode)) // @dev TODO - fix the UK issue properly
 
     // If not found, get the 3-letter code and try that
     if (!country) {