@@ -12,20 +12,17 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
1212import useEnvironment from '@hooks/useEnvironment' ;
1313import { useMemoizedLazyExpensifyIcons } from '@hooks/useLazyAsset' ;
1414import useLocalize from '@hooks/useLocalize' ;
15- import useOnyx from '@hooks/useOnyx' ;
1615import useStyleUtils from '@hooks/useStyleUtils' ;
1716import useTheme from '@hooks/useTheme' ;
1817import useThemeStyles from '@hooks/useThemeStyles' ;
1918import DateUtils from '@libs/DateUtils' ;
2019import { shouldUseBoldText } from '@libs/OptionsListUtils' ;
21- import { isChatUsedForOnboarding as isChatUsedForOnboardingReportUtils } from '@libs/ReportUtils' ;
22- import FreeTrial from '@pages/settings/Subscription/FreeTrial' ;
2320import variables from '@styles/variables' ;
2421import CONST from '@src/CONST' ;
25- import ONYXKEYS from '@src/ONYXKEYS' ;
2622import DescriptiveText from './OptionRow/DescriptiveText' ;
2723import DraftIndicator from './OptionRow/DraftIndicator' ;
2824import ErrorBadge from './OptionRow/ErrorBadge' ;
25+ import OnboardingBadge from './OptionRow/OnboardingBadge' ;
2926import Subtitle from './OptionRow/Subtitle' ;
3027import Title from './OptionRow/Title' ;
3128import OptionRowAvatar from './OptionRowAvatar' ;
@@ -41,9 +38,7 @@ function OptionRowLHN({isOptionFocused = false, onSelectRow = () => {}, optionIt
4138 const StyleUtils = useStyleUtils ( ) ;
4239 const expensifyIcons = useMemoizedLazyExpensifyIcons ( [ 'Pin' ] ) ;
4340
44- const { onboardingPurpose, onboarding, isScreenFocused} = useLHNTooltipContext ( ) ;
45- const [ conciergeReportID ] = useOnyx ( ONYXKEYS . CONCIERGE_REPORT_ID ) ;
46- const isChatUsedForOnboarding = isChatUsedForOnboardingReportUtils ( optionItem , onboarding , conciergeReportID , onboardingPurpose ) ;
41+ const { isScreenFocused} = useLHNTooltipContext ( ) ;
4742
4843 const { translate} = useLocalize ( ) ;
4944 const currentUserPersonalDetails = useCurrentUserPersonalDetails ( ) ;
@@ -135,7 +130,7 @@ function OptionRowLHN({isOptionFocused = false, onSelectRow = () => {}, optionIt
135130 displayNameStyle = { displayNameStyle }
136131 testID = { testID }
137132 />
138- { isChatUsedForOnboarding && < FreeTrial badgeStyles = { [ styles . mnh0 , styles . pl2 , styles . pr2 , styles . ml1 , styles . flexShrink1 ] } /> }
133+ < OnboardingBadge optionItem = { optionItem } />
139134 { isStatusVisible && (
140135 < Tooltip
141136 text = { statusContent }
0 commit comments