Create ReportUtils.isOldDotConciergeChat function

Expensify · Jan 15, 2024 · 020a22b · 020a22b
1 parent 23012c7
commit 020a22b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -831,6 +831,14 @@ function isConciergeChatReport(report: OnyxEntry<Report>): boolean {
     return report?.participantAccountIDs?.length === 1 && Number(report.participantAccountIDs?.[0]) === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report);
 }
 
+/**
+ * Only returns true if this is a DM report with Concierge, opened from OldDot
+ */
+function isOldDotConciergeChat(initialURL: string, report: OnyxEntry<Report>): boolean {
+
+    return report?.participantAccountIDs?.length === 1 && Number(report.participantAccountIDs?.[0]) === CONST.ACCOUNT_ID.CONCIERGE;
+}
+
 /**
  * Returns true if report is still being processed
  */
@@ -4432,6 +4440,7 @@ export {
     isPublicRoom,
     isPublicAnnounceRoom,
     isConciergeChatReport,
+    isOldDotConciergeChat,
     isProcessingReport,
     isCurrentUserTheOnlyParticipant,
     hasAutomatedExpensifyAccountIDs,

diff --git a/src/libs/SessionUtils.ts b/src/libs/SessionUtils.ts
@@ -53,9 +53,4 @@ function didUserLogInDuringSession() {
     return Boolean(loggedInDuringSession);
 }
 
-function didSessionStartAsOldDotConcierge(initialURL: string) {
-    console.debug("CRISTIII - " + initialURL);
-    return Boolean(true);
-}
-
-export {isLoggingInAsNewUser, didUserLogInDuringSession, resetDidUserLogInDuringSession, didSessionStartAsOldDotConcierge};
+export {isLoggingInAsNewUser, didUserLogInDuringSession, resetDidUserLogInDuringSession};
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -44,7 +44,6 @@ import reportActionPropTypes from './report/reportActionPropTypes';
 import ReportActionsView from './report/ReportActionsView';
 import ReportFooter from './report/ReportFooter';
 import {ActionListContext, ReactionListContext} from './ReportScreenContext';
-import * as SessionUtils from '@libs/SessionUtils';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -353,7 +352,7 @@ function ReportScreen({
         Performance.markEnd(CONST.TIMING.CHAT_RENDER);
 
         Linking.getInitialURL().then((url) => {
-            isOldDotConciergeRef.current = SessionUtils.didSessionStartAsOldDotConcierge(url);
+            isOldDotConciergeRef.current = ReportUtils.isOldDotConciergeChat(url, report);
         });
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);