Skip to content

Commit cbf48f5

Browse files
committed
Merge branch 'main' of https://github.com/thirdweb-dev/js into gi/portal-translation-crowdinai
2 parents 904091b + 1cff849 commit cbf48f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1862
-345
lines changed

.changeset/ninety-maps-sparkle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/tasty-berries-ring.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import type { Range } from "components/analytics/date-range-selector";
22
import { InAppWalletAnalytics } from "components/embedded-wallets/Analytics";
3+
import { notFound } from "next/navigation";
4+
import { getProject } from "../../../../../../@/api/projects";
5+
import { getAPIKeyForProjectId } from "../../../../../api/lib/getAPIKeys";
36

47
export default async function Page(props: {
58
params: Promise<{ team_slug: string; project_slug: string }>;
@@ -27,9 +30,19 @@ export default async function Page(props: {
2730
? (searchParams.interval as "day" | "week")
2831
: "week";
2932

33+
const project = await getProject(params.team_slug, params.project_slug);
34+
if (!project) {
35+
notFound();
36+
}
37+
38+
const apiKey = await getAPIKeyForProjectId(project.id);
39+
if (!apiKey) {
40+
notFound();
41+
}
42+
3043
return (
3144
<InAppWalletAnalytics
32-
clientId={params.project_slug}
45+
clientId={apiKey.key}
3346
interval={interval}
3447
range={range as Range}
3548
/>

apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/ProjectGeneralSettingsPage.stories.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ function Story() {
6060
payConfig: "/payConfig",
6161
}}
6262
onKeyUpdated={undefined}
63+
rotateSecretKey={async () => {
64+
await new Promise((resolve) => setTimeout(resolve, 1000));
65+
return {
66+
data: {
67+
secret: new Array(86).fill("x").join(""),
68+
secretHash: new Array(64).fill("x").join(""),
69+
secretMasked: "123...4567",
70+
},
71+
};
72+
}}
6373
showNebulaSettings={false}
6474
/>
6575

0 commit comments

Comments
 (0)