Fixes

twentyhq · Jun 28, 2024 · 7eb4159 · 7eb4159
1 parent fc4e75f
commit 7eb4159
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx b/packages/twenty-front/src/modules/ui/display/info/components/Info.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import { useNavigate } from 'react-router-dom';
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { IconInfoCircle } from 'twenty-ui';
 
+import { AppPath } from '@/types/AppPath';
 import { Button } from '@/ui/input/button/components/Button';
 
 export type InfoAccent = 'blue' | 'danger';
@@ -11,6 +13,7 @@ export type InfoProps = {
   text: string;
   buttonTitle?: string;
   onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  navigateTo?: AppPath;
 };
 
 const StyledTextContainer = styled.div`
@@ -51,18 +54,20 @@ export const Info = ({
   text,
   buttonTitle,
   onClick,
+  navigateTo,
 }: InfoProps) => {
   const theme = useTheme();
+  const navigate = useNavigate();
   return (
     <StyledInfo accent={accent}>
       <StyledTextContainer>
         <StyledIconInfoCircle size={theme.icon.size.md} />
         {text}
       </StyledTextContainer>
-      {buttonTitle && onClick && (
+      {buttonTitle && (onClick || navigateTo) && (
         <Button
           title={buttonTitle}
-          onClick={onClick}
+          onClick={navigateTo ? () => navigate(navigateTo) : onClick}
           size={'small'}
           variant={'secondary'}
           accent={accent}

diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -1,14 +1,17 @@
 import React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
 import { IconCheck, RGBA } from 'twenty-ui';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
+import { currentUserState } from '@/auth/states/currentUserState';
 import { AppPath } from '@/types/AppPath';
 import { MainButton } from '@/ui/input/button/components/MainButton';
 import { UndecoratedLink } from '@/ui/navigation/link/components/UndecoratedLink';
 import { AnimatedEaseIn } from '@/ui/utilities/animation/components/AnimatedEaseIn';
+import { OnboardingStatus } from '~/generated/graphql';
 
 const StyledCheckContainer = styled.div`
   align-items: center;
@@ -29,8 +32,14 @@ const StyledButtonContainer = styled.div`
 
 export const PaymentSuccess = () => {
   const theme = useTheme();
+  const currentUser = useRecoilValue(currentUserState);
   const color =
     theme.name === 'light' ? theme.grayScale.gray90 : theme.grayScale.gray10;
+
+  if (currentUser?.onboardingStatus === OnboardingStatus.Completed) {
+    return <></>;
+  }
+
   return (
     <>
       <AnimatedEaseIn>

diff --git a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
@@ -116,10 +116,6 @@ export const SettingsBilling = () => {
     }
   };
 
-  const openPlanRequired = () => {
-    window.location.replace(AppPath.PlanRequired);
-  };
-
   const openSwitchingIntervalModal = () => {
     setIsSwitchingIntervalModalOpen(true);
   };
@@ -168,15 +164,15 @@ export const SettingsBilling = () => {
             text={'Subscription canceled. Please start a new one'}
             buttonTitle={'Subscribe'}
             accent={'danger'}
-            onClick={openPlanRequired}
+            navigateTo={AppPath.PlanRequired}
           />
         )}
         {displaySubscribeInfo ? (
           <Info
             text={'Your workspace does not have an active subscription'}
             buttonTitle={'Subscribe'}
             accent={'danger'}
-            onClick={openPlanRequired}
+            navigateTo={AppPath.PlanRequired}
           />
         ) : (
           <>