various fixes for pricing and message stripes

codesandbox · Oct 25, 2023 · 057d0a6 · 057d0a6
1 parent a6372cd
commit 057d0a6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 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
@@ -15,20 +15,18 @@ export const RestrictedPublicReposImport: React.FC<{
       variant="warning"
     >
       Adjust your GitHub permissions to access your repositories.
-      <MessageStripe.MultiActions
+      <MessageStripe.Action
+        disabled={isLoadingGithub}
+        onClick={() => signInGithubClicked('public_repos')}
+      >
+        Allow public repositories
+      </MessageStripe.Action>
+      <MessageStripe.Action
         onClick={() => signInGithubClicked('private_repos')}
-        loading={isLoadingGithub}
-        options={
-          <MessageStripe.MultiActionsItem
-            disabled={isLoadingGithub}
-            onSelect={() => signInGithubClicked('public_repos')}
-          >
-            Access only public repositories
-          </MessageStripe.MultiActionsItem>
-        }
+        disabled={isLoadingGithub}
       >
-        Access all repositories
-      </MessageStripe.MultiActions>
+        Allow all repositories
+      </MessageStripe.Action>
     </MessageStripe>
   );
 };
diff --git 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<SidebarProps> = ({
             icon="sharing"
           />
 
-          <RowItem
-            name="Likes"
-            page="liked"
-            path={dashboardUrls.liked(activeTeam)}
-            icon="heart"
-          />
-
           {showRespositories && (
             <>
               <Element marginTop={4} />

diff --git 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
@@ -73,19 +73,7 @@ export const OnDismissWithActionSpaceBetween = () => (
 export const WithMultipleActions = () => (
   <MessageStripe variant="warning" justify="space-between" onDismiss={() => {}}>
     Adjust your GitHub permissions to access your repositories.
-    <MessageStripe.MultiActions
-      options={
-        <>
-          <MessageStripe.MultiActionsItem onSelect={() => {}}>
-            Access all repositories
-          </MessageStripe.MultiActionsItem>
-          <MessageStripe.MultiActionsItem onSelect={() => {}}>
-            Access only public repositories
-          </MessageStripe.MultiActionsItem>
-        </>
-      }
-    >
-      Review GitHub permissions
-    </MessageStripe.MultiActions>
+    <MessageStripe.Action>Option 1</MessageStripe.Action>
+    <MessageStripe.Action>Option 2</MessageStripe.Action>
   </MessageStripe>
 );
diff --git a/packages/components/src/components/MessageStripe/MessageStripe.tsx b/packages/components/src/components/MessageStripe/MessageStripe.tsx
@@ -103,7 +103,7 @@ const MessageStripe = ({
     }
 
     return (
-      <Text size={13} lineHeight="16px">
+      <Text size={13} css={{ flexGrow: 1 }} lineHeight="16px">
         {child}
       </Text>
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,7 +103,7 @@ const MessageStripe = ({ @@
         }
         return (
-          <Text size={13} lineHeight="16px">
+          <Text size={13} css={{ flexGrow: 1 }} lineHeight="16px">
             {child}
           </Text>
         );
@@ Expand Down @@