Merge branch 'main' into yash/skale-custom-gas

Author: kumaryash90

.changeset/fluffy-pets-tie.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix caching issues for headless component; improve code coverage

.changeset/warm-students-breathe.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": minor
+---
+
+Adds `getLastAuthProvider` to get the most recently used auth provider for login

apps/dashboard/framer-rewrites.js

@@ -3,6 +3,8 @@ module.exports = [
   // -- home
   "/",
   "/pricing",
+  "/bounties",
+  "/contact-us",
   // -- product landing pages --
   // -- connect
   "/connect",
@@ -31,4 +33,9 @@ module.exports = [
   // -- legal --
   "/terms",
   "/privacy-policy",
+  // -- community pages --
+  "/community/ambassadors",
+  "/community/startup-program",
+  // -- grants --
+  "/grant/superchain",
 ];

apps/dashboard/package.json

@@ -46,9 +46,9 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.1",
     "@radix-ui/react-tooltip": "1.1.4",
-    "@sentry/nextjs": "8.42.0",
+    "@sentry/nextjs": "8.43.0",
     "@shazow/whatsabi": "^0.17.0",
-    "@tanstack/react-query": "5.62.3",
+    "@tanstack/react-query": "5.62.7",
     "@tanstack/react-table": "^8.17.3",
     "@thirdweb-dev/service-utils": "workspace:*",
     "@vercel/functions": "^1.5.1",
@@ -62,13 +62,13 @@
     "date-fns": "4.1.0",
     "fetch-event-stream": "0.1.5",
     "flat": "^6.0.1",
-    "framer-motion": "11.13.3",
+    "framer-motion": "11.13.5",
     "fuse.js": "7.0.0",
     "input-otp": "^1.4.1",
     "ioredis": "^5.4.1",
     "ipaddr.js": "^2.2.0",
     "lucide-react": "0.468.0",
-    "next": "15.0.4",
+    "next": "15.1.0",
     "next-plausible": "^3.12.4",
     "next-seo": "^6.5.0",
     "next-themes": "^0.4.4",
@@ -86,10 +86,10 @@
     "react-hook-form": "7.53.2",
     "react-markdown": "^9.0.1",
     "react-table": "^7.8.0",
-    "recharts": "^2.13.3",
+    "recharts": "2.14.1",
     "remark-gfm": "^4.0.0",
     "server-only": "^0.0.1",
-    "shiki": "1.24.1",
+    "shiki": "1.24.2",
     "sonner": "^1.7.1",
     "spdx-correct": "^3.2.0",
     "swagger-ui-react": "^5.18.2",
@@ -98,13 +98,13 @@
     "thirdweb": "workspace:*",
     "tiny-invariant": "^1.3.3",
     "use-debounce": "^10.0.4",
-    "zod": "3.23.8"
+    "zod": "3.24.1"
   },
   "devDependencies": {
     "@chakra-ui/cli": "^2.4.1",
     "@chromatic-com/storybook": "3.2.2",
-    "@next/bundle-analyzer": "15.0.4",
-    "@next/eslint-plugin-next": "15.0.4",
+    "@next/bundle-analyzer": "15.1.0",
+    "@next/eslint-plugin-next": "15.1.0",
     "@playwright/test": "1.49.1",
     "@storybook/addon-essentials": "8.4.7",
     "@storybook/addon-interactions": "8.4.7",
@@ -116,7 +116,7 @@
     "@storybook/react": "8.4.7",
     "@storybook/test": "8.4.7",
     "@types/color": "4.2.0",
-    "@types/node": "22.10.1",
+    "@types/node": "22.10.2",
     "@types/papaparse": "^5.3.15",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
@@ -128,12 +128,12 @@
     "@typescript-eslint/eslint-plugin": "7.14.1",
     "@typescript-eslint/parser": "7.14.1",
     "autoprefixer": "^10.4.19",
-    "checkly": "^4.14.0",
+    "checkly": "^4.15.0",
     "eslint": "8.57.0",
     "eslint-config-biome": "1.9.4",
     "eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
     "eslint-plugin-storybook": "^0.11.1",
-    "knip": "5.39.2",
+    "knip": "5.39.4",
     "next-sitemap": "^4.2.3",
     "postcss": "8.4.49",
     "storybook": "8.4.7",

apps/dashboard/redirects.js

@@ -319,6 +319,12 @@ async function redirects() {
       destination: "/home",
       permanent: false,
     },
+    // redirect "/open-source" to "/bounties"
+    {
+      source: "/open-source",
+      destination: "/bounties",
+      permanent: false,
+    },
     ...legacyDashboardToTeamRedirects,
   ];
 }

