cleanup unused (thirdweb-dev#5476)

jnsdls · web-flow · commit 377f46c30316 · 2024-11-20T15:22:11.000-08:00
diff --git a/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts b/apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts
@@ -29,9 +29,6 @@ export const accountPlan = {
   enterprise: "enterprise",
 } as const;
 
-type AccountStatus = (typeof accountStatus)[keyof typeof accountStatus];
-type AccountPlan = (typeof accountPlan)[keyof typeof accountPlan];
-
 export type AuthorizedWallet = {
   id: string;
   accountId: string;
@@ -47,30 +44,17 @@ export type Account = {
   id: string;
   isStaff: boolean;
   creatorWalletAddress: string;
-  status: AccountStatus;
-  plan: AccountPlan;
   name?: string;
   email?: string;
   advancedEnabled: boolean;
-  currentBillingPeriodStartsAt: string;
-  currentBillingPeriodEndsAt: string;
   emailConfirmedAt?: string;
   unconfirmedEmail?: string;
-  trialPeriodEndedAt?: string;
   emailConfirmationWalletAddress?: string;
-  stripePaymentActionUrl?: string;
   onboardSkipped?: boolean;
-  paymentAttemptCount?: number;
   notificationPreferences?: {
     billing: "email" | "none";
     updates: "email" | "none";
   };
-  recurringPaymentFailures: {
-    subscriptionId: string;
-    subscriptionDescription: string;
-    paymentFailureCode: string;
-    serviceCutoffDate: string;
-  }[];
   // TODO - add image URL
 };
 
@@ -194,33 +178,16 @@ export interface UpdateKeyInput {
   redirectUrls: string[];
 }
 
-interface UsageBundler {
-  chainId: number;
-  sumTransactionFee: string;
-}
-
 interface UsageStorage {
   sumFileSizeBytes: number;
 }
 
-interface UsageEmbeddedWallets {
-  countWalletAddresses: number;
-}
-
 export interface UsageBillableByService {
   usage: {
-    bundler: UsageBundler[];
     storage: UsageStorage;
-    embeddedWallets: UsageEmbeddedWallets;
-  };
-  billableUsd: {
-    bundler: number;
-    storage: number;
-    embeddedWallets: number;
   };
   limits: {
     storage: number;
-    embeddedWallets: number;
   };
   rateLimits: {
     storage: number;
diff --git a/apps/dashboard/src/app/api/testnet-faucet/claim/route.ts b/apps/dashboard/src/app/api/testnet-faucet/claim/route.ts
@@ -74,7 +74,7 @@ export const POST = async (req: NextRequest) => {
   const account: { data: Account } = await accountRes.json();
 
   // Make sure the logged-in account has verified its email
-  if (account.data.status === "noCustomer") {
+  if (!account.data.email) {
     return NextResponse.json(
       {
         error: "Account owner hasn't verified email",
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/ecosystem/create/components/client/create-ecosystem-form.client.tsx
@@ -14,9 +14,7 @@ import {
 import { ImageUpload } from "@/components/ui/image-upload";
 import { Input } from "@/components/ui/input";
 import { RadioGroup, RadioGroupItemButton } from "@/components/ui/radio-group";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { accountStatus, useAccount } from "@3rdweb-sdk/react/hooks/useApi";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Loader2 } from "lucide-react";
 import Link from "next/link";
@@ -49,7 +47,6 @@ export function CreateEcosystemForm(props: {
   const [formDataToBeConfirmed, setFormDataToBeConfirmed] = useState<
     z.infer<typeof formSchema> | undefined
   >();
-  const { data: billingAccountInfo } = useAccount();
 
   const router = useDashboardRouter();
   const form = useForm<z.infer<typeof formSchema>>({
@@ -164,31 +161,16 @@ export function CreateEcosystemForm(props: {
               )}
             />
           </div>
-          {billingAccountInfo?.status !== accountStatus.validPayment ? (
-            <ToolTipLabel label="Please update your payment method to create an ecosystem">
-              {/* Allows the button to be disabled but the tooltip still works */}
-              <div className="w-full">
-                <Button
-                  type="submit"
-                  disabled={true}
-                  variant="primary"
-                  className="w-full opacity-50"
-                >
-                  Create
-                </Button>
-              </div>
-            </ToolTipLabel>
-          ) : (
-            <Button
-              type="submit"
-              variant="primary"
-              className="w-full"
-              disabled={isPending}
-            >
-              {isPending && <Loader2 className="mr-1 h-4 w-4 animate-spin" />}
-              Create
-            </Button>
-          )}
+
+          <Button
+            type="submit"
+            variant="primary"
+            className="w-full"
+            disabled={isPending}
+          >
+            {isPending && <Loader2 className="mr-1 h-4 w-4 animate-spin" />}
+            Create
+          </Button>
         </form>
       </Form>
       <ConfirmationDialog
diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/usage/overview/components/Usage.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/usage/overview/components/Usage.tsx
@@ -41,11 +41,6 @@ export const Usage: React.FC<UsageProps> = ({
     return {
       total: `${toSize(Math.min(consumedBytes, limitBytes), "MB")} of ${toSize(limitBytes)} included storage used`,
       progress: percent,
-      ...(usageData.billableUsd.storage > 0
-        ? {
-            overage: usageData.billableUsd.storage,
-          }
-        : {}),
       totalUsage: `Total Usage: ${toSize(consumedBytes, "MB")}`,
     };
   }, [usageData]);
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/AccountAbstractionPage.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/AccountAbstractionPage.tsx
@@ -1,12 +1,10 @@
 "use client";
-
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { TrackedLinkTW } from "@/components/ui/tracked-link";
 import {
   type ApiKeyService,
   accountStatus,
-  useAccount,
 } from "@3rdweb-sdk/react/hooks/useApi";
 import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
 import { SmartWalletsBillingAlert } from "components/settings/ApiKeys/Alerts";
@@ -26,24 +24,20 @@ export function AccountAbstractionPage(props: {
   teamSlug: string;
   projectKey: string;
   apiKeyServices: ApiKeyService[];
+  billingStatus: "validPayment" | (string & {}) | null;
   tab?: string;
 }) {
   const { apiKeyServices } = props;
   const looggedInUserQuery = useLoggedInUser();
-  const accountQuery = useAccount();
   const chain = useActiveWalletChain();
 
   const hasSmartWalletsWithoutBilling = useMemo(() => {
-    if (!accountQuery.data) {
-      return;
-    }
-
     return apiKeyServices.find(
       (s) =>
-        accountQuery.data.status !== accountStatus.validPayment &&
+        props.billingStatus !== accountStatus.validPayment &&
         s.name === "bundler",
     );
-  }, [apiKeyServices, accountQuery.data]);
+  }, [apiKeyServices, props.billingStatus]);
 
   const isOpChain = chain?.id ? isOpChainId(chain.id) : false;
 
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/account-abstraction/page.tsx
@@ -1,7 +1,8 @@
 import { getProject } from "@/api/projects";
 import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
 import type { Metadata } from "next";
-import { notFound } from "next/navigation";
+import { notFound, redirect } from "next/navigation";
+import { getTeamBySlug } from "../../../../../../@/api/team";
 import { getAbsoluteUrl } from "../../../../../../lib/vercel-utils";
 import { getAPIKeyForProjectId } from "../../../../../api/lib/getAPIKeys";
 import { AccountAbstractionPage } from "./AccountAbstractionPage";
@@ -11,7 +12,15 @@ export default async function Page(props: {
   searchParams: Promise<{ tab?: string }>;
 }) {
   const { team_slug, project_slug } = await props.params;
-  const project = await getProject(team_slug, project_slug);
+
+  const [team, project] = await Promise.all([
+    getTeamBySlug(team_slug),
+    getProject(team_slug, project_slug),
+  ]);
+
+  if (!team) {
+    redirect("/team");
+  }
 
   if (!project) {
     notFound();
@@ -28,6 +37,7 @@ export default async function Page(props: {
       <AccountAbstractionPage
         projectSlug={project.slug}
         teamSlug={team_slug}
+        billingStatus={team.billingStatus}
         projectKey={project.publishableKey}
         apiKeyServices={apiKey.services || []}
         tab={(await props.searchParams).tab}
diff --git a/apps/dashboard/src/components/onboarding/index.tsx b/apps/dashboard/src/components/onboarding/index.tsx
@@ -67,7 +67,7 @@ export const Onboarding: React.FC<{
       );
     }
     // skip when going thru claiming trial growth
-    else if (account?.trialPeriodEndedAt) {
+    else if (account?.onboardSkipped) {
       setState("skipped");
     }
     // user hasn't skipped onboarding, has valid email and no valid payment yet
diff --git a/apps/dashboard/src/components/onboarding/on-boarding-ui.client.tsx b/apps/dashboard/src/components/onboarding/on-boarding-ui.client.tsx
@@ -42,10 +42,7 @@ function OnboardingUI(props: {
         break;
       case "confirming":
         // after confirming, only show plan if user has not skipped onboarding earlier or trial period has ended
-        nextStep =
-          account.onboardSkipped || account?.trialPeriodEndedAt
-            ? "skipped"
-            : "plan";
+        nextStep = account.onboardSkipped ? "skipped" : "plan";
         break;
       case "confirmLinking":
         nextStep = "skipped";
@@ -145,7 +142,8 @@ function OnboardingUI(props: {
                 setState("skipped");
                 skipOnboarding();
               }}
-              canTrialGrowth={!account.trialPeriodEndedAt}
+              // TODO: what can we do here? assume true for the moment
+              canTrialGrowth={true}
             />
           </Suspense>
         )}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ export const POST = async (req: NextRequest) => {`
`74`	`74`	`const account: { data: Account } = await accountRes.json();`
`75`	`75`
`76`	`76`	`// Make sure the logged-in account has verified its email`
`77`		`- if (account.data.status === "noCustomer") {`
	`77`	`+ if (!account.data.email) {`
`78`	`78`	`return NextResponse.json(`
`79`	`79`	`{`
`80`	`80`	`error: "Account owner hasn't verified email",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export const Onboarding: React.FC<{`
`67`	`67`	`);`
`68`	`68`	`}`
`69`	`69`	`// skip when going thru claiming trial growth`
`70`		`- else if (account?.trialPeriodEndedAt) {`
	`70`	`+ else if (account?.onboardSkipped) {`
`71`	`71`	`setState("skipped");`
`72`	`72`	`}`
`73`	`73`	`// user hasn't skipped onboarding, has valid email and no valid payment yet`