Skip to content

Commit e185b5b

Browse files
authored
Merge branch 'main' into contract-deploy-button
2 parents 59023eb + 68ad62f commit e185b5b

File tree

147 files changed

+5733
-4295
lines changed

Some content is hidden

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

147 files changed

+5733
-4295
lines changed

.changeset/clever-carrots-march.md

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

.changeset/curly-ligers-exist.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
update `type` in `getUser` `Profiles` to match tyepscript types

.changeset/pink-ducks-flash.md

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

.changeset/selfish-deers-destroy.md

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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apps/ @jnsdls @joaquim-verges
2020
apps/dashboard/ @jnsdls @MananTank @joaquim-verges
2121
apps/playground-web/ @joaquim-verges @gregfromstl @jnsdls @joaquim-verges
2222
apps/wallet-ui/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23-
apps/portal/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23+
apps/portal/ @thirdweb-dev/product @thirdweb-dev/platform @thirdweb-dev/infra
2424

2525
# .github folder + .changeset + turbo config is owned by jonas for now
2626
scripts/ @jnsdls @joaquim-verges

apps/dashboard/framer-rewrites.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ module.exports = [
66
// -- product landing pages --
77
// -- connect
88
"/connect/sign-in",
9+
// -- nebula
910
"/nebula",
11+
// --insight
12+
"/insight",
1013
// -- contracts
14+
"/contracts",
1115
"/contracts/modular-contracts",
1216
"/contracts/explore",
1317
"/contracts/deployment-tool",
@@ -20,4 +24,7 @@ module.exports = [
2024
"/solutions/ecosystem",
2125
// -- campaigns --
2226
"/unlimited-wallets",
27+
// -- TPP --
28+
"/trusted-partner-program",
29+
"/trusted-partner-program/:partner_slug",
2330
];

apps/dashboard/package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
4848
"@radix-ui/react-tooltip": "1.1.4",
49-
"@sentry/nextjs": "8.40.0",
49+
"@sentry/nextjs": "8.42.0",
5050
"@shazow/whatsabi": "^0.17.0",
51-
"@tanstack/react-query": "5.61.4",
51+
"@tanstack/react-query": "5.62.1",
5252
"@tanstack/react-table": "^8.17.3",
5353
"@thirdweb-dev/service-utils": "workspace:*",
54-
"@vercel/functions": "^1.4.2",
54+
"@vercel/functions": "^1.5.1",
5555
"@vercel/og": "^0.6.4",
5656
"abitype": "1.0.6",
5757
"chakra-react-select": "^4.7.6",
@@ -61,12 +61,12 @@
6161
"compare-versions": "^6.1.0",
6262
"date-fns": "4.1.0",
6363
"flat": "^6.0.1",
64-
"framer-motion": "11.11.17",
64+
"framer-motion": "11.12.0",
6565
"fuse.js": "7.0.0",
6666
"input-otp": "^1.4.1",
6767
"ioredis": "^5.4.1",
6868
"ipaddr.js": "^2.2.0",
69-
"lucide-react": "0.461.0",
69+
"lucide-react": "0.462.0",
7070
"next": "15.0.3",
7171
"next-plausible": "^3.12.4",
7272
"next-seo": "^6.5.0",
@@ -106,17 +106,17 @@
106106
"@next/bundle-analyzer": "15.0.3",
107107
"@next/eslint-plugin-next": "15.0.3",
108108
"@playwright/test": "1.49.0",
109-
"@storybook/addon-essentials": "8.4.5",
110-
"@storybook/addon-interactions": "8.4.5",
111-
"@storybook/addon-links": "8.4.5",
112-
"@storybook/addon-onboarding": "8.4.5",
113-
"@storybook/addon-viewport": "8.4.5",
114-
"@storybook/blocks": "8.4.5",
115-
"@storybook/nextjs": "8.4.5",
116-
"@storybook/react": "8.4.5",
117-
"@storybook/test": "8.4.5",
109+
"@storybook/addon-essentials": "8.4.6",
110+
"@storybook/addon-interactions": "8.4.6",
111+
"@storybook/addon-links": "8.4.6",
112+
"@storybook/addon-onboarding": "8.4.6",
113+
"@storybook/addon-viewport": "8.4.6",
114+
"@storybook/blocks": "8.4.6",
115+
"@storybook/nextjs": "8.4.6",
116+
"@storybook/react": "8.4.6",
117+
"@storybook/test": "8.4.6",
118118
"@types/color": "4.2.0",
119-
"@types/node": "22.10.0",
119+
"@types/node": "22.10.1",
120120
"@types/papaparse": "^5.3.15",
121121
"@types/pluralize": "^0.0.33",
122122
"@types/qrcode": "^1.5.5",
@@ -128,15 +128,15 @@
128128
"@typescript-eslint/eslint-plugin": "7.14.1",
129129
"@typescript-eslint/parser": "7.14.1",
130130
"autoprefixer": "^10.4.19",
131-
"checkly": "^4.11.0",
131+
"checkly": "^4.14.0",
132132
"eslint": "8.57.0",
133-
"eslint-config-biome": "1.9.3",
133+
"eslint-config-biome": "1.9.4",
134134
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
135135
"eslint-plugin-storybook": "^0.11.1",
136-
"knip": "5.38.0",
136+
"knip": "5.39.0",
137137
"next-sitemap": "^4.2.3",
138138
"postcss": "8.4.49",
139-
"storybook": "8.4.5",
139+
"storybook": "8.4.6",
140140
"tailwindcss": "3.4.15",
141141
"typescript": "5.7.2"
142142
}

apps/dashboard/redirects.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,26 @@ async function redirects() {
271271
destination: "/solutions/ecosystem",
272272
permanent: false,
273273
},
274+
// redirect /storage to portal
275+
{
276+
source: "/storage",
277+
destination:
278+
"https://portal.thirdweb.com/infrastructure/storage/overview",
279+
permanent: false,
280+
},
281+
// redirect /rpc to portal
282+
{
283+
source: "/rpc-edge",
284+
destination:
285+
"https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
286+
permanent: false,
287+
},
288+
// redirect /sdk to portal
289+
{
290+
source: "/sdk",
291+
destination: "https://portal.thirdweb.com/connect/blockchain-api",
292+
permanent: false,
293+
},
274294
...legacyDashboardToTeamRedirects,
275295
];
276296
}

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/cancel-tab.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const CancelTab: React.FC<CancelTabProps> = ({
3131
<TransactionButton
3232
txChainID={contract.chain.id}
3333
transactionCount={1}
34-
isLoading={cancelQuery.isPending}
34+
isPending={cancelQuery.isPending}
3535
onClick={() => {
3636
trackEvent({
3737
category: "marketplace",
@@ -64,8 +64,7 @@ export const CancelTab: React.FC<CancelTabProps> = ({
6464
error: "Failed to cancel",
6565
});
6666
}}
67-
colorScheme="primary"
68-
alignSelf="flex-end"
67+
className="self-end"
6968
>
7069
Cancel {isAuction ? "Auction" : "Listing"}
7170
</TransactionButton>

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,11 +537,10 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
537537
</Button>
538538
<TransactionButton
539539
txChainID={contract.chain.id}
540-
isLoading={isFormLoading}
540+
isPending={isFormLoading}
541541
transactionCount={2}
542542
form={LIST_FORM_ID}
543543
type="submit"
544-
colorScheme="primary"
545544
>
546545
{actionText}
547546
</TransactionButton>

0 commit comments

Comments
 (0)