From b7cdaf83cbf947f9566005bca083f08e1a0047b9 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 12 Apr 2024 04:04:11 +0700
Subject: [PATCH 01/51] feat: surfacing potential duplicates

---
 src/components/HoldBanner.tsx         | 11 +++++--
 src/components/MoneyRequestHeader.tsx | 29 +++++++++++++++--
 src/languages/en.ts                   |  2 ++
 src/languages/es.ts                   |  2 ++
 src/libs/Permissions.ts               |  2 +-
 src/libs/TransactionUtils.ts          | 47 +++++++++++++++++++++++++--
 src/types/onyx/Transaction.ts         |  2 ++
 7 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/src/components/HoldBanner.tsx b/src/components/HoldBanner.tsx
index af77d9076629..5376087ba849 100644
--- a/src/components/HoldBanner.tsx
+++ b/src/components/HoldBanner.tsx
@@ -5,14 +5,19 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Text from './Text';
 import TextPill from './TextPill';
 
-function HoldBanner() {
+type HoldBannerProps = {
+    isRequestDuplicate?: boolean;
+    shouldShowBorderBottom?: boolean;
+};
+
+function HoldBanner({isRequestDuplicate = false, shouldShowBorderBottom = false}: HoldBannerProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, styles.borderBottom]}>
+        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, shouldShowBorderBottom ? styles.borderBottom : {}]}>
             <TextPill>{translate('iou.hold')}</TextPill>
-            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{translate('iou.requestOnHold')}</Text>
+            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{isRequestDuplicate ? translate('iou.requestDuplicate') : translate('iou.requestOnHold')}</Text>
         </View>
     );
 }
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index f451f5f15581..6588b8167e62 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -16,6 +16,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Policy, Report, ReportAction, ReportActions, Session, Transaction} from '@src/types/onyx';
 import type {OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
+import Button from './Button';
 import ConfirmModal from './ConfirmModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import HoldBanner from './HoldBanner';
@@ -61,6 +62,7 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
     const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID);
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isOnHold = TransactionUtils.isOnHold(transaction);
+    const isDuplicate = TransactionUtils.isDuplicate(transaction?.transactionID ?? '');
     const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
 
     // Only the requestor can take delete the request, admins can only edit it.
@@ -178,7 +180,15 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
                     policy={policy}
                     shouldShowBackButton={isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack(undefined, false, true)}
-                />
+                >
+                    {isDuplicate && !isSmallScreenWidth && (
+                        <Button
+                            success
+                            medium
+                            text={translate('iou.reviewDuplicates')}
+                        />
+                    )}
+                </HeaderWithBackButton>
                 {isPending && (
                     <MoneyRequestHeaderStatusBar
                         title={translate('iou.pending')}
@@ -193,7 +203,22 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
                         shouldShowBorderBottom
                     />
                 )}
-                {isOnHold && <HoldBanner />}
+                {isOnHold && (
+                    <HoldBanner
+                        isRequestDuplicate={isDuplicate}
+                        shouldShowBorderBottom={!isDuplicate || !isSmallScreenWidth}
+                    />
+                )}
+                {isDuplicate && isSmallScreenWidth && (
+                    <View style={[styles.ph5, styles.pb2, styles.borderBottom]}>
+                        <Button
+                            success
+                            medium
+                            text={translate('iou.reviewDuplicates')}
+                            style={[styles.w100, styles.pr0]}
+                        />
+                    </View>
+                )}
             </View>
             <ConfirmModal
                 title={translate('iou.deleteRequest')}
diff --git a/src/languages/en.ts b/src/languages/en.ts
index d9c96e51ed64..d73993548ce9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -720,6 +720,8 @@ export default {
         reason: 'Reason',
         holdReasonRequired: 'A reason is required when holding.',
         requestOnHold: 'This request was put on hold. Review the comments for next steps.',
+        requestDuplicate: 'This request has the same details as another one. Review the duplicated to remove the hold.',
+        reviewDuplicates: 'Review duplicates',
         confirmApprove: 'Confirm what to approve',
         confirmApprovalAmount: 'Approve the entire report total or only the amount not on hold.',
         confirmPay: 'Confirm what to pay',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index f6c649fdac72..2c7955ee8116 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -717,6 +717,8 @@ export default {
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
         requestOnHold: 'Este solicitud está bloqueada. Revisa los comentarios para saber como proceder.',
+        requestDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revise el duplicado para eliminar la retención.',
+        reviewDuplicates: 'Revisar duplicados',
         confirmApprove: 'Confirma que quieres aprobar',
         confirmApprovalAmount: 'Aprobar el total o solo la parte no bloqueada.',
         confirmPay: 'Confirma que quieres pagar',
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 105736faeba0..9cc91b8ea176 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true;
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 9c398998588e..598f6ed89943 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -5,7 +5,7 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {RecentWaypoint, Report, TaxRate, TaxRates, TaxRatesWithDefault, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {RecentWaypoint, Report, TaxRate, TaxRates, TaxRatesWithDefault, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
 import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {IOURequestType} from './actions/IOU';
@@ -35,6 +35,30 @@ Onyx.connect({
     callback: (value) => (allReports = value),
 });
 
+let allTransactionViolations: NonNullable<OnyxCollection<TransactionViolations>> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            allTransactionViolations = {};
+            return;
+        }
+
+        allTransactionViolations = value;
+    },
+});
+
+let currentUserEmail = '';
+let currentUserAccountID = -1;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        currentUserEmail = val?.email ?? '';
+        currentUserAccountID = val?.accountID ?? -1;
+    },
+});
+
 function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
     // This is used during the request creation flow before the transaction has been saved to the server
     if (lodashHas(transaction, 'iouRequestType')) {
@@ -591,6 +615,24 @@ function getRecentTransactions(transactions: Record<string, string>, size = 2):
         .slice(0, size);
 }
 
+/**
+ * Check if transaction has duplicatedTransaction violation.
+ * @param transactionID - the transaction to check
+ * @param checkDismissed - whether to check if the violation has already been dismissed as well
+ */
+function isDuplicate(transactionID: string, checkDismissed = false): boolean {
+    return true;
+    const hasDuplicatedViolation = !!allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
+        (violation: TransactionViolation) => violation.type === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+    );
+    if (!checkDismissed) {
+        return hasDuplicatedViolation;
+    }
+    const didDismissedViolation =
+        allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.comment?.dismissedViolations?.duplicatedTransaction?.[currentUserEmail] === `${currentUserAccountID}`;
+    return hasDuplicatedViolation && !didDismissedViolation;
+}
+
 /**
  * Check if transaction is on hold
  */
@@ -599,7 +641,7 @@ function isOnHold(transaction: OnyxEntry<Transaction>): boolean {
         return false;
     }
 
-    return !!transaction.comment?.hold;
+    return !!transaction.comment?.hold || isDuplicate(transaction?.transactionID, true);
 }
 
 /**
@@ -687,6 +729,7 @@ export {
     isFetchingWaypointsFromServer,
     isExpensifyCardTransaction,
     isCardTransaction,
+    isDuplicate,
     isPending,
     isPosted,
     isOnHold,
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 281b6b4228ce..11fce9e860d6 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -6,6 +6,7 @@ import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type {Participant, Split} from './IOU';
 import type * as OnyxCommon from './OnyxCommon';
 import type RecentWaypoint from './RecentWaypoint';
+import {ViolationName} from './TransactionViolation';
 
 type Waypoint = {
     /** The name associated with the address of the waypoint */
@@ -51,6 +52,7 @@ type Comment = {
     source?: string;
     originalTransactionID?: string;
     splits?: Split[];
+    dismissedViolations?: Record<ViolationName, Record<string, string>>;
 };
 
 type GeometryType = 'LineString';

From 513909a01b9551c6987c890af530a9cf98ea547d Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 12 Apr 2024 04:07:18 +0700
Subject: [PATCH 02/51] revert mistake changes

---
 src/libs/Permissions.ts       | 2 +-
 src/types/onyx/Transaction.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 9cc91b8ea176..105736faeba0 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 11fce9e860d6..ba3ebe03618f 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -6,7 +6,7 @@ import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type {Participant, Split} from './IOU';
 import type * as OnyxCommon from './OnyxCommon';
 import type RecentWaypoint from './RecentWaypoint';
-import {ViolationName} from './TransactionViolation';
+import type {ViolationName} from './TransactionViolation';
 
 type Waypoint = {
     /** The name associated with the address of the waypoint */

From 369585f65169fd322351716d9eca3b888f7649af Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Tue, 16 Apr 2024 03:39:20 +0700
Subject: [PATCH 03/51] modify copy

---
 src/languages/en.ts          | 2 +-
 src/languages/es.ts          | 2 +-
 src/libs/TransactionUtils.ts | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 70ec07f9da1c..8c22bcedb0fa 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -719,7 +719,7 @@ export default {
         reason: 'Reason',
         holdReasonRequired: 'A reason is required when holding.',
         requestOnHold: 'This request was put on hold. Review the comments for next steps.',
-        requestDuplicate: 'This request has the same details as another one. Review the duplicated to remove the hold.',
+        requestDuplicate: 'This request has the same details as another one. Review the duplicates to remove the hold.',
         reviewDuplicates: 'Review duplicates',
         confirmApprove: 'Confirm what to approve',
         confirmApprovalAmount: 'Approve the entire report total or only the amount not on hold.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index c16a150e713d..4b45bdea2c49 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -716,7 +716,7 @@ export default {
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
         requestOnHold: 'Este solicitud está bloqueada. Revisa los comentarios para saber como proceder.',
-        requestDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revise el duplicado para eliminar la retención.',
+        requestDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revise los duplicados para eliminar la retención.',
         reviewDuplicates: 'Revisar duplicados',
         confirmApprove: 'Confirma que quieres aprobar',
         confirmApprovalAmount: 'Aprobar el total o solo la parte no bloqueada.',
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 5bd66dc12558..0612d3d3cb6f 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -621,7 +621,6 @@ function getRecentTransactions(transactions: Record<string, string>, size = 2):
  * @param checkDismissed - whether to check if the violation has already been dismissed as well
  */
 function isDuplicate(transactionID: string, checkDismissed = false): boolean {
-    return true;
     const hasDuplicatedViolation = !!allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
         (violation: TransactionViolation) => violation.type === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
     );

From 20b404839b6337de2288de85771a1b3216bd75ee Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 19 Apr 2024 20:23:40 +0700
Subject: [PATCH 04/51] show RBR on violation preview

---
 src/libs/ReportUtils.ts      |  4 ++--
 src/libs/TransactionUtils.ts | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a15e1937dbe2..a7c90b3e3ca5 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4574,7 +4574,7 @@ function shouldHideReport(report: OnyxEntry<Report>, currentReportId: string): b
 }
 
 /**
- * Checks to see if a report's parentAction is an expense that contains a violation
+ * Checks to see if a report's parentAction is an expense that contains a violation type of either violation or warning
  */
 function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transactionViolations: OnyxCollection<TransactionViolation[]>, parentReportAction: OnyxEntry<ReportAction>): boolean {
     if (parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
@@ -4590,7 +4590,7 @@ function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transact
     if (report?.stateNum !== CONST.REPORT.STATE_NUM.OPEN && report?.stateNum !== CONST.REPORT.STATE_NUM.SUBMITTED) {
         return false;
     }
-    return TransactionUtils.hasViolation(IOUTransactionID, transactionViolations);
+    return TransactionUtils.hasViolation(IOUTransactionID, transactionViolations) || TransactionUtils.hasWarning(IOUTransactionID, transactionViolations);
 }
 
 /**
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 60b2a03f8ea0..33164c4a28b3 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -620,7 +620,7 @@ function getRecentTransactions(transactions: Record<string, string>, size = 2):
  */
 function isDuplicate(transactionID: string, checkDismissed = false): boolean {
     const hasDuplicatedViolation = !!allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
-        (violation: TransactionViolation) => violation.type === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+        (violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
     );
     if (!checkDismissed) {
         return hasDuplicatedViolation;
@@ -650,6 +650,15 @@ function hasViolation(transactionID: string, transactionViolations: OnyxCollecti
     );
 }
 
+/**
+ * Checks if any violations for the provided transaction are of type 'warning'
+ */
+function hasWarning(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    return Boolean(
+        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.WARNING),
+    );
+}
+
 function getTransactionViolations(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): TransactionViolation[] | null {
     return transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID] ?? null;
 }
@@ -742,6 +751,7 @@ export {
     waypointHasValidAddress,
     getRecentTransactions,
     hasViolation,
+    hasWarning,
 };
 
 export type {TransactionChanges};

From 5685c8c93cd8c97621c59419b1b86044a54f0df3 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 24 Apr 2024 02:20:52 +0700
Subject: [PATCH 05/51] fix illustration is sitting too far down

---
 src/pages/settings/Troubleshoot/TroubleshootPage.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index b2523a4e039c..3b235c1b71ec 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -22,9 +22,11 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import getPlatform from '@libs/getPlatform';
 import Navigation from '@libs/Navigation/Navigation';
 import * as App from '@userActions/App';
 import * as Report from '@userActions/Report';
+import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -81,6 +83,11 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
             .reverse();
     }, [shouldStoreLogs, translate, waitForNavigate, styles.sectionMenuItemTopDescription]);
 
