From c230720c4dfaa6e920ee32f6c26c35bca9dc134f Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 17 May 2024 18:44:15 +0000
Subject: [PATCH 01/77] fix: Gemfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-REXML-6861566
---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 751e05d2d32b..6cf346b06332 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source "https://rubygems.org"
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem "cocoapods", "~> 1.13"
+gem "cocoapods", "~> 1.14", ">= 1.14.0"
 gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
-gem "fastlane", "~> 2"
+gem "fastlane", "~> 2", ">= 2.220.0"
 gem "xcpretty", "~> 0"
 
 

From 8a279236db386b03d89ea756d64bdde563555513 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Wed, 22 May 2024 16:40:01 +0700
Subject: [PATCH 02/77] fix: cache extra attributes for video markdown
 conversion

---
 src/libs/actions/Report.ts                     | 12 +++++++-----
 .../report/ReportActionItemMessageEdit.tsx     | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 91a0ce5da930..8bc996a8b5a1 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1435,18 +1435,21 @@ function removeLinksFromHtml(html: string, links: string[]): string {
  * @param newCommentText text of the comment after editing.
  * @param originalCommentMarkdown original markdown of the comment before editing.
  */
-function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string): string {
+function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string, videoAttributeCache?: Record<string, string>): string {
     const parser = new ExpensiMark();
     if (newCommentText.length > CONST.MAX_MARKUP_LENGTH) {
         return newCommentText;
     }
-    const htmlForNewComment = parser.replace(newCommentText);
+
+    const htmlForNewComment = parser.replace(newCommentText, {
+        extras: {videoAttributeCache},
+    });
     const removedLinks = parser.getRemovedMarkdownLinks(originalCommentMarkdown, newCommentText);
     return removeLinksFromHtml(htmlForNewComment, removedLinks);
 }
 
 /** Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI. */
