From d8594f5f33db474bbdea94aacea58b6e77e36ffa Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 19 Jul 2023 14:32:06 +0530
Subject: [PATCH 001/214] chore: extract emojis from paste text

---
 src/CONST.js                                  |  1 +
 src/libs/EmojiUtils.js                        | 44 ++++++++++++++++++-
 src/pages/home/report/ReportActionCompose.js  |  2 +-
 .../report/ReportActionItemMessageEdit.js     |  2 +-
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 9a45cd631a90..85560caf0fd3 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1148,6 +1148,7 @@ const CONST = {
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
+        CODE_EMOJIS: /(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])/gi,
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
 
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 15f1d5301836..eed3865e3a4b 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -258,6 +258,47 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
     return code;
 };
 
+/**
+ * Extracts emojis from a given text.
+ *
+ * @param {string} text - The text to extract emojis from.
+ * @returns {string[]} An array of emoji codes.
+ */
+function extractEmojis(text) {
+    const emojis = [];
+    if (!text || typeof text !== 'string') return emojis;
+
+    let parseEmojis = text.match(CONST.REGEX.CODE_EMOJIS);
+    if (!parseEmojis) return emojis;
+
+    parseEmojis = [...new Set(parseEmojis)];
+
+    for (let i = 0; i < parseEmojis.length; i++) {
+        const character = parseEmojis[i];
+        const emoji = Emojis.emojiCodeTable[character];
+        if (!emoji) continue;
+        emojis.push(emoji);
+    }
+
+    return emojis;
+}
+
+/**
+ * Find all emojis in a text and replace them with their code.
+ * @param {string} text
+ * @param {number} preferredSkinTone
+ * @param {string} lang
+ * @returns
+ */
+function replaceAndExtractEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
+    const {text: newDraft = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
+
+    return {
+        text: newDraft,
+        emojis: emojis.concat(extractEmojis(text)),
+    };
+}
+
 /**
  * Replace any emoji name in a text with the emoji icon.
  * If we're on mobile, we also add a space after the emoji granted there's no text after it.
@@ -265,7 +306,7 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @param {String} text
  * @param {Number} preferredSkinTone
  * @param {String} lang
- * @returns {Object}
+ * @returns {{text: String, emojis: Array}}
  */
 function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
     const trie = emojisTrie[lang];
@@ -416,4 +457,5 @@ export {
     getPreferredSkinToneIndex,
     getPreferredEmojiCode,
     getUniqueEmojiCodes,
+    replaceAndExtractEmojis,
 };
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 8155f09b2aac..5794349d809e 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -789,7 +789,7 @@ class ReportActionCompose extends React.Component {
      * @param {Boolean} shouldDebounceSaveComment
      */
     updateComment(comment, shouldDebounceSaveComment) {
-        const {text: newComment = '', emojis = []} = EmojiUtils.replaceEmojis(comment, this.props.preferredSkinTone, this.props.preferredLocale);
+        const {text: newComment = '', emojis = []} = EmojiUtils.replaceAndExtractEmojis(comment, this.props.preferredSkinTone, this.props.preferredLocale);
 
         if (!_.isEmpty(emojis)) {
             this.insertedEmojis = [...this.insertedEmojis, ...emojis];
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index c7b39734961f..62f7c0fc1880 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -162,7 +162,7 @@ function ReportActionItemMessageEdit(props) {
      */
     const updateDraft = useCallback(
         (newDraftInput) => {
-            const {text: newDraft = '', emojis = []} = EmojiUtils.replaceEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);
+            const {text: newDraft = '', emojis = []} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);
 
             if (!_.isEmpty(emojis)) {
                 insertedEmojis.current = [...insertedEmojis.current, ...emojis];

From 29f0a45618c39333f2b184bcbff2b47c48e32b53 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 19 Jul 2023 14:52:14 +0530
Subject: [PATCH 002/214] chore: lint issue fix

---
 src/libs/EmojiUtils.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index eed3865e3a4b..69b0d6725433 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -276,29 +276,13 @@ function extractEmojis(text) {
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];
         const emoji = Emojis.emojiCodeTable[character];
-        if (!emoji) continue;
+        if (!emoji) continue; // eslint-disable-line no-continue
         emojis.push(emoji);
     }
 
     return emojis;
 }
 
-/**
- * Find all emojis in a text and replace them with their code.
- * @param {string} text
- * @param {number} preferredSkinTone
- * @param {string} lang
- * @returns
- */
-function replaceAndExtractEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
-    const {text: newDraft = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
-
-    return {
-        text: newDraft,
-        emojis: emojis.concat(extractEmojis(text)),
-    };
-}
-
 /**
  * Replace any emoji name in a text with the emoji icon.
  * If we're on mobile, we also add a space after the emoji granted there's no text after it.
@@ -344,6 +328,22 @@ function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
     return {text: newText, emojis};
 }
 
+/**
+ * Find all emojis in a text and replace them with their code.
+ * @param {string} text
+ * @param {number} preferredSkinTone
+ * @param {string} lang
+ * @returns {{text: string, emojis: string[]}}
+ */
+function replaceAndExtractEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
+    const {text: newDraft = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
+
+    return {
+        text: newDraft,
+        emojis: emojis.concat(extractEmojis(text)),
+    };
+}
+
 /**
  * Suggest emojis when typing emojis prefix after colon
  * @param {String} text

From 61444f805e5002661ce7729d051acdf1365296e4 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 21 Jul 2023 02:46:29 +0530
Subject: [PATCH 003/214] chore: change jsdoc and varible names

---
 src/libs/EmojiUtils.js                        | 23 +++++++++++--------
 src/pages/home/report/ReportActionCompose.js  |  2 +-
 .../report/ReportActionItemMessageEdit.js     |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 69b0d6725433..b1ad5b936d2e 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -261,15 +261,18 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
 /**
  * Extracts emojis from a given text.
  *
- * @param {string} text - The text to extract emojis from.
- * @returns {string[]} An array of emoji codes.
+ * @param {String} text - The text to extract emojis from.
+ * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
     const emojis = [];
     if (!text || typeof text !== 'string') return emojis;
 
     let parseEmojis = text.match(CONST.REGEX.CODE_EMOJIS);
-    if (!parseEmojis) return emojis;
+
+    if (!parseEmojis) {
+        return emojis;
+    }
 
     parseEmojis = [...new Set(parseEmojis)];
 
@@ -290,7 +293,7 @@ function extractEmojis(text) {
  * @param {String} text
  * @param {Number} preferredSkinTone
  * @param {String} lang
- * @returns {{text: String, emojis: Array}}
+ * @returns {Object}
  */
 function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
     const trie = emojisTrie[lang];
@@ -330,16 +333,16 @@ function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
 
 /**
  * Find all emojis in a text and replace them with their code.
- * @param {string} text
- * @param {number} preferredSkinTone
- * @param {string} lang
- * @returns {{text: string, emojis: string[]}}
+ * @param {String} text
+ * @param {Number} preferredSkinTone
+ * @param {String} lang
+ * @returns {Object}
  */
 function replaceAndExtractEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
-    const {text: newDraft = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
+    const {text: covertedText = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
 
     return {
-        text: newDraft,
+        text: covertedText,
         emojis: emojis.concat(extractEmojis(text)),
     };
 }
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 5794349d809e..e59acd640baf 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -789,7 +789,7 @@ class ReportActionCompose extends React.Component {
      * @param {Boolean} shouldDebounceSaveComment
      */
     updateComment(comment, shouldDebounceSaveComment) {
-        const {text: newComment = '', emojis = []} = EmojiUtils.replaceAndExtractEmojis(comment, this.props.preferredSkinTone, this.props.preferredLocale);
+        const {text: newComment, emojis} = EmojiUtils.replaceAndExtractEmojis(comment, this.props.preferredSkinTone, this.props.preferredLocale);
 
         if (!_.isEmpty(emojis)) {
             this.insertedEmojis = [...this.insertedEmojis, ...emojis];
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index 62f7c0fc1880..f4231ef50961 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -162,7 +162,7 @@ function ReportActionItemMessageEdit(props) {
      */
     const updateDraft = useCallback(
         (newDraftInput) => {
-            const {text: newDraft = '', emojis = []} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);
+            const {text: newDraft, emojis} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);
 
             if (!_.isEmpty(emojis)) {
                 insertedEmojis.current = [...insertedEmojis.current, ...emojis];

From 27f37b824531449f2ac99fc35c29455ea38db1e2 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 21 Jul 2023 02:47:37 +0530
Subject: [PATCH 004/214] chore: change condition for early return

---
 src/libs/EmojiUtils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index b1ad5b936d2e..eeb3774923a5 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,7 +266,9 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  */
 function extractEmojis(text) {
     const emojis = [];
-    if (!text || typeof text !== 'string') return emojis;
+    if (!text) {
+        return emojis;
+    }
 
     let parseEmojis = text.match(CONST.REGEX.CODE_EMOJIS);
 

From 2758401d1cd7aebc69f4775b50be2707ff6dd38d Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 21 Jul 2023 02:55:32 +0530
Subject: [PATCH 005/214] chore: remove extra regex and use the available one
 EMOJIS

---
 src/CONST.js           | 1 -
 src/libs/EmojiUtils.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 483a87b4a3ce..b7a730821fdb 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1148,7 +1148,6 @@ const CONST = {
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
-        CODE_EMOJIS: /(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])/gi,
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
 
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index eeb3774923a5..56ffed9e1086 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -270,7 +270,7 @@ function extractEmojis(text) {
         return emojis;
     }
 
-    let parseEmojis = text.match(CONST.REGEX.CODE_EMOJIS);
+    let parseEmojis = text.match(CONST.REGEX.EMOJIS);
 
     if (!parseEmojis) {
         return emojis;

From 8cccc8969d4356ce870c2a2bf7ac85e4bb8119b9 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Fri, 21 Jul 2023 12:37:04 +0530
Subject: [PATCH 006/214] chore: variable name spell fix

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

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 56ffed9e1086..dee635089e00 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -341,10 +341,10 @@ function replaceEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
  * @returns {Object}
  */
 function replaceAndExtractEmojis(text, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE, lang = CONST.LOCALES.DEFAULT) {
-    const {text: covertedText = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
+    const {text: convertedText = '', emojis = []} = replaceEmojis(text, preferredSkinTone, lang);
 
     return {
-        text: covertedText,
+        text: convertedText,
         emojis: emojis.concat(extractEmojis(text)),
     };
 }

From e8b2632ad26fe50d1562e8727f5cbceffc1db17e Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 26 Jul 2023 02:22:01 +0530
Subject: [PATCH 007/214] fix: zwj sequences issue

---
 src/CONST.js           |  2 ++
 src/libs/EmojiUtils.js | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index b7a730821fdb..c4fd7a5174eb 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1148,6 +1148,8 @@ const CONST = {
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
+        EMOJI_ZWJ_SEQUENCES:
+            /(👨‍❤️‍👨|👨‍❤️‍💋‍👨|👨‍👦|👨‍👦‍👦|👨‍👧|👨‍👧‍👦|👨‍👧‍👧|👨‍👨‍👦|👨‍👨‍👦‍👦|👨‍👨‍👧|👨‍👨‍👧‍👦|👨‍👨‍👧‍👧|👨‍👩‍👦|👨‍👩‍👦‍👦|👨‍👩‍👧|👨‍👩‍👧‍👦|👨‍👩‍👧‍👧|👨🏻‍❤️‍👨🏻|👨🏻‍❤️‍👨🏼|👨🏻‍❤️‍👨🏽|👨🏻‍❤️‍👨🏾|👨🏻‍❤️‍👨🏿|👨🏻‍❤️‍💋‍👨🏻|👨🏻‍❤️‍💋‍👨🏼|👨🏻‍❤️‍💋‍👨🏽|👨🏻‍❤️‍💋‍👨🏾|👨🏻‍❤️‍💋‍👨🏿|👨🏻‍🤝‍👨🏼|👨🏻‍🤝‍👨🏽|👨🏻‍🤝‍👨🏾|👨🏻‍🤝‍👨🏿|👨🏼‍❤️‍👨🏻|👨🏼‍❤️‍👨🏼|👨🏼‍❤️‍👨🏽|👨🏼‍❤️‍👨🏾|👨🏼‍❤️‍👨🏿|👨🏼‍❤️‍💋‍👨🏻|👨🏼‍❤️‍💋‍👨🏼|👨🏼‍❤️‍💋‍👨🏽|👨🏼‍❤️‍💋‍👨🏾|👨🏼‍❤️‍💋‍👨🏿|👨🏼‍🤝‍👨🏻|👨🏼‍🤝‍👨🏽|👨🏼‍🤝‍👨🏾|👨🏼‍🤝‍👨🏿|👨🏽‍❤️‍👨🏻|👨🏽‍❤️‍👨🏼|👨🏽‍❤️‍👨🏽|👨🏽‍❤️‍👨🏾|👨🏽‍❤️‍👨🏿|👨🏽‍❤️‍💋‍👨🏻|👨🏽‍❤️‍💋‍👨🏼|👨🏽‍❤️‍💋‍👨🏽|👨🏽‍❤️‍💋‍👨🏾|👨🏽‍❤️‍💋‍👨🏿|👨🏽‍🤝‍👨🏻|👨🏽‍🤝‍👨🏼|👨🏽‍🤝‍👨🏾|👨🏽‍🤝‍👨🏿|👨🏾‍❤️‍👨🏻|👨🏾‍❤️‍👨🏼|👨🏾‍❤️‍👨🏽|👨🏾‍❤️‍👨🏾|👨🏾‍❤️‍👨🏿|👨🏾‍❤️‍💋‍👨🏻|👨🏾‍❤️‍💋‍👨🏼|👨🏾‍❤️‍💋‍👨🏽|👨🏾‍❤️‍💋‍👨🏾|👨🏾‍❤️‍💋‍👨🏿|👨🏾‍🤝‍👨🏻|👨🏾‍🤝‍👨🏼|👨🏾‍🤝‍👨🏽|👨🏾‍🤝‍👨🏿|👨🏿‍❤️‍👨🏻|👨🏿‍❤️‍👨🏼|👨🏿‍❤️‍👨🏽|👨🏿‍❤️‍👨🏾|👨🏿‍❤️‍👨🏿|👨🏿‍❤️‍💋‍👨🏻|👨🏿‍❤️‍💋‍👨🏼|👨🏿‍❤️‍💋‍👨🏽|👨🏿‍❤️‍💋‍👨🏾|👨🏿‍❤️‍💋‍👨🏿|👨🏿‍🤝‍👨🏻|👨🏿‍🤝‍👨🏼|👨🏿‍🤝‍👨🏽|👨🏿‍🤝‍👨🏾|👩‍❤️‍👨|👩‍❤️‍👩|👩‍❤️‍💋‍👨|👩‍❤️‍💋‍👩|👩‍👦|👩‍👦‍👦|👩‍👧|👩‍👧‍👦|👩‍👧‍👧|👩‍👩‍👦|👩‍👩‍👦‍👦|👩‍👩‍👧|👩‍👩‍👧‍👦|👩‍👩‍👧‍👧|👩🏻‍❤️‍👨🏻|👩🏻‍❤️‍👨🏼|👩🏻‍❤️‍👨🏽|👩🏻‍❤️‍👨🏾|👩🏻‍❤️‍👨🏿|👩🏻‍❤️‍👩🏻|👩🏻‍❤️‍👩🏼|👩🏻‍❤️‍👩🏽|👩🏻‍❤️‍👩🏾|👩🏻‍❤️‍👩🏿|👩🏻‍❤️‍💋‍👨🏻|👩🏻‍❤️‍💋‍👨🏼|👩🏻‍❤️‍💋‍👨🏽|👩🏻‍❤️‍💋‍👨🏾|👩🏻‍❤️‍💋‍👨🏿|👩🏻‍❤️‍💋‍👩🏻|👩🏻‍❤️‍💋‍👩🏼|👩🏻‍❤️‍💋‍👩🏽|👩🏻‍❤️‍💋‍👩🏾|👩🏻‍❤️‍💋‍👩🏿|👩🏻‍🤝‍👨🏼|👩🏻‍🤝‍👨🏽|👩🏻‍🤝‍👨🏾|👩🏻‍🤝‍👨🏿|👩🏻‍🤝‍👩🏼|👩🏻‍🤝‍👩🏽|👩🏻‍🤝‍👩🏾|👩🏻‍🤝‍👩🏿|👩🏼‍❤️‍👨🏻|👩🏼‍❤️‍👨🏼|👩🏼‍❤️‍👨🏽|👩🏼‍❤️‍👨🏾|👩🏼‍❤️‍👨🏿|👩🏼‍❤️‍👩🏻|👩🏼‍❤️‍👩🏼|👩🏼‍❤️‍👩🏽|👩🏼‍❤️‍👩🏾|👩🏼‍❤️‍👩🏿|👩🏼‍❤️‍💋‍👨🏻|👩🏼‍❤️‍💋‍👨🏼|👩🏼‍❤️‍💋‍👨🏽|👩🏼‍❤️‍💋‍👨🏾|👩🏼‍❤️‍💋‍👨🏿|👩🏼‍❤️‍💋‍👩🏻|👩🏼‍❤️‍💋‍👩🏼|👩🏼‍❤️‍💋‍👩🏽|👩🏼‍❤️‍💋‍👩🏾|👩🏼‍❤️‍💋‍👩🏿|👩🏼‍🤝‍👨🏻|👩🏼‍🤝‍👨🏽|👩🏼‍🤝‍👨🏾|👩🏼‍🤝‍👨🏿|👩🏼‍🤝‍👩🏻|👩🏼‍🤝‍👩🏽|👩🏼‍🤝‍👩🏾|👩🏼‍🤝‍👩🏿|👩🏽‍❤️‍👨🏻|👩🏽‍❤️‍👨🏼|👩🏽‍❤️‍👨🏽|👩🏽‍❤️‍👨🏾|👩🏽‍❤️‍👨🏿|👩🏽‍❤️‍👩🏻|👩🏽‍❤️‍👩🏼|👩🏽‍❤️‍👩🏽|👩🏽‍❤️‍👩🏾|👩🏽‍❤️‍👩🏿|👩🏽‍❤️‍💋‍👨🏻|👩🏽‍❤️‍💋‍👨🏼|👩🏽‍❤️‍💋‍👨🏽|👩🏽‍❤️‍💋‍👨🏾|👩🏽‍❤️‍💋‍👨🏿|👩🏽‍❤️‍💋‍👩🏻|👩🏽‍❤️‍💋‍👩🏼|👩🏽‍❤️‍💋‍👩🏽|👩🏽‍❤️‍💋‍👩🏾|👩🏽‍❤️‍💋‍👩🏿|👩🏽‍🤝‍👨🏻|👩🏽‍🤝‍👨🏼|👩🏽‍🤝‍👨🏾|👩🏽‍🤝‍👨🏿|👩🏽‍🤝‍👩🏻|👩🏽‍🤝‍👩🏼|👩🏽‍🤝‍👩🏾|👩🏽‍🤝‍👩🏿|👩🏾‍❤️‍👨🏻|👩🏾‍❤️‍👨🏼|👩🏾‍❤️‍👨🏽|👩🏾‍❤️‍👨🏾|👩🏾‍❤️‍👨🏿|👩🏾‍❤️‍👩🏻|👩🏾‍❤️‍👩🏼|👩🏾‍❤️‍👩🏽|👩🏾‍❤️‍👩🏾|👩🏾‍❤️‍👩🏿|👩🏾‍❤️‍💋‍👨🏻|👩🏾‍❤️‍💋‍👨🏼|👩🏾‍❤️‍💋‍👨🏽|👩🏾‍❤️‍💋‍👨🏾|👩🏾‍❤️‍💋‍👨🏿|👩🏾‍❤️‍💋‍👩🏻|👩🏾‍❤️‍💋‍👩🏼|👩🏾‍❤️‍💋‍👩🏽|👩🏾‍❤️‍💋‍👩🏾|👩🏾‍❤️‍💋‍👩🏿|👩🏾‍🤝‍👨🏻|👩🏾‍🤝‍👨🏼|👩🏾‍🤝‍👨🏽|👩🏾‍🤝‍👨🏿|👩🏾‍🤝‍👩🏻|👩🏾‍🤝‍👩🏼|👩🏾‍🤝‍👩🏽|👩🏾‍🤝‍👩🏿|👩🏿‍❤️‍👨🏻|👩🏿‍❤️‍👨🏼|👩🏿‍❤️‍👨🏽|👩🏿‍❤️‍👨🏾|👩🏿‍❤️‍👨🏿|👩🏿‍❤️‍👩🏻|👩🏿‍❤️‍👩🏼|👩🏿‍❤️‍👩🏽|👩🏿‍❤️‍👩🏾|👩🏿‍❤️‍👩🏿|👩🏿‍❤️‍💋‍👨🏻|👩🏿‍❤️‍💋‍👨🏼|👩🏿‍❤️‍💋‍👨🏽|👩🏿‍❤️‍💋‍👨🏾|👩🏿‍❤️‍💋‍👨🏿|👩🏿‍❤️‍💋‍👩🏻|👩🏿‍❤️‍💋‍👩🏼|👩🏿‍❤️‍💋‍👩🏽|👩🏿‍❤️‍💋‍👩🏾|👩🏿‍❤️‍💋‍👩🏿|👩🏿‍🤝‍👨🏻|👩🏿‍🤝‍👨🏼|👩🏿‍🤝‍👨🏽|👩🏿‍🤝‍👨🏾|👩🏿‍🤝‍👩🏻|👩🏿‍🤝‍👩🏼|👩🏿‍🤝‍👩🏽|👩🏿‍🤝‍👩🏾|🧑‍🤝‍🧑|🧑🏻‍❤️‍💋‍🧑🏼|🧑🏻‍❤️‍💋‍🧑🏽|🧑🏻‍❤️‍💋‍🧑🏾|🧑🏻‍❤️‍💋‍🧑🏿|🧑🏻‍❤️‍🧑🏼|🧑🏻‍❤️‍🧑🏽|🧑🏻‍❤️‍🧑🏾|🧑🏻‍❤️‍🧑🏿|🧑🏻‍🎄|🧑🏻‍🤝‍🧑🏻|🧑🏻‍🤝‍🧑🏼|🧑🏻‍🤝‍🧑🏽|🧑🏻‍🤝‍🧑🏾|🧑🏻‍🤝‍🧑🏿|🧑🏼‍❤️‍💋‍🧑🏻|🧑🏼‍❤️‍💋‍🧑🏽|🧑🏼‍❤️‍💋‍🧑🏾|🧑🏼‍❤️‍💋‍🧑🏿|🧑🏼‍❤️‍🧑🏻|🧑🏼‍❤️‍🧑🏽|🧑🏼‍❤️‍🧑🏾|🧑🏼‍❤️‍🧑🏿|🧑🏼‍🎄|🧑🏼‍🤝‍🧑🏻|🧑🏼‍🤝‍🧑🏼|🧑🏼‍🤝‍🧑🏽|🧑🏼‍🤝‍🧑🏾|🧑🏼‍🤝‍🧑🏿|🧑🏽‍❤️‍💋‍🧑🏻|🧑🏽‍❤️‍💋‍🧑🏼|🧑🏽‍❤️‍💋‍🧑🏾|🧑🏽‍❤️‍💋‍🧑🏿|🧑🏽‍❤️‍🧑🏻|🧑🏽‍❤️‍🧑🏼|🧑🏽‍❤️‍🧑🏾|🧑🏽‍❤️‍🧑🏿|🧑🏽‍🎄|🧑🏽‍🤝‍🧑🏻|🧑🏽‍🤝‍🧑🏼|🧑🏽‍🤝‍🧑🏽|🧑🏽‍🤝‍🧑🏾|🧑🏽‍🤝‍🧑🏿|🧑🏾‍❤️‍💋‍🧑🏻|🧑🏾‍❤️‍💋‍🧑🏼|🧑🏾‍❤️‍💋‍🧑🏽|🧑🏾‍❤️‍💋‍🧑🏿|🧑🏾‍❤️‍🧑🏻|🧑🏾‍❤️‍🧑🏼|🧑🏾‍❤️‍🧑🏽|🧑🏾‍❤️‍🧑🏿|🧑🏾‍🎄|🧑🏾‍🤝‍🧑🏻|🧑🏾‍🤝‍🧑🏼|🧑🏾‍🤝‍🧑🏽|🧑🏾‍🤝‍🧑🏾|🧑🏾‍🤝‍🧑🏿|🧑🏿‍❤️‍💋‍🧑🏻|🧑🏿‍❤️‍💋‍🧑🏼|🧑🏿‍❤️‍💋‍🧑🏽|🧑🏿‍❤️‍💋‍🧑🏾|🧑🏿‍❤️‍🧑🏻|🧑🏿‍❤️‍🧑🏼|🧑🏿‍❤️‍🧑🏽|🧑🏿‍❤️‍🧑🏾|🧑🏿‍🎄|🧑🏿‍🤝‍🧑🏻|🧑🏿‍🤝‍🧑🏼|🧑🏿‍🤝‍🧑🏽|🧑🏿‍🤝‍🧑🏾|🧑🏿‍🤝‍🧑🏿|🫱🏻‍🫲🏼|🫱🏻‍🫲🏽|🫱🏻‍🫲🏾|🫱🏻‍🫲🏿|🫱🏼‍🫲🏻|🫱🏼‍🫲🏽|🫱🏼‍🫲🏾|🫱🏼‍🫲🏿|🫱🏽‍🫲🏻|🫱🏽‍🫲🏼|🫱🏽‍🫲🏾|🫱🏽‍🫲🏿|🫱🏾‍🫲🏻|🫱🏾‍🫲🏼|🫱🏾‍🫲🏽|🫱🏾‍🫲🏿|🫱🏿‍🫲🏻|🫱🏿‍🫲🏼|🫱🏿‍🫲🏽|🫱🏿‍🫲🏾|👨‍⚕️|👨‍⚖️|👨‍✈️|👨‍🌾|👨‍🍳|👨‍🍼|👨‍🎓|👨‍🎤|👨‍🎨|👨‍🏫|👨‍🏭|👨‍💻|👨‍💼|👨‍🔧|👨‍🔬|👨‍🚀|👨‍🚒|👨‍🦯|👨‍🦼|👨‍🦽|👨🏻‍⚕️|👨🏻‍⚖️|👨🏻‍✈️|👨🏻‍🌾|👨🏻‍🍳|👨🏻‍🍼|👨🏻‍🎓|👨🏻‍🎤|👨🏻‍🎨|👨🏻‍🏫|👨🏻‍🏭|👨🏻‍💻|👨🏻‍💼|👨🏻‍🔧|👨🏻‍🔬|👨🏻‍🚀|👨🏻‍🚒|👨🏻‍🦯|👨🏻‍🦼|👨🏻‍🦽|👨🏼‍⚕️|👨🏼‍⚖️|👨🏼‍✈️|👨🏼‍🌾|👨🏼‍🍳|👨🏼‍🍼|👨🏼‍🎓|👨🏼‍🎤|👨🏼‍🎨|👨🏼‍🏫|👨🏼‍🏭|👨🏼‍💻|👨🏼‍💼|👨🏼‍🔧|👨🏼‍🔬|👨🏼‍🚀|👨🏼‍🚒|👨🏼‍🦯|👨🏼‍🦼|👨🏼‍🦽|👨🏽‍⚕️|👨🏽‍⚖️|👨🏽‍✈️|👨🏽‍🌾|👨🏽‍🍳|👨🏽‍🍼|👨🏽‍🎓|👨🏽‍🎤|👨🏽‍🎨|👨🏽‍🏫|👨🏽‍🏭|👨🏽‍💻|👨🏽‍💼|👨🏽‍🔧|👨🏽‍🔬|👨🏽‍🚀|👨🏽‍🚒|👨🏽‍🦯|👨🏽‍🦼|👨🏽‍🦽|👨🏾‍⚕️|👨🏾‍⚖️|👨🏾‍✈️|👨🏾‍🌾|👨🏾‍🍳|👨🏾‍🍼|👨🏾‍🎓|👨🏾‍🎤|👨🏾‍🎨|👨🏾‍🏫|👨🏾‍🏭|👨🏾‍💻|👨🏾‍💼|👨🏾‍🔧|👨🏾‍🔬|👨🏾‍🚀|👨🏾‍🚒|👨🏾‍🦯|👨🏾‍🦼|👨🏾‍🦽|👨🏿‍⚕️|👨🏿‍⚖️|👨🏿‍✈️|👨🏿‍🌾|👨🏿‍🍳|👨🏿‍🍼|👨🏿‍🎓|👨🏿‍🎤|👨🏿‍🎨|👨🏿‍🏫|👨🏿‍🏭|👨🏿‍💻|👨🏿‍💼|👨🏿‍🔧|👨🏿‍🔬|👨🏿‍🚀|👨🏿‍🚒|👨🏿‍🦯|👨🏿‍🦼|👨🏿‍🦽|👩‍⚕️|👩‍⚖️|👩‍✈️|👩‍🌾|👩‍🍳|👩‍🍼|👩‍🎓|👩‍🎤|👩‍🎨|👩‍🏫|👩‍🏭|👩‍💻|👩‍💼|👩‍🔧|👩‍🔬|👩‍🚀|👩‍🚒|👩‍🦯|👩‍🦼|👩‍🦽|👩🏻‍⚕️|👩🏻‍⚖️|👩🏻‍✈️|👩🏻‍🌾|👩🏻‍🍳|👩🏻‍🍼|👩🏻‍🎓|👩🏻‍🎤|👩🏻‍🎨|👩🏻‍🏫|👩🏻‍🏭|👩🏻‍💻|👩🏻‍💼|👩🏻‍🔧|👩🏻‍🔬|👩🏻‍🚀|👩🏻‍🚒|👩🏻‍🦯|👩🏻‍🦼|👩🏻‍🦽|👩🏼‍⚕️|👩🏼‍⚖️|👩🏼‍✈️|👩🏼‍🌾|👩🏼‍🍳|👩🏼‍🍼|👩🏼‍🎓|👩🏼‍🎤|👩🏼‍🎨|👩🏼‍🏫|👩🏼‍🏭|👩🏼‍💻|👩🏼‍💼|👩🏼‍🔧|👩🏼‍🔬|👩🏼‍🚀|👩🏼‍🚒|👩🏼‍🦯|👩🏼‍🦼|👩🏼‍🦽|👩🏽‍⚕️|👩🏽‍⚖️|👩🏽‍✈️|👩🏽‍🌾|👩🏽‍🍳|👩🏽‍🍼|👩🏽‍🎓|👩🏽‍🎤|👩🏽‍🎨|👩🏽‍🏫|👩🏽‍🏭|👩🏽‍💻|👩🏽‍💼|👩🏽‍🔧|👩🏽‍🔬|👩🏽‍🚀|👩🏽‍🚒|👩🏽‍🦯|👩🏽‍🦼|👩🏽‍🦽|👩🏾‍⚕️|👩🏾‍⚖️|👩🏾‍✈️|👩🏾‍🌾|👩🏾‍🍳|👩🏾‍🍼|👩🏾‍🎓|👩🏾‍🎤|👩🏾‍🎨|👩🏾‍🏫|👩🏾‍🏭|👩🏾‍💻|👩🏾‍💼|👩🏾‍🔧|👩🏾‍🔬|👩🏾‍🚀|👩🏾‍🚒|👩🏾‍🦯|👩🏾‍🦼|👩🏾‍🦽|👩🏿‍⚕️|👩🏿‍⚖️|👩🏿‍✈️|👩🏿‍🌾|👩🏿‍🍳|👩🏿‍🍼|👩🏿‍🎓|👩🏿‍🎤|👩🏿‍🎨|👩🏿‍🏫|👩🏿‍🏭|👩🏿‍💻|👩🏿‍💼|👩🏿‍🔧|👩🏿‍🔬|👩🏿‍🚀|👩🏿‍🚒|👩🏿‍🦯|👩🏿‍🦼|👩🏿‍🦽|🧑‍⚕️|🧑‍⚖️|🧑‍✈️|🧑‍🌾|🧑‍🍳|🧑‍🍼|🧑‍🎓|🧑‍🎤|🧑‍🎨|🧑‍🏫|🧑‍🏭|🧑‍💻|🧑‍💼|🧑‍🔧|🧑‍🔬|🧑‍🚀|🧑‍🚒|🧑‍🦯|🧑‍🦼|🧑‍🦽|🧑🏻‍⚕️|🧑🏻‍⚖️|🧑🏻‍✈️|🧑🏻‍🌾|🧑🏻‍🍳|🧑🏻‍🍼|🧑🏻‍🎓|🧑🏻‍🎤|🧑🏻‍🎨|🧑🏻‍🏫|🧑🏻‍🏭|🧑🏻‍💻|🧑🏻‍💼|🧑🏻‍🔧|🧑🏻‍🔬|🧑🏻‍🚀|🧑🏻‍🚒|🧑🏻‍🦯|🧑🏻‍🦼|🧑🏻‍🦽|🧑🏼‍⚕️|🧑🏼‍⚖️|🧑🏼‍✈️|🧑🏼‍🌾|🧑🏼‍🍳|🧑🏼‍🍼|🧑🏼‍🎓|🧑🏼‍🎤|🧑🏼‍🎨|🧑🏼‍🏫|🧑🏼‍🏭|🧑🏼‍💻|🧑🏼‍💼|🧑🏼‍🔧|🧑🏼‍🔬|🧑🏼‍🚀|🧑🏼‍🚒|🧑🏼‍🦯|🧑🏼‍🦼|🧑🏼‍🦽|🧑🏽‍⚕️|🧑🏽‍⚖️|🧑🏽‍✈️|🧑🏽‍🌾|🧑🏽‍🍳|🧑🏽‍🍼|🧑🏽‍🎓|🧑🏽‍🎤|🧑🏽‍🎨|🧑🏽‍🏫|🧑🏽‍🏭|🧑🏽‍💻|🧑🏽‍💼|🧑🏽‍🔧|🧑🏽‍🔬|🧑🏽‍🚀|🧑🏽‍🚒|🧑🏽‍🦯|🧑🏽‍🦼|🧑🏽‍🦽|🧑🏾‍⚕️|🧑🏾‍⚖️|🧑🏾‍✈️|🧑🏾‍🌾|🧑🏾‍🍳|🧑🏾‍🍼|🧑🏾‍🎓|🧑🏾‍🎤|🧑🏾‍🎨|🧑🏾‍🏫|🧑🏾‍🏭|🧑🏾‍💻|🧑🏾‍💼|🧑🏾‍🔧|🧑🏾‍🔬|🧑🏾‍🚀|🧑🏾‍🚒|🧑🏾‍🦯|🧑🏾‍🦼|🧑🏾‍🦽|🧑🏿‍⚕️|🧑🏿‍⚖️|🧑🏿‍✈️|🧑🏿‍🌾|🧑🏿‍🍳|🧑🏿‍🍼|🧑🏿‍🎓|🧑🏿‍🎤|🧑🏿‍🎨|🧑🏿‍🏫|🧑🏿‍🏭|🧑🏿‍💻|🧑🏿‍💼|🧑🏿‍🔧|🧑🏿‍🔬|🧑🏿‍🚀|🧑🏿‍🚒|🧑🏿‍🦯|🧑🏿‍🦼|🧑🏿‍🦽|⛹🏻‍♀️|⛹🏻‍♂️|⛹🏼‍♀️|⛹🏼‍♂️|⛹🏽‍♀️|⛹🏽‍♂️|⛹🏾‍♀️|⛹🏾‍♂️|⛹🏿‍♀️|⛹🏿‍♂️|⛹️‍♀️|⛹️‍♂️|🏃‍♀️|🏃‍♂️|🏃🏻‍♀️|🏃🏻‍♂️|🏃🏼‍♀️|🏃🏼‍♂️|🏃🏽‍♀️|🏃🏽‍♂️|🏃🏾‍♀️|🏃🏾‍♂️|🏃🏿‍♀️|🏃🏿‍♂️|🏄‍♀️|🏄‍♂️|🏄🏻‍♀️|🏄🏻‍♂️|🏄🏼‍♀️|🏄🏼‍♂️|🏄🏽‍♀️|🏄🏽‍♂️|🏄🏾‍♀️|🏄🏾‍♂️|🏄🏿‍♀️|🏄🏿‍♂️|🏊‍♀️|🏊‍♂️|🏊🏻‍♀️|🏊🏻‍♂️|🏊🏼‍♀️|🏊🏼‍♂️|🏊🏽‍♀️|🏊🏽‍♂️|🏊🏾‍♀️|🏊🏾‍♂️|🏊🏿‍♀️|🏊🏿‍♂️|🏋🏻‍♀️|🏋🏻‍♂️|🏋🏼‍♀️|🏋🏼‍♂️|🏋🏽‍♀️|🏋🏽‍♂️|🏋🏾‍♀️|🏋🏾‍♂️|🏋🏿‍♀️|🏋🏿‍♂️|🏋️‍♀️|🏋️‍♂️|🏌🏻‍♀️|🏌🏻‍♂️|🏌🏼‍♀️|🏌🏼‍♂️|🏌🏽‍♀️|🏌🏽‍♂️|🏌🏾‍♀️|🏌🏾‍♂️|🏌🏿‍♀️|🏌🏿‍♂️|🏌️‍♀️|🏌️‍♂️|👮‍♀️|👮‍♂️|👮🏻‍♀️|👮🏻‍♂️|👮🏼‍♀️|👮🏼‍♂️|👮🏽‍♀️|👮🏽‍♂️|👮🏾‍♀️|👮🏾‍♂️|👮🏿‍♀️|👮🏿‍♂️|👯‍♀️|👯‍♂️|👰‍♀️|👰‍♂️|👰🏻‍♀️|👰🏻‍♂️|👰🏼‍♀️|👰🏼‍♂️|👰🏽‍♀️|👰🏽‍♂️|👰🏾‍♀️|👰🏾‍♂️|👰🏿‍♀️|👰🏿‍♂️|👱‍♀️|👱‍♂️|👱🏻‍♀️|👱🏻‍♂️|👱🏼‍♀️|👱🏼‍♂️|👱🏽‍♀️|👱🏽‍♂️|👱🏾‍♀️|👱🏾‍♂️|👱🏿‍♀️|👱🏿‍♂️|👳‍♀️|👳‍♂️|👳🏻‍♀️|👳🏻‍♂️|👳🏼‍♀️|👳🏼‍♂️|👳🏽‍♀️|👳🏽‍♂️|👳🏾‍♀️|👳🏾‍♂️|👳🏿‍♀️|👳🏿‍♂️|👷‍♀️|👷‍♂️|👷🏻‍♀️|👷🏻‍♂️|👷🏼‍♀️|👷🏼‍♂️|👷🏽‍♀️|👷🏽‍♂️|👷🏾‍♀️|👷🏾‍♂️|👷🏿‍♀️|👷🏿‍♂️|💁‍♀️|💁‍♂️|💁🏻‍♀️|💁🏻‍♂️|💁🏼‍♀️|💁🏼‍♂️|💁🏽‍♀️|💁🏽‍♂️|💁🏾‍♀️|💁🏾‍♂️|💁🏿‍♀️|💁🏿‍♂️|💂‍♀️|💂‍♂️|💂🏻‍♀️|💂🏻‍♂️|💂🏼‍♀️|💂🏼‍♂️|💂🏽‍♀️|💂🏽‍♂️|💂🏾‍♀️|💂🏾‍♂️|💂🏿‍♀️|💂🏿‍♂️|💆‍♀️|💆‍♂️|💆🏻‍♀️|💆🏻‍♂️|💆🏼‍♀️|💆🏼‍♂️|💆🏽‍♀️|💆🏽‍♂️|💆🏾‍♀️|💆🏾‍♂️|💆🏿‍♀️|💆🏿‍♂️|💇‍♀️|💇‍♂️|💇🏻‍♀️|💇🏻‍♂️|💇🏼‍♀️|💇🏼‍♂️|💇🏽‍♀️|💇🏽‍♂️|💇🏾‍♀️|💇🏾‍♂️|💇🏿‍♀️|💇🏿‍♂️|🕵🏻‍♀️|🕵🏻‍♂️|🕵🏼‍♀️|🕵🏼‍♂️|🕵🏽‍♀️|🕵🏽‍♂️|🕵🏾‍♀️|🕵🏾‍♂️|🕵🏿‍♀️|🕵🏿‍♂️|🕵️‍♀️|🕵️‍♂️|🙅‍♀️|🙅‍♂️|🙅🏻‍♀️|🙅🏻‍♂️|🙅🏼‍♀️|🙅🏼‍♂️|🙅🏽‍♀️|🙅🏽‍♂️|🙅🏾‍♀️|🙅🏾‍♂️|🙅🏿‍♀️|🙅🏿‍♂️|🙆‍♀️|🙆‍♂️|🙆🏻‍♀️|🙆🏻‍♂️|🙆🏼‍♀️|🙆🏼‍♂️|🙆🏽‍♀️|🙆🏽‍♂️|🙆🏾‍♀️|🙆🏾‍♂️|🙆🏿‍♀️|🙆🏿‍♂️|🙇‍♀️|🙇‍♂️|🙇🏻‍♀️|🙇🏻‍♂️|🙇🏼‍♀️|🙇🏼‍♂️|🙇🏽‍♀️|🙇🏽‍♂️|🙇🏾‍♀️|🙇🏾‍♂️|🙇🏿‍♀️|🙇🏿‍♂️|🙋‍♀️|🙋‍♂️|🙋🏻‍♀️|🙋🏻‍♂️|🙋🏼‍♀️|🙋🏼‍♂️|🙋🏽‍♀️|🙋🏽‍♂️|🙋🏾‍♀️|🙋🏾‍♂️|🙋🏿‍♀️|🙋🏿‍♂️|🙍‍♀️|🙍‍♂️|🙍🏻‍♀️|🙍🏻‍♂️|🙍🏼‍♀️|🙍🏼‍♂️|🙍🏽‍♀️|🙍🏽‍♂️|🙍🏾‍♀️|🙍🏾‍♂️|🙍🏿‍♀️|🙍🏿‍♂️|🙎‍♀️|🙎‍♂️|🙎🏻‍♀️|🙎🏻‍♂️|🙎🏼‍♀️|🙎🏼‍♂️|🙎🏽‍♀️|🙎🏽‍♂️|🙎🏾‍♀️|🙎🏾‍♂️|🙎🏿‍♀️|🙎🏿‍♂️|🚣‍♀️|🚣‍♂️|🚣🏻‍♀️|🚣🏻‍♂️|🚣🏼‍♀️|🚣🏼‍♂️|🚣🏽‍♀️|🚣🏽‍♂️|🚣🏾‍♀️|🚣🏾‍♂️|🚣🏿‍♀️|🚣🏿‍♂️|🚴‍♀️|🚴‍♂️|🚴🏻‍♀️|🚴🏻‍♂️|🚴🏼‍♀️|🚴🏼‍♂️|🚴🏽‍♀️|🚴🏽‍♂️|🚴🏾‍♀️|🚴🏾‍♂️|🚴🏿‍♀️|🚴🏿‍♂️|🚵‍♀️|🚵‍♂️|🚵🏻‍♀️|🚵🏻‍♂️|🚵🏼‍♀️|🚵🏼‍♂️|🚵🏽‍♀️|🚵🏽‍♂️|🚵🏾‍♀️|🚵🏾‍♂️|🚵🏿‍♀️|🚵🏿‍♂️|🚶‍♀️|🚶‍♂️|🚶🏻‍♀️|🚶🏻‍♂️|🚶🏼‍♀️|🚶🏼‍♂️|🚶🏽‍♀️|🚶🏽‍♂️|🚶🏾‍♀️|🚶🏾‍♂️|🚶🏿‍♀️|🚶🏿‍♂️|🤦‍♀️|🤦‍♂️|🤦🏻‍♀️|🤦🏻‍♂️|🤦🏼‍♀️|🤦🏼‍♂️|🤦🏽‍♀️|🤦🏽‍♂️|🤦🏾‍♀️|🤦🏾‍♂️|🤦🏿‍♀️|🤦🏿‍♂️|🤵‍♀️|🤵‍♂️|🤵🏻‍♀️|🤵🏻‍♂️|🤵🏼‍♀️|🤵🏼‍♂️|🤵🏽‍♀️|🤵🏽‍♂️|🤵🏾‍♀️|🤵🏾‍♂️|🤵🏿‍♀️|🤵🏿‍♂️|🤷‍♀️|🤷‍♂️|🤷🏻‍♀️|🤷🏻‍♂️|🤷🏼‍♀️|🤷🏼‍♂️|🤷🏽‍♀️|🤷🏽‍♂️|🤷🏾‍♀️|🤷🏾‍♂️|🤷🏿‍♀️|🤷🏿‍♂️|🤸‍♀️|🤸‍♂️|🤸🏻‍♀️|🤸🏻‍♂️|🤸🏼‍♀️|🤸🏼‍♂️|🤸🏽‍♀️|🤸🏽‍♂️|🤸🏾‍♀️|🤸🏾‍♂️|🤸🏿‍♀️|🤸🏿‍♂️|🤹‍♀️|🤹‍♂️|🤹🏻‍♀️|🤹🏻‍♂️|🤹🏼‍♀️|🤹🏼‍♂️|🤹🏽‍♀️|🤹🏽‍♂️|🤹🏾‍♀️|🤹🏾‍♂️|🤹🏿‍♀️|🤹🏿‍♂️|🤼‍♀️|🤼‍♂️|🤽‍♀️|🤽‍♂️|🤽🏻‍♀️|🤽🏻‍♂️|🤽🏼‍♀️|🤽🏼‍♂️|🤽🏽‍♀️|🤽🏽‍♂️|🤽🏾‍♀️|🤽🏾‍♂️|🤽🏿‍♀️|🤽🏿‍♂️|🤾‍♀️|🤾‍♂️|🤾🏻‍♀️|🤾🏻‍♂️|🤾🏼‍♀️|🤾🏼‍♂️|🤾🏽‍♀️|🤾🏽‍♂️|🤾🏾‍♀️|🤾🏾‍♂️|🤾🏿‍♀️|🤾🏿‍♂️|🦸‍♀️|🦸‍♂️|🦸🏻‍♀️|🦸🏻‍♂️|🦸🏼‍♀️|🦸🏼‍♂️|🦸🏽‍♀️|🦸🏽‍♂️|🦸🏾‍♀️|🦸🏾‍♂️|🦸🏿‍♀️|🦸🏿‍♂️|🦹‍♀️|🦹‍♂️|🦹🏻‍♀️|🦹🏻‍♂️|🦹🏼‍♀️|🦹🏼‍♂️|🦹🏽‍♀️|🦹🏽‍♂️|🦹🏾‍♀️|🦹🏾‍♂️|🦹🏿‍♀️|🦹🏿‍♂️|🧍‍♀️|🧍‍♂️|🧍🏻‍♀️|🧍🏻‍♂️|🧍🏼‍♀️|🧍🏼‍♂️|🧍🏽‍♀️|🧍🏽‍♂️|🧍🏾‍♀️|🧍🏾‍♂️|🧍🏿‍♀️|🧍🏿‍♂️|🧎‍♀️|🧎‍♂️|🧎🏻‍♀️|🧎🏻‍♂️|🧎🏼‍♀️|🧎🏼‍♂️|🧎🏽‍♀️|🧎🏽‍♂️|🧎🏾‍♀️|🧎🏾‍♂️|🧎🏿‍♀️|🧎🏿‍♂️|🧏‍♀️|🧏‍♂️|🧏🏻‍♀️|🧏🏻‍♂️|🧏🏼‍♀️|🧏🏼‍♂️|🧏🏽‍♀️|🧏🏽‍♂️|🧏🏾‍♀️|🧏🏾‍♂️|🧏🏿‍♀️|🧏🏿‍♂️|🧔‍♀️|🧔‍♂️|🧔🏻‍♀️|🧔🏻‍♂️|🧔🏼‍♀️|🧔🏼‍♂️|🧔🏽‍♀️|🧔🏽‍♂️|🧔🏾‍♀️|🧔🏾‍♂️|🧔🏿‍♀️|🧔🏿‍♂️|🧖‍♀️|🧖‍♂️|🧖🏻‍♀️|🧖🏻‍♂️|🧖🏼‍♀️|🧖🏼‍♂️|🧖🏽‍♀️|🧖🏽‍♂️|🧖🏾‍♀️|🧖🏾‍♂️|🧖🏿‍♀️|🧖🏿‍♂️|🧗‍♀️|🧗‍♂️|🧗🏻‍♀️|🧗🏻‍♂️|🧗🏼‍♀️|🧗🏼‍♂️|🧗🏽‍♀️|🧗🏽‍♂️|🧗🏾‍♀️|🧗🏾‍♂️|🧗🏿‍♀️|🧗🏿‍♂️|🧘‍♀️|🧘‍♂️|🧘🏻‍♀️|🧘🏻‍♂️|🧘🏼‍♀️|🧘🏼‍♂️|🧘🏽‍♀️|🧘🏽‍♂️|🧘🏾‍♀️|🧘🏾‍♂️|🧘🏿‍♀️|🧘🏿‍♂️|🧙‍♀️|🧙‍♂️|🧙🏻‍♀️|🧙🏻‍♂️|🧙🏼‍♀️|🧙🏼‍♂️|🧙🏽‍♀️|🧙🏽‍♂️|🧙🏾‍♀️|🧙🏾‍♂️|🧙🏿‍♀️|🧙🏿‍♂️|🧚‍♀️|🧚‍♂️|🧚🏻‍♀️|🧚🏻‍♂️|🧚🏼‍♀️|🧚🏼‍♂️|🧚🏽‍♀️|🧚🏽‍♂️|🧚🏾‍♀️|🧚🏾‍♂️|🧚🏿‍♀️|🧚🏿‍♂️|🧛‍♀️|🧛‍♂️|🧛🏻‍♀️|🧛🏻‍♂️|🧛🏼‍♀️|🧛🏼‍♂️|🧛🏽‍♀️|🧛🏽‍♂️|🧛🏾‍♀️|🧛🏾‍♂️|🧛🏿‍♀️|🧛🏿‍♂️|🧜‍♀️|🧜‍♂️|🧜🏻‍♀️|🧜🏻‍♂️|🧜🏼‍♀️|🧜🏼‍♂️|🧜🏽‍♀️|🧜🏽‍♂️|🧜🏾‍♀️|🧜🏾‍♂️|🧜🏿‍♀️|🧜🏿‍♂️|🧝‍♀️|🧝‍♂️|🧝🏻‍♀️|🧝🏻‍♂️|🧝🏼‍♀️|🧝🏼‍♂️|🧝🏽‍♀️|🧝🏽‍♂️|🧝🏾‍♀️|🧝🏾‍♂️|🧝🏿‍♀️|🧝🏿‍♂️|🧞‍♀️|🧞‍♂️|🧟‍♀️|🧟‍♂️|👨‍🦰|👨‍🦱|👨‍🦲|👨‍🦳|👨🏻‍🦰|👨🏻‍🦱|👨🏻‍🦲|👨🏻‍🦳|👨🏼‍🦰|👨🏼‍🦱|👨🏼‍🦲|👨🏼‍🦳|👨🏽‍🦰|👨🏽‍🦱|👨🏽‍🦲|👨🏽‍🦳|👨🏾‍🦰|👨🏾‍🦱|👨🏾‍🦲|👨🏾‍🦳|👨🏿‍🦰|👨🏿‍🦱|👨🏿‍🦲|👨🏿‍🦳|👩‍🦰|👩‍🦱|👩‍🦲|👩‍🦳|👩🏻‍🦰|👩🏻‍🦱|👩🏻‍🦲|👩🏻‍🦳|👩🏼‍🦰|👩🏼‍🦱|👩🏼‍🦲|👩🏼‍🦳|👩🏽‍🦰|👩🏽‍🦱|👩🏽‍🦲|👩🏽‍🦳|👩🏾‍🦰|👩🏾‍🦱|👩🏾‍🦲|👩🏾‍🦳|👩🏿‍🦰|👩🏿‍🦱|👩🏿‍🦲|👩🏿‍🦳|🧑‍🦰|🧑‍🦱|🧑‍🦲|🧑‍🦳|🧑🏻‍🦰|🧑🏻‍🦱|🧑🏻‍🦲|🧑🏻‍🦳|🧑🏼‍🦰|🧑🏼‍🦱|🧑🏼‍🦲|🧑🏼‍🦳|🧑🏽‍🦰|🧑🏽‍🦱|🧑🏽‍🦲|🧑🏽‍🦳|🧑🏾‍🦰|🧑🏾‍🦱|🧑🏾‍🦲|🧑🏾‍🦳|🧑🏿‍🦰|🧑🏿‍🦱|🧑🏿‍🦲|🧑🏿‍🦳|❤️‍🔥|❤️‍🩹|🏳️‍⚧️|🏳️‍🌈|🏴‍☠️|🐈‍⬛|🐕‍🦺|🐦‍⬛|🐻‍❄️|👁️‍🗨️|😮‍💨|😵‍💫|😶‍🌫️|🧑‍🎄)/gu,
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
 
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index dee635089e00..125e391f12d4 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -265,18 +265,30 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
+    let str = `${text}`;
     const emojis = [];
-    if (!text) {
+
+    if (!str) {
         return emojis;
     }
 
-    let parseEmojis = text.match(CONST.REGEX.EMOJIS);
+    let sequenceEmojis = str.match(CONST.REGEX.EMOJI_ZWJ_SEQUENCES);
+
+    if (sequenceEmojis) {
+        sequenceEmojis = [...new Set(sequenceEmojis)];
+        for (const sequenceEmoji of sequenceEmojis) {
+            const regex = new RegExp(sequenceEmoji, 'gu');
+            str = str.replace(regex, '');
+        }
+    }
+
+    let parseEmojis = str.match(CONST.REGEX.EMOJIS);
 
-    if (!parseEmojis) {
+    if (!parseEmojis && !sequenceEmojis) {
         return emojis;
     }
 
-    parseEmojis = [...new Set(parseEmojis)];
+    parseEmojis = [...new Set(parseEmojis), ...sequenceEmojis];
 
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];

From 4a533bd3b902e8134567f825d79e773a32ab80b6 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 26 Jul 2023 02:36:18 +0530
Subject: [PATCH 008/214] Removed extra emojis

---
 src/CONST.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index c4fd7a5174eb..395967b43e0f 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1149,7 +1149,7 @@ const CONST = {
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
         EMOJI_ZWJ_SEQUENCES:
-            /(👨‍❤️‍👨|👨‍❤️‍💋‍👨|👨‍👦|👨‍👦‍👦|👨‍👧|👨‍👧‍👦|👨‍👧‍👧|👨‍👨‍👦|👨‍👨‍👦‍👦|👨‍👨‍👧|👨‍👨‍👧‍👦|👨‍👨‍👧‍👧|👨‍👩‍👦|👨‍👩‍👦‍👦|👨‍👩‍👧|👨‍👩‍👧‍👦|👨‍👩‍👧‍👧|👨🏻‍❤️‍👨🏻|👨🏻‍❤️‍👨🏼|👨🏻‍❤️‍👨🏽|👨🏻‍❤️‍👨🏾|👨🏻‍❤️‍👨🏿|👨🏻‍❤️‍💋‍👨🏻|👨🏻‍❤️‍💋‍👨🏼|👨🏻‍❤️‍💋‍👨🏽|👨🏻‍❤️‍💋‍👨🏾|👨🏻‍❤️‍💋‍👨🏿|👨🏻‍🤝‍👨🏼|👨🏻‍🤝‍👨🏽|👨🏻‍🤝‍👨🏾|👨🏻‍🤝‍👨🏿|👨🏼‍❤️‍👨🏻|👨🏼‍❤️‍👨🏼|👨🏼‍❤️‍👨🏽|👨🏼‍❤️‍👨🏾|👨🏼‍❤️‍👨🏿|👨🏼‍❤️‍💋‍👨🏻|👨🏼‍❤️‍💋‍👨🏼|👨🏼‍❤️‍💋‍👨🏽|👨🏼‍❤️‍💋‍👨🏾|👨🏼‍❤️‍💋‍👨🏿|👨🏼‍🤝‍👨🏻|👨🏼‍🤝‍👨🏽|👨🏼‍🤝‍👨🏾|👨🏼‍🤝‍👨🏿|👨🏽‍❤️‍👨🏻|👨🏽‍❤️‍👨🏼|👨🏽‍❤️‍👨🏽|👨🏽‍❤️‍👨🏾|👨🏽‍❤️‍👨🏿|👨🏽‍❤️‍💋‍👨🏻|👨🏽‍❤️‍💋‍👨🏼|👨🏽‍❤️‍💋‍👨🏽|👨🏽‍❤️‍💋‍👨🏾|👨🏽‍❤️‍💋‍👨🏿|👨🏽‍🤝‍👨🏻|👨🏽‍🤝‍👨🏼|👨🏽‍🤝‍👨🏾|👨🏽‍🤝‍👨🏿|👨🏾‍❤️‍👨🏻|👨🏾‍❤️‍👨🏼|👨🏾‍❤️‍👨🏽|👨🏾‍❤️‍👨🏾|👨🏾‍❤️‍👨🏿|👨🏾‍❤️‍💋‍👨🏻|👨🏾‍❤️‍💋‍👨🏼|👨🏾‍❤️‍💋‍👨🏽|👨🏾‍❤️‍💋‍👨🏾|👨🏾‍❤️‍💋‍👨🏿|👨🏾‍🤝‍👨🏻|👨🏾‍🤝‍👨🏼|👨🏾‍🤝‍👨🏽|👨🏾‍🤝‍👨🏿|👨🏿‍❤️‍👨🏻|👨🏿‍❤️‍👨🏼|👨🏿‍❤️‍👨🏽|👨🏿‍❤️‍👨🏾|👨🏿‍❤️‍👨🏿|👨🏿‍❤️‍💋‍👨🏻|👨🏿‍❤️‍💋‍👨🏼|👨🏿‍❤️‍💋‍👨🏽|👨🏿‍❤️‍💋‍👨🏾|👨🏿‍❤️‍💋‍👨🏿|👨🏿‍🤝‍👨🏻|👨🏿‍🤝‍👨🏼|👨🏿‍🤝‍👨🏽|👨🏿‍🤝‍👨🏾|👩‍❤️‍👨|👩‍❤️‍👩|👩‍❤️‍💋‍👨|👩‍❤️‍💋‍👩|👩‍👦|👩‍👦‍👦|👩‍👧|👩‍👧‍👦|👩‍👧‍👧|👩‍👩‍👦|👩‍👩‍👦‍👦|👩‍👩‍👧|👩‍👩‍👧‍👦|👩‍👩‍👧‍👧|👩🏻‍❤️‍👨🏻|👩🏻‍❤️‍👨🏼|👩🏻‍❤️‍👨🏽|👩🏻‍❤️‍👨🏾|👩🏻‍❤️‍👨🏿|👩🏻‍❤️‍👩🏻|👩🏻‍❤️‍👩🏼|👩🏻‍❤️‍👩🏽|👩🏻‍❤️‍👩🏾|👩🏻‍❤️‍👩🏿|👩🏻‍❤️‍💋‍👨🏻|👩🏻‍❤️‍💋‍👨🏼|👩🏻‍❤️‍💋‍👨🏽|👩🏻‍❤️‍💋‍👨🏾|👩🏻‍❤️‍💋‍👨🏿|👩🏻‍❤️‍💋‍👩🏻|👩🏻‍❤️‍💋‍👩🏼|👩🏻‍❤️‍💋‍👩🏽|👩🏻‍❤️‍💋‍👩🏾|👩🏻‍❤️‍💋‍👩🏿|👩🏻‍🤝‍👨🏼|👩🏻‍🤝‍👨🏽|👩🏻‍🤝‍👨🏾|👩🏻‍🤝‍👨🏿|👩🏻‍🤝‍👩🏼|👩🏻‍🤝‍👩🏽|👩🏻‍🤝‍👩🏾|👩🏻‍🤝‍👩🏿|👩🏼‍❤️‍👨🏻|👩🏼‍❤️‍👨🏼|👩🏼‍❤️‍👨🏽|👩🏼‍❤️‍👨🏾|👩🏼‍❤️‍👨🏿|👩🏼‍❤️‍👩🏻|👩🏼‍❤️‍👩🏼|👩🏼‍❤️‍👩🏽|👩🏼‍❤️‍👩🏾|👩🏼‍❤️‍👩🏿|👩🏼‍❤️‍💋‍👨🏻|👩🏼‍❤️‍💋‍👨🏼|👩🏼‍❤️‍💋‍👨🏽|👩🏼‍❤️‍💋‍👨🏾|👩🏼‍❤️‍💋‍👨🏿|👩🏼‍❤️‍💋‍👩🏻|👩🏼‍❤️‍💋‍👩🏼|👩🏼‍❤️‍💋‍👩🏽|👩🏼‍❤️‍💋‍👩🏾|👩🏼‍❤️‍💋‍👩🏿|👩🏼‍🤝‍👨🏻|👩🏼‍🤝‍👨🏽|👩🏼‍🤝‍👨🏾|👩🏼‍🤝‍👨🏿|👩🏼‍🤝‍👩🏻|👩🏼‍🤝‍👩🏽|👩🏼‍🤝‍👩🏾|👩🏼‍🤝‍👩🏿|👩🏽‍❤️‍👨🏻|👩🏽‍❤️‍👨🏼|👩🏽‍❤️‍👨🏽|👩🏽‍❤️‍👨🏾|👩🏽‍❤️‍👨🏿|👩🏽‍❤️‍👩🏻|👩🏽‍❤️‍👩🏼|👩🏽‍❤️‍👩🏽|👩🏽‍❤️‍👩🏾|👩🏽‍❤️‍👩🏿|👩🏽‍❤️‍💋‍👨🏻|👩🏽‍❤️‍💋‍👨🏼|👩🏽‍❤️‍💋‍👨🏽|👩🏽‍❤️‍💋‍👨🏾|👩🏽‍❤️‍💋‍👨🏿|👩🏽‍❤️‍💋‍👩🏻|👩🏽‍❤️‍💋‍👩🏼|👩🏽‍❤️‍💋‍👩🏽|👩🏽‍❤️‍💋‍👩🏾|👩🏽‍❤️‍💋‍👩🏿|👩🏽‍🤝‍👨🏻|👩🏽‍🤝‍👨🏼|👩🏽‍🤝‍👨🏾|👩🏽‍🤝‍👨🏿|👩🏽‍🤝‍👩🏻|👩🏽‍🤝‍👩🏼|👩🏽‍🤝‍👩🏾|👩🏽‍🤝‍👩🏿|👩🏾‍❤️‍👨🏻|👩🏾‍❤️‍👨🏼|👩🏾‍❤️‍👨🏽|👩🏾‍❤️‍👨🏾|👩🏾‍❤️‍👨🏿|👩🏾‍❤️‍👩🏻|👩🏾‍❤️‍👩🏼|👩🏾‍❤️‍👩🏽|👩🏾‍❤️‍👩🏾|👩🏾‍❤️‍👩🏿|👩🏾‍❤️‍💋‍👨🏻|👩🏾‍❤️‍💋‍👨🏼|👩🏾‍❤️‍💋‍👨🏽|👩🏾‍❤️‍💋‍👨🏾|👩🏾‍❤️‍💋‍👨🏿|👩🏾‍❤️‍💋‍👩🏻|👩🏾‍❤️‍💋‍👩🏼|👩🏾‍❤️‍💋‍👩🏽|👩🏾‍❤️‍💋‍👩🏾|👩🏾‍❤️‍💋‍👩🏿|👩🏾‍🤝‍👨🏻|👩🏾‍🤝‍👨🏼|👩🏾‍🤝‍👨🏽|👩🏾‍🤝‍👨🏿|👩🏾‍🤝‍👩🏻|👩🏾‍🤝‍👩🏼|👩🏾‍🤝‍👩🏽|👩🏾‍🤝‍👩🏿|👩🏿‍❤️‍👨🏻|👩🏿‍❤️‍👨🏼|👩🏿‍❤️‍👨🏽|👩🏿‍❤️‍👨🏾|👩🏿‍❤️‍👨🏿|👩🏿‍❤️‍👩🏻|👩🏿‍❤️‍👩🏼|👩🏿‍❤️‍👩🏽|👩🏿‍❤️‍👩🏾|👩🏿‍❤️‍👩🏿|👩🏿‍❤️‍💋‍👨🏻|👩🏿‍❤️‍💋‍👨🏼|👩🏿‍❤️‍💋‍👨🏽|👩🏿‍❤️‍💋‍👨🏾|👩🏿‍❤️‍💋‍👨🏿|👩🏿‍❤️‍💋‍👩🏻|👩🏿‍❤️‍💋‍👩🏼|👩🏿‍❤️‍💋‍👩🏽|👩🏿‍❤️‍💋‍👩🏾|👩🏿‍❤️‍💋‍👩🏿|👩🏿‍🤝‍👨🏻|👩🏿‍🤝‍👨🏼|👩🏿‍🤝‍👨🏽|👩🏿‍🤝‍👨🏾|👩🏿‍🤝‍👩🏻|👩🏿‍🤝‍👩🏼|👩🏿‍🤝‍👩🏽|👩🏿‍🤝‍👩🏾|🧑‍🤝‍🧑|🧑🏻‍❤️‍💋‍🧑🏼|🧑🏻‍❤️‍💋‍🧑🏽|🧑🏻‍❤️‍💋‍🧑🏾|🧑🏻‍❤️‍💋‍🧑🏿|🧑🏻‍❤️‍🧑🏼|🧑🏻‍❤️‍🧑🏽|🧑🏻‍❤️‍🧑🏾|🧑🏻‍❤️‍🧑🏿|🧑🏻‍🎄|🧑🏻‍🤝‍🧑🏻|🧑🏻‍🤝‍🧑🏼|🧑🏻‍🤝‍🧑🏽|🧑🏻‍🤝‍🧑🏾|🧑🏻‍🤝‍🧑🏿|🧑🏼‍❤️‍💋‍🧑🏻|🧑🏼‍❤️‍💋‍🧑🏽|🧑🏼‍❤️‍💋‍🧑🏾|🧑🏼‍❤️‍💋‍🧑🏿|🧑🏼‍❤️‍🧑🏻|🧑🏼‍❤️‍🧑🏽|🧑🏼‍❤️‍🧑🏾|🧑🏼‍❤️‍🧑🏿|🧑🏼‍🎄|🧑🏼‍🤝‍🧑🏻|🧑🏼‍🤝‍🧑🏼|🧑🏼‍🤝‍🧑🏽|🧑🏼‍🤝‍🧑🏾|🧑🏼‍🤝‍🧑🏿|🧑🏽‍❤️‍💋‍🧑🏻|🧑🏽‍❤️‍💋‍🧑🏼|🧑🏽‍❤️‍💋‍🧑🏾|🧑🏽‍❤️‍💋‍🧑🏿|🧑🏽‍❤️‍🧑🏻|🧑🏽‍❤️‍🧑🏼|🧑🏽‍❤️‍🧑🏾|🧑🏽‍❤️‍🧑🏿|🧑🏽‍🎄|🧑🏽‍🤝‍🧑🏻|🧑🏽‍🤝‍🧑🏼|🧑🏽‍🤝‍🧑🏽|🧑🏽‍🤝‍🧑🏾|🧑🏽‍🤝‍🧑🏿|🧑🏾‍❤️‍💋‍🧑🏻|🧑🏾‍❤️‍💋‍🧑🏼|🧑🏾‍❤️‍💋‍🧑🏽|🧑🏾‍❤️‍💋‍🧑🏿|🧑🏾‍❤️‍🧑🏻|🧑🏾‍❤️‍🧑🏼|🧑🏾‍❤️‍🧑🏽|🧑🏾‍❤️‍🧑🏿|🧑🏾‍🎄|🧑🏾‍🤝‍🧑🏻|🧑🏾‍🤝‍🧑🏼|🧑🏾‍🤝‍🧑🏽|🧑🏾‍🤝‍🧑🏾|🧑🏾‍🤝‍🧑🏿|🧑🏿‍❤️‍💋‍🧑🏻|🧑🏿‍❤️‍💋‍🧑🏼|🧑🏿‍❤️‍💋‍🧑🏽|🧑🏿‍❤️‍💋‍🧑🏾|🧑🏿‍❤️‍🧑🏻|🧑🏿‍❤️‍🧑🏼|🧑🏿‍❤️‍🧑🏽|🧑🏿‍❤️‍🧑🏾|🧑🏿‍🎄|🧑🏿‍🤝‍🧑🏻|🧑🏿‍🤝‍🧑🏼|🧑🏿‍🤝‍🧑🏽|🧑🏿‍🤝‍🧑🏾|🧑🏿‍🤝‍🧑🏿|🫱🏻‍🫲🏼|🫱🏻‍🫲🏽|🫱🏻‍🫲🏾|🫱🏻‍🫲🏿|🫱🏼‍🫲🏻|🫱🏼‍🫲🏽|🫱🏼‍🫲🏾|🫱🏼‍🫲🏿|🫱🏽‍🫲🏻|🫱🏽‍🫲🏼|🫱🏽‍🫲🏾|🫱🏽‍🫲🏿|🫱🏾‍🫲🏻|🫱🏾‍🫲🏼|🫱🏾‍🫲🏽|🫱🏾‍🫲🏿|🫱🏿‍🫲🏻|🫱🏿‍🫲🏼|🫱🏿‍🫲🏽|🫱🏿‍🫲🏾|👨‍⚕️|👨‍⚖️|👨‍✈️|👨‍🌾|👨‍🍳|👨‍🍼|👨‍🎓|👨‍🎤|👨‍🎨|👨‍🏫|👨‍🏭|👨‍💻|👨‍💼|👨‍🔧|👨‍🔬|👨‍🚀|👨‍🚒|👨‍🦯|👨‍🦼|👨‍🦽|👨🏻‍⚕️|👨🏻‍⚖️|👨🏻‍✈️|👨🏻‍🌾|👨🏻‍🍳|👨🏻‍🍼|👨🏻‍🎓|👨🏻‍🎤|👨🏻‍🎨|👨🏻‍🏫|👨🏻‍🏭|👨🏻‍💻|👨🏻‍💼|👨🏻‍🔧|👨🏻‍🔬|👨🏻‍🚀|👨🏻‍🚒|👨🏻‍🦯|👨🏻‍🦼|👨🏻‍🦽|👨🏼‍⚕️|👨🏼‍⚖️|👨🏼‍✈️|👨🏼‍🌾|👨🏼‍🍳|👨🏼‍🍼|👨🏼‍🎓|👨🏼‍🎤|👨🏼‍🎨|👨🏼‍🏫|👨🏼‍🏭|👨🏼‍💻|👨🏼‍💼|👨🏼‍🔧|👨🏼‍🔬|👨🏼‍🚀|👨🏼‍🚒|👨🏼‍🦯|👨🏼‍🦼|👨🏼‍🦽|👨🏽‍⚕️|👨🏽‍⚖️|👨🏽‍✈️|👨🏽‍🌾|👨🏽‍🍳|👨🏽‍🍼|👨🏽‍🎓|👨🏽‍🎤|👨🏽‍🎨|👨🏽‍🏫|👨🏽‍🏭|👨🏽‍💻|👨🏽‍💼|👨🏽‍🔧|👨🏽‍🔬|👨🏽‍🚀|👨🏽‍🚒|👨🏽‍🦯|👨🏽‍🦼|👨🏽‍🦽|👨🏾‍⚕️|👨🏾‍⚖️|👨🏾‍✈️|👨🏾‍🌾|👨🏾‍🍳|👨🏾‍🍼|👨🏾‍🎓|👨🏾‍🎤|👨🏾‍🎨|👨🏾‍🏫|👨🏾‍🏭|👨🏾‍💻|👨🏾‍💼|👨🏾‍🔧|👨🏾‍🔬|👨🏾‍🚀|👨🏾‍🚒|👨🏾‍🦯|👨🏾‍🦼|👨🏾‍🦽|👨🏿‍⚕️|👨🏿‍⚖️|👨🏿‍✈️|👨🏿‍🌾|👨🏿‍🍳|👨🏿‍🍼|👨🏿‍🎓|👨🏿‍🎤|👨🏿‍🎨|👨🏿‍🏫|👨🏿‍🏭|👨🏿‍💻|👨🏿‍💼|👨🏿‍🔧|👨🏿‍🔬|👨🏿‍🚀|👨🏿‍🚒|👨🏿‍🦯|👨🏿‍🦼|👨🏿‍🦽|👩‍⚕️|👩‍⚖️|👩‍✈️|👩‍🌾|👩‍🍳|👩‍🍼|👩‍🎓|👩‍🎤|👩‍🎨|👩‍🏫|👩‍🏭|👩‍💻|👩‍💼|👩‍🔧|👩‍🔬|👩‍🚀|👩‍🚒|👩‍🦯|👩‍🦼|👩‍🦽|👩🏻‍⚕️|👩🏻‍⚖️|👩🏻‍✈️|👩🏻‍🌾|👩🏻‍🍳|👩🏻‍🍼|👩🏻‍🎓|👩🏻‍🎤|👩🏻‍🎨|👩🏻‍🏫|👩🏻‍🏭|👩🏻‍💻|👩🏻‍💼|👩🏻‍🔧|👩🏻‍🔬|👩🏻‍🚀|👩🏻‍🚒|👩🏻‍🦯|👩🏻‍🦼|👩🏻‍🦽|👩🏼‍⚕️|👩🏼‍⚖️|👩🏼‍✈️|👩🏼‍🌾|👩🏼‍🍳|👩🏼‍🍼|👩🏼‍🎓|👩🏼‍🎤|👩🏼‍🎨|👩🏼‍🏫|👩🏼‍🏭|👩🏼‍💻|👩🏼‍💼|👩🏼‍🔧|👩🏼‍🔬|👩🏼‍🚀|👩🏼‍🚒|👩🏼‍🦯|👩🏼‍🦼|👩🏼‍🦽|👩🏽‍⚕️|👩🏽‍⚖️|👩🏽‍✈️|👩🏽‍🌾|👩🏽‍🍳|👩🏽‍🍼|👩🏽‍🎓|👩🏽‍🎤|👩🏽‍🎨|👩🏽‍🏫|👩🏽‍🏭|👩🏽‍💻|👩🏽‍💼|👩🏽‍🔧|👩🏽‍🔬|👩🏽‍🚀|👩🏽‍🚒|👩🏽‍🦯|👩🏽‍🦼|👩🏽‍🦽|👩🏾‍⚕️|👩🏾‍⚖️|👩🏾‍✈️|👩🏾‍🌾|👩🏾‍🍳|👩🏾‍🍼|👩🏾‍🎓|👩🏾‍🎤|👩🏾‍🎨|👩🏾‍🏫|👩🏾‍🏭|👩🏾‍💻|👩🏾‍💼|👩🏾‍🔧|👩🏾‍🔬|👩🏾‍🚀|👩🏾‍🚒|👩🏾‍🦯|👩🏾‍🦼|👩🏾‍🦽|👩🏿‍⚕️|👩🏿‍⚖️|👩🏿‍✈️|👩🏿‍🌾|👩🏿‍🍳|👩🏿‍🍼|👩🏿‍🎓|👩🏿‍🎤|👩🏿‍🎨|👩🏿‍🏫|👩🏿‍🏭|👩🏿‍💻|👩🏿‍💼|👩🏿‍🔧|👩🏿‍🔬|👩🏿‍🚀|👩🏿‍🚒|👩🏿‍🦯|👩🏿‍🦼|👩🏿‍🦽|🧑‍⚕️|🧑‍⚖️|🧑‍✈️|🧑‍🌾|🧑‍🍳|🧑‍🍼|🧑‍🎓|🧑‍🎤|🧑‍🎨|🧑‍🏫|🧑‍🏭|🧑‍💻|🧑‍💼|🧑‍🔧|🧑‍🔬|🧑‍🚀|🧑‍🚒|🧑‍🦯|🧑‍🦼|🧑‍🦽|🧑🏻‍⚕️|🧑🏻‍⚖️|🧑🏻‍✈️|🧑🏻‍🌾|🧑🏻‍🍳|🧑🏻‍🍼|🧑🏻‍🎓|🧑🏻‍🎤|🧑🏻‍🎨|🧑🏻‍🏫|🧑🏻‍🏭|🧑🏻‍💻|🧑🏻‍💼|🧑🏻‍🔧|🧑🏻‍🔬|🧑🏻‍🚀|🧑🏻‍🚒|🧑🏻‍🦯|🧑🏻‍🦼|🧑🏻‍🦽|🧑🏼‍⚕️|🧑🏼‍⚖️|🧑🏼‍✈️|🧑🏼‍🌾|🧑🏼‍🍳|🧑🏼‍🍼|🧑🏼‍🎓|🧑🏼‍🎤|🧑🏼‍🎨|🧑🏼‍🏫|🧑🏼‍🏭|🧑🏼‍💻|🧑🏼‍💼|🧑🏼‍🔧|🧑🏼‍🔬|🧑🏼‍🚀|🧑🏼‍🚒|🧑🏼‍🦯|🧑🏼‍🦼|🧑🏼‍🦽|🧑🏽‍⚕️|🧑🏽‍⚖️|🧑🏽‍✈️|🧑🏽‍🌾|🧑🏽‍🍳|🧑🏽‍🍼|🧑🏽‍🎓|🧑🏽‍🎤|🧑🏽‍🎨|🧑🏽‍🏫|🧑🏽‍🏭|🧑🏽‍💻|🧑🏽‍💼|🧑🏽‍🔧|🧑🏽‍🔬|🧑🏽‍🚀|🧑🏽‍🚒|🧑🏽‍🦯|🧑🏽‍🦼|🧑🏽‍🦽|🧑🏾‍⚕️|🧑🏾‍⚖️|🧑🏾‍✈️|🧑🏾‍🌾|🧑🏾‍🍳|🧑🏾‍🍼|🧑🏾‍🎓|🧑🏾‍🎤|🧑🏾‍🎨|🧑🏾‍🏫|🧑🏾‍🏭|🧑🏾‍💻|🧑🏾‍💼|🧑🏾‍🔧|🧑🏾‍🔬|🧑🏾‍🚀|🧑🏾‍🚒|🧑🏾‍🦯|🧑🏾‍🦼|🧑🏾‍🦽|🧑🏿‍⚕️|🧑🏿‍⚖️|🧑🏿‍✈️|🧑🏿‍🌾|🧑🏿‍🍳|🧑🏿‍🍼|🧑🏿‍🎓|🧑🏿‍🎤|🧑🏿‍🎨|🧑🏿‍🏫|🧑🏿‍🏭|🧑🏿‍💻|🧑🏿‍💼|🧑🏿‍🔧|🧑🏿‍🔬|🧑🏿‍🚀|🧑🏿‍🚒|🧑🏿‍🦯|🧑🏿‍🦼|🧑🏿‍🦽|⛹🏻‍♀️|⛹🏻‍♂️|⛹🏼‍♀️|⛹🏼‍♂️|⛹🏽‍♀️|⛹🏽‍♂️|⛹🏾‍♀️|⛹🏾‍♂️|⛹🏿‍♀️|⛹🏿‍♂️|⛹️‍♀️|⛹️‍♂️|🏃‍♀️|🏃‍♂️|🏃🏻‍♀️|🏃🏻‍♂️|🏃🏼‍♀️|🏃🏼‍♂️|🏃🏽‍♀️|🏃🏽‍♂️|🏃🏾‍♀️|🏃🏾‍♂️|🏃🏿‍♀️|🏃🏿‍♂️|🏄‍♀️|🏄‍♂️|🏄🏻‍♀️|🏄🏻‍♂️|🏄🏼‍♀️|🏄🏼‍♂️|🏄🏽‍♀️|🏄🏽‍♂️|🏄🏾‍♀️|🏄🏾‍♂️|🏄🏿‍♀️|🏄🏿‍♂️|🏊‍♀️|🏊‍♂️|🏊🏻‍♀️|🏊🏻‍♂️|🏊🏼‍♀️|🏊🏼‍♂️|🏊🏽‍♀️|🏊🏽‍♂️|🏊🏾‍♀️|🏊🏾‍♂️|🏊🏿‍♀️|🏊🏿‍♂️|🏋🏻‍♀️|🏋🏻‍♂️|🏋🏼‍♀️|🏋🏼‍♂️|🏋🏽‍♀️|🏋🏽‍♂️|🏋🏾‍♀️|🏋🏾‍♂️|🏋🏿‍♀️|🏋🏿‍♂️|🏋️‍♀️|🏋️‍♂️|🏌🏻‍♀️|🏌🏻‍♂️|🏌🏼‍♀️|🏌🏼‍♂️|🏌🏽‍♀️|🏌🏽‍♂️|🏌🏾‍♀️|🏌🏾‍♂️|🏌🏿‍♀️|🏌🏿‍♂️|🏌️‍♀️|🏌️‍♂️|👮‍♀️|👮‍♂️|👮🏻‍♀️|👮🏻‍♂️|👮🏼‍♀️|👮🏼‍♂️|👮🏽‍♀️|👮🏽‍♂️|👮🏾‍♀️|👮🏾‍♂️|👮🏿‍♀️|👮🏿‍♂️|👯‍♀️|👯‍♂️|👰‍♀️|👰‍♂️|👰🏻‍♀️|👰🏻‍♂️|👰🏼‍♀️|👰🏼‍♂️|👰🏽‍♀️|👰🏽‍♂️|👰🏾‍♀️|👰🏾‍♂️|👰🏿‍♀️|👰🏿‍♂️|👱‍♀️|👱‍♂️|👱🏻‍♀️|👱🏻‍♂️|👱🏼‍♀️|👱🏼‍♂️|👱🏽‍♀️|👱🏽‍♂️|👱🏾‍♀️|👱🏾‍♂️|👱🏿‍♀️|👱🏿‍♂️|👳‍♀️|👳‍♂️|👳🏻‍♀️|👳🏻‍♂️|👳🏼‍♀️|👳🏼‍♂️|👳🏽‍♀️|👳🏽‍♂️|👳🏾‍♀️|👳🏾‍♂️|👳🏿‍♀️|👳🏿‍♂️|👷‍♀️|👷‍♂️|👷🏻‍♀️|👷🏻‍♂️|👷🏼‍♀️|👷🏼‍♂️|👷🏽‍♀️|👷🏽‍♂️|👷🏾‍♀️|👷🏾‍♂️|👷🏿‍♀️|👷🏿‍♂️|💁‍♀️|💁‍♂️|💁🏻‍♀️|💁🏻‍♂️|💁🏼‍♀️|💁🏼‍♂️|💁🏽‍♀️|💁🏽‍♂️|💁🏾‍♀️|💁🏾‍♂️|💁🏿‍♀️|💁🏿‍♂️|💂‍♀️|💂‍♂️|💂🏻‍♀️|💂🏻‍♂️|💂🏼‍♀️|💂🏼‍♂️|💂🏽‍♀️|💂🏽‍♂️|💂🏾‍♀️|💂🏾‍♂️|💂🏿‍♀️|💂🏿‍♂️|💆‍♀️|💆‍♂️|💆🏻‍♀️|💆🏻‍♂️|💆🏼‍♀️|💆🏼‍♂️|💆🏽‍♀️|💆🏽‍♂️|💆🏾‍♀️|💆🏾‍♂️|💆🏿‍♀️|💆🏿‍♂️|💇‍♀️|💇‍♂️|💇🏻‍♀️|💇🏻‍♂️|💇🏼‍♀️|💇🏼‍♂️|💇🏽‍♀️|💇🏽‍♂️|💇🏾‍♀️|💇🏾‍♂️|💇🏿‍♀️|💇🏿‍♂️|🕵🏻‍♀️|🕵🏻‍♂️|🕵🏼‍♀️|🕵🏼‍♂️|🕵🏽‍♀️|🕵🏽‍♂️|🕵🏾‍♀️|🕵🏾‍♂️|🕵🏿‍♀️|🕵🏿‍♂️|🕵️‍♀️|🕵️‍♂️|🙅‍♀️|🙅‍♂️|🙅🏻‍♀️|🙅🏻‍♂️|🙅🏼‍♀️|🙅🏼‍♂️|🙅🏽‍♀️|🙅🏽‍♂️|🙅🏾‍♀️|🙅🏾‍♂️|🙅🏿‍♀️|🙅🏿‍♂️|🙆‍♀️|🙆‍♂️|🙆🏻‍♀️|🙆🏻‍♂️|🙆🏼‍♀️|🙆🏼‍♂️|🙆🏽‍♀️|🙆🏽‍♂️|🙆🏾‍♀️|🙆🏾‍♂️|🙆🏿‍♀️|🙆🏿‍♂️|🙇‍♀️|🙇‍♂️|🙇🏻‍♀️|🙇🏻‍♂️|🙇🏼‍♀️|🙇🏼‍♂️|🙇🏽‍♀️|🙇🏽‍♂️|🙇🏾‍♀️|🙇🏾‍♂️|🙇🏿‍♀️|🙇🏿‍♂️|🙋‍♀️|🙋‍♂️|🙋🏻‍♀️|🙋🏻‍♂️|🙋🏼‍♀️|🙋🏼‍♂️|🙋🏽‍♀️|🙋🏽‍♂️|🙋🏾‍♀️|🙋🏾‍♂️|🙋🏿‍♀️|🙋🏿‍♂️|🙍‍♀️|🙍‍♂️|🙍🏻‍♀️|🙍🏻‍♂️|🙍🏼‍♀️|🙍🏼‍♂️|🙍🏽‍♀️|🙍🏽‍♂️|🙍🏾‍♀️|🙍🏾‍♂️|🙍🏿‍♀️|🙍🏿‍♂️|🙎‍♀️|🙎‍♂️|🙎🏻‍♀️|🙎🏻‍♂️|🙎🏼‍♀️|🙎🏼‍♂️|🙎🏽‍♀️|🙎🏽‍♂️|🙎🏾‍♀️|🙎🏾‍♂️|🙎🏿‍♀️|🙎🏿‍♂️|🚣‍♀️|🚣‍♂️|🚣🏻‍♀️|🚣🏻‍♂️|🚣🏼‍♀️|🚣🏼‍♂️|🚣🏽‍♀️|🚣🏽‍♂️|🚣🏾‍♀️|🚣🏾‍♂️|🚣🏿‍♀️|🚣🏿‍♂️|🚴‍♀️|🚴‍♂️|🚴🏻‍♀️|🚴🏻‍♂️|🚴🏼‍♀️|🚴🏼‍♂️|🚴🏽‍♀️|🚴🏽‍♂️|🚴🏾‍♀️|🚴🏾‍♂️|🚴🏿‍♀️|🚴🏿‍♂️|🚵‍♀️|🚵‍♂️|🚵🏻‍♀️|🚵🏻‍♂️|🚵🏼‍♀️|🚵🏼‍♂️|🚵🏽‍♀️|🚵🏽‍♂️|🚵🏾‍♀️|🚵🏾‍♂️|🚵🏿‍♀️|🚵🏿‍♂️|🚶‍♀️|🚶‍♂️|🚶🏻‍♀️|🚶🏻‍♂️|🚶🏼‍♀️|🚶🏼‍♂️|🚶🏽‍♀️|🚶🏽‍♂️|🚶🏾‍♀️|🚶🏾‍♂️|🚶🏿‍♀️|🚶🏿‍♂️|🤦‍♀️|🤦‍♂️|🤦🏻‍♀️|🤦🏻‍♂️|🤦🏼‍♀️|🤦🏼‍♂️|🤦🏽‍♀️|🤦🏽‍♂️|🤦🏾‍♀️|🤦🏾‍♂️|🤦🏿‍♀️|🤦🏿‍♂️|🤵‍♀️|🤵‍♂️|🤵🏻‍♀️|🤵🏻‍♂️|🤵🏼‍♀️|🤵🏼‍♂️|🤵🏽‍♀️|🤵🏽‍♂️|🤵🏾‍♀️|🤵🏾‍♂️|🤵🏿‍♀️|🤵🏿‍♂️|🤷‍♀️|🤷‍♂️|🤷🏻‍♀️|🤷🏻‍♂️|🤷🏼‍♀️|🤷🏼‍♂️|🤷🏽‍♀️|🤷🏽‍♂️|🤷🏾‍♀️|🤷🏾‍♂️|🤷🏿‍♀️|🤷🏿‍♂️|🤸‍♀️|🤸‍♂️|🤸🏻‍♀️|🤸🏻‍♂️|🤸🏼‍♀️|🤸🏼‍♂️|🤸🏽‍♀️|🤸🏽‍♂️|🤸🏾‍♀️|🤸🏾‍♂️|🤸🏿‍♀️|🤸🏿‍♂️|🤹‍♀️|🤹‍♂️|🤹🏻‍♀️|🤹🏻‍♂️|🤹🏼‍♀️|🤹🏼‍♂️|🤹🏽‍♀️|🤹🏽‍♂️|🤹🏾‍♀️|🤹🏾‍♂️|🤹🏿‍♀️|🤹🏿‍♂️|🤼‍♀️|🤼‍♂️|🤽‍♀️|🤽‍♂️|🤽🏻‍♀️|🤽🏻‍♂️|🤽🏼‍♀️|🤽🏼‍♂️|🤽🏽‍♀️|🤽🏽‍♂️|🤽🏾‍♀️|🤽🏾‍♂️|🤽🏿‍♀️|🤽🏿‍♂️|🤾‍♀️|🤾‍♂️|🤾🏻‍♀️|🤾🏻‍♂️|🤾🏼‍♀️|🤾🏼‍♂️|🤾🏽‍♀️|🤾🏽‍♂️|🤾🏾‍♀️|🤾🏾‍♂️|🤾🏿‍♀️|🤾🏿‍♂️|🦸‍♀️|🦸‍♂️|🦸🏻‍♀️|🦸🏻‍♂️|🦸🏼‍♀️|🦸🏼‍♂️|🦸🏽‍♀️|🦸🏽‍♂️|🦸🏾‍♀️|🦸🏾‍♂️|🦸🏿‍♀️|🦸🏿‍♂️|🦹‍♀️|🦹‍♂️|🦹🏻‍♀️|🦹🏻‍♂️|🦹🏼‍♀️|🦹🏼‍♂️|🦹🏽‍♀️|🦹🏽‍♂️|🦹🏾‍♀️|🦹🏾‍♂️|🦹🏿‍♀️|🦹🏿‍♂️|🧍‍♀️|🧍‍♂️|🧍🏻‍♀️|🧍🏻‍♂️|🧍🏼‍♀️|🧍🏼‍♂️|🧍🏽‍♀️|🧍🏽‍♂️|🧍🏾‍♀️|🧍🏾‍♂️|🧍🏿‍♀️|🧍🏿‍♂️|🧎‍♀️|🧎‍♂️|🧎🏻‍♀️|🧎🏻‍♂️|🧎🏼‍♀️|🧎🏼‍♂️|🧎🏽‍♀️|🧎🏽‍♂️|🧎🏾‍♀️|🧎🏾‍♂️|🧎🏿‍♀️|🧎🏿‍♂️|🧏‍♀️|🧏‍♂️|🧏🏻‍♀️|🧏🏻‍♂️|🧏🏼‍♀️|🧏🏼‍♂️|🧏🏽‍♀️|🧏🏽‍♂️|🧏🏾‍♀️|🧏🏾‍♂️|🧏🏿‍♀️|🧏🏿‍♂️|🧔‍♀️|🧔‍♂️|🧔🏻‍♀️|🧔🏻‍♂️|🧔🏼‍♀️|🧔🏼‍♂️|🧔🏽‍♀️|🧔🏽‍♂️|🧔🏾‍♀️|🧔🏾‍♂️|🧔🏿‍♀️|🧔🏿‍♂️|🧖‍♀️|🧖‍♂️|🧖🏻‍♀️|🧖🏻‍♂️|🧖🏼‍♀️|🧖🏼‍♂️|🧖🏽‍♀️|🧖🏽‍♂️|🧖🏾‍♀️|🧖🏾‍♂️|🧖🏿‍♀️|🧖🏿‍♂️|🧗‍♀️|🧗‍♂️|🧗🏻‍♀️|🧗🏻‍♂️|🧗🏼‍♀️|🧗🏼‍♂️|🧗🏽‍♀️|🧗🏽‍♂️|🧗🏾‍♀️|🧗🏾‍♂️|🧗🏿‍♀️|🧗🏿‍♂️|🧘‍♀️|🧘‍♂️|🧘🏻‍♀️|🧘🏻‍♂️|🧘🏼‍♀️|🧘🏼‍♂️|🧘🏽‍♀️|🧘🏽‍♂️|🧘🏾‍♀️|🧘🏾‍♂️|🧘🏿‍♀️|🧘🏿‍♂️|🧙‍♀️|🧙‍♂️|🧙🏻‍♀️|🧙🏻‍♂️|🧙🏼‍♀️|🧙🏼‍♂️|🧙🏽‍♀️|🧙🏽‍♂️|🧙🏾‍♀️|🧙🏾‍♂️|🧙🏿‍♀️|🧙🏿‍♂️|🧚‍♀️|🧚‍♂️|🧚🏻‍♀️|🧚🏻‍♂️|🧚🏼‍♀️|🧚🏼‍♂️|🧚🏽‍♀️|🧚🏽‍♂️|🧚🏾‍♀️|🧚🏾‍♂️|🧚🏿‍♀️|🧚🏿‍♂️|🧛‍♀️|🧛‍♂️|🧛🏻‍♀️|🧛🏻‍♂️|🧛🏼‍♀️|🧛🏼‍♂️|🧛🏽‍♀️|🧛🏽‍♂️|🧛🏾‍♀️|🧛🏾‍♂️|🧛🏿‍♀️|🧛🏿‍♂️|🧜‍♀️|🧜‍♂️|🧜🏻‍♀️|🧜🏻‍♂️|🧜🏼‍♀️|🧜🏼‍♂️|🧜🏽‍♀️|🧜🏽‍♂️|🧜🏾‍♀️|🧜🏾‍♂️|🧜🏿‍♀️|🧜🏿‍♂️|🧝‍♀️|🧝‍♂️|🧝🏻‍♀️|🧝🏻‍♂️|🧝🏼‍♀️|🧝🏼‍♂️|🧝🏽‍♀️|🧝🏽‍♂️|🧝🏾‍♀️|🧝🏾‍♂️|🧝🏿‍♀️|🧝🏿‍♂️|🧞‍♀️|🧞‍♂️|🧟‍♀️|🧟‍♂️|👨‍🦰|👨‍🦱|👨‍🦲|👨‍🦳|👨🏻‍🦰|👨🏻‍🦱|👨🏻‍🦲|👨🏻‍🦳|👨🏼‍🦰|👨🏼‍🦱|👨🏼‍🦲|👨🏼‍🦳|👨🏽‍🦰|👨🏽‍🦱|👨🏽‍🦲|👨🏽‍🦳|👨🏾‍🦰|👨🏾‍🦱|👨🏾‍🦲|👨🏾‍🦳|👨🏿‍🦰|👨🏿‍🦱|👨🏿‍🦲|👨🏿‍🦳|👩‍🦰|👩‍🦱|👩‍🦲|👩‍🦳|👩🏻‍🦰|👩🏻‍🦱|👩🏻‍🦲|👩🏻‍🦳|👩🏼‍🦰|👩🏼‍🦱|👩🏼‍🦲|👩🏼‍🦳|👩🏽‍🦰|👩🏽‍🦱|👩🏽‍🦲|👩🏽‍🦳|👩🏾‍🦰|👩🏾‍🦱|👩🏾‍🦲|👩🏾‍🦳|👩🏿‍🦰|👩🏿‍🦱|👩🏿‍🦲|👩🏿‍🦳|🧑‍🦰|🧑‍🦱|🧑‍🦲|🧑‍🦳|🧑🏻‍🦰|🧑🏻‍🦱|🧑🏻‍🦲|🧑🏻‍🦳|🧑🏼‍🦰|🧑🏼‍🦱|🧑🏼‍🦲|🧑🏼‍🦳|🧑🏽‍🦰|🧑🏽‍🦱|🧑🏽‍🦲|🧑🏽‍🦳|🧑🏾‍🦰|🧑🏾‍🦱|🧑🏾‍🦲|🧑🏾‍🦳|🧑🏿‍🦰|🧑🏿‍🦱|🧑🏿‍🦲|🧑🏿‍🦳|❤️‍🔥|❤️‍🩹|🏳️‍⚧️|🏳️‍🌈|🏴‍☠️|🐈‍⬛|🐕‍🦺|🐦‍⬛|🐻‍❄️|👁️‍🗨️|😮‍💨|😵‍💫|😶‍🌫️|🧑‍🎄)/gu,
+            /(😶‍🌫️|😮‍💨|😵‍💫|❤️‍🔥|👁️‍🗨️|🧔‍♂️|🧔🏾‍♂️|🧔🏼‍♂️|🧔‍♀️|🧔🏾‍♀️|🧔🏼‍♀️|👨‍🦰|👨🏾‍🦰|👨🏼‍🦰|👨‍🦱|👨🏾‍🦱|👨🏼‍🦱|👨‍🦳|👨🏾‍🦳|👨🏼‍🦳|👨‍🦲|👨🏾‍🦲|👨🏼‍🦲|👩‍🦰|👩🏾‍🦰|👩🏼‍🦰|🧑‍🦰|🧑🏾‍🦰|🧑🏼‍🦰|👩‍🦱|👩🏾‍🦱|👩🏼‍🦱|🧑‍🦱|🧑🏾‍🦱|🧑🏼‍🦱|👩‍🦳|👩🏾‍🦳|👩🏼‍🦳|🧑‍🦳|🧑🏾‍🦳|🧑🏼‍🦳|👩‍🦲|👩🏾‍🦲|👩🏼‍🦲|🧑‍🦲|🧑🏾‍🦲|🧑🏼‍🦲|👱‍♀️|👱🏾‍♀️|👱🏼‍♀️|👱‍♂️|👱🏾‍♂️|👱🏼‍♂️|🙍‍♂️|🙍🏾‍♂️|🙍🏼‍♂️|🙍‍♀️|🙍🏾‍♀️|🙍🏼‍♀️|🙎‍♂️|🙎🏾‍♂️|🙎🏼‍♂️|🙎‍♀️|🙎🏾‍♀️|🙎🏼‍♀️|🙅‍♂️|🙅🏾‍♂️|🙅🏼‍♂️|🙅‍♀️|🙅🏾‍♀️|🙅🏼‍♀️|🙆‍♂️|🙆🏾‍♂️|🙆🏼‍♂️|🙆‍♀️|🙆🏾‍♀️|🙆🏼‍♀️|💁‍♂️|💁🏾‍♂️|💁🏼‍♂️|💁‍♀️|💁🏾‍♀️|💁🏼‍♀️|🙋‍♂️|🙋🏾‍♂️|🙋🏼‍♂️|🙋‍♀️|🙋🏾‍♀️|🙋🏼‍♀️|🧏‍♂️|🧏🏾‍♂️|🧏🏼‍♂️|🧏‍♀️|🧏🏾‍♀️|🧏🏼‍♀️|🙇‍♂️|🙇🏾‍♂️|🙇🏼‍♂️|🙇‍♀️|🙇🏾‍♀️|🙇🏼‍♀️|🤦‍♂️|🤦🏾‍♂️|🤦🏼‍♂️|🤦‍♀️|🤦🏾‍♀️|🤦🏼‍♀️|🤷‍♂️|🤷🏾‍♂️|🤷🏼‍♂️|🤷‍♀️|🤷🏾‍♀️|🤷🏼‍♀️|🧑‍⚕️|🧑🏾‍⚕️|🧑🏼‍⚕️|👨‍⚕️|👨🏾‍⚕️|👨🏼‍⚕️|👩‍⚕️|👩🏾‍⚕️|👩🏼‍⚕️|🧑‍🎓|🧑🏾‍🎓|🧑🏼‍🎓|👨‍🎓|👨🏾‍🎓|👨🏼‍🎓|👩‍🎓|👩🏾‍🎓|👩🏼‍🎓|🧑‍🏫|🧑🏾‍🏫|🧑🏼‍🏫|👨‍🏫|👨🏾‍🏫|👨🏼‍🏫|👩‍🏫|👩🏾‍🏫|👩🏼‍🏫|🧑‍⚖️|🧑🏾‍⚖️|🧑🏼‍⚖️|👨‍⚖️|👨🏾‍⚖️|👨🏼‍⚖️|👩‍⚖️|👩🏾‍⚖️|👩🏼‍⚖️|🧑‍🌾|🧑🏾‍🌾|🧑🏼‍🌾|👨‍🌾|👨🏾‍🌾|👨🏼‍🌾|👩‍🌾|👩🏾‍🌾|👩🏼‍🌾|🧑‍🍳|🧑🏾‍🍳|🧑🏼‍🍳|👨‍🍳|👨🏾‍🍳|👨🏼‍🍳|👩‍🍳|👩🏾‍🍳|👩🏼‍🍳|🧑‍🔧|🧑🏾‍🔧|🧑🏼‍🔧|👨‍🔧|👨🏾‍🔧|👨🏼‍🔧|👩‍🔧|👩🏾‍🔧|👩🏼‍🔧|🧑‍🏭|🧑🏾‍🏭|🧑🏼‍🏭|👨‍🏭|👨🏾‍🏭|👨🏼‍🏭|👩‍🏭|👩🏾‍🏭|👩🏼‍🏭|🧑‍💼|🧑🏾‍💼|🧑🏼‍💼|👨‍💼|👨🏾‍💼|👨🏼‍💼|👩‍💼|👩🏾‍💼|👩🏼‍💼|🧑‍🔬|🧑🏾‍🔬|🧑🏼‍🔬|👨‍🔬|👨🏾‍🔬|👨🏼‍🔬|👩‍🔬|👩🏾‍🔬|👩🏼‍🔬|🧑‍💻|🧑🏾‍💻|🧑🏼‍💻|👨‍💻|👨🏾‍💻|👨🏼‍💻|👩‍💻|👩🏾‍💻|👩🏼‍💻|🧑‍🎤|🧑🏾‍🎤|🧑🏼‍🎤|👨‍🎤|👨🏾‍🎤|👨🏼‍🎤|👩‍🎤|👩🏾‍🎤|👩🏼‍🎤|🧑‍🎨|🧑🏾‍🎨|🧑🏼‍🎨|👨‍🎨|👨🏾‍🎨|👨🏼‍🎨|👩‍🎨|👩🏾‍🎨|👩🏼‍🎨|🧑‍✈️|🧑🏾‍✈️|🧑🏼‍✈️|👨‍✈️|👨🏾‍✈️|👨🏼‍✈️|👩‍✈️|👩🏾‍✈️|👩🏼‍✈️|🧑‍🚀|🧑🏾‍🚀|🧑🏼‍🚀|👨‍🚀|👨🏾‍🚀|👨🏼‍🚀|👩‍🚀|👩🏾‍🚀|👩🏼‍🚀|🧑‍🚒|🧑🏾‍🚒|🧑🏼‍🚒|👨‍🚒|👨🏾‍🚒|👨🏼‍🚒|👩‍🚒|👩🏾‍🚒|👩🏼‍🚒|👮‍♂️|👮🏾‍♂️|👮🏼‍♂️|👮‍♀️|👮🏾‍♀️|👮🏼‍♀️|🕵️‍♂️|🕵🏾‍♂️|🕵🏼‍♂️|🕵️‍♀️|🕵🏾‍♀️|🕵🏼‍♀️|💂‍♂️|💂🏾‍♂️|💂🏼‍♂️|💂‍♀️|💂🏾‍♀️|💂🏼‍♀️|👷‍♂️|👷🏾‍♂️|👷🏼‍♂️|👷‍♀️|👷🏾‍♀️|👷🏼‍♀️|👳‍♂️|👳🏾‍♂️|👳🏼‍♂️|👳‍♀️|👳🏾‍♀️|👳🏼‍♀️|🤵‍♂️|🤵🏾‍♂️|🤵🏼‍♂️|🤵‍♀️|🤵🏾‍♀️|🤵🏼‍♀️|👰‍♂️|👰🏾‍♂️|👰🏼‍♂️|👰‍♀️|👰🏾‍♀️|👰🏼‍♀️|👩‍🍼|👩🏾‍🍼|👩🏼‍🍼|👨‍🍼|👨🏾‍🍼|👨🏼‍🍼|🧑‍🍼|🧑🏾‍🍼|🧑🏼‍🍼|🧑‍🎄|🧑🏾‍🎄|🧑🏼‍🎄|🦸‍♂️|🦸🏾‍♂️|🦸🏼‍♂️|🦸‍♀️|🦸🏾‍♀️|🦸🏼‍♀️|🦹‍♂️|🦹🏾‍♂️|🦹🏼‍♂️|🦹‍♀️|🦹🏾‍♀️|🦹🏼‍♀️|🧙‍♂️|🧙🏾‍♂️|🧙🏼‍♂️|🧙‍♀️|🧙🏾‍♀️|🧙🏼‍♀️|🧚‍♂️|🧚🏾‍♂️|🧚🏼‍♂️|🧚‍♀️|🧚🏾‍♀️|🧚🏼‍♀️|🧛‍♂️|🧛🏾‍♂️|🧛🏼‍♂️|🧛‍♀️|🧛🏾‍♀️|🧛🏼‍♀️|🧜‍♂️|🧜🏾‍♂️|🧜🏼‍♂️|🧜‍♀️|🧜🏾‍♀️|🧜🏼‍♀️|🧝‍♂️|🧝🏾‍♂️|🧝🏼‍♂️|🧝‍♀️|🧝🏾‍♀️|🧝🏼‍♀️|🧞‍♂️|🧟‍♂️|💆‍♂️|💆🏾‍♂️|💆🏼‍♂️|💆‍♀️|💆🏾‍♀️|💆🏼‍♀️|💇‍♂️|💇🏾‍♂️|💇🏼‍♂️|💇‍♀️|💇🏾‍♀️|💇🏼‍♀️|🚶‍♂️|🚶🏾‍♂️|🚶🏼‍♂️|🚶‍♀️|🚶🏾‍♀️|🚶🏼‍♀️|🧍‍♂️|🧍🏾‍♂️|🧍🏼‍♂️|🧍‍♀️|🧍🏾‍♀️|🧍🏼‍♀️|🧎‍♂️|🧎🏾‍♂️|🧎🏼‍♂️|🧎‍♀️|🧎🏾‍♀️|🧎🏼‍♀️|🧑‍🦯|🧑🏾‍🦯|🧑🏼‍🦯|👨‍🦯|👨🏾‍🦯|👨🏼‍🦯|👩‍🦯|👩🏾‍🦯|👩🏼‍🦯|🧑‍🦼|🧑🏾‍🦼|🧑🏼‍🦼|👨‍🦼|👨🏾‍🦼|👨🏼‍🦼|👩‍🦼|👩🏾‍🦼|👩🏼‍🦼|🧑‍🦽|🧑🏾‍🦽|🧑🏼‍🦽|👨‍🦽|👨🏾‍🦽|👨🏼‍🦽|👩‍🦽|👩🏾‍🦽|👩🏼‍🦽|🏃‍♂️|🏃🏾‍♂️|🏃🏼‍♂️|🏃‍♀️|🏃🏾‍♀️|🏃🏼‍♀️|👯‍♂️|🧖‍♂️|🧖🏾‍♂️|🧖🏼‍♂️|🧖‍♀️|🧖🏾‍♀️|🧖🏼‍♀️|🧗‍♂️|🧗🏾‍♂️|🧗🏼‍♂️|🧗‍♀️|🧗🏾‍♀️|🧗🏼‍♀️|🏌️‍♂️|🏌🏾‍♂️|🏌🏼‍♂️|🏌️‍♀️|🏌🏾‍♀️|🏌🏼‍♀️|🏄‍♂️|🏄🏾‍♂️|🏄🏼‍♂️|🏄‍♀️|🏄🏾‍♀️|🏄🏼‍♀️|🚣‍♂️|🚣🏾‍♂️|🚣🏼‍♂️|🚣‍♀️|🚣🏾‍♀️|🚣🏼‍♀️|🏊‍♂️|🏊🏾‍♂️|🏊🏼‍♂️|🏊‍♀️|🏊🏾‍♀️|🏊🏼‍♀️|⛹️‍♂️|⛹🏾‍♂️|⛹🏼‍♂️|⛹️‍♀️|⛹🏾‍♀️|⛹🏼‍♀️|🏋️‍♂️|🏋🏾‍♂️|🏋🏼‍♂️|🏋️‍♀️|🏋🏾‍♀️|🏋🏼‍♀️|🚴‍♂️|🚴🏾‍♂️|🚴🏼‍♂️|🚴‍♀️|🚴🏾‍♀️|🚴🏼‍♀️|🚵‍♂️|🚵🏾‍♂️|🚵🏼‍♂️|🚵‍♀️|🚵🏾‍♀️|🚵🏼‍♀️|🤸‍♂️|🤸🏾‍♂️|🤸🏼‍♂️|🤸‍♀️|🤸🏾‍♀️|🤸🏼‍♀️|🤼‍♂️|🤽‍♂️|🤽🏾‍♂️|🤽🏼‍♂️|🤽‍♀️|🤽🏾‍♀️|🤽🏼‍♀️|🤾‍♂️|🤾🏾‍♂️|🤾🏼‍♂️|🤾‍♀️|🤾🏾‍♀️|🤾🏼‍♀️|🤹‍♂️|🤹🏾‍♂️|🤹🏼‍♂️|🤹‍♀️|🤹🏾‍♀️|🤹🏼‍♀️|🧘‍♂️|🧘🏾‍♂️|🧘🏼‍♂️|🧘‍♀️|🧘🏾‍♀️|🧘🏼‍♀️|🧑‍🤝‍🧑|🧑🏿‍🤝‍🧑🏾|🧑🏿‍🤝‍🧑🏼|🧑🏾‍🤝‍🧑🏿|🧑🏾‍🤝‍🧑🏽|🧑🏾‍🤝‍🧑🏻|🧑🏽‍🤝‍🧑🏾|🧑🏽‍🤝‍🧑🏼|🧑🏼‍🤝‍🧑🏿|🧑🏼‍🤝‍🧑🏽|🧑🏼‍🤝‍🧑🏻|🧑🏻‍🤝‍🧑🏾|🧑🏻‍🤝‍🧑🏼|👩🏿‍🤝‍👩🏾|👩🏿‍🤝‍👩🏼|👩🏾‍🤝‍👩🏿|👩🏾‍🤝‍👩🏼|👩🏽‍🤝‍👩🏿|👩🏽‍🤝‍👩🏼|👩🏼‍🤝‍👩🏿|👩🏼‍🤝‍👩🏽|👩🏻‍🤝‍👩🏿|👩🏻‍🤝‍👩🏽|👩🏿‍🤝‍👨🏾|👩🏿‍🤝‍👨🏼|👩🏾‍🤝‍👨🏿|👩🏾‍🤝‍👨🏼|👩🏽‍🤝‍👨🏿|👩🏽‍🤝‍👨🏼|👩🏼‍🤝‍👨🏿|👩🏼‍🤝‍👨🏽|👩🏻‍🤝‍👨🏿|👩🏻‍🤝‍👨🏽|👨🏿‍🤝‍👨🏾|👨🏿‍🤝‍👨🏼|👨🏾‍🤝‍👨🏿|👨🏾‍🤝‍👨🏼|👨🏽‍🤝‍👨🏿|👨🏽‍🤝‍👨🏼|👨🏼‍🤝‍👨🏿|👨🏼‍🤝‍👨🏽|👨🏻‍🤝‍👨🏿|👨🏻‍🤝‍👨🏽|🧑🏿‍❤️‍💋‍🧑🏾|🧑🏿‍❤️‍💋‍🧑🏼|🧑🏾‍❤️‍💋‍🧑🏿|🧑🏾‍❤️‍💋‍🧑🏼|🧑🏽‍❤️‍💋‍🧑🏿|🧑🏽‍❤️‍💋‍🧑🏼|🧑🏼‍❤️‍💋‍🧑🏿|🧑🏼‍❤️‍💋‍🧑🏽|🧑🏻‍❤️‍💋‍🧑🏿|🧑🏻‍❤️‍💋‍🧑🏽|👩‍❤️‍💋‍👨|👩🏿‍❤️‍💋‍👨🏾|👩🏿‍❤️‍💋‍👨🏼|👩🏾‍❤️‍💋‍👨🏿|👩🏾‍❤️‍💋‍👨🏽|👩🏾‍❤️‍💋‍👨🏻|👩🏽‍❤️‍💋‍👨🏾|👩🏽‍❤️‍💋‍👨🏼|👩🏼‍❤️‍💋‍👨🏿|👩🏼‍❤️‍💋‍👨🏽|👩🏼‍❤️‍💋‍👨🏻|👩🏻‍❤️‍💋‍👨🏾|👩🏻‍❤️‍💋‍👨🏼|👨‍❤️‍💋‍👨|👨🏿‍❤️‍💋‍👨🏾|👨🏿‍❤️‍💋‍👨🏼|👨🏾‍❤️‍💋‍👨🏿|👨🏾‍❤️‍💋‍👨🏽|👨🏾‍❤️‍💋‍👨🏻|👨🏽‍❤️‍💋‍👨🏾|👨🏽‍❤️‍💋‍👨🏼|👨🏼‍❤️‍💋‍👨🏿|👨🏼‍❤️‍💋‍👨🏽|👨🏼‍❤️‍💋‍👨🏻|👨🏻‍❤️‍💋‍👨🏾|👨🏻‍❤️‍💋‍👨🏼|👩‍❤️‍💋‍👩|👩🏿‍❤️‍💋‍👩🏾|👩🏿‍❤️‍💋‍👩🏼|👩🏾‍❤️‍💋‍👩🏿|👩🏾‍❤️‍💋‍👩🏽|👩🏾‍❤️‍💋‍👩🏻|👩🏽‍❤️‍💋‍👩🏾|👩🏽‍❤️‍💋‍👩🏼|👩🏼‍❤️‍💋‍👩🏿|👩🏼‍❤️‍💋‍👩🏽|👩🏼‍❤️‍💋‍👩🏻|👩🏻‍❤️‍💋‍👩🏾|👩🏻‍❤️‍💋‍👩🏼|🧑🏿‍❤️‍🧑🏾|🧑🏿‍❤️‍🧑🏼|🧑🏾‍❤️‍🧑🏿|🧑🏾‍❤️‍🧑🏼|🧑🏽‍❤️‍🧑🏿|🧑🏽‍❤️‍🧑🏼|🧑🏼‍❤️‍🧑🏿|🧑🏼‍❤️‍🧑🏽|🧑🏻‍❤️‍🧑🏿|🧑🏻‍❤️‍🧑🏽|👩‍❤️‍👨|👩🏿‍❤️‍👨🏾|👩🏿‍❤️‍👨🏼|👩🏾‍❤️‍👨🏿|👩🏾‍❤️‍👨🏽|👩🏾‍❤️‍👨🏻|👩🏽‍❤️‍👨🏾|👩🏽‍❤️‍👨🏼|👩🏼‍❤️‍👨🏿|👩🏼‍❤️‍👨🏽|👩🏼‍❤️‍👨🏻|👩🏻‍❤️‍👨🏾|👩🏻‍❤️‍👨🏼|👨‍❤️‍👨|👨🏿‍❤️‍👨🏾|👨🏿‍❤️‍👨🏼|👨🏾‍❤️‍👨🏿|👨🏾‍❤️‍👨🏽|👨🏾‍❤️‍👨🏻|👨🏽‍❤️‍👨🏾|👨🏽‍❤️‍👨🏼|👨🏼‍❤️‍👨🏿|👨🏼‍❤️‍👨🏽|👨🏼‍❤️‍👨🏻|👨🏻‍❤️‍👨🏾|👨🏻‍❤️‍👨🏼|👩‍❤️‍👩|👩🏿‍❤️‍👩🏾|👩🏿‍❤️‍👩🏼|👩🏾‍❤️‍👩🏿|👩🏾‍❤️‍👩🏽|👩🏾‍❤️‍👩🏻|👩🏽‍❤️‍👩🏾|👩🏽‍❤️‍👩🏼|👩🏼‍❤️‍👩🏿|👩🏼‍❤️‍👩🏽|👩🏼‍❤️‍👩🏻|👩🏻‍❤️‍👩🏾|👩🏻‍❤️‍👩🏼|👨‍👩‍👦|👨‍👩‍👧‍👦|👨‍👩‍👧‍👧|👨‍👨‍👧|👨‍👨‍👦‍👦|👩‍👩‍👦|👩‍👩‍👧‍👦|👩‍👩‍👧‍👧|👨‍👦‍👦|👨‍👧‍👦|👩‍👦|👩‍👧|👩‍👧‍👧|🐕‍🦺|🐈‍⬛|🐻‍❄️|🏳️‍🌈|🏴‍☠️)/gu,
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
 

From 8b10df286b48785baa1aad005ab2b47bcd1c4f82 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 26 Jul 2023 11:43:30 +0530
Subject: [PATCH 009/214] fix: lint issue

---
 src/libs/EmojiUtils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 125e391f12d4..b2eae17ec8d1 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -276,6 +276,7 @@ function extractEmojis(text) {
 
     if (sequenceEmojis) {
         sequenceEmojis = [...new Set(sequenceEmojis)];
+        // eslint-disable-next-line no-restricted-syntax
         for (const sequenceEmoji of sequenceEmojis) {
             const regex = new RegExp(sequenceEmoji, 'gu');
             str = str.replace(regex, '');

From af59f1b0535c7a94afde6225d8e15c26592f2945 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Thu, 27 Jul 2023 22:28:23 +0530
Subject: [PATCH 010/214] fix: emoji not adding due to null sequence

---
 src/libs/EmojiUtils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 064369c54ac4..a54bf00fe8f3 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -282,6 +282,8 @@ function extractEmojis(text) {
             const regex = new RegExp(sequenceEmoji, 'gu');
             str = str.replace(regex, '');
         }
+    } else {
+        sequenceEmojis = [];
     }
 
     let parseEmojis = str.match(CONST.REGEX.EMOJIS);

From a8b6aaa62487286951eedfe90338578bb950a8f2 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Sat, 29 Jul 2023 04:06:24 +0530
Subject: [PATCH 011/214] fix: used all the emoji constants

Ref Link : https://unicode.org/reports/tr18/#RL2.7
---
 src/CONST.js           |  6 ++++--
 src/libs/EmojiUtils.js | 21 ++++-----------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 6aebc38a165e..0b450d93cbb3 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1151,8 +1151,10 @@ const CONST = {
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
-        EMOJI_ZWJ_SEQUENCES:
-            /(😶‍🌫️|😮‍💨|😵‍💫|❤️‍🔥|👁️‍🗨️|🧔‍♂️|🧔🏾‍♂️|🧔🏼‍♂️|🧔‍♀️|🧔🏾‍♀️|🧔🏼‍♀️|👨‍🦰|👨🏾‍🦰|👨🏼‍🦰|👨‍🦱|👨🏾‍🦱|👨🏼‍🦱|👨‍🦳|👨🏾‍🦳|👨🏼‍🦳|👨‍🦲|👨🏾‍🦲|👨🏼‍🦲|👩‍🦰|👩🏾‍🦰|👩🏼‍🦰|🧑‍🦰|🧑🏾‍🦰|🧑🏼‍🦰|👩‍🦱|👩🏾‍🦱|👩🏼‍🦱|🧑‍🦱|🧑🏾‍🦱|🧑🏼‍🦱|👩‍🦳|👩🏾‍🦳|👩🏼‍🦳|🧑‍🦳|🧑🏾‍🦳|🧑🏼‍🦳|👩‍🦲|👩🏾‍🦲|👩🏼‍🦲|🧑‍🦲|🧑🏾‍🦲|🧑🏼‍🦲|👱‍♀️|👱🏾‍♀️|👱🏼‍♀️|👱‍♂️|👱🏾‍♂️|👱🏼‍♂️|🙍‍♂️|🙍🏾‍♂️|🙍🏼‍♂️|🙍‍♀️|🙍🏾‍♀️|🙍🏼‍♀️|🙎‍♂️|🙎🏾‍♂️|🙎🏼‍♂️|🙎‍♀️|🙎🏾‍♀️|🙎🏼‍♀️|🙅‍♂️|🙅🏾‍♂️|🙅🏼‍♂️|🙅‍♀️|🙅🏾‍♀️|🙅🏼‍♀️|🙆‍♂️|🙆🏾‍♂️|🙆🏼‍♂️|🙆‍♀️|🙆🏾‍♀️|🙆🏼‍♀️|💁‍♂️|💁🏾‍♂️|💁🏼‍♂️|💁‍♀️|💁🏾‍♀️|💁🏼‍♀️|🙋‍♂️|🙋🏾‍♂️|🙋🏼‍♂️|🙋‍♀️|🙋🏾‍♀️|🙋🏼‍♀️|🧏‍♂️|🧏🏾‍♂️|🧏🏼‍♂️|🧏‍♀️|🧏🏾‍♀️|🧏🏼‍♀️|🙇‍♂️|🙇🏾‍♂️|🙇🏼‍♂️|🙇‍♀️|🙇🏾‍♀️|🙇🏼‍♀️|🤦‍♂️|🤦🏾‍♂️|🤦🏼‍♂️|🤦‍♀️|🤦🏾‍♀️|🤦🏼‍♀️|🤷‍♂️|🤷🏾‍♂️|🤷🏼‍♂️|🤷‍♀️|🤷🏾‍♀️|🤷🏼‍♀️|🧑‍⚕️|🧑🏾‍⚕️|🧑🏼‍⚕️|👨‍⚕️|👨🏾‍⚕️|👨🏼‍⚕️|👩‍⚕️|👩🏾‍⚕️|👩🏼‍⚕️|🧑‍🎓|🧑🏾‍🎓|🧑🏼‍🎓|👨‍🎓|👨🏾‍🎓|👨🏼‍🎓|👩‍🎓|👩🏾‍🎓|👩🏼‍🎓|🧑‍🏫|🧑🏾‍🏫|🧑🏼‍🏫|👨‍🏫|👨🏾‍🏫|👨🏼‍🏫|👩‍🏫|👩🏾‍🏫|👩🏼‍🏫|🧑‍⚖️|🧑🏾‍⚖️|🧑🏼‍⚖️|👨‍⚖️|👨🏾‍⚖️|👨🏼‍⚖️|👩‍⚖️|👩🏾‍⚖️|👩🏼‍⚖️|🧑‍🌾|🧑🏾‍🌾|🧑🏼‍🌾|👨‍🌾|👨🏾‍🌾|👨🏼‍🌾|👩‍🌾|👩🏾‍🌾|👩🏼‍🌾|🧑‍🍳|🧑🏾‍🍳|🧑🏼‍🍳|👨‍🍳|👨🏾‍🍳|👨🏼‍🍳|👩‍🍳|👩🏾‍🍳|👩🏼‍🍳|🧑‍🔧|🧑🏾‍🔧|🧑🏼‍🔧|👨‍🔧|👨🏾‍🔧|👨🏼‍🔧|👩‍🔧|👩🏾‍🔧|👩🏼‍🔧|🧑‍🏭|🧑🏾‍🏭|🧑🏼‍🏭|👨‍🏭|👨🏾‍🏭|👨🏼‍🏭|👩‍🏭|👩🏾‍🏭|👩🏼‍🏭|🧑‍💼|🧑🏾‍💼|🧑🏼‍💼|👨‍💼|👨🏾‍💼|👨🏼‍💼|👩‍💼|👩🏾‍💼|👩🏼‍💼|🧑‍🔬|🧑🏾‍🔬|🧑🏼‍🔬|👨‍🔬|👨🏾‍🔬|👨🏼‍🔬|👩‍🔬|👩🏾‍🔬|👩🏼‍🔬|🧑‍💻|🧑🏾‍💻|🧑🏼‍💻|👨‍💻|👨🏾‍💻|👨🏼‍💻|👩‍💻|👩🏾‍💻|👩🏼‍💻|🧑‍🎤|🧑🏾‍🎤|🧑🏼‍🎤|👨‍🎤|👨🏾‍🎤|👨🏼‍🎤|👩‍🎤|👩🏾‍🎤|👩🏼‍🎤|🧑‍🎨|🧑🏾‍🎨|🧑🏼‍🎨|👨‍🎨|👨🏾‍🎨|👨🏼‍🎨|👩‍🎨|👩🏾‍🎨|👩🏼‍🎨|🧑‍✈️|🧑🏾‍✈️|🧑🏼‍✈️|👨‍✈️|👨🏾‍✈️|👨🏼‍✈️|👩‍✈️|👩🏾‍✈️|👩🏼‍✈️|🧑‍🚀|🧑🏾‍🚀|🧑🏼‍🚀|👨‍🚀|👨🏾‍🚀|👨🏼‍🚀|👩‍🚀|👩🏾‍🚀|👩🏼‍🚀|🧑‍🚒|🧑🏾‍🚒|🧑🏼‍🚒|👨‍🚒|👨🏾‍🚒|👨🏼‍🚒|👩‍🚒|👩🏾‍🚒|👩🏼‍🚒|👮‍♂️|👮🏾‍♂️|👮🏼‍♂️|👮‍♀️|👮🏾‍♀️|👮🏼‍♀️|🕵️‍♂️|🕵🏾‍♂️|🕵🏼‍♂️|🕵️‍♀️|🕵🏾‍♀️|🕵🏼‍♀️|💂‍♂️|💂🏾‍♂️|💂🏼‍♂️|💂‍♀️|💂🏾‍♀️|💂🏼‍♀️|👷‍♂️|👷🏾‍♂️|👷🏼‍♂️|👷‍♀️|👷🏾‍♀️|👷🏼‍♀️|👳‍♂️|👳🏾‍♂️|👳🏼‍♂️|👳‍♀️|👳🏾‍♀️|👳🏼‍♀️|🤵‍♂️|🤵🏾‍♂️|🤵🏼‍♂️|🤵‍♀️|🤵🏾‍♀️|🤵🏼‍♀️|👰‍♂️|👰🏾‍♂️|👰🏼‍♂️|👰‍♀️|👰🏾‍♀️|👰🏼‍♀️|👩‍🍼|👩🏾‍🍼|👩🏼‍🍼|👨‍🍼|👨🏾‍🍼|👨🏼‍🍼|🧑‍🍼|🧑🏾‍🍼|🧑🏼‍🍼|🧑‍🎄|🧑🏾‍🎄|🧑🏼‍🎄|🦸‍♂️|🦸🏾‍♂️|🦸🏼‍♂️|🦸‍♀️|🦸🏾‍♀️|🦸🏼‍♀️|🦹‍♂️|🦹🏾‍♂️|🦹🏼‍♂️|🦹‍♀️|🦹🏾‍♀️|🦹🏼‍♀️|🧙‍♂️|🧙🏾‍♂️|🧙🏼‍♂️|🧙‍♀️|🧙🏾‍♀️|🧙🏼‍♀️|🧚‍♂️|🧚🏾‍♂️|🧚🏼‍♂️|🧚‍♀️|🧚🏾‍♀️|🧚🏼‍♀️|🧛‍♂️|🧛🏾‍♂️|🧛🏼‍♂️|🧛‍♀️|🧛🏾‍♀️|🧛🏼‍♀️|🧜‍♂️|🧜🏾‍♂️|🧜🏼‍♂️|🧜‍♀️|🧜🏾‍♀️|🧜🏼‍♀️|🧝‍♂️|🧝🏾‍♂️|🧝🏼‍♂️|🧝‍♀️|🧝🏾‍♀️|🧝🏼‍♀️|🧞‍♂️|🧟‍♂️|💆‍♂️|💆🏾‍♂️|💆🏼‍♂️|💆‍♀️|💆🏾‍♀️|💆🏼‍♀️|💇‍♂️|💇🏾‍♂️|💇🏼‍♂️|💇‍♀️|💇🏾‍♀️|💇🏼‍♀️|🚶‍♂️|🚶🏾‍♂️|🚶🏼‍♂️|🚶‍♀️|🚶🏾‍♀️|🚶🏼‍♀️|🧍‍♂️|🧍🏾‍♂️|🧍🏼‍♂️|🧍‍♀️|🧍🏾‍♀️|🧍🏼‍♀️|🧎‍♂️|🧎🏾‍♂️|🧎🏼‍♂️|🧎‍♀️|🧎🏾‍♀️|🧎🏼‍♀️|🧑‍🦯|🧑🏾‍🦯|🧑🏼‍🦯|👨‍🦯|👨🏾‍🦯|👨🏼‍🦯|👩‍🦯|👩🏾‍🦯|👩🏼‍🦯|🧑‍🦼|🧑🏾‍🦼|🧑🏼‍🦼|👨‍🦼|👨🏾‍🦼|👨🏼‍🦼|👩‍🦼|👩🏾‍🦼|👩🏼‍🦼|🧑‍🦽|🧑🏾‍🦽|🧑🏼‍🦽|👨‍🦽|👨🏾‍🦽|👨🏼‍🦽|👩‍🦽|👩🏾‍🦽|👩🏼‍🦽|🏃‍♂️|🏃🏾‍♂️|🏃🏼‍♂️|🏃‍♀️|🏃🏾‍♀️|🏃🏼‍♀️|👯‍♂️|🧖‍♂️|🧖🏾‍♂️|🧖🏼‍♂️|🧖‍♀️|🧖🏾‍♀️|🧖🏼‍♀️|🧗‍♂️|🧗🏾‍♂️|🧗🏼‍♂️|🧗‍♀️|🧗🏾‍♀️|🧗🏼‍♀️|🏌️‍♂️|🏌🏾‍♂️|🏌🏼‍♂️|🏌️‍♀️|🏌🏾‍♀️|🏌🏼‍♀️|🏄‍♂️|🏄🏾‍♂️|🏄🏼‍♂️|🏄‍♀️|🏄🏾‍♀️|🏄🏼‍♀️|🚣‍♂️|🚣🏾‍♂️|🚣🏼‍♂️|🚣‍♀️|🚣🏾‍♀️|🚣🏼‍♀️|🏊‍♂️|🏊🏾‍♂️|🏊🏼‍♂️|🏊‍♀️|🏊🏾‍♀️|🏊🏼‍♀️|⛹️‍♂️|⛹🏾‍♂️|⛹🏼‍♂️|⛹️‍♀️|⛹🏾‍♀️|⛹🏼‍♀️|🏋️‍♂️|🏋🏾‍♂️|🏋🏼‍♂️|🏋️‍♀️|🏋🏾‍♀️|🏋🏼‍♀️|🚴‍♂️|🚴🏾‍♂️|🚴🏼‍♂️|🚴‍♀️|🚴🏾‍♀️|🚴🏼‍♀️|🚵‍♂️|🚵🏾‍♂️|🚵🏼‍♂️|🚵‍♀️|🚵🏾‍♀️|🚵🏼‍♀️|🤸‍♂️|🤸🏾‍♂️|🤸🏼‍♂️|🤸‍♀️|🤸🏾‍♀️|🤸🏼‍♀️|🤼‍♂️|🤽‍♂️|🤽🏾‍♂️|🤽🏼‍♂️|🤽‍♀️|🤽🏾‍♀️|🤽🏼‍♀️|🤾‍♂️|🤾🏾‍♂️|🤾🏼‍♂️|🤾‍♀️|🤾🏾‍♀️|🤾🏼‍♀️|🤹‍♂️|🤹🏾‍♂️|🤹🏼‍♂️|🤹‍♀️|🤹🏾‍♀️|🤹🏼‍♀️|🧘‍♂️|🧘🏾‍♂️|🧘🏼‍♂️|🧘‍♀️|🧘🏾‍♀️|🧘🏼‍♀️|🧑‍🤝‍🧑|🧑🏿‍🤝‍🧑🏾|🧑🏿‍🤝‍🧑🏼|🧑🏾‍🤝‍🧑🏿|🧑🏾‍🤝‍🧑🏽|🧑🏾‍🤝‍🧑🏻|🧑🏽‍🤝‍🧑🏾|🧑🏽‍🤝‍🧑🏼|🧑🏼‍🤝‍🧑🏿|🧑🏼‍🤝‍🧑🏽|🧑🏼‍🤝‍🧑🏻|🧑🏻‍🤝‍🧑🏾|🧑🏻‍🤝‍🧑🏼|👩🏿‍🤝‍👩🏾|👩🏿‍🤝‍👩🏼|👩🏾‍🤝‍👩🏿|👩🏾‍🤝‍👩🏼|👩🏽‍🤝‍👩🏿|👩🏽‍🤝‍👩🏼|👩🏼‍🤝‍👩🏿|👩🏼‍🤝‍👩🏽|👩🏻‍🤝‍👩🏿|👩🏻‍🤝‍👩🏽|👩🏿‍🤝‍👨🏾|👩🏿‍🤝‍👨🏼|👩🏾‍🤝‍👨🏿|👩🏾‍🤝‍👨🏼|👩🏽‍🤝‍👨🏿|👩🏽‍🤝‍👨🏼|👩🏼‍🤝‍👨🏿|👩🏼‍🤝‍👨🏽|👩🏻‍🤝‍👨🏿|👩🏻‍🤝‍👨🏽|👨🏿‍🤝‍👨🏾|👨🏿‍🤝‍👨🏼|👨🏾‍🤝‍👨🏿|👨🏾‍🤝‍👨🏼|👨🏽‍🤝‍👨🏿|👨🏽‍🤝‍👨🏼|👨🏼‍🤝‍👨🏿|👨🏼‍🤝‍👨🏽|👨🏻‍🤝‍👨🏿|👨🏻‍🤝‍👨🏽|🧑🏿‍❤️‍💋‍🧑🏾|🧑🏿‍❤️‍💋‍🧑🏼|🧑🏾‍❤️‍💋‍🧑🏿|🧑🏾‍❤️‍💋‍🧑🏼|🧑🏽‍❤️‍💋‍🧑🏿|🧑🏽‍❤️‍💋‍🧑🏼|🧑🏼‍❤️‍💋‍🧑🏿|🧑🏼‍❤️‍💋‍🧑🏽|🧑🏻‍❤️‍💋‍🧑🏿|🧑🏻‍❤️‍💋‍🧑🏽|👩‍❤️‍💋‍👨|👩🏿‍❤️‍💋‍👨🏾|👩🏿‍❤️‍💋‍👨🏼|👩🏾‍❤️‍💋‍👨🏿|👩🏾‍❤️‍💋‍👨🏽|👩🏾‍❤️‍💋‍👨🏻|👩🏽‍❤️‍💋‍👨🏾|👩🏽‍❤️‍💋‍👨🏼|👩🏼‍❤️‍💋‍👨🏿|👩🏼‍❤️‍💋‍👨🏽|👩🏼‍❤️‍💋‍👨🏻|👩🏻‍❤️‍💋‍👨🏾|👩🏻‍❤️‍💋‍👨🏼|👨‍❤️‍💋‍👨|👨🏿‍❤️‍💋‍👨🏾|👨🏿‍❤️‍💋‍👨🏼|👨🏾‍❤️‍💋‍👨🏿|👨🏾‍❤️‍💋‍👨🏽|👨🏾‍❤️‍💋‍👨🏻|👨🏽‍❤️‍💋‍👨🏾|👨🏽‍❤️‍💋‍👨🏼|👨🏼‍❤️‍💋‍👨🏿|👨🏼‍❤️‍💋‍👨🏽|👨🏼‍❤️‍💋‍👨🏻|👨🏻‍❤️‍💋‍👨🏾|👨🏻‍❤️‍💋‍👨🏼|👩‍❤️‍💋‍👩|👩🏿‍❤️‍💋‍👩🏾|👩🏿‍❤️‍💋‍👩🏼|👩🏾‍❤️‍💋‍👩🏿|👩🏾‍❤️‍💋‍👩🏽|👩🏾‍❤️‍💋‍👩🏻|👩🏽‍❤️‍💋‍👩🏾|👩🏽‍❤️‍💋‍👩🏼|👩🏼‍❤️‍💋‍👩🏿|👩🏼‍❤️‍💋‍👩🏽|👩🏼‍❤️‍💋‍👩🏻|👩🏻‍❤️‍💋‍👩🏾|👩🏻‍❤️‍💋‍👩🏼|🧑🏿‍❤️‍🧑🏾|🧑🏿‍❤️‍🧑🏼|🧑🏾‍❤️‍🧑🏿|🧑🏾‍❤️‍🧑🏼|🧑🏽‍❤️‍🧑🏿|🧑🏽‍❤️‍🧑🏼|🧑🏼‍❤️‍🧑🏿|🧑🏼‍❤️‍🧑🏽|🧑🏻‍❤️‍🧑🏿|🧑🏻‍❤️‍🧑🏽|👩‍❤️‍👨|👩🏿‍❤️‍👨🏾|👩🏿‍❤️‍👨🏼|👩🏾‍❤️‍👨🏿|👩🏾‍❤️‍👨🏽|👩🏾‍❤️‍👨🏻|👩🏽‍❤️‍👨🏾|👩🏽‍❤️‍👨🏼|👩🏼‍❤️‍👨🏿|👩🏼‍❤️‍👨🏽|👩🏼‍❤️‍👨🏻|👩🏻‍❤️‍👨🏾|👩🏻‍❤️‍👨🏼|👨‍❤️‍👨|👨🏿‍❤️‍👨🏾|👨🏿‍❤️‍👨🏼|👨🏾‍❤️‍👨🏿|👨🏾‍❤️‍👨🏽|👨🏾‍❤️‍👨🏻|👨🏽‍❤️‍👨🏾|👨🏽‍❤️‍👨🏼|👨🏼‍❤️‍👨🏿|👨🏼‍❤️‍👨🏽|👨🏼‍❤️‍👨🏻|👨🏻‍❤️‍👨🏾|👨🏻‍❤️‍👨🏼|👩‍❤️‍👩|👩🏿‍❤️‍👩🏾|👩🏿‍❤️‍👩🏼|👩🏾‍❤️‍👩🏿|👩🏾‍❤️‍👩🏽|👩🏾‍❤️‍👩🏻|👩🏽‍❤️‍👩🏾|👩🏽‍❤️‍👩🏼|👩🏼‍❤️‍👩🏿|👩🏼‍❤️‍👩🏽|👩🏼‍❤️‍👩🏻|👩🏻‍❤️‍👩🏾|👩🏻‍❤️‍👩🏼|👨‍👩‍👦|👨‍👩‍👧‍👦|👨‍👩‍👧‍👧|👨‍👨‍👧|👨‍👨‍👦‍👦|👩‍👩‍👦|👩‍👩‍👧‍👦|👩‍👩‍👧‍👧|👨‍👦‍👦|👨‍👧‍👦|👩‍👦|👩‍👧|👩‍👧‍👧|🐕‍🦺|🐈‍⬛|🐻‍❄️|🏳️‍🌈|🏴‍☠️)/gu,
+
+        EMOJIS_AND_ZWJ_SEQUENCE:
+            /[\p{Emoji}\p{Emoji_Presentation}\p{Emoji_Modifier}\p{Emoji_Modifier_Base}\p{Emoji_Component}\p{Extended_Pictographic}\p{Basic_Emoji}\p{Emoji_Keycap_Sequence}\p{RGI_Emoji_Modifier_Sequence}\p{RGI_Emoji_Flag_Sequence}\p{RGI_Emoji_Tag_Sequence}\p{RGI_Emoji_ZWJ_Sequence}\p{RGI_Emoji}]/gu,
+
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
 
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index a54bf00fe8f3..7e227151d1c6 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,33 +266,20 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
-    let str = `${text}`;
+    const str = `${text}`;
     const emojis = [];
 
     if (!str) {
         return emojis;
     }
 
-    let sequenceEmojis = str.match(CONST.REGEX.EMOJI_ZWJ_SEQUENCES);
+    let parseEmojis = str.match(CONST.REGEX.EMOJIS_AND_ZWJ_SEQUENCE);
 
-    if (sequenceEmojis) {
-        sequenceEmojis = [...new Set(sequenceEmojis)];
-        // eslint-disable-next-line no-restricted-syntax
-        for (const sequenceEmoji of sequenceEmojis) {
-            const regex = new RegExp(sequenceEmoji, 'gu');
-            str = str.replace(regex, '');
-        }
-    } else {
-        sequenceEmojis = [];
-    }
-
-    let parseEmojis = str.match(CONST.REGEX.EMOJIS);
-
-    if (!parseEmojis && !sequenceEmojis) {
+    if (!parseEmojis) {
         return emojis;
     }
 
-    parseEmojis = [...new Set(parseEmojis), ...sequenceEmojis];
+    parseEmojis = [...new Set(parseEmojis)];
 
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];

From eb1ec248124767e15209326ab1341b2947a728d3 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Sat, 29 Jul 2023 21:44:09 +0530
Subject: [PATCH 012/214] Update CONST.js

---
 src/CONST.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index 0b450d93cbb3..c9c9a245eae1 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1153,7 +1153,7 @@ const CONST = {
         EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
 
         EMOJIS_AND_ZWJ_SEQUENCE:
-            /[\p{Emoji}\p{Emoji_Presentation}\p{Emoji_Modifier}\p{Emoji_Modifier_Base}\p{Emoji_Component}\p{Extended_Pictographic}\p{Basic_Emoji}\p{Emoji_Keycap_Sequence}\p{RGI_Emoji_Modifier_Sequence}\p{RGI_Emoji_Flag_Sequence}\p{RGI_Emoji_Tag_Sequence}\p{RGI_Emoji_ZWJ_Sequence}\p{RGI_Emoji}]/gu,
+            /[\p{Extended_Pictographic}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
 
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,

From d863fef5e3e61202e6c1cf07a48c7a234778ff51 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Mon, 31 Jul 2023 09:55:39 +0530
Subject: [PATCH 013/214] chore: remove extra regex for emoji and use updated
 one

---
 src/CONST.js           | 5 +----
 src/libs/EmojiUtils.js | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index c9c9a245eae1..8d8e384e9647 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1150,10 +1150,7 @@ const CONST = {
         ROOM_NAME: /^#[a-z0-9à-ÿ-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
-        EMOJIS: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
-
-        EMOJIS_AND_ZWJ_SEQUENCE:
-            /[\p{Extended_Pictographic}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
+        EMOJIS: /[\p{Extended_Pictographic}](\u200D[\p{Extended_Pictographic}]|[\u{1F3FB}-\u{1F3FF}]|[\u{E0020}-\u{E007F}]|\uFE0F|\u20E3)*|[\u{1F1E6}-\u{1F1FF}]{2}|[#*0-9]\uFE0F?\u20E3/gu,
 
         TAX_ID: /^\d{9}$/,
         NON_NUMERIC: /\D/g,
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 7e227151d1c6..296ce7fa015f 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -273,7 +273,7 @@ function extractEmojis(text) {
         return emojis;
     }
 
-    let parseEmojis = str.match(CONST.REGEX.EMOJIS_AND_ZWJ_SEQUENCE);
+    let parseEmojis = str.match(CONST.REGEX.EMOJIS);
 
     if (!parseEmojis) {
         return emojis;

From 5b982125dc25c7086bb3d1c862274636f04a4154 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Tue, 1 Aug 2023 00:53:51 +0530
Subject: [PATCH 014/214] chore: remove extra str and change continue code

---
 src/libs/EmojiUtils.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 296ce7fa015f..eda27513205e 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,14 +266,13 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
-    const str = `${text}`;
     const emojis = [];
 
-    if (!str) {
+    if (!text) {
         return emojis;
     }
 
-    let parseEmojis = str.match(CONST.REGEX.EMOJIS);
+    let parseEmojis = text.match(CONST.REGEX.EMOJIS);
 
     if (!parseEmojis) {
         return emojis;
@@ -284,8 +283,9 @@ function extractEmojis(text) {
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];
         const emoji = Emojis.emojiCodeTable[character];
-        if (!emoji) continue; // eslint-disable-line no-continue
-        emojis.push(emoji);
+        if (emoji) {
+            emojis.push(emoji);
+        }
     }
 
     return emojis;

From 81845f4a271584e154cdf124d24a077cc099dbfe Mon Sep 17 00:00:00 2001
From: David Cardoza <dcardoza@expensify.com>
Date: Mon, 31 Jul 2023 19:17:36 -0700
Subject: [PATCH 015/214] Create Card-Rev-Share-for-Approved-Partners.md

Added new ExpensifyHelp page. Tracking issue is here - https://github.com/Expensify/Expensify/issues/304373
---
 docs/Card-Rev-Share-for-Approved-Partners.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/Card-Rev-Share-for-Approved-Partners.md

diff --git a/docs/Card-Rev-Share-for-Approved-Partners.md b/docs/Card-Rev-Share-for-Approved-Partners.md
new file mode 100644
index 000000000000..9b5647a004d3
--- /dev/null
+++ b/docs/Card-Rev-Share-for-Approved-Partners.md
@@ -0,0 +1,17 @@
+---
+title: Expensify Card revenue share for ExpensifyApproved! partners
+description: Earn money when your clients adopt the Expensify Card
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+Start making more with us! We're thrilled to announce a new incentive for our US-based ExpensifyApproved! partner accountants. You can now earn additional income for your firm every time your client uses their Expensify Card. We're offering  0.5% of the total Expensify Card spend of your clients in cashback returned to your firm. The more your clients spend, the more cashback your firm receives!<br>
+<br>This program is currently only available to US-based ExpensifyApproved! partner accountants.
+
+# How-to
+To benefit from this program, all you need to do is ensure that you are listed as a domain admin on your client's Expensify account. If you're not currently a domain admin, your client can follow the instructions outlined in [our help article](https://community.expensify.com/discussion/5749/how-to-add-and-remove-domain-admins#:~:text=Domain%20Admins%20have%20total%20control,a%20member%20of%20the%20domain.) to assign you this role.
+# FAQ
+- What if my firm is not permitted to accept revenue share from our clients? <br>
+<br>We understand that different firms may have different policies. If your firm is unable to accept this revenue share, you can pass the revenue share back to your client to give them an additional 0.5% of cash back using your own internal payment tools.<br><br>
+- What if my firm does not wish to participate in the program? <br>
+<br>Please reach out to your assigned partner manager at new.expensify.com to inform them you would not like to accept the revenue share nor do you want to pass the revenue share to your clients. 

From 11717c5772c631af6629d443270b8fbf107bf875 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 1 Aug 2023 20:41:32 +0800
Subject: [PATCH 016/214] fix keyboard flashing while clicking "Add attachment"

---
 patches/react-native+0.71.2-alpha.3.patch     | 17 +++++++++-
 src/components/AttachmentPicker/index.js      | 13 ++++++--
 .../AttachmentPicker/index.native.js          | 12 +++++--
 src/components/Modal/BaseModal.js             |  8 +++++
 src/components/Modal/index.android.js         | 10 ++++++
 src/libs/ComposerFocusManager.js              | 23 +++++++++++++
 src/pages/home/report/ReportActionCompose.js  | 32 ++++++++++++++-----
 7 files changed, 102 insertions(+), 13 deletions(-)
 create mode 100644 src/libs/ComposerFocusManager.js

diff --git a/patches/react-native+0.71.2-alpha.3.patch b/patches/react-native+0.71.2-alpha.3.patch
index 822ca9daec9c..e48c71bb2151 100644
--- a/patches/react-native+0.71.2-alpha.3.patch
+++ b/patches/react-native+0.71.2-alpha.3.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
-index 2f48f9e..ac7a416 100644
+index 2f48f9e..e26d677 100644
 --- a/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
 +++ b/node_modules/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.js
 @@ -65,6 +65,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
@@ -86,3 +86,18 @@ index 2f48f9e..ac7a416 100644
    componentDidMount(): void {
      if (Platform.OS === 'ios') {
        this._subscriptions = [
+diff --git a/node_modules/react-native/React/Views/RCTModalHostViewManager.m b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
+index 4b9f9ad..4992874 100644
+--- a/node_modules/react-native/React/Views/RCTModalHostViewManager.m
++++ b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
+@@ -79,6 +79,10 @@ RCT_EXPORT_MODULE()
+     if (self->_presentationBlock) {
+       self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+     } else {
++      UIWindow *window = RCTKeyWindow();
++      if (window && window.rootViewController && [window.rootViewController.view isFirstResponder]) {
++        [window.rootViewController.view resignFirstResponder];
++      }
+       [[modalHostView reactViewController] presentViewController:viewController
+                                                         animated:animated
+                                                       completion:completionBlock];
diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index e7653df2b4d0..d18165ab57ab 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -27,6 +27,8 @@ function getAcceptableFileTypes(type) {
 function AttachmentPicker(props) {
     const fileInput = useRef();
     const onPicked = useRef();
+    const onCanceled = useRef(() => {});
+
     return (
         <>
             <input
@@ -46,13 +48,20 @@ function AttachmentPicker(props) {
                 }}
                 // We are stopping the event propagation because triggering the `click()` on the hidden input
                 // causes the event to unexpectedly bubble up to anything wrapping this component e.g. Pressable
-                onClick={(e) => e.stopPropagation()}
+                onClick={(e) => {
+                    e.stopPropagation();
+                    if (!fileInput.current) {
+                        return;
+                    }
+                    fileInput.current.addEventListener('cancel', () => onCanceled.current(), { once: true});
+                }}
                 accept={getAcceptableFileTypes(props.type)}
             />
             {props.children({
-                openPicker: ({onPicked: newOnPicked}) => {
+                openPicker: ({onPicked: newOnPicked, onCanceled: newOnCanceled = () => {}}) => {
                     onPicked.current = newOnPicked;
                     fileInput.current.click();
+                    onCanceled.current = newOnCanceled;
                 },
             })}
         </>
diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index b4b7d0b04c4e..a8f3b8d35c16 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -126,6 +126,7 @@ class AttachmentPicker extends Component {
             });
         }
 
+        this.cancel = () => {};
         this.close = this.close.bind(this);
         this.pickAttachment = this.pickAttachment.bind(this);
         this.removeKeyboardListener = this.removeKeyboardListener.bind(this);
@@ -181,6 +182,7 @@ class AttachmentPicker extends Component {
      */
     pickAttachment(attachments = []) {
         if (attachments.length === 0) {
+            this.cancel();
             return;
         }
 
@@ -342,7 +344,10 @@ class AttachmentPicker extends Component {
      */
     renderChildren() {
         return this.props.children({
-            openPicker: ({onPicked}) => this.open(onPicked),
+            openPicker: ({onPicked, onCanceled = () => {}}) => {
+                this.open(onPicked);
+                this.cancel = onCanceled;
+            },
         });
     }
 
@@ -350,7 +355,10 @@ class AttachmentPicker extends Component {
         return (
             <>
                 <Popover
-                    onClose={this.close}
+                    onClose={() => {
+                        this.close();
+                        this.cancel();
+                    }}
                     isVisible={this.state.isVisible}
                     anchorPosition={styles.createMenuPosition}
                     onModalHide={this.onModalHide}
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index 6d5bd5390416..155e80acab84 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -10,6 +10,7 @@ import {propTypes as modalPropTypes, defaultProps as modalDefaultProps} from './
 import * as Modal from '../../libs/actions/Modal';
 import getModalStyles from '../../styles/getModalStyles';
 import variables from '../../styles/variables';
+import ComposerFocusManager from '../../libs/ComposerFocusManager';
 
 const propTypes = {
     ...modalPropTypes,
@@ -73,6 +74,9 @@ class BaseModal extends PureComponent {
             this.props.onModalHide();
         }
         Modal.onModalDidClose();
+        if (!this.props.fullscreen) {
+            ComposerFocusManager.setReadyToFocus();
+        }
     }
 
     render() {
@@ -109,6 +113,9 @@ class BaseModal extends PureComponent {
                 // Note: Escape key on web/desktop will trigger onBackButtonPress callback
                 // eslint-disable-next-line react/jsx-props-no-multi-spaces
                 onBackButtonPress={this.props.onClose}
+                onModalWillShow={() => {
+                    ComposerFocusManager.resetReadyToFocus();
+                }}
                 onModalShow={() => {
                     if (this.props.shouldSetModalVisibility) {
                         Modal.setModalVisibility(true);
@@ -117,6 +124,7 @@ class BaseModal extends PureComponent {
                 }}
                 propagateSwipe={this.props.propagateSwipe}
                 onModalHide={this.hideModal}
+                onDismiss={() => ComposerFocusManager.setReadyToFocus()}
                 onSwipeComplete={this.props.onClose}
                 swipeDirection={swipeDirection}
                 isVisible={this.props.isVisible}
diff --git a/src/components/Modal/index.android.js b/src/components/Modal/index.android.js
index 09df74329b20..b5f11a02650a 100644
--- a/src/components/Modal/index.android.js
+++ b/src/components/Modal/index.android.js
@@ -1,7 +1,17 @@
 import React from 'react';
+import {AppState} from 'react-native';
 import withWindowDimensions from '../withWindowDimensions';
 import BaseModal from './BaseModal';
 import {propTypes, defaultProps} from './modalPropTypes';
+import ComposerFocusManager from '../../libs/ComposerFocusManager';
+
+AppState.addEventListener('focus', () => {
+    ComposerFocusManager.setReadyToFocus();
+});
+
+AppState.addEventListener('blur', () => {
+    ComposerFocusManager.resetReadyToFocus();
+});
 
 // Only want to use useNativeDriver on Android. It has strange flashes issue on IOS
 // https://github.com/react-native-modal/react-native-modal#the-modal-flashes-in-a-weird-way-when-animating
diff --git a/src/libs/ComposerFocusManager.js b/src/libs/ComposerFocusManager.js
new file mode 100644
index 000000000000..1f5f9d2d6f97
--- /dev/null
+++ b/src/libs/ComposerFocusManager.js
@@ -0,0 +1,23 @@
+let isReadyToFocusPromise = Promise.resolve();
+let resolveIsReadyToFocus;
+
+function resetReadyToFocus() {
+    isReadyToFocusPromise = new Promise(resolve => {
+        resolveIsReadyToFocus = resolve;
+    });
+}
+function setReadyToFocus() {
+    if (!resolveIsReadyToFocus) {
+        return;
+    }
+    resolveIsReadyToFocus()
+}
+function isReadyToFocus() {
+    return isReadyToFocusPromise;
+}
+
+export default {
+    resetReadyToFocus,
+    setReadyToFocus,
+    isReadyToFocus,
+};
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 644a90216091..6766cbb0e8b4 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -59,6 +59,7 @@ import * as KeyDownListener from '../../../libs/KeyboardShortcut/KeyDownPressLis
 import * as EmojiPickerActions from '../../../libs/actions/EmojiPickerAction';
 import withAnimatedRef from '../../../components/withAnimatedRef';
 import updatePropsPaperWorklet from '../../../libs/updatePropsPaperWorklet';
+import ComposerFocusManager from '../../../libs/ComposerFocusManager';
 
 const propTypes = {
     /** Beta features list */
@@ -221,6 +222,8 @@ class ReportActionCompose extends React.Component {
 
         this.unsubscribeNavigationBlur = () => null;
         this.unsubscribeNavigationFocus = () => null;
+        
+        this.shouldFocusAfterClosingModal = true;
 
         this.state = {
             isFocused: this.shouldFocusInputOnScreenFocus && !this.props.modal.isVisible && !this.props.modal.willAlertModalBecomeVisible && this.props.shouldShowComposeInput,
@@ -268,10 +271,13 @@ class ReportActionCompose extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
+        if (this.props.modal.isVisible && !prevProps.modal.isVisible) {
+            this.shouldFocusAfterClosingModal = true;
+        }
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
-        if (this.willBlurTextInputOnTapOutside && !this.props.modal.isVisible && this.props.isFocused && (prevProps.modal.isVisible || !prevProps.isFocused)) {
+        if (this.willBlurTextInputOnTapOutside && this.shouldFocusAfterClosingModal && !this.props.modal.isVisible && this.props.isFocused && (prevProps.modal.isVisible || !prevProps.isFocused)) {
             this.focus();
         }
 
@@ -757,13 +763,14 @@ class ReportActionCompose extends React.Component {
 
             if (!shouldelay) {
                 this.textInput.focus();
-            } else {
-                // Keyboard is not opened after Emoji Picker is closed
-                // SetTimeout is used as a workaround
-                // https://github.com/react-native-modal/react-native-modal/issues/114
-                // We carefully choose a delay. 100ms is found enough for keyboard to open.
-                setTimeout(() => this.textInput.focus(), 100);
+                return;
             }
+            ComposerFocusManager.isReadyToFocus().then(() => {
+                if (!this.textInput) {
+                    return;
+                }
+                this.textInput.focus();
+            });
         });
     }
 
@@ -1036,6 +1043,7 @@ class ReportActionCompose extends React.Component {
                                 this.shouldBlockEmojiCalc = false;
                                 this.shouldBlockMentionCalc = false;
                                 this.setState({isAttachmentPreviewActive: false});
+                                this.focus(true);
                             }}
                         >
                             {({displayFileInModal}) => (
@@ -1095,6 +1103,7 @@ class ReportActionCompose extends React.Component {
                                                                 e.preventDefault();
 
                                                                 // Drop focus to avoid blue focus ring.
+                                                                this.textInput.blur();
                                                                 this.actionButton.blur();
                                                                 this.setMenuVisibility(true);
                                                             }}
@@ -1110,7 +1119,10 @@ class ReportActionCompose extends React.Component {
                                                 <PopoverMenu
                                                     animationInTiming={CONST.ANIMATION_IN_TIMING}
                                                     isVisible={this.state.isMenuVisible}
-                                                    onClose={() => this.setMenuVisibility(false)}
+                                                    onClose={() => {
+                                                        this.setMenuVisibility(false);
+                                                        this.focus(true);
+                                                    }}
                                                     onItemSelected={() => this.setMenuVisibility(false)}
                                                     anchorPosition={styles.createMenuPositionReportActionCompose(this.props.windowHeight)}
                                                     anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM}}
@@ -1128,8 +1140,12 @@ class ReportActionCompose extends React.Component {
                                                                     this.shouldBlockMentionCalc = true;
                                                                 }
 
+                                                                this.shouldFocusAfterClosingModal = false;
                                                                 openPicker({
                                                                     onPicked: displayFileInModal,
+                                                                    onCanceled: () => {
+                                                                        this.focus(true);
+                                                                    },
                                                                 });
                                                             },
                                                         },

From e0764460e2910a2cc247ac2568282c8d7d78f049 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 1 Aug 2023 22:08:01 +0800
Subject: [PATCH 017/214] fix lint style

---
 src/components/AttachmentPicker/index.js     |  2 +-
 src/libs/ComposerFocusManager.js             |  4 ++--
 src/pages/home/report/ReportActionCompose.js | 10 ++++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index d18165ab57ab..9ea94ae53d42 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -53,7 +53,7 @@ function AttachmentPicker(props) {
                     if (!fileInput.current) {
                         return;
                     }
-                    fileInput.current.addEventListener('cancel', () => onCanceled.current(), { once: true});
+                    fileInput.current.addEventListener('cancel', () => onCanceled.current(), {once: true});
                 }}
                 accept={getAcceptableFileTypes(props.type)}
             />
diff --git a/src/libs/ComposerFocusManager.js b/src/libs/ComposerFocusManager.js
index 1f5f9d2d6f97..569e165da962 100644
--- a/src/libs/ComposerFocusManager.js
+++ b/src/libs/ComposerFocusManager.js
@@ -2,7 +2,7 @@ let isReadyToFocusPromise = Promise.resolve();
 let resolveIsReadyToFocus;
 
 function resetReadyToFocus() {
-    isReadyToFocusPromise = new Promise(resolve => {
+    isReadyToFocusPromise = new Promise((resolve) => {
         resolveIsReadyToFocus = resolve;
     });
 }
@@ -10,7 +10,7 @@ function setReadyToFocus() {
     if (!resolveIsReadyToFocus) {
         return;
     }
-    resolveIsReadyToFocus()
+    resolveIsReadyToFocus();
 }
 function isReadyToFocus() {
     return isReadyToFocusPromise;
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 6766cbb0e8b4..27257805244f 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -222,7 +222,7 @@ class ReportActionCompose extends React.Component {
 
         this.unsubscribeNavigationBlur = () => null;
         this.unsubscribeNavigationFocus = () => null;
-        
+
         this.shouldFocusAfterClosingModal = true;
 
         this.state = {
@@ -277,7 +277,13 @@ class ReportActionCompose extends React.Component {
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
-        if (this.willBlurTextInputOnTapOutside && this.shouldFocusAfterClosingModal && !this.props.modal.isVisible && this.props.isFocused && (prevProps.modal.isVisible || !prevProps.isFocused)) {
+        if (
+            this.willBlurTextInputOnTapOutside &&
+            this.shouldFocusAfterClosingModal &&
+            !this.props.modal.isVisible &&
+            this.props.isFocused &&
+            (prevProps.modal.isVisible || !prevProps.isFocused)
+        ) {
             this.focus();
         }
 

From 7ac72b55865e8fd4ceb7147137c3dd5c5b07d1cc Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Thu, 3 Aug 2023 16:08:12 +0800
Subject: [PATCH 018/214] upgrade patch approach for modal

---
 ...-native+0.72.1+004+ModalKeyboardFlashing.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch

diff --git a/patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch b/patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch
new file mode 100644
index 000000000000..4f239084b4ec
--- /dev/null
+++ b/patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/react-native/React/Views/RCTModalHostViewManager.m b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
+index 4b9f9ad..4992874 100644
+--- a/node_modules/react-native/React/Views/RCTModalHostViewManager.m
++++ b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
+@@ -79,6 +79,10 @@ RCT_EXPORT_MODULE()
+     if (self->_presentationBlock) {
+       self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
+     } else {
++      UIWindow *window = RCTKeyWindow();
++      if (window && window.rootViewController && [window.rootViewController.view isFirstResponder]) {
++        [window.rootViewController.view resignFirstResponder];
++      }
+       [[modalHostView reactViewController] presentViewController:viewController
+                                                         animated:animated
+                                                       completion:completionBlock];

From ca83e138eedfe0ca3ca57f55299e5b8ab7495e36 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Fri, 4 Aug 2023 14:57:26 +0700
Subject: [PATCH 019/214] Fix drop drag zone

---
 src/hooks/useDragAndDrop.js                   |  1 +
 .../ThreePaneView.js                          | 40 +++++++++----------
 web/index.html                                | 10 +++++
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/hooks/useDragAndDrop.js b/src/hooks/useDragAndDrop.js
index 98df70085a72..bc8ab517731b 100644
--- a/src/hooks/useDragAndDrop.js
+++ b/src/hooks/useDragAndDrop.js
@@ -58,6 +58,7 @@ export default function useDragAndDrop({dropZone, onDrop = () => {}, shouldAllow
             }
 
             event.preventDefault();
+            event.stopPropagation();
 
             switch (event.type) {
                 case DRAG_OVER_EVENT:
diff --git a/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js b/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
index 2f9a899191bf..14b78752e62f 100644
--- a/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
+++ b/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
@@ -53,28 +53,26 @@ function ThreePaneView(props) {
                     );
                 }
                 if (route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-                    const Wrapper = props.state.index === i ? NoDropZone : React.Fragment;
                     return (
-                        <Wrapper key={route.key}>
-                            <View
-                                style={[
-                                    styles.flexRow,
-                                    styles.pAbsolute,
-                                    styles.w100,
-                                    styles.h100,
-                                    StyleUtils.getBackgroundColorWithOpacityStyle(themeColors.shadow, CONST.RIGHT_MODAL_BACKGROUND_OVERLAY_OPACITY),
-                                    StyleUtils.displayIfTrue(props.state.index === i),
-                                ]}
-                            >
-                                <PressableWithoutFeedback
-                                    style={[styles.flex1]}
-                                    onPress={() => props.navigation.goBack()}
-                                    accessibilityLabel={translate('common.close')}
-                                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                                />
-                                <View style={styles.rightPanelContainer}>{props.descriptors[route.key].render()}</View>
-                            </View>
-                        </Wrapper>
+                        <View
+                            key={route.key}
+                            style={[
+                                styles.flexRow,
+                                styles.pAbsolute,
+                                styles.w100,
+                                styles.h100,
+                                StyleUtils.getBackgroundColorWithOpacityStyle(themeColors.shadow, CONST.RIGHT_MODAL_BACKGROUND_OVERLAY_OPACITY),
+                                StyleUtils.displayIfTrue(props.state.index === i),
+                            ]}
+                        >
+                            <PressableWithoutFeedback
+                                style={[styles.flex1]}
+                                onPress={() => props.navigation.goBack()}
+                                accessibilityLabel={translate('common.close')}
+                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                            />
+                            <View style={styles.rightPanelContainer}>{props.descriptors[route.key].render()}</View>
+                        </View>
                     );
                 }
                 return (
diff --git a/web/index.html b/web/index.html
index d207fa54b97a..16c907fe441b 100644
--- a/web/index.html
+++ b/web/index.html
@@ -136,4 +136,14 @@
         </div>
     </div>
 </body>
+<script>
+    function dropDragListener(){
+        event.preventDefault();
+        event.dataTransfer.dropEffect = 'none';
+    }
+    document.addEventListener('dragover', dropDragListener);
+    document.addEventListener('dragenter', dropDragListener);
+    document.addEventListener('dragleave', dropDragListener);
+    document.addEventListener('drop', dropDragListener);
+</script>
 </html>

From 98a5c4a0a362e45a22b77424f8e2fd599db3cc0f Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 8 Aug 2023 02:49:20 +0800
Subject: [PATCH 020/214] rename patch filename

---
 ....patch => react-native+0.72.1+005+ModalKeyboardFlashing.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patches/{react-native+0.72.1+004+ModalKeyboardFlashing.patch => react-native+0.72.1+005+ModalKeyboardFlashing.patch} (100%)

diff --git a/patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch b/patches/react-native+0.72.1+005+ModalKeyboardFlashing.patch
similarity index 100%
rename from patches/react-native+0.72.1+004+ModalKeyboardFlashing.patch
rename to patches/react-native+0.72.1+005+ModalKeyboardFlashing.patch

From 5ce9cf2670fd471f9424e62be53bd12251668a23 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Sat, 12 Aug 2023 03:46:36 +0530
Subject: [PATCH 021/214] fix: handle skin tones for emojis

---
 assets/emojis/index.js | 19 ++++++++++++++++++-
 src/libs/EmojiUtils.js |  6 ++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/assets/emojis/index.js b/assets/emojis/index.js
index 3882ac7f0fa6..5ff2d6793f5b 100644
--- a/assets/emojis/index.js
+++ b/assets/emojis/index.js
@@ -27,10 +27,27 @@ const emojiCodeTable = _.reduce(
     {},
 );
 
+const emojiCodeTableWithSkinTones = _.reduce(
+    emojis,
+    (prev, cur) => {
+        const newValue = prev;
+        if (!cur.header) {
+            newValue[cur.code] = cur;
+        }
+        if (cur.types) {
+            cur.types.forEach((type) => {
+                newValue[type] = cur;
+            });
+        }
+        return newValue;
+    },
+    {},
+);
+
 const localeEmojis = {
     en: enEmojis,
     es: esEmojis,
 };
 
-export {emojiNameTable, emojiCodeTable, localeEmojis};
+export {emojiNameTable, emojiCodeTable, emojiCodeTableWithSkinTones, localeEmojis};
 export {skinTones, categoryFrequentlyUsed, default} from './common';
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index eda27513205e..09f03fc7d105 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,7 +266,7 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
-    const emojis = [];
+    let emojis = [];
 
     if (!text) {
         return emojis;
@@ -282,12 +282,14 @@ function extractEmojis(text) {
 
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];
-        const emoji = Emojis.emojiCodeTable[character];
+        const emoji = Emojis.emojiCodeTableWithSkinTones[character];
         if (emoji) {
             emojis.push(emoji);
         }
     }
 
+    // Create a new set to remove duplicates
+    emojis = [...new Set(emojis)];
     return emojis;
 }
 

From 4d0afeb33d67311589c50efc702f7c97b3bcff13 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Sat, 12 Aug 2023 16:43:17 +0800
Subject: [PATCH 022/214] rename patch filename

---
 ....patch => react-native+0.72.3+004+ModalKeyboardFlashing.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patches/{react-native+0.72.1+005+ModalKeyboardFlashing.patch => react-native+0.72.3+004+ModalKeyboardFlashing.patch} (100%)

diff --git a/patches/react-native+0.72.1+005+ModalKeyboardFlashing.patch b/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch
similarity index 100%
rename from patches/react-native+0.72.1+005+ModalKeyboardFlashing.patch
rename to patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch

From 70b6f38e7e002cddaac0501379b5815d97fda95a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 14 Aug 2023 14:53:51 +0300
Subject: [PATCH 023/214] Start creating new demo page route

---
 src/CONST.js                                  |  3 ++
 src/ROUTES.js                                 |  3 ++
 .../Navigators/CentralPaneNavigator.js        | 10 +++++
 src/libs/Navigation/linkingConfig.js          |  1 +
 src/pages/DemoSetupPage.js                    | 43 +++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 100644 src/pages/DemoSetupPage.js

diff --git a/src/CONST.js b/src/CONST.js
index 4c19965837d9..fe0013b3e94b 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -2534,6 +2534,9 @@ const CONST = {
         DISTANCE: 'distance',
     },
     STATUS_TEXT_MAX_LENGTH: 100,
+    DEMO_PAGES: {
+        SAASTR: 'SaaStrDemoSetup',
+    },
 };
 
 export default CONST;
diff --git a/src/ROUTES.js b/src/ROUTES.js
index 6c0365e40568..7f9e76a99338 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -173,6 +173,9 @@ export default {
     getWorkspaceTravelRoute: (policyID) => `workspace/${policyID}/travel`,
     getWorkspaceMembersRoute: (policyID) => `workspace/${policyID}/members`,
 
+    // These are some on-off routes that will be removed once they're no longer needed (see GH issues for details)
+    SAASTR: 'saastr',
+
     /**
      * @param {String} route
      * @returns {Object}
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
index 64eadcbe06c3..47880ba14470 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
@@ -2,9 +2,11 @@ import React from 'react';
 import {createStackNavigator} from '@react-navigation/stack';
 import SCREENS from '../../../../SCREENS';
 import ReportScreenWrapper from '../ReportScreenWrapper';
+import DemoSetupPage from '../../../../pages/DemoSetupPage';
 import getCurrentUrl from '../../currentUrl';
 import styles from '../../../../styles/styles';
 import FreezeWrapper from '../../FreezeWrapper';
+import CONST from '../../../../CONST';
 
 const Stack = createStackNavigator();
 
@@ -28,6 +30,14 @@ function CentralPaneNavigator() {
                     }}
                     component={ReportScreenWrapper}
                 />
+                <Stack.Screen
+                    name={CONST.DEMO_PAGES.SAASTR}
+                    options={{
+                        headerShown: false,
+                        title: 'New Expensify',
+                    }}
+                    component={DemoSetupPage}
+                />
             </Stack.Navigator>
         </FreezeWrapper>
     );
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index dcc4f77fde73..1a2bcc164bd0 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -23,6 +23,7 @@ export default {
             [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: {
                 screens: {
                     [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID,
+                    [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR
                 },
             },
             [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: {
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
new file mode 100644
index 000000000000..d512eaff6cad
--- /dev/null
+++ b/src/pages/DemoSetupPage.js
@@ -0,0 +1,43 @@
+import _ from 'underscore';
+import React from 'react';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
+import ONYXKEYS from '../ONYXKEYS';
+import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
+import CONST from '../CONST';
+
+const propTypes = {
+    /** Navigation route context info provided by react navigation */
+    route: PropTypes.shape({
+        /** The exact route name used to get to this screen */
+        name: PropTypes.string.isRequired,
+    }).isRequired,
+};
+
+/*
+ * This is a "utility page", that does this:
+ *     - Looks at the current route
+ *     - Determines if there's a demo command we need to call
+ *     - If not, routes back to home
+ */
+function DemoSetupPage(props) {
+    console.log('DEMO props', props);
+    useFocusEffect(() => {
+        if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
+            // Do SaaStr demo setup here
+            console.log('HERE')
+        }
+    });
+
+    return <FullScreenLoadingIndicator />;
+}
+
+DemoSetupPage.propTypes = propTypes;
+DemoSetupPage.displayName = 'DemoSetupPage';
+
+export default withOnyx({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(DemoSetupPage);

From 69da9ad36565b0948bfcc1ee815d43857e9e4d07 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 14 Aug 2023 16:31:24 +0300
Subject: [PATCH 024/214] Add new saastr email

---
 .env.example | 1 +
 src/CONST.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.env.example b/.env.example
index 944da2aa9296..d3bc11ec3024 100644
--- a/.env.example
+++ b/.env.example
@@ -26,5 +26,6 @@ EXPENSIFY_ACCOUNT_ID_QA=-1
 EXPENSIFY_ACCOUNT_ID_QA_TRAVIS=-1
 EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
 EXPENSIFY_ACCOUNT_ID_REWARDS=-1
+EXPENSIFY_ACCOUNT_ID_SAASTR=-1
 EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
 EXPENSIFY_ACCOUNT_ID_SVFG=-1
diff --git a/src/CONST.js b/src/CONST.js
index fe0013b3e94b..c1125708d7f7 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -844,6 +844,7 @@ const CONST = {
         QA: 'qa@expensify.com',
         QA_TRAVIS: 'qa+travisreceipts@expensify.com',
         RECEIPTS: 'receipts@expensify.com',
+        SAASTR: 'saastr@expensify.com',
         STUDENT_AMBASSADOR: 'studentambassadors@expensify.com',
         SVFG: 'svfg@expensify.com',
     },
@@ -863,6 +864,7 @@ const CONST = {
         QA_TRAVIS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_QA_TRAVIS', 8595733)),
         RECEIPTS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_RECEIPTS', -1)),
         REWARDS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_REWARDS', 11023767)), // rewards@expensify.com
+        SAASTR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SAASTR', -1)),
         STUDENT_AMBASSADOR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR', 10476956)),
         SVFG: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SVFG', 2012843)),
     },

From abb3964f1766e89ebc732889870a89852f2c205e Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Mon, 14 Aug 2023 20:40:08 +0700
Subject: [PATCH 025/214] Clean import

---
 .../AppNavigator/createResponsiveStackNavigator/ThreePaneView.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js b/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
index 14b78752e62f..75a5a1f514f7 100644
--- a/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
+++ b/src/libs/Navigation/AppNavigator/createResponsiveStackNavigator/ThreePaneView.js
@@ -11,7 +11,6 @@ import styles from '../../../../styles/styles';
 import CONST from '../../../../CONST';
 import PressableWithoutFeedback from '../../../../components/Pressable/PressableWithoutFeedback';
 import useLocalize from '../../../../hooks/useLocalize';
-import NoDropZone from '../../../../components/DragAndDrop/NoDropZone';
 
 const propTypes = {
     /* State from useNavigationBuilder */

From e805fdc56fcb428a698abd1c4630683af74bcd55 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 14 Aug 2023 16:47:49 +0300
Subject: [PATCH 026/214] Set up a new workspace, note todos

---
 src/libs/actions/DemoActions.js | 235 ++++++++++++++++++++++++++++++++
 src/pages/DemoSetupPage.js      |   6 +-
 2 files changed, 238 insertions(+), 3 deletions(-)
 create mode 100644 src/libs/actions/DemoActions.js

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
new file mode 100644
index 000000000000..a8529e9b1c20
--- /dev/null
+++ b/src/libs/actions/DemoActions.js
@@ -0,0 +1,235 @@
+import CONST from '../../CONST';
+import * as API from '../API';
+import {buildOptimisticWorkspaceChats} from '../ReportUtils';
+import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
+
+function createSaastrDemoWorkspaceAndNavigate() {
+    // Create workspace, owned and admin'd by SaaStr
+    const policyID = generatePolicyID();
+
+    // TODO: maybe add domain name as prefix??
+    const workspaceName = 'SaaStr Cantina';
+
+    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticCustomUnits();
+
+    const {
+        announceChatReportID,
+        announceChatData,
+        announceReportActionData,
+        announceCreatedReportActionID,
+        // Commenting these out b/c user shouldn't an admin to start with, right? :think:
+        // adminsChatReportID,
+        // adminsChatData,
+        // adminsReportActionData,
+        // adminsCreatedReportActionID,
+        expenseChatReportID,
+        expenseChatData,
+        expenseReportActionData,
+        expenseCreatedReportActionID,
+    } = buildOptimisticWorkspaceChats(policyID, workspaceName);
+
+    // TODO: Add this user to workspace as a member
+    // TODO: Add optimistic invite message comment
+    // TODO: Make sure a specific reimbursement account is tied to the workspace
+    // TODO: Is it fine if the expense chat report is OWNED by the user instead of saastr here?
+
+    // should all of the "Created" report actions (for each room) be OWNED by saastr or user?
+    //  - it shouldn't actually matter, we don't show anything
+
+    API.write(
+        'CreateSaastrDemoWorkspace',
+        {
+            policyID,
+            announceChatReportID,
+            adminsChatReportID,
+            expenseChatReportID,
+            policyName: workspaceName,
+            announceCreatedReportActionID,
+            adminsCreatedReportActionID,
+            expenseCreatedReportActionID,
+            customUnitID,
+            customUnitRateID,
+        },
+        {
+            optimisticData: [
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                    value: {
+                        id: policyID,
+                        type: CONST.POLICY.TYPE.FREE,
+                        name: workspaceName,
+                        role: CONST.POLICY.ROLE.USER,
+                        owner: CONST.EMAIL.SAASTR,
+                        outputCurrency: lodashGet(allPersonalDetails, [sessionAccountID, 'localCurrencyCode'], CONST.CURRENCY.USD),
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        customUnits,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
+                    value: {
+                        [sessionAccountID]: {
+                            role: CONST.POLICY.ROLE.USER,
+                            errors: {},
+                        },
+                        [CONST.ACCOUNT_ID.SAASTR]: {
+                            role: CONST.POLICY.ROLE.ADMIN,
+                            errors: {},
+                        },
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                        ...announceChatData,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+                    value: announceReportActionData,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                        ...adminsChatData,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+                    value: adminsReportActionData,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                        },
+                        ...expenseChatData,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+                    value: expenseReportActionData,
+                },
+            ],
+            successData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                    value: {pendingAction: null},
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: null,
+                        },
+                        pendingAction: null,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+                    value: {
+                        [_.keys(announceChatData)[0]]: {
+                            pendingAction: null,
+                        },
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: null,
+                        },
+                        pendingAction: null,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+                    value: {
+                        [_.keys(adminsChatData)[0]]: {
+                            pendingAction: null,
+                        },
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+                    value: {
+                        pendingFields: {
+                            addWorkspaceRoom: null,
+                        },
+                        pendingAction: null,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+                    value: {
+                        [_.keys(expenseChatData)[0]]: {
+                            pendingAction: null,
+                        },
+                    },
+                },
+            ],
+            failureData: [
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+                    value: null,
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+                    value: null,
+                },
+            ],
+        }
+    );
+    // TODO: navigate to workspace chat report
+}
+
+export {createSaastrDemoWorkspaceAndNavigate};
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index d512eaff6cad..735b91a6b1d8 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -6,6 +6,7 @@ import {useFocusEffect} from '@react-navigation/native';
 import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import CONST from '../CONST';
+import {createSaastrDemoWorkspaceAndNavigate} from '../libs/actions/DemoActions';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -22,11 +23,10 @@ const propTypes = {
  *     - If not, routes back to home
  */
 function DemoSetupPage(props) {
-    console.log('DEMO props', props);
     useFocusEffect(() => {
+        // Depending on the route that the user hit to get here, run a specific demo flow
         if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
-            // Do SaaStr demo setup here
-            console.log('HERE')
+            createSaastrDemoWorkspaceAndNavigate();
         }
     });
 

From 49fb4c1844489c00e8d47430544b748a374f2ef5 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 14 Aug 2023 17:01:18 +0300
Subject: [PATCH 027/214] A few fixes to connect the new API command

---
 src/libs/actions/DemoActions.js | 31 +++++++++++++++++++++++--------
 src/libs/actions/Policy.js      |  1 +
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index a8529e9b1c20..d671c05197c2 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -1,7 +1,19 @@
+import Onyx from 'react-native-onyx';
 import CONST from '../../CONST';
 import * as API from '../API';
 import {buildOptimisticWorkspaceChats} from '../ReportUtils';
 import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
+import Navigation from '../Navigation/Navigation';
+import ROUTES from '../../ROUTES';
+import ONYXKEYS from '../../ONYXKEYS';
+
+let sessionAccountID = 0;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        sessionAccountID = lodashGet(val, 'accountID', 0);
+    },
+});
 
 function createSaastrDemoWorkspaceAndNavigate() {
     // Create workspace, owned and admin'd by SaaStr
@@ -17,18 +29,17 @@ function createSaastrDemoWorkspaceAndNavigate() {
         announceChatData,
         announceReportActionData,
         announceCreatedReportActionID,
-        // Commenting these out b/c user shouldn't an admin to start with, right? :think:
-        // adminsChatReportID,
-        // adminsChatData,
-        // adminsReportActionData,
-        // adminsCreatedReportActionID,
+        // TODO: maybe comment these admin report data out b/c user shouldn't an admin to start with, right? :think:
+        adminsChatReportID,
+        adminsChatData,
+        adminsReportActionData,
+        adminsCreatedReportActionID,
         expenseChatReportID,
         expenseChatData,
         expenseReportActionData,
         expenseCreatedReportActionID,
     } = buildOptimisticWorkspaceChats(policyID, workspaceName);
 
-    // TODO: Add this user to workspace as a member
     // TODO: Add optimistic invite message comment
     // TODO: Make sure a specific reimbursement account is tied to the workspace
     // TODO: Is it fine if the expense chat report is OWNED by the user instead of saastr here?
@@ -61,7 +72,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
                         name: workspaceName,
                         role: CONST.POLICY.ROLE.USER,
                         owner: CONST.EMAIL.SAASTR,
-                        outputCurrency: lodashGet(allPersonalDetails, [sessionAccountID, 'localCurrencyCode'], CONST.CURRENCY.USD),
+                        outputCurrency: CONST.CURRENCY.USD,
                         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                         customUnits,
                     },
@@ -229,7 +240,11 @@ function createSaastrDemoWorkspaceAndNavigate() {
             ],
         }
     );
-    // TODO: navigate to workspace chat report
+
+    // Navigate to the new workspace chat report
+    // We must call goBack() to remove the /saastr route from history
+    Navigation.goBack();
+    Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID));
 }
 
 export {createSaastrDemoWorkspaceAndNavigate};
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 809491c14950..873eb01b17a0 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -1202,4 +1202,5 @@ export {
     setWorkspaceInviteMembersDraft,
     isPolicyOwner,
     clearErrors,
+    buildOptimisticCustomUnits,
 };

From 420c187ac85a25b124c5f7bf0e3b1ade3712d164 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Mon, 14 Aug 2023 20:30:18 +0530
Subject: [PATCH 028/214] chore: replace emojiCodeTable with
 emojiCodeTableWithSkinTones

---
 assets/emojis/index.js | 14 +-------------
 src/libs/EmojiUtils.js |  6 +++---
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/assets/emojis/index.js b/assets/emojis/index.js
index 5ff2d6793f5b..c8dab36f57d9 100644
--- a/assets/emojis/index.js
+++ b/assets/emojis/index.js
@@ -15,18 +15,6 @@ const emojiNameTable = _.reduce(
     {},
 );
 
-const emojiCodeTable = _.reduce(
-    emojis,
-    (prev, cur) => {
-        const newValue = prev;
-        if (!cur.header) {
-            newValue[cur.code] = cur;
-        }
-        return newValue;
-    },
-    {},
-);
-
 const emojiCodeTableWithSkinTones = _.reduce(
     emojis,
     (prev, cur) => {
@@ -49,5 +37,5 @@ const localeEmojis = {
     es: esEmojis,
 };
 
-export {emojiNameTable, emojiCodeTable, emojiCodeTableWithSkinTones, localeEmojis};
+export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis};
 export {skinTones, categoryFrequentlyUsed, default} from './common';
diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 09f03fc7d105..5965b463e237 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -13,7 +13,7 @@ Onyx.connect({
     key: ONYXKEYS.FREQUENTLY_USED_EMOJIS,
     callback: (val) => {
         frequentlyUsedEmojis = _.map(val, (item) => {
-            const emoji = Emojis.emojiCodeTable[item.code];
+            const emoji = Emojis.emojiCodeTableWithSkinTones[item.code];
             if (emoji) {
                 return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
             }
@@ -33,7 +33,7 @@ const findEmojiByName = (name) => Emojis.emojiNameTable[name];
  * @param {String} code
  * @returns {Object}
  */
-const findEmojiByCode = (code) => Emojis.emojiCodeTable[code];
+const findEmojiByCode = (code) => Emojis.emojiCodeTableWithSkinTones[code];
 
 /**
  *
@@ -229,7 +229,7 @@ function getFrequentlyUsedEmojis(newEmoji) {
             frequentEmojiList.splice(emojiIndex, 1);
         }
 
-        const updatedEmoji = {...Emojis.emojiCodeTable[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
+        const updatedEmoji = {...Emojis.emojiCodeTableWithSkinTones[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
 
         // We want to make sure the current emoji is added to the list
         // Hence, we take one less than the current frequent used emojis

From c0b42b118c7635a51440e6dc06424f3a4807b2ce Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Mon, 14 Aug 2023 20:41:33 +0530
Subject: [PATCH 029/214] fix: logic for removing duplicates

---
 src/libs/EmojiUtils.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 5965b463e237..3dca56f1cba4 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,7 +266,7 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
-    let emojis = [];
+    const emojis = [];
 
     if (!text) {
         return emojis;
@@ -278,18 +278,20 @@ function extractEmojis(text) {
         return emojis;
     }
 
-    parseEmojis = [...new Set(parseEmojis)];
+    parseEmojis = [...new Set(parseEmojis)]; // Some emojis are repeated with different skin tones
+
+    const alreadyParsedEmojis = new Set();
 
     for (let i = 0; i < parseEmojis.length; i++) {
         const character = parseEmojis[i];
         const emoji = Emojis.emojiCodeTableWithSkinTones[character];
-        if (emoji) {
+
+        if (emoji && !alreadyParsedEmojis.has(emoji.code)) {
+            alreadyParsedEmojis.add(emoji.code); // Add to set to avoid duplicates
             emojis.push(emoji);
         }
     }
 
-    // Create a new set to remove duplicates
-    emojis = [...new Set(emojis)];
     return emojis;
 }
 

From 0507a0ff97002aaa48e9ff148f2cf9add5b78d6a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 14 Aug 2023 18:41:13 +0300
Subject: [PATCH 030/214] Add ability to run specific demo by initial URL

---
 src/Expensify.js               | 11 +++++++++--
 src/ONYXKEYS.js                |  3 +++
 src/languages/en.js            |  5 +++++
 src/languages/es.js            |  5 +++++
 src/libs/actions/App.js        | 19 +++++++++++++++++++
 src/pages/signin/SignInPage.js | 19 +++++++++++++++++--
 6 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index c85c2862e96e..3d6f7a861663 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -31,6 +31,7 @@ import SplashScreenHider from './components/SplashScreenHider';
 import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
+import {runDemoByURL} from './libs/actions/App';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -163,10 +164,16 @@ function Expensify(props) {
         appStateChangeListener.current = AppState.addEventListener('change', initializeClient);
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
-        Linking.getInitialURL().then((url) => Report.openReportFromDeepLink(url, isAuthenticated));
+        Linking.getInitialURL().then((url) => {
+            runDemoByURL(url);
+            Report.openReportFromDeepLink(url, isAuthenticated);
+        });
 
         // Open chat report from a deep link (only mobile native)
-        Linking.addEventListener('url', (state) => Report.openReportFromDeepLink(state.url, isAuthenticated));
+        Linking.addEventListener('url', (state) => {
+            runDemoByURL(state.url);
+            Report.openReportFromDeepLink(state.url, isAuthenticated);
+        });
 
         return () => {
             if (!appStateChangeListener.current) {
diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index a99a09063561..b6bc97c4e555 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -263,4 +263,7 @@ export default {
 
     // Receipt upload modal
     RECEIPT_MODAL: 'receiptModal',
+
+    // Information on any active demos being run
+    DEMO_INFO: 'demoInfo',
 };
diff --git a/src/languages/en.js b/src/languages/en.js
index 09651e6ec05e..78e8e69211d3 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1591,4 +1591,9 @@ export default {
     stateSelectorModal: {
         placeholderText: 'Search to see options',
     },
+    demos: {
+        saastr: {
+            signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
+        }
+    }
 };
diff --git a/src/languages/es.js b/src/languages/es.js
index fa920c84ce35..2af31340cf9c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -2063,4 +2063,9 @@ export default {
     stateSelectorModal: {
         placeholderText: 'Buscar para ver opciones',
     },
+    demos: {
+        saastr: {
+            signInWelcome: '',
+        }
+    }
 };
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index fe2c908dfd0b..18f5254346f8 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -437,6 +437,24 @@ function beginDeepLinkRedirectAfterTransition() {
     waitForSignOnTransitionToFinish().then(beginDeepLinkRedirect);
 }
 
+/**
+ * Runs code for specific demos, based on the provided URL
+ *
+ * @param {String} url - URL user is navigating to via deep link (or regular link in web)
+ */
+function runDemoByURL(url = '') {
+    if (url.endsWith(ROUTES.SAASTR)) {
+        Onyx.merge(ONYXKEYS.DEMO_INFO, {
+            saastr: {
+                isBeginningDemo: true,
+            }
+        })
+    } else {
+        // No demo is being run, so clear out demo info
+        Onyx.set(ONYXKEYS.DEMO_INFO, null);
+    }
+}
+
 export {
     setLocale,
     setLocaleAndNavigate,
@@ -449,4 +467,5 @@ export {
     beginDeepLinkRedirect,
     beginDeepLinkRedirectAfterTransition,
     createWorkspaceAndNavigateToIt,
+    runDemoByURL
 };
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index f6eb4f9306f3..f46595daea60 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -45,11 +45,19 @@ const propTypes = {
         twoFactorAuthCode: PropTypes.string,
         validateCode: PropTypes.string,
     }),
+
+    /** Information about any currently running demos */
+    demoInfo: PropTypes.shape({
+        saastr: PropTypes.shape({
+            isBeginningDemo: PropTypes.bool,
+        }),
+    }),
 };
 
 const defaultProps = {
     account: {},
     credentials: {},
+    demoInfo: {},
 };
 
 /**
@@ -77,7 +85,7 @@ function getRenderOptions({hasLogin, hasValidateCode, hasAccount, isPrimaryLogin
     };
 }
 
-function SignInPage({credentials, account}) {
+function SignInPage({credentials, account, demoInfo}) {
     const {translate, formatPhoneNumber} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const safeAreaInsets = useSafeAreaInsets();
@@ -102,7 +110,13 @@ function SignInPage({credentials, account}) {
     let welcomeText = '';
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.getStarted');
-        welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
+        
+        if (demoInfo.saastr && demoInfo.saastr.isBeginningDemo) {
+            welcomeText = translate('demos.saastr.signInWelcome');
+        } else {
+            welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
+        }
+        
     } else if (shouldShowValidateCodeForm) {
         if (account.requiresTwoFactorAuth) {
             // We will only know this after a user signs in successfully, without their 2FA code
@@ -165,4 +179,5 @@ SignInPage.displayName = 'SignInPage';
 export default withOnyx({
     account: {key: ONYXKEYS.ACCOUNT},
     credentials: {key: ONYXKEYS.CREDENTIALS},
+    demoInfo: {key: ONYXKEYS.DEMO_INFO},
 })(SignInPage);

From 32256506be6db98e5699824bc1262e219a036be1 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 13:55:27 -0600
Subject: [PATCH 031/214] Remove unused prop

---
 src/components/ReportActionItem/MoneyRequestPreview.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index e5a53be6c46a..85fb952a2959 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -100,9 +100,6 @@ const propTypes = {
     /** Information about the user accepting the terms for payments */
     walletTerms: walletTermsPropTypes,
 
-    /** Pending action, if any */
-    pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)),
-
     /** Whether or not an IOU report contains money requests in a different currency
      * that are either created or cancelled offline, and thus haven't been converted to the report's currency yet
      */
@@ -119,7 +116,6 @@ const defaultProps = {
     checkIfContextMenuActive: () => {},
     containerStyles: [],
     walletTerms: {},
-    pendingAction: null,
     isHovered: false,
     personalDetails: {},
     session: {
@@ -197,7 +193,6 @@ function MoneyRequestPreview(props) {
     const childContainer = (
         <View>
             <OfflineWithFeedback
-                pendingAction={props.pendingAction}
                 errors={props.walletTerms.errors}
                 onClose={() => {
                     PaymentMethods.clearWalletTermsError();

From 648c9c2e1c4beee93537383ab7d076c663acdd64 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:00:08 -0600
Subject: [PATCH 032/214] Add transaction subscription

---
 src/components/ReportActionItem/MoneyRequestPreview.js | 7 +++++++
 src/pages/home/report/reportActionFragmentPropTypes.js | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 85fb952a2959..85311b91073e 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -91,6 +91,9 @@ const propTypes = {
         }),
     ),
 
+    /** The transaction attached to the action.message.iouTransactionID */
+    transaction: PropTypes.any,
+
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
         /** Currently logged in user email */
@@ -121,6 +124,7 @@ const defaultProps = {
     session: {
         email: null,
     },
+    transaction: null,
     shouldShowPendingConversionMessage: false,
 };
 
@@ -311,6 +315,9 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        transaction: {
+            key: ({action}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${(action && action.message && action.message.iouTransactionID) || 0}`,
+        },
         walletTerms: {
             key: ONYXKEYS.WALLET_TERMS,
         },
diff --git a/src/pages/home/report/reportActionFragmentPropTypes.js b/src/pages/home/report/reportActionFragmentPropTypes.js
index 5d2e3b951a1d..2949813dcebd 100644
--- a/src/pages/home/report/reportActionFragmentPropTypes.js
+++ b/src/pages/home/report/reportActionFragmentPropTypes.js
@@ -29,4 +29,7 @@ export default PropTypes.shape({
 
     /** Fragment edited flag */
     isEdited: PropTypes.bool,
+
+    /** A possible IOU transaction ID */
+    iouTransactionID: PropTypes.int,
 });

From d91b6947683dc96e056c2d45e19e2935e740254f Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:12:19 -0600
Subject: [PATCH 033/214] Add a method to determine transaction type

---
 src/CONST.js                 |  5 +++++
 src/libs/TransactionUtils.js | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index cc5d63be0373..0319ac4fad71 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -639,6 +639,11 @@ const CONST = {
         DARK: 'dark',
         SYSTEM: 'system',
     },
+    TRANSACTION: {
+        TYPE: {
+            CUSTOM_UNIT: 'customUnit',
+        },
+    },
     JSON_CODE: {
         SUCCESS: 200,
         BAD_REQUEST: 400,
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 48892a69cc01..8a11f536b20a 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -167,4 +167,15 @@ function getCreated(transaction) {
     return format(new Date(lodashGet(transaction, 'created', '')), CONST.DATE.FNS_FORMAT_STRING);
 }
 
-export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getTransaction, getDescription, getAmount, getCurrency, getCreated};
+/**
+ * @param {Object} transaction
+ * @param {String} transaction.type
+ * @param {Object} [transaction.customUnit]
+ * @param {String} [transaction.customUnit.name]
+ * @returns {Boolean}
+ */
+function isDistanceRequest(transaction) {
+    return transaction && transaction.type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && transaction.customUnit && transaction.customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE;
+}
+
+export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getTransaction, getDescription, getAmount, getCurrency, getCreated, isDistanceRequest};

From 846176339f557a4cc4719c15a39c8538037c881d Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:18:47 -0600
Subject: [PATCH 034/214] Add method for getting a receipt URL

---
 src/libs/ReceiptUtils.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
index 635537226815..c9c6fcffa3f0 100644
--- a/src/libs/ReceiptUtils.js
+++ b/src/libs/ReceiptUtils.js
@@ -9,6 +9,7 @@ import ReceiptHTML from '../../assets/images/receipt-html.png';
 import ReceiptDoc from '../../assets/images/receipt-doc.png';
 import ReceiptGeneric from '../../assets/images/receipt-generic.png';
 import ReceiptSVG from '../../assets/images/receipt-svg.png';
+import CONFIG from '../CONFIG';
 
 function validateReceipt(file) {
     const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));
@@ -68,4 +69,13 @@ function isBeingScanned(receipt) {
     return receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
 }
 
-export {validateReceipt, getThumbnailAndImageURIs, isBeingScanned};
+/**
+ * Returns the URL of a receipt given a filename
+ * @param {String} filename
+ * @returns {String}
+ */
+function getURL(filename) {
+    return `${CONFIG.EXPENSIFY.EXPENSIFY_URL}receipts/${filename}`;
+}
+
+export {validateReceipt, getThumbnailAndImageURIs, getURL, isBeingScanned};

From 8600f5c4aeae21e11f6b080fdb4af04eefbc923d Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:32:13 -0600
Subject: [PATCH 035/214] Display header and amount

---
 .../ReportActionItem/MoneyRequestPreview.js   | 31 +++++++++++++++----
 .../report/reportActionFragmentPropTypes.js   |  3 --
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 85311b91073e..06bbcc2b0e57 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -92,7 +92,18 @@ const propTypes = {
     ),
 
     /** The transaction attached to the action.message.iouTransactionID */
-    transaction: PropTypes.any,
+    transaction: PropTypes.shape({
+        /** The type of transaction */
+        type: PropTypes.string,
+
+        /** Custom units attached to the transaction */
+        customUnits: PropTypes.arrayOf(
+            PropTypes.shape({
+                /** The name of the custom unit */
+                name: PropTypes.string,
+            }),
+        ),
+    }),
 
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
@@ -124,7 +135,7 @@ const defaultProps = {
     session: {
         email: null,
     },
-    transaction: null,
+    transaction: {},
     shouldShowPendingConversionMessage: false,
 };
 
@@ -147,9 +158,9 @@ function MoneyRequestPreview(props) {
     const requestCurrency = moneyRequestAction.currency;
     const requestComment = moneyRequestAction.comment.trim();
 
-    const transaction = ReportActionUtils.getTransaction(props.action);
-    const hasReceipt = TransactionUtils.hasReceipt(transaction);
+    const hasReceipt = TransactionUtils.hasReceipt(props.transaction);
     const isScanning = !ReportActionUtils.hasReadyMoneyRequests(props.action);
+    const isDistanceRequest = props.transaction && TransactionUtils.isDistanceRequest(props.transaction);
 
     const getSettledMessage = () => {
         switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
@@ -169,6 +180,10 @@ function MoneyRequestPreview(props) {
     };
 
     const getPreviewHeaderText = () => {
+        if (isDistanceRequest) {
+            return props.translate('tabSelector.distance');
+        }
+
         if (isScanning) {
             return props.translate('common.receipt');
         }
@@ -187,6 +202,10 @@ function MoneyRequestPreview(props) {
     };
 
     const getDisplayAmountText = () => {
+        if (isDistanceRequest) {
+            return TransactionUtils.getAmount(props.transaction);
+        }
+
         if (isScanning) {
             return props.translate('iou.receiptScanning');
         }
@@ -208,7 +227,7 @@ function MoneyRequestPreview(props) {
                 <View style={[styles.moneyRequestPreviewBox, ...props.containerStyles, isScanning ? styles.moneyRequestPreviewBoxHover : undefined]}>
                     {hasReceipt && (
                         <ReportActionItemImages
-                            images={[ReceiptUtils.getThumbnailAndImageURIs(transaction.receipt.source, transaction.filename)]}
+                            images={[ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename)]}
                             size={1}
                             total={1}
                             hoverStyle={isScanning ? styles.moneyRequestPreviewBoxHover : undefined}
@@ -316,7 +335,7 @@ export default compose(
             key: ONYXKEYS.SESSION,
         },
         transaction: {
-            key: ({action}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${(action && action.message && action.message.iouTransactionID) || 0}`,
+            key: ({action}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${(action && action.originalMessage && action.originalMessage.IOUTransactionID) || 0}`,
         },
         walletTerms: {
             key: ONYXKEYS.WALLET_TERMS,
diff --git a/src/pages/home/report/reportActionFragmentPropTypes.js b/src/pages/home/report/reportActionFragmentPropTypes.js
index 2949813dcebd..5d2e3b951a1d 100644
--- a/src/pages/home/report/reportActionFragmentPropTypes.js
+++ b/src/pages/home/report/reportActionFragmentPropTypes.js
@@ -29,7 +29,4 @@ export default PropTypes.shape({
 
     /** Fragment edited flag */
     isEdited: PropTypes.bool,
-
-    /** A possible IOU transaction ID */
-    iouTransactionID: PropTypes.int,
 });

From 613e662a74020291191d14a69f66b35b1b9726d2 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:33:30 -0600
Subject: [PATCH 036/214] Remove duplicate method

---
 src/libs/TransactionUtils.js | 26 +-------------------------
 src/pages/EditRequestPage.js |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 8a11f536b20a..f7cdd3168f27 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -1,24 +1,10 @@
-import Onyx from 'react-native-onyx';
 import {format} from 'date-fns';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
 import CONST from '../CONST';
-import ONYXKEYS from '../ONYXKEYS';
 import DateUtils from './DateUtils';
 import * as NumberUtils from './NumberUtils';
 
-let allTransactions = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.TRANSACTION,
-    waitForCollectionCallback: true,
-    callback: (val) => {
-        if (!val) {
-            return;
-        }
-        allTransactions = val;
-    },
-});
-
 /**
  * Optimistically generate a transaction.
  *
@@ -101,16 +87,6 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
     return updatedTransaction;
 }
 
-/**
- * Retrieve the particular transaction object given its ID.
- *
- * @param {String} transactionID
- * @returns {Object}
- */
-function getTransaction(transactionID) {
-    return lodashGet(allTransactions, `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {});
-}
-
 /**
  * Return the comment field (referred to as description in the App) from the transaction.
  * The comment does not have its modifiedComment counterpart.
@@ -178,4 +154,4 @@ function isDistanceRequest(transaction) {
     return transaction && transaction.type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && transaction.customUnit && transaction.customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE;
 }
 
-export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getTransaction, getDescription, getAmount, getCurrency, getCreated, isDistanceRequest};
+export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getDescription, getAmount, getCurrency, getCreated, isDistanceRequest};
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 971ad056ae7e..941a560591c2 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -39,7 +39,7 @@ const defaultProps = {
 
 function EditRequestPage({report, route}) {
     const transactionID = lodashGet(ReportActionsUtils.getParentReportAction(report), 'originalMessage.IOUTransactionID', '');
-    const transaction = TransactionUtils.getTransaction(transactionID);
+    const transaction = ReportActionsUtils.getTransaction(transactionID);
     const transactionDescription = TransactionUtils.getDescription(transaction);
     const transactionAmount = TransactionUtils.getAmount(transaction, ReportUtils.isExpenseReport(ReportUtils.getParentReport(report)));
     const transactionCurrency = TransactionUtils.getCurrency(transaction);

From f1a0e8efd08570566f96cae03efaa4e6dc8df4c4 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 14:37:06 -0600
Subject: [PATCH 037/214] Use the right description

---
 .../ReportActionItem/MoneyRequestPreview.js          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 06bbcc2b0e57..ebe210986460 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -93,6 +93,9 @@ const propTypes = {
 
     /** The transaction attached to the action.message.iouTransactionID */
     transaction: PropTypes.shape({
+        /** The name of the transaction merchant */
+        merchant: PropTypes.string,
+
         /** The type of transaction */
         type: PropTypes.string,
 
@@ -156,12 +159,17 @@ function MoneyRequestPreview(props) {
 
     const requestAmount = moneyRequestAction.amount;
     const requestCurrency = moneyRequestAction.currency;
-    const requestComment = moneyRequestAction.comment.trim();
+    let description = moneyRequestAction.comment.trim();
 
     const hasReceipt = TransactionUtils.hasReceipt(props.transaction);
     const isScanning = !ReportActionUtils.hasReadyMoneyRequests(props.action);
     const isDistanceRequest = props.transaction && TransactionUtils.isDistanceRequest(props.transaction);
 
+    // On a distance request the merchange of the transaction will be used for the description since that's where it's stored in the database
+    if (isDistanceRequest) {
+        description = props.transaction.merchant;
+    }
+
     const getSettledMessage = () => {
         switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
             case CONST.IOU.PAYMENT_TYPE.PAYPAL_ME:
@@ -284,7 +292,7 @@ function MoneyRequestPreview(props) {
                                 {!isCurrentUserManager && props.shouldShowPendingConversionMessage && (
                                     <Text style={[styles.textLabel, styles.colorMuted, styles.mt1]}>{props.translate('iou.pendingConversionMessage')}</Text>
                                 )}
-                                {!_.isEmpty(requestComment) && <Text style={[styles.mt1, styles.colorMuted]}>{requestComment}</Text>}
+                                {!_.isEmpty(description) && <Text style={[styles.mt1, styles.colorMuted]}>{description}</Text>}
                             </View>
                             {props.isBillSplit && !_.isEmpty(participantAccountIDs) && (
                                 <Text style={[styles.textLabel, styles.colorMuted, styles.ml1]}>

From 58d7fe245b5249e4bc8285a832017bcb42531a84 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 14 Aug 2023 15:17:00 -0600
Subject: [PATCH 038/214] Add receipt image component

---
 src/components/ReportActionItem/MoneyRequestPreview.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index ebe210986460..ceffcafa89e1 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -93,6 +93,9 @@ const propTypes = {
 
     /** The transaction attached to the action.message.iouTransactionID */
     transaction: PropTypes.shape({
+        /** The name of the file for the receipt image. This is just the filename and doesn't come with any kind of a path */
+        filename: PropTypes.string,
+
         /** The name of the transaction merchant */
         merchant: PropTypes.string,
 
@@ -241,6 +244,8 @@ function MoneyRequestPreview(props) {
                             hoverStyle={isScanning ? styles.moneyRequestPreviewBoxHover : undefined}
                         />
                     )}
+
+                    {isDistanceRequest && <ReportActionItemImages images={[ReceiptUtils.getURL(props.transaction.filename)]} />}
                     <View style={styles.moneyRequestPreviewBoxText}>
                         <View style={[styles.flexRow]}>
                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>

From a3f7564a22f4baf2e64fab93b69cecaa8f8e3366 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 10:17:50 +0300
Subject: [PATCH 039/214] Fix customizing the header

---
 src/pages/signin/SignInPage.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index f46595daea60..2617aad1d630 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -110,13 +110,11 @@ function SignInPage({credentials, account, demoInfo}) {
     let welcomeText = '';
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.getStarted');
+        welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
         
         if (demoInfo.saastr && demoInfo.saastr.isBeginningDemo) {
-            welcomeText = translate('demos.saastr.signInWelcome');
-        } else {
-            welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
+            welcomeHeader = translate('demos.saastr.signInWelcome');
         }
-        
     } else if (shouldShowValidateCodeForm) {
         if (account.requiresTwoFactorAuth) {
             // We will only know this after a user signs in successfully, without their 2FA code

From 24843e6251e31d967e123b17a31584a38ac28c5a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 11:30:40 +0300
Subject: [PATCH 040/214] New util to get workspace chat report from policy
 owner

---
 src/libs/ReportUtils.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index ab8537d2bcdd..951e93fa99c3 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -2884,6 +2884,19 @@ function getPolicy(policyID) {
     return policy;
 }
 
+/**
+ * @param {String} policyOwner
+ * @returns {String|null}
+ */
+function getPolicyExpenseChatReportIDByOwner(policyOwner) {
+    const policy = _.find(allPolicies, (policy) => policy.owner === policyOwner);
+    if (!policy) {
+        return null;
+    }
+
+    return _find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policy.id);
+}
+
 /*
  * @param {Object|null} report
  * @returns {Boolean}
@@ -3148,6 +3161,7 @@ export {
     getReportOfflinePendingActionAndErrors,
     isDM,
     getPolicy,
+    getPolicyExpenseChatReportIDByOwner,
     shouldDisableSettings,
     shouldDisableRename,
     hasSingleParticipant,

From 247a58ac87cfa8d17666aed3b1f23e302c00c04b Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 11:31:04 +0300
Subject: [PATCH 041/214] Lookup workspace chat first & add workspace name
 prefix

---
 src/libs/actions/DemoActions.js | 34 +++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index d671c05197c2..fe237f5a1b25 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -1,26 +1,52 @@
+import Str from 'expensify-common/lib/str';
 import Onyx from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import CONST from '../../CONST';
 import * as API from '../API';
-import {buildOptimisticWorkspaceChats} from '../ReportUtils';
+import {buildOptimisticWorkspaceChats, getPolicyExpenseChatReportIDByOwner} from '../ReportUtils';
 import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
 
 let sessionAccountID = 0;
+let sessionEmail = 0;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
         sessionAccountID = lodashGet(val, 'accountID', 0);
+        sessionEmail = lodashGet(val, 'email', '');
     },
 });
 
+let userIsFromPublicDomain;
+Onyx.connect({
+    key: ONYXKEYS.USER,
+    callback: (val) => {
+        if (!val) {
+            return;
+        }
+
+        userIsFromPublicDomain = val.isFromPublicDomain;
+    }
+})
+
 function createSaastrDemoWorkspaceAndNavigate() {
+    // Try to navigate to existing SaaStr expense chat if it exists in Onyx
+    const saastrWorkspaceChatReportID = getPolicyExpenseChatReportIDByOwner(CONST.EMAIL.SAASTR);
+    if (saastrWorkspaceChatReportID) {
+        // We must call goBack() to remove the /saastr route from history
+        Navigation.goBack();
+        Navigation.navigate(ROUTES.getReportRoute(saastrWorkspaceChatReportID));
+        return;
+    }
+
     // Create workspace, owned and admin'd by SaaStr
     const policyID = generatePolicyID();
 
-    // TODO: maybe add domain name as prefix??
-    const workspaceName = 'SaaStr Cantina';
+    // Add domain name as prefix (only if domain is private)
+    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
+    const workspaceName = `${domainNamePrefix}SaaStr Workspace`;
 
     const {customUnits, customUnitID, customUnitRateID} = buildOptimisticCustomUnits();
 
@@ -244,7 +270,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
     // Navigate to the new workspace chat report
     // We must call goBack() to remove the /saastr route from history
     Navigation.goBack();
-    Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID));
+    Navigation.navigate(ROUTES.getReportRoute(expenseChatReportID));
 }
 
 export {createSaastrDemoWorkspaceAndNavigate};

From 0b32e91742d13dc5b63d7a4beb76430492ed5341 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 11:59:34 +0300
Subject: [PATCH 042/214] Add optimistic welcome message when creating
 workspace chat

---
 src/libs/actions/DemoActions.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index fe237f5a1b25..6f2ad6ba2f7d 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import CONST from '../../CONST';
 import * as API from '../API';
-import {buildOptimisticWorkspaceChats, getPolicyExpenseChatReportIDByOwner} from '../ReportUtils';
+import {buildOptimisticWorkspaceChats, buildOptimisticAddCommentReportAction, getPolicyExpenseChatReportIDByOwner} from '../ReportUtils';
 import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
@@ -66,7 +66,29 @@ function createSaastrDemoWorkspaceAndNavigate() {
         expenseCreatedReportActionID,
     } = buildOptimisticWorkspaceChats(policyID, workspaceName);
 
-    // TODO: Add optimistic invite message comment
+    // Add optimistic invite message comment
+    const initialMessageText = `
+    Welcome to NewExpensify, who wants $20?
+
+    To scan the receipt and get paid:
+    1. Click the +
+    2. Click Request Money.
+    3. Take a photo of the receipt, we'll automatically enter all the info.
+    4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!
+    `;
+    // TODO: make sure this comes FROM saastr!!
+    const welcomeMessageReportAction = buildOptimisticAddCommentReportAction(initialMessageText);
+
+    // Update policy expense chat report actions with welcome message from saastr
+    expenseReportActionData[welcomeMessageReportAction.reportAction.reportActionID] = welcomeMessageReportAction.reportAction;
+
+    // Update report with info about last message sent
+    const currentTime = DateUtils.getDBTime();
+    expenseChatData.lastVisibleActionCreated = currentTime,
+    expenseChatData.lastMessageText = initialMessageText,
+    expenseChatData.lastActorAccountID = CONST.ACCOUNT_ID.SAASTR,
+    expenseChatData.lastReadTime = currentTime,
+
     // TODO: Make sure a specific reimbursement account is tied to the workspace
     // TODO: Is it fine if the expense chat report is OWNED by the user instead of saastr here?
 

From 24f4e367c28d3f63de0f1f5e5d7775df61e7ea62 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 12:05:56 +0300
Subject: [PATCH 043/214] A few fixes & remove a few TODOs

---
 src/libs/actions/DemoActions.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 6f2ad6ba2f7d..5eeabac77142 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -84,16 +84,10 @@ function createSaastrDemoWorkspaceAndNavigate() {
 
     // Update report with info about last message sent
     const currentTime = DateUtils.getDBTime();
-    expenseChatData.lastVisibleActionCreated = currentTime,
-    expenseChatData.lastMessageText = initialMessageText,
-    expenseChatData.lastActorAccountID = CONST.ACCOUNT_ID.SAASTR,
-    expenseChatData.lastReadTime = currentTime,
-
-    // TODO: Make sure a specific reimbursement account is tied to the workspace
-    // TODO: Is it fine if the expense chat report is OWNED by the user instead of saastr here?
-
-    // should all of the "Created" report actions (for each room) be OWNED by saastr or user?
-    //  - it shouldn't actually matter, we don't show anything
+    expenseChatData.lastVisibleActionCreated = currentTime;
+    expenseChatData.lastMessageText = initialMessageText;
+    expenseChatData.lastActorAccountID = CONST.ACCOUNT_ID.SAASTR;
+    expenseChatData.lastReadTime = currentTime;
 
     API.write(
         'CreateSaastrDemoWorkspace',

From 2556d2f2e8013e94a536fa0629f3ae37b01a0f11 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 12:15:30 +0300
Subject: [PATCH 044/214] Make sure welcome message comes from SaaStr

---
 src/libs/actions/DemoActions.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 5eeabac77142..fef5e765ef1d 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -26,7 +26,6 @@ Onyx.connect({
         if (!val) {
             return;
         }
-
         userIsFromPublicDomain = val.isFromPublicDomain;
     }
 })
@@ -76,8 +75,10 @@ function createSaastrDemoWorkspaceAndNavigate() {
     3. Take a photo of the receipt, we'll automatically enter all the info.
     4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!
     `;
-    // TODO: make sure this comes FROM saastr!!
     const welcomeMessageReportAction = buildOptimisticAddCommentReportAction(initialMessageText);
+    welcomeMessageReportAction.reportAction.actorAccountID = CONST.ACCOUNT_ID.SAASTR;
+    welcomeMessageReportAction.reportAction.person[0].text = 'SaaStr 2023';
+    welcomeMessageReportAction.reportAction.avatar = '';
 
     // Update policy expense chat report actions with welcome message from saastr
     expenseReportActionData[welcomeMessageReportAction.reportAction.reportActionID] = welcomeMessageReportAction.reportAction;

From e812d10a11291a5e417ec7303f2ba0ca22707834 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 12:18:26 +0300
Subject: [PATCH 045/214] Add saastr acct num

---
 src/CONST.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index e35926a78fc7..e4715eb43a9c 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -865,7 +865,7 @@ const CONST = {
         QA_TRAVIS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_QA_TRAVIS', 8595733)),
         RECEIPTS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_RECEIPTS', -1)),
         REWARDS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_REWARDS', 11023767)), // rewards@expensify.com
-        SAASTR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SAASTR', -1)),
+        SAASTR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SAASTR', 15252830)),
         STUDENT_AMBASSADOR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR', 10476956)),
         SVFG: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SVFG', 2012843)),
     },

From 2d3d3a3e2b5f8a46a158853e2ec159703cfdb80a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 12:25:46 +0300
Subject: [PATCH 046/214] prettify

---
 src/languages/en.js                  | 4 ++--
 src/languages/es.js                  | 4 ++--
 src/libs/Navigation/linkingConfig.js | 2 +-
 src/libs/actions/App.js              | 6 +++---
 src/libs/actions/DemoActions.js      | 6 +++---
 src/pages/signin/SignInPage.js       | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index ee6a5893019c..c15e0a66b387 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1595,6 +1595,6 @@ export default {
     demos: {
         saastr: {
             signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
-        }
-    }
+        },
+    },
 };
diff --git a/src/languages/es.js b/src/languages/es.js
index 7511ec1e17e5..c150972aa750 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -2067,6 +2067,6 @@ export default {
     demos: {
         saastr: {
             signInWelcome: '',
-        }
-    }
+        },
+    },
 };
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index 1a2bcc164bd0..d583d9c5bc13 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -23,7 +23,7 @@ export default {
             [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: {
                 screens: {
                     [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID,
-                    [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR
+                    [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR,
                 },
             },
             [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: {
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index b7ae9f7272d6..41b617379664 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -447,8 +447,8 @@ function runDemoByURL(url = '') {
         Onyx.merge(ONYXKEYS.DEMO_INFO, {
             saastr: {
                 isBeginningDemo: true,
-            }
-        })
+            },
+        });
     } else {
         // No demo is being run, so clear out demo info
         Onyx.set(ONYXKEYS.DEMO_INFO, null);
@@ -467,5 +467,5 @@ export {
     beginDeepLinkRedirect,
     beginDeepLinkRedirectAfterTransition,
     createWorkspaceAndNavigateToIt,
-    runDemoByURL
+    runDemoByURL,
 };
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index fef5e765ef1d..72169a7ce2c8 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -27,8 +27,8 @@ Onyx.connect({
             return;
         }
         userIsFromPublicDomain = val.isFromPublicDomain;
-    }
-})
+    },
+});
 
 function createSaastrDemoWorkspaceAndNavigate() {
     // Try to navigate to existing SaaStr expense chat if it exists in Onyx
@@ -281,7 +281,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
                     value: null,
                 },
             ],
-        }
+        },
     );
 
     // Navigate to the new workspace chat report
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 2617aad1d630..a19d1dea5faf 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -111,7 +111,7 @@ function SignInPage({credentials, account, demoInfo}) {
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? translate('login.hero.header') : translate('welcomeText.getStarted');
         welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
-        
+
         if (demoInfo.saastr && demoInfo.saastr.isBeginningDemo) {
             welcomeHeader = translate('demos.saastr.signInWelcome');
         }

From 4cf57058833d40d672b813bfc01a35a99f7da290 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 15:39:52 +0300
Subject: [PATCH 047/214] Update spanish translation

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

diff --git a/src/languages/es.js b/src/languages/es.js
index c150972aa750..20e215a18fe2 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -2066,7 +2066,7 @@ export default {
     },
     demos: {
         saastr: {
-            signInWelcome: '',
+            signInWelcome: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
         },
     },
 };

From c9e2d65230b22425ee9b3dda952e68b147c11ef6 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 16:58:28 +0300
Subject: [PATCH 048/214] Remove policyExpenseChat beta

---
 src/CONST.js               | 1 -
 src/libs/Permissions.js    | 8 --------
 src/libs/ReportUtils.js    | 5 -----
 src/libs/actions/Policy.js | 5 -----
 4 files changed, 19 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index a0c6cbf2bcf3..3c531c2a257c 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -216,7 +216,6 @@ const CONST = {
         INTERNATIONALIZATION: 'internationalization',
         IOU_SEND: 'sendMoney',
         POLICY_ROOMS: 'policyRooms',
-        POLICY_EXPENSE_CHAT: 'policyExpenseChat',
         PASSWORDLESS: 'passwordless',
         TASKS: 'tasks',
         THREADS: 'threads',
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index f80f1878fc36..b490d8cbe367 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -70,14 +70,6 @@ function canUsePolicyRooms(betas) {
     return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas);
 }
 
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUsePolicyExpenseChat(betas) {
-    return _.contains(betas, CONST.BETAS.POLICY_EXPENSE_CHAT) || canUseAllBetas(betas);
-}
-
 /**
  * @param {Array<String>} betas
  * @returns {Boolean}
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index aa72fc88d8cc..2a92e028c0df 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -2530,11 +2530,6 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, iouRep
         return true;
     }
 
-    // Exclude policy expense chats if the user isn't in the policy expense chat beta
-    if (isPolicyExpenseChat(report) && !Permissions.canUsePolicyExpenseChat(betas)) {
-        return false;
-    }
-
     // Hide chats between two users that haven't been commented on from the LNH
     if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report)) {
         return false;
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 809491c14950..22b729b25581 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -261,11 +261,6 @@ function createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, betas) {
         reportCreationData: {},
     };
 
-    // If the user is not in the beta, we don't want to create any chats
-    if (!Permissions.canUsePolicyExpenseChat(betas)) {
-        return workspaceMembersChats;
-    }
-
     _.each(invitedEmailsToAccountIDs, (accountID, email) => {
         const cleanAccountID = Number(accountID);
         const login = OptionsListUtils.addSMSDomainIfPhoneNumber(email);

From 109960015984b1c2a7040db65756f92a0650759e Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 15 Aug 2023 16:58:35 +0300
Subject: [PATCH 049/214] Update tests

---
 src/libs/__mocks__/Permissions.js |  1 -
 tests/unit/SidebarFilterTest.js   | 64 ++++---------------------------
 tests/unit/SidebarOrderTest.js    |  4 +-
 tests/unit/SidebarTest.js         |  4 +-
 4 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/src/libs/__mocks__/Permissions.js b/src/libs/__mocks__/Permissions.js
index 5486d184d51b..3d7a94b86848 100644
--- a/src/libs/__mocks__/Permissions.js
+++ b/src/libs/__mocks__/Permissions.js
@@ -12,6 +12,5 @@ export default {
     ...jest.requireActual('../Permissions'),
     canUseDefaultRooms: (betas) => _.contains(betas, CONST.BETAS.DEFAULT_ROOMS),
     canUsePolicyRooms: (betas) => _.contains(betas, CONST.BETAS.POLICY_ROOMS),
-    canUsePolicyExpenseChat: (betas) => _.contains(betas, CONST.BETAS.POLICY_EXPENSE_CHAT),
     canUseIOUSend: (betas) => _.contains(betas, CONST.BETAS.IOU_SEND),
 };
diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
index bcc8d2f8765c..61dac3f2f786 100644
--- a/tests/unit/SidebarFilterTest.js
+++ b/tests/unit/SidebarFilterTest.js
@@ -127,54 +127,6 @@ describe('Sidebar', () => {
             );
         });
 
-        it('includes or excludes policy expensechats depending on the beta', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
-            // Given a policy expense report
-            // and the user not being in any betas
-            const report = {
-                ...LHNTestUtils.getFakeReport(),
-                chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
-            };
-
-            return (
-                waitForPromisesToResolve()
-                    // When Onyx is updated to contain that data and the sidebar re-renders
-                    .then(() =>
-                        Onyx.multiSet({
-                            [ONYXKEYS.BETAS]: [],
-                            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
-                            [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
-                        }),
-                    )
-
-                    // When the report has at least one ADDCOMMENT action to be rendered in the LNH
-                    .then(() => Report.addComment(report.reportID, 'Hi, this is a comment'))
-
-                    // Then no reports are rendered in the LHN
-                    .then(() => {
-                        const hintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
-                        const optionRows = screen.queryAllByAccessibilityHint(hintText);
-                        expect(optionRows).toHaveLength(0);
-                    })
-
-                    // When the user is added to the policy expense beta and the sidebar re-renders
-                    .then(() =>
-                        Onyx.multiSet({
-                            [ONYXKEYS.BETAS]: [CONST.BETAS.POLICY_EXPENSE_CHAT],
-                        }),
-                    )
-
-                    // Then there is one report rendered in the LHN
-                    .then(() => {
-                        const hintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
-                        const optionRows = screen.queryAllByAccessibilityHint(hintText);
-                        expect(optionRows).toHaveLength(1);
-                    })
-            );
-        });
-
         it('includes or excludes user created policy rooms depending on the beta', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
@@ -335,7 +287,7 @@ describe('Sidebar', () => {
             };
 
             // Given the user is in all betas
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
             // Given there are 6 boolean variables tested in the filtering logic:
             // 1. isArchived
@@ -539,7 +491,7 @@ describe('Sidebar', () => {
             };
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
             return (
                 waitForPromisesToResolve()
@@ -602,7 +554,7 @@ describe('Sidebar', () => {
             };
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
             return (
                 waitForPromisesToResolve()
@@ -660,7 +612,7 @@ describe('Sidebar', () => {
         };
 
         // Given the user is in all betas
-        const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+        const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
         // Given there are 6 boolean variables tested in the filtering logic:
         // 1. isArchived
@@ -753,7 +705,7 @@ describe('Sidebar', () => {
                 };
 
                 // Given the user is in all betas
-                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
                     waitForPromisesToResolve()
@@ -804,7 +756,7 @@ describe('Sidebar', () => {
                 };
 
                 // Given the user is in all betas
-                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
                     waitForPromisesToResolve()
@@ -853,7 +805,7 @@ describe('Sidebar', () => {
                 };
 
                 // Given the user is in all betas
-                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
                     waitForPromisesToResolve()
@@ -898,7 +850,7 @@ describe('Sidebar', () => {
                 };
 
                 // Given the user is in all betas
-                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+                const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
                     waitForPromisesToResolve()
diff --git a/tests/unit/SidebarOrderTest.js b/tests/unit/SidebarOrderTest.js
index 734f062ec770..95277ec74ffe 100644
--- a/tests/unit/SidebarOrderTest.js
+++ b/tests/unit/SidebarOrderTest.js
@@ -575,7 +575,7 @@ describe('Sidebar', () => {
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
             // Given the user is in all betas
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForPromisesToResolve()
@@ -667,7 +667,7 @@ describe('Sidebar', () => {
             const report3 = LHNTestUtils.getFakeReport([5, 6], 1, true);
 
             // Given the user is in all betas
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForPromisesToResolve()
diff --git a/tests/unit/SidebarTest.js b/tests/unit/SidebarTest.js
index 3a89c5564bc5..84403ce5fc11 100644
--- a/tests/unit/SidebarTest.js
+++ b/tests/unit/SidebarTest.js
@@ -56,7 +56,7 @@ describe('Sidebar', () => {
             };
 
             // Given the user is in all betas
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForPromisesToResolve()
@@ -99,7 +99,7 @@ describe('Sidebar', () => {
             };
 
             // Given the user is in all betas
-            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS, CONST.BETAS.POLICY_EXPENSE_CHAT];
+            const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForPromisesToResolve()

From 8f7ab26d9744812b97f0af1a8e91579eac436fc2 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 15 Aug 2023 13:22:47 -0400
Subject: [PATCH 050/214] add distance menu item

---
 src/components/ReportActionItem/MoneyRequestView.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index b01226df0d35..5386038090da 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -94,6 +94,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
         receiptUris = ReceiptUtils.getThumbnailAndImageURIs(transaction.receipt.source, transaction.filename);
     }
 
+    const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+
     return (
         <View>
             <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth), StyleUtils.getMinimumHeight(CONST.EMPTY_STATE_BACKGROUND.MONEY_REPORT.MIN_HEIGHT)]}>
@@ -128,6 +130,15 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
                 shouldShowRightIcon={canEdit}
                 onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
             />
+            {isDistanceRequest && (
+                <MenuItemWithTopDescription
+                    description={translate('tabSelector.distance')}
+                    title="123 miles @ $456 / mile"
+                    disabled={isSettled || !canEdit}
+                    shouldShowRightIcon={canEdit}
+                    onPress={() => {}}
+                />
+            )}
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
         </View>
     );

From 5c64db923e97377357eab63880aa12a501452911 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 15 Aug 2023 13:26:46 -0400
Subject: [PATCH 051/214] get custom unit and mileage rate and use distance
 text stub

---
 .../ReportActionItem/MoneyRequestView.js      |  5 ++++-
 src/libs/PolicyUtils.js                       | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index 5386038090da..abbe30ab895f 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -23,6 +23,7 @@ import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import EmptyStateBackgroundImage from '../../../assets/images/empty-state_background-fade.png';
 import useLocalize from '../../hooks/useLocalize';
 import * as TransactionUtils from '../../libs/TransactionUtils';
+import * as PolicyUtils from '../../libs/PolicyUtils';
 import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import withLocalize from '../withLocalize';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
@@ -95,6 +96,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
     }
 
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+    const distanceCustomUnit = PolicyUtils.getDistanceCustomUnit(policy);
+    const mileageRate = PolicyUtils.getDefaultMileageRate(distanceCustomUnit);
 
     return (
         <View>
@@ -133,7 +136,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
             {isDistanceRequest && (
                 <MenuItemWithTopDescription
                     description={translate('tabSelector.distance')}
-                    title="123 miles @ $456 / mile"
+                    title={PolicyUtils.getDistanceText(transaction, distanceCustomUnit, mileageRate)}
                     disabled={isSettled || !canEdit}
                     shouldShowRightIcon={canEdit}
                     onPress={() => {}}
diff --git a/src/libs/PolicyUtils.js b/src/libs/PolicyUtils.js
index 582271d6610e..7be02703415d 100644
--- a/src/libs/PolicyUtils.js
+++ b/src/libs/PolicyUtils.js
@@ -166,6 +166,23 @@ function getIneligibleInvitees(policyMembers, personalDetails) {
     return memberEmailsToExclude;
 }
 
+function getDistanceCustomUnit(policy) {
+    const customUnits = _.values(policy.customUnits);
+    return _.find(customUnits, (customUnit) => customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+}
+
+function getDefaultMileageRate(customUnit) {
+    if (!customUnit) {
+        return 0;
+    }
+
+    return _.find(customUnit.rates, (rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
+}
+
+function getDistanceText(transaction, customUnit, mileageRate) {
+    return '123 miles @ $456 / mile';
+}
+
 export {
     getActivePolicies,
     hasPolicyMemberError,
@@ -179,4 +196,7 @@ export {
     isPolicyAdmin,
     getMemberAccountIDsForWorkspace,
     getIneligibleInvitees,
+    getDistanceCustomUnit,
+    getDefaultMileageRate,
+    getDistanceText,
 };

From 8de53ea30399e1f4de378cf5111f566f562cf850 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 15 Aug 2023 13:35:59 -0400
Subject: [PATCH 052/214] add isDistanceRequest stub

---
 src/libs/TransactionUtils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 48892a69cc01..92f9b74e1eb0 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -167,4 +167,8 @@ function getCreated(transaction) {
     return format(new Date(lodashGet(transaction, 'created', '')), CONST.DATE.FNS_FORMAT_STRING);
 }
 
-export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getTransaction, getDescription, getAmount, getCurrency, getCreated};
+function isDistanceRequest(transaction) {
+    return true;
+}
+
+export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getTransaction, getDescription, getAmount, getCurrency, getCreated, isDistanceRequest};

From b7be1f207ca3f6bd025bc29dd23e91f7c1c5e5fa Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 16 Aug 2023 00:51:53 +0700
Subject: [PATCH 053/214] Move to App.js

---
 src/App.js     | 21 ++++++++++++++++++++-
 web/index.html | 10 ----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/App.js b/src/App.js
index d8faa911f86b..bb6473587e1d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,5 @@
 import '../wdyr';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {LogBox} from 'react-native';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
@@ -23,6 +23,8 @@ import ThemeStylesProvider from './styles/ThemeStylesProvider';
 import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
 import * as Session from './libs/actions/Session';
+import getPlatform from './libs/getPlatform';
+import CONST from './CONST';
 
 // For easier debugging and development, when we are in web we expose Onyx to the window, so you can more easily set data into Onyx
 if (window && Environment.isDevelopment()) {
@@ -40,6 +42,23 @@ LogBox.ignoreLogs([
 const fill = {flex: 1};
 
 function App() {
+    const dropDragListener = (event) => {
+        event.preventDefault();
+        // eslint-disable-next-line no-param-reassign
+        event.dataTransfer.dropEffect = 'none';
+    };
+
+    useEffect(() => {
+        const platform = getPlatform();
+        if (platform !== CONST.PLATFORM.WEB && platform !== CONST.PLATFORM.DESKTOP) {
+            return;
+        }
+        document.addEventListener('dragover', dropDragListener);
+        document.addEventListener('dragenter', dropDragListener);
+        document.addEventListener('dragleave', dropDragListener);
+        document.addEventListener('drop', dropDragListener);
+    }, []);
+
     return (
         <GestureHandlerRootView style={fill}>
             <ComposeProviders
diff --git a/web/index.html b/web/index.html
index 16c907fe441b..d207fa54b97a 100644
--- a/web/index.html
+++ b/web/index.html
@@ -136,14 +136,4 @@
         </div>
     </div>
 </body>
-<script>
-    function dropDragListener(){
-        event.preventDefault();
-        event.dataTransfer.dropEffect = 'none';
-    }
-    document.addEventListener('dragover', dropDragListener);
-    document.addEventListener('dragenter', dropDragListener);
-    document.addEventListener('dragleave', dropDragListener);
-    document.addEventListener('drop', dropDragListener);
-</script>
 </html>

From 018a53d5ab1cd6bed68771568c0ce61589bef841 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:13:54 +0700
Subject: [PATCH 054/214] Add setDefaultDragDropEvent

---
 src/App.js                                     | 18 ++----------------
 src/libs/setDefaultDragDropEvent/index.js      | 13 +++++++++++++
 .../setDefaultDragDropEvent/index.native.js    |  1 +
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 src/libs/setDefaultDragDropEvent/index.js
 create mode 100644 src/libs/setDefaultDragDropEvent/index.native.js

diff --git a/src/App.js b/src/App.js
index bb6473587e1d..d4944bbc6a0a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -23,8 +23,7 @@ import ThemeStylesProvider from './styles/ThemeStylesProvider';
 import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
 import * as Session from './libs/actions/Session';
-import getPlatform from './libs/getPlatform';
-import CONST from './CONST';
+import setDefaultDragDropEvent from './libs/setDefaultDragDropEvent';
 
 // For easier debugging and development, when we are in web we expose Onyx to the window, so you can more easily set data into Onyx
 if (window && Environment.isDevelopment()) {
@@ -42,21 +41,8 @@ LogBox.ignoreLogs([
 const fill = {flex: 1};
 
 function App() {
-    const dropDragListener = (event) => {
-        event.preventDefault();
-        // eslint-disable-next-line no-param-reassign
-        event.dataTransfer.dropEffect = 'none';
-    };
-
     useEffect(() => {
-        const platform = getPlatform();
-        if (platform !== CONST.PLATFORM.WEB && platform !== CONST.PLATFORM.DESKTOP) {
-            return;
-        }
-        document.addEventListener('dragover', dropDragListener);
-        document.addEventListener('dragenter', dropDragListener);
-        document.addEventListener('dragleave', dropDragListener);
-        document.addEventListener('drop', dropDragListener);
+        setDefaultDragDropEvent();
     }, []);
 
     return (
diff --git a/src/libs/setDefaultDragDropEvent/index.js b/src/libs/setDefaultDragDropEvent/index.js
new file mode 100644
index 000000000000..b0e411a5fb7b
--- /dev/null
+++ b/src/libs/setDefaultDragDropEvent/index.js
@@ -0,0 +1,13 @@
+function dragDropListener(event) {
+    event.preventDefault();
+    // eslint-disable-next-line no-param-reassign
+    event.dataTransfer.dropEffect = 'none';
+}
+
+function setDefaultDragDropEvent() {
+    document.addEventListener('dragover', dragDropListener);
+    document.addEventListener('dragenter', dragDropListener);
+    document.addEventListener('dragleave', dragDropListener);
+    document.addEventListener('drop', dragDropListener);
+}
+export default setDefaultDragDropEvent;
diff --git a/src/libs/setDefaultDragDropEvent/index.native.js b/src/libs/setDefaultDragDropEvent/index.native.js
new file mode 100644
index 000000000000..2d1ec238274a
--- /dev/null
+++ b/src/libs/setDefaultDragDropEvent/index.native.js
@@ -0,0 +1 @@
+export default () => {};

From acdf45df70559a71afdf6799a4ebc1eba008efb2 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 15 Aug 2023 14:15:46 -0400
Subject: [PATCH 055/214] use transaction merchant instead of recomputing the
 distance text

---
 .../ReportActionItem/MoneyRequestView.js      |  5 +----
 src/libs/PolicyUtils.js                       | 20 -------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index abbe30ab895f..4db4fea47472 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -23,7 +23,6 @@ import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import EmptyStateBackgroundImage from '../../../assets/images/empty-state_background-fade.png';
 import useLocalize from '../../hooks/useLocalize';
 import * as TransactionUtils from '../../libs/TransactionUtils';
-import * as PolicyUtils from '../../libs/PolicyUtils';
 import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import withLocalize from '../withLocalize';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
@@ -96,8 +95,6 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
     }
 
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
-    const distanceCustomUnit = PolicyUtils.getDistanceCustomUnit(policy);
-    const mileageRate = PolicyUtils.getDefaultMileageRate(distanceCustomUnit);
 
     return (
         <View>
@@ -136,7 +133,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
             {isDistanceRequest && (
                 <MenuItemWithTopDescription
                     description={translate('tabSelector.distance')}
-                    title={PolicyUtils.getDistanceText(transaction, distanceCustomUnit, mileageRate)}
+                    title={transaction.merchant}
                     disabled={isSettled || !canEdit}
                     shouldShowRightIcon={canEdit}
                     onPress={() => {}}
diff --git a/src/libs/PolicyUtils.js b/src/libs/PolicyUtils.js
index 7be02703415d..582271d6610e 100644
--- a/src/libs/PolicyUtils.js
+++ b/src/libs/PolicyUtils.js
@@ -166,23 +166,6 @@ function getIneligibleInvitees(policyMembers, personalDetails) {
     return memberEmailsToExclude;
 }
 
-function getDistanceCustomUnit(policy) {
-    const customUnits = _.values(policy.customUnits);
-    return _.find(customUnits, (customUnit) => customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-}
-
-function getDefaultMileageRate(customUnit) {
-    if (!customUnit) {
-        return 0;
-    }
-
-    return _.find(customUnit.rates, (rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
-}
-
-function getDistanceText(transaction, customUnit, mileageRate) {
-    return '123 miles @ $456 / mile';
-}
-
 export {
     getActivePolicies,
     hasPolicyMemberError,
@@ -196,7 +179,4 @@ export {
     isPolicyAdmin,
     getMemberAccountIDsForWorkspace,
     getIneligibleInvitees,
-    getDistanceCustomUnit,
-    getDefaultMileageRate,
-    getDistanceText,
 };

From ced727a73aa6057062d17775b1dca2ab57b2dae6 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:34:42 +0700
Subject: [PATCH 056/214] Add useDefaultDragAndDrop

---
 src/App.js                                       |  9 +++------
 src/hooks/useDefaultDragAndDrop/index.js         | 16 ++++++++++++++++
 .../useDefaultDragAndDrop}/index.native.js       |  0
 src/libs/setDefaultDragDropEvent/index.js        | 13 -------------
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 src/hooks/useDefaultDragAndDrop/index.js
 rename src/{libs/setDefaultDragDropEvent => hooks/useDefaultDragAndDrop}/index.native.js (100%)
 delete mode 100644 src/libs/setDefaultDragDropEvent/index.js

diff --git a/src/App.js b/src/App.js
index d4944bbc6a0a..c432a0b666c8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,5 @@
 import '../wdyr';
-import React, {useEffect} from 'react';
+import React from 'react';
 import {LogBox} from 'react-native';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
@@ -23,7 +23,7 @@ import ThemeStylesProvider from './styles/ThemeStylesProvider';
 import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
 import * as Session from './libs/actions/Session';
-import setDefaultDragDropEvent from './libs/setDefaultDragDropEvent';
+import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 
 // For easier debugging and development, when we are in web we expose Onyx to the window, so you can more easily set data into Onyx
 if (window && Environment.isDevelopment()) {
@@ -41,10 +41,7 @@ LogBox.ignoreLogs([
 const fill = {flex: 1};
 
 function App() {
-    useEffect(() => {
-        setDefaultDragDropEvent();
-    }, []);
-
+    useDefaultDragAndDrop();
     return (
         <GestureHandlerRootView style={fill}>
             <ComposeProviders
diff --git a/src/hooks/useDefaultDragAndDrop/index.js b/src/hooks/useDefaultDragAndDrop/index.js
new file mode 100644
index 000000000000..f677209afeca
--- /dev/null
+++ b/src/hooks/useDefaultDragAndDrop/index.js
@@ -0,0 +1,16 @@
+import {useEffect} from 'react';
+
+export default function useDefaultDragAndDrop() {
+    const dropDragListener = (event) => {
+        event.preventDefault();
+        // eslint-disable-next-line no-param-reassign
+        event.dataTransfer.dropEffect = 'none';
+    };
+
+    useEffect(() => {
+        document.addEventListener('dragover', dropDragListener);
+        document.addEventListener('dragenter', dropDragListener);
+        document.addEventListener('dragleave', dropDragListener);
+        document.addEventListener('drop', dropDragListener);
+    }, []);
+}
diff --git a/src/libs/setDefaultDragDropEvent/index.native.js b/src/hooks/useDefaultDragAndDrop/index.native.js
similarity index 100%
rename from src/libs/setDefaultDragDropEvent/index.native.js
rename to src/hooks/useDefaultDragAndDrop/index.native.js
diff --git a/src/libs/setDefaultDragDropEvent/index.js b/src/libs/setDefaultDragDropEvent/index.js
deleted file mode 100644
index b0e411a5fb7b..000000000000
--- a/src/libs/setDefaultDragDropEvent/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function dragDropListener(event) {
-    event.preventDefault();
-    // eslint-disable-next-line no-param-reassign
-    event.dataTransfer.dropEffect = 'none';
-}
-
-function setDefaultDragDropEvent() {
-    document.addEventListener('dragover', dragDropListener);
-    document.addEventListener('dragenter', dragDropListener);
-    document.addEventListener('dragleave', dragDropListener);
-    document.addEventListener('drop', dragDropListener);
-}
-export default setDefaultDragDropEvent;

From 7db1ba678b01602cfb184a668acc7270b79240ca Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 16 Aug 2023 01:53:38 +0700
Subject: [PATCH 057/214] Update useDefaultDragAndDrop

---
 src/hooks/useDefaultDragAndDrop/index.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/hooks/useDefaultDragAndDrop/index.js b/src/hooks/useDefaultDragAndDrop/index.js
index f677209afeca..34005c9de2b3 100644
--- a/src/hooks/useDefaultDragAndDrop/index.js
+++ b/src/hooks/useDefaultDragAndDrop/index.js
@@ -1,16 +1,21 @@
 import {useEffect} from 'react';
 
 export default function useDefaultDragAndDrop() {
-    const dropDragListener = (event) => {
-        event.preventDefault();
-        // eslint-disable-next-line no-param-reassign
-        event.dataTransfer.dropEffect = 'none';
-    };
-
     useEffect(() => {
+        const dropDragListener = (event) => {
+            event.preventDefault();
+            // eslint-disable-next-line no-param-reassign
+            event.dataTransfer.dropEffect = 'none';
+        };
         document.addEventListener('dragover', dropDragListener);
         document.addEventListener('dragenter', dropDragListener);
         document.addEventListener('dragleave', dropDragListener);
         document.addEventListener('drop', dropDragListener);
+        return () => {
+            document.removeEventListener('dragover', dropDragListener);
+            document.removeEventListener('dragenter', dropDragListener);
+            document.removeEventListener('dragleave', dropDragListener);
+            document.removeEventListener('drop', dropDragListener);
+        };
     }, []);
 }

From 9be4aee96693e77de1ce0ef9d0ca8b58694acb6d Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Wed, 16 Aug 2023 04:58:38 +0300
Subject: [PATCH 058/214] Small tweaks

---
 src/libs/ReportUtils.js         | 2 +-
 src/libs/actions/DemoActions.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index cb607fc9255c..a708c324b3ca 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3020,7 +3020,7 @@ function getPolicyExpenseChatReportIDByOwner(policyOwner) {
         return null;
     }
 
-    return _find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policy.id);
+    return _.find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policy.id);
 }
 
 /*
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 72169a7ce2c8..1029a92252d4 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -8,6 +8,7 @@ import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
+import DateUtils from '../DateUtils';
 
 let sessionAccountID = 0;
 let sessionEmail = 0;

From d4b812ee3a250c8d379de58f348dfc1a6e6b8247 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 15 Aug 2023 20:51:16 -0600
Subject: [PATCH 059/214] Properly format currency and images

---
 .../ReportActionItem/MoneyRequestPreview.js           |  4 ++--
 src/libs/ReceiptUtils.js                              | 11 +----------
 src/libs/TransactionUtils.js                          |  4 +++-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index ceffcafa89e1..0c111f6809c4 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -214,7 +214,7 @@ function MoneyRequestPreview(props) {
 
     const getDisplayAmountText = () => {
         if (isDistanceRequest) {
-            return TransactionUtils.getAmount(props.transaction);
+            return CurrencyUtils.convertToDisplayString(TransactionUtils.getAmount(props.transaction), props.transaction.currency);
         }
 
         if (isScanning) {
@@ -245,7 +245,7 @@ function MoneyRequestPreview(props) {
                         />
                     )}
 
-                    {isDistanceRequest && <ReportActionItemImages images={[ReceiptUtils.getURL(props.transaction.filename)]} />}
+                    {isDistanceRequest && <ReportActionItemImages images={[ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename)]} />}
                     <View style={styles.moneyRequestPreviewBoxText}>
                         <View style={[styles.flexRow]}>
                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
index c9c6fcffa3f0..03781db0fa31 100644
--- a/src/libs/ReceiptUtils.js
+++ b/src/libs/ReceiptUtils.js
@@ -69,13 +69,4 @@ function isBeingScanned(receipt) {
     return receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
 }
 
-/**
- * Returns the URL of a receipt given a filename
- * @param {String} filename
- * @returns {String}
- */
-function getURL(filename) {
-    return `${CONFIG.EXPENSIFY.EXPENSIFY_URL}receipts/${filename}`;
-}
-
-export {validateReceipt, getThumbnailAndImageURIs, getURL, isBeingScanned};
+export {validateReceipt, getThumbnailAndImageURIs, isBeingScanned};
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index f7cdd3168f27..28f11d6ac261 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -151,7 +151,9 @@ function getCreated(transaction) {
  * @returns {Boolean}
  */
 function isDistanceRequest(transaction) {
-    return transaction && transaction.type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && transaction.customUnit && transaction.customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE;
+    const type = lodashGet(transaction, 'comment.type');
+    const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
+    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
 }
 
 export {buildOptimisticTransaction, hasReceipt, getUpdatedTransaction, getDescription, getAmount, getCurrency, getCreated, isDistanceRequest};

From 5451be69e4f66bfd1496bfec7e791a208eb2f348 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Wed, 16 Aug 2023 11:32:12 +0300
Subject: [PATCH 060/214] Fixing up lint errors

---
 src/Expensify.js                |  6 +++---
 src/libs/ReportUtils.js         |  6 +++---
 src/libs/actions/DemoActions.js | 15 ++++++++-------
 src/pages/DemoSetupPage.js      |  5 ++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index 3d6f7a861663..fd34f836d3ed 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -31,7 +31,7 @@ import SplashScreenHider from './components/SplashScreenHider';
 import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import {runDemoByURL} from './libs/actions/App';
+import * as App from './libs/actions/App';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -165,13 +165,13 @@ function Expensify(props) {
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
-            runDemoByURL(url);
+            App.runDemoByURL(url);
             Report.openReportFromDeepLink(url, isAuthenticated);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            runDemoByURL(state.url);
+            App.runDemoByURL(state.url);
             Report.openReportFromDeepLink(state.url, isAuthenticated);
         });
 
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index bce20cbb43f2..4386e9dc09a6 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3005,12 +3005,12 @@ function getPolicy(policyID) {
  * @returns {String|null}
  */
 function getPolicyExpenseChatReportIDByOwner(policyOwner) {
-    const policy = _.find(allPolicies, (policy) => policy.owner === policyOwner);
-    if (!policy) {
+    const policyWithOwner = _.find(allPolicies, (policy) => policy.owner === policyOwner);
+    if (!policyWithOwner) {
         return null;
     }
 
-    return _.find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policy.id);
+    return _.find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policyWithOwner.id);
 }
 
 /*
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 1029a92252d4..c8b734ad59e7 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -1,10 +1,11 @@
 import Str from 'expensify-common/lib/str';
 import Onyx from 'react-native-onyx';
+import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import CONST from '../../CONST';
 import * as API from '../API';
-import {buildOptimisticWorkspaceChats, buildOptimisticAddCommentReportAction, getPolicyExpenseChatReportIDByOwner} from '../ReportUtils';
-import {buildOptimisticCustomUnits, generatePolicyID} from './Policy';
+import * as ReportUtils from '../ReportUtils';
+import * as Policy from './Policy';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -33,7 +34,7 @@ Onyx.connect({
 
 function createSaastrDemoWorkspaceAndNavigate() {
     // Try to navigate to existing SaaStr expense chat if it exists in Onyx
-    const saastrWorkspaceChatReportID = getPolicyExpenseChatReportIDByOwner(CONST.EMAIL.SAASTR);
+    const saastrWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(CONST.EMAIL.SAASTR);
     if (saastrWorkspaceChatReportID) {
         // We must call goBack() to remove the /saastr route from history
         Navigation.goBack();
@@ -42,13 +43,13 @@ function createSaastrDemoWorkspaceAndNavigate() {
     }
 
     // Create workspace, owned and admin'd by SaaStr
-    const policyID = generatePolicyID();
+    const policyID = Policy.generatePolicyID();
 
     // Add domain name as prefix (only if domain is private)
     const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
     const workspaceName = `${domainNamePrefix}SaaStr Workspace`;
 
-    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticCustomUnits();
+    const {customUnits, customUnitID, customUnitRateID} = Policy.buildOptimisticCustomUnits();
 
     const {
         announceChatReportID,
@@ -64,7 +65,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
         expenseChatData,
         expenseReportActionData,
         expenseCreatedReportActionID,
-    } = buildOptimisticWorkspaceChats(policyID, workspaceName);
+    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
 
     // Add optimistic invite message comment
     const initialMessageText = `
@@ -76,7 +77,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
     3. Take a photo of the receipt, we'll automatically enter all the info.
     4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!
     `;
-    const welcomeMessageReportAction = buildOptimisticAddCommentReportAction(initialMessageText);
+    const welcomeMessageReportAction = ReportUtils.buildOptimisticAddCommentReportAction(initialMessageText);
     welcomeMessageReportAction.reportAction.actorAccountID = CONST.ACCOUNT_ID.SAASTR;
     welcomeMessageReportAction.reportAction.person[0].text = 'SaaStr 2023';
     welcomeMessageReportAction.reportAction.avatar = '';
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index 735b91a6b1d8..5bf9a6a68f2f 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -1,4 +1,3 @@
-import _ from 'underscore';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
@@ -6,7 +5,7 @@ import {useFocusEffect} from '@react-navigation/native';
 import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import CONST from '../CONST';
-import {createSaastrDemoWorkspaceAndNavigate} from '../libs/actions/DemoActions';
+import * as DemoActions from '../libs/actions/DemoActions';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -26,7 +25,7 @@ function DemoSetupPage(props) {
     useFocusEffect(() => {
         // Depending on the route that the user hit to get here, run a specific demo flow
         if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
-            createSaastrDemoWorkspaceAndNavigate();
+            DemoActions.createSaastrDemoWorkspaceAndNavigate();
         }
     });
 

From 887427ae55c7328a49e58523519891123a78c217 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Wed, 16 Aug 2023 22:46:21 +0800
Subject: [PATCH 061/214] replace setTimeout approach

---
 src/libs/focusWithDelay.js                   | 35 +++++++++++++++++
 src/libs/focusWithDelay/focusWithDelay.js    | 40 --------------------
 src/libs/focusWithDelay/index.js             |  7 ----
 src/libs/focusWithDelay/index.native.js      |  6 ---
 src/pages/home/report/ReportActionCompose.js | 33 ++--------------
 5 files changed, 39 insertions(+), 82 deletions(-)
 create mode 100644 src/libs/focusWithDelay.js
 delete mode 100644 src/libs/focusWithDelay/focusWithDelay.js
 delete mode 100644 src/libs/focusWithDelay/index.js
 delete mode 100644 src/libs/focusWithDelay/index.native.js

diff --git a/src/libs/focusWithDelay.js b/src/libs/focusWithDelay.js
new file mode 100644
index 000000000000..367cc2b92f9f
--- /dev/null
+++ b/src/libs/focusWithDelay.js
@@ -0,0 +1,35 @@
+import {InteractionManager} from 'react-native';
+import ComposerFocusManager from './ComposerFocusManager';
+
+/**
+ * Create a function that focuses a text input.
+ * @param {Object} textInput the text input to focus
+ * @returns {Function} a function that focuses the text input with a configurable delay
+ */
+function focusWithDelay(textInput) {
+    /**
+     * Focus the text input
+     * @param {Boolean} [shouldDelay=false] Impose delay before focusing the text input
+     */
+    return (shouldDelay = false) => {
+        // There could be other animations running while we trigger manual focus.
+        // This prevents focus from making those animations janky.
+        InteractionManager.runAfterInteractions(() => {
+            if (!textInput) {
+                return;
+            }
+            if (!shouldDelay) {
+                textInput.focus();
+                return;
+            }
+            ComposerFocusManager.isReadyToFocus().then(() => {
+                if (!textInput) {
+                    return;
+                }
+                textInput.focus();
+            });
+        });
+    };
+}
+
+export default focusWithDelay;
diff --git a/src/libs/focusWithDelay/focusWithDelay.js b/src/libs/focusWithDelay/focusWithDelay.js
deleted file mode 100644
index 143d5dd12430..000000000000
--- a/src/libs/focusWithDelay/focusWithDelay.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import {InteractionManager} from 'react-native';
-
-/**
- * Creates a function that can be used to focus a text input
- * @param {Boolean} disableDelay whether to force focus without a delay (on web and desktop)
- * @returns {Function} a focusWithDelay function
- */
-function focusWithDelay(disableDelay = false) {
-    /**
-     * Create a function that focuses a text input.
-     * @param {Object} textInput the text input to focus
-     * @returns {Function} a function that focuses the text input with a configurable delay
-     */
-    return (textInput) =>
-        /**
-         * Focus the text input
-         * @param {Boolean} [shouldDelay=false] Impose delay before focusing the text input
-         */
-        (shouldDelay = false) => {
-            // There could be other animations running while we trigger manual focus.
-            // This prevents focus from making those animations janky.
-            InteractionManager.runAfterInteractions(() => {
-                if (!textInput) {
-                    return;
-                }
-
-                if (disableDelay || !shouldDelay) {
-                    textInput.focus();
-                } else {
-                    // Keyboard is not opened after Emoji Picker is closed
-                    // SetTimeout is used as a workaround
-                    // https://github.com/react-native-modal/react-native-modal/issues/114
-                    // We carefully choose a delay. 100ms is found enough for keyboard to open.
-                    setTimeout(() => textInput.focus(), 100);
-                }
-            });
-        };
-}
-
-export default focusWithDelay;
diff --git a/src/libs/focusWithDelay/index.js b/src/libs/focusWithDelay/index.js
deleted file mode 100644
index faeb43147c5c..000000000000
--- a/src/libs/focusWithDelay/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import focusWithDelay from './focusWithDelay';
-
-/**
- * We pass true to disable the delay on the web because it doesn't require
- * using the workaround (explained in the focusWithDelay.js file).
- */
-export default focusWithDelay(true);
diff --git a/src/libs/focusWithDelay/index.native.js b/src/libs/focusWithDelay/index.native.js
deleted file mode 100644
index 27fb19fe1570..000000000000
--- a/src/libs/focusWithDelay/index.native.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import focusWithDelay from './focusWithDelay';
-
-/**
- * We enable the delay on native to display the keyboard correctly
- */
-export default focusWithDelay(false);
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index bbe17caf1e35..d105bdef731b 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -1,11 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {View, InteractionManager, LayoutAnimation, NativeModules, findNodeHandle} from 'react-native';
+import {View, LayoutAnimation, NativeModules, findNodeHandle} from 'react-native';
 import {runOnJS} from 'react-native-reanimated';
 import {Gesture, GestureDetector} from 'react-native-gesture-handler';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
+import focusWithDelay from '../../../libs/focusWithDelay';
 import styles from '../../../styles/styles';
 import themeColors from '../../../styles/themes/default';
 import Composer from '../../../components/Composer';
@@ -59,7 +60,6 @@ import * as KeyDownListener from '../../../libs/KeyboardShortcut/KeyDownPressLis
 import * as EmojiPickerActions from '../../../libs/actions/EmojiPickerAction';
 import withAnimatedRef from '../../../components/withAnimatedRef';
 import updatePropsPaperWorklet from '../../../libs/updatePropsPaperWorklet';
-import ComposerFocusManager from '../../../libs/ComposerFocusManager';
 
 const propTypes = {
     /** Beta features list */
@@ -178,7 +178,7 @@ class ReportActionCompose extends React.Component {
         this.submitForm = this.submitForm.bind(this);
         this.setIsFocused = this.setIsFocused.bind(this);
         this.setIsFullComposerAvailable = this.setIsFullComposerAvailable.bind(this);
-        this.focus = this.focus.bind(this);
+        this.focus = focusWithDelay(this.textInput).bind(this);
         this.replaceSelectionWithText = this.replaceSelectionWithText.bind(this);
         this.focusComposerOnKeyPress = this.focusComposerOnKeyPress.bind(this);
         this.checkComposerVisibility = this.checkComposerVisibility.bind(this);
@@ -393,6 +393,7 @@ class ReportActionCompose extends React.Component {
         if (_.isFunction(this.props.animatedRef)) {
             this.props.animatedRef(el);
         }
+        this.focus = focusWithDelay(this.textInput).bind(this);
     }
 
     /**
@@ -753,32 +754,6 @@ class ReportActionCompose extends React.Component {
         this.replaceSelectionWithText(e.key, false);
     }
 
-    /**
-     * Focus the composer text input
-     * @param {Boolean} [shouldelay=false] Impose delay before focusing the composer
-     * @memberof ReportActionCompose
-     */
-    focus(shouldelay = false) {
-        // There could be other animations running while we trigger manual focus.
-        // This prevents focus from making those animations janky.
-        InteractionManager.runAfterInteractions(() => {
-            if (!this.textInput) {
-                return;
-            }
-
-            if (!shouldelay) {
-                this.textInput.focus();
-                return;
-            }
-            ComposerFocusManager.isReadyToFocus().then(() => {
-                if (!this.textInput) {
-                    return;
-                }
-                this.textInput.focus();
-            });
-        });
-    }
-
     /**
      * Save our report comment in Onyx. We debounce this method in the constructor so that it's not called too often
      * to update Onyx and re-render this component.

From 1817b399612755a03dca49190dca5eae2b578f6a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 16 Aug 2023 11:45:52 -0600
Subject: [PATCH 062/214] Fix whitespace

---
 src/components/ReportActionItem/MoneyRequestView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index c65302483342..76f53965633b 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -92,7 +92,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
     if (ReportActionsUtils.isDeletedAction(parentReportAction)) {
         return null;
     }
-  
+
     const transaction = TransactionUtils.getTransaction(parentReportAction.originalMessage.IOUTransactionID);
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     let receiptURIs;

From c40ebaeb83fddb9d2b6c644d7114cd061c86b0db Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 16 Aug 2023 11:59:41 -0600
Subject: [PATCH 063/214] Fix bad merge

---
 src/libs/TransactionUtils.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 694b0d2fc891..b00948040892 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -1,10 +1,24 @@
 import {format} from 'date-fns';
 import lodashGet from 'lodash/get';
+import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
 import DateUtils from './DateUtils';
 import * as NumberUtils from './NumberUtils';
 
+let allTransactions = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION,
+    waitForCollectionCallback: true,
+    callback: (val) => {
+        if (!val) {
+            return;
+        }
+        allTransactions = val;
+    },
+});
+
 /**
  * Optimistically generate a transaction.
  *
@@ -87,6 +101,16 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
     return updatedTransaction;
 }
 
+/**
+ * Retrieve the particular transaction object given its ID.
+ *
+ * @param {String} transactionID
+ * @returns {Object}
+ */
+function getTransaction(transactionID) {
+    return lodashGet(allTransactions, `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {});
+}
+
 /**
  * Return the comment field (referred to as description in the App) from the transaction.
  * The comment does not have its modifiedComment counterpart.
@@ -181,11 +205,11 @@ export {
     buildOptimisticTransaction,
     hasReceipt,
     getUpdatedTransaction,
-    getTransaction,
     getDescription,
     getAmount,
     getCurrency,
     getCreated,
     getReportPreviewTransactionsWithReceipts,
+    getTransaction,
     isDistanceRequest,
 };

From 49d669c23129e67bb97b3b6fd6c6605217e5131c Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 16 Aug 2023 15:54:56 -0600
Subject: [PATCH 064/214] Remove duplicate receipt image

---
 src/components/ReportActionItem/MoneyRequestPreview.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index cb22f37c5d54..d103c5152a20 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -242,8 +242,6 @@ function MoneyRequestPreview(props) {
                             hoverStyle={isScanning ? styles.moneyRequestPreviewBoxHover : undefined}
                         />
                     )}
-
-                    {isDistanceRequest && <ReportActionItemImages images={[ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename)]} />}
                     <View style={styles.moneyRequestPreviewBoxText}>
                         <View style={[styles.flexRow]}>
                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>

From a021e0f92a780d4e3914f42f008ba0365ceb5ec3 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Thu, 17 Aug 2023 11:50:26 +0800
Subject: [PATCH 065/214] preserve keyboard state

---
 src/pages/home/report/ReportActionCompose.js | 42 ++++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index d105bdef731b..7ead07cbdb49 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -196,6 +196,7 @@ class ReportActionCompose extends React.Component {
         this.updateNumberOfLines = this.updateNumberOfLines.bind(this);
         this.showPopoverMenu = this.showPopoverMenu.bind(this);
         this.debouncedUpdateFrequentlyUsedEmojis = _.debounce(this.debouncedUpdateFrequentlyUsedEmojis.bind(this), 1000, false);
+        this.restoreKeyboardState = this.restoreKeyboardState.bind(this);
         this.comment = props.comment;
         this.insertedEmojis = [];
 
@@ -215,6 +216,9 @@ class ReportActionCompose extends React.Component {
         this.shouldBlockEmojiCalc = false;
         this.shouldBlockMentionCalc = false;
 
+        this.willOpenNextModal = false;
+        this.isKeyboardVisibleWhenShowingModal = false;
+
         // For mobile Safari, updating the selection prop on an unfocused input will cause it to automatically gain focus
         // and subsequent programmatic focus shifts (e.g., modal focus trap) to show the blue frame (:focus-visible style),
         // so we need to ensure that it is only updated after focus.
@@ -223,8 +227,6 @@ class ReportActionCompose extends React.Component {
         this.unsubscribeNavigationBlur = () => null;
         this.unsubscribeNavigationFocus = () => null;
 
-        this.shouldFocusAfterClosingModal = true;
-
         this.state = {
             isFocused: this.shouldFocusInputOnScreenFocus && !this.props.modal.isVisible && !this.props.modal.willAlertModalBecomeVisible && this.props.shouldShowComposeInput,
             isFullComposerAvailable: props.isComposerFullSize,
@@ -274,18 +276,12 @@ class ReportActionCompose extends React.Component {
 
     componentDidUpdate(prevProps) {
         if (this.props.modal.isVisible && !prevProps.modal.isVisible) {
-            this.shouldFocusAfterClosingModal = true;
+            this.willOpenNextModal = false;
         }
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
-        if (
-            this.willBlurTextInputOnTapOutside &&
-            this.shouldFocusAfterClosingModal &&
-            !this.props.modal.isVisible &&
-            this.props.isFocused &&
-            (prevProps.modal.isVisible || !prevProps.isFocused)
-        ) {
+        if (this.willBlurTextInputOnTapOutside && !this.willOpenNextModal && !this.props.modal.isVisible && this.props.isFocused && (prevProps.modal.isVisible || !prevProps.isFocused)) {
             this.focus();
         }
 
@@ -961,6 +957,14 @@ class ReportActionCompose extends React.Component {
         return true;
     }
 
+    restoreKeyboardState() {
+        if (!this.isKeyboardVisibleWhenShowingModal) {
+            return;
+        }
+        this.focus(true);
+        this.isKeyboardVisibleWhenShowingModal = false;
+    }
+
     render() {
         const reportParticipants = _.without(lodashGet(this.props.report, 'participantAccountIDs', []), this.props.currentUserPersonalDetails.accountID);
         const participantsWithoutExpensifyAccountIDs = _.difference(reportParticipants, CONST.EXPENSIFY_ACCOUNT_IDS);
@@ -1023,7 +1027,7 @@ class ReportActionCompose extends React.Component {
                                 this.shouldBlockEmojiCalc = false;
                                 this.shouldBlockMentionCalc = false;
                                 this.setState({isAttachmentPreviewActive: false});
-                                this.focus(true);
+                                this.restoreKeyboardState();
                             }}
                         >
                             {({displayFileInModal}) => (
@@ -1037,12 +1041,10 @@ class ReportActionCompose extends React.Component {
                                                     this.shouldBlockEmojiCalc = true;
                                                     this.shouldBlockMentionCalc = true;
                                                 }
-                                                this.shouldFocusAfterClosingModal = false;
+                                                this.willOpenNextModal = true;
                                                 openPicker({
                                                     onPicked: displayFileInModal,
-                                                    onCanceled: () => {
-                                                        this.focus(true);
-                                                    },
+                                                    onCanceled: this.restoreKeyboardState,
                                                 });
                                             };
                                             const menuItems = [
@@ -1111,6 +1113,9 @@ class ReportActionCompose extends React.Component {
                                                                 ref={this.actionButtonRef}
                                                                 onPress={(e) => {
                                                                     e.preventDefault();
+                                                                    if (!this.willBlurTextInputOnTapOutside) {
+                                                                        this.isKeyboardVisibleWhenShowingModal = this.textInput.isFocused();
+                                                                    }
                                                                     this.textInput.blur();
 
                                                                     // Drop focus to avoid blue focus ring.
@@ -1131,7 +1136,7 @@ class ReportActionCompose extends React.Component {
                                                         isVisible={this.state.isMenuVisible}
                                                         onClose={() => {
                                                             this.setMenuVisibility(false);
-                                                            this.focus(true);
+                                                            this.restoreKeyboardState();
                                                         }}
                                                         onItemSelected={(item, index) => {
                                                             this.setMenuVisibility(false);
@@ -1167,9 +1172,12 @@ class ReportActionCompose extends React.Component {
                                             style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]}
                                             maxLines={maxComposerLines}
                                             onFocus={() => this.setIsFocused(true)}
-                                            onBlur={() => {
+                                            onBlur={(e) => {
                                                 this.setIsFocused(false);
                                                 this.resetSuggestions();
+                                                if (e.relatedTarget && e.relatedTarget === this.actionButtonRef.current) {
+                                                    this.isKeyboardVisibleWhenShowingModal = true;
+                                                }
                                             }}
                                             onClick={() => {
                                                 this.shouldBlockEmojiCalc = false;

From 1b56731b29bb720072005c19fcb4151cc81947da Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Thu, 17 Aug 2023 15:30:12 +0300
Subject: [PATCH 066/214] Remove admin rooms, send welcome report action id

---
 src/libs/actions/DemoActions.js | 55 ++-------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index c8b734ad59e7..094d74402f1a 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -56,11 +56,6 @@ function createSaastrDemoWorkspaceAndNavigate() {
         announceChatData,
         announceReportActionData,
         announceCreatedReportActionID,
-        // TODO: maybe comment these admin report data out b/c user shouldn't an admin to start with, right? :think:
-        adminsChatReportID,
-        adminsChatData,
-        adminsReportActionData,
-        adminsCreatedReportActionID,
         expenseChatReportID,
         expenseChatData,
         expenseReportActionData,
@@ -83,7 +78,8 @@ function createSaastrDemoWorkspaceAndNavigate() {
     welcomeMessageReportAction.reportAction.avatar = '';
 
     // Update policy expense chat report actions with welcome message from saastr
-    expenseReportActionData[welcomeMessageReportAction.reportAction.reportActionID] = welcomeMessageReportAction.reportAction;
+    const expenseChatWelcomeReportActionID = welcomeMessageReportAction.reportAction.reportActionID;
+    expenseReportActionData[expenseChatWelcomeReportActionID] = welcomeMessageReportAction.reportAction;
 
     // Update report with info about last message sent
     const currentTime = DateUtils.getDBTime();
@@ -97,12 +93,11 @@ function createSaastrDemoWorkspaceAndNavigate() {
         {
             policyID,
             announceChatReportID,
-            adminsChatReportID,
             expenseChatReportID,
             policyName: workspaceName,
             announceCreatedReportActionID,
-            adminsCreatedReportActionID,
             expenseCreatedReportActionID,
+            expenseChatWelcomeReportActionID,
             customUnitID,
             customUnitRateID,
         },
@@ -151,21 +146,6 @@ function createSaastrDemoWorkspaceAndNavigate() {
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
                     value: announceReportActionData,
                 },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                        ...adminsChatData,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-                    value: adminsReportActionData,
-                },
                 {
                     onyxMethod: Onyx.METHOD.SET,
                     key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
@@ -207,25 +187,6 @@ function createSaastrDemoWorkspaceAndNavigate() {
                         },
                     },
                 },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: null,
-                        },
-                        pendingAction: null,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-                    value: {
-                        [_.keys(adminsChatData)[0]]: {
-                            pendingAction: null,
-                        },
-                    },
-                },
                 {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
@@ -262,16 +223,6 @@ function createSaastrDemoWorkspaceAndNavigate() {
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
                     value: null,
                 },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-                    value: null,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-                    value: null,
-                },
                 {
                     onyxMethod: Onyx.METHOD.SET,
                     key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,

From 22bd4b4d41d8752d706f7251beb65bc1c080aa8d Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 17:16:29 +0200
Subject: [PATCH 067/214] add strings

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 4ce07f7e00ca..e3878fdd8517 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -151,6 +151,7 @@ export default {
         edit: 'Edit',
         showMore: 'Show more',
         merchant: 'Merchant',
+        category: 'Category',
     },
     anonymousReportFooter: {
         logoTagline: 'Join in on the discussion.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 7cee163470f3..c3cab2702d6d 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -150,6 +150,7 @@ export default {
         edit: 'Editar',
         showMore: 'Mostrar más',
         merchant: 'Comerciante',
+        category: 'Categoría',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discussion.',

From ab6a7ec2a7a2cbf7f182989b82b8f9fcae932309 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 17:17:06 +0200
Subject: [PATCH 068/214] add MoneyRequestCategoryPage

---
 src/ROUTES.js                                 |  2 +
 .../AppNavigator/ModalStackNavigators.js      |  7 +++
 src/libs/Navigation/linkingConfig.js          |  1 +
 src/pages/iou/MoneyRequestCategoryPage.js     | 49 +++++++++++++++++++
 4 files changed, 59 insertions(+)
 create mode 100644 src/pages/iou/MoneyRequestCategoryPage.js

diff --git a/src/ROUTES.js b/src/ROUTES.js
index 90d08e5b13c8..bcee5d488405 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -92,6 +92,7 @@ export default {
     MONEY_REQUEST_CONFIRMATION: ':iouType/new/confirmation/:reportID?',
     MONEY_REQUEST_CURRENCY: ':iouType/new/currency/:reportID?',
     MONEY_REQUEST_DESCRIPTION: ':iouType/new/description/:reportID?',
+    MONEY_REQUEST_CATEGORY: ':iouType/new/category/:reportID?',
     MONEY_REQUEST_MANUAL_TAB: ':iouType/new/:reportID?/manual',
     MONEY_REQUEST_SCAN_TAB: ':iouType/new/:reportID?/scan',
     MONEY_REQUEST_DISTANCE_TAB: ':iouType/new/:reportID?/distance',
@@ -104,6 +105,7 @@ export default {
     getMoneyRequestConfirmationRoute: (iouType, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
     getMoneyRequestCurrencyRoute: (iouType, reportID = '', currency, backTo) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
     getMoneyRequestDescriptionRoute: (iouType, reportID = '') => `${iouType}/new/description/${reportID}`,
+    getMoneyRequestCategoryRoute: (iouType, reportID = '') => `${iouType}/new/category/${reportID}`,
     SPLIT_BILL_DETAILS: `r/:reportID/split/:reportActionID`,
     getSplitBillDetailsRoute: (reportID, reportActionID) => `r/${reportID}/split/${reportActionID}`,
     getNewTaskRoute: (reportID) => `${NEW_TASK}/${reportID}`,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 8a489afb035e..9fcc89dd2950 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -76,6 +76,13 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator([
         },
         name: 'Money_Request_Description',
     },
+    {
+        getComponent: () => {
+            const MoneyRequestCategoryPage = require('../../../pages/iou/MoneyRequestCategoryPage').default;
+            return MoneyRequestCategoryPage;
+        },
+        name: 'Money_Request_Category',
+    },
     {
         getComponent: () => {
             const AddPersonalBankAccountPage = require('../../../pages/AddPersonalBankAccountPage').default;
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index dcc4f77fde73..4814955325df 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -321,6 +321,7 @@ export default {
                             Money_Request_Confirmation: ROUTES.MONEY_REQUEST_CONFIRMATION,
                             Money_Request_Currency: ROUTES.MONEY_REQUEST_CURRENCY,
                             Money_Request_Description: ROUTES.MONEY_REQUEST_DESCRIPTION,
+                            Money_Request_Category: ROUTES.MONEY_REQUEST_CATEGORY,
                             IOU_Send_Enable_Payments: ROUTES.IOU_SEND_ENABLE_PAYMENTS,
                             IOU_Send_Add_Bank_Account: ROUTES.IOU_SEND_ADD_BANK_ACCOUNT,
                             IOU_Send_Add_Debit_Card: ROUTES.IOU_SEND_ADD_DEBIT_CARD,
diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js
new file mode 100644
index 000000000000..b69d9c683e06
--- /dev/null
+++ b/src/pages/iou/MoneyRequestCategoryPage.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import ROUTES from '../../ROUTES';
+import Navigation from '../../libs/Navigation/Navigation';
+import useLocalize from '../../hooks/useLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+
+const propTypes = {
+    route: PropTypes.shape({
+        /** Each parameter passed via the URL */
+        params: PropTypes.shape({
+            /** TODO: Comment */
+            iouType: PropTypes.string,
+
+            /** TODO: Comment */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
+};
+
+function MoneyRequestCategoryPage({route}) {
+    const {translate} = useLocalize();
+
+    const navigateBack = () => {
+        const iouType = lodashGet(route, 'params.iouType', '');
+        const reportID = lodashGet(route, 'params.reportID', '');
+
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.category')}
+                onBackButtonPress={navigateBack}
+            />
+        </ScreenWrapper>
+    );
+}
+
+MoneyRequestCategoryPage.displayName = 'MoneyRequestCategoryPage';
+MoneyRequestCategoryPage.propTypes = propTypes;
+
+export default MoneyRequestCategoryPage;

From f95d8bb421929b6d210f497563753a11f4f57e80 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 17:17:37 +0200
Subject: [PATCH 069/214] add category to MoneyRequestConfirmationList

---
 .../MoneyRequestConfirmationList.js           | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 2cc458d0e4ad..88e78fa820e5 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -63,6 +63,9 @@ const propTypes = {
     /** IOU merchant */
     iouMerchant: PropTypes.string,
 
+    /** TODO: Comment */
+    iouCategory: PropTypes.string,
+
     /** Selected participants from MoneyRequestModal with login / accountID */
     selectedParticipants: PropTypes.arrayOf(optionPropTypes).isRequired,
 
@@ -96,6 +99,14 @@ const propTypes = {
 
     /** File source of the receipt */
     receiptSource: PropTypes.string,
+
+    /** TODO: Comment */
+    policyCategories: PropTypes.objectOf(
+        PropTypes.shape({
+            enabled: PropTypes.bool.isRequired,
+            name: PropTypes.string.isRequired,
+        }),
+    ),
 };
 
 const defaultProps = {
@@ -103,6 +114,7 @@ const defaultProps = {
     onSendMoney: () => {},
     onSelectParticipant: () => {},
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
+    iouCategory: '',
     payeePersonalDetails: null,
     canModifyParticipants: false,
     isReadOnly: false,
@@ -115,6 +127,7 @@ const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
     receiptPath: '',
     receiptSource: '',
+    policyCategories: null,
 };
 
 function MoneyRequestConfirmationList(props) {
@@ -419,6 +432,16 @@ function MoneyRequestConfirmationList(props) {
                         // Note: This component is disabled until this field is editable in next PR
                         disabled
                     />
+                    {props.policyCategories !== null && (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly}
+                            title={props.iouCategory}
+                            description={translate('common.category')}
+                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestCategoryRoute(props.iouType, props.reportID))}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            disabled={didConfirm || props.isReadOnly}
+                        />
+                    )}
                 </>
             )}
         </OptionsSelector>
@@ -434,5 +457,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        policyCategories: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+        },
     }),
 )(MoneyRequestConfirmationList);

From d20ba5e9f036d9b3f58fbdfee137f0e01ae6dfea Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 11:30:08 -0500
Subject: [PATCH 070/214] Add Mobile Banner Component, Styled (not functional)

---
 assets/images/expensify-app-icon.svg |  18 +++++
 src/Expensify.js                     |   2 +
 src/components/MobileBanner/index.js | 108 +++++++++++++++++++++++++++
 src/styles/styles.js                 |   5 ++
 src/styles/utilities/spacing.js      |  16 ++++
 src/styles/variables.js              |   1 +
 6 files changed, 150 insertions(+)
 create mode 100644 assets/images/expensify-app-icon.svg
 create mode 100644 src/components/MobileBanner/index.js

diff --git a/assets/images/expensify-app-icon.svg b/assets/images/expensify-app-icon.svg
new file mode 100644
index 000000000000..a0adfe7dd952
--- /dev/null
+++ b/assets/images/expensify-app-icon.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#03D47C;}
+	.st1{fill:#002E22;}
+</style>
+<rect class="st0" width="48" height="48"/>
+<path class="st1" d="M30.6,18.5v-3.9H17.4v18.9h13.2v-3.9h-8.4v-3.6H29v-4h-6.7v-3.4H30.6z"/>
+<path class="st1" d="M24,8.3C24,8.3,24,8.3,24,8.3c3.3,0,6.4,1,9,2.8c0.6,0.4,1.5,0.4,2.1-0.1c0.6-0.6,0.6-1.7-0.1-2.2
+	C31.9,6.6,28.1,5.3,24,5.3C13.7,5.3,5.3,13.7,5.3,24c0,4.1,1.3,7.9,3.5,10.9c0.5,0.7,1.6,0.8,2.2,0.1c0.6-0.6,0.6-1.4,0.1-2.1
+	c-1.8-2.6-2.8-5.6-2.8-9C8.3,15.4,15.4,8.3,24,8.3C24,8.3,24,8.3,24,8.3z"/>
+<path class="st1" d="M39.5,13.4c-0.5-0.7-1.6-0.8-2.2-0.2c-0.6,0.6-0.6,1.4-0.2,2.1c1.6,2.5,2.6,5.5,2.6,8.7c0,3.2-1,6.3-2.7,8.8
+	c-0.4,0.7-0.4,1.5,0.2,2.1c0.6,0.6,1.7,0.6,2.2-0.1c2.1-3,3.4-6.8,3.4-10.8C42.8,20,41.6,16.4,39.5,13.4z"/>
+<path class="st1" d="M24,39.7c-3.2,0-6.2-1-8.7-2.6c-0.7-0.4-1.5-0.4-2.1,0.2c-0.6,0.6-0.6,1.7,0.2,2.2c3,2.1,6.7,3.3,10.6,3.3
+	c3.9,0,7.7-1.3,10.8-3.4c0.7-0.5,0.8-1.6,0.1-2.2c-0.6-0.6-1.4-0.6-2.1-0.2C30.3,38.7,27.3,39.7,24,39.7z"/>
+</svg>
diff --git a/src/Expensify.js b/src/Expensify.js
index c85c2862e96e..ecdb1a809152 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -31,6 +31,7 @@ import SplashScreenHider from './components/SplashScreenHider';
 import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
+import MobileBanner from './components/MobileBanner';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
@@ -191,6 +192,7 @@ function Expensify(props) {
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
                     <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}
+                    {true ? <MobileBanner /> : null}
                     {props.updateAvailable ? <UpdateAppModal /> : null}
                     {props.screenShareRequest ? (
                         <ConfirmModal
diff --git a/src/components/MobileBanner/index.js b/src/components/MobileBanner/index.js
new file mode 100644
index 000000000000..8b5f3277dac8
--- /dev/null
+++ b/src/components/MobileBanner/index.js
@@ -0,0 +1,108 @@
+import React, {memo} from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import Banner from '../Banner';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import Hoverable from '../Hoverable';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import RenderHTML from '../RenderHTML';
+import Text from '../Text';
+import * as StyleUtils from '../../styles/StyleUtils';
+import getButtonState from '../../libs/getButtonState';
+import Tooltip from '../Tooltip';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import CONST from '../../CONST';
+import AppIcon from '../../../assets/images/expensify-app-icon.svg';
+import Button from '../Button';
+import variables from '../../styles/variables';
+
+const propTypes = {
+    /** Text to display in the banner. */
+    text: PropTypes.string.isRequired,
+
+    /** Should this component render the left-aligned exclamation icon? */
+    shouldShowIcon: PropTypes.bool,
+
+    /** Should this component render a close button? */
+    shouldShowCloseButton: PropTypes.bool,
+
+    /** Should this component render the text as HTML? */
+    shouldRenderHTML: PropTypes.bool,
+
+    /** Callback called when the close button is pressed */
+    onClose: PropTypes.func,
+
+    /** Callback called when the message is pressed */
+    onPress: PropTypes.func,
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    shouldRenderHTML: false,
+    shouldShowIcon: false,
+    shouldShowCloseButton: false,
+    onClose: undefined,
+    onPress: undefined,
+};
+
+function MobileBanner(props) {
+    return (
+        <View
+            style={[
+                styles.flexRow,
+                styles.alignItemsCenter,
+                styles.pv4,
+                styles.ph5,
+                styles.gap4,
+                styles.activeComponentBG,
+                styles.mw100,
+            ]}
+        >
+            <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
+                <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
+                    <Icon
+                        src={AppIcon}
+                        width={variables.mobileBannerAppIconSize}
+                        height={variables.mobileBannerAppIconSize}
+                        additionalStyles={[styles.appIconBorderRadius]}
+                    />
+                    <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
+                        <Text
+                            style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
+                            suppressHighlighting
+                        >
+                            {"Download the app"}
+                        </Text>
+                        <Text
+                            style={[styles.alignSelfStretch, styles.textLabel]}
+                            suppressHighlighting
+
+                        >
+                            {"Keep the conversation going in New Expensify."}
+                        </Text>
+                    </View>
+                </View>
+            </View>
+            <Button small success text="Download" onPress={()=>{}} />
+            <Tooltip text={props.translate('common.close')}>
+                <PressableWithFeedback
+                    onPress={props.onClose}
+                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    accessibilityLabel={props.translate('common.close')}
+                >
+                    <Icon src={Expensicons.Close} />
+                </PressableWithFeedback>
+            </Tooltip>
+        </View>
+    );
+}
+
+MobileBanner.displayName = 'MobileBanner';
+MobileBanner.propTypes = propTypes;
+MobileBanner.defaultProps = defaultProps;
+
+export default compose(withLocalize, memo)(MobileBanner);
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 0bef42f3edc2..fda88f78af8e 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -230,6 +230,11 @@ const styles = {
         color: themeColors.textSupporting,
     },
 
+    appIconBorderRadius: {
+        overflow: 'hidden', 
+        borderRadius: 12,
+    },
+
     unitCol: {
         margin: 0,
         padding: 0,
diff --git a/src/styles/utilities/spacing.js b/src/styles/utilities/spacing.js
index 4adb7e79a9ff..f3d7746eb312 100644
--- a/src/styles/utilities/spacing.js
+++ b/src/styles/utilities/spacing.js
@@ -483,6 +483,22 @@ export default {
         gap: 4,
     },
 
+    gap2: {
+        gap: 8,
+    },
+
+    gap3: {
+        gap: 12,
+    },
+
+    gap4: {
+        gap: 16,
+    },
+
+    gap5: {
+        gap: 20,
+    },
+
     gap7: {
         gap: 28,
     },
diff --git a/src/styles/variables.js b/src/styles/variables.js
index af4d81c93c79..4b0436ff6ed3 100644
--- a/src/styles/variables.js
+++ b/src/styles/variables.js
@@ -28,6 +28,7 @@ export default {
     componentBorderRadiusLarge: 16,
     componentBorderRadiusCard: 12,
     componentBorderRadiusRounded: 24,
+    mobileBannerAppIconSize: 48,
     buttonBorderRadius: 100,
     avatarSizeLargeBordered: 88,
     avatarSizeLarge: 80,

From 602aa40fcff636e01e894bbafe09b985d3e7d740 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 19:02:30 +0200
Subject: [PATCH 071/214] create general category prop types

---
 src/components/categoryPropTypes.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/components/categoryPropTypes.js

diff --git a/src/components/categoryPropTypes.js b/src/components/categoryPropTypes.js
new file mode 100644
index 000000000000..ac9e7a564c1c
--- /dev/null
+++ b/src/components/categoryPropTypes.js
@@ -0,0 +1,9 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.shape({
+    /** TODO: Comment */
+    name: PropTypes.string.isRequired,
+
+    /** TODO: Comment */
+    enabled: PropTypes.bool.isRequired,
+});

From efe21ba7e343d0050635d2dde52c47e3f1c899ff Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 19:02:40 +0200
Subject: [PATCH 072/214] create page category picker

---
 .../CategoryPicker/categoryPickerPropTypes.js | 17 +++++++++
 src/components/CategoryPicker/index.js        | 35 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 src/components/CategoryPicker/categoryPickerPropTypes.js
 create mode 100644 src/components/CategoryPicker/index.js

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
new file mode 100644
index 000000000000..ceb6268bc0b3
--- /dev/null
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -0,0 +1,17 @@
+import PropTypes from 'prop-types';
+import categoryPropTypes from '../categoryPropTypes';
+
+const propTypes = {
+    /** TODO: Comment */
+    policyID: PropTypes.string,
+
+    /** TODO: Comment */
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
+};
+
+const defaultProps = {
+    policyID: '',
+    policyCategories: null,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
new file mode 100644
index 000000000000..1b37dfca44da
--- /dev/null
+++ b/src/components/CategoryPicker/index.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import _ from 'underscore';
+import {View, Text} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+import {propTypes, defaultProps} from './categoryPickerPropTypes';
+
+function CategoryPicker({policyCategories}) {
+    if (policyCategories === null) {
+        return null;
+    }
+
+    return (
+        <View>
+            {_.chain(policyCategories)
+                .values()
+                .map((category) => (
+                    <View key={category.name}>
+                        <Text>{category.name}</Text>
+                    </View>
+                ))
+                .value()}
+        </View>
+    );
+}
+
+CategoryPicker.displayName = 'CategoryPicker';
+CategoryPicker.propTypes = propTypes;
+CategoryPicker.defaultProps = defaultProps;
+
+export default withOnyx({
+    policyCategories: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+    },
+})(CategoryPicker);

From 2904336eed9be1c0ab83d2f0ad37e55158e36311 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 17 Aug 2023 19:03:00 +0200
Subject: [PATCH 073/214] integrate category picker to MoneyRequestCategoryPage

---
 src/pages/iou/MoneyRequestCategoryPage.js | 26 ++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js
index b69d9c683e06..572e6a5fc2f4 100644
--- a/src/pages/iou/MoneyRequestCategoryPage.js
+++ b/src/pages/iou/MoneyRequestCategoryPage.js
@@ -1,13 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
 import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 import useLocalize from '../../hooks/useLocalize';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import CategoryPicker from '../../components/CategoryPicker';
+import ONYXKEYS from '../../ONYXKEYS';
+import reportPropTypes from '../reportPropTypes';
 
 const propTypes = {
+    /** TODO: Comment */
     route: PropTypes.shape({
         /** Each parameter passed via the URL */
         params: PropTypes.shape({
@@ -18,14 +23,22 @@ const propTypes = {
             reportID: PropTypes.string,
         }),
     }).isRequired,
+
+    /** TODO: Comment */
+    report: reportPropTypes,
+};
+
+const defaultProps = {
+    report: {},
 };
 
-function MoneyRequestCategoryPage({route}) {
+function MoneyRequestCategoryPage({route, report}) {
     const {translate} = useLocalize();
 
+    const reportID = lodashGet(route, 'params.reportID', '');
+
     const navigateBack = () => {
         const iouType = lodashGet(route, 'params.iouType', '');
-        const reportID = lodashGet(route, 'params.reportID', '');
 
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
     };
@@ -39,11 +52,18 @@ function MoneyRequestCategoryPage({route}) {
                 title={translate('common.category')}
                 onBackButtonPress={navigateBack}
             />
+
+            <CategoryPicker policyID={report.policyID} />
         </ScreenWrapper>
     );
 }
 
 MoneyRequestCategoryPage.displayName = 'MoneyRequestCategoryPage';
 MoneyRequestCategoryPage.propTypes = propTypes;
+MoneyRequestCategoryPage.defaultProps = defaultProps;
 
-export default MoneyRequestCategoryPage;
+export default withOnyx({
+    report: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+    },
+})(MoneyRequestCategoryPage);

From ecd7d397caedcf16cfbb499aed8e2f18db91f3c7 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:11:21 -0500
Subject: [PATCH 074/214] Clean up and add functionality

---
 src/components/MobileBanner/index.js | 143 ++++++++++++---------------
 src/styles/styles.js                 |   2 +-
 2 files changed, 62 insertions(+), 83 deletions(-)

diff --git a/src/components/MobileBanner/index.js b/src/components/MobileBanner/index.js
index 8b5f3277dac8..6a03d1ea3c08 100644
--- a/src/components/MobileBanner/index.js
+++ b/src/components/MobileBanner/index.js
@@ -1,108 +1,87 @@
-import React, {memo} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import Banner from '../Banner';
 import styles from '../../styles/styles';
-import compose from '../../libs/compose';
-import Hoverable from '../Hoverable';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
-import RenderHTML from '../RenderHTML';
 import Text from '../Text';
-import * as StyleUtils from '../../styles/StyleUtils';
-import getButtonState from '../../libs/getButtonState';
 import Tooltip from '../Tooltip';
-import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import PressableWithFeedback from '../Pressable/PressableWithFeedback';
 import CONST from '../../CONST';
 import AppIcon from '../../../assets/images/expensify-app-icon.svg';
 import Button from '../Button';
 import variables from '../../styles/variables';
+import useLocalize from '../../hooks/useLocalize';
+import * as Link from '../../libs/actions/Link';
+import * as Browser from '../../libs/Browser';
+import getOperatingSystem from '../../libs/getOperatingSystem';
 
-const propTypes = {
-    /** Text to display in the banner. */
-    text: PropTypes.string.isRequired,
+function MobileBanner() {
+    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile());
+    const {translate} = useLocalize();
 
-    /** Should this component render the left-aligned exclamation icon? */
-    shouldShowIcon: PropTypes.bool,
+    const handleCloseBanner = () => {
+        setshouldShowBanner(false);
+    };
 
-    /** Should this component render a close button? */
-    shouldShowCloseButton: PropTypes.bool,
+    let link = '';
 
-    /** Should this component render the text as HTML? */
-    shouldRenderHTML: PropTypes.bool,
+    if (getOperatingSystem() === CONST.OS.IOS) {
+        link = CONST.APP_DOWNLOAD_LINKS.IOS;
+    } else if (getOperatingSystem() === CONST.OS.ANDROID) {
+        link = CONST.APP_DOWNLOAD_LINKS.ANDROID;
+    }
 
-    /** Callback called when the close button is pressed */
-    onClose: PropTypes.func,
+    const handleOpenAppStore = () => {
+        Link.openExternalLink(link, true);
+    };
 
-    /** Callback called when the message is pressed */
-    onPress: PropTypes.func,
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    shouldRenderHTML: false,
-    shouldShowIcon: false,
-    shouldShowCloseButton: false,
-    onClose: undefined,
-    onPress: undefined,
-};
-
-function MobileBanner(props) {
     return (
-        <View
-            style={[
-                styles.flexRow,
-                styles.alignItemsCenter,
-                styles.pv4,
-                styles.ph5,
-                styles.gap4,
-                styles.activeComponentBG,
-                styles.mw100,
-            ]}
-        >
-            <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
-                <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
-                    <Icon
-                        src={AppIcon}
-                        width={variables.mobileBannerAppIconSize}
-                        height={variables.mobileBannerAppIconSize}
-                        additionalStyles={[styles.appIconBorderRadius]}
-                    />
-                    <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
-                        <Text
-                            style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
-                            suppressHighlighting
-                        >
-                            {"Download the app"}
-                        </Text>
-                        <Text
-                            style={[styles.alignSelfStretch, styles.textLabel]}
-                            suppressHighlighting
-
-                        >
-                            {"Keep the conversation going in New Expensify."}
-                        </Text>
+        shouldShowBanner && (
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv4, styles.ph5, styles.gap4, styles.activeComponentBG, styles.mw100]}>
+                <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
+                    <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
+                        <Icon
+                            src={AppIcon}
+                            width={variables.mobileBannerAppIconSize}
+                            height={variables.mobileBannerAppIconSize}
+                            additionalStyles={[styles.appIconBorderRadius]}
+                        />
+                        <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
+                            <Text
+                                style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
+                                suppressHighlighting
+                            >
+                                {'Download the app'}
+                            </Text>
+                            <Text
+                                style={[styles.alignSelfStretch, styles.textLabel]}
+                                suppressHighlighting
+                            >
+                                {'Keep the conversation going in New Expensify.'}
+                            </Text>
+                        </View>
                     </View>
                 </View>
+                <Button
+                    small
+                    success
+                    text="Download"
+                    onPress={handleOpenAppStore}
+                />
+                <Tooltip text={translate('common.close')}>
+                    <PressableWithFeedback
+                        onPress={handleCloseBanner}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                        accessibilityLabel={translate('common.close')}
+                    >
+                        <Icon src={Expensicons.Close} />
+                    </PressableWithFeedback>
+                </Tooltip>
             </View>
-            <Button small success text="Download" onPress={()=>{}} />
-            <Tooltip text={props.translate('common.close')}>
-                <PressableWithFeedback
-                    onPress={props.onClose}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                    accessibilityLabel={props.translate('common.close')}
-                >
-                    <Icon src={Expensicons.Close} />
-                </PressableWithFeedback>
-            </Tooltip>
-        </View>
+        )
     );
 }
 
 MobileBanner.displayName = 'MobileBanner';
-MobileBanner.propTypes = propTypes;
-MobileBanner.defaultProps = defaultProps;
 
-export default compose(withLocalize, memo)(MobileBanner);
+export default MobileBanner;
diff --git a/src/styles/styles.js b/src/styles/styles.js
index fda88f78af8e..5a0a92ad609b 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -231,7 +231,7 @@ const styles = {
     },
 
     appIconBorderRadius: {
-        overflow: 'hidden', 
+        overflow: 'hidden',
         borderRadius: 12,
     },
 

From 0c24cfa07cc182ccf9962fd55d5fa21cc00fb5c6 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:15:48 -0500
Subject: [PATCH 075/214] Move out of folder

---
 .../index.js => MobileBanner.js}              | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)
 rename src/components/{MobileBanner/index.js => MobileBanner.js} (83%)

diff --git a/src/components/MobileBanner/index.js b/src/components/MobileBanner.js
similarity index 83%
rename from src/components/MobileBanner/index.js
rename to src/components/MobileBanner.js
index 6a03d1ea3c08..ac1e408fa3e2 100644
--- a/src/components/MobileBanner/index.js
+++ b/src/components/MobileBanner.js
@@ -1,19 +1,19 @@
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import styles from '../../styles/styles';
-import Icon from '../Icon';
-import * as Expensicons from '../Icon/Expensicons';
-import Text from '../Text';
-import Tooltip from '../Tooltip';
-import PressableWithFeedback from '../Pressable/PressableWithFeedback';
-import CONST from '../../CONST';
+import styles from '../styles/styles';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import Text from './Text';
+import Tooltip from './Tooltip';
+import PressableWithFeedback from './Pressable/PressableWithFeedback';
+import CONST from '../CONST';
 import AppIcon from '../../../assets/images/expensify-app-icon.svg';
-import Button from '../Button';
-import variables from '../../styles/variables';
-import useLocalize from '../../hooks/useLocalize';
-import * as Link from '../../libs/actions/Link';
-import * as Browser from '../../libs/Browser';
-import getOperatingSystem from '../../libs/getOperatingSystem';
+import Button from './Button';
+import variables from '../styles/variables';
+import useLocalize from '../hooks/useLocalize';
+import * as Link from '../libs/actions/Link';
+import * as Browser from '../libs/Browser';
+import getOperatingSystem from '../libs/getOperatingSystem';
 
 function MobileBanner() {
     const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile());

From aefdaeb1b6d8b92e793e45dc1b7d4214dc44099f Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:20:04 -0500
Subject: [PATCH 076/214] fix asset path

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

diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index ac1e408fa3e2..8e641a3d6447 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -7,7 +7,7 @@ import Text from './Text';
 import Tooltip from './Tooltip';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
 import CONST from '../CONST';
-import AppIcon from '../../../assets/images/expensify-app-icon.svg';
+import AppIcon from '../../assets/images/expensify-app-icon.svg';
 import Button from './Button';
 import variables from '../styles/variables';
 import useLocalize from '../hooks/useLocalize';

From 8d14fa3b427ab096a6dabc34f3cf27324e9a1df7 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:29:21 -0500
Subject: [PATCH 077/214] Add copy to en/es

---
 src/components/MobileBanner.js | 6 +++---
 src/languages/en.js            | 4 ++++
 src/languages/es.js            | 4 ++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index 8e641a3d6447..56aa3ab3a741 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -51,13 +51,13 @@ function MobileBanner() {
                                 style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
                                 suppressHighlighting
                             >
-                                {'Download the app'}
+                                {translate('mobileBanner.downloadTheApp')}
                             </Text>
                             <Text
                                 style={[styles.alignSelfStretch, styles.textLabel]}
                                 suppressHighlighting
                             >
-                                {'Keep the conversation going in New Expensify.'}
+                                {translate('mobileBanner.keepTheConversationGoing')}
                             </Text>
                         </View>
                     </View>
@@ -65,7 +65,7 @@ function MobileBanner() {
                 <Button
                     small
                     success
-                    text="Download"
+                    text={translate('common.download')}
                     onPress={handleOpenAppStore}
                 />
                 <Tooltip text={translate('common.close')}>
diff --git a/src/languages/en.js b/src/languages/en.js
index 4ce07f7e00ca..2c7f60f5adfc 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -235,6 +235,10 @@ export default {
         newFaceEnterMagicCode: ({login}) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
         welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
+    mobileBanner: {
+        downloadTheApp: 'Download the App.',
+        keepTheConversationGoing: 'Keep the conversation going in New Expensify.',
+    },
     login: {
         hero: {
             header: 'Split bills, request payments, and chat with friends.',
diff --git a/src/languages/es.js b/src/languages/es.js
index 7cee163470f3..014e81077bb3 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -234,6 +234,10 @@ export default {
         newFaceEnterMagicCode: ({login}) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
         welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
+    mobileBanner: {
+        downloadTheApp: 'Descarga la App.',
+        keepTheConversationGoing: 'Mantén la conversación en New Expensify.',
+    },
     login: {
         hero: {
             header: 'Divida las facturas, solicite pagos y chatee con sus amigos.',

From fde38d55fd9ae56fec946320202a1b43c759d8ae Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:45:21 -0500
Subject: [PATCH 078/214] modify spanish translation from slack feedback

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

diff --git a/src/languages/es.js b/src/languages/es.js
index 014e81077bb3..4f2ad4a93704 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -235,7 +235,7 @@ export default {
         welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     mobileBanner: {
-        downloadTheApp: 'Descarga la App.',
+        downloadTheApp: 'Descarga la aplicación.',
         keepTheConversationGoing: 'Mantén la conversación en New Expensify.',
     },
     login: {

From e61e3f02ba4fa3bf07f350ec286ac64a7bb5685b Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 12:55:16 -0500
Subject: [PATCH 079/214] Fix lint

---
 src/Expensify.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index ecdb1a809152..931190645109 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -189,10 +189,10 @@ function Expensify(props) {
                 <>
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
+                    <MobileBanner />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
                     <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}
-                    {true ? <MobileBanner /> : null}
                     {props.updateAvailable ? <UpdateAppModal /> : null}
                     {props.screenShareRequest ? (
                         <ConfirmModal

From 41a359051a5dcb7e5be47853cf8325e6e952f46a Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 17 Aug 2023 17:03:12 -0500
Subject: [PATCH 080/214] Add GetRoute API command

---
 src/libs/actions/Transaction.js | 56 ++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 4ad0b2d17a8f..0e3ecb3cd3ee 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -3,6 +3,7 @@ import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as CollectionUtils from '../CollectionUtils';
+import * as API from '../API';
 
 const allTransactions = {};
 Onyx.connect({
@@ -100,4 +101,57 @@ function removeWaypoint(transactionID, currentIndex) {
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, newTransaction);
 }
 
-export {addStop, createInitialWaypoints, saveWaypoint, removeWaypoint};
+/**
+ * Gets the route for a set of waypoints
+ * Used so we can generate a map view of the provided waypoints
+ * @param {String} transactionID 
+ * @param {Object} waypoints 
+ */
+function getRoute(transactionID, waypoints) {
+    API.read('GetRoute', {
+        transactionID,
+        waypoints
+    }, {
+        optimisticData: [
+            {
+                // Clears any potentially stale error messages from fetching the route
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                value: {
+                    route: {
+                        isLoading: true
+                    },
+                    errorFields: {
+                        route: null
+                    },
+                },
+            },
+        ],
+        // The route and failure are sent back via pusher in the BE, we are just clearing the loading state here
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                value: {
+                    route: {
+                        isLoading: false,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                value: {
+                    route: {
+                        isLoading: false,
+                    },
+                },
+            },
+        ],
+    },);
+    
+}
+
+export {addStop, createInitialWaypoints, saveWaypoint, removeWaypoint, getRoute};

From 81f1536ffd7f41080b2ea505c9d3b838ca52c821 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 17 Aug 2023 17:14:45 -0500
Subject: [PATCH 081/214] Design comments- remove period, fix line height in
 second line

---
 src/components/MobileBanner.js | 2 +-
 src/languages/en.js            | 2 +-
 src/languages/es.js            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index 56aa3ab3a741..14073be4ddc2 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -54,7 +54,7 @@ function MobileBanner() {
                                 {translate('mobileBanner.downloadTheApp')}
                             </Text>
                             <Text
-                                style={[styles.alignSelfStretch, styles.textLabel]}
+                                style={[styles.alignSelfStretch, styles.textLabel, styles.lh16]}
                                 suppressHighlighting
                             >
                                 {translate('mobileBanner.keepTheConversationGoing')}
diff --git a/src/languages/en.js b/src/languages/en.js
index 2c7f60f5adfc..c607d1193f12 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -236,7 +236,7 @@ export default {
         welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     mobileBanner: {
-        downloadTheApp: 'Download the App.',
+        downloadTheApp: 'Download the App',
         keepTheConversationGoing: 'Keep the conversation going in New Expensify.',
     },
     login: {
diff --git a/src/languages/es.js b/src/languages/es.js
index 4f2ad4a93704..961d7676f338 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -235,7 +235,7 @@ export default {
         welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     mobileBanner: {
-        downloadTheApp: 'Descarga la aplicación.',
+        downloadTheApp: 'Descarga la aplicación',
         keepTheConversationGoing: 'Mantén la conversación en New Expensify.',
     },
     login: {

From a0f270c62f813adb8c50f362498a783513a27513 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 17 Aug 2023 17:35:52 -0500
Subject: [PATCH 082/214] Add handling to fetch route

---
 src/components/DistanceRequest.js | 10 ++++
 src/libs/actions/Transaction.js   | 83 ++++++++++++++++---------------
 2 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 93254bdfddf1..a057ffa17ec4 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -79,6 +79,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const waypoints = lodashGet(transaction, 'comment.waypoints', {});
     const numberOfWaypoints = _.size(waypoints);
     const lastWaypointIndex = numberOfWaypoints - 1;
+    const isLoadingRoute = lodashGet(transaction, 'route.isLoading', false);
 
     // Show up to the max number of waypoints plus 1/2 of one to hint at scrolling
     const halfMenuItemHeight = Math.floor(variables.baseMenuItemHeight / 2);
@@ -103,6 +104,15 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         setShouldShowGradient(visibleAreaEnd < scrollContentHeight);
     };
 
+    // Handle fetching the route when there are at least 2 waypoints
+    useEffect(() => {
+        if (numberOfWaypoints < 1 || isLoadingRoute) {
+            return;
+        }
+
+        Transaction.getRoute(transactionID, waypoints);
+    }, [numberOfWaypoints, waypoints, transactionID, isLoadingRoute]);
+
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
     return (
diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 0e3ecb3cd3ee..f81f3785bd17 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -104,54 +104,57 @@ function removeWaypoint(transactionID, currentIndex) {
 /**
  * Gets the route for a set of waypoints
  * Used so we can generate a map view of the provided waypoints
- * @param {String} transactionID 
- * @param {Object} waypoints 
+ * @param {String} transactionID
+ * @param {Object} waypoints
  */
 function getRoute(transactionID, waypoints) {
-    API.read('GetRoute', {
-        transactionID,
-        waypoints
-    }, {
-        optimisticData: [
-            {
-                // Clears any potentially stale error messages from fetching the route
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                value: {
-                    route: {
-                        isLoading: true
-                    },
-                    errorFields: {
-                        route: null
+    API.read(
+        'GetRoute',
+        {
+            transactionID,
+            waypoints,
+        },
+        {
+            optimisticData: [
+                {
+                    // Clears any potentially stale error messages from fetching the route
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                    value: {
+                        route: {
+                            isLoading: true,
+                        },
+                        errorFields: {
+                            route: null,
+                        },
                     },
                 },
-            },
-        ],
-        // The route and failure are sent back via pusher in the BE, we are just clearing the loading state here
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                value: {
-                    route: {
-                        isLoading: false,
+            ],
+            // The route and failure are sent back via pusher in the BE, we are just clearing the loading state here
+            successData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                    value: {
+                        route: {
+                            isLoading: false,
+                        },
                     },
                 },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                value: {
-                    route: {
-                        isLoading: false,
+            ],
+            failureData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                    value: {
+                        route: {
+                            isLoading: false,
+                        },
                     },
                 },
-            },
-        ],
-    },);
-    
+            ],
+        },
+    );
 }
 
 export {addStop, createInitialWaypoints, saveWaypoint, removeWaypoint, getRoute};

From bbc2cf6e373604414add242561b12ec37b384042 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Fri, 18 Aug 2023 10:08:03 +0300
Subject: [PATCH 083/214] Yeah pretend i remembered to remove that earlier

---
 src/libs/Permissions.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index b490d8cbe367..7f52c41ad0fd 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -118,7 +118,6 @@ export default {
     canUseWallet,
     canUseCommentLinking,
     canUsePolicyRooms,
-    canUsePolicyExpenseChat,
     canUseTasks,
     canUseScanReceipts,
     canUseCustomStatus,

From c50119e6cb038acefc99c4a78f9c0e0dc606abf9 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Fri, 18 Aug 2023 10:33:43 +0300
Subject: [PATCH 084/214] Remove unused betas

---
 src/libs/actions/Policy.js                        | 9 +++------
 src/pages/workspace/WorkspaceInviteMessagePage.js | 9 +--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 6e4360b57863..ca83adfb82a8 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -13,7 +13,6 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as ReportUtils from '../ReportUtils';
 import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
 import Log from '../Log';
-import Permissions from '../Permissions';
 
 const allPolicies = {};
 Onyx.connect({
@@ -234,10 +233,9 @@ function removeMembers(accountIDs, policyID) {
  *
  * @param {String} policyID
  * @param {Object} invitedEmailsToAccountIDs
- * @param {Array} betas
  * @returns {Object} - object with onyxSuccessData, onyxOptimisticData, and optimisticReportIDs (map login to reportID)
  */
-function createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, betas) {
+function createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs) {
     const workspaceMembersChats = {
         onyxSuccessData: [],
         onyxOptimisticData: [],
@@ -327,16 +325,15 @@ function createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, betas) {
  * @param {Object} invitedEmailsToAccountIDs
  * @param {String} welcomeNote
  * @param {String} policyID
- * @param {Array<String>} betas
  */
-function addMembersToWorkspace(invitedEmailsToAccountIDs, welcomeNote, policyID, betas) {
+function addMembersToWorkspace(invitedEmailsToAccountIDs, welcomeNote, policyID) {
     const membersListKey = `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`;
     const logins = _.map(_.keys(invitedEmailsToAccountIDs), (memberLogin) => OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin));
     const accountIDs = _.values(invitedEmailsToAccountIDs);
     const newPersonalDetailsOnyxData = PersonalDetailsUtils.getNewPersonalDetailsOnyxData(logins, accountIDs);
 
     // create onyx data for policy expense chats for each new member
-    const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, betas);
+    const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
 
     const optimisticData = [
         {
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js
index 4aa4cd59b3fc..9a046d7fe4c2 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.js
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.js
@@ -47,9 +47,6 @@ const propTypes = {
     /** All of the personal details for everyone */
     allPersonalDetails: PropTypes.objectOf(personalDetailsPropTypes),
 
-    /** Beta features list */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
     invitedEmailsToAccountIDsDraft: PropTypes.objectOf(PropTypes.number),
 
     /** URL Route params */
@@ -68,7 +65,6 @@ const propTypes = {
 const defaultProps = {
     ...policyDefaultProps,
     allPersonalDetails: {},
-    betas: [],
     invitedEmailsToAccountIDsDraft: {},
 };
 
@@ -123,7 +119,7 @@ class WorkspaceInviteMessagePage extends React.Component {
 
     sendInvitation() {
         Keyboard.dismiss();
-        Policy.addMembersToWorkspace(this.props.invitedEmailsToAccountIDsDraft, this.state.welcomeNote, this.props.route.params.policyID, this.props.betas);
+        Policy.addMembersToWorkspace(this.props.invitedEmailsToAccountIDsDraft, this.state.welcomeNote, this.props.route.params.policyID);
         Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, {});
         // Pop the invite message page before navigating to the members page.
         Navigation.goBack();
@@ -248,9 +244,6 @@ export default compose(
         allPersonalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
         invitedEmailsToAccountIDsDraft: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
         },

From a65f22ee6ea258bdb40921a79f85e01a2d12cfe4 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Fri, 18 Aug 2023 10:56:29 +0300
Subject: [PATCH 085/214] Remove unused var

---
 tests/unit/SidebarFilterTest.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
index 61dac3f2f786..85d409969133 100644
--- a/tests/unit/SidebarFilterTest.js
+++ b/tests/unit/SidebarFilterTest.js
@@ -7,7 +7,6 @@ import wrapOnyxWithWaitForPromisesToResolve from '../utils/wrapOnyxWithWaitForPr
 import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
 import * as Localize from '../../src/libs/Localize';
-import * as Report from '../../src/libs/actions/Report';
 
 // Be sure to include the mocked permissions library or else the beta tests won't work
 jest.mock('../../src/libs/Permissions');

From 9f743b3b0b0b6811ca619c9b6fa20d1932d440a7 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Fri, 18 Aug 2023 15:30:16 +0700
Subject: [PATCH 086/214] fix: 24174

---
 .../PushNotification/index.native.js          | 23 ++++++++++++++++++
 src/libs/actions/Session/index.js             | 24 -------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/libs/Notification/PushNotification/index.native.js b/src/libs/Notification/PushNotification/index.native.js
index 299af69873f9..3c868c41e6f4 100644
--- a/src/libs/Notification/PushNotification/index.native.js
+++ b/src/libs/Notification/PushNotification/index.native.js
@@ -7,6 +7,7 @@ import NotificationType from './NotificationType';
 import * as PushNotification from '../../actions/PushNotification';
 import ONYXKEYS from '../../../ONYXKEYS';
 import configureForegroundNotifications from './configureForegroundNotifications';
+import subscribeToReportCommentPushNotifications from './subscribeToReportCommentPushNotifications';
 
 let isUserOptedInToPushNotifications = false;
 Onyx.connect({
@@ -185,6 +186,28 @@ function clearNotifications() {
     Airship.push.clearNotifications();
 }
 
+/**
+ * Manage push notification subscriptions on sign-in/sign-out.
+ *
+ * On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
+ * push subscription when the session changes here.
+ */
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
+    callback: (notificationID) => {
+        if (notificationID) {
+            register(notificationID);
+
+            // Prevent issue where report linking fails after users switch accounts without closing the app
+            init();
+            subscribeToReportCommentPushNotifications();
+        } else {
+            deregister();
+            clearNotifications();
+        }
+    },
+});
+
 export default {
     init,
     register,
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index a538291bd054..68a827763d19 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -7,7 +7,6 @@ import ONYXKEYS from '../../../ONYXKEYS';
 import redirectToSignIn from '../SignInRedirect';
 import CONFIG from '../../../CONFIG';
 import Log from '../../Log';
-import PushNotification from '../../Notification/PushNotification';
 import Timing from '../Timing';
 import CONST from '../../../CONST';
 import Timers from '../../Timers';
@@ -18,7 +17,6 @@ import * as API from '../../API';
 import * as NetworkStore from '../../Network/NetworkStore';
 import Navigation from '../../Navigation/Navigation';
 import * as Device from '../Device';
-import subscribeToReportCommentPushNotifications from '../../Notification/PushNotification/subscribeToReportCommentPushNotifications';
 import ROUTES from '../../../ROUTES';
 import * as ErrorUtils from '../../ErrorUtils';
 import * as ReportUtils from '../../ReportUtils';
@@ -37,28 +35,6 @@ Onyx.connect({
     callback: (val) => (credentials = val || {}),
 });
 
-/**
- * Manage push notification subscriptions on sign-in/sign-out.
- *
- * On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
- * push subscription when the session changes here.
- */
-Onyx.connect({
-    key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
-    callback: (notificationID) => {
-        if (notificationID) {
-            PushNotification.register(notificationID);
-
-            // Prevent issue where report linking fails after users switch accounts without closing the app
-            PushNotification.init();
-            subscribeToReportCommentPushNotifications();
-        } else {
-            PushNotification.deregister();
-            PushNotification.clearNotifications();
-        }
-    },
-});
-
 /**
  * Clears the Onyx store and redirects user to the sign in page
  */

From 093590f3ef13ec537a8565627c1d281b663ad4f8 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Fri, 18 Aug 2023 11:38:01 +0300
Subject: [PATCH 087/214] Fix getShareDestinationsOptions test

---
 tests/unit/OptionsListUtilsTest.js | 35 +++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
index 1c176bdb1ce4..b4a4c9439f69 100644
--- a/tests/unit/OptionsListUtilsTest.js
+++ b/tests/unit/OptionsListUtilsTest.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import * as OptionsListUtils from '../../src/libs/OptionsListUtils';
+import * as ReportUtils from '../../src/libs/ReportUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 import CONST from '../../src/CONST';
@@ -103,6 +104,10 @@ describe('OptionsListUtils', () => {
             oldPolicyName: "SHIELD's workspace",
             chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
             isOwnPolicyExpenseChat: true,
+
+            // This indicates that the report is archived
+            stateNum: 2,
+            statusNum: 2,
         },
     };
 
@@ -567,39 +572,57 @@ describe('OptionsListUtils', () => {
     });
 
     it('getShareDestinationsOptions()', () => {
+        // Filter current REPORTS as we do in the component, before getting share destination options
+        const filteredReports = {};
+        _.keys(REPORTS).forEach((reportKey) => {
+            if (ReportUtils.shouldDisableWriteActions(REPORTS[reportKey]) || ReportUtils.isExpensifyOnlyParticipantInReport(REPORTS[reportKey])) {
+                return;
+            }
+            filteredReports[reportKey] = REPORTS[reportKey];
+        });
+
         // When we pass an empty search value
-        let results = OptionsListUtils.getShareDestinationOptions(REPORTS, PERSONAL_DETAILS, [], '');
+        let results = OptionsListUtils.getShareDestinationOptions(filteredReports, PERSONAL_DETAILS, [], '');
 
         // Then we should expect all the recent reports to show but exclude the archived rooms
         expect(results.recentReports.length).toBe(_.size(REPORTS) - 1);
 
         // When we pass a search value that doesn't match the group chat name
-        results = OptionsListUtils.getShareDestinationOptions(REPORTS, PERSONAL_DETAILS, [], 'mutants');
+        results = OptionsListUtils.getShareDestinationOptions(filteredReports, PERSONAL_DETAILS, [], 'mutants');
 
         // Then we should expect no recent reports to show
         expect(results.recentReports.length).toBe(0);
 
         // When we pass a search value that matches the group chat name
-        results = OptionsListUtils.getShareDestinationOptions(REPORTS, PERSONAL_DETAILS, [], 'Iron Man, Fantastic');
+        results = OptionsListUtils.getShareDestinationOptions(filteredReports, PERSONAL_DETAILS, [], 'Iron Man, Fantastic');
 
         // Then we should expect the group chat to show along with the contacts matching the search
         expect(results.recentReports.length).toBe(1);
 
+        // Filter current REPORTS_WITH_WORKSPACE_ROOMS as we do in the component, before getting share destination options
+        const filteredReportsWithWorkspaceRooms = {};
+        _.keys(REPORTS_WITH_WORKSPACE_ROOMS).forEach((reportKey) => {
+            if (ReportUtils.shouldDisableWriteActions(REPORTS_WITH_WORKSPACE_ROOMS[reportKey]) || ReportUtils.isExpensifyOnlyParticipantInReport(REPORTS_WITH_WORKSPACE_ROOMS[reportKey])) {
+                return;
+            }
+            filteredReportsWithWorkspaceRooms[reportKey] = REPORTS_WITH_WORKSPACE_ROOMS[reportKey];
+        });
+
         // When we also have a policy to return rooms in the results
-        results = OptionsListUtils.getShareDestinationOptions(REPORTS_WITH_WORKSPACE_ROOMS, PERSONAL_DETAILS, [], '');
+        results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, PERSONAL_DETAILS, [], '');
 
         // Then we should expect the DMS, the group chats and the workspace room to show
         // We should expect all the recent reports to show, excluding the archived rooms
         expect(results.recentReports.length).toBe(_.size(REPORTS_WITH_WORKSPACE_ROOMS) - 1);
 
         // When we search for a workspace room
-        results = OptionsListUtils.getShareDestinationOptions(REPORTS_WITH_WORKSPACE_ROOMS, PERSONAL_DETAILS, [], 'Avengers Room');
+        results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, PERSONAL_DETAILS, [], 'Avengers Room');
 
         // Then we should expect only the workspace room to show
         expect(results.recentReports.length).toBe(1);
 
         // When we search for a workspace room that doesn't exist
-        results = OptionsListUtils.getShareDestinationOptions(REPORTS_WITH_WORKSPACE_ROOMS, PERSONAL_DETAILS, [], 'Mutants Lair');
+        results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, PERSONAL_DETAILS, [], 'Mutants Lair');
 
         // Then we should expect no results to show
         expect(results.recentReports.length).toBe(0);

From 079dde4a634dafe7b495381a726bee4e8b595e6c Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 18 Aug 2023 12:48:25 +0200
Subject: [PATCH 088/214] add comments

---
 .../CategoryPicker/categoryPickerPropTypes.js          |  4 ++--
 src/components/MoneyRequestConfirmationList.js         |  4 ++--
 src/components/categoryPropTypes.js                    |  4 ++--
 src/pages/iou/MoneyRequestCategoryPage.js              | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index ceb6268bc0b3..b5f8a6f2146e 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -2,10 +2,10 @@ import PropTypes from 'prop-types';
 import categoryPropTypes from '../categoryPropTypes';
 
 const propTypes = {
-    /** TODO: Comment */
+    /** The policyID of we are getting categories */
     policyID: PropTypes.string,
 
-    /** TODO: Comment */
+    /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 };
 
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 88e78fa820e5..e2f872bd3bfb 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -63,7 +63,7 @@ const propTypes = {
     /** IOU merchant */
     iouMerchant: PropTypes.string,
 
-    /** TODO: Comment */
+    /** IOU Category */
     iouCategory: PropTypes.string,
 
     /** Selected participants from MoneyRequestModal with login / accountID */
@@ -100,7 +100,7 @@ const propTypes = {
     /** File source of the receipt */
     receiptSource: PropTypes.string,
 
-    /** TODO: Comment */
+    /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(
         PropTypes.shape({
             enabled: PropTypes.bool.isRequired,
diff --git a/src/components/categoryPropTypes.js b/src/components/categoryPropTypes.js
index ac9e7a564c1c..6320791554e4 100644
--- a/src/components/categoryPropTypes.js
+++ b/src/components/categoryPropTypes.js
@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
 
 export default PropTypes.shape({
-    /** TODO: Comment */
+    /** Name of a category */
     name: PropTypes.string.isRequired,
 
-    /** TODO: Comment */
+    /** Flag that determine is a category active */
     enabled: PropTypes.bool.isRequired,
 });
diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js
index 572e6a5fc2f4..ad4e475ff765 100644
--- a/src/pages/iou/MoneyRequestCategoryPage.js
+++ b/src/pages/iou/MoneyRequestCategoryPage.js
@@ -12,19 +12,19 @@ import ONYXKEYS from '../../ONYXKEYS';
 import reportPropTypes from '../reportPropTypes';
 
 const propTypes = {
-    /** TODO: Comment */
+    /** Navigation route context info provided by react navigation */
     route: PropTypes.shape({
-        /** Each parameter passed via the URL */
+        /** Route specific parameters used on this screen via route :iouType/new/category/:reportID? */
         params: PropTypes.shape({
-            /** TODO: Comment */
+            /** The type of IOU report, i.e. bill, request, send */
             iouType: PropTypes.string,
 
-            /** TODO: Comment */
+            /** reportID for the transaction thread */
             reportID: PropTypes.string,
         }),
     }).isRequired,
 
-    /** TODO: Comment */
+    /** The report currently being used */
     report: reportPropTypes,
 };
 

From 272dd1b9144eb611080dc42f473aebd3e46a4f73 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 18 Aug 2023 13:20:20 +0200
Subject: [PATCH 089/214] implement category list

---
 .../CategoryPicker/categoryPickerPropTypes.js |  6 +++
 src/components/CategoryPicker/index.js        | 47 +++++++++++++------
 src/pages/iou/MoneyRequestCategoryPage.js     | 11 +++--
 3 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index b5f8a6f2146e..596c1c680ae8 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -2,9 +2,15 @@ import PropTypes from 'prop-types';
 import categoryPropTypes from '../categoryPropTypes';
 
 const propTypes = {
+    /** The report ID of the IOU */
+    reportID: PropTypes.string,
+
     /** The policyID of we are getting categories */
     policyID: PropTypes.string,
 
+    /** The type of IOU report, i.e. bill, request, send */
+    iouType: PropTypes.string,
+
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 };
diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index 1b37dfca44da..fc9c1b39b6fb 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -1,26 +1,43 @@
 import React from 'react';
 import _ from 'underscore';
-import {View, Text} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import {propTypes, defaultProps} from './categoryPickerPropTypes';
+import OptionsList from '../OptionsList';
+import styles from '../../styles/styles';
+import ScreenWrapper from '../ScreenWrapper';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
 
-function CategoryPicker({policyCategories}) {
-    if (policyCategories === null) {
-        return null;
-    }
+function CategoryPicker({policyCategories, reportID, iouType}) {
+    const categoryList = _.chain(policyCategories)
+        .values()
+        .map((category) => ({
+            text: category.name,
+            keyForList: category.name,
+            tooltipText: category.name,
+        }))
+        .value();
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+    };
 
     return (
-        <View>
-            {_.chain(policyCategories)
-                .values()
-                .map((category) => (
-                    <View key={category.name}>
-                        <Text>{category.name}</Text>
-                    </View>
-                ))
-                .value()}
-        </View>
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            {({safeAreaPaddingBottomStyle}) => (
+                <OptionsList
+                    optionHoveredStyle={styles.hoveredComponentBG}
+                    contentContainerStyles={[safeAreaPaddingBottomStyle]}
+                    sections={[
+                        {
+                            data: categoryList,
+                        },
+                    ]}
+                    onSelectRow={navigateBack}
+                />
+            )}
+        </ScreenWrapper>
     );
 }
 
diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js
index ad4e475ff765..80b88a762609 100644
--- a/src/pages/iou/MoneyRequestCategoryPage.js
+++ b/src/pages/iou/MoneyRequestCategoryPage.js
@@ -19,7 +19,7 @@ const propTypes = {
             /** The type of IOU report, i.e. bill, request, send */
             iouType: PropTypes.string,
 
-            /** reportID for the transaction thread */
+            /** The report ID of the IOU */
             reportID: PropTypes.string,
         }),
     }).isRequired,
@@ -36,10 +36,9 @@ function MoneyRequestCategoryPage({route, report}) {
     const {translate} = useLocalize();
 
     const reportID = lodashGet(route, 'params.reportID', '');
+    const iouType = lodashGet(route, 'params.iouType', '');
 
     const navigateBack = () => {
-        const iouType = lodashGet(route, 'params.iouType', '');
-
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
     };
 
@@ -53,7 +52,11 @@ function MoneyRequestCategoryPage({route, report}) {
                 onBackButtonPress={navigateBack}
             />
 
-            <CategoryPicker policyID={report.policyID} />
+            <CategoryPicker
+                policyID={report.policyID}
+                reportID={reportID}
+                iouType={iouType}
+            />
         </ScreenWrapper>
     );
 }

From 9a241c408a22fd577682dddf9595eb95f05578ff Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 18 Aug 2023 14:08:46 +0200
Subject: [PATCH 090/214] clarify prop types

---
 src/components/CategoryPicker/categoryPickerPropTypes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index 596c1c680ae8..555a1e3356b5 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -3,13 +3,13 @@ import categoryPropTypes from '../categoryPropTypes';
 
 const propTypes = {
     /** The report ID of the IOU */
-    reportID: PropTypes.string,
+    reportID: PropTypes.string.isRequired,
 
     /** The policyID of we are getting categories */
     policyID: PropTypes.string,
 
     /** The type of IOU report, i.e. bill, request, send */
-    iouType: PropTypes.string,
+    iouType: PropTypes.string.isRequired,
 
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),

From 4b1081a2b5fcfc7b9718951a1eed55d965bd10e6 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 18 Aug 2023 14:10:42 +0200
Subject: [PATCH 091/214] memorize category list

---
 src/components/CategoryPicker/index.js | 32 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index fc9c1b39b6fb..163ab6673ca2 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -10,14 +10,22 @@ import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 
 function CategoryPicker({policyCategories, reportID, iouType}) {
-    const categoryList = _.chain(policyCategories)
-        .values()
-        .map((category) => ({
-            text: category.name,
-            keyForList: category.name,
-            tooltipText: category.name,
-        }))
-        .value();
+    const sections = useMemo(() => {
+        const categoryList = _.chain(policyCategories)
+            .values()
+            .map((category) => ({
+                text: category.name,
+                keyForList: category.name,
+                tooltipText: category.name,
+            }))
+            .value();
+
+        return [
+            {
+                data: categoryList,
+            },
+        ];
+    }, [policyCategories]);
 
     const navigateBack = () => {
         Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
@@ -29,11 +37,7 @@ function CategoryPicker({policyCategories, reportID, iouType}) {
                 <OptionsList
                     optionHoveredStyle={styles.hoveredComponentBG}
                     contentContainerStyles={[safeAreaPaddingBottomStyle]}
-                    sections={[
-                        {
-                            data: categoryList,
-                        },
-                    ]}
+                    sections={sections}
                     onSelectRow={navigateBack}
                 />
             )}

From b415c224a7aee3601ee683fdb2d5f3c37ab986f1 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 18 Aug 2023 09:48:08 -0500
Subject: [PATCH 092/214] Fix Capitalization of 'Download the App' to 'Download
 the app'

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

diff --git a/src/languages/en.js b/src/languages/en.js
index 7134970d546e..f66aa09e8a22 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -244,7 +244,7 @@ export default {
         welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     mobileBanner: {
-        downloadTheApp: 'Download the App',
+        downloadTheApp: 'Download the app',
         keepTheConversationGoing: 'Keep the conversation going in New Expensify.',
     },
     login: {

From e5c55cd7ac30c1375d3707edb5a1df9c7414f8ac Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 10:47:52 -0500
Subject: [PATCH 093/214] get display showing

---
 src/components/DistanceRequest.js | 11 ++++++++---
 src/libs/actions/Transaction.js   |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index a057ffa17ec4..be3ba413ab1d 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -78,6 +78,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
 
     const waypoints = lodashGet(transaction, 'comment.waypoints', {});
     const numberOfWaypoints = _.size(waypoints);
+
     const lastWaypointIndex = numberOfWaypoints - 1;
     const isLoadingRoute = lodashGet(transaction, 'route.isLoading', false);
 
@@ -106,12 +107,16 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
 
     // Handle fetching the route when there are at least 2 waypoints
     useEffect(() => {
-        if (numberOfWaypoints < 1 || isLoadingRoute) {
+        const nonEmptyWaypoints = _.filter(waypoints, waypoint => 
+            waypoint && typeof waypoint.address === 'string' && waypoint.address.trim() !== ''
+        ).length;
+    
+        if (nonEmptyWaypoints < 2 || isLoadingRoute) {
             return;
         }
 
         Transaction.getRoute(transactionID, waypoints);
-    }, [numberOfWaypoints, waypoints, transactionID, isLoadingRoute]);
+    }, [waypoints, transactionID, isLoadingRoute]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
@@ -184,6 +189,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             location: CONST.SF_COORDINATES,
                             zoom: DEFAULT_ZOOM_LEVEL,
                         }}
+                        directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
                         style={styles.mapView}
                     />
                 ) : (
@@ -206,7 +212,6 @@ DistanceRequest.defaultProps = defaultProps;
 export default withOnyx({
     transaction: {
         key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.transactionID}`,
-        selector: (transaction) => (transaction ? {transactionID: transaction.transactionID, comment: {waypoints: lodashGet(transaction, 'comment.waypoints')}} : null),
     },
     mapboxAccessToken: {
         key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index f81f3785bd17..e17bcb138f55 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -112,7 +112,7 @@ function getRoute(transactionID, waypoints) {
         'GetRoute',
         {
             transactionID,
-            waypoints,
+            waypoints: JSON.stringify(waypoints),
         },
         {
             optimisticData: [
@@ -121,7 +121,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        route: {
+                        routes: {
                             isLoading: true,
                         },
                         errorFields: {
@@ -136,7 +136,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        route: {
+                        routes: {
                             isLoading: false,
                         },
                     },
@@ -147,7 +147,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        route: {
+                        routes: {
                             isLoading: false,
                         },
                     },

From 92e4489aa336fb77b0a991f16cb52a53a7b7c437 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 11:07:36 -0500
Subject: [PATCH 094/214] Add styling / update version

---
 package-lock.json                 | 14 +++++++-------
 package.json                      |  2 +-
 src/components/DistanceRequest.js |  2 ++
 src/styles/styles.js              |  5 +++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ab81bcecb18..db955088bcf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.6",
+        "react-native-x-maps": "1.0.7",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -43458,9 +43458,9 @@
       }
     },
     "node_modules/react-native-x-maps": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.6.tgz",
-      "integrity": "sha512-aGqhdjBPDI6ZXhccjnetjA88eYFB5l8wtpY1ooGwEbiAUOaCqEWqeUHMI79q3VByBOgfP51gJOtpZbk9JOIKcw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.7.tgz",
+      "integrity": "sha512-dfuEPWAXjESTTZ2tLFkYLHjd++s/goGvksiPib4a6DoPfF1HA6jXvasB9ddjG1iHMVmHY8Cvc2OVZTGNaAp0RA==",
       "peerDependencies": {
         "@math.gl/web-mercator": "^3.6.3",
         "@rnmapbox/maps": "^10.0.11",
@@ -80311,9 +80311,9 @@
       }
     },
     "react-native-x-maps": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.6.tgz",
-      "integrity": "sha512-aGqhdjBPDI6ZXhccjnetjA88eYFB5l8wtpY1ooGwEbiAUOaCqEWqeUHMI79q3VByBOgfP51gJOtpZbk9JOIKcw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.7.tgz",
+      "integrity": "sha512-dfuEPWAXjESTTZ2tLFkYLHjd++s/goGvksiPib4a6DoPfF1HA6jXvasB9ddjG1iHMVmHY8Cvc2OVZTGNaAp0RA==",
       "requires": {}
     },
     "react-pdf": {
diff --git a/package.json b/package.json
index 9b5ecd0c7119..e406765acbe8 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-lottie": "^1.4.4",
     "react-native-webview": "^11.17.2",
-    "react-native-x-maps": "1.0.6",
+    "react-native-x-maps": "1.0.7",
     "react-pdf": "^6.2.2",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index be3ba413ab1d..a69844f02c6f 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -190,6 +190,8 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             zoom: DEFAULT_ZOOM_LEVEL,
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
+                        directionStyle={styles.mapDirection}
+                        styleURL='mapbox://styles/shawnborton/cllcoiqds00cs01r80kp34tmq'
                         style={styles.mapView}
                     />
                 ) : (
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 575e202efa35..519836036754 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3753,6 +3753,11 @@ const styles = {
         overflow: 'hidden',
     },
 
+    mapDirection: {
+        width: 15,
+        color: Colors.blue800,
+    },
+
     mapPendingView: {
         backgroundColor: themeColors.highlightBG,
         ...flex.flex1,

From ae8c7e708a058f731607dd9d3ef59dcb8d96cb27 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 18 Aug 2023 11:08:59 -0500
Subject: [PATCH 095/214] Remember if user has dismissed the banner

---
 src/ONYXKEYS.js                       |  3 +++
 src/components/MobileBanner.js        | 25 ++++++++++++++++++++++---
 src/libs/actions/DownloadAppBanner.js | 11 +++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 src/libs/actions/DownloadAppBanner.js

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 7ef5c68c3850..991ee572f01f 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -242,6 +242,9 @@ export default {
     // This can be either "light", "dark" or "system"
     PREFERRED_THEME: 'preferredTheme',
 
+    // Denotes if the Download App Banner has been dismissed
+    SHOW_DOWNLOAD_APP_BANNER: 'showDownloadAppBanner',
+
     // Whether we're checking if the room is public or not
     IS_CHECKING_PUBLIC_ROOM: 'isCheckingPublicRoom',
 
diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index 14073be4ddc2..1fc3415597bb 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -1,5 +1,8 @@
 import React, {useState} from 'react';
 import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
@@ -14,12 +17,23 @@ import useLocalize from '../hooks/useLocalize';
 import * as Link from '../libs/actions/Link';
 import * as Browser from '../libs/Browser';
 import getOperatingSystem from '../libs/getOperatingSystem';
+import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
 
-function MobileBanner() {
-    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile());
+
+const propTypes = {
+    showDownloadAppBanner: PropTypes.bool,
+}
+
+const defaultProps = {
+    showDownloadAppBanner: true,
+}
+
+function MobileBanner({showDownloadAppBanner}) {
+    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() && showDownloadAppBanner);
     const {translate} = useLocalize();
 
     const handleCloseBanner = () => {
+        setShowDownloadAppBanner(false);
         setshouldShowBanner(false);
     };
 
@@ -83,5 +97,10 @@ function MobileBanner() {
 }
 
 MobileBanner.displayName = 'MobileBanner';
+MobileBanner.propTypes = propTypes;
+MobileBanner.defaultProps = defaultProps;
 
-export default MobileBanner;
+export default withOnyx({
+    showDownloadAppBanner: {
+        key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
+}})(MobileBanner);
diff --git a/src/libs/actions/DownloadAppBanner.js b/src/libs/actions/DownloadAppBanner.js
new file mode 100644
index 000000000000..d138a4cf67c9
--- /dev/null
+++ b/src/libs/actions/DownloadAppBanner.js
@@ -0,0 +1,11 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+
+/**
+ * @param {Boolean} shouldShowBanner
+ */
+function setShowDownloadAppBanner(shouldShowBanner) {
+    Onyx.set(ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER, shouldShowBanner);
+}
+
+export default setShowDownloadAppBanner;

From ec791de19d02cc2b6785b8c773a660e33ed88592 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 18 Aug 2023 11:09:55 -0500
Subject: [PATCH 096/214] prettier

---
 src/components/MobileBanner.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index 1fc3415597bb..fe78ee8b110d 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -19,14 +19,13 @@ import * as Browser from '../libs/Browser';
 import getOperatingSystem from '../libs/getOperatingSystem';
 import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
 
-
 const propTypes = {
     showDownloadAppBanner: PropTypes.bool,
-}
+};
 
 const defaultProps = {
     showDownloadAppBanner: true,
-}
+};
 
 function MobileBanner({showDownloadAppBanner}) {
     const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() && showDownloadAppBanner);
@@ -103,4 +102,5 @@ MobileBanner.defaultProps = defaultProps;
 export default withOnyx({
     showDownloadAppBanner: {
         key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-}})(MobileBanner);
+    },
+})(MobileBanner);

From 3a2f1a0bea363a0df6eb9a2c84a4f220b2220ffd Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 12:04:38 -0500
Subject: [PATCH 097/214] Add errorFields

---
 src/components/DistanceRequest.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index a69844f02c6f..03961ce51928 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -21,6 +21,7 @@ import useNetwork from '../hooks/useNetwork';
 import useLocalize from '../hooks/useLocalize';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
+import OfflineWithFeedback from './OfflineWithFeedback';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
@@ -51,6 +52,12 @@ const propTypes = {
                 address: PropTypes.string,
             }),
         }),
+
+        /** Errors related to this transaction */
+        errorFields: {
+            /** Errors related to fetching the route */
+            route: PropTypes.string,
+        }
     }),
 
     /** Data about Mapbox token for calling Mapbox API */
@@ -122,6 +129,13 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
 
     return (
         <>
+            <OfflineWithFeedback
+                errors={lodashGet(transaction, 'errorFields', null)}
+                onClose={() => {
+                    console.log('remove error');
+                }}
+                errorRowStyles={[styles.mbn1]}
+            >
             <View
                 style={styles.distanceRequestContainer(scrollContainerMaxHeight)}
                 onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))}
@@ -190,7 +204,10 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             zoom: DEFAULT_ZOOM_LEVEL,
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
-                        directionStyle={styles.mapDirection}
+                        directionStyle={{
+                            width: 15,
+                            color: '#002140'
+                        }}
                         styleURL='mapbox://styles/shawnborton/cllcoiqds00cs01r80kp34tmq'
                         style={styles.mapView}
                     />
@@ -204,6 +221,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                     </View>
                 )}
             </View>
+            </OfflineWithFeedback>
         </>
     );
 }

From c3abd93be848c5e8c4db5adb0d547bb6d46b77a5 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 15:32:48 -0500
Subject: [PATCH 098/214] Prevent fetching while offline

---
 src/components/DistanceRequest.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 03961ce51928..34ee9617eb07 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -55,7 +55,7 @@ const propTypes = {
 
         /** Errors related to this transaction */
         errorFields: {
-            /** Errors related to fetching the route */
+            /** Error related to fetching the route */
             route: PropTypes.string,
         }
     }),
@@ -118,12 +118,12 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
             waypoint && typeof waypoint.address === 'string' && waypoint.address.trim() !== ''
         ).length;
     
-        if (nonEmptyWaypoints < 2 || isLoadingRoute) {
+        if (isOffline || nonEmptyWaypoints < 2 || isLoadingRoute) {
             return;
         }
 
         Transaction.getRoute(transactionID, waypoints);
-    }, [waypoints, transactionID, isLoadingRoute]);
+    }, [waypoints, transactionID, isLoadingRoute, isOffline]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 

From e03cd935428f5d3ffaa4311e00f79bab52822d1e Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 15:39:06 -0500
Subject: [PATCH 099/214] Fix proptype

---
 src/components/DistanceRequest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 34ee9617eb07..c1237ec12276 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -54,10 +54,10 @@ const propTypes = {
         }),
 
         /** Errors related to this transaction */
-        errorFields: {
+        errorFields: PropTypes.shape({
             /** Error related to fetching the route */
             route: PropTypes.string,
-        }
+        }),
     }),
 
     /** Data about Mapbox token for calling Mapbox API */

From e4428668c3a102557fb119536ad7570117d0ef89 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 18 Aug 2023 15:34:35 -0600
Subject: [PATCH 100/214] Remove unused import

---
 src/libs/ReceiptUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
index fcf2b07cd010..c1c028073690 100644
--- a/src/libs/ReceiptUtils.js
+++ b/src/libs/ReceiptUtils.js
@@ -9,7 +9,6 @@ import ReceiptHTML from '../../assets/images/receipt-html.png';
 import ReceiptDoc from '../../assets/images/receipt-doc.png';
 import ReceiptGeneric from '../../assets/images/receipt-generic.png';
 import ReceiptSVG from '../../assets/images/receipt-svg.png';
-import CONFIG from '../CONFIG';
 
 function validateReceipt(file) {
     const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));

From 42017562da5139d25fdc4f71b345245d746000d0 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 18:27:04 -0500
Subject: [PATCH 101/214] Add error dot indicator and screen wrapper

---
 src/components/DistanceRequest.js | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index c1237ec12276..51e6467bf918 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -21,7 +21,9 @@ import useNetwork from '../hooks/useNetwork';
 import useLocalize from '../hooks/useLocalize';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
-import OfflineWithFeedback from './OfflineWithFeedback';
+import ScreenWrapper from './ScreenWrapper';
+import DotIndicatorMessage from './DotIndicatorMessage';
+import * as ErrorUtils from '../libs/ErrorUtils';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
@@ -53,11 +55,8 @@ const propTypes = {
             }),
         }),
 
-        /** Errors related to this transaction */
-        errorFields: PropTypes.shape({
-            /** Error related to fetching the route */
-            route: PropTypes.string,
-        }),
+       /** Server side errors keyed by microtime */
+       errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
     }),
 
     /** Data about Mapbox token for calling Mapbox API */
@@ -88,6 +87,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
 
     const lastWaypointIndex = numberOfWaypoints - 1;
     const isLoadingRoute = lodashGet(transaction, 'route.isLoading', false);
+    const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
 
     // Show up to the max number of waypoints plus 1/2 of one to hint at scrolling
     const halfMenuItemHeight = Math.floor(variables.baseMenuItemHeight / 2);
@@ -128,14 +128,9 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
     return (
-        <>
-            <OfflineWithFeedback
-                errors={lodashGet(transaction, 'errorFields', null)}
-                onClose={() => {
-                    console.log('remove error');
-                }}
-                errorRowStyles={[styles.mbn1]}
-            >
+        <ScreenWrapper
+            shouldEnableMaxHeight
+        >
             <View
                 style={styles.distanceRequestContainer(scrollContainerMaxHeight)}
                 onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))}
@@ -182,6 +177,13 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                         colors={[theme.transparent, theme.modalBackground]}
                     />
                 )}
+                {hasRouteError && (
+                    <DotIndicatorMessage
+                        style={[styles.mh5, styles.mv3]}
+                        messages={ErrorUtils.getLatestErrorField(transaction, 'route')}
+                        type="error"
+                    />
+                )}
             </View>
             <View style={[styles.flexRow, styles.justifyContentCenter, styles.pt1]}>
                 <Button
@@ -221,8 +223,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                     </View>
                 )}
             </View>
-            </OfflineWithFeedback>
-        </>
+        </ScreenWrapper>
     );
 }
 

From 1b9056c8664cf2a10325e7eac65b82d94406e136 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 18 Aug 2023 18:36:40 -0500
Subject: [PATCH 102/214] Handle clearing errors when updating input

---
 src/components/DistanceRequest.js |  7 ++++---
 src/libs/actions/Transaction.js   | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 51e6467bf918..4c3d342474d6 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -86,7 +86,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const numberOfWaypoints = _.size(waypoints);
 
     const lastWaypointIndex = numberOfWaypoints - 1;
-    const isLoadingRoute = lodashGet(transaction, 'route.isLoading', false);
+    const isLoadingRoute = lodashGet(transaction, 'comment.isLoading', false);
     const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
 
     // Show up to the max number of waypoints plus 1/2 of one to hint at scrolling
@@ -118,12 +118,13 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
             waypoint && typeof waypoint.address === 'string' && waypoint.address.trim() !== ''
         ).length;
     
-        if (isOffline || nonEmptyWaypoints < 2 || isLoadingRoute) {
+        // Only fetch the route when all the waypoints are filled (prevents an error fetching with an empty waypoint)
+        if (isOffline || isLoadingRoute || numberOfWaypoints !== nonEmptyWaypoints || nonEmptyWaypoints < 2) {
             return;
         }
 
         Transaction.getRoute(transactionID, waypoints);
-    }, [waypoints, transactionID, isLoadingRoute, isOffline]);
+    }, [numberOfWaypoints, waypoints, transactionID, isLoadingRoute, isOffline]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index e17bcb138f55..53ee0319b0f7 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -64,6 +64,10 @@ function saveWaypoint(transactionID, index, waypoint) {
                 [`waypoint${index}`]: waypoint,
             },
         },
+        // Empty out errors when we're saving a new waypoint as this indicates the user is updating their input
+        errorFields: {
+            route: null,
+        },
     });
 }
 
@@ -121,7 +125,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        routes: {
+                        comment: {
                             isLoading: true,
                         },
                         errorFields: {
@@ -136,7 +140,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        routes: {
+                        comment: {
                             isLoading: false,
                         },
                     },
@@ -147,7 +151,7 @@ function getRoute(transactionID, waypoints) {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                     value: {
-                        routes: {
+                        comment: {
                             isLoading: false,
                         },
                     },

From 3dfcf11a31d10ea5a960d193fd2737b94d00fd6a Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Sat, 19 Aug 2023 11:05:30 +0800
Subject: [PATCH 103/214] fix lint error

---
 src/pages/home/report/ReportActionCompose.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 8b3e6589ccfe..3f0c06172f23 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -362,7 +362,7 @@ function ReportActionCompose({
 
         return translate('reportActionCompose.writeSomething');
     }, [report, blockedFromConcierge, translate, conciergePlaceholderRandomIndex]);
-    
+
     /**
      * Focus the composer text input
      * @param {Boolean} [shouldDelay=false] Impose delay before focusing the composer
@@ -371,10 +371,10 @@ function ReportActionCompose({
     const focus = useCallback((shouldDelay) => {
         focusWithDelay(textInputRef.current)(shouldDelay);
     }, []);
-    
+
     const willOpenNextModal = useRef(false);
     const isKeyboardVisibleWhenShowingModal = useRef(false);
-    
+
     const restoreKeyboardState = useCallback(() => {
         if (!isKeyboardVisibleWhenShowingModal.current) {
             return;
@@ -1150,10 +1150,10 @@ function ReportActionCompose({
                                                             ref={actionButtonRef}
                                                             onPress={(e) => {
                                                                 e.preventDefault();
-                                                                    if (!willBlurTextInputOnTapOutside) {
-                                                                        isKeyboardVisibleWhenShowingModal.current = textInputRef.current.isFocused();
-                                                                    }
-                                                                    textInputRef.current.blur();
+                                                                if (!willBlurTextInputOnTapOutside) {
+                                                                    isKeyboardVisibleWhenShowingModal.current = textInputRef.current.isFocused();
+                                                                }
+                                                                textInputRef.current.blur();
 
                                                                 // Drop focus to avoid blue focus ring.
                                                                 actionButtonRef.current.blur();
@@ -1222,7 +1222,7 @@ function ReportActionCompose({
                                         }}
                                         onPasteFile={displayFileInModal}
                                         shouldClear={textInputShouldClear}
-                                            onClear={() => setTextInputShouldClear(false)}
+                                        onClear={() => setTextInputShouldClear(false)}
                                         isDisabled={isBlockedFromConcierge || disabled}
                                         selection={selection}
                                         onSelectionChange={onSelectionChange}

From 586c22a6c1410ae624793822272ba8385f84ac6e Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Sat, 19 Aug 2023 09:08:31 -0500
Subject: [PATCH 104/214] Move MobileBanner down in tree

---
 src/Expensify.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index 0dd8f1c45da0..497f5c8563a2 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -189,8 +189,8 @@ function Expensify(props) {
                 <>
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
-                    <MobileBanner />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
+                    <MobileBanner />
                     <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}
                     {props.updateAvailable ? <UpdateAppModal /> : null}

From 2ac25900a9e5d15b0ccbf5c733573e2665e1b01f Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Sun, 20 Aug 2023 22:42:30 +0700
Subject: [PATCH 105/214] fix require cycle

---
 .../PushNotificationListener.js               | 86 ++++++++++++++++++
 .../Notification/PushNotification/index.js    |  5 -
 .../PushNotification/index.native.js          | 91 +------------------
 ...bscribeToReportCommentPushNotifications.js |  7 +-
 4 files changed, 93 insertions(+), 96 deletions(-)
 create mode 100644 src/libs/Notification/PushNotification/PushNotificationListener.js

diff --git a/src/libs/Notification/PushNotification/PushNotificationListener.js b/src/libs/Notification/PushNotification/PushNotificationListener.js
new file mode 100644
index 000000000000..4054d149607a
--- /dev/null
+++ b/src/libs/Notification/PushNotification/PushNotificationListener.js
@@ -0,0 +1,86 @@
+import {EventType} from '@ua/react-native-airship';
+import lodashGet from 'lodash/get';
+import _ from 'underscore';
+import Log from '../../Log';
+
+const notificationEventActionMap = {};
+
+/**
+ * Handle a push notification event, and trigger and bound actions.
+ *
+ * @param {String} eventType
+ * @param {Object} notification
+ */
+function pushNotificationEventCallback(eventType, notification) {
+    const actionMap = notificationEventActionMap[eventType] || {};
+    let payload = lodashGet(notification, 'extras.payload');
+
+    // On Android, some notification payloads are sent as a JSON string rather than an object
+    if (_.isString(payload)) {
+        payload = JSON.parse(payload);
+    }
+
+    Log.info(`[PushNotification] Callback triggered for ${eventType}`);
+
+    if (!payload) {
+        Log.warn('[PushNotification] Notification has null or undefined payload, not executing any callback.');
+        return;
+    }
+
+    if (!payload.type) {
+        Log.warn('[PushNotification] No type value provided in payload, not executing any callback.');
+        return;
+    }
+
+    const action = actionMap[payload.type];
+    if (!action) {
+        Log.warn('[PushNotification] No callback set up: ', {
+            event: eventType,
+            notificationType: payload.type,
+        });
+        return;
+    }
+    action(payload);
+}
+
+/**
+ * Bind a callback to a push notification of a given type.
+ * See https://github.com/Expensify/Web-Expensify/blob/main/lib/MobilePushNotifications.php for the various
+ * types of push notifications sent, along with the data that they provide.
+ *
+ * Note: This implementation allows for only one callback to be bound to an Event/Type pair. For example,
+ *       if we attempt to bind two callbacks to the PushReceived event for reportComment notifications,
+ *       the second will overwrite the first.
+ *
+ * @param {String} notificationType
+ * @param {Function} callback
+ * @param {String} [triggerEvent] - The event that should trigger this callback. Should be one of UrbanAirship.EventType
+ */
+function bind(notificationType, callback, triggerEvent) {
+    if (!notificationEventActionMap[triggerEvent]) {
+        notificationEventActionMap[triggerEvent] = {};
+    }
+    notificationEventActionMap[triggerEvent][notificationType] = callback;
+}
+
+/**
+ * Bind a callback to be executed when a push notification of a given type is received.
+ *
+ * @param {String} notificationType
+ * @param {Function} callback
+ */
+function onReceived(notificationType, callback) {
+    bind(notificationType, callback, EventType.PushReceived);
+}
+
+/**
+ * Bind a callback to be executed when a push notification of a given type is tapped by the user.
+ *
+ * @param {String} notificationType
+ * @param {Function} callback
+ */
+function onSelected(notificationType, callback) {
+    bind(notificationType, callback, EventType.NotificationResponse);
+}
+
+export {pushNotificationEventCallback, onReceived, onSelected};
diff --git a/src/libs/Notification/PushNotification/index.js b/src/libs/Notification/PushNotification/index.js
index 88136ff5dc72..b8475f50d11f 100644
--- a/src/libs/Notification/PushNotification/index.js
+++ b/src/libs/Notification/PushNotification/index.js
@@ -1,12 +1,7 @@
-import NotificationType from './NotificationType';
-
 // Push notifications are only supported on mobile, so we'll just noop here
 export default {
     init: () => {},
     register: () => {},
     deregister: () => {},
-    onReceived: () => {},
-    onSelected: () => {},
-    TYPE: NotificationType,
     clearNotifications: () => {},
 };
diff --git a/src/libs/Notification/PushNotification/index.native.js b/src/libs/Notification/PushNotification/index.native.js
index 3c868c41e6f4..475645bb9405 100644
--- a/src/libs/Notification/PushNotification/index.native.js
+++ b/src/libs/Notification/PushNotification/index.native.js
@@ -1,13 +1,11 @@
-import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import Airship, {EventType} from '@ua/react-native-airship';
-import lodashGet from 'lodash/get';
 import Log from '../../Log';
-import NotificationType from './NotificationType';
 import * as PushNotification from '../../actions/PushNotification';
 import ONYXKEYS from '../../../ONYXKEYS';
 import configureForegroundNotifications from './configureForegroundNotifications';
 import subscribeToReportCommentPushNotifications from './subscribeToReportCommentPushNotifications';
+import * as PushNotificationListener from './PushNotificationListener';
 
 let isUserOptedInToPushNotifications = false;
 Onyx.connect({
@@ -15,46 +13,6 @@ Onyx.connect({
     callback: (val) => (isUserOptedInToPushNotifications = val),
 });
 
-const notificationEventActionMap = {};
-
-/**
- * Handle a push notification event, and trigger and bound actions.
- *
- * @param {String} eventType
- * @param {Object} notification
- */
-function pushNotificationEventCallback(eventType, notification) {
-    const actionMap = notificationEventActionMap[eventType] || {};
-    let payload = lodashGet(notification, 'extras.payload');
-
-    // On Android, some notification payloads are sent as a JSON string rather than an object
-    if (_.isString(payload)) {
-        payload = JSON.parse(payload);
-    }
-
-    Log.info(`[PushNotification] Callback triggered for ${eventType}`);
-
-    if (!payload) {
-        Log.warn('[PushNotification] Notification has null or undefined payload, not executing any callback.');
-        return;
-    }
-
-    if (!payload.type) {
-        Log.warn('[PushNotification] No type value provided in payload, not executing any callback.');
-        return;
-    }
-
-    const action = actionMap[payload.type];
-    if (!action) {
-        Log.warn('[PushNotification] No callback set up: ', {
-            event: eventType,
-            notificationType: payload.type,
-        });
-        return;
-    }
-    action(payload);
-}
-
 /**
  * Check if a user is opted-in to push notifications on this device and update the `pushNotificationsEnabled` NVP accordingly.
  */
@@ -85,13 +43,13 @@ function init() {
             PushNotification.setPushNotificationOptInStatus(true);
         }
 
-        pushNotificationEventCallback(EventType.PushReceived, notification.pushPayload);
+        PushNotificationListener.pushNotificationEventCallback(EventType.PushReceived, notification.pushPayload);
     });
 
     // Note: the NotificationResponse event has a nested PushReceived event,
     // so event.notification refers to the same thing as notification above ^
     Airship.addListener(EventType.NotificationResponse, (event) => {
-        pushNotificationEventCallback(EventType.NotificationResponse, event.pushPayload);
+        PushNotificationListener.pushNotificationEventCallback(EventType.NotificationResponse, event.pushPayload);
     });
 
     // Keep track of which users have enabled push notifications via an NVP.
@@ -139,46 +97,6 @@ function deregister() {
     Airship.removeAllListeners(EventType.NotificationResponse);
 }
 
-/**
- * Bind a callback to a push notification of a given type.
- * See https://github.com/Expensify/Web-Expensify/blob/main/lib/MobilePushNotifications.php for the various
- * types of push notifications sent, along with the data that they provide.
- *
- * Note: This implementation allows for only one callback to be bound to an Event/Type pair. For example,
- *       if we attempt to bind two callbacks to the PushReceived event for reportComment notifications,
- *       the second will overwrite the first.
- *
- * @param {String} notificationType
- * @param {Function} callback
- * @param {String} [triggerEvent] - The event that should trigger this callback. Should be one of UrbanAirship.EventType
- */
-function bind(notificationType, callback, triggerEvent) {
-    if (!notificationEventActionMap[triggerEvent]) {
-        notificationEventActionMap[triggerEvent] = {};
-    }
-    notificationEventActionMap[triggerEvent][notificationType] = callback;
-}
-
-/**
- * Bind a callback to be executed when a push notification of a given type is received.
- *
- * @param {String} notificationType
- * @param {Function} callback
- */
-function onReceived(notificationType, callback) {
-    bind(notificationType, callback, EventType.PushReceived);
-}
-
-/**
- * Bind a callback to be executed when a push notification of a given type is tapped by the user.
- *
- * @param {String} notificationType
- * @param {Function} callback
- */
-function onSelected(notificationType, callback) {
-    bind(notificationType, callback, EventType.NotificationResponse);
-}
-
 /**
  * Clear all push notifications
  */
@@ -212,8 +130,5 @@ export default {
     init,
     register,
     deregister,
-    onReceived,
-    onSelected,
-    TYPE: NotificationType,
     clearNotifications,
 };
diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
index a36fef610a39..2316fda06904 100644
--- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
+++ b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
@@ -1,5 +1,6 @@
 import Onyx from 'react-native-onyx';
-import PushNotification from '.';
+import NotificationType from './NotificationType';
+import * as PushNotificationListener from './PushNotificationListener';
 import ROUTES from '../../../ROUTES';
 import Log from '../../Log';
 import Navigation from '../../Navigation/Navigation';
@@ -10,14 +11,14 @@ import backgroundRefresh from './backgroundRefresh';
  * Setup reportComment push notification callbacks.
  */
 export default function subscribeToReportCommentPushNotifications() {
-    PushNotification.onReceived(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID, onyxData}) => {
+    PushNotificationListener.onReceived(NotificationType.REPORT_COMMENT, ({reportID, reportActionID, onyxData}) => {
         Log.info(`[PushNotification] received report comment notification in the ${Visibility.isVisible() ? 'foreground' : 'background'}`, false, {reportID, reportActionID});
         Onyx.update(onyxData);
         backgroundRefresh();
     });
 
     // Open correct report when push notification is clicked
-    PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID}) => {
+    PushNotificationListener.onSelected(NotificationType.REPORT_COMMENT, ({reportID, reportActionID}) => {
         if (!reportID) {
             Log.warn('[PushNotification] This push notification has no reportID');
         }

From f26ca2d569ee7b8020cb3a4d39b2b3ae32a119f3 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 21 Aug 2023 08:11:26 +0700
Subject: [PATCH 106/214] remove test pushnotification in session test

---
 tests/actions/SessionTest.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js
index 506279421e7e..18db5783ed41 100644
--- a/tests/actions/SessionTest.js
+++ b/tests/actions/SessionTest.js
@@ -5,16 +5,12 @@ import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as TestHelper from '../utils/TestHelper';
 import CONST from '../../src/CONST';
-import PushNotification from '../../src/libs/Notification/PushNotification';
 import * as App from '../../src/libs/actions/App';
 
 // We are mocking this method so that we can later test to see if it was called and what arguments it was called with.
 // We test HttpUtils.xhr() since this means that our API command turned into a network request and isn't only queued.
 HttpUtils.xhr = jest.fn();
 
-// Mocked to ensure push notifications are subscribed/unsubscribed as the session changes
-jest.mock('../../src/libs/Notification/PushNotification');
-
 Onyx.init({
     keys: ONYXKEYS,
     registerStorageEventListener: () => {},
@@ -89,11 +85,4 @@ describe('Session', () => {
                 expect(session.authToken).toBe(TEST_REFRESHED_AUTH_TOKEN);
             });
     });
-
-    test('Push notifications are subscribed after signing in', () => TestHelper.signInWithTestUser().then(() => expect(PushNotification.register).toBeCalled()));
-
-    test('Push notifications are unsubscribed after signing out', () =>
-        TestHelper.signInWithTestUser()
-            .then(TestHelper.signOutTestUser)
-            .then(() => expect(PushNotification.deregister).toBeCalled()));
 });

From 453ff522c8abc9d61ab6eb99f2c99c3d0fb21f69 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 21 Aug 2023 13:29:14 +0300
Subject: [PATCH 107/214] Remove duplicate demo page setup

---
 src/ROUTES.js                                     | 1 -
 src/languages/en.js                               | 1 -
 src/languages/es.js                               | 1 -
 src/libs/Navigation/AppNavigator/PublicScreens.js | 6 ------
 src/libs/Navigation/linkingConfig.js              | 1 -
 5 files changed, 10 deletions(-)

diff --git a/src/ROUTES.js b/src/ROUTES.js
index 0d82ec8383c2..d2a9884cfacf 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -25,7 +25,6 @@ export default {
         return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`;
     },
     HOME: '',
-    SAASTR_HOME: 'saastr',
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',
     SETTINGS_SHARE_CODE: 'settings/shareCode',
diff --git a/src/languages/en.js b/src/languages/en.js
index 3fd2a2e1904e..1929cf3c36a8 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -248,7 +248,6 @@ export default {
         hero: {
             header: 'Split bills, request payments, and chat with friends.',
             body: 'Welcome to the future of Expensify, your new go-to place for financial collaboration with friends and teammates alike.',
-            demoHeadline: 'Welcome to SaaStr! Hop in to start networking now.',
         },
     },
     thirdPartySignIn: {
diff --git a/src/languages/es.js b/src/languages/es.js
index bf1a9014e000..01422e0658f2 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -247,7 +247,6 @@ export default {
         hero: {
             header: 'Divida las facturas, solicite pagos y chatee con sus amigos.',
             body: 'Bienvenido al futuro de Expensify, tu nuevo lugar de referencia para la colaboración financiera con amigos y compañeros de equipo por igual.',
-            demoHeadline: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
         },
     },
     thirdPartySignIn: {
diff --git a/src/libs/Navigation/AppNavigator/PublicScreens.js b/src/libs/Navigation/AppNavigator/PublicScreens.js
index e78e3179d4ac..7a87530a2d9e 100644
--- a/src/libs/Navigation/AppNavigator/PublicScreens.js
+++ b/src/libs/Navigation/AppNavigator/PublicScreens.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {createStackNavigator} from '@react-navigation/stack';
 import SignInPage from '../../../pages/signin/SignInPage';
-import DemoSetupPage from '../../../pages/signin/DemoSetupPage';
 import ValidateLoginPage from '../../../pages/ValidateLoginPage';
 import LogInWithShortLivedAuthTokenPage from '../../../pages/LogInWithShortLivedAuthTokenPage';
 import SCREENS from '../../../SCREENS';
@@ -20,11 +19,6 @@ function PublicScreens() {
                 options={defaultScreenOptions}
                 component={SignInPage}
             />
-            <RootStack.Screen
-                name="SaaStrHome"
-                options={defaultScreenOptions}
-                component={DemoSetupPage}
-            />
             <RootStack.Screen
                 name={SCREENS.TRANSITION_BETWEEN_APPS}
                 options={defaultScreenOptions}
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index ca5cfcef0480..a3a5ce902c69 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -17,7 +17,6 @@ export default {
             GoogleSignInDesktop: ROUTES.GOOGLE_SIGN_IN,
             DesktopSignInRedirect: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
             [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS,
-            SaaStrHome: ROUTES.SAASTR_HOME,
 
             // Sidebar
             [SCREENS.HOME]: {

From 1f97101b7a082242bcdcb96d4cd94c017d48ced3 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 21 Aug 2023 14:43:03 +0300
Subject: [PATCH 108/214] Add similar SBE demo workflow

---
 .env.example                                          |  1 +
 src/CONST.js                                          |  7 +++++++
 src/ROUTES.js                                         |  1 +
 src/languages/en.js                                   |  3 +++
 src/languages/es.js                                   |  3 +++
 .../AppNavigator/Navigators/CentralPaneNavigator.js   |  8 ++++++++
 src/libs/Navigation/linkingConfig.js                  |  1 +
 src/libs/actions/App.js                               | 11 +++++++++++
 src/libs/actions/DemoActions.js                       |  9 ++++++++-
 src/pages/DemoSetupPage.js                            |  2 ++
 10 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index d3bc11ec3024..601813eeab98 100644
--- a/.env.example
+++ b/.env.example
@@ -27,5 +27,6 @@ EXPENSIFY_ACCOUNT_ID_QA_TRAVIS=-1
 EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
 EXPENSIFY_ACCOUNT_ID_REWARDS=-1
 EXPENSIFY_ACCOUNT_ID_SAASTR=-1
+EXPENSIFY_ACCOUNT_ID_SBE=-1
 EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
 EXPENSIFY_ACCOUNT_ID_SVFG=-1
diff --git a/src/CONST.js b/src/CONST.js
index 9205c9fe374a..261b0528b3f9 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -860,6 +860,7 @@ const CONST = {
         QA_TRAVIS: 'qa+travisreceipts@expensify.com',
         RECEIPTS: 'receipts@expensify.com',
         SAASTR: 'saastr@expensify.com',
+        SBE: 'sbe@expensify.com',
         STUDENT_AMBASSADOR: 'studentambassadors@expensify.com',
         SVFG: 'svfg@expensify.com',
     },
@@ -880,6 +881,7 @@ const CONST = {
         RECEIPTS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_RECEIPTS', -1)),
         REWARDS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_REWARDS', 11023767)), // rewards@expensify.com
         SAASTR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SAASTR', 15252830)),
+        SBE: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SBE', -1)), // TODO: replace with prod account ID
         STUDENT_AMBASSADOR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR', 10476956)),
         SVFG: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SVFG', 2012843)),
     },
@@ -1211,6 +1213,8 @@ const CONST = {
             this.EMAIL.QA,
             this.EMAIL.QA_TRAVIS,
             this.EMAIL.RECEIPTS,
+            this.EMAIL.SAASTR,
+            this.EMAIL.SBE,
             this.EMAIL.STUDENT_AMBASSADOR,
             this.EMAIL.SVFG,
         ];
@@ -1231,6 +1235,8 @@ const CONST = {
             this.ACCOUNT_ID.QA_TRAVIS,
             this.ACCOUNT_ID.RECEIPTS,
             this.ACCOUNT_ID.REWARDS,
+            this.ACCOUNT_ID.SAASTR,
+            this.ACCOUNT_ID.SBE,
             this.ACCOUNT_ID.STUDENT_AMBASSADOR,
             this.ACCOUNT_ID.SVFG,
         ];
@@ -2568,6 +2574,7 @@ const CONST = {
     },
     DEMO_PAGES: {
         SAASTR: 'SaaStrDemoSetup',
+        SBE: 'SbeDemoSetup',
     },
 };
 
diff --git a/src/ROUTES.js b/src/ROUTES.js
index d2a9884cfacf..0aae086522fa 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -183,6 +183,7 @@ export default {
 
     // These are some on-off routes that will be removed once they're no longer needed (see GH issues for details)
     SAASTR: 'saastr',
+    SBE: 'sbe',
 
     /**
      * @param {String} route
diff --git a/src/languages/en.js b/src/languages/en.js
index 1929cf3c36a8..9b5f5d2fecc1 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1626,5 +1626,8 @@ export default {
         saastr: {
             signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
         },
+        sbe: {
+            signInWelcome: 'Welcome to Small Business Expo! Get paid back for your ride.',
+        },
     },
 };
diff --git a/src/languages/es.js b/src/languages/es.js
index 01422e0658f2..15f1d22fa2a6 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -2113,5 +2113,8 @@ export default {
         saastr: {
             signInWelcome: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
         },
+        sbe: {
+            signInWelcome: '¡Bienvenido a Small Business Expo! Recupera el dinero de tu viaje.',
+        },
     },
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
index 47880ba14470..f685497e477b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator.js
@@ -38,6 +38,14 @@ function CentralPaneNavigator() {
                     }}
                     component={DemoSetupPage}
                 />
+                <Stack.Screen
+                    name={CONST.DEMO_PAGES.SBE}
+                    options={{
+                        headerShown: false,
+                        title: 'New Expensify',
+                    }}
+                    component={DemoSetupPage}
+                />
             </Stack.Navigator>
         </FreezeWrapper>
     );
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index a3a5ce902c69..a0e394dd3863 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -27,6 +27,7 @@ export default {
                 screens: {
                     [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID,
                     [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR,
+                    [CONST.DEMO_PAGES.SBE]: ROUTES.SBE,
                 },
             },
             [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: {
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 954d8470a146..37d3597df494 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -470,12 +470,23 @@ function beginDeepLinkRedirectAfterTransition(shouldAuthenticateWithCurrentAccou
  * @param {String} url - URL user is navigating to via deep link (or regular link in web)
  */
 function runDemoByURL(url = '') {
+    if (!url) {
+        url = '';
+    }
+    url = url.toLowerCase();
+
     if (url.endsWith(ROUTES.SAASTR)) {
         Onyx.merge(ONYXKEYS.DEMO_INFO, {
             saastr: {
                 isBeginningDemo: true,
             },
         });
+    } else if (url.endsWith(ROUTES.SBE)) {
+        Onyx.merge(ONYXKEYS.DEMO_INFO, {
+            sbe: {
+                isBeginningDemo: true,
+            },
+        });
     } else {
         // No demo is being run, so clear out demo info
         Onyx.set(ONYXKEYS.DEMO_INFO, null);
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 094d74402f1a..1686ddd15954 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -32,6 +32,10 @@ Onyx.connect({
     },
 });
 
+function createSbeDemoWorkspaceAndNavigate() {
+    // TODO: reuse lots of code
+}
+
 function createSaastrDemoWorkspaceAndNavigate() {
     // Try to navigate to existing SaaStr expense chat if it exists in Onyx
     const saastrWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(CONST.EMAIL.SAASTR);
@@ -243,4 +247,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
     Navigation.navigate(ROUTES.getReportRoute(expenseChatReportID));
 }
 
-export {createSaastrDemoWorkspaceAndNavigate};
+export {
+    createSaastrDemoWorkspaceAndNavigate,
+    createSbeDemoWorkspaceAndNavigate,
+};
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index 5bf9a6a68f2f..f79a5b880b28 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -26,6 +26,8 @@ function DemoSetupPage(props) {
         // Depending on the route that the user hit to get here, run a specific demo flow
         if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
             DemoActions.createSaastrDemoWorkspaceAndNavigate();
+        } else if (props.route.name === CONST.DEMO_PAGES.SBE) {
+            DemoActions.createSbeDemoWorkspaceAndNavigate();
         }
     });
 

From db90ed0254bde7c3e4ef1dc5dbe1e712ebf11a7a Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Mon, 21 Aug 2023 15:17:30 +0300
Subject: [PATCH 109/214] Refactor for new SBE flow

---
 src/libs/actions/DemoActions.js | 107 ++++++++++++++++++++------------
 src/pages/DemoSetupPage.js      |   7 ++-
 2 files changed, 74 insertions(+), 40 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 1686ddd15954..e65b440e255e 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -32,29 +32,33 @@ Onyx.connect({
     },
 });
 
-function createSbeDemoWorkspaceAndNavigate() {
-    // TODO: reuse lots of code
-}
-
-function createSaastrDemoWorkspaceAndNavigate() {
-    // Try to navigate to existing SaaStr expense chat if it exists in Onyx
-    const saastrWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(CONST.EMAIL.SAASTR);
-    if (saastrWorkspaceChatReportID) {
-        // We must call goBack() to remove the /saastr route from history
+/**
+ * @param {String} workspaceOwnerEmail email of the workspace owner
+ * @param {String} workspaceName
+ * @param {String} welcomeNoteText
+ * @param {Number} adminAccountID
+ * @param {String} apiCommand
+ */
+function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, workspaceName, welcomeNoteText, adminAccountID, apiCommand) {
+    // If we don't have a command name to call, just go back so the user is navigated home
+    if (!apiCommand) {
+        Navigation.goBack();
+        return;
+    }
+    
+    // Try to navigate to existing demo workspace expense chat if it exists in Onyx
+    const demoWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(workspaceOwnerEmail);
+    if (demoWorkspaceChatReportID) {
+        // We must call goBack() to remove the demo route from nav history
         Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(saastrWorkspaceChatReportID));
+        Navigation.navigate(ROUTES.getReportRoute(demoWorkspaceChatReportID));
         return;
     }
 
-    // Create workspace, owned and admin'd by SaaStr
+    // Create workspace, owned and admin'd by passed email
     const policyID = Policy.generatePolicyID();
-
-    // Add domain name as prefix (only if domain is private)
-    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
-    const workspaceName = `${domainNamePrefix}SaaStr Workspace`;
-
+    
     const {customUnits, customUnitID, customUnitRateID} = Policy.buildOptimisticCustomUnits();
-
     const {
         announceChatReportID,
         announceChatData,
@@ -67,33 +71,24 @@ function createSaastrDemoWorkspaceAndNavigate() {
     } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
 
     // Add optimistic invite message comment
-    const initialMessageText = `
-    Welcome to NewExpensify, who wants $20?
-
-    To scan the receipt and get paid:
-    1. Click the +
-    2. Click Request Money.
-    3. Take a photo of the receipt, we'll automatically enter all the info.
-    4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!
-    `;
-    const welcomeMessageReportAction = ReportUtils.buildOptimisticAddCommentReportAction(initialMessageText);
-    welcomeMessageReportAction.reportAction.actorAccountID = CONST.ACCOUNT_ID.SAASTR;
-    welcomeMessageReportAction.reportAction.person[0].text = 'SaaStr 2023';
+    const welcomeMessageReportAction = ReportUtils.buildOptimisticAddCommentReportAction(welcomeNoteText);
+    welcomeMessageReportAction.reportAction.actorAccountID = adminAccountID;
+    welcomeMessageReportAction.reportAction.person[0].text = '';
     welcomeMessageReportAction.reportAction.avatar = '';
 
-    // Update policy expense chat report actions with welcome message from saastr
+    // Update policy expense chat report actions with welcome message
     const expenseChatWelcomeReportActionID = welcomeMessageReportAction.reportAction.reportActionID;
     expenseReportActionData[expenseChatWelcomeReportActionID] = welcomeMessageReportAction.reportAction;
 
     // Update report with info about last message sent
     const currentTime = DateUtils.getDBTime();
     expenseChatData.lastVisibleActionCreated = currentTime;
-    expenseChatData.lastMessageText = initialMessageText;
-    expenseChatData.lastActorAccountID = CONST.ACCOUNT_ID.SAASTR;
+    expenseChatData.lastMessageText = welcomeNoteText.replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
+    expenseChatData.lastActorAccountID = adminAccountID;
     expenseChatData.lastReadTime = currentTime;
 
     API.write(
-        'CreateSaastrDemoWorkspace',
+        apiCommand,
         {
             policyID,
             announceChatReportID,
@@ -115,7 +110,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
                         type: CONST.POLICY.TYPE.FREE,
                         name: workspaceName,
                         role: CONST.POLICY.ROLE.USER,
-                        owner: CONST.EMAIL.SAASTR,
+                        owner: workspaceOwnerEmail,
                         outputCurrency: CONST.CURRENCY.USD,
                         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                         customUnits,
@@ -129,7 +124,7 @@ function createSaastrDemoWorkspaceAndNavigate() {
                             role: CONST.POLICY.ROLE.USER,
                             errors: {},
                         },
-                        [CONST.ACCOUNT_ID.SAASTR]: {
+                        [adminAccountID]: {
                             role: CONST.POLICY.ROLE.ADMIN,
                             errors: {},
                         },
@@ -242,12 +237,48 @@ function createSaastrDemoWorkspaceAndNavigate() {
     );
 
     // Navigate to the new workspace chat report
-    // We must call goBack() to remove the /saastr route from history
+    // We must call goBack() to remove the demo route from history
     Navigation.goBack();
     Navigation.navigate(ROUTES.getReportRoute(expenseChatReportID));
 }
 
+function runSbeDemo() {
+    // Add domain name as prefix (only if domain is private)
+    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
+    const workspaceName = `${domainNamePrefix}SBE Workspace`;
+
+    const welcomeNoteText = `
+    Thanks for testing out New Expensify!
+    
+    Get paid back for your journey to or from Small Business Expo, whether you're driving yourself or catching a ride:
+    
+    1. Click the "+" > Request money > Distance.
+    2. Enter your start and end addresses.
+    3. Get paid back at the IRS mileage rate of $0.655/mile!
+    
+    Note: Must submit by Thursday, September 7th, 2023. One reimbursement per person.`;
+
+    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, workspaceName, welcomeNoteText, CONST.ACCOUNT_ID.SBE, '');
+}
+
+function runSaastrDemo() {
+    // Add domain name as prefix (only if domain is private)
+    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
+    const workspaceName = `${domainNamePrefix}SaaStr Workspace`;
+
+    const welcomeNoteText = `
+    Welcome to NewExpensify, who wants $20?
+
+    To scan the receipt and get paid:
+    1. Click the +
+    2. Click Request Money.
+    3. Take a photo of the receipt, we'll automatically enter all the info.
+    4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!`;
+
+    createDemoWorkspaceAndNavigate(CONST.EMAIL.SAASTR, workspaceName, welcomeNoteText, CONST.ACCOUNT_ID.SAASTR, 'CreateSaastrDemoWorkspace');
+}
+
 export {
-    createSaastrDemoWorkspaceAndNavigate,
-    createSbeDemoWorkspaceAndNavigate,
+    runSaastrDemo,
+    runSbeDemo,
 };
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index f79a5b880b28..69fad6493608 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -6,6 +6,7 @@ import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import CONST from '../CONST';
 import * as DemoActions from '../libs/actions/DemoActions';
+import * as Navigation from '../libs/Navigation/Navigation';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -25,9 +26,11 @@ function DemoSetupPage(props) {
     useFocusEffect(() => {
         // Depending on the route that the user hit to get here, run a specific demo flow
         if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
-            DemoActions.createSaastrDemoWorkspaceAndNavigate();
+            DemoActions.runSaastrDemo();
         } else if (props.route.name === CONST.DEMO_PAGES.SBE) {
-            DemoActions.createSbeDemoWorkspaceAndNavigate();
+            DemoActions.runSbeDemo();
+        } else {
+            Navigation.goBack();
         }
     });
 

From b8925d9baa713fcd16f4f5d2bba61db59bc64b03 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 21 Aug 2023 22:07:04 +0700
Subject: [PATCH 110/214] refactor file lib notification

---
 src/Expensify.js                              |   2 +
 .../PushNotificationListener.js               |  86 --------------
 .../Notification/PushNotification/index.js    |   5 +
 .../PushNotification/index.native.js          | 112 ++++++++++++++----
 .../subscribePushNotification/index.js        |  26 ++++
 ...bscribeToReportCommentPushNotifications.js |   7 +-
 6 files changed, 123 insertions(+), 115 deletions(-)
 delete mode 100644 src/libs/Notification/PushNotification/PushNotificationListener.js
 create mode 100644 src/libs/Notification/PushNotification/subscribePushNotification/index.js

diff --git a/src/Expensify.js b/src/Expensify.js
index 41176ab779d4..d5455ca9db71 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -35,6 +35,8 @@ import DeeplinkWrapper from './components/DeeplinkWrapper';
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 // eslint-disable-next-line no-unused-vars
 import UnreadIndicatorUpdater from './libs/UnreadIndicatorUpdater';
+// eslint-disable-next-line no-unused-vars
+import subscribePushNotification from './libs/Notification/PushNotification/subscribePushNotification';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
diff --git a/src/libs/Notification/PushNotification/PushNotificationListener.js b/src/libs/Notification/PushNotification/PushNotificationListener.js
deleted file mode 100644
index 4054d149607a..000000000000
--- a/src/libs/Notification/PushNotification/PushNotificationListener.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import {EventType} from '@ua/react-native-airship';
-import lodashGet from 'lodash/get';
-import _ from 'underscore';
-import Log from '../../Log';
-
-const notificationEventActionMap = {};
-
-/**
- * Handle a push notification event, and trigger and bound actions.
- *
- * @param {String} eventType
- * @param {Object} notification
- */
-function pushNotificationEventCallback(eventType, notification) {
-    const actionMap = notificationEventActionMap[eventType] || {};
-    let payload = lodashGet(notification, 'extras.payload');
-
-    // On Android, some notification payloads are sent as a JSON string rather than an object
-    if (_.isString(payload)) {
-        payload = JSON.parse(payload);
-    }
-
-    Log.info(`[PushNotification] Callback triggered for ${eventType}`);
-
-    if (!payload) {
-        Log.warn('[PushNotification] Notification has null or undefined payload, not executing any callback.');
-        return;
-    }
-
-    if (!payload.type) {
-        Log.warn('[PushNotification] No type value provided in payload, not executing any callback.');
-        return;
-    }
-
-    const action = actionMap[payload.type];
-    if (!action) {
-        Log.warn('[PushNotification] No callback set up: ', {
-            event: eventType,
-            notificationType: payload.type,
-        });
-        return;
-    }
-    action(payload);
-}
-
-/**
- * Bind a callback to a push notification of a given type.
- * See https://github.com/Expensify/Web-Expensify/blob/main/lib/MobilePushNotifications.php for the various
- * types of push notifications sent, along with the data that they provide.
- *
- * Note: This implementation allows for only one callback to be bound to an Event/Type pair. For example,
- *       if we attempt to bind two callbacks to the PushReceived event for reportComment notifications,
- *       the second will overwrite the first.
- *
- * @param {String} notificationType
- * @param {Function} callback
- * @param {String} [triggerEvent] - The event that should trigger this callback. Should be one of UrbanAirship.EventType
- */
-function bind(notificationType, callback, triggerEvent) {
-    if (!notificationEventActionMap[triggerEvent]) {
-        notificationEventActionMap[triggerEvent] = {};
-    }
-    notificationEventActionMap[triggerEvent][notificationType] = callback;
-}
-
-/**
- * Bind a callback to be executed when a push notification of a given type is received.
- *
- * @param {String} notificationType
- * @param {Function} callback
- */
-function onReceived(notificationType, callback) {
-    bind(notificationType, callback, EventType.PushReceived);
-}
-
-/**
- * Bind a callback to be executed when a push notification of a given type is tapped by the user.
- *
- * @param {String} notificationType
- * @param {Function} callback
- */
-function onSelected(notificationType, callback) {
-    bind(notificationType, callback, EventType.NotificationResponse);
-}
-
-export {pushNotificationEventCallback, onReceived, onSelected};
diff --git a/src/libs/Notification/PushNotification/index.js b/src/libs/Notification/PushNotification/index.js
index b8475f50d11f..88136ff5dc72 100644
--- a/src/libs/Notification/PushNotification/index.js
+++ b/src/libs/Notification/PushNotification/index.js
@@ -1,7 +1,12 @@
+import NotificationType from './NotificationType';
+
 // Push notifications are only supported on mobile, so we'll just noop here
 export default {
     init: () => {},
     register: () => {},
     deregister: () => {},
+    onReceived: () => {},
+    onSelected: () => {},
+    TYPE: NotificationType,
     clearNotifications: () => {},
 };
diff --git a/src/libs/Notification/PushNotification/index.native.js b/src/libs/Notification/PushNotification/index.native.js
index 475645bb9405..299af69873f9 100644
--- a/src/libs/Notification/PushNotification/index.native.js
+++ b/src/libs/Notification/PushNotification/index.native.js
@@ -1,11 +1,12 @@
+import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import Airship, {EventType} from '@ua/react-native-airship';
+import lodashGet from 'lodash/get';
 import Log from '../../Log';
+import NotificationType from './NotificationType';
 import * as PushNotification from '../../actions/PushNotification';
 import ONYXKEYS from '../../../ONYXKEYS';
 import configureForegroundNotifications from './configureForegroundNotifications';
-import subscribeToReportCommentPushNotifications from './subscribeToReportCommentPushNotifications';
-import * as PushNotificationListener from './PushNotificationListener';
 
 let isUserOptedInToPushNotifications = false;
 Onyx.connect({
@@ -13,6 +14,46 @@ Onyx.connect({
     callback: (val) => (isUserOptedInToPushNotifications = val),
 });
 
+const notificationEventActionMap = {};
+
+/**
+ * Handle a push notification event, and trigger and bound actions.
+ *
+ * @param {String} eventType
+ * @param {Object} notification
+ */
+function pushNotificationEventCallback(eventType, notification) {
+    const actionMap = notificationEventActionMap[eventType] || {};
+    let payload = lodashGet(notification, 'extras.payload');
+
+    // On Android, some notification payloads are sent as a JSON string rather than an object
+    if (_.isString(payload)) {
+        payload = JSON.parse(payload);
+    }
+
+    Log.info(`[PushNotification] Callback triggered for ${eventType}`);
+
+    if (!payload) {
+        Log.warn('[PushNotification] Notification has null or undefined payload, not executing any callback.');
+        return;
+    }
+
+    if (!payload.type) {
+        Log.warn('[PushNotification] No type value provided in payload, not executing any callback.');
+        return;
+    }
+
+    const action = actionMap[payload.type];
+    if (!action) {
+        Log.warn('[PushNotification] No callback set up: ', {
+            event: eventType,
+            notificationType: payload.type,
+        });
+        return;
+    }
+    action(payload);
+}
+
 /**
  * Check if a user is opted-in to push notifications on this device and update the `pushNotificationsEnabled` NVP accordingly.
  */
@@ -43,13 +84,13 @@ function init() {
             PushNotification.setPushNotificationOptInStatus(true);
         }
 
-        PushNotificationListener.pushNotificationEventCallback(EventType.PushReceived, notification.pushPayload);
+        pushNotificationEventCallback(EventType.PushReceived, notification.pushPayload);
     });
 
     // Note: the NotificationResponse event has a nested PushReceived event,
     // so event.notification refers to the same thing as notification above ^
     Airship.addListener(EventType.NotificationResponse, (event) => {
-        PushNotificationListener.pushNotificationEventCallback(EventType.NotificationResponse, event.pushPayload);
+        pushNotificationEventCallback(EventType.NotificationResponse, event.pushPayload);
     });
 
     // Keep track of which users have enabled push notifications via an NVP.
@@ -98,37 +139,58 @@ function deregister() {
 }
 
 /**
- * Clear all push notifications
+ * Bind a callback to a push notification of a given type.
+ * See https://github.com/Expensify/Web-Expensify/blob/main/lib/MobilePushNotifications.php for the various
+ * types of push notifications sent, along with the data that they provide.
+ *
+ * Note: This implementation allows for only one callback to be bound to an Event/Type pair. For example,
+ *       if we attempt to bind two callbacks to the PushReceived event for reportComment notifications,
+ *       the second will overwrite the first.
+ *
+ * @param {String} notificationType
+ * @param {Function} callback
+ * @param {String} [triggerEvent] - The event that should trigger this callback. Should be one of UrbanAirship.EventType
  */
-function clearNotifications() {
-    Airship.push.clearNotifications();
+function bind(notificationType, callback, triggerEvent) {
+    if (!notificationEventActionMap[triggerEvent]) {
+        notificationEventActionMap[triggerEvent] = {};
+    }
+    notificationEventActionMap[triggerEvent][notificationType] = callback;
 }
 
 /**
- * Manage push notification subscriptions on sign-in/sign-out.
+ * Bind a callback to be executed when a push notification of a given type is received.
  *
- * On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
- * push subscription when the session changes here.
+ * @param {String} notificationType
+ * @param {Function} callback
  */
-Onyx.connect({
-    key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
-    callback: (notificationID) => {
-        if (notificationID) {
-            register(notificationID);
-
-            // Prevent issue where report linking fails after users switch accounts without closing the app
-            init();
-            subscribeToReportCommentPushNotifications();
-        } else {
-            deregister();
-            clearNotifications();
-        }
-    },
-});
+function onReceived(notificationType, callback) {
+    bind(notificationType, callback, EventType.PushReceived);
+}
+
+/**
+ * Bind a callback to be executed when a push notification of a given type is tapped by the user.
+ *
+ * @param {String} notificationType
+ * @param {Function} callback
+ */
+function onSelected(notificationType, callback) {
+    bind(notificationType, callback, EventType.NotificationResponse);
+}
+
+/**
+ * Clear all push notifications
+ */
+function clearNotifications() {
+    Airship.push.clearNotifications();
+}
 
 export default {
     init,
     register,
     deregister,
+    onReceived,
+    onSelected,
+    TYPE: NotificationType,
     clearNotifications,
 };
diff --git a/src/libs/Notification/PushNotification/subscribePushNotification/index.js b/src/libs/Notification/PushNotification/subscribePushNotification/index.js
new file mode 100644
index 000000000000..45dc8d8a7ae9
--- /dev/null
+++ b/src/libs/Notification/PushNotification/subscribePushNotification/index.js
@@ -0,0 +1,26 @@
+import Onyx from 'react-native-onyx';
+import PushNotification from '..';
+import subscribeToReportCommentPushNotifications from '../subscribeToReportCommentPushNotifications';
+import ONYXKEYS from '../../../../ONYXKEYS';
+
+/**
+ * Manage push notification subscriptions on sign-in/sign-out.
+ *
+ * On Android, AuthScreens unmounts when the app is closed with the back button so we manage the
+ * push subscription when the session changes here.
+ */
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
+    callback: (notificationID) => {
+        if (notificationID) {
+            PushNotification.register(notificationID);
+
+            // Prevent issue where report linking fails after users switch accounts without closing the app
+            PushNotification.init();
+            subscribeToReportCommentPushNotifications();
+        } else {
+            PushNotification.deregister();
+            PushNotification.clearNotifications();
+        }
+    },
+});
diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
index 2316fda06904..a36fef610a39 100644
--- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
+++ b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
@@ -1,6 +1,5 @@
 import Onyx from 'react-native-onyx';
-import NotificationType from './NotificationType';
-import * as PushNotificationListener from './PushNotificationListener';
+import PushNotification from '.';
 import ROUTES from '../../../ROUTES';
 import Log from '../../Log';
 import Navigation from '../../Navigation/Navigation';
@@ -11,14 +10,14 @@ import backgroundRefresh from './backgroundRefresh';
  * Setup reportComment push notification callbacks.
  */
 export default function subscribeToReportCommentPushNotifications() {
-    PushNotificationListener.onReceived(NotificationType.REPORT_COMMENT, ({reportID, reportActionID, onyxData}) => {
+    PushNotification.onReceived(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID, onyxData}) => {
         Log.info(`[PushNotification] received report comment notification in the ${Visibility.isVisible() ? 'foreground' : 'background'}`, false, {reportID, reportActionID});
         Onyx.update(onyxData);
         backgroundRefresh();
     });
 
     // Open correct report when push notification is clicked
-    PushNotificationListener.onSelected(NotificationType.REPORT_COMMENT, ({reportID, reportActionID}) => {
+    PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID}) => {
         if (!reportID) {
             Log.warn('[PushNotification] This push notification has no reportID');
         }

From e08d1862e9bacd62ff207b98b17921408f104ba8 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 21 Aug 2023 23:23:54 +0700
Subject: [PATCH 111/214] revert unit test

---
 tests/actions/SessionTest.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js
index 18db5783ed41..506279421e7e 100644
--- a/tests/actions/SessionTest.js
+++ b/tests/actions/SessionTest.js
@@ -5,12 +5,16 @@ import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as TestHelper from '../utils/TestHelper';
 import CONST from '../../src/CONST';
+import PushNotification from '../../src/libs/Notification/PushNotification';
 import * as App from '../../src/libs/actions/App';
 
 // We are mocking this method so that we can later test to see if it was called and what arguments it was called with.
 // We test HttpUtils.xhr() since this means that our API command turned into a network request and isn't only queued.
 HttpUtils.xhr = jest.fn();
 
+// Mocked to ensure push notifications are subscribed/unsubscribed as the session changes
+jest.mock('../../src/libs/Notification/PushNotification');
+
 Onyx.init({
     keys: ONYXKEYS,
     registerStorageEventListener: () => {},
@@ -85,4 +89,11 @@ describe('Session', () => {
                 expect(session.authToken).toBe(TEST_REFRESHED_AUTH_TOKEN);
             });
     });
+
+    test('Push notifications are subscribed after signing in', () => TestHelper.signInWithTestUser().then(() => expect(PushNotification.register).toBeCalled()));
+
+    test('Push notifications are unsubscribed after signing out', () =>
+        TestHelper.signInWithTestUser()
+            .then(TestHelper.signOutTestUser)
+            .then(() => expect(PushNotification.deregister).toBeCalled()));
 });

From e0bbb618c37f12e375e520ed106658328cb81a8f Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Mon, 21 Aug 2023 18:35:45 +0200
Subject: [PATCH 112/214] grammar fixes

---
 src/components/CategoryPicker/categoryPickerPropTypes.js | 2 +-
 src/components/categoryPropTypes.js                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index 555a1e3356b5..f59b5d40d5c3 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -5,7 +5,7 @@ const propTypes = {
     /** The report ID of the IOU */
     reportID: PropTypes.string.isRequired,
 
-    /** The policyID of we are getting categories */
+    /** The policyID we are getting categories for */
     policyID: PropTypes.string,
 
     /** The type of IOU report, i.e. bill, request, send */
diff --git a/src/components/categoryPropTypes.js b/src/components/categoryPropTypes.js
index 6320791554e4..4b4b4e547c71 100644
--- a/src/components/categoryPropTypes.js
+++ b/src/components/categoryPropTypes.js
@@ -4,6 +4,6 @@ export default PropTypes.shape({
     /** Name of a category */
     name: PropTypes.string.isRequired,
 
-    /** Flag that determine is a category active */
+    /** Flag that determines if a category is active */
     enabled: PropTypes.bool.isRequired,
 });

From c78eea15d09b4f41bde8b6710440f1453c12b214 Mon Sep 17 00:00:00 2001
From: Pluto0104 <fed.dev.pluto@gmail.com>
Date: Mon, 21 Aug 2023 09:46:43 -0700
Subject: [PATCH 113/214] updated alphabetic and latin letter regex

---
 src/CONST.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index a0c6cbf2bcf3..ad7e51eef896 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -1107,8 +1107,8 @@ const CONST = {
     REGEX: {
         SPECIAL_CHARS_WITHOUT_NEWLINE: /((?!\n)[()-\s\t])/g,
         DIGITS_AND_PLUS: /^\+?[0-9]*$/,
-        ALPHABETIC_AND_LATIN_CHARS: /^[a-zA-ZÀ-ÿ ]*$/,
-        NON_ALPHABETIC_AND_NON_LATIN_CHARS: /[^a-zA-ZÀ-ÿ]/g,
+        ALPHABETIC_AND_LATIN_CHARS: /^[\p{Script=Latin} ]*$/u,
+        NON_ALPHABETIC_AND_NON_LATIN_CHARS: /[^\p{Script=Latin}]/gu,
         POSITIVE_INTEGER: /^\d+$/,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,

From 2c5a9f0c5b57b5fe10fdcc6a89f84adbed7f4d07 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 14:06:30 -0700
Subject: [PATCH 114/214] Update react-native-x-maps to 1.0.8

---
 package-lock.json | 35 +++++++----------------------------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1aa539261aa..cdca0ca2a4c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.7",
+        "react-native-x-maps": "1.0.8",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -5605,16 +5605,6 @@
         "gl-style-validate": "dist/gl-style-validate.mjs"
       }
     },
-    "node_modules/@math.gl/web-mercator": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz",
-      "integrity": "sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.0",
-        "gl-matrix": "^3.4.0"
-      }
-    },
     "node_modules/@mdx-js/mdx": {
       "version": "1.6.22",
       "dev": true,
@@ -43457,11 +43447,10 @@
       }
     },
     "node_modules/react-native-x-maps": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.7.tgz",
-      "integrity": "sha512-dfuEPWAXjESTTZ2tLFkYLHjd++s/goGvksiPib4a6DoPfF1HA6jXvasB9ddjG1iHMVmHY8Cvc2OVZTGNaAp0RA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.8.tgz",
+      "integrity": "sha512-9JSm/6QvK7tKgNqloJ4rqlDCDvbAe0pJSn58aPvesA24pLK3lSm3CIGLT2sx7wHEgzQiXEtC0sM+Qa0p/z2xKw==",
       "peerDependencies": {
-        "@math.gl/web-mercator": "^3.6.3",
         "@rnmapbox/maps": "^10.0.11",
         "mapbox-gl": "^2.15.0",
         "react": "^18.2.0",
@@ -54219,16 +54208,6 @@
         "sort-object": "^3.0.3"
       }
     },
-    "@math.gl/web-mercator": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz",
-      "integrity": "sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw==",
-      "peer": true,
-      "requires": {
-        "@babel/runtime": "^7.12.0",
-        "gl-matrix": "^3.4.0"
-      }
-    },
     "@mdx-js/mdx": {
       "version": "1.6.22",
       "dev": true,
@@ -80309,9 +80288,9 @@
       }
     },
     "react-native-x-maps": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.7.tgz",
-      "integrity": "sha512-dfuEPWAXjESTTZ2tLFkYLHjd++s/goGvksiPib4a6DoPfF1HA6jXvasB9ddjG1iHMVmHY8Cvc2OVZTGNaAp0RA==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.8.tgz",
+      "integrity": "sha512-9JSm/6QvK7tKgNqloJ4rqlDCDvbAe0pJSn58aPvesA24pLK3lSm3CIGLT2sx7wHEgzQiXEtC0sM+Qa0p/z2xKw==",
       "requires": {}
     },
     "react-pdf": {
diff --git a/package.json b/package.json
index 6e5ba1b27de1..e295b00b77a6 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-lottie": "^1.4.4",
     "react-native-webview": "^11.17.2",
-    "react-native-x-maps": "1.0.7",
+    "react-native-x-maps": "1.0.8",
     "react-pdf": "^6.2.2",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",

From a8fb1c7516a5f7ae4b871ffb4fc0089f6e6c27a2 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 14:28:45 -0700
Subject: [PATCH 115/214] Update DistanceRequest.js

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

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 4c3d342474d6..fd6f15e48467 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -211,7 +211,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             width: 15,
                             color: '#002140'
                         }}
-                        styleURL='mapbox://styles/shawnborton/cllcoiqds00cs01r80kp34tmq'
+                        styleURL='mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq'
                         style={styles.mapView}
                     />
                 ) : (

From 0105c37e42f2f7194df2c2012b3689d3a8c682bc Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 14:56:09 -0700
Subject: [PATCH 116/214] prevent looping of getRoute

---
 src/components/DistanceRequest.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index fd6f15e48467..ad75763ef3c1 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useState, useRef} from 'react';
 import {ScrollView, View} from 'react-native';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
@@ -112,8 +112,17 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         setShouldShowGradient(visibleAreaEnd < scrollContentHeight);
     };
 
+    const previousWaypointsRef = useRef();
+
     // Handle fetching the route when there are at least 2 waypoints
     useEffect(() => {
+        // Check if the waypoints have changed by comparing with the previous value stored in the ref
+        const haveWaypointsChanged = !_.isEqual(previousWaypointsRef.current, waypoints);
+
+        if (!haveWaypointsChanged) {
+            return;
+        }
+
         const nonEmptyWaypoints = _.filter(waypoints, waypoint => 
             waypoint && typeof waypoint.address === 'string' && waypoint.address.trim() !== ''
         ).length;
@@ -124,6 +133,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         }
 
         Transaction.getRoute(transactionID, waypoints);
+        previousWaypointsRef.current = waypoints;
     }, [numberOfWaypoints, waypoints, transactionID, isLoadingRoute, isOffline]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
@@ -208,7 +218,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
                         directionStyle={{
-                            width: 15,
+                            width: 30,
                             color: '#002140'
                         }}
                         styleURL='mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq'

From d67bba4bc4002af6e9305832b197cb62397bbd85 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:00:05 -0700
Subject: [PATCH 117/214] add waypoint validation

---
 package-lock.json                 | 14 ++++++-------
 package.json                      |  2 +-
 src/components/DistanceRequest.js |  9 +++-----
 src/libs/TransactionUtils.js      | 35 +++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cdca0ca2a4c7..76daa23f7b10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.8",
+        "react-native-x-maps": "1.0.9",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -43447,9 +43447,9 @@
       }
     },
     "node_modules/react-native-x-maps": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.8.tgz",
-      "integrity": "sha512-9JSm/6QvK7tKgNqloJ4rqlDCDvbAe0pJSn58aPvesA24pLK3lSm3CIGLT2sx7wHEgzQiXEtC0sM+Qa0p/z2xKw==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.9.tgz",
+      "integrity": "sha512-EEb0BcAWwTnN18J2QL7WHbafV/NLaxtPKJbB0SYJp4KzGK1lRTT3Pl/LYodEUhLUbYk04Y0jcA8ifiImc7yn6A==",
       "peerDependencies": {
         "@rnmapbox/maps": "^10.0.11",
         "mapbox-gl": "^2.15.0",
@@ -80288,9 +80288,9 @@
       }
     },
     "react-native-x-maps": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.8.tgz",
-      "integrity": "sha512-9JSm/6QvK7tKgNqloJ4rqlDCDvbAe0pJSn58aPvesA24pLK3lSm3CIGLT2sx7wHEgzQiXEtC0sM+Qa0p/z2xKw==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.9.tgz",
+      "integrity": "sha512-EEb0BcAWwTnN18J2QL7WHbafV/NLaxtPKJbB0SYJp4KzGK1lRTT3Pl/LYodEUhLUbYk04Y0jcA8ifiImc7yn6A==",
       "requires": {}
     },
     "react-pdf": {
diff --git a/package.json b/package.json
index e295b00b77a6..bf5ede262148 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-lottie": "^1.4.4",
     "react-native-webview": "^11.17.2",
-    "react-native-x-maps": "1.0.8",
+    "react-native-x-maps": "1.0.9",
     "react-pdf": "^6.2.2",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index ad75763ef3c1..08fcb5fa9bed 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -7,6 +7,7 @@ import {withOnyx} from 'react-native-onyx';
 import MapView from 'react-native-x-maps';
 import ONYXKEYS from '../ONYXKEYS';
 import * as Transaction from '../libs/actions/Transaction';
+import * as TransactionUtils from '../libs/TransactionUtils';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 import * as Expensicons from './Icon/Expensicons';
 import theme from '../styles/themes/default';
@@ -118,17 +119,13 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     useEffect(() => {
         // Check if the waypoints have changed by comparing with the previous value stored in the ref
         const haveWaypointsChanged = !_.isEqual(previousWaypointsRef.current, waypoints);
-
         if (!haveWaypointsChanged) {
             return;
         }
 
-        const nonEmptyWaypoints = _.filter(waypoints, waypoint => 
-            waypoint && typeof waypoint.address === 'string' && waypoint.address.trim() !== ''
-        ).length;
-    
+
         // Only fetch the route when all the waypoints are filled (prevents an error fetching with an empty waypoint)
-        if (isOffline || isLoadingRoute || numberOfWaypoints !== nonEmptyWaypoints || nonEmptyWaypoints < 2) {
+        if (isOffline || isLoadingRoute || !TransactionUtils.validateWaypoints(waypoints)) {
             return;
         }
 
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 99fcc1844ad4..44bf65ec3efd 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -230,6 +230,40 @@ function isReceiptBeingScanned(transaction) {
     return transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
 }
 
+/**
+ * Verifies that the provided waypoints are valid
+ * @param {Object} waypoints 
+ * @returns {Boolean}
+ */
+function validateWaypoints(waypoints) {
+    const waypointValues = _.values(waypoints);
+
+    // Ensure the number of waypoints is between 2 and 25
+    if (waypointValues.length < 2 || waypointValues.length > 25) {
+        return false;
+    }
+
+    for (let i = 0; i < waypointValues.length; i++) {
+        const currentWaypoint = waypointValues[i];
+        const previousWaypoint = waypointValues[i - 1];
+
+        // Check if the waypoint has a valid address
+        if (!currentWaypoint || 
+            !currentWaypoint.address || 
+            typeof currentWaypoint.address !== 'string' || 
+            currentWaypoint.address.trim() === '') {
+            return false;
+        }
+
+        // Check for adjacent waypoints with the same address
+        if (previousWaypoint && currentWaypoint.address === previousWaypoint.address) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 export {
     buildOptimisticTransaction,
     getUpdatedTransaction,
@@ -243,4 +277,5 @@ export {
     getAllReportTransactions,
     hasReceipt,
     isReceiptBeingScanned,
+    validateWaypoints,
 };

From c928bfd65e56028d771a299d36d0362413778c42 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:32:16 -0700
Subject: [PATCH 118/214] update styling

---
 package-lock.json                 | 14 +++++++-------
 package.json                      |  2 +-
 src/components/DistanceRequest.js |  5 +----
 src/styles/styles.js              |  4 ++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76daa23f7b10..b16c3c4027a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.9",
+        "react-native-x-maps": "1.0.10",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
@@ -43447,9 +43447,9 @@
       }
     },
     "node_modules/react-native-x-maps": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.9.tgz",
-      "integrity": "sha512-EEb0BcAWwTnN18J2QL7WHbafV/NLaxtPKJbB0SYJp4KzGK1lRTT3Pl/LYodEUhLUbYk04Y0jcA8ifiImc7yn6A==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.10.tgz",
+      "integrity": "sha512-jBRl5JzP3QmGY6tj5CR9UwbREZ3tnuSa7puZozai3bRFrN68k3W6x1p6O8SGp91VvcQlaqJUPFZ+bkYiY3XRvA==",
       "peerDependencies": {
         "@rnmapbox/maps": "^10.0.11",
         "mapbox-gl": "^2.15.0",
@@ -80288,9 +80288,9 @@
       }
     },
     "react-native-x-maps": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.9.tgz",
-      "integrity": "sha512-EEb0BcAWwTnN18J2QL7WHbafV/NLaxtPKJbB0SYJp4KzGK1lRTT3Pl/LYodEUhLUbYk04Y0jcA8ifiImc7yn6A==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/react-native-x-maps/-/react-native-x-maps-1.0.10.tgz",
+      "integrity": "sha512-jBRl5JzP3QmGY6tj5CR9UwbREZ3tnuSa7puZozai3bRFrN68k3W6x1p6O8SGp91VvcQlaqJUPFZ+bkYiY3XRvA==",
       "requires": {}
     },
     "react-pdf": {
diff --git a/package.json b/package.json
index bf5ede262148..e8fb2538563e 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-lottie": "^1.4.4",
     "react-native-webview": "^11.17.2",
-    "react-native-x-maps": "1.0.9",
+    "react-native-x-maps": "1.0.10",
     "react-pdf": "^6.2.2",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 08fcb5fa9bed..7564a6deec2b 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -214,10 +214,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                             zoom: DEFAULT_ZOOM_LEVEL,
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
-                        directionStyle={{
-                            width: 30,
-                            color: '#002140'
-                        }}
+                        directionStyle={styles.mapDirection}
                         styleURL='mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq'
                         style={styles.mapView}
                     />
diff --git a/src/styles/styles.js b/src/styles/styles.js
index dddfbd022a0f..1db4ee9f47c6 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3818,8 +3818,8 @@ const styles = {
     },
 
     mapDirection: {
-        width: 15,
-        color: Colors.blue800,
+        width: 8,
+        color: Colors.green,
     },
 
     mapPendingView: {

From 1cc24c96c3c59b5a95d6486d7426c26a6a705aaa Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:33:25 -0700
Subject: [PATCH 119/214] Prettier

---
 src/components/DistanceRequest.js | 11 ++++-------
 src/libs/TransactionUtils.js      |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 7564a6deec2b..8c4ed41000c6 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -56,8 +56,8 @@ const propTypes = {
             }),
         }),
 
-       /** Server side errors keyed by microtime */
-       errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+        /** Server side errors keyed by microtime */
+        errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
     }),
 
     /** Data about Mapbox token for calling Mapbox API */
@@ -123,7 +123,6 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
             return;
         }
 
-
         // Only fetch the route when all the waypoints are filled (prevents an error fetching with an empty waypoint)
         if (isOffline || isLoadingRoute || !TransactionUtils.validateWaypoints(waypoints)) {
             return;
@@ -136,9 +135,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 
     return (
-        <ScreenWrapper
-            shouldEnableMaxHeight
-        >
+        <ScreenWrapper shouldEnableMaxHeight>
             <View
                 style={styles.distanceRequestContainer(scrollContainerMaxHeight)}
                 onLayout={(event = {}) => setScrollContainerHeight(lodashGet(event, 'nativeEvent.layout.height', 0))}
@@ -215,7 +212,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
                         directionStyle={styles.mapDirection}
-                        styleURL='mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq'
+                        styleURL="mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq"
                         style={styles.mapView}
                     />
                 ) : (
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 44bf65ec3efd..6dadd01ef18f 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -232,7 +232,7 @@ function isReceiptBeingScanned(transaction) {
 
 /**
  * Verifies that the provided waypoints are valid
- * @param {Object} waypoints 
+ * @param {Object} waypoints
  * @returns {Boolean}
  */
 function validateWaypoints(waypoints) {
@@ -248,10 +248,7 @@ function validateWaypoints(waypoints) {
         const previousWaypoint = waypointValues[i - 1];
 
         // Check if the waypoint has a valid address
-        if (!currentWaypoint || 
-            !currentWaypoint.address || 
-            typeof currentWaypoint.address !== 'string' || 
-            currentWaypoint.address.trim() === '') {
+        if (!currentWaypoint || !currentWaypoint.address || typeof currentWaypoint.address !== 'string' || currentWaypoint.address.trim() === '') {
             return false;
         }
 

From b33c36d7f56c1d0c18fa8e0198d928f9e8ea9e6f Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:39:19 -0700
Subject: [PATCH 120/214] Update styles.js

---
 src/styles/styles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index 1db4ee9f47c6..d6500f8e4327 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3818,7 +3818,7 @@ const styles = {
     },
 
     mapDirection: {
-        width: 8,
+        width: 7,
         color: Colors.green,
     },
 

From 679872eb61752b2651da52924ea52735b5463f68 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:47:52 -0700
Subject: [PATCH 121/214] Update DistanceRequest.js

---
 src/components/DistanceRequest.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 1a93e1a59931..c619f3450212 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -242,7 +242,6 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
                         }}
                         directionCoordinates={lodashGet(transaction, 'routes.route0.geometry.coordinates', [])}
                         directionStyle={styles.mapDirection}
-                        styleURL="mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq"
                         style={styles.mapView}
                         waypoints={waypointMarkers}
                         styleURL={CONST.MAPBOX_STYLE_URL}

From 55b5a38c1fca514886dc6d219f96719c241b1c43 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:51:42 -0700
Subject: [PATCH 122/214] clear out existing routes

---
 src/libs/actions/Transaction.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 53ee0319b0f7..4f71402bf189 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -68,6 +68,15 @@ function saveWaypoint(transactionID, index, waypoint) {
         errorFields: {
             route: null,
         },
+
+        // Clear the existing route so that we don't show an old route
+        routes: {
+            route0: {
+                geometry: {
+                    coordinates: null
+                }
+            }
+        },
     });
 }
 
@@ -101,6 +110,14 @@ function removeWaypoint(transactionID, currentIndex) {
             ...transaction.comment,
             waypoints: reIndexedWaypoints,
         },
+        // Clear the existing route so that we don't show an old route
+        routes: {
+            route0: {
+                geometry: {
+                    coordinates: null
+                }
+            }
+        },
     };
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, newTransaction);
 }

From f4a8fcef5c5d300540f0fcfbed9a436d6161d36b Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 21 Aug 2023 17:57:55 -0700
Subject: [PATCH 123/214] Update Transaction.js

---
 src/libs/actions/Transaction.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 4f71402bf189..248e1abbc200 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -73,9 +73,9 @@ function saveWaypoint(transactionID, index, waypoint) {
         routes: {
             route0: {
                 geometry: {
-                    coordinates: null
-                }
-            }
+                    coordinates: null,
+                },
+            },
         },
     });
 }
@@ -114,9 +114,9 @@ function removeWaypoint(transactionID, currentIndex) {
         routes: {
             route0: {
                 geometry: {
-                    coordinates: null
-                }
-            }
+                    coordinates: null,
+                },
+            },
         },
     };
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, newTransaction);

From a4ec93431ff43f5c04e81833f04adbe186a33d7a Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 22 Aug 2023 10:27:47 +0700
Subject: [PATCH 124/214] fix test

---
 tests/actions/SessionTest.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js
index 506279421e7e..d8bfa144e358 100644
--- a/tests/actions/SessionTest.js
+++ b/tests/actions/SessionTest.js
@@ -8,6 +8,10 @@ import CONST from '../../src/CONST';
 import PushNotification from '../../src/libs/Notification/PushNotification';
 import * as App from '../../src/libs/actions/App';
 
+// This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
+// eslint-disable-next-line no-unused-vars
+import subscribePushNotification from '../../src/libs/Notification/PushNotification/subscribePushNotification';
+
 // We are mocking this method so that we can later test to see if it was called and what arguments it was called with.
 // We test HttpUtils.xhr() since this means that our API command turned into a network request and isn't only queued.
 HttpUtils.xhr = jest.fn();

From b7ef46d4832ca3313eeeaff0f4ce14998b54022f Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Tue, 22 Aug 2023 10:06:01 +0530
Subject: [PATCH 125/214] updated comments

---
 src/libs/EmojiUtils.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 3dca56f1cba4..cafb98ef65b7 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -278,7 +278,8 @@ function extractEmojis(text) {
         return emojis;
     }
 
-    parseEmojis = [...new Set(parseEmojis)]; // Some emojis are repeated with different skin tones
+    // Some emojis are repeated with different skin tones
+    parseEmojis = [...new Set(parseEmojis)];
 
     const alreadyParsedEmojis = new Set();
 
@@ -287,7 +288,8 @@ function extractEmojis(text) {
         const emoji = Emojis.emojiCodeTableWithSkinTones[character];
 
         if (emoji && !alreadyParsedEmojis.has(emoji.code)) {
-            alreadyParsedEmojis.add(emoji.code); // Add to set to avoid duplicates
+            // Add to set to avoid duplicates due to different skin tones of the same emoji
+            alreadyParsedEmojis.add(emoji.code);
             emojis.push(emoji);
         }
     }

From bc97f1a97fd9bf342bb5dc802a5b7fd5c33223a5 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 22 Aug 2023 10:42:32 +0300
Subject: [PATCH 126/214] Clean up url-cleaning logic

---
 src/libs/actions/App.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 37d3597df494..56a49cedce1a 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -470,18 +470,15 @@ function beginDeepLinkRedirectAfterTransition(shouldAuthenticateWithCurrentAccou
  * @param {String} url - URL user is navigating to via deep link (or regular link in web)
  */
 function runDemoByURL(url = '') {
-    if (!url) {
-        url = '';
-    }
-    url = url.toLowerCase();
+    const cleanUrl = (url || '').toLowerCase();
 
-    if (url.endsWith(ROUTES.SAASTR)) {
+    if (cleanUrl.endsWith(ROUTES.SAASTR)) {
         Onyx.merge(ONYXKEYS.DEMO_INFO, {
             saastr: {
                 isBeginningDemo: true,
             },
         });
-    } else if (url.endsWith(ROUTES.SBE)) {
+    } else if (cleanUrl.endsWith(ROUTES.SBE)) {
         Onyx.merge(ONYXKEYS.DEMO_INFO, {
             sbe: {
                 isBeginningDemo: true,

From f4d1ff461346c9b49ed39b2705a496f22e7e5982 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 22 Aug 2023 10:46:22 +0300
Subject: [PATCH 127/214] Add sbe account number

---
 src/CONST.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index dd656cea68a9..dcf573bdb684 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -889,7 +889,7 @@ const CONST = {
         RECEIPTS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_RECEIPTS', -1)),
         REWARDS: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_REWARDS', 11023767)), // rewards@expensify.com
         SAASTR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SAASTR', 15252830)),
-        SBE: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SBE', -1)), // TODO: replace with prod account ID
+        SBE: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SBE', 15305309)),
         STUDENT_AMBASSADOR: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR', 10476956)),
         SVFG: Number(lodashGet(Config, 'EXPENSIFY_ACCOUNT_ID_SVFG', 2012843)),
     },

From a2bda8c417817f0ff2f0800b7a1aa4ac853791d1 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 22 Aug 2023 14:02:58 +0300
Subject: [PATCH 128/214] Move fn to DemoActions, remove optimistic data

---
 src/Expensify.js                |   6 +-
 src/libs/actions/App.js         |  27 ----
 src/libs/actions/DemoActions.js | 265 ++++++--------------------------
 src/pages/signin/SignInPage.js  |   6 +-
 4 files changed, 51 insertions(+), 253 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index db2e844d4a85..a3eb87ddb9a3 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -30,7 +30,7 @@ import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import * as App from './libs/actions/App';
+import * as DemoActions from './libs/actions/DemoActions';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
@@ -165,13 +165,13 @@ function Expensify(props) {
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
-            App.runDemoByURL(url);
+            DemoActions.runDemoByURL(url);
             Report.openReportFromDeepLink(url, isAuthenticated);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            App.runDemoByURL(state.url);
+            DemoActions.runDemoByURL(state.url);
             Report.openReportFromDeepLink(state.url, isAuthenticated);
         });
 
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 56a49cedce1a..46d21d50cc3e 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -464,32 +464,6 @@ function beginDeepLinkRedirectAfterTransition(shouldAuthenticateWithCurrentAccou
     waitForSignOnTransitionToFinish().then(() => beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount));
 }
 
-/**
- * Runs code for specific demos, based on the provided URL
- *
- * @param {String} url - URL user is navigating to via deep link (or regular link in web)
- */
-function runDemoByURL(url = '') {
-    const cleanUrl = (url || '').toLowerCase();
-
-    if (cleanUrl.endsWith(ROUTES.SAASTR)) {
-        Onyx.merge(ONYXKEYS.DEMO_INFO, {
-            saastr: {
-                isBeginningDemo: true,
-            },
-        });
-    } else if (cleanUrl.endsWith(ROUTES.SBE)) {
-        Onyx.merge(ONYXKEYS.DEMO_INFO, {
-            sbe: {
-                isBeginningDemo: true,
-            },
-        });
-    } else {
-        // No demo is being run, so clear out demo info
-        Onyx.set(ONYXKEYS.DEMO_INFO, null);
-    }
-}
-
 export {
     setLocale,
     setLocaleAndNavigate,
@@ -503,5 +477,4 @@ export {
     beginDeepLinkRedirect,
     beginDeepLinkRedirectAfterTransition,
     createWorkspaceAndNavigateToIt,
-    runDemoByURL,
 };
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index e65b440e255e..bc7317d27d46 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -1,15 +1,13 @@
-import Str from 'expensify-common/lib/str';
 import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import CONST from '../../CONST';
 import * as API from '../API';
 import * as ReportUtils from '../ReportUtils';
-import * as Policy from './Policy';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
-import DateUtils from '../DateUtils';
+import * as Localize from '../Localize';
 
 let sessionAccountID = 0;
 let sessionEmail = 0;
@@ -34,12 +32,9 @@ Onyx.connect({
 
 /**
  * @param {String} workspaceOwnerEmail email of the workspace owner
- * @param {String} workspaceName
- * @param {String} welcomeNoteText
- * @param {Number} adminAccountID
  * @param {String} apiCommand
  */
-function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, workspaceName, welcomeNoteText, adminAccountID, apiCommand) {
+function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
     // If we don't have a command name to call, just go back so the user is navigated home
     if (!apiCommand) {
         Navigation.goBack();
@@ -55,230 +50,62 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, workspaceName, welc
         return;
     }
 
-    // Create workspace, owned and admin'd by passed email
-    const policyID = Policy.generatePolicyID();
-    
-    const {customUnits, customUnitID, customUnitRateID} = Policy.buildOptimisticCustomUnits();
-    const {
-        announceChatReportID,
-        announceChatData,
-        announceReportActionData,
-        announceCreatedReportActionID,
-        expenseChatReportID,
-        expenseChatData,
-        expenseReportActionData,
-        expenseCreatedReportActionID,
-    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
-
-    // Add optimistic invite message comment
-    const welcomeMessageReportAction = ReportUtils.buildOptimisticAddCommentReportAction(welcomeNoteText);
-    welcomeMessageReportAction.reportAction.actorAccountID = adminAccountID;
-    welcomeMessageReportAction.reportAction.person[0].text = '';
-    welcomeMessageReportAction.reportAction.avatar = '';
-
-    // Update policy expense chat report actions with welcome message
-    const expenseChatWelcomeReportActionID = welcomeMessageReportAction.reportAction.reportActionID;
-    expenseReportActionData[expenseChatWelcomeReportActionID] = welcomeMessageReportAction.reportAction;
-
-    // Update report with info about last message sent
-    const currentTime = DateUtils.getDBTime();
-    expenseChatData.lastVisibleActionCreated = currentTime;
-    expenseChatData.lastMessageText = welcomeNoteText.replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
-    expenseChatData.lastActorAccountID = adminAccountID;
-    expenseChatData.lastReadTime = currentTime;
-
-    API.write(
-        apiCommand,
-        {
-            policyID,
-            announceChatReportID,
-            expenseChatReportID,
-            policyName: workspaceName,
-            announceCreatedReportActionID,
-            expenseCreatedReportActionID,
-            expenseChatWelcomeReportActionID,
-            customUnitID,
-            customUnitRateID,
-        },
-        {
-            optimisticData: [
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                    value: {
-                        id: policyID,
-                        type: CONST.POLICY.TYPE.FREE,
-                        name: workspaceName,
-                        role: CONST.POLICY.ROLE.USER,
-                        owner: workspaceOwnerEmail,
-                        outputCurrency: CONST.CURRENCY.USD,
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        customUnits,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-                    value: {
-                        [sessionAccountID]: {
-                            role: CONST.POLICY.ROLE.USER,
-                            errors: {},
-                        },
-                        [adminAccountID]: {
-                            role: CONST.POLICY.ROLE.ADMIN,
-                            errors: {},
-                        },
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                        ...announceChatData,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-                    value: announceReportActionData,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                        ...expenseChatData,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-                    value: expenseReportActionData,
-                },
-            ],
-            successData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                    value: {pendingAction: null},
-                },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: null,
-                        },
-                        pendingAction: null,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-                    value: {
-                        [_.keys(announceChatData)[0]]: {
-                            pendingAction: null,
-                        },
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-                    value: {
-                        pendingFields: {
-                            addWorkspaceRoom: null,
-                        },
-                        pendingAction: null,
-                    },
-                },
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-                    value: {
-                        [_.keys(expenseChatData)[0]]: {
-                            pendingAction: null,
-                        },
-                    },
-                },
-            ],
-            failureData: [
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policyID}`,
-                    value: null,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-                    value: null,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-                    value: null,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-                    value: null,
-                },
-                {
-                    onyxMethod: Onyx.METHOD.SET,
-                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-                    value: null,
-                },
-            ],
-        },
-    );
+    API.makeRequestWithSideEffects(apiCommand, {})
+        .then((response) => {
+            // Navigate to the new workspace chat report
+            // We must call goBack() to remove the demo route from history
+            Navigation.goBack();
+            Navigation.navigate(ROUTES.getReportRoute(response.expenseChatReportID));
+        });
 
-    // Navigate to the new workspace chat report
-    // We must call goBack() to remove the demo route from history
-    Navigation.goBack();
-    Navigation.navigate(ROUTES.getReportRoute(expenseChatReportID));
 }
 
 function runSbeDemo() {
-    // Add domain name as prefix (only if domain is private)
-    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
-    const workspaceName = `${domainNamePrefix}SBE Workspace`;
-
-    const welcomeNoteText = `
-    Thanks for testing out New Expensify!
-    
-    Get paid back for your journey to or from Small Business Expo, whether you're driving yourself or catching a ride:
-    
-    1. Click the "+" > Request money > Distance.
-    2. Enter your start and end addresses.
-    3. Get paid back at the IRS mileage rate of $0.655/mile!
-    
-    Note: Must submit by Thursday, September 7th, 2023. One reimbursement per person.`;
-
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, workspaceName, welcomeNoteText, CONST.ACCOUNT_ID.SBE, '');
+    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, '');
 }
 
 function runSaastrDemo() {
-    // Add domain name as prefix (only if domain is private)
-    const domainNamePrefix = userIsFromPublicDomain ? `${Str.extractEmailDomain(sessionEmail)} ` : '';
-    const workspaceName = `${domainNamePrefix}SaaStr Workspace`;
-
-    const welcomeNoteText = `
-    Welcome to NewExpensify, who wants $20?
+    createDemoWorkspaceAndNavigate(CONST.EMAIL.SAASTR, 'CreateSaastrDemoWorkspace');
+}
 
-    To scan the receipt and get paid:
-    1. Click the +
-    2. Click Request Money.
-    3. Take a photo of the receipt, we'll automatically enter all the info.
-    4. Come say hi at the Expensify booth (#601) and let us know if you have any feedback!`;
+/**
+ * Runs code for specific demos, based on the provided URL
+ *
+ * @param {String} url - URL user is navigating to via deep link (or regular link in web)
+ */
+function runDemoByURL(url = '') {
+    const cleanUrl = (url || '').toLowerCase();
+
+    if (cleanUrl.endsWith(ROUTES.SAASTR)) {
+        Onyx.set(ONYXKEYS.DEMO_INFO, {
+            saastr: {
+                isBeginningDemo: true,
+            },
+        });
+    } else if (cleanUrl.endsWith(ROUTES.SBE)) {
+        Onyx.set(ONYXKEYS.DEMO_INFO, {
+            sbe: {
+                isBeginningDemo: true,
+            },
+        });
+    } else {
+        // No demo is being run, so clear out demo info
+        Onyx.set(ONYXKEYS.DEMO_INFO, null);
+    }
+}
 
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SAASTR, workspaceName, welcomeNoteText, CONST.ACCOUNT_ID.SAASTR, 'CreateSaastrDemoWorkspace');
+function getHeadlineKeyByDemoInfo(demoInfo = {}) {
+    if (lodashGet(demoInfo, 'saastr.isBeginningDemo')) {
+        return Localize.translateLocal('demos.saastr.signInWelcome');
+    } else if (lodashGet(demoInfo, 'sbe.isBeginningDemo')) {
+        return Localize.translateLocal('demos.sbe.signInWelcome');
+    }
+    return '';
 }
 
 export {
     runSaastrDemo,
     runSbeDemo,
+    runDemoByURL,
+    getHeadlineKeyByDemoInfo,
 };
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index e19b9ca7749f..79a1eaa4665a 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -19,6 +19,7 @@ import * as StyleUtils from '../../styles/StyleUtils';
 import useLocalize from '../../hooks/useLocalize';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import Log from '../../libs/Log';
+import * as DemoActions from '../../libs/actions/DemoActions';
 
 const propTypes = {
     /** The details about the account that the user is signing in with */
@@ -113,10 +114,7 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
 
     let welcomeHeader = '';
     let welcomeText = '';
-    let customHeadline = '';
-    if (demoInfo.saastr && demoInfo.saastr.isBeginningDemo) {
-        customHeadline = translate('demos.saastr.signInWelcome');
-    }
+    let customHeadline = DemoActions.getHeadlineKeyByDemoInfo(demoInfo);
     const headerText = customHeadline || translate('login.hero.header');
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? headerText : translate('welcomeText.getStarted');

From 4d165ce724d88c63b325bf8f6944a60453288a50 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 22 Aug 2023 19:43:46 +0800
Subject: [PATCH 129/214] add explanation for the patch file

---
 .../react-native+0.72.3+004+ModalKeyboardFlashing.patch    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch b/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch
index 4f239084b4ec..84a233894f94 100644
--- a/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch
+++ b/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch
@@ -1,11 +1,14 @@
 diff --git a/node_modules/react-native/React/Views/RCTModalHostViewManager.m b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
-index 4b9f9ad..4992874 100644
+index 4b9f9ad..b72984c 100644
 --- a/node_modules/react-native/React/Views/RCTModalHostViewManager.m
 +++ b/node_modules/react-native/React/Views/RCTModalHostViewManager.m
-@@ -79,6 +79,10 @@ RCT_EXPORT_MODULE()
+@@ -79,6 +79,13 @@ RCT_EXPORT_MODULE()
      if (self->_presentationBlock) {
        self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
      } else {
++      // In our App, If an input is blurred and a modal is opened, the rootView will become the firstResponder, which
++      // will cause system to retain a wrong keyboard state, and then the keyboard to flicker when the modal is closed.
++      // We first resign the rootView to avoid this problem.
 +      UIWindow *window = RCTKeyWindow();
 +      if (window && window.rootViewController && [window.rootViewController.view isFirstResponder]) {
 +        [window.rootViewController.view resignFirstResponder];

From f0d14fdbf08bdc82ea25520b03ff5370cacb1c85 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 13:07:14 +0100
Subject: [PATCH 130/214] Make sure to show the delete request for the
 requestor

---
 src/components/MoneyRequestHeader.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index 60d8a121d4bb..49f9a30b28c5 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -13,7 +13,6 @@ import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimen
 import compose from '../libs/compose';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
-import * as Policy from '../libs/actions/Policy';
 import ONYXKEYS from '../ONYXKEYS';
 import * as IOU from '../libs/actions/IOU';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
@@ -59,13 +58,11 @@ function MoneyRequestHeader(props) {
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const moneyRequestReport = props.parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-    const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`];
-    const isPayer =
-        Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID);
+    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+    const isRequestor = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
     const report = props.report;
     report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
     report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
-    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
 
     const deleteTransaction = useCallback(() => {
         IOU.deleteMoneyRequest(parentReportAction.originalMessage.IOUTransactionID, parentReportAction, true);
@@ -81,7 +78,7 @@ function MoneyRequestHeader(props) {
                 <HeaderWithBackButton
                     shouldShowAvatarWithDisplay
                     shouldShowPinButton={false}
-                    shouldShowThreeDotsButton={!isPayer && !isSettled}
+                    shouldShowThreeDotsButton={isRequestor && !isSettled}
                     threeDotsMenuItems={[
                         {
                             icon: Expensicons.Trashcan,

From f28e275f50427fba75c2657698ba389ed593df8e Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 13:09:36 +0100
Subject: [PATCH 131/214] Add explanantion comment

---
 src/components/MoneyRequestHeader.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index 49f9a30b28c5..a4ddddfe35ed 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -59,6 +59,8 @@ function MoneyRequestHeader(props) {
     const moneyRequestReport = props.parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+
+    // Only the requestor can take delete the request, admins can only edit it.
     const isRequestor = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
     const report = props.report;
     report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);

From 09baf7ba7eda194a97e6604fda72e8bee80aacc7 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 22 Aug 2023 20:10:43 +0800
Subject: [PATCH 132/214] keep ref name consistent

---
 src/components/AttachmentPicker/index.native.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
index 077ffcccc704..8b1bb54da920 100644
--- a/src/components/AttachmentPicker/index.native.js
+++ b/src/components/AttachmentPicker/index.native.js
@@ -95,7 +95,7 @@ function AttachmentPicker({type, children}) {
 
     const completeAttachmentSelection = useRef();
     const onModalHide = useRef();
-    const onCancel = useRef();
+    const onCanceled = useRef();
 
     const {translate} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
@@ -217,9 +217,11 @@ function AttachmentPicker({type, children}) {
      * Opens the attachment modal
      *
      * @param {function} onPickedHandler A callback that will be called with the selected attachment
+     * @param {function} onCanceledHandler A callback that will be called without a selected attachment
      */
-    const open = (onPickedHandler) => {
+    const open = (onPickedHandler, onCanceledHandler = () => {}) => {
         completeAttachmentSelection.current = onPickedHandler;
+        onCanceled.current = onCanceledHandler;
         setIsVisible(true);
     };
 
@@ -240,7 +242,7 @@ function AttachmentPicker({type, children}) {
     const pickAttachment = useCallback(
         (attachments = []) => {
             if (attachments.length === 0) {
-                onCancel.current();
+                onCanceled.current();
                 return Promise.resolve();
             }
 
@@ -310,10 +312,7 @@ function AttachmentPicker({type, children}) {
      */
     const renderChildren = () =>
         children({
-            openPicker: ({onPicked, onCanceled = () => {}}) => {
-                open(onPicked);
-                onCancel.current = onCanceled;
-            },
+            openPicker: ({onPicked, onCanceled: newOnCanceled}) => open(onPicked, newOnCanceled),
         });
 
     return (
@@ -321,7 +320,7 @@ function AttachmentPicker({type, children}) {
             <Popover
                 onClose={() => {
                     close();
-                    onCancel.current();
+                    onCanceled.current();
                 }}
                 isVisible={isVisible}
                 anchorPosition={styles.createMenuPosition}

From 5a43ad0fadadbe24ebce390c871f0e2dade7af71 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 13:12:00 +0100
Subject: [PATCH 133/214] Update variable name to match other places

---
 src/components/MoneyRequestHeader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index a4ddddfe35ed..de1a08c8f83c 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -61,7 +61,7 @@ function MoneyRequestHeader(props) {
     const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
 
     // Only the requestor can take delete the request, admins can only edit it.
-    const isRequestor = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
+    const isActionOwner = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
     const report = props.report;
     report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
     report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
@@ -80,7 +80,7 @@ function MoneyRequestHeader(props) {
                 <HeaderWithBackButton
                     shouldShowAvatarWithDisplay
                     shouldShowPinButton={false}
-                    shouldShowThreeDotsButton={isRequestor && !isSettled}
+                    shouldShowThreeDotsButton={isActionOwner && !isSettled}
                     threeDotsMenuItems={[
                         {
                             icon: Expensicons.Trashcan,

From e272a1cc5fecb4fe6b5ef95c4dfa114af4e4562a Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 22 Aug 2023 20:41:30 +0800
Subject: [PATCH 134/214] rename variable name

---
 src/pages/home/report/ReportActionCompose.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 3f0c06172f23..d27100028033 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -372,7 +372,7 @@ function ReportActionCompose({
         focusWithDelay(textInputRef.current)(shouldDelay);
     }, []);
 
-    const willOpenNextModal = useRef(false);
+    const isNextModalWillOpen = useRef(false);
     const isKeyboardVisibleWhenShowingModal = useRef(false);
 
     const restoreKeyboardState = useCallback(() => {
@@ -995,12 +995,12 @@ function ReportActionCompose({
     const prevIsFocused = usePrevious(isFocusedProp);
     useEffect(() => {
         if (modal.isVisible && !prevIsModalVisible) {
-            willOpenNextModal.current = false;
+            isNextModalWillOpen.current = false;
         }
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
-        if (!(willBlurTextInputOnTapOutside && !willOpenNextModal.current && !modal.isVisible && isFocusedProp && (prevIsModalVisible || !prevIsFocused))) {
+        if (!(willBlurTextInputOnTapOutside && !isNextModalWillOpen.current && !modal.isVisible && isFocusedProp && (prevIsModalVisible || !prevIsFocused))) {
             return;
         }
 
@@ -1078,7 +1078,7 @@ function ReportActionCompose({
                                                 shouldBlockEmojiCalc.current = true;
                                                 shouldBlockMentionCalc.current = true;
                                             }
-                                            willOpenNextModal.current = true;
+                                            isNextModalWillOpen.current = true;
                                             openPicker({
                                                 onPicked: displayFileInModal,
                                                 onCanceled: restoreKeyboardState,

From 67d3228561f50f0b0bac4731ecee1390c4febad9 Mon Sep 17 00:00:00 2001
From: ntdiary <2471314@gmail.com>
Date: Tue, 22 Aug 2023 21:26:09 +0800
Subject: [PATCH 135/214] rename variable name

---
 src/pages/home/report/ReportActionCompose.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index d27100028033..5b027abced45 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -372,15 +372,15 @@ function ReportActionCompose({
         focusWithDelay(textInputRef.current)(shouldDelay);
     }, []);
 
-    const isNextModalWillOpen = useRef(false);
-    const isKeyboardVisibleWhenShowingModal = useRef(false);
+    const isNextModalWillOpenRef = useRef(false);
+    const isKeyboardVisibleWhenShowingModalRef = useRef(false);
 
     const restoreKeyboardState = useCallback(() => {
-        if (!isKeyboardVisibleWhenShowingModal.current) {
+        if (!isKeyboardVisibleWhenShowingModalRef.current) {
             return;
         }
         focus(true);
-        isKeyboardVisibleWhenShowingModal.current = false;
+        isKeyboardVisibleWhenShowingModalRef.current = false;
     }, [focus]);
 
     /**
@@ -995,12 +995,12 @@ function ReportActionCompose({
     const prevIsFocused = usePrevious(isFocusedProp);
     useEffect(() => {
         if (modal.isVisible && !prevIsModalVisible) {
-            isNextModalWillOpen.current = false;
+            isNextModalWillOpenRef.current = false;
         }
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
-        if (!(willBlurTextInputOnTapOutside && !isNextModalWillOpen.current && !modal.isVisible && isFocusedProp && (prevIsModalVisible || !prevIsFocused))) {
+        if (!(willBlurTextInputOnTapOutside && !isNextModalWillOpenRef.current && !modal.isVisible && isFocusedProp && (prevIsModalVisible || !prevIsFocused))) {
             return;
         }
 
@@ -1078,7 +1078,7 @@ function ReportActionCompose({
                                                 shouldBlockEmojiCalc.current = true;
                                                 shouldBlockMentionCalc.current = true;
                                             }
-                                            isNextModalWillOpen.current = true;
+                                            isNextModalWillOpenRef.current = true;
                                             openPicker({
                                                 onPicked: displayFileInModal,
                                                 onCanceled: restoreKeyboardState,
@@ -1151,7 +1151,7 @@ function ReportActionCompose({
                                                             onPress={(e) => {
                                                                 e.preventDefault();
                                                                 if (!willBlurTextInputOnTapOutside) {
-                                                                    isKeyboardVisibleWhenShowingModal.current = textInputRef.current.isFocused();
+                                                                    isKeyboardVisibleWhenShowingModalRef.current = textInputRef.current.isFocused();
                                                                 }
                                                                 textInputRef.current.blur();
 
@@ -1213,7 +1213,7 @@ function ReportActionCompose({
                                             setIsFocused(false);
                                             resetSuggestions();
                                             if (e.relatedTarget && e.relatedTarget === actionButtonRef.current) {
-                                                isKeyboardVisibleWhenShowingModal.current = true;
+                                                isKeyboardVisibleWhenShowingModalRef.current = true;
                                             }
                                         }}
                                         onClick={() => {

From 35d08c4a7cbc7700d19784a4c978a562a93779fc Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 22 Aug 2023 10:27:19 -0400
Subject: [PATCH 136/214] use existing merchant menu item for distance

---
 src/components/ReportActionItem/MoneyRequestView.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index 7c4a53dfa5f7..ac7c0784c499 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -164,21 +164,12 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
                 <MenuItemWithTopDescription
-                    description={translate('common.merchant')}
+                    description={isDistanceRequest ? translate('tabSelector.distance') : translate('common.merchant')}
                     title={transactionMerchant}
                     shouldShowRightIcon={false}
                     disabled
                 />
             </OfflineWithFeedback>
-            {isDistanceRequest && (
-                <MenuItemWithTopDescription
-                    description={translate('tabSelector.distance')}
-                    title={transaction.merchant}
-                    disabled={isSettled || !canEdit}
-                    shouldShowRightIcon={canEdit}
-                    onPress={() => {}}
-                />
-            )}
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
         </View>
     );

From 6c8815bd0d94f07a3b05ad83cf5dc0b9f304e460 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 22 Aug 2023 10:31:22 -0400
Subject: [PATCH 137/214] add isDistanceRequest implementation

---
 src/CONST.js                 |  5 +++++
 src/libs/TransactionUtils.js | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index 901d2f7f4241..384f7a3e5e12 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -661,6 +661,11 @@ const CONST = {
         DARK: 'dark',
         SYSTEM: 'system',
     },
+    TRANSACTION: {
+        TYPE: {
+            CUSTOM_UNIT: 'customUnit',
+        },
+    },
     JSON_CODE: {
         SUCCESS: 200,
         BAD_REQUEST: 400,
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index d6083e5d771c..c4f802e0aa72 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -243,8 +243,17 @@ function isReceiptBeingScanned(transaction) {
     return transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANREADY || transaction.receipt.state === CONST.IOU.RECEIPT_STATE.SCANNING;
 }
 
+/**
+ * @param {Object} transaction
+ * @param {String} transaction.type
+ * @param {Object} [transaction.customUnit]
+ * @param {String} [transaction.customUnit.name]
+ * @returns {Boolean}
+ */
 function isDistanceRequest(transaction) {
-    return true;
+    const type = lodashGet(transaction, 'comment.type');
+    const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
+    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
 }
 
 export {

From 511f438bca34403b8b0940bcc888b37ab49cac4b Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 22 Aug 2023 17:56:27 +0300
Subject: [PATCH 138/214] Cleanup and correctly navigate

---
 src/libs/actions/DemoActions.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index bc7317d27d46..7170985ff505 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -35,12 +35,6 @@ Onyx.connect({
  * @param {String} apiCommand
  */
 function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
-    // If we don't have a command name to call, just go back so the user is navigated home
-    if (!apiCommand) {
-        Navigation.goBack();
-        return;
-    }
-    
     // Try to navigate to existing demo workspace expense chat if it exists in Onyx
     const demoWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(workspaceOwnerEmail);
     if (demoWorkspaceChatReportID) {
@@ -50,18 +44,30 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
         return;
     }
 
-    API.makeRequestWithSideEffects(apiCommand, {})
+    API.makeRequestWithSideEffects(apiCommand)
         .then((response) => {
-            // Navigate to the new workspace chat report
-            // We must call goBack() to remove the demo route from history
+            // Get report updates from Onyx response data
+            const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT);
+            if (!reportUpdate) {
+                return;
+            }
+
+            // Get the policy expense chat update
+            const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
+            if (!policyExpenseChatReport) {
+                return;
+            }
+
+            // Navigate to the new policy expense chat report
+            // Note: We must call goBack() to remove the demo route from history
             Navigation.goBack();
-            Navigation.navigate(ROUTES.getReportRoute(response.expenseChatReportID));
+            Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID));
         });
 
 }
 
 function runSbeDemo() {
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, '');
+    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, 'CreateSbeDemoWorkspace');
 }
 
 function runSaastrDemo() {

From 3eb170708bd1de05a0f3001a397b8c0a611486c4 Mon Sep 17 00:00:00 2001
From: Alex Beaman <alexbeaman@expensify.com>
Date: Tue, 22 Aug 2023 17:59:10 +0300
Subject: [PATCH 139/214] Lint cleanup

---
 src/libs/actions/DemoActions.js | 67 +++++++++++----------------------
 src/pages/signin/SignInPage.js  |  2 +-
 2 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
index 7170985ff505..aa2b43824f91 100644
--- a/src/libs/actions/DemoActions.js
+++ b/src/libs/actions/DemoActions.js
@@ -9,27 +9,6 @@ import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as Localize from '../Localize';
 
-let sessionAccountID = 0;
-let sessionEmail = 0;
-Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (val) => {
-        sessionAccountID = lodashGet(val, 'accountID', 0);
-        sessionEmail = lodashGet(val, 'email', '');
-    },
-});
-
-let userIsFromPublicDomain;
-Onyx.connect({
-    key: ONYXKEYS.USER,
-    callback: (val) => {
-        if (!val) {
-            return;
-        }
-        userIsFromPublicDomain = val.isFromPublicDomain;
-    },
-});
-
 /**
  * @param {String} workspaceOwnerEmail email of the workspace owner
  * @param {String} apiCommand
@@ -44,26 +23,26 @@ function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
         return;
     }
 
-    API.makeRequestWithSideEffects(apiCommand)
-        .then((response) => {
-            // Get report updates from Onyx response data
-            const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT);
-            if (!reportUpdate) {
-                return;
-            }
-
-            // Get the policy expense chat update
-            const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-            if (!policyExpenseChatReport) {
-                return;
-            }
+    // We use makeRequestWithSideEffects here because we need to get the workspace chat report ID to navigate to it after it's created
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects(apiCommand).then((response) => {
+        // Get report updates from Onyx response data
+        const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT);
+        if (!reportUpdate) {
+            return;
+        }
 
-            // Navigate to the new policy expense chat report
-            // Note: We must call goBack() to remove the demo route from history
-            Navigation.goBack();
-            Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID));
-        });
+        // Get the policy expense chat update
+        const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
+        if (!policyExpenseChatReport) {
+            return;
+        }
 
+        // Navigate to the new policy expense chat report
+        // Note: We must call goBack() to remove the demo route from history
+        Navigation.goBack();
+        Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID));
+    });
 }
 
 function runSbeDemo() {
@@ -103,15 +82,11 @@ function runDemoByURL(url = '') {
 function getHeadlineKeyByDemoInfo(demoInfo = {}) {
     if (lodashGet(demoInfo, 'saastr.isBeginningDemo')) {
         return Localize.translateLocal('demos.saastr.signInWelcome');
-    } else if (lodashGet(demoInfo, 'sbe.isBeginningDemo')) {
+    }
+    if (lodashGet(demoInfo, 'sbe.isBeginningDemo')) {
         return Localize.translateLocal('demos.sbe.signInWelcome');
     }
     return '';
 }
 
-export {
-    runSaastrDemo,
-    runSbeDemo,
-    runDemoByURL,
-    getHeadlineKeyByDemoInfo,
-};
+export {runSaastrDemo, runSbeDemo, runDemoByURL, getHeadlineKeyByDemoInfo};
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 79a1eaa4665a..f1a8cf3b910e 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -114,7 +114,7 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
 
     let welcomeHeader = '';
     let welcomeText = '';
-    let customHeadline = DemoActions.getHeadlineKeyByDemoInfo(demoInfo);
+    const customHeadline = DemoActions.getHeadlineKeyByDemoInfo(demoInfo);
     const headerText = customHeadline || translate('login.hero.header');
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? headerText : translate('welcomeText.getStarted');

From e7872cee5819caa2ecd37eb90f5a832fe702f3c2 Mon Sep 17 00:00:00 2001
From: Daniel Edwards <cdaniel.edwards@gmail.com>
Date: Tue, 22 Aug 2023 11:30:26 -0400
Subject: [PATCH 140/214] Adds check in Browser lib to replace pathname if
 coming from desktop redirect

---
 src/libs/Browser/index.web.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.js
index 9e48bb25a105..f317c33f3619 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.js
@@ -72,7 +72,8 @@ function isSafari() {
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
-    params.set('exitTo', `${window.location.pathname}${window.location.search}${window.location.hash}`);
+    const openingFromDesktopRedirect = window.location.pathname === '/desktop-signin-redirect';
+    params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : window.location.pathname}${window.location.search}${window.location.hash}`);
     if (email && shortLivedAuthToken) {
         params.set('email', email);
         params.set('shortLivedAuthToken', shortLivedAuthToken);

From afd324052baeafc3463564b4f0f6ae2f4021c251 Mon Sep 17 00:00:00 2001
From: Andrew Rosiclair <arosiclair@expensify.com>
Date: Tue, 22 Aug 2023 11:40:17 -0400
Subject: [PATCH 141/214] remove disabled for merchant/distance item

---
 src/components/ReportActionItem/MoneyRequestView.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index ac7c0784c499..85fa14987d6b 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -167,7 +167,6 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
                     description={isDistanceRequest ? translate('tabSelector.distance') : translate('common.merchant')}
                     title={transactionMerchant}
                     shouldShowRightIcon={false}
-                    disabled
                 />
             </OfflineWithFeedback>
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}

From 931524f4f64bd67c46ca0abb2bc93598b79fac34 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 17:04:34 +0100
Subject: [PATCH 142/214] Implement the edit merchant page

---
 src/libs/ReportUtils.js              |  4 ++
 src/libs/TransactionUtils.js         |  1 +
 src/libs/actions/IOU.js              |  4 +-
 src/pages/EditRequestMerchantPage.js | 61 ++++++++++++++++++++++++++++
 src/pages/EditRequestPage.js         | 19 ++++++++-
 5 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/EditRequestMerchantPage.js

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 99dd31ab99aa..f5e225677d4c 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1449,6 +1449,10 @@ function getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, i
         originalMessage.oldCreated = TransactionUtils.getCreated(oldTransaction);
         originalMessage.created = transactionChanges.created;
     }
+    if (_.has(transactionChanges, 'merchant')) {
+        originalMessage.oldMerchant = TransactionUtils.getMerchant(oldTransaction);
+        originalMessage.merchant = transactionChanges.merchant;
+    }
 
     // The amount is always a combination of the currency and the number value so when one changes we need to store both
     // to match how we handle the modified expense action in oldDot
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index f0e3dddd14f3..ceb07d78b469 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -128,6 +128,7 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
         ...(_.has(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
         ...(_.has(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
         ...(_.has(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(_.has(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
     };
 
     return updatedTransaction;
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 267b3eced25f..994898521048 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1006,6 +1006,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
                     amount: null,
                     created: null,
                     currency: null,
+                    merchant: null,
                 },
             },
         },
@@ -1032,7 +1033,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
     ];
 
     // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment} = ReportUtils.getTransactionDetails(updatedTransaction);
+    const {created, amount, currency, comment, merchant} = ReportUtils.getTransactionDetails(updatedTransaction);
     API.write(
         'EditMoneyRequest',
         {
@@ -1042,6 +1043,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             amount,
             currency,
             comment,
+            merchant,
         },
         {optimisticData, successData, failureData},
     );
diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
new file mode 100644
index 000000000000..104e3ae1f596
--- /dev/null
+++ b/src/pages/EditRequestMerchantPage.js
@@ -0,0 +1,61 @@
+import React, {useRef} from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import TextInput from '../components/TextInput';
+import ScreenWrapper from '../components/ScreenWrapper';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import Form from '../components/Form';
+import ONYXKEYS from '../ONYXKEYS';
+import styles from '../styles/styles';
+import Navigation from '../libs/Navigation/Navigation';
+import CONST from '../CONST';
+import useLocalize from '../hooks/useLocalize';
+
+const propTypes = {
+    /** Transaction default merchant value */
+    defaultMerchant: PropTypes.string.isRequired,
+
+    /** Callback to fire when the Save button is pressed  */
+    onSubmit: PropTypes.func.isRequired,
+};
+
+function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
+    const {translate} = useLocalize();
+    const merchantInputRef = useRef(null);
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            onEntryTransitionEnd={() => merchantInputRef.current && merchantInputRef.current.focus()}
+        >
+            <HeaderWithBackButton
+                title={translate('common.merchant')}
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <Form
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM}
+                onSubmit={onSubmit}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb4}>
+                    <TextInput
+                        inputID="merchant"
+                        name="merchant"
+                        defaultValue={defaultMerchant}
+                        label={translate('moneyRequestConfirmationList.merchant')}
+                        accessibilityLabel={translate('moneyRequestConfirmationList.merchant')}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                        ref={(e) => (merchantInputRef.current = e)}
+                    />
+                </View>
+            </Form>
+        </ScreenWrapper>
+    );
+}
+
+EditRequestMerchantPage.propTypes = propTypes;
+EditRequestMerchantPage.displayName = 'EditRequestMerchantPage';
+
+export default EditRequestMerchantPage;
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 8133acb0994e..83b0019315e4 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -12,6 +12,7 @@ import * as TransactionUtils from '../libs/TransactionUtils';
 import * as Policy from '../libs/actions/Policy';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../components/withCurrentUserPersonalDetails';
 import EditRequestDescriptionPage from './EditRequestDescriptionPage';
+import EditRequestMerchantPage from './EditRequestMerchantPage';
 import EditRequestCreatedPage from './EditRequestCreatedPage';
 import EditRequestAmountPage from './EditRequestAmountPage';
 import reportPropTypes from './reportPropTypes';
@@ -67,7 +68,7 @@ const defaultProps = {
 function EditRequestPage({report, route, parentReport, policy, session}) {
     const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
-    const {amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription} = ReportUtils.getTransactionDetails(transaction);
+    const {amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription, merchant: transactionMerchant} = ReportUtils.getTransactionDetails(transaction);
 
     const defaultCurrency = lodashGet(route, 'params.currency', '') || transactionCurrency;
 
@@ -151,6 +152,22 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
         );
     }
 
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.MERCHANT) {
+        return (
+            <EditRequestMerchantPage
+                defaultMerchant={transactionMerchant}
+                onSubmit={(transactionChanges) => {
+                    // In case the merchant hasn't been changed, do not make the API request.
+                    if (transactionChanges.merchant.trim() === transactionMerchant) {
+                        Navigation.dismissModal();
+                        return;
+                    }
+                    editMoneyRequest({merchant: transactionChanges.merchant.trim()});
+                }}
+            />
+        );
+    }
+
     return null;
 }
 

From 880ba045a6c50cc1bb1517b5a34c5a463210df5f Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 17:06:16 +0100
Subject: [PATCH 143/214] Remove disabled prop from the edit merchant row

---
 src/components/ReportActionItem/MoneyRequestView.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index 5d09c99d3533..b9bc405504df 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -166,8 +166,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
                 <MenuItemWithTopDescription
                     description={translate('common.merchant')}
                     title={transactionMerchant}
-                    shouldShowRightIcon={false}
-                    disabled
+                    shouldShowRightIcon={canEdit}
                 />
             </OfflineWithFeedback>
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}

From 1afa76898aec4992ce6cf651ef0c88106e79089a Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 17:11:23 +0100
Subject: [PATCH 144/214] Update tests

---
 src/CONST.js                                        |  3 +++
 src/components/ReportActionItem/MoneyRequestView.js |  3 +++
 src/libs/TransactionUtils.js                        |  4 ++--
 tests/actions/IOUTest.js                            | 12 ++++++------
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 70fe2c3f1c18..5fbc24710eec 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -661,6 +661,9 @@ const CONST = {
         DARK: 'dark',
         SYSTEM: 'system',
     },
+    TRANSACTION: {
+        DEFAULT_MERCHANT: 'Request',
+    },
     JSON_CODE: {
         SUCCESS: 200,
         BAD_REQUEST: 400,
diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index b9bc405504df..d31048e4a77e 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -166,7 +166,10 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
                 <MenuItemWithTopDescription
                     description={translate('common.merchant')}
                     title={transactionMerchant}
+                    disabled={isSettled || !canEdit}
                     shouldShowRightIcon={canEdit}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}
                 />
             </OfflineWithFeedback>
             {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index ceb07d78b469..c348c4d77dc7 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -43,7 +43,7 @@ function buildOptimisticTransaction(
     created = '',
     source = '',
     originalTransactionID = '',
-    merchant = CONST.REPORT.TYPE.IOU,
+    merchant = CONST.TRANSACTION.DEFAULT_MERCHANT,
     receipt = {},
     filename = '',
     existingTransactionID = null,
@@ -66,7 +66,7 @@ function buildOptimisticTransaction(
         currency,
         reportID,
         comment: commentJSON,
-        merchant: merchant || CONST.REPORT.TYPE.IOU,
+        merchant: merchant || CONST.TRANSACTION.DEFAULT_MERCHANT,
         created: created || DateUtils.getDBTime(),
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,
diff --git a/tests/actions/IOUTest.js b/tests/actions/IOUTest.js
index bf32c2ef8f9a..6fbbe19cec8e 100644
--- a/tests/actions/IOUTest.js
+++ b/tests/actions/IOUTest.js
@@ -293,7 +293,7 @@ describe('actions/IOU', () => {
                                     // The comment should be correct
                                     expect(transaction.comment.comment).toBe(comment);
 
-                                    expect(transaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
+                                    expect(transaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
 
                                     // It should be pending
                                     expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
@@ -477,7 +477,7 @@ describe('actions/IOU', () => {
                                     expect(newTransaction.reportID).toBe(iouReportID);
                                     expect(newTransaction.amount).toBe(amount);
                                     expect(newTransaction.comment.comment).toBe(comment);
-                                    expect(newTransaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
+                                    expect(newTransaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
                                     expect(newTransaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
                                     // The transactionID on the iou action should match the one from the transactions collection
@@ -620,7 +620,7 @@ describe('actions/IOU', () => {
                                         expect(transaction.reportID).toBe(iouReportID);
                                         expect(transaction.amount).toBe(amount);
                                         expect(transaction.comment.comment).toBe(comment);
-                                        expect(transaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
+                                        expect(transaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
                                         expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
                                         // The transactionID on the iou action should match the one from the transactions collection
@@ -1079,9 +1079,9 @@ describe('actions/IOU', () => {
                                     expect(vitTransaction.comment.comment).toBe(comment);
                                     expect(groupTransaction.comment.comment).toBe(comment);
 
-                                    expect(carlosTransaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
-                                    expect(julesTransaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
-                                    expect(vitTransaction.merchant).toBe(CONST.REPORT.TYPE.IOU);
+                                    expect(carlosTransaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
+                                    expect(julesTransaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
+                                    expect(vitTransaction.merchant).toBe(CONST.TRANSACTION.DEFAULT_MERCHANT);
                                     expect(groupTransaction.merchant).toBe(
                                         `Split bill with ${RORY_EMAIL}, ${CARLOS_EMAIL}, ${JULES_EMAIL}, and ${VIT_EMAIL} [${DateUtils.getDBTime().slice(0, 10)}]`,
                                     );

From 4fd293e7f5d3e2244e0f499234cc5ea0ff448cc0 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 17:13:19 +0100
Subject: [PATCH 145/214] Swap the created and merchant order for the modified
 expense messahe

---
 src/libs/ReportUtils.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index f5e225677d4c..83b1bca9a13e 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1411,11 +1411,6 @@ function getModifiedExpenseMessage(reportAction) {
         return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.newComment, reportActionOriginalMessage.oldComment, 'description', true);
     }
 
-    const hasModifiedMerchant = _.has(reportActionOriginalMessage, 'oldMerchant') && _.has(reportActionOriginalMessage, 'merchant');
-    if (hasModifiedMerchant) {
-        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.merchant, reportActionOriginalMessage.oldMerchant, 'merchant', true);
-    }
-
     const hasModifiedCreated = _.has(reportActionOriginalMessage, 'oldCreated') && _.has(reportActionOriginalMessage, 'created');
     if (hasModifiedCreated) {
         // Take only the YYYY-MM-DD value as the original date includes timestamp
@@ -1423,6 +1418,11 @@ function getModifiedExpenseMessage(reportAction) {
         formattedOldCreated = format(formattedOldCreated, CONST.DATE.FNS_FORMAT_STRING);
         return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.created, formattedOldCreated, 'date', false);
     }
+
+    const hasModifiedMerchant = _.has(reportActionOriginalMessage, 'oldMerchant') && _.has(reportActionOriginalMessage, 'merchant');
+    if (hasModifiedMerchant) {
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.merchant, reportActionOriginalMessage.oldMerchant, 'merchant', true);
+    }
 }
 
 /**

From 8d17b2c53edd0c09b4732a22a21f0357b05165fe Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 22 Aug 2023 17:35:59 +0100
Subject: [PATCH 146/214] Polish

---
 package-lock.json                              | 2 +-
 src/components/MoneyRequestConfirmationList.js | 2 +-
 src/pages/EditRequestMerchantPage.js           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e0f6c8ab897b..36f7380189d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -107,7 +107,7 @@
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-lottie": "^1.4.4",
         "react-native-webview": "^11.17.2",
-        "react-native-x-maps": "1.0.9",
+        "react-native-x-maps": "^1.0.9",
         "react-pdf": "^6.2.2",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index ffd65cfb8f74..50ba4aba95c1 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -386,7 +386,7 @@ function MoneyRequestConfirmationList(props) {
                     />
                     <MenuItemWithTopDescription
                         shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
-                        title={props.iouMerchant}
+                        title={props.iouMerchant || CONST.TRANSACTION.DEFAULT_MERCHANT}
                         description={translate('common.merchant')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
                         titleStyle={styles.flex1}
diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
index 104e3ae1f596..c9c4cfbdbfaf 100644
--- a/src/pages/EditRequestMerchantPage.js
+++ b/src/pages/EditRequestMerchantPage.js
@@ -44,8 +44,8 @@ function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
                         inputID="merchant"
                         name="merchant"
                         defaultValue={defaultMerchant}
-                        label={translate('moneyRequestConfirmationList.merchant')}
-                        accessibilityLabel={translate('moneyRequestConfirmationList.merchant')}
+                        label={translate('common.merchant')}
+                        accessibilityLabel={translate('common.merchant')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                         ref={(e) => (merchantInputRef.current = e)}
                     />

From f485cae348e60dbaf105a41aa400a4a773b0f197 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 17:55:13 +0100
Subject: [PATCH 147/214] Initial Bottom Banner Styling

---
 src/components/ConfirmContent.js | 110 +++++++++++++++++++++++++------
 src/components/ConfirmModal.js   |  22 +++++++
 src/components/MobileBanner.js   | 103 ++++++++++++++++-------------
 src/languages/en.js              |   3 +-
 src/languages/es.js              |   1 +
 5 files changed, 173 insertions(+), 66 deletions(-)

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 6981fd451309..94c215090393 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -8,6 +8,9 @@ import Button from './Button';
 import useLocalize from '../hooks/useLocalize';
 import useNetwork from '../hooks/useNetwork';
 import Text from './Text';
+import variables from '../styles/variables';
+import AppIcon from '../../assets/images/expensify-app-icon.svg';
+import Icon from './Icon';
 
 const propTypes = {
     /** Title of the modal */
@@ -40,9 +43,28 @@ const propTypes = {
     /** Whether we should show the cancel button */
     shouldShowCancelButton: PropTypes.bool,
 
+    iconSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+
+    shouldCenterContent: PropTypes.bool,
+
+    /** Styles for title */
+    // eslint-disable-next-line react/forbid-prop-types
+    titleStyles: PropTypes.arrayOf(PropTypes.object),
+
+
+    /** Styles for prompt */
+    // eslint-disable-next-line react/forbid-prop-types
+    promptStyles: PropTypes.arrayOf(PropTypes.object),
+
+
     /** Styles for view */
     // eslint-disable-next-line react/forbid-prop-types
     contentStyles: PropTypes.arrayOf(PropTypes.object),
+
+
+    /** Styles for icon */
+    // eslint-disable-next-line react/forbid-prop-types
+    iconStyles: PropTypes.arrayOf(PropTypes.object),
 };
 
 const defaultProps = {
@@ -55,6 +77,12 @@ const defaultProps = {
     shouldDisableConfirmButtonWhenOffline: false,
     shouldShowCancelButton: true,
     contentStyles: [],
+    iconSource: null,
+    shouldCenterContent: false,
+    titleStyles: [],
+    promptStyles: [],
+    iconStyles: [],
+
 };
 
 function ConfirmContent(props) {
@@ -63,29 +91,69 @@ function ConfirmContent(props) {
 
     return (
         <View style={[styles.m5, ...props.contentStyles]}>
-            <View style={[styles.flexRow, styles.mb4]}>
-                <Header title={props.title} />
+            <View style={props.shouldCenterContent ? [styles.alignItemsCenter, styles.mb6] : []}>
+                {!_.isEmpty(props.iconSource) || _.isFunction(props.iconSource) && (
+                    <View style={[styles.flexRow, styles.mb3]}>
+                        <Icon
+                            src={props.iconSource}
+                            width={variables.mobileBannerAppIconSize}
+                            height={variables.mobileBannerAppIconSize}
+                            additionalStyles={[[...props.iconStyles]]}
+                        />
+                    </View>
+                )}
+
+                <View style={[styles.flexRow, props.shouldCenterContent  ? {} : styles.mb4]}>
+                    <Header title={props.title} textStyles={[...props.titleStyles]}/>
+                </View>
+
+                {_.isString(props.prompt) ? <Text style={[...props.promptStyles, props.shouldCenterContent ? styles.textAlignCenter : {}]}>{props.prompt}</Text> : props.prompt}
             </View>
 
-            {_.isString(props.prompt) ? <Text>{props.prompt}</Text> : props.prompt}
-
-            <Button
-                success={props.success}
-                danger={props.danger}
-                style={[styles.mt4]}
-                onPress={props.onConfirm}
-                pressOnEnter
-                text={props.confirmText || translate('common.yes')}
-                isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
-            />
-            {props.shouldShowCancelButton && (
-                <Button
-                    style={[styles.mt3, styles.noSelect]}
-                    onPress={props.onCancel}
-                    text={props.cancelText || translate('common.no')}
-                    shouldUseDefaultHover
-                />
-            )}
+            {props.shouldCenterContent ? (
+                <View style={[styles.flexRow, styles.gap4]}>
+                    {props.shouldShowCancelButton && (
+                        <Button
+                            style={[styles.noSelect, styles.flex1]}
+                            onPress={props.onCancel}
+                            text={props.cancelText || translate('common.no')}
+                            shouldUseDefaultHover
+                            medium
+                        />
+                    )}
+                    <Button
+                        success={props.success}
+                        danger={props.danger}
+                        style={[styles.flex1]}
+                        onPress={props.onConfirm}
+                        pressOnEnter
+                        text={props.confirmText || translate('common.yes')}
+                        isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
+                        medium
+                    />
+                </View>
+            ) : (
+                <>
+                    <Button
+                        success={props.success}
+                        danger={props.danger}
+                        style={[styles.mt4]}
+                        onPress={props.onConfirm}
+                        pressOnEnter
+                        text={props.confirmText || translate('common.yes')}
+                        isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
+                    />
+                    {props.shouldShowCancelButton && (
+                        <Button
+                            style={[styles.mt3, styles.noSelect]}
+                            onPress={props.onCancel}
+                            text={props.cancelText || translate('common.no')}
+                            shouldUseDefaultHover
+                        />
+                    ) }
+                </>
+            )
+        }
         </View>
     );
 }
diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js
index 56bcfe933aaf..e1b25fc0914a 100755
--- a/src/components/ConfirmModal.js
+++ b/src/components/ConfirmModal.js
@@ -45,6 +45,19 @@ const propTypes = {
     /** Should we announce the Modal visibility changes? */
     shouldSetModalVisibility: PropTypes.bool,
 
+    iconSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+
+    /** Styles for title */
+    // eslint-disable-next-line react/forbid-prop-types
+    titleStyles: PropTypes.arrayOf(PropTypes.object),
+
+
+    /** Styles for prompt */
+    // eslint-disable-next-line react/forbid-prop-types
+    promptStyles: PropTypes.arrayOf(PropTypes.object),
+
+    shouldCenterContent: PropTypes.bool,
+
     ...windowDimensionsPropTypes,
 };
 
@@ -59,7 +72,11 @@ const defaultProps = {
     shouldShowCancelButton: true,
     shouldSetModalVisibility: true,
     title: '',
+    iconSource: null,
+    shouldCenterContent: false,
     onModalHide: () => {},
+    titleStyles: [],
+    promptStyles: [],
 };
 
 function ConfirmModal(props) {
@@ -85,6 +102,11 @@ function ConfirmModal(props) {
                 danger={props.danger}
                 shouldDisableConfirmButtonWhenOffline={props.shouldDisableConfirmButtonWhenOffline}
                 shouldShowCancelButton={props.shouldShowCancelButton}
+                shouldCenterContent={props.shouldCenterContent}
+                iconSource={props.iconSource}
+                iconStyles={props.iconStyles}
+                titleStyles={props.titleStyles}
+                promptStyles={props.promptStyles}
             />
         </Modal>
     );
diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index fe78ee8b110d..66463f916cb6 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -18,6 +18,7 @@ import * as Link from '../libs/actions/Link';
 import * as Browser from '../libs/Browser';
 import getOperatingSystem from '../libs/getOperatingSystem';
 import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
+import ConfirmModal from './ConfirmModal';
 
 const propTypes = {
     showDownloadAppBanner: PropTypes.bool,
@@ -28,7 +29,9 @@ const defaultProps = {
 };
 
 function MobileBanner({showDownloadAppBanner}) {
-    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() && showDownloadAppBanner);
+    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() || true);
+    const [isModalOpen, setIsModalOpen] = useState(true);
+
     const {translate} = useLocalize();
 
     const handleCloseBanner = () => {
@@ -49,49 +52,61 @@ function MobileBanner({showDownloadAppBanner}) {
     };
 
     return (
-        shouldShowBanner && (
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv4, styles.ph5, styles.gap4, styles.activeComponentBG, styles.mw100]}>
-                <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
-                    <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
-                        <Icon
-                            src={AppIcon}
-                            width={variables.mobileBannerAppIconSize}
-                            height={variables.mobileBannerAppIconSize}
-                            additionalStyles={[styles.appIconBorderRadius]}
-                        />
-                        <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
-                            <Text
-                                style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
-                                suppressHighlighting
-                            >
-                                {translate('mobileBanner.downloadTheApp')}
-                            </Text>
-                            <Text
-                                style={[styles.alignSelfStretch, styles.textLabel, styles.lh16]}
-                                suppressHighlighting
-                            >
-                                {translate('mobileBanner.keepTheConversationGoing')}
-                            </Text>
-                        </View>
-                    </View>
-                </View>
-                <Button
-                    small
-                    success
-                    text={translate('common.download')}
-                    onPress={handleOpenAppStore}
-                />
-                <Tooltip text={translate('common.close')}>
-                    <PressableWithFeedback
-                        onPress={handleCloseBanner}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                        accessibilityLabel={translate('common.close')}
-                    >
-                        <Icon src={Expensicons.Close} />
-                    </PressableWithFeedback>
-                </Tooltip>
-            </View>
-        )
+        <ConfirmModal
+            title={translate('mobileBanner.downloadTheApp')}
+            isVisible={shouldShowBanner}
+            onConfirm={handleOpenAppStore}
+            onCancel={handleCloseBanner}
+            prompt={translate('mobileBanner.keepTheConversationGoing')}
+            confirmText={translate('common.download')}
+            cancelText={translate('mobileBanner.noThanks')}
+            // shouldCenterContent
+            iconSource={AppIcon}
+            promptStyles={[styles.textNormal, styles.lh20]}
+            titleStyles={[styles.textHeadline]}
+            iconStyles={[styles.appIconBorderRadius]}
+        />
+        // <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv4, styles.ph5, styles.gap4, styles.activeComponentBG, styles.mw100]}>
+        //     <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
+        //         <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
+        //             <Icon
+        //                 src={AppIcon}
+        //                 width={variables.mobileBannerAppIconSize}
+        //                 height={variables.mobileBannerAppIconSize}
+        //                 additionalStyles={[styles.appIconBorderRadius]}
+        //             />
+        //             <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
+        //                 <Text
+        //                     style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
+        //                     suppressHighlighting
+        //                 >
+        //                     {translate('mobileBanner.downloadTheApp')}
+        //                 </Text>
+        //                 <Text
+        //                     style={[styles.alignSelfStretch, styles.textLabel, styles.lh16]}
+        //                     suppressHighlighting
+        //                 >
+        //                     {translate('mobileBanner.keepTheConversationGoing')}
+        //                 </Text>
+        //             </View>
+        //         </View>
+        //     </View>
+        //     <Button
+        //         small
+        //         success
+        //         text={translate('common.download')}
+        //         onPress={handleOpenAppStore}
+        //     />
+        //     <Tooltip text={translate('common.close')}>
+        //         <PressableWithFeedback
+        //             onPress={handleCloseBanner}
+        //             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+        //             accessibilityLabel={translate('common.close')}
+        //         >
+        //             <Icon src={Expensicons.Close} />
+        //         </PressableWithFeedback>
+        //     </Tooltip>
+        // </View>
     );
 }
 
diff --git a/src/languages/en.js b/src/languages/en.js
index 492e538730cc..380fca6c9353 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -248,7 +248,8 @@ export default {
     },
     mobileBanner: {
         downloadTheApp: 'Download the app',
-        keepTheConversationGoing: 'Keep the conversation going in New Expensify.',
+        keepTheConversationGoing: 'Keep the conversation going in New Expensify, download the app for an enhanced experience.',
+        noThanks: 'No thanks',
     },
     login: {
         hero: {
diff --git a/src/languages/es.js b/src/languages/es.js
index 9c7bab9538b9..f283dd7c6f6d 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -248,6 +248,7 @@ export default {
     mobileBanner: {
         downloadTheApp: 'Descarga la aplicación',
         keepTheConversationGoing: 'Mantén la conversación en New Expensify.',
+        noThanks: '',
     },
     login: {
         hero: {

From 9bcb4291e31bd24a6ba6326700f78eb95249f000 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 17:57:02 +0100
Subject: [PATCH 148/214] center styling

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

diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
index 66463f916cb6..061021f9b39f 100644
--- a/src/components/MobileBanner.js
+++ b/src/components/MobileBanner.js
@@ -60,7 +60,7 @@ function MobileBanner({showDownloadAppBanner}) {
             prompt={translate('mobileBanner.keepTheConversationGoing')}
             confirmText={translate('common.download')}
             cancelText={translate('mobileBanner.noThanks')}
-            // shouldCenterContent
+            shouldCenterContent
             iconSource={AppIcon}
             promptStyles={[styles.textNormal, styles.lh20]}
             titleStyles={[styles.textHeadline]}

From 955e5adddfd3e4c31e65ec55633cc205f6647e10 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 18:32:53 +0100
Subject: [PATCH 149/214] Rename to DownloadAppModal, clean up

---
 src/Expensify.js                   |   4 +-
 src/components/ConfirmContent.js   |  20 ++---
 src/components/ConfirmModal.js     |   8 +-
 src/components/DownloadAppModal.js |  73 +++++++++++++++++
 src/components/MobileBanner.js     | 121 -----------------------------
 src/languages/en.js                |   2 +-
 src/languages/es.js                |   6 +-
 src/styles/variables.js            |   2 +-
 8 files changed, 98 insertions(+), 138 deletions(-)
 create mode 100644 src/components/DownloadAppModal.js
 delete mode 100644 src/components/MobileBanner.js

diff --git a/src/Expensify.js b/src/Expensify.js
index 497f5c8563a2..a29d26f469c0 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -30,7 +30,7 @@ import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import MobileBanner from './components/MobileBanner';
+import DownloadAppModal from './components/DownloadAppModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
@@ -190,7 +190,7 @@ function Expensify(props) {
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
-                    <MobileBanner />
+                    <DownloadAppModal />
                     <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />
                     {/* We include the modal for showing a new update at the top level so the option is always present. */}
                     {props.updateAvailable ? <UpdateAppModal /> : null}
diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 94c215090393..e761abdbd739 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -64,7 +64,7 @@ const propTypes = {
 
     /** Styles for icon */
     // eslint-disable-next-line react/forbid-prop-types
-    iconStyles: PropTypes.arrayOf(PropTypes.object),
+    iconAdditionalStyles: PropTypes.arrayOf(PropTypes.object),
 };
 
 const defaultProps = {
@@ -81,7 +81,7 @@ const defaultProps = {
     shouldCenterContent: false,
     titleStyles: [],
     promptStyles: [],
-    iconStyles: [],
+    iconAdditionalStyles: [],
 
 };
 
@@ -89,28 +89,30 @@ function ConfirmContent(props) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
+    const isCentered = props.shouldCenterContent;
+
     return (
         <View style={[styles.m5, ...props.contentStyles]}>
-            <View style={props.shouldCenterContent ? [styles.alignItemsCenter, styles.mb6] : []}>
+            <View style={isCentered ? [styles.alignItemsCenter, styles.mb6] : []}>
                 {!_.isEmpty(props.iconSource) || _.isFunction(props.iconSource) && (
                     <View style={[styles.flexRow, styles.mb3]}>
                         <Icon
                             src={props.iconSource}
-                            width={variables.mobileBannerAppIconSize}
-                            height={variables.mobileBannerAppIconSize}
-                            additionalStyles={[[...props.iconStyles]]}
+                            width={variables.downloadAppModalAppIconSize}
+                            height={variables.downloadAppModalAppIconSize}
+                            additionalStyles={[...props.iconAdditionalStyles]}
                         />
                     </View>
                 )}
 
-                <View style={[styles.flexRow, props.shouldCenterContent  ? {} : styles.mb4]}>
+                <View style={[styles.flexRow, isCentered  ? {} : styles.mb4]}>
                     <Header title={props.title} textStyles={[...props.titleStyles]}/>
                 </View>
 
-                {_.isString(props.prompt) ? <Text style={[...props.promptStyles, props.shouldCenterContent ? styles.textAlignCenter : {}]}>{props.prompt}</Text> : props.prompt}
+                {_.isString(props.prompt) ? <Text style={[...props.promptStyles, isCentered ? styles.textAlignCenter : {}]}>{props.prompt}</Text> : props.prompt}
             </View>
 
-            {props.shouldCenterContent ? (
+            {isCentered ? (
                 <View style={[styles.flexRow, styles.gap4]}>
                     {props.shouldShowCancelButton && (
                         <Button
diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js
index e1b25fc0914a..44afbcb3ce9c 100755
--- a/src/components/ConfirmModal.js
+++ b/src/components/ConfirmModal.js
@@ -56,6 +56,11 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     promptStyles: PropTypes.arrayOf(PropTypes.object),
 
+    /** Styles for icon */
+    // eslint-disable-next-line react/forbid-prop-types
+    iconAdditionalStyles: PropTypes.arrayOf(PropTypes.object),
+
+
     shouldCenterContent: PropTypes.bool,
 
     ...windowDimensionsPropTypes,
@@ -76,6 +81,7 @@ const defaultProps = {
     shouldCenterContent: false,
     onModalHide: () => {},
     titleStyles: [],
+    iconAdditionalStyles: [],
     promptStyles: [],
 };
 
@@ -104,7 +110,7 @@ function ConfirmModal(props) {
                 shouldShowCancelButton={props.shouldShowCancelButton}
                 shouldCenterContent={props.shouldCenterContent}
                 iconSource={props.iconSource}
-                iconStyles={props.iconStyles}
+                iconAdditionalStyles={props.iconAdditionalStyles}
                 titleStyles={props.titleStyles}
                 promptStyles={props.promptStyles}
             />
diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
new file mode 100644
index 000000000000..d0d8ee13d6f6
--- /dev/null
+++ b/src/components/DownloadAppModal.js
@@ -0,0 +1,73 @@
+import React, {useState} from 'react';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../ONYXKEYS';
+import styles from '../styles/styles';
+import CONST from '../CONST';
+import AppIcon from '../../assets/images/expensify-app-icon.svg';
+import useLocalize from '../hooks/useLocalize';
+import * as Link from '../libs/actions/Link';
+import * as Browser from '../libs/Browser';
+import getOperatingSystem from '../libs/getOperatingSystem';
+import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
+import ConfirmModal from './ConfirmModal';
+
+const propTypes = {
+    /** ONYX PROP to hide banner for a user that has dismissed it */
+    // eslint-disable-next-line react/forbid-prop-types
+    showDownloadAppBanner: PropTypes.bool,
+};
+
+const defaultProps = {
+    showDownloadAppBanner: true,
+};
+
+function DownloadAppModal({showDownloadAppBanner}) {
+    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() && showDownloadAppBanner);
+
+    const {translate} = useLocalize();
+
+    const handleCloseBanner = () => {
+        setShowDownloadAppBanner(false);
+        setshouldShowBanner(false);
+    };
+
+    let link = '';
+
+    if (getOperatingSystem() === CONST.OS.IOS) {
+        link = CONST.APP_DOWNLOAD_LINKS.IOS;
+    } else if (getOperatingSystem() === CONST.OS.ANDROID) {
+        link = CONST.APP_DOWNLOAD_LINKS.ANDROID;
+    }
+
+    const handleOpenAppStore = () => {
+        Link.openExternalLink(link, true);
+    };
+
+    return (
+        <ConfirmModal
+            title={translate('DownloadAppModal.downloadTheApp')}
+            isVisible={shouldShowBanner}
+            onConfirm={handleOpenAppStore}
+            onCancel={handleCloseBanner}
+            prompt={translate('DownloadAppModal.keepTheConversationGoing')}
+            confirmText={translate('common.download')}
+            cancelText={translate('DownloadAppModal.noThanks')}
+            shouldCenterContent
+            iconSource={AppIcon}
+            promptStyles={[styles.textNormal, styles.lh20]}
+            titleStyles={[styles.textHeadline]}
+            iconAdditionalStyles={[styles.appIconBorderRadius]}
+        />
+    );
+}
+
+DownloadAppModal.displayName = 'DownloadAppModal';
+DownloadAppModal.propTypes = propTypes;
+DownloadAppModal.defaultProps = defaultProps;
+
+export default withOnyx({
+    showDownloadAppBanner: {
+        key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
+    },
+})(DownloadAppModal);
diff --git a/src/components/MobileBanner.js b/src/components/MobileBanner.js
deleted file mode 100644
index 061021f9b39f..000000000000
--- a/src/components/MobileBanner.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import React, {useState} from 'react';
-import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
-import styles from '../styles/styles';
-import Icon from './Icon';
-import * as Expensicons from './Icon/Expensicons';
-import Text from './Text';
-import Tooltip from './Tooltip';
-import PressableWithFeedback from './Pressable/PressableWithFeedback';
-import CONST from '../CONST';
-import AppIcon from '../../assets/images/expensify-app-icon.svg';
-import Button from './Button';
-import variables from '../styles/variables';
-import useLocalize from '../hooks/useLocalize';
-import * as Link from '../libs/actions/Link';
-import * as Browser from '../libs/Browser';
-import getOperatingSystem from '../libs/getOperatingSystem';
-import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
-import ConfirmModal from './ConfirmModal';
-
-const propTypes = {
-    showDownloadAppBanner: PropTypes.bool,
-};
-
-const defaultProps = {
-    showDownloadAppBanner: true,
-};
-
-function MobileBanner({showDownloadAppBanner}) {
-    const [shouldShowBanner, setshouldShowBanner] = useState(Browser.isMobile() || true);
-    const [isModalOpen, setIsModalOpen] = useState(true);
-
-    const {translate} = useLocalize();
-
-    const handleCloseBanner = () => {
-        setShowDownloadAppBanner(false);
-        setshouldShowBanner(false);
-    };
-
-    let link = '';
-
-    if (getOperatingSystem() === CONST.OS.IOS) {
-        link = CONST.APP_DOWNLOAD_LINKS.IOS;
-    } else if (getOperatingSystem() === CONST.OS.ANDROID) {
-        link = CONST.APP_DOWNLOAD_LINKS.ANDROID;
-    }
-
-    const handleOpenAppStore = () => {
-        Link.openExternalLink(link, true);
-    };
-
-    return (
-        <ConfirmModal
-            title={translate('mobileBanner.downloadTheApp')}
-            isVisible={shouldShowBanner}
-            onConfirm={handleOpenAppStore}
-            onCancel={handleCloseBanner}
-            prompt={translate('mobileBanner.keepTheConversationGoing')}
-            confirmText={translate('common.download')}
-            cancelText={translate('mobileBanner.noThanks')}
-            shouldCenterContent
-            iconSource={AppIcon}
-            promptStyles={[styles.textNormal, styles.lh20]}
-            titleStyles={[styles.textHeadline]}
-            iconStyles={[styles.appIconBorderRadius]}
-        />
-        // <View style={[styles.flexRow, styles.alignItemsCenter, styles.pv4, styles.ph5, styles.gap4, styles.activeComponentBG, styles.mw100]}>
-        //     <View style={[styles.flex1, styles.flexRow, styles.flexGrow1, styles.alignItemsCenter]}>
-        //         <View style={[styles.alignItemsCenter, styles.gap3, styles.flexRow, styles.flex1]}>
-        //             <Icon
-        //                 src={AppIcon}
-        //                 width={variables.mobileBannerAppIconSize}
-        //                 height={variables.mobileBannerAppIconSize}
-        //                 additionalStyles={[styles.appIconBorderRadius]}
-        //             />
-        //             <View style={[styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.flex1]}>
-        //                 <Text
-        //                     style={[styles.alignSelfStretch, styles.textLabel, styles.textStrong]}
-        //                     suppressHighlighting
-        //                 >
-        //                     {translate('mobileBanner.downloadTheApp')}
-        //                 </Text>
-        //                 <Text
-        //                     style={[styles.alignSelfStretch, styles.textLabel, styles.lh16]}
-        //                     suppressHighlighting
-        //                 >
-        //                     {translate('mobileBanner.keepTheConversationGoing')}
-        //                 </Text>
-        //             </View>
-        //         </View>
-        //     </View>
-        //     <Button
-        //         small
-        //         success
-        //         text={translate('common.download')}
-        //         onPress={handleOpenAppStore}
-        //     />
-        //     <Tooltip text={translate('common.close')}>
-        //         <PressableWithFeedback
-        //             onPress={handleCloseBanner}
-        //             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-        //             accessibilityLabel={translate('common.close')}
-        //         >
-        //             <Icon src={Expensicons.Close} />
-        //         </PressableWithFeedback>
-        //     </Tooltip>
-        // </View>
-    );
-}
-
-MobileBanner.displayName = 'MobileBanner';
-MobileBanner.propTypes = propTypes;
-MobileBanner.defaultProps = defaultProps;
-
-export default withOnyx({
-    showDownloadAppBanner: {
-        key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-    },
-})(MobileBanner);
diff --git a/src/languages/en.js b/src/languages/en.js
index 380fca6c9353..9d2b76053a3c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -246,7 +246,7 @@ export default {
         newFaceEnterMagicCode: ({login}) => `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
         welcomeEnterMagicCode: ({login}) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
-    mobileBanner: {
+    DownloadAppModal: {
         downloadTheApp: 'Download the app',
         keepTheConversationGoing: 'Keep the conversation going in New Expensify, download the app for an enhanced experience.',
         noThanks: 'No thanks',
diff --git a/src/languages/es.js b/src/languages/es.js
index f283dd7c6f6d..fbf372bda00b 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -245,10 +245,10 @@ export default {
         newFaceEnterMagicCode: ({login}) => `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
         welcomeEnterMagicCode: ({login}) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
-    mobileBanner: {
+    DownloadAppModal: {
         downloadTheApp: 'Descarga la aplicación',
-        keepTheConversationGoing: 'Mantén la conversación en New Expensify.',
-        noThanks: '',
+        keepTheConversationGoing: 'Mantén la conversación en New Expensify, descarga la aplicación para una experiencia mejorada.',
+        noThanks: 'No, gracias',
     },
     login: {
         hero: {
diff --git a/src/styles/variables.js b/src/styles/variables.js
index 4b0436ff6ed3..2614e1313cda 100644
--- a/src/styles/variables.js
+++ b/src/styles/variables.js
@@ -28,7 +28,7 @@ export default {
     componentBorderRadiusLarge: 16,
     componentBorderRadiusCard: 12,
     componentBorderRadiusRounded: 24,
-    mobileBannerAppIconSize: 48,
+    downloadAppModalAppIconSize: 48,
     buttonBorderRadius: 100,
     avatarSizeLargeBordered: 88,
     avatarSizeLarge: 80,

From 163f58cf6076dff441ea7d0b41982e70c761b1b5 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 18:33:43 +0100
Subject: [PATCH 150/214] prettier

---
 src/components/ConfirmContent.js | 39 ++++++++++++++++----------------
 src/components/ConfirmModal.js   |  2 --
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index e761abdbd739..5c85ec659908 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -51,17 +51,14 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     titleStyles: PropTypes.arrayOf(PropTypes.object),
 
-
     /** Styles for prompt */
     // eslint-disable-next-line react/forbid-prop-types
     promptStyles: PropTypes.arrayOf(PropTypes.object),
 
-
     /** Styles for view */
     // eslint-disable-next-line react/forbid-prop-types
     contentStyles: PropTypes.arrayOf(PropTypes.object),
 
-
     /** Styles for icon */
     // eslint-disable-next-line react/forbid-prop-types
     iconAdditionalStyles: PropTypes.arrayOf(PropTypes.object),
@@ -82,7 +79,6 @@ const defaultProps = {
     titleStyles: [],
     promptStyles: [],
     iconAdditionalStyles: [],
-
 };
 
 function ConfirmContent(props) {
@@ -94,19 +90,23 @@ function ConfirmContent(props) {
     return (
         <View style={[styles.m5, ...props.contentStyles]}>
             <View style={isCentered ? [styles.alignItemsCenter, styles.mb6] : []}>
-                {!_.isEmpty(props.iconSource) || _.isFunction(props.iconSource) && (
-                    <View style={[styles.flexRow, styles.mb3]}>
-                        <Icon
-                            src={props.iconSource}
-                            width={variables.downloadAppModalAppIconSize}
-                            height={variables.downloadAppModalAppIconSize}
-                            additionalStyles={[...props.iconAdditionalStyles]}
-                        />
-                    </View>
-                )}
-
-                <View style={[styles.flexRow, isCentered  ? {} : styles.mb4]}>
-                    <Header title={props.title} textStyles={[...props.titleStyles]}/>
+                {!_.isEmpty(props.iconSource) ||
+                    (_.isFunction(props.iconSource) && (
+                        <View style={[styles.flexRow, styles.mb3]}>
+                            <Icon
+                                src={props.iconSource}
+                                width={variables.downloadAppModalAppIconSize}
+                                height={variables.downloadAppModalAppIconSize}
+                                additionalStyles={[...props.iconAdditionalStyles]}
+                            />
+                        </View>
+                    ))}
+
+                <View style={[styles.flexRow, isCentered ? {} : styles.mb4]}>
+                    <Header
+                        title={props.title}
+                        textStyles={[...props.titleStyles]}
+                    />
                 </View>
 
                 {_.isString(props.prompt) ? <Text style={[...props.promptStyles, isCentered ? styles.textAlignCenter : {}]}>{props.prompt}</Text> : props.prompt}
@@ -152,10 +152,9 @@ function ConfirmContent(props) {
                             text={props.cancelText || translate('common.no')}
                             shouldUseDefaultHover
                         />
-                    ) }
+                    )}
                 </>
-            )
-        }
+            )}
         </View>
     );
 }
diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js
index 44afbcb3ce9c..a008b90207fb 100755
--- a/src/components/ConfirmModal.js
+++ b/src/components/ConfirmModal.js
@@ -51,7 +51,6 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     titleStyles: PropTypes.arrayOf(PropTypes.object),
 
-
     /** Styles for prompt */
     // eslint-disable-next-line react/forbid-prop-types
     promptStyles: PropTypes.arrayOf(PropTypes.object),
@@ -60,7 +59,6 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     iconAdditionalStyles: PropTypes.arrayOf(PropTypes.object),
 
-
     shouldCenterContent: PropTypes.bool,
 
     ...windowDimensionsPropTypes,

From bc88a5e8cf01e3bb2fe8e8af54158384a4444e24 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 18:41:22 +0100
Subject: [PATCH 151/214] rename action to DownloadAppModal

---
 src/components/DownloadAppModal.js                            | 4 ++--
 .../actions/{DownloadAppBanner.js => DownloadAppModal.js}     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename src/libs/actions/{DownloadAppBanner.js => DownloadAppModal.js} (67%)

diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
index d0d8ee13d6f6..6d714979a34e 100644
--- a/src/components/DownloadAppModal.js
+++ b/src/components/DownloadAppModal.js
@@ -9,7 +9,7 @@ import useLocalize from '../hooks/useLocalize';
 import * as Link from '../libs/actions/Link';
 import * as Browser from '../libs/Browser';
 import getOperatingSystem from '../libs/getOperatingSystem';
-import setShowDownloadAppBanner from '../libs/actions/DownloadAppBanner';
+import setShowDownloadAppModal from '../libs/actions/DownloadAppModal';
 import ConfirmModal from './ConfirmModal';
 
 const propTypes = {
@@ -28,7 +28,7 @@ function DownloadAppModal({showDownloadAppBanner}) {
     const {translate} = useLocalize();
 
     const handleCloseBanner = () => {
-        setShowDownloadAppBanner(false);
+        setShowDownloadAppModal(false);
         setshouldShowBanner(false);
     };
 
diff --git a/src/libs/actions/DownloadAppBanner.js b/src/libs/actions/DownloadAppModal.js
similarity index 67%
rename from src/libs/actions/DownloadAppBanner.js
rename to src/libs/actions/DownloadAppModal.js
index d138a4cf67c9..5dc2d3fdca22 100644
--- a/src/libs/actions/DownloadAppBanner.js
+++ b/src/libs/actions/DownloadAppModal.js
@@ -4,8 +4,8 @@ import ONYXKEYS from '../../ONYXKEYS';
 /**
  * @param {Boolean} shouldShowBanner
  */
-function setShowDownloadAppBanner(shouldShowBanner) {
+function setShowDownloadAppModal(shouldShowBanner) {
     Onyx.set(ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER, shouldShowBanner);
 }
 
-export default setShowDownloadAppBanner;
+export default setShowDownloadAppModal;

From f1633a609f52fb2fd19427cb0cd047f43eebeddc Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 22 Aug 2023 18:52:35 +0100
Subject: [PATCH 152/214] remove unused import for lint

---
 src/components/ConfirmContent.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 5c85ec659908..78b9a9d500e4 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -9,7 +9,6 @@ import useLocalize from '../hooks/useLocalize';
 import useNetwork from '../hooks/useNetwork';
 import Text from './Text';
 import variables from '../styles/variables';
-import AppIcon from '../../assets/images/expensify-app-icon.svg';
 import Icon from './Icon';
 
 const propTypes = {

From 944241e21938c9527ec9019362468051371991e2 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 11:02:02 -0700
Subject: [PATCH 153/214] use previous ref

---
 src/components/DistanceRequest.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index c619f3450212..009d4560a9c5 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -25,6 +25,7 @@ import ROUTES from '../ROUTES';
 import ScreenWrapper from './ScreenWrapper';
 import DotIndicatorMessage from './DotIndicatorMessage';
 import * as ErrorUtils from '../libs/ErrorUtils';
+import usePrevious from '../hooks/usePrevious';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
@@ -89,6 +90,8 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const lastWaypointIndex = numberOfWaypoints - 1;
     const isLoadingRoute = lodashGet(transaction, 'comment.isLoading', false);
     const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
+    const previousWaypoints = usePrevious(waypoints);
+    const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
 
     const waypointMarkers = _.filter(
         _.map(waypoints, (waypoint, key) => {
@@ -143,12 +146,8 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         setShouldShowGradient(visibleAreaEnd < scrollContentHeight);
     };
 
-    const previousWaypointsRef = useRef();
-
     // Handle fetching the route when there are at least 2 waypoints
     useEffect(() => {
-        // Check if the waypoints have changed by comparing with the previous value stored in the ref
-        const haveWaypointsChanged = !_.isEqual(previousWaypointsRef.current, waypoints);
         if (!haveWaypointsChanged) {
             return;
         }
@@ -159,8 +158,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         }
 
         Transaction.getRoute(transactionID, waypoints);
-        previousWaypointsRef.current = waypoints;
-    }, [numberOfWaypoints, waypoints, transactionID, isLoadingRoute, isOffline]);
+    }, [haveWaypointsChanged, waypoints, transactionID, isLoadingRoute, isOffline]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 

From 90b941e2445282e71b773c1f3746b7d522d097e5 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 11:30:52 -0700
Subject: [PATCH 154/214] lint

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

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 009d4560a9c5..1706479702c3 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useState, useRef} from 'react';
+import React, {useEffect, useState} from 'react';
 import {ScrollView, View} from 'react-native';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';

From a997962e5b67740b3b07f05b09b5a08e5fc1fd0d Mon Sep 17 00:00:00 2001
From: Anjana Mendiratta <expertsquarrel@gmail.com>
Date: Wed, 23 Aug 2023 00:16:40 +0530
Subject: [PATCH 155/214] fix: allow .xyz as rate input

Signed-off-by: Anjana Mendiratta <expertsquarrel@gmail.com>
---
 src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
index 021624082678..5a150c2c4eb2 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
@@ -93,8 +93,8 @@ class WorkspaceRateAndUnitPage extends React.Component {
     validate(values) {
         const errors = {};
         const decimalSeparator = this.props.toLocaleDigit('.');
-        const rateValueRegex = RegExp(String.raw`^\d{1,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,3})?$`, 'i');
-        if (!rateValueRegex.test(values.rate)) {
+        const rateValueRegex = RegExp(String.raw`^\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,3})?$`, 'i');
+        if (!rateValueRegex.test(values.rate) || values.rate === '') {
             errors.rate = 'workspace.reimburse.invalidRateError';
         }
         return errors;

From e8f719c289bafcc389df9b62cc33c35d0198334b Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 22 Aug 2023 22:14:07 +0300
Subject: [PATCH 156/214] Update src/pages/DemoSetupPage.js

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
---
 src/pages/DemoSetupPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index 69fad6493608..e665e61b5088 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -6,7 +6,7 @@ import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import CONST from '../CONST';
 import * as DemoActions from '../libs/actions/DemoActions';
-import * as Navigation from '../libs/Navigation/Navigation';
+import Navigation from '../libs/Navigation/Navigation';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */

From fb9ced7d7911bbfd94eb5bc79bba51d77429ae67 Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 23 Aug 2023 00:47:59 +0530
Subject: [PATCH 157/214] modify code to remove extra set

---
 src/libs/EmojiUtils.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index cafb98ef65b7..239112215b28 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -266,29 +266,24 @@ const getEmojiCodeWithSkinColor = (item, preferredSkinToneIndex) => {
  * @returns {Object[]} An array of emoji codes.
  */
 function extractEmojis(text) {
-    const emojis = [];
-
     if (!text) {
-        return emojis;
+        return [];
     }
 
-    let parseEmojis = text.match(CONST.REGEX.EMOJIS);
+    // Parsed Emojis including skin tones - Eg: ['👩🏻', '👩🏻', '👩🏼', '👩🏻', '👩🏼', '👩']
+    const parsedEmojis = text.match(CONST.REGEX.EMOJIS);
 
-    if (!parseEmojis) {
-        return emojis;
+    if (!parsedEmojis) {
+        return [];
     }
 
-    // Some emojis are repeated with different skin tones
-    parseEmojis = [...new Set(parseEmojis)];
-
+    const emojis = [];
     const alreadyParsedEmojis = new Set();
 
-    for (let i = 0; i < parseEmojis.length; i++) {
-        const character = parseEmojis[i];
+    for (let i = 0; i < parsedEmojis.length; i++) {
+        const character = parsedEmojis[i];
         const emoji = Emojis.emojiCodeTableWithSkinTones[character];
-
         if (emoji && !alreadyParsedEmojis.has(emoji.code)) {
-            // Add to set to avoid duplicates due to different skin tones of the same emoji
             alreadyParsedEmojis.add(emoji.code);
             emojis.push(emoji);
         }

From 3ea66119237ca8fdceab1b20563012eff0fc2cab Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 23 Aug 2023 01:03:42 +0530
Subject: [PATCH 158/214] Added comments and updated variable name

---
 src/libs/EmojiUtils.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index 239112215b28..f16db7244031 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -278,13 +278,17 @@ function extractEmojis(text) {
     }
 
     const emojis = [];
-    const alreadyParsedEmojis = new Set();
+
+    // Text can contain similar emojis as well as their skin tone variants. Create a Set to remove duplicate emojis from the search.
+    const foundEmojiCodes = new Set();
 
     for (let i = 0; i < parsedEmojis.length; i++) {
         const character = parsedEmojis[i];
         const emoji = Emojis.emojiCodeTableWithSkinTones[character];
-        if (emoji && !alreadyParsedEmojis.has(emoji.code)) {
-            alreadyParsedEmojis.add(emoji.code);
+
+        // Add the parsed emoji to the final emojis if not already present.
+        if (emoji && !foundEmojiCodes.has(emoji.code)) {
+            foundEmojiCodes.add(emoji.code);
             emojis.push(emoji);
         }
     }

From ac14e22c51e8b72b7bd90a7695bf612c6fbaf7b8 Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 22 Aug 2023 22:39:46 +0300
Subject: [PATCH 159/214] Address feedback after review.

---
 src/libs/ReportUtils.js           |  6 +++++-
 src/libs/actions/Policy.js        |  1 -
 src/pages/DemoSetupPage.js        |  8 +-------
 src/pages/signin/DemoSetupPage.js | 12 ------------
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 src/pages/signin/DemoSetupPage.js

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index a487e3ca3896..a1b52b468735 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3115,7 +3115,11 @@ function getPolicyExpenseChatReportIDByOwner(policyOwner) {
         return null;
     }
 
-    return _.find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policyWithOwner.id);
+    const expenseChat = _.find(allReports, (report) => isPolicyExpenseChat(report) && report.policyID === policyWithOwner.id);
+    if (!expenseChat) {
+        return null;
+    }
+    return expenseChat;
 }
 
 /*
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 556a3f5f6d5d..6cc539be9503 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -1201,6 +1201,5 @@ export {
     removeWorkspace,
     setWorkspaceInviteMembersDraft,
     clearErrors,
-    buildOptimisticCustomUnits,
     openDraftWorkspaceRequest,
 };
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index e665e61b5088..53739820142b 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -1,8 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
 import {useFocusEffect} from '@react-navigation/native';
-import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import CONST from '../CONST';
 import * as DemoActions from '../libs/actions/DemoActions';
@@ -40,8 +38,4 @@ function DemoSetupPage(props) {
 DemoSetupPage.propTypes = propTypes;
 DemoSetupPage.displayName = 'DemoSetupPage';
 
-export default withOnyx({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(DemoSetupPage);
+export default DemoSetupPage;
diff --git a/src/pages/signin/DemoSetupPage.js b/src/pages/signin/DemoSetupPage.js
deleted file mode 100644
index f457c3a5421a..000000000000
--- a/src/pages/signin/DemoSetupPage.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import SignInPage from './SignInPage';
-import useLocalize from '../../hooks/useLocalize';
-
-function DemoSetupPage() {
-    const {translate} = useLocalize();
-    return <SignInPage customHeadline={translate('login.hero.demoHeadline')} />;
-}
-
-DemoSetupPage.displayName = 'DemoSetupPage';
-
-export default DemoSetupPage;

From 090ba1795facf61904424134765a946b9f889700 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 12:47:41 -0700
Subject: [PATCH 160/214] Clear route on new waypoint

---
 src/libs/actions/Transaction.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 248e1abbc200..4f7b988b85ea 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -48,6 +48,14 @@ function addStop(transactionID) {
                 [`waypoint${newLastIndex}`]: {},
             },
         },
+        // Clear the existing route so that we don't show an old route
+        routes: {
+            route0: {
+                geometry: {
+                    coordinates: null,
+                },
+            },
+        },
     });
 }
 

From b54208582b049b48af153d54b0ca05da5aa84f46 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 12:56:11 -0700
Subject: [PATCH 161/214] style actually

---
 src/libs/actions/Transaction.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.js
index 4f7b988b85ea..02927bf7d111 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.js
@@ -48,6 +48,7 @@ function addStop(transactionID) {
                 [`waypoint${newLastIndex}`]: {},
             },
         },
+
         // Clear the existing route so that we don't show an old route
         routes: {
             route0: {

From a32515a848c793348ef7724e0a076748ad73e73b Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 22 Aug 2023 22:56:45 +0300
Subject: [PATCH 162/214] Fix conflicts after merge.

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

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 3c0b3ee9a6d6..074a5e99e6b1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -218,6 +218,9 @@ const ONYXKEYS = {
     // The access token to be used with the Mapbox library
     MAPBOX_ACCESS_TOKEN: 'mapboxAccessToken',
 
+    // Information on any active demos being run
+    DEMO_INFO: 'demoInfo',
+
     /** Collection Keys */
     COLLECTION: {
         DOWNLOAD: 'download_',

From f4e916a22983e77f5e6b7c53f49acd4fa99f855e Mon Sep 17 00:00:00 2001
From: jeet-dhandha <jeet.dhandha.2511@gmail.com>
Date: Wed, 23 Aug 2023 01:33:26 +0530
Subject: [PATCH 163/214] updated comment

---
 src/libs/EmojiUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/EmojiUtils.js b/src/libs/EmojiUtils.js
index f16db7244031..df00418b7524 100644
--- a/src/libs/EmojiUtils.js
+++ b/src/libs/EmojiUtils.js
@@ -270,7 +270,7 @@ function extractEmojis(text) {
         return [];
     }
 
-    // Parsed Emojis including skin tones - Eg: ['👩🏻', '👩🏻', '👩🏼', '👩🏻', '👩🏼', '👩']
+    // Parse Emojis including skin tones - Eg: ['👩🏻', '👩🏻', '👩🏼', '👩🏻', '👩🏼', '👩']
     const parsedEmojis = text.match(CONST.REGEX.EMOJIS);
 
     if (!parsedEmojis) {

From a694759c0bf3604b39e2d85f17f8051f0385a576 Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 22 Aug 2023 23:19:05 +0300
Subject: [PATCH 164/214] Update src/libs/ReportUtils.js

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
---
 src/libs/ReportUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index fa1fd1cb461b..5ba24f6ba513 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3118,7 +3118,7 @@ function getPolicyExpenseChatReportIDByOwner(policyOwner) {
     if (!expenseChat) {
         return null;
     }
-    return expenseChat;
+    return expenseChat.reportID;
 }
 
 /*

From 784dbf20e17af598f3e8927d5d629c8760ce3024 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 22 Aug 2023 14:49:13 -0600
Subject: [PATCH 165/214] DRY up the transaction proptypes

---
 src/components/DistanceRequest.js             | 21 ++------------
 .../ReportActionItem/MoneyRequestPreview.js   | 20 ++-----------
 src/components/transactionPropTypes.js        | 28 ++++++++++++++++++-
 src/pages/iou/WaypointEditor.js               | 21 ++------------
 4 files changed, 33 insertions(+), 57 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 8f07c7c05ecf..52bd07a1b1a8 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -21,6 +21,7 @@ import useNetwork from '../hooks/useNetwork';
 import useLocalize from '../hooks/useLocalize';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
+import transactionPropTypes from './transactionPropTypes';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
@@ -33,25 +34,7 @@ const propTypes = {
     transactionID: PropTypes.string,
 
     /** The optimistic transaction for this request */
-    transaction: PropTypes.shape({
-        /** The transactionID of this request */
-        transactionID: PropTypes.string,
-
-        /** The comment object on the transaction */
-        comment: PropTypes.shape({
-            /** The waypoints defining the distance request */
-            waypoints: PropTypes.shape({
-                /** The latitude of the waypoint */
-                lat: PropTypes.number,
-
-                /** The longitude of the waypoint */
-                lng: PropTypes.number,
-
-                /** The address of the waypoint */
-                address: PropTypes.string,
-            }),
-        }),
-    }),
+    transaction: transactionPropTypes,
 
     /** Data about Mapbox token for calling Mapbox API */
     mapboxAccessToken: PropTypes.shape({
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index ff6f1ece361f..52241f615a60 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -31,6 +31,7 @@ import refPropTypes from '../refPropTypes';
 import PressableWithFeedback from '../Pressable/PressableWithoutFeedback';
 import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import ReportActionItemImages from './ReportActionItemImages';
+import transactionPropTypes from '../transactionPropTypes';
 
 const propTypes = {
     /** The active IOUReport, used for Onyx subscription */
@@ -91,24 +92,7 @@ const propTypes = {
     ),
 
     /** The transaction attached to the action.message.iouTransactionID */
-    transaction: PropTypes.shape({
-        /** The name of the file for the receipt image. This is just the filename and doesn't come with any kind of a path */
-        filename: PropTypes.string,
-
-        /** The name of the transaction merchant */
-        merchant: PropTypes.string,
-
-        /** The type of transaction */
-        type: PropTypes.string,
-
-        /** Custom units attached to the transaction */
-        customUnits: PropTypes.arrayOf(
-            PropTypes.shape({
-                /** The name of the custom unit */
-                name: PropTypes.string,
-            }),
-        ),
-    }),
+    transaction: transactionPropTypes,
 
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
diff --git a/src/components/transactionPropTypes.js b/src/components/transactionPropTypes.js
index 14bfc288f245..fa171c7d7c00 100644
--- a/src/components/transactionPropTypes.js
+++ b/src/components/transactionPropTypes.js
@@ -1,4 +1,6 @@
 import PropTypes from 'prop-types';
+import _ from 'underscore';
+import CONST from '../CONST';
 
 export default PropTypes.shape({
     /** The transaction id */
@@ -28,11 +30,35 @@ export default PropTypes.shape({
     /** The edited merchant name */
     modifiedMerchant: PropTypes.string,
 
-    /** The comment added to the transaction */
+    /** The comment object on the transaction */
     comment: PropTypes.shape({
+        /** The text of the comment */
         comment: PropTypes.string,
+
+        /** The waypoints defining the distance request */
+        waypoints: PropTypes.shape({
+            /** The latitude of the waypoint */
+            lat: PropTypes.number,
+
+            /** The longitude of the waypoint */
+            lng: PropTypes.number,
+
+            /** The address of the waypoint */
+            address: PropTypes.string,
+        }),
     }),
 
+    /** The type of transaction */
+    type: PropTypes.oneOf(_.values(CONST.TRANSACTION.TYPE)),
+
+    /** Custom units attached to the transaction */
+    customUnits: PropTypes.arrayOf(
+        PropTypes.shape({
+            /** The name of the custom unit */
+            name: PropTypes.string,
+        }),
+    ),
+
     /** The original currency of the transaction */
     currency: PropTypes.string,
 
diff --git a/src/pages/iou/WaypointEditor.js b/src/pages/iou/WaypointEditor.js
index d5c8009a25d3..a3f8f40f5372 100644
--- a/src/pages/iou/WaypointEditor.js
+++ b/src/pages/iou/WaypointEditor.js
@@ -18,6 +18,7 @@ import * as ValidationUtils from '../../libs/ValidationUtils';
 import ROUTES from '../../ROUTES';
 import {withNetwork} from '../../components/OnyxProvider';
 import networkPropTypes from '../../components/networkPropTypes';
+import transactionPropTypes from '../../components/transactionPropTypes';
 
 const propTypes = {
     /** The transactionID of the IOU */
@@ -35,25 +36,7 @@ const propTypes = {
     }),
 
     /** The optimistic transaction for this request */
-    transaction: PropTypes.shape({
-        /** The transactionID of this request */
-        transactionID: PropTypes.string,
-
-        /** The comment object on the transaction */
-        comment: PropTypes.shape({
-            /** The waypoints defining the distance request */
-            waypoints: PropTypes.shape({
-                /** The latitude of the waypoint */
-                lat: PropTypes.number,
-
-                /** The longitude of the waypoint */
-                lng: PropTypes.number,
-
-                /** The address of the waypoint */
-                address: PropTypes.string,
-            }),
-        }),
-    }),
+    transaction: transactionPropTypes,
 
     /** Information about the network */
     network: networkPropTypes.isRequired,

From 0f68829b176458ddb8349bde9921f81805944403 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 20:49:27 +0000
Subject: [PATCH 166/214] Update version to 1.3.56-8

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 71e1d984a30b..e7b6ba55efe2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035607
-        versionName "1.3.56-7"
+        versionCode 1001035608
+        versionName "1.3.56-8"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1205a1f27103..0a3c9bc6573d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.7</string>
+	<string>1.3.56.8</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 01bbba417e0e..7f718e0d8ab5 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.3.56.7</string>
+	<string>1.3.56.8</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6dc34635e936..921c9e73d6eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-7",
+  "version": "1.3.56-8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-7",
+      "version": "1.3.56-8",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 573fda448477..c5bdd2abaf4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-7",
+  "version": "1.3.56-8",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 1c5842e968fc812467f00a05c433e76ec69b8894 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 20:50:42 +0000
Subject: [PATCH 167/214] Update version to 1.3.56-9

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e7b6ba55efe2..034a0b088505 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035608
-        versionName "1.3.56-8"
+        versionCode 1001035609
+        versionName "1.3.56-9"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0a3c9bc6573d..cf3a3473714e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.8</string>
+	<string>1.3.56.9</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7f718e0d8ab5..5377e4ef21ae 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.3.56.8</string>
+	<string>1.3.56.9</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 921c9e73d6eb..bf3634ee1c50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-8",
+  "version": "1.3.56-9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-8",
+      "version": "1.3.56-9",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c5bdd2abaf4a..27195f385230 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-8",
+  "version": "1.3.56-9",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From f760e2e113dcdfc363b35180fc6709e76c790131 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 22 Aug 2023 13:54:31 -0700
Subject: [PATCH 168/214] pass merchant back when editing money requests

---
 src/libs/actions/IOU.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 267b3eced25f..ee9afa8b0eb8 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1032,7 +1032,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
     ];
 
     // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment} = ReportUtils.getTransactionDetails(updatedTransaction);
+    const {created, amount, currency, comment, merchant} = ReportUtils.getTransactionDetails(updatedTransaction);
     API.write(
         'EditMoneyRequest',
         {
@@ -1042,6 +1042,7 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             amount,
             currency,
             comment,
+            merchant,
         },
         {optimisticData, successData, failureData},
     );

From e5633493d0723529a43f69332eb575a4dc12766f Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 22 Aug 2023 14:55:34 -0600
Subject: [PATCH 169/214] Cleanup distance request check

---
 .../ReportActionItem/MoneyRequestPreview.js   |  4 ++--
 src/components/transactionPropTypes.js        |  2 +-
 src/libs/TransactionUtils.js                  | 21 ++++---------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 52241f615a60..0112b2cca7f3 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -150,9 +150,9 @@ function MoneyRequestPreview(props) {
     let description = requestComment;
     const hasReceipt = TransactionUtils.hasReceipt(props.transaction);
     const isScanning = hasReceipt && TransactionUtils.isReceiptBeingScanned(props.transaction);
-    const isDistanceRequest = props.transaction && TransactionUtils.isDistanceRequest(props.transaction);
+    const isDistanceRequest = TransactionUtils.isDistanceRequest(props.transaction);
 
-    // On a distance request the merchange of the transaction will be used for the description since that's where it's stored in the database
+    // On a distance request the merchant of the transaction will be used for the description since that's where it's stored in the database
     if (isDistanceRequest) {
         description = props.transaction.merchant;
     }
diff --git a/src/components/transactionPropTypes.js b/src/components/transactionPropTypes.js
index fa171c7d7c00..f9bad284cf68 100644
--- a/src/components/transactionPropTypes.js
+++ b/src/components/transactionPropTypes.js
@@ -67,7 +67,7 @@ export default PropTypes.shape({
 
     /** The receipt object associated with the transaction */
     receipt: PropTypes.shape({
-        receiptID: PropTypes.string,
+        receiptID: PropTypes.number,
         source: PropTypes.string,
         state: PropTypes.string,
     }),
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 437f056ea6b7..e73c2de2261d 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -224,19 +224,6 @@ function getCreated(transaction) {
     return '';
 }
 
-/**
- * @param {Object} transaction
- * @param {String} transaction.type
- * @param {Object} [transaction.customUnit]
- * @param {String} [transaction.customUnit.name]
- * @returns {Boolean}
- */
-function isDistanceRequest(transaction) {
-    const type = lodashGet(transaction, 'comment.type');
-    const customUnitName = lodashGet(transaction, 'comment.customUnit.name');
-    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
-}
-
 /**
  * Get the transactions related to a report preview with receipts
  * Get the details linked to the IOU reportAction
@@ -259,9 +246,10 @@ function isReceiptBeingScanned(transaction) {
 
 /**
  * @param {Object} transaction
- * @param {String} transaction.type
- * @param {Object} [transaction.customUnit]
- * @param {String} [transaction.customUnit.name]
+ * @param {Object} transaction.comment
+ * @param {String} transaction.comment.type
+ * @param {Object} [transaction.comment.customUnit]
+ * @param {String} [transaction.comment.customUnit.name]
  * @returns {Boolean}
  */
 function isDistanceRequest(transaction) {
@@ -284,5 +272,4 @@ export {
     hasReceipt,
     isDistanceRequest,
     isReceiptBeingScanned,
-    isDistanceRequest,
 };

From 12f14088ade98217623c09104485b30aa7037b19 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 20:57:26 +0000
Subject: [PATCH 170/214] Update version to 1.3.56-10

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 034a0b088505..dded980d66d9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035609
-        versionName "1.3.56-9"
+        versionCode 1001035610
+        versionName "1.3.56-10"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index cf3a3473714e..a014be3b62de 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.9</string>
+	<string>1.3.56.10</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5377e4ef21ae..820586d55cf9 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.3.56.9</string>
+	<string>1.3.56.10</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index bf3634ee1c50..cfb11f02e249 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-9",
+  "version": "1.3.56-10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-9",
+      "version": "1.3.56-10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 27195f385230..43ebb92e62b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-9",
+  "version": "1.3.56-10",
   "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 0eeb47b084f32ce74fdc43d3efdb8a9e53cc8316 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 13:58:54 -0700
Subject: [PATCH 171/214] Move shouldFetchRoute to a constant

---
 src/components/DistanceRequest.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 1706479702c3..44695d361526 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -92,6 +92,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
     const previousWaypoints = usePrevious(waypoints);
     const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
+    const shouldFetchRoute = !haveWaypointsChanged || isOffline || isLoadingRoute || !TransactionUtils.validateWaypoints(waypoints);
 
     const waypointMarkers = _.filter(
         _.map(waypoints, (waypoint, key) => {
@@ -148,17 +149,12 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
 
     // Handle fetching the route when there are at least 2 waypoints
     useEffect(() => {
-        if (!haveWaypointsChanged) {
-            return;
-        }
-
-        // Only fetch the route when all the waypoints are filled (prevents an error fetching with an empty waypoint)
-        if (isOffline || isLoadingRoute || !TransactionUtils.validateWaypoints(waypoints)) {
+        if (!shouldFetchRoute) {
             return;
         }
 
         Transaction.getRoute(transactionID, waypoints);
-    }, [haveWaypointsChanged, waypoints, transactionID, isLoadingRoute, isOffline]);
+    }, [shouldFetchRoute]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 

From 0d808f01e21f03ab4c45aff280e9d3843abc1e72 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 21:00:18 +0000
Subject: [PATCH 172/214] Update version to 1.3.56-11

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index dded980d66d9..f366223cfb00 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035610
-        versionName "1.3.56-10"
+        versionCode 1001035611
+        versionName "1.3.56-11"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a014be3b62de..8cf9b1d8bf61 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.10</string>
+	<string>1.3.56.11</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 820586d55cf9..782498a80067 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.3.56.10</string>
+	<string>1.3.56.11</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index cfb11f02e249..39c9d5dd1deb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-10",
+  "version": "1.3.56-11",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-10",
+      "version": "1.3.56-11",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 43ebb92e62b0..fdbf38e8c507 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-10",
+  "version": "1.3.56-11",
   "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 70ffa1bb6bfa257a34ecc03fcc1b0882a4f5340c Mon Sep 17 00:00:00 2001
From: Daniel Edwards <cdaniel.edwards@gmail.com>
Date: Tue, 22 Aug 2023 17:05:06 -0400
Subject: [PATCH 173/214] Update to use route CONST

---
 src/libs/Browser/index.web.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.js
index f317c33f3619..c45bf71cee5f 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.js
@@ -1,5 +1,6 @@
 import CONST from '../../CONST';
 import CONFIG from '../../CONFIG';
+import ROUTES from '../../ROUTES';
 
 /**
  * Fetch browser name from UA string
@@ -72,7 +73,7 @@ function isSafari() {
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
-    const openingFromDesktopRedirect = window.location.pathname === '/desktop-signin-redirect';
+    const openingFromDesktopRedirect = window.location.pathname === ROUTES.DESKTOP_SIGN_IN_REDIRECT;
     params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : window.location.pathname}${window.location.search}${window.location.hash}`);
     if (email && shortLivedAuthToken) {
         params.set('email', email);

From 6d04fda742772616246728a40693014efff77de2 Mon Sep 17 00:00:00 2001
From: Daniel Edwards <cdaniel.edwards@gmail.com>
Date: Tue, 22 Aug 2023 17:07:09 -0400
Subject: [PATCH 174/214] Added some comments

---
 src/libs/Browser/index.web.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.js
index c45bf71cee5f..32f6392aef76 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.js
@@ -73,7 +73,9 @@ function isSafari() {
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
-    const openingFromDesktopRedirect = window.location.pathname === ROUTES.DESKTOP_SIGN_IN_REDIRECT;
+    // If the user is opening the desktop app through a third party signin flow, we need to manually add the exitTo param
+    // so that the desktop app redirects to the correct home route after signin is complete.
+    const openingFromDesktopRedirect = window.location.pathname === `/${ROUTES.DESKTOP_SIGN_IN_REDIRECT}`;
     params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : window.location.pathname}${window.location.search}${window.location.hash}`);
     if (email && shortLivedAuthToken) {
         params.set('email', email);

From f929159bd9b77747976cac991e067c3cd85d482b Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 21:12:11 +0000
Subject: [PATCH 175/214] Update version to 1.3.56-12

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index f366223cfb00..7425566bfa99 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035611
-        versionName "1.3.56-11"
+        versionCode 1001035612
+        versionName "1.3.56-12"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 8cf9b1d8bf61..f6c66ed89977 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.11</string>
+	<string>1.3.56.12</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 782498a80067..d9b2964367a5 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.3.56.11</string>
+	<string>1.3.56.12</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 39c9d5dd1deb..f95922b61900 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-11",
+  "version": "1.3.56-12",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-11",
+      "version": "1.3.56-12",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index fdbf38e8c507..367788a22157 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-11",
+  "version": "1.3.56-12",
   "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 844ee72474ddf6e760a49ece470fb1c3a4604318 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 14:16:08 -0700
Subject: [PATCH 176/214] Update DistanceRequest.js

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

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 44695d361526..efab82fe7ae9 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -154,7 +154,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
         }
 
         Transaction.getRoute(transactionID, waypoints);
-    }, [shouldFetchRoute]);
+    }, [shouldFetchRoute, transactionID, waypoints]);
 
     useEffect(updateGradientVisibility, [scrollContainerHeight, scrollContentHeight]);
 

From d1442aed3566bf609b27469e7a2aa5f78f3fd475 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 02:33:20 +0500
Subject: [PATCH 177/214] Block new reactions on report action of report that
 has creation errors

---
 .../Reactions/ReportActionItemEmojiReactions.js   | 15 +++++++++------
 src/pages/home/report/ReportActionItem.js         |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 806e87b4301d..0091a528fb5c 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -19,7 +19,7 @@ const propTypes = {
     emojiReactions: EmojiReactionsPropTypes,
 
     /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
-    reportActionID: PropTypes.string.isRequired,
+    reportAction: PropTypes.object,
 
     /**
      * Function to call when the user presses on an emoji.
@@ -37,6 +37,7 @@ const defaultProps = {
 };
 
 function ReportActionItemEmojiReactions(props) {
+    const hasErrors = !_.isEmpty(props.reportAction.errors);
     const {reactionListRef} = useContext(ReportScreenContext);
     const popoverReactionListAnchor = useRef(null);
     let totalReactionCount = 0;
@@ -91,7 +92,7 @@ function ReportActionItemEmojiReactions(props) {
         };
 
         const onReactionListOpen = (event) => {
-            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportActionID);
+            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportAction.reportActionID);
         };
 
         return {
@@ -143,10 +144,12 @@ function ReportActionItemEmojiReactions(props) {
                         </Tooltip>
                     );
                 })}
-                <AddReactionBubble
-                    onSelectEmoji={props.toggleReaction}
-                    reportAction={{reportActionID: props.reportActionID}}
-                />
+                {!hasErrors && (
+                    <AddReactionBubble
+                        onSelectEmoji={props.toggleReaction}
+                        reportAction={{reportActionID: props.reportAction.reportActionID}}
+                    />
+                )}
             </View>
         )
     );
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 9f0c2d8cda47..8b944b3354d0 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -399,7 +399,7 @@ function ReportActionItem(props) {
                 {!ReportActionsUtils.isMessageDeleted(props.action) && (
                     <View style={draftMessageRightAlign}>
                         <ReportActionItemEmojiReactions
-                            reportActionID={props.action.reportActionID}
+                            reportAction={props.action}
                             emojiReactions={props.emojiReactions}
                             toggleReaction={(emoji) => {
                                 if (Session.isAnonymousUser()) {

From bf188acfade22437b8ee4ffa402cbd25be4e00a6 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 02:33:53 +0500
Subject: [PATCH 178/214] Block user from removing reactions on report action
 of report that has creation errors

---
 src/components/Reactions/EmojiReactionBubble.js  | 16 ++++++++++++++--
 .../Reactions/ReportActionItemEmojiReactions.js  |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js
index 30520cb633ef..0a7f308ce912 100644
--- a/src/components/Reactions/EmojiReactionBubble.js
+++ b/src/components/Reactions/EmojiReactionBubble.js
@@ -38,6 +38,9 @@ const propTypes = {
      */
     hasUserReacted: PropTypes.bool,
 
+    /** Whether the user can react with the current emoji */
+    isReactionBlocked: PropTypes.bool,
+
     ...windowDimensionsPropTypes,
 };
 
@@ -45,6 +48,7 @@ const defaultProps = {
     count: 0,
     onReactionListOpen: () => {},
     isContextMenu: false,
+    isReactionBlocked: false,
 
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
@@ -52,8 +56,16 @@ const defaultProps = {
 function EmojiReactionBubble(props) {
     return (
         <PressableWithSecondaryInteraction
-            style={({hovered, pressed}) => [styles.emojiReactionBubble, StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, props.hasUserReacted, props.isContextMenu)]}
-            onPress={props.onPress}
+            style={({hovered, pressed}) => [
+                styles.emojiReactionBubble,
+                StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, props.hasUserReacted, props.isContextMenu),
+                props.isReactionBlocked && styles.cursorDisabled,
+            ]}
+            onPress={() => {
+                if (props.isReactionBlocked) return;
+
+                props.onPress();
+            }}
             onLongPress={props.onReactionListOpen}
             onSecondaryInteraction={props.onReactionListOpen}
             ref={props.forwardedRef}
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 0091a528fb5c..29c2661a68c9 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -139,6 +139,7 @@ function ReportActionItemEmojiReactions(props) {
                                     reactionUsers={reaction.reactionUsers}
                                     hasUserReacted={reaction.hasUserReacted}
                                     onReactionListOpen={reaction.onReactionListOpen}
+                                    isReactionBlocked={hasErrors}
                                 />
                             </View>
                         </Tooltip>

From dbace82253ca0abc0f89135018c3d8bdd529d3db Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 22 Aug 2023 15:56:36 -0600
Subject: [PATCH 179/214] Revert "Merge pull request #24544 from
 eh2077/21527-fix-sync-draft-and-edit-status-of-thread-first-chat"

This reverts commit 6e055d073dff463097e5fed7cfed234bcfcde845, reversing
changes made to e043331def1babf5c70021a22043faed858f38d0.
---
 src/libs/actions/Report.js                        |  7 +++----
 .../home/report/ContextMenu/ContextMenuActions.js |  2 +-
 src/pages/home/report/ReportActionCompose.js      |  2 +-
 src/pages/home/report/ReportActionItem.js         |  3 +--
 .../home/report/ReportActionItemMessageEdit.js    | 15 ++++-----------
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 3bc4ea966b23..ade3791fc0c7 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1188,12 +1188,11 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
  * Saves the draft for a comment report action. This will put the comment into "edit mode"
  *
  * @param {String} reportID
- * @param {Object} reportAction
+ * @param {Number} reportActionID
  * @param {String} draftMessage
  */
-function saveReportActionDraft(reportID, reportAction, draftMessage) {
-    const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}_${reportAction.reportActionID}`, draftMessage);
+function saveReportActionDraft(reportID, reportActionID, draftMessage) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}_${reportActionID}`, draftMessage);
 }
 
 /**
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index 374539a3ea74..936f482cca17 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -279,7 +279,7 @@ export default [
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget, isChronosReport) =>
             type === CONTEXT_MENU_TYPES.REPORT_ACTION && ReportUtils.canEditReportAction(reportAction) && !isArchivedRoom && !isChronosReport,
         onPress: (closePopover, {reportID, reportAction, draftMessage}) => {
-            const editAction = () => Report.saveReportActionDraft(reportID, reportAction, _.isEmpty(draftMessage) ? getActionText(reportAction) : '');
+            const editAction = () => Report.saveReportActionDraft(reportID, reportAction.reportActionID, _.isEmpty(draftMessage) ? getActionText(reportAction) : '');
 
             if (closePopover) {
                 // Hide popover, then call editAction
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 8f9e43cfdbab..e9f4b4ea930e 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -897,7 +897,7 @@ function ReportActionCompose({
                 const lastReportAction = _.find([...reportActions, parentReportAction], (action) => ReportUtils.canEditReportAction(action));
 
                 if (lastReportAction !== -1 && lastReportAction) {
-                    Report.saveReportActionDraft(reportID, lastReportAction, _.last(lastReportAction.message).html);
+                    Report.saveReportActionDraft(reportID, lastReportAction.reportActionID, _.last(lastReportAction.message).html);
                 }
             }
         },
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 9f0c2d8cda47..ea9d20b04500 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -617,8 +617,7 @@ export default compose(
     withReportActionsDrafts({
         propName: 'draftMessage',
         transformValue: (drafts, props) => {
-            const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action);
-            const draftKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}_${props.action.reportActionID}`;
+            const draftKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${props.report.reportID}_${props.action.reportActionID}`;
             return lodashGet(drafts, draftKey, '');
         },
     }),
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index d6a734080019..2d8bd5f35655 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -111,13 +111,6 @@ function ReportActionItemMessageEdit(props) {
     const isFocusedRef = useRef(false);
     const insertedEmojis = useRef([]);
 
-    useEffect(() => {
-        if (props.draftMessage === props.action.message[0].html) {
-            return;
-        }
-        setDraft(Str.htmlDecode(props.draftMessage));
-    }, [props.draftMessage, props.action.message]);
-
     useEffect(() => {
         // required for keeping last state of isFocused variable
         isFocusedRef.current = isFocused;
@@ -156,9 +149,9 @@ function ReportActionItemMessageEdit(props) {
     const debouncedSaveDraft = useMemo(
         () =>
             _.debounce((newDraft) => {
-                Report.saveReportActionDraft(props.reportID, props.action, newDraft);
+                Report.saveReportActionDraft(props.reportID, props.action.reportActionID, newDraft);
             }, 1000),
-        [props.reportID, props.action],
+        [props.reportID, props.action.reportActionID],
     );
 
     /**
@@ -217,7 +210,7 @@ function ReportActionItemMessageEdit(props) {
      */
     const deleteDraft = useCallback(() => {
         debouncedSaveDraft.cancel();
-        Report.saveReportActionDraft(props.reportID, props.action, '');
+        Report.saveReportActionDraft(props.reportID, props.action.reportActionID, '');
         ComposerActions.setShouldShowComposeInput(true);
         ReportActionComposeFocusManager.clear();
         ReportActionComposeFocusManager.focus();
@@ -229,7 +222,7 @@ function ReportActionItemMessageEdit(props) {
                 keyboardDidHideListener.remove();
             });
         }
-    }, [props.action, debouncedSaveDraft, props.index, props.reportID, reportScrollManager]);
+    }, [props.action.reportActionID, debouncedSaveDraft, props.index, props.reportID, reportScrollManager]);
 
     /**
      * Save the draft of the comment to be the new comment message. This will take the comment out of "edit mode" with

From 06f34c645c435e534ef11d83772bf17a68a5d02a Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 22:06:28 +0000
Subject: [PATCH 180/214] Update version to 1.3.56-13

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7425566bfa99..3f65970e077a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035612
-        versionName "1.3.56-12"
+        versionCode 1001035613
+        versionName "1.3.56-13"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f6c66ed89977..f77b9725eb32 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.12</string>
+	<string>1.3.56.13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index d9b2964367a5..0fea60e744cf 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.3.56.12</string>
+	<string>1.3.56.13</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index f95922b61900..0e1b566e26a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-12",
+  "version": "1.3.56-13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-12",
+      "version": "1.3.56-13",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 367788a22157..9a07b5b7ab64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-12",
+  "version": "1.3.56-13",
   "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 2fe13263acef201be804c624735d9744babbf681 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 15:11:54 -0700
Subject: [PATCH 181/214] update logic lol

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

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index efab82fe7ae9..68154e6ae745 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -92,7 +92,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
     const previousWaypoints = usePrevious(waypoints);
     const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
-    const shouldFetchRoute = !haveWaypointsChanged || isOffline || isLoadingRoute || !TransactionUtils.validateWaypoints(waypoints);
+    const shouldFetchRoute = haveWaypointsChanged || !isOffline || !isLoadingRoute || TransactionUtils.validateWaypoints(waypoints);
 
     const waypointMarkers = _.filter(
         _.map(waypoints, (waypoint, key) => {

From d2893a789795deadb6526aeb16b26a02bc4c48da Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 22 Aug 2023 15:23:05 -0700
Subject: [PATCH 182/214] Fix admin post only welcome message

---
 src/components/ReportWelcomeText.js | 22 +++++++++-------------
 src/libs/ReportUtils.js             |  3 ++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 9fc446df31e3..80c26b5d6b3f 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -65,7 +65,6 @@ function ReportWelcomeText(props) {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report);
     const isChatRoom = ReportUtils.isChatRoom(props.report);
     const isDefault = !(isChatRoom || isPolicyExpenseChat);
-    const isAdminsOnlyPostingRoom = ReportUtils.isAdminsOnlyPostingRoom(props.report);
     const participantAccountIDs = lodashGet(props.report, 'participantAccountIDs', []);
     const isMultipleParticipant = participantAccountIDs.length > 1;
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
@@ -100,19 +99,16 @@ function ReportWelcomeText(props) {
                 {isChatRoom && (
                     <>
                         <Text>{roomWelcomeMessage.phrase1}</Text>
-                        {/* for rooms in which only admins can post we dont need room name and phrase two */}
-                        {(!isAdminsOnlyPostingRoom || isUserPolicyAdmin) && (
-                            <>
-                                <Text
-                                    style={[styles.textStrong]}
-                                    onPress={() => Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
-                                    suppressHighlighting
-                                >
-                                    {ReportUtils.getReportName(props.report)}
-                                </Text>
-                                <Text>{roomWelcomeMessage.phrase2}</Text>
-                            </>
+                        {roomWelcomeMessage.showReportName && (
+                            <Text
+                                style={[styles.textStrong]}
+                                onPress={() => Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
+                                suppressHighlighting
+                            >
+                                {ReportUtils.getReportName(props.report)}
+                            </Text>
                         )}
+                        {roomWelcomeMessage.phrase2 !== undefined && <Text>{roomWelcomeMessage.phrase2}</Text>}
                     </>
                 )}
                 {isDefault && (
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 99dd31ab99aa..f40003382121 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -766,7 +766,7 @@ function canDeleteReportAction(reportAction, reportID) {
  */
 
 function getRoomWelcomeMessage(report, isUserPolicyAdmin) {
-    const welcomeMessage = {};
+    const welcomeMessage = {showReportName: true};
     const workspaceName = getPolicyName(report);
 
     if (isArchivedRoom(report)) {
@@ -780,6 +780,7 @@ function getRoomWelcomeMessage(report, isUserPolicyAdmin) {
         welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
     } else if (isAdminsOnlyPostingRoom(report) && !isUserPolicyAdmin) {
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminOnlyPostingRoom');
+        welcomeMessage.showReportName = false;
     } else if (isAnnounceRoom(report)) {
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
         welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});

From 47084469506496df823b6a492e584c40d64f551d Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 22 Aug 2023 15:26:28 -0700
Subject: [PATCH 183/214] adjust the check

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

diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index 68154e6ae745..3eb52c1ec1c7 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -92,7 +92,7 @@ function DistanceRequest({transactionID, transaction, mapboxAccessToken}) {
     const hasRouteError = Boolean(lodashGet(transaction, 'errorFields.route'));
     const previousWaypoints = usePrevious(waypoints);
     const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
-    const shouldFetchRoute = haveWaypointsChanged || !isOffline || !isLoadingRoute || TransactionUtils.validateWaypoints(waypoints);
+    const shouldFetchRoute = haveWaypointsChanged && !isOffline && !isLoadingRoute && TransactionUtils.validateWaypoints(waypoints);
 
     const waypointMarkers = _.filter(
         _.map(waypoints, (waypoint, key) => {

From 07e0a0702d0b65eb52a097da435c5994d57a89f3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 22:29:26 +0000
Subject: [PATCH 184/214] Update version to 1.3.56-14

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3f65970e077a..59d2f7b4c189 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035613
-        versionName "1.3.56-13"
+        versionCode 1001035614
+        versionName "1.3.56-14"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f77b9725eb32..6b0632457975 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.13</string>
+	<string>1.3.56.14</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0fea60e744cf..3bdb7831777c 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.3.56.13</string>
+	<string>1.3.56.14</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 0e1b566e26a2..f95fb7f6270c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-13",
+  "version": "1.3.56-14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-13",
+      "version": "1.3.56-14",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9a07b5b7ab64..db08bc1a9f87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-13",
+  "version": "1.3.56-14",
   "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 aecdc3e4d120fb6601e32ae66171f0ffd4fd80be Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 03:53:42 +0500
Subject: [PATCH 185/214] Updated report action prop type in report item emoji
 reactions

---
 .../Reactions/ReportActionItemEmojiReactions.js           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 29c2661a68c9..59e65da9387a 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -18,8 +18,12 @@ import ReportScreenContext from '../../pages/home/ReportScreenContext';
 const propTypes = {
     emojiReactions: EmojiReactionsPropTypes,
 
-    /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
-    reportAction: PropTypes.object,
+    /** The report action belonging to the emoji reaction */
+    reportAction: PropTypes.shape({
+        reportActionID: PropTypes.string.isRequired,
+        // eslint-disable-next-line react/forbid-prop-types
+        errors: PropTypes.object,
+    }),
 
     /**
      * Function to call when the user presses on an emoji.

From b955641f1ac60af1e60a2c0a5da6aeb9f73092e1 Mon Sep 17 00:00:00 2001
From: Aldo Canepa <aldo@expensify.com>
Date: Tue, 22 Aug 2023 16:30:51 -0700
Subject: [PATCH 186/214] Only pass numberic strings to Str.fromUSDToNumber

Str.fromUSDToNumber now crashes if you pass a boolean true|false or
strings that are not valid numbers
---
 src/pages/ReimbursementAccount/ValidationStep.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index 0afa855f1ea6..90dfc8060e19 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -67,7 +67,7 @@ class ValidationStep extends React.Component {
         const errors = {};
 
         _.each(values, (value, key) => {
-            const filteredValue = this.filterInput(value);
+            const filteredValue = typeof value === 'string' ? this.filterInput(value) : value;
             if (ValidationUtils.isRequiredFulfilled(filteredValue)) {
                 return;
             }
@@ -103,7 +103,7 @@ class ValidationStep extends React.Component {
      */
     filterInput(amount) {
         let value = amount ? amount.toString().trim() : '';
-        if (value === '' || !Math.abs(Str.fromUSDToNumber(value)) || _.isNaN(Number(value))) {
+        if (value === '' || _.isNaN(Number(value)) || !Math.abs(Str.fromUSDToNumber(value))) {
             return '';
         }
 

From 40e22d1fedc82fee205cd83dc3caa3d757f31919 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 23:34:21 +0000
Subject: [PATCH 187/214] Update version to 1.3.56-15

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 59d2f7b4c189..6067d372a074 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035614
-        versionName "1.3.56-14"
+        versionCode 1001035615
+        versionName "1.3.56-15"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 6b0632457975..420baa4efedb 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.14</string>
+	<string>1.3.56.15</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3bdb7831777c..e76169acfc4d 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.3.56.14</string>
+	<string>1.3.56.15</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index bb28b59bd8b7..830fe148e62b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-14",
+  "version": "1.3.56-15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-14",
+      "version": "1.3.56-15",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 862a69cae02d..ca568ede6a6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-14",
+  "version": "1.3.56-15",
   "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 5048f2ef20678b9edee91028f3c83ee476b1d25b Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 22 Aug 2023 23:40:25 +0000
Subject: [PATCH 188/214] Update version to 1.3.56-16

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6067d372a074..4dc526670ba8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035615
-        versionName "1.3.56-15"
+        versionCode 1001035616
+        versionName "1.3.56-16"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 420baa4efedb..0be38766e849 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.15</string>
+	<string>1.3.56.16</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index e76169acfc4d..a4d4ef1cf382 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.3.56.15</string>
+	<string>1.3.56.16</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 830fe148e62b..664640a4451f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-15",
+  "version": "1.3.56-16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-15",
+      "version": "1.3.56-16",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index ca568ede6a6a..2e2ae406d56a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-15",
+  "version": "1.3.56-16",
   "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 a534a323343dd9fa42f7b253b6ee4c140e5df258 Mon Sep 17 00:00:00 2001
From: pradeepkumar <kongupradeep@live.com>
Date: Wed, 23 Aug 2023 05:20:50 +0530
Subject: [PATCH 189/214] max-length

---
 src/CONST.js                              | 2 ++
 src/pages/iou/MoneyRequestMerchantPage.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/CONST.js b/src/CONST.js
index e8c95b83f57e..b58134d06c0b 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -75,6 +75,8 @@ const CONST = {
     },
 
     PULL_REQUEST_NUMBER,
+    
+    MERCHANT_NAME_MAX_LENGTH: 255,
 
     CALENDAR_PICKER: {
         // Numbers were arbitrarily picked.
diff --git a/src/pages/iou/MoneyRequestMerchantPage.js b/src/pages/iou/MoneyRequestMerchantPage.js
index bec9bcb419f7..e2d04288353f 100644
--- a/src/pages/iou/MoneyRequestMerchantPage.js
+++ b/src/pages/iou/MoneyRequestMerchantPage.js
@@ -109,6 +109,7 @@ function MoneyRequestMerchantPage({iou, route}) {
                         inputID="moneyRequestMerchant"
                         name="moneyRequestMerchant"
                         defaultValue={iou.merchant}
+                        maxLength={CONST.MERCHANT_NAME_MAX_LENGTH}
                         label={translate('common.merchant')}
                         accessibilityLabel={translate('common.merchant')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}

From 3108a6adb9101b4e9656d0aacf9471992f9c81d7 Mon Sep 17 00:00:00 2001
From: pradeepkumar <kongupradeep@live.com>
Date: Wed, 23 Aug 2023 05:36:21 +0530
Subject: [PATCH 190/214] fix lint

---
 src/CONST.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CONST.js b/src/CONST.js
index b58134d06c0b..4d5cc0c598cf 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -75,7 +75,7 @@ const CONST = {
     },
 
     PULL_REQUEST_NUMBER,
-    
+
     MERCHANT_NAME_MAX_LENGTH: 255,
 
     CALENDAR_PICKER: {

From 0fb2ca40901bf334d1748a2d2b3d6c81b3eb4fb5 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 23 Aug 2023 00:12:53 +0000
Subject: [PATCH 191/214] Update version to 1.3.56-17

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4dc526670ba8..da2ec99a5e29 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035616
-        versionName "1.3.56-16"
+        versionCode 1001035617
+        versionName "1.3.56-17"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0be38766e849..5d3a84ae0882 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.16</string>
+	<string>1.3.56.17</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a4d4ef1cf382..bd167bffe848 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.3.56.16</string>
+	<string>1.3.56.17</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 664640a4451f..fc51acf3f71c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-16",
+  "version": "1.3.56-17",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-16",
+      "version": "1.3.56-17",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 2e2ae406d56a..e4b92a66706b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-16",
+  "version": "1.3.56-17",
   "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 79ea92345e48599d6663ef20213f8c64bb0568c1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 23 Aug 2023 00:36:55 +0000
Subject: [PATCH 192/214] Update version to 1.3.56-18

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index da2ec99a5e29..b2bcadc8a501 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035617
-        versionName "1.3.56-17"
+        versionCode 1001035618
+        versionName "1.3.56-18"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 5d3a84ae0882..2b345df70da2 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.17</string>
+	<string>1.3.56.18</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index bd167bffe848..0b8b3c3f7a72 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.3.56.17</string>
+	<string>1.3.56.18</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index fc51acf3f71c..742cd329cd84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-17",
+  "version": "1.3.56-18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-17",
+      "version": "1.3.56-18",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e4b92a66706b..2b6e4bfb79a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-17",
+  "version": "1.3.56-18",
   "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 87ed5ddd8130a6a2982715fe390f2bd2b45bbaf1 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 12:28:03 +0500
Subject: [PATCH 193/214] Updated early return style

---
 src/components/Reactions/EmojiReactionBubble.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js
index 0a7f308ce912..1e7816052658 100644
--- a/src/components/Reactions/EmojiReactionBubble.js
+++ b/src/components/Reactions/EmojiReactionBubble.js
@@ -62,7 +62,9 @@ function EmojiReactionBubble(props) {
                 props.isReactionBlocked && styles.cursorDisabled,
             ]}
             onPress={() => {
-                if (props.isReactionBlocked) return;
+                if (props.isReactionBlocked) {
+                    return;
+                }
 
                 props.onPress();
             }}

From 1086186fac2f17270c56093aec62ce2a11ca9b06 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 12:38:10 +0500
Subject: [PATCH 194/214] Added prop for report action item error in emoji
 reactions

---
 .../ReportActionItemEmojiReactions.js         | 21 +++++++++----------
 src/pages/home/report/ReportActionItem.js     | 11 +++++-----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 59e65da9387a..1912014d6716 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -18,12 +18,8 @@ import ReportScreenContext from '../../pages/home/ReportScreenContext';
 const propTypes = {
     emojiReactions: EmojiReactionsPropTypes,
 
-    /** The report action belonging to the emoji reaction */
-    reportAction: PropTypes.shape({
-        reportActionID: PropTypes.string.isRequired,
-        // eslint-disable-next-line react/forbid-prop-types
-        errors: PropTypes.object,
-    }),
+    /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
+    reportActionID: PropTypes.string.isRequired,
 
     /**
      * Function to call when the user presses on an emoji.
@@ -32,16 +28,19 @@ const propTypes = {
      */
     toggleReaction: PropTypes.func.isRequired,
 
+    /** A bool indicating if the current report action has any errors */
+    hasReportActionErrors: PropTypes.bool,
+
     ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
     emojiReactions: {},
+    hasReportActionErrors: false,
 };
 
 function ReportActionItemEmojiReactions(props) {
-    const hasErrors = !_.isEmpty(props.reportAction.errors);
     const {reactionListRef} = useContext(ReportScreenContext);
     const popoverReactionListAnchor = useRef(null);
     let totalReactionCount = 0;
@@ -96,7 +95,7 @@ function ReportActionItemEmojiReactions(props) {
         };
 
         const onReactionListOpen = (event) => {
-            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportAction.reportActionID);
+            reactionListRef.current.showReactionList(event, popoverReactionListAnchor.current, reactionEmojiName, props.reportActionID);
         };
 
         return {
@@ -143,16 +142,16 @@ function ReportActionItemEmojiReactions(props) {
                                     reactionUsers={reaction.reactionUsers}
                                     hasUserReacted={reaction.hasUserReacted}
                                     onReactionListOpen={reaction.onReactionListOpen}
-                                    isReactionBlocked={hasErrors}
+                                    isReactionBlocked={props.hasReportActionErrors}
                                 />
                             </View>
                         </Tooltip>
                     );
                 })}
-                {!hasErrors && (
+                {!props.hasReportActionErrors && (
                     <AddReactionBubble
                         onSelectEmoji={props.toggleReaction}
-                        reportAction={{reportActionID: props.reportAction.reportActionID}}
+                        reportAction={{reportActionID: props.reportActionID}}
                     />
                 )}
             </View>
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 8b944b3354d0..7b6105a3fd05 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -245,7 +245,7 @@ function ReportActionItem(props) {
      * @param {Boolean} hovered whether the ReportActionItem is hovered
      * @returns {Object} child component(s)
      */
-    const renderItemContent = (hovered = false) => {
+    const renderItemContent = (hovered = false, hasErrors = false) => {
         let children;
         const originalMessage = lodashGet(props.action, 'originalMessage', {});
 
@@ -399,8 +399,9 @@ function ReportActionItem(props) {
                 {!ReportActionsUtils.isMessageDeleted(props.action) && (
                     <View style={draftMessageRightAlign}>
                         <ReportActionItemEmojiReactions
-                            reportAction={props.action}
+                            reportActionID={props.action.reportActionID}
                             emojiReactions={props.emojiReactions}
+                            hasReportActionErrors={hasErrors}
                             toggleReaction={(emoji) => {
                                 if (Session.isAnonymousUser()) {
                                     hideContextMenu(false);
@@ -438,8 +439,8 @@ function ReportActionItem(props) {
      * @param {Boolean} isWhisper whether the ReportActionItem is a whisper
      * @returns {Object} report action item
      */
-    const renderReportActionItem = (hovered, isWhisper) => {
-        const content = renderItemContent(hovered || isContextMenuActive);
+    const renderReportActionItem = (hovered, isWhisper, hasErrors) => {
+        const content = renderItemContent(hovered || isContextMenuActive, hasErrors);
 
         if (props.draftMessage) {
             return <ReportActionItemDraft>{content}</ReportActionItemDraft>;
@@ -592,7 +593,7 @@ function ReportActionItem(props) {
                                         />
                                     </View>
                                 )}
-                                {renderReportActionItem(hovered, isWhisper)}
+                                {renderReportActionItem(hovered, isWhisper, hasErrors)}
                             </OfflineWithFeedback>
                         </View>
                     </View>

From bf8d641c4e6dfdd59d3eb2d1e5fc6675ca871937 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 12:39:48 +0500
Subject: [PATCH 195/214] Added jsdoc for report action errors prop

---
 src/pages/home/report/ReportActionItem.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 7b6105a3fd05..eec643d1ea0e 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -243,6 +243,7 @@ function ReportActionItem(props) {
     /**
      * Get the content of ReportActionItem
      * @param {Boolean} hovered whether the ReportActionItem is hovered
+     * @param {Boolean} hasErrors whether the report action has any errors
      * @returns {Object} child component(s)
      */
     const renderItemContent = (hovered = false, hasErrors = false) => {
@@ -437,6 +438,7 @@ function ReportActionItem(props) {
      * Get ReportActionItem with a proper wrapper
      * @param {Boolean} hovered whether the ReportActionItem is hovered
      * @param {Boolean} isWhisper whether the ReportActionItem is a whisper
+     * @param {Boolean} hasErrors whether the report action has any errors
      * @returns {Object} report action item
      */
     const renderReportActionItem = (hovered, isWhisper, hasErrors) => {

From 212714a5ebf2eeb77e96eac271c85edbd3f4070e Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Wed, 23 Aug 2023 10:24:02 +0200
Subject: [PATCH 196/214] [TS migration] Migrate 'NAVIGATORS.js' constant to
 TypeScript

---
 src/{NAVIGATORS.js => NAVIGATORS.ts} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/{NAVIGATORS.js => NAVIGATORS.ts} (96%)

diff --git a/src/NAVIGATORS.js b/src/NAVIGATORS.ts
similarity index 96%
rename from src/NAVIGATORS.js
rename to src/NAVIGATORS.ts
index d9dcf9d3cd52..a3a041e65684 100644
--- a/src/NAVIGATORS.js
+++ b/src/NAVIGATORS.ts
@@ -6,4 +6,4 @@ export default {
     CENTRAL_PANE_NAVIGATOR: 'CentralPaneNavigator',
     RIGHT_MODAL_NAVIGATOR: 'RightModalNavigator',
     FULL_SCREEN_NAVIGATOR: 'FullScreenNavigator',
-};
+} as const;

From bcf2d431b0f889165477c34acc8ff88d86d5c270 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 23 Aug 2023 11:53:39 +0200
Subject: [PATCH 197/214] clarify comments

---
 src/components/CategoryPicker/categoryPickerPropTypes.js | 1 +
 src/components/categoryPropTypes.js                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index f59b5d40d5c3..ccc1643021ce 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -11,6 +11,7 @@ const propTypes = {
     /** The type of IOU report, i.e. bill, request, send */
     iouType: PropTypes.string.isRequired,
 
+    /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 };
diff --git a/src/components/categoryPropTypes.js b/src/components/categoryPropTypes.js
index 4b4b4e547c71..90c3ac368d1c 100644
--- a/src/components/categoryPropTypes.js
+++ b/src/components/categoryPropTypes.js
@@ -4,6 +4,6 @@ export default PropTypes.shape({
     /** Name of a category */
     name: PropTypes.string.isRequired,
 
-    /** Flag that determines if a category is active */
+    /** Flag that determines if a category is active and able to be selected */
     enabled: PropTypes.bool.isRequired,
 });

From b0da998742f4ba73d399dcb62471678ed38151de Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 23 Aug 2023 11:54:10 +0200
Subject: [PATCH 198/214] improve props of MoneyRequestConfirmationList

---
 src/components/MoneyRequestConfirmationList.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 6c65d4a38d2a..7fc2417d30b3 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -27,6 +27,7 @@ import themeColors from '../styles/themes/default';
 import Image from './Image';
 import useLocalize from '../hooks/useLocalize';
 import * as ReceiptUtils from '../libs/ReceiptUtils';
+import categoryPropTypes from './categoryPropTypes';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -97,12 +98,7 @@ const propTypes = {
     receiptSource: PropTypes.string,
 
     /** Collection of categories attached to a policy */
-    policyCategories: PropTypes.objectOf(
-        PropTypes.shape({
-            enabled: PropTypes.bool.isRequired,
-            name: PropTypes.string.isRequired,
-        }),
-    ),
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
 };
 
 const defaultProps = {
@@ -123,7 +119,7 @@ const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
     receiptPath: '',
     receiptSource: '',
-    policyCategories: null,
+    policyCategories: {},
 };
 
 function MoneyRequestConfirmationList(props) {
@@ -406,7 +402,7 @@ function MoneyRequestConfirmationList(props) {
                         onPress={() => Navigation.navigate(ROUTES.getMoneyRequestMerchantRoute(props.iouType, props.reportID))}
                         disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                     />
-                    {props.policyCategories !== null && (
+                    {!_.isEmpty(props.policyCategories) && (
                         <MenuItemWithTopDescription
                             shouldShowRightIcon={!props.isReadOnly}
                             title={props.iouCategory}

From ffb18caf9a0cb50120c34034567560eef3cff225 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 23 Aug 2023 12:04:27 +0200
Subject: [PATCH 199/214] clarify props

---
 src/components/MoneyRequestConfirmationList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 7fc2417d30b3..3dc7f06acfad 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -97,6 +97,7 @@ const propTypes = {
     /** File source of the receipt */
     receiptSource: PropTypes.string,
 
+    /* Onyx Props */
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 };

From 9dbff2d533ba3486a49b12453a4953ebf3c1a864 Mon Sep 17 00:00:00 2001
From: Artem Makushov <waterim3009@gmail.com>
Date: Wed, 23 Aug 2023 16:16:06 +0200
Subject: [PATCH 200/214] change from Etc/UTC to UTC

---
 src/libs/DateUtils.js       |  2 +-
 tests/unit/DateUtilsTest.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/DateUtils.js b/src/libs/DateUtils.js
index 0767bc44c002..b33a1b1b2a73 100644
--- a/src/libs/DateUtils.js
+++ b/src/libs/DateUtils.js
@@ -273,7 +273,7 @@ function getDBTime(timestamp = '') {
  * @returns {String}
  */
 function subtractMillisecondsFromDateTime(dateTime, milliseconds) {
-    const date = zonedTimeToUtc(dateTime, 'Etc/UTC');
+    const date = zonedTimeToUtc(dateTime, 'UTC');
     const newTimestamp = subMilliseconds(date, milliseconds).valueOf();
     return getDBTime(newTimestamp);
 }
diff --git a/tests/unit/DateUtilsTest.js b/tests/unit/DateUtilsTest.js
index 305ffdb8f487..d17c1c052929 100644
--- a/tests/unit/DateUtilsTest.js
+++ b/tests/unit/DateUtilsTest.js
@@ -14,7 +14,7 @@ describe('DateUtils', () => {
             keys: ONYXKEYS,
             initialKeyStates: {
                 [ONYXKEYS.SESSION]: {accountID: 999},
-                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {999: {timezone: {selected: 'Etc/UTC'}}},
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {999: {timezone: {selected: 'UTC'}}},
             },
         });
         return waitForPromisesToResolve();
@@ -73,7 +73,7 @@ describe('DateUtils', () => {
         Intl.DateTimeFormat = jest.fn(() => ({
             resolvedOptions: () => ({timeZone: 'America/Chicago'}),
         }));
-        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'Etc/UTC', automatic: true}}}).then(() => {
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'UTC', automatic: true}}}).then(() => {
             const result = DateUtils.getCurrentTimezone();
             expect(result).toEqual({
                 selected: 'America/Chicago',
@@ -84,12 +84,12 @@ describe('DateUtils', () => {
 
     it('should not update timezone if automatic and selected timezone match', () => {
         Intl.DateTimeFormat = jest.fn(() => ({
-            resolvedOptions: () => ({timeZone: 'Etc/UTC'}),
+            resolvedOptions: () => ({timeZone: 'UTC'}),
         }));
-        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'Etc/UTC', automatic: true}}}).then(() => {
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {999: {timezone: {selected: 'UTC', automatic: true}}}).then(() => {
             const result = DateUtils.getCurrentTimezone();
             expect(result).toEqual({
-                selected: 'Etc/UTC',
+                selected: 'UTC',
                 automatic: true,
             });
         });

From 913794278042fe348769ed439f06fbabbab7bee4 Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 19:32:48 +0500
Subject: [PATCH 201/214] Renamed reaction blocked prop

---
 .../Reactions/ReportActionItemEmojiReactions.js        | 10 +++++-----
 src/pages/home/report/ReportActionItem.js              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 1912014d6716..0be077bd5f0e 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -28,8 +28,8 @@ const propTypes = {
      */
     toggleReaction: PropTypes.func.isRequired,
 
-    /** A bool indicating if the current report action has any errors */
-    hasReportActionErrors: PropTypes.bool,
+    /** A bool indicating if the user can add or remove reactions from current action */
+    isReactionBlocked: PropTypes.bool,
 
     ...withCurrentUserPersonalDetailsPropTypes,
 };
@@ -37,7 +37,7 @@ const propTypes = {
 const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
     emojiReactions: {},
-    hasReportActionErrors: false,
+    isReactionBlocked: false,
 };
 
 function ReportActionItemEmojiReactions(props) {
@@ -142,13 +142,13 @@ function ReportActionItemEmojiReactions(props) {
                                     reactionUsers={reaction.reactionUsers}
                                     hasUserReacted={reaction.hasUserReacted}
                                     onReactionListOpen={reaction.onReactionListOpen}
-                                    isReactionBlocked={props.hasReportActionErrors}
+                                    isReactionBlocked={props.isReactionBlocked}
                                 />
                             </View>
                         </Tooltip>
                     );
                 })}
-                {!props.hasReportActionErrors && (
+                {!props.isReactionBlocked && (
                     <AddReactionBubble
                         onSelectEmoji={props.toggleReaction}
                         reportAction={{reportActionID: props.reportActionID}}
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index eec643d1ea0e..0949fff044fe 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -402,7 +402,7 @@ function ReportActionItem(props) {
                         <ReportActionItemEmojiReactions
                             reportActionID={props.action.reportActionID}
                             emojiReactions={props.emojiReactions}
-                            hasReportActionErrors={hasErrors}
+                            isReactionBlocked={hasErrors}
                             toggleReaction={(emoji) => {
                                 if (Session.isAnonymousUser()) {
                                     hideContextMenu(false);

From 66b56e9db91e2a5146756ee8cb3d6ccf1b936c05 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Wed, 23 Aug 2023 15:47:30 +0100
Subject: [PATCH 202/214] add shouldStackButtons prop

---
 src/components/ConfirmContent.js   | 48 +++++++++++++++++-------------
 src/components/ConfirmModal.js     |  9 +++++-
 src/components/DownloadAppModal.js |  1 +
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 78b9a9d500e4..9a72d4e7d584 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -42,10 +42,15 @@ const propTypes = {
     /** Whether we should show the cancel button */
     shouldShowCancelButton: PropTypes.bool,
 
+    /** Icon to display above the title */
     iconSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
 
+    /** Whether to center the icon / text content */
     shouldCenterContent: PropTypes.bool,
 
+    /** Whether to stack the buttons */
+    shouldStackButtons: PropTypes.bool,
+
     /** Styles for title */
     // eslint-disable-next-line react/forbid-prop-types
     titleStyles: PropTypes.arrayOf(PropTypes.object),
@@ -75,6 +80,7 @@ const defaultProps = {
     contentStyles: [],
     iconSource: null,
     shouldCenterContent: false,
+    shouldStackButtons: true,
     titleStyles: [],
     promptStyles: [],
     iconAdditionalStyles: [],
@@ -111,7 +117,27 @@ function ConfirmContent(props) {
                 {_.isString(props.prompt) ? <Text style={[...props.promptStyles, isCentered ? styles.textAlignCenter : {}]}>{props.prompt}</Text> : props.prompt}
             </View>
 
-            {isCentered ? (
+            {props.shouldStackButtons ? (
+                <>
+                    <Button
+                        success={props.success}
+                        danger={props.danger}
+                        style={[styles.mt4]}
+                        onPress={props.onConfirm}
+                        pressOnEnter
+                        text={props.confirmText || translate('common.yes')}
+                        isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
+                    />
+                    {props.shouldShowCancelButton && (
+                        <Button
+                            style={[styles.mt3, styles.noSelect]}
+                            onPress={props.onCancel}
+                            text={props.cancelText || translate('common.no')}
+                            shouldUseDefaultHover
+                        />
+                    )}
+                </>
+            ) : (
                 <View style={[styles.flexRow, styles.gap4]}>
                     {props.shouldShowCancelButton && (
                         <Button
@@ -133,26 +159,6 @@ function ConfirmContent(props) {
                         medium
                     />
                 </View>
-            ) : (
-                <>
-                    <Button
-                        success={props.success}
-                        danger={props.danger}
-                        style={[styles.mt4]}
-                        onPress={props.onConfirm}
-                        pressOnEnter
-                        text={props.confirmText || translate('common.yes')}
-                        isDisabled={isOffline && props.shouldDisableConfirmButtonWhenOffline}
-                    />
-                    {props.shouldShowCancelButton && (
-                        <Button
-                            style={[styles.mt3, styles.noSelect]}
-                            onPress={props.onCancel}
-                            text={props.cancelText || translate('common.no')}
-                            shouldUseDefaultHover
-                        />
-                    )}
-                </>
             )}
         </View>
     );
diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js
index a008b90207fb..705a05ec2058 100755
--- a/src/components/ConfirmModal.js
+++ b/src/components/ConfirmModal.js
@@ -45,6 +45,7 @@ const propTypes = {
     /** Should we announce the Modal visibility changes? */
     shouldSetModalVisibility: PropTypes.bool,
 
+    /** Icon to display above the title */
     iconSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
 
     /** Styles for title */
@@ -59,8 +60,12 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     iconAdditionalStyles: PropTypes.arrayOf(PropTypes.object),
 
+    /** Whether to center the icon / text content */
     shouldCenterContent: PropTypes.bool,
 
+    /** Whether to stack the buttons */
+    shouldStackButtons: PropTypes.bool,
+
     ...windowDimensionsPropTypes,
 };
 
@@ -76,11 +81,12 @@ const defaultProps = {
     shouldSetModalVisibility: true,
     title: '',
     iconSource: null,
-    shouldCenterContent: false,
     onModalHide: () => {},
     titleStyles: [],
     iconAdditionalStyles: [],
     promptStyles: [],
+    shouldCenterContent: false,
+    shouldStackButtons: true,
 };
 
 function ConfirmModal(props) {
@@ -111,6 +117,7 @@ function ConfirmModal(props) {
                 iconAdditionalStyles={props.iconAdditionalStyles}
                 titleStyles={props.titleStyles}
                 promptStyles={props.promptStyles}
+                shouldStackButtons={props.shouldStackButtons}
             />
         </Modal>
     );
diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
index 6d714979a34e..1eeab1c72fd3 100644
--- a/src/components/DownloadAppModal.js
+++ b/src/components/DownloadAppModal.js
@@ -58,6 +58,7 @@ function DownloadAppModal({showDownloadAppBanner}) {
             promptStyles={[styles.textNormal, styles.lh20]}
             titleStyles={[styles.textHeadline]}
             iconAdditionalStyles={[styles.appIconBorderRadius]}
+            shouldStackButtons={false}
         />
     );
 }

From 2daf94a654f5ef7079952f5c231e1c44bd186359 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Wed, 23 Aug 2023 15:54:15 +0100
Subject: [PATCH 203/214] add back SHOW_DOWNLOAD_APP_BANNER key

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

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 074a5e99e6b1..d4d2ab1f90a6 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -87,6 +87,9 @@ const ONYXKEYS = {
     SESSION: 'session',
     BETAS: 'betas',
 
+    /** Denotes if the Download App Banner has been dismissed */
+    SHOW_DOWNLOAD_APP_BANNER: 'showDownloadAppBanner',
+
     /** NVP keys
      * Contains the user's payPalMe data */
     PAYPAL: 'paypal',
@@ -286,6 +289,7 @@ type OnyxValues = {
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
+    [ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER]: boolean;
     [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.Request[];
     [ONYXKEYS.QUEUED_ONYX_UPDATES]: OnyxTypes.QueuedOnyxUpdates;
     [ONYXKEYS.CURRENT_DATE]: string;

From 9fb9a1aed369077a3cdb50a11fde0d61828c49cf Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@gmail.com>
Date: Wed, 23 Aug 2023 09:25:28 -0600
Subject: [PATCH 204/214] Add error fields to proptypes

---
 src/components/transactionPropTypes.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/transactionPropTypes.js b/src/components/transactionPropTypes.js
index f9bad284cf68..66ed18a1f0b7 100644
--- a/src/components/transactionPropTypes.js
+++ b/src/components/transactionPropTypes.js
@@ -71,4 +71,7 @@ export default PropTypes.shape({
         source: PropTypes.string,
         state: PropTypes.string,
     }),
+
+    /** Server side errors keyed by microtime */
+    errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
 });

From 50599fe4fc9b81718afa889ef2848ac1475cd9ec Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@gmail.com>
Date: Wed, 23 Aug 2023 09:35:10 -0600
Subject: [PATCH 205/214] Remove extra export

---
 src/libs/TransactionUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index abc6d21f91ef..5e133d3a383b 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -304,5 +304,4 @@ export {
     isReceiptBeingScanned,
     validateWaypoints,
     isDistanceRequest,
-    isReceiptBeingScanned,
 };

From 5d1d5f15a2f195a256d54aecb21c1c66d994f726 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 23 Aug 2023 15:52:24 +0000
Subject: [PATCH 206/214] Update version to 1.3.56-19

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index b2bcadc8a501..93ff6a5e491e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035618
-        versionName "1.3.56-18"
+        versionCode 1001035619
+        versionName "1.3.56-19"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2b345df70da2..0cee08b8bc1a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.18</string>
+	<string>1.3.56.19</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0b8b3c3f7a72..a844da8a1415 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.3.56.18</string>
+	<string>1.3.56.19</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 742cd329cd84..be6a9ca3dad4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-18",
+  "version": "1.3.56-19",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-18",
+      "version": "1.3.56-19",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 2b6e4bfb79a5..721b7d0fc543 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-18",
+  "version": "1.3.56-19",
   "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 a7bacb9bed394f44ce94ce37177a86faf9ca2680 Mon Sep 17 00:00:00 2001
From: Amy Evans <amy@expensify.com>
Date: Wed, 23 Aug 2023 12:06:40 -0400
Subject: [PATCH 207/214] Revert "fix: revalidate upon input and refocus if
 error occurs"

---
 src/components/MagicCodeInput.js | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/components/MagicCodeInput.js b/src/components/MagicCodeInput.js
index 5dba1c9c1b20..c62cb3c5281e 100644
--- a/src/components/MagicCodeInput.js
+++ b/src/components/MagicCodeInput.js
@@ -114,35 +114,21 @@ function MagicCodeInput(props) {
         },
     }));
 
-    /**
-     * Validate the entered code and submit
-     *
-     * @param {String} value
-     */
-    const validateAndSubmit = (value) => {
-        const numbers = decomposeString(value, props.maxLength);
+    const validateAndSubmit = () => {
+        const numbers = decomposeString(props.value, props.maxLength);
         if (!props.shouldSubmitOnComplete || _.filter(numbers, (n) => ValidationUtils.isNumeric(n)).length !== props.maxLength || props.network.isOffline) {
             return;
         }
         // Blurs the input and removes focus from the last input and, if it should submit
         // on complete, it will call the onFulfill callback.
         blurMagicCodeInput();
-        props.onFulfill(value);
+        props.onFulfill(props.value);
     };
 
-    useNetwork({onReconnect: () => validateAndSubmit(props.value)});
+    useNetwork({onReconnect: validateAndSubmit});
 
     useEffect(() => {
-        if (!props.hasError) {
-            return;
-        }
-
-        // Focus the last input if an error occurred to allow for corrections
-        inputRefs.current[props.maxLength - 1].focus();
-    }, [props.hasError, props.maxLength]);
-
-    useEffect(() => {
-        validateAndSubmit(props.value);
+        validateAndSubmit();
 
         // We have not added:
         // + the editIndex as the dependency because we don't want to run this logic after focusing on an input to edit it after the user has completed the code.
@@ -193,11 +179,6 @@ function MagicCodeInput(props) {
 
         const finalInput = composeToString(numbers);
         props.onChangeText(finalInput);
-
-        // If the same number is pressed, we cannot depend on props.value in useEffect for re-submitting
-        if (props.value === finalInput) {
-            validateAndSubmit(finalInput);
-        }
     };
 
     /**

From 8f3532e0c931c37a8ad1e1808eb73e8149802660 Mon Sep 17 00:00:00 2001
From: Daniel Gale-Rosen <dgalerosen@expensify.com>
Date: Wed, 23 Aug 2023 12:44:41 -0400
Subject: [PATCH 208/214] hide overflow

---
 src/styles/styles.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index 8df481ddb70e..154089a51447 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3636,10 +3636,11 @@ const styles = {
 
     googleButtonContainer: {
         colorScheme: 'light',
-        width: 40,
-        height: 40,
+        width: 42,
+        height: 42,
         marginLeft: 12,
         alignItems: 'center',
+        overflowY: 'hidden',
     },
 
     googlePillButtonContainer: {

From ce586e5717c6f787e9741b307683bc197d441396 Mon Sep 17 00:00:00 2001
From: Daniel Gale-Rosen <dgalerosen@expensify.com>
Date: Wed, 23 Aug 2023 12:48:41 -0400
Subject: [PATCH 209/214] undo change in dimensions

---
 src/styles/styles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/styles/styles.js b/src/styles/styles.js
index 154089a51447..45dbe39d55a1 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -3636,8 +3636,8 @@ const styles = {
 
     googleButtonContainer: {
         colorScheme: 'light',
-        width: 42,
-        height: 42,
+        width: 40,
+        height: 40,
         marginLeft: 12,
         alignItems: 'center',
         overflowY: 'hidden',

From fc4b894d379773af5c59081d34fbd432bf76cfc1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 23 Aug 2023 18:11:05 +0000
Subject: [PATCH 210/214] Update version to 1.3.56-20

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 93ff6a5e491e..be63a2a37f82 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035619
-        versionName "1.3.56-19"
+        versionCode 1001035620
+        versionName "1.3.56-20"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0cee08b8bc1a..a5f25ac8cd7a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.19</string>
+	<string>1.3.56.20</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a844da8a1415..f16cc3e67a1f 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.3.56.19</string>
+	<string>1.3.56.20</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index be6a9ca3dad4..7f2c28c67ad7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-19",
+  "version": "1.3.56-20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-19",
+      "version": "1.3.56-20",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 721b7d0fc543..6d6c62c0e0b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-19",
+  "version": "1.3.56-20",
   "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 c17a085dac644ac761119388b04daad0382b6d5d Mon Sep 17 00:00:00 2001
From: Huzaifa Rasheed <huzaifarasheed900@gmail.com>
Date: Wed, 23 Aug 2023 23:20:08 +0500
Subject: [PATCH 211/214] Updated emojis block boolean prop name

---
 src/components/Reactions/EmojiReactionBubble.js        | 10 +++++-----
 .../Reactions/ReportActionItemEmojiReactions.js        | 10 +++++-----
 src/pages/home/report/ReportActionItem.js              |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js
index 1e7816052658..bb37735d6920 100644
--- a/src/components/Reactions/EmojiReactionBubble.js
+++ b/src/components/Reactions/EmojiReactionBubble.js
@@ -38,8 +38,8 @@ const propTypes = {
      */
     hasUserReacted: PropTypes.bool,
 
-    /** Whether the user can react with the current emoji */
-    isReactionBlocked: PropTypes.bool,
+    /** We disable reacting with emojis on report actions that have errors */
+    shouldBlockReactions: PropTypes.bool,
 
     ...windowDimensionsPropTypes,
 };
@@ -48,7 +48,7 @@ const defaultProps = {
     count: 0,
     onReactionListOpen: () => {},
     isContextMenu: false,
-    isReactionBlocked: false,
+    shouldBlockReactions: false,
 
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
@@ -59,10 +59,10 @@ function EmojiReactionBubble(props) {
             style={({hovered, pressed}) => [
                 styles.emojiReactionBubble,
                 StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, props.hasUserReacted, props.isContextMenu),
-                props.isReactionBlocked && styles.cursorDisabled,
+                props.shouldBlockReactions && styles.cursorDisabled,
             ]}
             onPress={() => {
-                if (props.isReactionBlocked) {
+                if (props.shouldBlockReactions) {
                     return;
                 }
 
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index 0be077bd5f0e..ec2755f1a5dd 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -28,8 +28,8 @@ const propTypes = {
      */
     toggleReaction: PropTypes.func.isRequired,
 
-    /** A bool indicating if the user can add or remove reactions from current action */
-    isReactionBlocked: PropTypes.bool,
+    /** We disable reacting with emojis on report actions that have errors */
+    shouldBlockReactions: PropTypes.bool,
 
     ...withCurrentUserPersonalDetailsPropTypes,
 };
@@ -37,7 +37,7 @@ const propTypes = {
 const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
     emojiReactions: {},
-    isReactionBlocked: false,
+    shouldBlockReactions: false,
 };
 
 function ReportActionItemEmojiReactions(props) {
@@ -142,13 +142,13 @@ function ReportActionItemEmojiReactions(props) {
                                     reactionUsers={reaction.reactionUsers}
                                     hasUserReacted={reaction.hasUserReacted}
                                     onReactionListOpen={reaction.onReactionListOpen}
-                                    isReactionBlocked={props.isReactionBlocked}
+                                    shouldBlockReactions={props.shouldBlockReactions}
                                 />
                             </View>
                         </Tooltip>
                     );
                 })}
-                {!props.isReactionBlocked && (
+                {!props.shouldBlockReactions && (
                     <AddReactionBubble
                         onSelectEmoji={props.toggleReaction}
                         reportAction={{reportActionID: props.reportActionID}}
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 0949fff044fe..f61e4d5e1c5d 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -402,7 +402,7 @@ function ReportActionItem(props) {
                         <ReportActionItemEmojiReactions
                             reportActionID={props.action.reportActionID}
                             emojiReactions={props.emojiReactions}
-                            isReactionBlocked={hasErrors}
+                            shouldBlockReactions={hasErrors}
                             toggleReaction={(emoji) => {
                                 if (Session.isAnonymousUser()) {
                                     hideContextMenu(false);

From ce6d5c4cfa066d5583b7aaf9c257cfce2a54d7d8 Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Wed, 23 Aug 2023 19:34:43 +0100
Subject: [PATCH 212/214] Make the request populate the input field

---
 src/components/MoneyRequestConfirmationList.js | 2 +-
 src/libs/actions/IOU.js                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 35a7a561458e..3dc7f06acfad 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -396,7 +396,7 @@ function MoneyRequestConfirmationList(props) {
                     />
                     <MenuItemWithTopDescription
                         shouldShowRightIcon={!props.isReadOnly && isTypeRequest}
-                        title={props.iouMerchant || CONST.TRANSACTION.DEFAULT_MERCHANT}
+                        title={props.iouMerchant}
                         description={translate('common.merchant')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
                         titleStyle={styles.flex1}
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 994898521048..0479b0c17b0e 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -79,7 +79,7 @@ function resetMoneyRequestInfo(id = '') {
         currency: lodashGet(currentUserPersonalDetails, 'localCurrencyCode', CONST.CURRENCY.USD),
         comment: '',
         participants: [],
-        merchant: '',
+        merchant: CONST.TRANSACTION.DEFAULT_MERCHANT,
         created,
         receiptPath: '',
         receiptSource: '',

From 95545ccc9d07bf0b68241ed6b4ca099615ce400a Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Wed, 23 Aug 2023 19:36:04 +0100
Subject: [PATCH 213/214] Fix suggestion from previous PR

---
 src/pages/EditRequestMerchantPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
index c9c4cfbdbfaf..5c128599e74a 100644
--- a/src/pages/EditRequestMerchantPage.js
+++ b/src/pages/EditRequestMerchantPage.js
@@ -30,7 +30,7 @@ function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
         >
             <HeaderWithBackButton
                 title={translate('common.merchant')}
-                onBackButtonPress={() => Navigation.goBack()}
+                onBackButtonPress={Navigation.goBack}
             />
             <Form
                 style={[styles.flexGrow1, styles.ph5]}

From f6e63e0b1e657f95132552b893dcf2389c34bcfd Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 23 Aug 2023 19:34:21 +0000
Subject: [PATCH 214/214] Update version to 1.3.56-21

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index be63a2a37f82..8e3a9e4feabb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035620
-        versionName "1.3.56-20"
+        versionCode 1001035621
+        versionName "1.3.56-21"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a5f25ac8cd7a..1c496cb636c7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.56.20</string>
+	<string>1.3.56.21</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f16cc3e67a1f..8e283466f825 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.3.56.20</string>
+	<string>1.3.56.21</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 7f2c28c67ad7..4d871b159932 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-20",
+  "version": "1.3.56-21",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.56-20",
+      "version": "1.3.56-21",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 6d6c62c0e0b9..2d23bb9a0ff1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.56-20",
+  "version": "1.3.56-21",
   "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.",