diff --git a/apps/scoutgame/app/(general)/home/page.tsx b/apps/scoutgame/app/(general)/home/page.tsx
index d94276a4ba..5b8c2ee014 100644
--- a/apps/scoutgame/app/(general)/home/page.tsx
+++ b/apps/scoutgame/app/(general)/home/page.tsx
@@ -1,5 +1,4 @@
 import { HomePage } from 'components/home/HomePage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 
 export default async function Home({
   searchParams
@@ -7,7 +6,6 @@ export default async function Home({
   searchParams: { [key: string]: string | string[] | undefined };
 }) {
   const tab = searchParams.tab as string;
-  const user = await getUserFromSession();
 
-  return <HomePage user={user || null} tab={tab || 'leaderboard'} />;
+  return <HomePage tab={tab || 'leaderboard'} />;
 }
diff --git a/apps/scoutgame/app/(general)/notifications/page.tsx b/apps/scoutgame/app/(general)/notifications/page.tsx
index 3a2eeeeee1..fc9903bffe 100644
--- a/apps/scoutgame/app/(general)/notifications/page.tsx
+++ b/apps/scoutgame/app/(general)/notifications/page.tsx
@@ -1,14 +1,14 @@
+import { getSession } from '@connect-shared/lib/session/getSession';
 import { getNotifications } from '@packages/scoutgame/notifications/getNotifications';
 
 import { NotificationsPage } from 'components/notifications/NotificationsPage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 
 export default async function Page() {
-  const user = await getUserFromSession();
+  const { scoutId } = await getSession();
 
-  const notifications = user
+  const notifications = scoutId
     ? await getNotifications({
-        userId: user.id
+        userId: scoutId
       })
     : [];
 
diff --git a/apps/scoutgame/app/(general)/profile/page.tsx b/apps/scoutgame/app/(general)/profile/page.tsx
index 9f65763ef6..1a960904af 100644
--- a/apps/scoutgame/app/(general)/profile/page.tsx
+++ b/apps/scoutgame/app/(general)/profile/page.tsx
@@ -4,7 +4,7 @@ import { redirect } from 'next/navigation';
 
 import type { ProfileTab } from 'components/profile/ProfilePage';
 import { ProfilePage } from 'components/profile/ProfilePage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
+import { getCachedUserFromSession as getUserFromSession } from 'lib/session/getUserFromSession';
 import { getUserStats } from 'lib/users/getUserStats';
 
 export const dynamic = 'force-dynamic';
diff --git a/apps/scoutgame/app/(general)/scout/page.tsx b/apps/scoutgame/app/(general)/scout/page.tsx
index e6b36b780b..92c2e6b186 100644
--- a/apps/scoutgame/app/(general)/scout/page.tsx
+++ b/apps/scoutgame/app/(general)/scout/page.tsx
@@ -1,6 +1,5 @@
 import { ScoutPage } from 'components/scout/ScoutPage';
 import type { BuildersSort } from 'lib/builders/getSortedBuilders';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 
 export default async function Scout({
   searchParams
@@ -9,7 +8,6 @@ export default async function Scout({
 }) {
   const sortParam = searchParams.tab;
   const sort = (sortParam && typeof sortParam === 'string' ? sortParam : 'top') as BuildersSort;
-  const user = await getUserFromSession();
 
-  return <ScoutPage sort={sort} user={user} />;
+  return <ScoutPage sort={sort} />;
 }
diff --git a/apps/scoutgame/app/(info)/welcome/how-it-works/page.tsx b/apps/scoutgame/app/(info)/welcome/how-it-works/page.tsx
index c5bf1d3d61..edbd76f025 100644
--- a/apps/scoutgame/app/(info)/welcome/how-it-works/page.tsx
+++ b/apps/scoutgame/app/(info)/welcome/how-it-works/page.tsx
@@ -1,7 +1,6 @@
 import type { Metadata } from 'next';
 
 import { HowItWorksPage } from 'components/welcome/how-it-works/HowItWorksPage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 
 export const dynamic = 'force-dynamic';
 
@@ -13,8 +12,6 @@ export const metadata: Metadata = {
 };
 
 export default async function HowItWorks() {
-  const user = await getUserFromSession();
-
   // logic in middleware.ts ensures that user is logged in
-  return <HowItWorksPage username={user!.username} />;
+  return <HowItWorksPage />;
 }
diff --git a/apps/scoutgame/app/(info)/welcome/page.tsx b/apps/scoutgame/app/(info)/welcome/page.tsx
index d9195c0f25..9820e353fb 100644
--- a/apps/scoutgame/app/(info)/welcome/page.tsx
+++ b/apps/scoutgame/app/(info)/welcome/page.tsx
@@ -3,7 +3,7 @@ import type { Metadata } from 'next';
 import { redirect } from 'next/navigation';
 
 import { WelcomePage } from 'components/welcome/WelcomePage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
+import { getCachedUserFromSession as getUserFromSession } from 'lib/session/getUserFromSession';
 
 export const dynamic = 'force-dynamic';
 
diff --git a/apps/scoutgame/app/(info)/welcome/spam-policy/page.tsx b/apps/scoutgame/app/(info)/welcome/spam-policy/page.tsx
index 95d925961a..cca2efdc49 100644
--- a/apps/scoutgame/app/(info)/welcome/spam-policy/page.tsx
+++ b/apps/scoutgame/app/(info)/welcome/spam-policy/page.tsx
@@ -1,9 +1,6 @@
 import type { Metadata } from 'next';
 
 import { SpamPolicyPage } from 'components/welcome/spam-policy/SpamPolicyPage';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
-
-export const dynamic = 'force-dynamic';
 
 export const metadata: Metadata = {
   other: {
@@ -13,7 +10,5 @@ export const metadata: Metadata = {
 };
 
 export default async function SpamPolicy({ searchParams }: { searchParams: { 'profile-redirect': string } }) {
-  const user = await getUserFromSession();
-
-  return <SpamPolicyPage user={user} redirectToProfile={searchParams['profile-redirect'] === 'true'} />;
+  return <SpamPolicyPage redirectToProfile={searchParams['profile-redirect'] === 'true'} />;
 }
diff --git a/apps/scoutgame/app/layout.tsx b/apps/scoutgame/app/layout.tsx
index 49fe029f5c..633ef8eb75 100644
--- a/apps/scoutgame/app/layout.tsx
+++ b/apps/scoutgame/app/layout.tsx
@@ -4,7 +4,7 @@ import Script from 'next/script';
 import type { ReactNode } from 'react';
 
 import { AppProviders } from 'components/layout/AppProviders';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
+import { getCachedUserFromSession as getUserFromSession } from 'lib/session/getUserFromSession';
 import 'theme/styles.scss';
 
 const ClientGlobals = dynamic(() => import('components/common/ClientGlobals').then((comp) => comp.ClientGlobals), {
diff --git a/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfile.tsx b/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfile.tsx
index 085dec7a74..a830ffb4bc 100644
--- a/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfile.tsx
+++ b/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfile.tsx
@@ -6,7 +6,6 @@ import { currentSeason } from '@packages/scoutgame/dates';
 import { getBuilderActivities } from 'lib/builders/getBuilderActivities';
 import { getBuilderScouts } from 'lib/builders/getBuilderScouts';
 import { getBuilderStats } from 'lib/builders/getBuilderStats';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 import type { BasicUserInfo } from 'lib/users/interfaces';
 
 import { PublicBuilderProfileContainer } from './PublicBuilderProfileContainer';
@@ -19,8 +18,7 @@ export async function PublicBuilderProfile({ publicUser }: { publicUser: BasicUs
     builderNft,
     { allTimePoints = 0, seasonPoints = 0, rank = 0, gemsCollected = 0 } = {},
     builderActivities = [],
-    { scouts = [], totalNftsSold = 0, totalScouts = 0 } = {},
-    user
+    { scouts = [], totalNftsSold = 0, totalScouts = 0 } = {}
   ] = isApprovedBuilder
     ? await Promise.all([
         prisma.builderNft.findUnique({
@@ -37,8 +35,7 @@ export async function PublicBuilderProfile({ publicUser }: { publicUser: BasicUs
         }),
         getBuilderStats(builderId),
         getBuilderActivities({ builderId, limit: 200 }),
-        getBuilderScouts(builderId),
-        getUserFromSession()
+        getBuilderScouts(builderId)
       ])
     : [];
 
@@ -57,7 +54,6 @@ export async function PublicBuilderProfile({ publicUser }: { publicUser: BasicUs
       builderActivities={builderActivities}
       gemsCollected={gemsCollected}
       rank={rank}
-      user={user}
     />
   );
 }
diff --git a/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfileContainer.tsx b/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfileContainer.tsx
index 5e1bc5470b..a2eadb6a9a 100644
--- a/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfileContainer.tsx
+++ b/apps/scoutgame/components/[username]/components/PublicBuilderProfile/PublicBuilderProfileContainer.tsx
@@ -28,10 +28,6 @@ type BuilderProfileProps = {
   builderActivities: BuilderActivity[];
   gemsCollected?: number;
   rank?: number | null;
-  user?: {
-    id: string;
-    username: string;
-  } | null;
 };
 
 const PaperContainer = styled(Paper)(({ theme }) => ({
@@ -58,8 +54,7 @@ export function PublicBuilderProfileContainer({
   totalNftsSold,
   builderActivities,
   gemsCollected,
-  rank,
-  user
+  rank
 }: BuilderProfileProps) {
   const isDesktop = useMdScreen();
 
@@ -89,7 +84,6 @@ export function PublicBuilderProfileContainer({
                     hideDetails
                     showPurchaseButton
                     size='small'
-                    userId={user?.id}
                   />
                 </Box>
                 <Stack gap={1} pr={1}>
@@ -140,7 +134,6 @@ export function PublicBuilderProfileContainer({
                       gemsCollected: 0,
                       builderPoints: 0
                     }}
-                    userId={user?.id}
                     hideDetails
                     showPurchaseButton
                   />
diff --git a/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfile.tsx b/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfile.tsx
index d90af882fd..62d30112f5 100644
--- a/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfile.tsx
+++ b/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfile.tsx
@@ -2,14 +2,13 @@ import { prisma } from '@charmverse/core/prisma-client';
 
 import { getScoutedBuilders } from 'lib/scouts/getScoutedBuilders';
 import { getScoutStats } from 'lib/scouts/getScoutStats';
-import { getUserFromSession } from 'lib/session/getUserFromSession';
 import type { BasicUserInfo } from 'lib/users/interfaces';
 import { BasicUserInfoSelect } from 'lib/users/queries';
 
 import { PublicScoutProfileContainer } from './PublicScoutProfileContainer';
 
 export async function PublicScoutProfile({ publicUser }: { publicUser: BasicUserInfo }) {
-  const [scout, { allTimePoints, seasonPoints, nftsPurchased }, scoutedBuilders, user] = await Promise.all([
+  const [scout, { allTimePoints, seasonPoints, nftsPurchased }, scoutedBuilders] = await Promise.all([
     prisma.scout.findUniqueOrThrow({
       where: {
         id: publicUser.id
@@ -17,8 +16,7 @@ export async function PublicScoutProfile({ publicUser }: { publicUser: BasicUser
       select: BasicUserInfoSelect
     }),
     getScoutStats(publicUser.id),
-    getScoutedBuilders({ scoutId: publicUser.id }),
-    getUserFromSession()
+    getScoutedBuilders({ scoutId: publicUser.id })
   ]);
 
   return (
@@ -31,7 +29,6 @@ export async function PublicScoutProfile({ publicUser }: { publicUser: BasicUser
       seasonPoints={seasonPoints}
       nftsPurchased={nftsPurchased}
       scoutedBuilders={scoutedBuilders}
-      userId={user?.id}
     />
   );
 }
diff --git a/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfileContainer.tsx b/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfileContainer.tsx
index c22e47f307..a2f3cb177e 100644
--- a/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfileContainer.tsx
+++ b/apps/scoutgame/components/[username]/components/PublicScoutProfile/PublicScoutProfileContainer.tsx
@@ -20,7 +20,6 @@ export type ScoutProfileProps = {
   seasonPoints: number;
   nftsPurchased: number;
   scoutedBuilders: BuilderInfo[];
-  userId?: string;
 };
 
 export function PublicScoutProfileContainer({
@@ -28,8 +27,7 @@ export function PublicScoutProfileContainer({
   allTimePoints,
   seasonPoints,
   nftsPurchased,
-  scoutedBuilders,
-  userId
+  scoutedBuilders
 }: ScoutProfileProps) {
   const isDesktop = useMdScreen();
   return (
@@ -68,12 +66,7 @@ export function PublicScoutProfileContainer({
           Scouted Builders
         </Typography>
         {scoutedBuilders.length > 0 ? (
-          <BuildersGallery
-            builders={scoutedBuilders}
-            columns={5}
-            size={isDesktop ? 'large' : 'small'}
-            userId={userId}
-          />
+          <BuildersGallery builders={scoutedBuilders} columns={5} size={isDesktop ? 'large' : 'small'} />
         ) : (
           <Typography>This Scout hasn't discovered any Builders yet. Check back to see who they find!</Typography>
         )}
diff --git a/apps/scoutgame/components/common/Card/BuilderCard/BuilderCard.tsx b/apps/scoutgame/components/common/Card/BuilderCard/BuilderCard.tsx
index ebe22665f2..38c284d160 100644
--- a/apps/scoutgame/components/common/Card/BuilderCard/BuilderCard.tsx
+++ b/apps/scoutgame/components/common/Card/BuilderCard/BuilderCard.tsx
@@ -14,15 +14,13 @@ export function BuilderCard({
   showPurchaseButton = false,
   hideDetails = false,
   showHotIcon = false,
-  size = 'medium',
-  userId
+  size = 'medium'
 }: {
   size?: 'x-small' | 'small' | 'medium' | 'large';
   builder: BuilderInfo;
   hideDetails?: boolean;
   showPurchaseButton?: boolean;
   showHotIcon?: boolean;
-  userId?: string;
 }) {
   return (
     <Card
@@ -48,7 +46,7 @@ export function BuilderCard({
       </BuilderCardNftDisplay>
       {typeof builder.price !== 'undefined' && showPurchaseButton && (
         <Stack px={{ xs: 1, md: 0 }} pt={{ xs: 1, md: 2 }} pb={{ xs: 1, md: 0 }}>
-          <ScoutButton builder={builder} isAuthenticated={!!userId} />
+          <ScoutButton builder={builder} />
         </Stack>
       )}
     </Card>
diff --git a/apps/scoutgame/components/common/Gallery/BuildersGallery.tsx b/apps/scoutgame/components/common/Gallery/BuildersGallery.tsx
index ba21f36bd7..fb3ecf706e 100644
--- a/apps/scoutgame/components/common/Gallery/BuildersGallery.tsx
+++ b/apps/scoutgame/components/common/Gallery/BuildersGallery.tsx
@@ -8,14 +8,12 @@ export function BuildersGallery({
   builders,
   columns = 6,
   showHotIcon = false,
-  size = 'medium',
-  userId
+  size = 'medium'
 }: {
   builders: BuilderInfo[];
   columns?: number;
   showHotIcon?: boolean;
   size?: 'small' | 'medium' | 'large';
-  userId?: string;
 }) {
   return (
     <Box sx={{ flexGrow: 1 }}>
@@ -32,7 +30,7 @@ export function BuildersGallery({
                   X {builder.nftsSoldToScout ?? 0}
                 </Typography>
               )}
-              <BuilderCard builder={builder} showPurchaseButton showHotIcon={showHotIcon} size={size} userId={userId} />
+              <BuilderCard builder={builder} showPurchaseButton showHotIcon={showHotIcon} size={size} />
             </Box>
           </Grid>
         ))}
diff --git a/apps/scoutgame/components/common/Header/Header.tsx b/apps/scoutgame/components/common/Header/Header.tsx
index 2234deea34..b6500725e2 100644
--- a/apps/scoutgame/components/common/Header/Header.tsx
+++ b/apps/scoutgame/components/common/Header/Header.tsx
@@ -20,11 +20,12 @@ import { InstallAppMenuItem } from './components/InstallAppMenuItem';
 
 export function Header() {
   const router = useRouter();
-  const { user } = useUser();
+  const { user, refreshUser } = useUser();
   const [anchorElUser, setAnchorElUser] = useState<null | HTMLElement>(null);
 
   const { execute: logoutUser, isExecuting: isExecutingLogout } = useAction(logoutAction, {
     onSuccess: async () => {
+      await refreshUser();
       revalidatePathAction();
       router.push('/');
     },
diff --git a/apps/scoutgame/components/common/NFTPurchaseDialog/components/NFTPurchaseForm.tsx b/apps/scoutgame/components/common/NFTPurchaseDialog/components/NFTPurchaseForm.tsx
index f253caf1ce..c569a408e2 100644
--- a/apps/scoutgame/components/common/NFTPurchaseDialog/components/NFTPurchaseForm.tsx
+++ b/apps/scoutgame/components/common/NFTPurchaseDialog/components/NFTPurchaseForm.tsx
@@ -74,7 +74,7 @@ export function NFTPurchaseForm(props: NFTPurchaseProps) {
 }
 
 export function NFTPurchaseFormContent({ builder }: NFTPurchaseProps) {
-  const { user } = useUser();
+  const { user, refreshUser } = useUser();
   const builderId = builder.id;
   const initialQuantities = [1, 11, 111];
   const pricePerNft = builder.price ? convertCostToPoints(builder.price).toLocaleString() : '';
@@ -147,6 +147,7 @@ export function NFTPurchaseFormContent({ builder }: NFTPurchaseProps) {
     async onSuccess(res) {
       if (res.data?.id) {
         await checkDecentTransaction({ pendingTransactionId: res.data.id });
+        await refreshUser();
         log.info('NFT minted', { chainId, builderTokenId, purchaseCost });
       } else {
         log.warn('NFT minted but no transaction id returned', {
diff --git a/apps/scoutgame/components/common/ScoutButton/ScoutButton.tsx b/apps/scoutgame/components/common/ScoutButton/ScoutButton.tsx
index c5f3150977..6d36045392 100644
--- a/apps/scoutgame/components/common/ScoutButton/ScoutButton.tsx
+++ b/apps/scoutgame/components/common/ScoutButton/ScoutButton.tsx
@@ -7,7 +7,7 @@ import Image from 'next/image';
 import { useState } from 'react';
 
 import type { NFTPurchaseProps } from 'components/common/NFTPurchaseDialog/components/NFTPurchaseForm';
-import type { MinimalUserInfo } from 'lib/users/interfaces';
+import { useUser } from 'components/layout/UserProvider';
 
 import { DynamicLoadingContext, LoadingComponent } from '../DynamicLoading';
 
@@ -21,16 +21,12 @@ const NFTPurchaseDialog = dynamic(
   }
 );
 
-export function ScoutButton({
-  builder,
-  isAuthenticated = true
-}: {
-  builder: NFTPurchaseProps['builder'];
-  isAuthenticated?: boolean;
-}) {
+export function ScoutButton({ builder }: { builder: NFTPurchaseProps['builder'] }) {
   const [isPurchasing, setIsPurchasing] = useState<boolean>(false);
   const [authPopup, setAuthPopup] = useState<boolean>(false);
   const [dialogLoadingStatus, setDialogLoadingStatus] = useState<boolean>(false);
+  const { user } = useUser();
+  const isAuthenticated = Boolean(user?.id);
 
   const handleClick = () => {
     if (isAuthenticated) {
diff --git a/apps/scoutgame/components/common/WarpcastLogin/WarpcastLoginButton.tsx b/apps/scoutgame/components/common/WarpcastLogin/WarpcastLoginButton.tsx
index 6cef022b13..0efa26653e 100644
--- a/apps/scoutgame/components/common/WarpcastLogin/WarpcastLoginButton.tsx
+++ b/apps/scoutgame/components/common/WarpcastLogin/WarpcastLoginButton.tsx
@@ -22,7 +22,7 @@ import { WarpcastIcon } from './WarpcastIcon';
 export function WarpcastLoginButton({ children, ...props }: ButtonProps) {
   const popupState = usePopupState({ variant: 'popover', popupId: 'warpcast-login' });
   const router = useRouter();
-  const { setUser } = useUser();
+  const { refreshUser } = useUser();
   const { isAuthenticated } = useProfile();
   const searchParams = useSearchParams();
   const redirectUrlEncoded = searchParams.get('redirectUrl');
@@ -44,7 +44,7 @@ export function WarpcastLoginButton({ children, ...props }: ButtonProps) {
         return;
       }
 
-      setUser(data.user);
+      await refreshUser(data.user);
 
       await revalidatePath();
       router.push(nextPage);
diff --git a/apps/scoutgame/components/home/HomePage.tsx b/apps/scoutgame/components/home/HomePage.tsx
index 77557063fb..445615e533 100644
--- a/apps/scoutgame/components/home/HomePage.tsx
+++ b/apps/scoutgame/components/home/HomePage.tsx
@@ -7,12 +7,11 @@ import { LoadingCards } from 'components/common/Loading/LoadingCards';
 import { LoadingTable } from 'components/common/Loading/LoadingTable';
 import { TodaysHotBuildersCarousel } from 'components/home/components/BuildersCarousel/TodaysHotBuildersCarousel';
 import { HomeTabsMenu } from 'components/home/components/HomePageTable/components/HomeTabsMenu';
-import type { SessionUser } from 'lib/session/getUserFromSession';
 
 import { homeTabs } from './components/HomePageTable/components/HomeTabsMenu';
 import { HomeTab } from './components/HomePageTable/HomePageTable';
 
-export function HomePage({ user, tab }: { user: SessionUser | null; tab: string }) {
+export function HomePage({ tab }: { tab: string }) {
   const currentTab = homeTabs.some((t) => t.value === tab) ? tab : 'leaderboard';
   return (
     <>
@@ -24,13 +23,13 @@ export function HomePage({ user, tab }: { user: SessionUser | null; tab: string
             Scout Today's HOT Builders
           </Typography>
         </Stack>
-        <Suspense fallback={<LoadingCards />}>
-          <TodaysHotBuildersCarousel userId={user?.id} />
+        <Suspense key={currentTab} fallback={<LoadingCards />}>
+          <TodaysHotBuildersCarousel />
         </Suspense>
         <HomeTabsMenu tab={currentTab} />
         <Box px={{ xs: 1, md: 0 }} mb={2} maxHeight={{ md: '400px' }} overflow='auto'>
           <Suspense key={currentTab} fallback={<LoadingTable />}>
-            <HomeTab tab={currentTab} userId={user?.id} />
+            <HomeTab tab={currentTab} />
           </Suspense>
         </Box>
       </Container>
diff --git a/apps/scoutgame/components/home/components/BuildersCarousel/BuildersCarousel.tsx b/apps/scoutgame/components/home/components/BuildersCarousel/BuildersCarousel.tsx
index 2c8adc8399..40470ce575 100644
--- a/apps/scoutgame/components/home/components/BuildersCarousel/BuildersCarousel.tsx
+++ b/apps/scoutgame/components/home/components/BuildersCarousel/BuildersCarousel.tsx
@@ -7,7 +7,7 @@ import type { BuilderInfo } from 'lib/builders/interfaces';
 
 import { BuilderCard } from '../../../common/Card/BuilderCard/BuilderCard';
 
-export function BuildersCarousel({ builders, userId }: { builders: BuilderInfo[]; userId?: string }) {
+export function BuildersCarousel({ builders }: { builders: BuilderInfo[] }) {
   const isMdScreen = useMdScreen();
   const isLgScreen = useLgScreen();
   const size = isLgScreen ? 'large' : isMdScreen ? 'small' : 'x-small';
@@ -20,7 +20,7 @@ export function BuildersCarousel({ builders, userId }: { builders: BuilderInfo[]
   return (
     <Carousel>
       {builders.map((builder) => (
-        <BuilderCard size={size} key={builder.id} builder={builder} showPurchaseButton showHotIcon userId={userId} />
+        <BuilderCard size={size} key={builder.id} builder={builder} showPurchaseButton showHotIcon />
       ))}
     </Carousel>
   );
diff --git a/apps/scoutgame/components/home/components/BuildersCarousel/TodaysHotBuildersCarousel.tsx b/apps/scoutgame/components/home/components/BuildersCarousel/TodaysHotBuildersCarousel.tsx
index d397bf24b1..ed8bac2cb5 100644
--- a/apps/scoutgame/components/home/components/BuildersCarousel/TodaysHotBuildersCarousel.tsx
+++ b/apps/scoutgame/components/home/components/BuildersCarousel/TodaysHotBuildersCarousel.tsx
@@ -4,7 +4,7 @@ import { getTodaysHotBuilders } from 'lib/builders/getTodaysHotBuilders';
 
 import { BuildersCarousel } from './BuildersCarousel';
 
-export async function TodaysHotBuildersCarousel({ userId }: { userId?: string }) {
+export async function TodaysHotBuildersCarousel() {
   const builders = await getTodaysHotBuilders();
-  return <BuildersCarousel builders={builders} userId={userId} />;
+  return <BuildersCarousel builders={builders} />;
 }
diff --git a/apps/scoutgame/components/home/components/HomePageTable/HomePageTable.tsx b/apps/scoutgame/components/home/components/HomePageTable/HomePageTable.tsx
index d82d87d804..82474b9f50 100644
--- a/apps/scoutgame/components/home/components/HomePageTable/HomePageTable.tsx
+++ b/apps/scoutgame/components/home/components/HomePageTable/HomePageTable.tsx
@@ -10,7 +10,7 @@ import { LeaderboardTable } from './components/LeaderboardTable';
 import { TopBuildersTable } from './components/TopBuildersTable';
 import { TopScoutsTable } from './components/TopScoutsTable';
 
-export async function HomeTab({ tab, userId }: { tab: string; userId?: string }) {
+export async function HomeTab({ tab }: { tab: string }) {
   if (tab === 'activity') {
     const activities = await getBuilderActivities({ limit: 100 });
     return <ActivityTable activities={activities} />;
@@ -23,12 +23,12 @@ export async function HomeTab({ tab, userId }: { tab: string; userId?: string })
 
   if (tab === 'top-builders') {
     const topBuilders = await getTopBuilders({ limit: 200 });
-    return <TopBuildersTable builders={topBuilders} userId={userId} />;
+    return <TopBuildersTable builders={topBuilders} />;
   }
 
   if (tab === 'leaderboard') {
     const data = await getLeaderboard({ limit: 200 });
-    return <LeaderboardTable data={data} userId={userId} />;
+    return <LeaderboardTable data={data} />;
   }
   return null;
 }
diff --git a/apps/scoutgame/components/home/components/HomePageTable/components/LeaderboardTable.tsx b/apps/scoutgame/components/home/components/HomePageTable/components/LeaderboardTable.tsx
index 9f8ec9b6d0..0a63081067 100644
--- a/apps/scoutgame/components/home/components/HomePageTable/components/LeaderboardTable.tsx
+++ b/apps/scoutgame/components/home/components/HomePageTable/components/LeaderboardTable.tsx
@@ -18,7 +18,7 @@ import type { LeaderBoardRow } from 'lib/builders/getLeaderboard';
 
 import { TableCellText } from './TableCellText';
 
-export function LeaderboardTable({ data, userId }: { data: LeaderBoardRow[]; userId?: string }) {
+export function LeaderboardTable({ data }: { data: LeaderBoardRow[] }) {
   const sorted = data.sort((a, b) => b.progress - a.progress);
 
   return (
@@ -90,7 +90,7 @@ export function LeaderboardTable({ data, userId }: { data: LeaderBoardRow[]; use
                 </Stack>
               </TableCell>
               <TableCell sx={getSXProps({ mdDown: true, display: 'table-cell' })} width='150px'>
-                <ScoutButton builder={row} isAuthenticated={!!userId} />
+                <ScoutButton builder={row} />
               </TableCell>
             </TableRow>
           ))}
diff --git a/apps/scoutgame/components/home/components/HomePageTable/components/TopBuildersTable.tsx b/apps/scoutgame/components/home/components/HomePageTable/components/TopBuildersTable.tsx
index 9dc0011eed..f13d1b34c4 100644
--- a/apps/scoutgame/components/home/components/HomePageTable/components/TopBuildersTable.tsx
+++ b/apps/scoutgame/components/home/components/HomePageTable/components/TopBuildersTable.tsx
@@ -19,7 +19,7 @@ import type { TopBuilderInfo } from 'lib/builders/getTopBuilders';
 
 import { TableCellText } from './TableCellText';
 
-export function TopBuildersTable({ builders, userId }: { builders: TopBuilderInfo[]; userId?: string }) {
+export function TopBuildersTable({ builders }: { builders: TopBuilderInfo[] }) {
   return (
     <TableContainer data-test='top-builders-table' component={Paper} sx={{ px: { md: 6 } }}>
       <Table aria-label='Top scouts table' size='small'>
@@ -105,7 +105,7 @@ export function TopBuildersTable({ builders, userId }: { builders: TopBuilderInf
                 </Stack>
               </TableCell>
               <TableCell align='center' width='150px'>
-                <ScoutButton builder={builder} isAuthenticated={!!userId} />
+                <ScoutButton builder={builder} />
               </TableCell>
             </TableRow>
           ))}
diff --git a/apps/scoutgame/components/layout/AppProviders.tsx b/apps/scoutgame/components/layout/AppProviders.tsx
index 40a61bf0d2..be2dfa7b41 100644
--- a/apps/scoutgame/components/layout/AppProviders.tsx
+++ b/apps/scoutgame/components/layout/AppProviders.tsx
@@ -9,6 +9,7 @@ import { WagmiProvider } from 'components/common/WalletLogin/WagmiProvider';
 import type { SessionUser } from 'lib/session/getUserFromSession';
 import theme from 'theme/theme';
 
+import { SWRProvider } from './SwrProvider';
 import { UserProvider } from './UserProvider';
 
 export function AppProviders({ children, user }: { children: ReactNode; user: SessionUser | null }) {
@@ -17,7 +18,9 @@ export function AppProviders({ children, user }: { children: ReactNode; user: Se
       <ThemeProvider theme={theme}>
         <CssBaseline enableColorScheme />
         <WagmiProvider>
-          <UserProvider userSession={user}>{children}</UserProvider>
+          <SWRProvider>
+            <UserProvider userSession={user}>{children}</UserProvider>
+          </SWRProvider>
         </WagmiProvider>
       </ThemeProvider>
     </AppRouterCacheProvider>
diff --git a/apps/scoutgame/components/layout/SwrProvider.tsx b/apps/scoutgame/components/layout/SwrProvider.tsx
new file mode 100644
index 0000000000..5320ebdd90
--- /dev/null
+++ b/apps/scoutgame/components/layout/SwrProvider.tsx
@@ -0,0 +1,18 @@
+'use client';
+
+import type { ReactNode } from 'react';
+import { SWRConfig } from 'swr';
+
+export function SWRProvider({ children }: { children: ReactNode }) {
+  return (
+    <SWRConfig
+      value={{
+        shouldRetryOnError(err) {
+          return err.status >= 500;
+        }
+      }}
+    >
+      {children}
+    </SWRConfig>
+  );
+}
diff --git a/apps/scoutgame/components/layout/UserProvider.tsx b/apps/scoutgame/components/layout/UserProvider.tsx
index 8319dfa504..1e5b7d936b 100644
--- a/apps/scoutgame/components/layout/UserProvider.tsx
+++ b/apps/scoutgame/components/layout/UserProvider.tsx
@@ -1,29 +1,29 @@
 'use client';
 
 import type { ReactNode } from 'react';
-import { createContext, useCallback, useContext, useMemo, useState } from 'react';
+import { createContext, useCallback, useContext, useMemo } from 'react';
 
-import { useGetUserTrigger } from 'hooks/api/session';
+import { useGetUser } from 'hooks/api/session';
 import type { SessionUser } from 'lib/session/getUserFromSession';
 
 type UserContext = {
   user: SessionUser | null;
-  setUser: (user: SessionUser | null) => void;
-  reloadUser: () => Promise<void>;
+  refreshUser: (_user?: SessionUser | null) => Promise<SessionUser | null | undefined>;
 };
 
 export const UserContext = createContext<Readonly<UserContext | null>>(null);
 
 export function UserProvider({ children, userSession }: { children: ReactNode; userSession: SessionUser | null }) {
-  const [user, setUser] = useState<SessionUser | null>(userSession);
-  const { trigger: triggerReload } = useGetUserTrigger();
+  const { data: user = userSession, mutate: mutateUser } = useGetUser();
 
-  const reloadUser = useCallback(async () => {
-    const updated = await triggerReload();
-    setUser(updated);
-  }, [triggerReload]);
+  const refreshUser = useCallback(
+    async (_user?: SessionUser | null) => {
+      return mutateUser(_user);
+    },
+    [mutateUser]
+  );
 
-  const value = useMemo(() => ({ user, reloadUser, setUser }), [user, reloadUser, setUser]);
+  const value = useMemo(() => ({ user, refreshUser }), [user, refreshUser]);
 
   return <UserContext.Provider value={value}>{children}</UserContext.Provider>;
 }
diff --git a/apps/scoutgame/components/profile/ProfilePage.tsx b/apps/scoutgame/components/profile/ProfilePage.tsx
index 490cea93f8..dd55d44c24 100644
--- a/apps/scoutgame/components/profile/ProfilePage.tsx
+++ b/apps/scoutgame/components/profile/ProfilePage.tsx
@@ -1,6 +1,7 @@
 import { Box, Paper, Stack, Typography } from '@mui/material';
 import { Suspense } from 'react';
 
+import { LoadingComponent } from 'components/common/Loading/LoadingComponent';
 import { UserProfile } from 'components/common/Profile/UserProfile';
 import type { UserStats } from 'lib/users/getUserStats';
 import type { BasicUserInfo } from 'lib/users/interfaces';
@@ -77,11 +78,11 @@ export function ProfilePage({ user, tab }: ProfilePageProps) {
           </Paper>
         </Stack>
 
-        <Suspense fallback={tab === 'scout' ? <ScoutProfileLoading /> : null}>
+        <Suspense fallback={tab === 'scout' ? <ScoutProfileLoading /> : <LoadingComponent isLoading />}>
           {tab === 'win' ? (
             <PointsClaimScreen userId={user.id} username={user.username} />
           ) : tab === 'scout' ? (
-            <ScoutProfile userId={user.id} isMobile />
+            <ScoutProfile userId={user.id} />
           ) : tab === 'build' ? (
             <BuilderProfile builder={user} />
           ) : (
@@ -96,7 +97,7 @@ export function ProfilePage({ user, tab }: ProfilePageProps) {
                 <Typography variant='h6' color='text.secondary'>
                   Scout
                 </Typography>
-                <ScoutProfile userId={user.id} isMobile={false} />
+                <ScoutProfile userId={user.id} />
               </Paper>
               <Paper
                 sx={{
diff --git a/apps/scoutgame/components/profile/components/PointsClaimScreen/PointsClaimButton.tsx b/apps/scoutgame/components/profile/components/PointsClaimScreen/PointsClaimButton.tsx
index 1c1f2b63d1..6b2edf769e 100644
--- a/apps/scoutgame/components/profile/components/PointsClaimScreen/PointsClaimButton.tsx
+++ b/apps/scoutgame/components/profile/components/PointsClaimScreen/PointsClaimButton.tsx
@@ -9,14 +9,14 @@ import { useUser } from 'components/layout/UserProvider';
 import { claimPointsAction } from 'lib/points/claimPointsAction';
 
 export function PointsClaimButton() {
-  const { execute, isExecuting, result } = useAction(claimPointsAction);
+  const { executeAsync, isExecuting, result } = useAction(claimPointsAction);
   const [showModal, setShowModal] = useState(false);
-  const { reloadUser } = useUser();
+  const { refreshUser } = useUser();
 
   const handleClaim = async () => {
-    await execute();
+    await executeAsync();
     setShowModal(true);
-    await reloadUser();
+    await refreshUser();
   };
 
   const handleCloseModal = () => {
diff --git a/apps/scoutgame/components/profile/components/ProfileTabsMenu.tsx b/apps/scoutgame/components/profile/components/ProfileTabsMenu.tsx
index 88171f44ea..b5dff258b0 100644
--- a/apps/scoutgame/components/profile/components/ProfileTabsMenu.tsx
+++ b/apps/scoutgame/components/profile/components/ProfileTabsMenu.tsx
@@ -16,7 +16,7 @@ const mobileTabs = ['scout', 'build', 'win'];
 
 export function ProfileTabsMenu({ tab }: { tab: ProfileTab }) {
   const { data: claimablePoints } = useGetClaimablePoints();
-  const isMobile = useMediaQuery((theme: Theme) => theme.breakpoints.down('sm'));
+  const isMobile = useMediaQuery((theme: Theme) => theme.breakpoints.down('sm'), { noSsr: true });
   const isDesktop = useMdScreen();
   const router = useRouter();
 
diff --git a/apps/scoutgame/components/profile/components/ScoutProfile/ScoutProfile.tsx b/apps/scoutgame/components/profile/components/ScoutProfile/ScoutProfile.tsx
index 956774c9f1..4108db0b30 100644
--- a/apps/scoutgame/components/profile/components/ScoutProfile/ScoutProfile.tsx
+++ b/apps/scoutgame/components/profile/components/ScoutProfile/ScoutProfile.tsx
@@ -9,7 +9,7 @@ import { getScoutedBuilders } from 'lib/scouts/getScoutedBuilders';
 
 import { ScoutStats } from './ScoutStats';
 
-export async function ScoutProfile({ userId, isMobile }: { userId: string; isMobile?: boolean }) {
+export async function ScoutProfile({ userId }: { userId: string }) {
   const [seasonStats, scoutedBuilders] = await Promise.all([
     prisma.userSeasonStats.findUnique({
       where: {
@@ -39,7 +39,7 @@ export async function ScoutProfile({ userId, isMobile }: { userId: string; isMob
           Scouted Builders
         </Typography>
         {scoutedBuilders.length > 0 ? (
-          <BuildersGallery builders={scoutedBuilders} columns={3} size='small' userId={userId} />
+          <BuildersGallery builders={scoutedBuilders} columns={3} size='small' />
         ) : (
           <Typography>You haven't scouted any Builders yet. Start exploring and discover talent!</Typography>
         )}
diff --git a/apps/scoutgame/components/scout/ScoutPage.tsx b/apps/scoutgame/components/scout/ScoutPage.tsx
index af7fd51b6d..08661794fc 100644
--- a/apps/scoutgame/components/scout/ScoutPage.tsx
+++ b/apps/scoutgame/components/scout/ScoutPage.tsx
@@ -9,7 +9,7 @@ import { ScoutPageBuildersGallery } from './components/ScoutPageBuildersGallery'
 import { SearchBuildersInput } from './components/SearchBuildersInput';
 import { SortOptionTabs, sortOptions } from './components/SortOptionTabs';
 
-export function ScoutPage({ sort, user }: { sort: BuildersSort; user?: { username: string; id: string } | null }) {
+export function ScoutPage({ sort }: { sort: BuildersSort }) {
   const currentSort = sortOptions.some((t) => t.value === sort) ? sort : 'top';
 
   return (
@@ -17,7 +17,7 @@ export function ScoutPage({ sort, user }: { sort: BuildersSort; user?: { usernam
       <SearchBuildersInput />
       <SortOptionTabs value={currentSort} />
       <Suspense key={currentSort} fallback={<LoadingGallery />}>
-        <ScoutPageBuildersGallery sort={currentSort} showHotIcon={currentSort === 'hot'} userId={user?.id} />
+        <ScoutPageBuildersGallery sort={currentSort} showHotIcon={currentSort === 'hot'} />
       </Suspense>
     </PageContainer>
   );
diff --git a/apps/scoutgame/components/scout/components/BuildersGalleryContainer.tsx b/apps/scoutgame/components/scout/components/BuildersGalleryContainer.tsx
index d34d66d4d6..7b9e9e1921 100644
--- a/apps/scoutgame/components/scout/components/BuildersGalleryContainer.tsx
+++ b/apps/scoutgame/components/scout/components/BuildersGalleryContainer.tsx
@@ -14,14 +14,12 @@ import type { BuilderInfo } from 'lib/builders/interfaces';
 export function BuildersGalleryContainer({
   initialBuilders,
   showHotIcon,
-  userId,
   sort,
   initialCursor
 }: {
   initialCursor: CompositeCursor | null;
   initialBuilders: BuilderInfo[];
   showHotIcon: boolean;
-  userId?: string;
   sort: BuildersSort;
 }) {
   const [error, setError] = useState<string | null>(null);
@@ -86,7 +84,6 @@ export function BuildersGalleryContainer({
         showHotIcon={showHotIcon}
         size={isDesktop ? 'medium' : 'small'}
         columns={5}
-        userId={userId}
       />
       {nextCursor && <div ref={observerTarget} style={{ height: '20px', width: '100%' }} />}
       {isLoading && (
diff --git a/apps/scoutgame/components/scout/components/ScoutPageBuildersGallery.tsx b/apps/scoutgame/components/scout/components/ScoutPageBuildersGallery.tsx
index a2db8caf14..4bdb3d5e01 100644
--- a/apps/scoutgame/components/scout/components/ScoutPageBuildersGallery.tsx
+++ b/apps/scoutgame/components/scout/components/ScoutPageBuildersGallery.tsx
@@ -7,15 +7,7 @@ import { BuildersGalleryContainer } from './BuildersGalleryContainer';
 
 export const dynamic = 'force-dynamic';
 
-export async function ScoutPageBuildersGallery({
-  sort,
-  showHotIcon,
-  userId
-}: {
-  sort: BuildersSort;
-  showHotIcon: boolean;
-  userId?: string;
-}) {
+export async function ScoutPageBuildersGallery({ sort, showHotIcon }: { sort: BuildersSort; showHotIcon: boolean }) {
   const { builders, nextCursor } = await getSortedBuilders({
     sort: sort as BuildersSort,
     limit: 15,
@@ -29,7 +21,6 @@ export async function ScoutPageBuildersGallery({
       initialCursor={nextCursor}
       initialBuilders={builders}
       showHotIcon={showHotIcon}
-      userId={userId}
     />
   );
 }
diff --git a/apps/scoutgame/components/welcome/how-it-works/HowItWorksPage.tsx b/apps/scoutgame/components/welcome/how-it-works/HowItWorksPage.tsx
index edfa29154e..6a355d9d02 100644
--- a/apps/scoutgame/components/welcome/how-it-works/HowItWorksPage.tsx
+++ b/apps/scoutgame/components/welcome/how-it-works/HowItWorksPage.tsx
@@ -1,12 +1,11 @@
-import { Button, List, ListItem, Stack, Typography } from '@mui/material';
-import Image from 'next/image';
+import { Button, List, ListItem, Typography } from '@mui/material';
 import Link from 'next/link';
 
 import { SinglePageLayout } from 'components/common/Layout';
 import { SinglePageWrapper } from 'components/common/SinglePageWrapper';
 import { InfoBackgroundImage } from 'components/layout/InfoBackgroundImage';
 
-export function HowItWorksPage({ username }: { username: string }) {
+export function HowItWorksPage() {
   return (
     <SinglePageLayout>
       <InfoBackgroundImage />
diff --git a/apps/scoutgame/components/welcome/spam-policy/SpamPolicyPage.tsx b/apps/scoutgame/components/welcome/spam-policy/SpamPolicyPage.tsx
index e51015c8cd..96acf9112c 100644
--- a/apps/scoutgame/components/welcome/spam-policy/SpamPolicyPage.tsx
+++ b/apps/scoutgame/components/welcome/spam-policy/SpamPolicyPage.tsx
@@ -1,16 +1,18 @@
 'use client';
 
 import { Button, Typography } from '@mui/material';
+import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useAction } from 'next-safe-action/hooks';
 
 import { SinglePageLayout } from 'components/common/Layout';
 import { SinglePageWrapper } from 'components/common/SinglePageWrapper';
 import { InfoBackgroundImage } from 'components/layout/InfoBackgroundImage';
-import type { SessionUser } from 'lib/session/getUserFromSession';
+import { useUser } from 'components/layout/UserProvider';
 import { saveOnboardedAction } from 'lib/users/saveOnboardedAction';
 
-export function SpamPolicyPage({ user, redirectToProfile }: { user: SessionUser | null; redirectToProfile: boolean }) {
+export function SpamPolicyPage({ redirectToProfile }: { redirectToProfile: boolean }) {
+  const { user } = useUser();
   const router = useRouter();
   // programmatically added builders will land here skipping the /welcome/builder page
   // we set the onboardedAt flag on that page, so make sure we set it here too if the user hasn't been onboarded yet
@@ -40,6 +42,7 @@ export function SpamPolicyPage({ user, redirectToProfile }: { user: SessionUser
         {user ? (
           user.onboardedAt ? (
             <Button
+              LinkComponent={Link}
               href={redirectToProfile ? '/profile' : '/welcome/how-it-works'}
               data-test='continue-button'
               disabled={isExecuting}
diff --git a/apps/scoutgame/lib/session/getUser.ts b/apps/scoutgame/lib/session/getUser.ts
new file mode 100644
index 0000000000..4e9d7d4ff5
--- /dev/null
+++ b/apps/scoutgame/lib/session/getUser.ts
@@ -0,0 +1,36 @@
+import { prisma } from '@charmverse/core/prisma-client';
+import { replaceS3Domain } from '@root/lib/utils/url';
+import { cache } from 'react';
+
+import type { SessionUser } from './getUserFromSession';
+
+export async function getUser(userId?: string): Promise<SessionUser | null> {
+  if (!userId) {
+    return null;
+  }
+
+  const user = await prisma.scout.findFirst({
+    where: {
+      id: userId
+    },
+    select: {
+      id: true,
+      username: true,
+      displayName: true,
+      avatar: true,
+      builderStatus: true,
+      currentBalance: true,
+      onboardedAt: true,
+      agreedToTermsAt: true,
+      bio: true
+    }
+  });
+
+  if (user?.avatar) {
+    user.avatar = replaceS3Domain(user.avatar);
+  }
+
+  return user;
+}
+
+export const cacheGetUser = cache(getUser);
diff --git a/apps/scoutgame/lib/session/getUserFromSession.ts b/apps/scoutgame/lib/session/getUserFromSession.ts
index 625fa70655..4f9f5dcada 100644
--- a/apps/scoutgame/lib/session/getUserFromSession.ts
+++ b/apps/scoutgame/lib/session/getUserFromSession.ts
@@ -1,37 +1,29 @@
 import type { Scout } from '@charmverse/core/prisma';
-import { prisma } from '@charmverse/core/prisma-client';
 import { getSession } from '@connect-shared/lib/session/getSession';
-import { replaceS3Domain } from '@root/lib/utils/url';
+
+import { cacheGetUser, getUser } from './getUser';
 
 export type SessionUser = Pick<
   Scout,
-  'id' | 'username' | 'displayName' | 'avatar' | 'builderStatus' | 'currentBalance' | 'onboardedAt' | 'agreedToTermsAt'
+  | 'id'
+  | 'username'
+  | 'displayName'
+  | 'avatar'
+  | 'builderStatus'
+  | 'currentBalance'
+  | 'onboardedAt'
+  | 'agreedToTermsAt'
+  | 'bio'
 >;
 
 export async function getUserFromSession(): Promise<SessionUser | null> {
   const session = await getSession();
-  if (session?.scoutId) {
-    const user = await prisma.scout.findFirst({
-      where: {
-        id: session.scoutId
-      },
-      select: {
-        id: true,
-        username: true,
-        displayName: true,
-        avatar: true,
-        builderStatus: true,
-        currentBalance: true,
-        onboardedAt: true,
-        agreedToTermsAt: true,
-        bio: true
-      }
-    });
+  return getUser(session.scoutId);
+}
+
+export async function getCachedUserFromSession(): Promise<SessionUser | null> {
+  const session = await getSession();
+  const cached = cacheGetUser(session.scoutId);
 
-    if (user?.avatar) {
-      user.avatar = replaceS3Domain(user.avatar);
-    }
-    return user;
-  }
-  return null;
+  return cached;
 }
diff --git a/components/settings/account/components/otp/components/DeleteOtpModal.tsx b/components/settings/account/components/otp/components/DeleteOtpModal.tsx
index 439237ec3f..9e7dc5fa16 100644
--- a/components/settings/account/components/otp/components/DeleteOtpModal.tsx
+++ b/components/settings/account/components/otp/components/DeleteOtpModal.tsx
@@ -8,7 +8,9 @@ import { useUser } from 'hooks/useUser';
 
 import { ConfirmAuthCode } from './ConfirmAuthCode';
 
-export function CustomModal({ onClose, ...props }: Omit<ModalProps, 'children'>, ref: Ref<HTMLDivElement>) {
+type Props = Omit<ModalProps, 'children'>;
+
+export function CustomModal({ onClose, ...props }: Props, ref: Ref<HTMLDivElement>) {
   const { trigger: deleteOtp, error: deleteOtpError, isMutating: isLoadingDeleteOtp } = useDeleteOtp();
   const { refreshUser } = useUser();
 
diff --git a/package-lock.json b/package-lock.json
index 84f98877fb..0f440b1cf4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -190,14 +190,14 @@
         "prosemirror-utils": "^1.2.2",
         "prosemirror-view": "^1.34.1",
         "qrcode": "^1.5.3",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
         "react-countdown": "^2.3.2",
         "react-csv": "^2.2.2",
         "react-dnd": "^16.0.0",
         "react-dnd-html5-backend": "^16.0.0",
         "react-dnd-multi-backend": "^8.0.0",
         "react-dnd-touch-backend": "^16.0.0",
-        "react-dom": "^18.2.0",
+        "react-dom": "^18.3.1",
         "react-email": "^3.0.1",
         "react-hook-form": "^7.25.0",
         "react-hot-keys": "^2.7.1",
@@ -219,7 +219,7 @@
         "socket.io-client": "^4.7.5",
         "stripe": "^12.14.0",
         "swagger-ui-react": "^5.17.14",
-        "swr": "^2.2.4",
+        "swr": "^2.2.5",
         "tiktoken": "^1.0.15",
         "tsconfig-paths": "^4.2.0",
         "tsx": "^4.7.0",
@@ -283,10 +283,10 @@
         "@types/papaparse": "^5.3.5",
         "@types/promise-retry": "^1.1.3",
         "@types/qrcode": "^1.5.5",
-        "@types/react": "^18.3.3",
+        "@types/react": "^18.3.11",
         "@types/react-copy-to-clipboard": "^5.0.4",
         "@types/react-csv": "^1.1.2",
-        "@types/react-dom": "^18.3.0",
+        "@types/react-dom": "^18.3.1",
         "@types/react-pdf": "^7.0.0",
         "@types/react-resizable": "^1.7.4",
         "@types/react-window": "^1.8.7",
@@ -29162,9 +29162,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "node_modules/@types/react": {
-      "version": "18.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+      "version": "18.3.11",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
+      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -29189,9 +29189,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
-      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
       "dev": true,
       "dependencies": {
         "@types/react": "*"
@@ -34412,15 +34412,9 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -34433,6 +34427,9 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
@@ -35216,9 +35213,9 @@
       }
     },
     "node_modules/confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA=="
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="
     },
     "node_modules/config-chain": {
       "version": "1.1.13",
@@ -35825,16 +35822,11 @@
       }
     },
     "node_modules/crossws": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.2.4.tgz",
-      "integrity": "sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg==",
-      "peerDependencies": {
-        "uWebSockets.js": "*"
-      },
-      "peerDependenciesMeta": {
-        "uWebSockets.js": {
-          "optional": true
-        }
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.3.1.tgz",
+      "integrity": "sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==",
+      "dependencies": {
+        "uncrypto": "^0.1.3"
       }
     },
     "node_modules/crypt": {
@@ -42487,20 +42479,20 @@
       }
     },
     "node_modules/h3": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/h3/-/h3-1.12.0.tgz",
-      "integrity": "sha512-Zi/CcNeWBXDrFNlV0hUBJQR9F7a96RjMeAZweW/ZWkR9fuXrMcvKnSA63f/zZ9l0GgQOZDVHGvXivNN9PWOwhA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/h3/-/h3-1.13.0.tgz",
+      "integrity": "sha512-vFEAu/yf8UMUcB4s43OaDaigcqpQd14yanmOsn+NcRX3/guSKncyE2rOYhq8RIchgJrPSs/QiIddnTTR1ddiAg==",
       "dependencies": {
-        "cookie-es": "^1.1.0",
-        "crossws": "^0.2.4",
+        "cookie-es": "^1.2.2",
+        "crossws": ">=0.2.0 <0.4.0",
         "defu": "^6.1.4",
         "destr": "^2.0.3",
-        "iron-webcrypto": "^1.1.1",
-        "ohash": "^1.1.3",
+        "iron-webcrypto": "^1.2.1",
+        "ohash": "^1.1.4",
         "radix3": "^1.1.2",
-        "ufo": "^1.5.3",
+        "ufo": "^1.5.4",
         "uncrypto": "^0.1.3",
-        "unenv": "^1.9.0"
+        "unenv": "^1.10.0"
       }
     },
     "node_modules/h3/node_modules/iron-webcrypto": {
@@ -47539,6 +47531,7 @@
       "version": "1.21.6",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
       "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -49092,26 +49085,26 @@
       }
     },
     "node_modules/listhen": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/listhen/-/listhen-1.7.2.tgz",
-      "integrity": "sha512-7/HamOm5YD9Wb7CFgAZkKgVPA96WwhcTQoqtm2VTZGVbVVn3IWKRBTgrU7cchA3Q8k9iCsG8Osoi9GX4JsGM9g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/listhen/-/listhen-1.9.0.tgz",
+      "integrity": "sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==",
       "dependencies": {
         "@parcel/watcher": "^2.4.1",
         "@parcel/watcher-wasm": "^2.4.1",
         "citty": "^0.1.6",
         "clipboardy": "^4.0.0",
         "consola": "^3.2.3",
-        "crossws": "^0.2.0",
+        "crossws": ">=0.2.0 <0.4.0",
         "defu": "^6.1.4",
         "get-port-please": "^3.1.2",
-        "h3": "^1.10.2",
+        "h3": "^1.12.0",
         "http-shutdown": "^1.2.2",
-        "jiti": "^1.21.0",
-        "mlly": "^1.6.1",
+        "jiti": "^2.1.2",
+        "mlly": "^1.7.1",
         "node-forge": "^1.3.1",
         "pathe": "^1.1.2",
         "std-env": "^3.7.0",
-        "ufo": "^1.4.0",
+        "ufo": "^1.5.4",
         "untun": "^0.1.3",
         "uqr": "^0.1.2"
       },
@@ -49120,6 +49113,14 @@
         "listhen": "bin/listhen.mjs"
       }
     },
+    "node_modules/listhen/node_modules/jiti": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.3.3.tgz",
+      "integrity": "sha512-EX4oNDwcXSivPrw2qKH2LB5PoFxEvgtv2JgwW0bU858HoLQ+kutSvjLMUqBd0PeJYEinLWhoI9Ol0eYMqj/wNQ==",
+      "bin": {
+        "jiti": "lib/jiti-cli.mjs"
+      }
+    },
     "node_modules/lit": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz",
@@ -51920,20 +51921,20 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "node_modules/mlly": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
-      "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz",
+      "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==",
       "dependencies": {
-        "acorn": "^8.11.3",
+        "acorn": "^8.12.1",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.1.1",
-        "ufo": "^1.5.3"
+        "pkg-types": "^1.2.0",
+        "ufo": "^1.5.4"
       }
     },
     "node_modules/mlly/node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -55910,19 +55911,19 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
     "node_modules/ofetch": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.3.4.tgz",
-      "integrity": "sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.4.1.tgz",
+      "integrity": "sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==",
       "dependencies": {
         "destr": "^2.0.3",
-        "node-fetch-native": "^1.6.3",
-        "ufo": "^1.5.3"
+        "node-fetch-native": "^1.6.4",
+        "ufo": "^1.5.4"
       }
     },
     "node_modules/ohash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz",
-      "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.4.tgz",
+      "integrity": "sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g=="
     },
     "node_modules/on-exit-leak-free": {
       "version": "2.1.2",
@@ -57495,12 +57496,12 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz",
-      "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz",
+      "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==",
       "dependencies": {
-        "confbox": "^0.1.7",
-        "mlly": "^1.7.1",
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.2",
         "pathe": "^1.1.2"
       }
     },
@@ -58387,11 +58388,14 @@
       ]
     },
     "node_modules/qr-code-styling": {
-      "version": "1.6.0-rc.1",
-      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.6.0-rc.1.tgz",
-      "integrity": "sha512-ModRIiW6oUnsP18QzrRYZSc/CFKFKIdj7pUs57AEVH20ajlglRpN3HukjHk0UbNMTlKGuaYl7Gt6/O5Gg2NU2Q==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.8.0.tgz",
+      "integrity": "sha512-f6DP31ae/TYWAwjaW0ds7qk+2l7BgPpLW1WDH3t8XSlwXHl8aSvyNQomQ2ra7GC3H9yyNWnjb70jw3KGkFyANw==",
       "dependencies": {
-        "qrcode-generator": "^1.4.3"
+        "qrcode-generator": "^1.4.4"
+      },
+      "engines": {
+        "node": ">=18.18.0"
       }
     },
     "node_modules/qrcode": {
@@ -58811,9 +58815,9 @@
       }
     },
     "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -59002,15 +59006,15 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
     "node_modules/react-draggable": {
@@ -59280,29 +59284,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/react-email/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/react-email/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -59348,17 +59329,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/react-email/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/react-email/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -61318,9 +61288,9 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
@@ -63995,9 +63965,9 @@
       }
     },
     "node_modules/swr": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.4.tgz",
-      "integrity": "sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.5.tgz",
+      "integrity": "sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==",
       "dependencies": {
         "client-only": "^0.0.1",
         "use-sync-external-store": "^1.2.0"
@@ -66002,40 +65972,6 @@
         }
       }
     },
-    "node_modules/unstorage/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/unstorage/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/unstorage/node_modules/lru-cache": {
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
@@ -68343,7 +68279,7 @@
         "graphql-request": "^6.1.0",
         "hono": "^4.1.0",
         "node-fetch": "^2.6.6",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
         "satori": "^0.10.13",
         "sha256": "^0.2.0",
         "sharp": "^0.32.6",
@@ -85027,8 +84963,8 @@
         "@storybook/react-dom-shim": "8.3.5",
         "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
         "fs-extra": "^11.1.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "rehype-external-links": "^3.0.0",
         "rehype-slug": "^6.0.0",
         "ts-dedent": "^2.0.0"
@@ -89091,9 +89027,9 @@
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
     },
     "@types/react": {
-      "version": "18.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+      "version": "18.3.11",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
+      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
       "requires": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -89118,9 +89054,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "18.3.0",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
-      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
       "dev": true,
       "requires": {
         "@types/react": "*"
@@ -93327,9 +93263,9 @@
       }
     },
     "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "requires": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -93938,9 +93874,9 @@
       }
     },
     "confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA=="
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w=="
     },
     "config-chain": {
       "version": "1.1.13",
@@ -94440,10 +94376,12 @@
       }
     },
     "crossws": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.2.4.tgz",
-      "integrity": "sha512-DAxroI2uSOgUKLz00NX6A8U/8EE3SZHmIND+10jkVSaypvyt57J5JEOxAQOL6lQxyzi/wZbTIwssU1uy69h5Vg==",
-      "requires": {}
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.3.1.tgz",
+      "integrity": "sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==",
+      "requires": {
+        "uncrypto": "^0.1.3"
+      }
     },
     "crypt": {
       "version": "0.0.2",
@@ -99410,20 +99348,20 @@
       }
     },
     "h3": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/h3/-/h3-1.12.0.tgz",
-      "integrity": "sha512-Zi/CcNeWBXDrFNlV0hUBJQR9F7a96RjMeAZweW/ZWkR9fuXrMcvKnSA63f/zZ9l0GgQOZDVHGvXivNN9PWOwhA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/h3/-/h3-1.13.0.tgz",
+      "integrity": "sha512-vFEAu/yf8UMUcB4s43OaDaigcqpQd14yanmOsn+NcRX3/guSKncyE2rOYhq8RIchgJrPSs/QiIddnTTR1ddiAg==",
       "requires": {
-        "cookie-es": "^1.1.0",
-        "crossws": "^0.2.4",
+        "cookie-es": "^1.2.2",
+        "crossws": ">=0.2.0 <0.4.0",
         "defu": "^6.1.4",
         "destr": "^2.0.3",
-        "iron-webcrypto": "^1.1.1",
-        "ohash": "^1.1.3",
+        "iron-webcrypto": "^1.2.1",
+        "ohash": "^1.1.4",
         "radix3": "^1.1.2",
-        "ufo": "^1.5.3",
+        "ufo": "^1.5.4",
         "uncrypto": "^0.1.3",
-        "unenv": "^1.9.0"
+        "unenv": "^1.10.0"
       },
       "dependencies": {
         "iron-webcrypto": {
@@ -103087,7 +103025,8 @@
     "jiti": {
       "version": "1.21.6",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w=="
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "dev": true
     },
     "joi": {
       "version": "17.9.2",
@@ -104300,28 +104239,35 @@
       }
     },
     "listhen": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/listhen/-/listhen-1.7.2.tgz",
-      "integrity": "sha512-7/HamOm5YD9Wb7CFgAZkKgVPA96WwhcTQoqtm2VTZGVbVVn3IWKRBTgrU7cchA3Q8k9iCsG8Osoi9GX4JsGM9g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/listhen/-/listhen-1.9.0.tgz",
+      "integrity": "sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==",
       "requires": {
         "@parcel/watcher": "^2.4.1",
         "@parcel/watcher-wasm": "^2.4.1",
         "citty": "^0.1.6",
         "clipboardy": "^4.0.0",
         "consola": "^3.2.3",
-        "crossws": "^0.2.0",
+        "crossws": ">=0.2.0 <0.4.0",
         "defu": "^6.1.4",
         "get-port-please": "^3.1.2",
-        "h3": "^1.10.2",
+        "h3": "^1.12.0",
         "http-shutdown": "^1.2.2",
-        "jiti": "^1.21.0",
-        "mlly": "^1.6.1",
+        "jiti": "^2.1.2",
+        "mlly": "^1.7.1",
         "node-forge": "^1.3.1",
         "pathe": "^1.1.2",
         "std-env": "^3.7.0",
-        "ufo": "^1.4.0",
+        "ufo": "^1.5.4",
         "untun": "^0.1.3",
         "uqr": "^0.1.2"
+      },
+      "dependencies": {
+        "jiti": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.3.3.tgz",
+          "integrity": "sha512-EX4oNDwcXSivPrw2qKH2LB5PoFxEvgtv2JgwW0bU858HoLQ+kutSvjLMUqBd0PeJYEinLWhoI9Ol0eYMqj/wNQ=="
+        }
       }
     },
     "lit": {
@@ -106548,20 +106494,20 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "mlly": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
-      "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz",
+      "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==",
       "requires": {
-        "acorn": "^8.11.3",
+        "acorn": "^8.12.1",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.1.1",
-        "ufo": "^1.5.3"
+        "pkg-types": "^1.2.0",
+        "ufo": "^1.5.4"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.12.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-          "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
+          "version": "8.13.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
+          "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w=="
         }
       }
     },
@@ -109262,19 +109208,19 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
     "ofetch": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.3.4.tgz",
-      "integrity": "sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/ofetch/-/ofetch-1.4.1.tgz",
+      "integrity": "sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==",
       "requires": {
         "destr": "^2.0.3",
-        "node-fetch-native": "^1.6.3",
-        "ufo": "^1.5.3"
+        "node-fetch-native": "^1.6.4",
+        "ufo": "^1.5.4"
       }
     },
     "ohash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz",
-      "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.4.tgz",
+      "integrity": "sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g=="
     },
     "on-exit-leak-free": {
       "version": "2.1.2",
@@ -110425,12 +110371,12 @@
       }
     },
     "pkg-types": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.0.tgz",
-      "integrity": "sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz",
+      "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==",
       "requires": {
-        "confbox": "^0.1.7",
-        "mlly": "^1.7.1",
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.2",
         "pathe": "^1.1.2"
       }
     },
@@ -111132,11 +111078,11 @@
       "dev": true
     },
     "qr-code-styling": {
-      "version": "1.6.0-rc.1",
-      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.6.0-rc.1.tgz",
-      "integrity": "sha512-ModRIiW6oUnsP18QzrRYZSc/CFKFKIdj7pUs57AEVH20ajlglRpN3HukjHk0UbNMTlKGuaYl7Gt6/O5Gg2NU2Q==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/qr-code-styling/-/qr-code-styling-1.8.0.tgz",
+      "integrity": "sha512-f6DP31ae/TYWAwjaW0ds7qk+2l7BgPpLW1WDH3t8XSlwXHl8aSvyNQomQ2ra7GC3H9yyNWnjb70jw3KGkFyANw==",
       "requires": {
-        "qrcode-generator": "^1.4.3"
+        "qrcode-generator": "^1.4.4"
       }
     },
     "qrcode": {
@@ -111453,9 +111399,9 @@
       }
     },
     "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
@@ -111595,12 +111541,12 @@
       "requires": {}
     },
     "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "requires": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       }
     },
     "react-draggable": {
@@ -111756,21 +111702,6 @@
             "supports-color": "^7.1.0"
           }
         },
-        "chokidar": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-          "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -111801,14 +111732,6 @@
             "path-scurry": "^1.10.1"
           }
         },
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -113237,9 +113160,9 @@
       }
     },
     "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "requires": {
         "loose-envify": "^1.1.0"
       }
@@ -115604,9 +115527,9 @@
       "integrity": "sha512-VbQLQXC04io6AoAjIUWuZwW4MSYozkcP9KjLdrsG/00Q/yiwvhz9RQyt0nHXV10hi9NVnDNy1/wv7Dzq1lkOCQ=="
     },
     "swr": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.4.tgz",
-      "integrity": "sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.2.5.tgz",
+      "integrity": "sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==",
       "requires": {
         "client-only": "^0.0.1",
         "use-sync-external-store": "^1.2.0"
@@ -117092,29 +117015,6 @@
         "ufo": "^1.5.4"
       },
       "dependencies": {
-        "chokidar": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-          "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
-        "glob-parent": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
         "lru-cache": {
           "version": "10.4.3",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
diff --git a/package.json b/package.json
index 750995da46..c608edf556 100644
--- a/package.json
+++ b/package.json
@@ -302,14 +302,14 @@
     "prosemirror-utils": "^1.2.2",
     "prosemirror-view": "^1.34.1",
     "qrcode": "^1.5.3",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-countdown": "^2.3.2",
     "react-csv": "^2.2.2",
     "react-dnd": "^16.0.0",
     "react-dnd-html5-backend": "^16.0.0",
     "react-dnd-multi-backend": "^8.0.0",
     "react-dnd-touch-backend": "^16.0.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-email": "^3.0.1",
     "react-hook-form": "^7.25.0",
     "react-hot-keys": "^2.7.1",
@@ -331,7 +331,7 @@
     "socket.io-client": "^4.7.5",
     "stripe": "^12.14.0",
     "swagger-ui-react": "^5.17.14",
-    "swr": "^2.2.4",
+    "swr": "^2.2.5",
     "tiktoken": "^1.0.15",
     "tsconfig-paths": "^4.2.0",
     "tsx": "^4.7.0",
@@ -395,10 +395,10 @@
     "@types/papaparse": "^5.3.5",
     "@types/promise-retry": "^1.1.3",
     "@types/qrcode": "^1.5.5",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.11",
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-csv": "^1.1.2",
-    "@types/react-dom": "^18.3.0",
+    "@types/react-dom": "^18.3.1",
     "@types/react-pdf": "^7.0.0",
     "@types/react-resizable": "^1.7.4",
     "@types/react-window": "^1.8.7",
@@ -458,8 +458,8 @@
     "webpack": "^5.94.0"
   },
   "overrides": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "typescript": "^5.4.2",
     "esbuild": "^0.19.5",
     "serverless": "^4.1.19",