Merge branch 'ian/ftux' of https://github.com/thirdweb-dev/js into ian/ftux

Author: ianthirdweb

apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts

@@ -268,17 +268,17 @@ export interface BillingCredit {
 
 interface UseAccountInput {
   refetchInterval?:
-  | number
-  | false
-  | ((
-    query: Query<
-      Account,
-      Error,
-      Account,
-      readonly ["account", string, "me"]
-    >,
-  ) => number | false | undefined)
-  | undefined;
+    | number
+    | false
+    | ((
+        query: Query<
+          Account,
+          Error,
+          Account,
+          readonly ["account", string, "me"]
+        >,
+      ) => number | false | undefined)
+    | undefined;
 }
 
 export function useAccount({ refetchInterval }: UseAccountInput = {}) {

apps/dashboard/src/app/(dashboard)/layout.tsx

@@ -1,7 +1,7 @@
 import { AppFooter } from "@/components/blocks/app-footer";
+import { UnlimitedWalletsBanner } from "components/notices/AnnouncementBanner";
 import { ErrorProvider } from "../../contexts/error-handler";
 import { DashboardHeader } from "../components/Header/DashboardHeader";
-import { UnlimitedWalletsBanner } from "components/notices/AnnouncementBanner";
 
 export default function DashboardLayout(props: { children: React.ReactNode }) {
   return (

apps/dashboard/src/app/account/layout.tsx

@@ -3,10 +3,10 @@ import { getTeams } from "@/api/team";
 import { DashboardTypeCookieSetter } from "@/components/DashboardTypeCookieSetter";
 import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import { AppFooter } from "@/components/blocks/app-footer";
+import { UnlimitedWalletsBanner } from "components/notices/AnnouncementBanner";
 import type React from "react";
 import { TWAutoConnect } from "../components/autoconnect";
 import { AccountHeader } from "./components/AccountHeader";
-import { UnlimitedWalletsBanner } from "components/notices/AnnouncementBanner";
 
 export default async function AccountLayout(props: {
   children: React.ReactNode;

apps/dashboard/src/app/layout.tsx

@@ -7,7 +7,6 @@ import PlausibleProvider from "next-plausible";
 import dynamic from "next/dynamic";
 import { Inter } from "next/font/google";
 import NextTopLoader from "nextjs-toploader";
-import { UnlimitedWalletsBanner } from "../components/notices/AnnouncementBanner";
 import { PostHogProvider } from "./components/root-providers";
 import { AppRouterProviders } from "./providers";
 

apps/dashboard/src/app/onboarding/page.tsx

@@ -209,6 +209,12 @@ export default function OnboardingPage({
 
   const onSubmit: SubmitHandler<FormData> = async (data) => {
     setIsLoading(true);
+
+    const account = await accountQuery.refetch();
+    if (!account.data?.id) {
+      throw new Error("No account found");
+    }
+
     const res = await fetch(
       `${THIRDWEB_ANALYTICS_API_HOST}/v1/preferences/account`,
       {
@@ -217,7 +223,7 @@ export default function OnboardingPage({
           "Content-Type": "application/json",
         },
         body: JSON.stringify({
-          accountId: accountQuery.data?.id,
+          accountId: account.data.id,
           userType: data.userType,
           role: data.role,
           industry: data.industry,

apps/dashboard/src/app/team/[team_slug]/layout.tsx

@@ -1,7 +1,7 @@
 import { DashboardTypeCookieSetter } from "@/components/DashboardTypeCookieSetter";
 import { AppFooter } from "@/components/blocks/app-footer";
-import { TWAutoConnect } from "../../components/autoconnect";
 import { UnlimitedWalletsBanner } from "components/notices/AnnouncementBanner";
+import { TWAutoConnect } from "../../components/autoconnect";
 
 export default function RootTeamLayout(props: {
   children: React.ReactNode;