apps/dashboard/src/@/actions/validLogin.ts

@@ -0,0 +1,48 @@
+"use server";
+
+import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
+import { cookies } from "next/headers";
+import { getAddress } from "thirdweb";
+import { COOKIE_PREFIX_TOKEN } from "../constants/cookie";
+import { API_SERVER_URL } from "../constants/env";
+
+/**
+ * Check that the connected wallet is valid for the current active account
+ */
+export async function isWalletValidForActiveAccount(params: {
+  address: string;
+  account: Account;
+  authToken: string;
+}) {
+  const cookieStore = await cookies();
+  const authCookieNameForAddress =
+    COOKIE_PREFIX_TOKEN + getAddress(params.address);
+
+  // authToken for this wallet address should be present
+  const authTokenForAddress = cookieStore.get(authCookieNameForAddress)?.value;
+  if (!authTokenForAddress) {
+    return false;
+  }
+
+  // this authToken should be same as current active authToken
+  if (authTokenForAddress !== params.authToken) {
+    return false;
+  }
+
+  // authToken should be valid
+  const accountRes = await fetch(`${API_SERVER_URL}/v1/account/me`, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${authTokenForAddress}`,
+    },
+  });
+
+  if (accountRes.status !== 200) {
+    return false;
+  }
+
+  const account = (await accountRes.json()).data as Account;
+
+  // the current account should match the account fetched for the authToken
+  return account.id === params.account.id;
+}

apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx

@@ -3,16 +3,17 @@ import { ToolTipLabel } from "@/components/ui/tooltip";
 import { AsteriskIcon, InfoIcon } from "lucide-react";
 
 export function FormFieldSetup(props: {
-  htmlFor: string;
+  htmlFor?: string;
   label: string;
   errorMessage: React.ReactNode | undefined;
   children: React.ReactNode;
   tooltip?: React.ReactNode;
   isRequired: boolean;
   helperText?: React.ReactNode;
+  className?: string;
 }) {
   return (
-    <div>
+    <div className={props.className}>
       <div className="mb-2 inline-flex items-center gap-1">
         <Label htmlFor={props.htmlFor}>{props.label}</Label>
 

apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx

@@ -1,10 +1,8 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
 import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { useStore } from "@/lib/reactive";
-import { cn } from "@/lib/utils";
 import { getSDKTheme } from "app/components/sdk-component-theme";
 import { CustomChainRenderer } from "components/selects/CustomChainRenderer";
 import { mapV4ChainToV5Chain } from "contexts/map-chains";
@@ -18,6 +16,7 @@ import type { Chain } from "thirdweb";
 import {
   ConnectButton,
   type NetworkSelectorProps,
+  useActiveAccount,
   useConnectModal,
 } from "thirdweb/react";
 import { useFavoriteChainIds } from "../../../../app/(dashboard)/(chain)/components/client/star-button";
@@ -29,16 +28,15 @@ import {
   addRecentlyUsedChainId,
   recentlyUsedChainIdsStore,
 } from "../../../../stores/chainStores";
-import { useLoggedInUser } from "../../hooks/useLoggedInUser";
 import { popularChains } from "../popularChains";
 
 export const CustomConnectWallet = (props: {
   loginRequired?: boolean;
   connectButtonClassName?: string;
   signInLinkButtonClassName?: string;
   detailsButtonClassName?: string;
-  loadingButtonClassName?: string;
   chain?: Chain;
+  isLoggedIn: boolean;
 }) => {
   const thirdwebClient = useThirdwebClient();
   const loginRequired =
@@ -120,25 +118,11 @@ export const CustomConnectWallet = (props: {
   ]);
 
   // ensures login status on pages that need it
-  const { isPending, isLoggedIn } = useLoggedInUser();
+  const { isLoggedIn } = props;
   const pathname = usePathname();
+  const account = useActiveAccount();
 
-  if (isPending) {
-    return (
-      <>
-        <div
-          className={cn(
-            "flex h-[48px] w-[144px] items-center justify-center rounded-lg border border-border bg-muted",
-            props.loadingButtonClassName,
-          )}
-        >
-          <Spinner className="size-4" />
-        </div>
-      </>
-    );
-  }
-
-  if (!isLoggedIn && loginRequired) {
+  if ((!isLoggedIn || !account) && loginRequired) {
     return (
       <>
         <Button