-function editReportComment(reportID: string, originalReportAction: OnyxEntry<ReportAction>, textForNewComment: string) {
+function editReportComment(reportID: string, originalReportAction: OnyxEntry<ReportAction>, textForNewComment: string, videoAttributeCache?: Record<string, string>) {
     const parser = new ExpensiMark();
     const originalReportID = ReportUtils.getOriginalReportID(reportID, originalReportAction);
 
@@ -1464,8 +1467,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
     if (originalCommentMarkdown === textForNewComment) {
         return;
     }
-
-    const htmlForNewComment = handleUserDeletedLinksInHtml(textForNewComment, originalCommentMarkdown);
+    const htmlForNewComment = handleUserDeletedLinksInHtml(textForNewComment, originalCommentMarkdown, videoAttributeCache);
     const reportComment = parser.htmlToText(htmlForNewComment);
 
     // For comments shorter than or equal to 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 6cb03e8dae05..c5f51ab8570e 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -66,6 +66,9 @@ const messageEditInput = 'messageEditInput';
 
 const shouldUseForcedSelectionRange = shouldUseEmojiPickerSelection();
 
+// video source -> video attributes
+const draftMessageVideoAttributeCache = new Map<string, string>();
+
 function ReportActionItemMessageEdit(
     {action, draftMessage, reportID, index, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
     forwardedRef: ForwardedRef<TextInput | HTMLTextAreaElement | undefined>,
@@ -106,7 +109,18 @@ function ReportActionItemMessageEdit(
 
     useEffect(() => {
         const parser = new ExpensiMark();
-        const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '');
+        const videoAttributesCache: Record<string, string> = {};
+        const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '', {
+            cacheVideoAttributes: (videoSource, attrs) => {
+                videoAttributesCache[videoSource] = attrs;
+            },
+        });
+
+        draftMessageVideoAttributeCache.clear();
+        for (const [videoSource, attrs] of Object.entries(videoAttributesCache)) {
+            draftMessageVideoAttributeCache.set(videoSource, attrs);
+        }
+
         if (
             ReportActionsUtils.isDeletedAction(action) ||
             Boolean(action.message && draftMessage === originalMessage) ||
@@ -301,7 +315,7 @@ function ReportActionItemMessageEdit(
             ReportActionContextMenu.showDeleteModal(reportID, action, true, deleteDraft, () => focusEditAfterCancelDelete(textInputRef.current));
             return;
         }
-        Report.editReportComment(reportID, action, trimmedNewDraft);
+        Report.editReportComment(reportID, action, trimmedNewDraft, Object.fromEntries(draftMessageVideoAttributeCache));
         deleteDraft();
     }, [action, deleteDraft, draft, reportID]);
 

From 27809d61306e002929974fb7bd7e754ab9ee096a Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 7 Jun 2024 15:15:47 +0530
Subject: [PATCH 03/77] fix: mWeb - Chat - Uploading an image while offline
 briefly shows an offline message in the preview.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/ImageView/index.tsx | 10 ++++++----
 src/components/Lightbox/index.tsx  |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/ImageView/index.tsx b/src/components/ImageView/index.tsx
index f08941ef7d77..da77f93ab65c 100644
--- a/src/components/ImageView/index.tsx
+++ b/src/components/ImageView/index.tsx
@@ -195,6 +195,8 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
         };
     }, [canUseTouchScreen, trackMovement, trackPointerPosition]);
 
+    const isLocalFile = url.startsWith('blob:') || url.startsWith('file:');
+
     if (canUseTouchScreen) {
         return (
             <View
@@ -213,8 +215,8 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
                     onLoad={imageLoad}
                     onError={onError}
                 />
-                {((isLoading && !isOffline) || (!isLoading && zoomScale === 0)) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
-                {isLoading && <AttachmentOfflineIndicator />}
+                {((isLoading && (!isOffline || isLocalFile)) || (!isLoading && zoomScale === 0)) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+                {isLoading && !isLocalFile && <AttachmentOfflineIndicator />}
             </View>
         );
     }
@@ -247,8 +249,8 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
                 />
             </PressableWithoutFeedback>
 
-            {isLoading && !isOffline && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
-            {isLoading && <AttachmentOfflineIndicator />}
+            {isLoading && (!isOffline || isLocalFile) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+            {isLoading && !isLocalFile && <AttachmentOfflineIndicator />}
         </View>
     );
 }
diff --git a/src/components/Lightbox/index.tsx b/src/components/Lightbox/index.tsx
index 0be0171eaa9a..6b3b7557cf58 100644
--- a/src/components/Lightbox/index.tsx
+++ b/src/components/Lightbox/index.tsx
@@ -197,6 +197,8 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
         [onScaleChangedContext, onScaleChangedProp],
     );
 
+    const isLocalFile = uri.startsWith('blob:') || uri.startsWith('file:');
+
     return (
         <View
             style={[StyleSheet.absoluteFill, style]}
@@ -248,13 +250,13 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
                     )}
 
                     {/* Show activity indicator while the lightbox is still loading the image. */}
-                    {isLoading && !isOffline && (
+                    {isLoading && (!isOffline || isLocalFile) && (
                         <ActivityIndicator
                             size="large"
                             style={StyleSheet.absoluteFill}
                         />
                     )}
-                    {isLoading && <AttachmentOfflineIndicator />}
+                    {isLoading && !isLocalFile && <AttachmentOfflineIndicator />}
                 </>
             )}
         </View>

From dd494e7f42e24aa54777a0a792111660a08e8b4a Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Thu, 13 Jun 2024 14:15:46 +0800
Subject: [PATCH 04/77] fix emoji cut off after edit

---
 .../HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx       | 4 +++-
 src/pages/home/report/comment/TextCommentFragment.tsx         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
index a548f39372ec..88e5c1f42555 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
@@ -12,10 +12,12 @@ function EditedRenderer({tnode, TDefaultRenderer, style, ...defaultRendererProps
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const isPendingDelete = !!(tnode.attributes.deleted !== undefined);
+    const isLarge = !!(tnode.attributes.islarge !== undefined);
     return (
-        <Text>
+        <Text style={isLarge && styles.onlyEmojisTextLineHeight}>
             <Text
                 style={styles.userSelectNone}
+                fontSize={variables.fontSizeSmall}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {' '}
diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index f29acf8d35fc..28b4f9eebc88 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -53,7 +53,7 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
     // on other device, only render it as text if the only difference is <br /> tag
     const containsOnlyEmojis = EmojiUtils.containsOnlyEmojis(text ?? '');
     if (!shouldRenderAsText(html, text ?? '') && !(containsOnlyEmojis && styleAsDeleted)) {
-        const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''}></edited>` : '';
+        const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''} ${containsOnlyEmojis ? 'islarge' : ''}></edited>` : '';
         const htmlWithDeletedTag = styleAsDeleted ? `<del>${html}</del>` : html;
 
         const htmlContent = containsOnlyEmojis ? Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>') : htmlWithDeletedTag;

From 5153b9516ec9fbc90e2b7dab1560a2d6ffca4e39 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Thu, 13 Jun 2024 18:17:47 +0700
Subject: [PATCH 05/77] fix: set the cache directly

---
 src/pages/home/report/ReportActionItemMessageEdit.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index e0becda218d7..70b426d6594e 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -109,18 +109,13 @@ function ReportActionItemMessageEdit(
 
     useEffect(() => {
         const parser = new ExpensiMark();
-        const videoAttributesCache: Record<string, string> = {};
+        draftMessageVideoAttributeCache.clear();
         const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '', {
             cacheVideoAttributes: (videoSource, attrs) => {
-                videoAttributesCache[videoSource] = attrs;
+                draftMessageVideoAttributeCache.set(videoSource, attrs);
             },
         });
 
-        draftMessageVideoAttributeCache.clear();
-        for (const [videoSource, attrs] of Object.entries(videoAttributesCache)) {
-            draftMessageVideoAttributeCache.set(videoSource, attrs);
-        }
-
         if (ReportActionsUtils.isDeletedAction(action) || !!(action.message && draftMessage === originalMessage) || !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)) {
             return;
         }

From 1771b7c260de1d1556416305811a4ebb335cb155 Mon Sep 17 00:00:00 2001
From: Anusha <anusharukhsar1@gmail.com>
Date: Thu, 13 Jun 2024 20:10:12 +0500
Subject: [PATCH 06/77] fix workspace empty state

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1d3f495369d9..7ba463a41401 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2315,7 +2315,7 @@ export default {
             importedFromAccountingSoftware: 'The taxes below are imported from your',
         },
         emptyWorkspace: {
-            title: 'Create a workspace',
+            title: 'Create a new workspace',
             subtitle: 'Workspaces are where you’ll chat with your team, reimburse expenses, issue cards, send invoices, pay bills, and more - all in one place.',
             createAWorkspaceCTA: 'Get Started',
             features: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 93ed4853a113..0511557c4a6e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2354,7 +2354,7 @@ export default {
             importedFromAccountingSoftware: 'Impuestos importadas desde',
         },
         emptyWorkspace: {
-            title: 'Crea un espacio de trabajo',
+            title: 'Crea un nuevo espacio de trabajo',
             subtitle: 'En los espacios de trabajo podrás chatear con tu equipo, reembolsar gastos, emitir tarjetas, enviar y pagar facturas, y mucho más - todo en un mismo lugar.',
             createAWorkspaceCTA: 'Comenzar',
             features: {
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 599e8818b52c..c4ded14d3e7f 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -369,6 +369,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                     title={translate('common.workspaces')}
                     shouldShowBackButton={isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack()}
+                    icon={Illustrations.BigRocket}
                 >
                     <Button
                         accessibilityLabel={translate('workspace.new.newWorkspace')}
@@ -390,6 +391,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                             illustration={LottieAnimations.WorkspacePlanet}
                             // We use this style to vertically center the illustration, as the original illustration is not centered
                             illustrationStyle={styles.emptyWorkspaceIllustrationStyle}
+                            titleStyles={styles.textHeadlineH1}
                         />
                     </View>
                 </ScrollView>

From 16f92123096ffa188281fde513cf77343e7f5138 Mon Sep 17 00:00:00 2001
From: Anusha <anusharukhsar1@gmail.com>
Date: Thu, 13 Jun 2024 20:22:47 +0500
Subject: [PATCH 07/77] add icon in header

---
 src/pages/workspace/WorkspacesListPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index c4ded14d3e7f..6432dd487f9a 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -410,6 +410,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                     title={translate('common.workspaces')}
                     shouldShowBackButton={isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack()}
+                    icon={Illustrations.BigRocket}
                 >
                     <Button
                         accessibilityLabel={translate('workspace.new.newWorkspace')}

From 127d350993ddded4c3dc09d4a2c6453b021d528c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 16:57:15 +0100
Subject: [PATCH 08/77] Add NVP_FIRST_DAY_FREE_TRIAL Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 0d22d3714fe6..99b88df19ee8 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -169,6 +169,9 @@ const ONYXKEYS = {
     /** The NVP with the last action taken (for the Quick Action Button) */
     NVP_QUICK_ACTION_GLOBAL_CREATE: 'nvp_quickActionGlobalCreate',
 
+    /** The start date of the workspace owner’s free trial period. */
+    NVP_FIRST_DAY_FREE_TRIAL: 'nvp_private_firstDayFreeTrial',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -699,6 +702,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.CACHED_PDF_PATHS]: Record<string, string>;
     [ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS]: Record<string, OnyxTypes.PolicyOwnershipChangeChecks>;
     [ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE]: OnyxTypes.QuickAction;
+    [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From 3aaaac125c9378f78caf1dba950a22a735cd8b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 16:58:04 +0100
Subject: [PATCH 09/77] Add NVP_LAST_DAY_FREE_TRIAL Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 99b88df19ee8..04f62b0ac7b3 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -172,6 +172,9 @@ const ONYXKEYS = {
     /** The start date of the workspace owner’s free trial period. */
     NVP_FIRST_DAY_FREE_TRIAL: 'nvp_private_firstDayFreeTrial',
 
+    /** The end date of the workspace owner’s free trial period. */
+    NVP_LAST_DAY_FREE_TRIAL: 'nvp_private_lastDayFreeTrial',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -703,6 +706,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS]: Record<string, OnyxTypes.PolicyOwnershipChangeChecks>;
     [ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE]: OnyxTypes.QuickAction;
     [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;
+    [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: string;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From 12fa1167b8ac92487784b963863620ec1dca456b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 16:59:41 +0100
Subject: [PATCH 10/77] Add NVP_BILLING_FUND_ID Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 04f62b0ac7b3..840abf9f571a 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -175,6 +175,9 @@ const ONYXKEYS = {
     /** The end date of the workspace owner’s free trial period. */
     NVP_LAST_DAY_FREE_TRIAL: 'nvp_private_lastDayFreeTrial',
 
+    /** ID associated with the payment card added by the user. */
+    NVP_BILLING_FUND_ID: 'nvp_expensify_billingFundID',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -707,6 +710,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE]: OnyxTypes.QuickAction;
     [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;
     [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: string;
+    [ONYXKEYS.NVP_BILLING_FUND_ID]: number;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From 91affbd223778d2d4081a15c8bb8bd287e7f48fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 17:01:02 +0100
Subject: [PATCH 11/77] Add NVP_PRIVATE_AMOUNT_OWNED Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 840abf9f571a..a8e85845f617 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -178,6 +178,9 @@ const ONYXKEYS = {
     /** ID associated with the payment card added by the user. */
     NVP_BILLING_FUND_ID: 'nvp_expensify_billingFundID',
 
+    /** The amount owed by the workspace’s owner. */
+    NVP_PRIVATE_AMOUNT_OWNED: 'nvp_private_amountOwed',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -711,6 +714,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;
     [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: string;
     [ONYXKEYS.NVP_BILLING_FUND_ID]: number;
+    [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: number;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From a8f194f3f47b053f54be34c598815fe2a3602f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 17:02:21 +0100
Subject: [PATCH 12/77] Add NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END Onyx key

---
 src/ONYXKEYS.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index a8e85845f617..35acfb06d1d2 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -181,6 +181,9 @@ const ONYXKEYS = {
     /** The amount owed by the workspace’s owner. */
     NVP_PRIVATE_AMOUNT_OWNED: 'nvp_private_amountOwed',
 
+    /** The end date (epoch timestamp) of the workspace owner’s grace period after the free trial ends. */
+    NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END: 'nvp_private_billingGracePeriodEnd',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -715,6 +718,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: string;
     [ONYXKEYS.NVP_BILLING_FUND_ID]: number;
     [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: number;
+    [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: number;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

From 9f41e9b471149945f37019fa1f16da95669634b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Thu, 13 Jun 2024 17:27:06 +0100
Subject: [PATCH 13/77] Add SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END
 Onyx key

---
 src/ONYXKEYS.ts                         |  5 +++++
 src/types/onyx/BillingGraceEndPeriod.ts | 13 +++++++++++++
 src/types/onyx/index.ts                 |  2 ++
 3 files changed, 20 insertions(+)
 create mode 100644 src/types/onyx/BillingGraceEndPeriod.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 35acfb06d1d2..d5289d97b8ab 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -391,6 +391,10 @@ const ONYXKEYS = {
 
         // Search Page related
         SNAPSHOT: 'snapshot_',
+
+        // Shared NVPs
+        /** Collection of objects where each objects represents a workspace’s owner which is past due billing AND the user is a member of. */
+        SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END: 'sharedNVP_private_billingGracePeriodEnd_'
     },
 
     /** List of Form ids */
@@ -604,6 +608,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_JOIN_MEMBER]: OnyxTypes.PolicyJoinMember;
     [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS]: OnyxTypes.PolicyConnectionSyncProgress;
     [ONYXKEYS.COLLECTION.SNAPSHOT]: OnyxTypes.SearchResults;
+    [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: OnyxTypes.BillingGraceEndPeriod;
 };
 
 type OnyxValuesMapping = {
diff --git a/src/types/onyx/BillingGraceEndPeriod.ts b/src/types/onyx/BillingGraceEndPeriod.ts
new file mode 100644
index 000000000000..e66bc92c59df
--- /dev/null
+++ b/src/types/onyx/BillingGraceEndPeriod.ts
@@ -0,0 +1,13 @@
+/** Model of BillingGraceEndPeriod's Shared NVP record */
+type BillingGraceEndPeriod = {
+    /** The name of the NVP key. */
+    name: string;
+
+    /** The permission associated with the NVP key. */
+    permissions: string;
+    
+    /** The grace period end date (epoch timestamp) of the workspace's owner where the user is a member of. */
+    value: number;
+};
+
+export default BillingGraceEndPeriod;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 5a70ddd48d9e..47e0f34045ec 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -3,6 +3,7 @@ import type AccountData from './AccountData';
 import type {BankAccountList} from './BankAccount';
 import type BankAccount from './BankAccount';
 import type Beta from './Beta';
+import type BillingGraceEndPeriod from './BillingGraceEndPeriod';
 import type BlockedFromConcierge from './BlockedFromConcierge';
 import type Card from './Card';
 import type {CardList} from './Card';
@@ -187,4 +188,5 @@ export type {
     CapturedLogs,
     SearchResults,
     PrivateSubscription,
+    BillingGraceEndPeriod,
 };

From 3127c9d10db8d94017cad014c99480c1f926baf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 12:19:40 +0100
Subject: [PATCH 14/77] Implement isChatUsedForOnboarding() and
 getChatUsedForOnboarding() functions

---
 src/libs/AccountUtils.ts      |  1 +
 src/libs/ReportUtils.ts       | 17 ++++++++++++++
 tests/unit/ReportUtilsTest.ts | 43 +++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/src/libs/AccountUtils.ts b/src/libs/AccountUtils.ts
index 8bc7037e9682..b926e20ca59c 100644
--- a/src/libs/AccountUtils.ts
+++ b/src/libs/AccountUtils.ts
@@ -5,6 +5,7 @@ import type {Account} from '@src/types/onyx';
 const isValidateCodeFormSubmitting = (account: OnyxEntry<Account>) =>
     !!account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);
 
+/** Whether the accound ID is an odd number, useful for A/B testing. */
 const isAccountIDOddNumber = (accountID: number) => accountID % 2 === 1;
 
 export default {isValidateCodeFormSubmitting, isAccountIDOddNumber};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 914c653b6f91..5f17b4125f14 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -58,6 +58,7 @@ import type {Comment, Receipt, TransactionChanges, WaypointCollection} from '@sr
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import AccountUtils from './AccountUtils';
 import * as IOU from './actions/IOU';
 import * as PolicyActions from './actions/Policy/Policy';
 import * as store from './actions/ReimbursementAccount/store';
@@ -6946,6 +6947,20 @@ function shouldShowMerchantColumn(transactions: Transaction[]) {
     return transactions.some((transaction) => isExpenseReport(allReports?.[transaction.reportID] ?? {}));
 }
 
+/**
+ * Whether the report is a system chat or concierge chat, depending on the user's account ID.
+ */
+function isChatUsedForOnboarding(report: OnyxEntry<Report>): boolean {
+    return AccountUtils.isAccountIDOddNumber(currentUserAccountID ?? -1) ? isSystemChat(report) : isConciergeChatReport(report);
+}
+
+/**
+ * Get the report (system or concierge chat) used for the user's onboarding process.
+ */
+function getChatUsedForOnboarding(): OnyxEntry<Report> {
+    return Object.values(allReports ?? {}).find(isChatUsedForOnboarding);
+}
+
 export {
     addDomainToShortMention,
     areAllRequestsBeingSmartScanned,
@@ -7217,6 +7232,8 @@ export {
     isDraftReport,
     changeMoneyRequestHoldStatus,
     createDraftWorkspaceAndNavigateToConfirmationScreen,
+    isChatUsedForOnboarding,
+    getChatUsedForOnboarding,
 };
 
 export type {
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 326e020464e0..c678a6fed6cc 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -821,4 +821,47 @@ describe('ReportUtils', () => {
             expect(ReportUtils.getAllAncestorReportActions(reports[4])).toEqual(resultAncestors);
         });
     });
+
+    describe('isChatUsedForOnboarding', () => {
+        afterAll(() => Onyx.clear());
+
+        it('should return true if the user account ID is odd and report is the system chat', async () => {
+            const accountID = 1;
+
+            return Onyx.multiSet({
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
+                    [accountID]: {
+                        accountID,
+                    },
+                },
+                [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
+            }).then(() => {
+                const report: Report = {
+                    ...LHNTestUtils.getFakeReport(),
+                    chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+                };
+
+                expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
+            });
+        });
+
+        it('should return true if the user account ID is even and report is the concierge chat', async () => {
+            const accountID = 2;
+
+            return Onyx.multiSet({
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
+                    [accountID]: {
+                        accountID,
+                    },
+                },
+                [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
+            }).then(() => {
+                const report: Report = {
+                    ...LHNTestUtils.getFakeReport([CONST.ACCOUNT_ID.CONCIERGE]),
+                };
+
+                expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
+            });
+        });
+    });
 });

From 4eb8d41bcb69d7a4fa8dc06e0066bf65fe535937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 12:19:56 +0100
Subject: [PATCH 15/77] Add descriptive comment to isSystemChat() function

---
 src/libs/ReportUtils.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 5f17b4125f14..f53e625295d0 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1035,12 +1035,15 @@ function isGroupChat(report: OnyxEntry<Report> | Partial<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.GROUP;
 }
 
+/**
+ * Only returns true if this is the Expensify DM report.
+ */
 function isSystemChat(report: OnyxEntry<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.SYSTEM;
 }
 
 /**
- * Only returns true if this is our main 1:1 DM report with Concierge
+ * Only returns true if this is our main 1:1 DM report with Concierge.
  */
 function isConciergeChatReport(report: OnyxInputOrEntry<Report>): boolean {
     const participantAccountIDs = Object.keys(report?.participants ?? {})

From 5f812e23309d22987a5cc19c8bc892ef64e8832b Mon Sep 17 00:00:00 2001
From: Rodrigo Lino da Costa <rodrigo@expensify.com>
Date: Fri, 14 Jun 2024 10:18:27 -0300
Subject: [PATCH 16/77] hides required toggle in case there are dependent tags

---
 .../workspace/tags/WorkspaceViewTagsPage.tsx  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
index f889c34b66d1..ee1f7aac0ec8 100644
--- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
@@ -35,6 +35,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import type {TagListItem} from './types';
+import {hasDependentTags} from "@libs/PolicyUtils";
 
 type WorkspaceViewTagsProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_LIST_VIEW>;
 
@@ -84,6 +85,8 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
         [currentPolicyTag, selectedTags, translate],
     );
 
+    const hasDependentTags = useMemo( () => PolicyUtils.hasDependentTags(policy, policyTags), [policy, policyTags]);
+
     const tagListKeyedByName = useMemo(
         () =>
             tagList.reduce<Record<string, TagListItem>>((acc, tag) => {
@@ -234,18 +237,20 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
                     cancelText={translate('common.cancel')}
                     danger
                 />
-                <View style={[styles.pv4, styles.ph5]}>
-                    <ToggleSettingOptionRow
-                        title={translate('common.required')}
-                        switchAccessibilityLabel={translate('common.required')}
-                        isActive={!!currentPolicyTag?.required}
-                        onToggle={(on) => Tag.setPolicyTagsRequired(policyID, on, route.params.orderWeight)}
-                        pendingAction={currentPolicyTag.pendingFields?.required}
-                        errors={currentPolicyTag?.errorFields?.required ?? undefined}
-                        onCloseError={() => Tag.clearPolicyTagListError(policyID, route.params.orderWeight, 'required')}
-                        disabled={!currentPolicyTag?.required && !Object.values(currentPolicyTag?.tags ?? {}).some((tag) => tag.enabled)}
-                    />
-                </View>
+                {!hasDependentTags && (
+                    <View style={[styles.pv4, styles.ph5]}>
+                        <ToggleSettingOptionRow
+                            title={translate('common.required')}
+                            switchAccessibilityLabel={translate('common.required')}
+                            isActive={!!currentPolicyTag?.required}
+                            onToggle={(on) => Tag.setPolicyTagsRequired(policyID, on, route.params.orderWeight)}
+                            pendingAction={currentPolicyTag.pendingFields?.required}
+                            errors={currentPolicyTag?.errorFields?.required ?? undefined}
+                            onCloseError={() => Tag.clearPolicyTagListError(policyID, route.params.orderWeight, 'required')}
+                            disabled={!currentPolicyTag?.required && !Object.values(currentPolicyTag?.tags ?? {}).some((tag) => tag.enabled)}
+                        />
+                    </View>
+                )}
                 <OfflineWithFeedback
                     errors={currentPolicyTag.errors}
                     pendingAction={currentPolicyTag.pendingAction}

From a63b1039f0f688dbce4e81f72defe98e3f983189 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Fri, 14 Jun 2024 19:24:13 +0530
Subject: [PATCH 17/77] Implementing NetSuite type in connection

---
 src/types/onyx/Policy.ts | 340 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 340 insertions(+)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index f18fb7d35ea5..e7d6a57d2744 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -591,6 +591,343 @@ type XeroConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** */
+type Subsidiary = {
+    /** ID of the subsidiary */
+    internalID: string;
+
+    /** Country where subsidiary is present */
+    country: string;
+
+    /** Whether the subsidiary is an elimination */
+    isElimination: boolean;
+
+    /** Name of the subsidiary */
+    name: string;
+};
+
+/** NetSuite Financial account (bank account, debit card, etc) */
+type NetSuiteAccount = {
+    /** GL code assigned to the financial account */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+
+    /** Name of the account */
+    name: string;
+
+    /** ID assigned to the financial account */
+    id: string;
+
+    /** Type of the financial account */
+    type: string;
+};
+
+/** NetSuite Tax account */
+type NetSuiteTaxAccount = {
+    /** Name of the tax account */
+    name: string;
+
+    /** ID assigned to the tax account */
+    externalID: string;
+
+    /** Country of the tax account */
+    country: string;
+};
+
+/** NetSuite Vendor Model */
+type NetSuiteVendor = {
+    /** ID of the vendor */
+    id: string;
+
+    /** Name of the vendor */
+    name: string;
+
+    /** E-mail of the vendor */
+    email: string;
+};
+
+/** NetSuite Invoice Item Model */
+type InvoiceItem = {
+    /** ID of the invoice item */
+    id: string;
+
+    /** Name of the invoice item */
+    name: string;
+};
+
+/** Data from the NetSuite accounting integration. */
+type NetSuiteConnectionData = {
+    /** Collection of the subsidiaries present in the NetSuite account */
+    subsidiaryList: Subsidiary[];
+
+    /** Collection of receivable accounts */
+    receivableList: NetSuiteAccount[];
+
+    /** Collection of vendors */
+    vendors: NetSuiteVendor[];
+
+    /** Collection of invoice items */
+    items: InvoiceItem[];
+
+    /** Collection of the payable accounts */
+    payableList: NetSuiteAccount[];
+
+    /** Collection of tax accounts */
+    taxAccountsList: NetSuiteTaxAccount[];
+};
+
+/** NetSuite mapping values */
+type NetSuiteMappingValues = 'NETSUITE_DEFAULT' | 'REPORT_FIELD' | 'TAG';
+
+/** NetSuite invoice item preference values */
+type InvoiceItemPreferenceValues = 'create' | 'select';
+
+/** NetSuite export destination values */
+type ExpensesExportDestinationValues = 'EXPENSE_REPORT' | 'VENDOR_BILL' | 'JOURNAL_ENTRY';
+
+/** NetSuite expense report approval level values */
+type ExpenseReportsApprovalLevelValues = 'REPORTS_APPROVED_NONE' | 'REPORTS_SUPERVISOR_APPROVED' | 'REPORTS_ACCOUNTING_APPROVED' | 'REPORTS_APPROVED_BOTH';
+
+/** NetSuite vendor bills approval level values */
+type VendorBillsApprovalLevelValues = 'VENDOR_BILLS_APPROVED_NONE' | 'VENDOR_BILLS_APPROVAL_PENDING' | 'VENDOR_BILLS_APPROVED';
+
+/** NetSuite journal approval level values */
+type JournalsApprovalLevelValues = 'JOURNALS_APPROVED_NONE' | 'JOURNALS_APPROVAL_PENDING' | 'JOURNALS_APPROVED';
+
+/** NetSuite export date values */
+type ExportDateValues = 'SUBMITTED' | 'EXPORTED' | 'LAST_EXPENSE';
+
+/** NetSuite journal posting preference values */
+type JournalPostingPreferenceValues = 'JOURNALS_POSTING_TOTAL_LINE' | 'JOURNALS_POSTING_INDIVIDUAL_LINE';
+
+/** User configuration for the NetSuite accounting integration. */
+type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Invoice Item Preference */
+    invoiceItemPreference: InvoiceItemPreferenceValues;
+
+    /** ID of the bank account for NetSuite invoice collections */
+    receivableAccount: string;
+
+    /** ID of the bank account for NetSuite tax posting */
+    taxPostingAccount: string;
+
+    /**  */
+    exportToNextOpenPeriod: boolean;
+
+    /** */
+    allowForeignCurrency: boolean;
+
+    /** Where to export reimbursable expenses */
+    reimbursableExpensesExportDestination: ExpensesExportDestinationValues;
+
+    /** */
+    subsidiary: string;
+
+    /** */
+    syncOptions: {
+        /** */
+        mapping: {
+            /** */
+            classes: NetSuiteMappingValues;
+
+            /** */
+            jobs: NetSuiteMappingValues;
+
+            /** */
+            locations: NetSuiteMappingValues;
+
+            /** */
+            customers: NetSuiteMappingValues;
+
+            /** */
+            departments: NetSuiteMappingValues;
+        };
+
+        /** */
+        crossSubsidiaryCustomers: boolean;
+
+        /** */
+        syncApprovalWorkflow: boolean;
+
+        /** */
+        syncCustomLists: boolean;
+
+        /** Tells the expense reports approval level */
+        exportReportsTo: ExpenseReportsApprovalLevelValues;
+
+        /** Tells the vendor bills approval level */
+        exportVendorBillsTo: VendorBillsApprovalLevelValues;
+
+        /** */
+        setFinalApprover: boolean;
+
+        /** */
+        syncReimbursedReports: boolean;
+
+        /** */
+        customSegments: Array<{
+            /** */
+            segmentName: string;
+
+            /** */
+            internalID: string;
+
+            /** */
+            scriptID: string;
+
+            /** */
+            mapping: 'tag' | 'reportField';
+        }>;
+
+        /** */
+        syncPeople: boolean;
+
+        /** */
+        enableNewCategories: boolean;
+
+        /** */
+        hasChosenAutoSyncOption: boolean;
+
+        /** */
+        finalApprover: string;
+
+        /** */
+        syncTax: boolean;
+
+        /** */
+        syncCustomSegments: boolean;
+
+        /** */
+        customLists: Array<{
+            /** */
+            listName: string;
+
+            /** */
+            internalID: string;
+
+            /** */
+            transactionFieldID: string;
+
+            /** */
+            mapping: 'tag' | 'reportField';
+        }>;
+
+        /** */
+        syncCategories: boolean;
+
+        /** */
+        hasChosenSyncReimbursedReportsOption: boolean;
+
+        /** */
+        exportJournalsTo: JournalsApprovalLevelValues;
+    };
+
+    /** */
+    autoCreateEntities: boolean;
+
+    /** */
+    exporter: string;
+
+    /** */
+    exportDate: ExportDateValues;
+
+    /** */
+    nonreimbursableExpensesExportDestination: ExpensesExportDestinationValues;
+
+    /** */
+    reimbursablePayableAccount: string;
+
+    /** */
+    journalPostingPreference: JournalPostingPreferenceValues;
+
+    /** */
+    invoiceItem: string;
+
+    /** */
+    subsidiaryID: string;
+
+    /** */
+    defaultVendor: string;
+
+    /** */
+    provincialTaxPostingAccount: string;
+
+    /** */
+    reimbursementAccountID: string;
+
+    /** */
+    approvalAccount: string;
+
+    /** */
+    payableAcct: string;
+
+    /** */
+    customFormIDOptions: {
+        /** */
+        reimbursable: {
+            /** */
+            expenseReport: null;
+        };
+
+        /** */
+        nonReimbursable: {
+            /** */
+            vendorBill: null;
+        };
+
+        /** */
+        enabled: boolean;
+    };
+
+    /** */
+    collectionAccount: string;
+}>;
+
+/** NetSuite connection model */
+type NetSuiteConnection = {
+    /** Account ID of the NetSuite Integration */
+    accountID: string;
+
+    /** */
+    tokenID: string;
+
+    /** */
+    options: {
+        /** Data imported from NetSuite */
+        data: NetSuiteConnectionData;
+
+        /** Configuration of the connection */
+        config: NetSuiteConnectionConfig;
+    };
+
+    /** */
+    verified: boolean;
+
+    /** */
+    lastSyncDate: string;
+
+    /** */
+    lastErrorSyncDate: string;
+
+    /** */
+    source: string;
+
+    /** */
+    config: {
+        /** NetSuite auto synchronization configs */
+        autoSync: {
+            /** Whether data should be automatically synched between the app and Xero */
+            enabled: boolean;
+
+            /** */
+            jobID: string;
+        };
+    };
+
+    /** */
+    tokenSecret: string;
+};
+
 /** State of integration connection */
 type Connection<ConnectionData, ConnectionConfig> = {
     /** State of the last synchronization */
@@ -610,6 +947,9 @@ type Connections = {
 
     /** Xero integration connection */
     xero: Connection<XeroConnectionData, XeroConnectionConfig>;
+
+    /** NetSuite integration connection */
+    netsuite: NetSuiteConnection;
 };
 
 /** Names of integration connections */

From b0ef6da11810e4e591cae54995f7f95cc073a545 Mon Sep 17 00:00:00 2001
From: Rodrigo Lino da Costa <rodrigo@expensify.com>
Date: Fri, 14 Jun 2024 12:59:57 -0300
Subject: [PATCH 18/77] removed useless import and run prettier

---
 src/pages/workspace/tags/WorkspaceViewTagsPage.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
index ee1f7aac0ec8..85dd0c7fe414 100644
--- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
@@ -35,7 +35,6 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import type {TagListItem} from './types';
-import {hasDependentTags} from "@libs/PolicyUtils";
 
 type WorkspaceViewTagsProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_LIST_VIEW>;
 
@@ -85,7 +84,7 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
         [currentPolicyTag, selectedTags, translate],
     );
 
-    const hasDependentTags = useMemo( () => PolicyUtils.hasDependentTags(policy, policyTags), [policy, policyTags]);
+    const hasDependentTags = useMemo(() => PolicyUtils.hasDependentTags(policy, policyTags), [policy, policyTags]);
 
     const tagListKeyedByName = useMemo(
         () =>

From 92ba0c8986336d82c3304daebfa325c37a7ebdb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 17:19:52 +0100
Subject: [PATCH 19/77] Implement
 SubscriptionUtils.calculateRemainingFreeTrialDays() function

---
 src/ONYXKEYS.ts                     |  4 ++--
 src/libs/SubscriptionUtils.ts       | 22 +++++++++++++++++++
 tests/unit/SubscriptionUtilsTest.ts | 33 +++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 src/libs/SubscriptionUtils.ts
 create mode 100644 tests/unit/SubscriptionUtilsTest.ts

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index d5289d97b8ab..bcaa1fe0e0e1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -169,10 +169,10 @@ const ONYXKEYS = {
     /** The NVP with the last action taken (for the Quick Action Button) */
     NVP_QUICK_ACTION_GLOBAL_CREATE: 'nvp_quickActionGlobalCreate',
 
-    /** The start date of the workspace owner’s free trial period. */
+    /** The start date (yyyy-MM-dd HH:mm:ss) of the workspace owner’s free trial period. */
     NVP_FIRST_DAY_FREE_TRIAL: 'nvp_private_firstDayFreeTrial',
 
-    /** The end date of the workspace owner’s free trial period. */
+    /** The end date (yyyy-MM-dd HH:mm:ss) of the workspace owner’s free trial period. */
     NVP_LAST_DAY_FREE_TRIAL: 'nvp_private_lastDayFreeTrial',
 
     /** ID associated with the payment card added by the user. */
diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
new file mode 100644
index 000000000000..022fe4cd6fe2
--- /dev/null
+++ b/src/libs/SubscriptionUtils.ts
@@ -0,0 +1,22 @@
+import {differenceInCalendarDays, parse as parseDate} from 'date-fns';
+import type {OnyxEntry} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+let lastDayFreeTrial: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL,
+    callback: (value) => (lastDayFreeTrial = value),
+});
+
+function calculateRemainingFreeTrialDays(): number {
+    if (!lastDayFreeTrial) {
+        return 0;
+    }
+
+    const difference = differenceInCalendarDays(parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date()), new Date());
+    return difference < 0 ? 0 : difference;
+}
+
+export {calculateRemainingFreeTrialDays};
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
new file mode 100644
index 000000000000..c990bb0a6324
--- /dev/null
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -0,0 +1,33 @@
+import {addDays, format as formatDate, subDays} from 'date-fns';
+import Onyx from 'react-native-onyx';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+Onyx.init({keys: ONYXKEYS});
+
+describe('SubscriptionUtils', () => {
+    describe('calculateRemainingFreeTrialDays', () => {
+        afterEach(() => Onyx.clear());
+
+        it('should return 0 if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
+        });
+
+        it('should return 0 if the current date is after the free trial end date', async () => {
+            const date = formatDate(subDays(new Date(), 8), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING);
+
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, date);
+
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
+        });
+
+        it('should return the remaining days if the current date is before the free trial end date', async () => {
+            const date = formatDate(addDays(new Date(), 5), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING);
+
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, date);
+
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(5);
+        });
+    });
+});

From ce591a307fc83422ac20a93781ea3f89293d8ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 17:20:08 +0100
Subject: [PATCH 20/77] Improve ReportUtilsTest tests

---
 tests/unit/ReportUtilsTest.ts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index c678a6fed6cc..f9a815345693 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -823,45 +823,45 @@ describe('ReportUtils', () => {
     });
 
     describe('isChatUsedForOnboarding', () => {
-        afterAll(() => Onyx.clear());
+        afterEach(() => Onyx.clear());
 
         it('should return true if the user account ID is odd and report is the system chat', async () => {
             const accountID = 1;
 
-            return Onyx.multiSet({
+            await Onyx.multiSet({
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
                     [accountID]: {
                         accountID,
                     },
                 },
                 [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
-            }).then(() => {
-                const report: Report = {
-                    ...LHNTestUtils.getFakeReport(),
-                    chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
-                };
-
-                expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
             });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
         });
 
         it('should return true if the user account ID is even and report is the concierge chat', async () => {
             const accountID = 2;
 
-            return Onyx.multiSet({
+            await Onyx.multiSet({
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
                     [accountID]: {
                         accountID,
                     },
                 },
                 [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
-            }).then(() => {
-                const report: Report = {
-                    ...LHNTestUtils.getFakeReport([CONST.ACCOUNT_ID.CONCIERGE]),
-                };
-
-                expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
             });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport([CONST.ACCOUNT_ID.CONCIERGE]),
+            };
+
+            expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
         });
     });
 });

From ac22ed8f661fe31bf4d2f012380b7d3e1f166f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 17:32:41 +0100
Subject: [PATCH 21/77] Implement SubscriptionUtils.isUserOnFreeTrial()
 function

---
 src/libs/SubscriptionUtils.ts       | 28 ++++++++++++++++++++++++++--
 tests/unit/SubscriptionUtilsTest.ts | 26 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 022fe4cd6fe2..fb63cf8b2d9e 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -1,15 +1,24 @@
-import {differenceInCalendarDays, parse as parseDate} from 'date-fns';
+import {differenceInCalendarDays, isAfter, isBefore, parse as parseDate} from 'date-fns';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
+let firstDayFreeTrial: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL,
+    callback: (value) => (firstDayFreeTrial = value),
+});
+
 let lastDayFreeTrial: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL,
     callback: (value) => (lastDayFreeTrial = value),
 });
 
+/**
+ * Calculates the remaining number of days of the workspace owner's free trial before it ends.
+ */
 function calculateRemainingFreeTrialDays(): number {
     if (!lastDayFreeTrial) {
         return 0;
@@ -19,4 +28,19 @@ function calculateRemainingFreeTrialDays(): number {
     return difference < 0 ? 0 : difference;
 }
 
-export {calculateRemainingFreeTrialDays};
+/**
+ * Whether the workspace's owner is on its free trial period.
+ */
+function isUserOnFreeTrial(): boolean {
+    if (!firstDayFreeTrial || !lastDayFreeTrial) {
+        return true;
+    }
+
+    const currentDate = new Date();
+    const firstDayFreeTrialDate = parseDate(firstDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
+    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
+
+    return isAfter(currentDate, firstDayFreeTrialDate) && isBefore(currentDate, lastDayFreeTrialDate);
+}
+
+export {calculateRemainingFreeTrialDays, isUserOnFreeTrial};
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
index c990bb0a6324..4f1ab09254e4 100644
--- a/tests/unit/SubscriptionUtilsTest.ts
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -30,4 +30,30 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(5);
         });
     });
+
+    describe('isUserOnFreeTrial', () => {
+        afterEach(() => Onyx.clear());
+
+        it('should return true if the Onyx keys are not set', () => {
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return true if the current date is between the free trial start and end dates', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return false if the current date is after the free trial end date', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 10), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
+        });
+    });
 });

From c012ed3978aabaf7cfc1902efc1ae307d62257f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 18:01:31 +0100
Subject: [PATCH 22/77] Implement SubscriptionUtils.hasUserFreeTrialEnded()
 function

---
 src/libs/SubscriptionUtils.ts       | 16 +++++++++-
 tests/unit/SubscriptionUtilsTest.ts | 49 +++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index fb63cf8b2d9e..0dce8c01e3f3 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -43,4 +43,18 @@ function isUserOnFreeTrial(): boolean {
     return isAfter(currentDate, firstDayFreeTrialDate) && isBefore(currentDate, lastDayFreeTrialDate);
 }
 
-export {calculateRemainingFreeTrialDays, isUserOnFreeTrial};
+/**
+ * Whether the workspace owner's free trial period has ended.
+ */
+function hasUserFreeTrialEnded(): boolean {
+    if (!lastDayFreeTrial) {
+        return false;
+    }
+
+    const currentDate = new Date();
+    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
+
+    return isAfter(currentDate, lastDayFreeTrialDate);
+}
+
+export {calculateRemainingFreeTrialDays, isUserOnFreeTrial, hasUserFreeTrialEnded};
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
index 4f1ab09254e4..4c0f4c03e32e 100644
--- a/tests/unit/SubscriptionUtilsTest.ts
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -8,31 +8,36 @@ Onyx.init({keys: ONYXKEYS});
 
 describe('SubscriptionUtils', () => {
     describe('calculateRemainingFreeTrialDays', () => {
-        afterEach(() => Onyx.clear());
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+            });
+        });
 
         it('should return 0 if the Onyx key is not set', () => {
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
         });
 
         it('should return 0 if the current date is after the free trial end date', async () => {
-            const date = formatDate(subDays(new Date(), 8), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING);
-
-            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, date);
-
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(subDays(new Date(), 8), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
         });
 
         it('should return the remaining days if the current date is before the free trial end date', async () => {
-            const date = formatDate(addDays(new Date(), 5), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING);
-
-            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, date);
-
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addDays(new Date(), 5), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(5);
         });
     });
 
     describe('isUserOnFreeTrial', () => {
-        afterEach(() => Onyx.clear());
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null,
+            });
+        });
 
         it('should return true if the Onyx keys are not set', () => {
             expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
@@ -56,4 +61,28 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
         });
     });
