Skip to content

Commit 723702c

Browse files
authored
Merge branch 'main' into pr/thirdweb-nebula-package
2 parents df21293 + ffea73c commit 723702c

File tree

20 files changed

+331
-256
lines changed

20 files changed

+331
-256
lines changed

.changeset/quick-foxes-raise.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+
Use decimal string for BuyWidget amount

.changeset/spicy-cooks-smoke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": minor
3+
---
4+
5+
add berachain and berachain testnet in chains package

apps/dashboard/src/@/components/blocks/pricing-card.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,8 @@ export const PricingCard: React.FC<PricingCardProps> = ({
6060
const remainingTrialDays =
6161
(activeTrialEndsAt ? remainingDays(activeTrialEndsAt) : 0) || 0;
6262

63-
// if the team has just signed up and has not subscribed yet, and the billing plan is growth, then they get a 7 day trial
64-
const has7DayTrial =
65-
remainingTrialDays === 0 &&
66-
billingStatus === "noPayment" &&
67-
billingPlan === "growth";
63+
// trials are disabled for now
64+
const has7DayTrial = false;
6865

6966
return (
7067
<div

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/buy-edition-drop/buy-edition-drop.client.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
184184

185185
return (
186186
<Form {...form}>
187-
<form className="space-y-5" onSubmit={handleSubmit}>
187+
<form className="space-y-4" onSubmit={handleSubmit}>
188188
<FormField
189189
control={form.control}
190190
name="amount"
@@ -215,7 +215,7 @@ export function BuyEditionDrop(props: BuyEditionDropProps) {
215215
}
216216
}
217217
}}
218-
className="!text-2xl h-auto bg-muted/50 font-bold"
218+
className="bg-muted/50"
219219
/>
220220
</FormControl>
221221
<FormMessage />

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,18 @@ function RenderClaimConditionInfo(props: {
282282
enabled: !props.isSkeleton,
283283
});
284284

285+
const noClaimConditionSet = !claimCondition.isPending && !claimCondition.data;
286+
287+
if (noClaimConditionSet) {
288+
return (
289+
<div>
290+
<p className="text-muted-foreground text-sm">
291+
Not available for purchase
292+
</p>
293+
</div>
294+
);
295+
}
296+
285297
return (
286298
<div className="flex flex-col items-start gap-0.5">
287299
<div className="flex items-center gap-1.5">

0 commit comments

Comments
 (0)