Skip to content

Commit 64b08db

Browse files
committed
made periodEnd required
1 parent 300f14a commit 64b08db

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
3737

3838
const currentPlan = await getCurrentPlan(organization.id);
3939

40-
return typedjson({ ...plans, ...currentPlan, organizationSlug });
40+
const periodEnd = new Date();
41+
periodEnd.setMonth(periodEnd.getMonth() + 1);
42+
43+
return typedjson({ ...plans, ...currentPlan, organizationSlug, periodEnd });
4144
}
4245

4346
export default function ChoosePlanPage() {
44-
const { plans, v3Subscription, organizationSlug } = useTypedLoaderData<typeof loader>();
47+
const { plans, v3Subscription, organizationSlug, periodEnd } =
48+
useTypedLoaderData<typeof loader>();
4549

4650
return (
4751
<MainCenteredContainer className="flex max-w-[80rem] flex-col items-center gap-8 p-3">
@@ -52,6 +56,7 @@ export default function ChoosePlanPage() {
5256
organizationSlug={organizationSlug}
5357
hasPromotedPlan
5458
showGithubVerificationBadge
59+
periodEnd={periodEnd}
5560
/>
5661
</MainCenteredContainer>
5762
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ type PricingPlansProps = {
252252
organizationSlug: string;
253253
hasPromotedPlan: boolean;
254254
showGithubVerificationBadge?: boolean;
255-
periodEnd?: Date;
255+
periodEnd: Date;
256256
};
257257

258258
export function PricingPlans({
@@ -271,7 +271,7 @@ export function PricingPlans({
271271
subscription={subscription}
272272
organizationSlug={organizationSlug}
273273
showGithubVerificationBadge={showGithubVerificationBadge}
274-
periodEnd={periodEnd ?? new Date()}
274+
periodEnd={periodEnd}
275275
/>
276276
<TierHobby
277277
plan={plans.hobby}

0 commit comments

Comments
 (0)