+
+    describe('hasUserFreeTrialEnded', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null,
+            });
+        });
+
+        it('should return false if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeFalsy();
+        });
+
+        it('should return false if the current date is before the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeFalsy();
+        });
+
+        it('should return true if the current date is after the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeTruthy();
+        });
+    });
 });

From ccd5758b2ebb94079187fc18ac590d01f0a57d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 18:09:14 +0100
Subject: [PATCH 23/77] Implement
 SubscriptionUtils.doesUserHavePaymentCardAdded() function

---
 src/libs/SubscriptionUtils.ts       | 15 ++++++++++++++-
 tests/unit/SubscriptionUtilsTest.ts | 18 ++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 0dce8c01e3f3..881b89e97df6 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -16,6 +16,12 @@ Onyx.connect({
     callback: (value) => (lastDayFreeTrial = value),
 });
 
+let userBillingFundID: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_BILLING_FUND_ID,
+    callback: (value) => (userBillingFundID = value),
+});
+
 /**
  * Calculates the remaining number of days of the workspace owner's free trial before it ends.
  */
@@ -57,4 +63,11 @@ function hasUserFreeTrialEnded(): boolean {
     return isAfter(currentDate, lastDayFreeTrialDate);
 }
 
-export {calculateRemainingFreeTrialDays, isUserOnFreeTrial, hasUserFreeTrialEnded};
+/**
+ * Whether the user has a payment card added to its account.
+ */
+function doesUserHavePaymentCardAdded(): boolean {
+    return userBillingFundID !== undefined;
+}
+
+export {calculateRemainingFreeTrialDays, isUserOnFreeTrial, hasUserFreeTrialEnded, doesUserHavePaymentCardAdded};
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
index 4c0f4c03e32e..ae0436d59f23 100644
--- a/tests/unit/SubscriptionUtilsTest.ts
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -85,4 +85,22 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeTruthy();
         });
     });
+
+    describe('doesUserHavePaymentCardAdded', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null,
+            });
+        });
+
+        it('should return false if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.doesUserHavePaymentCardAdded()).toBeFalsy();
+        });
+
+        it('should return true if the Onyx key is set', async () => {
+            await Onyx.set(ONYXKEYS.NVP_BILLING_FUND_ID, 8010);
+            expect(SubscriptionUtils.doesUserHavePaymentCardAdded()).toBeTruthy();
+        });
+    });
 });

From 5fa1f176a1c6eb85838f11e1f36cc23d6b8eb1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 22:59:38 +0100
Subject: [PATCH 24/77] Implement
 SubscriptionUtils.shouldRestrictUserBillableActions() function

---
 src/libs/SubscriptionUtils.ts       |  63 ++++++++++++++++-
 tests/unit/SubscriptionUtilsTest.ts | 101 +++++++++++++++++++++++++++-
 2 files changed, 160 insertions(+), 4 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 881b89e97df6..8c234385ac70 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -1,8 +1,9 @@
-import {differenceInCalendarDays, isAfter, isBefore, parse as parseDate} from 'date-fns';
-import type {OnyxEntry} from 'react-native-onyx';
+import {differenceInCalendarDays, fromUnixTime, isAfter, isBefore, parse as parseDate} from 'date-fns';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {BillingGraceEndPeriod, Policy} from '@src/types/onyx';
 
 let firstDayFreeTrial: OnyxEntry<string>;
 Onyx.connect({
@@ -22,6 +23,32 @@ Onyx.connect({
     callback: (value) => (userBillingFundID = value),
 });
 
+let userBillingGraceEndPeriodCollection: OnyxCollection<BillingGraceEndPeriod>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END,
+    callback: (value) => (userBillingGraceEndPeriodCollection = value),
+    waitForCollectionCallback: true,
+});
+
+let ownerBillingGraceEndPeriod: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END,
+    callback: (value) => (ownerBillingGraceEndPeriod = value),
+});
+
+let amountOwed: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED,
+    callback: (value) => (amountOwed = value),
+});
+
+let allPolicies: OnyxCollection<Policy>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (value) => (allPolicies = value),
+    waitForCollectionCallback: true,
+});
+
 /**
  * Calculates the remaining number of days of the workspace owner's free trial before it ends.
  */
@@ -70,4 +97,34 @@ function doesUserHavePaymentCardAdded(): boolean {
     return userBillingFundID !== undefined;
 }
 
-export {calculateRemainingFreeTrialDays, isUserOnFreeTrial, hasUserFreeTrialEnded, doesUserHavePaymentCardAdded};
+/**
+ * Whether the user's billable actions should be restricted.
+ */
+function shouldRestrictUserBillableActions(policyID: string): boolean {
+    // This logic will be executed if the user is a workspace's non-owner (normal user or admin).
+    // We should restrict the workspace's non-owner actions if it's member of a workspace where the owner is
+    // past due and is past its grace period end.
+    for (const userBillingGraceEndPeriodEntry of Object.entries(userBillingGraceEndPeriodCollection ?? {})) {
+        const [entryKey, userBillingGracePeriodEnd] = userBillingGraceEndPeriodEntry;
+
+        if (userBillingGracePeriodEnd && isAfter(new Date(), fromUnixTime(userBillingGracePeriodEnd.value))) {
+            const ownerPolicy = Object.values(allPolicies ?? {}).find(
+                (policy) => policy?.id === policyID && String(policy.ownerAccountID ?? -1) === entryKey.slice(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END.length),
+            );
+
+            if (ownerPolicy) {
+                return true;
+            }
+        }
+    }
+
+    // If it reached here it means that the user is actually the workspace's owner.
+    // We should restrict the workspace's owner actions if it's past its grace period end date and it's owing some amount.
+    if (ownerBillingGraceEndPeriod && amountOwed !== undefined && isAfter(new Date(), fromUnixTime(ownerBillingGraceEndPeriod))) {
+        return true;
+    }
+
+    return false;
+}
+
+export {calculateRemainingFreeTrialDays, doesUserHavePaymentCardAdded, hasUserFreeTrialEnded, isUserOnFreeTrial, shouldRestrictUserBillableActions};
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
index ae0436d59f23..8e4c99c5151f 100644
--- a/tests/unit/SubscriptionUtilsTest.ts
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -1,8 +1,16 @@
-import {addDays, format as formatDate, subDays} from 'date-fns';
+import {addDays, format as formatDate, getUnixTime, subDays} from 'date-fns';
 import Onyx from 'react-native-onyx';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {BillingGraceEndPeriod} from '@src/types/onyx';
+import createRandomPolicy from '../utils/collections/policies';
+
+const billingGraceEndPeriod: BillingGraceEndPeriod = {
+    name: 'owner@email.com',
+    permissions: 'read',
+    value: 0,
+};
 
 Onyx.init({keys: ONYXKEYS});
 
@@ -103,4 +111,95 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.doesUserHavePaymentCardAdded()).toBeTruthy();
         });
     });
+
+    describe('shouldRestrictUserBillableActions', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: null,
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: null,
+                [ONYXKEYS.COLLECTION.POLICY]: null,
+            });
+        });
+
+        it("should return false if the user isn't a workspace's owner or isn't a member of any past due billing workspace", () => {
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions('1')).toBeFalsy();
+        });
+
+        it('should return false if the user is a non-owner of a workspace that is not in the shared NVP collection', async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(subDays(new Date(), 3)), // past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: 2002, // owner not in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return false if the user is a workspace's non-owner that is not past due billing", async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(addDays(new Date(), 3)), // not past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID, // owner in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return true if the user is a workspace's non-owner that is past due billing", async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(subDays(new Date(), 3)), // past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID, // owner in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeTruthy();
+        });
+
+        it('should return false if the user is a workspace owner but is not past due billing', async () => {
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(addDays(new Date(), 3)), // not past due
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it('should return true if the user is a workspace owner but is past due billing', async () => {
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: 8010, // owing some amount
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeTruthy();
+        });
+    });
 });

From 8e27a71b20b8619f8892939ae28f5a823a02f68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 23:06:04 +0100
Subject: [PATCH 25/77] Improve shouldRestrictUserBillableActions() logic

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

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 8c234385ac70..93811de6fffe 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -108,11 +108,11 @@ function shouldRestrictUserBillableActions(policyID: string): boolean {
         const [entryKey, userBillingGracePeriodEnd] = userBillingGraceEndPeriodEntry;
 
         if (userBillingGracePeriodEnd && isAfter(new Date(), fromUnixTime(userBillingGracePeriodEnd.value))) {
-            const ownerPolicy = Object.values(allPolicies ?? {}).find(
-                (policy) => policy?.id === policyID && String(policy.ownerAccountID ?? -1) === entryKey.slice(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END.length),
-            );
+            // Extracts the owner account ID from the collection member key.
+            const ownerAccountID = entryKey.slice(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END.length);
 
-            if (ownerPolicy) {
+            const ownerPolicy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+            if (String(ownerPolicy?.ownerAccountID ?? -1) === ownerAccountID) {
                 return true;
             }
         }

From 52074be1e8a71c3fde14ee2a81421b19c216ff25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 23:22:43 +0100
Subject: [PATCH 26/77] Fix TS errors

---
 src/libs/actions/Policy/Member.ts | 17 +++----
 src/libs/actions/Policy/Policy.ts | 83 +++++++++++++++++--------------
 src/libs/actions/Report.ts        | 37 +++++++-------
 3 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
index fc28a01b043c..74d1831f32b9 100644
--- a/src/libs/actions/Policy/Member.ts
+++ b/src/libs/actions/Policy/Member.ts
@@ -247,8 +247,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: optimisticMembersState},
         },
-        ...announceRoomMembers.onyxOptimisticData,
     ];
+    optimisticData.push(...announceRoomMembers.onyxOptimisticData);
 
     const successData: OnyxUpdate[] = [
         {
@@ -256,8 +256,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: successMembersState},
         },
-        ...announceRoomMembers.onyxSuccessData,
     ];
+    successData.push(...announceRoomMembers.onyxSuccessData);
 
     const failureData: OnyxUpdate[] = [
         {
@@ -265,8 +265,8 @@ function removeMembers(accountIDs: number[], policyID: string) {
             key: policyKey,
             value: {employeeList: failureMembersState},
         },
-        ...announceRoomMembers.onyxFailureData,
     ];
+    failureData.push(...announceRoomMembers.onyxFailureData);
 
     const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 
@@ -551,10 +551,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: optimisticMembersState,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
-        ...membersChats.onyxOptimisticData,
-        ...announceRoomMembers.onyxOptimisticData,
     ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData, ...membersChats.onyxOptimisticData, ...announceRoomMembers.onyxOptimisticData);
 
     const successData: OnyxUpdate[] = [
         {
@@ -564,10 +562,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: successMembersState,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
-        ...membersChats.onyxSuccessData,
-        ...announceRoomMembers.onyxSuccessData,
     ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData, ...membersChats.onyxSuccessData, ...announceRoomMembers.onyxSuccessData);
 
     const failureData: OnyxUpdate[] = [
         {
@@ -580,9 +576,8 @@ function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccount
                 employeeList: failureMembersState,
             },
         },
-        ...membersChats.onyxFailureData,
-        ...announceRoomMembers.onyxFailureData,
     ];
+    failureData.push(...membersChats.onyxFailureData, ...announceRoomMembers.onyxFailureData);
 
     const params: AddMembersToWorkspaceParams = {
         employees: JSON.stringify(logins.map((login) => ({email: login}))),
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index 8f82ca5881fc..23bdfaf67e96 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -2197,8 +2197,8 @@ function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string
                 pendingAction: null,
             },
         },
-        ...employeeWorkspaceChat.onyxOptimisticData,
     ];
+    optimisticData.push(...employeeWorkspaceChat.onyxOptimisticData);
 
     const successData: OnyxUpdate[] = [
         {
@@ -2634,49 +2634,56 @@ function enablePolicyTaxes(policyID: string, enabled: boolean) {
     };
     const policy = getPolicy(policyID);
     const shouldAddDefaultTaxRatesData = (!policy?.taxRates || isEmptyObject(policy.taxRates)) && enabled;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: enabled,
-                    },
-                    pendingFields: {
-                        tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: enabled,
+                },
+                pendingFields: {
+                    tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []),
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        tax: null,
-                    },
+        },
+    ];
+    optimisticData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []));
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    tax: null,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []),
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: !enabled,
-                    },
-                    pendingFields: {
-                        tax: null,
-                    },
+        },
+    ];
+    successData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []));
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: !enabled,
+                },
+                pendingFields: {
+                    tax: null,
                 },
             },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []),
-        ],
+        },
+    ];
+    failureData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []));
+
+    const onyxData: OnyxData = {
+        optimisticData,
+        successData,
+        failureData,
     };
 
     const parameters: EnablePolicyTaxesParams = {policyID, enabled};
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 3adf48046936..01557b21897a 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2734,8 +2734,8 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
                 pendingChatMembers,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
     ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData);
 
     const successPendingChatMembers = report?.pendingChatMembers
         ? report?.pendingChatMembers?.filter(
@@ -2750,8 +2750,9 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
                 pendingChatMembers: successPendingChatMembers,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
     ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData);
+
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -3342,8 +3343,8 @@ function completeOnboarding(
         return acc;
     }, []);
 
-    const optimisticData: OnyxUpdate[] = [
-        ...tasksForOptimisticData,
+    const optimisticData: OnyxUpdate[] = [...tasksForOptimisticData];
+    optimisticData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`,
@@ -3364,18 +3365,18 @@ function completeOnboarding(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: engagementChoice},
         },
-    ];
-    const successData: OnyxUpdate[] = [
-        ...tasksForSuccessData,
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
-            value: {
-                [introductionCommentAction.reportActionID]: {pendingAction: null},
-                [textCommentAction.reportActionID]: {pendingAction: null},
-            },
+    );
+
+    const successData: OnyxUpdate[] = [...tasksForSuccessData];
+    successData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
+        value: {
+            [introductionCommentAction.reportActionID]: {pendingAction: null},
+            [textCommentAction.reportActionID]: {pendingAction: null},
         },
-    ];
+    });
+
     let failureReport: Partial<Report> = {
         lastMessageTranslationKey: '',
         lastMessageText: '',
@@ -3394,8 +3395,8 @@ function completeOnboarding(
         };
     }
 
-    const failureData: OnyxUpdate[] = [
-        ...tasksForFailureData,
+    const failureData: OnyxUpdate[] = [...tasksForFailureData];
+    failureData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`,
@@ -3418,7 +3419,7 @@ function completeOnboarding(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: null},
         },
-    ];
+    );
 
     const guidedSetupData: GuidedSetupData = [
         {type: 'message', ...introductionMessage},

From 0cf96d70b093a4391e889072df5ec00bc0498ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Fri, 14 Jun 2024 23:32:31 +0100
Subject: [PATCH 27/77] Prettier

---
 src/ONYXKEYS.ts                         | 2 +-
 src/types/onyx/BillingGraceEndPeriod.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index bcaa1fe0e0e1..34537f65dfbf 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -394,7 +394,7 @@ const ONYXKEYS = {
 
         // Shared NVPs
         /** Collection of objects where each objects represents a workspace’s owner which is past due billing AND the user is a member of. */
-        SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END: 'sharedNVP_private_billingGracePeriodEnd_'
+        SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END: 'sharedNVP_private_billingGracePeriodEnd_',
     },
 
     /** List of Form ids */
diff --git a/src/types/onyx/BillingGraceEndPeriod.ts b/src/types/onyx/BillingGraceEndPeriod.ts
index e66bc92c59df..44235694adb9 100644
--- a/src/types/onyx/BillingGraceEndPeriod.ts
+++ b/src/types/onyx/BillingGraceEndPeriod.ts
@@ -5,7 +5,7 @@ type BillingGraceEndPeriod = {
 
     /** The permission associated with the NVP key. */
     permissions: string;
-    
+
     /** The grace period end date (epoch timestamp) of the workspace's owner where the user is a member of. */
     value: number;
 };

From 35e9bba5afcc2b418b35d05dd5e11f10b01ef36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 17 Jun 2024 12:29:51 +0100
Subject: [PATCH 28/77] Changes ReportUtils.requiresAttentionFromCurrentUser()
 to include free trial logic

---
 src/libs/ReportUtils.ts       |  6 +++
 tests/unit/ReportUtilsTest.ts | 75 ++++++++++++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 06a336171023..eb6d332f0271 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -83,6 +83,7 @@ import * as PolicyUtils from './PolicyUtils';
 import type {LastVisibleMessage} from './ReportActionsUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import StringUtils from './StringUtils';
+import * as SubscriptionUtils from './SubscriptionUtils';
 import * as TransactionUtils from './TransactionUtils';
 import * as Url from './Url';
 import type {AvatarSource} from './UserUtils';
@@ -2289,6 +2290,7 @@ function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): bo
  *  - is unread and the user was mentioned in one of the unread comments
  *  - is for an outstanding task waiting on the user
  *  - has an outstanding child expense that is waiting for an action from the current user (e.g. pay, approve, add bank account)
+ *  - is either the system or concierge chat, the user free trial has ended and it didn't add a payment card yet
  *
  * @param option (report or optionItem)
  * @param parentReportAction (the report action the current report is a thread of)
@@ -2319,6 +2321,10 @@ function requiresAttentionFromCurrentUser(optionOrReport: OnyxEntry<Report> | Op
         return true;
     }
 
+    if (isChatUsedForOnboarding(optionOrReport) && SubscriptionUtils.hasUserFreeTrialEnded() && !SubscriptionUtils.doesUserHavePaymentCardAdded()) {
+        return true;
+    }
+
     return false;
 }
 
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index f9a815345693..139a15cb9f1d 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import {addDays, format as formatDate, subDays} from 'date-fns';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -266,9 +267,15 @@ describe('ReportUtils', () => {
     });
 
     describe('requiresAttentionFromCurrentUser', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+        });
+
         it('returns false when there is no report', () => {
             expect(ReportUtils.requiresAttentionFromCurrentUser(undefined)).toBe(false);
         });
+
         it('returns false when the matched IOU report does not have an owner accountID', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -276,6 +283,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns false when the linked iou report has an oustanding IOU', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -288,6 +296,7 @@ describe('ReportUtils', () => {
                 expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
             });
         });
