Skip to content

Commit 05d760a

Browse files
Merge remote-tracking branch 'origin/main' into new-engine-docs
2 parents f392aed + c81fed3 commit 05d760a

File tree

193 files changed

+11514
-268
lines changed

Some content is hidden

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

193 files changed

+11514
-268
lines changed

.changeset/big-cases-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/vault-sdk": patch
3+
---
4+
5+
Introducing vault sdk

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ packages/*/typedoc/*
3030
storybook-static
3131
.aider*
3232

33-
tsconfig.tsbuildinfo
33+
tsconfig.tsbuildinfo
34+
.cursor

apps/dashboard/.env.example

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,8 @@ ANALYTICS_SERVICE_URL=""
104104
NEXT_PUBLIC_NEBULA_URL=""
105105

106106
# required for billing parts of the dashboard (team -> settings -> billing / invoices)
107-
STRIPE_SECRET_KEY=""
107+
STRIPE_SECRET_KEY=""
108+
109+
# required for server wallet management
110+
NEXT_PUBLIC_THIRDWEB_VAULT_URL=""
111+
NEXT_PUBLIC_ENGINE_CLOUD_URL=""

apps/dashboard/knip.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"ignoreDependencies": [
1313
"@storybook/blocks",
1414
"@thirdweb-dev/service-utils",
15+
"@thirdweb-dev/vault-sdk",
1516
"@types/color",
1617
"fast-xml-parser"
1718
]

apps/dashboard/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@
4545
"@radix-ui/react-slot": "^1.2.0",
4646
"@radix-ui/react-switch": "^1.2.2",
4747
"@radix-ui/react-tooltip": "1.2.3",
48+
"@scalar/api-reference-react": "^0.6.19",
4849
"@sentry/nextjs": "9.13.0",
4950
"@shazow/whatsabi": "0.21.0",
5051
"@tanstack/react-query": "5.74.4",
5152
"@tanstack/react-table": "^8.21.3",
5253
"@thirdweb-dev/service-utils": "workspace:*",
54+
"@thirdweb-dev/vault-sdk": "workspace:*",
5355
"@vercel/functions": "2.0.0",
5456
"@vercel/og": "^0.6.8",
5557
"abitype": "1.0.8",

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use server";
22

33
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
4-
import { API_SERVER_URL } from "../constants/env";
4+
import { API_SERVER_URL, THIRDWEB_ENGINE_CLOUD_URL } from "../constants/env";
55

66
type ProxyActionParams = {
77
pathname: string;
@@ -79,6 +79,10 @@ export async function apiServerProxy<T>(params: ProxyActionParams) {
7979
return proxy<T>(API_SERVER_URL, params);
8080
}
8181

82+
export async function engineCloudProxy<T>(params: ProxyActionParams) {
83+
return proxy<T>(THIRDWEB_ENGINE_CLOUD_URL, params);
84+
}
85+
8286
export async function payServerProxy<T>(params: ProxyActionParams) {
8387
return proxy<T>(
8488
process.env.NEXT_PUBLIC_PAY_URL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export function FullWidthSidebarLayout(props: {
9595
links={[...contentSidebarLinks, ...(footerSidebarLinks || [])]}
9696
/>
9797

98-
<main className="z-0 flex min-w-0 grow flex-col max-sm:w-full">
98+
<main className="flex min-w-0 grow flex-col max-sm:w-full">
9999
{children}
100100
</main>
101101
<AppFooter containerClassName="max-w-7xl" />

apps/dashboard/src/@/components/blocks/select-with-search.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ export const SelectWithSearch = React.forwardRef<
129129
selectedOption && "text-foreground",
130130
)}
131131
>
132-
{selectedOption?.label || placeholder}
132+
{renderOption && selectedOption
133+
? renderOption(selectedOption)
134+
: selectedOption?.label || placeholder}
133135
</span>
134136
<ChevronDownIcon className="size-4 cursor-pointer text-muted-foreground" />
135137
</div>

apps/dashboard/src/@/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const buttonVariants = cva(
2222
link: "text-primary underline-offset-4 hover:underline text-semibold",
2323
pink: "border border-nebula-pink-foreground !text-nebula-pink-foreground bg-[hsl(var(--nebula-pink-foreground)/5%)] hover:bg-nebula-pink-foreground/10 dark:!text-foreground dark:bg-nebula-pink-foreground/10 dark:hover:bg-nebula-pink-foreground/20",
2424
upsell:
25-
"bg-gradient-to-r from-purple-500 to-pink-500 text-white hover:from-purple-600 hover:to-pink-600 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
25+
"bg-green-600 text-white hover:bg-green-700 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 transition-all duration-200",
2626
},
2727
size: {
2828
default: "h-10 px-4 py-2",

apps/dashboard/src/@/components/ui/tabs.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Button } from "./button";
1010
import { ToolTipLabel } from "./tooltip";
1111

1212
export type TabLink = {
13-
name: string;
13+
name: React.ReactNode;
1414
href: string;
1515
isActive: boolean;
1616
isDisabled?: boolean;
@@ -43,7 +43,7 @@ export function TabLinks(props: {
4343
return (
4444
<Button
4545
asChild
46-
key={tab.name}
46+
key={tab.href}
4747
disabled={tab.isDisabled}
4848
variant="ghost"
4949
>
@@ -206,7 +206,7 @@ function useUnderline<El extends HTMLElement>() {
206206

207207
export function TabPathLinks(props: {
208208
links: {
209-
name: string;
209+
name: React.ReactNode;
210210
path: string;
211211
exactMatch?: boolean;
212212
isDisabled?: boolean;

0 commit comments

Comments
 (0)