+    const isNativePlatform = useMemo(() => {
+        const platform = getPlatform();
+        return platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID;
+    }, []);
+
     return (
         <ScreenWrapper
             shouldEnablePickerAvoiding={false}
@@ -101,7 +108,7 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
                         isCentralPane
                         subtitleMuted
                         illustration={LottieAnimations.Desk}
-                        illustrationStyle={[styles.mt4, styles.mbn4]}
+                        illustrationStyle={!isNativePlatform && [styles.mt4, styles.mbn4]}
                         titleStyles={styles.accountSettingsSectionTitle}
                         illustrationBackgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.TROUBLESHOOT].backgroundColor}
                         renderSubtitle={() => (

From 4a6a2853b9d1de2409239a3ac44d087dd96f50fe Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 26 Apr 2024 02:19:16 +0700
Subject: [PATCH 06/51] show hold message on iou preview

---
 .../MoneyRequestPreviewContent.tsx                    | 11 ++++++++---
 src/languages/en.ts                                   |  2 +-
 src/languages/es.ts                                   |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 7f70a3e538a9..78312c69b4a4 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -97,6 +97,7 @@ function MoneyRequestPreviewContent({
     const isDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const shouldShowRBR =
         hasViolations || hasFieldErrors || (!(isSettled && !isSettlementOrApprovalPartial) && !(ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial) && isOnHold);
+    const shouldShowHoldMessage = !(isSettled && !isSettlementOrApprovalPartial) && isOnHold;
 
     /*
      Show the merchant for IOUs and expenses only if:
@@ -164,7 +165,11 @@ function MoneyRequestPreviewContent({
                 const isTooLong = violationsCount > 1 || violationMessage.length > 15;
                 const hasViolationsAndFieldErrors = violationsCount > 0 && hasFieldErrors;
 
-                return `${message} ${CONST.DOT_SEPARATOR} ${isTooLong || hasViolationsAndFieldErrors ? translate('violations.reviewRequired') : violationMessage}`;
+                message += ` ${CONST.DOT_SEPARATOR} ${isTooLong || hasViolationsAndFieldErrors ? translate('violations.reviewRequired') : violationMessage}`;
+                if (shouldShowHoldMessage) {
+                    message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.hold')}`;
+                }
+                return message;
             }
 
             const isMerchantMissing = TransactionUtils.isMerchantMissing(transaction);
@@ -175,7 +180,7 @@ function MoneyRequestPreviewContent({
                 message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingAmount')}`;
             } else if (isMerchantMissing) {
                 message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingMerchant')}`;
-            } else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
+            } else if (shouldShowHoldMessage) {
                 message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.hold')}`;
             }
         } else if (ReportUtils.isPaidGroupPolicyExpenseReport(iouReport) && ReportUtils.isReportApproved(iouReport) && !ReportUtils.isSettled(iouReport?.reportID) && !isPartialHold) {
@@ -184,7 +189,7 @@ function MoneyRequestPreviewContent({
             message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
         } else if (iouReport?.isCancelledIOU) {
             message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.canceled')}`;
-        } else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
+        } else if (shouldShowHoldMessage) {
             message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.hold')}`;
         }
         return message;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 96fbe463b846..02b67ef4c956 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2763,7 +2763,7 @@ export default {
         categoryOutOfPolicy: 'Category no longer valid',
         conversionSurcharge: ({surcharge}: ViolationsConversionSurchargeParams) => `Applied ${surcharge}% conversion surcharge`,
         customUnitOutOfPolicy: 'Unit no longer valid',
-        duplicatedTransaction: 'Potential duplicate',
+        duplicatedTransaction: 'Duplicate',
         fieldRequired: 'Report fields are required',
         futureDate: 'Future date not allowed',
         invoiceMarkup: ({invoiceMarkup}: ViolationsInvoiceMarkupParams) => `Marked up by ${invoiceMarkup}%`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 6b81fd529233..7f17b400f075 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3256,7 +3256,7 @@ export default {
         categoryOutOfPolicy: 'La categoría ya no es válida',
         conversionSurcharge: ({surcharge}: ViolationsConversionSurchargeParams = {}) => `${surcharge}% de recargo aplicado`,
         customUnitOutOfPolicy: 'La unidad ya no es válida',
-        duplicatedTransaction: 'Posible duplicado',
+        duplicatedTransaction: 'Duplicada',
         fieldRequired: 'Los campos del informe son obligatorios',
         futureDate: 'Fecha futura no permitida',
         invoiceMarkup: ({invoiceMarkup}: ViolationsInvoiceMarkupParams) => `Incrementado un ${invoiceMarkup}%`,

From 462b3dfdcf8910d636725d2203e5b1d339a6230c Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 26 Apr 2024 02:19:29 +0700
Subject: [PATCH 07/51] show rbr on report preview

---
 src/components/ReportActionItem/ReportPreview.tsx | 7 +++++--
 src/libs/ReportUtils.ts                           | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 5c78e1e2604e..57f15ee60e1b 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -136,8 +136,11 @@ function ReportPreview({
 
     const hasReceipts = transactionsWithReceipts.length > 0;
     const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations)) || ReportUtils.hasActionsWithErrors(iouReportID);
+    const hasErrors =
+        hasMissingSmartscanFields ||
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        (canUseViolations && (ReportUtils.hasViolations(iouReportID, transactionViolations) || ReportUtils.hasWarnings(iouReportID, transactionViolations))) ||
+        ReportUtils.hasActionsWithErrors(iouReportID);
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
     const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index f7dc428120a8..124e74e918d2 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -4751,6 +4751,14 @@ function hasViolations(reportID: string, transactionViolations: OnyxCollection<T
     return transactions.some((transaction) => TransactionUtils.hasViolation(transaction.transactionID, transactionViolations));
 }
 
+/**
+ * Checks to see if a report contains a violation of type `warning`
+ */
+function hasWarnings(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    const transactions = TransactionUtils.getAllReportTransactions(reportID);
+    return transactions.some((transaction) => TransactionUtils.hasWarning(transaction.transactionID, transactionViolations));
+}
+
 /**
  * Takes several pieces of data from Onyx and evaluates if a report should be shown in the option list (either when searching
  * for reports or the reports shown in the LHN).
@@ -6304,6 +6312,7 @@ export {
     hasSmartscanError,
     hasUpdatedTotal,
     hasViolations,
+    hasWarnings,
     isActionCreator,
     isAdminRoom,
     isAdminsOnlyPostingRoom,

From 7e2d6052ca7c9b04b9911f4bb80877fa051fea11 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 26 Apr 2024 02:26:30 +0700
Subject: [PATCH 08/51] fix crash

---
 src/components/MoneyRequestHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 8e59eba75a87..a918460e1ecb 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -75,7 +75,7 @@ function MoneyRequestHeader({
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isOnHold = TransactionUtils.isOnHold(transaction);
     const isDuplicate = TransactionUtils.isDuplicate(transaction?.transactionID ?? '');
-    const {windowWidth} = useWindowDimensions();
+    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
 
     // Only the requestor can take delete the expense, admins can only edit it.
     const isActionOwner = typeof parentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && parentReportAction.actorAccountID === session?.accountID;

From e68f9f1e8732f35caab835e4f2c7a0a9afa991af Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 3 May 2024 00:04:21 +0700
Subject: [PATCH 09/51] hide unhold expense for duplicate expenses

---
 src/components/MoneyRequestHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 1274fe5a4c62..ee78ad2db4b6 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -128,7 +128,7 @@ function MoneyRequestHeader({
         const isHoldCreator = ReportUtils.isHoldCreator(transaction, report?.reportID) && isRequestIOU;
         const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
         const canModifyStatus = !isTrackExpenseReport && (isPolicyAdmin || isActionOwner || isApprover);
-        if (isOnHold && (isHoldCreator || (!isRequestIOU && canModifyStatus))) {
+        if (isOnHold && !isDuplicate && (isHoldCreator || (!isRequestIOU && canModifyStatus))) {
             threeDotsMenuItems.push({
                 icon: Expensicons.Stopwatch,
                 text: translate('iou.unholdExpense'),

From 3d844a0154c816c546141a660a419ae118fbcc65 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Fri, 3 May 2024 00:08:31 +0700
Subject: [PATCH 10/51] revert unneccessary changes

---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1d26803c6e79..c5a5e7f45ed7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -730,7 +730,7 @@ export default {
         explainHold: 'Explica la razón para bloquear esta solicitud.',
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
-        expenseOnHold: 'Este gasto quedó en suspenso. Revise los comentarios para los próximos pasos.',
+        expenseOnHold: 'Este gasto está bloqueado. Revisa los comentarios para saber como proceder.',
         expenseDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revise los duplicados para eliminar la retención.',
         reviewDuplicates: 'Revisar duplicados',
         confirmApprove: 'Confirma que quieres aprobar',

From 49473826da882a3eaeb2b989c75497881eb9d984 Mon Sep 17 00:00:00 2001
From: Joe Ph <153004152+gijoe0295@users.noreply.github.com>
Date: Sun, 5 May 2024 00:26:35 +0700
Subject: [PATCH 11/51] Update copy

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
---
 src/languages/es.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index c5a5e7f45ed7..0c1c914896ce 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3381,7 +3381,7 @@ export default {
         categoryOutOfPolicy: 'La categoría ya no es válida',
         conversionSurcharge: ({surcharge}: ViolationsConversionSurchargeParams = {}) => `${surcharge}% de recargo aplicado`,
         customUnitOutOfPolicy: 'La unidad ya no es válida',
-        duplicatedTransaction: 'Duplicada',
+        duplicatedTransaction: 'Duplicado',
         fieldRequired: 'Los campos del informe son obligatorios',
         futureDate: 'Fecha futura no permitida',
         invoiceMarkup: ({invoiceMarkup}: ViolationsInvoiceMarkupParams) => `Incrementado un ${invoiceMarkup}%`,

From 22b6cd9c0af4047124041478f099cbb241b7f2ea Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Sun, 5 May 2024 21:10:06 +0700
Subject: [PATCH 12/51] revert HoldBanner changes

---
 src/components/HoldBanner.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/HoldBanner.tsx b/src/components/HoldBanner.tsx
index de1f4debe4d0..d760d4efbe96 100644
--- a/src/components/HoldBanner.tsx
+++ b/src/components/HoldBanner.tsx
@@ -5,19 +5,14 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Text from './Text';
 import TextPill from './TextPill';
 
-type HoldBannerProps = {
-    isRequestDuplicate?: boolean;
-    shouldShowBorderBottom?: boolean;
-};
-
-function HoldBanner({isRequestDuplicate = false, shouldShowBorderBottom = false}: HoldBannerProps) {
+function HoldBanner() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, shouldShowBorderBottom ? styles.borderBottom : {}]}>
+        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, styles.borderBottom]}>
             <TextPill>{translate('iou.hold')}</TextPill>
-            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{isRequestDuplicate ? translate('iou.expenseDuplicate') : translate('iou.expenseOnHold')}</Text>
+            <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{translate('iou.expenseOnHold')}</Text>
         </View>
     );
 }

From fc07750b88c794b4120290612ea0c7f4955acb13 Mon Sep 17 00:00:00 2001
From: gijoe0295 <gijoe0295@gmail.com>
Date: Thu, 16 May 2024 17:13:21 +0700
Subject: [PATCH 13/51] fix type error

---
 src/libs/TransactionUtils.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 47ea71577dda..cfd87ff64024 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -40,20 +40,6 @@ Onyx.connect({
     callback: (value) => (allReports = value),
 });
 
-let allTransactionViolations: NonNullable<OnyxCollection<TransactionViolations>> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
-    waitForCollectionCallback: true,
-    callback: (value) => {
-        if (!value) {
-            allTransactionViolations = {};
-            return;
-        }
-
-        allTransactionViolations = value;
-    },
-});
-
 let currentUserEmail = '';
 let currentUserAccountID = -1;
 Onyx.connect({
@@ -653,7 +639,7 @@ function getRecentTransactions(transactions: Record<string, string>, size = 2):
  * @param checkDismissed - whether to check if the violation has already been dismissed as well
  */
 function isDuplicate(transactionID: string, checkDismissed = false): boolean {
-    const hasDuplicatedViolation = !!allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
+    const hasDuplicatedViolation = !!allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
         (violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
     );
     if (!checkDismissed) {

From 3bf0a5ae323bb1485fce05f677eb7ec7a1cc7449 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Mon, 20 May 2024 21:55:34 +0530
Subject: [PATCH 14/51] fix: Can't view receipt from Split Expense details view

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 .../MoneyRequestConfirmationList.tsx          | 60 +++++++++++++------
 src/pages/TransactionReceiptPage.tsx          |  3 +-
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 33f1258e60c7..e9830e496b44 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -51,6 +51,7 @@ import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 import MoneyRequestAmountInput from './MoneyRequestAmountInput';
 import PDFThumbnail from './PDFThumbnail';
 import {PressableWithFeedback} from './Pressable';
+import PressableWithoutFocus from './Pressable/PressableWithoutFocus';
 import ReceiptEmptyState from './ReceiptEmptyState';
 import ReceiptImage from './ReceiptImage';
 import SelectionList from './SelectionList';
@@ -1090,26 +1091,42 @@ function MoneyRequestConfirmationList({
         () => (
             <View style={styles.moneyRequestImage}>
                 {isLocalFile && Str.isPDF(receiptFilename) ? (
-                    <PDFThumbnail
-                        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-                        previewSourceURL={resolvedReceiptImage as string}
-                        // We don't support scanning password protected PDF receipt
-                        enabled={!isAttachmentInvalid}
-                        onPassword={() => setIsAttachmentInvalid(true)}
-                    />
+                    <PressableWithoutFocus
+                        onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
+                        accessibilityRole={CONST.ROLE.BUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                        disabled={!isEditingSplitBill}
+                        disabledStyle={styles.cursorPointer}
+                    >
+                        <PDFThumbnail
+                            // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+                            previewSourceURL={resolvedReceiptImage as string}
+                            // We don't support scanning password protected PDF receipt
+                            enabled={!isAttachmentInvalid}
+                            onPassword={() => setIsAttachmentInvalid(true)}
+                        />
+                    </PressableWithoutFocus>
                 ) : (
-                    <ReceiptImage
-                        isThumbnail={isThumbnail}
-                        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                        source={resolvedThumbnail || resolvedReceiptImage || ''}
-                        // AuthToken is required when retrieving the image from the server
-                        // but we don't need it to load the blob:// or file:// image when starting an expense/split
-                        // So if we have a thumbnail, it means we're retrieving the image from the server
-                        isAuthTokenRequired={!!receiptThumbnail && !isLocalFile}
-                        fileExtension={fileExtension}
-                        shouldUseThumbnailImage
-                        shouldUseInitialObjectPosition={isDistanceRequest}
-                    />
+                    <PressableWithoutFocus
+                        onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
+                        disabled={!isEditingSplitBill || isThumbnail}
+                        accessibilityRole={CONST.ROLE.BUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                        disabledStyle={styles.cursorPointer}
+                    >
+                        <ReceiptImage
+                            isThumbnail={isThumbnail}
+                            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                            source={resolvedThumbnail || resolvedReceiptImage || ''}
+                            // AuthToken is required when retrieving the image from the server
+                            // but we don't need it to load the blob:// or file:// image when starting an expense/split
+                            // So if we have a thumbnail, it means we're retrieving the image from the server
+                            isAuthTokenRequired={!!receiptThumbnail && !isLocalFile}
+                            fileExtension={fileExtension}
+                            shouldUseThumbnailImage
+                            shouldUseInitialObjectPosition={isDistanceRequest}
+                        />
+                    </PressableWithoutFocus>
                 )}
             </View>
         ),
@@ -1124,6 +1141,11 @@ function MoneyRequestConfirmationList({
             receiptThumbnail,
             fileExtension,
             isDistanceRequest,
+            isEditingSplitBill,
+            reportID,
+            transactionID,
+            translate,
+            styles.cursorPointer,
         ],
     );
 
diff --git a/src/pages/TransactionReceiptPage.tsx b/src/pages/TransactionReceiptPage.tsx
index eff94119ea2b..35fac4612e63 100644
--- a/src/pages/TransactionReceiptPage.tsx
+++ b/src/pages/TransactionReceiptPage.tsx
@@ -50,7 +50,8 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
     const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
 
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
+    const shouldShowNotFoundPage = isTrackExpenseReport || transaction?.reportID === CONST.REPORT.SPLIT_REPORTID ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
+    // const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
 
     return (
         <AttachmentModal

From 8510c65be84612c6c848ec9d339071071bbc7503 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 23 May 2024 01:30:23 +0530
Subject: [PATCH 15/51] Use double negation instead of Boolean()

---
 .../extractAttachmentsFromReport.ts           |  4 +-
 src/components/Button/index.tsx               |  4 +-
 src/components/ConfirmedRoute.tsx             |  2 +-
 .../DatePicker/CalendarPicker/index.tsx       |  2 +-
 .../DisplayNames/DisplayNamesWithTooltip.tsx  |  2 +-
 src/components/FocusableMenuItem.tsx          |  2 +-
 .../HTMLRenderers/AnchorRenderer.tsx          |  2 +-
 .../HTMLRenderers/EditedRenderer.tsx          |  2 +-
 .../HTMLRenderers/ImageRenderer.tsx           |  2 +-
 src/components/Header.tsx                     |  4 +-
 src/components/MapView/MapView.tsx            |  2 +-
 src/components/MapView/MapView.website.tsx    |  2 +-
 src/components/MentionSuggestions.tsx         |  2 +-
 .../MoneyRequestConfirmationList.tsx          |  4 +-
 src/components/OptionListContextProvider.tsx  |  2 +-
 src/components/ParentNavigationSubtitle.tsx   |  4 +-
 .../Pressable/PressableWithFeedback.tsx       |  2 +-
 src/components/RadioButtonWithLabel.tsx       |  2 +-
 .../ReportActionItem/MoneyReportView.tsx      |  4 +-
 .../MoneyRequestPreviewContent.tsx            |  2 +-
 .../ReportActionItem/MoneyRequestView.tsx     |  4 +-
 .../ReportActionItemImage.tsx                 |  2 +-
 src/components/SelectionList/BaseListItem.tsx |  2 +-
 .../TextInput/BaseTextInput/index.native.tsx  |  2 +-
 .../TextInput/BaseTextInput/index.tsx         |  6 +--
 src/components/TextInput/index.tsx            |  2 +-
 src/libs/CurrencyUtils.ts                     |  2 +-
 src/libs/EmojiUtils.ts                        |  4 +-
 .../Environment/betaChecker/index.android.ts  |  2 +-
 src/libs/HttpUtils.ts                         |  6 +--
 src/libs/Log.ts                               |  2 +-
 .../BottomTabBar.tsx                          |  2 +-
 src/libs/Navigation/linkTo.ts                 |  2 +-
 src/libs/Network/NetworkStore.ts              |  2 +-
 src/libs/NetworkConnection.ts                 |  2 +-
 src/libs/PolicyUtils.ts                       |  8 ++--
 src/libs/Pusher/pusher.ts                     |  2 +-
 src/libs/ReportActionsUtils.ts                |  4 +-
 src/libs/ReportUtils.ts                       | 38 ++++++++-----------
 src/libs/SessionUtils.ts                      |  2 +-
 src/libs/TransactionUtils.ts                  | 14 +++----
 src/libs/ValidationUtils.ts                   | 10 ++---
 src/libs/Violations/ViolationsUtils.ts        |  4 +-
 src/libs/actions/Session/index.ts             |  2 +-
 src/libs/models/BankAccount.ts                |  2 +-
 src/pages/AddPersonalBankAccountPage.tsx      |  2 +-
 src/pages/ChatFinderPage/index.tsx            |  2 +-
 src/pages/DetailsPage.tsx                     |  2 +-
 .../FeesAndTerms/substeps/TermsStep.tsx       |  2 +-
 src/pages/EnablePayments/OnfidoPrivacy.tsx    |  2 +-
 .../TermsPage/LongTermsForm.tsx               |  4 +-
 src/pages/EnablePayments/TermsStep.tsx        |  2 +-
 src/pages/GroupChatNameEditPage.tsx           |  2 +-
 src/pages/InviteReportParticipantsPage.tsx    |  2 +-
 src/pages/NewChatConfirmPage.tsx              |  2 +-
 src/pages/NewChatPage.tsx                     |  2 +-
 .../BaseOnboardingPurpose.tsx                 |  2 +-
 src/pages/ProfilePage.tsx                     |  6 +--
 .../ReimbursementAccountPage.tsx              |  2 +-
 src/pages/ReportParticipantDetailsPage.tsx    |  2 +-
 src/pages/RoomInvitePage.tsx                  |  2 +-
 src/pages/Travel/TravelTerms.tsx              |  2 +-
 .../PopoverReportActionContextMenu.tsx        |  2 +-
 .../PopoverReactionList/index.tsx             |  2 +-
 .../report/ReportActionItemMessageEdit.tsx    |  4 +-
 .../report/ReportActionItemParentAction.tsx   |  2 +-
 .../home/report/ReportActionItemSingle.tsx    |  2 +-
 src/pages/home/report/ReportActionsView.tsx   |  4 +-
 src/pages/home/sidebar/AllSettingsScreen.tsx  |  2 +-
 .../MoneyRequestParticipantsSelector.tsx      |  2 +-
 .../step/IOURequestStepDistanceRate.tsx       |  4 +-
 .../request/step/IOURequestStepMerchant.tsx   |  2 +-
 .../step/IOURequestStepScan/index.native.tsx  |  2 +-
 .../request/step/IOURequestStepScan/index.tsx |  2 +-
 .../request/step/IOURequestStepSplitPayer.tsx |  2 +-
 .../step/IOURequestStepTaxAmountPage.tsx      |  6 +--
 .../ShareLogList/BaseShareLogList.tsx         |  2 +-
 src/pages/settings/InitialSettingsPage.tsx    |  4 +-
 .../TwoFactorAuth/Steps/CodesStep.tsx         |  4 +-
 .../TwoFactorAuth/Steps/VerifyStep.tsx        |  2 +-
 .../Wallet/ReportVirtualCardFraudPage.tsx     |  2 +-
 .../settings/Wallet/TransferBalancePage.tsx   |  2 +-
 src/pages/tasks/NewTaskPage.tsx               |  2 +-
 src/pages/tasks/TaskAssigneeSelectorModal.tsx |  4 +-
 .../qbo/advanced/QuickbooksAdvancedPage.tsx   |  6 +--
 ...uickbooksCompanyCardExpenseAccountPage.tsx |  2 +-
 ...ompanyCardExpenseAccountSelectCardPage.tsx |  2 +-
 .../QuickbooksExportConfigurationPage.tsx     |  2 +-
 ...oksOutOfPocketExpenseConfigurationPage.tsx |  6 +--
 ...ooksOutOfPocketExpenseEntitySelectPage.tsx |  4 +-
 .../qbo/import/QuickbooksClassesPage.tsx      |  2 +-
 .../qbo/import/QuickbooksCustomersPage.tsx    |  2 +-
 .../qbo/import/QuickbooksImportPage.tsx       | 10 ++---
 .../qbo/import/QuickbooksLocationsPage.tsx    |  2 +-
 .../xero/advanced/XeroAdvancedPage.tsx        |  4 +-
 .../members/WorkspaceMemberDetailsPage.tsx    |  2 +-
 .../workflows/WorkspaceWorkflowsPage.tsx      |  2 +-
 src/styles/utils/index.ts                     |  2 +-
 tests/unit/SidebarFilterTest.ts               |  4 +-
 tests/utils/getIsUsingFakeTimers.ts           |  2 +-
 100 files changed, 161 insertions(+), 173 deletions(-)

diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts
index d1185f88ccd5..c6911c5d6991 100644
--- a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts
+++ b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts
@@ -30,7 +30,7 @@ function extractAttachmentsFromReport(parentReportAction?: OnyxEntry<ReportActio
                 const splittedUrl = attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE].split('/');
                 attachments.unshift({
                     source: tryResolveUrlFromApiRoot(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]),
-                    isAuthTokenRequired: Boolean(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]),
+                    isAuthTokenRequired: !!attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE],
                     file: {name: splittedUrl[splittedUrl.length - 1]},
                     duration: Number(attribs[CONST.ATTACHMENT_DURATION_ATTRIBUTE]),
                     isReceipt: false,
@@ -62,7 +62,7 @@ function extractAttachmentsFromReport(parentReportAction?: OnyxEntry<ReportActio
                 attachments.unshift({
                     reportActionID: attribs['data-id'],
                     source,
-                    isAuthTokenRequired: Boolean(expensifySource),
+                    isAuthTokenRequired: !!expensifySource,
                     file: {name: fileName},
                     isReceipt: false,
                     hasBeenFlagged: attribs['data-flagged'] === 'true',
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 6b65fb56ea24..2b7efc37dc51 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -227,7 +227,7 @@ function Button(
                     large && styles.buttonLargeText,
                     success && styles.buttonSuccessText,
                     danger && styles.buttonDangerText,
-                    Boolean(icon) && styles.textAlignLeft,
+                    !!icon && styles.textAlignLeft,
                     textStyles,
                 ]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
@@ -333,7 +333,7 @@ function Button(
                 ]}
                 style={[
                     styles.button,
-                    StyleUtils.getButtonStyleWithIcon(styles, small, medium, large, Boolean(icon), Boolean(text?.length > 0), shouldShowRightIcon),
+                    StyleUtils.getButtonStyleWithIcon(styles, small, medium, large, !!icon, !!(text?.length > 0), shouldShowRightIcon),
                     success ? styles.buttonSuccess : undefined,
                     danger ? styles.buttonDanger : undefined,
                     isDisabled ? styles.buttonOpacityDisabled : undefined,
diff --git a/src/components/ConfirmedRoute.tsx b/src/components/ConfirmedRoute.tsx
index d9cbbc8f248f..08dabbe3a0d1 100644
--- a/src/components/ConfirmedRoute.tsx
+++ b/src/components/ConfirmedRoute.tsx
@@ -90,7 +90,7 @@ function ConfirmedRoute({mapboxAccessToken, transaction, interactive}: Confirmed
         return MapboxToken.stop;
     }, []);
 
-    return !isOffline && Boolean(mapboxAccessToken?.token) ? (
+    return !isOffline && !!mapboxAccessToken?.token ? (
         <DistanceMapView
             interactive={interactive}
             accessToken={mapboxAccessToken?.token ?? ''}
diff --git a/src/components/DatePicker/CalendarPicker/index.tsx b/src/components/DatePicker/CalendarPicker/index.tsx
index 1b290aacd30d..7710519264db 100644
--- a/src/components/DatePicker/CalendarPicker/index.tsx
+++ b/src/components/DatePicker/CalendarPicker/index.tsx
@@ -235,7 +235,7 @@ function CalendarPicker({
                                 style={themeStyles.calendarDayRoot}
                                 accessibilityLabel={day?.toString() ?? ''}
                                 tabIndex={day ? 0 : -1}
-                                accessible={Boolean(day)}
+                                accessible={!!day}
                                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {({hovered, pressed}) => (
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index 91b8b0fc4483..0b0c3ddf27ca 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -74,7 +74,7 @@ function DisplayNamesWithToolTip({shouldUseFullTitle, fullTitle, displayNamesWit
                       </Fragment>
                   ))}
             {renderAdditionalText?.()}
-            {Boolean(isEllipsisActive) && (
+            {!!isEllipsisActive && (
                 <View style={styles.displayNameTooltipEllipsis}>
                     <Tooltip text={fullTitle}>
                         {/* There is some Gap for real ellipsis so we are adding 4 `.` to cover */}
diff --git a/src/components/FocusableMenuItem.tsx b/src/components/FocusableMenuItem.tsx
index 7868e6e11b0e..fc873196231d 100644
--- a/src/components/FocusableMenuItem.tsx
+++ b/src/components/FocusableMenuItem.tsx
@@ -8,7 +8,7 @@ function FocusableMenuItem(props: MenuItemProps) {
     const ref = useRef<View>(null);
 
     // Sync focus on an item
-    useSyncFocus(ref, Boolean(props.focused));
+    useSyncFocus(ref, !!props.focused);
 
     return (
         <MenuItem
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
index d918007e5750..4b78b68fe3d9 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
@@ -22,7 +22,7 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) {
     const htmlAttribs = tnode.attributes;
     const {environmentURL} = useEnvironment();
     // An auth token is needed to download Expensify chat attachments
-    const isAttachment = Boolean(htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]);
+    const isAttachment = !!htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
     const tNodeChild = tnode?.domNode?.children?.[0];
     const displayName = tNodeChild && 'data' in tNodeChild && typeof tNodeChild.data === 'string' ? tNodeChild.data : '';
     const parentStyle = tnode.parent?.styles?.nativeTextRet ?? {};
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
index 03f7a5dbedf7..a548f39372ec 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
@@ -11,7 +11,7 @@ function EditedRenderer({tnode, TDefaultRenderer, style, ...defaultRendererProps
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const isPendingDelete = Boolean(tnode.attributes.deleted !== undefined);
+    const isPendingDelete = !!(tnode.attributes.deleted !== undefined);
     return (
         <Text>
             <Text
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
index 79eaa30ee922..361ddb3af754 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
@@ -50,7 +50,7 @@ function ImageRenderer({tnode}: ImageRendererProps) {
     //           control and thus require no authToken to verify access.
     //
     const attachmentSourceAttribute = htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
-    const isAttachmentOrReceipt = Boolean(attachmentSourceAttribute);
+    const isAttachmentOrReceipt = !!attachmentSourceAttribute;
 
     // Files created/uploaded/hosted by App should resolve from API ROOT. Other URLs aren't modified
     const previewSource = tryResolveUrlFromApiRoot(htmlAttribs.src);
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index bf97346940a5..86a7a9cabcb6 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -30,7 +30,7 @@ function Header({title = '', subtitle = '', textStyles = [], containerStyles = [
             <>
                 {/* If there's no subtitle then display a fragment to avoid an empty space which moves the main title */}
                 {typeof subtitle === 'string'
-                    ? Boolean(subtitle) && (
+                    ? !!subtitle && (
                           <Text
                               style={[styles.mutedTextLabel, styles.pre]}
                               numberOfLines={1}
@@ -47,7 +47,7 @@ function Header({title = '', subtitle = '', textStyles = [], containerStyles = [
         <View style={[styles.flex1, styles.flexRow, containerStyles]}>
             <View style={styles.mw100}>
                 {typeof title === 'string'
-                    ? Boolean(title) && (
+                    ? !!title && (
                           <Text
                               numberOfLines={2}
                               style={[styles.headerText, styles.textLarge, textStyles]}
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index b1021350435c..49f42b7f88c3 100644
--- a/src/components/MapView/MapView.tsx
+++ b/src/components/MapView/MapView.tsx
@@ -145,7 +145,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
         };
 
         const centerCoordinate = currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location;
-        return !isOffline && Boolean(accessToken) && Boolean(currentPosition) ? (
+        return !isOffline && !!accessToken && !!currentPosition ? (
             <View style={[style, !interactive ? styles.pointerEventsNone : {}]}>
                 <Mapbox.MapView
                     style={{flex: 1}}
diff --git a/src/components/MapView/MapView.website.tsx b/src/components/MapView/MapView.website.tsx
index e16289ee948d..80a347d2f727 100644
--- a/src/components/MapView/MapView.website.tsx
+++ b/src/components/MapView/MapView.website.tsx
@@ -178,7 +178,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
             [mapRef],
         );
 
-        return !isOffline && Boolean(accessToken) && Boolean(currentPosition) ? (
+        return !isOffline && !!accessToken && !!currentPosition ? (
             <View
                 style={style}
                 // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/MentionSuggestions.tsx b/src/components/MentionSuggestions.tsx
index a787ac5ded56..877133b196cc 100644
--- a/src/components/MentionSuggestions.tsx
+++ b/src/components/MentionSuggestions.tsx
@@ -110,7 +110,7 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe
                     >
                         {styledHandle?.map(
                             ({text, isColored}, i) =>
-                                Boolean(text) && (
+                                !!text && (
                                     <Text
                                         // eslint-disable-next-line react/no-array-index-key
                                         key={`${text}${i}`}
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 33f1258e60c7..123e45ec200a 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -916,14 +916,14 @@ function MoneyRequestConfirmationList({
             item: (
                 <MenuItemWithTopDescription
                     key={translate('common.rate')}
-                    shouldShowRightIcon={Boolean(rate) && !isReadOnly && isPolicyExpenseChat}
+                    shouldShowRightIcon={!!rate && !isReadOnly && isPolicyExpenseChat}
                     title={DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline)}
                     description={translate('common.rate')}
                     style={[styles.moneyRequestMenuItem]}
                     titleStyle={styles.flex1}
                     onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
                     disabled={didConfirm}
-                    interactive={Boolean(rate) && !isReadOnly && isPolicyExpenseChat}
+                    interactive={!!rate && !isReadOnly && isPolicyExpenseChat}
                 />
             ),
             shouldShow: isDistanceRequest && canUseP2PDistanceRequests,
diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index c9bf5d7b9db2..fe7942f30024 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -124,7 +124,7 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
             }
 
             Object.values(reports ?? {})
-                .filter((report) => Boolean(Object.keys(report?.participants ?? {}).includes(accountID)) || (ReportUtils.isSelfDM(report) && report?.ownerAccountID === Number(accountID)))
+                .filter((report) => !!Object.keys(report?.participants ?? {}).includes(accountID) || (ReportUtils.isSelfDM(report) && report?.ownerAccountID === Number(accountID)))
                 .forEach((report) => {
                     if (!report) {
                         return;
diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index fc21d3d8b780..b3b59fcb856a 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -55,13 +55,13 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
                 style={[styles.optionAlternateText]}
                 numberOfLines={1}
             >
-                {Boolean(reportName) && (
+                {!!reportName && (
                     <>
                         <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{`${translate('threads.from')} `}</Text>
                         <Text style={[styles.optionAlternateText, styles.textLabelSupporting, styles.link]}>{reportName}</Text>
                     </>
                 )}
-                {Boolean(workspaceName) && <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{` ${translate('threads.in')} ${workspaceName}`}</Text>}
+                {!!workspaceName && <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{` ${translate('threads.in')} ${workspaceName}`}</Text>}
             </Text>
         </PressableWithoutFeedback>
     );
diff --git a/src/components/Pressable/PressableWithFeedback.tsx b/src/components/Pressable/PressableWithFeedback.tsx
index 74ea4596046e..d50404873eeb 100644
--- a/src/components/Pressable/PressableWithFeedback.tsx
+++ b/src/components/Pressable/PressableWithFeedback.tsx
@@ -49,7 +49,7 @@ function PressableWithFeedback(
 
     return (
         <OpacityView
-            shouldDim={Boolean(!rest.disabled && (isPressed || isHovered))}
+            shouldDim={!!(!rest.disabled && (isPressed || isHovered))}
             dimmingValue={isPressed ? pressDimmingValue : hoverDimmingValue}
             style={wrapperStyle}
             needsOffscreenAlphaCompositing={needsOffscreenAlphaCompositing}
diff --git a/src/components/RadioButtonWithLabel.tsx b/src/components/RadioButtonWithLabel.tsx
index 9b93d7900772..50cca4abcf03 100644
--- a/src/components/RadioButtonWithLabel.tsx
+++ b/src/components/RadioButtonWithLabel.tsx
@@ -60,7 +60,7 @@ function RadioButtonWithLabel({LabelComponent, style, label = '', hasError = fal
                     hoverDimmingValue={0.8}
                     pressDimmingValue={0.5}
                 >
-                    {Boolean(label) && <Text style={[styles.ml1]}>{label}</Text>}
+                    {!!label && <Text style={[styles.ml1]}>{label}</Text>}
                     {!!LabelComponent && <LabelComponent />}
                 </PressableWithFeedback>
             </View>
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 139b5fde58b2..64f0bf45e704 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -45,7 +45,7 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
     const formattedTotalAmount = CurrencyUtils.convertToDisplayString(totalDisplaySpend, report.currency);
     const formattedOutOfPocketAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, report.currency);
     const formattedCompanySpendAmount = CurrencyUtils.convertToDisplayString(nonReimbursableSpend, report.currency);
-    const isPartiallyPaid = Boolean(report?.pendingFields?.partial);
+    const isPartiallyPaid = !!report?.pendingFields?.partial;
 
     const subAmountTextStyles: StyleProp<TextStyle> = [
         styles.taskTitleMenuItem,
@@ -124,7 +124,7 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
                                 </Text>
                             </View>
                         </View>
-                        {Boolean(shouldShowBreakdown) && (
+                        {!!shouldShowBreakdown && (
                             <>
                                 <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv1]}>
                                     <View style={[styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 4ff318bc3c47..74d8648b8c47 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -85,7 +85,7 @@ function MoneyRequestPreviewContent({
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const isScanning = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
     const isOnHold = TransactionUtils.isOnHold(transaction);
-    const isSettlementOrApprovalPartial = Boolean(iouReport?.pendingFields?.partial);
+    const isSettlementOrApprovalPartial = !!iouReport?.pendingFields?.partial;
     const isPartialHold = isSettlementOrApprovalPartial && isOnHold;
     const hasViolations = TransactionUtils.hasViolation(transaction?.transactionID ?? '', transactionViolations);
     const hasNoticeTypeViolations = TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations);
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 0380780e0ccb..0bb1be6eb67f 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -122,7 +122,7 @@ function MoneyRequestView({
     const isEmptyMerchant = transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const formattedTransactionAmount = transactionAmount ? CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency) : '';
-    const hasPendingWaypoints = Boolean(transaction?.pendingFields?.waypoints);
+    const hasPendingWaypoints = !!transaction?.pendingFields?.waypoints;
     const showMapAsImage = isDistanceRequest && hasPendingWaypoints;
     const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && CurrencyUtils.convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
@@ -329,7 +329,7 @@ function MoneyRequestView({
                 {!isInvoice && (
                     <ReceiptAuditHeader
                         notes={noticeTypeViolations}
-                        shouldShowAuditMessage={Boolean(shouldShowNotesViolations && didRceiptScanSucceed)}
+                        shouldShowAuditMessage={!!(shouldShowNotesViolations && didRceiptScanSucceed)}
                     />
                 )}
                 {shouldShowMapOrReceipt && (
diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
index 4e7f123a2fb2..32b563a4385a 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -70,7 +70,7 @@ function ReportActionItemImage({
     const attachmentModalSource = tryResolveUrlFromApiRoot(image ?? '');
     const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail ?? '');
     const isEReceipt = transaction && TransactionUtils.hasEReceipt(transaction);
-    const isDistanceRequest = Boolean(transaction && TransactionUtils.isDistanceRequest(transaction));
+    const isDistanceRequest = !!(transaction && TransactionUtils.isDistanceRequest(transaction));
 
     let propsObj: ReceiptImageProps;
 
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 5876e476afa2..01c5443f4dc3 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -40,7 +40,7 @@ function BaseListItem<TItem extends ListItem>({
     const pressableRef = useRef<View>(null);
 
     // Sync focus on an item
-    useSyncFocus(pressableRef, Boolean(isFocused), shouldSyncFocus);
+    useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
diff --git a/src/components/TextInput/BaseTextInput/index.native.tsx b/src/components/TextInput/BaseTextInput/index.native.tsx
index 4f0c7dd71116..283558318284 100644
--- a/src/components/TextInput/BaseTextInput/index.native.tsx
+++ b/src/components/TextInput/BaseTextInput/index.native.tsx
@@ -242,7 +242,7 @@ function BaseTextInput(
         setPasswordHidden((prevPasswordHidden) => !prevPasswordHidden);
     }, []);
 
-    const hasLabel = Boolean(label?.length);
+    const hasLabel = !!label?.length;
     const isReadOnly = inputProps.readOnly ?? inputProps.disabled;
     // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and errorText can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
diff --git a/src/components/TextInput/BaseTextInput/index.tsx b/src/components/TextInput/BaseTextInput/index.tsx
index c73509aa7b8f..7083f45519f6 100644
--- a/src/components/TextInput/BaseTextInput/index.tsx
+++ b/src/components/TextInput/BaseTextInput/index.tsx
@@ -239,7 +239,7 @@ function BaseTextInput(
         setPasswordHidden((prevPasswordHidden: boolean | undefined) => !prevPasswordHidden);
     }, []);
 
-    const hasLabel = Boolean(label?.length);
+    const hasLabel = !!label?.length;
     const isReadOnly = inputProps.readOnly ?? inputProps.disabled;
     // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and errorText can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -328,7 +328,7 @@ function BaseTextInput(
                                     />
                                 </View>
                             )}
-                            {Boolean(prefixCharacter) && (
+                            {!!prefixCharacter && (
                                 <View style={[styles.textInputPrefixWrapper, prefixContainerStyle]}>
                                     <Text
                                         tabIndex={-1}
@@ -405,7 +405,7 @@ function BaseTextInput(
                                     style={[styles.mt4, styles.ml1]}
                                 />
                             )}
-                            {Boolean(inputProps.secureTextEntry) && (
+                            {!!inputProps.secureTextEntry && (
                                 <Checkbox
                                     style={[styles.flex1, styles.textInputIconContainer]}
                                     onPress={togglePasswordVisibility}
diff --git a/src/components/TextInput/index.tsx b/src/components/TextInput/index.tsx
index 75c4d52e0f86..a9dda9e956cf 100644
--- a/src/components/TextInput/index.tsx
+++ b/src/components/TextInput/index.tsx
@@ -43,7 +43,7 @@ function TextInput(props: BaseTextInputProps, ref: ForwardedRef<BaseTextInputRef
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    const isLabeledMultiline = Boolean(props.label?.length) && props.multiline;
+    const isLabeledMultiline = !!props.label?.length && props.multiline;
     const labelAnimationStyle = {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         '--active-label-translate-y': `${styleConst.ACTIVE_LABEL_TRANSLATE_Y}px`,
diff --git a/src/libs/CurrencyUtils.ts b/src/libs/CurrencyUtils.ts
index ec2423833087..a6cadccd3b14 100644
--- a/src/libs/CurrencyUtils.ts
+++ b/src/libs/CurrencyUtils.ts
@@ -148,7 +148,7 @@ function convertToDisplayStringWithoutCurrency(amountInCents: number, currency:
  */
 function isValidCurrencyCode(currencyCode: string): boolean {
     const currency = currencyList?.[currencyCode];
-    return Boolean(currency);
+    return !!currency;
 }
 
 export {
diff --git a/src/libs/EmojiUtils.ts b/src/libs/EmojiUtils.ts
index 3b189dbb084f..1e18ccb62154 100644
--- a/src/libs/EmojiUtils.ts
+++ b/src/libs/EmojiUtils.ts
@@ -517,13 +517,13 @@ const enrichEmojiReactionWithTimestamps = (emoji: ReportActionReaction, emojiNam
  */
 function hasAccountIDEmojiReacted(accountID: number, usersReactions: UsersReactions, skinTone?: number) {
     if (skinTone === undefined) {
-        return Boolean(usersReactions[accountID]);
+        return !!usersReactions[accountID];
     }
     const userReaction = usersReactions[accountID];
     if (!userReaction?.skinTones || !Object.values(userReaction?.skinTones ?? {}).length) {
         return false;
     }
-    return Boolean(userReaction.skinTones[skinTone]);
+    return !!userReaction.skinTones[skinTone];
 }
 
 /**
diff --git a/src/libs/Environment/betaChecker/index.android.ts b/src/libs/Environment/betaChecker/index.android.ts
index 4b912e0daaa5..2d92c6ac623f 100644
--- a/src/libs/Environment/betaChecker/index.android.ts
+++ b/src/libs/Environment/betaChecker/index.android.ts
@@ -10,7 +10,7 @@ let isLastSavedBeta = false;
 Onyx.connect({
     key: ONYXKEYS.IS_BETA,
     callback: (value) => {
-        isLastSavedBeta = Boolean(value);
+        isLastSavedBeta = !!value;
     },
 });
 
diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index 842776d0c8dd..ed939615dfd5 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -20,8 +20,8 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        shouldFailAllRequests = Boolean(network.shouldFailAllRequests);
-        shouldForceOffline = Boolean(network.shouldForceOffline);
+        shouldFailAllRequests = !!network.shouldFailAllRequests;
+        shouldForceOffline = !!network.shouldForceOffline;
     },
 });
 
@@ -159,7 +159,7 @@ function xhr(command: string, data: Record<string, unknown>, type: RequestType =
     });
 
     const url = ApiUtils.getCommandURL({shouldUseSecure, command});
-    return processHTTPRequest(url, type, formData, Boolean(data.canCancel));
+    return processHTTPRequest(url, type, formData, !!data.canCancel);
 }
 
 function cancelPendingRequests() {
diff --git a/src/libs/Log.ts b/src/libs/Log.ts
index 101996870e1d..6495a6f3d42c 100644
--- a/src/libs/Log.ts
+++ b/src/libs/Log.ts
@@ -24,7 +24,7 @@ Onyx.connect({
             shouldCollectLogs = false;
         }
 
-        shouldCollectLogs = Boolean(val);
+        shouldCollectLogs = !!val;
     },
 });
 
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
index 7f26177eeb0f..e875073d60df 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
@@ -46,7 +46,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
         const currentRoute = routes?.[navigationState?.index ?? 0];
         // When we are redirected to the Settings tab from the OldDot, we don't want to call the Welcome.show() method.
         // To prevent this, the value of the bottomTabRoute?.name is checked here
-        if (Boolean(currentRoute && currentRoute.name !== NAVIGATORS.BOTTOM_TAB_NAVIGATOR && currentRoute.name !== NAVIGATORS.CENTRAL_PANE_NAVIGATOR) || Session.isAnonymousUser()) {
+        if (!!(currentRoute && currentRoute.name !== NAVIGATORS.BOTTOM_TAB_NAVIGATOR && currentRoute.name !== NAVIGATORS.CENTRAL_PANE_NAVIGATOR) || Session.isAnonymousUser()) {
             return;
         }
 
diff --git a/src/libs/Navigation/linkTo.ts b/src/libs/Navigation/linkTo.ts
index 50050e4b8ff4..50a855934c5e 100644
--- a/src/libs/Navigation/linkTo.ts
+++ b/src/libs/Navigation/linkTo.ts
@@ -155,7 +155,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
         const topRouteName = rootState?.routes?.at(-1)?.name;
         const isTargetNavigatorOnTop = topRouteName === action.payload.name;
 
-        const isTargetScreenDifferentThanCurrent = Boolean(topmostCentralPaneRoute && topmostCentralPaneRoute.name !== action.payload.params?.screen);
+        const isTargetScreenDifferentThanCurrent = !!(topmostCentralPaneRoute && topmostCentralPaneRoute.name !== action.payload.params?.screen);
         const areParamsDifferent =
             action.payload.params?.screen === SCREENS.REPORT
                 ? getTopmostReportId(rootState) !== getTopmostReportId(stateFromPath)
diff --git a/src/libs/Network/NetworkStore.ts b/src/libs/Network/NetworkStore.ts
index 086beddc970e..6b3ea2e82225 100644
--- a/src/libs/Network/NetworkStore.ts
+++ b/src/libs/Network/NetworkStore.ts
@@ -81,7 +81,7 @@ Onyx.connect({
             triggerReconnectCallback();
         }
 
-        offline = Boolean(network.shouldForceOffline) || !!network.isOffline;
+        offline = !!network.shouldForceOffline || !!network.isOffline;
     },
 });
 
diff --git a/src/libs/NetworkConnection.ts b/src/libs/NetworkConnection.ts
index 6e8cc165afff..04dc2d07b08f 100644
--- a/src/libs/NetworkConnection.ts
+++ b/src/libs/NetworkConnection.ts
@@ -68,7 +68,7 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        const currentShouldForceOffline = Boolean(network.shouldForceOffline);
+        const currentShouldForceOffline = !!network.shouldForceOffline;
         if (currentShouldForceOffline === shouldForceOffline) {
             return;
         }
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 6a26b1a6cfc2..d33f3d38f49f 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -116,7 +116,7 @@ function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<t
 function shouldShowPolicy(policy: OnyxEntry<Policy>, isOffline: boolean): boolean {
     return (
         !!policy &&
-        (policy?.isPolicyExpenseChatEnabled || Boolean(policy?.isJoinRequestPending)) &&
+        (policy?.isPolicyExpenseChatEnabled || !!policy?.isJoinRequestPending) &&
         (isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0)
     );
 }
@@ -290,7 +290,7 @@ function extractPolicyIDFromPath(path: string) {
  * Whether the policy has active accounting integration connections
  */
 function hasAccountingConnections(policy: OnyxEntry<Policy>) {
-    return Boolean(policy?.connections);
+    return !!policy?.connections;
 }
 
 function getPathWithoutPolicyID(path: string) {
@@ -323,10 +323,10 @@ function canEditTaxRate(policy: Policy, taxID: string): boolean {
 
 function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
     if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
-        return Boolean(policy?.tax?.trackingEnabled);
+        return !!policy?.tax?.trackingEnabled;
     }
 
-    return Boolean(policy?.[featureName]);
+    return !!policy?.[featureName];
 }
 
 function getApprovalWorkflow(policy: OnyxEntry<Policy> | EmptyObject): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
diff --git a/src/libs/Pusher/pusher.ts b/src/libs/Pusher/pusher.ts
index 48c5e5c1409f..b695582edcf1 100644
--- a/src/libs/Pusher/pusher.ts
+++ b/src/libs/Pusher/pusher.ts
@@ -63,7 +63,7 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        shouldForceOffline = Boolean(network.shouldForceOffline);
+        shouldForceOffline = !!network.shouldForceOffline;
     },
 });
 
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 906a2963baa8..543e8627d072 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -870,7 +870,7 @@ function getOneTransactionThreadReportID(
             // - they have an assocaited IOU transaction ID or
             // - they have visibile childActions (like comments) that we'd want to display
             // - the action is pending deletion and the user is offline
-            (Boolean(action.originalMessage.IOUTransactionID) ||
+            (!!action.originalMessage.IOUTransactionID ||
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 (isMessageDeleted(action) && action.childVisibleActionCount) ||
                 (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline))),
@@ -1135,7 +1135,7 @@ function isReportActionUnread(reportAction: OnyxEntry<ReportAction>, lastReadTim
         return !isCreatedAction(reportAction);
     }
 
-    return Boolean(reportAction && lastReadTime && reportAction.created && lastReadTime < reportAction.created);
+    return !!(reportAction && lastReadTime && reportAction.created && lastReadTime < reportAction.created);
 }
 
 /**
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index b8e4c448fdc2..a822cc5c340e 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -781,7 +781,7 @@ function isCompletedTaskReport(report: OnyxEntry<Report>): boolean {
  * Checks if the current user is the manager of the supplied report
  */
 function isReportManager(report: OnyxEntry<Report>): boolean {
-    return Boolean(report && report.managerID === currentUserAccountID);
+    return !!(report && report.managerID === currentUserAccountID);
 }
 
 /**
@@ -847,7 +847,7 @@ function isCurrentUserSubmitter(reportID: string): boolean {
         return false;
     }
     const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
-    return Boolean(report && report.ownerAccountID === currentUserAccountID);
+    return !!(report && report.ownerAccountID === currentUserAccountID);
 }
 
 /**
@@ -1020,7 +1020,7 @@ function isWorkspaceTaskReport(report: OnyxEntry<Report>): boolean {
  * Returns true if report has a parent
  */
 function isThread(report: OnyxEntry<Report>): boolean {
-    return Boolean(report?.parentReportID && report?.parentReportActionID);
+    return !!(report?.parentReportID && report?.parentReportActionID);
 }
 
 /**
@@ -1649,14 +1649,12 @@ function canShowReportRecipientLocalTime(personalDetails: OnyxCollection<Persona
     const reportRecipient = personalDetails?.[reportRecipientAccountIDs[0]];
     const reportRecipientTimezone = reportRecipient?.timezone ?? CONST.DEFAULT_TIME_ZONE;
     const isReportParticipantValidated = reportRecipient?.validated ?? false;
-    return Boolean(
-        !hasMultipleParticipants &&
+    return !!(!hasMultipleParticipants &&
             !isChatRoom(report) &&
             !isPolicyExpenseChat(getRootParentReport(report)) &&
             reportRecipient &&
             reportRecipientTimezone?.selected &&
-            isReportParticipantValidated,
-    );
+            isReportParticipantValidated);
 }
 
 /**
@@ -2262,7 +2260,7 @@ function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): bo
     // lastMentionedTime and lastReadTime are both datetime strings and can be compared directly
     const lastMentionedTime = reportOrOption.lastMentionedTime ?? '';
     const lastReadTime = reportOrOption.lastReadTime ?? '';
-    return Boolean('isUnreadWithMention' in reportOrOption && reportOrOption.isUnreadWithMention) || lastReadTime < lastMentionedTime;
+    return !!('isUnreadWithMention' in reportOrOption && reportOrOption.isUnreadWithMention) || lastReadTime < lastMentionedTime;
 }
 
 /**
@@ -2696,15 +2694,13 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
 function canEditReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
     const isCommentOrIOU = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU;
 
-    return Boolean(
-        reportAction?.actorAccountID === currentUserAccountID &&
+    return !!(reportAction?.actorAccountID === currentUserAccountID &&
             isCommentOrIOU &&
             canEditMoneyRequest(reportAction) && // Returns true for non-IOU actions
             !ReportActionsUtils.isReportActionAttachment(reportAction) &&
             !ReportActionsUtils.isDeletedAction(reportAction) &&
             !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
-            reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-    );
+            reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
 /**
@@ -5302,15 +5298,13 @@ function canFlagReportAction(reportAction: OnyxEntry<ReportAction>, reportID: st
         return false;
     }
 
-    return Boolean(
-        !isCurrentUserAction &&
+    return !!(!isCurrentUserAction &&
             reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT &&
             !ReportActionsUtils.isDeletedAction(reportAction) &&
             !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
             !isEmptyObject(report) &&
             report &&
-            isAllowedToComment(report),
-    );
+            isAllowedToComment(report));
 }
 
 /**
@@ -5464,7 +5458,7 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
 
     let isOwnPolicyExpenseChat = report?.isOwnPolicyExpenseChat ?? false;
     if (isExpenseReport(report) && getParentReport(report)) {
-        isOwnPolicyExpenseChat = Boolean(getParentReport(report)?.isOwnPolicyExpenseChat);
+        isOwnPolicyExpenseChat = !!getParentReport(report)?.isOwnPolicyExpenseChat;
     }
 
     // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't submit expenses from such report
@@ -5688,7 +5682,7 @@ function canLeaveRoom(report: OnyxEntry<Report>, isPolicyEmployee: boolean): boo
 }
 
 function isCurrentUserTheOnlyParticipant(participantAccountIDs?: number[]): boolean {
-    return Boolean(participantAccountIDs?.length === 1 && participantAccountIDs?.[0] === currentUserAccountID);
+    return !!(participantAccountIDs?.length === 1 && participantAccountIDs?.[0] === currentUserAccountID);
 }
 
 /**
@@ -6078,8 +6072,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
  *
  */
 function isDeprecatedGroupDM(report: OnyxEntry<Report>): boolean {
-    return Boolean(
-        report &&
+    return !!(report &&
             !isChatThread(report) &&
             !isTaskReport(report) &&
             !isInvoiceReport(report) &&
@@ -6088,8 +6081,7 @@ function isDeprecatedGroupDM(report: OnyxEntry<Report>): boolean {
             !Object.values(CONST.REPORT.CHAT_TYPE).some((chatType) => chatType === getChatType(report)) &&
             Object.keys(report.participants ?? {})
                 .map(Number)
-                .filter((accountID) => accountID !== currentUserAccountID).length > 1,
-    );
+                .filter((accountID) => accountID !== currentUserAccountID).length > 1);
 }
 
 /**
@@ -6103,7 +6095,7 @@ function isRootGroupChat(report: OnyxEntry<Report>): boolean {
  * Assume any report without a reportID is unusable.
  */
 function isValidReport(report?: OnyxEntry<Report>): boolean {
-    return Boolean(report?.reportID);
+    return !!report?.reportID;
 }
 
 /**
diff --git a/src/libs/SessionUtils.ts b/src/libs/SessionUtils.ts
index 52521d5146cc..e8854e158b48 100644
--- a/src/libs/SessionUtils.ts
+++ b/src/libs/SessionUtils.ts
@@ -50,7 +50,7 @@ function resetDidUserLogInDuringSession() {
 }
 
 function didUserLogInDuringSession() {
-    return Boolean(loggedInDuringSession);
+    return !!loggedInDuringSession;
 }
 
 export {isLoggingInAsNewUser, didUserLogInDuringSession, resetDidUserLogInDuringSession};
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 79e73f1585d2..2309795b0b35 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -58,7 +58,7 @@ function isScanRequest(transaction: OnyxEntry<Transaction>): boolean {
         return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN;
     }
 
-    return Boolean(transaction?.receipt?.source);
+    return !!transaction?.receipt?.source;
 }
 
 function getRequestType(transaction: OnyxEntry<Transaction>): IOURequestType {
@@ -509,7 +509,7 @@ function didRceiptScanSucceed(transaction: OnyxEntry<Transaction>): boolean {
  * Check if the transaction has a non-smartscanning receipt and is missing required fields
  */
 function hasMissingSmartscanFields(transaction: OnyxEntry<Transaction>): boolean {
-    return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
+    return !!(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
 }
 
 /**
@@ -523,9 +523,7 @@ function getTransactionViolations(transactionID: string, transactionViolations:
  * Check if there is pending rter violation in transactionViolations.
  */
 function hasPendingRTERViolation(transactionViolations?: TransactionViolations | null): boolean {
-    return Boolean(
-        transactionViolations?.some((transactionViolation: TransactionViolation) => transactionViolation.name === CONST.VIOLATIONS.RTER && transactionViolation.data?.pendingPattern),
-    );
+    return !!transactionViolations?.some((transactionViolation: TransactionViolation) => transactionViolation.name === CONST.VIOLATIONS.RTER && transactionViolation.data?.pendingPattern);
 }
 
 /**
@@ -649,16 +647,14 @@ function isOnHoldByTransactionID(transactionID: string): boolean {
  * Checks if any violations for the provided transaction are of type 'violation'
  */
 function hasViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolations>): boolean {
-    return Boolean(
-        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION),
-    );
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION);
 }
 
 /**
  * Checks if any violations for the provided transaction are of type 'notice'
  */
 function hasNoticeTypeViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
-    return Boolean(transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === 'notice'));
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === 'notice');
 }
 
 /**
diff --git a/src/libs/ValidationUtils.ts b/src/libs/ValidationUtils.ts
index d5a87fc07e28..81727772b088 100644
--- a/src/libs/ValidationUtils.ts
+++ b/src/libs/ValidationUtils.ts
@@ -96,7 +96,7 @@ function isRequiredFulfilled(value?: FormValue | number[] | string[] | Record<st
     if (Array.isArray(value) || isObject(value)) {
         return !isEmpty(value);
     }
-    return Boolean(value);
+    return !!value;
 }
 
 /**
@@ -293,15 +293,15 @@ function isValidUSPhone(phoneNumber = '', isCountryCodeOptional?: boolean): bool
 }
 
 function isValidValidateCode(validateCode: string): boolean {
-    return Boolean(validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING));
+    return !!validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING);
 }
 
 function isValidRecoveryCode(recoveryCode: string): boolean {
-    return Boolean(recoveryCode.match(CONST.RECOVERY_CODE_REGEX_STRING));
+    return !!recoveryCode.match(CONST.RECOVERY_CODE_REGEX_STRING);
 }
 
 function isValidTwoFactorCode(code: string): boolean {
-    return Boolean(code.match(CONST.REGEX.CODE_2FA));
+    return !!code.match(CONST.REGEX.CODE_2FA);
 }
 
 /**
@@ -351,7 +351,7 @@ function isValidDisplayName(name: string): boolean {
  * Checks that the provided legal name doesn't contain special characters
  */
 function isValidLegalName(name: string): boolean {
-    const hasAccentedChars = Boolean(name.match(CONST.REGEX.ACCENT_LATIN_CHARS));
+    const hasAccentedChars = !!name.match(CONST.REGEX.ACCENT_LATIN_CHARS);
     return CONST.REGEX.ALPHABETIC_AND_LATIN_CHARS.test(name) && !hasAccentedChars;
 }
 
diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts
index 42f58be1d699..adb31d151dcc 100644
--- a/src/libs/Violations/ViolationsUtils.ts
+++ b/src/libs/Violations/ViolationsUtils.ts
@@ -69,7 +69,7 @@ function getTagViolationsForMultiLevelTags(
     const errorIndexes = [];
     for (let i = 0; i < policyTagKeys.length; i++) {
         const isTagRequired = policyTagList[policyTagKeys[i]].required ?? true;
-        const isTagSelected = Boolean(selectedTags[i]);
+        const isTagSelected = !!selectedTags[i];
         if (isTagRequired && (!isTagSelected || (selectedTags.length === 1 && selectedTags[0] === ''))) {
             errorIndexes.push(i);
         }
@@ -87,7 +87,7 @@ function getTagViolationsForMultiLevelTags(
         for (let i = 0; i < policyTagKeys.length; i++) {
             const selectedTag = selectedTags[i];
             const tags = policyTagList[policyTagKeys[i]].tags;
-            const isTagInPolicy = Object.values(tags).some((tag) => tag.name === selectedTag && Boolean(tag.enabled));
+            const isTagInPolicy = Object.values(tags).some((tag) => tag.name === selectedTag && !!tag.enabled);
             if (!isTagInPolicy) {
                 newTransactionViolations.push({
                     name: CONST.VIOLATIONS.TAG_OUT_OF_POLICY,
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 9fc1485cd6e5..51b6de1540a6 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -181,7 +181,7 @@ function isAnonymousUser(sessionParam?: OnyxEntry<Session>): boolean {
 }
 
 function hasStashedSession(): boolean {
-    return Boolean(stashedSession.authToken && stashedCredentials.autoGeneratedLogin && stashedCredentials.autoGeneratedLogin !== '');
+    return !!(stashedSession.authToken && stashedCredentials.autoGeneratedLogin && stashedCredentials.autoGeneratedLogin !== '');
 }
 
 /**
diff --git a/src/libs/models/BankAccount.ts b/src/libs/models/BankAccount.ts
index 611d77c99927..a8612df14687 100644
--- a/src/libs/models/BankAccount.ts
+++ b/src/libs/models/BankAccount.ts
@@ -153,7 +153,7 @@ class BankAccount {
      * Return whether this bank account has been risk checked
      */
     isRiskChecked() {
-        return Boolean(this.json.accountData?.riskChecked);
+        return !!this.json.accountData?.riskChecked;
     }
 
     /**
diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx
index 5cd0f3ef8026..ac02cd26879b 100644
--- a/src/pages/AddPersonalBankAccountPage.tsx
+++ b/src/pages/AddPersonalBankAccountPage.tsx
@@ -80,7 +80,7 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona
             ) : (
                 <FormProvider
                     formID={ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM}
-                    isSubmitButtonVisible={Boolean(selectedPlaidAccountId)}
+                    isSubmitButtonVisible={!!selectedPlaidAccountId}
                     submitButtonText={translate('common.saveAndContinue')}
                     scrollContextEnabled
                     onSubmit={submitBankAccountForm}
diff --git a/src/pages/ChatFinderPage/index.tsx b/src/pages/ChatFinderPage/index.tsx
index d4b856e6955e..9e907bb0bfaa 100644
--- a/src/pages/ChatFinderPage/index.tsx
+++ b/src/pages/ChatFinderPage/index.tsx
@@ -85,7 +85,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
             };
         }
         const optionList = OptionsListUtils.getSearchOptions(options, '', betas ?? []);
-        const header = OptionsListUtils.getHeaderMessage(optionList.recentReports.length + optionList.personalDetails.length !== 0, Boolean(optionList.userToInvite), '');
+        const header = OptionsListUtils.getHeaderMessage(optionList.recentReports.length + optionList.personalDetails.length !== 0, !!optionList.userToInvite, '');
         return {...optionList, headerMessage: header};
     }, [areOptionsInitialized, betas, isScreenTransitionEnd, options]);
 
diff --git a/src/pages/DetailsPage.tsx b/src/pages/DetailsPage.tsx
index 49b3e856c65d..804b5b7b664c 100755
--- a/src/pages/DetailsPage.tsx
+++ b/src/pages/DetailsPage.tsx
@@ -123,7 +123,7 @@ function DetailsPage({personalDetails, route, session}: DetailsPageProps) {
                                         </PressableWithoutFocus>
                                     )}
                                 </AttachmentModal>
-                                {Boolean(displayName) && (
+                                {!!displayName && (
                                     <Text
                                         style={[styles.textHeadline, styles.mb6, styles.pre]}
                                         numberOfLines={1}
diff --git a/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
index fe17ea7e1afb..1dde89a2988a 100644
--- a/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
+++ b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
@@ -101,7 +101,7 @@ function TermsStep() {
                     Navigation.navigate(ROUTES.SETTINGS_WALLET);
                 }}
                 message={errorMessage}
-                isAlertVisible={error || Boolean(errorMessage)}
+                isAlertVisible={error || !!errorMessage}
                 isLoading={!!walletTerms?.isLoading}
                 containerStyles={[styles.mh0, styles.mv5]}
             />
diff --git a/src/pages/EnablePayments/OnfidoPrivacy.tsx b/src/pages/EnablePayments/OnfidoPrivacy.tsx
index cf6e6837df16..ace91f315e32 100644
--- a/src/pages/EnablePayments/OnfidoPrivacy.tsx
+++ b/src/pages/EnablePayments/OnfidoPrivacy.tsx
@@ -72,7 +72,7 @@ function OnfidoPrivacy({walletOnfidoData = DEFAULT_WALLET_ONFIDO_DATA}: OnfidoPr
                     </FormScrollView>
                     <FixedFooter>
                         <FormAlertWithSubmitButton
-                            isAlertVisible={Boolean(onfidoError)}
+                            isAlertVisible={!!onfidoError}
                             onSubmit={openOnfidoFlow}
                             onFixTheErrorsLinkPressed={() => {
                                 formRef.current?.scrollTo({y: 0, animated: true});
diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
index e1b6a0ff3365..760bd0c03b88 100644
--- a/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
+++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
@@ -71,11 +71,11 @@ function LongTermsForm() {
                 <View style={[styles.longTermsRow]}>
                     <View style={[styles.flex4]}>
                         <Text>{section.title}</Text>
-                        {Boolean(section.subTitle) && <Text style={[styles.textMicroSupporting, styles.mt1]}>{section.subTitle}</Text>}
+                        {!!section.subTitle && <Text style={[styles.textMicroSupporting, styles.mt1]}>{section.subTitle}</Text>}
                     </View>
                     <View style={[styles.flex1, styles.termsCenterRight]}>
                         <Text style={[styles.textStrong, styles.textAlignRight]}>{section.rightText}</Text>
-                        {Boolean(section.subRightText) && <Text style={[styles.textMicroSupporting, styles.mt1, styles.textAlignRight]}>{section.subRightText}</Text>}
+                        {!!section.subRightText && <Text style={[styles.textMicroSupporting, styles.mt1, styles.textAlignRight]}>{section.subRightText}</Text>}
                     </View>
                 </View>
                 <Text style={[styles.textLabelSupporting, styles.mt2]}>{section.details}</Text>
diff --git a/src/pages/EnablePayments/TermsStep.tsx b/src/pages/EnablePayments/TermsStep.tsx
index 916a5200a2e0..47b941108c43 100644
--- a/src/pages/EnablePayments/TermsStep.tsx
+++ b/src/pages/EnablePayments/TermsStep.tsx
@@ -113,7 +113,7 @@ function TermsStep(props: TermsStepProps) {
                         });
                     }}
                     message={errorMessage}
-                    isAlertVisible={error || Boolean(errorMessage)}
+                    isAlertVisible={error || !!errorMessage}
                     isLoading={!!props.walletTerms?.isLoading}
                     containerStyles={[styles.mh0, styles.mv4]}
                 />
diff --git a/src/pages/GroupChatNameEditPage.tsx b/src/pages/GroupChatNameEditPage.tsx
index 87218fbb89cd..82cab39986b4 100644
--- a/src/pages/GroupChatNameEditPage.tsx
+++ b/src/pages/GroupChatNameEditPage.tsx
@@ -32,7 +32,7 @@ type GroupChatNameEditPageProps = StackScreenProps<NewChatNavigatorParamList, ty
 function GroupChatNameEditPage({groupChatDraft, route}: GroupChatNameEditPageProps) {
     // If we have a reportID this means we are using this page to update an existing Group Chat name
     const reportID = route.params?.reportID ?? '';
-    const isUpdatingExistingReport = Boolean(reportID);
+    const isUpdatingExistingReport = !!reportID;
 
     const styles = useThemeStyles();
     const {translate} = useLocalize();
diff --git a/src/pages/InviteReportParticipantsPage.tsx b/src/pages/InviteReportParticipantsPage.tsx
index 74bb5bec96d7..999890edadd7 100644
--- a/src/pages/InviteReportParticipantsPage.tsx
+++ b/src/pages/InviteReportParticipantsPage.tsx
@@ -184,7 +184,7 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
         ) {
             return translate('messages.userIsAlreadyMember', {login: searchValue, name: reportName ?? ''});
         }
-        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, Boolean(userToInvite), searchValue);
+        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, !!userToInvite, searchValue);
     }, [searchTerm, userToInvite, excludedUsers, invitePersonalDetails, translate, reportName]);
 
     return (
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index 82f67eb40c86..efb454c5d63c 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -144,7 +144,7 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     sections={[{title: translate('common.members'), data: sections}]}
                     ListItem={InviteMemberListItem}
                     onSelectRow={unselectOption}
-                    showConfirmButton={Boolean(selectedOptions.length)}
+                    showConfirmButton={!!selectedOptions.length}
                     confirmButtonText={translate('newChatPage.startGroup')}
                     onConfirm={createGroup}
                     shouldHideListOnInitialRender={false}
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 555a7c855d42..c9b0007ddbf6 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -75,7 +75,7 @@ function useOptions({isGroupChat}: NewChatPageProps) {
 
         const headerMessage = OptionsListUtils.getHeaderMessage(
             filteredOptions.personalDetails.length + filteredOptions.recentReports.length !== 0,
-            Boolean(filteredOptions.userToInvite),
+            !!filteredOptions.userToInvite,
             debouncedSearchTerm.trim(),
             selectedOptions.some((participant) => participant?.searchText?.toLowerCase?.().includes(debouncedSearchTerm.trim().toLowerCase())),
         );
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index fd328cc26cda..cbb714089a8d 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -140,7 +140,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
                             saveAndNavigate();
                         }}
                         message={errorMessage}
-                        isAlertVisible={error || Boolean(errorMessage)}
+                        isAlertVisible={error || !!errorMessage}
                         containerStyles={[styles.w100, styles.mb5, styles.mh0, paddingHorizontal]}
                     />
                 </View>
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index d5e556b25dd0..355704bafe1b 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -82,7 +82,7 @@ function ProfilePage({route}: ProfilePageProps) {
         const accountID = Number(route.params?.accountID ?? 0);
         const reportID = ReportUtils.getChatByParticipants(session?.accountID ? [accountID, session.accountID] : [], reports)?.reportID ?? '';
 
-        if ((Boolean(session) && Number(session?.accountID) === accountID) || SessionActions.isAnonymousUser() || !reportID) {
+        if ((!!session && Number(session?.accountID) === accountID) || SessionActions.isAnonymousUser() || !reportID) {
             return `${ONYXKEYS.COLLECTION.REPORT}0` as const;
         }
         return `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
@@ -118,7 +118,7 @@ function ProfilePage({route}: ProfilePageProps) {
     const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : login;
 
     const hasMinimumDetails = !isEmptyObject(details.avatar);
-    const isLoading = Boolean(personalDetailsMetadata?.[accountID]?.isLoading) || isEmptyObject(details);
+    const isLoading = !!personalDetailsMetadata?.[accountID]?.isLoading || isEmptyObject(details);
 
     // If the API returns an error for some reason there won't be any details and isLoading will get set to false, so we want to show a blocking screen
     const shouldShowBlockingView = !hasMinimumDetails && !isLoading;
@@ -170,7 +170,7 @@ function ProfilePage({route}: ProfilePageProps) {
                                         />
                                     </OfflineWithFeedback>
                                 </PressableWithoutFocus>
-                                {Boolean(displayName) && (
+                                {!!displayName && (
                                     <Text
                                         style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
                                         numberOfLines={1}
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
index 8c59e98f7218..c03ac2c0a86b 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
@@ -469,7 +469,7 @@ function ReimbursementAccountPage({
         return (
             <RequestorStep
                 ref={requestorStepRef}
-                shouldShowOnfido={Boolean(shouldShowOnfido)}
+                shouldShowOnfido={!!shouldShowOnfido}
                 onBackButtonPress={goBack}
             />
         );
diff --git a/src/pages/ReportParticipantDetailsPage.tsx b/src/pages/ReportParticipantDetailsPage.tsx
index b6ac1e29e5f2..259f5ec798b5 100644
--- a/src/pages/ReportParticipantDetailsPage.tsx
+++ b/src/pages/ReportParticipantDetailsPage.tsx
@@ -86,7 +86,7 @@ function ReportParticipantDetails({personalDetails, report, route}: ReportPartic
                         size={CONST.AVATAR_SIZE.XLARGE}
                         fallbackIcon={fallbackIcon}
                     />
-                    {Boolean(details.displayName ?? '') && (
+                    {!!(details.displayName ?? '') && (
                         <Text
                             style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
                             numberOfLines={1}
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index c78094594f16..d93929e62868 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -214,7 +214,7 @@ function RoomInvitePage({
         ) {
             return translate('messages.userIsAlreadyMember', {login: searchValue, name: reportName});
         }
-        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, Boolean(userToInvite), searchValue);
+        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, !!userToInvite, searchValue);
     }, [debouncedSearchTerm, userToInvite, excludedUsers, invitePersonalDetails, translate, reportName]);
 
     useEffect(() => {
diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx
index 468ca9b8082a..50df99d10581 100644
--- a/src/pages/Travel/TravelTerms.tsx
+++ b/src/pages/Travel/TravelTerms.tsx
@@ -95,7 +95,7 @@ function TravelTerms() {
                                     Navigation.resetToHome();
                                 }}
                                 message={errorMessage}
-                                isAlertVisible={error || Boolean(errorMessage)}
+                                isAlertVisible={error || !!errorMessage}
                                 containerStyles={[styles.mh0, styles.mt5]}
                             />
                         </ScrollView>
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 6cb688ff2558..a0e1d1bc50b9 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -187,7 +187,7 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         onEmojiPickerToggle.current = setIsEmojiPickerActive;
 
         new Promise<void>((resolve) => {
-            if (Boolean(!pageX && !pageY && contextMenuAnchorRef.current) || isOverflowMenu) {
+            if (!!(!pageX && !pageY && contextMenuAnchorRef.current) || isOverflowMenu) {
                 calculateAnchorPosition(contextMenuAnchorRef.current).then((position) => {
                     popoverAnchorPosition.current = {horizontal: position.horizontal, vertical: position.vertical};
                     contextMenuDimensions.current = {width: position.vertical, height: position.height};
diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx b/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
index 2cdcac65feae..8d29fe3c52bd 100644
--- a/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
+++ b/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
@@ -19,7 +19,7 @@ function PopoverReactionList(props: unknown, ref: ForwardedRef<ReactionListRef>)
         innerReactionListRef.current?.hideReactionList();
     };
 
-    const isActiveReportAction = (actionID: number | string) => Boolean(actionID) && reactionListReportActionID === actionID;
+    const isActiveReportAction = (actionID: number | string) => !!actionID && reactionListReportActionID === actionID;
 
     useImperativeHandle(ref, () => ({showReactionList, hideReactionList, isActiveReportAction}));
 
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 6cb03e8dae05..62b6982a48a3 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -109,8 +109,8 @@ function ReportActionItemMessageEdit(
         const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '');
         if (
             ReportActionsUtils.isDeletedAction(action) ||
-            Boolean(action.message && draftMessage === originalMessage) ||
-            Boolean(prevDraftMessage === draftMessage || isCommentPendingSaved.current)
+            !!(action.message && draftMessage === originalMessage) ||
+            !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)
         ) {
             return;
         }
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index a32900fdd502..6d59e868f639 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -106,7 +106,7 @@ function ReportActionItemParentAction({
             {allAncestors.map((ancestor) => (
                 <OfflineWithFeedback
                     key={ancestor.reportAction.reportActionID}
-                    shouldDisableOpacity={Boolean(ancestor.reportAction?.pendingAction)}
+                    shouldDisableOpacity={!!ancestor.reportAction?.pendingAction}
                     pendingAction={ancestor.report?.pendingFields?.addWorkspaceRoom ?? ancestor.report?.pendingFields?.createChat}
                     errors={ancestor.report?.errorFields?.addWorkspaceRoom ?? ancestor.report?.errorFields?.createChat}
                     errorRowStyles={[styles.ml10, styles.mr2]}
diff --git a/src/pages/home/report/ReportActionItemSingle.tsx b/src/pages/home/report/ReportActionItemSingle.tsx
index c082a9122dbb..b94cd0be2538 100644
--- a/src/pages/home/report/ReportActionItemSingle.tsx
+++ b/src/pages/home/report/ReportActionItemSingle.tsx
@@ -255,7 +255,7 @@ function ReportActionItemSingle({
                                 />
                             ))}
                         </PressableWithoutFeedback>
-                        {Boolean(hasEmojiStatus) && (
+                        {!!hasEmojiStatus && (
                             <Tooltip text={statusTooltipText}>
                                 <Text
                                     style={styles.userReportStatusEmoji}
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index d1e45f3998cd..94722bb35ec6 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -502,7 +502,7 @@ function ReportActionsView({
                 action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
                 action.originalMessage &&
                 (action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
-                    Boolean(action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && action.originalMessage.IOUDetails) ||
+                    !!(action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && action.originalMessage.IOUDetails) ||
                     action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK),
         );
 
@@ -529,7 +529,7 @@ function ReportActionsView({
         // Update pending action of created action if we have some requests that are pending
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const createdAction = actions.pop()!;
-        if (moneyRequestActions.filter((action) => Boolean(action.pendingAction)).length > 0) {
+        if (moneyRequestActions.filter((action) => !!action.pendingAction).length > 0) {
             createdAction.pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
         }
 
diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx
index 8056d9bcc413..c06b2464f5b1 100644
--- a/src/pages/home/sidebar/AllSettingsScreen.tsx
+++ b/src/pages/home/sidebar/AllSettingsScreen.tsx
@@ -82,7 +82,7 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) {
             iconRight: item.iconRight,
             onPress: item.action,
             shouldShowRightIcon: item.shouldShowRightIcon,
-            shouldBlockSelection: Boolean(item.link),
+            shouldBlockSelection: !!item.link,
             wrapperStyle: styles.sectionMenuItem,
             isPaneMenu: true,
             focused: item.focused,
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index b525a2c1e3dd..601a74cf1e5f 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -254,7 +254,7 @@ function MoneyRequestParticipantsSelector({participants = [], onFinish, onPartic
         () =>
             OptionsListUtils.getHeaderMessage(
                 ((newChatOptions as Options)?.personalDetails ?? []).length + ((newChatOptions as Options)?.recentReports ?? []).length !== 0,
-                Boolean((newChatOptions as Options)?.userToInvite),
+                !!(newChatOptions as Options)?.userToInvite,
                 debouncedSearchTerm.trim(),
                 participants.some((participant) => participant?.searchText?.toLowerCase().includes(debouncedSearchTerm.trim().toLowerCase())),
             ),
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
index 1b9ccf1876cf..ee7035201fb4 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
@@ -60,7 +60,7 @@ function IOURequestStepDistanceRate({
             alternateText: rate.name ? rateForDisplay : '',
             keyForList: rate.customUnitRateID,
             value: rate.customUnitRateID,
-            isSelected: lastSelectedRateID ? lastSelectedRateID === rate.customUnitRateID : Boolean(rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE),
+            isSelected: lastSelectedRateID ? lastSelectedRateID === rate.customUnitRateID : !!(rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE),
         };
     });
 
@@ -77,7 +77,7 @@ function IOURequestStepDistanceRate({
         <StepScreenWrapper
             headerTitle={translate('common.rate')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
+            shouldShowWrapper={!!backTo}
             testID="rate"
         >
             <Text style={[styles.mh5, styles.mv4]}>{translate('iou.chooseARate', {unit})}</Text>
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
index fc7d39b49089..fd83ba146ecc 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -63,7 +63,7 @@ function IOURequestStepMerchant({
     const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
     const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
 
-    const isMerchantRequired = ReportUtils.isReportInGroupPolicy(report) || transaction?.participants?.some((participant) => Boolean(participant.isPolicyExpenseChat));
+    const isMerchantRequired = ReportUtils.isReportInGroupPolicy(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);
     const navigateBack = () => {
         Navigation.goBack(backTo);
     };
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
index c022a079df65..f9090e77bb44 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -439,7 +439,7 @@ function IOURequestStepScan({
             includeSafeAreaPaddingBottom
             headerTitle={translate('common.receipt')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
+            shouldShowWrapper={!!backTo}
             testID={IOURequestStepScan.displayName}
         >
             {cameraPermissionStatus !== RESULTS.GRANTED && (
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
index ede79e009a49..2f626d312397 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -646,7 +646,7 @@ function IOURequestStepScan({
         <StepScreenDragAndDropWrapper
             headerTitle={translate('common.receipt')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
+            shouldShowWrapper={!!backTo}
             testID={IOURequestStepScan.displayName}
         >
             {(isDraggingOverWrapper) => (
diff --git a/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx b/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
index c2ee404b1205..184d228efdd6 100644
--- a/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
+++ b/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
@@ -51,7 +51,7 @@ function IOURequestStepSplitPayer({
         const participants = transaction?.participants ?? [];
         const participantOptions =
             [currentUserOption, ...participants]
-                ?.filter((participant) => Boolean(participant.accountID))
+                ?.filter((participant) => !!participant.accountID)
                 ?.map((participant) => OptionsListUtils.getParticipantsOption(participant, personalDetails)) ?? [];
         return [
             {
diff --git a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
index 94f8e2be2f6c..e04326ee1217 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
@@ -144,14 +144,14 @@ function IOURequestStepTaxAmountPage({
             headerTitle={translate('iou.taxAmount')}
             onBackButtonPress={navigateBack}
             testID={IOURequestStepTaxAmountPage.displayName}
-            shouldShowWrapper={Boolean(backTo || isEditing)}
+            shouldShowWrapper={!!(backTo || isEditing)}
             includeSafeAreaPaddingBottom
         >
             <MoneyRequestAmountForm
-                isEditing={Boolean(backTo || isEditing)}
+                isEditing={!!(backTo || isEditing)}
                 currency={currency}
                 amount={Math.abs(transactionDetails?.taxAmount ?? 0)}
-                taxAmount={getTaxAmount(transaction, policy, currency, Boolean(backTo || isEditing))}
+                taxAmount={getTaxAmount(transaction, policy, currency, !!(backTo || isEditing))}
                 ref={(e) => (textInput.current = e)}
                 onCurrencyButtonPress={navigateToCurrencySelectionPage}
                 onSubmitButtonPress={updateTaxAmount}
diff --git a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
index 05ec664fb4c0..e20803a3f8c6 100644
--- a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
+++ b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
@@ -42,7 +42,7 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
             userToInvite: localUserToInvite,
         } = OptionsListUtils.getShareLogOptions(options, debouncedSearchValue.trim(), betas ?? []);
 
-        const header = OptionsListUtils.getHeaderMessage((localRecentReports?.length || 0) + (localPersonalDetails?.length || 0) !== 0, Boolean(localUserToInvite), debouncedSearchValue);
+        const header = OptionsListUtils.getHeaderMessage((localRecentReports?.length || 0) + (localPersonalDetails?.length || 0) !== 0, !!localUserToInvite, debouncedSearchValue);
 
         return {
             recentReports: localRecentReports,
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 2dfeb1841a74..0bb331a3db38 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -324,7 +324,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                                 floatRightAvatarSize={item.avatarSize}
                                 ref={popoverAnchor}
                                 hoverAndPressStyle={styles.hoveredComponentBG}
-                                shouldBlockSelection={Boolean(item.link)}
+                                shouldBlockSelection={!!item.link}
                                 onSecondaryInteraction={item.link ? (event) => openPopover(item.link, event) : undefined}
                                 focused={
                                     !!activeRoute?.name && !!item.routeName && !!(activeRoute?.name.toLowerCase().replaceAll('_', '') === item.routeName.toLowerCase().replaceAll('/', ''))
@@ -436,7 +436,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                     >
                         {currentUserPersonalDetails.displayName ? currentUserPersonalDetails.displayName : formatPhoneNumber(session?.email ?? '')}
                     </Text>
-                    {Boolean(currentUserPersonalDetails.displayName) && (
+                    {!!currentUserPersonalDetails.displayName && (
                         <Text
                             style={[styles.textLabelSupporting, styles.mt1, styles.w100, styles.textAlignCenter]}
                             numberOfLines={1}
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
index dfa769077374..2782a632f599 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
@@ -74,7 +74,7 @@ function CodesStep({account, backTo}: CodesStepProps) {
                         ) : (
                             <>
                                 <View style={styles.twoFactorAuthCodesContainer}>
-                                    {Boolean(account?.recoveryCodes) &&
+                                    {!!account?.recoveryCodes &&
                                         account?.recoveryCodes?.split(', ').map((code) => (
                                             <Text
                                                 style={styles.twoFactorAuthCode}
@@ -122,7 +122,7 @@ function CodesStep({account, backTo}: CodesStepProps) {
                     </View>
                 </Section>
                 <FixedFooter style={[styles.mtAuto, styles.pt5]}>
-                    {Boolean(error) && (
+                    {!!error && (
                         <FormHelpMessage
                             isError
                             message={error}
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
index cfd233d61cf1..aeb388ff56b2 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
@@ -98,7 +98,7 @@ function VerifyStep({account}: VerifyStepProps) {
                     </View>
                     <Text style={styles.mt5}>{translate('twoFactorAuth.addKey')}</Text>
                     <View style={[styles.mt11, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                        {Boolean(account?.twoFactorAuthSecretKey) && <Text>{splitSecretInChunks(account?.twoFactorAuthSecretKey ?? '')}</Text>}
+                        {!!account?.twoFactorAuthSecretKey && <Text>{splitSecretInChunks(account?.twoFactorAuthSecretKey ?? '')}</Text>}
                         <PressableWithDelayToggle
                             text={translate('twoFactorAuth.copy')}
                             textChecked={translate('common.copied')}
diff --git a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
index 76f5f4c1bef3..22761c40da9c 100644
--- a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
+++ b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
@@ -71,7 +71,7 @@ function ReportVirtualCardFraudPage({
             <View style={[styles.flex1, styles.justifyContentBetween]}>
                 <Text style={[styles.webViewStyles.baseFontStyle, styles.mh5]}>{translate('reportFraudPage.description')}</Text>
                 <FormAlertWithSubmitButton
-                    isAlertVisible={Boolean(virtualCardError)}
+                    isAlertVisible={!!virtualCardError}
                     onSubmit={() => Card.reportVirtualExpensifyCardFraud(virtualCard.cardID)}
                     message={virtualCardError}
                     isLoading={formData?.isLoading}
diff --git a/src/pages/settings/Wallet/TransferBalancePage.tsx b/src/pages/settings/Wallet/TransferBalancePage.tsx
index c0f42fb9440d..b6246f29c051 100644
--- a/src/pages/settings/Wallet/TransferBalancePage.tsx
+++ b/src/pages/settings/Wallet/TransferBalancePage.tsx
@@ -191,7 +191,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                         ))}
                     </View>
                     <Text style={[styles.pt8, styles.ph5, styles.pb1, styles.textLabelSupporting, styles.justifyContentStart]}>{translate('transferAmountPage.whichAccount')}</Text>
-                    {Boolean(selectedAccount) && (
+                    {!!selectedAccount && (
                         <MenuItem
                             title={selectedAccount?.title}
                             description={selectedAccount?.description}
diff --git a/src/pages/tasks/NewTaskPage.tsx b/src/pages/tasks/NewTaskPage.tsx
index d038e8260418..8f2c1a223db1 100644
--- a/src/pages/tasks/NewTaskPage.tsx
+++ b/src/pages/tasks/NewTaskPage.tsx
@@ -199,7 +199,7 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
                     </View>
                     <View style={styles.flexShrink0}>
                         <FormAlertWithSubmitButton
-                            isAlertVisible={Boolean(errorMessage)}
+                            isAlertVisible={!!errorMessage}
                             message={errorMessage}
                             onSubmit={onSubmit}
                             enabledWhenOffline
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.tsx b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
index 3116b8a84152..1a6dfd4b0ccf 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.tsx
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
@@ -69,8 +69,8 @@ function useOptions() {
         );
 
         const headerMessage = OptionsListUtils.getHeaderMessage(
-            (recentReports?.length || 0) + (personalDetails?.length || 0) !== 0 || Boolean(currentUserOption),
-            Boolean(userToInvite),
+            (recentReports?.length || 0) + (personalDetails?.length || 0) !== 0 || !!currentUserOption,
+            !!userToInvite,
             debouncedSearchValue,
         );
 
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
index 87736bd67dbd..ab693623544a 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
@@ -73,7 +73,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
             title: translate('workspace.qbo.advancedConfig.autoSync'),
             subtitle: translate('workspace.qbo.advancedConfig.autoSyncDescription'),
             switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.autoSyncDescription'),
-            isActive: Boolean(autoSync?.enabled),
+            isActive: !!autoSync?.enabled,
             onToggle: () =>
                 Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.AUTO_SYNC, {
                     enabled: !autoSync?.enabled,
@@ -87,7 +87,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
             title: translate('workspace.qbo.advancedConfig.inviteEmployees'),
             subtitle: translate('workspace.qbo.advancedConfig.inviteEmployeesDescription'),
             switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.inviteEmployeesDescription'),
-            isActive: Boolean(syncPeople),
+            isActive: !!syncPeople,
             onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE, !syncPeople),
             pendingAction: pendingFields?.syncPeople,
             errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE),
@@ -98,7 +98,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
             title: translate('workspace.qbo.advancedConfig.createEntities'),
             subtitle: translate('workspace.qbo.advancedConfig.createEntitiesDescription'),
             switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.createEntitiesDescription'),
-            isActive: Boolean(autoCreateVendor),
+            isActive: !!autoCreateVendor,
             onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR, !autoCreateVendor),
             pendingAction: pendingFields?.autoCreateVendor,
             errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR),
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
index f0f1246dc631..66acd06b560b 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
@@ -71,7 +71,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
                                 title={translate('workspace.qbo.defaultVendor')}
                                 titleStyle={styles.textStrong}
                                 wrapperStyle={[styles.ph5, styles.mb3, styles.mt1]}
-                                isActive={Boolean(autoCreateVendor)}
+                                isActive={!!autoCreateVendor}
                                 onToggle={(isOn) =>
                                     Connections.updateManyPolicyConnectionConfigs(
                                         policyID,
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
index 4f757eab253f..81a2299aca0b 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
@@ -29,7 +29,7 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
     const policyID = policy?.id ?? '';
     const {nonReimbursableExpensesExportDestination, nonReimbursableExpensesAccount, syncLocations, nonReimbursableBillDefaultVendor} = policy?.connections?.quickbooksOnline?.config ?? {};
     const {creditCards, bankAccounts, accountPayable, vendors} = policy?.connections?.quickbooksOnline?.data ?? {};
-    const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isLocationEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
 
     const sections = useMemo(() => {
         const options: AccountListItem[] = [
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
index e49536c33306..9eb69b2be2db 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
@@ -54,7 +54,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
         {
             description: translate('workspace.qbo.exportExpenses'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID)),
-            brickRoadIndicator: Boolean(errorFields?.exportEntity) || Boolean(errorFields?.reimbursableExpensesAccount) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            brickRoadIndicator: !!errorFields?.exportEntity || !!errorFields?.reimbursableExpensesAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}`) : undefined,
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             pendingAction: pendingFields?.reimbursableExpensesExportDestination || pendingFields?.reimbursableExpensesAccount,
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
index 861f7d416902..ec6cb74887e3 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
@@ -19,11 +19,11 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
     const styles = useThemeStyles();
     const policyID = policy?.id ?? '';
     const {syncLocations, reimbursableExpensesAccount, reimbursableExpensesExportDestination, errorFields, syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
-    const isTaxesEnabled = Boolean(syncTax);
+    const isLocationEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isTaxesEnabled = !!syncTax;
     const shouldShowTaxError = isTaxesEnabled && reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY;
     const shouldShowLocationError = isLocationEnabled && reimbursableExpensesExportDestination !== CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY;
-    const hasErrors = Boolean(errorFields?.reimbursableExpensesExportDestination) || shouldShowTaxError || shouldShowLocationError;
+    const hasErrors = !!errorFields?.reimbursableExpensesExportDestination || shouldShowTaxError || shouldShowLocationError;
 
     return (
         <AccessOrNotFoundWrapper
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
index 612fc3755ada..9d23215c59f2 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
@@ -30,8 +30,8 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
     const styles = useThemeStyles();
     const {reimbursableExpensesExportDestination, reimbursableExpensesAccount, syncTax, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
     const {bankAccounts, accountPayable, journalEntryAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
-    const isLocationsEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
-    const isTaxesEnabled = Boolean(syncTax);
+    const isLocationsEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isTaxesEnabled = !!syncTax;
     const policyID = policy?.id ?? '';
 
     const data: CardListItem[] = useMemo(
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
index 4d9e2ff63dde..900bbce30ae7 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
@@ -21,7 +21,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
     const styles = useThemeStyles();
     const policyID = policy?.id ?? '';
     const {syncClasses, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncClasses && syncClasses !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isSwitchOn = !!(syncClasses && syncClasses !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
     const isReportFieldsSelected = syncClasses === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
 
     return (
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
index f93adcbe3cff..e25b6aeb9984 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
@@ -21,7 +21,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
     const styles = useThemeStyles();
     const policyID = policy?.id ?? '';
     const {syncCustomers, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncCustomers && syncCustomers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isSwitchOn = !!(syncCustomers && syncCustomers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
     const isReportFieldsSelected = syncCustomers === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
     return (
         <AccessOrNotFoundWrapper
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
index 32d9f3597a4d..00798c7856f7 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
@@ -24,28 +24,28 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
         {
             description: translate('workspace.accounting.accounts'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.enableNewCategories),
+            hasError: !!policy?.errors?.enableNewCategories,
             title: translate('workspace.accounting.importAsCategory'),
             pendingAction: pendingFields?.enableNewCategories,
         },
         {
             description: translate('workspace.qbo.classes'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncClasses),
+            hasError: !!policy?.errors?.syncClasses,
             title: translate(`workspace.accounting.importTypes.${syncClasses ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncClasses,
         },
         {
             description: translate('workspace.qbo.customers'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncCustomers),
+            hasError: !!policy?.errors?.syncCustomers,
             title: translate(`workspace.accounting.importTypes.${syncCustomers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncCustomers,
         },
         {
             description: translate('workspace.qbo.locations'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncLocations),
+            hasError: !!policy?.errors?.syncLocations,
             title: translate(`workspace.accounting.importTypes.${syncLocations ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncLocations,
         },
@@ -55,7 +55,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
         sections.push({
             description: translate('workspace.accounting.taxes'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncTax),
+            hasError: !!policy?.errors?.syncTax,
             title: translate(syncTax ? 'workspace.accounting.imported' : 'workspace.accounting.notImported'),
             pendingAction: pendingFields?.syncTax,
         });
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
index 1183b2a96c49..f066940f346c 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
@@ -21,7 +21,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
     const styles = useThemeStyles();
     const policyID = policy?.id ?? '';
     const {syncLocations, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isSwitchOn = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
     const isReportFieldsSelected = syncLocations === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
 
     return (
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
index de6e62b4baa3..30f27456836f 100644
--- a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
@@ -55,7 +55,7 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
                 switchAccessibilityLabel={translate('workspace.xero.advancedConfig.autoSyncDescription')}
                 shouldPlaceSubtitleBelowSwitch
                 wrapperStyle={styles.mv3}
-                isActive={Boolean(autoSync?.enabled)}
+                isActive={!!autoSync?.enabled}
                 onToggle={() =>
                     Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.AUTO_SYNC, {
                         enabled: !autoSync?.enabled,
@@ -72,7 +72,7 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
                 switchAccessibilityLabel={translate('workspace.xero.advancedConfig.reimbursedReportsDescription')}
                 shouldPlaceSubtitleBelowSwitch
                 wrapperStyle={styles.mv3}
-                isActive={Boolean(sync?.syncReimbursedReports)}
+                isActive={!!sync?.syncReimbursedReports}
                 onToggle={() =>
                     Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.SYNC, {
                         syncReimbursedReports: !sync?.syncReimbursedReports,
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 4f1cb550cf05..41a9c425f790 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -165,7 +165,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
                                 fallbackIcon={fallbackIcon}
                             />
                         </OfflineWithFeedback>
-                        {Boolean(details.displayName ?? '') && (
+                        {!!(details.displayName ?? '') && (
                             <Text
                                 style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
                                 numberOfLines={1}
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 3bb4abc2679c..222e60b91a16 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -266,7 +266,7 @@ function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPagePr
     );
 
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
-    const isLoading = Boolean(policy?.isLoading && policy?.reimbursementChoice === undefined);
+    const isLoading = !!(policy?.isLoading && policy?.reimbursementChoice === undefined);
 
     return (
         <AccessOrNotFoundWrapper
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 4c2f9a180518..8c05feabc94c 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -505,7 +505,7 @@ function getButtonStyleWithIcon(
     hasText?: boolean,
     shouldShowRightIcon?: boolean,
 ): ViewStyle | undefined {
-    const useDefaultButtonStyles = Boolean(hasIcon && shouldShowRightIcon) || Boolean(!hasIcon && !shouldShowRightIcon);
+    const useDefaultButtonStyles = !!(hasIcon && shouldShowRightIcon) || !!(!hasIcon && !shouldShowRightIcon);
     switch (true) {
         case small: {
             const verticalStyle = hasIcon ? styles.pl2 : styles.pr2;
diff --git a/tests/unit/SidebarFilterTest.ts b/tests/unit/SidebarFilterTest.ts
index 09ad1c379a09..c54c2cae54f8 100644
--- a/tests/unit/SidebarFilterTest.ts
+++ b/tests/unit/SidebarFilterTest.ts
@@ -320,7 +320,7 @@ xdescribe('Sidebar', () => {
                 const boolArr: boolean[] = [];
                 for (let j = AMOUNT_OF_VARIABLES - 1; j >= 0; j--) {
                     // eslint-disable-next-line no-bitwise
-                    boolArr.push(Boolean(i & (1 << j)));
+                    boolArr.push(!!(i & (1 << j)));
                 }
 
                 // To test a failing set of conditions, comment out the for loop above and then use a hardcoded array
@@ -666,7 +666,7 @@ xdescribe('Sidebar', () => {
             const boolArr: boolean[] = [];
             for (let j = AMOUNT_OF_VARIABLES - 1; j >= 0; j--) {
                 // eslint-disable-next-line no-bitwise
-                boolArr.push(Boolean(i & (1 << j)));
+                boolArr.push(!!(i & (1 << j)));
             }
 
             // To test a failing set of conditions, comment out the for loop above and then use a hardcoded array
diff --git a/tests/utils/getIsUsingFakeTimers.ts b/tests/utils/getIsUsingFakeTimers.ts
index 52138276928c..b5dda6a4bac1 100644
--- a/tests/utils/getIsUsingFakeTimers.ts
+++ b/tests/utils/getIsUsingFakeTimers.ts
@@ -1,3 +1,3 @@
 type SetTimeout = typeof global.setTimeout & jest.Mock & typeof jasmine;
 
-export default () => Boolean((global.setTimeout as SetTimeout).mock || (global.setTimeout as SetTimeout).clock);
+export default () => !!((global.setTimeout as SetTimeout).mock || (global.setTimeout as SetTimeout).clock);

From 9fd62440f2fc93d2afa7a95c51885a3502e046b0 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Thu, 23 May 2024 16:15:51 +0530
Subject: [PATCH 16/51] introduce isSplitBillDetailsPage prop in
 MoneyRequestConfirmationList.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/MoneyRequestConfirmationList.tsx | 16 ++++++++++------
 src/pages/iou/SplitBillDetailsPage.tsx          |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index e9830e496b44..04df182fb547 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -161,6 +161,9 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     /** Whether we're editing a split expense */
     isEditingSplitBill?: boolean;
 
+    /** Whether we're shwowing a created split expense */
+    isSplitBillDetailsPage?: boolean;
+
     /** Whether we should show the amount, date, and merchant fields. */
     shouldShowSmartScanFields?: boolean;
 
@@ -224,6 +227,7 @@ function MoneyRequestConfirmationList({
     allPolicies,
     action = CONST.IOU.ACTION.CREATE,
     currencyList,
+    isSplitBillDetailsPage = false,
 }: MoneyRequestConfirmationListProps) {
     const policy = policyReal ?? policyDraft;
     const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
@@ -1095,8 +1099,8 @@ function MoneyRequestConfirmationList({
                         onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
                         accessibilityRole={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                        disabled={!isEditingSplitBill}
-                        disabledStyle={styles.cursorPointer}
+                        disabled={!isSplitBillDetailsPage}
+                        disabledStyle={styles.cursorDefault}
                     >
                         <PDFThumbnail
                             // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
@@ -1109,10 +1113,10 @@ function MoneyRequestConfirmationList({
                 ) : (
                     <PressableWithoutFocus
                         onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
-                        disabled={!isEditingSplitBill || isThumbnail}
+                        disabled={!isSplitBillDetailsPage || isThumbnail}
                         accessibilityRole={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                        disabledStyle={styles.cursorPointer}
+                        disabledStyle={styles.cursorDefault}
                     >
                         <ReceiptImage
                             isThumbnail={isThumbnail}
@@ -1141,11 +1145,11 @@ function MoneyRequestConfirmationList({
             receiptThumbnail,
             fileExtension,
             isDistanceRequest,
-            isEditingSplitBill,
             reportID,
             transactionID,
             translate,
-            styles.cursorPointer,
+            styles.cursorDefault,
+            isSplitBillDetailsPage,
         ],
     );
 
diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx
index 51b432d7e860..1d7bc20756d8 100644
--- a/src/pages/iou/SplitBillDetailsPage.tsx
+++ b/src/pages/iou/SplitBillDetailsPage.tsx
@@ -122,6 +122,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                             receiptPath={transaction?.receipt?.source}
                             receiptFilename={transaction?.filename}
                             isEditingSplitBill={isEditingSplitBill}
+                            isSplitBillDetailsPage
                             hasSmartScanFailed={hasSmartScanFailed}
                             reportID={reportID}
                             reportActionID={reportAction?.reportActionID}

From ccec593e427b45bfec1291a68dc1519aabc825c6 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Thu, 23 May 2024 23:36:24 +0530
Subject: [PATCH 17/51] minor fix.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/iou/SplitBillDetailsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx
index 1d7bc20756d8..bd4e79e6962e 100644
--- a/src/pages/iou/SplitBillDetailsPage.tsx
+++ b/src/pages/iou/SplitBillDetailsPage.tsx
@@ -113,6 +113,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                             iouCurrencyCode={splitCurrency}
                             iouComment={splitComment}
                             iouCreated={splitCreated}
+                            isSplitBillDetailsPage
                             iouMerchant={splitMerchant}
                             iouCategory={splitCategory}
                             iouIsBillable={splitBillable}
@@ -122,7 +123,6 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                             receiptPath={transaction?.receipt?.source}
                             receiptFilename={transaction?.filename}
                             isEditingSplitBill={isEditingSplitBill}
-                            isSplitBillDetailsPage
                             hasSmartScanFailed={hasSmartScanFailed}
                             reportID={reportID}
                             reportActionID={reportAction?.reportActionID}

From 240f49cb3ac8c66180728d9abf7a488191916e05 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 31 May 2024 04:57:55 +0530
Subject: [PATCH 18/51] update prop name.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/MoneyRequestConfirmationList.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index c61f1818a605..da316d96ddff 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -161,8 +161,8 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     /** Whether we're editing a split expense */
     isEditingSplitBill?: boolean;
 
-    /** Whether we're shwowing a created split expense */
-    isSplitBillDetailsPage?: boolean;
+    /** Whether we can navigate to receipt page */
+    shouldDisplayReceipt?: boolean;
 
     /** Whether we should show the amount, date, and merchant fields. */
     shouldShowSmartScanFields?: boolean;
@@ -227,7 +227,7 @@ function MoneyRequestConfirmationList({
     allPolicies,
     action = CONST.IOU.ACTION.CREATE,
     currencyList,
-    isSplitBillDetailsPage = false,
+    shouldDisplayReceipt = false,
 }: MoneyRequestConfirmationListProps) {
     const policy = policyReal ?? policyDraft;
     const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
@@ -1102,7 +1102,7 @@ function MoneyRequestConfirmationList({
                         onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
                         accessibilityRole={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                        disabled={!isSplitBillDetailsPage}
+                        disabled={!shouldDisplayReceipt}
                         disabledStyle={styles.cursorDefault}
                     >
                         <PDFThumbnail
@@ -1116,7 +1116,7 @@ function MoneyRequestConfirmationList({
                 ) : (
                     <PressableWithoutFocus
                         onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
-                        disabled={!isSplitBillDetailsPage || isThumbnail}
+                        disabled={!shouldDisplayReceipt || isThumbnail}
                         accessibilityRole={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                         disabledStyle={styles.cursorDefault}
@@ -1152,7 +1152,7 @@ function MoneyRequestConfirmationList({
             transactionID,
             translate,
             styles.cursorDefault,
-            isSplitBillDetailsPage,
+            shouldDisplayReceipt,
         ],
     );
 

From 7fe560518556321d807cdd1aee80284ac085fc1e Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 31 May 2024 04:59:08 +0530
Subject: [PATCH 19/51] minor fix.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/iou/SplitBillDetailsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx
index 77676e01b54b..657281cbf67a 100644
--- a/src/pages/iou/SplitBillDetailsPage.tsx
+++ b/src/pages/iou/SplitBillDetailsPage.tsx
@@ -114,7 +114,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                             iouCurrencyCode={splitCurrency}
                             iouComment={splitComment}
                             iouCreated={splitCreated}
-                            isSplitBillDetailsPage
+                            shouldDisplayReceipt
                             iouMerchant={splitMerchant}
                             iouCategory={splitCategory}
                             iouIsBillable={splitBillable}

From 925a5a157c71d07b6fb251ff1f6b2db4a72123df Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 05:37:53 +0530
Subject: [PATCH 20/51] added translation

---
 src/languages/en.ts | 6 ++++--
 src/languages/es.ts | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 8d1b24211583..e6c04e5691d9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -428,8 +428,7 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
-            `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        welcomeNewFace: ({login}: NewFaceEnterMagicCodeParams) => `Welcome ${login}, it's always great to see a new face around here!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
@@ -1423,6 +1422,9 @@ export default {
         onceTheAbove: 'Once the above steps are completed, please reach out to ',
         toUnblock: ' to unblock your login.',
     },
+    welcomeSignUpForm: {
+        join: 'Join',
+    },
     detailsPage: {
         localTime: 'Local time',
     },
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 29f85edfc93e..af7b0946202f 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -419,8 +419,7 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
-            `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        welcomeNewFace: ({login}: NewFaceEnterMagicCodeParams) => `Bienvenido ${login}, ¡siempre es genial ver una cara nueva por aquí!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
@@ -1424,6 +1423,9 @@ export default {
         onceTheAbove: 'Una vez completados los pasos anteriores, ponte en contacto con ',
         toUnblock: ' para desbloquear el inicio de sesión.',
     },
+    welcomeSignUpForm: {
+        join: 'Unirse',
+    },
     detailsPage: {
         localTime: 'Hora local',
     },

From 90ea20e9ea17dbb4d6eb2a8f3255f8329a0d0eda Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 05:38:21 +0530
Subject: [PATCH 21/51] updatd API call

---
 src/libs/API/parameters/BeginSignInParams.ts | 1 +
 src/libs/actions/Session/index.ts            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/API/parameters/BeginSignInParams.ts b/src/libs/API/parameters/BeginSignInParams.ts
index 2f85a3335c62..0dec2587ed14 100644
--- a/src/libs/API/parameters/BeginSignInParams.ts
+++ b/src/libs/API/parameters/BeginSignInParams.ts
@@ -1,5 +1,6 @@
 type BeginSignInParams = {
     email: string;
+    useNewBeginSignIn: boolean;
 };
 
 export default BeginSignInParams;
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 303517558206..a1d56e8ad12f 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -405,7 +405,7 @@ function signInAttemptState(): OnyxData {
 function beginSignIn(email: string) {
     const {optimisticData, successData, failureData} = signInAttemptState();
 
-    const params: BeginSignInParams = {email};
+    const params: BeginSignInParams = {email, useNewBeginSignIn: true};
 
     API.read(READ_COMMANDS.BEGIN_SIGNIN, params, {optimisticData, successData, failureData});
 }

From efb056f6149020f64e7e129f36468d3ef3800baa Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 05:53:31 +0530
Subject: [PATCH 22/51] signs up an user

---
 src/libs/API/parameters/SignUpUserParams.ts |  6 +++
 src/libs/API/parameters/index.ts            |  1 +
 src/libs/API/types.ts                       |  2 +
 src/libs/actions/Session/index.ts           | 44 +++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 src/libs/API/parameters/SignUpUserParams.ts

diff --git a/src/libs/API/parameters/SignUpUserParams.ts b/src/libs/API/parameters/SignUpUserParams.ts
new file mode 100644
index 000000000000..81f97b965f33
--- /dev/null
+++ b/src/libs/API/parameters/SignUpUserParams.ts
@@ -0,0 +1,6 @@
+type SignUpUserParams = {
+    email?: string;
+    preferredLocale: string;
+};
+
+export default SignUpUserParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index c9e2e342c5ae..7e1554948e3c 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -223,3 +223,4 @@ export type {default as OpenPolicyAccountingPageParams} from './OpenPolicyAccoun
 export type {default as SearchParams} from './Search';
 export type {default as SendInvoiceParams} from './SendInvoiceParams';
 export type {default as MarkAsCashParams} from './MarkAsCashParams';
+export type {default as SignUpUserParams} from './SignUpUserParams';
\ No newline at end of file
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 40deec85bc47..91fa07fb84d4 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -218,6 +218,7 @@ const WRITE_COMMANDS = {
     ACCEPT_SPOTNANA_TERMS: 'AcceptSpotnanaTerms',
     SEND_INVOICE: 'SendInvoice',
     MARK_AS_CASH: 'MarkAsCash',
+    SIGN_UP_USER: 'SignUpUser',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -436,6 +437,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS]: EmptyObject;
     [WRITE_COMMANDS.SEND_INVOICE]: Parameters.SendInvoiceParams;
     [WRITE_COMMANDS.MARK_AS_CASH]: Parameters.MarkAsCashParams;
+    [WRITE_COMMANDS.SIGN_UP_USER]: Parameters.SignUpUserParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index a1d56e8ad12f..ceb351724b89 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -18,6 +18,7 @@ import type {
     SignInUserWithLinkParams,
     UnlinkLoginParams,
     ValidateTwoFactorAuthParams,
+    SignUpUserParams
 } from '@libs/API/parameters';
 import type SignInUserParams from '@libs/API/parameters/SignInUserParams';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
@@ -410,6 +411,48 @@ function beginSignIn(email: string) {
     API.read(READ_COMMANDS.BEGIN_SIGNIN, params, {optimisticData, successData, failureData});
 }
 
+/**
+ * Creates an account for the new user and signs them into the application with the newly created account.
+ *
+ * @param {String} [preferredLocale] Indicates which language to use when the user lands in the app
+ */
+function signUpUser(preferredLocale: string = CONST.LOCALES.DEFAULT) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                ...CONST.DEFAULT_ACCOUNT_DATA,
+                isLoading: true,
+            },
+        },
+    ];
+
+    const successData:OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData:OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const params: SignUpUserParams = {email: credentials.login, preferredLocale};
+
+    API.write(WRITE_COMMANDS.SIGN_UP_USER, params, {optimisticData, successData, failureData});
+}
+
 /**
  * Given an idToken from Sign in with Apple, checks the API to see if an account
  * exists for that email address and signs the user in if so.
@@ -1004,4 +1047,5 @@ export {
     signInWithSupportAuthToken,
     isSupportAuthToken,
     hasStashedSession,
+    signUpUser,
 };

From 6bff5d3aef185e28ebea8fbd27a4a41d09b59294 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 07:10:28 +0530
Subject: [PATCH 23/51] add new user signup page

---
 src/languages/en.ts                    |  4 +-
 src/languages/es.ts                    |  4 +-
 src/languages/types.ts                 |  4 +-
 src/pages/signin/SignInPage.tsx        |  4 +-
 src/pages/signin/SignUpWelcomeForm.tsx | 58 ++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/signin/SignUpWelcomeForm.tsx

diff --git a/src/languages/en.ts b/src/languages/en.ts
index e6c04e5691d9..595de7e59fc2 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -33,7 +33,7 @@ import type {
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -428,7 +428,7 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        welcomeNewFace: ({login}: NewFaceEnterMagicCodeParams) => `Welcome ${login}, it's always great to see a new face around here!`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index af7b0946202f..1d7d0124779c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -32,7 +32,7 @@ import type {
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -419,7 +419,7 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        welcomeNewFace: ({login}: NewFaceEnterMagicCodeParams) => `Bienvenido ${login}, ¡siempre es genial ver una cara nueva por aquí!`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, ¡siempre es genial ver una cara nueva por aquí!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
diff --git a/src/languages/types.ts b/src/languages/types.ts
index e2e7e26e696b..5f0fc761e2de 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -18,7 +18,7 @@ type LoggedInAsParams = {
     email: string;
 };
 
-type NewFaceEnterMagicCodeParams = {
+type SignUpNewFaceCodeParams = {
     login: string;
 };
 
@@ -329,7 +329,7 @@ export type {
     LoggedInAsParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 16aeb7053726..8e863655910d 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -224,8 +224,8 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
             } else {
                 welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
                 welcomeText = shouldUseNarrowLayout
-                    ? `${translate('welcomeText.welcome')} ${translate('welcomeText.newFaceEnterMagicCode', {login: userLoginToDisplay})}`
-                    : translate('welcomeText.newFaceEnterMagicCode', {login: userLoginToDisplay});
+                    ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
+                    : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
             }
         }
     } else if (shouldShowUnlinkLoginForm || shouldShowEmailDeliveryFailurePage || shouldShowChooseSSOOrMagicCode) {
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
new file mode 100644
index 000000000000..866c867e7f50
--- /dev/null
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import { TouchableOpacity, View } from 'react-native';
+import { withOnyx } from 'react-native-onyx';
+import Button from '../../components/Button';
+import Text from '../../components/Text';
+import * as Session from '../../libs/actions/Session';
+import ONYXKEYS from '../../ONYXKEYS';
+import redirectToSignIn from '../../libs/actions/SignInRedirect';
+import Terms from './Terms';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import type {OnyxEntry} from 'react-native-onyx';
+import type {Account, Locale} from '@src/types/onyx';
+
+type SignUpWelcomeFormOnyxProps = {
+    /** State for the account */
+    account: OnyxEntry<Account>;
+
+    /** The user's preferred locale */
+    preferredLocale: OnyxEntry<Locale>;
+};
+
+type SignUpWelcomeFormProps = SignUpWelcomeFormOnyxProps;
+
+function SignUpWelcomeForm({account, preferredLocale}: SignUpWelcomeFormProps) {
+    const network = useNetwork();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return <>
+        <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+            <TouchableOpacity onPress={() => redirectToSignIn()}>
+                <Text style={[styles.link]}>{translate('common.back')}</Text>
+            </TouchableOpacity>
+            <Button
+                medium
+                success
+                text={translate('welcomeForm.join')}
+                isLoading={account?.isLoading}
+                onPress={() => Session.signUpUser(preferredLocale)}
+                isDisabled={network.isOffline || !_.isEmpty(props.account.message)}
+                pressOnEnter
+            />
+        </View>
+        <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
+            <Terms />
+        </View>
+    </>;
+}
+SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
+
+export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
+    account: {key: ONYXKEYS.ACCOUNT},
+    preferredLocale: {
+        key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    },
+})(SignUpWelcomeForm);
\ No newline at end of file

From 4482d55bf6c53b0f71b95fff80c5e8886e04f3a4 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 07:32:50 +0530
Subject: [PATCH 24/51] added signup welcome form to login flow

---
 src/pages/signin/SignInPage.tsx | 46 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 8e863655910d..cf22e420c57c 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -33,6 +33,7 @@ import SignInPageLayout from './SignInPageLayout';
 import type {SignInPageLayoutRef} from './SignInPageLayout/types';
 import UnlinkLoginForm from './UnlinkLoginForm';
 import ValidateCodeForm from './ValidateCodeForm';
+import SignUpWelcomeForm from './SignUpWelcomeForm';
 
 type SignInPageInnerOnyxProps = {
     /** The details about the account that the user is signing in with */
@@ -61,6 +62,7 @@ type RenderOption = {
     shouldInitiateSAMLLogin: boolean;
     shouldShowWelcomeHeader: boolean;
     shouldShowWelcomeText: boolean;
+    shouldShouldSignUpWelcomeForm: boolean;
 };
 
 type GetRenderOptionsParams = {
@@ -71,6 +73,7 @@ type GetRenderOptionsParams = {
     isUsingMagicCode: boolean;
     hasInitiatedSAMLLogin: boolean;
     shouldShowAnotherLoginPageOpenedMessage: boolean;
+    credentials: OnyxEntry<Credentials>;
 };
 
 /**
@@ -90,6 +93,7 @@ function getRenderOptions({
     isUsingMagicCode,
     hasInitiatedSAMLLogin,
     shouldShowAnotherLoginPageOpenedMessage,
+    credentials,
 }: GetRenderOptionsParams): RenderOption {
     const hasAccount = !isEmptyObject(account);
     const isSAMLEnabled = !!account?.isSAMLEnabled;
@@ -107,22 +111,26 @@ function getRenderOptions({
         Session.clearSignInData();
     }
 
+    // Show the Welcome form if a user is signing up for a new account in a domain that is not controlled
+    const shouldShouldSignUpWelcomeForm = Boolean(credentials?.login) && !account?.validated && !account?.accountExists && !account?.domainControlled;
     const shouldShowLoginForm = !shouldShowAnotherLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;
-    const shouldShowValidateCodeForm =
-        hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired;
+    const shouldShowValidateCodeForm = !shouldShouldSignUpWelcomeForm && 
+        (hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired);
     const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin;
     const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage;
+
     return {
         shouldShowLoginForm,
         shouldShowEmailDeliveryFailurePage,
-        shouldShowUnlinkLoginForm: isUnvalidatedSecondaryLogin,
+        shouldShowUnlinkLoginForm: !shouldShouldSignUpWelcomeForm && isUnvalidatedSecondaryLogin,
         shouldShowValidateCodeForm,
         shouldShowChooseSSOOrMagicCode,
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        shouldShouldSignUpWelcomeForm,
     };
 }
 
@@ -181,6 +189,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        shouldShouldSignUpWelcomeForm,
     } = getRenderOptions({
         hasLogin: !!credentials?.login,
         hasValidateCode: !!credentials?.validateCode,
@@ -189,6 +198,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         isUsingMagicCode,
         hasInitiatedSAMLLogin,
         shouldShowAnotherLoginPageOpenedMessage,
+        credentials
     });
 
     if (shouldInitiateSAMLLogin) {
@@ -200,6 +210,11 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     let welcomeText = '';
     const headerText = translate('login.hero.header');
 
+    const userLogin = Str.removeSMSDomain(credentials?.login ?? '');
+
+    // replacing spaces with "hard spaces" to prevent breaking the number
+    const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin).replace(/ /g, '\u00A0') : userLogin;
+
     if (shouldShowAnotherLoginPageOpenedMessage) {
         welcomeHeader = translate('welcomeText.anotherLoginPageIsOpen');
         welcomeText = translate('welcomeText.anotherLoginPageIsOpenExplanation');
@@ -212,21 +227,10 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
             welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
             welcomeText = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
         } else {
-            const userLogin = Str.removeSMSDomain(credentials?.login ?? '');
-
-            // replacing spaces with "hard spaces" to prevent breaking the number
-            const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin).replace(/ /g, '\u00A0') : userLogin;
-            if (account?.validated) {
-                welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
-                welcomeText = shouldUseNarrowLayout
-                    ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay})}`
-                    : translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay});
-            } else {
-                welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
-                welcomeText = shouldUseNarrowLayout
-                    ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
-                    : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
-            }
+            welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
+            welcomeText = shouldUseNarrowLayout
+                ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay})}`
+                : translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay});
         }
     } else if (shouldShowUnlinkLoginForm || shouldShowEmailDeliveryFailurePage || shouldShowChooseSSOOrMagicCode) {
         welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
@@ -235,6 +239,11 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         if (shouldShowEmailDeliveryFailurePage || shouldShowChooseSSOOrMagicCode) {
             welcomeText = '';
         }
+    } else if (shouldShouldSignUpWelcomeForm) {
+        welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
+        welcomeText = shouldUseNarrowLayout
+                ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
+                : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
     } else if (!shouldInitiateSAMLLogin && !hasInitiatedSAMLLogin) {
         Log.warn('SignInPage in unexpected state!');
     }
@@ -269,6 +278,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                     blurOnSubmit={account?.validated === false}
                     scrollPageToTop={signInPageLayoutRef.current?.scrollPageToTop}
                 />
+                {shouldShouldSignUpWelcomeForm && <SignUpWelcomeForm />}
                 {shouldShowValidateCodeForm && (
                     <ValidateCodeForm
                         isVisible={!shouldShowAnotherLoginPageOpenedMessage}

From acf1a13c296a60bfb8ac1c35766738782f4a87ba Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 07:55:40 +0530
Subject: [PATCH 25/51] lint fixes

---
 src/libs/API/parameters/SignUpUserParams.ts |  5 ++-
 src/libs/actions/Session/index.ts           |  3 +-
 src/pages/signin/SignUpWelcomeForm.tsx      | 37 ++++++++++-----------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/libs/API/parameters/SignUpUserParams.ts b/src/libs/API/parameters/SignUpUserParams.ts
index 81f97b965f33..f516083fa378 100644
--- a/src/libs/API/parameters/SignUpUserParams.ts
+++ b/src/libs/API/parameters/SignUpUserParams.ts
@@ -1,6 +1,9 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
 type SignUpUserParams = {
     email?: string;
-    preferredLocale: string;
+    preferredLocale: ValueOf<typeof CONST.LOCALES>
 };
 
 export default SignUpUserParams;
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index ceb351724b89..e04327e93bd2 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -414,9 +414,8 @@ function beginSignIn(email: string) {
 /**
  * Creates an account for the new user and signs them into the application with the newly created account.
  *
- * @param {String} [preferredLocale] Indicates which language to use when the user lands in the app
  */
-function signUpUser(preferredLocale: string = CONST.LOCALES.DEFAULT) {
+function signUpUser() {
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 866c867e7f50..cdc985a09cb2 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -1,45 +1,45 @@
 import React from 'react';
-import { TouchableOpacity, View } from 'react-native';
+import { View } from 'react-native';
 import { withOnyx } from 'react-native-onyx';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
-import * as Session from '../../libs/actions/Session';
-import ONYXKEYS from '../../ONYXKEYS';
-import redirectToSignIn from '../../libs/actions/SignInRedirect';
-import Terms from './Terms';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import type {OnyxEntry} from 'react-native-onyx';
-import type {Account, Locale} from '@src/types/onyx';
+import Button from '@components/Button';
+import Text from '@components/Text';
+import * as Session from '@userActions/Session';
+import ONYXKEYS from '@src/ONYXKEYS';
+import redirectToSignIn from '@userActions/SignInRedirect';
+import type {Account} from '@src/types/onyx';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import Terms from './Terms';
 
 type SignUpWelcomeFormOnyxProps = {
     /** State for the account */
     account: OnyxEntry<Account>;
-
-    /** The user's preferred locale */
-    preferredLocale: OnyxEntry<Locale>;
 };
 
 type SignUpWelcomeFormProps = SignUpWelcomeFormOnyxProps;
 
-function SignUpWelcomeForm({account, preferredLocale}: SignUpWelcomeFormProps) {
+function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
     const network = useNetwork();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     return <>
         <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-            <TouchableOpacity onPress={() => redirectToSignIn()}>
+            <PressableWithFeedback 
+            accessibilityLabel={translate('common.back')}
+            onPress={() => redirectToSignIn()}>
                 <Text style={[styles.link]}>{translate('common.back')}</Text>
-            </TouchableOpacity>
+            </PressableWithFeedback>
             <Button
                 medium
                 success
-                text={translate('welcomeForm.join')}
+                text={translate('welcomeSignUpForm.join')}
                 isLoading={account?.isLoading}
-                onPress={() => Session.signUpUser(preferredLocale)}
-                isDisabled={network.isOffline || !_.isEmpty(props.account.message)}
+                onPress={() => Session.signUpUser()}
+                isDisabled={network.isOffline || !!account?.message}
                 pressOnEnter
             />
         </View>
@@ -52,7 +52,4 @@ SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
 
 export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
     account: {key: ONYXKEYS.ACCOUNT},
-    preferredLocale: {
-        key: ONYXKEYS.NVP_PREFERRED_LOCALE,
-    },
 })(SignUpWelcomeForm);
\ No newline at end of file

From b2aac338954be9f0ec57dbe8453c13d5459ed615 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 07:57:33 +0530
Subject: [PATCH 26/51] add EOL

---
 src/libs/API/parameters/index.ts       | 2 +-
 src/pages/signin/SignUpWelcomeForm.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 7e1554948e3c..7f682ca44d29 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -223,4 +223,4 @@ export type {default as OpenPolicyAccountingPageParams} from './OpenPolicyAccoun
 export type {default as SearchParams} from './Search';
 export type {default as SendInvoiceParams} from './SendInvoiceParams';
 export type {default as MarkAsCashParams} from './MarkAsCashParams';
-export type {default as SignUpUserParams} from './SignUpUserParams';
\ No newline at end of file
+export type {default as SignUpUserParams} from './SignUpUserParams';
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index cdc985a09cb2..4f9e71e09d64 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -52,4 +52,4 @@ SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
 
 export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
     account: {key: ONYXKEYS.ACCOUNT},
-})(SignUpWelcomeForm);
\ No newline at end of file
+})(SignUpWelcomeForm);

From 300f23ee1bec8c48795d171739a577ad7976fe3f Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 31 May 2024 08:09:05 +0530
Subject: [PATCH 27/51] fix type

---
 src/libs/API/parameters/SignUpUserParams.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/API/parameters/SignUpUserParams.ts b/src/libs/API/parameters/SignUpUserParams.ts
index f516083fa378..00080017d30f 100644
--- a/src/libs/API/parameters/SignUpUserParams.ts
+++ b/src/libs/API/parameters/SignUpUserParams.ts
@@ -3,7 +3,7 @@ import type CONST from '@src/CONST';
 
 type SignUpUserParams = {
     email?: string;
-    preferredLocale: ValueOf<typeof CONST.LOCALES>
+    preferredLocale: ValueOf<typeof CONST.LOCALES> | null;
 };
 
 export default SignUpUserParams;

From f869d0cf241f1a13b480afb87fe34c6641cf0eef Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Fri, 31 May 2024 20:47:32 +0530
Subject: [PATCH 28/51] Update

---
 package-lock.json                                         | 8 ++++----
 package.json                                              | 2 +-
 src/components/ReportActionItem/MoneyReportView.tsx       | 4 ++--
 .../MoneyRequestPreview/MoneyRequestPreviewContent.tsx    | 4 +---
 src/components/ReportActionItem/MoneyRequestView.tsx      | 4 ++--
 src/components/Switch.tsx                                 | 2 +-
 src/libs/HttpUtils.ts                                     | 4 ++--
 src/libs/Navigation/linkTo/index.ts                       | 2 +-
 src/libs/PolicyUtils.ts                                   | 6 +++---
 src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx     | 2 +-
 src/pages/ProfilePage.tsx                                 | 8 ++++----
 .../iou/request/step/withWritableReportOrNotFound.tsx     | 2 +-
 .../workspace/categories/WorkspaceCategoriesPage.tsx      | 2 +-
 src/pages/workspace/tags/WorkspaceTagsPage.tsx            | 2 +-
 src/pages/workspace/taxes/WorkspaceTaxesPage.tsx          | 2 +-
 15 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b31d2b73305e..b1f1dfcb173f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -207,7 +207,7 @@
         "electron-builder": "24.13.2",
         "eslint": "^7.6.0",
         "eslint-config-airbnb-typescript": "^17.1.0",
-        "eslint-config-expensify": "^2.0.47",
+        "eslint-config-expensify": "^2.0.50",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jest": "^24.1.0",
@@ -19365,9 +19365,9 @@
       }
     },
     "node_modules/eslint-config-expensify": {
-      "version": "2.0.48",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.48.tgz",
-      "integrity": "sha512-PFegJ9Wfsiu5tgevhjA1toCxsZ8Etfk6pIjtXAnwpmVj7q4CtB3QDRusJoUDyJ3HrZr8AsFKViz7CU/CBTfwOw==",
+      "version": "2.0.50",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.50.tgz",
+      "integrity": "sha512-I+OMkEprqEWlSCZGJBJxpt2Wg4HQ41/QqpKVfcADiQ3xJ76bZ1mBueqz6DR4jfph1xC6XVRl4dqGNlwbeU/2Rg==",
       "dev": true,
       "dependencies": {
         "@lwc/eslint-plugin-lwc": "^1.7.2",
diff --git a/package.json b/package.json
index 12bfac4e43a4..dfe7b2dfe416 100644
--- a/package.json
+++ b/package.json
@@ -259,7 +259,7 @@
     "electron-builder": "24.13.2",
     "eslint": "^7.6.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-expensify": "^2.0.47",
+    "eslint-config-expensify": "^2.0.50",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^24.1.0",
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 81d59d750284..87f0b771ab47 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -43,7 +43,7 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
     const formattedTotalAmount = CurrencyUtils.convertToDisplayString(totalDisplaySpend, report.currency);
     const formattedOutOfPocketAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, report.currency);
     const formattedCompanySpendAmount = CurrencyUtils.convertToDisplayString(nonReimbursableSpend, report.currency);
-    const isPartiallyPaid = Boolean(report?.pendingFields?.partial);
+    const isPartiallyPaid = !!report?.pendingFields?.partial;
 
     const subAmountTextStyles: StyleProp<TextStyle> = [
         styles.taskTitleMenuItem,
@@ -121,7 +121,7 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
                             </Text>
                         </View>
                     </View>
-                    {Boolean(shouldShowBreakdown) && (
+                    {!!shouldShowBreakdown && (
                         <>
                             <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv1]}>
                                 <View style={[styles.flex1, styles.justifyContentCenter]}>
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index cb9c73d51d00..18dcf3cb29b7 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -93,9 +93,7 @@ function MoneyRequestPreviewContent({
     const isSettlementOrApprovalPartial = !!iouReport?.pendingFields?.partial;
     const isPartialHold = isSettlementOrApprovalPartial && isOnHold;
     const hasViolations = TransactionUtils.hasViolation(transaction?.transactionID ?? '', transactionViolations);
-    const hasNoticeTypeViolations = Boolean(
-        TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations) && ReportUtils.isPaidGroupPolicy(iouReport) && canUseViolations,
-    );
+    const hasNoticeTypeViolations = !!(TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations) && ReportUtils.isPaidGroupPolicy(iouReport) && canUseViolations);
     const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index f01fb049e943..54ce13820402 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -119,7 +119,7 @@ function MoneyRequestView({
     const isEmptyMerchant = transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const formattedTransactionAmount = transactionAmount ? CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency) : '';
-    const hasPendingWaypoints = Boolean(transaction?.pendingFields?.waypoints);
+    const hasPendingWaypoints = !!transaction?.pendingFields?.waypoints;
     const showMapAsImage = isDistanceRequest && hasPendingWaypoints;
     const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && CurrencyUtils.convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
@@ -338,7 +338,7 @@ function MoneyRequestView({
                 {shouldShowReceiptHeader && (
                     <ReceiptAuditHeader
                         notes={receiptViolations}
-                        shouldShowAuditMessage={Boolean(shouldShowNotesViolations && didRceiptScanSucceed)}
+                        shouldShowAuditMessage={!!(shouldShowNotesViolations && didRceiptScanSucceed)}
                     />
                 )}
                 {shouldShowMapOrReceipt && (
diff --git a/src/components/Switch.tsx b/src/components/Switch.tsx
index 3d9b586b8b91..2e29008cd9ec 100644
--- a/src/components/Switch.tsx
+++ b/src/components/Switch.tsx
@@ -63,7 +63,7 @@ function Switch({isOn, onToggle, accessibilityLabel, disabled, showLockIcon}: Sw
             pressDimmingValue={0.8}
         >
             <Animated.View style={[styles.switchThumb, styles.switchThumbTransformation(offsetX.current)]}>
-                {(Boolean(disabled) || Boolean(showLockIcon)) && (
+                {(!!disabled || !!showLockIcon) && (
                     <Icon
                         src={Expensicons.Lock}
                         fill={isOn ? theme.text : theme.icon}
diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index b254303d1784..251d176d6961 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -27,8 +27,8 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        shouldFailAllRequests = Boolean(network.shouldFailAllRequests);
-        shouldForceOffline = Boolean(network.shouldForceOffline);
+        shouldFailAllRequests = !!(network.shouldFailAllRequests);
+        shouldForceOffline = !!(network.shouldForceOffline);
     },
 });
 
diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
index b9839483a056..07dfbf743ffc 100644
--- a/src/libs/Navigation/linkTo/index.ts
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -71,7 +71,7 @@ export default function linkTo(navigation: NavigationContainerRef<RootStackParam
         const topRouteName = rootState?.routes?.at(-1)?.name;
         const isTargetNavigatorOnTop = topRouteName === action.payload.name;
 
-        const isTargetScreenDifferentThanCurrent = Boolean(!topmostCentralPaneRoute || topmostCentralPaneRoute.name !== action.payload.params?.screen);
+        const isTargetScreenDifferentThanCurrent = !!(!topmostCentralPaneRoute || topmostCentralPaneRoute.name !== action.payload.params?.screen);
         const areParamsDifferent =
             action.payload.params?.screen === SCREENS.REPORT
                 ? getTopmostReportId(rootState) !== getTopmostReportId(stateFromPath)
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index d34bd8611832..e337cbd97a96 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -117,7 +117,7 @@ function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<t
 function shouldShowPolicy(policy: OnyxEntry<Policy>, isOffline: boolean): boolean {
     return (
         !!policy &&
-        (policy?.isPolicyExpenseChatEnabled || Boolean(policy?.isJoinRequestPending)) &&
+        (policy?.isPolicyExpenseChatEnabled || !!policy?.isJoinRequestPending) &&
         (isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0)
     );
 }
@@ -336,10 +336,10 @@ function canEditTaxRate(policy: Policy, taxID: string): boolean {
 
 function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
     if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
-        return Boolean(policy?.tax?.trackingEnabled);
+        return !!policy?.tax?.trackingEnabled;
     }
 
-    return Boolean(policy?.[featureName]);
+    return !!policy?.[featureName];
 }
 
 function getApprovalWorkflow(policy: OnyxEntry<Policy> | EmptyObject): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 31ff883834cc..5b186ccbe7a9 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -154,7 +154,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
                             saveAndNavigate();
                         }}
                         message={errorMessage}
-                        isAlertVisible={Boolean(errorMessage)}
+                        isAlertVisible={!!errorMessage}
                         containerStyles={[styles.w100, styles.mb5, styles.mh0, paddingHorizontal]}
                     />
                 </View>
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 7ce9bcf47c9c..9adc0544eac7 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -81,7 +81,7 @@ function ProfilePage({route}: ProfilePageProps) {
         const accountID = Number(route.params?.accountID ?? 0);
         const reportID = ReportUtils.getChatByParticipants(session?.accountID ? [accountID, session.accountID] : [], reports)?.reportID ?? '';
 
-        if ((Boolean(session) && Number(session?.accountID) === accountID) || SessionActions.isAnonymousUser() || !reportID) {
+        if ((!!session && Number(session?.accountID) === accountID) || SessionActions.isAnonymousUser() || !reportID) {
             return `${ONYXKEYS.COLLECTION.REPORT}0` as const;
         }
         return `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
@@ -114,8 +114,8 @@ function ProfilePage({route}: ProfilePageProps) {
     const phoneNumber = getPhoneNumber(details);
     const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : login;
 
-    const hasAvatar = Boolean(details.avatar);
-    const isLoading = Boolean(personalDetailsMetadata?.[accountID]?.isLoading) || isEmptyObject(details);
+    const hasAvatar = !!details.avatar;
+    const isLoading = !!personalDetailsMetadata?.[accountID]?.isLoading || isEmptyObject(details);
 
     const statusEmojiCode = details?.status?.emojiCode ?? '';
     const statusText = details?.status?.text ?? '';
@@ -165,7 +165,7 @@ function ProfilePage({route}: ProfilePageProps) {
                                     />
                                 </OfflineWithFeedback>
                             </PressableWithoutFocus>
-                            {Boolean(displayName) && (
+                            {!!displayName && (
                                 <Text
                                     style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
                                     numberOfLines={1}
diff --git a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
index 0a13bcd46a3e..ced2b28bb167 100644
--- a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
+++ b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
@@ -62,7 +62,7 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
         const canUserPerformWriteAction = ReportUtils.canUserPerformWriteAction(report);
 
         useEffect(() => {
-            if (Boolean(report?.reportID) || !route.params.reportID) {
+            if (!!report?.reportID || !route.params.reportID) {
                 return;
             }
 
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 04afa305ddb4..6e285570c303 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -58,7 +58,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyId}`);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyId}`);
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const isConnectedToQbo = Boolean(policy?.connections?.quickbooksOnline);
+    const isConnectedToQbo = !!policy?.connections?.quickbooksOnline;
 
     const fetchCategories = useCallback(() => {
         Category.openPolicyCategoriesPage(policyId);
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index f70e6b9ba5a4..f7afacce93ad 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -52,7 +52,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
     const {environmentURL} = useEnvironment();
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const isConnectedToQbo = Boolean(policy?.connections?.quickbooksOnline);
+    const isConnectedToQbo = !!policy?.connections?.quickbooksOnline;
     const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);
     const canSelectMultiple = !isMultiLevelTags;
 
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index 608dfe2b26c8..af77a668264c 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -58,7 +58,7 @@ function WorkspaceTaxesPage({
     const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
 
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const isConnectedToQbo = Boolean(policy?.connections?.quickbooksOnline);
+    const isConnectedToQbo = !!policy?.connections?.quickbooksOnline;
 
     const fetchTaxes = useCallback(() => {
         openPolicyTaxesPage(policyID);

From 99976e08991bbbe3b54ff20c55693bd7b64763a6 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Mon, 3 Jun 2024 07:54:15 +0530
Subject: [PATCH 29/51] remove commented code.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/TransactionReceiptPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/TransactionReceiptPage.tsx b/src/pages/TransactionReceiptPage.tsx
index 35fac4612e63..5721caf3e1a0 100644
--- a/src/pages/TransactionReceiptPage.tsx
+++ b/src/pages/TransactionReceiptPage.tsx
@@ -51,7 +51,6 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
 
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFoundPage = isTrackExpenseReport || transaction?.reportID === CONST.REPORT.SPLIT_REPORTID ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
-    // const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
 
     return (
         <AttachmentModal

From b10a47d6afe4de00eb53070291ec4a5751addac0 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Mon, 3 Jun 2024 11:56:05 +0530
Subject: [PATCH 30/51] minor fixes

---
 src/languages/en.ts             | 2 +-
 src/languages/es.ts             | 2 +-
 src/pages/signin/SignInPage.tsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 595de7e59fc2..6aefc687bad3 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -428,7 +428,7 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here!`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here! Please continue by tapping the join button below.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 1d7d0124779c..3212a7b92fee 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -419,7 +419,7 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, ¡siempre es genial ver una cara nueva por aquí!`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, siempre es genial ver una cara nueva por aquí! Por favor, continúa haciendo click en el botón de unirse abajo.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index cf22e420c57c..1243f66ac390 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -118,8 +118,8 @@ function getRenderOptions({
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;
     const shouldShowValidateCodeForm = !shouldShouldSignUpWelcomeForm && 
         (hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired);
-    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin;
-    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage;
+    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin || shouldShouldSignUpWelcomeForm;
+    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage || shouldShouldSignUpWelcomeForm;
 
     return {
         shouldShowLoginForm,

From 921768059a8409fe0b764fb5640fcf591c333112 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Mon, 3 Jun 2024 11:58:39 +0530
Subject: [PATCH 31/51] style fixes

---
 src/languages/en.ts                    |  2 +-
 src/languages/es.ts                    |  2 +-
 src/libs/actions/Session/index.ts      |  6 +--
 src/pages/signin/SignInPage.tsx        | 21 ++++++---
 src/pages/signin/SignUpWelcomeForm.tsx | 59 ++++++++++++++------------
 5 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6aefc687bad3..ba6a2a0b5156 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -33,7 +33,6 @@ import type {
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -66,6 +65,7 @@ import type {
     SetTheRequestParams,
     SettledAfterAddedBankAccountParams,
     SettleExpensifyCardParams,
+    SignUpNewFaceCodeParams,
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3212a7b92fee..0d73b5694ba5 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -32,7 +32,6 @@ import type {
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -65,6 +64,7 @@ import type {
     SetTheRequestParams,
     SettledAfterAddedBankAccountParams,
     SettleExpensifyCardParams,
+    SignUpNewFaceCodeParams,
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index e04327e93bd2..5d336a7bebb5 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -16,9 +16,9 @@ import type {
     RequestNewValidateCodeParams,
     RequestUnlinkValidationLinkParams,
     SignInUserWithLinkParams,
+    SignUpUserParams,
     UnlinkLoginParams,
     ValidateTwoFactorAuthParams,
-    SignUpUserParams
 } from '@libs/API/parameters';
 import type SignInUserParams from '@libs/API/parameters/SignInUserParams';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
@@ -427,7 +427,7 @@ function signUpUser() {
         },
     ];
 
-    const successData:OnyxUpdate[] = [
+    const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
@@ -437,7 +437,7 @@ function signUpUser() {
         },
     ];
 
-    const failureData:OnyxUpdate[] = [
+    const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 1243f66ac390..3dec3419b236 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -31,9 +31,9 @@ import LoginForm from './LoginForm';
 import type {InputHandle} from './LoginForm/types';
 import SignInPageLayout from './SignInPageLayout';
 import type {SignInPageLayoutRef} from './SignInPageLayout/types';
+import SignUpWelcomeForm from './SignUpWelcomeForm';
 import UnlinkLoginForm from './UnlinkLoginForm';
 import ValidateCodeForm from './ValidateCodeForm';
-import SignUpWelcomeForm from './SignUpWelcomeForm';
 
 type SignInPageInnerOnyxProps = {
     /** The details about the account that the user is signing in with */
@@ -116,10 +116,17 @@ function getRenderOptions({
     const shouldShowLoginForm = !shouldShowAnotherLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;
-    const shouldShowValidateCodeForm = !shouldShouldSignUpWelcomeForm && 
-        (hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired);
+    const shouldShowValidateCodeForm =
+        !shouldShouldSignUpWelcomeForm &&
+        hasAccount &&
+        (hasLogin || hasValidateCode) &&
+        !isUnvalidatedSecondaryLogin &&
+        !hasEmailDeliveryFailure &&
+        !shouldShowChooseSSOOrMagicCode &&
+        !isSAMLRequired;
     const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin || shouldShouldSignUpWelcomeForm;
-    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage || shouldShouldSignUpWelcomeForm;
+    const shouldShowWelcomeText =
+        shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage || shouldShouldSignUpWelcomeForm;
 
     return {
         shouldShowLoginForm,
@@ -198,7 +205,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         isUsingMagicCode,
         hasInitiatedSAMLLogin,
         shouldShowAnotherLoginPageOpenedMessage,
-        credentials
+        credentials,
     });
 
     if (shouldInitiateSAMLLogin) {
@@ -242,8 +249,8 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     } else if (shouldShouldSignUpWelcomeForm) {
         welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
         welcomeText = shouldUseNarrowLayout
-                ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
-                : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
+            ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
+            : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
     } else if (!shouldInitiateSAMLLogin && !hasInitiatedSAMLLogin) {
         Log.warn('SignInPage in unexpected state!');
     }
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 4f9e71e09d64..4c7d057192f0 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
-import { View } from 'react-native';
-import { withOnyx } from 'react-native-onyx';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
+import {View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
 import * as Session from '@userActions/Session';
-import ONYXKEYS from '@src/ONYXKEYS';
 import redirectToSignIn from '@userActions/SignInRedirect';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {Account} from '@src/types/onyx';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Terms from './Terms';
 
 type SignUpWelcomeFormOnyxProps = {
@@ -26,27 +26,30 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    return <>
-        <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-            <PressableWithFeedback 
-            accessibilityLabel={translate('common.back')}
-            onPress={() => redirectToSignIn()}>
-                <Text style={[styles.link]}>{translate('common.back')}</Text>
-            </PressableWithFeedback>
-            <Button
-                medium
-                success
-                text={translate('welcomeSignUpForm.join')}
-                isLoading={account?.isLoading}
-                onPress={() => Session.signUpUser()}
-                isDisabled={network.isOffline || !!account?.message}
-                pressOnEnter
-            />
-        </View>
-        <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
-            <Terms />
-        </View>
-    </>;
+    return (
+        <>
+            <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                <PressableWithFeedback
+                    accessibilityLabel={translate('common.back')}
+                    onPress={() => redirectToSignIn()}
+                >
+                    <Text style={[styles.link]}>{translate('common.back')}</Text>
+                </PressableWithFeedback>
+                <Button
+                    medium
+                    success
+                    text={translate('welcomeSignUpForm.join')}
+                    isLoading={account?.isLoading}
+                    onPress={() => Session.signUpUser()}
+                    isDisabled={network.isOffline || !!account?.message}
+                    pressOnEnter
+                />
+            </View>
+            <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
+                <Terms />
+            </View>
+        </>
+    );
 }
 SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
 

From 19717d9235cb38408f92ad1b9a48df3e107771f4 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Tue, 4 Jun 2024 08:57:16 +0700
Subject: [PATCH 32/51] fix: add paddingRight for blockquote

to avoid cursor overlapping in inline-block
---
 src/hooks/useMarkdownStyle.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hooks/useMarkdownStyle.ts b/src/hooks/useMarkdownStyle.ts
index b1f430e232e4..d1af33aa9da5 100644
--- a/src/hooks/useMarkdownStyle.ts
+++ b/src/hooks/useMarkdownStyle.ts
@@ -28,6 +28,12 @@ function useMarkdownStyle(message: string | null = null): MarkdownStyle {
                 borderWidth: 4,
                 marginLeft: 0,
                 paddingLeft: 6,
+                /**
+                 * since blockquote has `inline-block` display -> padding-right is needed to prevent cursor overlapping
+                 * with last character of the text node.
+                 * As long as paddingRight > cursor.width, cursor will be displayed correctly.
+                 */
+                paddingRight: 1,
             },
             code: {
                 fontFamily: FontUtils.fontFamily.platform.MONOSPACE,

From 4de123442f69860b1f8c655de9807e64e6fa856c Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:50:27 +0530
Subject: [PATCH 33/51] Update

---
 src/libs/NetworkConnection.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/NetworkConnection.ts b/src/libs/NetworkConnection.ts
index 9599ed7a40cb..c860d164e810 100644
--- a/src/libs/NetworkConnection.ts
+++ b/src/libs/NetworkConnection.ts
@@ -79,7 +79,7 @@ Onyx.connect({
         } else {
             // If we are no longer forcing offline fetch the NetInfo to set isOffline appropriately
             NetInfo.fetch().then((state) => {
-                const isInternetReachable = Boolean(state.isInternetReachable);
+                const isInternetReachable = !!state.isInternetReachable;
                 setOfflineStatus(isInternetReachable);
                 Log.info(
                     `[NetworkStatus] The force-offline mode was turned off. Getting the device network status from NetInfo. Network state: ${JSON.stringify(
@@ -160,7 +160,7 @@ function subscribeToNetworkStatus(): () => void {
             return;
         }
         setOfflineStatus(state.isInternetReachable === false);
-        Log.info(`[NetworkStatus] NetInfo.addEventListener event coming, setting "offlineStatus" to ${Boolean(state.isInternetReachable)} with network state: ${JSON.stringify(state)}`);
+        Log.info(`[NetworkStatus] NetInfo.addEventListener event coming, setting "offlineStatus" to ${!!state.isInternetReachable} with network state: ${JSON.stringify(state)}`);
         setNetWorkStatus(state.isInternetReachable);
     });
 

From 46646501313bee6a9ebb3ba42205c9579118b0b9 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Jun 2024 05:38:25 +0700
Subject: [PATCH 34/51] fix create getLightbulbIllustrationStyle

---
 src/pages/settings/Troubleshoot/TroubleshootPage.tsx  | 11 +++--------
 .../getLightbulbIllustrationStyle/index.native.ts     |  6 ++++++
 .../getLightbulbIllustrationStyle/index.ts            |  9 +++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts
 create mode 100644 src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts

diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index 3b235c1b71ec..34f762e7b827 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -22,15 +22,14 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import getPlatform from '@libs/getPlatform';
 import Navigation from '@libs/Navigation/Navigation';
 import * as App from '@userActions/App';
 import * as Report from '@userActions/Report';
-import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import getLightbulbIllustrationStyle from './getLightbulbIllustrationStyle';
 
 type BaseMenuItem = {
     translationKey: TranslationPaths;
@@ -52,6 +51,7 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
     const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false);
     const waitForNavigate = useWaitForNavigation();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const illustrationStyle = getLightbulbIllustrationStyle();
 
     const menuItems = useMemo(() => {
         const debugConsoleItem: BaseMenuItem = {
@@ -83,11 +83,6 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
             .reverse();
     }, [shouldStoreLogs, translate, waitForNavigate, styles.sectionMenuItemTopDescription]);
 
-    const isNativePlatform = useMemo(() => {
-        const platform = getPlatform();
-        return platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID;
-    }, []);
-
     return (
         <ScreenWrapper
             shouldEnablePickerAvoiding={false}
@@ -108,7 +103,7 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
                         isCentralPane
                         subtitleMuted
                         illustration={LottieAnimations.Desk}
-                        illustrationStyle={!isNativePlatform && [styles.mt4, styles.mbn4]}
+                        illustrationStyle={illustrationStyle}
                         titleStyles={styles.accountSettingsSectionTitle}
                         illustrationBackgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.TROUBLESHOOT].backgroundColor}
                         renderSubtitle={() => (
diff --git a/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts
new file mode 100644
index 000000000000..034df2052d97
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts
@@ -0,0 +1,6 @@
+import type {ViewStyle} from 'react-native';
+
+// Styling lottie animations for the Lightbulb component requires different margin values depending on the platform.
+export default function getLightbulbIllustrationStyle(): ViewStyle {
+    return {};
+}
diff --git a/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts
new file mode 100644
index 000000000000..fa22fde73062
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts
@@ -0,0 +1,9 @@
+import type {ViewStyle} from 'react-native';
+
+// Styling lottie animations for the Lightbulb component requires different margin values depending on the platform.
+export default function getTripIllustrationStyle(): ViewStyle {
+    return {
+        marginTop: 16,
+        marginBottom: -16,
+    };
+}

From 78cbc578a9eb2d36538c21cfbd423ec42bcd4a12 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Wed, 5 Jun 2024 15:01:52 +0530
Subject: [PATCH 35/51] some UI fixes

---
 src/languages/en.ts                           |  2 +-
 src/languages/es.ts                           |  2 +-
 src/libs/LocalePhoneNumber.ts                 |  1 +
 .../Contacts/ContactMethodDetailsPage.tsx     |  2 +-
 src/pages/signin/SignInPage.tsx               |  2 +-
 src/pages/signin/SignUpWelcomeForm.tsx        | 19 +++++++------------
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6d79fc10ddd9..6bbbd45ea459 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -433,7 +433,7 @@ export default {
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here! Please continue by tapping the join button below.`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3afc9b0508c7..62bf8d0ff7f1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -424,7 +424,7 @@ export default {
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, siempre es genial ver una cara nueva por aquí! Por favor, continúa haciendo click en el botón de unirse abajo.`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, siempre es genial ver una cara nueva por aquí!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
diff --git a/src/libs/LocalePhoneNumber.ts b/src/libs/LocalePhoneNumber.ts
index 460d5fc0fe9f..faa5401cdf3a 100644
--- a/src/libs/LocalePhoneNumber.ts
+++ b/src/libs/LocalePhoneNumber.ts
@@ -18,6 +18,7 @@ function formatPhoneNumber(number: string): string {
     if (!number) {
         return '';
     }
+    number = number.replace(/ /g, '\u00A0');
 
     // do not parse the string, if it doesn't contain the SMS domain and it's not a phone number
     if (number.indexOf(CONST.SMS.DOMAIN) === -1 && !CONST.REGEX.DIGITS_AND_PLUS.test(number)) {
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
index 8aaeb7151563..0d9a3ec813b2 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
@@ -186,7 +186,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
     }
 
     // Replacing spaces with "hard spaces" to prevent breaking the number
-    const formattedContactMethod = Str.isSMSLogin(contactMethod) ? formatPhoneNumber(contactMethod).replace(/ /g, '\u00A0') : contactMethod;
+    const formattedContactMethod = Str.isSMSLogin(contactMethod) ? formatPhoneNumber(contactMethod) : contactMethod;
     const hasMagicCodeBeenSent = !!loginData.validateCodeSent;
     const isFailedAddContactMethod = !!loginData.errorFields?.addedLogin;
     const isFailedRemovedContactMethod = !!loginData.errorFields?.deletedLogin;
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index af4fbe04affa..d410fe2d11f0 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -220,7 +220,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     const userLogin = Str.removeSMSDomain(credentials?.login ?? '');
 
     // replacing spaces with "hard spaces" to prevent breaking the number
-    const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin).replace(/ /g, '\u00A0') : userLogin;
+    const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin) : userLogin;
 
     if (shouldShowAnotherLoginPageOpenedMessage) {
         welcomeHeader = translate('welcomeText.anotherLoginPageIsOpen');
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index 4c7d057192f0..ebb6a63b8f9c 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -3,8 +3,6 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -12,6 +10,7 @@ import * as Session from '@userActions/Session';
 import redirectToSignIn from '@userActions/SignInRedirect';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Account} from '@src/types/onyx';
+import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
 import Terms from './Terms';
 
 type SignUpWelcomeFormOnyxProps = {
@@ -28,24 +27,20 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
 
     return (
         <>
-            <View style={[styles.mb4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                <PressableWithFeedback
-                    accessibilityLabel={translate('common.back')}
-                    onPress={() => redirectToSignIn()}
-                >
-                    <Text style={[styles.link]}>{translate('common.back')}</Text>
-                </PressableWithFeedback>
+            <View style={[styles.mt3, styles.mb2]}>
                 <Button
-                    medium
+                    isDisabled={network.isOffline || !!account?.message}
                     success
+                    large
                     text={translate('welcomeSignUpForm.join')}
                     isLoading={account?.isLoading}
                     onPress={() => Session.signUpUser()}
-                    isDisabled={network.isOffline || !!account?.message}
                     pressOnEnter
+                    style={[styles.mb2]}
                 />
+                <ChangeExpensifyLoginLink onPress={() => redirectToSignIn()} />
             </View>
-            <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
+            <View style={[styles.mt4, styles.signInPageWelcomeTextContainer]}>
                 <Terms />
             </View>
         </>

From f093d51a5b9553296b5c329187df06a353ef0c7a Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Wed, 5 Jun 2024 15:44:12 +0530
Subject: [PATCH 36/51] fix lint and added a new welcome variant

---
 src/languages/en.ts                    | 1 +
 src/languages/es.ts                    | 1 +
 src/libs/LocalePhoneNumber.ts          | 2 ++
 src/pages/signin/SignInPage.tsx        | 2 +-
 src/pages/signin/SignUpWelcomeForm.tsx | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6bbbd45ea459..28d26be53ad4 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -430,6 +430,7 @@ export default {
         anotherLoginPageIsOpen: 'Another login page is open.',
         anotherLoginPageIsOpenExplanation: "You've opened the login page in a separate tab, please login from that specific tab.",
         welcome: 'Welcome!',
+        welcomeWithoutExclamation: 'Welcome',
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 62bf8d0ff7f1..48373dbbe541 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -421,6 +421,7 @@ export default {
         anotherLoginPageIsOpen: 'Otra página de inicio de sesión está abierta.',
         anotherLoginPageIsOpenExplanation: 'Ha abierto la página de inicio de sesión en una pestaña separada, inicie sesión desde esa pestaña específica.',
         welcome: '¡Bienvenido!',
+        welcomeWithoutExclamation: 'Bienvenido',
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
diff --git a/src/libs/LocalePhoneNumber.ts b/src/libs/LocalePhoneNumber.ts
index faa5401cdf3a..440148457d15 100644
--- a/src/libs/LocalePhoneNumber.ts
+++ b/src/libs/LocalePhoneNumber.ts
@@ -18,6 +18,8 @@ function formatPhoneNumber(number: string): string {
     if (!number) {
         return '';
     }
+
+    // eslint-disable-next-line no-param-reassign
     number = number.replace(/ /g, '\u00A0');
 
     // do not parse the string, if it doesn't contain the SMS domain and it's not a phone number
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index d410fe2d11f0..22093cc04fda 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -249,7 +249,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     } else if (shouldShouldSignUpWelcomeForm) {
         welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
         welcomeText = shouldUseNarrowLayout
-            ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
+            ? `${translate('welcomeText.welcomeWithoutExclamation')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
             : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
     } else if (!shouldInitiateSAMLLogin && !hasInitiatedSAMLLogin) {
         Log.warn('SignInPage in unexpected state!');
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index ebb6a63b8f9c..a5cdfc3b5529 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -38,7 +38,7 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
                     pressOnEnter
                     style={[styles.mb2]}
                 />
-                <ChangeExpensifyLoginLink onPress={() => redirectToSignIn()} />
+                <ChangeExpensifyLoginLink onPress={() => {redirectToSignIn();}} />
             </View>
             <View style={[styles.mt4, styles.signInPageWelcomeTextContainer]}>
                 <Terms />

From f5b6e633abf1037235f2a8713e29d862f58e56cf Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Wed, 5 Jun 2024 15:58:01 +0530
Subject: [PATCH 37/51] style fixes

---
 src/pages/signin/SignUpWelcomeForm.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
index a5cdfc3b5529..1d8010be14cb 100644
--- a/src/pages/signin/SignUpWelcomeForm.tsx
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -38,7 +38,11 @@ function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
                     pressOnEnter
                     style={[styles.mb2]}
                 />
-                <ChangeExpensifyLoginLink onPress={() => {redirectToSignIn();}} />
+                <ChangeExpensifyLoginLink
+                    onPress={() => {
+                        redirectToSignIn();
+                    }}
+                />
             </View>
             <View style={[styles.mt4, styles.signInPageWelcomeTextContainer]}>
                 <Terms />

From 12a2483602f922d3f033b973f6aa231e6fca56d2 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:00:26 +0530
Subject: [PATCH 38/51] Update

---
 .../MoneyRequestPreviewContent.tsx            |  6 +-
 src/libs/HttpUtils.ts                         |  4 +-
 src/libs/ReportUtils.ts                       | 70 +++++++++++--------
 src/libs/TransactionUtils.ts                  |  4 +-
 .../report/ReportActionItemMessageEdit.tsx    |  6 +-
 5 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 18dcf3cb29b7..6a7fba2bb806 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -93,7 +93,11 @@ function MoneyRequestPreviewContent({
     const isSettlementOrApprovalPartial = !!iouReport?.pendingFields?.partial;
     const isPartialHold = isSettlementOrApprovalPartial && isOnHold;
     const hasViolations = TransactionUtils.hasViolation(transaction?.transactionID ?? '', transactionViolations);
-    const hasNoticeTypeViolations = !!(TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations) && ReportUtils.isPaidGroupPolicy(iouReport) && canUseViolations);
+    const hasNoticeTypeViolations = !!(
+        TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations) &&
+        ReportUtils.isPaidGroupPolicy(iouReport) &&
+        canUseViolations
+    );
     const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index 251d176d6961..a826c668be12 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -27,8 +27,8 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        shouldFailAllRequests = !!(network.shouldFailAllRequests);
-        shouldForceOffline = !!(network.shouldForceOffline);
+        shouldFailAllRequests = !!network.shouldFailAllRequests;
+        shouldForceOffline = !!network.shouldForceOffline;
     },
 });
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e3f290a0ee2b..acb7e4256dd0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1674,12 +1674,14 @@ function canShowReportRecipientLocalTime(personalDetails: OnyxCollection<Persona
     const reportRecipient = personalDetails?.[reportRecipientAccountIDs[0]];
     const reportRecipientTimezone = reportRecipient?.timezone ?? CONST.DEFAULT_TIME_ZONE;
     const isReportParticipantValidated = reportRecipient?.validated ?? false;
-    return !!(!hasMultipleParticipants &&
-            !isChatRoom(report) &&
-            !isPolicyExpenseChat(getRootParentReport(report)) &&
-            reportRecipient &&
-            reportRecipientTimezone?.selected &&
-            isReportParticipantValidated);
+    return !!(
+        !hasMultipleParticipants &&
+        !isChatRoom(report) &&
+        !isPolicyExpenseChat(getRootParentReport(report)) &&
+        reportRecipient &&
+        reportRecipientTimezone?.selected &&
+        isReportParticipantValidated
+    );
 }
 
 /**
@@ -2728,14 +2730,16 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
 function canEditReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
     const isCommentOrIOU = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU;
 
-    return !!(reportAction?.actorAccountID === currentUserAccountID &&
-            isCommentOrIOU &&
-            canEditMoneyRequest(reportAction) && // Returns true for non-IOU actions
-            !isReportMessageAttachment(reportAction?.message?.[0]) &&
-            (isEmptyObject(reportAction.attachmentInfo) || !reportAction.isOptimisticAction) &&
-            !ReportActionsUtils.isDeletedAction(reportAction) &&
-            !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
-            reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return !!(
+        reportAction?.actorAccountID === currentUserAccountID &&
+        isCommentOrIOU &&
+        canEditMoneyRequest(reportAction) && // Returns true for non-IOU actions
+        !isReportMessageAttachment(reportAction?.message?.[0]) &&
+        (isEmptyObject(reportAction.attachmentInfo) || !reportAction.isOptimisticAction) &&
+        !ReportActionsUtils.isDeletedAction(reportAction) &&
+        !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
+        reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+    );
 }
 
 /**
@@ -5433,13 +5437,15 @@ function canFlagReportAction(reportAction: OnyxEntry<ReportAction>, reportID: st
         return false;
     }
 
-    return !!(!isCurrentUserAction &&
-            reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT &&
-            !ReportActionsUtils.isDeletedAction(reportAction) &&
-            !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
-            !isEmptyObject(report) &&
-            report &&
-            isAllowedToComment(report));
+    return !!(
+        !isCurrentUserAction &&
+        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT &&
+        !ReportActionsUtils.isDeletedAction(reportAction) &&
+        !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
+        !isEmptyObject(report) &&
+        report &&
+        isAllowedToComment(report)
+    );
 }
 
 /**
@@ -6208,16 +6214,18 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
  *
  */
 function isDeprecatedGroupDM(report: OnyxEntry<Report>): boolean {
-    return !!(report &&
-            !isChatThread(report) &&
-            !isTaskReport(report) &&
-            !isInvoiceReport(report) &&
-            !isMoneyRequestReport(report) &&
-            !isArchivedRoom(report) &&
-            !Object.values(CONST.REPORT.CHAT_TYPE).some((chatType) => chatType === getChatType(report)) &&
-            Object.keys(report.participants ?? {})
-                .map(Number)
-                .filter((accountID) => accountID !== currentUserAccountID).length > 1);
+    return !!(
+        report &&
+        !isChatThread(report) &&
+        !isTaskReport(report) &&
+        !isInvoiceReport(report) &&
+        !isMoneyRequestReport(report) &&
+        !isArchivedRoom(report) &&
+        !Object.values(CONST.REPORT.CHAT_TYPE).some((chatType) => chatType === getChatType(report)) &&
+        Object.keys(report.participants ?? {})
+            .map(Number)
+            .filter((accountID) => accountID !== currentUserAccountID).length > 1
+    );
 }
 
 /**
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index e454df06abcc..9aae0b4c26b7 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -647,7 +647,9 @@ function isOnHoldByTransactionID(transactionID: string): boolean {
  * Checks if any violations for the provided transaction are of type 'violation'
  */
 function hasViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolations>): boolean {
-    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION);
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some(
+        (violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION,
+    );
 }
 
 /**
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 62b6982a48a3..2d7205a12288 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -107,11 +107,7 @@ function ReportActionItemMessageEdit(
     useEffect(() => {
         const parser = new ExpensiMark();
         const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '');
-        if (
-            ReportActionsUtils.isDeletedAction(action) ||
-            !!(action.message && draftMessage === originalMessage) ||
-            !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)
-        ) {
+        if (ReportActionsUtils.isDeletedAction(action) || !!(action.message && draftMessage === originalMessage) || !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)) {
             return;
         }
         setDraft(draftMessage);

From fb84baac72f2b35c04cfa12d04b9089d528afec1 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 5 Jun 2024 12:57:42 -0600
Subject: [PATCH 39/51] fix button width, disable tax sorting

---
 src/components/SelectionList/Search/TransactionListItemRow.tsx | 2 +-
 src/components/SelectionList/SearchTableHeader.tsx             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
index 02ac0bcd700d..50a34be86f61 100644
--- a/src/components/SelectionList/Search/TransactionListItemRow.tsx
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -154,7 +154,7 @@ function ActionCell({onButtonPress}: ActionCellProps) {
             onPress={onButtonPress}
             small
             pressOnEnter
-            style={[styles.p0]}
+            style={[styles.w100]}
         />
     );
 }
diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
index a23c2e322ad7..913ceb914eb0 100644
--- a/src/components/SelectionList/SearchTableHeader.tsx
+++ b/src/components/SelectionList/SearchTableHeader.tsx
@@ -64,6 +64,7 @@ const SearchColumns: SearchColumnConfig[] = [
         columnName: CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT,
         translationKey: 'common.tax',
         shouldShow: (data: OnyxTypes.SearchResults['data']) => SearchUtils.getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT),
+        isColumnSortable: false,
     },
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.TOTAL_AMOUNT,

From 6bc04971ee2c61282029f55108489493975875cf Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 5 Jun 2024 13:10:47 -0600
Subject: [PATCH 40/51] fix report list item button size

---
 src/components/SelectionList/Search/ReportListItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
index 10e25f3d871c..5c3e8ed724d2 100644
--- a/src/components/SelectionList/Search/ReportListItem.tsx
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -55,7 +55,7 @@ function ActionCell({onButtonPress}: ActionCellProps) {
             onPress={onButtonPress}
             small
             pressOnEnter
-            style={[styles.p0]}
+            style={[styles.w100]}
         />
     );
 }

From a8651375a7a338b09a272696ef67207edcd0c63d Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 6 Jun 2024 22:59:22 +0530
Subject: [PATCH 41/51] Update

---
 src/pages/DetailsPage.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 src/pages/DetailsPage.tsx

diff --git a/src/pages/DetailsPage.tsx b/src/pages/DetailsPage.tsx
deleted file mode 100755
index e69de29bb2d1..000000000000

From 0cf53992fc82d449e840d3d3f82915ee6834b276 Mon Sep 17 00:00:00 2001
From: ShridharGoel <35566748+ShridharGoel@users.noreply.github.com>
Date: Thu, 6 Jun 2024 23:09:28 +0530
Subject: [PATCH 42/51] Update

---
 src/components/ConfirmedRoute.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ConfirmedRoute.tsx b/src/components/ConfirmedRoute.tsx
index 745535f3f03f..b6d6bb13213c 100644
--- a/src/components/ConfirmedRoute.tsx
+++ b/src/components/ConfirmedRoute.tsx
@@ -104,7 +104,7 @@ function ConfirmedRoute({mapboxAccessToken, transaction, isSmallerIcon, shouldHa
 
     const shouldDisplayMap = !requireRouteToDisplayMap || !!coordinates.length;
 
-    return !isOffline && Boolean(mapboxAccessToken?.token) && shouldDisplayMap ? (
+    return !isOffline && !!mapboxAccessToken?.token && shouldDisplayMap ? (
         <DistanceMapView
             interactive={interactive}
             accessToken={mapboxAccessToken?.token ?? ''}

From 03594fc3d88214dcba047077b943461d417b519f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 6 Jun 2024 11:58:32 -0600
Subject: [PATCH 43/51] always show categories, tags and taxes columns

---
 .../SelectionList/SearchTableHeader.tsx       |  6 ++---
 src/libs/SearchUtils.ts                       | 24 ++++++-------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
index a23c2e322ad7..a52029aeacd8 100644
--- a/src/components/SelectionList/SearchTableHeader.tsx
+++ b/src/components/SelectionList/SearchTableHeader.tsx
@@ -53,17 +53,17 @@ const SearchColumns: SearchColumnConfig[] = [
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.CATEGORY,
         translationKey: 'common.category',
-        shouldShow: (data: OnyxTypes.SearchResults['data']) => SearchUtils.getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.CATEGORY),
+        shouldShow: () => true,
     },
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.TAG,
         translationKey: 'common.tag',
-        shouldShow: (data: OnyxTypes.SearchResults['data']) => SearchUtils.getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAG),
+        shouldShow: () => true,
     },
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT,
         translationKey: 'common.tax',
-        shouldShow: (data: OnyxTypes.SearchResults['data']) => SearchUtils.getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT),
+        shouldShow: () => true,
     },
     {
         columnName: CONST.SEARCH_TABLE_COLUMNS.TOTAL_AMOUNT,
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index b63147b81136..a5d2ac1d9df2 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -76,15 +76,8 @@ function getShouldShowMerchant(data: OnyxTypes.SearchResults['data']): boolean {
     });
 }
 
-function getShouldShowColumn(data: OnyxTypes.SearchResults['data'], columnName: ValueOf<typeof CONST.SEARCH_TABLE_COLUMNS>) {
-    return Object.values(data).some((item) => !!item[columnName]);
-}
-
 function getTransactionsSections(data: OnyxTypes.SearchResults['data']): TransactionListItemType[] {
     const shouldShowMerchant = getShouldShowMerchant(data);
-    const shouldShowCategory = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.CATEGORY);
-    const shouldShowTag = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAG);
-    const shouldShowTax = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT);
 
     return Object.entries(data)
         .filter(([key]) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION))
@@ -107,9 +100,9 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data']): Transac
                 formattedMerchant,
                 date,
                 shouldShowMerchant,
-                shouldShowCategory,
-                shouldShowTag,
-                shouldShowTax,
+                shouldShowCategory: true,
+                shouldShowTag: true,
+                shouldShowTax: true,
                 keyForList: transactionItem.transactionID,
             };
         });
@@ -117,9 +110,6 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data']): Transac
 
 function getReportSections(data: OnyxTypes.SearchResults['data']): ReportListItemType[] {
     const shouldShowMerchant = getShouldShowMerchant(data);
-    const shouldShowCategory = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.CATEGORY);
-    const shouldShowTag = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAG);
-    const shouldShowTax = getShouldShowColumn(data, CONST.SEARCH_TABLE_COLUMNS.TAX_AMOUNT);
 
     const reportIDToTransactions: Record<string, ReportListItemType> = {};
     for (const key in data) {
@@ -152,9 +142,9 @@ function getReportSections(data: OnyxTypes.SearchResults['data']): ReportListIte
                 formattedMerchant,
                 date,
                 shouldShowMerchant,
-                shouldShowCategory,
-                shouldShowTag,
-                shouldShowTax,
+                shouldShowCategory: true,
+                shouldShowTag: true,
+                shouldShowTax: true,
                 keyForList: transactionItem.transactionID,
             };
             if (reportIDToTransactions[reportKey]?.transactions) {
@@ -240,5 +230,5 @@ function getSearchParams() {
     return topmostCentralPaneRoute?.params as CentralPaneNavigatorParamList['Search_Central_Pane'];
 }
 
-export {getListItem, getQueryHash, getSections, getSortedSections, getShouldShowColumn, getShouldShowMerchant, getSearchType, getSearchParams};
+export {getListItem, getQueryHash, getSections, getSortedSections, getShouldShowMerchant, getSearchType, getSearchParams};
 export type {SearchColumnType, SortOrder};

From c3d8f363502c6eb9cccfdc89125ba7fd0fc08a69 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Thu, 6 Jun 2024 12:51:52 -0700
Subject: [PATCH 44/51] Fix crash in MoneyRequestConfirmationList

---
 src/components/MoneyRequestConfirmationList.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 6e8c2c9990e2..b7cc0741a152 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -255,9 +255,7 @@ function MoneyRequestConfirmationList({
 
     const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;
 
-    const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction)
-        ? DistanceRequestUtils.getRateForP2P(policyCurrency)
-        : mileageRates?.[customUnitRateID] ?? DistanceRequestUtils.getDefaultMileageRate(policy);
+    const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction) ? DistanceRequestUtils.getRateForP2P(policyCurrency) : mileageRates?.[customUnitRateID] ?? defaultMileageRate;
 
     const {unit, rate} = mileageRate ?? {};
 

From 82cdf01a80af2afb6995c3baa9a8eb7e6a30f7c8 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jun 2024 20:32:52 +0000
Subject: [PATCH 45/51] Update version to 1.4.80-7

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1d91f75bd30c..6bf8b4547cfc 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048006
-        versionName "1.4.80-6"
+        versionCode 1001048007
+        versionName "1.4.80-7"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2d9ce2c19520..b2b42f017020 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.6</string>
+	<string>1.4.80.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1f7fc84174f1..fae1cb880b8f 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.6</string>
+	<string>1.4.80.7</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index b38b57c77d34..e1b0c3a07fbe 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.80</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.6</string>
+	<string>1.4.80.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 69909af61a96..f74da94b87ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-6",
+  "version": "1.4.80-7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.80-6",
+      "version": "1.4.80-7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index b26a10a6780a..ce33c0007de9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-6",
+  "version": "1.4.80-7",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 33521cbc88cd4baa18989d1e3386d3b66fd6f08e Mon Sep 17 00:00:00 2001
From: Ishpaul Singh <104348397+ishpaul777@users.noreply.github.com>
Date: Fri, 7 Jun 2024 02:11:12 +0530
Subject: [PATCH 46/51] Revert "fix: Error message only changes after clicking
 Split expense button for the second time"

---
 .../MoneyRequestConfirmationList.tsx          | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index b7cc0741a152..b63fa7157c63 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -344,15 +344,14 @@ function MoneyRequestConfirmationList({
     const isCategoryRequired = !!policy?.requiresCategory;
 
     useEffect(() => {
-        if (shouldDisplayFieldError && didConfirmSplit) {
-            setFormError('iou.error.genericSmartscanFailureMessage');
-            return;
-        }
-
         if (shouldDisplayFieldError && hasSmartScanFailed) {
             setFormError('iou.receiptScanningFailed');
             return;
         }
+        if (shouldDisplayFieldError && didConfirmSplit) {
+            setFormError('iou.error.genericSmartscanFailureMessage');
+            return;
+        }
         // reset the form error whenever the screen gains or loses focus
         setFormError('');
 
@@ -714,7 +713,21 @@ function MoneyRequestConfirmationList({
                 setFormError('iou.error.invalidCategoryLength');
                 return;
             }
-            if (iouType !== CONST.IOU.TYPE.PAY) {
+
+            if (formError) {
+                return;
+            }
+
+            if (iouType === CONST.IOU.TYPE.PAY) {
+                if (!paymentMethod) {
+                    return;
+                }
+
+                setDidConfirm(true);
+
+                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
+                onSendMoney?.(paymentMethod);
+            } else {
                 // validate the amount for distance expenses
                 const decimals = CurrencyUtils.getCurrencyDecimals(iouCurrencyCode);
                 if (isDistanceRequest && !isDistanceRequestWithPendingRoute && !MoneyRequestUtils.validateAmount(String(iouAmount), decimals)) {
@@ -731,18 +744,6 @@ function MoneyRequestConfirmationList({
                 playSound(SOUNDS.DONE);
                 setDidConfirm(true);
                 onConfirm?.(selectedParticipants);
-            } else {
-                if (formError) {
-                    return;
-                }
-                if (!paymentMethod) {
-                    return;
-                }
-
-                setDidConfirm(true);
-
-                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
-                onSendMoney?.(paymentMethod);
             }
         },
         [

From 1685e56690317791b3e0719b4c6715a3cbe1a63f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Thu, 6 Jun 2024 15:10:26 -0600
Subject: [PATCH 47/51] fix crash

---
 src/libs/DistanceRequestUtils.ts  | 4 ++--
 src/libs/actions/Policy/Policy.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index ed4a6a73c9b9..cbae1e0d3bfb 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -52,7 +52,7 @@ function getMileageRates(policy: OnyxEntry<Policy>, includeDisabledRates = false
     }
 
     Object.entries(distanceUnit.rates).forEach(([rateID, rate]) => {
-        if (!includeDisabledRates && !rate.enabled) {
+        if (!includeDisabledRates && rate.enabled === false) {
             return;
         }
 
@@ -89,7 +89,7 @@ function getDefaultMileageRate(policy: OnyxEntry<Policy> | EmptyObject): Mileage
     }
     const mileageRates = getMileageRates(policy);
 
-    const distanceRate = Object.values(mileageRates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(mileageRates)[0];
+    const distanceRate = Object.values(mileageRates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(mileageRates)[0] ?? {};
 
     return {
         customUnitRateID: distanceRate.customUnitRateID,
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index e17d4290a46a..0e168f973078 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -1407,6 +1407,7 @@ function buildOptimisticCustomUnits(): OptimisticCustomUnits {
                     customUnitRateID,
                     name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
                     rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
+                    enabled: true,
                     currency,
                 },
             },

From 53ffcb489bba626cafd52a25bb8e3b1a8b5963bd Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jun 2024 21:18:27 +0000
Subject: [PATCH 48/51] Update version to 1.4.80-8

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6bf8b4547cfc..c0fcda5d7228 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048007
-        versionName "1.4.80-7"
+        versionCode 1001048008
+        versionName "1.4.80-8"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b2b42f017020..f537f6937bbf 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.7</string>
+	<string>1.4.80.8</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fae1cb880b8f..6776737ea338 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.7</string>
+	<string>1.4.80.8</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index e1b0c3a07fbe..875443eb3ef4 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.80</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.7</string>
+	<string>1.4.80.8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index f74da94b87ef..4cae7b9edce6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-7",
+  "version": "1.4.80-8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.80-7",
+      "version": "1.4.80-8",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index ce33c0007de9..61b366d10439 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-7",
+  "version": "1.4.80-8",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 66870b49b1023d6ddae78408e4d175d74ea812e3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 6 Jun 2024 21:28:31 +0000
Subject: [PATCH 49/51] Update version to 1.4.80-9

---
 android/app/build.gradle                    | 4 ++--
 ios/NewExpensify/Info.plist                 | 2 +-
 ios/NewExpensifyTests/Info.plist            | 2 +-
 ios/NotificationServiceExtension/Info.plist | 2 +-
 package-lock.json                           | 4 ++--
 package.json                                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index c0fcda5d7228..ab15f3190354 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048008
-        versionName "1.4.80-8"
+        versionCode 1001048009
+        versionName "1.4.80-9"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f537f6937bbf..6e35b9282d07 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.8</string>
+	<string>1.4.80.9</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6776737ea338..b4c1313c26c9 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.8</string>
+	<string>1.4.80.9</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 875443eb3ef4..11caa243baf5 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.80</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.8</string>
+	<string>1.4.80.9</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 4cae7b9edce6..d4a562971333 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-8",
+  "version": "1.4.80-9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.80-8",
+      "version": "1.4.80-9",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 61b366d10439..07ed53d8f7eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-8",
+  "version": "1.4.80-9",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 9b123b992ff37c98e59f9057ac5730f6e6541246 Mon Sep 17 00:00:00 2001
From: James Dean <james@expensify.com>
Date: Thu, 6 Jun 2024 14:38:35 -0700
Subject: [PATCH 50/51] Update en.ts

---
 src/languages/en.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index a10a7b4282ae..703db81391c9 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2391,7 +2391,7 @@ export default {
             subtitle: 'Connect to your accounting system to code transactions with your chart of accounts, auto-match payments, and keep your finances in sync.',
             qbo: 'Quickbooks Online',
             xero: 'Xero',
-            setup: 'Set up',
+            setup: 'Connect',
             lastSync: 'Last synced just now',
             import: 'Import',
             export: 'Export',

From e543b60a53c0f52f8bd3e7c0c0a5ba4c60314ee2 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Thu, 6 Jun 2024 15:21:10 -0700
Subject: [PATCH 51/51] Replace Boolean by !!

---
 src/libs/TransactionUtils.ts    | 4 +---
 src/pages/signin/SignInPage.tsx | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
index 463067a7dfce..33b409daf3d2 100644
--- a/src/libs/TransactionUtils.ts
+++ b/src/libs/TransactionUtils.ts
@@ -690,9 +690,7 @@ function hasNoticeTypeViolation(transactionID: string, transactionViolations: On
  * Checks if any violations for the provided transaction are of type 'warning'
  */
 function hasWarningTypeViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
-    return Boolean(
-        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.WARNING),
-    );
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.WARNING);
 }
 
 /**
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 879f2c047052..407ce6304f2b 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -112,7 +112,7 @@ function getRenderOptions({
     }
 
     // Show the Welcome form if a user is signing up for a new account in a domain that is not controlled
-    const shouldShouldSignUpWelcomeForm = Boolean(credentials?.login) && !account?.validated && !account?.accountExists && !account?.domainControlled;
+    const shouldShouldSignUpWelcomeForm = !!credentials?.login && !account?.validated && !account?.accountExists && !account?.domainControlled;
     const shouldShowLoginForm = !shouldShowAnotherLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;