+
         it('returns false when the report has no outstanding IOU but is waiting for a bank account and the logged user is the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -296,6 +305,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns false when the report has outstanding IOU and is not waiting for a bank account and the logged user is the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -304,6 +314,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns false when the report has no oustanding IOU but is waiting for a bank account and the logged user is not the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -312,6 +323,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns true when the report has an unread mention', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -319,6 +331,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
+
         it('returns true when the report is an outstanding task', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -330,6 +343,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
+
         it('returns true when the report has oustanding child expense', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -339,6 +353,62 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
+
+        it("returns false if the user free trial hasn't ended yet", async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial not ended
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
+        });
+
+        it('returns false if the user free trial has ended and it added a payment card', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial not ended
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: 8010, // payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
+        });
+
+        it("returns true if the report is the system chat, the user free trial has ended and it didn't add a payment card yet", async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial ended
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
+        });
+
+        it("returns true if the report is the concierge chat, the user free trial has ended and it didn't add a payment card yet", async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial ended
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+                [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID: 8}, // even account id
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport([CONST.ACCOUNT_ID.CONCIERGE]),
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
+        });
     });
 
     describe('getMoneyRequestOptions', () => {
@@ -823,7 +893,10 @@ describe('ReportUtils', () => {
     });
 
     describe('isChatUsedForOnboarding', () => {
-        afterEach(() => Onyx.clear());
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+        });
 
         it('should return true if the user account ID is odd and report is the system chat', async () => {
             const accountID = 1;

From 2b49784ae5b7f535b91a3dc79584e951581758da Mon Sep 17 00:00:00 2001
From: Github <olimpia.zurek@gmail.com>
Date: Mon, 17 Jun 2024 13:37:18 +0200
Subject: [PATCH 29/77] add debounce and memoization to triggerUnreadUpdate

---
 src/libs/UnreadIndicatorUpdater/index.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libs/UnreadIndicatorUpdater/index.ts b/src/libs/UnreadIndicatorUpdater/index.ts
index fd1fc3f8ee2e..05754a960e40 100644
--- a/src/libs/UnreadIndicatorUpdater/index.ts
+++ b/src/libs/UnreadIndicatorUpdater/index.ts
@@ -1,3 +1,5 @@
+import debounce from 'lodash/debounce';
+import memoize from 'lodash/memoize';
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -35,13 +37,16 @@ export default function getUnreadReportsForUnreadIndicator(reports: OnyxCollecti
     );
 }
 
-const triggerUnreadUpdate = () => {
+const memoizedGetUnreadReportsForUnreadIndicator = memoize(getUnreadReportsForUnreadIndicator);
+
+const triggerUnreadUpdate = debounce(() => {
     const currentReportID = navigationRef.isReady() ? Navigation.getTopmostReportId() ?? '-1' : '-1';
 
     // We want to keep notification count consistent with what can be accessed from the LHN list
-    const unreadReports = getUnreadReportsForUnreadIndicator(allReports, currentReportID);
+    const unreadReports = memoizedGetUnreadReportsForUnreadIndicator(allReports, currentReportID);
+
     updateUnread(unreadReports.length);
-};
+}, 300);
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,

From 7eb5a07a8e18559e53685df65759f57637561af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 17 Jun 2024 15:54:10 +0100
Subject: [PATCH 30/77] Add another test for
 ReportUtils.requiresAttentionFromCurrentUser()

---
 tests/unit/ReportUtilsTest.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 139a15cb9f1d..5f8902c5c076 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -354,6 +354,20 @@ describe('ReportUtils', () => {
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
 
+        it("returns false if the user is not on free trial", async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null, // not on free trial
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
+        });
+
         it("returns false if the user free trial hasn't ended yet", async () => {
             await Onyx.multiSet({
                 [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial not ended

From 7b5456deeab5095c0f8f5e2faeecf57ddc0ab67a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 17 Jun 2024 16:24:48 +0100
Subject: [PATCH 31/77] Prettier fix

---
 tests/unit/ReportUtilsTest.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 5f8902c5c076..a04f26e70c5b 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -354,7 +354,7 @@ describe('ReportUtils', () => {
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
 
-        it("returns false if the user is not on free trial", async () => {
+        it('returns false if the user is not on free trial', async () => {
             await Onyx.multiSet({
                 [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null, // not on free trial
                 [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added

From efe02e16486e71dd6c8eb5a70f3c21b0f02b665f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Mon, 17 Jun 2024 16:35:29 +0100
Subject: [PATCH 32/77] Fix dates

---
 src/libs/SubscriptionUtils.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 93811de6fffe..721bb9b1aa6c 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -57,7 +57,8 @@ function calculateRemainingFreeTrialDays(): number {
         return 0;
     }
 
-    const difference = differenceInCalendarDays(parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date()), new Date());
+    const currentDate = new Date();
+    const difference = differenceInCalendarDays(parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate), currentDate);
     return difference < 0 ? 0 : difference;
 }
 
@@ -70,8 +71,8 @@ function isUserOnFreeTrial(): boolean {
     }
 
     const currentDate = new Date();
-    const firstDayFreeTrialDate = parseDate(firstDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
-    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
+    const firstDayFreeTrialDate = parseDate(firstDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate);
+    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate);
 
     return isAfter(currentDate, firstDayFreeTrialDate) && isBefore(currentDate, lastDayFreeTrialDate);
 }
@@ -85,7 +86,7 @@ function hasUserFreeTrialEnded(): boolean {
     }
 
     const currentDate = new Date();
-    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, new Date());
+    const lastDayFreeTrialDate = parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate);
 
     return isAfter(currentDate, lastDayFreeTrialDate);
 }
@@ -101,13 +102,15 @@ function doesUserHavePaymentCardAdded(): boolean {
  * Whether the user's billable actions should be restricted.
  */
 function shouldRestrictUserBillableActions(policyID: string): boolean {
+    const currentDate = new Date();
+
     // This logic will be executed if the user is a workspace's non-owner (normal user or admin).
     // We should restrict the workspace's non-owner actions if it's member of a workspace where the owner is
     // past due and is past its grace period end.
     for (const userBillingGraceEndPeriodEntry of Object.entries(userBillingGraceEndPeriodCollection ?? {})) {
         const [entryKey, userBillingGracePeriodEnd] = userBillingGraceEndPeriodEntry;
 
-        if (userBillingGracePeriodEnd && isAfter(new Date(), fromUnixTime(userBillingGracePeriodEnd.value))) {
+        if (userBillingGracePeriodEnd && isAfter(currentDate, fromUnixTime(userBillingGracePeriodEnd.value))) {
             // Extracts the owner account ID from the collection member key.
             const ownerAccountID = entryKey.slice(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END.length);
 
@@ -120,7 +123,7 @@ function shouldRestrictUserBillableActions(policyID: string): boolean {
 
     // If it reached here it means that the user is actually the workspace's owner.
     // We should restrict the workspace's owner actions if it's past its grace period end date and it's owing some amount.
-    if (ownerBillingGraceEndPeriod && amountOwed !== undefined && isAfter(new Date(), fromUnixTime(ownerBillingGraceEndPeriod))) {
+    if (ownerBillingGraceEndPeriod && amountOwed !== undefined && isAfter(currentDate, fromUnixTime(ownerBillingGraceEndPeriod))) {
         return true;
     }
 

From a2cfd544cc71812b8cc1d91ddc675140cb1852f8 Mon Sep 17 00:00:00 2001
From: dominictb <tb-dominic@outlook.com>
Date: Tue, 18 Jun 2024 01:51:09 +0700
Subject: [PATCH 33/77] chore: update expensify-common 2.0.17

---
 package-lock.json                              | 11 +++++------
 package.json                                   |  2 +-
 src/libs/OnyxAwareParser.ts                    | 18 ++++++++++++++----
 src/libs/actions/Report.ts                     |  1 +
 .../report/ReportActionItemMessageEdit.tsx     |  6 ++----
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e1c8cee95d34..36156f2b2ca6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -60,7 +60,7 @@
         "date-fns-tz": "^2.0.0",
         "dom-serializer": "^0.2.2",
         "domhandler": "^4.3.0",
-        "expensify-common": "^2.0.12",
+        "expensify-common": "2.0.17",
         "expo": "^50.0.3",
         "expo-av": "~13.10.4",
         "expo-image": "1.11.0",
@@ -20769,9 +20769,9 @@
       }
     },
     "node_modules/expensify-common": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.12.tgz",
-      "integrity": "sha512-idIm9mAGDX1qyfA2Ky/1ZJZVMbGydtpIdwl6zl1Yc7FO11IGvAYLh2cH9VsQk98AapRTiJu7QUaRWLLGDaHIcQ==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.17.tgz",
+      "integrity": "sha512-W7xO10/bYF/p0/cUOtzejXJDiLCB/U6JTXVltzOE70xjGgzTSyRotPkEtEItHTvXOS2Wz8jJ262nrGfFMpfisA==",
       "dependencies": {
         "awesome-phonenumber": "^5.4.0",
         "classnames": "2.5.0",
@@ -20785,8 +20785,7 @@
         "react-dom": "16.12.0",
         "semver": "^7.6.0",
         "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
-        "ua-parser-js": "^1.0.37",
-        "underscore": "1.13.6"
+        "ua-parser-js": "^1.0.37"
       }
     },
     "node_modules/expensify-common/node_modules/react": {
diff --git a/package.json b/package.json
index dd594ddbc8c2..f1030b9420c6 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "^2.0.12",
+    "expensify-common": "2.0.17",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
     "expo-image": "1.11.0",
diff --git a/src/libs/OnyxAwareParser.ts b/src/libs/OnyxAwareParser.ts
index a202118bdf5f..c058775341c2 100644
--- a/src/libs/OnyxAwareParser.ts
+++ b/src/libs/OnyxAwareParser.ts
@@ -31,12 +31,22 @@ Onyx.connect({
     },
 });
 
-function parseHtmlToMarkdown(html: string, reportIDToName?: Record<string, string>, accountIDToName?: Record<string, string>): string {
-    return parser.htmlToMarkdown(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap});
+function parseHtmlToMarkdown(
+    html: string,
+    reportIDToName?: Record<string, string>,
+    accountIDToName?: Record<string, string>,
+    cacheVideoAttributes?: (videoSource: string, videoAttrs: string) => void,
+): string {
+    return parser.htmlToMarkdown(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap, cacheVideoAttributes});
 }
 
-function parseHtmlToText(html: string, reportIDToName?: Record<string, string>, accountIDToName?: Record<string, string>): string {
-    return parser.htmlToText(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap});
+function parseHtmlToText(
+    html: string,
+    reportIDToName?: Record<string, string>,
+    accountIDToName?: Record<string, string>,
+    cacheVideoAttributes?: (videoSource: string, videoAttrs: string) => void,
+): string {
+    return parser.htmlToText(html, {reportIDToName: reportIDToName ?? reportIDToNameMap, accountIDToName: accountIDToName ?? accountIDToNameMap, cacheVideoAttributes});
 }
 
 export {parseHtmlToMarkdown, parseHtmlToText};
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 1d42ac2d50c0..c8a8563c777f 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1450,6 +1450,7 @@ function removeLinksFromHtml(html: string, links: string[]): string {
  *
  * @param newCommentText text of the comment after editing.
  * @param originalCommentMarkdown original markdown of the comment before editing.
+ * @param videoAttributeCache cache of video attributes ([videoSource]: videoAttributes)
  */
 function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string, videoAttributeCache?: Record<string, string>): string {
     const parser = new ExpensiMark();
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 9fdaf95f86b4..49f889c7aa92 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -110,10 +110,8 @@ function ReportActionItemMessageEdit(
     useEffect(() => {
         draftMessageVideoAttributeCache.clear();
 
-        const originalMessage = parseHtmlToMarkdown(action.message?.[0]?.html ?? '', undefined, undefined, {
-            cacheVideoAttributes: (videoSource, attrs) => {
-                draftMessageVideoAttributeCache.set(videoSource, attrs);
-            },
+        const originalMessage = parseHtmlToMarkdown(action.message?.[0]?.html ?? '', undefined, undefined, (videoSource, attrs) => {
+            draftMessageVideoAttributeCache.set(videoSource, attrs);
         });
         if (ReportActionsUtils.isDeletedAction(action) || !!(action.message && draftMessage === originalMessage) || !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)) {
             return;

From 8a864df0ea7c3900889e5d41b8740f66ccdf3ad5 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 18 Jun 2024 10:01:13 +0530
Subject: [PATCH 34/77] Correcting type of netsuite

---
 src/types/onyx/Policy.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index e7d6a57d2744..817a9680d6cb 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -606,6 +606,9 @@ type Subsidiary = {
     name: string;
 };
 
+/** NetSuite financial account type values */
+type AccountTypeValues = '_accountsPayable' | '_otherCurrentLiability' | '_creditCard' | '_bank' | '_otherCurrentAsset' | '_longTermLiability' | '_accountsReceivable' | '_expense';
+
 /** NetSuite Financial account (bank account, debit card, etc) */
 type NetSuiteAccount = {
     /** GL code assigned to the financial account */
@@ -619,7 +622,7 @@ type NetSuiteAccount = {
     id: string;
 
     /** Type of the financial account */
-    type: string;
+    type: AccountTypeValues;
 };
 
 /** NetSuite Tax account */
@@ -866,13 +869,13 @@ type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
         /** */
         reimbursable: {
             /** */
-            expenseReport: null;
+            expenseReport: string;
         };
 
         /** */
         nonReimbursable: {
             /** */
-            vendorBill: null;
+            vendorBill: string;
         };
 
         /** */

From da6a7c907c749f4a125291fd6876329b4ce05df5 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Tue, 18 Jun 2024 10:07:19 +0530
Subject: [PATCH 35/77] Correcting type of connection sync

---
 src/types/onyx/Policy.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 817a9680d6cb..331e11751ad5 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -164,6 +164,9 @@ type TaxRatesWithDefault = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** Connection sync source values */
+type ConnectionSourceValues = 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'AUTOSYNC' | 'AUTOAPPROVE';
+
 /** Connection last synchronization state */
 type ConnectionLastSync = {
     /** Date when the connection's last successful sync occurred */
@@ -176,7 +179,7 @@ type ConnectionLastSync = {
     isSuccessful: boolean;
 
     /** Where did the connection's last sync came from */
-    source: 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'AUTOSYNC' | 'AUTOAPPROVE';
+    source: ConnectionSourceValues;
 };
 
 /** Financial account (bank account, debit card, etc) */
@@ -906,14 +909,14 @@ type NetSuiteConnection = {
     /** */
     verified: boolean;
 
-    /** */
+    /** Date when the connection's last successful sync occurred */
     lastSyncDate: string;
 
-    /** */
+    /** Date when the connection's last failed sync occurred */
     lastErrorSyncDate: string;
 
-    /** */
-    source: string;
+    /** Where did the connection's last sync came from */
+    source: ConnectionSourceValues;
 
     /** */
     config: {

From 49336df93f962aa3dc4868bc77dd6acdd54abef3 Mon Sep 17 00:00:00 2001
From: Github <olimpia.zurek@gmail.com>
Date: Tue, 18 Jun 2024 09:36:45 +0200
Subject: [PATCH 36/77] extract debounce time to const

---
 src/CONST.ts                             | 1 +
 src/libs/UnreadIndicatorUpdater/index.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 9311816c38a2..19bd95a7c917 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -940,6 +940,7 @@ const CONST = {
         COMMENT_LENGTH_DEBOUNCE_TIME: 500,
         SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
         RESIZE_DEBOUNCE_TIME: 100,
+        UNREAD_UPDATE_DEBOUNCE_TIME: 300,
     },
     SEARCH_TABLE_COLUMNS: {
         RECEIPT: 'receipt',
diff --git a/src/libs/UnreadIndicatorUpdater/index.ts b/src/libs/UnreadIndicatorUpdater/index.ts
index 05754a960e40..7698433c33c1 100644
--- a/src/libs/UnreadIndicatorUpdater/index.ts
+++ b/src/libs/UnreadIndicatorUpdater/index.ts
@@ -46,7 +46,7 @@ const triggerUnreadUpdate = debounce(() => {
     const unreadReports = memoizedGetUnreadReportsForUnreadIndicator(allReports, currentReportID);
 
     updateUnread(unreadReports.length);
-}, 300);
+}, CONST.TIMING.UNREAD_UPDATE_DEBOUNCE_TIME);
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,

From 9c060fbe9702bb3ae38adbdba9719b5c7a15119d Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Jun 2024 15:12:53 +0700
Subject: [PATCH 37/77] Revert: Backend unreachability message

---
 .storybook/preview.tsx                        |   2 +-
 src/CONST.ts                                  |   6 +-
 src/Expensify.tsx                             |   6 +-
 src/components/OfflineIndicator.tsx           |  23 +---
 src/hooks/useNetwork.ts                       |   9 +-
 src/languages/en.ts                           |   1 -
 src/languages/es.ts                           |   1 -
 src/libs/NetworkConnection.ts                 | 112 +++++++-----------
 src/libs/actions/Network.ts                   |  11 +-
 .../index.android.ts                          |  15 ---
 src/libs/checkInternetReachability/index.ts   |   5 -
 src/libs/checkInternetReachability/types.ts   |   3 -
 src/types/onyx/Network.ts                     |   3 -
 tests/unit/APITest.ts                         |  38 +++---
 tests/unit/NetworkTest.ts                     |  10 +-
 15 files changed, 80 insertions(+), 165 deletions(-)
 delete mode 100644 src/libs/checkInternetReachability/index.android.ts
 delete mode 100644 src/libs/checkInternetReachability/index.ts
 delete mode 100644 src/libs/checkInternetReachability/types.ts

diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 7527857eeda7..ec8e17dda4cf 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -16,7 +16,7 @@ import './fonts.css';
 Onyx.init({
     keys: ONYXKEYS,
     initialKeyStates: {
-        [ONYXKEYS.NETWORK]: {isOffline: false, isBackendReachable: true},
+        [ONYXKEYS.NETWORK]: {isOffline: false},
     },
 });
 
diff --git a/src/CONST.ts b/src/CONST.ts
index 9311816c38a2..920a223b5722 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -560,10 +560,8 @@ const CONST = {
     EMPTY_ARRAY,
     EMPTY_OBJECT,
     USE_EXPENSIFY_URL,
-    STATUS_EXPENSIFY_URL: 'https://status.expensify.com',
     GOOGLE_MEET_URL_ANDROID: 'https://meet.google.com',
     GOOGLE_DOC_IMAGE_LINK_MATCH: 'googleusercontent.com',
-    GOOGLE_CLOUD_URL: 'https://clients3.google.com/generate_204',
     IMAGE_BASE64_MATCH: 'base64',
     DEEPLINK_BASE_URL: 'new-expensify://',
     PDF_VIEWER_URL: '/pdf/web/viewer.html',
@@ -1059,7 +1057,7 @@ const CONST = {
         MAX_RETRY_WAIT_TIME_MS: 10 * 1000,
         PROCESS_REQUEST_DELAY_MS: 1000,
         MAX_PENDING_TIME_MS: 10 * 1000,
-        BACKEND_CHECK_INTERVAL_MS: 60 * 1000,
+        RECHECK_INTERVAL_MS: 60 * 1000,
         MAX_REQUEST_RETRIES: 10,
         NETWORK_STATUS: {
             ONLINE: 'online',
@@ -1071,7 +1069,7 @@ const CONST = {
     DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
     DEFAULT_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
     DEFAULT_CLOSE_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
-    DEFAULT_NETWORK_DATA: {isOffline: false, isBackendReachable: true},
+    DEFAULT_NETWORK_DATA: {isOffline: false},
     FORMS: {
         LOGIN_FORM: 'LoginForm',
         VALIDATE_CODE_FORM: 'ValidateCodeForm',
diff --git a/src/Expensify.tsx b/src/Expensify.tsx
index ddc4b5f88a69..458f1e3c5d24 100644
--- a/src/Expensify.tsx
+++ b/src/Expensify.tsx
@@ -146,10 +146,10 @@ function Expensify({
         // Initialize this client as being an active client
         ActiveClientManager.init();
 
-        // Used for the offline indicator appearing when someone is offline or backend is unreachable
-        const unsubscribeNetworkStatus = NetworkConnection.subscribeToNetworkStatus();
+        // Used for the offline indicator appearing when someone is offline
+        const unsubscribeNetInfo = NetworkConnection.subscribeToNetInfo();
 
-        return () => unsubscribeNetworkStatus();
+        return unsubscribeNetInfo;
     }, []);
 
     useEffect(() => {
diff --git a/src/components/OfflineIndicator.tsx b/src/components/OfflineIndicator.tsx
index 1cadace6d3b4..337e5dd850f7 100644
--- a/src/components/OfflineIndicator.tsx
+++ b/src/components/OfflineIndicator.tsx
@@ -7,11 +7,9 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
-import CONST from '@src/CONST';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
-import TextLink from './TextLink';
 
 type OfflineIndicatorProps = {
     /** Optional styles for container element that will override the default styling for the offline indicator */
@@ -25,7 +23,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isOffline, isBackendReachable} = useNetwork();
+    const {isOffline} = useNetwork();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const computedStyles = useMemo((): StyleProp<ViewStyle> => {
@@ -36,7 +34,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
         return shouldUseNarrowLayout ? styles.offlineIndicatorMobile : styles.offlineIndicator;
     }, [containerStyles, shouldUseNarrowLayout, styles.offlineIndicatorMobile, styles.offlineIndicator]);
 
-    if (!isOffline && isBackendReachable) {
+    if (!isOffline) {
         return null;
     }
 
@@ -48,22 +46,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
                 width={variables.iconSizeSmall}
                 height={variables.iconSizeSmall}
             />
-            <Text style={[styles.ml3, styles.chatItemComposeSecondaryRowSubText]}>
-                {isOffline ? (
-                    translate('common.youAppearToBeOffline')
-                ) : (
-                    <>
-                        {translate('common.weMightHaveProblem')}
-                        <TextLink
-                            href={CONST.STATUS_EXPENSIFY_URL}
-                            style={[styles.chatItemComposeSecondaryRowSubText, styles.link]}
-                        >
-                            {new URL(CONST.STATUS_EXPENSIFY_URL).host}
-                        </TextLink>
-                        .
-                    </>
-                )}
-            </Text>
+            <Text style={[styles.ml3, styles.chatItemComposeSecondaryRowSubText]}>{translate('common.youAppearToBeOffline')}</Text>
         </View>
     );
 }
diff --git a/src/hooks/useNetwork.ts b/src/hooks/useNetwork.ts
index 65565d035e36..950d0592b59c 100644
--- a/src/hooks/useNetwork.ts
+++ b/src/hooks/useNetwork.ts
@@ -6,14 +6,13 @@ type UseNetworkProps = {
     onReconnect?: () => void;
 };
 
-type UseNetwork = {isOffline: boolean; isBackendReachable: boolean};
+type UseNetwork = {isOffline: boolean};
 
 export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {}): UseNetwork {
     const callback = useRef(onReconnect);
     callback.current = onReconnect;
 
-    const {isOffline, networkStatus, isBackendReachable} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
-    const isNetworkStatusUnknown = networkStatus === CONST.NETWORK.NETWORK_STATUS.UNKNOWN;
+    const {isOffline, networkStatus} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
     const prevOfflineStatusRef = useRef(isOffline);
     useEffect(() => {
         // If we were offline before and now we are not offline then we just reconnected
@@ -30,6 +29,6 @@ export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {
         prevOfflineStatusRef.current = isOffline;
     }, [isOffline]);
 
-    // If the network status is unknown, we fallback to default state, i.e. we're online and backend is reachable.
-    return isNetworkStatusUnknown ? CONST.DEFAULT_NETWORK_DATA : {isOffline, isBackendReachable};
+    // If the network status is undefined, we don't treat it as offline. Otherwise, we utilize the isOffline prop.
+    return {isOffline: networkStatus === CONST.NETWORK.NETWORK_STATUS.UNKNOWN ? false : isOffline};
 }
diff --git a/src/languages/en.ts b/src/languages/en.ts
index bf3803c7606d..f5520afa2cc2 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -273,7 +273,6 @@ export default {
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
         youAppearToBeOffline: 'You appear to be offline.',
-        weMightHaveProblem: 'We might have a problem. Check out ',
         thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
         attachementWillBeAvailableOnceBackOnline: 'Attachment will become available once back online.',
         areYouSure: 'Are you sure?',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 4c900e23acc5..2facecb0815b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -264,7 +264,6 @@ export default {
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
         youAppearToBeOffline: 'Parece que estás desconectado.',
-        weMightHaveProblem: 'Peude que te tengamos un problema. Echa un vistazo a ',
         thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
         attachementWillBeAvailableOnceBackOnline: 'El archivo adjunto estará disponible cuando vuelvas a estar en línea.',
         areYouSure: '¿Estás seguro?',
diff --git a/src/libs/NetworkConnection.ts b/src/libs/NetworkConnection.ts
index 8c76e52aa42d..0b4ca5291689 100644
--- a/src/libs/NetworkConnection.ts
+++ b/src/libs/NetworkConnection.ts
@@ -8,7 +8,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import * as NetworkActions from './actions/Network';
 import AppStateMonitor from './AppStateMonitor';
-import checkInternetReachability from './checkInternetReachability';
 import Log from './Log';
 
 let isOffline = false;
@@ -43,23 +42,12 @@ function setOfflineStatus(isCurrentlyOffline: boolean, reason = ''): void {
     // When reconnecting, ie, going from offline to online, all the reconnection callbacks
     // are triggered (this is usually Actions that need to re-download data from the server)
     if (isOffline && !isCurrentlyOffline) {
-        NetworkActions.setIsBackendReachable(true, 'moved from offline to online');
         triggerReconnectionCallbacks('offline status changed');
     }
 
     isOffline = isCurrentlyOffline;
 }
 
-function setNetWorkStatus(isInternetReachable: boolean | null): void {
-    let networkStatus;
-    if (!isBoolean(isInternetReachable)) {
-        networkStatus = CONST.NETWORK.NETWORK_STATUS.UNKNOWN;
-    } else {
-        networkStatus = isInternetReachable ? CONST.NETWORK.NETWORK_STATUS.ONLINE : CONST.NETWORK.NETWORK_STATUS.OFFLINE;
-    }
-    NetworkActions.setNetWorkStatus(networkStatus);
-}
-
 // Update the offline status in response to changes in shouldForceOffline
 let shouldForceOffline = false;
 Onyx.connect({
@@ -103,26 +91,23 @@ Onyx.connect({
 });
 
 /**
- * Set interval to periodically (re)check backend status.
- * Because backend unreachability might imply lost internet connection, we need to check internet reachability.
- * @returns clearInterval cleanup
+ * Set up the event listener for NetInfo to tell whether the user has
+ * internet connectivity or not. This is more reliable than the Pusher
+ * `disconnected` event which takes about 10-15 seconds to emit.
+ * @returns unsubscribe method
  */
-function subscribeToBackendAndInternetReachability(): () => void {
-    const intervalID = setInterval(() => {
-        // Offline status also implies backend unreachability
-        if (isOffline) {
-            // Periodically recheck the network connection
-            // More info: https://github.com/Expensify/App/issues/42988
-            recheckNetworkConnection();
-            Log.info(`[NetworkStatus] Rechecking the network connection with "isOffline" set to "true" to double-check internet reachability.`);
-            return;
-        }
-        // Using the API url ensures reachability is tested over internet
-        fetch(`${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/Ping?accountID=${accountID || 'unknown'}`, {
-            method: 'GET',
-            cache: 'no-cache',
-        })
-            .then((response) => {
+function subscribeToNetInfo(): () => void {
+    // Note: We are disabling the configuration for NetInfo when using the local web API since requests can get stuck in a 'Pending' state and are not reliable indicators for "offline".
+    // If you need to test the "recheck" feature then switch to the production API proxy server.
+    if (!CONFIG.IS_USING_LOCAL_WEB) {
+        // Calling NetInfo.configure (re)checks current state. We use it to force a recheck whenever we (re)subscribe
+        NetInfo.configure({
+            // By default, NetInfo uses `/` for `reachabilityUrl`
+            // When App is served locally (or from Electron) this address is always reachable - even offline
+            // Using the API url ensures reachability is tested over internet
+            reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/Ping?accountID=${accountID || 'unknown'}`,
+            reachabilityMethod: 'GET',
+            reachabilityTest: (response) => {
                 if (!response.ok) {
                     return Promise.resolve(false);
                 }
@@ -130,44 +115,15 @@ function subscribeToBackendAndInternetReachability(): () => void {
                     .json()
                     .then((json) => Promise.resolve(json.jsonCode === 200))
                     .catch(() => Promise.resolve(false));
-            })
-            .then((isBackendReachable: boolean) => {
-                if (isBackendReachable) {
-                    NetworkActions.setIsBackendReachable(true, 'successfully completed API request');
-                    return;
-                }
-                NetworkActions.setIsBackendReachable(false, 'request succeeded, but internet reachability test failed');
-                checkInternetReachability().then((isInternetReachable: boolean) => {
-                    setOfflineStatus(!isInternetReachable, 'checkInternetReachability was called after api/ping returned a non-200 jsonCode');
-                    setNetWorkStatus(isInternetReachable);
-                });
-            })
-            .catch(() => {
-                NetworkActions.setIsBackendReachable(false, 'request failed and internet reachability test failed');
-                checkInternetReachability().then((isInternetReachable: boolean) => {
-                    setOfflineStatus(!isInternetReachable, 'checkInternetReachability was called after api/ping request failed');
-                    setNetWorkStatus(isInternetReachable);
-                });
-            });
-    }, CONST.NETWORK.BACKEND_CHECK_INTERVAL_MS);
-
-    return () => {
-        clearInterval(intervalID);
-    };
-}
+            },
 
-/**
- * Monitor internet connectivity and perform periodic backend reachability checks
- * @returns unsubscribe method
- */
-function subscribeToNetworkStatus(): () => void {
-    // Note: We are disabling the reachability check when using the local web API since requests can get stuck in a 'Pending' state and are not reliable indicators for reachability.
-    // If you need to test the "recheck" feature then switch to the production API proxy server.
-    const unsubscribeFromBackendReachability = !CONFIG.IS_USING_LOCAL_WEB ? subscribeToBackendAndInternetReachability() : undefined;
+            // If a check is taking longer than this time we're considered offline
+            reachabilityRequestTimeout: CONST.NETWORK.MAX_PENDING_TIME_MS,
+        });
+    }
 
-    // Set up the event listener for NetInfo to tell whether the user has
-    // internet connectivity or not. This is more reliable than the Pusher
-    // `disconnected` event which takes about 10-15 seconds to emit.
+    // Subscribe to the state change event via NetInfo so we can update
+    // whether a user has internet connectivity or not.
     const unsubscribeNetInfo = NetInfo.addEventListener((state) => {
         Log.info('[NetworkConnection] NetInfo state change', false, {...state});
         if (shouldForceOffline) {
@@ -176,11 +132,27 @@ function subscribeToNetworkStatus(): () => void {
         }
         setOfflineStatus(state.isInternetReachable === false, 'NetInfo received a state change event');
         Log.info(`[NetworkStatus] NetInfo.addEventListener event coming, setting "offlineStatus" to ${!!state.isInternetReachable} with network state: ${JSON.stringify(state)}`);
-        setNetWorkStatus(state.isInternetReachable);
+        let networkStatus;
+        if (!isBoolean(state.isInternetReachable)) {
+            networkStatus = CONST.NETWORK.NETWORK_STATUS.UNKNOWN;
+        } else {
+            networkStatus = state.isInternetReachable ? CONST.NETWORK.NETWORK_STATUS.ONLINE : CONST.NETWORK.NETWORK_STATUS.OFFLINE;
+        }
+        NetworkActions.setNetWorkStatus(networkStatus);
     });
 
+    // Periodically recheck the network connection
+    // More info: https://github.com/Expensify/App/issues/42988
+    const recheckIntervalID = setInterval(() => {
+        if (!isOffline) {
+            return;
+        }
+        recheckNetworkConnection();
+        Log.info(`[NetworkStatus] Rechecking the network connection with "isOffline" set to "true" to double-check internet reachability.`);
+    }, CONST.NETWORK.RECHECK_INTERVAL_MS);
+
     return () => {
-        unsubscribeFromBackendReachability?.();
+        clearInterval(recheckIntervalID);
         unsubscribeNetInfo();
     };
 }
@@ -231,6 +203,6 @@ export default {
     onReconnect,
     triggerReconnectionCallbacks,
     recheckNetworkConnection,
-    subscribeToNetworkStatus,
+    subscribeToNetInfo,
 };
 export type {NetworkStatus};
diff --git a/src/libs/actions/Network.ts b/src/libs/actions/Network.ts
index 883e336d6c90..d8a87aff551d 100644
--- a/src/libs/actions/Network.ts
+++ b/src/libs/actions/Network.ts
@@ -3,15 +3,6 @@ import Log from '@libs/Log';
 import type {NetworkStatus} from '@libs/NetworkConnection';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-function setIsBackendReachable(isBackendReachable: boolean, reason: string) {
-    if (isBackendReachable) {
-        Log.info(`[Network] Backend is reachable because: ${reason}`);
-    } else {
-        Log.info(`[Network] Backend is not reachable because: ${reason}`);
-    }
-    Onyx.merge(ONYXKEYS.NETWORK, {isBackendReachable});
-}
-
 function setIsOffline(isOffline: boolean, reason = '') {
     if (reason) {
         let textToLog = '[Network] Client is';
@@ -41,4 +32,4 @@ function setShouldFailAllRequests(shouldFailAllRequests: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldFailAllRequests});
 }
 
-export {setIsBackendReachable, setIsOffline, setShouldForceOffline, setShouldFailAllRequests, setTimeSkew, setNetWorkStatus};
+export {setIsOffline, setShouldForceOffline, setShouldFailAllRequests, setTimeSkew, setNetWorkStatus};
diff --git a/src/libs/checkInternetReachability/index.android.ts b/src/libs/checkInternetReachability/index.android.ts
deleted file mode 100644
index da46623c3e05..000000000000
--- a/src/libs/checkInternetReachability/index.android.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import CONST from '@src/CONST';
-import type InternetReachabilityCheck from './types';
-
-/**
- * Although Android supports internet reachability check, it only does on initiating the connection.
- * We need to implement a test for a highly-available endpoint in case of lost internet after initiation.
- */
-export default function checkInternetReachability(): InternetReachabilityCheck {
-    return fetch(CONST.GOOGLE_CLOUD_URL, {
-        method: 'GET',
-        cache: 'no-cache',
-    })
-        .then((response) => Promise.resolve(response.status === 204))
-        .catch(() => Promise.resolve(false));
-}
diff --git a/src/libs/checkInternetReachability/index.ts b/src/libs/checkInternetReachability/index.ts
deleted file mode 100644
index d7d0808c6efc..000000000000
--- a/src/libs/checkInternetReachability/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type InternetReachabilityCheck from './types';
-
-export default function checkInternetReachability(): InternetReachabilityCheck {
-    return Promise.resolve(true);
-}
diff --git a/src/libs/checkInternetReachability/types.ts b/src/libs/checkInternetReachability/types.ts
deleted file mode 100644
index 3e1cb96cb26c..000000000000
--- a/src/libs/checkInternetReachability/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-type InternetReachabilityCheck = Promise<boolean>;
-
-export default InternetReachabilityCheck;
diff --git a/src/types/onyx/Network.ts b/src/types/onyx/Network.ts
index 4ef24a314647..680c6c468c00 100644
--- a/src/types/onyx/Network.ts
+++ b/src/types/onyx/Network.ts
@@ -5,9 +5,6 @@ type Network = {
     /** Is the network currently offline or not */
     isOffline: boolean;
 
-    /** Is the backend reachable when online */
-    isBackendReachable: boolean;
-
     /** Should the network be forced offline */
     shouldForceOffline?: boolean;
 
diff --git a/tests/unit/APITest.ts b/tests/unit/APITest.ts
index 07633b19802b..9688b0890c34 100644
--- a/tests/unit/APITest.ts
+++ b/tests/unit/APITest.ts
@@ -68,7 +68,7 @@ describe('APITests', () => {
         const xhr = jest.spyOn(HttpUtils, 'xhr').mockRejectedValue(new Error('Unexpected xhr call'));
 
         // Given we're offline
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: true, isBackendReachable: false})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
             .then(() => {
                 // When API Writes and Reads are called
                 API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
@@ -101,7 +101,7 @@ describe('APITests', () => {
         // Given we have some requests made while we're offline
         return (
             Onyx.multiSet({
-                [ONYXKEYS.NETWORK]: {isOffline: true, isBackendReachable: false},
+                [ONYXKEYS.NETWORK]: {isOffline: true},
                 [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin: 'test', autoGeneratedPassword: 'passwd'},
                 [ONYXKEYS.SESSION]: {authToken: 'testToken'},
             })
@@ -117,7 +117,7 @@ describe('APITests', () => {
                 })
 
                 // When we resume connectivity
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(waitForBatchedUpdates)
                 .then(() => {
                     expect(NetworkStore.isOffline()).toBe(false);
@@ -153,7 +153,7 @@ describe('APITests', () => {
 
         // Given we have some requests made while we're offline
         return (
-            Onyx.set(ONYXKEYS.NETWORK, {isOffline: true, isBackendReachable: false})
+            Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
                     API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
@@ -162,7 +162,7 @@ describe('APITests', () => {
                 })
 
                 // When we resume connectivity
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(waitForBatchedUpdates)
                 .then(() => {
                     // Then requests should remain persisted until the xhr call is resolved
@@ -215,7 +215,7 @@ describe('APITests', () => {
 
         // Given we have a request made while we're offline
         return (
-            Onyx.set(ONYXKEYS.NETWORK, {isOffline: true, isBackendReachable: false})
+            Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
                     API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
@@ -223,7 +223,7 @@ describe('APITests', () => {
                 })
 
                 // When we resume connectivity
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(waitForBatchedUpdates)
                 .then(() => {
                     // Then there has only been one request so far
@@ -302,14 +302,14 @@ describe('APITests', () => {
         Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: 'test', autoGeneratedPassword: 'passwd'});
         return (
             waitForBatchedUpdates()
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: true, isBackendReachable: false}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: true}))
                 .then(() => {
                     API.write<WriteCommand>('Mock' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
                     return waitForBatchedUpdates();
                 })
 
                 // When we resume connectivity
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(waitForBatchedUpdates)
                 .then(() => {
                     const nonLogCalls = xhr.mock.calls.filter(([commandName]) => commandName !== 'Log');
@@ -332,7 +332,7 @@ describe('APITests', () => {
         const xhr = jest.spyOn(HttpUtils, 'xhr').mockResolvedValue({jsonCode: CONST.JSON_CODE.SUCCESS});
         return Onyx.multiSet({
             [ONYXKEYS.SESSION]: {authToken: 'anyToken'},
-            [ONYXKEYS.NETWORK]: {isOffline: true, isBackendReachable: false},
+            [ONYXKEYS.NETWORK]: {isOffline: true},
             [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin: 'test_user', autoGeneratedPassword: 'psswd'},
         })
             .then(() => {
@@ -347,7 +347,7 @@ describe('APITests', () => {
 
                 return waitForBatchedUpdates();
             })
-            .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+            .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
             .then(waitForBatchedUpdates)
             .then(() => {
                 // Then expect all 7 calls to have been made and for the Writes to be made in the order that we made them
@@ -368,7 +368,7 @@ describe('APITests', () => {
         const xhr = jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({jsonCode: CONST.JSON_CODE.NOT_AUTHENTICATED}).mockResolvedValue({jsonCode: CONST.JSON_CODE.SUCCESS});
 
         return Onyx.multiSet({
-            [ONYXKEYS.NETWORK]: {isOffline: true, isBackendReachable: false},
+            [ONYXKEYS.NETWORK]: {isOffline: true},
             [ONYXKEYS.SESSION]: {authToken: 'test'},
             [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin: 'test', autoGeneratedPassword: 'passwd'},
         })
@@ -382,7 +382,7 @@ describe('APITests', () => {
                 API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value6'} as ApiRequestCommandParameters[WriteCommand]);
                 return waitForBatchedUpdates();
             })
-            .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+            .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
             .then(waitForBatchedUpdates)
             .then(() => {
                 // Then expect only 8 calls to have been made total and for them to be made in the order that we made them despite requiring reauthentication
@@ -412,7 +412,7 @@ describe('APITests', () => {
 
         return Onyx.multiSet({
             [ONYXKEYS.SESSION]: {authToken: 'oldToken'},
-            [ONYXKEYS.NETWORK]: {isOffline: false, isBackendReachable: true},
+            [ONYXKEYS.NETWORK]: {isOffline: false},
             [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin: 'test_user', autoGeneratedPassword: 'psswd'},
         })
             .then(() => {
@@ -426,7 +426,7 @@ describe('APITests', () => {
                     forceNetworkRequest: false,
                 });
 
-                Onyx.set(ONYXKEYS.NETWORK, {isOffline: true, isBackendReachable: false});
+                Onyx.set(ONYXKEYS.NETWORK, {isOffline: true});
                 expect(NetworkStore.isOffline()).toBe(false);
                 expect(NetworkStore.isAuthenticating()).toBe(false);
                 return waitForBatchedUpdates();
@@ -444,7 +444,7 @@ describe('APITests', () => {
                 waitForBatchedUpdates();
 
                 // Come back from offline to trigger the sequential queue flush
-                Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true});
+                Onyx.set(ONYXKEYS.NETWORK, {isOffline: false});
             })
             .then(() => {
                 // When we wait for the sequential queue to finish
@@ -491,7 +491,7 @@ describe('APITests', () => {
 
         // Given a simulated a condition where the credentials have not yet been read from storage and we are offline
         return Onyx.multiSet({
-            [ONYXKEYS.NETWORK]: {isOffline: true, isBackendReachable: false},
+            [ONYXKEYS.NETWORK]: {isOffline: true},
             [ONYXKEYS.CREDENTIALS]: {},
             [ONYXKEYS.SESSION]: null,
         })
@@ -507,7 +507,7 @@ describe('APITests', () => {
                 expect(PersistedRequests.getAll().length).toBe(1);
 
                 // When we go online and wait for promises to resolve
-                return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true});
+                return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false});
             })
             .then(waitForBatchedUpdates)
             .then(() => {
@@ -531,7 +531,7 @@ describe('APITests', () => {
 
     test('Write request will move directly to the SequentialQueue when we are online and block non-Write requests', () => {
         const xhr = jest.spyOn(HttpUtils, 'xhr');
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 // GIVEN that we are online
                 expect(NetworkStore.isOffline()).toBe(false);
diff --git a/tests/unit/NetworkTest.ts b/tests/unit/NetworkTest.ts
index 850e7d5c236a..42b3024efaa3 100644
--- a/tests/unit/NetworkTest.ts
+++ b/tests/unit/NetworkTest.ts
@@ -109,7 +109,7 @@ describe('NetworkTests', () => {
             // This should first trigger re-authentication and then a Failed to fetch
             PersonalDetails.openPublicProfilePage(TEST_USER_ACCOUNT_ID);
             return waitForBatchedUpdates()
-                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true}))
+                .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(() => {
                     expect(isOffline).toBe(false);
 
@@ -260,7 +260,7 @@ describe('NetworkTests', () => {
         const logHmmmSpy = jest.spyOn(Log, 'hmmm');
 
         // Given we have a request made while online
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 Network.post('MockBadNetworkResponse', {param1: 'value1'});
                 return waitForBatchedUpdates();
@@ -276,7 +276,7 @@ describe('NetworkTests', () => {
         const logAlertSpy = jest.spyOn(Log, 'alert');
 
         // Given we have a request made while online
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 Network.post('MockBadNetworkResponse', {param1: 'value1'});
                 return waitForBatchedUpdates();
@@ -292,7 +292,7 @@ describe('NetworkTests', () => {
         const onResolved = jest.fn();
 
         // Given we have a request made while online
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 expect(NetworkStore.isOffline()).toBe(false);
 
@@ -313,7 +313,7 @@ describe('NetworkTests', () => {
         // GIVEN a mock that will return a "cancelled" request error
         global.fetch = jest.fn().mockRejectedValue(new DOMException('Aborted', CONST.ERROR.REQUEST_CANCELLED));
 
-        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false, isBackendReachable: true})
+        return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 // WHEN we make a few requests and then cancel them
                 Network.post('MockCommandOne');

From d4deb6b8ed342133b7ae447f45cdaf83a337b7c4 Mon Sep 17 00:00:00 2001
From: Skyweb331 <skyweb331@gmail.com>
Date: Tue, 18 Jun 2024 04:40:44 -0400
Subject: [PATCH 38/77] disable back button behavior for android on onboarding

---
 src/pages/OnboardingPurpose/index.native.tsx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/OnboardingPurpose/index.native.tsx b/src/pages/OnboardingPurpose/index.native.tsx
index c13245038629..02f8cf84a80f 100644
--- a/src/pages/OnboardingPurpose/index.native.tsx
+++ b/src/pages/OnboardingPurpose/index.native.tsx
@@ -1,8 +1,22 @@
-import React from 'react';
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import {BackHandler} from 'react-native';
 import BaseOnboardingPurpose from './BaseOnboardingPurpose';
 import type {OnboardingPurposeProps} from './types';
 
 function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
+    // To block android native back button behavior
+    useFocusEffect(
+        useCallback(() => {
+            // Return true to indicate that the back button press is handled here
+            const backAction = () => true;
+
+            const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
+
+            return () => backHandler.remove();
+        }, []),
+    );
+
     return (
         <BaseOnboardingPurpose
             shouldUseNativeStyles

From 9954f493176bc37597c2abb1fb0ed919dce7f1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Henriques?= <contact@fabiohenriques.dev>
Date: Tue, 18 Jun 2024 17:49:08 +0100
Subject: [PATCH 39/77] Address review comments

---
 src/ONYXKEYS.ts                     |  2 +-
 src/libs/SubscriptionUtils.ts       | 12 +++---
 tests/unit/ReportUtilsTest.ts       |  4 ++
 tests/unit/SubscriptionUtilsTest.ts | 65 ++++++++++++++++++++++++-----
 4 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 34537f65dfbf..5267cd1fdf55 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -393,7 +393,7 @@ const ONYXKEYS = {
         SNAPSHOT: 'snapshot_',
 
         // Shared NVPs
-        /** Collection of objects where each objects represents a workspace’s owner which is past due billing AND the user is a member of. */
+        /** Collection of objects where each object represents the owner of the workspace that is past due billing AND the user is a member of. */
         SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END: 'sharedNVP_private_billingGracePeriodEnd_',
     },
 
diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
index 721bb9b1aa6c..50dc4f99eec0 100644
--- a/src/libs/SubscriptionUtils.ts
+++ b/src/libs/SubscriptionUtils.ts
@@ -1,4 +1,4 @@
-import {differenceInCalendarDays, fromUnixTime, isAfter, isBefore, parse as parseDate} from 'date-fns';
+import {differenceInSeconds, fromUnixTime, isAfter, isBefore, parse as parseDate} from 'date-fns';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
@@ -58,8 +58,10 @@ function calculateRemainingFreeTrialDays(): number {
     }
 
     const currentDate = new Date();
-    const difference = differenceInCalendarDays(parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate), currentDate);
-    return difference < 0 ? 0 : difference;
+    const diffInSeconds = differenceInSeconds(parseDate(lastDayFreeTrial, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING, currentDate), currentDate);
+    const diffInDays = Math.ceil(diffInSeconds / 86400);
+
+    return diffInDays < 0 ? 0 : diffInDays;
 }
 
 /**
@@ -67,7 +69,7 @@ function calculateRemainingFreeTrialDays(): number {
  */
 function isUserOnFreeTrial(): boolean {
     if (!firstDayFreeTrial || !lastDayFreeTrial) {
-        return true;
+        return false;
     }
 
     const currentDate = new Date();
@@ -123,7 +125,7 @@ function shouldRestrictUserBillableActions(policyID: string): boolean {
 
     // If it reached here it means that the user is actually the workspace's owner.
     // We should restrict the workspace's owner actions if it's past its grace period end date and it's owing some amount.
-    if (ownerBillingGraceEndPeriod && amountOwed !== undefined && isAfter(currentDate, fromUnixTime(ownerBillingGraceEndPeriod))) {
+    if (ownerBillingGraceEndPeriod && amountOwed !== undefined && amountOwed > 0 && isAfter(currentDate, fromUnixTime(ownerBillingGraceEndPeriod))) {
         return true;
     }
 
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index a04f26e70c5b..98b92c77663b 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -912,6 +912,10 @@ describe('ReportUtils', () => {
             await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
         });
 
+        it('should return false if the report is neither the system or concierge chat', () => {
+            expect(ReportUtils.isChatUsedForOnboarding(LHNTestUtils.getFakeReport())).toBeFalsy();
+        });
+
         it('should return true if the user account ID is odd and report is the system chat', async () => {
             const accountID = 1;
 
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
index 8e4c99c5151f..7767ae9f387b 100644
--- a/tests/unit/SubscriptionUtilsTest.ts
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -1,4 +1,4 @@
-import {addDays, format as formatDate, getUnixTime, subDays} from 'date-fns';
+import {addDays, addMinutes, format as formatDate, getUnixTime, subDays} from 'date-fns';
 import Onyx from 'react-native-onyx';
 import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import CONST from '@src/CONST';
@@ -32,6 +32,11 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
         });
 
+        it('should return 1 if the current date is on the same day of the free trial end date, but some minutes earlier', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addMinutes(new Date(), 30), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(1);
+        });
+
         it('should return the remaining days if the current date is before the free trial end date', async () => {
             await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addDays(new Date(), 5), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
             expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(5);
@@ -47,27 +52,54 @@ describe('SubscriptionUtils', () => {
             });
         });
 
-        it('should return true if the Onyx keys are not set', () => {
-            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        it('should return false if the Onyx keys are not set', () => {
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
         });
 
-        it('should return true if the current date is between the free trial start and end dates', async () => {
+        it('should return false if the current date is before the free trial start date', async () => {
             await Onyx.multiSet({
-                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
-                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 4), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
             });
 
-            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
         });
 
         it('should return false if the current date is after the free trial end date', async () => {
             await Onyx.multiSet({
-                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 10), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
-                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 4), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
             });
 
             expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
         });
+
+        it('should return true if the current date is on the same date of free trial start date', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(new Date(), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return true if the current date is on the same date of free trial end date, but some minutes earlier', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addMinutes(new Date(), 30), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return true if the current date is between the free trial start and end dates', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
     });
 
     describe('hasUserFreeTrialEnded', () => {
@@ -191,12 +223,23 @@ describe('SubscriptionUtils', () => {
             expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
         });
 
-        it('should return true if the user is a workspace owner but is past due billing', async () => {
+        it("should return false if the user is a workspace owner but is past due billing but isn't owning any amount", async () => {
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: 0,
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it('should return true if the user is a workspace owner but is past due billing and is owning some amount', async () => {
             const policyID = '1001';
 
             await Onyx.multiSet({
                 [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
-                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: 8010, // owing some amount
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWNED]: 8010,
             });
 
             expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeTruthy();

From 1047f73ef9cfefaa2d8dce93c9a7f6e09b73f649 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Wed, 19 Jun 2024 03:34:33 +0530
Subject: [PATCH 40/77] add util function for checking local files.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/ImageView/index.tsx                        | 3 ++-
 src/components/Lightbox/index.tsx                         | 3 ++-
 src/libs/ReceiptUtils.ts                                  | 2 +-
 src/libs/fileDownload/FileUtils.ts                        | 8 ++++++++
 src/pages/iou/request/step/IOURequestStepConfirmation.tsx | 3 ++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/ImageView/index.tsx b/src/components/ImageView/index.tsx
index da77f93ab65c..c74d9bd5aa52 100644
--- a/src/components/ImageView/index.tsx
+++ b/src/components/ImageView/index.tsx
@@ -12,6 +12,7 @@ import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import CONST from '@src/CONST';
 import viewRef from '@src/types/utils/viewRef';
 import type ImageViewProps from './types';
@@ -195,7 +196,7 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
         };
     }, [canUseTouchScreen, trackMovement, trackPointerPosition]);
 
-    const isLocalFile = url.startsWith('blob:') || url.startsWith('file:');
+    const isLocalFile = FileUtils.isLocalFile(url);
 
     if (canUseTouchScreen) {
         return (
diff --git a/src/components/Lightbox/index.tsx b/src/components/Lightbox/index.tsx
index 6b3b7557cf58..ea10e104a59d 100644
--- a/src/components/Lightbox/index.tsx
+++ b/src/components/Lightbox/index.tsx
@@ -12,6 +12,7 @@ import {getCanvasFitScale} from '@components/MultiGestureCanvas/utils';
 import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import NUMBER_OF_CONCURRENT_LIGHTBOXES from './numberOfConcurrentLightboxes';
 
 const cachedImageDimensions = new Map<string, ContentSize | undefined>();
@@ -197,7 +198,7 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
         [onScaleChangedContext, onScaleChangedProp],
     );
 
-    const isLocalFile = uri.startsWith('blob:') || uri.startsWith('file:');
+    const isLocalFile = FileUtils.isLocalFile(uri);
 
     return (
         <View
diff --git a/src/libs/ReceiptUtils.ts b/src/libs/ReceiptUtils.ts
index b3892d20162f..b42a23e215bf 100644
--- a/src/libs/ReceiptUtils.ts
+++ b/src/libs/ReceiptUtils.ts
@@ -56,7 +56,7 @@ function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction>, receiptPa
         return {thumbnail: `${path.substring(0, path.length - 4)}.jpg.1024.jpg`, image: path, filename};
     }
 
-    const isLocalFile = typeof path === 'number' || path.startsWith('blob:') || path.startsWith('file:') || path.startsWith('/');
+    const isLocalFile = FileUtils.isLocalFile(path);
     const {fileExtension} = FileUtils.splitExtensionFromFileName(filename);
     return {isThumbnail: true, fileExtension: Object.values(CONST.IOU.FILE_TYPES).find((type) => type === fileExtension), image: path, isLocalFile, filename};
 }
diff --git a/src/libs/fileDownload/FileUtils.ts b/src/libs/fileDownload/FileUtils.ts
index f058ce0f80d8..0ce33a02f95d 100644
--- a/src/libs/fileDownload/FileUtils.ts
+++ b/src/libs/fileDownload/FileUtils.ts
@@ -252,6 +252,13 @@ function validateImageForCorruption(file: FileObject): Promise<void> {
     });
 }
 
+function isLocalFile(receiptUri?: string | number): boolean {
+    if (!receiptUri) {
+        return false;
+    }
+    return typeof receiptUri === 'number' || receiptUri?.startsWith('blob:') || receiptUri?.startsWith('file:') || receiptUri?.startsWith('/');
+}
+
 export {
     showGeneralErrorAlert,
     showSuccessAlert,
@@ -264,5 +271,6 @@ export {
     appendTimeToFileName,
     readFileAsync,
     base64ToFile,
+    isLocalFile,
     validateImageForCorruption,
 };
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 1683ef3e3df2..d5dafa58cd9e 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -13,6 +13,7 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import * as IOUUtils from '@libs/IOUUtils';
 import Log from '@libs/Log';
@@ -204,7 +205,7 @@ function IOURequestStepConfirmation({
     // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        const isLocalFile = typeof receiptPath === 'number' || receiptPath?.startsWith('blob:') || receiptPath?.startsWith('file:') || receiptPath?.startsWith('/');
+        const isLocalFile = FileUtils.isLocalFile(receiptPath);
 
         if (!isLocalFile) {
             setReceiptFile(transaction?.receipt);

From e0acf6e5a9fe4ec36fe4a0c0f7de36425bb6a583 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Wed, 19 Jun 2024 11:13:10 +0700
Subject: [PATCH 41/77] Fix: Vendor toggle style

---
 .../qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
index 5ab28f80db2f..d18edd0489b8 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
@@ -65,6 +65,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
                     {nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL && (
                         <>
                             <ToggleSettingOptionRow
+                                shouldPlaceSubtitleBelowSwitch
                                 subtitle={translate('workspace.qbo.defaultVendorDescription')}
                                 switchAccessibilityLabel={translate('workspace.qbo.defaultVendorDescription')}
                                 errors={errorFields?.autoCreateVendor ?? undefined}

From e482df632cf345835b04e196734cb62eb0d0c9a7 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 19 Jun 2024 12:22:43 +0800
Subject: [PATCH 42/77] remove double encrypted auth token

---
 src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
index 9742c613de2f..e81df553d560 100644
--- a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
+++ b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
@@ -37,8 +37,7 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
         if (typeof source === 'number' || !source) {
             return;
         }
-        const sourceURI = addEncryptedAuthTokenToURL(source.uri);
-        fileDownload(sourceURI);
+        fileDownload(source.uri);
     }, [videoPopoverMenuPlayerRef]);
 
     const menuItems = useMemo(() => {

From abb41d66bbe618122e9860cbce3a5e825e8d4903 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 19 Jun 2024 12:24:32 +0800
Subject: [PATCH 43/77] remove unused import

---
 src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
index e81df553d560..0958ec148c3d 100644
--- a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
+++ b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
@@ -4,7 +4,6 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
 import type {VideoWithOnFullScreenUpdate} from '@components/VideoPlayer/types';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
 import fileDownload from '@libs/fileDownload';
 import CONST from '@src/CONST';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';

From f6a8aeab5a0bc503e494f115b4a33fb0c3b35850 Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Wed, 19 Jun 2024 11:47:26 +0700
Subject: [PATCH 44/77] Fix: Send button does not response

---
 src/pages/home/report/ReportActionCompose/SendButton.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionCompose/SendButton.tsx b/src/pages/home/report/ReportActionCompose/SendButton.tsx
index c505eb0e32e7..2c094b36e766 100644
--- a/src/pages/home/report/ReportActionCompose/SendButton.tsx
+++ b/src/pages/home/report/ReportActionCompose/SendButton.tsx
@@ -8,6 +8,7 @@ import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
 
 type SendButtonProps = {
@@ -22,6 +23,7 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useWindowDimensions();
 
     const Tap = Gesture.Tap().onEnd(() => {
         handleSendMessage();
@@ -33,7 +35,12 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
             // Keep focus on the composer when Send message is clicked.
             onMouseDown={(e) => e.preventDefault()}
         >
-            <GestureDetector gesture={Tap}>
+            <GestureDetector
+                // A new GestureDetector instance must be created when switching from a large screen to a small screen
+                // if not, the GestureDetector may not function correctly.
+                key={`${isSmallScreenWidth ? 0 : 1}`}
+                gesture={Tap}
+            >
                 <Tooltip text={translate('common.send')}>
                     <PressableWithFeedback
                         style={({pressed, isDisabled}) => [

From e769861d7e8263308ee305dc0bf7c380c9ac859f Mon Sep 17 00:00:00 2001
From: truph01 <truphd01@gmail.com>
Date: Wed, 19 Jun 2024 11:48:32 +0700
Subject: [PATCH 45/77] Fix: Revert change

---
 src/pages/home/report/ReportActionCompose/SendButton.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/SendButton.tsx b/src/pages/home/report/ReportActionCompose/SendButton.tsx
index 2c094b36e766..c505eb0e32e7 100644
--- a/src/pages/home/report/ReportActionCompose/SendButton.tsx
+++ b/src/pages/home/report/ReportActionCompose/SendButton.tsx
@@ -8,7 +8,6 @@ import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
 
 type SendButtonProps = {
@@ -23,7 +22,6 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
 
     const Tap = Gesture.Tap().onEnd(() => {
         handleSendMessage();
@@ -35,12 +33,7 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
             // Keep focus on the composer when Send message is clicked.
             onMouseDown={(e) => e.preventDefault()}
         >
-            <GestureDetector
-                // A new GestureDetector instance must be created when switching from a large screen to a small screen
-                // if not, the GestureDetector may not function correctly.
-                key={`${isSmallScreenWidth ? 0 : 1}`}
-                gesture={Tap}
-            >
+            <GestureDetector gesture={Tap}>
                 <Tooltip text={translate('common.send')}>
                     <PressableWithFeedback
                         style={({pressed, isDisabled}) => [

From 58b921b688b93799f338203fbf806700c3d6ec20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Wed, 19 Jun 2024 11:15:18 +0200
Subject: [PATCH 46/77] Revert "Revert "fix: CI upload source maps when
 deploying a new app version""

This reverts commit fb23d524c293cd563e56b15c180100728430efbb.
---
 .github/workflows/platformDeploy.yml                  | 2 +-
 ios/.xcode.env                                        | 5 +++++
 workflow_tests/assertions/platformDeployAssertions.ts | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 5ceb760a452b..20bf0d257a9b 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: android-sourcemap
-          path: android/app/build/generated/sourcemaps/react/release/*.map
+          path: android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
 
       - name: Upload Android version to GitHub artifacts
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
diff --git a/ios/.xcode.env b/ios/.xcode.env
index 3d5782c71568..0ef3f59d606a 100644
--- a/ios/.xcode.env
+++ b/ios/.xcode.env
@@ -9,3 +9,8 @@
 # For example, to use nvm with brew, add the following line
 # . "$(brew --prefix nvm)/nvm.sh" --no-use
 export NODE_BINARY=$(command -v node)
+
+# Provide a sourcemap path so that in release builds a source map file will be
+# created at the specified location.
+# (RN's default behaviour on iOS is to skip creating a sourcemap file):
+export SOURCEMAP_FILE="$(pwd)/../main.jsbundle.map";
diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
index 24bb91f001f6..03fdcc86ee94 100644
--- a/workflow_tests/assertions/platformDeployAssertions.ts
+++ b/workflow_tests/assertions/platformDeployAssertions.ts
@@ -64,7 +64,7 @@ function assertAndroidJobExecuted(workflowResult: Step[], didExecute = true, isP
     steps.push(
         createStepAssertion('Archive Android sourcemaps', true, null, 'ANDROID', 'Archiving Android sourcemaps', [
             {key: 'name', value: 'android-sourcemap'},
-            {key: 'path', value: 'android/app/build/generated/sourcemaps/react/release/*.map'},
+            {key: 'path', value: 'android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map'},
         ]),
     );
     if (!isProduction) {

From 3012a38a6d6806089f59cd751a55ff943b2c814c Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:31:36 +0530
Subject: [PATCH 47/77] Apply suggestions from code review

Co-authored-by: Yuwen Memon <yuwen@expensify.com>
---
 src/types/onyx/Policy.ts | 172 +++++++++++++++++++--------------------
 1 file changed, 86 insertions(+), 86 deletions(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 331e11751ad5..3e8e7b16d59a 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -165,7 +165,7 @@ type TaxRatesWithDefault = OnyxCommon.OnyxValueWithOfflineFeedback<{
 }>;
 
 /** Connection sync source values */
-type ConnectionSourceValues = 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'AUTOSYNC' | 'AUTOAPPROVE';
+type JobSourceValues = 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'NEWEXPENSIFY' | 'AUTOSYNC' | 'AUTOAPPROVE';
 
 /** Connection last synchronization state */
 type ConnectionLastSync = {
@@ -178,8 +178,8 @@ type ConnectionLastSync = {
     /** Whether the connection's last sync was successful */
     isSuccessful: boolean;
 
-    /** Where did the connection's last sync came from */
-    source: ConnectionSourceValues;
+    /** Where did the connection's last sync job come from */
+    source: JobSourceValues;
 };
 
 /** Financial account (bank account, debit card, etc) */
@@ -594,7 +594,7 @@ type XeroConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
-/** */
+/** Data stored about subsidiaries from NetSuite  */
 type Subsidiary = {
     /** ID of the subsidiary */
     internalID: string;
@@ -602,14 +602,14 @@ type Subsidiary = {
     /** Country where subsidiary is present */
     country: string;
 
-    /** Whether the subsidiary is an elimination */
+    /** Whether the subsidiary is an elimination subsidiary (a special type used to handle intercompany transaction) */
     isElimination: boolean;
 
     /** Name of the subsidiary */
     name: string;
 };
 
-/** NetSuite financial account type values */
+/** NetSuite bank account type values imported by Expensify*/
 type AccountTypeValues = '_accountsPayable' | '_otherCurrentLiability' | '_creditCard' | '_bank' | '_otherCurrentAsset' | '_longTermLiability' | '_accountsReceivable' | '_expense';
 
 /** NetSuite Financial account (bank account, debit card, etc) */
@@ -621,7 +621,7 @@ type NetSuiteAccount = {
     /** Name of the account */
     name: string;
 
-    /** ID assigned to the financial account */
+    /** ID assigned to the financial account in NetSuite */
     id: string;
 
     /** Type of the financial account */
@@ -633,7 +633,7 @@ type NetSuiteTaxAccount = {
     /** Name of the tax account */
     name: string;
 
-    /** ID assigned to the tax account */
+    /** ID assigned to the tax account in NetSuite*/
     externalID: string;
 
     /** Country of the tax account */
@@ -642,7 +642,7 @@ type NetSuiteTaxAccount = {
 
 /** NetSuite Vendor Model */
 type NetSuiteVendor = {
-    /** ID of the vendor */
+    /** ID of the vendor in NetSuite*/
     id: string;
 
     /** Name of the vendor */
@@ -654,7 +654,7 @@ type NetSuiteVendor = {
 
 /** NetSuite Invoice Item Model */
 type InvoiceItem = {
-    /** ID of the invoice item */
+    /** ID of the invoice item in NetSuite */
     id: string;
 
     /** Name of the invoice item */
@@ -686,30 +686,30 @@ type NetSuiteConnectionData = {
 type NetSuiteMappingValues = 'NETSUITE_DEFAULT' | 'REPORT_FIELD' | 'TAG';
 
 /** NetSuite invoice item preference values */
-type InvoiceItemPreferenceValues = 'create' | 'select';
+type NetSuiteInvoiceItemPreferenceValues = 'create' | 'select';
 
 /** NetSuite export destination values */
-type ExpensesExportDestinationValues = 'EXPENSE_REPORT' | 'VENDOR_BILL' | 'JOURNAL_ENTRY';
+type NetSuiteExportDestinationValues = 'EXPENSE_REPORT' | 'VENDOR_BILL' | 'JOURNAL_ENTRY';
 
 /** NetSuite expense report approval level values */
-type ExpenseReportsApprovalLevelValues = 'REPORTS_APPROVED_NONE' | 'REPORTS_SUPERVISOR_APPROVED' | 'REPORTS_ACCOUNTING_APPROVED' | 'REPORTS_APPROVED_BOTH';
+type NetSuiteExpenseReportApprovalLevels = 'REPORTS_APPROVED_NONE' | 'REPORTS_SUPERVISOR_APPROVED' | 'REPORTS_ACCOUNTING_APPROVED' | 'REPORTS_APPROVED_BOTH';
 
 /** NetSuite vendor bills approval level values */
-type VendorBillsApprovalLevelValues = 'VENDOR_BILLS_APPROVED_NONE' | 'VENDOR_BILLS_APPROVAL_PENDING' | 'VENDOR_BILLS_APPROVED';
+type NetSuiteVendorBillApprovalLevels = 'VENDOR_BILLS_APPROVED_NONE' | 'VENDOR_BILLS_APPROVAL_PENDING' | 'VENDOR_BILLS_APPROVED';
 
 /** NetSuite journal approval level values */
-type JournalsApprovalLevelValues = 'JOURNALS_APPROVED_NONE' | 'JOURNALS_APPROVAL_PENDING' | 'JOURNALS_APPROVED';
+type NetSuiteJournalApprovalLevels = 'JOURNALS_APPROVED_NONE' | 'JOURNALS_APPROVAL_PENDING' | 'JOURNALS_APPROVED';
 
 /** NetSuite export date values */
-type ExportDateValues = 'SUBMITTED' | 'EXPORTED' | 'LAST_EXPENSE';
+type NetSuiteExportDateOptions = 'SUBMITTED' | 'EXPORTED' | 'LAST_EXPENSE';
 
 /** NetSuite journal posting preference values */
-type JournalPostingPreferenceValues = 'JOURNALS_POSTING_TOTAL_LINE' | 'JOURNALS_POSTING_INDIVIDUAL_LINE';
+type NetSuiteJournalPostingPreferences = 'JOURNALS_POSTING_TOTAL_LINE' | 'JOURNALS_POSTING_INDIVIDUAL_LINE';
 
 /** User configuration for the NetSuite accounting integration. */
 type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Invoice Item Preference */
-    invoiceItemPreference: InvoiceItemPreferenceValues;
+    invoiceItemPreference: NetSuiteInvoiceItemPreferenceValues;
 
     /** ID of the bank account for NetSuite invoice collections */
     receivableAccount: string;
@@ -717,175 +717,175 @@ type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** ID of the bank account for NetSuite tax posting */
     taxPostingAccount: string;
 
-    /**  */
+    /** Whether we should export to the most recent open period if the current one is closed  */
     exportToNextOpenPeriod: boolean;
 
-    /** */
+    /** Whether we will include the original foreign amount of a transaction to NetSuite */
     allowForeignCurrency: boolean;
 
     /** Where to export reimbursable expenses */
-    reimbursableExpensesExportDestination: ExpensesExportDestinationValues;
+    reimbursableExpensesExportDestination: NetSuiteExportDestinationValues;
 
-    /** */
+    /** The sub-entity within the NetSuite account for which this policy is connected */
     subsidiary: string;
 
-    /** */
+    /** Configuration options pertaining to sync. This subset of configurations is a legacy object. New configurations should just go directly under the config */
     syncOptions: {
-        /** */
+        /** Different NetSuite records that can be mapped to either Report Fields or Tags in Expensify */
         mapping: {
-            /** */
+            /** A general type of classification category in NetSuite */
             classes: NetSuiteMappingValues;
 
-            /** */
+            /** A type of classification category in NetSuite linked to projects */
             jobs: NetSuiteMappingValues;
 
-            /** */
+            /** A type of classification category in NetSuite linked to locations */
             locations: NetSuiteMappingValues;
 
-            /** */
+            /** A type of classification category in NetSuite linked to customers */
             customers: NetSuiteMappingValues;
 
-            /** */
+            /** A type of classification category in NetSuite linked to departments within the company */
             departments: NetSuiteMappingValues;
         };
 
-        /** */
+        /** Whether we want to import customers into NetSuite from across all subsidiaries */
         crossSubsidiaryCustomers: boolean;
 
-        /** */
+        /** Whether we'll import employee supervisors and set them as managers in the Expensify approval workflow */
         syncApprovalWorkflow: boolean;
 
-        /** */
+        /** Whether we import custom lists from NetSuite */
         syncCustomLists: boolean;
 
-        /** Tells the expense reports approval level */
-        exportReportsTo: ExpenseReportsApprovalLevelValues;
+        /** The approval level we set for an Expense Report record created in NetSuite */
+        exportReportsTo: NetSuiteExpenseReportApprovalLevels;
 
-        /** Tells the vendor bills approval level */
-        exportVendorBillsTo: VendorBillsApprovalLevelValues;
+        /** The approval level we set for a Vendor Bill record created in NetSuite */
+        exportVendorBillsTo: NetSuiteVendorBillApprovalLevels;
 
-        /** */
+        /** Whether or not we need to set the final approver in this policy via sync */
         setFinalApprover: boolean;
 
-        /** */
+        /** Whether we sync report reimbursement status between Expensify and NetSuite */
         syncReimbursedReports: boolean;
 
-        /** */
+        /** The relevant details of the custom segments we import into Expensify and code onto expenses */
         customSegments: Array<{
-            /** */
+            /** The name of the custom segment */
             segmentName: string;
 
-            /** */
+            /** The ID of the custom segment in NetSuite */
             internalID: string;
 
-            /** */
+            /** The ID of the transaction form field we'll code this segment onto during Export */
             scriptID: string;
 
-            /** */
+            /** Whether we import this segment as a report field or tag */
             mapping: 'tag' | 'reportField';
         }>;
 
-        /** */
+        /** Whether to import Employees from NetSuite into Expensify */
         syncPeople: boolean;
 
-        /** */
+        /** Whether to enable a new Expense Category into Expensify */
         enableNewCategories: boolean;
 
-        /** */
+        /** A now unused configuration saying whether a customer had toggled AutoSync yet. */
         hasChosenAutoSyncOption: boolean;
 
-        /** */
+        /** The final approver to be set in the Expensify approval workflow */
         finalApprover: string;
 
-        /** */
+        /** Whether to import tax groups from NetSuite */
         syncTax: boolean;
 
-        /** */
+        /** Whether to import custom segments from NetSuite */
         syncCustomSegments: boolean;
 
-        /** */
+        /** The relevant details of the custom lists we import into Expensify and code onto expenses */
         customLists: Array<{
-            /** */
+            /** The name of the custom list in NetSuite */
             listName: string;
 
-            /** */
+            /** The internalID of the custom list in NetSuite */
             internalID: string;
 
-            /** */
+            /** The ID of the transaction form field we'll code the list option onto during Export */
             transactionFieldID: string;
 
-            /** */
+            /** Whether we import this list as a report field or tag */
             mapping: 'tag' | 'reportField';
         }>;
 
-        /** */
+        /** Whether we'll import Expense Categories into Expensify as categories */
         syncCategories: boolean;
 
-        /** */
+        /** A now unused configuration saying whether a customer had toggled syncing reimbursement yet. */
         hasChosenSyncReimbursedReportsOption: boolean;
 
-        /** */
-        exportJournalsTo: JournalsApprovalLevelValues;
+        /** The approval level we set for a Journal Entry record created in NetSuite */
+        exportJournalsTo: NetSuiteJournalApprovalLevels;
     };
 
-    /** */
+    /** Whther to automatically create employees and vendors upon export in NetSuite if they don't exist */
     autoCreateEntities: boolean;
 
-    /** */
+    /** The account to run auto export */
     exporter: string;
 
-    /** */
-    exportDate: ExportDateValues;
+    /** The transaction date to set upon export */
+    exportDate: NetSuiteExportDateOptions;
 
-    /** */
-    nonreimbursableExpensesExportDestination: ExpensesExportDestinationValues;
+    /** The type of transaction in NetSuite we export non-reimbursable transactions to */
+    nonreimbursableExpensesExportDestination: NetSuiteExportDestinationValues;
 
-    /** */
+    /** Credit account for reimbursable transactions */
     reimbursablePayableAccount: string;
 
-    /** */
-    journalPostingPreference: JournalPostingPreferenceValues;
+    /** Whether we post Journals as individual separate entries or a single unified entry */
+    journalPostingPreference: NetSuiteJournalPostingPreferences;
 
-    /** */
+    /** The Item record to associate with lines on an invoice created via Expensify */
     invoiceItem: string;
 
-    /** */
+    /** The internaID of the selected subsidiary in NetSuite */
     subsidiaryID: string;
 
-    /** */
+    /** The default vendor to use for Transactions in NetSuite */
     defaultVendor: string;
 
-    /** */
+    /** The provincial tax account for tax line items in NetSuite (only for Canadian Subsidiaries) */
     provincialTaxPostingAccount: string;
 
-    /** */
+    /** The account used for reimbursement in NetSuite */
     reimbursementAccountID: string;
 
-    /** */
+    /** The account used for approvals in NetSuite */
     approvalAccount: string;
 
-    /** */
+    /** Credit account for Non-reimbursables (not applicable to expense report entry) */
     payableAcct: string;
 
-    /** */
+    /** Configurations for customer to set custom forms for which reimbursable and non-reimbursable transactions will export to in NetSuite */
     customFormIDOptions: {
-        /** */
+        /** The custom form selections for reimbursable transactions */
         reimbursable: {
             /** */
             expenseReport: string;
         };
 
-        /** */
+        /** The custom form selections for non-reimbursable transactions */
         nonReimbursable: {
             /** */
             vendorBill: string;
         };
 
-        /** */
+        /** Whether we'll use the custom form selections upon export to NetSuite */
         enabled: boolean;
     };
 
-    /** */
+    /** The account to use for Invoices export to NetSuite */
     collectionAccount: string;
 }>;
 
@@ -894,10 +894,10 @@ type NetSuiteConnection = {
     /** Account ID of the NetSuite Integration */
     accountID: string;
 
-    /** */
+    /** Encrypted tokenID for authenticating to NetSuite */
     tokenID: string;
 
-    /** */
+    /** Config and Data for the NetSuite connection */
     options: {
         /** Data imported from NetSuite */
         data: NetSuiteConnectionData;
@@ -906,7 +906,7 @@ type NetSuiteConnection = {
         config: NetSuiteConnectionConfig;
     };
 
-    /** */
+    /** Whether the sync connection has been successful */
     verified: boolean;
 
     /** Date when the connection's last successful sync occurred */
@@ -916,21 +916,21 @@ type NetSuiteConnection = {
     lastErrorSyncDate: string;
 
     /** Where did the connection's last sync came from */
-    source: ConnectionSourceValues;
+    source: JobSourceValues;
 
-    /** */
+    /** Config object used solely to store autosync settings */
     config: {
         /** NetSuite auto synchronization configs */
         autoSync: {
             /** Whether data should be automatically synched between the app and Xero */
             enabled: boolean;
 
-            /** */
+            /** The bedrock job associated with the NetSuite Auto Sync job */
             jobID: string;
         };
     };
 
-    /** */
+    /** Encrypted token secret for authenticating to NetSuite */
     tokenSecret: string;
 };
 

From 13020d9606a8ad551dfb169510fa0592b69305c3 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:38:15 +0530
Subject: [PATCH 48/77] Apply suggestions from code review

---
 src/types/onyx/Policy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 3e8e7b16d59a..cb5a32591b3a 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -922,7 +922,7 @@ type NetSuiteConnection = {
     config: {
         /** NetSuite auto synchronization configs */
         autoSync: {
-            /** Whether data should be automatically synched between the app and Xero */
+            /** Whether data should be automatically synched between the app and NetSuite */
             enabled: boolean;
 
             /** The bedrock job associated with the NetSuite Auto Sync job */

From 2d4bf0e152210ed2416169049a8a6ab56afca383 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 19 Jun 2024 16:49:16 +0530
Subject: [PATCH 49/77] Fix lint

---
 src/types/onyx/Policy.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index cb5a32591b3a..8329116ed2b2 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -609,7 +609,7 @@ type Subsidiary = {
     name: string;
 };
 
-/** NetSuite bank account type values imported by Expensify*/
+/** NetSuite bank account type values imported by Expensify */
 type AccountTypeValues = '_accountsPayable' | '_otherCurrentLiability' | '_creditCard' | '_bank' | '_otherCurrentAsset' | '_longTermLiability' | '_accountsReceivable' | '_expense';
 
 /** NetSuite Financial account (bank account, debit card, etc) */
@@ -633,7 +633,7 @@ type NetSuiteTaxAccount = {
     /** Name of the tax account */
     name: string;
 
-    /** ID assigned to the tax account in NetSuite*/
+    /** ID assigned to the tax account in NetSuite */
     externalID: string;
 
     /** Country of the tax account */
@@ -642,7 +642,7 @@ type NetSuiteTaxAccount = {
 
 /** NetSuite Vendor Model */
 type NetSuiteVendor = {
-    /** ID of the vendor in NetSuite*/
+    /** ID of the vendor in NetSuite */
     id: string;
 
     /** Name of the vendor */

From 916d0c940edd0fe158c983612654d8ae9d1a1762 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 19 Jun 2024 17:00:26 +0530
Subject: [PATCH 50/77] Fix customFormIDOptions type

---
 src/types/onyx/Policy.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 8329116ed2b2..7af821b08666 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -1,4 +1,4 @@
-import type {ValueOf} from 'type-fest';
+import type {RequireExactlyOne, ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
 import type * as OnyxTypes from '.';
@@ -706,6 +706,18 @@ type NetSuiteExportDateOptions = 'SUBMITTED' | 'EXPORTED' | 'LAST_EXPENSE';
 /** NetSuite journal posting preference values */
 type NetSuiteJournalPostingPreferences = 'JOURNALS_POSTING_TOTAL_LINE' | 'JOURNALS_POSTING_INDIVIDUAL_LINE';
 
+/** The custom form selection options for transactions (any one will be used at most) */
+type NetSuiteCustomFormIDOptions = {
+    /** If the option is expense report */
+    expenseReport: string;
+
+    /** If the option is vendor bill */
+    vendorBill: string;
+
+    /** If the option is journal entry */
+    journalEntry: string;
+};
+
 /** User configuration for the NetSuite accounting integration. */
 type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Invoice Item Preference */
@@ -870,16 +882,10 @@ type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Configurations for customer to set custom forms for which reimbursable and non-reimbursable transactions will export to in NetSuite */
     customFormIDOptions: {
         /** The custom form selections for reimbursable transactions */
-        reimbursable: {
-            /** */
-            expenseReport: string;
-        };
+        reimbursable: RequireExactlyOne<NetSuiteCustomFormIDOptions, 'expenseReport' | 'journalEntry' | 'vendorBill'>;
 
         /** The custom form selections for non-reimbursable transactions */
-        nonReimbursable: {
-            /** */
-            vendorBill: string;
-        };
+        nonReimbursable: RequireExactlyOne<NetSuiteCustomFormIDOptions, 'expenseReport' | 'journalEntry' | 'vendorBill'>;
 
         /** Whether we'll use the custom form selections upon export to NetSuite */
         enabled: boolean;

From 55973ecf7eb11d129c983031fb820fa068606610 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Wed, 19 Jun 2024 14:50:22 +0300
Subject: [PATCH 51/77] fix: comment linking e2e test

---
 .../BaseInvertedFlatList/index.e2e.tsx        |  8 +--
 src/libs/E2E/tests/linkingTest.e2e.ts         | 53 +++++++++++--------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx b/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
index 5df39ec02c89..4481b22f17b5 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
@@ -1,6 +1,6 @@
 import React, {forwardRef, useMemo} from 'react';
 import type {FlatListProps, ScrollViewProps, ViewToken} from 'react-native';
-import {FlatList} from 'react-native';
+import {DeviceEventEmitter, FlatList} from 'react-native';
 import type {ReportAction} from '@src/types/onyx';
 
 type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
@@ -9,16 +9,13 @@ type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
 
 const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
 
-let localViewableItems: ViewToken[];
-const getViewableItems = () => localViewableItems;
-
 function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.ForwardedRef<FlatList<ReportAction>>) {
     const {shouldEnableAutoScrollToTopThreshold, ...rest} = props;
 
     const handleViewableItemsChanged = useMemo(
         () =>
             ({viewableItems}: {viewableItems: ViewToken[]}) => {
-                localViewableItems = viewableItems;
+                DeviceEventEmitter.emit('onViewableItemsChanged', viewableItems);
             },
         [],
     );
@@ -51,4 +48,3 @@ function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.Fo
 BaseInvertedFlatListE2e.displayName = 'BaseInvertedFlatListE2e';
 
 export default forwardRef(BaseInvertedFlatListE2e);
-export {getViewableItems};
diff --git a/src/libs/E2E/tests/linkingTest.e2e.ts b/src/libs/E2E/tests/linkingTest.e2e.ts
index c48ffb5a8057..59c5ac38c9e5 100644
--- a/src/libs/E2E/tests/linkingTest.e2e.ts
+++ b/src/libs/E2E/tests/linkingTest.e2e.ts
@@ -1,11 +1,12 @@
+import {DeviceEventEmitter} from 'react-native';
 import type {NativeConfig} from 'react-native-config';
 import Config from 'react-native-config';
-import {getViewableItems} from '@components/InvertedFlatList/BaseInvertedFlatList/index.e2e';
 import Timing from '@libs/actions/Timing';
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
 import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded';
 import E2EClient from '@libs/E2E/client';
 import getConfigValueOrThrow from '@libs/E2E/utils/getConfigValueOrThrow';
+import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import CONST from '@src/CONST';
@@ -23,6 +24,29 @@ const test = (config: NativeConfig) => {
             return waitForAppLoaded().then(() => E2EClient.submitTestDone());
         }
 
+        const [appearMessagePromise, appearMessageResolve] = getPromiseWithResolve();
+        const [switchReportPromise, switchReportResolve] = getPromiseWithResolve();
+
+        Promise.all([appearMessagePromise, switchReportPromise])
+            .then(() => {
+                console.debug('[E2E] Test completed successfully, exiting…');
+                E2EClient.submitTestDone();
+            })
+            .catch((err) => {
+                console.debug('[E2E] Error while submitting test results:', err);
+            });
+
+        const subscription = DeviceEventEmitter.addListener('onViewableItemsChanged', (res) => {
+            console.debug('[E2E] Viewable items retrieved, verifying correct message…', res);
+
+            if (!!res && res[0]?.item?.reportActionID === linkedReportActionID) {
+                appearMessageResolve();
+                subscription.remove();
+            } else {
+                console.debug('[E2E] Message verification failed');
+            }
+        });
+
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
                 console.debug('[E2E] Sidebar loaded, navigating to a report…');
@@ -41,27 +65,14 @@ const test = (config: NativeConfig) => {
 
             if (entry.name === CONST.TIMING.SWITCH_REPORT) {
                 console.debug('[E2E] Linking: 1');
-                setTimeout(() => {
-                    const res = getViewableItems();
-                    console.debug('[E2E] Viewable items retrieved, verifying correct message…');
 
-                    if (!!res && res[0]?.item?.reportActionID === linkedReportActionID) {
-                        E2EClient.submitTestResults({
-                            branch: Config.E2E_BRANCH,
-                            name: 'Comment linking',
-                            duration: entry.duration,
-                        })
-                            .then(() => {
-                                console.debug('[E2E] Test completed successfully, exiting…');
-                                E2EClient.submitTestDone();
-                            })
-                            .catch((err) => {
-                                console.debug('[E2E] Error while submitting test results:', err);
-                            });
-                    } else {
-                        console.debug('[E2E] Message verification failed');
-                    }
-                }, 3000);
+                E2EClient.submitTestResults({
+                    branch: Config.E2E_BRANCH,
+                    name: 'Comment linking',
+                    duration: entry.duration,
+                });
+
+                switchReportResolve();
             }
         });
     });

From 6ed05f6fa188fe6382c078aac68e1c15c63d1bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Wed, 19 Jun 2024 15:47:27 +0200
Subject: [PATCH 52/77] apply patch for fixing whitespace support in sourcemap
 path on iOS

The patch is part of react-native 0.75 in this commit: https://github.com/facebook/react-native/commit/e25a9b4c5d0e4c32dbc1eca071911e34faa177ce
---
 ...iOS-fix-whitespace-support-sourcemap.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 patches/react-native+0.73.4+017+iOS-fix-whitespace-support-sourcemap.patch

diff --git a/patches/react-native+0.73.4+017+iOS-fix-whitespace-support-sourcemap.patch b/patches/react-native+0.73.4+017+iOS-fix-whitespace-support-sourcemap.patch
new file mode 100644
index 000000000000..e8ca87026282
--- /dev/null
+++ b/patches/react-native+0.73.4+017+iOS-fix-whitespace-support-sourcemap.patch
@@ -0,0 +1,37 @@
+diff --git a/node_modules/react-native/scripts/react-native-xcode.sh b/node_modules/react-native/scripts/react-native-xcode.sh
+index d6c382b..3e1742c 100755
+--- a/node_modules/react-native/scripts/react-native-xcode.sh
++++ b/node_modules/react-native/scripts/react-native-xcode.sh
+@@ -104,7 +104,7 @@ fi
+ 
+ BUNDLE_FILE="$CONFIGURATION_BUILD_DIR/main.jsbundle"
+ 
+-EXTRA_ARGS=
++EXTRA_ARGS=()
+ 
+ case "$PLATFORM_NAME" in
+   "macosx")
+@@ -131,12 +131,12 @@ if [[ $EMIT_SOURCEMAP == true ]]; then
+   else
+     PACKAGER_SOURCEMAP_FILE="$SOURCEMAP_FILE"
+   fi
+-  EXTRA_ARGS="$EXTRA_ARGS --sourcemap-output $PACKAGER_SOURCEMAP_FILE"
++  EXTRA_ARGS+=("--sourcemap-output" "$PACKAGER_SOURCEMAP_FILE")
+ fi
+ 
+ # Hermes doesn't require JS minification.
+ if [[ $USE_HERMES != false && $DEV == false ]]; then
+-  EXTRA_ARGS="$EXTRA_ARGS --minify false"
++  EXTRA_ARGS+=("--minify" "false")
+ fi
+ 
+ "$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
+@@ -147,7 +147,7 @@ fi
+   --reset-cache \
+   --bundle-output "$BUNDLE_FILE" \
+   --assets-dest "$DEST" \
+-  $EXTRA_ARGS \
++  "${EXTRA_ARGS[@]}" \
+   $EXTRA_PACKAGER_ARGS
+ 
+ if [[ $USE_HERMES == false ]]; then

From c2ff42f4a8006550b3ce5a63204a4a0a97e55dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Wed, 19 Jun 2024 16:31:21 +0200
Subject: [PATCH 53/77] uploaded sourcemap names contain app version

---
 .github/workflows/platformDeploy.yml                  | 4 ++--
 workflow_tests/assertions/platformDeployAssertions.ts | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 20bf0d257a9b..91203a65b5ce 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -96,7 +96,7 @@ jobs:
       - name: Archive Android sourcemaps
         uses: actions/upload-artifact@v3
         with:
-          name: android-sourcemap
+          name: android-sourcemap-${{ github.ref_name }}
           path: android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
 
       - name: Upload Android version to GitHub artifacts
@@ -248,7 +248,7 @@ jobs:
       - name: Archive iOS sourcemaps
         uses: actions/upload-artifact@v3
         with:
-          name: ios-sourcemap
+          name: ios-sourcemap-${{ github.ref_name }}
           path: main.jsbundle.map
 
       - name: Upload iOS version to GitHub artifacts
diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
index 03fdcc86ee94..0df3e46d9b81 100644
--- a/workflow_tests/assertions/platformDeployAssertions.ts
+++ b/workflow_tests/assertions/platformDeployAssertions.ts
@@ -63,7 +63,8 @@ function assertAndroidJobExecuted(workflowResult: Step[], didExecute = true, isP
     }
     steps.push(
         createStepAssertion('Archive Android sourcemaps', true, null, 'ANDROID', 'Archiving Android sourcemaps', [
-            {key: 'name', value: 'android-sourcemap'},
+            // Note 1.2.3 comes from the ref name that we are on, which is the version we are deploying
+            {key: 'name', value: 'android-sourcemap-1.2.3'},
             {key: 'path', value: 'android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map'},
         ]),
     );
@@ -187,7 +188,8 @@ function assertIOSJobExecuted(workflowResult: Step[], didExecute = true, isProdu
     }
     steps.push(
         createStepAssertion('Archive iOS sourcemaps', true, null, 'IOS', 'Archiving sourcemaps', [
-            {key: 'name', value: 'ios-sourcemap'},
+            // Note 1.2.3 comes from the ref name that we are on, which is the version we are deploying
+            {key: 'name', value: 'ios-sourcemap-1.2.3'},
             {key: 'path', value: 'main.jsbundle.map'},
         ]),
     );

From 5781eee2ac04d00db383571d84f8ce3e01418aeb Mon Sep 17 00:00:00 2001
From: Daniel Silva <danieldoglas@users.noreply.github.com>
Date: Wed, 19 Jun 2024 17:01:16 +0200
Subject: [PATCH 54/77] Revert "Revert "Fullstory plugin update. Annotation
 plugin fix.""

---
 android/build.gradle |  2 +-
 babel.config.js      | 10 +++++++---
 ios/Podfile          |  2 +-
 ios/Podfile.lock     | 12 ++++++------
 package-lock.json    |  4 ++--
 package.json         |  1 +
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 52c998998ba0..9fc585ab9f05 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -29,7 +29,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.47.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.49.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/babel.config.js b/babel.config.js
index 060bc0313950..8eb0d102db01 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -10,8 +10,13 @@ const defaultPlugins = [
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 
-    // This will serve to map the classes correctly in FullStory
-    '@fullstory/babel-plugin-annotate-react',
+    [
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            'react-native-web': true,
+            native: true,
+        },
+    ],
 
     // We use `transform-class-properties` for transforming ReactNative libraries and do not use it for our own
     // source code transformation as we do not use class property assignment.
@@ -45,7 +50,6 @@ const metro = {
             '@fullstory/babel-plugin-annotate-react',
             {
                 native: true,
-                setFSTagName: true,
             },
         ],
 
diff --git a/ios/Podfile b/ios/Podfile
index d72086d4c07b..6330bb3d8d52 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -118,4 +118,4 @@ target 'NotificationServiceExtension' do
   pod 'AirshipServiceExtension'
 end
 
-pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz'
\ No newline at end of file
+pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz'
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1e1626e5d73e..077003ed5285 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -138,7 +138,7 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
   - fmt (6.2.1)
-  - FullStory (1.48.0)
+  - FullStory (1.49.0)
   - fullstory_react-native (1.4.2):
     - FullStory (~> 1.14)
     - glog
@@ -2117,7 +2117,7 @@ DEPENDENCIES:
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz\"}`)"
+  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz\"}`)"
   - "fullstory_react-native (from `../node_modules/@fullstory/react-native`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
@@ -2283,7 +2283,7 @@ EXTERNAL SOURCES:
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
   fullstory_react-native:
     :path: "../node_modules/@fullstory/react-native"
   glog:
@@ -2480,7 +2480,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
 
 SPEC CHECKSUMS:
   Airship: 5a6d3f8a982398940b0d48423bb9b8736717c123
@@ -2507,7 +2507,7 @@ SPEC CHECKSUMS:
   FirebasePerformance: 0c01a7a496657d7cea86d40c0b1725259d164c6c
   FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  FullStory: 097347c823c21c655ca25fd8d5e6355a9326ec54
+  FullStory: c95f74445f871bc344cdc4a4e4ece61b5554e55d
   fullstory_react-native: 6cba8a2c054374a24a44dc4310407d9435459cae
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
@@ -2631,6 +2631,6 @@ SPEC CHECKSUMS:
   VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
   Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
 
-PODFILE CHECKSUM: 66a5c97ae1059e4da1993a4ad95abe5d819f555b
+PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14
 
 COCOAPODS: 1.13.0
diff --git a/package-lock.json b/package-lock.json
index 256780e74aad..c7d6ca9f233a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "@formatjs/intl-locale": "^3.3.0",
         "@formatjs/intl-numberformat": "^8.5.0",
         "@formatjs/intl-pluralrules": "^5.2.2",
+        "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
         "@fullstory/babel-plugin-react-native": "^1.2.1",
         "@fullstory/browser": "^2.0.3",
         "@fullstory/react-native": "^1.4.2",
@@ -5588,8 +5589,7 @@
     },
     "node_modules/@fullstory/babel-plugin-annotate-react": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@fullstory/babel-plugin-annotate-react/-/babel-plugin-annotate-react-2.3.0.tgz",
-      "integrity": "sha512-gYLUL6Tu0exbvTIhK9nSCaztmqBlQAm07Fvtl/nKTc+lxwFkcX9vR8RrdTbyjJZKbPaA5EMlExQ6GeLCXkfm5g=="
+      "resolved": "git+ssh://git@github.com/fullstorydev/fullstory-babel-plugin-annotate-react.git#25c26dadb644d5355e381a4ea4ca1cd05af4a8f6"
     },
     "node_modules/@fullstory/babel-plugin-react-native": {
       "version": "1.2.1",
diff --git a/package.json b/package.json
index 8f3b4d938168..9ae32784baf5 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "@formatjs/intl-locale": "^3.3.0",
     "@formatjs/intl-numberformat": "^8.5.0",
     "@formatjs/intl-pluralrules": "^5.2.2",
+    "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
     "@fullstory/babel-plugin-react-native": "^1.2.1",
     "@fullstory/browser": "^2.0.3",
     "@fullstory/react-native": "^1.4.2",

From de89bbd7d66227515acf8c672c6ff72321c053a0 Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Wed, 19 Jun 2024 17:10:18 +0200
Subject: [PATCH 55/77] allow fullstory on staging

---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index ccdd4edb4355..84b19c4e56f8 100644
--- a/web/index.html
+++ b/web/index.html
@@ -130,7 +130,7 @@
     <link rel="manifest" href="/manifest.json" />
 </head>
 <body>
-    <% if (htmlWebpackPlugin.options.isWeb && htmlWebpackPlugin.options.isProduction) { %>
+    <% if (htmlWebpackPlugin.options.isWeb && (htmlWebpackPlugin.options.isProduction || htmlWebpackPlugin.options.isStaging)) { %>
         <!-- Google Tag Manager (noscript) -->
         <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N4M3FLJZ" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         <!-- End Google Tag Manager (noscript) -->

From ccece4940651927b47da9838a0428a672c462ac2 Mon Sep 17 00:00:00 2001
From: kirillzyusko <kiryl@margelo.io>
Date: Wed, 19 Jun 2024 18:31:35 +0300
Subject: [PATCH 56/77] fix: changes after review

---
 src/libs/E2E/tests/linkingTest.e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/E2E/tests/linkingTest.e2e.ts b/src/libs/E2E/tests/linkingTest.e2e.ts
index 59c5ac38c9e5..62a4581a5036 100644
--- a/src/libs/E2E/tests/linkingTest.e2e.ts
+++ b/src/libs/E2E/tests/linkingTest.e2e.ts
@@ -43,7 +43,7 @@ const test = (config: NativeConfig) => {
                 appearMessageResolve();
                 subscription.remove();
             } else {
-                console.debug('[E2E] Message verification failed');
+                console.debug(`[E2E] Provided message id '${res?.[0]?.item?.reportActionID}' doesn't match to an expected '${linkedReportActionID}'. Waiting for a next one…`);
             }
         });
 

From 54199d4a34e08acd9ef3efcdf70e6b23ade3e69e Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Wed, 19 Jun 2024 18:38:23 +0300
Subject: [PATCH 57/77] Update Gemfile

Co-authored-by: Andrew Gable <andrew@expensify.com>
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6cf346b06332..a33bc958ed0d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby ">= 2.6.10"
 
 gem "cocoapods", "~> 1.14", ">= 1.14.0"
 gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
-gem "fastlane", "~> 2", ">= 2.220.0"
+gem "fastlane", "~> 2"
 gem "xcpretty", "~> 0"
 
 

From d7b6633e1c71deb23ee6a3d375754f7585e394fa Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Wed, 19 Jun 2024 18:48:23 +0300
Subject: [PATCH 58/77] Update Fastlane and Cocoapods

---
 Gemfile      |   2 +-
 Gemfile.lock | 102 ++++++++++++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/Gemfile b/Gemfile
index a33bc958ed0d..9433f7de3370 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem "cocoapods", "~> 1.14", ">= 1.14.0"
+gem "cocoapods", "~> 1.14"
 gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
 gem "fastlane", "~> 2"
 gem "xcpretty", "~> 0"
diff --git a/Gemfile.lock b/Gemfile.lock
index e1b4fc2ec7e4..bcca22c31512 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7.7)
+    activesupport (7.0.8.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
@@ -16,32 +17,33 @@ GEM
       json (>= 1.5.1)
     apktools (0.7.4)
       rubyzip (~> 2.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.883.0)
-    aws-sdk-core (3.190.3)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.76.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.85.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.13.0)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.13.0)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -54,7 +56,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.13.0)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -65,7 +67,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -77,18 +79,17 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.109.0)
+    excon (0.110.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -117,15 +118,15 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.3.0)
-    fastlane (2.219.0)
+    fastimage (2.3.1)
+    fastlane (2.221.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -146,10 +147,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (>= 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -158,12 +159,15 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-aws_s3 (2.1.0)
       apktools (~> 0.7)
       aws-sdk-s3 (~> 1)
       mime-types (~> 3.3)
-    ffi (1.16.3)
+    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -183,17 +187,17 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.37.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -204,44 +208,47 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.1)
-    jwt (2.7.1)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1003)
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.24.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    optparse (0.4.0)
+    nkf (0.2.0)
+    optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (4.0.7)
-    rake (13.1.0)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -249,6 +256,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -262,12 +270,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -278,7 +283,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-21
@@ -289,7 +293,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (~> 1.13)
+  cocoapods (~> 1.14)
   fastlane (~> 2)
   fastlane-plugin-aws_s3
   xcpretty (~> 0)
@@ -298,4 +302,4 @@ RUBY VERSION
    ruby 2.6.10p210
 
 BUNDLED WITH
-   2.3.22
+   2.4.14

From 0df70df7790da4f57daf1fe9f7b50ebebdae3d89 Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Wed, 19 Jun 2024 18:11:46 +0200
Subject: [PATCH 59/77] adding plugin only if we're not executing desktop

---
 babel.config.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 8eb0d102db01..36ff3a0e858a 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -3,21 +3,13 @@ require('dotenv').config();
 const IS_E2E_TESTING = process.env.E2E_TESTING === 'true';
 
 const defaultPresets = ['@babel/preset-react', '@babel/preset-env', '@babel/preset-flow', '@babel/preset-typescript'];
-const defaultPlugins = [
+let defaultPlugins = [
     // Adding the commonjs: true option to react-native-web plugin can cause styling conflicts
     ['react-native-web'],
 
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 
-    [
-        '@fullstory/babel-plugin-annotate-react',
-        {
-            'react-native-web': true,
-            native: true,
-        },
-    ],
-
     // We use `transform-class-properties` for transforming ReactNative libraries and do not use it for our own
     // source code transformation as we do not use class property assignment.
     'transform-class-properties',
@@ -26,6 +18,16 @@ const defaultPlugins = [
     'react-native-reanimated/plugin',
 ];
 
+if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
+    defaultPlugins.push([
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            'react-native-web': true,
+            native: true,
+        },
+    ]);
+}
+
 const webpack = {
     presets: defaultPresets,
     plugins: defaultPlugins,
@@ -128,6 +130,7 @@ module.exports = (api) => {
     console.debug('  - api.env:', api.env());
     console.debug('  - process.env.NODE_ENV:', process.env.NODE_ENV);
     console.debug('  - process.env.BABEL_ENV:', process.env.BABEL_ENV);
+    console.debug(' - electronenv', JSON.stringify(process.env));
 
     // For `react-native` (iOS/Android) caller will be "metro"
     // For `webpack` (Web) caller will be "@babel-loader"

From c8a04a06e52988e10683d88e42dc31f5ed1e818a Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Wed, 19 Jun 2024 18:12:43 +0200
Subject: [PATCH 60/77] adding comment

---
 babel.config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/babel.config.js b/babel.config.js
index 36ff3a0e858a..bd387d84e178 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -18,6 +18,8 @@ let defaultPlugins = [
     'react-native-reanimated/plugin',
 ];
 
+// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's 
+// ignore it for desktop builds.
 if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
     defaultPlugins.push([
         '@fullstory/babel-plugin-annotate-react',

From 36ef88f4148feffe15f3dc72283655560ae00ae6 Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Wed, 19 Jun 2024 18:14:00 +0200
Subject: [PATCH 61/77] prettier

---
 babel.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel.config.js b/babel.config.js
index bd387d84e178..e9fa32cd1fe9 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -18,7 +18,7 @@ let defaultPlugins = [
     'react-native-reanimated/plugin',
 ];
 
-// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's 
+// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's
 // ignore it for desktop builds.
 if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
     defaultPlugins.push([

From 9d2aad4decfc64a441de5fb202460eb462f64ebf Mon Sep 17 00:00:00 2001
From: Daniel Silva <dsilva@expensify.com>
Date: Wed, 19 Jun 2024 18:17:21 +0200
Subject: [PATCH 62/77] adding comment

---
 babel.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel.config.js b/babel.config.js
index e9fa32cd1fe9..e04e589166f4 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -21,6 +21,7 @@ let defaultPlugins = [
 // The Fullstory annotate plugin generated a few errors when executed in Electron. Let's
 // ignore it for desktop builds.
 if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
+    console.debug('This is not a desktop build, adding babel-plugin-annotate-react');
     defaultPlugins.push([
         '@fullstory/babel-plugin-annotate-react',
         {
@@ -132,7 +133,6 @@ module.exports = (api) => {
     console.debug('  - api.env:', api.env());
     console.debug('  - process.env.NODE_ENV:', process.env.NODE_ENV);
     console.debug('  - process.env.BABEL_ENV:', process.env.BABEL_ENV);
-    console.debug(' - electronenv', JSON.stringify(process.env));
 
     // For `react-native` (iOS/Android) caller will be "metro"
     // For `webpack` (Web) caller will be "@babel-loader"

From 6e8046ba1c95107c1d22d7945b4f75815ff65389 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <58412969+shubham1206agra@users.noreply.github.com>
Date: Wed, 19 Jun 2024 22:40:17 +0530
Subject: [PATCH 63/77] Update src/types/onyx/Policy.ts

Co-authored-by: Yuwen Memon <yuwen@expensify.com>
---
 src/types/onyx/Policy.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 7af821b08666..a09f80d2d57d 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -893,6 +893,9 @@ type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
 
     /** The account to use for Invoices export to NetSuite */
     collectionAccount: string;
+    
+    /** Whether this account is using the newer version of tax in NetSuite, SuiteTax */
+    suiteTaxEnabled: boolean;
 }>;
 
 /** NetSuite connection model */

From 1171d602b2110621ff88615b8f12848401708277 Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agra1206@gmail.com>
Date: Wed, 19 Jun 2024 22:49:04 +0530
Subject: [PATCH 64/77] Added error types in config

---
 src/types/onyx/Policy.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index a09f80d2d57d..bd8f5e7d33d9 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -893,9 +893,15 @@ type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
 
     /** The account to use for Invoices export to NetSuite */
     collectionAccount: string;
-    
+
     /** Whether this account is using the newer version of tax in NetSuite, SuiteTax */
     suiteTaxEnabled: boolean;
+
+    /** Collection of errors coming from BE */
+    errors?: OnyxCommon.Errors;
+
+    /** Collection of form field errors  */
+    errorFields?: OnyxCommon.ErrorFields;
 }>;
 
 /** NetSuite connection model */

From 8ba48de7b68e838055ee585367d04a4ef77f6afb Mon Sep 17 00:00:00 2001
From: Anusha <anusharukhsar1@gmail.com>
Date: Wed, 19 Jun 2024 22:35:38 +0500
Subject: [PATCH 65/77] undo changes

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index bdc20781c42c..498635cdb449 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2316,7 +2316,7 @@ export default {
             importedFromAccountingSoftware: 'The taxes below are imported from your',
         },
         emptyWorkspace: {
-            title: 'Create a new workspace',
+            title: 'Create a workspace',
             subtitle: 'Workspaces are where you’ll chat with your team, reimburse expenses, issue cards, send invoices, pay bills, and more - all in one place.',
             createAWorkspaceCTA: 'Get Started',
             features: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index eb1157885c79..3969e255ec28 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2352,7 +2352,7 @@ export default {
             importedFromAccountingSoftware: 'Impuestos importadas desde',
         },
         emptyWorkspace: {
-            title: 'Crea un nuevo espacio de trabajo',
+            title: 'Crea un espacio de trabajo',
             subtitle: 'En los espacios de trabajo podrás chatear con tu equipo, reembolsar gastos, emitir tarjetas, enviar y pagar facturas, y mucho más - todo en un mismo lugar.',
             createAWorkspaceCTA: 'Comenzar',
             features: {

From 9929ac4e017fc8cf4e8151594786a34068d6ac1c Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Wed, 19 Jun 2024 15:28:44 -0400
Subject: [PATCH 66/77] Update Connect-a-Business-Bank-Account.md

https://github.com/Expensify/Expensify/issues/386408
---
 .../new-expensify/expenses/Connect-a-Business-Bank-Account.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
index 96653bc69763..a58f980d8e50 100644
--- a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
@@ -11,6 +11,10 @@ To connect a bank account in New Expensify, you must first enable the Make or Tr
 3. Click on **Workflows** 
 4. Enable **Make or track payments**
 
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png){:width="100%"}
+
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
+
 # Step 2: Connect bank account
 1. Click Connect bank account
 2. Select either Connect online with Plaid (preferred) or Connect manually

From 3ff8bf37d23fc2f667b68675ef0015ea76b326e4 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Wed, 19 Jun 2024 15:40:24 -0400
Subject: [PATCH 67/77] Update Connect-a-Business-Bank-Account.md

updated file name
---
 .../new-expensify/expenses/Connect-a-Business-Bank-Account.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
index a58f980d8e50..de6a2f219484 100644
--- a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
@@ -13,7 +13,7 @@ To connect a bank account in New Expensify, you must first enable the Make or Tr
 
 ![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png){:width="100%"}
 
-![Insert alt text for accessibility here]({{site.url}}/assets/images/ensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ExensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
 
 # Step 2: Connect bank account
 1. Click Connect bank account

From 3e27be8766d18f8d0e728dcbbd874788291d7772 Mon Sep 17 00:00:00 2001
From: James Dean <james@expensify.com>
Date: Wed, 19 Jun 2024 12:46:16 -0700
Subject: [PATCH 68/77] 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 498635cdb449..3a569801bb6a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2003,7 +2003,7 @@ export default {
             exportAs: 'Export as',
             exportDescription: 'Configure how Expensify data exports to QuickBooks Online.',
             preferredExporter: 'Preferred exporter',
-            date: 'Date',
+            date: 'Export date',
             exportExpenses: 'Export out-of-pocket expenses as',
             exportInvoices: 'Export invoices to',
             exportCompany: 'Export company cards as',

From 9fe2b170b87bc6573a6628f64ab92e28d401904d Mon Sep 17 00:00:00 2001
From: James Dean <james@expensify.com>
Date: Wed, 19 Jun 2024 12:52:09 -0700
Subject: [PATCH 69/77] Update es.ts

---
 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 3969e255ec28..a2118d55e43c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2029,7 +2029,7 @@ export default {
             exportCompany: 'Exportar tarjetas de empresa como',
             exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Online.',
             preferredExporter: 'Exportador preferido',
-            date: 'Fecha',
+            date: 'Fecha de exportación',
             deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
             deepDiveExpensifyCardIntegration: 'nuestra integración.',
             exportExpensifyCard: 'Exportar las transacciones de las tarjetas Expensify como',

From 31c4df6146263ded2c8fbf675885977d3a6113df Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:13:31 -0400
Subject: [PATCH 70/77] Update
 docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md

Co-authored-by: Rushat Gabhane <rushatgabhane@gmail.com>
---
 .../new-expensify/expenses/Connect-a-Business-Bank-Account.md   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
index de6a2f219484..64ae3997c4f9 100644
--- a/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/expenses/Connect-a-Business-Bank-Account.md
@@ -13,7 +13,7 @@ To connect a bank account in New Expensify, you must first enable the Make or Tr
 
 ![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png){:width="100%"}
 
-![Insert alt text for accessibility here]({{site.url}}/assets/images/ExensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
 
 # Step 2: Connect bank account
 1. Click Connect bank account

From 0881497770ff3c5977cdc413b6eea5af28bc1e3e Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 19 Jun 2024 20:36:48 +0000
Subject: [PATCH 71/77] Update version to 1.4.85-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 5ad56cc04ace..8209286b1963 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 1001048506
-        versionName "1.4.85-6"
+        versionCode 1001048507
+        versionName "1.4.85-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 fadc85d38ccc..4081980c40a7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.6</string>
+	<string>1.4.85.7</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 663bcdee7400..75f499c7f6e8 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.85.6</string>
+	<string>1.4.85.7</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 364ca5817d5d..818a2aca7cdb 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.85</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.6</string>
+	<string>1.4.85.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index c7d6ca9f233a..86e56d3c3f5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-6",
+  "version": "1.4.85-7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.85-6",
+      "version": "1.4.85-7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9ae32784baf5..83b33e5a539a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-6",
+  "version": "1.4.85-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 fa3f6c8598dc54181c332e7d2a1b08aa6e4400ee Mon Sep 17 00:00:00 2001
From: Github <andrew@expensify.com>
Date: Wed, 19 Jun 2024 15:01:24 -0600
Subject: [PATCH 72/77] Update to version 9.0.0.0 in preperation for HybridApp

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8209286b1963..18e95556867c 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 1001048507
-        versionName "1.4.85-7"
+        versionCode 1009000000
+        versionName "9.0.0-0"
         // 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 4081980c40a7..23384a1402e5 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>9.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.7</string>
+	<string>9.0.0.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 75f499c7f6e8..993f96287cac 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>9.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 818a2aca7cdb..11eebb990594 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>9.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.7</string>
+	<string>9.0.0.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 86e56d3c3f5d..4db3048e6ab4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-7",
+  "version": "9.0.0-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.85-7",
+      "version": "9.0.0-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 83b33e5a539a..49c8dc84a15d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-7",
+  "version": "9.0.0-0",
   "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 f311fc55cd24ae6c58f061f193e73209c387d5dc Mon Sep 17 00:00:00 2001
From: Github <andrew@expensify.com>
Date: Wed, 19 Jun 2024 15:04:42 -0600
Subject: [PATCH 73/77] Pass along version to HybridApp deploy

---
 .github/workflows/platformDeploy.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 91203a65b5ce..dd169a25c63d 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -372,8 +372,11 @@ jobs:
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event_name == 'push' }}
     steps:
+      - name: Get version
+        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
+
       - name: 'Deploy HybridApp'
-        run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true
+        run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version=${{ env.VERSION }}
         env:
             GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

From 4950ea797cfe20ea63e6bbea09a596edee8e0eaf Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 19 Jun 2024 21:22:08 +0000
Subject: [PATCH 74/77] Update version to 1.4.86-0

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8209286b1963..d7d06b46ccbd 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 1001048507
-        versionName "1.4.85-7"
+        versionCode 1001048600
+        versionName "1.4.86-0"
         // 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 4081980c40a7..532fce46ad8e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>1.4.86</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.7</string>
+	<string>1.4.86.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 75f499c7f6e8..3027cc7d2aac 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>1.4.86</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.7</string>
+	<string>1.4.86.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 818a2aca7cdb..d8d8da1d8401 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.85</string>
+	<string>1.4.86</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.85.7</string>
+	<string>1.4.86.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 86e56d3c3f5d..6c73746a327a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-7",
+  "version": "1.4.86-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.85-7",
+      "version": "1.4.86-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 83b33e5a539a..b407164e5fa7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.85-7",
+  "version": "1.4.86-0",
   "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 c0f358dcc5299a6302dac784ae211dae6e2cc9e1 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 19 Jun 2024 17:10:02 -0700
Subject: [PATCH 75/77] Lock cocoapods version more tightly

---
 Gemfile          |  2 +-
 Gemfile.lock     |  2 +-
 ios/Podfile.lock | 14 ++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9433f7de3370..5227deb80865 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem "cocoapods", "~> 1.14"
+gem "cocoapods", "= 1.15.2"
 gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
 gem "fastlane", "~> 2"
 gem "xcpretty", "~> 0"
diff --git a/Gemfile.lock b/Gemfile.lock
index bcca22c31512..3780235053ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -293,7 +293,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (~> 1.14)
+  cocoapods (= 1.15.2)
   fastlane (~> 2)
   fastlane-plugin-aws_s3
   xcpretty (~> 0)
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 077003ed5285..ddab159714fc 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1243,13 +1243,7 @@ PODS:
   - react-native-config (1.5.0):
     - react-native-config/App (= 1.5.0)
   - react-native-config/App (1.5.0):
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React
-    - React-Codegen
-    - React-RCTFabric
-    - ReactCommon/turbomodule/core
+    - React-Core
   - react-native-document-picker (9.1.1):
     - RCT-Folly
     - RCTRequired
@@ -2558,7 +2552,7 @@ SPEC CHECKSUMS:
   react-native-airship: 38e2596999242b68c933959d6145512e77937ac0
   react-native-blob-util: 1ddace5234c62e3e6e4e154d305ad07ef686599b
   react-native-cameraroll: f373bebbe9f6b7c3fd2a6f97c5171cda574cf957
-  react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
+  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-document-picker: 8532b8af7c2c930f9e202aac484ac785b0f4f809
   react-native-geolocation: f9e92eb774cb30ac1e099f34b3a94f03b4db7eb3
   react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
@@ -2629,8 +2623,8 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
   VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
-  Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
+  Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
 
 PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

From c353016d98291fcae2e6237a08bd70d8842dbcc0 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 19 Jun 2024 17:24:47 -0700
Subject: [PATCH 76/77] Fix regex in verifyPodfile

---
 .github/scripts/verifyPodfile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh
index 0d04d8f1b3ed..bcc68aa1a496 100755
--- a/.github/scripts/verifyPodfile.sh
+++ b/.github/scripts/verifyPodfile.sh
@@ -40,7 +40,7 @@ fi
 info "Ensuring correct version of cocoapods is used..."
 
 POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+)(\.[[:digit:]]+)?';
-POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"~> $POD_VERSION_REGEX\"/\1/p" Gemfile)"
+POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"= $POD_VERSION_REGEX\"/\1/p" Gemfile)"
 info "Pod version from Gemfile: $POD_VERSION_FROM_GEMFILE"
 
 POD_VERSION_FROM_PODFILE_LOCK="$(sed -nr "s/COCOAPODS: $POD_VERSION_REGEX/\1/p" ios/Podfile.lock)"

From 5caf8be6da8b7716564768434b2b5b98ec48cf36 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Wed, 19 Jun 2024 17:26:31 -0700
Subject: [PATCH 77/77] Match full pod version

---
 .github/scripts/verifyPodfile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh
index bcc68aa1a496..f4b1c5521733 100755
--- a/.github/scripts/verifyPodfile.sh
+++ b/.github/scripts/verifyPodfile.sh
@@ -39,7 +39,7 @@ fi
 
 info "Ensuring correct version of cocoapods is used..."
 
-POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+)(\.[[:digit:]]+)?';
+POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)?';
 POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"= $POD_VERSION_REGEX\"/\1/p" Gemfile)"
 info "Pod version from Gemfile: $POD_VERSION_FROM_GEMFILE"