From 4c92345af6aeaa36e8abc2e1a780903be4b78500 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Thu, 19 Dec 2024 16:33:51 +0700
Subject: [PATCH 1/4] Add Guide booking link to #admins header

---
 src/languages/en.ts           |  1 +
 src/languages/es.ts           |  1 +
 src/pages/home/HeaderView.tsx | 28 +++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 457f2063ffb4..8b886cdf136f 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4476,6 +4476,7 @@ const translations = {
         description: 'Choose from the support options below:',
         chatWithConcierge: 'Chat with Concierge',
         scheduleSetupCall: 'Schedule a setup call',
+        scheduleADemo: 'Schedule a demo',
         questionMarkButtonTooltip: 'Get assistance from our team',
         exploreHelpDocs: 'Explore help docs',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index ef9ec53705ce..b1655ce1f925 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4524,6 +4524,7 @@ const translations = {
         description: 'Elige una de las siguientes opciones:',
         chatWithConcierge: 'Chatear con Concierge',
         scheduleSetupCall: 'Concertar una llamada',
+        scheduleADemo: 'Schedule a demo',
         questionMarkButtonTooltip: 'Obtén ayuda de nuestro equipo',
         exploreHelpDocs: 'Explorar la documentación de ayuda',
     },
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 03e7dcd82156..ff80e589e239 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -1,5 +1,5 @@
 import {useRoute} from '@react-navigation/native';
-import React, {memo} from 'react';
+import React, {memo, useEffect} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
@@ -25,6 +25,8 @@ import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {openExternalLink} from '@libs/actions/Link';
+import {getAssignedSupportData} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
@@ -75,6 +77,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID || '-1'}`);
     const policy = usePolicy(report?.policyID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
 
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -101,6 +104,14 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const policyName = ReportUtils.getPolicyName(report, true);
     const policyDescription = ReportUtils.getPolicyDescriptionText(policy);
     const isPersonalExpenseChat = isPolicyExpenseChat && ReportUtils.isCurrentUserSubmitter(report?.reportID ?? '');
+    const policyID = report?.policyID;
+    useEffect(() => {
+        if (!policyID) {
+            return;
+        }
+        getAssignedSupportData(policyID);
+    }, [policyID]);
+
     const shouldShowSubtitle = () => {
         if (!subtitle) {
             return false;
@@ -114,6 +125,19 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
         return true;
     };
 
+    const shouldShowGuideBooking = !!account && report?.reportID.toString() === account?.adminsRoomReportID?.toString() && !!account?.guideDetails?.calendarLink;
+
+    const guideBookingButton = (
+        <Button
+            success
+            text={translate('getAssistancePage.scheduleADemo')}
+            onPress={() => {
+                openExternalLink(account?.guideDetails?.calendarLink ?? '');
+            }}
+            icon={Expensicons.CalendarSolid}
+        />
+    );
+
     const join = Session.checkIfActionIsAllowed(() => Report.joinRoom(report));
 
     const canJoin = ReportUtils.canJoinChat(report, parentReportAction, policy);
@@ -287,6 +311,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                                 )}
                             </PressableWithoutFeedback>
                             <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
+                                {shouldShowGuideBooking && !shouldUseNarrowLayout && guideBookingButton}
                                 {!shouldUseNarrowLayout && isChatUsedForOnboarding && freeTrialButton}
                                 {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
                                 {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
@@ -312,6 +337,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
             </View>
             {!isParentReportLoading && !isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
             {!isLoading && isChatUsedForOnboarding && shouldUseNarrowLayout && <View style={[styles.pb3, styles.ph5]}>{freeTrialButton}</View>}
+            {!isLoading && shouldShowGuideBooking && shouldUseNarrowLayout && <View style={[styles.pb3, styles.ph5]}>{guideBookingButton}</View>}
         </View>
     );
 }

From 8228c83fbdc0bd0e412198e9da1a1d338d54e314 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Fri, 20 Dec 2024 15:12:18 +0700
Subject: [PATCH 2/4] fix lint

---
 src/libs/ReportUtils.ts       |  4 ++--
 src/pages/home/HeaderView.tsx | 35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index c20ec7386b0a..f9f3ca4d19d6 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1040,8 +1040,8 @@ function isSettled(reportOrID: OnyxInputOrEntry<Report> | SearchReport | string
 /**
  * Whether the current user is the submitter of the report
  */
-function isCurrentUserSubmitter(reportID: string): boolean {
-    if (!allReports) {
+function isCurrentUserSubmitter(reportID: string | undefined): boolean {
+    if (!allReports || !reportID) {
         return false;
     }
     const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index ff80e589e239..02799e6dbc8c 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -72,9 +72,11 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const {isSmallScreenWidth} = useResponsiveLayout();
     const route = useRoute();
     const [isDeleteTaskConfirmModalVisible, setIsDeleteTaskConfirmModalVisible] = React.useState(false);
-    const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
+    const [invoiceReceiverPolicy] = useOnyx(
+        `${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : CONST.DEFAULT_NUMBER_ID}`,
+    );
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID || '-1'}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID}`);
     const policy = usePolicy(report?.policyID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
@@ -103,7 +105,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const reportDescription = Parser.htmlToText(ReportUtils.getReportDescription(report));
     const policyName = ReportUtils.getPolicyName(report, true);
     const policyDescription = ReportUtils.getPolicyDescriptionText(policy);
-    const isPersonalExpenseChat = isPolicyExpenseChat && ReportUtils.isCurrentUserSubmitter(report?.reportID ?? '');
+    const isPersonalExpenseChat = isPolicyExpenseChat && ReportUtils.isCurrentUserSubmitter(report?.reportID);
     const policyID = report?.policyID;
     useEffect(() => {
         if (!policyID) {
@@ -127,17 +129,6 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
 
     const shouldShowGuideBooking = !!account && report?.reportID.toString() === account?.adminsRoomReportID?.toString() && !!account?.guideDetails?.calendarLink;
 
-    const guideBookingButton = (
-        <Button
-            success
-            text={translate('getAssistancePage.scheduleADemo')}
-            onPress={() => {
-                openExternalLink(account?.guideDetails?.calendarLink ?? '');
-            }}
-            icon={Expensicons.CalendarSolid}
-        />
-    );
-
     const join = Session.checkIfActionIsAllowed(() => Report.joinRoom(report));
 
     const canJoin = ReportUtils.canJoinChat(report, parentReportAction, policy);
@@ -178,6 +169,18 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
     const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth;
     const isChatUsedForOnboarding = ReportUtils.isChatUsedForOnboarding(report);
 
+    const guideBookingButton = (
+        <Button
+            success
+            text={translate('getAssistancePage.scheduleADemo')}
+            onPress={() => {
+                openExternalLink(account?.guideDetails?.calendarLink ?? '');
+            }}
+            style={isChatUsedForOnboarding && styles.mr2}
+            icon={Expensicons.CalendarSolid}
+        />
+    );
+
     return (
         <View
             style={[shouldShowBorderBottom && styles.borderBottom]}
@@ -283,8 +286,8 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                                     {isPolicyExpenseChat && !!policyDescription && isEmptyObject(parentNavigationSubtitleData) && (
                                         <PressableWithoutFeedback
                                             onPress={() => {
-                                                if (ReportUtils.canEditPolicyDescription(policy)) {
-                                                    Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID ?? '-1'));
+                                                if (ReportUtils.canEditPolicyDescription(policy) && report.policyID) {
+                                                    Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID));
                                                     return;
                                                 }
                                                 Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID, Navigation.getReportRHPActiveRoute()));

From 23114fe0605b994194e6a1c0c4a5c23753d1097c Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Tue, 7 Jan 2025 23:07:55 +0700
Subject: [PATCH 3/4] fix styles 2 buttons

---
 src/pages/home/HeaderView.tsx                 | 34 ++++++++++++++-----
 src/pages/settings/Subscription/FreeTrial.tsx | 10 +++---
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index f3c9ff518868..2846cd3742f4 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -174,11 +174,18 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
             onPress={() => {
                 openExternalLink(account?.guideDetails?.calendarLink ?? '');
             }}
-            style={isChatUsedForOnboarding && styles.mr2}
+            style={!shouldUseNarrowLayout && isChatUsedForOnboarding && styles.mr2}
             icon={Expensicons.CalendarSolid}
         />
     );
 
+    const getGuideBookButtonStyles = () => {
+        if (isChatUsedForOnboarding) {
+            return [styles.pb3, styles.pl5, styles.w50, styles.pr1];
+        }
+        return [styles.pb3, styles.ph5];
+    };
+
     return (
         <View
             style={[shouldShowBorderBottom && styles.borderBottom]}
@@ -313,7 +320,12 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                             </PressableWithoutFeedback>
                             <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
                                 {shouldShowGuideBooking && !shouldUseNarrowLayout && guideBookingButton}
-                                {!shouldUseNarrowLayout && isChatUsedForOnboarding && <FreeTrial pressable />}
+                                {!shouldUseNarrowLayout && isChatUsedForOnboarding && (
+                                    <FreeTrial
+                                        pressable
+                                        success={!shouldShowGuideBooking}
+                                    />
+                                )}
                                 {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
                                 {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton}
                             </View>
@@ -337,13 +349,17 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
                 )}
             </View>
             {!isParentReportLoading && !isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
-            {!isLoading && isChatUsedForOnboarding && shouldUseNarrowLayout && (
-                <FreeTrial
-                    pressable
-                    addSpacing
-                />
-            )}
-            {!isLoading && shouldShowGuideBooking && shouldUseNarrowLayout && <View style={[styles.pb3, styles.ph5]}>{guideBookingButton}</View>}
+            <View style={isChatUsedForOnboarding && shouldShowGuideBooking && [styles.dFlex, styles.flexRow]}>
+                {!isLoading && shouldShowGuideBooking && shouldUseNarrowLayout && <View style={getGuideBookButtonStyles()}>{guideBookingButton}</View>}
+                {!isLoading && isChatUsedForOnboarding && shouldUseNarrowLayout && (
+                    <FreeTrial
+                        pressable
+                        addSpacing
+                        success={!shouldShowGuideBooking}
+                        inARow={shouldShowGuideBooking}
+                    />
+                )}
+            </View>
         </View>
     );
 }
diff --git a/src/pages/settings/Subscription/FreeTrial.tsx b/src/pages/settings/Subscription/FreeTrial.tsx
index 499adfa3a89d..d1a5f8a27873 100644
--- a/src/pages/settings/Subscription/FreeTrial.tsx
+++ b/src/pages/settings/Subscription/FreeTrial.tsx
@@ -16,9 +16,11 @@ type FreeTrialProps = {
     badgeStyles?: StyleProp<ViewStyle>;
     pressable?: boolean;
     addSpacing?: boolean;
+    success?: boolean;
+    inARow?: boolean;
 };
 
-function FreeTrial({badgeStyles, pressable = false, addSpacing = false}: FreeTrialProps) {
+function FreeTrial({badgeStyles, pressable = false, addSpacing = false, success = true, inARow = false}: FreeTrialProps) {
     const styles = useThemeStyles();
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const [firstDayFreeTrial] = useOnyx(ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL);
@@ -42,19 +44,19 @@ function FreeTrial({badgeStyles, pressable = false, addSpacing = false}: FreeTri
     const freeTrial = pressable ? (
         <Button
             icon={Expensicons.Star}
-            success
+            success={success}
             text={freeTrialText}
             onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)}
         />
     ) : (
         <Badge
-            success
+            success={success}
             text={freeTrialText}
             badgeStyles={badgeStyles}
         />
     );
 
-    return addSpacing ? <View style={[styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
+    return addSpacing ? <View style={inARow ? [styles.pb3, styles.pr5, styles.w50, styles.pl1] : [styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
 }
 
 FreeTrial.displayName = 'FreeTrial';

From d4619b1d0b62d6686bdcde6dafbc422dd06b93db Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Wed, 15 Jan 2025 14:27:16 +0700
Subject: [PATCH 4/4] fix lint

---
 src/pages/settings/Subscription/FreeTrial.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/settings/Subscription/FreeTrial.tsx b/src/pages/settings/Subscription/FreeTrial.tsx
index d1a5f8a27873..5cb9592bb52f 100644
--- a/src/pages/settings/Subscription/FreeTrial.tsx
+++ b/src/pages/settings/Subscription/FreeTrial.tsx
@@ -4,11 +4,11 @@ import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Badge from '@components/Badge';
 import Button from '@components/Button';
+import {Star} from '@components/Icon/Expensicons';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import * as SubscriptionUtils from '@libs/SubscriptionUtils';
-import * as Expensicons from '@src/components/Icon/Expensicons';
+import {getFreeTrialText} from '@libs/SubscriptionUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
@@ -34,7 +34,7 @@ function FreeTrial({badgeStyles, pressable = false, addSpacing = false, success
         if (!privateSubscription && !isOffline) {
             return;
         }
-        setFreeTrialText(SubscriptionUtils.getFreeTrialText(policies));
+        setFreeTrialText(getFreeTrialText(policies));
     }, [isOffline, privateSubscription, policies, firstDayFreeTrial, lastDayFreeTrial]);
 
     if (!freeTrialText) {
@@ -43,7 +43,7 @@ function FreeTrial({badgeStyles, pressable = false, addSpacing = false, success
 
     const freeTrial = pressable ? (
         <Button
-            icon={Expensicons.Star}
+            icon={Star}
             success={success}
             text={freeTrialText}
             onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)}