Skip to content

Commit 190f358

Browse files
committed
merge main
2 parents fc4a4ac + 9546b92 commit 190f358

File tree

158 files changed

+2670
-1274
lines changed

Some content is hidden

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

158 files changed

+2670
-1274
lines changed

.changeset/loud-clocks-begin.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
---
4+
5+
update nebula ratelimit type

.changeset/ninety-heads-work.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
---
4+
5+
update error response url

apps/dashboard/src/app/(app)/login/auth-actions.ts renamed to apps/dashboard/src/@/actions/auth-actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
1212
import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
1313
import { API_SERVER_SECRET } from "@/constants/server-envs";
1414
import { isVercel } from "@/utils/vercel";
15-
import { verifyTurnstileToken } from "./verifyTurnstileToken";
15+
import { verifyTurnstileToken } from "../../app/login/verifyTurnstileToken";
1616

1717
export async function getLoginPayload(
1818
params: GenerateLoginPayloadParams,

apps/dashboard/src/@/components/connect-wallet/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use client";
22

33
import { useFavoriteChainIds } from "@app/(dashboard)/(chain)/components/client/star-button";
4-
import { doLogout } from "@app/login/auth-actions";
54
import Image from "next/image";
65
import Link from "next/link";
76
import { usePathname } from "next/navigation";
@@ -14,6 +13,7 @@ import {
1413
useActiveAccount,
1514
useConnectModal,
1615
} from "thirdweb/react";
16+
import { doLogout } from "@/actions/auth-actions";
1717
import { resetAnalytics } from "@/analytics/reset";
1818
import { CustomChainRenderer } from "@/components/misc/CustomChainRenderer";
1919
import { LazyConfigureNetworkModal } from "@/components/misc/configure-networks/LazyConfigureNetworkModal";

apps/dashboard/src/@/storybook/stubs.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ export function teamStub(id: string, billingPlan: Team["billingPlan"]): Team {
5757
},
5858
nebula: {
5959
enabled: true,
60-
rateLimit: 1000,
60+
rateLimit: {
61+
perSecond: 1000,
62+
perMinute: 1000,
63+
},
6164
},
6265
pay: {
6366
enabled: true,

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/chain-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { ThirdwebClient } from "thirdweb";
33
import type { ChainMetadata } from "thirdweb/chains";
44
import { Button } from "@/components/ui/button";
55
import { cn } from "@/lib/utils";
6-
import { mapV4ChainToV5Chain } from "../../../../../../../../@/utils/map-chains";
6+
import { mapV4ChainToV5Chain } from "@/utils/map-chains";
77
import { ChainIcon } from "../../../../components/server/chain-icon";
88
import { AddChainToWallet } from "../client/add-chain-to-wallet";
99

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
DropdownMenuTrigger,
2020
} from "@/components/ui/dropdown-menu";
2121
import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
22-
import { mapV4ChainToV5Chain } from "../../../../../../@/utils/map-chains";
22+
import { mapV4ChainToV5Chain } from "@/utils/map-chains";
2323
import { TeamHeader } from "../../../../team/components/TeamHeader/team-header";
2424
import { StarButton } from "../../components/client/star-button";
2525
import { getChain, getChainMetadata } from "../../utils";

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractFromParams.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { getAddress, getContract, isAddress } from "thirdweb";
22
import { localhost } from "thirdweb/chains";
3+
import { getUserThirdwebClient } from "@/api/auth-token";
34
import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
45
import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
6+
import { fetchChainWithLocalOverrides } from "@/utils/fetchChainWithLocalOverrides";
57
import { mapV4ChainToV5Chain } from "@/utils/map-chains";
6-
import { getUserThirdwebClient } from "../../../../../../../@/api/auth-token";
7-
import { fetchChainWithLocalOverrides } from "../../../../../../../@/utils/fetchChainWithLocalOverrides";
88

99
export async function getContractPageParamsInfo(params: {
1010
contractAddress: string;

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/shared-nfts-token-page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { notFound, redirect } from "next/navigation";
2-
import { getAuthTokenWalletAddress } from "../../../../../../../../@/api/auth-token";
2+
import { getAuthTokenWalletAddress } from "@/api/auth-token";
33
import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
44
import { redirectToContractLandingPage } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/utils";
55
import { buildContractPagePath } from "../../_utils/contract-page-path";

0 commit comments

Comments
 (0)