Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add trial expired warning for enterprise #3997

Merged
merged 1 commit into from
Jun 16, 2023

Conversation

ivarconr
Copy link
Member

Adds the trial expired warning for enterprise as well.

@ivarconr ivarconr requested a review from nunogois June 16, 2023 10:16
@vercel
Copy link

vercel bot commented Jun 16, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
unleash-monorepo-frontend ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 16, 2023 10:17am
1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
unleash-docs ⬜️ Ignored (Inspect) Jun 16, 2023 10:17am

@@ -104,7 +104,7 @@ export const InstanceStatus: FC = ({ children }) => {
return (
<>
<ConditionallyRender
condition={isBilling && Boolean(instanceStatus)}
condition={Boolean(instanceStatus)}
Copy link
Member

@nunogois nunogois Jun 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understood this correctly, we want isBilling to only represent plans that we show the billing page for (invoices, etc). That's why we removed it from this condition and have not added ENTERPRISE to the billing plans.

I think this is a safe change, both the bar and the dialog should only get displayed in case we have specific information from the instance status (e.g. has expired).

I would recommend removing isBilling from the destructor above since it's now unused.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend removing isBilling from the destructor above since it's now unused.

Yes!

@@ -82,6 +82,7 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
[InstancePlan.PRO]: 80,
[InstancePlan.COMPANY]: 0,
[InstancePlan.TEAM]: 0,
[InstancePlan.ENTERPRISE]: 0,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to https://github.com/Unleash/unleash/pull/3997/files#r1232089348 I don't think we need this.

Suggested change
[InstancePlan.ENTERPRISE]: 0,

Copy link
Member

@nunogois nunogois left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, added a few comments.

@ivarconr ivarconr merged commit dcac61e into main Jun 16, 2023
19 checks passed
@ivarconr ivarconr deleted the fix/add-trial-warning-for-enterprise branch June 16, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants