Skip to content

Commit 0877a70

Browse files
committed
Fixed subscribe button if you’re already github verified
1 parent 255af74 commit 0877a70

File tree

1 file changed

+32
-24
lines changed

1 file changed

+32
-24
lines changed

apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,11 @@ export function TierFree({
425425
subscription.canceledAt === undefined ? (
426426
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen} key="cancel">
427427
<DialogTrigger asChild>
428-
<Button variant="tertiary/large" fullWidth className="text-md my-6 font-medium">
429-
{`Downgrade to ${plan.title}`}
430-
</Button>
428+
<div className="my-6">
429+
<Button variant="tertiary/large" fullWidth className="text-md font-medium">
430+
{`Downgrade to ${plan.title}`}
431+
</Button>
432+
</div>
431433
</DialogTrigger>
432434
<DialogContent className="sm:max-w-md">
433435
<Form action={formAction} method="post" id="subscribe">
@@ -501,27 +503,33 @@ export function TierFree({
501503
</DialogContent>
502504
</Dialog>
503505
) : (
504-
<Button
505-
variant="tertiary/large"
506-
fullWidth
507-
className="text-md my-6 font-medium"
508-
disabled={
509-
isLoading ||
510-
subscription?.plan?.type === plan.type ||
511-
subscription?.canceledAt !== undefined
512-
}
513-
LeadingIcon={
514-
isLoading && navigation.formData?.get("planCode") === null ? Spinner : undefined
515-
}
516-
>
517-
{subscription?.plan === undefined
518-
? "Select plan"
519-
: subscription.plan.type === "free"
520-
? "Current plan"
521-
: subscription.canceledAt !== undefined
522-
? "Current plan"
523-
: "Select plan"}
524-
</Button>
506+
<Form action={formAction} method="post" id="subscribe-verified" className="my-6">
507+
<input type="hidden" name="type" value="free" />
508+
<input type="hidden" name="callerPath" value={location.pathname} />
509+
<Button
510+
variant="tertiary/large"
511+
type="submit"
512+
form="subscribe-verified"
513+
fullWidth
514+
className="text-md font-medium"
515+
disabled={
516+
isLoading ||
517+
subscription?.plan?.type === plan.type ||
518+
subscription?.canceledAt !== undefined
519+
}
520+
LeadingIcon={
521+
isLoading && navigation.formData?.get("planCode") === null ? Spinner : undefined
522+
}
523+
>
524+
{subscription?.plan === undefined
525+
? "Select plan"
526+
: subscription.plan.type === "free"
527+
? "Current plan"
528+
: subscription.canceledAt !== undefined
529+
? "Current plan"
530+
: "Select plan"}
531+
</Button>
532+
</Form>
525533
)}
526534
<ul className="flex flex-col gap-2.5">
527535
<ConcurrentRuns limits={plan.limits} />

0 commit comments

Comments
 (0)