Skip to content

Commit 55caafc

Browse files
authored
Merge branch 'main' into portal-v2
2 parents 2a2fbb0 + 144bb33 commit 55caafc

File tree

69 files changed

+616
-794
lines changed

Some content is hidden

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

69 files changed

+616
-794
lines changed

.changeset/clean-tools-learn.md

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

.changeset/clear-kiwis-rule.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+
Rename otherWallet to allConnectedWallets in autoConnect onConnect callback

.changeset/mean-pants-beam.md

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

apps/dashboard/redirects.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ const projectPageRedirects = [
115115
permanent: false,
116116
source: `${projectRoute}/connect/analytics`,
117117
},
118+
{
119+
destination: `${projectRoute}/gateway/indexer/:path*`,
120+
permanent: false,
121+
source: `${projectRoute}/insight/:path*`,
122+
},
123+
{
124+
destination: `${projectRoute}/gateway/rpc/:path*`,
125+
permanent: false,
126+
source: `${projectRoute}/rpc/:path*`,
127+
},
118128
];
119129

120130
const teamPageRedirects = [

apps/dashboard/src/@/components/misc/AnnouncementBanner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export function AnnouncementBanner() {
4747
return (
4848
<AnnouncementBannerUI
4949
href="https://blog.thirdweb.com/changelog/project-view-update-wallets/"
50-
label="Project View Update - Wallets"
50+
label="Transactions, Vault, and Account Abstraction are now part of Wallets in Project Dashboard. View changes"
5151
trackingLabel="project-view-update-wallets"
5252
/>
5353
);

apps/dashboard/src/@/components/ui/link-with-copy-button.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export function LinkWithCopyButton(props: {
1212
textToCopy: string;
1313
copyTooltip: string;
1414
className?: string;
15+
linkIconClassName?: string;
1516
}) {
1617
const [isCopied, setIsCopied] = useState(false);
1718
const Icon = isCopied ? CheckIcon : CopyIcon;
@@ -37,8 +38,15 @@ export function LinkWithCopyButton(props: {
3738
target="_blank"
3839
className="text-sm text-muted-foreground hover:underline flex items-center gap-1 tabular-nums flex-1 truncate hover:text-foreground group"
3940
>
40-
<span className="max-w-full truncate">{props.textToShow}</span>
41-
<ArrowUpRightIcon className="size-3.5 opacity-70 shrink-0 group-hover:opacity-100" />
41+
<span className="max-w-full truncate tabular-nums">
42+
{props.textToShow}
43+
</span>
44+
<ArrowUpRightIcon
45+
className={cn(
46+
"size-3.5 opacity-70 shrink-0 group-hover:opacity-100",
47+
props.linkIconClassName,
48+
)}
49+
/>
4250
</Link>
4351
</div>
4452
);

apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { ConnectSDKIcon } from "@/icons/ConnectSDKIcon";
22
import { ContractIcon } from "@/icons/ContractIcon";
33
import { EngineIcon } from "@/icons/EngineIcon";
4-
import { InsightIcon } from "@/icons/InsightIcon";
54
import { NebulaIcon } from "@/icons/NebulaIcon";
65
import { PayIcon } from "@/icons/PayIcon";
76
import { RPCIcon } from "@/icons/RPCIcon";
@@ -51,13 +50,6 @@ export const products = [
5150
link: "https://portal.thirdweb.com/payments",
5251
name: "Payments",
5352
},
54-
{
55-
description: "Query and analyze blockchain data",
56-
icon: InsightIcon,
57-
id: "insight",
58-
link: "https://thirdweb.com/insight",
59-
name: "Insight",
60-
},
6153
{
6254
description: "The most powerful AI for interacting with the blockchain",
6355
icon: NebulaIcon,

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/bridge/QuickstartSection.client.tsx

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
"use client";
22

3-
import {
4-
ArrowRightLeftIcon,
5-
BadgeDollarSignIcon,
6-
WebhookIcon,
7-
} from "lucide-react";
3+
import { CodeIcon, WebhookIcon } from "lucide-react";
84
import { FeatureCard } from "../payments/components/FeatureCard.client";
95

106
export function QuickStartSection(props: {
@@ -24,40 +20,43 @@ export function QuickStartSection(props: {
2420
</div>
2521
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
2622
<FeatureCard
27-
title="Cross-chain Swap Tokens"
28-
icon={ArrowRightLeftIcon}
29-
setupTime={5}
23+
title="Buy Widget Component"
24+
icon={CodeIcon}
3025
id="swap_tokens"
31-
features={["Swap any token", "Cross-chain swap"]}
32-
description="Swap tokens cross-chain with dedicated swapping endpoints."
26+
features={[
27+
"React component",
28+
"Cross-chain token swaps across 85+ blockchains",
29+
"Fiat onramp support to buy tokens with credit/debit cards",
30+
"Customizable UI",
31+
]}
32+
description={undefined}
3333
link={{
3434
href: `https://portal.thirdweb.com/bridge/swap`,
35-
label: "Setup Swap",
35+
label: "Get Started",
3636
}}
3737
/>
3838

3939
<FeatureCard
40-
title="Earn Fees"
41-
description="Setup fees to earn any time a user swaps or bridges funds."
42-
icon={BadgeDollarSignIcon}
40+
title="Bridge Widget Script"
41+
description={undefined}
42+
icon={CodeIcon}
4343
id="fees"
44-
setupTime={1}
4544
features={[
46-
"Fees on every purchase",
47-
"Custom percentage",
48-
"Directly to your wallet",
45+
"Integrate with a script tag",
46+
"Cross-chain token swaps across 85+ blockchains",
47+
"Fiat onramp support to buy tokens with credit/debit cards",
48+
"Customizable UI",
4949
]}
5050
link={{
51-
href: `/team/${props.teamSlug}/${props.projectSlug}/settings/payments`,
52-
label: "Configure Fees",
51+
href: `/team/${props.teamSlug}/${props.projectSlug}/bridge/configuration`,
52+
label: "Get Started",
5353
}}
5454
/>
5555

5656
<FeatureCard
5757
title="Webhooks"
5858
description="Create Webhooks to get notified on each purchase or transaction."
5959
icon={WebhookIcon}
60-
setupTime={5}
6160
id="webhooks"
6261
features={["Instant events", "Transaction verification"]}
6362
link={{
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { getAuthToken } from "@/api/auth-token";
33
import { getProject } from "@/api/project/projects";
44
import { getTeamBySlug } from "@/api/team/get-team";
55
import { getFees } from "@/api/universal-bridge/developer";
6+
import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
67
import { getProjectWallet } from "@/lib/server/project-wallet";
78
import { loginRedirect } from "@/utils/redirects";
8-
import { ProjectSettingsBreadcrumb } from "../_components/project-settings-breadcrumb";
9+
import { RouteDiscovery } from "../RouteDiscovery";
910
import { PayConfig } from "./PayConfig";
1011

1112
export default async function Page(props: {
@@ -21,7 +22,7 @@ export default async function Page(props: {
2122
]);
2223

2324
if (!authToken) {
24-
loginRedirect(`/team/${team_slug}/${project_slug}/settings/payments`);
25+
loginRedirect(`/team/${team_slug}/${project_slug}/bridge/configuration`);
2526
}
2627

2728
if (!team) {
@@ -56,14 +57,13 @@ export default async function Page(props: {
5657
};
5758
}
5859

59-
return (
60-
<div className="flex flex-col gap-5">
61-
<ProjectSettingsBreadcrumb
62-
teamSlug={team_slug}
63-
projectSlug={project_slug}
64-
page="Payments"
65-
/>
60+
const client = getClientThirdwebClient({
61+
jwt: authToken,
62+
teamId: project.teamId,
63+
});
6664

65+
return (
66+
<div className="flex flex-col gap-6">
6767
<PayConfig
6868
fees={fees}
6969
project={project}
@@ -72,6 +72,8 @@ export default async function Page(props: {
7272
teamSlug={team_slug}
7373
authToken={authToken}
7474
/>
75+
76+
<RouteDiscovery client={client} project={project} />
7577
</div>
7678
);
7779
}

0 commit comments

Comments
 (0)