Skip to content

Commit 1247bed

Browse files
authored
Merge branch 'main' into yash/add-berachain
2 parents d3fc3f5 + 167f921 commit 1247bed

File tree

312 files changed

+14590
-4779
lines changed

Some content is hidden

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

312 files changed

+14590
-4779
lines changed

.changeset/better-owls-flash.md

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

.changeset/fluffy-paws-slide.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+
Fix setting explicit amount on TransactionWidget

.changeset/icy-eyes-show.md

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

.changeset/weak-papayas-occur.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+
Fix etherlink transfers when too little funds

.changeset/whole-ends-like.md

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

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
49+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
5050
with:
5151
languages: ${{ matrix.language }}
5252
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
5959
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6060
# If this step fails, then you should remove it and run the build manually (see below)
6161
- name: Autobuild
62-
uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
62+
uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
6363

6464
# ℹ️ Command-line programs to run using the OS shell.
6565
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,4 +72,4 @@ jobs:
7272
# ./location_of_script_within_repo/buildscript.sh
7373

7474
- name: Perform CodeQL Analysis
75-
uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
75+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0

apps/dashboard/.env.example

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ NEXT_PUBLIC_STRIPE_KEY=
4444

4545
NEXT_PUBLIC_STRIPE_PAYMENT_METHOD_CFG_ID=
4646

47-
# Needed for contract analytics / blockchain data information
48-
CHAINSAW_API_KEY=
49-
5047
#
5148
# Private (server)
5249
#
@@ -65,17 +62,11 @@ MORALIS_API_KEY=
6562
# - not required to build (unless testing wallet NFTs)>
6663
SSR_ALCHEMY_KEY=
6764

68-
# beehiiv.com API key (used for newsletter signups)
69-
# - not required to build (unless testing newsletter signups)>
70-
BEEHIIV_API_KEY=
7165

7266
# Hubspot Access Token (used for contact us form)
7367
# - not required to build (unless testing contact us form)>
7468
HUBSPOT_ACCESS_TOKEN=
7569

76-
# Github API Token (used for /open-source)
77-
GITHUB_API_TOKEN="ghp_..."
78-
7970
# Upload server url
8071
NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER="https://storage.thirdweb-preview.com"
8172

@@ -100,8 +91,6 @@ REDIS_URL=""
10091

10192
ANALYTICS_SERVICE_URL=""
10293

103-
# Required for Nebula Chat
104-
NEXT_PUBLIC_NEBULA_URL=""
10594

10695
# required for billing parts of the dashboard (team -> settings -> billing / invoices)
10796
STRIPE_SECRET_KEY=""

apps/dashboard/framer-rewrites.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ module.exports = [
66
"/bounties",
77
"/contact-us",
88
// -- product landing pages --
9-
// -- connect
10-
"/connect",
11-
"/connect/sign-in",
12-
"/connect/account-abstraction",
13-
"/connect/universal-bridge",
14-
"/connect/auth",
15-
"/connect/in-app-wallets",
9+
// -- build category
10+
"/wallets",
11+
"/account-abstraction",
12+
"/universal-bridge",
13+
"/auth",
14+
"/in-app-wallets",
15+
"/transactions",
16+
// -- end build category
1617
// -- storage
1718
"/storage",
1819
// -- nebula
@@ -24,8 +25,7 @@ module.exports = [
2425
"/contracts/modular-contracts",
2526
"/contracts/explore",
2627
"/contracts/deployment-tool",
27-
// -- engine
28-
"/engine",
28+
2929
// -- solutions pages --
3030
"/solutions/:solution_slug",
3131
// -- campaigns --

apps/dashboard/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@radix-ui/react-switch": "^1.2.5",
4747
"@radix-ui/react-tooltip": "1.2.7",
4848
"@scalar/api-reference-react": "^0.6.19",
49-
"@sentry/nextjs": "9.28.1",
49+
"@sentry/nextjs": "9.29.0",
5050
"@shazow/whatsabi": "0.22.2",
5151
"@tanstack/react-query": "5.80.7",
5252
"@tanstack/react-table": "^8.21.3",
@@ -62,7 +62,6 @@
6262
"compare-versions": "^6.1.0",
6363
"date-fns": "4.1.0",
6464
"fast-xml-parser": "^5.2.5",
65-
"fetch-event-stream": "0.1.5",
6665
"flat": "^6.0.1",
6766
"framer-motion": "12.17.0",
6867
"fuse.js": "7.1.0",

apps/dashboard/redirects.js

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ async function redirects() {
213213
{
214214
source: "/cli/login",
215215
destination:
216-
"https://support.thirdweb.com/troubleshooting-errors/7Y1BqKNvtLdBv5fZkRZZB3/issue-linking-device-on-the-authorization-page-via-thirdweb-cli/cn9LRA3ax7XCP6uxwRYdvx",
216+
"https://portal.thirdweb.com/knowledge-base/onchain-common-errors/thirdweb-cli/device-link-error",
217217
permanent: false,
218218
},
219219

@@ -238,11 +238,6 @@ async function redirects() {
238238
destination: "/contracts/explore",
239239
permanent: false,
240240
},
241-
{
242-
source: "/build",
243-
destination: "/contracts/modular-contracts",
244-
permanent: false,
245-
},
246241
{
247242
source: "/ui-components",
248243
destination: "/sdk",
@@ -319,28 +314,10 @@ async function redirects() {
319314
destination: "/templates/:slug",
320315
permanent: false,
321316
},
322-
// redirect /account-abstraction to /connect/account-abstraction
323-
{
324-
source: "/account-abstraction",
325-
destination: "/connect/account-abstraction",
326-
permanent: false,
327-
},
328-
// redirect /connect/pay to /connect/universal-bridge
317+
// redirect /connect/pay to /universal-bridge
329318
{
330319
source: "/connect/pay",
331-
destination: "/connect/universal-bridge",
332-
permanent: false,
333-
},
334-
// redirect /auth to /connect/auth
335-
{
336-
source: "/auth",
337-
destination: "/connect/auth",
338-
permanent: false,
339-
},
340-
// redirect /in-app-wallets to /connect/in-app-wallets
341-
{
342-
source: "/in-app-wallets",
343-
destination: "/connect/in-app-wallets",
320+
destination: "/universal-bridge",
344321
permanent: false,
345322
},
346323
// PREVIOUS CAMPAIGNS
@@ -374,6 +351,37 @@ async function redirects() {
374351
destination: "/superchain",
375352
permanent: false,
376353
},
354+
// connect -> build redirects
355+
{
356+
source: "/connect",
357+
destination: "/wallets",
358+
permanent: false,
359+
},
360+
{
361+
source: "/connect/account-abstraction",
362+
destination: "/account-abstraction",
363+
permanent: false,
364+
},
365+
{
366+
source: "/connect/universal-bridge",
367+
destination: "/universal-bridge",
368+
permanent: false,
369+
},
370+
{
371+
source: "/connect/auth",
372+
destination: "/auth",
373+
permanent: false,
374+
},
375+
{
376+
source: "/connect/in-app-wallets",
377+
destination: "/in-app-wallets",
378+
permanent: false,
379+
},
380+
{
381+
source: "/engine",
382+
destination: "/transactions",
383+
permanent: false,
384+
},
377385

378386
...legacyDashboardToTeamRedirects,
379387
];

0 commit comments

Comments
 (0)