From 057d0a6c60b17e27fbbfb6d9f3fc04a9351bfc75 Mon Sep 17 00:00:00 2001 From: Alex Moldovan Date: Wed, 25 Oct 2023 16:45:40 +0000 Subject: [PATCH] various fixes for pricing and message stripes --- .../shared/RestrictedPublicReposImport.tsx | 22 +++++++++---------- .../src/app/pages/Dashboard/Sidebar/index.tsx | 7 ------ .../legacy-pages/WorkspacePlanSelection.tsx | 3 +-- .../MessageStripe/MessageStripe.stories.tsx | 16 ++------------ .../MessageStripe/MessageStripe.tsx | 2 +- 5 files changed, 14 insertions(+), 36 deletions(-) diff --git a/packages/app/src/app/pages/Dashboard/Components/shared/RestrictedPublicReposImport.tsx b/packages/app/src/app/pages/Dashboard/Components/shared/RestrictedPublicReposImport.tsx index 4e07a915ce4..e9f8aec4b5d 100644 --- a/packages/app/src/app/pages/Dashboard/Components/shared/RestrictedPublicReposImport.tsx +++ b/packages/app/src/app/pages/Dashboard/Components/shared/RestrictedPublicReposImport.tsx @@ -15,20 +15,18 @@ export const RestrictedPublicReposImport: React.FC<{ variant="warning" > Adjust your GitHub permissions to access your repositories. - signInGithubClicked('public_repos')} + > + Allow public repositories + + signInGithubClicked('private_repos')} - loading={isLoadingGithub} - options={ - signInGithubClicked('public_repos')} - > - Access only public repositories - - } + disabled={isLoadingGithub} > - Access all repositories - + Allow all repositories + ); }; diff --git a/packages/app/src/app/pages/Dashboard/Sidebar/index.tsx b/packages/app/src/app/pages/Dashboard/Sidebar/index.tsx index abd8aaf9dc5..e2e92fcd184 100644 --- a/packages/app/src/app/pages/Dashboard/Sidebar/index.tsx +++ b/packages/app/src/app/pages/Dashboard/Sidebar/index.tsx @@ -201,13 +201,6 @@ export const Sidebar: React.FC = ({ icon="sharing" /> - - {showRespositories && ( <> diff --git a/packages/app/src/app/pages/Pro/legacy-pages/WorkspacePlanSelection.tsx b/packages/app/src/app/pages/Pro/legacy-pages/WorkspacePlanSelection.tsx index 6d19818dcf4..e0024c17395 100644 --- a/packages/app/src/app/pages/Pro/legacy-pages/WorkspacePlanSelection.tsx +++ b/packages/app/src/app/pages/Pro/legacy-pages/WorkspacePlanSelection.tsx @@ -77,9 +77,8 @@ export const WorkspacePlanSelection: React.FC = () => { return null; } - const multiplier = isYearlyInterval ? 12 : 1; const quantity = options?.perEditor ? 1 : subscription.quantity; - const price = quantity * subscription.unitPrice * multiplier; + const price = quantity * subscription.unitPrice; // A Paddle subscription returns the currency in uppercase EUR. A Stripe // subscription returns the currency in lowercase usd. The formatCurrency diff --git a/packages/components/src/components/MessageStripe/MessageStripe.stories.tsx b/packages/components/src/components/MessageStripe/MessageStripe.stories.tsx index 7c8f3dca637..7031b106bfd 100644 --- a/packages/components/src/components/MessageStripe/MessageStripe.stories.tsx +++ b/packages/components/src/components/MessageStripe/MessageStripe.stories.tsx @@ -73,19 +73,7 @@ export const OnDismissWithActionSpaceBetween = () => ( export const WithMultipleActions = () => ( {}}> Adjust your GitHub permissions to access your repositories. - - {}}> - Access all repositories - - {}}> - Access only public repositories - - - } - > - Review GitHub permissions - + Option 1 + Option 2 ); diff --git a/packages/components/src/components/MessageStripe/MessageStripe.tsx b/packages/components/src/components/MessageStripe/MessageStripe.tsx index 6c9963c15e5..140a014528e 100644 --- a/packages/components/src/components/MessageStripe/MessageStripe.tsx +++ b/packages/components/src/components/MessageStripe/MessageStripe.tsx @@ -103,7 +103,7 @@ const MessageStripe = ({ } return ( - + {child} );