Skip to content

Remove /v1/keys usage #6292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove /v1/keys usage #6292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/dashboard/.storybook/preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Inter as interFont } from "next/font/google";
// biome-ignore lint/style/useImportType: <explanation>
import React from "react";
import { useEffect } from "react";
import { Toaster } from "sonner";
import { Button } from "../src/@/components/ui/button";

const queryClient = new QueryClient();
Expand Down Expand Up @@ -79,7 +80,13 @@ function StoryLayout(props: {
</div>

<div className="flex min-w-0 grow flex-col">{props.children}</div>
<ToasterSetup />
</div>
</QueryClientProvider>
);
}

function ToasterSetup() {
const { theme } = useTheme();
return <Toaster richColors theme={theme === "light" ? "light" : "dark"} />;
}
15 changes: 1 addition & 14 deletions apps/dashboard/src/@/components/blocks/pricing-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ type PricingCardProps = {
ctaHint?: string;
highlighted?: boolean;
current?: boolean;
canTrialGrowth?: boolean;
activeTrialEndsAt?: string;
redirectPath: string;
redirectToCheckout: RedirectBillingCheckoutAction;
Expand All @@ -43,7 +42,6 @@ export const PricingCard: React.FC<PricingCardProps> = ({
cta,
highlighted = false,
current = false,
canTrialGrowth = false,
activeTrialEndsAt,
redirectPath,
redirectToCheckout,
Expand Down Expand Up @@ -88,18 +86,7 @@ export const PricingCard: React.FC<PricingCardProps> = ({
<div className="flex flex-col gap-0.5">
<div className="flex items-center gap-2">
<span className="font-semibold text-3xl text-foreground tracking-tight">
{isCustomPrice ? (
plan.price
) : canTrialGrowth ? (
<>
<span className="text-muted-foreground line-through">
${plan.price}
</span>{" "}
$0
</>
) : (
`$${plan.price}`
)}
${plan.price}
</span>

{!isCustomPrice && (
Expand Down
174 changes: 71 additions & 103 deletions apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export type Account = {
// TODO - add image URL
};

interface UpdateAccountInput {
export interface UpdateAccountInput {
name?: string;
email?: string;
linkWallet?: boolean;
Expand Down Expand Up @@ -379,39 +379,40 @@ export function useUserOpUsagePeriod(args: {
});
}

export function useUpdateAccount() {
const queryClient = useQueryClient();
const address = useActiveAccount()?.address;
export async function updateAccountClient(input: UpdateAccountInput) {
type Result = {
data: object;
error?: { message: string };
};

return useMutation({
mutationFn: async (input: UpdateAccountInput) => {
type Result = {
data: object;
error?: { message: string };
};
const res = await apiServerProxy<Result>({
pathname: "/v1/account",
method: "PUT",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(input),
});

const res = await apiServerProxy<Result>({
pathname: "/v1/account",
method: "PUT",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(input),
});
if (!res.ok) {
throw new Error(res.error);
}

if (!res.ok) {
throw new Error(res.error);
}
const json = res.data;

const json = res.data;
if (json.error) {
throw new Error(json.error.message);
}

if (json.error) {
throw new Error(json.error.message);
}
return json.data;
}

return json.data;
},
export function useUpdateAccount() {
const queryClient = useQueryClient();
const address = useActiveAccount()?.address;

return useMutation({
mutationFn: updateAccountClient,
onSuccess: () => {
return queryClient.invalidateQueries({
queryKey: accountKeys.me(address || ""),
Expand Down Expand Up @@ -460,94 +461,61 @@ export function useUpdateNotifications() {
});
}

export function useConfirmEmail() {
const address = useActiveAccount()?.address;
const queryClient = useQueryClient();
export const verifyEmailClient = async (input: ConfirmEmailInput) => {
type Result = {
error?: { message: string };
data: { team: Team; account: Account };
};

return useMutation({
mutationFn: async (input: ConfirmEmailInput) => {
type Result = {
error?: { message: string };
data: { team: Team; account: Account };
};
const res = await apiServerProxy<Result>({
pathname: "/v1/account/confirmEmail",
method: "PUT",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(input),
});

const res = await apiServerProxy<Result>({
pathname: "/v1/account/confirmEmail",
method: "PUT",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(input),
});
if (!res.ok) {
throw new Error(res.error);
}

if (!res.ok) {
throw new Error(res.error);
}
const json = res.data;

const json = res.data;
if (json.error) {
throw new Error(json.error.message);
}

if (json.error) {
throw new Error(json.error.message);
}
return json.data;
};

return json.data;
},
onSuccess: async () => {
// invalidate related cache, since could be relinking account
return Promise.all([
queryClient.invalidateQueries({
queryKey: apiKeys.keys(address || ""),
}),
queryClient.invalidateQueries({
queryKey: accountKeys.usage(address || ""),
}),
queryClient.invalidateQueries({
queryKey: accountKeys.me(address || ""),
}),
]);
export const resendEmailClient = async () => {
type Result = {
error?: { message: string };
data: object;
};

const res = await apiServerProxy<Result>({
pathname: "/v1/account/resendEmailConfirmation",
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({}),
});
}

export function useResendEmailConfirmation() {
const address = useActiveAccount()?.address;
const queryClient = useQueryClient();

return useMutation({
mutationFn: async () => {
type Result = {
error?: { message: string };
data: object;
};

const res = await apiServerProxy<Result>({
pathname: "/v1/account/resendEmailConfirmation",
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({}),
});

if (!res.ok) {
throw new Error(res.error);
}
if (!res.ok) {
throw new Error(res.error);
}

const json = res.data;
const json = res.data;

if (json.error) {
throw new Error(json.error.message);
}
if (json.error) {
throw new Error(json.error.message);
}

return json.data;
},
onSuccess: () => {
return queryClient.invalidateQueries({
queryKey: accountKeys.me(address || ""),
});
},
});
}
return json.data;
};

export function useCreateApiKey() {
const address = useActiveAccount()?.address;
Expand Down
3 changes: 1 addition & 2 deletions ...hboard)/(chain)/[chain_id]/[contractAddress]/modules/components/batchMetadata.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ZERO_ADDRESS } from "thirdweb";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
Expand Down Expand Up @@ -109,7 +109,6 @@ function Component() {
contractChainId={1}
/>
</BadgeContainer>
<Toaster richColors />
</div>
</ErrorProvider>
</ThirdwebProvider>
Expand Down
4 changes: 1 addition & 3 deletions ...(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/claimable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { subDays } from "date-fns";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { mobileViewport } from "stories/utils";
import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
Expand Down Expand Up @@ -196,8 +196,6 @@ function Component() {
isValidTokenId={true}
noClaimConditionSet={noClaimConditionSet}
/>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
4 changes: 1 addition & 3 deletions .../(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/mintable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
import { accountStub } from "../../../../../../../stories/stubs";
Expand Down Expand Up @@ -175,8 +175,6 @@ function Component() {
contractChainId={1}
/>
</BadgeContainer>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
3 changes: 0 additions & 3 deletions ...ashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Checkbox } from "@/components/ui/checkbox";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ThirdwebProvider } from "thirdweb/react";
import { ModuleCardUI } from "./module-card";
Expand Down Expand Up @@ -120,8 +119,6 @@ function Component() {
</div>
</ModuleCardUI>
</BadgeContainer>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
4 changes: 1 addition & 3 deletions ...)/(chain)/[chain_id]/[contractAddress]/modules/components/openEditionMetadata.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
import { accountStub } from "../../../../../../../stories/stubs";
Expand Down Expand Up @@ -98,8 +98,6 @@ function Component() {
twAccount={accountStub()}
/>
</BadgeContainer>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
4 changes: 1 addition & 3 deletions ...p/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/royalty.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
import { accountStub } from "../../../../../../../stories/stubs";
Expand Down Expand Up @@ -168,8 +168,6 @@ function Component() {
twAccount={twAccount}
/>
</BadgeContainer>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
4 changes: 1 addition & 3 deletions ...shboard)/(chain)/[chain_id]/[contractAddress]/modules/components/transferable.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
import type { Meta, StoryObj } from "@storybook/react";
import { useMutation } from "@tanstack/react-query";
import { useState } from "react";
import { Toaster, toast } from "sonner";
import { toast } from "sonner";
import { BadgeContainer, mobileViewport } from "stories/utils";
import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
import { accountStub } from "../../../../../../../stories/stubs";
Expand Down Expand Up @@ -139,8 +139,6 @@ function Component() {
twAccount={accountStub()}
/>
</BadgeContainer>

<Toaster richColors />
</div>
</ThirdwebProvider>
);
Expand Down
Loading
Loading