From ba9040809c09c50cf2a90f1533fec52b16fa8d1a Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 11 Oct 2024 11:55:30 +0300 Subject: [PATCH 1/4] feat: more clear pricing text --- .../OrderEnvironments/OrderEnvironments.tsx | 6 +++--- .../OrderEnvironmentsDialogPricing.tsx | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx index c03cc1234209..3827eee06604 100644 --- a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx +++ b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx @@ -18,9 +18,9 @@ export const OrderEnvironments: FC = () => { 'purchaseAdditionalEnvironments', ); - if (!isPro() || !isPurchaseAdditionalEnvironmentsEnabled) { - return null; - } + // if (!isPro() || !isPurchaseAdditionalEnvironmentsEnabled) { + // return null; + // } const onSubmit = (environments: string[]) => { setPurchaseDialogOpen(false); diff --git a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx index c05596abcbff..38ccdb8388d9 100644 --- a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx +++ b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx @@ -30,6 +30,10 @@ const StyledCardContent = styled(Box)(({ theme }) => ({ padding: theme.spacing(2), })); +const StyledExtraText = styled('div')(({ theme }) => ({ + paddingTop: theme.spacing(2), +})); + export const OrderEnvironmentsDialogPricing: FC< OrderEnvironmentsDialogPricingProps > = ({ pricingOptions }) => ( @@ -55,5 +59,11 @@ export const OrderEnvironmentsDialogPricing: FC< ))} + + + With Pro it is minimum of 5 users, that means an additional + environment would be minimum $50 per month. + + ); From 0b95c7734fcd1600eb7a418d271ff7ed5e275d8e Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 11 Oct 2024 11:56:06 +0300 Subject: [PATCH 2/4] Fix --- .../OrderEnvironments/OrderEnvironments.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx index 3827eee06604..c03cc1234209 100644 --- a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx +++ b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironments.tsx @@ -18,9 +18,9 @@ export const OrderEnvironments: FC = () => { 'purchaseAdditionalEnvironments', ); - // if (!isPro() || !isPurchaseAdditionalEnvironmentsEnabled) { - // return null; - // } + if (!isPro() || !isPurchaseAdditionalEnvironmentsEnabled) { + return null; + } const onSubmit = (environments: string[]) => { setPurchaseDialogOpen(false); From e80235c0923da0cd5acec71f4ac4528b7c1fb0dd Mon Sep 17 00:00:00 2001 From: Jaanus Sellin Date: Fri, 11 Oct 2024 12:07:20 +0300 Subject: [PATCH 3/4] Update frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx Co-authored-by: Tymoteusz Czech <2625371+Tymek@users.noreply.github.com> --- .../OrderEnvironmentsDialogPricing.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx index 38ccdb8388d9..dd950e06d6ba 100644 --- a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx +++ b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx @@ -61,8 +61,8 @@ export const OrderEnvironmentsDialogPricing: FC< ))} - With Pro it is minimum of 5 users, that means an additional - environment would be minimum $50 per month. + With Pro, there is a minimum of 5 users, meaning + an additional environment will cost at least $50 per month. From 1a25708f778666bb77762488635c8302b66f202d Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 11 Oct 2024 12:12:03 +0300 Subject: [PATCH 4/4] Fix --- .../OrderEnvironmentsDialogPricing.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx index dd950e06d6ba..ba4b47937094 100644 --- a/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx +++ b/frontend/src/component/environments/EnvironmentTable/OrderEnvironments/OrderEnvironmentsDialog/OrderEnvironmentsDialogPricing/OrderEnvironmentsDialogPricing.tsx @@ -61,8 +61,8 @@ export const OrderEnvironmentsDialogPricing: FC< ))} - With Pro, there is a minimum of 5 users, meaning - an additional environment will cost at least $50 per month. + With Pro, there is a minimum of 5 users, meaning an additional + environment will cost at least $50 per month.