@@ -30,7 +30,7 @@ import Performance from '@libs/Performance';
30
30
import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager' ;
31
31
import {
32
32
isAdminRoom ,
33
- isChatUsedForOnboarding ,
33
+ isChatUsedForOnboarding as isChatUsedForOnboardingReportUtils ,
34
34
isConciergeChatReport ,
35
35
isGroupChat ,
36
36
isOneOnOneChat ,
@@ -62,7 +62,8 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
62
62
const session = useSession ( ) ;
63
63
const shouldShowWokspaceChatTooltip = isPolicyExpenseChat ( report ) && activePolicyID === report ?. policyID && session ?. accountID === report ?. ownerAccountID ;
64
64
const isOnboardingGuideAssigned = introSelected ?. choice === CONST . ONBOARDING_CHOICES . MANAGE_TEAM && ! session ?. email ?. includes ( '+' ) ;
65
- const shouldShowGetStartedTooltip = isOnboardingGuideAssigned ? isAdminRoom ( report ) : isConciergeChatReport ( report ) ;
65
+ const isChatUsedForOnboarding = isChatUsedForOnboardingReportUtils ( report , introSelected ?. choice ) ;
66
+ const shouldShowGetStartedTooltip = isOnboardingGuideAssigned ? isAdminRoom ( report ) && isChatUsedForOnboarding : isConciergeChatReport ( report ) ;
66
67
const isActiveRouteHome = useIsCurrentRouteHome ( ) ;
67
68
68
69
const { tooltipToRender, shouldShowTooltip} = useMemo ( ( ) => {
@@ -76,9 +77,6 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
76
77
77
78
const { shouldShowProductTrainingTooltip, renderProductTrainingTooltip, hideProductTrainingTooltip} = useProductTrainingContext ( tooltipToRender , shouldShowTooltip ) ;
78
79
79
- // During the onboarding flow, the introSelected NVP is not yet available.
80
- const [ onboardingPurposeSelected ] = useOnyx ( ONYXKEYS . ONBOARDING_PURPOSE_SELECTED ) ;
81
-
82
80
const { translate} = useLocalize ( ) ;
83
81
const [ isContextMenuActive , setIsContextMenuActive ] = useState ( false ) ;
84
82
@@ -283,7 +281,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
283
281
isSystemChat ( report )
284
282
}
285
283
/>
286
- { isChatUsedForOnboarding ( report , onboardingPurposeSelected ) && < FreeTrial badgeStyles = { [ styles . mnh0 , styles . pl2 , styles . pr2 , styles . ml1 ] } /> }
284
+ { isChatUsedForOnboarding && < FreeTrial badgeStyles = { [ styles . mnh0 , styles . pl2 , styles . pr2 , styles . ml1 ] } /> }
287
285
{ isStatusVisible && (
288
286
< Tooltip
289
287
text = { statusContent }
0 commit comments