From b74f71852152d99500c00b62af790c838ff68cad Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 31 Mar 2023 14:35:04 +0200
Subject: [PATCH 01/92] feat: create formatPhoneNumber util function

---
 package-lock.json                             | 14 +++
 package.json                                  |  1 +
 src/components/withLocalize.js                | 27 ++----
 src/libs/LocalePhoneNumber.js                 | 53 -----------
 src/libs/ReportUtils.js                       |  4 +-
 src/libs/SidebarUtils.js                      |  6 +-
 src/libs/formatPhoneNumber.js                 | 61 +++++++++++++
 src/pages/DetailsPage.js                      | 18 ++--
 src/pages/home/report/ParticipantLocalTime.js |  2 +-
 .../home/report/ReportActionItemSingle.js     |  7 +-
 src/pages/iou/IOUModal.js                     |  2 +-
 .../Contacts/ContactMethodDetailsPage.js      | 10 ++-
 .../Profile/Contacts/ContactMethodsPage.js    |  4 +-
 .../settings/Profile/Contacts/LoginField.js   |  4 +-
 src/pages/signin/ResendValidationForm.js      |  7 +-
 src/pages/signin/SignInPage.js                |  8 +-
 tests/unit/LocalePhoneNumberTest.js           | 88 -------------------
 tests/unit/ReportUtilsTest.js                 |  8 +-
 tests/unit/formatPhoneNumberTest.js           | 49 +++++++++++
 19 files changed, 188 insertions(+), 185 deletions(-)
 delete mode 100644 src/libs/LocalePhoneNumber.js
 create mode 100644 src/libs/formatPhoneNumber.js
 delete mode 100644 tests/unit/LocalePhoneNumberTest.js
 create mode 100644 tests/unit/formatPhoneNumberTest.js

diff --git a/package-lock.json b/package-lock.json
index 02f2d2a9d4fd..6af3a1cd0f16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,6 +34,7 @@
         "@react-navigation/native": "6.0.13",
         "@react-navigation/stack": "6.3.1",
         "@ua/react-native-airship": "^15.2.0",
+        "awesome-phonenumber": "^5.3.0",
         "babel-plugin-transform-remove-console": "^6.9.4",
         "babel-polyfill": "^6.26.0",
         "dom-serializer": "^0.2.2",
@@ -17876,6 +17877,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/awesome-phonenumber": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.3.0.tgz",
+      "integrity": "sha512-Inioq+5cDHcbSdy400FnXs1D68fZujU5Nbm3tg+qU+j/iPFW0U5CBI/rlrjI2mGCI31GvErSMk2oiNKOR2sX5w==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/axe-core": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
@@ -58267,6 +58276,11 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true
     },
+    "awesome-phonenumber": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.3.0.tgz",
+      "integrity": "sha512-Inioq+5cDHcbSdy400FnXs1D68fZujU5Nbm3tg+qU+j/iPFW0U5CBI/rlrjI2mGCI31GvErSMk2oiNKOR2sX5w=="
+    },
     "axe-core": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
diff --git a/package.json b/package.json
index 4583c48916c1..0fb6b5cbbc8f 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "@react-navigation/drawer": "github:Expensify/react-navigation#react-navigation-drawer-v6.5.0-alpha1-gitpkg",
     "@react-navigation/native": "6.0.13",
     "@react-navigation/stack": "6.3.1",
+    "awesome-phonenumber": "^5.3.0",
     "@ua/react-native-airship": "^15.2.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index a188e413ddf6..e0a207e871b4 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -7,12 +7,12 @@ import getComponentDisplayName from '../libs/getComponentDisplayName';
 import ONYXKEYS from '../ONYXKEYS';
 import * as Localize from '../libs/Localize';
 import DateUtils from '../libs/DateUtils';
-import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
 import * as NumberFormatUtils from '../libs/NumberFormatUtils';
 import * as LocaleDigitUtils from '../libs/LocaleDigitUtils';
 import CONST from '../CONST';
 import compose from '../libs/compose';
 import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
+import formatPhoneNumber from '../libs/formatPhoneNumber';
 
 const LocaleContext = createContext(null);
 
@@ -29,11 +29,9 @@ const withLocalizePropTypes = {
     /** Formats a datetime to local date and time string */
     datetimeToCalendarTime: PropTypes.func.isRequired,
 
-    /** Returns a locally converted phone number without the country code */
-    toLocalPhone: PropTypes.func.isRequired,
-
-    /** Returns an internationally converted phone number with the country code */
-    fromLocalPhone: PropTypes.func.isRequired,
+    /** Returns a locally converted phone number for numbers from the same region
+     * and an internationally converted phone number with the country code for numbers from other regions */
+    formatPhoneNumber: PropTypes.func.isRequired,
 
     /** Gets the standard digit corresponding to a locale digit */
     fromLocaleDigit: PropTypes.func.isRequired,
@@ -77,8 +75,7 @@ class LocaleContextProvider extends React.Component {
             numberFormat: this.numberFormat.bind(this),
             datetimeToRelative: this.datetimeToRelative.bind(this),
             datetimeToCalendarTime: this.datetimeToCalendarTime.bind(this),
-            fromLocalPhone: this.fromLocalPhone.bind(this),
-            toLocalPhone: this.toLocalPhone.bind(this),
+            formatPhoneNumber: this.formatPhoneNumber.bind(this),
             fromLocaleDigit: this.fromLocaleDigit.bind(this),
             toLocaleDigit: this.toLocaleDigit.bind(this),
             preferredLocale: this.props.preferredLocale,
@@ -126,19 +123,11 @@ class LocaleContextProvider extends React.Component {
     }
 
     /**
-     * @param {Number} number
-     * @returns {String}
-     */
-    toLocalPhone(number) {
-        return LocalePhoneNumber.toLocalPhone(this.props.preferredLocale, number);
-    }
-
-    /**
-     * @param {Number} number
+     * @param {String} phoneNumber
      * @returns {String}
      */
-    fromLocalPhone(number) {
-        return LocalePhoneNumber.fromLocalPhone(this.props.preferredLocale, number);
+    formatPhoneNumber(phoneNumber) {
+        return formatPhoneNumber(phoneNumber);
     }
 
     /**
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
deleted file mode 100644
index 3d47e7c6a5a9..000000000000
--- a/src/libs/LocalePhoneNumber.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import lodashGet from 'lodash/get';
-import lodashTrim from 'lodash/trim';
-import lodashIncludes from 'lodash/includes';
-import lodashStartsWith from 'lodash/startsWith';
-import Str from 'expensify-common/lib/str';
-import translations from '../languages/translations';
-
-/**
- * Returns a locally converted phone number without the country code
- *
- * @param {String} locale eg 'en', 'es-ES'
- * @param {String} number
- * @returns {String}
- */
-function toLocalPhone(locale, number) {
-    const numString = lodashTrim(number);
-    const withoutPlusNum = lodashIncludes(numString, '+') ? Str.cutBefore(numString, '+') : numString;
-    const country = lodashGet(translations, [locale, 'phoneCountryCode']);
-
-    if (country) {
-        if (lodashStartsWith(withoutPlusNum, country)) {
-            return Str.cutBefore(withoutPlusNum, country);
-        }
-        return numString;
-    }
-    return number;
-}
-
-/**
- * Returns an internationally converted phone number with the country code
- *
- * @param {String} locale eg 'en', 'es-ES'
- * @param {String} number
- * @returns {String}
- */
-function fromLocalPhone(locale, number) {
-    const numString = lodashTrim(number);
-    const withoutPlusNum = lodashIncludes(numString, '+') ? Str.cutBefore(numString, '+') : numString;
-    const country = lodashGet(translations, [locale, 'phoneCountryCode']);
-
-    if (country) {
-        if (lodashStartsWith(withoutPlusNum, country)) {
-            return `+${withoutPlusNum}`;
-        }
-        return `+${country}${withoutPlusNum}`;
-    }
-    return number;
-}
-
-export {
-    toLocalPhone,
-    fromLocalPhone,
-};
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 1b637537f2f5..b4f8e884d1e4 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -7,7 +7,6 @@ import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 import * as Localize from './Localize';
-import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as Expensicons from '../components/Icon/Expensicons';
 import hashCode from './hashCode';
 import Navigation from './Navigation/Navigation';
@@ -21,6 +20,7 @@ import linkingConfig from './Navigation/linkingConfig';
 import * as defaultAvatars from '../components/Icon/DefaultAvatars';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import * as defaultWorkspaceAvatars from '../components/Icon/WorkspaceDefaultAvatars';
+import formatPhoneNumber from './formatPhoneNumber';
 
 let sessionEmail;
 Onyx.connect({
@@ -748,7 +748,7 @@ function getDisplayNameForParticipant(login, shouldUseShortForm = false) {
     const loginWithoutSMSDomain = Str.removeSMSDomain(personalDetails.login);
     let longName = personalDetails.displayName || loginWithoutSMSDomain;
     if (longName === loginWithoutSMSDomain && Str.isSMSLogin(longName)) {
-        longName = LocalePhoneNumber.toLocalPhone(preferredLocale, longName);
+        longName = formatPhoneNumber(longName);
     }
     const shortName = personalDetails.firstName || longName;
 
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 99429caa7e04..3bbd8f9a5a6e 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -9,6 +9,7 @@ import * as Localize from './Localize';
 import CONST from '../CONST';
 import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
+import formatPhoneNumber from './formatPhoneNumber';
 
 // Note: It is very important that the keys subscribed to here are the same
 // keys that are connected to SidebarLinks withOnyx(). If there was a key missing from SidebarLinks and it's data was updated
@@ -240,6 +241,9 @@ function getOptionData(reportID) {
     const hasMultipleParticipants = participantPersonalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
     const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
 
+    const login = Str.removeSMSDomain(personalDetail.login);
+    const formattedLogin = Str.isSMSLogin(login) ? formatPhoneNumber(login) : login;
+
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((participantPersonalDetailList || []).slice(0, 10), hasMultipleParticipants);
 
@@ -293,7 +297,7 @@ function getOptionData(reportID) {
                 }).join(' ');
         }
 
-        result.alternateText = lastMessageText || Str.removeSMSDomain(personalDetail.login);
+        result.alternateText = lastMessageText || formattedLogin;
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result, iouReports);
diff --git a/src/libs/formatPhoneNumber.js b/src/libs/formatPhoneNumber.js
new file mode 100644
index 000000000000..026065b38e2b
--- /dev/null
+++ b/src/libs/formatPhoneNumber.js
@@ -0,0 +1,61 @@
+import lodashGet from 'lodash/get';
+import Onyx from 'react-native-onyx';
+import {parsePhoneNumber} from 'awesome-phonenumber';
+import ONYXKEYS from '../ONYXKEYS';
+
+let currentUserEmail;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        // When signed out, val is undefined
+        if (!val) {
+            return;
+        }
+
+        currentUserEmail = val.email;
+    },
+});
+
+let currentUserPersonalDetails;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS,
+    callback: (val) => {
+        currentUserPersonalDetails = lodashGet(val, currentUserEmail, {});
+    },
+});
+
+let countryCodeByIP;
+Onyx.connect({
+    key: ONYXKEYS.COUNTRY_CODE,
+    callback: val => countryCodeByIP = val || 1,
+});
+
+/**
+ * Returns a locally converted phone number for numbers from the same region
+ * and an internationally converted phone number with the country code for numbers from other regions
+ *
+ * @param {String} number
+ * @returns {String}
+ */
+
+function formatPhoneNumber(number) {
+    const parsed = parsePhoneNumber(number);
+    let locale;
+
+    if (currentUserPersonalDetails.phoneNumber) {
+        locale = parsePhoneNumber(currentUserPersonalDetails.phoneNumber).countryCode;
+    } else {
+        locale = countryCodeByIP;
+    }
+
+    const regionCode = parsed.countryCode;
+
+    if (regionCode === locale) {
+        // replacing regular spaces for so-called "hard spaces" to avoid breaking the line on whitespace
+        return parsed.number.national;
+    }
+
+    return parsed.number.international;
+}
+
+export default formatPhoneNumber;
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index 3b5b83796d43..9d59dbcf0009 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -108,6 +108,10 @@ class DetailsPage extends React.PureComponent {
             pronouns = this.props.translate(`pronouns.${localeKey}`);
         }
 
+        const phoneNumber = getPhoneNumber(details);
+        const displayName = isSMSLogin ? this.props.formatPhoneNumber(phoneNumber) : details.displayName;
+        const communicationsLinkValue = isSMSLogin ? getPhoneNumber(details) : details.login;
+
         return (
             <ScreenWrapper>
                 <FullPageNotFoundView shouldShow={_.isEmpty(login)}>
@@ -127,7 +131,7 @@ class DetailsPage extends React.PureComponent {
                             <ScrollView>
                                 <View style={styles.avatarSectionWrapper}>
                                     <AttachmentModal
-                                        headerTitle={isSMSLogin ? this.props.toLocalPhone(details.displayName) : details.displayName}
+                                        headerTitle={displayName}
                                         source={ReportUtils.getFullSizeAvatar(details.avatar, details.login)}
                                         isAuthTokenRequired
                                     >
@@ -151,7 +155,7 @@ class DetailsPage extends React.PureComponent {
                                     </AttachmentModal>
                                     {details.displayName && (
                                         <Text style={[styles.textHeadline, styles.mb6, styles.pre]} numberOfLines={1}>
-                                            {isSMSLogin ? this.props.toLocalPhone(details.displayName) : details.displayName}
+                                            {displayName}
                                         </Text>
                                     )}
                                     {details.login ? (
@@ -161,11 +165,13 @@ class DetailsPage extends React.PureComponent {
                                                     ? 'common.phoneNumber'
                                                     : 'common.email')}
                                             </Text>
-                                            <CommunicationsLink value={isSMSLogin ? getPhoneNumber(details) : details.login}>
-                                                <Tooltip text={isSMSLogin ? getPhoneNumber(details) : details.login}>
+                                            <CommunicationsLink
+                                                value={communicationsLinkValue}
+                                            >
+                                                <Tooltip text={communicationsLinkValue}>
                                                     <Text numberOfLines={1}>
                                                         {isSMSLogin
-                                                            ? this.props.toLocalPhone(getPhoneNumber(details))
+                                                            ? this.props.formatPhoneNumber(phoneNumber)
                                                             : details.login}
                                                     </Text>
                                                 </Tooltip>
@@ -186,7 +192,7 @@ class DetailsPage extends React.PureComponent {
                                 </View>
                                 {details.login !== this.props.session.email && (
                                     <MenuItem
-                                        title={`${this.props.translate('common.message')}${details.displayName}`}
+                                        title={`${this.props.translate('common.message')}${displayName}`}
                                         icon={Expensicons.ChatBubble}
                                         onPress={() => Report.navigateToAndOpenReport([details.login])}
                                         wrapperStyle={styles.breakAll}
diff --git a/src/pages/home/report/ParticipantLocalTime.js b/src/pages/home/report/ParticipantLocalTime.js
index ab1b3dcc4b5d..4043acd54692 100644
--- a/src/pages/home/report/ParticipantLocalTime.js
+++ b/src/pages/home/report/ParticipantLocalTime.js
@@ -56,7 +56,7 @@ class ParticipantLocalTime extends PureComponent {
     render() {
         const reportRecipientDisplayName = this.props.participant.firstName
             || (Str.isSMSLogin(this.props.participant.login)
-                ? this.props.toLocalPhone(this.props.participant.displayName)
+                ? this.props.formatPhoneNumber(Str.removeSMSDomain(this.props.participant.displayName))
                 : this.props.participant.displayName);
 
         return (
diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index 19d2cc05f58c..927bc0be52a0 100644
--- a/src/pages/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -65,7 +65,10 @@ const ReportActionItemSingle = (props) => {
     // we'll need to take the displayName from personal details and have it be in the same format for now. Eventually,
     // we should stop referring to the report history items entirely for this information.
     const personArray = displayName
-        ? [{type: 'TEXT', text: Str.isSMSLogin(login) ? props.toLocalPhone(displayName) : displayName}]
+        ? [{
+            type: 'TEXT',
+            text: Str.isSMSLogin(login) ? props.formatPhoneNumber(Str.removeSMSDomain(displayName)) : displayName
+        }]
         : props.action.person;
 
     return (
@@ -107,7 +110,7 @@ const ReportActionItemSingle = (props) => {
                                 />
                             ))}
                         </Pressable>
-                        <ReportActionItemDate created={props.action.created} />
+                        <ReportActionItemDate created={props.action.created}/>
                     </View>
                 ) : null}
                 {props.children}
diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
index 069ff51c7e57..0ecbb081e31f 100755
--- a/src/pages/iou/IOUModal.js
+++ b/src/pages/iou/IOUModal.js
@@ -121,7 +121,7 @@ class IOUModal extends Component {
             text: personalDetails.displayName,
             firstName: lodashGet(personalDetails, 'firstName', ''),
             lastName: lodashGet(personalDetails, 'lastName', ''),
-            alternateText: Str.isSMSLogin(personalDetails.login) ? Str.removeSMSDomain(personalDetails.login) : personalDetails.login,
+            alternateText: Str.isSMSLogin(personalDetails.login) ? this.props.formatPhoneNumber(Str.removeSMSDomain(personalDetails.login)) : personalDetails.login,
             icons: [{
                 source: ReportUtils.getAvatar(personalDetails.avatar, personalDetails.login),
                 name: personalDetails.login,
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index eca350a4e691..7785ad6bc2e7 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -142,6 +142,12 @@ class ContactMethodDetailsPage extends Component {
 
     render() {
         const contactMethod = this.getContactMethod();
+
+        // replacing spaces with "hard spaces" to prevent breaking the number
+        const formattedContactMethod = Str.isSMSLogin(contactMethod)
+            ? this.props.formatPhoneNumber(Str.removeSMSDomain(contactMethod)).replace(/ /g, '\u00A0')
+            : contactMethod;
+
         const loginData = this.props.loginList[contactMethod];
         if (!contactMethod || !loginData) {
             return <NotFoundPage />;
@@ -154,7 +160,7 @@ class ContactMethodDetailsPage extends Component {
         return (
             <ScreenWrapper>
                 <HeaderWithCloseButton
-                    title={Str.removeSMSDomain(contactMethod)}
+                    title={formattedContactMethod}
                     shouldShowBackButton
                     onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS)}
                     onCloseButtonPress={() => Navigation.dismissModal(true)}
@@ -175,7 +181,7 @@ class ContactMethodDetailsPage extends Component {
                                 <Icon src={Expensicons.DotIndicator} fill={colors.green} />
                                 <View style={[styles.flex1, styles.ml4]}>
                                     <Text>
-                                        {this.props.translate('contacts.enterMagicCode', {contactMethod})}
+                                        {this.props.translate('contacts.enterMagicCode', {contactMethod: formattedContactMethod})}
                                     </Text>
                                 </View>
                             </View>
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
index a205eb7da709..c5b494569164 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
@@ -96,13 +96,15 @@ const ContactMethodsPage = (props) => {
         // Default to using login key if we deleted login.partnerUserID optimistically
         // but still need to show the pending login being deleted while offline.
         const partnerUserID = login.partnerUserID || loginName;
+        const menuItemTitle = Str.isSMSLogin(partnerUserID) ? props.formatPhoneNumber(Str.removeSMSDomain(partnerUserID)) : partnerUserID;
+
         return (
             <OfflineWithFeedback
                 pendingAction={pendingAction}
                 key={partnerUserID}
             >
                 <MenuItem
-                    title={Str.removeSMSDomain(partnerUserID)}
+                    title={menuItemTitle}
                     description={description}
                     onPress={() => Navigation.navigate(ROUTES.getEditContactMethodRoute(partnerUserID))}
                     brickRoadIndicator={indicator}
diff --git a/src/pages/settings/Profile/Contacts/LoginField.js b/src/pages/settings/Profile/Contacts/LoginField.js
index 1fff1838ba9c..337522d68cb4 100755
--- a/src/pages/settings/Profile/Contacts/LoginField.js
+++ b/src/pages/settings/Profile/Contacts/LoginField.js
@@ -69,7 +69,7 @@ class LoginField extends Component {
             return this.props.label;
         }
         if (this.props.type === CONST.LOGIN_TYPE.PHONE) {
-            return this.props.toLocalPhone(this.props.login.partnerUserID);
+            return this.props.formatPhoneNumber(this.props.login.partnerUserID);
         }
         return this.props.login.partnerUserID;
     }
@@ -106,7 +106,7 @@ class LoginField extends Component {
                             <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.pt]}>
                                 <Text numberOfLines={1}>
                                     {this.props.type === CONST.LOGIN_TYPE.PHONE
-                                        ? this.props.toLocalPhone(this.props.login.partnerUserID)
+                                        ? this.props.formatPhoneNumber(this.props.login.partnerUserID)
                                         : this.props.login.partnerUserID}
                                 </Text>
                                 <Button
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 01f5cf7ea37e..ccea70c260a7 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -49,7 +49,12 @@ const defaultProps = {
 
 const ResendValidationForm = (props) => {
     const isSMSLogin = Str.isSMSLogin(props.credentials.login);
-    const login = isSMSLogin ? props.toLocalPhone(Str.removeSMSDomain(props.credentials.login)) : props.credentials.login;
+
+    // replacing spaces with "hard spaces" to prevent breaking the number
+    const login = isSMSLogin
+        ? props.formatPhoneNumber(Str.removeSMSDomain(props.credentials.login)).replace(/ /g, '\u00A0')
+        : props.credentials.login;
+
     const loginType = (isSMSLogin ? props.translate('common.phone') : props.translate('common.email')).toLowerCase();
 
     return (
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index f8c1ccaffa0b..442c539298a4 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -92,9 +92,13 @@ class SignInPage extends Component {
                 welcomeText = this.props.translate('validateCodeForm.enterAuthenticatorCode');
             } else {
                 const userLogin = Str.removeSMSDomain(lodashGet(this.props, 'credentials.login', ''));
+
+                // replacing spaces with "hard spaces" to prevent breaking the number
+                const userLoginToDisplay = Str.isSMSLogin(userLogin) ? this.props.formatPhoneNumber(userLogin).replace(/ /g, '\u00A0') : userLogin;
+
                 welcomeText = this.props.account.validated
-                    ? this.props.translate('welcomeText.welcomeBackEnterMagicCode', {login: userLogin})
-                    : this.props.translate('welcomeText.welcomeEnterMagicCode', {login: userLogin});
+                    ? this.props.translate('welcomeText.welcomeBackEnterMagicCode', {login: userLoginToDisplay})
+                    : this.props.translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay});
             }
         } else if (showPasswordForm) {
             welcomeText = this.props.translate('welcomeText.welcomeBack');
diff --git a/tests/unit/LocalePhoneNumberTest.js b/tests/unit/LocalePhoneNumberTest.js
deleted file mode 100644
index 26f51c24d863..000000000000
--- a/tests/unit/LocalePhoneNumberTest.js
+++ /dev/null
@@ -1,88 +0,0 @@
-const localePhoneNumber = require('../../src/libs/LocalePhoneNumber');
-
-describe('localePhoneNumber', () => {
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('es-ES', '34547474747474')).toBe('547474747474');
-    });
-
-    // Failing due to the use of Trimstart.
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('es-ES', '343434343434')).toBe('3434343434');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('es-ES', '+34547474747474')).toBe('547474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('es-ES', '547474747474')).toBe('547474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('es-ES', '+17474747474')).toBe('+17474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en', '+1547474747474')).toBe('547474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en', '1547474747474')).toBe('547474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en', '547474747474')).toBe('547474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en', '+347474747474')).toBe('+347474747474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en', '+34 747 474 7474')).toBe('+34 747 474 7474');
-    });
-
-    it('Test to local Number Conversion by locale', () => {
-        expect(localePhoneNumber.toLocalPhone('en-EN', '+17474747474')).toBe('+17474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('es-ES', '34547474747474')).toBe('+34547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('es-ES', '+34547474747474')).toBe('+34547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('es-ES', '547474747474')).toBe('+34547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('es-ES', '+17474747474')).toBe('+3417474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en', '+1547474747474')).toBe('+1547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en', '1547474747474')).toBe('+1547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en', '547474747474')).toBe('+1547474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en', '+347474747474')).toBe('+1347474747474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en', ' + 34 747 474 7474 ')).toBe('+1 34 747 474 7474');
-    });
-
-    it('Test to international Number Conversion by locale', () => {
-        expect(localePhoneNumber.fromLocalPhone('en-EN', '+17474747474')).toBe('+17474747474');
-    });
-});
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 1701793edfd1..fa05e62cb277 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -64,7 +64,7 @@ describe('ReportUtils', () => {
                     pronouns: 'She/her',
                 },
                 {
-                    displayName: '2223334444',
+                    displayName: '(222) 333-4444',
                     tooltip: '+12223334444',
                     pronouns: undefined,
                 },
@@ -89,7 +89,7 @@ describe('ReportUtils', () => {
                     pronouns: 'She/her',
                 },
                 {
-                    displayName: '2223334444',
+                    displayName: '(222) 333-4444',
                     tooltip: '+12223334444',
                     pronouns: undefined,
                 },
@@ -114,14 +114,14 @@ describe('ReportUtils', () => {
             test('SMS', () => {
                 expect(ReportUtils.getReportName({
                     participants: [currentUserEmail, '+12223334444@expensify.sms'],
-                })).toBe('2223334444');
+                })).toBe('(222) 333-4444');
             });
         });
 
         test('Group DM', () => {
             expect(ReportUtils.getReportName({
                 participants: [currentUserEmail, 'ragnar@vikings.net', 'floki@vikings.net', 'lagertha@vikings.net', '+12223334444@expensify.sms'],
-            })).toBe('Ragnar, floki@vikings.net, Lagertha, 2223334444');
+            })).toBe('Ragnar, floki@vikings.net, Lagertha, (222) 333-4444');
         });
 
         describe('Default Policy Room', () => {
diff --git a/tests/unit/formatPhoneNumberTest.js b/tests/unit/formatPhoneNumberTest.js
new file mode 100644
index 000000000000..5c0db5438be0
--- /dev/null
+++ b/tests/unit/formatPhoneNumberTest.js
@@ -0,0 +1,49 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '../../src/ONYXKEYS';
+import formatPhoneNumber from '../../src/libs/formatPhoneNumber';
+import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+
+const ES_NUMBER = '+34702474537';
+const US_NUMBER = '+18332403627';
+
+describe('formatPhoneNumber', () => {
+    beforeAll(() => Onyx.init({
+        keys: ONYXKEYS,
+    }));
+
+    describe('when the current user has a phone number', () => {
+        beforeEach(() => Onyx.multiSet({
+            [ONYXKEYS.SESSION]: {email: 'current@user.com'},
+            [ONYXKEYS.COUNTRY_CODE]: 34,
+            [ONYXKEYS.PERSONAL_DETAILS]: {'current@user.com': {phoneNumber: US_NUMBER}},
+        }).then(waitForPromisesToResolve));
+
+        afterEach(() => Onyx.clear());
+
+        it('Should display a number from the same region formatted locally', () => {
+            expect(formatPhoneNumber(US_NUMBER)).toBe('(833) 240-3627');
+        });
+
+        it('Should display a number from another region formatted internationally', () => {
+            expect(formatPhoneNumber(ES_NUMBER)).toBe('+34 702 47 45 37');
+        });
+    });
+
+    describe('when the current user does not have a phone number', () => {
+        beforeEach(() => Onyx.multiSet({
+            [ONYXKEYS.SESSION]: {email: 'current@user.com'},
+            [ONYXKEYS.COUNTRY_CODE]: 34,
+            [ONYXKEYS.PERSONAL_DETAILS]: {'current@user.com': {phoneNumber: ''}},
+        }).then(waitForPromisesToResolve));
+
+        afterEach(() => Onyx.clear());
+
+        it('should display a number from the same region formatted locally', () => {
+            expect(formatPhoneNumber(ES_NUMBER)).toBe('702 47 45 37');
+        });
+
+        it('should display a number from another region formatted internationally', () => {
+            expect(formatPhoneNumber(US_NUMBER)).toBe('+1 833-240-3627');
+        });
+    });
+});

From 40bf1d5492179553162d72238722e67a8565038e Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Tue, 4 Apr 2023 15:44:09 +0200
Subject: [PATCH 02/92] refactor: restore LocalePhoneNumber util and move
 formatPhoneNumber there

---
 src/components/withLocalize.js                         |  4 ++--
 .../{formatPhoneNumber.js => LocalePhoneNumber.js}     |  5 ++++-
 src/libs/ReportUtils.js                                |  4 ++--
 src/libs/SidebarUtils.js                               |  4 ++--
 ...rmatPhoneNumberTest.js => LocalePhoneNumberTest.js} | 10 +++++-----
 5 files changed, 15 insertions(+), 12 deletions(-)
 rename src/libs/{formatPhoneNumber.js => LocalePhoneNumber.js} (94%)
 rename tests/unit/{formatPhoneNumberTest.js => LocalePhoneNumberTest.js} (77%)

diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index e0a207e871b4..d577e38d3138 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -12,7 +12,7 @@ import * as LocaleDigitUtils from '../libs/LocaleDigitUtils';
 import CONST from '../CONST';
 import compose from '../libs/compose';
 import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
-import formatPhoneNumber from '../libs/formatPhoneNumber';
+import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
 
 const LocaleContext = createContext(null);
 
@@ -127,7 +127,7 @@ class LocaleContextProvider extends React.Component {
      * @returns {String}
      */
     formatPhoneNumber(phoneNumber) {
-        return formatPhoneNumber(phoneNumber);
+        return LocalePhoneNumber.formatPhoneNumber(phoneNumber);
     }
 
     /**
diff --git a/src/libs/formatPhoneNumber.js b/src/libs/LocalePhoneNumber.js
similarity index 94%
rename from src/libs/formatPhoneNumber.js
rename to src/libs/LocalePhoneNumber.js
index 026065b38e2b..4af8a9224229 100644
--- a/src/libs/formatPhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -58,4 +58,7 @@ function formatPhoneNumber(number) {
     return parsed.number.international;
 }
 
-export default formatPhoneNumber;
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    formatPhoneNumber,
+};
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index b4f8e884d1e4..83053a897af1 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -20,7 +20,7 @@ import linkingConfig from './Navigation/linkingConfig';
 import * as defaultAvatars from '../components/Icon/DefaultAvatars';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import * as defaultWorkspaceAvatars from '../components/Icon/WorkspaceDefaultAvatars';
-import formatPhoneNumber from './formatPhoneNumber';
+import * as LocalePhoneNumber from './LocalePhoneNumber';
 
 let sessionEmail;
 Onyx.connect({
@@ -748,7 +748,7 @@ function getDisplayNameForParticipant(login, shouldUseShortForm = false) {
     const loginWithoutSMSDomain = Str.removeSMSDomain(personalDetails.login);
     let longName = personalDetails.displayName || loginWithoutSMSDomain;
     if (longName === loginWithoutSMSDomain && Str.isSMSLogin(longName)) {
-        longName = formatPhoneNumber(longName);
+        longName = LocalePhoneNumber.formatPhoneNumber(longName);
     }
     const shortName = personalDetails.firstName || longName;
 
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 3bbd8f9a5a6e..108376a9e1bd 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -9,7 +9,7 @@ import * as Localize from './Localize';
 import CONST from '../CONST';
 import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
-import formatPhoneNumber from './formatPhoneNumber';
+import * as LocalePhoneNumber from './LocalePhoneNumber';
 
 // Note: It is very important that the keys subscribed to here are the same
 // keys that are connected to SidebarLinks withOnyx(). If there was a key missing from SidebarLinks and it's data was updated
@@ -242,7 +242,7 @@ function getOptionData(reportID) {
     const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
 
     const login = Str.removeSMSDomain(personalDetail.login);
-    const formattedLogin = Str.isSMSLogin(login) ? formatPhoneNumber(login) : login;
+    const formattedLogin = Str.isSMSLogin(login) ? LocalePhoneNumber.formatPhoneNumber(login) : login;
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((participantPersonalDetailList || []).slice(0, 10), hasMultipleParticipants);
diff --git a/tests/unit/formatPhoneNumberTest.js b/tests/unit/LocalePhoneNumberTest.js
similarity index 77%
rename from tests/unit/formatPhoneNumberTest.js
rename to tests/unit/LocalePhoneNumberTest.js
index 5c0db5438be0..045e13f70c8f 100644
--- a/tests/unit/formatPhoneNumberTest.js
+++ b/tests/unit/LocalePhoneNumberTest.js
@@ -1,6 +1,6 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import formatPhoneNumber from '../../src/libs/formatPhoneNumber';
+import * as LocalePhoneNumber from '../../src/libs/LocalePhoneNumber';
 import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 
 const ES_NUMBER = '+34702474537';
@@ -21,11 +21,11 @@ describe('formatPhoneNumber', () => {
         afterEach(() => Onyx.clear());
 
         it('Should display a number from the same region formatted locally', () => {
-            expect(formatPhoneNumber(US_NUMBER)).toBe('(833) 240-3627');
+            expect(LocalePhoneNumber.formatPhoneNumber(US_NUMBER)).toBe('(833) 240-3627');
         });
 
         it('Should display a number from another region formatted internationally', () => {
-            expect(formatPhoneNumber(ES_NUMBER)).toBe('+34 702 47 45 37');
+            expect(LocalePhoneNumber.formatPhoneNumber(ES_NUMBER)).toBe('+34 702 47 45 37');
         });
     });
 
@@ -39,11 +39,11 @@ describe('formatPhoneNumber', () => {
         afterEach(() => Onyx.clear());
 
         it('should display a number from the same region formatted locally', () => {
-            expect(formatPhoneNumber(ES_NUMBER)).toBe('702 47 45 37');
+            expect(LocalePhoneNumber.formatPhoneNumber(ES_NUMBER)).toBe('702 47 45 37');
         });
 
         it('should display a number from another region formatted internationally', () => {
-            expect(formatPhoneNumber(US_NUMBER)).toBe('+1 833-240-3627');
+            expect(LocalePhoneNumber.formatPhoneNumber(US_NUMBER)).toBe('+1 833-240-3627');
         });
     });
 });

From f8482ea1f251a5626d9278c91f30ca2314aed7f3 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 02:13:10 +0700
Subject: [PATCH 03/92] fix: incorrect bill splits for some currencies

---
 src/components/IOUConfirmationList.js |  4 ++--
 src/libs/IOUUtils.js                  | 32 +++++++++++++++++++++++----
 src/libs/actions/IOU.js               |  4 ++--
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index eae3f48d84ca..695c88a9467e 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -153,7 +153,7 @@ class IOUConfirmationList extends Component {
     getParticipantsWithAmount(participants) {
         return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(
             participants,
-            this.props.numberFormat(IOUUtils.calculateAmount(participants, this.props.iouAmount) / 100, {
+            this.props.numberFormat(IOUUtils.calculateAmount(participants, this.props.iouAmount, this.props.iou.selectedCurrencyCode) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode), {
                 style: 'currency',
                 currency: this.props.iou.selectedCurrencyCode,
             }),
@@ -187,7 +187,7 @@ class IOUConfirmationList extends Component {
 
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
                 this.props.currentUserPersonalDetails,
-                this.props.numberFormat(IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, true) / 100, {
+                this.props.numberFormat(IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, this.props.iou.selectedCurrencyCode, true) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode), {
                     style: 'currency',
                     currency: this.props.iou.selectedCurrencyCode,
                 }),
diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index b4e8f1ff46ce..1ced04b9d7a4 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -1,31 +1,55 @@
 import _ from 'underscore';
 import CONST from '../CONST';
 
+function getCurrencyDecimals(currency) {
+    const formatted = Intl.NumberFormat('en', {style: 'currency', currency}).format(0);
+    const decimalPointIndex = formatted.indexOf('.');
+    return decimalPointIndex === -1
+        ? 0
+        : Math.min(formatted.length - decimalPointIndex - 1, 2);
+}
+
+function getCurrencyUnits(currency) {
+    return 10 ** getCurrencyDecimals(currency);
+}
+
 /**
  * Calculates the amount per user given a list of participants
  * @param {Array} participants - List of logins for the participants in the chat. It should not include the current user's login.
  * @param {Number} total - IOU total amount
+ * @param {String} currency - IOU currency
  * @param {Boolean} isDefaultUser - Whether we are calculating the amount for the current user
+ * @param {Boolean} shouldConvertTo2DigitsFormat - Whether to convert the amount to 2-digits format
  * @returns {Number}
  */
-function calculateAmount(participants, total, isDefaultUser = false) {
+function calculateAmount(participants, total, currency, isDefaultUser = false, shouldConvertTo2DigitsFormat = false) {
     // Convert to cents before working with iouAmount to avoid
     // javascript subtraction with decimal problem -- when dealing with decimals,
     // because they are encoded as IEEE 754 floating point numbers, some of the decimal
     // numbers cannot be represented with perfect accuracy.
-    // Cents is temporary and there must be support for other currencies in the future
-    const iouAmount = Math.round(parseFloat(total * 100));
+    // Currencies that do not have minor units (i.e. no decimal place) are also supported.
+    // https://github.com/Expensify/App/issues/15878
+    const currencyUnits = getCurrencyUnits(currency);
+    const iouAmount = Math.round(parseFloat(total * currencyUnits));
+
     const totalParticipants = participants.length + 1;
     const amountPerPerson = Math.round(iouAmount / totalParticipants);
 
     if (!isDefaultUser) {
+        if (shouldConvertTo2DigitsFormat) {
+            return (amountPerPerson * 100) / currencyUnits;
+        }
         return amountPerPerson;
     }
 
     const sumAmount = amountPerPerson * totalParticipants;
     const difference = iouAmount - sumAmount;
 
-    return iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
+    const finalAmount = iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
+    if (shouldConvertTo2DigitsFormat) {
+        return (finalAmount * 100) / currencyUnits;
+    }
+    return finalAmount;
 }
 
 /**
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 9bad1af1a63f..ba791426fef1 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -311,8 +311,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
     ];
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
-    const splitAmount = IOUUtils.calculateAmount(participants, amount);
-    const splits = [{email: currentUserEmail, amount: IOUUtils.calculateAmount(participants, amount, true)}];
+    const splitAmount = IOUUtils.calculateAmount(participants, amount, currency, false, true);
+    const splits = [{email: currentUserEmail, amount: IOUUtils.calculateAmount(participants, amount, currency, true, true)}];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {

From 36e3c8b1385b4b5a83eb83c34f221e01545b704d Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 02:25:52 +0700
Subject: [PATCH 04/92] fix eslint

---
 src/components/IOUConfirmationList.js | 31 ++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 695c88a9467e..b45a4ff882ae 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -153,10 +153,17 @@ class IOUConfirmationList extends Component {
     getParticipantsWithAmount(participants) {
         return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(
             participants,
-            this.props.numberFormat(IOUUtils.calculateAmount(participants, this.props.iouAmount, this.props.iou.selectedCurrencyCode) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode), {
-                style: 'currency',
-                currency: this.props.iou.selectedCurrencyCode,
-            }),
+            this.props.numberFormat(
+                IOUUtils.calculateAmount(
+                    participants,
+                    this.props.iouAmount,
+                    this.props.iou.selectedCurrencyCode,
+                ) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode),
+                {
+                    style: 'currency',
+                    currency: this.props.iou.selectedCurrencyCode,
+                },
+            ),
         );
     }
 
@@ -187,10 +194,18 @@ class IOUConfirmationList extends Component {
 
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
                 this.props.currentUserPersonalDetails,
-                this.props.numberFormat(IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, this.props.iou.selectedCurrencyCode, true) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode), {
-                    style: 'currency',
-                    currency: this.props.iou.selectedCurrencyCode,
-                }),
+                this.props.numberFormat(
+                    IOUUtils.calculateAmount(
+                        selectedParticipants,
+                        this.props.iouAmount,
+                        this.props.iou.selectedCurrencyCode,
+                        true,
+                    ) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode),
+                    {
+                        style: 'currency',
+                        currency: this.props.iou.selectedCurrencyCode,
+                    },
+                ),
             );
 
             sections.push({

From 8bc9e5e9c12eba9ec968757cb88ecdde41663556 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 12:01:59 +0700
Subject: [PATCH 05/92] export function getCurrencyUnits

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

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 1ced04b9d7a4..34a73710f560 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -163,4 +163,5 @@ export {
     updateIOUOwnerAndTotal,
     getIOUReportActions,
     isIOUReportPendingCurrencyConversion,
+    getCurrencyUnits,
 };

From 1d5fb24e8f5f05e5f309339266170a25449daea1 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 14:10:19 +0700
Subject: [PATCH 06/92] refactor: remove duplicated logic

---
 src/libs/IOUUtils.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 34a73710f560..d089c71efe6b 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -35,20 +35,18 @@ function calculateAmount(participants, total, currency, isDefaultUser = false, s
     const totalParticipants = participants.length + 1;
     const amountPerPerson = Math.round(iouAmount / totalParticipants);
 
-    if (!isDefaultUser) {
-        if (shouldConvertTo2DigitsFormat) {
-            return (amountPerPerson * 100) / currencyUnits;
-        }
-        return amountPerPerson;
-    }
+    let finalAmount = amountPerPerson;
 
-    const sumAmount = amountPerPerson * totalParticipants;
-    const difference = iouAmount - sumAmount;
+    if (isDefaultUser) {
+        const sumAmount = amountPerPerson * totalParticipants;
+        const difference = iouAmount - sumAmount;
+        finalAmount = iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
+    }
 
-    const finalAmount = iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
     if (shouldConvertTo2DigitsFormat) {
-        return (finalAmount * 100) / currencyUnits;
+        finalAmount = (finalAmount * 100) / currencyUnits;
     }
+
     return finalAmount;
 }
 

From e0723b0f5bb49d9cf93128c321a7593407302781 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 5 Apr 2023 13:25:30 +0200
Subject: [PATCH 07/92] feat: add formatPhoneNumberInText function

---
 src/components/ReportActionItem/IOUQuote.js |  2 +-
 src/components/ReportTransaction.js         |  2 +-
 src/components/withLocalize.js              | 13 ++++++++++
 src/libs/LocalePhoneNumber.js               | 27 +++++++++++++++++++-
 src/libs/SidebarUtils.js                    |  2 +-
 tests/unit/LocalePhoneNumberTest.js         | 28 +++++++++++++++++----
 6 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/components/ReportActionItem/IOUQuote.js b/src/components/ReportActionItem/IOUQuote.js
index f93888d41448..fba7144a6242 100644
--- a/src/components/ReportActionItem/IOUQuote.js
+++ b/src/components/ReportActionItem/IOUQuote.js
@@ -82,7 +82,7 @@ const IOUQuote = props => (
                         : styles.cursorDefault]}
                     >
                         {/* Get remainder of IOU message */}
-                        {fragment.text.substring(fragment.text.indexOf(' '))}
+                        {props.formatPhoneNumberInText(fragment.text.substring(fragment.text.indexOf(' ')))}
                     </Text>
                 </Text>
                 <Icon src={Expensicons.ArrowRight} fill={props.shouldAllowViewDetails ? StyleUtils.getIconFillColor(getButtonState(props.isHovered)) : themeColors.transparent} />
diff --git a/src/components/ReportTransaction.js b/src/components/ReportTransaction.js
index be53b11c742e..8111fb1d3297 100644
--- a/src/components/ReportTransaction.js
+++ b/src/components/ReportTransaction.js
@@ -76,7 +76,7 @@ class ReportTransaction extends Component {
                         wrapperStyles={[styles.reportTransactionWrapper]}
                     >
                         <Text style={[styles.chatItemMessage]}>
-                            {this.props.action.message[0].text}
+                            {this.props.formatPhoneNumberInText(this.props.action.message[0].text)}
                         </Text>
                     </ReportActionItemSingle>
                     {this.props.canBeRejected && (
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index d577e38d3138..3ad5002a55eb 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -33,6 +33,10 @@ const withLocalizePropTypes = {
      * and an internationally converted phone number with the country code for numbers from other regions */
     formatPhoneNumber: PropTypes.func.isRequired,
 
+    /** Returns a locally converted phone number for numbers from the same region
+     * and an internationally converted phone number with the country code for numbers from other regions */
+    formatPhoneNumberInText: PropTypes.func.isRequired,
+
     /** Gets the standard digit corresponding to a locale digit */
     fromLocaleDigit: PropTypes.func.isRequired,
 
@@ -76,6 +80,7 @@ class LocaleContextProvider extends React.Component {
             datetimeToRelative: this.datetimeToRelative.bind(this),
             datetimeToCalendarTime: this.datetimeToCalendarTime.bind(this),
             formatPhoneNumber: this.formatPhoneNumber.bind(this),
+            formatPhoneNumberInText: this.formatPhoneNumberInText.bind(this),
             fromLocaleDigit: this.fromLocaleDigit.bind(this),
             toLocaleDigit: this.toLocaleDigit.bind(this),
             preferredLocale: this.props.preferredLocale,
@@ -130,6 +135,14 @@ class LocaleContextProvider extends React.Component {
         return LocalePhoneNumber.formatPhoneNumber(phoneNumber);
     }
 
+    /**
+     * @param {String} text
+     * @returns {String}
+     */
+    formatPhoneNumberInText(text) {
+        return LocalePhoneNumber.formatPhoneNumberInText(text);
+    }
+
     /**
      * @param {String} digit
      * @returns {String}
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 4af8a9224229..1cf3bca0f7d9 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -1,6 +1,8 @@
+import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import {parsePhoneNumber} from 'awesome-phonenumber';
+import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 
 let currentUserEmail;
@@ -40,6 +42,12 @@ Onyx.connect({
 
 function formatPhoneNumber(number) {
     const parsed = parsePhoneNumber(number);
+
+    // return the string untouched if it's not a phone number
+    if (!parsed.valid && !parsed.possible) {
+        return number;
+    }
+
     let locale;
 
     if (currentUserPersonalDetails.phoneNumber) {
@@ -58,7 +66,24 @@ function formatPhoneNumber(number) {
     return parsed.number.international;
 }
 
+function formatPhoneNumberInText(text) {
+    if (!text) {
+        return '';
+    }
+
+    const textArray = text.split(' ');
+
+    const formattedText = _.map(textArray, (txt) => {
+        if (Str.isSMSLogin(txt)) {
+            return formatPhoneNumber(Str.removeSMSDomain(txt));
+        }
+        return txt;
+    }).join(' ');
+
+    return formattedText;
+}
+
 export {
-    // eslint-disable-next-line import/prefer-default-export
     formatPhoneNumber,
+    formatPhoneNumberInText,
 };
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 108376a9e1bd..ec8357637913 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -297,7 +297,7 @@ function getOptionData(reportID) {
                 }).join(' ');
         }
 
-        result.alternateText = lastMessageText || formattedLogin;
+        result.alternateText = LocalePhoneNumber.formatPhoneNumberInText(lastMessageText) || formattedLogin;
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result, iouReports);
diff --git a/tests/unit/LocalePhoneNumberTest.js b/tests/unit/LocalePhoneNumberTest.js
index 045e13f70c8f..33827c812007 100644
--- a/tests/unit/LocalePhoneNumberTest.js
+++ b/tests/unit/LocalePhoneNumberTest.js
@@ -6,12 +6,12 @@ import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 const ES_NUMBER = '+34702474537';
 const US_NUMBER = '+18332403627';
 
-describe('formatPhoneNumber', () => {
+describe('LocalePhoneNumber utils', () => {
     beforeAll(() => Onyx.init({
         keys: ONYXKEYS,
     }));
 
-    describe('when the current user has a phone number', () => {
+    describe('formatPhoneNumber function - when the current user has a phone number', () => {
         beforeEach(() => Onyx.multiSet({
             [ONYXKEYS.SESSION]: {email: 'current@user.com'},
             [ONYXKEYS.COUNTRY_CODE]: 34,
@@ -20,16 +20,16 @@ describe('formatPhoneNumber', () => {
 
         afterEach(() => Onyx.clear());
 
-        it('Should display a number from the same region formatted locally', () => {
+        it('should display a number from the same region formatted locally', () => {
             expect(LocalePhoneNumber.formatPhoneNumber(US_NUMBER)).toBe('(833) 240-3627');
         });
 
-        it('Should display a number from another region formatted internationally', () => {
+        it('should display a number from another region formatted internationally', () => {
             expect(LocalePhoneNumber.formatPhoneNumber(ES_NUMBER)).toBe('+34 702 47 45 37');
         });
     });
 
-    describe('when the current user does not have a phone number', () => {
+    describe('formatPhoneNumber function - when the current user does not have a phone number', () => {
         beforeEach(() => Onyx.multiSet({
             [ONYXKEYS.SESSION]: {email: 'current@user.com'},
             [ONYXKEYS.COUNTRY_CODE]: 34,
@@ -46,4 +46,22 @@ describe('formatPhoneNumber', () => {
             expect(LocalePhoneNumber.formatPhoneNumber(US_NUMBER)).toBe('+1 833-240-3627');
         });
     });
+
+    describe('formatPhoneNumberInText', () => {
+        beforeEach(() => Onyx.multiSet({
+            [ONYXKEYS.SESSION]: {email: 'current@user.com'},
+            [ONYXKEYS.COUNTRY_CODE]: 1,
+            [ONYXKEYS.PERSONAL_DETAILS]: {'current@user.com': {phoneNumber: US_NUMBER}},
+        }).then(waitForPromisesToResolve));
+
+        afterEach(() => Onyx.clear());
+
+        it('should return empty string when no text is given', () => {
+            expect(LocalePhoneNumber.formatPhoneNumberInText(undefined)).toBe('');
+        });
+
+        it('should properly format the phone number in text', () => {
+            expect(LocalePhoneNumber.formatPhoneNumberInText(`Requested USD 20.00 from ${US_NUMBER}@expensify.sms`)).toBe('Requested USD 20.00 from (833) 240-3627');
+        });
+    });
 });

From 6dd8c327b41bbc08842f7aa33f5ea6425376551f Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 5 Apr 2023 14:30:55 +0200
Subject: [PATCH 08/92] fix: apply requested changes

---
 src/components/ReportActionItem/IOUQuote.js |  3 ++-
 src/components/ReportTransaction.js         |  3 ++-
 src/components/withLocalize.js              | 13 -------------
 src/libs/LocalePhoneNumber.js               |  4 +---
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/components/ReportActionItem/IOUQuote.js b/src/components/ReportActionItem/IOUQuote.js
index fba7144a6242..45d5a2a1ddd8 100644
--- a/src/components/ReportActionItem/IOUQuote.js
+++ b/src/components/ReportActionItem/IOUQuote.js
@@ -14,6 +14,7 @@ import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import {showContextMenuForReport} from '../ShowContextMenuContext';
 import * as StyleUtils from '../../styles/StyleUtils';
 import getButtonState from '../../libs/getButtonState';
+import * as LocalePhoneNumber from '../../libs/LocalePhoneNumber';
 
 const propTypes = {
     /** All the data of the action */
@@ -82,7 +83,7 @@ const IOUQuote = props => (
                         : styles.cursorDefault]}
                     >
                         {/* Get remainder of IOU message */}
-                        {props.formatPhoneNumberInText(fragment.text.substring(fragment.text.indexOf(' ')))}
+                        {LocalePhoneNumber.formatPhoneNumberInText(fragment.text.substring(fragment.text.indexOf(' ')))}
                     </Text>
                 </Text>
                 <Icon src={Expensicons.ArrowRight} fill={props.shouldAllowViewDetails ? StyleUtils.getIconFillColor(getButtonState(props.isHovered)) : themeColors.transparent} />
diff --git a/src/components/ReportTransaction.js b/src/components/ReportTransaction.js
index 8111fb1d3297..03b83c4783ee 100644
--- a/src/components/ReportTransaction.js
+++ b/src/components/ReportTransaction.js
@@ -5,6 +5,7 @@ import styles from '../styles/styles';
 import CONST from '../CONST';
 import * as IOU from '../libs/actions/IOU';
 import * as ReportActions from '../libs/actions/ReportActions';
+import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
 import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
 import ReportActionItemSingle from '../pages/home/report/ReportActionItemSingle';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -76,7 +77,7 @@ class ReportTransaction extends Component {
                         wrapperStyles={[styles.reportTransactionWrapper]}
                     >
                         <Text style={[styles.chatItemMessage]}>
-                            {this.props.formatPhoneNumberInText(this.props.action.message[0].text)}
+                            {LocalePhoneNumber.formatPhoneNumberInText(this.props.action.message[0].text)}
                         </Text>
                     </ReportActionItemSingle>
                     {this.props.canBeRejected && (
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 3ad5002a55eb..d577e38d3138 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -33,10 +33,6 @@ const withLocalizePropTypes = {
      * and an internationally converted phone number with the country code for numbers from other regions */
     formatPhoneNumber: PropTypes.func.isRequired,
 
-    /** Returns a locally converted phone number for numbers from the same region
-     * and an internationally converted phone number with the country code for numbers from other regions */
-    formatPhoneNumberInText: PropTypes.func.isRequired,
-
     /** Gets the standard digit corresponding to a locale digit */
     fromLocaleDigit: PropTypes.func.isRequired,
 
@@ -80,7 +76,6 @@ class LocaleContextProvider extends React.Component {
             datetimeToRelative: this.datetimeToRelative.bind(this),
             datetimeToCalendarTime: this.datetimeToCalendarTime.bind(this),
             formatPhoneNumber: this.formatPhoneNumber.bind(this),
-            formatPhoneNumberInText: this.formatPhoneNumberInText.bind(this),
             fromLocaleDigit: this.fromLocaleDigit.bind(this),
             toLocaleDigit: this.toLocaleDigit.bind(this),
             preferredLocale: this.props.preferredLocale,
@@ -135,14 +130,6 @@ class LocaleContextProvider extends React.Component {
         return LocalePhoneNumber.formatPhoneNumber(phoneNumber);
     }
 
-    /**
-     * @param {String} text
-     * @returns {String}
-     */
-    formatPhoneNumberInText(text) {
-        return LocalePhoneNumber.formatPhoneNumberInText(text);
-    }
-
     /**
      * @param {String} digit
      * @returns {String}
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 1cf3bca0f7d9..6f5247478bf9 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -73,14 +73,12 @@ function formatPhoneNumberInText(text) {
 
     const textArray = text.split(' ');
 
-    const formattedText = _.map(textArray, (txt) => {
+    return _.map(textArray, (txt) => {
         if (Str.isSMSLogin(txt)) {
             return formatPhoneNumber(Str.removeSMSDomain(txt));
         }
         return txt;
     }).join(' ');
-
-    return formattedText;
 }
 
 export {

From 81f909b5109934c5507551f11b605d9e75b8b03a Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 22:52:46 +0700
Subject: [PATCH 09/92] add JSDoc and unit test for getCurrencyDecimals
 function

---
 src/libs/IOUUtils.js       | 10 ++++++++++
 tests/unit/IOUUtilsTest.js | 14 ++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index d089c71efe6b..5be66ac1ab59 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -1,6 +1,15 @@
 import _ from 'underscore';
 import CONST from '../CONST';
 
+/**
+ * Returns the number of digits after the decimal separator
+ * for a specific currency following ISO 4217.
+ * For currencies that have decimal places > 2, floor to 2 instead:
+ * https://github.com/Expensify/App/issues/15878#issuecomment-1496291464
+ *
+ * @param {String} currency - IOU currency
+ * @returns {Number}
+ */
 function getCurrencyDecimals(currency) {
     const formatted = Intl.NumberFormat('en', {style: 'currency', currency}).format(0);
     const decimalPointIndex = formatted.indexOf('.');
@@ -162,4 +171,5 @@ export {
     getIOUReportActions,
     isIOUReportPendingCurrencyConversion,
     getCurrencyUnits,
+    getCurrencyDecimals,
 };
diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 97ee16ca038b..53b91867962c 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -131,3 +131,17 @@ describe('isIOUReportPendingCurrencyConversion', () => {
     });
 });
 
+describe('getCurrencyDecimals', () => {
+    test('Currency decimals smaller than or equal 2', () => {
+        expect(IOUUtils.getCurrencyDecimals('JPY')).toBe(0);
+        expect(IOUUtils.getCurrencyDecimals('USD')).toBe(2);
+    });
+
+    test('Currency decimals larger than 2 should return 2', () => {
+        // Actual: 3
+        expect(IOUUtils.getCurrencyDecimals('LYD')).toBe(2);
+
+        // Actual: 4
+        expect(IOUUtils.getCurrencyDecimals('UYW')).toBe(2);
+    });
+});

From 714c49df3efedec0543c00026d2b8f329142bb06 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 5 Apr 2023 23:39:49 +0700
Subject: [PATCH 10/92] add JSDoc and unit test for getCurrencyUnits function

---
 src/libs/IOUUtils.js       |  7 +++++++
 tests/unit/IOUUtilsTest.js | 11 +++++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 5be66ac1ab59..352b25f61353 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -18,6 +18,13 @@ function getCurrencyDecimals(currency) {
         : Math.min(formatted.length - decimalPointIndex - 1, 2);
 }
 
+/**
+ * Returns the currency's minor unit quantity
+ * i.e. Cent in USD
+ *
+ * @param {String} currency - IOU currency
+ * @returns {Number}
+ */
 function getCurrencyUnits(currency) {
     return 10 ** getCurrencyDecimals(currency);
 }
diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 53b91867962c..43ef28549ee1 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -145,3 +145,14 @@ describe('getCurrencyDecimals', () => {
         expect(IOUUtils.getCurrencyDecimals('UYW')).toBe(2);
     });
 });
+
+describe('getCurrencyUnits', () => {
+    test('Currency with decimals smaller than or equal 2', () => {
+        expect(IOUUtils.getCurrencyUnits('JPY')).toBe(1);
+        expect(IOUUtils.getCurrencyUnits('USD')).toBe(100);
+    });
+
+    test('Currency with decimals larger than 2 should be floor to 2', () => {
+        expect(IOUUtils.getCurrencyUnits('LYD')).toBe(100);
+    });
+});

From 9d2a5e42292c099d38a4b93e8d8d0fcbfd9f3a35 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 5 Apr 2023 18:07:40 -0700
Subject: [PATCH 11/92] Add new Task Beta

---
 src/libs/Permissions.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index 68f1a493f158..d3e407260e20 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -94,6 +94,14 @@ function canUsePasswordlessLogins(betas) {
     return _.contains(betas, CONST.BETAS.PASSWORDLESS) || _.contains(betas, CONST.BETAS.ALL);
 }
 
+/**
+ * @param {Array<String>} betas
+ * @returns {Boolean}
+ */
+function canUseTasks(betas) {
+    return _.contains(betas, CONST.BETAS.TASKS) || _.contains(betas, CONST.BETAS.ALL);
+}
+
 export default {
     canUseChronos,
     canUseIOU,
@@ -105,4 +113,5 @@ export default {
     canUsePolicyRooms,
     canUsePolicyExpenseChat,
     canUsePasswordlessLogins,
+    canUseTasks,
 };

From 78c231691e671cd816acb95fbfd16830b0447093 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Wed, 5 Apr 2023 18:07:49 -0700
Subject: [PATCH 12/92] Update CONST.js

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

diff --git a/src/CONST.js b/src/CONST.js
index 20f2ff43a632..8d1cbaea9246 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -190,6 +190,7 @@ const CONST = {
         POLICY_ROOMS: 'policyRooms',
         POLICY_EXPENSE_CHAT: 'policyExpenseChat',
         PASSWORDLESS: 'passwordless',
+        TASKS: 'tasks',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',

From f1f5ae382f0183ee8ee00a72a752a5388d8dd1b0 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 6 Apr 2023 12:09:15 -0700
Subject: [PATCH 13/92] handle all the new page linking

---
 src/ROUTES.js                                            | 2 ++
 src/libs/Navigation/AppNavigator/AuthScreens.js          | 6 ++++++
 src/libs/Navigation/AppNavigator/ModalStackNavigators.js | 9 +++++++++
 src/libs/Navigation/linkingConfig.js                     | 5 +++++
 4 files changed, 22 insertions(+)

diff --git a/src/ROUTES.js b/src/ROUTES.js
index d5ba2406e322..46ebb2087d17 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -55,6 +55,7 @@ export default {
     getEditContactMethodRoute: contactMethod => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
     NEW_GROUP: 'new/group',
     NEW_CHAT: 'new/chat',
+    NEW_TASK: 'new/task',
     REPORT,
     REPORT_WITH_ID: 'r/:reportID',
     getReportRoute: reportID => `r/${reportID}`,
@@ -88,6 +89,7 @@ export default {
     IOU_DETAILS_ENABLE_PAYMENTS: `${IOU_DETAILS}/enable-payments`,
     IOU_DETAILS_WITH_IOU_REPORT_ID: `${IOU_DETAILS}/:chatReportID/:iouReportID/`,
     getIouDetailsRoute: (chatReportID, iouReportID) => `iou/details/${chatReportID}/${iouReportID}`,
+    getTaskDetailsRoute: taskID => `task/details/${taskID}`,
     SEARCH: 'search',
     SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:accountID/:validateCode',
     DETAILS: 'details',
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 776508f27864..f033f5a8a243 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -288,6 +288,12 @@ class AuthScreens extends React.Component {
                     component={ModalStackNavigators.IOURequestModalStackNavigator}
                     listeners={modalScreenListeners}
                 />
+                <RootStack.Screen
+                    name="NewTask"
+                    options={modalScreenOptions}
+                    component={ModalStackNavigators.NewTaskModalStackNavigator}
+                    listeners={modalScreenListeners}
+                />
                 <RootStack.Screen
                     name="IOU_Bill"
                     options={modalScreenOptions}
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 7b46354e9391..570f76afbd62 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -195,6 +195,14 @@ const NewChatModalStackNavigator = createModalStackNavigator([{
     name: 'NewChat_Root',
 }]);
 
+const NewTaskModalStackNavigator = createModalStackNavigator([{
+    getComponent: () => {
+        const NewTaskPage = require('../../../pages/NewTaskPage').default;
+        return NewTaskPage;
+    },
+    name: 'NewTask_Root',
+}]);
+
 const SettingsModalStackNavigator = createModalStackNavigator([
     {
         getComponent: () => {
@@ -538,6 +546,7 @@ export {
     SearchModalStackNavigator,
     NewGroupModalStackNavigator,
     NewChatModalStackNavigator,
+    NewTaskModalStackNavigator,
     SettingsModalStackNavigator,
     EnablePaymentsStackNavigator,
     AddPersonalBankAccountModalStackNavigator,
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index a096a7421867..bcf02b411dcb 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -205,6 +205,11 @@ export default {
                     NewChat_Root: ROUTES.NEW_CHAT,
                 },
             },
+            NewTask: {
+                screens: {
+                    NewTask_Root: ROUTES.NEW_TASK,
+                },
+            },
             Search: {
                 screens: {
                     Search_Root: ROUTES.SEARCH,

From 0298aef62947969c231e957f522f1876b0a33df7 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 6 Apr 2023 12:09:31 -0700
Subject: [PATCH 14/92] show in FAB

---
 .../SidebarScreen/FloatingActionButtonAndPopover.js        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 426a50e68285..ed89fd5364ca 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -211,6 +211,13 @@ class FloatingActionButtonAndPopover extends React.Component {
                                 onSelected: () => Navigation.navigate(ROUTES.IOU_BILL),
                             },
                         ] : []),
+                        ...(Permissions.canUseTasks(this.props.betas) ? [
+                            {
+                                icon: Expensicons.Document,
+                                text: this.props.translate('sidebarScreen.newTask'),
+                                onSelected: () => Navigation.navigate(ROUTES.NEW_TASK),
+                            },
+                        ] : []),
                         ...(!this.props.isLoading && !Policy.hasActiveFreePolicy(this.props.allPolicies) ? [
                             {
                                 icon: Expensicons.NewWorkspace,

From 89212a86125ac2d8cd8ed6610e85801db6b4e099 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Tue, 11 Apr 2023 17:03:05 +0200
Subject: [PATCH 15/92] fix: apply requested changes

---
 src/libs/LocalePhoneNumber.js | 24 +++++++++++++-----------
 src/libs/SidebarUtils.js      |  2 +-
 src/pages/DetailsPage.js      |  6 +++---
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 6f5247478bf9..6b3c07d1ee67 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -39,31 +39,33 @@ Onyx.connect({
  * @param {String} number
  * @returns {String}
  */
-
 function formatPhoneNumber(number) {
-    const parsed = parsePhoneNumber(number);
+    const parsedPhoneNumber = parsePhoneNumber(number);
 
     // return the string untouched if it's not a phone number
-    if (!parsed.valid && !parsed.possible) {
+    if (!parsedPhoneNumber.valid && !parsedPhoneNumber.possible) {
         return number;
     }
 
-    let locale;
+    let signedInUserCountryCode;
 
+    /**
+     * if there is a phone number saved in the user's personal details we format the other numbers depending on
+     * the phone number's country code, otherwise we use country code based on the user's IP
+     */
     if (currentUserPersonalDetails.phoneNumber) {
-        locale = parsePhoneNumber(currentUserPersonalDetails.phoneNumber).countryCode;
+        signedInUserCountryCode = parsePhoneNumber(currentUserPersonalDetails.phoneNumber).countryCode;
     } else {
-        locale = countryCodeByIP;
+        signedInUserCountryCode = countryCodeByIP;
     }
 
-    const regionCode = parsed.countryCode;
+    const regionCode = parsedPhoneNumber.countryCode;
 
-    if (regionCode === locale) {
-        // replacing regular spaces for so-called "hard spaces" to avoid breaking the line on whitespace
-        return parsed.number.national;
+    if (regionCode === signedInUserCountryCode) {
+        return parsedPhoneNumber.number.national;
     }
 
-    return parsed.number.international;
+    return parsedPhoneNumber.number.international;
 }
 
 function formatPhoneNumberInText(text) {
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 8d7410d4607d..c543caeab0bc 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -294,7 +294,7 @@ function getOptionData(reportID) {
                 }).join(' ');
         }
 
-        result.alternateText = LocalePhoneNumber.formatPhoneNumberInText(lastMessageText) || formattedLogin;
+        result.alternateText = lastMessageText || formattedLogin;
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result, iouReports);
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index 9d59dbcf0009..ae68a1e6a590 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -110,7 +110,7 @@ class DetailsPage extends React.PureComponent {
 
         const phoneNumber = getPhoneNumber(details);
         const displayName = isSMSLogin ? this.props.formatPhoneNumber(phoneNumber) : details.displayName;
-        const communicationsLinkValue = isSMSLogin ? getPhoneNumber(details) : details.login;
+        const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : details.login;
 
         return (
             <ScreenWrapper>
@@ -166,9 +166,9 @@ class DetailsPage extends React.PureComponent {
                                                     : 'common.email')}
                                             </Text>
                                             <CommunicationsLink
-                                                value={communicationsLinkValue}
+                                                value={phoneOrEmail}
                                             >
-                                                <Tooltip text={communicationsLinkValue}>
+                                                <Tooltip text={phoneOrEmail}>
                                                     <Text numberOfLines={1}>
                                                         {isSMSLogin
                                                             ? this.props.formatPhoneNumber(phoneNumber)

From 8fa6b58c8766236d84a5e3d355f70c4f48106ceb Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 11 Apr 2023 18:16:16 -0700
Subject: [PATCH 16/92] add new page for creating tasks

---
 src/ONYXKEYS.js          |   1 +
 src/languages/en.js      |   9 +++
 src/pages/NewTaskPage.js | 120 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 src/pages/NewTaskPage.js

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
index 6fe8a0625cd8..7e7d56582cbb 100755
--- a/src/ONYXKEYS.js
+++ b/src/ONYXKEYS.js
@@ -187,6 +187,7 @@ export default {
         HOME_ADDRESS_FORM: 'homeAddressForm',
         NEW_ROOM_FORM: 'newRoomForm',
         ROOM_SETTINGS_FORM: 'roomSettingsForm',
+        NEW_TASK_FORM: 'newTaskForm',
     },
 
     // Whether we should show the compose input or not
diff --git a/src/languages/en.js b/src/languages/en.js
index c1229dcf979a..46cb49dcf026 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -292,6 +292,7 @@ export default {
         draftedMessage: 'Drafted message',
         listOfChatMessages: 'List of chat messages',
         listOfChats: 'List of chats',
+        newTask: 'Assign task',
     },
     iou: {
         amount: 'Amount',
@@ -1128,6 +1129,14 @@ export default {
             public_announce: 'Public Announce',
         },
     },
+    newTaskPage: {
+        assignee: 'To',
+        assignTask: 'Assign task',
+        title: 'Title',
+        description: 'Description',
+        shareIn: 'Share in',
+        pleaseEnterTaskName: 'Please enter a task name',
+    },
     statementPage: {
         generatingPDF: 'We\'re generating your PDF right now. Please come back later!',
     },
diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
new file mode 100644
index 000000000000..2778ef43d511
--- /dev/null
+++ b/src/pages/NewTaskPage.js
@@ -0,0 +1,120 @@
+import React from 'react';
+import {View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import * as Report from '../libs/actions/Report';
+import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
+import compose from '../libs/compose';
+import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
+import Navigation from '../libs/Navigation/Navigation';
+import ScreenWrapper from '../components/ScreenWrapper';
+import styles from '../styles/styles';
+import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
+import * as ErrorUtils from '../libs/ErrorUtils';
+import * as ValidationUtils from '../libs/ValidationUtils';
+import Form from '../components/Form';
+import shouldDelayFocus from '../libs/shouldDelayFocus';
+import TextInput from '../components/TextInput';
+
+const propTypes = {
+    /** All reports shared with the user */
+    reports: PropTypes.shape({
+        /** The report name */
+        reportName: PropTypes.string,
+
+        /** The report type */
+        type: PropTypes.string,
+
+        /** ID of the policy */
+        policyID: PropTypes.string,
+    }),
+
+    /** List of betas available to current user */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
+    ...withLocalizePropTypes,
+};
+const defaultProps = {
+    betas: [],
+    reports: {},
+};
+
+const NewTaskPage = (props) => {
+    /**
+     * @param {Object} values - form input values passed by the Form component
+     * @returns {Boolean}
+     */
+    function validate(values) {
+        const errors = {};
+
+        if (!values.taskTitle) {
+            // We error if the user doesn't enter a room name
+            ErrorUtils.addErrorMessage(errors, 'taskTitle', props.translate('newTaskPage.pleaseEnterTaskName'));
+        }
+
+        return errors;
+    }
+
+    function onSubmit() {
+        console.log('submitted');
+    }
+
+    if (!Permissions.canUseTasks(props.betas)) {
+        Navigation.dismissModal();
+        return null;
+    }
+
+    return (
+        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <HeaderWithCloseButton
+                title={props.translate('sidebarScreen.newTask')}
+                onCloseButtonPress={() => Navigation.dismissModal()}
+            />
+            <Form
+                formID={ONYXKEYS.FORMS.NEW_TASK_FORM}
+                submitButtonText={props.translate('newTaskPage.assignTask')}
+                scrollContextEnabled
+                style={[styles.mh5, styles.mt5, styles.flexGrow1]}
+                validate={values => validate(values)}
+                onSubmit={() => onSubmit()}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <TextInput
+                        autoFocus
+                        shouldDelayFocus={shouldDelayFocus}
+                        inputID="taskTitle"
+                        label={props.translate('newTaskPage.title')}
+                        shouldSaveDraft
+                    />
+                </View>
+                <View style={styles.mb5}>
+                    <TextInput
+                        autoFocus
+                        shouldDelayFocus={shouldDelayFocus}
+                        inputID="taskDescription"
+                        label={props.translate('newTaskPage.description')}
+                        shouldSaveDraft
+                    />
+                </View>
+            </Form>
+        </ScreenWrapper>
+    );
+};
+
+NewTaskPage.displayName = 'NewTaskPage';
+NewTaskPage.propTypes = propTypes;
+NewTaskPage.defaultProps = defaultProps;
+
+export default compose(
+    withOnyx({
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
+        reports: {
+            key: ONYXKEYS.COLLECTION.REPORT,
+        },
+    }),
+    withLocalize,
+)(NewTaskPage);

From d2ed3e032339ec6834316e4db212773992e89b92 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 12 Apr 2023 18:02:37 +0200
Subject: [PATCH 17/92] fix: remove formatPhoneNumberInText function

---
 src/components/ReportActionItem/IOUQuote.js |  3 +--
 src/components/ReportTransaction.js         |  3 +--
 src/libs/LocalePhoneNumber.js               | 17 +----------------
 tests/unit/LocalePhoneNumberTest.js         | 18 ------------------
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/src/components/ReportActionItem/IOUQuote.js b/src/components/ReportActionItem/IOUQuote.js
index 45d5a2a1ddd8..f93888d41448 100644
--- a/src/components/ReportActionItem/IOUQuote.js
+++ b/src/components/ReportActionItem/IOUQuote.js
@@ -14,7 +14,6 @@ import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import {showContextMenuForReport} from '../ShowContextMenuContext';
 import * as StyleUtils from '../../styles/StyleUtils';
 import getButtonState from '../../libs/getButtonState';
-import * as LocalePhoneNumber from '../../libs/LocalePhoneNumber';
 
 const propTypes = {
     /** All the data of the action */
@@ -83,7 +82,7 @@ const IOUQuote = props => (
                         : styles.cursorDefault]}
                     >
                         {/* Get remainder of IOU message */}
-                        {LocalePhoneNumber.formatPhoneNumberInText(fragment.text.substring(fragment.text.indexOf(' ')))}
+                        {fragment.text.substring(fragment.text.indexOf(' '))}
                     </Text>
                 </Text>
                 <Icon src={Expensicons.ArrowRight} fill={props.shouldAllowViewDetails ? StyleUtils.getIconFillColor(getButtonState(props.isHovered)) : themeColors.transparent} />
diff --git a/src/components/ReportTransaction.js b/src/components/ReportTransaction.js
index 03b83c4783ee..be53b11c742e 100644
--- a/src/components/ReportTransaction.js
+++ b/src/components/ReportTransaction.js
@@ -5,7 +5,6 @@ import styles from '../styles/styles';
 import CONST from '../CONST';
 import * as IOU from '../libs/actions/IOU';
 import * as ReportActions from '../libs/actions/ReportActions';
-import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
 import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
 import ReportActionItemSingle from '../pages/home/report/ReportActionItemSingle';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -77,7 +76,7 @@ class ReportTransaction extends Component {
                         wrapperStyles={[styles.reportTransactionWrapper]}
                     >
                         <Text style={[styles.chatItemMessage]}>
-                            {LocalePhoneNumber.formatPhoneNumberInText(this.props.action.message[0].text)}
+                            {this.props.action.message[0].text}
                         </Text>
                     </ReportActionItemSingle>
                     {this.props.canBeRejected && (
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 6b3c07d1ee67..64b3de75efc0 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -68,22 +68,7 @@ function formatPhoneNumber(number) {
     return parsedPhoneNumber.number.international;
 }
 
-function formatPhoneNumberInText(text) {
-    if (!text) {
-        return '';
-    }
-
-    const textArray = text.split(' ');
-
-    return _.map(textArray, (txt) => {
-        if (Str.isSMSLogin(txt)) {
-            return formatPhoneNumber(Str.removeSMSDomain(txt));
-        }
-        return txt;
-    }).join(' ');
-}
-
 export {
+    // eslint-disable-next-line import/prefer-default-export
     formatPhoneNumber,
-    formatPhoneNumberInText,
 };
diff --git a/tests/unit/LocalePhoneNumberTest.js b/tests/unit/LocalePhoneNumberTest.js
index 33827c812007..40d6bcc7bf69 100644
--- a/tests/unit/LocalePhoneNumberTest.js
+++ b/tests/unit/LocalePhoneNumberTest.js
@@ -46,22 +46,4 @@ describe('LocalePhoneNumber utils', () => {
             expect(LocalePhoneNumber.formatPhoneNumber(US_NUMBER)).toBe('+1 833-240-3627');
         });
     });
-
-    describe('formatPhoneNumberInText', () => {
-        beforeEach(() => Onyx.multiSet({
-            [ONYXKEYS.SESSION]: {email: 'current@user.com'},
-            [ONYXKEYS.COUNTRY_CODE]: 1,
-            [ONYXKEYS.PERSONAL_DETAILS]: {'current@user.com': {phoneNumber: US_NUMBER}},
-        }).then(waitForPromisesToResolve));
-
-        afterEach(() => Onyx.clear());
-
-        it('should return empty string when no text is given', () => {
-            expect(LocalePhoneNumber.formatPhoneNumberInText(undefined)).toBe('');
-        });
-
-        it('should properly format the phone number in text', () => {
-            expect(LocalePhoneNumber.formatPhoneNumberInText(`Requested USD 20.00 from ${US_NUMBER}@expensify.sms`)).toBe('Requested USD 20.00 from (833) 240-3627');
-        });
-    });
 });

From 985ac9fc03ff45606bddaeca5ed51f4c0d099c29 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 12 Apr 2023 18:29:43 +0200
Subject: [PATCH 18/92] fix: fix linting error

---
 src/libs/LocalePhoneNumber.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 64b3de75efc0..2c333279d76d 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -1,8 +1,6 @@
-import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import {parsePhoneNumber} from 'awesome-phonenumber';
-import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 
 let currentUserEmail;

From bd3008e3476ee01dade5a4311d16f82abd622225 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Thu, 13 Apr 2023 00:08:37 +0530
Subject: [PATCH 19/92] feat: only digits allowed in yearSearchPage

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/YearPickerPage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/YearPickerPage.js b/src/pages/YearPickerPage.js
index f2a4cdee3024..bff894ee9245 100644
--- a/src/pages/YearPickerPage.js
+++ b/src/pages/YearPickerPage.js
@@ -70,9 +70,10 @@ class YearPickerPage extends React.Component {
      * @param {String} text
      */
     filterYearList(text) {
+        const searchText = text.replace(/[\D]/g, '');
         this.setState({
-            inputText: text,
-            yearOptions: _.filter(this.yearList, year => year.text.includes(text.trim())),
+            inputText: searchText,
+            yearOptions: _.filter(this.yearList, year => year.text.includes(searchText)),
         });
     }
 

From f9dbf54bde65a9d2a404d7902c030567c46a1133 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Thu, 13 Apr 2023 14:18:28 +0530
Subject: [PATCH 20/92] fix: simplify regex

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/YearPickerPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/YearPickerPage.js b/src/pages/YearPickerPage.js
index bff894ee9245..f776657062c3 100644
--- a/src/pages/YearPickerPage.js
+++ b/src/pages/YearPickerPage.js
@@ -70,7 +70,7 @@ class YearPickerPage extends React.Component {
      * @param {String} text
      */
     filterYearList(text) {
-        const searchText = text.replace(/[\D]/g, '');
+        const searchText = text.replace(/\D/g, '');
         this.setState({
             inputText: searchText,
             yearOptions: _.filter(this.yearList, year => year.text.includes(searchText)),

From 075d6422c265ded879b39d64aa0f035be2d5f62c Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Thu, 13 Apr 2023 17:17:15 +0700
Subject: [PATCH 21/92] get currency decimals from onyx

---
 src/libs/IOUUtils.js | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 352b25f61353..12caf6c42f4b 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -1,9 +1,23 @@
 import _ from 'underscore';
+import Onyx from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
+
+let currencyList = {};
+Onyx.connect({
+    key: ONYXKEYS.CURRENCY_LIST,
+    callback: (val) => {
+        if (_.isEmpty(val)) {
+            return;
+        }
+
+        currencyList = val;
+    },
+});
 
 /**
- * Returns the number of digits after the decimal separator
- * for a specific currency following ISO 4217.
+ * Returns the number of digits after the decimal separator for a specific currency.
  * For currencies that have decimal places > 2, floor to 2 instead:
  * https://github.com/Expensify/App/issues/15878#issuecomment-1496291464
  *
@@ -11,16 +25,13 @@ import CONST from '../CONST';
  * @returns {Number}
  */
 function getCurrencyDecimals(currency) {
-    const formatted = Intl.NumberFormat('en', {style: 'currency', currency}).format(0);
-    const decimalPointIndex = formatted.indexOf('.');
-    return decimalPointIndex === -1
-        ? 0
-        : Math.min(formatted.length - decimalPointIndex - 1, 2);
+    const decimals = lodashGet(currencyList, [currency, 'decimals']);
+    return _.isUndefined(decimals) ? 0 : Math.min(decimals, 2);
 }
 
 /**
  * Returns the currency's minor unit quantity
- * i.e. Cent in USD
+ * e.g. Cent in USD
  *
  * @param {String} currency - IOU currency
  * @returns {Number}

From 89dee32b92bb4f258986decbc0ad02e708770fe8 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Fri, 14 Apr 2023 00:21:06 +0530
Subject: [PATCH 22/92] feat: update state if text changed

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/YearPickerPage.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/YearPickerPage.js b/src/pages/YearPickerPage.js
index f776657062c3..54b5d2c3c4f0 100644
--- a/src/pages/YearPickerPage.js
+++ b/src/pages/YearPickerPage.js
@@ -70,10 +70,15 @@ class YearPickerPage extends React.Component {
      * @param {String} text
      */
     filterYearList(text) {
-        const searchText = text.replace(/\D/g, '');
-        this.setState({
-            inputText: searchText,
-            yearOptions: _.filter(this.yearList, year => year.text.includes(searchText)),
+        const searchText = text.replace(CONST.REGEX.NON_NUMERIC, '');
+        this.setState((prevState) => {
+            if (searchText === prevState.inputText) {
+                return {};
+            }
+            return {
+                inputText: searchText,
+                yearOptions: _.filter(this.yearList, year => year.text.includes(searchText)),
+            };
         });
     }
 

From 933411ca7b61fe7b0a2f0ec155009b2071176ef7 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 16:25:50 -0700
Subject: [PATCH 23/92] update copy

---
 src/languages/en.js                                             | 1 -
 src/pages/NewTaskPage.js                                        | 2 +-
 .../sidebar/SidebarScreen/FloatingActionButtonAndPopover.js     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 46cb49dcf026..5ae634abe518 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -292,7 +292,6 @@ export default {
         draftedMessage: 'Drafted message',
         listOfChatMessages: 'List of chat messages',
         listOfChats: 'List of chats',
-        newTask: 'Assign task',
     },
     iou: {
         amount: 'Amount',
diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
index 2778ef43d511..dce688eef381 100644
--- a/src/pages/NewTaskPage.js
+++ b/src/pages/NewTaskPage.js
@@ -68,7 +68,7 @@ const NewTaskPage = (props) => {
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>
             <HeaderWithCloseButton
-                title={props.translate('sidebarScreen.newTask')}
+                title={props.translate('newTaskPage.assignTask')}
                 onCloseButtonPress={() => Navigation.dismissModal()}
             />
             <Form
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index ed89fd5364ca..0b4b42088019 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -214,7 +214,7 @@ class FloatingActionButtonAndPopover extends React.Component {
                         ...(Permissions.canUseTasks(this.props.betas) ? [
                             {
                                 icon: Expensicons.Document,
-                                text: this.props.translate('sidebarScreen.newTask'),
+                                text: this.props.translate('newTaskPage.assignTask'),
                                 onSelected: () => Navigation.navigate(ROUTES.NEW_TASK),
                             },
                         ] : []),

From b62bbe2722a5a8f5a0791dd3efd1bcf02542b613 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 17:00:13 -0700
Subject: [PATCH 24/92] allow task to be created from within DM

---
 src/ROUTES.js                                        |  5 ++++-
 src/libs/Navigation/linkingConfig.js                 |  2 +-
 src/pages/NewTaskPage.js                             | 12 ++----------
 src/pages/home/report/ReportActionCompose.js         |  5 +++++
 .../SidebarScreen/FloatingActionButtonAndPopover.js  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ROUTES.js b/src/ROUTES.js
index 46ebb2087d17..9d5933977db3 100644
--- a/src/ROUTES.js
+++ b/src/ROUTES.js
@@ -13,6 +13,7 @@ const IOU_DETAILS = 'iou/details';
 const IOU_REQUEST_CURRENCY = `${IOU_REQUEST}/currency`;
 const IOU_BILL_CURRENCY = `${IOU_BILL}/currency`;
 const IOU_SEND_CURRENCY = `${IOU_SEND}/currency`;
+const NEW_TASK = 'new/task';
 const SETTINGS_PERSONAL_DETAILS = 'settings/profile/personal-details';
 const SETTINGS_CONTACT_METHODS = 'settings/profile/contact-methods';
 
@@ -55,7 +56,7 @@ export default {
     getEditContactMethodRoute: contactMethod => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
     NEW_GROUP: 'new/group',
     NEW_CHAT: 'new/chat',
-    NEW_TASK: 'new/task',
+    NEW_TASK,
     REPORT,
     REPORT_WITH_ID: 'r/:reportID',
     getReportRoute: reportID => `r/${reportID}`,
@@ -89,6 +90,8 @@ export default {
     IOU_DETAILS_ENABLE_PAYMENTS: `${IOU_DETAILS}/enable-payments`,
     IOU_DETAILS_WITH_IOU_REPORT_ID: `${IOU_DETAILS}/:chatReportID/:iouReportID/`,
     getIouDetailsRoute: (chatReportID, iouReportID) => `iou/details/${chatReportID}/${iouReportID}`,
+    getNewTaskRoute: reportID => `${NEW_TASK}/${reportID}`,
+    NEW_TASK_WITH_REPORT_ID: `${NEW_TASK}/:reportID?`,
     getTaskDetailsRoute: taskID => `task/details/${taskID}`,
     SEARCH: 'search',
     SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:accountID/:validateCode',
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index bcf02b411dcb..15e4ee9adcf8 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -207,7 +207,7 @@ export default {
             },
             NewTask: {
                 screens: {
-                    NewTask_Root: ROUTES.NEW_TASK,
+                    NewTask_Root: ROUTES.NEW_TASK_WITH_REPORT_ID,
                 },
             },
             Search: {
diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
index dce688eef381..dfd0fbcdbb81 100644
--- a/src/pages/NewTaskPage.js
+++ b/src/pages/NewTaskPage.js
@@ -2,7 +2,6 @@ import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import * as Report from '../libs/actions/Report';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import compose from '../libs/compose';
 import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
@@ -10,12 +9,11 @@ import Navigation from '../libs/Navigation/Navigation';
 import ScreenWrapper from '../components/ScreenWrapper';
 import styles from '../styles/styles';
 import ONYXKEYS from '../ONYXKEYS';
-import CONST from '../CONST';
 import * as ErrorUtils from '../libs/ErrorUtils';
-import * as ValidationUtils from '../libs/ValidationUtils';
 import Form from '../components/Form';
 import shouldDelayFocus from '../libs/shouldDelayFocus';
 import TextInput from '../components/TextInput';
+import Permissions from '../libs/Permissions';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -57,7 +55,7 @@ const NewTaskPage = (props) => {
     }
 
     function onSubmit() {
-        console.log('submitted');
+
     }
 
     if (!Permissions.canUseTasks(props.betas)) {
@@ -74,7 +72,6 @@ const NewTaskPage = (props) => {
             <Form
                 formID={ONYXKEYS.FORMS.NEW_TASK_FORM}
                 submitButtonText={props.translate('newTaskPage.assignTask')}
-                scrollContextEnabled
                 style={[styles.mh5, styles.mt5, styles.flexGrow1]}
                 validate={values => validate(values)}
                 onSubmit={() => onSubmit()}
@@ -83,19 +80,14 @@ const NewTaskPage = (props) => {
                 <View style={styles.mb5}>
                     <TextInput
                         autoFocus
-                        shouldDelayFocus={shouldDelayFocus}
                         inputID="taskTitle"
                         label={props.translate('newTaskPage.title')}
-                        shouldSaveDraft
                     />
                 </View>
                 <View style={styles.mb5}>
                     <TextInput
-                        autoFocus
-                        shouldDelayFocus={shouldDelayFocus}
                         inputID="taskDescription"
                         label={props.translate('newTaskPage.description')}
-                        shouldSaveDraft
                     />
                 </View>
             </Form>
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index b85cb03f8e40..43f89cc36579 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -790,6 +790,11 @@ class ReportActionCompose extends React.Component {
                                                             });
                                                         },
                                                     },
+                                                    {
+                                                        icon: Expensicons.Clipboard,
+                                                        text: this.props.translate('newTaskPage.assignTask'),
+                                                        onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
+                                                    },
                                                 ]}
                                             />
                                         </>
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 0b4b42088019..e7fa865a9849 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -213,7 +213,7 @@ class FloatingActionButtonAndPopover extends React.Component {
                         ] : []),
                         ...(Permissions.canUseTasks(this.props.betas) ? [
                             {
-                                icon: Expensicons.Document,
+                                icon: Expensicons.Clipboard,
                                 text: this.props.translate('newTaskPage.assignTask'),
                                 onSelected: () => Navigation.navigate(ROUTES.NEW_TASK),
                             },

From 0d5efaa904e81d45c593b5a4e8846f2fda51c427 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 17:12:17 -0700
Subject: [PATCH 25/92] update methods to be called menuItemOptions

---
 src/CONST.js                                 |  1 +
 src/libs/ReportUtils.js                      |  5 +++--
 src/pages/home/report/ReportActionCompose.js | 18 +++++++++---------
 tests/unit/ReportUtilsTest.js                | 18 +++++++++---------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 8d1cbaea9246..bcd956c1be58 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -405,6 +405,7 @@ const CONST = {
         TYPE: {
             CHAT: 'chat',
             IOU: 'iou',
+            TASK: 'task',
         },
         CHAT_TYPE: {
             POLICY_ANNOUNCE: 'policyAnnounce',
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 72da3fe6d6c1..2b6c7f15382f 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1628,7 +1628,7 @@ function canRequestMoney(report) {
  * @param {Array} betas
  * @returns {Array}
  */
-function getMoneyRequestOptions(report, reportParticipants, betas) {
+function getMenuItemOptions(report, reportParticipants, betas) {
     const participants = _.filter(reportParticipants, email => currentUserPersonalDetails.login !== email);
     const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
     const hasMultipleParticipants = participants.length > 1;
@@ -1650,6 +1650,7 @@ function getMoneyRequestOptions(report, reportParticipants, betas) {
     return [
         ...(canRequestMoney(report) ? [CONST.IOU.IOU_TYPE.REQUEST] : []),
         ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.IOU_TYPE.SEND] : []),
+        ...(Permissions.canUseTasks(betas) ? [CONST.REPORT.TYPE.TASK] : []),
     ];
 }
 
@@ -1749,6 +1750,6 @@ export {
     getParsedComment,
     getFullSizeAvatar,
     getSmallSizeAvatar,
-    getMoneyRequestOptions,
+    getMenuItemOptions,
     canRequestMoney,
 };
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 43f89cc36579..d437b6cdcbe1 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -163,7 +163,7 @@ class ReportActionCompose extends React.Component {
         this.isEmojiCode = this.isEmojiCode.bind(this);
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
-        this.getMoneyRequestOptions = this.getMoneyRequestOptions.bind(this);
+        this.getMenuItemOptions = this.getMenuItemOptions.bind(this);
         this.addAttachment = this.addAttachment.bind(this);
         this.insertSelectedEmoji = this.insertSelectedEmoji.bind(this);
         this.setExceededMaxCommentLength = this.setExceededMaxCommentLength.bind(this);
@@ -332,7 +332,7 @@ class ReportActionCompose extends React.Component {
      * @param {Array} reportParticipants
      * @returns {Array<object>}
      */
-    getMoneyRequestOptions(reportParticipants) {
+    getMenuItemOptions(reportParticipants) {
         const options = {
             [CONST.IOU.IOU_TYPE.SPLIT]: {
                 icon: Expensicons.Receipt,
@@ -349,8 +349,13 @@ class ReportActionCompose extends React.Component {
                 text: this.props.translate('iou.sendMoney'),
                 onSelected: () => Navigation.navigate(ROUTES.getIOUSendRoute(this.props.reportID)),
             },
+            [CONST.REPORT.TYPE.TASK]: {
+                icon: Expensicons.Clipboard,
+                text: this.props.translate('newTaskPage.assignTask'),
+                onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
+            },
         };
-        return _.map(ReportUtils.getMoneyRequestOptions(this.props.report, reportParticipants, this.props.betas), option => options[option]);
+        return _.map(ReportUtils.getMenuItemOptions(this.props.report, reportParticipants, this.props.betas), option => options[option]);
     }
 
     /**
@@ -780,7 +785,7 @@ class ReportActionCompose extends React.Component {
                                                 onClose={() => this.setMenuVisibility(false)}
                                                 onItemSelected={() => this.setMenuVisibility(false)}
                                                 anchorPosition={styles.createMenuPositionReportActionCompose}
-                                                menuItems={[...this.getMoneyRequestOptions(reportParticipants),
+                                                menuItems={[...this.getMenuItemOptions(reportParticipants),
                                                     {
                                                         icon: Expensicons.Paperclip,
                                                         text: this.props.translate('reportActionCompose.addAttachment'),
@@ -790,11 +795,6 @@ class ReportActionCompose extends React.Component {
                                                             });
                                                         },
                                                     },
-                                                    {
-                                                        icon: Expensicons.Clipboard,
-                                                        text: this.props.translate('newTaskPage.assignTask'),
-                                                        onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
-                                                    },
                                                 ]}
                                             />
                                         </>
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 1701793edfd1..ee2c2fdad08c 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -308,7 +308,7 @@ describe('ReportUtils', () => {
         });
     });
 
-    describe('getMoneyRequestOptions', () => {
+    describe('getMenuItemOptions', () => {
         const participants = _.keys(participantsPersonalDetails);
 
         beforeAll(() => {
@@ -324,19 +324,19 @@ describe('ReportUtils', () => {
         describe('return empty iou options if', () => {
             it('participants contains excluded iou emails', () => {
                 const allEmpty = _.every(CONST.EXPENSIFY_EMAILS, (email) => {
-                    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
+                    const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
                     return moneyRequestOptions.length === 0;
                 });
                 expect(allEmpty).toBe(true);
             });
 
             it('no participants except self', () => {
-                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail], [CONST.BETAS.IOU]);
+                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail], [CONST.BETAS.IOU]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
             it('no iou permission', () => {
-                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], []);
+                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], []);
                 expect(moneyRequestOptions.length).toBe(0);
             });
         });
@@ -353,14 +353,14 @@ describe('ReportUtils', () => {
                         ...LHNTestUtils.getFakeReport(),
                         chatType,
                     };
-                    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants[0]], [CONST.BETAS.IOU]);
+                    const moneyRequestOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants[0]], [CONST.BETAS.IOU]);
                     return moneyRequestOptions.length === 1 && moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT);
                 });
                 expect(onlyHaveSplitOption).toBe(true);
             });
 
             it('has multiple participants exclude self', () => {
-                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
+                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT)).toBe(true);
             });
@@ -368,7 +368,7 @@ describe('ReportUtils', () => {
 
         describe('return only iou request option if', () => {
             it(' does not have iou send permission', () => {
-                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
+                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             });
@@ -379,14 +379,14 @@ describe('ReportUtils', () => {
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
                     isOwnPolicyExpenseChat: true,
                 };
-                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
+                const moneyRequestOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             });
         });
 
         it('return both iou send and request money', () => {
-            const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
+            const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
             expect(moneyRequestOptions.length).toBe(2);
             expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SEND)).toBe(true);

From 399da8ad17a41dbd9ceca86caed510a68c54532d Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 17:22:31 -0700
Subject: [PATCH 26/92] update tests to include tasks

---
 src/components/ReportWelcomeText.js |  4 +--
 src/pages/NewTaskPage.js            |  1 -
 tests/unit/ReportUtilsTest.js       | 45 +++++++++++++++--------------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 3c6dc7a763af..a5cf3b8ef3d1 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -68,7 +68,7 @@ const ReportWelcomeText = (props) => {
         isMultipleParticipant,
     );
     const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(props.report, props.policies);
-    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(props.report, participants, props.betas);
+    const menuItemOptions = ReportUtils.getMenuItemOptions(props.report, participants, props.betas);
     return (
         <>
             <View>
@@ -132,7 +132,7 @@ const ReportWelcomeText = (props) => {
                         ))}
                     </Text>
                 )}
-                {(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SEND) || moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)) && (
+                {(menuItemOptions.includes(CONST.IOU.IOU_TYPE.SEND) || menuItemOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)) && (
                     <Text>
                         {/* Need to confirm copy for the below with marketing, and then add to translations. */}
                         {props.translate('reportActionsView.usePlusButton')}
diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
index dfd0fbcdbb81..19cb12037189 100644
--- a/src/pages/NewTaskPage.js
+++ b/src/pages/NewTaskPage.js
@@ -11,7 +11,6 @@ import styles from '../styles/styles';
 import ONYXKEYS from '../ONYXKEYS';
 import * as ErrorUtils from '../libs/ErrorUtils';
 import Form from '../components/Form';
-import shouldDelayFocus from '../libs/shouldDelayFocus';
 import TextInput from '../components/TextInput';
 import Permissions from '../libs/Permissions';
 
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index ee2c2fdad08c..bd210c350128 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -324,20 +324,20 @@ describe('ReportUtils', () => {
         describe('return empty iou options if', () => {
             it('participants contains excluded iou emails', () => {
                 const allEmpty = _.every(CONST.EXPENSIFY_EMAILS, (email) => {
-                    const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
-                    return moneyRequestOptions.length === 0;
+                    const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
+                    return menuItemOptions.length === 0;
                 });
                 expect(allEmpty).toBe(true);
             });
 
             it('no participants except self', () => {
-                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail], [CONST.BETAS.IOU]);
-                expect(moneyRequestOptions.length).toBe(0);
+                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail], [CONST.BETAS.IOU, CONST.BETAS.TASKS]);
+                expect(menuItemOptions.length).toBe(0);
             });
 
-            it('no iou permission', () => {
-                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], []);
-                expect(moneyRequestOptions.length).toBe(0);
+            it('no iou/task permission', () => {
+                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], []);
+                expect(menuItemOptions.length).toBe(0);
             });
         });
 
@@ -360,17 +360,18 @@ describe('ReportUtils', () => {
             });
 
             it('has multiple participants exclude self', () => {
-                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
-                expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT)).toBe(true);
+                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU, CONST.BETAS.TASKS]);
+                expect(menuItemOptions.length).toBe(2);
+                expect(menuItemOptions.includes(CONST.IOU.IOU_TYPE.SPLIT)).toBe(true);
+                expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
             });
         });
 
         describe('return only iou request option if', () => {
             it(' does not have iou send permission', () => {
-                const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
-                expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
+                expect(menuItemOptions.length).toBe(1);
+                expect(menuItemOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             });
 
             it('a policy expense chat', () => {
@@ -379,17 +380,19 @@ describe('ReportUtils', () => {
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
                     isOwnPolicyExpenseChat: true,
                 };
-                const moneyRequestOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
-                expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+                const menuItemOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND, CONST.BETAS.TASKS]);
+                expect(menuItemOptions.length).toBe(2);
+                expect(menuItemOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+                expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
             });
         });
 
-        it('return both iou send and request money', () => {
-            const moneyRequestOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
-            expect(moneyRequestOptions.length).toBe(2);
-            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
-            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SEND)).toBe(true);
+        it('return iou send, request money, and task', () => {
+            const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND, CONST.BETAS.TASKS]);
+            expect(menuItemOptions.length).toBe(3);
+            expect(menuItemOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+            expect(menuItemOptions.includes(CONST.IOU.IOU_TYPE.SEND)).toBe(true);
+            expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
         });
     });
 

From 8f59e8fa35896e2b5b262a6d617ab2f6f2643d87 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 17:36:31 -0700
Subject: [PATCH 27/92] fix icons

---
 src/libs/ReportUtils.js                                    | 7 +++++--
 src/pages/home/report/ReportActionCompose/index.js         | 2 +-
 .../SidebarScreen/FloatingActionButtonAndPopover.js        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 68d5df973943..9ec4469496ae 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1656,7 +1656,7 @@ function getMenuItemOptions(report, reportParticipants, betas) {
     const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
     const hasMultipleParticipants = participants.length > 1;
 
-    if (hasExcludedIOUEmails || (participants.length === 0 && !report.isOwnPolicyExpenseChat) || !Permissions.canUseIOU(betas)) {
+    if (hasExcludedIOUEmails || (participants.length === 0 && !report.isOwnPolicyExpenseChat) || !Permissions.canUseIOU(betas) || !Permissions.canUseTasks(betas)) {
         return [];
     }
 
@@ -1665,7 +1665,10 @@ function getMenuItemOptions(report, reportParticipants, betas) {
     // DM chats will have the Split Bill option only when there are at least 3 people in the chat.
     // There is no Split Bill option for Workspace chats
     if (isChatRoom(report) || (hasMultipleParticipants && !isPolicyExpenseChat(report))) {
-        return [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT];
+        return [
+            CONST.IOU.MONEY_REQUEST_TYPE.SPLIT,
+            Permissions.canUseTasks(betas) ? CONST.REPORT.TYPE.TASK : '',
+        ];
     }
 
     // DM chats that only have 2 people will see the Send / Request money options.
diff --git a/src/pages/home/report/ReportActionCompose/index.js b/src/pages/home/report/ReportActionCompose/index.js
index 20139cc2d935..4441f2b455f3 100644
--- a/src/pages/home/report/ReportActionCompose/index.js
+++ b/src/pages/home/report/ReportActionCompose/index.js
@@ -364,7 +364,7 @@ class ReportActionCompose extends React.Component {
                 onSelected: () => Navigation.navigate(ROUTES.getIOUSendRoute(this.props.reportID)),
             },
             [CONST.REPORT.TYPE.TASK]: {
-                icon: Expensicons.Clipboard,
+                icon: Expensicons.Checkmark,
                 text: this.props.translate('newTaskPage.assignTask'),
                 onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
             },
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index e7fa865a9849..1b9ab0f53052 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -213,7 +213,7 @@ class FloatingActionButtonAndPopover extends React.Component {
                         ] : []),
                         ...(Permissions.canUseTasks(this.props.betas) ? [
                             {
-                                icon: Expensicons.Clipboard,
+                                icon: Expensicons.Checkmark,
                                 text: this.props.translate('newTaskPage.assignTask'),
                                 onSelected: () => Navigation.navigate(ROUTES.NEW_TASK),
                             },

From 0060b847e590a4e1a32e85d24539b8a7a4cfc61f Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 17:47:06 -0700
Subject: [PATCH 28/92] add translations

---
 src/languages/es.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/languages/es.js b/src/languages/es.js
index ea4bb1fc7a76..0c634aae2aea 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -1126,6 +1126,14 @@ export default {
             public_announce: 'Anuncio Público',
         },
     },
+    newTaskPage: {
+        assignee: 'Verso',
+        assignTask: 'Atribuir tarefa',
+        title: 'Título',
+        description: 'Descrição',
+        shareIn: 'Compartilhar em',
+        pleaseEnterTaskName: 'Por favor, insira um nome de tarefa',
+    },
     statementPage: {
         generatingPDF: 'Estamos generando tu PDF ahora mismo. ¡Por favor, vuelve más tarde!',
     },

From 0e0cf20f7290490448ac9a77bb71d1c5eb645ec5 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 18:01:22 -0700
Subject: [PATCH 29/92] copy / fix bug

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

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 9ec4469496ae..81d346cf673f 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1656,7 +1656,7 @@ function getMenuItemOptions(report, reportParticipants, betas) {
     const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
     const hasMultipleParticipants = participants.length > 1;
 
-    if (hasExcludedIOUEmails || (participants.length === 0 && !report.isOwnPolicyExpenseChat) || !Permissions.canUseIOU(betas) || !Permissions.canUseTasks(betas)) {
+    if (hasExcludedIOUEmails || (participants.length === 0 && !report.isOwnPolicyExpenseChat) || !Permissions.canUseIOU(betas)) {
         return [];
     }
 
@@ -1671,8 +1671,8 @@ function getMenuItemOptions(report, reportParticipants, betas) {
         ];
     }
 
-    // DM chats that only have 2 people will see the Send / Request money options.
-    // Workspace chats should only see the Request money option, as "easy overages" is not available.
+    // DM chats that only have 2 people will see the Send / Request money / Assign task options.
+    // Workspace chats should see the Request money and Assign Task option, as "easy overages" is not available.
     return [
         ...(canRequestMoney(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST] : []),
         ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.SEND] : []),

From 957016cb12813e37fe0440abde0f4fb4cd3d2348 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 18:45:03 -0700
Subject: [PATCH 30/92] revert changes to money request options

---
 src/libs/ReportUtils.js                       |  9 ++-
 .../home/report/ReportActionCompose/index.js  | 18 ++---
 tests/unit/ReportUtilsTest.js                 | 68 +++++++------------
 3 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 81d346cf673f..7fffe9a687d0 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1651,7 +1651,7 @@ function canRequestMoney(report) {
  * @param {Array} betas
  * @returns {Array}
  */
-function getMenuItemOptions(report, reportParticipants, betas) {
+function getMoneyRequestOptions(report, reportParticipants, betas) {
     const participants = _.filter(reportParticipants, email => currentUserPersonalDetails.login !== email);
     const hasExcludedIOUEmails = lodashIntersection(reportParticipants, CONST.EXPENSIFY_EMAILS).length > 0;
     const hasMultipleParticipants = participants.length > 1;
@@ -1674,9 +1674,8 @@ function getMenuItemOptions(report, reportParticipants, betas) {
     // DM chats that only have 2 people will see the Send / Request money / Assign task options.
     // Workspace chats should see the Request money and Assign Task option, as "easy overages" is not available.
     return [
-        ...(canRequestMoney(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST] : []),
-        ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.SEND] : []),
-        ...(Permissions.canUseTasks(betas) ? [CONST.REPORT.TYPE.TASK] : []),
+        ...(canRequestMoney(report) ? [CONST.IOU.IOU_TYPE.REQUEST] : []),
+        ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.IOU_TYPE.SEND] : []),
     ];
 }
 
@@ -1777,6 +1776,6 @@ export {
     getParsedComment,
     getFullSizeAvatar,
     getSmallSizeAvatar,
-    getMenuItemOptions,
+    getMoneyRequestOptions,
     canRequestMoney,
 };
diff --git a/src/pages/home/report/ReportActionCompose/index.js b/src/pages/home/report/ReportActionCompose/index.js
index 4441f2b455f3..d5a07f426fed 100644
--- a/src/pages/home/report/ReportActionCompose/index.js
+++ b/src/pages/home/report/ReportActionCompose/index.js
@@ -170,7 +170,7 @@ class ReportActionCompose extends React.Component {
         this.isEmojiCode = this.isEmojiCode.bind(this);
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
-        this.getMenuItemOptions = this.getMenuItemOptions.bind(this);
+        this.getMoneyRequestOptions = this.getMoneyRequestOptions.bind(this);
         this.addAttachment = this.addAttachment.bind(this);
         this.insertSelectedEmoji = this.insertSelectedEmoji.bind(this);
         this.setExceededMaxCommentLength = this.setExceededMaxCommentLength.bind(this);
@@ -346,7 +346,7 @@ class ReportActionCompose extends React.Component {
      * @param {Array} reportParticipants
      * @returns {Array<object>}
      */
-    getMenuItemOptions(reportParticipants) {
+    getMoneyRequestOptions(reportParticipants) {
         const options = {
             [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT]: {
                 icon: Expensicons.Receipt,
@@ -363,13 +363,8 @@ class ReportActionCompose extends React.Component {
                 text: this.props.translate('iou.sendMoney'),
                 onSelected: () => Navigation.navigate(ROUTES.getIOUSendRoute(this.props.reportID)),
             },
-            [CONST.REPORT.TYPE.TASK]: {
-                icon: Expensicons.Checkmark,
-                text: this.props.translate('newTaskPage.assignTask'),
-                onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
-            },
         };
-        return _.map(ReportUtils.getMenuItemOptions(this.props.report, reportParticipants, this.props.betas), option => options[option]);
+        return _.map(ReportUtils.getMoneyRequestOptions(this.props.report, reportParticipants, this.props.betas), option => options[option]);
     }
 
     /**
@@ -833,7 +828,7 @@ class ReportActionCompose extends React.Component {
                                                 onClose={() => this.setMenuVisibility(false)}
                                                 onItemSelected={() => this.setMenuVisibility(false)}
                                                 anchorPosition={styles.createMenuPositionReportActionCompose}
-                                                menuItems={[...this.getMenuItemOptions(reportParticipants),
+                                                menuItems={[...this.getMoneyRequestOptions(reportParticipants),
                                                     {
                                                         icon: Expensicons.Paperclip,
                                                         text: this.props.translate('reportActionCompose.addAttachment'),
@@ -843,6 +838,11 @@ class ReportActionCompose extends React.Component {
                                                             });
                                                         },
                                                     },
+                                                    {
+                                                        icon: Expensicons.Clipboard,
+                                                        text: this.props.translate('newTaskPage.assignTask'),
+                                                        onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
+                                                    },
                                                 ]}
                                             />
                                         </>
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 1176202a139d..7260ea59a634 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -308,7 +308,7 @@ describe('ReportUtils', () => {
         });
     });
 
-    describe('getMenuItemOptions', () => {
+    describe('getMoneyRequestOptions', () => {
         const participants = _.keys(participantsPersonalDetails);
 
         beforeAll(() => {
@@ -324,20 +324,20 @@ describe('ReportUtils', () => {
         describe('return empty iou options if', () => {
             it('participants contains excluded iou emails', () => {
                 const allEmpty = _.every(CONST.EXPENSIFY_EMAILS, (email) => {
-                    const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
-                    return menuItemOptions.length === 0;
+                    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, email], [CONST.BETAS.IOU]);
+                    return moneyRequestOptions.length === 0;
                 });
                 expect(allEmpty).toBe(true);
             });
 
             it('no participants except self', () => {
-                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail], [CONST.BETAS.IOU, CONST.BETAS.TASKS]);
-                expect(menuItemOptions.length).toBe(0);
+                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail], [CONST.BETAS.IOU]);
+                expect(moneyRequestOptions.length).toBe(0);
             });
 
-            it('no iou/task permission', () => {
-                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], []);
-                expect(menuItemOptions.length).toBe(0);
+            it('no iou permission', () => {
+                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], []);
+                expect(moneyRequestOptions.length).toBe(0);
             });
         });
 
@@ -353,24 +353,24 @@ describe('ReportUtils', () => {
                         ...LHNTestUtils.getFakeReport(),
                         chatType,
                     };
-                    const menuItemOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants[0]], [CONST.BETAS.IOU]);
-                    return menuItemOptions.length === 1 && menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT);
+                    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants[0]], [CONST.BETAS.IOU]);
+                    return moneyRequestOptions.length === 1 && moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT);
                 });
                 expect(onlyHaveSplitOption).toBe(true);
             });
 
             it('has multiple participants exclude self', () => {
-                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
-                expect(menuItemOptions.length).toBe(1);
-                expect(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)).toBe(true);
+                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
+                expect(moneyRequestOptions.length).toBe(1);
+                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT)).toBe(true);
             });
         });
 
         describe('return only iou request option if', () => {
             it(' does not have iou send permission', () => {
-                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
-                expect(menuItemOptions.length).toBe(1);
-                expect(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
+                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
+                expect(moneyRequestOptions.length).toBe(1);
+                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             });
 
             it('a policy expense chat', () => {
@@ -379,37 +379,17 @@ describe('ReportUtils', () => {
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
                     isOwnPolicyExpenseChat: true,
                 };
-                const menuItemOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
-                expect(menuItemOptions.length).toBe(1);
-                expect(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
+                const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
+                expect(moneyRequestOptions.length).toBe(1);
+                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
             });
         });
 
-        describe('return only task option if', () => {
-            it('only has task permission', () => {
-                const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.TASKS]);
-                expect(menuItemOptions.length).toBe(1);
-                expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
-            });
-
-            it('a policy expense chat', () => {
-                const report = {
-                    ...LHNTestUtils.getFakeReport(),
-                    chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
-                    isOwnPolicyExpenseChat: true,
-                };
-                const menuItemOptions = ReportUtils.getMenuItemOptions(report, [currentUserEmail, participants], [CONST.BETAS.TASKS]);
-                expect(menuItemOptions.length).toBe(1);
-                expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
-            });
-        });
-
-        it('return iou send, request money, and assign task', () => {
-            const menuItemOptions = ReportUtils.getMenuItemOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND, CONST.BETAS.TASKS]);
-            expect(menuItemOptions.length).toBe(3);
-            expect(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
-            expect(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SEND)).toBe(true);
-            expect(menuItemOptions.includes(CONST.REPORT.TYPE.TASK)).toBe(true);
+        it('return both iou send and request money', () => {
+            const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
+            expect(moneyRequestOptions.length).toBe(2);
+            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SEND)).toBe(true);
         });
     });
 

From 1906accee1c541d6e3256d6a093156e306711209 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 18:52:25 -0700
Subject: [PATCH 31/92] more reverts

---
 src/CONST.js                        |  1 -
 src/components/ReportWelcomeText.js |  4 ++--
 src/libs/ReportUtils.js             | 13 +++++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 6f498ba722f0..0e89ed24234a 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -410,7 +410,6 @@ const CONST = {
             CHAT: 'chat',
             EXPENSE: 'expense',
             IOU: 'iou',
-            TASK: 'task',
         },
         CHAT_TYPE: {
             POLICY_ANNOUNCE: 'policyAnnounce',
diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 220fa86c6a05..f0721af2c2ea 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -68,7 +68,7 @@ const ReportWelcomeText = (props) => {
         isMultipleParticipant,
     );
     const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(props.report, props.policies);
-    const menuItemOptions = ReportUtils.getMenuItemOptions(props.report, participants, props.betas);
+    const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(props.report, participants, props.betas);
     return (
         <>
             <View>
@@ -132,7 +132,7 @@ const ReportWelcomeText = (props) => {
                         ))}
                     </Text>
                 )}
-                {(menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SEND) || menuItemOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)) && (
+                {(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SEND) || moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)) && (
                     <Text>
                         {/* Need to confirm copy for the below with marketing, and then add to translations. */}
                         {props.translate('reportActionsView.usePlusButton')}
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 7fffe9a687d0..f35f2ceb7784 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1665,17 +1665,14 @@ function getMoneyRequestOptions(report, reportParticipants, betas) {
     // DM chats will have the Split Bill option only when there are at least 3 people in the chat.
     // There is no Split Bill option for Workspace chats
     if (isChatRoom(report) || (hasMultipleParticipants && !isPolicyExpenseChat(report))) {
-        return [
-            CONST.IOU.MONEY_REQUEST_TYPE.SPLIT,
-            Permissions.canUseTasks(betas) ? CONST.REPORT.TYPE.TASK : '',
-        ];
+        return [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT];
     }
 
-    // DM chats that only have 2 people will see the Send / Request money / Assign task options.
-    // Workspace chats should see the Request money and Assign Task option, as "easy overages" is not available.
+    // DM chats that only have 2 people will see the Send / Request money options.
+    // Workspace chats should only see the Request money option, as "easy overages" is not available.
     return [
-        ...(canRequestMoney(report) ? [CONST.IOU.IOU_TYPE.REQUEST] : []),
-        ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.IOU_TYPE.SEND] : []),
+        ...(canRequestMoney(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST] : []),
+        ...(Permissions.canUseIOUSend(betas) && !isPolicyExpenseChat(report) ? [CONST.IOU.MONEY_REQUEST_TYPE.SEND] : []),
     ];
 }
 

From 5d1ef62beac48356c494d6045f265615a2829631 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 18:54:44 -0700
Subject: [PATCH 32/92] test reverts / update translations

---
 src/languages/es.js           | 10 +++++-----
 tests/unit/ReportUtilsTest.js | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index 0c634aae2aea..7cad709b05dd 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -1127,12 +1127,12 @@ export default {
         },
     },
     newTaskPage: {
-        assignee: 'Verso',
-        assignTask: 'Atribuir tarefa',
+        assignee: 'Para',
+        assignTask: 'Asignar tarea',
         title: 'Título',
-        description: 'Descrição',
-        shareIn: 'Compartilhar em',
-        pleaseEnterTaskName: 'Por favor, insira um nome de tarefa',
+        description: 'Descripción',
+        shareIn: 'Compartir en',
+        pleaseEnterTaskName: 'Por favor, ingrese un nombre para la tarea',
     },
     statementPage: {
         generatingPDF: 'Estamos generando tu PDF ahora mismo. ¡Por favor, vuelve más tarde!',
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index 7260ea59a634..c9fcca5a6a7d 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -354,7 +354,7 @@ describe('ReportUtils', () => {
                         chatType,
                     };
                     const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants[0]], [CONST.BETAS.IOU]);
-                    return moneyRequestOptions.length === 1 && moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT);
+                    return moneyRequestOptions.length === 1 && moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT);
                 });
                 expect(onlyHaveSplitOption).toBe(true);
             });
@@ -362,7 +362,7 @@ describe('ReportUtils', () => {
             it('has multiple participants exclude self', () => {
                 const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, ...participants], [CONST.BETAS.IOU]);
                 expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SPLIT)).toBe(true);
+                expect(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)).toBe(true);
             });
         });
 
@@ -370,7 +370,7 @@ describe('ReportUtils', () => {
             it(' does not have iou send permission', () => {
                 const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU]);
                 expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+                expect(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
             });
 
             it('a policy expense chat', () => {
@@ -381,15 +381,15 @@ describe('ReportUtils', () => {
                 };
                 const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
                 expect(moneyRequestOptions.length).toBe(1);
-                expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
+                expect(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
             });
         });
 
         it('return both iou send and request money', () => {
             const moneyRequestOptions = ReportUtils.getMoneyRequestOptions({}, [currentUserEmail, participants], [CONST.BETAS.IOU, CONST.BETAS.IOU_SEND]);
             expect(moneyRequestOptions.length).toBe(2);
-            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.REQUEST)).toBe(true);
-            expect(moneyRequestOptions.includes(CONST.IOU.IOU_TYPE.SEND)).toBe(true);
+            expect(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)).toBe(true);
+            expect(moneyRequestOptions.includes(CONST.IOU.MONEY_REQUEST_TYPE.SEND)).toBe(true);
         });
     });
 

From a842d2b0889dbb2655d55c17809948728163d6b0 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Thu, 13 Apr 2023 19:29:41 -0700
Subject: [PATCH 33/92] clean up logic for determining if we should show task

---
 .../home/report/ReportActionCompose/index.js  | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/index.js b/src/pages/home/report/ReportActionCompose/index.js
index d5a07f426fed..eb29e369b182 100644
--- a/src/pages/home/report/ReportActionCompose/index.js
+++ b/src/pages/home/report/ReportActionCompose/index.js
@@ -52,6 +52,7 @@ import withKeyboardState, {keyboardStatePropTypes} from '../../../../components/
 import ArrowKeyFocusManager from '../../../../components/ArrowKeyFocusManager';
 import KeyboardShortcut from '../../../../libs/KeyboardShortcut';
 import KeyDownAction from './keyDownAction';
+import Permissions from '../../../../libs/Permissions';
 
 const propTypes = {
     /** Beta features list */
@@ -171,6 +172,7 @@ class ReportActionCompose extends React.Component {
         this.setTextInputRef = this.setTextInputRef.bind(this);
         this.getInputPlaceholder = this.getInputPlaceholder.bind(this);
         this.getMoneyRequestOptions = this.getMoneyRequestOptions.bind(this);
+        this.getTaskOption = this.getTaskOption.bind(this);
         this.addAttachment = this.addAttachment.bind(this);
         this.insertSelectedEmoji = this.insertSelectedEmoji.bind(this);
         this.setExceededMaxCommentLength = this.setExceededMaxCommentLength.bind(this);
@@ -395,6 +397,29 @@ class ReportActionCompose extends React.Component {
         }
     }
 
+    /**
+     * Determines if we can show the task option
+     * @param {Array} reportParticipants
+     * @returns {Boolean}
+     */
+    getTaskOption(reportParticipants) {
+        // We only prevent the task option from showing if it's a DM and the other user is an Expensify default email
+        if (!Permissions.canUseTasks(this.props.betas) || (lodashGet(this.props.report, 'participants', []).length === 1 && _.some(reportParticipants, email => _.contains(
+            CONST.EXPENSIFY_EMAILS,
+            email,
+        )))) {
+            return [];
+        }
+
+        return [
+            {
+                icon: Expensicons.Checkmark,
+                text: this.props.translate('newTaskPage.assignTask'),
+                onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
+            },
+        ];
+    }
+
     /**
      * Clean data related to EmojiSuggestions
      */
@@ -828,7 +853,7 @@ class ReportActionCompose extends React.Component {
                                                 onClose={() => this.setMenuVisibility(false)}
                                                 onItemSelected={() => this.setMenuVisibility(false)}
                                                 anchorPosition={styles.createMenuPositionReportActionCompose}
-                                                menuItems={[...this.getMoneyRequestOptions(reportParticipants),
+                                                menuItems={[...this.getMoneyRequestOptions(reportParticipants), ...this.getTaskOption(reportParticipants),
                                                     {
                                                         icon: Expensicons.Paperclip,
                                                         text: this.props.translate('reportActionCompose.addAttachment'),
@@ -838,11 +863,6 @@ class ReportActionCompose extends React.Component {
                                                             });
                                                         },
                                                     },
-                                                    {
-                                                        icon: Expensicons.Clipboard,
-                                                        text: this.props.translate('newTaskPage.assignTask'),
-                                                        onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
-                                                    },
                                                 ]}
                                             />
                                         </>

From 30b9069f92666df1e297419863abf7d5ebf99432 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 14 Apr 2023 10:01:00 +0200
Subject: [PATCH 34/92] fix: move Str.removeSMSdomain to formatPhoneNumber
 function

---
 src/libs/LocalePhoneNumber.js                                  | 3 ++-
 src/pages/home/report/ParticipantLocalTime.js                  | 2 +-
 src/pages/home/report/ReportActionItemSingle.js                | 2 +-
 .../settings/Profile/Contacts/ContactMethodDetailsPage.js      | 2 +-
 src/pages/settings/Profile/Contacts/ContactMethodsPage.js      | 2 +-
 src/pages/settings/Profile/ProfilePage.js                      | 3 +--
 src/pages/signin/ResendValidationForm.js                       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 2c333279d76d..0b7527277257 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -1,5 +1,6 @@
 import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
+import Str from 'expensify-common/lib/str';
 import {parsePhoneNumber} from 'awesome-phonenumber';
 import ONYXKEYS from '../ONYXKEYS';
 
@@ -38,7 +39,7 @@ Onyx.connect({
  * @returns {String}
  */
 function formatPhoneNumber(number) {
-    const parsedPhoneNumber = parsePhoneNumber(number);
+    const parsedPhoneNumber = parsePhoneNumber(Str.removeSMSDomain(number));
 
     // return the string untouched if it's not a phone number
     if (!parsedPhoneNumber.valid && !parsedPhoneNumber.possible) {
diff --git a/src/pages/home/report/ParticipantLocalTime.js b/src/pages/home/report/ParticipantLocalTime.js
index 4043acd54692..fb494afb05e9 100644
--- a/src/pages/home/report/ParticipantLocalTime.js
+++ b/src/pages/home/report/ParticipantLocalTime.js
@@ -56,7 +56,7 @@ class ParticipantLocalTime extends PureComponent {
     render() {
         const reportRecipientDisplayName = this.props.participant.firstName
             || (Str.isSMSLogin(this.props.participant.login)
-                ? this.props.formatPhoneNumber(Str.removeSMSDomain(this.props.participant.displayName))
+                ? this.props.formatPhoneNumber(this.props.participant.displayName)
                 : this.props.participant.displayName);
 
         return (
diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index 2459059ae9df..ed208a7db999 100644
--- a/src/pages/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -67,7 +67,7 @@ const ReportActionItemSingle = (props) => {
     const personArray = displayName
         ? [{
             type: 'TEXT',
-            text: Str.isSMSLogin(login) ? props.formatPhoneNumber(Str.removeSMSDomain(displayName)) : displayName,
+            text: Str.isSMSLogin(login) ? props.formatPhoneNumber(displayName) : displayName,
         }]
         : props.action.person;
 
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 872222aa3e58..a2aa35f6beff 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -159,7 +159,7 @@ class ContactMethodDetailsPage extends Component {
 
         // replacing spaces with "hard spaces" to prevent breaking the number
         const formattedContactMethod = Str.isSMSLogin(contactMethod)
-            ? this.props.formatPhoneNumber(Str.removeSMSDomain(contactMethod)).replace(/ /g, '\u00A0')
+            ? this.props.formatPhoneNumber(contactMethod).replace(/ /g, '\u00A0')
             : contactMethod;
 
         const loginData = this.props.loginList[contactMethod];
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
index cc2d3db3e990..ce7711e58de2 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
@@ -83,7 +83,7 @@ const ContactMethodsPage = (props) => {
         // Default to using login key if we deleted login.partnerUserID optimistically
         // but still need to show the pending login being deleted while offline.
         const partnerUserID = login.partnerUserID || loginName;
-        const menuItemTitle = Str.isSMSLogin(partnerUserID) ? props.formatPhoneNumber(Str.removeSMSDomain(partnerUserID)) : partnerUserID;
+        const menuItemTitle = Str.isSMSLogin(partnerUserID) ? props.formatPhoneNumber(partnerUserID) : partnerUserID;
 
         return (
             <OfflineWithFeedback
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index 3ea4f9abb9f7..88890bcd0f99 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -1,4 +1,3 @@
-import Str from 'expensify-common/lib/str';
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
@@ -65,7 +64,7 @@ const ProfilePage = (props) => {
         },
         {
             description: props.translate('contacts.contactMethod'),
-            title: Str.removeSMSDomain(lodashGet(currentUserDetails, 'login', '')),
+            title: props.formatPhoneNumber(lodashGet(currentUserDetails, 'login', '')),
             pageRoute: ROUTES.SETTINGS_CONTACT_METHODS,
             brickRoadIndicator: contactMethodBrickRoadIndicator,
         },
diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index ccea70c260a7..c0ac9bf2c075 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -52,7 +52,7 @@ const ResendValidationForm = (props) => {
 
     // replacing spaces with "hard spaces" to prevent breaking the number
     const login = isSMSLogin
-        ? props.formatPhoneNumber(Str.removeSMSDomain(props.credentials.login)).replace(/ /g, '\u00A0')
+        ? props.formatPhoneNumber(props.credentials.login).replace(/ /g, '\u00A0')
         : props.credentials.login;
 
     const loginType = (isSMSLogin ? props.translate('common.phone') : props.translate('common.email')).toLowerCase();

From 989882da83265d98638dd8a959b71e04314dcb75 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 14 Apr 2023 15:06:32 +0700
Subject: [PATCH 35/92] fix: app crashes on deleteing message in empty chat in
 offline mode

---
 src/libs/ReportActionsUtils.js | 9 +++++++--
 src/libs/actions/Report.js     | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 75c0cccf0dff..d8ab71a8cbdb 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -134,7 +134,7 @@ function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) {
 function getLastVisibleAction(reportID, actionsToMerge = {}) {
     const actions = _.toArray(lodashMerge({}, allReportActions[reportID], actionsToMerge));
     const visibleActions = _.filter(actions, action => (!isDeletedAction(action)));
-    return _.max(visibleActions, action => moment.utc(action.created).valueOf());
+    return _.max(visibleActions, action => moment.utc(action.created).valueOf()) || {};
 }
 
 /**
@@ -144,7 +144,12 @@ function getLastVisibleAction(reportID, actionsToMerge = {}) {
  */
 function getLastVisibleMessageText(reportID, actionsToMerge = {}) {
     const lastVisibleAction = getLastVisibleAction(reportID, actionsToMerge);
-    const message = lodashGet(lastVisibleAction, ['message', 0]);
+    const message = lodashGet(lastVisibleAction, ['message', 0], {});
+
+    if (_.isEmpty(message)) {
+        return '';
+    }
+
     if (isReportMessageAttachment(message)) {
         return CONST.ATTACHMENT_MESSAGE_TEXT;
     }
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 5f6b81dab4f2..513a70c1e743 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -693,7 +693,6 @@ function deleteReportComment(reportID, reportAction) {
     // If we are deleting the last visible message, let's find the previous visible one (or set an empty one if there are none) and update the lastMessageText in the LHN.
     // Similarly, if we are deleting the last read comment we will want to update the lastVisibleActionCreated to use the previous visible message.
     let optimisticReport = {
-        lastMessageText: '',
         lastVisibleActionCreated: '',
     };
     const lastMessageText = ReportActionsUtils.getLastVisibleMessageText(reportID, optimisticReportActions);

From b4cdbebfbdd2c9728376e24fb6b0074f29b6421f Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 14 Apr 2023 17:49:36 +0700
Subject: [PATCH 36/92] default decimal to 2 for missing currencies

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

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 12caf6c42f4b..a9948684a6a3 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -26,7 +26,7 @@ Onyx.connect({
  */
 function getCurrencyDecimals(currency) {
     const decimals = lodashGet(currencyList, [currency, 'decimals']);
-    return _.isUndefined(decimals) ? 0 : Math.min(decimals, 2);
+    return _.isUndefined(decimals) ? 2 : Math.min(decimals, 2);
 }
 
 /**

From 1c21bce32c56586a4944277c351a5da236f9fb05 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 14 Apr 2023 17:58:41 +0700
Subject: [PATCH 37/92] refactor for readibility

---
 src/components/IOUConfirmationList.js | 36 ++++++++++-----------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 182fabdcfb51..f6e1c06302a7 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -151,19 +151,15 @@ class IOUConfirmationList extends Component {
      * @returns {Array}
      */
     getParticipantsWithAmount(participants) {
+        const iouAmount = IOUUtils.calculateAmount(participants, this.props.iouAmount, this.props.iou.selectedCurrencyCode);
+        const currencyUnits = IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode);
+
         return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(
             participants,
-            this.props.numberFormat(
-                IOUUtils.calculateAmount(
-                    participants,
-                    this.props.iouAmount,
-                    this.props.iou.selectedCurrencyCode,
-                ) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode),
-                {
-                    style: 'currency',
-                    currency: this.props.iou.selectedCurrencyCode,
-                },
-            ),
+            this.props.numberFormat(iouAmount / currencyUnits, {
+                style: 'currency',
+                currency: this.props.iou.selectedCurrencyCode,
+            }),
         );
     }
 
@@ -192,20 +188,14 @@ class IOUConfirmationList extends Component {
             const formattedUnselectedParticipants = this.getParticipantsWithoutAmount(unselectedParticipants);
             const formattedParticipants = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
+            const myIOUAmount = IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, this.props.iou.selectedCurrencyCode, true);
+            const currencyUnits = IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode);
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
                 this.props.currentUserPersonalDetails,
-                this.props.numberFormat(
-                    IOUUtils.calculateAmount(
-                        selectedParticipants,
-                        this.props.iouAmount,
-                        this.props.iou.selectedCurrencyCode,
-                        true,
-                    ) / IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode),
-                    {
-                        style: 'currency',
-                        currency: this.props.iou.selectedCurrencyCode,
-                    },
-                ),
+                this.props.numberFormat(myIOUAmount / currencyUnits, {
+                    style: 'currency',
+                    currency: this.props.iou.selectedCurrencyCode,
+                }),
             );
 
             sections.push({

From 048624182db9050f395b70b48b8a7d5abe110b20 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 14 Apr 2023 18:48:50 +0700
Subject: [PATCH 38/92] update mock currencyList.json and init Onyx for
 IOUUtilsTest

---
 tests/unit/IOUUtilsTest.js   |   16 +
 tests/unit/currencyList.json | 1069 +++++++++++++++++-----------------
 2 files changed, 561 insertions(+), 524 deletions(-)

diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 4678ea1b231c..2c4c1b76f94f 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -1,6 +1,10 @@
+import Onyx from 'react-native-onyx';
 import CONST from '../../src/CONST';
 import * as IOUUtils from '../../src/libs/IOUUtils';
 import * as ReportUtils from '../../src/libs/ReportUtils';
+import ONYXKEYS from '../../src/ONYXKEYS';
+import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import currencyList from './currencyList.json';
 
 let iouReport;
 let reportActions;
@@ -38,6 +42,16 @@ function cancelMoneyRequest(moneyRequestAction, {isOnline} = {}) {
     );
 }
 
+function initCurrencyList() {
+    Onyx.init({
+        keys: ONYXKEYS,
+        initialKeyStates: {
+            [ONYXKEYS.CURRENCY_LIST]: currencyList,
+        },
+    });
+    return waitForPromisesToResolve();
+}
+
 beforeEach(() => {
     reportActions = [];
     const chatReportID = ReportUtils.generateReportID();
@@ -133,6 +147,7 @@ describe('isIOUReportPendingCurrencyConversion', () => {
 });
 
 describe('getCurrencyDecimals', () => {
+    beforeAll(() => initCurrencyList());
     test('Currency decimals smaller than or equal 2', () => {
         expect(IOUUtils.getCurrencyDecimals('JPY')).toBe(0);
         expect(IOUUtils.getCurrencyDecimals('USD')).toBe(2);
@@ -148,6 +163,7 @@ describe('getCurrencyDecimals', () => {
 });
 
 describe('getCurrencyUnits', () => {
+    beforeAll(() => initCurrencyList());
     test('Currency with decimals smaller than or equal 2', () => {
         expect(IOUUtils.getCurrencyUnits('JPY')).toBe(1);
         expect(IOUUtils.getCurrencyUnits('USD')).toBe(100);
diff --git a/tests/unit/currencyList.json b/tests/unit/currencyList.json
index 740b3caf2b28..1283a854f7a9 100644
--- a/tests/unit/currencyList.json
+++ b/tests/unit/currencyList.json
@@ -1,855 +1,876 @@
 {
     "AED": {
-      "symbol": "Dhs",
-      "name": "UAE Dirham",
-      "ISO4217": "784"
+        "symbol": "Dhs",
+        "name": "UAE Dirham",
+        "ISO4217": "784"
     },
     "AFN": {
-      "symbol": "Af",
-      "name": "Afghan Afghani",
-      "ISO4217": "971"
+        "symbol": "Af",
+        "name": "Afghan Afghani",
+        "decimals": 0,
+        "ISO4217": "971"
     },
     "ALL": {
-      "symbol": "ALL",
-      "name": "Albanian Lek",
-      "ISO4217": "008"
+        "symbol": "ALL",
+        "name": "Albanian Lek",
+        "decimals": 0,
+        "ISO4217": "008"
     },
     "AMD": {
-      "symbol": "դր",
-      "name": "Armenian Dram",
-      "ISO4217": "051"
+        "symbol": "դր",
+        "name": "Armenian Dram",
+        "ISO4217": "051"
     },
     "ANG": {
-      "symbol": "NAƒ",
-      "name": "Neth Antilles Guilder",
-      "ISO4217": "532"
+        "symbol": "NAƒ",
+        "name": "Neth Antilles Guilder",
+        "ISO4217": "532"
     },
     "AOA": {
-      "symbol": "Kz",
-      "name": "Angolan Kwanza",
-      "ISO4217": "973"
+        "symbol": "Kz",
+        "name": "Angolan Kwanza",
+        "ISO4217": "973"
     },
     "ARS": {
-      "symbol": "AR$",
-      "name": "Argentine Peso",
-      "ISO4217": "032"
+        "symbol": "AR$",
+        "name": "Argentine Peso",
+        "ISO4217": "032"
     },
     "AUD": {
-      "symbol": "A$",
-      "name": "Australian Dollar",
-      "ISO4217": "036"
+        "symbol": "A$",
+        "name": "Australian Dollar",
+        "ISO4217": "036"
     },
     "AWG": {
-      "symbol": "ƒ",
-      "name": "Aruba Florin",
-      "ISO4217": "533"
+        "symbol": "ƒ",
+        "name": "Aruba Florin",
+        "ISO4217": "533"
     },
     "AZN": {
-      "symbol": "man",
-      "name": "Azerbaijani Manat",
-      "ISO4217": "944"
+        "symbol": "man",
+        "name": "Azerbaijani Manat",
+        "ISO4217": "944"
     },
     "BAM": {
-      "symbol": "KM",
-      "name": "Bosnia And Herzegovina Convertible Mark",
-      "ISO4217": "977"
+        "symbol": "KM",
+        "name": "Bosnia And Herzegovina Convertible Mark",
+        "ISO4217": "977"
     },
     "BBD": {
-      "symbol": "Bds$",
-      "name": "Barbados Dollar",
-      "ISO4217": "052"
+        "symbol": "Bds$",
+        "name": "Barbados Dollar",
+        "ISO4217": "052"
     },
     "BDT": {
-      "symbol": "Tk",
-      "name": "Bangladesh Taka",
-      "ISO4217": "050"
+        "symbol": "Tk",
+        "name": "Bangladesh Taka",
+        "ISO4217": "050"
     },
     "BGN": {
-      "symbol": "лв",
-      "name": "Bulgarian Lev",
-      "ISO4217": "975"
+        "symbol": "лв",
+        "name": "Bulgarian Lev",
+        "ISO4217": "975"
     },
     "BHD": {
-      "symbol": "BHD",
-      "name": "Bahraini Dinar",
-      "ISO4217": "048"
+        "symbol": "BHD",
+        "name": "Bahraini Dinar",
+        "ISO4217": "048"
     },
     "BIF": {
-      "symbol": "FBu",
-      "name": "Burundi Franc",
-      "decimals": 0,
-      "ISO4217": "108"
+        "symbol": "FBu",
+        "name": "Burundi Franc",
+        "decimals": 0,
+        "ISO4217": "108"
     },
     "BMD": {
-      "symbol": "BD$",
-      "name": "Bermuda Dollar",
-      "ISO4217": "060"
+        "symbol": "BD$",
+        "name": "Bermuda Dollar",
+        "ISO4217": "060"
     },
     "BND": {
-      "symbol": "BN$",
-      "name": "Brunei Dollar",
-      "ISO4217": "096"
+        "symbol": "BN$",
+        "name": "Brunei Dollar",
+        "ISO4217": "096"
     },
     "BOB": {
-      "symbol": "Bs",
-      "name": "Bolivian Boliviano",
-      "ISO4217": "068"
+        "symbol": "Bs",
+        "name": "Bolivian Boliviano",
+        "ISO4217": "068"
     },
     "BRL": {
-      "symbol": "R$",
-      "name": "Brazilian Real",
-      "ISO4217": "986"
+        "symbol": "R$",
+        "name": "Brazilian Real",
+        "ISO4217": "986"
     },
     "BSD": {
-      "symbol": "BS$",
-      "name": "Bahamian Dollar",
-      "ISO4217": "044"
+        "symbol": "BS$",
+        "name": "Bahamian Dollar",
+        "ISO4217": "044"
     },
     "BTN": {
-      "symbol": "Nu.",
-      "name": "Bhutan Ngultrum",
-      "ISO4217": "064"
+        "symbol": "Nu.",
+        "name": "Bhutan Ngultrum",
+        "ISO4217": "064"
     },
     "BWP": {
-      "symbol": "P",
-      "name": "Botswana Pula",
-      "ISO4217": "072"
+        "symbol": "P",
+        "name": "Botswana Pula",
+        "ISO4217": "072"
     },
     "BYN": {
-      "symbol": "BR",
-      "name": "Belarus Ruble",
-      "ISO4217": "933"
+        "symbol": "BR",
+        "name": "Belarus Ruble",
+        "ISO4217": "933"
     },
     "BYR": {
-      "symbol": "BR",
-      "name": "Belarus Ruble",
-      "retired": true,
-      "retirementDate": "2016-07-01",
-      "ISO4217": "974"
+        "symbol": "BR",
+        "name": "Belarus Ruble",
+        "decimals": 0,
+        "retired": true,
+        "retirementDate": "2016-07-01",
+        "ISO4217": "974"
     },
     "BZD": {
-      "symbol": "BZ$",
-      "name": "Belize Dollar",
-      "ISO4217": "084"
+        "symbol": "BZ$",
+        "name": "Belize Dollar",
+        "ISO4217": "084"
     },
     "CAD": {
-      "symbol": "C$",
-      "name": "Canadian Dollar",
-      "ISO4217": "124"
+        "symbol": "C$",
+        "name": "Canadian Dollar",
+        "ISO4217": "124"
     },
     "CDF": {
-      "symbol": "CDF",
-      "name": "Congolese Franc",
-      "ISO4217": "976"
+        "symbol": "CDF",
+        "name": "Congolese Franc",
+        "ISO4217": "976"
     },
     "CHF": {
-      "symbol": "CHF",
-      "name": "Swiss Franc",
-      "ISO4217": "756"
+        "symbol": "CHF",
+        "name": "Swiss Franc",
+        "ISO4217": "756"
     },
     "CLP": {
-      "symbol": "Ch$",
-      "name": "Chilean Peso",
-      "decimals": 0,
-      "ISO4217": "152"
+        "symbol": "Ch$",
+        "name": "Chilean Peso",
+        "decimals": 0,
+        "ISO4217": "152"
     },
     "CNY": {
-      "symbol": "¥",
-      "name": "Chinese Yuan",
-      "ISO4217": "156"
+        "symbol": "¥",
+        "name": "Chinese Yuan",
+        "ISO4217": "156"
     },
     "COP": {
-      "symbol": "Col$",
-      "name": "Colombian Peso",
-      "decimals": 0,
-      "ISO4217": "170"
+        "symbol": "Col$",
+        "name": "Colombian Peso",
+        "decimals": 0,
+        "ISO4217": "170"
     },
     "CRC": {
-      "symbol": "CR₡",
-      "name": "Costa Rica Colon",
-      "ISO4217": "188"
+        "symbol": "CR₡",
+        "name": "Costa Rica Colon",
+        "ISO4217": "188"
     },
     "CUC": {
-      "symbol": "CUC",
-      "name": "Cuban Convertible Peso",
-      "ISO4217": "931"
+        "symbol": "CUC",
+        "name": "Cuban Convertible Peso",
+        "ISO4217": "931"
     },
     "CUP": {
-      "symbol": "$MN",
-      "name": "Cuban Peso",
-      "ISO4217": "192"
+        "symbol": "$MN",
+        "name": "Cuban Peso",
+        "ISO4217": "192"
     },
     "CVE": {
-      "symbol": "Esc",
-      "name": "Cape Verde Escudo",
-      "ISO4217": "132"
+        "symbol": "Esc",
+        "name": "Cape Verde Escudo",
+        "ISO4217": "132"
     },
     "CZK": {
-      "symbol": "Kč",
-      "name": "Czech Koruna",
-      "ISO4217": "203"
+        "symbol": "Kč",
+        "name": "Czech Koruna",
+        "ISO4217": "203"
     },
     "DJF": {
-      "symbol": "Fdj",
-      "name": "Dijibouti Franc",
-      "decimals": 0,
-      "ISO4217": "262"
+        "symbol": "Fdj",
+        "name": "Dijibouti Franc",
+        "decimals": 0,
+        "ISO4217": "262"
     },
     "DKK": {
-      "symbol": "Dkr",
-      "name": "Danish Krone",
-      "ISO4217": "208"
+        "symbol": "Dkr",
+        "name": "Danish Krone",
+        "ISO4217": "208"
     },
     "DOP": {
-      "symbol": "RD$",
-      "name": "Dominican Peso",
-      "ISO4217": "214"
+        "symbol": "RD$",
+        "name": "Dominican Peso",
+        "ISO4217": "214"
     },
     "DZD": {
-      "symbol": "DZD",
-      "name": "Algerian Dinar",
-      "ISO4217": "012"
+        "symbol": "DZD",
+        "name": "Algerian Dinar",
+        "ISO4217": "012"
     },
     "EEK": {
-      "symbol": "KR",
-      "name": "Estonian Kroon",
-      "ISO4217": "",
-      "retired": true
+        "symbol": "KR",
+        "name": "Estonian Kroon",
+        "ISO4217": "",
+        "retired": true
     },
     "EGP": {
-      "symbol": "EGP",
-      "name": "Egyptian Pound",
-      "ISO4217": "818"
+        "symbol": "EGP",
+        "name": "Egyptian Pound",
+        "ISO4217": "818"
     },
     "ERN": {
-      "symbol": "Nfk",
-      "name": "Eritrea Nakfa",
-      "ISO4217": "232"
+        "symbol": "Nfk",
+        "name": "Eritrea Nakfa",
+        "ISO4217": "232"
     },
     "ETB": {
-      "symbol": "Br",
-      "name": "Ethiopian Birr",
-      "ISO4217": "230"
+        "symbol": "Br",
+        "name": "Ethiopian Birr",
+        "ISO4217": "230"
     },
     "EUR": {
-      "symbol": "€",
-      "name": "Euro",
-      "ISO4217": "978"
+        "symbol": "€",
+        "name": "Euro",
+        "ISO4217": "978"
     },
     "FJD": {
-      "symbol": "FJ$",
-      "name": "Fiji Dollar",
-      "ISO4217": "242"
+        "symbol": "FJ$",
+        "name": "Fiji Dollar",
+        "ISO4217": "242"
     },
     "FKP": {
-      "symbol": "FK£",
-      "name": "Falkland Islands Pound",
-      "ISO4217": "238"
+        "symbol": "FK£",
+        "name": "Falkland Islands Pound",
+        "ISO4217": "238"
     },
     "GBP": {
-      "symbol": "£",
-      "name": "British Pound",
-      "ISO4217": "826"
+        "symbol": "£",
+        "name": "British Pound",
+        "ISO4217": "826"
     },
     "GEL": {
-      "symbol": "ლ",
-      "name": "Georgian Lari",
-      "ISO4217": "981"
+        "symbol": "ლ",
+        "name": "Georgian Lari",
+        "ISO4217": "981"
     },
     "GHS": {
-      "symbol": "₵",
-      "name": "Ghanaian Cedi",
-      "ISO4217": "936"
+        "symbol": "₵",
+        "name": "Ghanaian Cedi",
+        "ISO4217": "936"
     },
     "GIP": {
-      "symbol": "£G",
-      "name": "Gibraltar Pound",
-      "ISO4217": "292"
+        "symbol": "£G",
+        "name": "Gibraltar Pound",
+        "ISO4217": "292"
     },
     "GMD": {
-      "symbol": "D",
-      "name": "Gambian Dalasi",
-      "ISO4217": "270"
+        "symbol": "D",
+        "name": "Gambian Dalasi",
+        "ISO4217": "270"
     },
     "GNF": {
-      "symbol": "FG",
-      "name": "Guinea Franc",
-      "decimals": 0,
-      "ISO4217": "324"
+        "symbol": "FG",
+        "name": "Guinea Franc",
+        "decimals": 0,
+        "ISO4217": "324"
     },
     "GTQ": {
-      "symbol": "Q",
-      "name": "Guatemala Quetzal",
-      "ISO4217": "320"
+        "symbol": "Q",
+        "name": "Guatemala Quetzal",
+        "ISO4217": "320"
     },
     "GYD": {
-      "symbol": "GY$",
-      "name": "Guyana Dollar",
-      "ISO4217": "328"
+        "symbol": "GY$",
+        "name": "Guyana Dollar",
+        "ISO4217": "328"
     },
     "HKD": {
-      "symbol": "HK$",
-      "name": "Hong Kong Dollar",
-      "ISO4217": "344"
+        "symbol": "HK$",
+        "name": "Hong Kong Dollar",
+        "ISO4217": "344"
     },
     "HNL": {
-      "symbol": "HNL",
-      "name": "Honduras Lempira",
-      "ISO4217": "340"
+        "symbol": "HNL",
+        "name": "Honduras Lempira",
+        "ISO4217": "340"
     },
     "HRK": {
-      "symbol": "kn",
-      "name": "Croatian Kuna",
-      "ISO4217": "191"
+        "symbol": "kn",
+        "name": "Croatian Kuna",
+        "ISO4217": "191"
     },
     "HTG": {
-      "symbol": "G",
-      "name": "Haiti Gourde",
-      "ISO4217": "332"
+        "symbol": "G",
+        "name": "Haiti Gourde",
+        "ISO4217": "332"
     },
     "HUF": {
-      "symbol": "Ft",
-      "name": "Hungarian Forint",
-      "ISO4217": "348"
+        "symbol": "Ft",
+        "name": "Hungarian Forint",
+        "ISO4217": "348"
     },
     "IDR": {
-      "symbol": "Rp",
-      "name": "Indonesian Rupiah",
-      "ISO4217": "360"
+        "symbol": "Rp",
+        "name": "Indonesian Rupiah",
+        "ISO4217": "360"
     },
     "ILS": {
-      "symbol": "₪",
-      "name": "Israeli Shekel",
-      "ISO4217": "376"
+        "symbol": "₪",
+        "name": "Israeli Shekel",
+        "ISO4217": "376"
     },
     "INR": {
-      "symbol": "₹",
-      "name": "Indian Rupee",
-      "ISO4217": "356"
+        "symbol": "₹",
+        "name": "Indian Rupee",
+        "ISO4217": "356"
     },
     "IQD": {
-      "symbol": "IQD",
-      "name": "Iraqi Dinar",
-      "ISO4217": "368"
+        "symbol": "IQD",
+        "name": "Iraqi Dinar",
+        "decimals": 0,
+        "ISO4217": "368"
     },
     "IRR": {
-      "symbol": "﷼",
-      "name": "Iran Rial",
-      "ISO4217": "364"
+        "symbol": "﷼",
+        "name": "Iran Rial",
+        "decimals": 0,
+        "ISO4217": "364"
     },
     "ISK": {
-      "symbol": "kr",
-      "name": "Iceland Krona",
-      "decimals": 0,
-      "ISO4217": "352"
+        "symbol": "kr",
+        "name": "Iceland Krona",
+        "decimals": 0,
+        "ISO4217": "352"
     },
     "JMD": {
-      "symbol": "J$",
-      "name": "Jamaican Dollar",
-      "ISO4217": "388"
+        "symbol": "J$",
+        "name": "Jamaican Dollar",
+        "ISO4217": "388"
     },
     "JOD": {
-      "symbol": "JOD",
-      "name": "Jordanian Dinar",
-      "ISO4217": "400"
+        "symbol": "JOD",
+        "name": "Jordanian Dinar",
+        "ISO4217": "400"
     },
     "JPY": {
-      "symbol": "¥",
-      "name": "Japanese Yen",
-      "decimals": 0,
-      "ISO4217": "392"
+        "symbol": "¥",
+        "name": "Japanese Yen",
+        "decimals": 0,
+        "ISO4217": "392"
     },
     "KES": {
-      "symbol": "KSh",
-      "name": "Kenyan Shilling",
-      "ISO4217": "404"
+        "symbol": "KSh",
+        "name": "Kenyan Shilling",
+        "ISO4217": "404"
     },
     "KGS": {
-      "symbol": "KGS",
-      "name": "Kyrgyzstani Som",
-      "ISO4217": "417"
+        "symbol": "KGS",
+        "name": "Kyrgyzstani Som",
+        "ISO4217": "417"
     },
     "KHR": {
-      "symbol": "KHR",
-      "name": "Cambodia Riel",
-      "ISO4217": "116"
+        "symbol": "KHR",
+        "name": "Cambodia Riel",
+        "ISO4217": "116"
     },
     "KMF": {
-      "symbol": "CF",
-      "name": "Comoros Franc",
-      "ISO4217": "174"
+        "symbol": "CF",
+        "name": "Comoros Franc",
+        "decimals": 0,
+        "ISO4217": "174"
     },
     "KPW": {
-      "symbol": "KP₩",
-      "name": "North Korean Won",
-      "ISO4217": "408"
+        "symbol": "KP₩",
+        "name": "North Korean Won",
+        "decimals": 0,
+        "ISO4217": "408"
     },
     "KRW": {
-      "symbol": "₩",
-      "name": "Korean Won",
-      "ISO4217": "410"
+        "symbol": "₩",
+        "name": "Korean Won",
+        "decimals": 0,
+        "ISO4217": "410"
     },
     "KWD": {
-      "symbol": "KWD",
-      "name": "Kuwaiti Dinar",
-      "ISO4217": "414"
+        "symbol": "KWD",
+        "name": "Kuwaiti Dinar",
+        "ISO4217": "414"
     },
     "KYD": {
-      "symbol": "CI$",
-      "name": "Cayman Islands Dollar",
-      "ISO4217": "136"
+        "symbol": "CI$",
+        "name": "Cayman Islands Dollar",
+        "ISO4217": "136"
     },
     "KZT": {
-      "symbol": "〒",
-      "name": "Kazakhstan Tenge",
-      "ISO4217": "398"
+        "symbol": "〒",
+        "name": "Kazakhstan Tenge",
+        "ISO4217": "398"
     },
     "LAK": {
-      "symbol": "₭",
-      "name": "Lao Kip",
-      "ISO4217": "418"
+        "symbol": "₭",
+        "name": "Lao Kip",
+        "decimals": 0,
+        "ISO4217": "418"
     },
     "LBP": {
-      "symbol": "LBP",
-      "name": "Lebanese Pound",
-      "ISO4217": "422"
+        "symbol": "LBP",
+        "name": "Lebanese Pound",
+        "decimals": 0,
+        "ISO4217": "422"
     },
     "LKR": {
-      "symbol": "SL₨",
-      "name": "Sri Lanka Rupee",
-      "ISO4217": "144"
+        "symbol": "SL₨",
+        "name": "Sri Lanka Rupee",
+        "ISO4217": "144"
     },
     "LRD": {
-      "symbol": "L$",
-      "name": "Liberian Dollar",
-      "ISO4217": "430"
+        "symbol": "L$",
+        "name": "Liberian Dollar",
+        "ISO4217": "430"
     },
     "LSL": {
-      "symbol": "M",
-      "name": "Lesotho Loti",
-      "ISO4217": "426"
+        "symbol": "M",
+        "name": "Lesotho Loti",
+        "ISO4217": "426"
     },
     "LTL": {
-      "symbol": "Lt",
-      "name": "Lithuanian Lita",
-      "retirementDate": "2015-08-22",
-      "retired": true,
-      "ISO4217": "440"
+        "symbol": "Lt",
+        "name": "Lithuanian Lita",
+        "retirementDate": "2015-08-22",
+        "retired": true,
+        "ISO4217": "440"
     },
     "LVL": {
-      "symbol": "Ls",
-      "name": "Latvian Lat",
-      "ISO4217": "428",
-      "retired": true
+        "symbol": "Ls",
+        "name": "Latvian Lat",
+        "ISO4217": "428",
+        "retired": true
     },
     "LYD": {
-      "symbol": "LYD",
-      "name": "Libyan Dinar",
-      "ISO4217": "434"
+        "symbol": "LYD",
+        "name": "Libyan Dinar",
+        "ISO4217": "434"
     },
     "MAD": {
-      "symbol": "MAD",
-      "name": "Moroccan Dirham",
-      "ISO4217": "504"
+        "symbol": "MAD",
+        "name": "Moroccan Dirham",
+        "ISO4217": "504"
     },
     "MDL": {
-      "symbol": "MDL",
-      "name": "Moldovan Leu",
-      "ISO4217": "498"
+        "symbol": "MDL",
+        "name": "Moldovan Leu",
+        "ISO4217": "498"
     },
     "MGA": {
-      "symbol": "MGA",
-      "name": "Malagasy Ariary",
-      "ISO4217": "969"
+        "symbol": "MGA",
+        "name": "Malagasy Ariary",
+        "decimals": 0,
+        "ISO4217": "969"
     },
     "MKD": {
-      "symbol": "ден",
-      "name": "Macedonian Denar",
-      "ISO4217": "807"
+        "symbol": "ден",
+        "name": "Macedonian Denar",
+        "ISO4217": "807"
     },
     "MMK": {
-      "symbol": "Ks",
-      "name": "Myanmar Kyat",
-      "ISO4217": "104"
+        "symbol": "Ks",
+        "name": "Myanmar Kyat",
+        "decimals": 0,
+        "ISO4217": "104"
     },
     "MNT": {
-      "symbol": "₮",
-      "name": "Mongolian Tugrik",
-      "ISO4217": "496"
+        "symbol": "₮",
+        "name": "Mongolian Tugrik",
+        "ISO4217": "496"
     },
     "MOP": {
-      "symbol": "MOP$",
-      "name": "Macau Pataca",
-      "ISO4217": "446"
+        "symbol": "MOP$",
+        "name": "Macau Pataca",
+        "ISO4217": "446"
     },
     "MRO": {
-      "symbol": "UM",
-      "name": "Mauritania Ougulya",
-      "decimals": 0,
-      "retired": true,
-      "retirementDate": "2018-07-11",
-      "ISO4217": "478"
+        "symbol": "UM",
+        "name": "Mauritania Ougulya",
+        "decimals": 0,
+        "retired": true,
+        "retirementDate": "2018-07-11",
+        "ISO4217": "478"
     },
     "MRU": {
-      "symbol": "UM",
-      "name": "Mauritania Ougulya",
-      "decimals": 0,
-      "ISO4217": ""
+        "symbol": "UM",
+        "name": "Mauritania Ougulya",
+        "decimals": 0,
+        "ISO4217": ""
     },
     "MUR": {
-      "symbol": "Rs",
-      "name": "Mauritius Rupee",
-      "ISO4217": "480"
+        "symbol": "Rs",
+        "name": "Mauritius Rupee",
+        "ISO4217": "480"
     },
     "MVR": {
-      "symbol": "Rf",
-      "name": "Maldives Rufiyaa",
-      "ISO4217": "462"
+        "symbol": "Rf",
+        "name": "Maldives Rufiyaa",
+        "ISO4217": "462"
     },
     "MWK": {
-      "symbol": "MK",
-      "name": "Malawi Kwacha",
-      "ISO4217": "454"
+        "symbol": "MK",
+        "name": "Malawi Kwacha",
+        "ISO4217": "454"
     },
     "MXN": {
-      "symbol": "Mex$",
-      "name": "Mexican Peso",
-      "ISO4217": "484"
+        "symbol": "Mex$",
+        "name": "Mexican Peso",
+        "ISO4217": "484"
     },
     "MYR": {
-      "symbol": "RM",
-      "name": "Malaysian Ringgit",
-      "ISO4217": "458"
+        "symbol": "RM",
+        "name": "Malaysian Ringgit",
+        "ISO4217": "458"
     },
     "MZN": {
-      "symbol": "MTn",
-      "name": "Mozambican Metical",
-      "ISO4217": "943"
+        "symbol": "MTn",
+        "name": "Mozambican Metical",
+        "ISO4217": "943"
     },
     "NAD": {
-      "symbol": "N$",
-      "name": "Namibian Dollar",
-      "ISO4217": "516"
+        "symbol": "N$",
+        "name": "Namibian Dollar",
+        "ISO4217": "516"
     },
     "NGN": {
-      "symbol": "₦",
-      "name": "Nigerian Naira",
-      "ISO4217": "566"
+        "symbol": "₦",
+        "name": "Nigerian Naira",
+        "ISO4217": "566"
     },
     "NIO": {
-      "symbol": "NIO",
-      "name": "Nicaragua Cordoba",
-      "ISO4217": "558"
+        "symbol": "NIO",
+        "name": "Nicaragua Cordoba",
+        "ISO4217": "558"
     },
     "NOK": {
-      "symbol": "Nkr",
-      "name": "Norwegian Krone",
-      "ISO4217": "578"
+        "symbol": "Nkr",
+        "name": "Norwegian Krone",
+        "ISO4217": "578"
     },
     "NPR": {
-      "symbol": "₨",
-      "name": "Nepalese Rupee",
-      "ISO4217": "524"
+        "symbol": "₨",
+        "name": "Nepalese Rupee",
+        "ISO4217": "524"
     },
     "NZD": {
-      "symbol": "NZ$",
-      "name": "New Zealand Dollar",
-      "ISO4217": "554"
+        "symbol": "NZ$",
+        "name": "New Zealand Dollar",
+        "ISO4217": "554"
     },
     "OMR": {
-      "symbol": "OMR",
-      "name": "Omani Rial",
-      "ISO4217": "512"
+        "symbol": "OMR",
+        "name": "Omani Rial",
+        "ISO4217": "512"
     },
     "PAB": {
-      "symbol": "B",
-      "name": "Panama Balboa",
-      "ISO4217": "590"
+        "symbol": "B",
+        "name": "Panama Balboa",
+        "ISO4217": "590"
     },
     "PEN": {
-      "symbol": "S/.",
-      "name": "Peruvian Nuevo Sol",
-      "ISO4217": "604"
+        "symbol": "S/.",
+        "name": "Peruvian Nuevo Sol",
+        "ISO4217": "604"
     },
     "PGK": {
-      "symbol": "K",
-      "name": "Papua New Guinea Kina",
-      "ISO4217": "598"
+        "symbol": "K",
+        "name": "Papua New Guinea Kina",
+        "ISO4217": "598"
     },
     "PHP": {
-      "symbol": "₱",
-      "name": "Philippine Peso",
-      "ISO4217": "608"
+        "symbol": "₱",
+        "name": "Philippine Peso",
+        "ISO4217": "608"
     },
     "PKR": {
-      "symbol": "Rs",
-      "name": "Pakistani Rupee",
-      "ISO4217": "586"
+        "symbol": "Rs",
+        "name": "Pakistani Rupee",
+        "ISO4217": "586"
     },
     "PLN": {
-      "symbol": "zł",
-      "name": "Polish Zloty",
-      "ISO4217": "985"
+        "symbol": "zł",
+        "name": "Polish Zloty",
+        "ISO4217": "985"
     },
     "PYG": {
-      "symbol": "₲",
-      "name": "Paraguayan Guarani",
-      "ISO4217": "600"
+        "symbol": "₲",
+        "name": "Paraguayan Guarani",
+        "decimals": 0,
+        "ISO4217": "600"
     },
     "QAR": {
-      "symbol": "QAR",
-      "name": "Qatar Rial",
-      "ISO4217": "634"
+        "symbol": "QAR",
+        "name": "Qatar Rial",
+        "ISO4217": "634"
     },
     "RON": {
-      "symbol": "RON",
-      "name": "Romanian New Leu",
-      "ISO4217": "946"
+        "symbol": "RON",
+        "name": "Romanian New Leu",
+        "ISO4217": "946"
     },
     "RSD": {
-      "symbol": "РСД",
-      "name": "Serbian Dinar",
-      "ISO4217": "941"
+        "symbol": "РСД",
+        "name": "Serbian Dinar",
+        "decimals": 0,
+        "ISO4217": "941"
     },
     "RUB": {
-      "symbol": "₽",
-      "name": "Russian Rouble",
-      "ISO4217": "643"
+        "symbol": "₽",
+        "name": "Russian Rouble",
+        "ISO4217": "643"
     },
     "RWF": {
-      "symbol": "RF",
-      "name": "Rwanda Franc",
-      "decimals": 0,
-      "ISO4217": "646"
+        "symbol": "RF",
+        "name": "Rwanda Franc",
+        "decimals": 0,
+        "ISO4217": "646"
     },
     "SAR": {
-      "symbol": "SAR",
-      "name": "Saudi Arabian Riyal",
-      "ISO4217": "682"
+        "symbol": "SAR",
+        "name": "Saudi Arabian Riyal",
+        "ISO4217": "682"
     },
     "SBD": {
-      "symbol": "SI$",
-      "name": "Solomon Islands Dollar",
-      "ISO4217": "090"
+        "symbol": "SI$",
+        "name": "Solomon Islands Dollar",
+        "ISO4217": "090"
     },
     "SCR": {
-      "symbol": "SR",
-      "name": "Seychelles Rupee",
-      "ISO4217": "690"
+        "symbol": "SR",
+        "name": "Seychelles Rupee",
+        "ISO4217": "690"
     },
     "SDG": {
-      "symbol": "SDG",
-      "name": "Sudanese Pound",
-      "ISO4217": "938"
+        "symbol": "SDG",
+        "name": "Sudanese Pound",
+        "ISO4217": "938"
     },
     "SEK": {
-      "symbol": "Skr",
-      "name": "Swedish Krona",
-      "ISO4217": "752"
+        "symbol": "Skr",
+        "name": "Swedish Krona",
+        "ISO4217": "752"
     },
     "SGD": {
-      "symbol": "S$",
-      "name": "Singapore Dollar",
-      "ISO4217": "702"
+        "symbol": "S$",
+        "name": "Singapore Dollar",
+        "ISO4217": "702"
     },
     "SHP": {
-      "symbol": "£S",
-      "name": "St Helena Pound",
-      "ISO4217": "654"
+        "symbol": "£S",
+        "name": "St Helena Pound",
+        "ISO4217": "654"
     },
     "SLL": {
-      "symbol": "Le",
-      "name": "Sierra Leone Leone",
-      "ISO4217": "694"
+        "symbol": "Le",
+        "name": "Sierra Leone Leone",
+        "decimals": 0,
+        "ISO4217": "694"
     },
     "SOS": {
-      "symbol": "So.",
-      "name": "Somali Shilling",
-      "ISO4217": "706"
+        "symbol": "So.",
+        "name": "Somali Shilling",
+        "decimals": 0,
+        "ISO4217": "706"
     },
     "SRD": {
-      "symbol": "SRD",
-      "name": "Surinamese Dollar",
-      "ISO4217": "968"
+        "symbol": "SRD",
+        "name": "Surinamese Dollar",
+        "ISO4217": "968"
     },
     "STD": {
-      "symbol": "Db",
-      "name": "Sao Tome Dobra",
-      "retired": true,
-      "retirementDate": "2018-07-11",
-      "ISO4217": "678"
+        "symbol": "Db",
+        "name": "Sao Tome Dobra",
+        "decimals": 0,
+        "retired": true,
+        "retirementDate": "2018-07-11",
+        "ISO4217": "678"
     },
     "STN": {
-      "symbol": "Db",
-      "name": "Sao Tome Dobra",
-      "ISO4217": ""
+        "symbol": "Db",
+        "name": "Sao Tome Dobra",
+        "ISO4217": ""
     },
     "SVC": {
-      "symbol": "SVC",
-      "name": "El Salvador Colon",
-      "ISO4217": "222"
+        "symbol": "SVC",
+        "name": "El Salvador Colon",
+        "ISO4217": "222"
     },
     "SYP": {
-      "symbol": "SYP",
-      "name": "Syrian Pound",
-      "ISO4217": "760"
+        "symbol": "SYP",
+        "name": "Syrian Pound",
+        "decimals": 0,
+        "ISO4217": "760"
     },
     "SZL": {
-      "symbol": "E",
-      "name": "Swaziland Lilageni",
-      "ISO4217": "748"
+        "symbol": "E",
+        "name": "Swaziland Lilageni",
+        "ISO4217": "748"
     },
     "THB": {
-      "symbol": "฿",
-      "name": "Thai Baht",
-      "ISO4217": "764"
+        "symbol": "฿",
+        "name": "Thai Baht",
+        "ISO4217": "764"
     },
     "TJS": {
-      "symbol": "TJS",
-      "name": "Tajikistani Somoni",
-      "ISO4217": "972"
+        "symbol": "TJS",
+        "name": "Tajikistani Somoni",
+        "ISO4217": "972"
     },
     "TMT": {
-      "symbol": "m",
-      "name": "Turkmenistani Manat",
-      "ISO4217": "934"
+        "symbol": "m",
+        "name": "Turkmenistani Manat",
+        "ISO4217": "934"
     },
     "TND": {
-      "symbol": "TND",
-      "name": "Tunisian Dinar",
-      "ISO4217": "788"
+        "symbol": "TND",
+        "name": "Tunisian Dinar",
+        "ISO4217": "788"
     },
     "TOP": {
-      "symbol": "T$",
-      "name": "Tonga Pa'ang",
-      "ISO4217": "776"
+        "symbol": "T$",
+        "name": "Tonga Pa'ang",
+        "ISO4217": "776"
     },
     "TRY": {
-      "symbol": "TL",
-      "name": "Turkish Lira",
-      "ISO4217": "949"
+        "symbol": "TL",
+        "name": "Turkish Lira",
+        "ISO4217": "949"
     },
     "TTD": {
-      "symbol": "TT$",
-      "name": "Trinidad & Tobago Dollar",
-      "ISO4217": "780"
+        "symbol": "TT$",
+        "name": "Trinidad & Tobago Dollar",
+        "ISO4217": "780"
     },
     "TWD": {
-      "symbol": "NT$",
-      "name": "Taiwan Dollar",
-      "ISO4217": "901"
+        "symbol": "NT$",
+        "name": "Taiwan Dollar",
+        "ISO4217": "901"
     },
     "TZS": {
-      "symbol": "TZS",
-      "name": "Tanzanian Shilling",
-      "ISO4217": "834"
+        "symbol": "TZS",
+        "name": "Tanzanian Shilling",
+        "ISO4217": "834"
     },
     "UAH": {
-      "symbol": "₴",
-      "name": "Ukraine Hryvnia",
-      "ISO4217": "980"
+        "symbol": "₴",
+        "name": "Ukraine Hryvnia",
+        "ISO4217": "980"
     },
     "UGX": {
-      "symbol": "USh",
-      "name": "Ugandan Shilling",
-      "decimals": 0,
-      "ISO4217": "800"
+        "symbol": "USh",
+        "name": "Ugandan Shilling",
+        "decimals": 0,
+        "ISO4217": "800"
     },
     "USD": {
-      "symbol": "$",
-      "name": "United States Dollar",
-      "ISO4217": "840"
+        "symbol": "$",
+        "name": "United States Dollar",
+        "ISO4217": "840"
     },
     "UYU": {
-      "symbol": "$U",
-      "name": "Uruguayan New Peso",
-      "ISO4217": "858"
+        "symbol": "$U",
+        "name": "Uruguayan New Peso",
+        "ISO4217": "858"
     },
     "UZS": {
-      "symbol": "UZS",
-      "name": "Uzbekistani Som",
-      "ISO4217": "860"
+        "symbol": "UZS",
+        "name": "Uzbekistani Som",
+        "ISO4217": "860"
     },
     "VEB": {
-      "symbol": "Bs.",
-      "name": "Venezuelan Bolivar",
-      "retired": true,
-      "retirementDate": "2008-02-01",
-      "ISO4217": ""
+        "symbol": "Bs.",
+        "name": "Venezuelan Bolivar",
+        "retired": true,
+        "retirementDate": "2008-02-01",
+        "ISO4217": ""
     },
     "VEF": {
-      "symbol": "Bs.F",
-      "name": "Venezuelan Bolivar Fuerte",
-      "retired": true,
-      "retirementDate": "2018-08-20",
-      "ISO4217": "937"
+        "symbol": "Bs.F",
+        "name": "Venezuelan Bolivar Fuerte",
+        "retired": true,
+        "retirementDate": "2018-08-20",
+        "ISO4217": "937"
     },
     "VES": {
-      "symbol": "Bs.S",
-      "name": "Venezuelan Bolivar Soberano",
-      "ISO4217": "928"
+        "symbol": "Bs.S",
+        "name": "Venezuelan Bolivar Soberano",
+        "ISO4217": "928"
     },
     "VND": {
-      "symbol": "₫",
-      "name": "Vietnam Dong",
-      "decimals": 0,
-      "ISO4217": "704"
+        "symbol": "₫",
+        "name": "Vietnam Dong",
+        "decimals": 0,
+        "ISO4217": "704"
     },
     "VUV": {
-      "symbol": "Vt",
-      "name": "Vanuatu Vatu",
-      "ISO4217": "548"
+        "symbol": "Vt",
+        "name": "Vanuatu Vatu",
+        "decimals": 0,
+        "ISO4217": "548"
     },
     "WST": {
-      "symbol": "WS$",
-      "name": "Samoa Tala",
-      "ISO4217": "882"
+        "symbol": "WS$",
+        "name": "Samoa Tala",
+        "ISO4217": "882"
     },
     "XAF": {
-      "symbol": "FCFA",
-      "name": "CFA Franc (BEAC)",
-      "decimals": 0,
-      "ISO4217": "950"
+        "symbol": "FCFA",
+        "name": "CFA Franc (BEAC)",
+        "decimals": 0,
+        "ISO4217": "950"
     },
     "XCD": {
-      "symbol": "EC$",
-      "name": "East Caribbean Dollar",
-      "ISO4217": "951"
+        "symbol": "EC$",
+        "name": "East Caribbean Dollar",
+        "ISO4217": "951"
     },
     "XOF": {
-      "symbol": "CFA",
-      "name": "CFA Franc (BCEAO)",
-      "decimals": 0,
-      "ISO4217": "952"
+        "symbol": "CFA",
+        "name": "CFA Franc (BCEAO)",
+        "decimals": 0,
+        "ISO4217": "952"
     },
     "XPF": {
-      "symbol": "XPF",
-      "name": "Pacific Franc",
-      "decimals": 0,
-      "ISO4217": "953"
+        "symbol": "XPF",
+        "name": "Pacific Franc",
+        "decimals": 0,
+        "ISO4217": "953"
     },
     "YER": {
-      "symbol": "YER",
-      "name": "Yemen  Riyal",
-      "ISO4217": "886"
+        "symbol": "YER",
+        "name": "Yemen Riyal",
+        "decimals": 0,
+        "ISO4217": "886"
     },
     "ZAR": {
-      "symbol": "R",
-      "name": "South African Rand",
-      "ISO4217": "710"
+        "symbol": "R",
+        "name": "South African Rand",
+        "ISO4217": "710"
     },
     "ZMK": {
-      "symbol": "ZK",
-      "name": "Zambian Kwacha",
-      "retired": true,
-      "retirementDate": "2013-01-01",
-      "ISO4217": "894"
+        "symbol": "ZK",
+        "name": "Zambian Kwacha",
+        "decimals": 0,
+        "retired": true,
+        "retirementDate": "2013-01-01",
+        "ISO4217": "894"
     },
     "ZMW": {
-      "symbol": "ZMW",
-      "name": "Zambian Kwacha",
-      "cacheBurst": 1,
-      "ISO4217": "967"
+        "symbol": "ZMW",
+        "name": "Zambian Kwacha",
+        "cacheBurst": 1,
+        "ISO4217": "967"
     }
 }
   
\ No newline at end of file

From 4308726d159fe46ecd3f53ddf3dd22a587c681fc Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 14 Apr 2023 22:56:44 +0700
Subject: [PATCH 39/92] added unit test for calculateAmount

---
 tests/unit/IOUUtilsTest.js | 55 ++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 2c4c1b76f94f..5dd3774c9596 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -52,27 +52,27 @@ function initCurrencyList() {
     return waitForPromisesToResolve();
 }
 
-beforeEach(() => {
-    reportActions = [];
-    const chatReportID = ReportUtils.generateReportID();
-    const amount = 1000;
-    const currency = 'USD';
-
-    iouReport = ReportUtils.buildOptimisticIOUReport(
-        ownerEmail,
-        managerEmail,
-        amount,
-        chatReportID,
-        currency,
-        CONST.LOCALES.EN,
-    );
-
-    // The starting point of all tests is the IOUReport containing a single non-pending transaction in USD
-    // All requests in the tests are assumed to be offline, unless isOnline is specified
-    createIOUReportAction('create', amount, currency, {IOUTransactionID: '', isOnline: true});
-});
-
 describe('isIOUReportPendingCurrencyConversion', () => {
+    beforeEach(() => {
+        reportActions = [];
+        const chatReportID = ReportUtils.generateReportID();
+        const amount = 1000;
+        const currency = 'USD';
+
+        iouReport = ReportUtils.buildOptimisticIOUReport(
+            ownerEmail,
+            managerEmail,
+            amount,
+            chatReportID,
+            currency,
+            CONST.LOCALES.EN,
+        );
+
+        // The starting point of all tests is the IOUReport containing a single non-pending transaction in USD
+        // All requests in the tests are assumed to be offline, unless isOnline is specified
+        createIOUReportAction('create', amount, currency, {IOUTransactionID: '', isOnline: true});
+    });
+
     test('Requesting money offline in a different currency will show the pending conversion message', () => {
         // Request money offline in AED
         createIOUReportAction('create', 100, 'AED');
@@ -173,3 +173,18 @@ describe('getCurrencyUnits', () => {
         expect(IOUUtils.getCurrencyUnits('LYD')).toBe(100);
     });
 });
+
+describe('calculateAmount', () => {
+    beforeAll(() => initCurrencyList());
+    test('103 JPY split among 3 participants including the default user should be [35, 34, 34]', () => {
+        const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com'];
+        expect(IOUUtils.calculateAmount(participants, 103, 'JPY', true)).toBe(35);
+        expect(IOUUtils.calculateAmount(participants, 103, 'JPY')).toBe(34);
+    });
+
+    test('10 AFN split among 4 participants including the default user should be [1, 3, 3, 3]', () => {
+        const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com', 'suestorm@expensify.com'];
+        expect(IOUUtils.calculateAmount(participants, 10, 'AFN', true)).toBe(1);
+        expect(IOUUtils.calculateAmount(participants, 10, 'AFN')).toBe(3);
+    });
+});

From e5018baf1d7be142d2022f0fb249b3b6c3a86358 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 14 Apr 2023 19:19:32 +0200
Subject: [PATCH 40/92] fix: add missing format phone number function

---
 src/libs/OptionsListUtils.js                    | 7 ++++---
 src/libs/actions/PersonalDetails.js             | 5 +++--
 src/pages/iou/MoneyRequestModal.js              | 2 +-
 src/pages/settings/InitialSettingsPage.js       | 5 ++---
 src/pages/settings/Security/CloseAccountPage.js | 2 +-
 src/pages/signin/ChangeExpensifyLoginLink.js    | 3 +--
 src/pages/workspace/WorkspaceMembersPage.js     | 5 ++---
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index aa2fc49ce9b9..b838d2303fe8 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -11,6 +11,7 @@ import Permissions from './Permissions';
 import * as CollectionUtils from './CollectionUtils';
 import Navigation from './Navigation/Navigation';
 import * as LoginUtils from './LoginUtils';
+import * as LocalePhoneNumber from './LocalePhoneNumber';
 
 /**
  * OptionsListUtils is used to build a list options passed to the OptionsList component. Several different UI views can
@@ -112,7 +113,7 @@ function getPersonalDetailsForLogins(logins, personalDetails) {
             if (!personalDetail) {
                 personalDetail = {
                     login,
-                    displayName: Str.removeSMSDomain(login),
+                    displayName: LocalePhoneNumber.formatPhoneNumber(login),
                     avatar: ReportUtils.getDefaultAvatar(login),
                 };
             }
@@ -357,13 +358,13 @@ function createOption(logins, personalDetails, report, reportActions = {}, {
         } else {
             result.alternateText = (showChatPreviewLine && lastMessageText)
                 ? lastMessageText
-                : Str.removeSMSDomain(personalDetail.login);
+                : LocalePhoneNumber.formatPhoneNumber(personalDetail.login);
         }
         reportName = ReportUtils.getReportName(report, policies);
     } else {
         reportName = ReportUtils.getDisplayNameForParticipant(logins[0]);
         result.keyForList = personalDetail.login;
-        result.alternateText = Str.removeSMSDomain(personalDetail.login);
+        result.alternateText = LocalePhoneNumber.formatPhoneNumber(personalDetail.login);
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result, iouReports);
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index 138b70da78f0..5d51951d858b 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -6,6 +6,7 @@ import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import * as API from '../API';
 import * as ReportUtils from '../ReportUtils';
+import * as LocalePhoneNumber from '../LocalePhoneNumber';
 import ROUTES from '../../ROUTES';
 import Navigation from '../Navigation/Navigation';
 
@@ -29,9 +30,9 @@ Onyx.connect({
  * @returns {String}
  */
 function getDisplayName(login, personalDetail) {
-    // If we have a number like +15857527441@expensify.sms then let's remove @expensify.sms
+    // If we have a number like +15857527441@expensify.sms then let's remove @expensify.sms and format it
     // so that the option looks cleaner in our UI.
-    const userLogin = Str.removeSMSDomain(login);
+    const userLogin = LocalePhoneNumber.formatPhoneNumber(login);
     const userDetails = personalDetail || lodashGet(personalDetails, login);
 
     if (!userDetails) {
diff --git a/src/pages/iou/MoneyRequestModal.js b/src/pages/iou/MoneyRequestModal.js
index 27139f3e2bcf..aeef8abbbdbf 100644
--- a/src/pages/iou/MoneyRequestModal.js
+++ b/src/pages/iou/MoneyRequestModal.js
@@ -111,7 +111,7 @@ const MoneyRequestModal = (props) => {
         text: personalDetails.displayName,
         firstName: lodashGet(personalDetails, 'firstName', ''),
         lastName: lodashGet(personalDetails, 'lastName', ''),
-        alternateText: Str.isSMSLogin(personalDetails.login) ? Str.removeSMSDomain(personalDetails.login) : personalDetails.login,
+        alternateText: Str.isSMSLogin(personalDetails.login) ? props.formatPhoneNumber(personalDetails.login) : personalDetails.login,
         icons: [{
             source: ReportUtils.getAvatar(personalDetails.avatar, personalDetails.login),
             name: personalDetails.login,
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index 0593c10e4fb6..3328825ad434 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -4,7 +4,6 @@ import {View, ScrollView, Pressable} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
-import Str from 'expensify-common/lib/str';
 import {withNetwork} from '../../components/OnyxProvider';
 import styles from '../../styles/styles';
 import Text from '../../components/Text';
@@ -296,7 +295,7 @@ class InitialSettingsPage extends React.Component {
                                             <Text style={[styles.textHeadline, styles.pre]} numberOfLines={1}>
                                                 {this.props.currentUserPersonalDetails.displayName
                                                     ? this.props.currentUserPersonalDetails.displayName
-                                                    : Str.removeSMSDomain(this.props.session.email)}
+                                                    : this.props.formatPhoneNumber(this.props.session.email)}
                                             </Text>
                                         </Tooltip>
                                     </Pressable>
@@ -305,7 +304,7 @@ class InitialSettingsPage extends React.Component {
                                             style={[styles.textLabelSupporting, styles.mt1]}
                                             numberOfLines={1}
                                         >
-                                            {Str.removeSMSDomain(this.props.session.email)}
+                                            {this.props.formatPhoneNumber(this.props.session.email)}
                                         </Text>
                                     )}
                                 </View>
diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index 56a5c27e12a0..b80ab2687bac 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -85,7 +85,7 @@ class CloseAccountPage extends Component {
     }
 
     render() {
-        const userEmailOrPhone = Str.removeSMSDomain(this.props.session.email);
+        const userEmailOrPhone = this.props.formatPhoneNumber(this.props.session.email);
         return (
             <ScreenWrapper includeSafeAreaPaddingBottom={false}>
                 <HeaderWithCloseButton
diff --git a/src/pages/signin/ChangeExpensifyLoginLink.js b/src/pages/signin/ChangeExpensifyLoginLink.js
index a0913859f80d..a430ea7410d7 100755
--- a/src/pages/signin/ChangeExpensifyLoginLink.js
+++ b/src/pages/signin/ChangeExpensifyLoginLink.js
@@ -3,7 +3,6 @@ import {TouchableOpacity, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
-import Str from 'expensify-common/lib/str';
 import Text from '../../components/Text';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -35,7 +34,7 @@ const ChangeExpensifyLoginLink = props => (
             <Text>
                 {props.translate('common.not')}
                 &nbsp;
-                {Str.removeSMSDomain(props.credentials.login)}
+                {props.formatPhoneNumber(props.credentials.login)}
                 {'? '}
             </Text>
         )}
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index a8eaafffdf2e..9b7fc0a9bd0f 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -6,7 +6,6 @@ import {
 } from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import Str from 'expensify-common/lib/str';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
@@ -290,8 +289,8 @@ class WorkspaceMembersPage extends React.Component {
                             onSelectRow={() => this.toggleUser(item.login, item.pendingAction)}
                             boldStyle
                             option={{
-                                text: Str.removeSMSDomain(item.displayName),
-                                alternateText: Str.removeSMSDomain(item.login),
+                                text: this.props.formatPhoneNumber(item.displayName),
+                                alternateText: this.props.formatPhoneNumber(item.login),
                                 participantsList: [item],
                                 icons: [{
                                     source: ReportUtils.getAvatar(item.avatar, item.login),

From cdb5889bdbe5a522a3c81ae0941d0acf87bd493a Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 14 Apr 2023 21:23:25 +0200
Subject: [PATCH 41/92] fix: minor fix

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

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index d60ce2d9b564..734ad5555081 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -190,7 +190,7 @@ function getParticipantsOptions(report, personalDetails) {
         text: details.displayName,
         firstName: lodashGet(details, 'firstName', ''),
         lastName: lodashGet(details, 'lastName', ''),
-        alternateText: Str.isSMSLogin(details.login) ? Str.removeSMSDomain(details.login) : details.login,
+        alternateText: Str.isSMSLogin(details.login) ? LocalePhoneNumber.formatPhoneNumber(details.login) : details.login,
         icons: [{
             source: ReportUtils.getAvatar(details.avatar, details.login),
             name: details.login,

From 664690972aad96ffc8313bc15ac8d45f9c6d3838 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 14 Apr 2023 14:01:17 -0700
Subject: [PATCH 42/92] add new icon, update translations

---
 assets/images/task.svg                            | 15 +++++++++++++++
 src/components/Icon/Expensicons.js                |  2 ++
 src/languages/en.js                               |  3 +--
 src/languages/es.js                               |  3 +--
 .../home/report/ReportActionCompose/index.js      |  2 +-
 .../FloatingActionButtonAndPopover.js             |  2 +-
 6 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 assets/images/task.svg

diff --git a/assets/images/task.svg b/assets/images/task.svg
new file mode 100644
index 000000000000..20412f771b69
--- /dev/null
+++ b/assets/images/task.svg
@@ -0,0 +1,15 @@
+<?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 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<g>
+	<path d="M9.5,5h9C19.3,5,20,4.3,20,3.5S19.3,2,18.5,2h-9C8.7,2,8,2.7,8,3.5S8.7,5,9.5,5z"/>
+	<path d="M18.5,8.5h-9C8.7,8.5,8,9.2,8,10s0.7,1.5,1.5,1.5h9c0.8,0,1.5-0.7,1.5-1.5S19.3,8.5,18.5,8.5z"/>
+	<path d="M18.5,15h-9C8.7,15,8,15.7,8,16.5S8.7,18,9.5,18h9c0.8,0,1.5-0.7,1.5-1.5S19.3,15,18.5,15z"/>
+	<path d="M4.5,1L2.9,3.2L2.4,2.7C1.9,2.3,1.2,2.3,0.8,2.8C0.4,3.3,0.4,4,0.9,4.5l2,1.9c0.1,0.1,0.3,0.2,0.4,0.1
+		c0.1,0,0.3-0.1,0.4-0.2l2.7-3.9c0.4-0.5,0.3-1.2-0.2-1.6C5.5,0.3,4.8,0.5,4.5,1z"/>
+	<path d="M4.5,7L2.9,9.2L2.4,8.7C1.9,8.3,1.2,8.3,0.8,8.8C0.4,9.3,0.4,10,0.9,10.5l2,1.9c0.1,0.1,0.3,0.2,0.4,0.1
+		c0.1,0,0.3-0.1,0.4-0.2l2.7-3.9c0.4-0.5,0.3-1.2-0.2-1.6C5.5,6.3,4.8,6.5,4.5,7z"/>
+	<circle cx="3.5" cy="16.5" r="2.5"/>
+</g>
+</svg>
diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js
index 976d846dcb81..d3c7c2f4bc57 100644
--- a/src/components/Icon/Expensicons.js
+++ b/src/components/Icon/Expensicons.js
@@ -109,6 +109,7 @@ import Podcast from '../../../assets/images/social-podcast.svg';
 import Linkedin from '../../../assets/images/social-linkedin.svg';
 import Instagram from '../../../assets/images/social-instagram.svg';
 import AddReaction from '../../../assets/images/add-reaction.svg';
+import Task from '../../../assets/images/task.svg';
 
 export {
     ActiveRoomAvatar,
@@ -204,6 +205,7 @@ export {
     Send,
     Shield,
     Sync,
+    Task,
     ThreeDots,
     Transfer,
     Trashcan,
diff --git a/src/languages/en.js b/src/languages/en.js
index d6b8c5695fb7..d04d5aa0ffaa 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -1126,12 +1126,11 @@ export default {
         },
     },
     newTaskPage: {
-        assignee: 'To',
         assignTask: 'Assign task',
         title: 'Title',
         description: 'Description',
         shareIn: 'Share in',
-        pleaseEnterTaskName: 'Please enter a task name',
+        pleaseEnterTaskName: 'Please enter a title',
     },
     statementPage: {
         generatingPDF: 'We\'re generating your PDF right now. Please come back later!',
diff --git a/src/languages/es.js b/src/languages/es.js
index 7cad709b05dd..a2026a6f3e6a 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -1127,12 +1127,11 @@ export default {
         },
     },
     newTaskPage: {
-        assignee: 'Para',
         assignTask: 'Asignar tarea',
         title: 'Título',
         description: 'Descripción',
         shareIn: 'Compartir en',
-        pleaseEnterTaskName: 'Por favor, ingrese un nombre para la tarea',
+        pleaseEnterTaskName: 'Por favor introduce un título',
     },
     statementPage: {
         generatingPDF: 'Estamos generando tu PDF ahora mismo. ¡Por favor, vuelve más tarde!',
diff --git a/src/pages/home/report/ReportActionCompose/index.js b/src/pages/home/report/ReportActionCompose/index.js
index eb29e369b182..d4e90335229c 100644
--- a/src/pages/home/report/ReportActionCompose/index.js
+++ b/src/pages/home/report/ReportActionCompose/index.js
@@ -413,7 +413,7 @@ class ReportActionCompose extends React.Component {
 
         return [
             {
-                icon: Expensicons.Checkmark,
+                icon: Expensicons.Task,
                 text: this.props.translate('newTaskPage.assignTask'),
                 onSelected: () => Navigation.navigate(ROUTES.getNewTaskRoute(this.props.reportID)),
             },
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index 1b9ab0f53052..ebff5f4e6a51 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -213,7 +213,7 @@ class FloatingActionButtonAndPopover extends React.Component {
                         ] : []),
                         ...(Permissions.canUseTasks(this.props.betas) ? [
                             {
-                                icon: Expensicons.Checkmark,
+                                icon: Expensicons.Task,
                                 text: this.props.translate('newTaskPage.assignTask'),
                                 onSelected: () => Navigation.navigate(ROUTES.NEW_TASK),
                             },

From d3b29142e223958cf5803d1e2a75e20b0b4dc9a0 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Fri, 14 Apr 2023 14:03:48 -0700
Subject: [PATCH 43/92] remove unused reports

---
 src/pages/NewTaskPage.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
index 19cb12037189..a102038e998e 100644
--- a/src/pages/NewTaskPage.js
+++ b/src/pages/NewTaskPage.js
@@ -15,18 +15,6 @@ import TextInput from '../components/TextInput';
 import Permissions from '../libs/Permissions';
 
 const propTypes = {
-    /** All reports shared with the user */
-    reports: PropTypes.shape({
-        /** The report name */
-        reportName: PropTypes.string,
-
-        /** The report type */
-        type: PropTypes.string,
-
-        /** ID of the policy */
-        policyID: PropTypes.string,
-    }),
-
     /** List of betas available to current user */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -34,7 +22,6 @@ const propTypes = {
 };
 const defaultProps = {
     betas: [],
-    reports: {},
 };
 
 const NewTaskPage = (props) => {
@@ -103,9 +90,6 @@ export default compose(
         betas: {
             key: ONYXKEYS.BETAS,
         },
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
     }),
     withLocalize,
 )(NewTaskPage);

From 5b5845df957b10e35511c049cb757b39769bc740 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Sun, 16 Apr 2023 00:14:44 +0700
Subject: [PATCH 44/92] rename getCurrencyUnits to singular

---
 src/components/MoneyRequestConfirmationList.js |  8 ++++----
 src/libs/IOUUtils.js                           | 10 +++++-----
 tests/unit/IOUUtilsTest.js                     |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 640935771c53..420f47733f11 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -139,11 +139,11 @@ class MoneyRequestConfirmationList extends Component {
      */
     getParticipantsWithAmount(participants) {
         const iouAmount = IOUUtils.calculateAmount(participants, this.props.iouAmount, this.props.iou.selectedCurrencyCode);
-        const currencyUnits = IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode);
+        const currencyUnit = IOUUtils.getCurrencyUnit(this.props.iou.selectedCurrencyCode);
 
         return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(
             participants,
-            this.props.numberFormat(iouAmount / currencyUnits, {
+            this.props.numberFormat(iouAmount / currencyUnit, {
                 style: 'currency',
                 currency: this.props.iou.selectedCurrencyCode,
             }),
@@ -176,10 +176,10 @@ class MoneyRequestConfirmationList extends Component {
             const formattedParticipants = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
             const myIOUAmount = IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, this.props.iou.selectedCurrencyCode, true);
-            const currencyUnits = IOUUtils.getCurrencyUnits(this.props.iou.selectedCurrencyCode);
+            const currencyUnit = IOUUtils.getCurrencyUnit(this.props.iou.selectedCurrencyCode);
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
                 this.props.currentUserPersonalDetails,
-                this.props.numberFormat(myIOUAmount / currencyUnits, {
+                this.props.numberFormat(myIOUAmount / currencyUnit, {
                     style: 'currency',
                     currency: this.props.iou.selectedCurrencyCode,
                 }),
diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index a9948684a6a3..0d3be7607bc1 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -36,7 +36,7 @@ function getCurrencyDecimals(currency) {
  * @param {String} currency - IOU currency
  * @returns {Number}
  */
-function getCurrencyUnits(currency) {
+function getCurrencyUnit(currency) {
     return 10 ** getCurrencyDecimals(currency);
 }
 
@@ -56,8 +56,8 @@ function calculateAmount(participants, total, currency, isDefaultUser = false, s
     // numbers cannot be represented with perfect accuracy.
     // Currencies that do not have minor units (i.e. no decimal place) are also supported.
     // https://github.com/Expensify/App/issues/15878
-    const currencyUnits = getCurrencyUnits(currency);
-    const iouAmount = Math.round(parseFloat(total * currencyUnits));
+    const currencyUnit = getCurrencyUnit(currency);
+    const iouAmount = Math.round(parseFloat(total * currencyUnit));
 
     const totalParticipants = participants.length + 1;
     const amountPerPerson = Math.round(iouAmount / totalParticipants);
@@ -71,7 +71,7 @@ function calculateAmount(participants, total, currency, isDefaultUser = false, s
     }
 
     if (shouldConvertTo2DigitsFormat) {
-        finalAmount = (finalAmount * 100) / currencyUnits;
+        finalAmount = (finalAmount * 100) / currencyUnit;
     }
 
     return finalAmount;
@@ -188,6 +188,6 @@ export {
     updateIOUOwnerAndTotal,
     getIOUReportActions,
     isIOUReportPendingCurrencyConversion,
-    getCurrencyUnits,
+    getCurrencyUnit,
     getCurrencyDecimals,
 };
diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 5dd3774c9596..180948c21cc6 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -165,12 +165,12 @@ describe('getCurrencyDecimals', () => {
 describe('getCurrencyUnits', () => {
     beforeAll(() => initCurrencyList());
     test('Currency with decimals smaller than or equal 2', () => {
-        expect(IOUUtils.getCurrencyUnits('JPY')).toBe(1);
-        expect(IOUUtils.getCurrencyUnits('USD')).toBe(100);
+        expect(IOUUtils.getCurrencyUnit('JPY')).toBe(1);
+        expect(IOUUtils.getCurrencyUnit('USD')).toBe(100);
     });
 
     test('Currency with decimals larger than 2 should be floor to 2', () => {
-        expect(IOUUtils.getCurrencyUnits('LYD')).toBe(100);
+        expect(IOUUtils.getCurrencyUnit('LYD')).toBe(100);
     });
 });
 

From d2b28c0741af109878056c15d26dd44e003fedd5 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Sun, 16 Apr 2023 00:15:54 +0700
Subject: [PATCH 45/92] default currency param to USD

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

diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index 0d3be7607bc1..f3ffc21ea107 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -24,7 +24,7 @@ Onyx.connect({
  * @param {String} currency - IOU currency
  * @returns {Number}
  */
-function getCurrencyDecimals(currency) {
+function getCurrencyDecimals(currency = CONST.CURRENCY.USD) {
     const decimals = lodashGet(currencyList, [currency, 'decimals']);
     return _.isUndefined(decimals) ? 2 : Math.min(decimals, 2);
 }
@@ -36,7 +36,7 @@ function getCurrencyDecimals(currency) {
  * @param {String} currency - IOU currency
  * @returns {Number}
  */
-function getCurrencyUnit(currency) {
+function getCurrencyUnit(currency = CONST.CURRENCY.USD) {
     return 10 ** getCurrencyDecimals(currency);
 }
 

From 0f8cf46c02ad3766800efd22bfe14a932be0fa9a Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Sun, 16 Apr 2023 00:24:37 +0700
Subject: [PATCH 46/92] keep original indents currencyList.json

---
 tests/unit/currencyList.json | 1093 +++++++++++++++++-----------------
 1 file changed, 546 insertions(+), 547 deletions(-)

diff --git a/tests/unit/currencyList.json b/tests/unit/currencyList.json
index 1283a854f7a9..3995569912b7 100644
--- a/tests/unit/currencyList.json
+++ b/tests/unit/currencyList.json
@@ -1,876 +1,875 @@
 {
     "AED": {
-        "symbol": "Dhs",
-        "name": "UAE Dirham",
-        "ISO4217": "784"
+      "symbol": "Dhs",
+      "name": "UAE Dirham",
+      "ISO4217": "784"
     },
     "AFN": {
-        "symbol": "Af",
-        "name": "Afghan Afghani",
-        "decimals": 0,
-        "ISO4217": "971"
+      "symbol": "Af",
+      "name": "Afghan Afghani",
+      "decimals": 0,
+      "ISO4217": "971"
     },
     "ALL": {
-        "symbol": "ALL",
-        "name": "Albanian Lek",
-        "decimals": 0,
-        "ISO4217": "008"
+      "symbol": "ALL",
+      "name": "Albanian Lek",
+      "decimals": 0,
+      "ISO4217": "008"
     },
     "AMD": {
-        "symbol": "դր",
-        "name": "Armenian Dram",
-        "ISO4217": "051"
+      "symbol": "դր",
+      "name": "Armenian Dram",
+      "ISO4217": "051"
     },
     "ANG": {
-        "symbol": "NAƒ",
-        "name": "Neth Antilles Guilder",
-        "ISO4217": "532"
+      "symbol": "NAƒ",
+      "name": "Neth Antilles Guilder",
+      "ISO4217": "532"
     },
     "AOA": {
-        "symbol": "Kz",
-        "name": "Angolan Kwanza",
-        "ISO4217": "973"
+      "symbol": "Kz",
+      "name": "Angolan Kwanza",
+      "ISO4217": "973"
     },
     "ARS": {
-        "symbol": "AR$",
-        "name": "Argentine Peso",
-        "ISO4217": "032"
+      "symbol": "AR$",
+      "name": "Argentine Peso",
+      "ISO4217": "032"
     },
     "AUD": {
-        "symbol": "A$",
-        "name": "Australian Dollar",
-        "ISO4217": "036"
+      "symbol": "A$",
+      "name": "Australian Dollar",
+      "ISO4217": "036"
     },
     "AWG": {
-        "symbol": "ƒ",
-        "name": "Aruba Florin",
-        "ISO4217": "533"
+      "symbol": "ƒ",
+      "name": "Aruba Florin",
+      "ISO4217": "533"
     },
     "AZN": {
-        "symbol": "man",
-        "name": "Azerbaijani Manat",
-        "ISO4217": "944"
+      "symbol": "man",
+      "name": "Azerbaijani Manat",
+      "ISO4217": "944"
     },
     "BAM": {
-        "symbol": "KM",
-        "name": "Bosnia And Herzegovina Convertible Mark",
-        "ISO4217": "977"
+      "symbol": "KM",
+      "name": "Bosnia And Herzegovina Convertible Mark",
+      "ISO4217": "977"
     },
     "BBD": {
-        "symbol": "Bds$",
-        "name": "Barbados Dollar",
-        "ISO4217": "052"
+      "symbol": "Bds$",
+      "name": "Barbados Dollar",
+      "ISO4217": "052"
     },
     "BDT": {
-        "symbol": "Tk",
-        "name": "Bangladesh Taka",
-        "ISO4217": "050"
+      "symbol": "Tk",
+      "name": "Bangladesh Taka",
+      "ISO4217": "050"
     },
     "BGN": {
-        "symbol": "лв",
-        "name": "Bulgarian Lev",
-        "ISO4217": "975"
+      "symbol": "лв",
+      "name": "Bulgarian Lev",
+      "ISO4217": "975"
     },
     "BHD": {
-        "symbol": "BHD",
-        "name": "Bahraini Dinar",
-        "ISO4217": "048"
+      "symbol": "BHD",
+      "name": "Bahraini Dinar",
+      "ISO4217": "048"
     },
     "BIF": {
-        "symbol": "FBu",
-        "name": "Burundi Franc",
-        "decimals": 0,
-        "ISO4217": "108"
+      "symbol": "FBu",
+      "name": "Burundi Franc",
+      "decimals": 0,
+      "ISO4217": "108"
     },
     "BMD": {
-        "symbol": "BD$",
-        "name": "Bermuda Dollar",
-        "ISO4217": "060"
+      "symbol": "BD$",
+      "name": "Bermuda Dollar",
+      "ISO4217": "060"
     },
     "BND": {
-        "symbol": "BN$",
-        "name": "Brunei Dollar",
-        "ISO4217": "096"
+      "symbol": "BN$",
+      "name": "Brunei Dollar",
+      "ISO4217": "096"
     },
     "BOB": {
-        "symbol": "Bs",
-        "name": "Bolivian Boliviano",
-        "ISO4217": "068"
+      "symbol": "Bs",
+      "name": "Bolivian Boliviano",
+      "ISO4217": "068"
     },
     "BRL": {
-        "symbol": "R$",
-        "name": "Brazilian Real",
-        "ISO4217": "986"
+      "symbol": "R$",
+      "name": "Brazilian Real",
+      "ISO4217": "986"
     },
     "BSD": {
-        "symbol": "BS$",
-        "name": "Bahamian Dollar",
-        "ISO4217": "044"
+      "symbol": "BS$",
+      "name": "Bahamian Dollar",
+      "ISO4217": "044"
     },
     "BTN": {
-        "symbol": "Nu.",
-        "name": "Bhutan Ngultrum",
-        "ISO4217": "064"
+      "symbol": "Nu.",
+      "name": "Bhutan Ngultrum",
+      "ISO4217": "064"
     },
     "BWP": {
-        "symbol": "P",
-        "name": "Botswana Pula",
-        "ISO4217": "072"
+      "symbol": "P",
+      "name": "Botswana Pula",
+      "ISO4217": "072"
     },
     "BYN": {
-        "symbol": "BR",
-        "name": "Belarus Ruble",
-        "ISO4217": "933"
+      "symbol": "BR",
+      "name": "Belarus Ruble",
+      "ISO4217": "933"
     },
     "BYR": {
-        "symbol": "BR",
-        "name": "Belarus Ruble",
-        "decimals": 0,
-        "retired": true,
-        "retirementDate": "2016-07-01",
-        "ISO4217": "974"
+      "symbol": "BR",
+      "name": "Belarus Ruble",
+      "decimals": 0,
+      "retired": true,
+      "retirementDate": "2016-07-01",
+      "ISO4217": "974"
     },
     "BZD": {
-        "symbol": "BZ$",
-        "name": "Belize Dollar",
-        "ISO4217": "084"
+      "symbol": "BZ$",
+      "name": "Belize Dollar",
+      "ISO4217": "084"
     },
     "CAD": {
-        "symbol": "C$",
-        "name": "Canadian Dollar",
-        "ISO4217": "124"
+      "symbol": "C$",
+      "name": "Canadian Dollar",
+      "ISO4217": "124"
     },
     "CDF": {
-        "symbol": "CDF",
-        "name": "Congolese Franc",
-        "ISO4217": "976"
+      "symbol": "CDF",
+      "name": "Congolese Franc",
+      "ISO4217": "976"
     },
     "CHF": {
-        "symbol": "CHF",
-        "name": "Swiss Franc",
-        "ISO4217": "756"
+      "symbol": "CHF",
+      "name": "Swiss Franc",
+      "ISO4217": "756"
     },
     "CLP": {
-        "symbol": "Ch$",
-        "name": "Chilean Peso",
-        "decimals": 0,
-        "ISO4217": "152"
+      "symbol": "Ch$",
+      "name": "Chilean Peso",
+      "decimals": 0,
+      "ISO4217": "152"
     },
     "CNY": {
-        "symbol": "¥",
-        "name": "Chinese Yuan",
-        "ISO4217": "156"
+      "symbol": "¥",
+      "name": "Chinese Yuan",
+      "ISO4217": "156"
     },
     "COP": {
-        "symbol": "Col$",
-        "name": "Colombian Peso",
-        "decimals": 0,
-        "ISO4217": "170"
+      "symbol": "Col$",
+      "name": "Colombian Peso",
+      "decimals": 0,
+      "ISO4217": "170"
     },
     "CRC": {
-        "symbol": "CR₡",
-        "name": "Costa Rica Colon",
-        "ISO4217": "188"
+      "symbol": "CR₡",
+      "name": "Costa Rica Colon",
+      "ISO4217": "188"
     },
     "CUC": {
-        "symbol": "CUC",
-        "name": "Cuban Convertible Peso",
-        "ISO4217": "931"
+      "symbol": "CUC",
+      "name": "Cuban Convertible Peso",
+      "ISO4217": "931"
     },
     "CUP": {
-        "symbol": "$MN",
-        "name": "Cuban Peso",
-        "ISO4217": "192"
+      "symbol": "$MN",
+      "name": "Cuban Peso",
+      "ISO4217": "192"
     },
     "CVE": {
-        "symbol": "Esc",
-        "name": "Cape Verde Escudo",
-        "ISO4217": "132"
+      "symbol": "Esc",
+      "name": "Cape Verde Escudo",
+      "ISO4217": "132"
     },
     "CZK": {
-        "symbol": "Kč",
-        "name": "Czech Koruna",
-        "ISO4217": "203"
+      "symbol": "Kč",
+      "name": "Czech Koruna",
+      "ISO4217": "203"
     },
     "DJF": {
-        "symbol": "Fdj",
-        "name": "Dijibouti Franc",
-        "decimals": 0,
-        "ISO4217": "262"
+      "symbol": "Fdj",
+      "name": "Dijibouti Franc",
+      "decimals": 0,
+      "ISO4217": "262"
     },
     "DKK": {
-        "symbol": "Dkr",
-        "name": "Danish Krone",
-        "ISO4217": "208"
+      "symbol": "Dkr",
+      "name": "Danish Krone",
+      "ISO4217": "208"
     },
     "DOP": {
-        "symbol": "RD$",
-        "name": "Dominican Peso",
-        "ISO4217": "214"
+      "symbol": "RD$",
+      "name": "Dominican Peso",
+      "ISO4217": "214"
     },
     "DZD": {
-        "symbol": "DZD",
-        "name": "Algerian Dinar",
-        "ISO4217": "012"
+      "symbol": "DZD",
+      "name": "Algerian Dinar",
+      "ISO4217": "012"
     },
     "EEK": {
-        "symbol": "KR",
-        "name": "Estonian Kroon",
-        "ISO4217": "",
-        "retired": true
+      "symbol": "KR",
+      "name": "Estonian Kroon",
+      "ISO4217": "",
+      "retired": true
     },
     "EGP": {
-        "symbol": "EGP",
-        "name": "Egyptian Pound",
-        "ISO4217": "818"
+      "symbol": "EGP",
+      "name": "Egyptian Pound",
+      "ISO4217": "818"
     },
     "ERN": {
-        "symbol": "Nfk",
-        "name": "Eritrea Nakfa",
-        "ISO4217": "232"
+      "symbol": "Nfk",
+      "name": "Eritrea Nakfa",
+      "ISO4217": "232"
     },
     "ETB": {
-        "symbol": "Br",
-        "name": "Ethiopian Birr",
-        "ISO4217": "230"
+      "symbol": "Br",
+      "name": "Ethiopian Birr",
+      "ISO4217": "230"
     },
     "EUR": {
-        "symbol": "€",
-        "name": "Euro",
-        "ISO4217": "978"
+      "symbol": "€",
+      "name": "Euro",
+      "ISO4217": "978"
     },
     "FJD": {
-        "symbol": "FJ$",
-        "name": "Fiji Dollar",
-        "ISO4217": "242"
+      "symbol": "FJ$",
+      "name": "Fiji Dollar",
+      "ISO4217": "242"
     },
     "FKP": {
-        "symbol": "FK£",
-        "name": "Falkland Islands Pound",
-        "ISO4217": "238"
+      "symbol": "FK£",
+      "name": "Falkland Islands Pound",
+      "ISO4217": "238"
     },
     "GBP": {
-        "symbol": "£",
-        "name": "British Pound",
-        "ISO4217": "826"
+      "symbol": "£",
+      "name": "British Pound",
+      "ISO4217": "826"
     },
     "GEL": {
-        "symbol": "ლ",
-        "name": "Georgian Lari",
-        "ISO4217": "981"
+      "symbol": "ლ",
+      "name": "Georgian Lari",
+      "ISO4217": "981"
     },
     "GHS": {
-        "symbol": "₵",
-        "name": "Ghanaian Cedi",
-        "ISO4217": "936"
+      "symbol": "₵",
+      "name": "Ghanaian Cedi",
+      "ISO4217": "936"
     },
     "GIP": {
-        "symbol": "£G",
-        "name": "Gibraltar Pound",
-        "ISO4217": "292"
+      "symbol": "£G",
+      "name": "Gibraltar Pound",
+      "ISO4217": "292"
     },
     "GMD": {
-        "symbol": "D",
-        "name": "Gambian Dalasi",
-        "ISO4217": "270"
+      "symbol": "D",
+      "name": "Gambian Dalasi",
+      "ISO4217": "270"
     },
     "GNF": {
-        "symbol": "FG",
-        "name": "Guinea Franc",
-        "decimals": 0,
-        "ISO4217": "324"
+      "symbol": "FG",
+      "name": "Guinea Franc",
+      "decimals": 0,
+      "ISO4217": "324"
     },
     "GTQ": {
-        "symbol": "Q",
-        "name": "Guatemala Quetzal",
-        "ISO4217": "320"
+      "symbol": "Q",
+      "name": "Guatemala Quetzal",
+      "ISO4217": "320"
     },
     "GYD": {
-        "symbol": "GY$",
-        "name": "Guyana Dollar",
-        "ISO4217": "328"
+      "symbol": "GY$",
+      "name": "Guyana Dollar",
+      "ISO4217": "328"
     },
     "HKD": {
-        "symbol": "HK$",
-        "name": "Hong Kong Dollar",
-        "ISO4217": "344"
+      "symbol": "HK$",
+      "name": "Hong Kong Dollar",
+      "ISO4217": "344"
     },
     "HNL": {
-        "symbol": "HNL",
-        "name": "Honduras Lempira",
-        "ISO4217": "340"
+      "symbol": "HNL",
+      "name": "Honduras Lempira",
+      "ISO4217": "340"
     },
     "HRK": {
-        "symbol": "kn",
-        "name": "Croatian Kuna",
-        "ISO4217": "191"
+      "symbol": "kn",
+      "name": "Croatian Kuna",
+      "ISO4217": "191"
     },
     "HTG": {
-        "symbol": "G",
-        "name": "Haiti Gourde",
-        "ISO4217": "332"
+      "symbol": "G",
+      "name": "Haiti Gourde",
+      "ISO4217": "332"
     },
     "HUF": {
-        "symbol": "Ft",
-        "name": "Hungarian Forint",
-        "ISO4217": "348"
+      "symbol": "Ft",
+      "name": "Hungarian Forint",
+      "ISO4217": "348"
     },
     "IDR": {
-        "symbol": "Rp",
-        "name": "Indonesian Rupiah",
-        "ISO4217": "360"
+      "symbol": "Rp",
+      "name": "Indonesian Rupiah",
+      "ISO4217": "360"
     },
     "ILS": {
-        "symbol": "₪",
-        "name": "Israeli Shekel",
-        "ISO4217": "376"
+      "symbol": "₪",
+      "name": "Israeli Shekel",
+      "ISO4217": "376"
     },
     "INR": {
-        "symbol": "₹",
-        "name": "Indian Rupee",
-        "ISO4217": "356"
+      "symbol": "₹",
+      "name": "Indian Rupee",
+      "ISO4217": "356"
     },
     "IQD": {
-        "symbol": "IQD",
-        "name": "Iraqi Dinar",
-        "decimals": 0,
-        "ISO4217": "368"
+      "symbol": "IQD",
+      "name": "Iraqi Dinar",
+      "decimals": 0,
+      "ISO4217": "368"
     },
     "IRR": {
-        "symbol": "﷼",
-        "name": "Iran Rial",
-        "decimals": 0,
-        "ISO4217": "364"
+      "symbol": "﷼",
+      "name": "Iran Rial",
+      "decimals": 0,
+      "ISO4217": "364"
     },
     "ISK": {
-        "symbol": "kr",
-        "name": "Iceland Krona",
-        "decimals": 0,
-        "ISO4217": "352"
+      "symbol": "kr",
+      "name": "Iceland Krona",
+      "decimals": 0,
+      "ISO4217": "352"
     },
     "JMD": {
-        "symbol": "J$",
-        "name": "Jamaican Dollar",
-        "ISO4217": "388"
+      "symbol": "J$",
+      "name": "Jamaican Dollar",
+      "ISO4217": "388"
     },
     "JOD": {
-        "symbol": "JOD",
-        "name": "Jordanian Dinar",
-        "ISO4217": "400"
+      "symbol": "JOD",
+      "name": "Jordanian Dinar",
+      "ISO4217": "400"
     },
     "JPY": {
-        "symbol": "¥",
-        "name": "Japanese Yen",
-        "decimals": 0,
-        "ISO4217": "392"
+      "symbol": "¥",
+      "name": "Japanese Yen",
+      "decimals": 0,
+      "ISO4217": "392"
     },
     "KES": {
-        "symbol": "KSh",
-        "name": "Kenyan Shilling",
-        "ISO4217": "404"
+      "symbol": "KSh",
+      "name": "Kenyan Shilling",
+      "ISO4217": "404"
     },
     "KGS": {
-        "symbol": "KGS",
-        "name": "Kyrgyzstani Som",
-        "ISO4217": "417"
+      "symbol": "KGS",
+      "name": "Kyrgyzstani Som",
+      "ISO4217": "417"
     },
     "KHR": {
-        "symbol": "KHR",
-        "name": "Cambodia Riel",
-        "ISO4217": "116"
+      "symbol": "KHR",
+      "name": "Cambodia Riel",
+      "ISO4217": "116"
     },
     "KMF": {
-        "symbol": "CF",
-        "name": "Comoros Franc",
-        "decimals": 0,
-        "ISO4217": "174"
+      "symbol": "CF",
+      "name": "Comoros Franc",
+      "decimals": 0,
+      "ISO4217": "174"
     },
     "KPW": {
-        "symbol": "KP₩",
-        "name": "North Korean Won",
-        "decimals": 0,
-        "ISO4217": "408"
+      "symbol": "KP₩",
+      "name": "North Korean Won",
+      "decimals": 0,
+      "ISO4217": "408"
     },
     "KRW": {
-        "symbol": "₩",
-        "name": "Korean Won",
-        "decimals": 0,
-        "ISO4217": "410"
+      "symbol": "₩",
+      "name": "Korean Won",
+      "decimals": 0,
+      "ISO4217": "410"
     },
     "KWD": {
-        "symbol": "KWD",
-        "name": "Kuwaiti Dinar",
-        "ISO4217": "414"
+      "symbol": "KWD",
+      "name": "Kuwaiti Dinar",
+      "ISO4217": "414"
     },
     "KYD": {
-        "symbol": "CI$",
-        "name": "Cayman Islands Dollar",
-        "ISO4217": "136"
+      "symbol": "CI$",
+      "name": "Cayman Islands Dollar",
+      "ISO4217": "136"
     },
     "KZT": {
-        "symbol": "〒",
-        "name": "Kazakhstan Tenge",
-        "ISO4217": "398"
+      "symbol": "〒",
+      "name": "Kazakhstan Tenge",
+      "ISO4217": "398"
     },
     "LAK": {
-        "symbol": "₭",
-        "name": "Lao Kip",
-        "decimals": 0,
-        "ISO4217": "418"
+      "symbol": "₭",
+      "name": "Lao Kip",
+      "decimals": 0,
+      "ISO4217": "418"
     },
     "LBP": {
-        "symbol": "LBP",
-        "name": "Lebanese Pound",
-        "decimals": 0,
-        "ISO4217": "422"
+      "symbol": "LBP",
+      "name": "Lebanese Pound",
+      "decimals": 0,
+      "ISO4217": "422"
     },
     "LKR": {
-        "symbol": "SL₨",
-        "name": "Sri Lanka Rupee",
-        "ISO4217": "144"
+      "symbol": "SL₨",
+      "name": "Sri Lanka Rupee",
+      "ISO4217": "144"
     },
     "LRD": {
-        "symbol": "L$",
-        "name": "Liberian Dollar",
-        "ISO4217": "430"
+      "symbol": "L$",
+      "name": "Liberian Dollar",
+      "ISO4217": "430"
     },
     "LSL": {
-        "symbol": "M",
-        "name": "Lesotho Loti",
-        "ISO4217": "426"
+      "symbol": "M",
+      "name": "Lesotho Loti",
+      "ISO4217": "426"
     },
     "LTL": {
-        "symbol": "Lt",
-        "name": "Lithuanian Lita",
-        "retirementDate": "2015-08-22",
-        "retired": true,
-        "ISO4217": "440"
+      "symbol": "Lt",
+      "name": "Lithuanian Lita",
+      "retirementDate": "2015-08-22",
+      "retired": true,
+      "ISO4217": "440"
     },
     "LVL": {
-        "symbol": "Ls",
-        "name": "Latvian Lat",
-        "ISO4217": "428",
-        "retired": true
+      "symbol": "Ls",
+      "name": "Latvian Lat",
+      "ISO4217": "428",
+      "retired": true
     },
     "LYD": {
-        "symbol": "LYD",
-        "name": "Libyan Dinar",
-        "ISO4217": "434"
+      "symbol": "LYD",
+      "name": "Libyan Dinar",
+      "ISO4217": "434"
     },
     "MAD": {
-        "symbol": "MAD",
-        "name": "Moroccan Dirham",
-        "ISO4217": "504"
+      "symbol": "MAD",
+      "name": "Moroccan Dirham",
+      "ISO4217": "504"
     },
     "MDL": {
-        "symbol": "MDL",
-        "name": "Moldovan Leu",
-        "ISO4217": "498"
+      "symbol": "MDL",
+      "name": "Moldovan Leu",
+      "ISO4217": "498"
     },
     "MGA": {
-        "symbol": "MGA",
-        "name": "Malagasy Ariary",
-        "decimals": 0,
-        "ISO4217": "969"
+      "symbol": "MGA",
+      "name": "Malagasy Ariary",
+      "decimals": 0,
+      "ISO4217": "969"
     },
     "MKD": {
-        "symbol": "ден",
-        "name": "Macedonian Denar",
-        "ISO4217": "807"
+      "symbol": "ден",
+      "name": "Macedonian Denar",
+      "ISO4217": "807"
     },
     "MMK": {
-        "symbol": "Ks",
-        "name": "Myanmar Kyat",
-        "decimals": 0,
-        "ISO4217": "104"
+      "symbol": "Ks",
+      "name": "Myanmar Kyat",
+      "decimals": 0,
+      "ISO4217": "104"
     },
     "MNT": {
-        "symbol": "₮",
-        "name": "Mongolian Tugrik",
-        "ISO4217": "496"
+      "symbol": "₮",
+      "name": "Mongolian Tugrik",
+      "ISO4217": "496"
     },
     "MOP": {
-        "symbol": "MOP$",
-        "name": "Macau Pataca",
-        "ISO4217": "446"
+      "symbol": "MOP$",
+      "name": "Macau Pataca",
+      "ISO4217": "446"
     },
     "MRO": {
-        "symbol": "UM",
-        "name": "Mauritania Ougulya",
-        "decimals": 0,
-        "retired": true,
-        "retirementDate": "2018-07-11",
-        "ISO4217": "478"
+      "symbol": "UM",
+      "name": "Mauritania Ougulya",
+      "decimals": 0,
+      "retired": true,
+      "retirementDate": "2018-07-11",
+      "ISO4217": "478"
     },
     "MRU": {
-        "symbol": "UM",
-        "name": "Mauritania Ougulya",
-        "decimals": 0,
-        "ISO4217": ""
+      "symbol": "UM",
+      "name": "Mauritania Ougulya",
+      "decimals": 0,
+      "ISO4217": ""
     },
     "MUR": {
-        "symbol": "Rs",
-        "name": "Mauritius Rupee",
-        "ISO4217": "480"
+      "symbol": "Rs",
+      "name": "Mauritius Rupee",
+      "ISO4217": "480"
     },
     "MVR": {
-        "symbol": "Rf",
-        "name": "Maldives Rufiyaa",
-        "ISO4217": "462"
+      "symbol": "Rf",
+      "name": "Maldives Rufiyaa",
+      "ISO4217": "462"
     },
     "MWK": {
-        "symbol": "MK",
-        "name": "Malawi Kwacha",
-        "ISO4217": "454"
+      "symbol": "MK",
+      "name": "Malawi Kwacha",
+      "ISO4217": "454"
     },
     "MXN": {
-        "symbol": "Mex$",
-        "name": "Mexican Peso",
-        "ISO4217": "484"
+      "symbol": "Mex$",
+      "name": "Mexican Peso",
+      "ISO4217": "484"
     },
     "MYR": {
-        "symbol": "RM",
-        "name": "Malaysian Ringgit",
-        "ISO4217": "458"
+      "symbol": "RM",
+      "name": "Malaysian Ringgit",
+      "ISO4217": "458"
     },
     "MZN": {
-        "symbol": "MTn",
-        "name": "Mozambican Metical",
-        "ISO4217": "943"
+      "symbol": "MTn",
+      "name": "Mozambican Metical",
+      "ISO4217": "943"
     },
     "NAD": {
-        "symbol": "N$",
-        "name": "Namibian Dollar",
-        "ISO4217": "516"
+      "symbol": "N$",
+      "name": "Namibian Dollar",
+      "ISO4217": "516"
     },
     "NGN": {
-        "symbol": "₦",
-        "name": "Nigerian Naira",
-        "ISO4217": "566"
+      "symbol": "₦",
+      "name": "Nigerian Naira",
+      "ISO4217": "566"
     },
     "NIO": {
-        "symbol": "NIO",
-        "name": "Nicaragua Cordoba",
-        "ISO4217": "558"
+      "symbol": "NIO",
+      "name": "Nicaragua Cordoba",
+      "ISO4217": "558"
     },
     "NOK": {
-        "symbol": "Nkr",
-        "name": "Norwegian Krone",
-        "ISO4217": "578"
+      "symbol": "Nkr",
+      "name": "Norwegian Krone",
+      "ISO4217": "578"
     },
     "NPR": {
-        "symbol": "₨",
-        "name": "Nepalese Rupee",
-        "ISO4217": "524"
+      "symbol": "₨",
+      "name": "Nepalese Rupee",
+      "ISO4217": "524"
     },
     "NZD": {
-        "symbol": "NZ$",
-        "name": "New Zealand Dollar",
-        "ISO4217": "554"
+      "symbol": "NZ$",
+      "name": "New Zealand Dollar",
+      "ISO4217": "554"
     },
     "OMR": {
-        "symbol": "OMR",
-        "name": "Omani Rial",
-        "ISO4217": "512"
+      "symbol": "OMR",
+      "name": "Omani Rial",
+      "ISO4217": "512"
     },
     "PAB": {
-        "symbol": "B",
-        "name": "Panama Balboa",
-        "ISO4217": "590"
+      "symbol": "B",
+      "name": "Panama Balboa",
+      "ISO4217": "590"
     },
     "PEN": {
-        "symbol": "S/.",
-        "name": "Peruvian Nuevo Sol",
-        "ISO4217": "604"
+      "symbol": "S/.",
+      "name": "Peruvian Nuevo Sol",
+      "ISO4217": "604"
     },
     "PGK": {
-        "symbol": "K",
-        "name": "Papua New Guinea Kina",
-        "ISO4217": "598"
+      "symbol": "K",
+      "name": "Papua New Guinea Kina",
+      "ISO4217": "598"
     },
     "PHP": {
-        "symbol": "₱",
-        "name": "Philippine Peso",
-        "ISO4217": "608"
+      "symbol": "₱",
+      "name": "Philippine Peso",
+      "ISO4217": "608"
     },
     "PKR": {
-        "symbol": "Rs",
-        "name": "Pakistani Rupee",
-        "ISO4217": "586"
+      "symbol": "Rs",
+      "name": "Pakistani Rupee",
+      "ISO4217": "586"
     },
     "PLN": {
-        "symbol": "zł",
-        "name": "Polish Zloty",
-        "ISO4217": "985"
+      "symbol": "zł",
+      "name": "Polish Zloty",
+      "ISO4217": "985"
     },
     "PYG": {
-        "symbol": "₲",
-        "name": "Paraguayan Guarani",
-        "decimals": 0,
-        "ISO4217": "600"
+      "symbol": "₲",
+      "name": "Paraguayan Guarani",
+      "decimals": 0,
+      "ISO4217": "600"
     },
     "QAR": {
-        "symbol": "QAR",
-        "name": "Qatar Rial",
-        "ISO4217": "634"
+      "symbol": "QAR",
+      "name": "Qatar Rial",
+      "ISO4217": "634"
     },
     "RON": {
-        "symbol": "RON",
-        "name": "Romanian New Leu",
-        "ISO4217": "946"
+      "symbol": "RON",
+      "name": "Romanian New Leu",
+      "ISO4217": "946"
     },
     "RSD": {
-        "symbol": "РСД",
-        "name": "Serbian Dinar",
-        "decimals": 0,
-        "ISO4217": "941"
+      "symbol": "РСД",
+      "name": "Serbian Dinar",
+      "decimals": 0,
+      "ISO4217": "941"
     },
     "RUB": {
-        "symbol": "₽",
-        "name": "Russian Rouble",
-        "ISO4217": "643"
+      "symbol": "₽",
+      "name": "Russian Rouble",
+      "ISO4217": "643"
     },
     "RWF": {
-        "symbol": "RF",
-        "name": "Rwanda Franc",
-        "decimals": 0,
-        "ISO4217": "646"
+      "symbol": "RF",
+      "name": "Rwanda Franc",
+      "decimals": 0,
+      "ISO4217": "646"
     },
     "SAR": {
-        "symbol": "SAR",
-        "name": "Saudi Arabian Riyal",
-        "ISO4217": "682"
+      "symbol": "SAR",
+      "name": "Saudi Arabian Riyal",
+      "ISO4217": "682"
     },
     "SBD": {
-        "symbol": "SI$",
-        "name": "Solomon Islands Dollar",
-        "ISO4217": "090"
+      "symbol": "SI$",
+      "name": "Solomon Islands Dollar",
+      "ISO4217": "090"
     },
     "SCR": {
-        "symbol": "SR",
-        "name": "Seychelles Rupee",
-        "ISO4217": "690"
+      "symbol": "SR",
+      "name": "Seychelles Rupee",
+      "ISO4217": "690"
     },
     "SDG": {
-        "symbol": "SDG",
-        "name": "Sudanese Pound",
-        "ISO4217": "938"
+      "symbol": "SDG",
+      "name": "Sudanese Pound",
+      "ISO4217": "938"
     },
     "SEK": {
-        "symbol": "Skr",
-        "name": "Swedish Krona",
-        "ISO4217": "752"
+      "symbol": "Skr",
+      "name": "Swedish Krona",
+      "ISO4217": "752"
     },
     "SGD": {
-        "symbol": "S$",
-        "name": "Singapore Dollar",
-        "ISO4217": "702"
+      "symbol": "S$",
+      "name": "Singapore Dollar",
+      "ISO4217": "702"
     },
     "SHP": {
-        "symbol": "£S",
-        "name": "St Helena Pound",
-        "ISO4217": "654"
+      "symbol": "£S",
+      "name": "St Helena Pound",
+      "ISO4217": "654"
     },
     "SLL": {
-        "symbol": "Le",
-        "name": "Sierra Leone Leone",
-        "decimals": 0,
-        "ISO4217": "694"
+      "symbol": "Le",
+      "name": "Sierra Leone Leone",
+      "decimals": 0,
+      "ISO4217": "694"
     },
     "SOS": {
-        "symbol": "So.",
-        "name": "Somali Shilling",
-        "decimals": 0,
-        "ISO4217": "706"
+      "symbol": "So.",
+      "name": "Somali Shilling",
+      "decimals": 0,
+      "ISO4217": "706"
     },
     "SRD": {
-        "symbol": "SRD",
-        "name": "Surinamese Dollar",
-        "ISO4217": "968"
+      "symbol": "SRD",
+      "name": "Surinamese Dollar",
+      "ISO4217": "968"
     },
     "STD": {
-        "symbol": "Db",
-        "name": "Sao Tome Dobra",
-        "decimals": 0,
-        "retired": true,
-        "retirementDate": "2018-07-11",
-        "ISO4217": "678"
+      "symbol": "Db",
+      "name": "Sao Tome Dobra",
+      "decimals": 0,
+      "retired": true,
+      "retirementDate": "2018-07-11",
+      "ISO4217": "678"
     },
     "STN": {
-        "symbol": "Db",
-        "name": "Sao Tome Dobra",
-        "ISO4217": ""
+      "symbol": "Db",
+      "name": "Sao Tome Dobra",
+      "ISO4217": ""
     },
     "SVC": {
-        "symbol": "SVC",
-        "name": "El Salvador Colon",
-        "ISO4217": "222"
+      "symbol": "SVC",
+      "name": "El Salvador Colon",
+      "ISO4217": "222"
     },
     "SYP": {
-        "symbol": "SYP",
-        "name": "Syrian Pound",
-        "decimals": 0,
-        "ISO4217": "760"
+      "symbol": "SYP",
+      "name": "Syrian Pound",
+      "decimals": 0,
+      "ISO4217": "760"
     },
     "SZL": {
-        "symbol": "E",
-        "name": "Swaziland Lilageni",
-        "ISO4217": "748"
+      "symbol": "E",
+      "name": "Swaziland Lilageni",
+      "ISO4217": "748"
     },
     "THB": {
-        "symbol": "฿",
-        "name": "Thai Baht",
-        "ISO4217": "764"
+      "symbol": "฿",
+      "name": "Thai Baht",
+      "ISO4217": "764"
     },
     "TJS": {
-        "symbol": "TJS",
-        "name": "Tajikistani Somoni",
-        "ISO4217": "972"
+      "symbol": "TJS",
+      "name": "Tajikistani Somoni",
+      "ISO4217": "972"
     },
     "TMT": {
-        "symbol": "m",
-        "name": "Turkmenistani Manat",
-        "ISO4217": "934"
+      "symbol": "m",
+      "name": "Turkmenistani Manat",
+      "ISO4217": "934"
     },
     "TND": {
-        "symbol": "TND",
-        "name": "Tunisian Dinar",
-        "ISO4217": "788"
+      "symbol": "TND",
+      "name": "Tunisian Dinar",
+      "ISO4217": "788"
     },
     "TOP": {
-        "symbol": "T$",
-        "name": "Tonga Pa'ang",
-        "ISO4217": "776"
+      "symbol": "T$",
+      "name": "Tonga Pa'ang",
+      "ISO4217": "776"
     },
     "TRY": {
-        "symbol": "TL",
-        "name": "Turkish Lira",
-        "ISO4217": "949"
+      "symbol": "TL",
+      "name": "Turkish Lira",
+      "ISO4217": "949"
     },
     "TTD": {
-        "symbol": "TT$",
-        "name": "Trinidad & Tobago Dollar",
-        "ISO4217": "780"
+      "symbol": "TT$",
+      "name": "Trinidad & Tobago Dollar",
+      "ISO4217": "780"
     },
     "TWD": {
-        "symbol": "NT$",
-        "name": "Taiwan Dollar",
-        "ISO4217": "901"
+      "symbol": "NT$",
+      "name": "Taiwan Dollar",
+      "ISO4217": "901"
     },
     "TZS": {
-        "symbol": "TZS",
-        "name": "Tanzanian Shilling",
-        "ISO4217": "834"
+      "symbol": "TZS",
+      "name": "Tanzanian Shilling",
+      "ISO4217": "834"
     },
     "UAH": {
-        "symbol": "₴",
-        "name": "Ukraine Hryvnia",
-        "ISO4217": "980"
+      "symbol": "₴",
+      "name": "Ukraine Hryvnia",
+      "ISO4217": "980"
     },
     "UGX": {
-        "symbol": "USh",
-        "name": "Ugandan Shilling",
-        "decimals": 0,
-        "ISO4217": "800"
+      "symbol": "USh",
+      "name": "Ugandan Shilling",
+      "decimals": 0,
+      "ISO4217": "800"
     },
     "USD": {
-        "symbol": "$",
-        "name": "United States Dollar",
-        "ISO4217": "840"
+      "symbol": "$",
+      "name": "United States Dollar",
+      "ISO4217": "840"
     },
     "UYU": {
-        "symbol": "$U",
-        "name": "Uruguayan New Peso",
-        "ISO4217": "858"
+      "symbol": "$U",
+      "name": "Uruguayan New Peso",
+      "ISO4217": "858"
     },
     "UZS": {
-        "symbol": "UZS",
-        "name": "Uzbekistani Som",
-        "ISO4217": "860"
+      "symbol": "UZS",
+      "name": "Uzbekistani Som",
+      "ISO4217": "860"
     },
     "VEB": {
-        "symbol": "Bs.",
-        "name": "Venezuelan Bolivar",
-        "retired": true,
-        "retirementDate": "2008-02-01",
-        "ISO4217": ""
+      "symbol": "Bs.",
+      "name": "Venezuelan Bolivar",
+      "retired": true,
+      "retirementDate": "2008-02-01",
+      "ISO4217": ""
     },
     "VEF": {
-        "symbol": "Bs.F",
-        "name": "Venezuelan Bolivar Fuerte",
-        "retired": true,
-        "retirementDate": "2018-08-20",
-        "ISO4217": "937"
+      "symbol": "Bs.F",
+      "name": "Venezuelan Bolivar Fuerte",
+      "retired": true,
+      "retirementDate": "2018-08-20",
+      "ISO4217": "937"
     },
     "VES": {
-        "symbol": "Bs.S",
-        "name": "Venezuelan Bolivar Soberano",
-        "ISO4217": "928"
+      "symbol": "Bs.S",
+      "name": "Venezuelan Bolivar Soberano",
+      "ISO4217": "928"
     },
     "VND": {
-        "symbol": "₫",
-        "name": "Vietnam Dong",
-        "decimals": 0,
-        "ISO4217": "704"
+      "symbol": "₫",
+      "name": "Vietnam Dong",
+      "decimals": 0,
+      "ISO4217": "704"
     },
     "VUV": {
-        "symbol": "Vt",
-        "name": "Vanuatu Vatu",
-        "decimals": 0,
-        "ISO4217": "548"
+      "symbol": "Vt",
+      "name": "Vanuatu Vatu",
+      "decimals": 0,
+      "ISO4217": "548"
     },
     "WST": {
-        "symbol": "WS$",
-        "name": "Samoa Tala",
-        "ISO4217": "882"
+      "symbol": "WS$",
+      "name": "Samoa Tala",
+      "ISO4217": "882"
     },
     "XAF": {
-        "symbol": "FCFA",
-        "name": "CFA Franc (BEAC)",
-        "decimals": 0,
-        "ISO4217": "950"
+      "symbol": "FCFA",
+      "name": "CFA Franc (BEAC)",
+      "decimals": 0,
+      "ISO4217": "950"
     },
     "XCD": {
-        "symbol": "EC$",
-        "name": "East Caribbean Dollar",
-        "ISO4217": "951"
+      "symbol": "EC$",
+      "name": "East Caribbean Dollar",
+      "ISO4217": "951"
     },
     "XOF": {
-        "symbol": "CFA",
-        "name": "CFA Franc (BCEAO)",
-        "decimals": 0,
-        "ISO4217": "952"
+      "symbol": "CFA",
+      "name": "CFA Franc (BCEAO)",
+      "decimals": 0,
+      "ISO4217": "952"
     },
     "XPF": {
-        "symbol": "XPF",
-        "name": "Pacific Franc",
-        "decimals": 0,
-        "ISO4217": "953"
+      "symbol": "XPF",
+      "name": "Pacific Franc",
+      "decimals": 0,
+      "ISO4217": "953"
     },
     "YER": {
-        "symbol": "YER",
-        "name": "Yemen Riyal",
-        "decimals": 0,
-        "ISO4217": "886"
+      "symbol": "YER",
+      "name": "Yemen Riyal",
+      "decimals": 0,
+      "ISO4217": "886"
     },
     "ZAR": {
-        "symbol": "R",
-        "name": "South African Rand",
-        "ISO4217": "710"
+      "symbol": "R",
+      "name": "South African Rand",
+      "ISO4217": "710"
     },
     "ZMK": {
-        "symbol": "ZK",
-        "name": "Zambian Kwacha",
-        "decimals": 0,
-        "retired": true,
-        "retirementDate": "2013-01-01",
-        "ISO4217": "894"
+      "symbol": "ZK",
+      "name": "Zambian Kwacha",
+      "decimals": 0,
+      "retired": true,
+      "retirementDate": "2013-01-01",
+      "ISO4217": "894"
     },
     "ZMW": {
-        "symbol": "ZMW",
-        "name": "Zambian Kwacha",
-        "cacheBurst": 1,
-        "ISO4217": "967"
+      "symbol": "ZMW",
+      "name": "Zambian Kwacha",
+      "cacheBurst": 1,
+      "ISO4217": "967"
     }
-}
-  
\ No newline at end of file
+  }
\ No newline at end of file

From 1a931f171b728b8c690db3a5abe1288a75722022 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Sun, 16 Apr 2023 00:35:09 +0700
Subject: [PATCH 47/92] add edge case unit test for calculateAmount

---
 tests/unit/IOUUtilsTest.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 180948c21cc6..58ba38839cf1 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -187,4 +187,10 @@ describe('calculateAmount', () => {
         expect(IOUUtils.calculateAmount(participants, 10, 'AFN', true)).toBe(1);
         expect(IOUUtils.calculateAmount(participants, 10, 'AFN')).toBe(3);
     });
+
+    test('0.02 USD split among 4 participants including the default user should be [-1, 1, 1, 1]', () => {
+        const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com', 'suestorm@expensify.com'];
+        expect(IOUUtils.calculateAmount(participants, 0.02, 'USD', true)).toBe(-1);
+        expect(IOUUtils.calculateAmount(participants, 0.02, 'USD')).toBe(1);
+    });
 });

From 4d0d63821052d524e5e99c273b2a54add59c65d4 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Sun, 16 Apr 2023 00:48:13 +0530
Subject: [PATCH 48/92] feat: left align header message on emojiPicker

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/components/EmojiPicker/EmojiPickerMenu/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index cb0f71cd1d7c..5b0ca7a9a537 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -494,7 +494,7 @@ class EmojiPickerMenu extends Component {
                 pointerEvents={this.state.arePointerEventsDisabled ? 'none' : 'auto'}
             >
                 {!this.props.isSmallScreenWidth && (
-                    <View style={[styles.ph4, styles.pb1, styles.pt2]}>
+                    <View style={[styles.ph4, styles.pb2, styles.pt2]}>
                         <TextInput
                             label={this.props.translate('common.search')}
                             onChangeText={this.filterEmojis}
@@ -521,9 +521,9 @@ class EmojiPickerMenu extends Component {
                                 styles.disabledText,
                                 styles.emojiPickerList,
                                 styles.dFlex,
-                                styles.alignItemsCenter,
-                                styles.justifyContentCenter,
                                 styles.flexGrow1,
+                                styles.textLabel,
+                                styles.colorMuted,
                                 this.isMobileLandscape() && styles.emojiPickerListLandscape,
                             ]}
                         >

From f65c1824a365ef657c2b52c1df991fea03f91750 Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Sun, 16 Apr 2023 14:18:48 +0200
Subject: [PATCH 49/92] add padding bottom to base modal

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

diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index 1e314654bba3..a0f1ed6fccfc 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -144,7 +144,7 @@ class BaseModal extends PureComponent {
 
                         const modalPaddingStyles = StyleUtils.getModalPaddingStyles({
                             safeAreaPaddingTop,
-                            safeAreaPaddingBottom,
+                            safeAreaPaddingBottom: insets.bottom === 0 ? 12 : safeAreaPaddingBottom,
                             safeAreaPaddingLeft,
                             safeAreaPaddingRight,
                             shouldAddBottomSafeAreaMargin,

From 1d733173550a6963beaec4406d035af76f8f5aa8 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Mon, 17 Apr 2023 09:40:30 +0700
Subject: [PATCH 50/92] add unit test for calculateAmount with currency having
 two decimals

---
 tests/unit/IOUUtilsTest.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 58ba38839cf1..03ab29412aca 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -162,7 +162,7 @@ describe('getCurrencyDecimals', () => {
     });
 });
 
-describe('getCurrencyUnits', () => {
+describe('getCurrencyUnit', () => {
     beforeAll(() => initCurrencyList());
     test('Currency with decimals smaller than or equal 2', () => {
         expect(IOUUtils.getCurrencyUnit('JPY')).toBe(1);
@@ -188,6 +188,12 @@ describe('calculateAmount', () => {
         expect(IOUUtils.calculateAmount(participants, 10, 'AFN')).toBe(3);
     });
 
+    test('10 BHD split among 3 participants including the default user should be [334, 333, 333]', () => {
+        const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com'];
+        expect(IOUUtils.calculateAmount(participants, 10, 'BHD', true)).toBe(334);
+        expect(IOUUtils.calculateAmount(participants, 10, 'BHD')).toBe(333);
+    });
+
     test('0.02 USD split among 4 participants including the default user should be [-1, 1, 1, 1]', () => {
         const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com', 'suestorm@expensify.com'];
         expect(IOUUtils.calculateAmount(participants, 0.02, 'USD', true)).toBe(-1);

From 05c340b8cef5967559e5deb8839402d778cf7777 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Mon, 17 Apr 2023 09:24:02 +0200
Subject: [PATCH 51/92] feat: upgrade awesome-phonenumber version

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

diff --git a/package-lock.json b/package-lock.json
index 3e61f5cabf79..df60cbbd685a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "@react-navigation/native": "6.0.13",
         "@react-navigation/stack": "6.3.1",
         "@ua/react-native-airship": "^15.2.0",
-        "awesome-phonenumber": "^5.3.0",
+        "awesome-phonenumber": "^5.4.0",
         "babel-plugin-transform-remove-console": "^6.9.4",
         "babel-polyfill": "^6.26.0",
         "dom-serializer": "^0.2.2",
@@ -16728,9 +16728,9 @@
       }
     },
     "node_modules/awesome-phonenumber": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.3.0.tgz",
-      "integrity": "sha512-Inioq+5cDHcbSdy400FnXs1D68fZujU5Nbm3tg+qU+j/iPFW0U5CBI/rlrjI2mGCI31GvErSMk2oiNKOR2sX5w==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.4.0.tgz",
+      "integrity": "sha512-jf6E+GHKRIMobCKygQhZ9kHmdxZ8hvXUlVhLyesP/k8JVpmWAyNa5TzWDS0hKe480tmT419yRtGLmTpD0k8pUQ==",
       "engines": {
         "node": ">=14"
       }
@@ -52431,9 +52431,9 @@
       "dev": true
     },
     "awesome-phonenumber": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.3.0.tgz",
-      "integrity": "sha512-Inioq+5cDHcbSdy400FnXs1D68fZujU5Nbm3tg+qU+j/iPFW0U5CBI/rlrjI2mGCI31GvErSMk2oiNKOR2sX5w=="
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/awesome-phonenumber/-/awesome-phonenumber-5.4.0.tgz",
+      "integrity": "sha512-jf6E+GHKRIMobCKygQhZ9kHmdxZ8hvXUlVhLyesP/k8JVpmWAyNa5TzWDS0hKe480tmT419yRtGLmTpD0k8pUQ=="
     },
     "axe-core": {
       "version": "4.4.3",
diff --git a/package.json b/package.json
index 488dd2ab2da4..8d5981d666be 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "@react-navigation/drawer": "github:Expensify/react-navigation#react-navigation-drawer-v6.5.0-alpha1-gitpkg",
     "@react-navigation/native": "6.0.13",
     "@react-navigation/stack": "6.3.1",
-    "awesome-phonenumber": "^5.3.0",
     "@ua/react-native-airship": "^15.2.0",
+    "awesome-phonenumber": "^5.4.0",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",

From 07ebc760ec5b55a388b94b60cf796b80556427fa Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Mon, 17 Apr 2023 09:35:52 +0200
Subject: [PATCH 52/92] fix: change parsing phone number condition, change test
 numbers for valid ones

---
 src/libs/LocalePhoneNumber.js |  2 +-
 tests/unit/ReportUtilsTest.js | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.js
index 0b7527277257..dbe7e39f5941 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.js
@@ -42,7 +42,7 @@ function formatPhoneNumber(number) {
     const parsedPhoneNumber = parsePhoneNumber(Str.removeSMSDomain(number));
 
     // return the string untouched if it's not a phone number
-    if (!parsedPhoneNumber.valid && !parsedPhoneNumber.possible) {
+    if (!parsedPhoneNumber.valid) {
         return number;
     }
 
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index b24e4adadbf0..d610b740135f 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -25,8 +25,8 @@ const participantsPersonalDetails = {
         login: 'lagertha@vikings.net',
         pronouns: 'She/her',
     },
-    '+12223334444@expensify.sms': {
-        login: '+12223334444@expensify.sms',
+    '+18332403627@expensify.sms': {
+        login: '+18332403627@expensify.sms',
     },
 };
 const policy = {
@@ -64,8 +64,8 @@ describe('ReportUtils', () => {
                     pronouns: 'She/her',
                 },
                 {
-                    displayName: '(222) 333-4444',
-                    tooltip: '+12223334444',
+                    displayName: '(833) 240-3627',
+                    tooltip: '+18332403627',
                     pronouns: undefined,
                 },
             ]);
@@ -89,8 +89,8 @@ describe('ReportUtils', () => {
                     pronouns: 'She/her',
                 },
                 {
-                    displayName: '(222) 333-4444',
-                    tooltip: '+12223334444',
+                    displayName: '(833) 240-3627',
+                    tooltip: '+18332403627',
                     pronouns: undefined,
                 },
             ]);
@@ -113,15 +113,15 @@ describe('ReportUtils', () => {
 
             test('SMS', () => {
                 expect(ReportUtils.getReportName({
-                    participants: [currentUserEmail, '+12223334444@expensify.sms'],
-                })).toBe('(222) 333-4444');
+                    participants: [currentUserEmail, '+18332403627@expensify.sms'],
+                })).toBe('(833) 240-3627');
             });
         });
 
         test('Group DM', () => {
             expect(ReportUtils.getReportName({
-                participants: [currentUserEmail, 'ragnar@vikings.net', 'floki@vikings.net', 'lagertha@vikings.net', '+12223334444@expensify.sms'],
-            })).toBe('Ragnar, floki@vikings.net, Lagertha, (222) 333-4444');
+                participants: [currentUserEmail, 'ragnar@vikings.net', 'floki@vikings.net', 'lagertha@vikings.net', '+18332403627@expensify.sms'],
+            })).toBe('Ragnar, floki@vikings.net, Lagertha, (833) 240-3627');
         });
 
         describe('Default Policy Room', () => {

From 7229c8120b0df003f33d416f67f745546001541f Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Mon, 17 Apr 2023 15:19:59 +0700
Subject: [PATCH 53/92] fix: no notification on web if window is not active

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

diff --git a/src/libs/Visibility/index.js b/src/libs/Visibility/index.js
index 2d6c7d2f0906..c86d4a1e6965 100644
--- a/src/libs/Visibility/index.js
+++ b/src/libs/Visibility/index.js
@@ -6,7 +6,7 @@ import {AppState} from 'react-native';
  * @returns {Boolean}
  */
 function isVisible() {
-    return document.visibilityState === 'visible';
+    return document.visibilityState === 'visible' && document.hasFocus();
 }
 
 /**

From 67588f72151f2f8364b1bc3198c533d4ae3b6231 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Mon, 17 Apr 2023 18:37:10 +0100
Subject: [PATCH 54/92] implement stripSpacesFromAmount method to remove spaces
 from pasted values

---
 src/pages/iou/steps/MoneyRequestAmountPage.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/pages/iou/steps/MoneyRequestAmountPage.js b/src/pages/iou/steps/MoneyRequestAmountPage.js
index 10c260895490..912da7f18939 100755
--- a/src/pages/iou/steps/MoneyRequestAmountPage.js
+++ b/src/pages/iou/steps/MoneyRequestAmountPage.js
@@ -59,6 +59,7 @@ class MoneyRequestAmountPage extends React.Component {
         this.updateLongPressHandlerState = this.updateLongPressHandlerState.bind(this);
         this.updateAmount = this.updateAmount.bind(this);
         this.stripCommaFromAmount = this.stripCommaFromAmount.bind(this);
+        this.stripSpacesFromAmount = this.stripSpacesFromAmount.bind(this);
         this.focusTextInput = this.focusTextInput.bind(this);
         this.navigateToCurrencySelectionPage = this.navigateToCurrencySelectionPage.bind(this);
         this.amountViewID = 'amountView';
@@ -126,13 +127,14 @@ class MoneyRequestAmountPage extends React.Component {
      * @returns {Object}
      */
     getNewState(prevState, newAmount) {
-        if (!this.validateAmount(newAmount)) {
+        const newAmountWithoutSpaces = this.stripSpacesFromAmount(newAmount);
+        if (!this.validateAmount(newAmountWithoutSpaces)) {
             // Use a shallow copy of selection to trigger setSelection
             // More info: https://github.com/Expensify/App/issues/16385
             return {amount: prevState.amount, selection: {...prevState.selection}};
         }
-        const selection = this.getNewSelection(prevState.selection, prevState.amount.length, newAmount.length);
-        return {amount: this.stripCommaFromAmount(newAmount), selection};
+        const selection = this.getNewSelection(prevState.selection, prevState.amount.length, newAmountWithoutSpaces.length);
+        return {amount: this.stripCommaFromAmount(newAmountWithoutSpaces), selection};
     }
 
     /**
@@ -194,6 +196,16 @@ class MoneyRequestAmountPage extends React.Component {
         return amount.replace(/,/g, '');
     }
 
+    /**
+     * Strip spaces from the amount
+     *
+     * @param {String} amount
+     * @returns {String}
+     */
+    stripSpacesFromAmount(amount) {
+        return amount.replace(/\s+/g, '');
+    }
+
     /**
      * Adds a leading zero to the amount if user entered just the decimal separator
      *

From 022381135a132a16e0e5868a76107b73858cc0a3 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Mon, 17 Apr 2023 13:44:05 -0700
Subject: [PATCH 55/92] add permission

---
 src/pages/home/report/ReportActionCompose.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 02fa098e0d5e..735ea16c50cb 100644
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -52,6 +52,7 @@ import withKeyboardState, {keyboardStatePropTypes} from '../../../components/wit
 import ArrowKeyFocusManager from '../../../components/ArrowKeyFocusManager';
 import OfflineWithFeedback from '../../../components/OfflineWithFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
+import Permissions from '../../../libs/Permissions';
 
 const propTypes = {
     /** Beta features list */

From e503ce9829f1c352ed18568050f62261c66054f1 Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Tue, 18 Apr 2023 00:34:33 +0200
Subject: [PATCH 56/92] add padding bottom to base modal

---
 src/components/Modal/BaseModal.js | 3 ++-
 src/styles/StyleUtils.js          | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index a0f1ed6fccfc..7d44127f1c91 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -144,7 +144,7 @@ class BaseModal extends PureComponent {
 
                         const modalPaddingStyles = StyleUtils.getModalPaddingStyles({
                             safeAreaPaddingTop,
-                            safeAreaPaddingBottom: insets.bottom === 0 ? 12 : safeAreaPaddingBottom,
+                            safeAreaPaddingBottom,
                             safeAreaPaddingLeft,
                             safeAreaPaddingRight,
                             shouldAddBottomSafeAreaMargin,
@@ -155,6 +155,7 @@ class BaseModal extends PureComponent {
                             modalContainerStyleMarginBottom: modalContainerStyle.marginBottom,
                             modalContainerStylePaddingTop: modalContainerStyle.paddingTop,
                             modalContainerStylePaddingBottom: modalContainerStyle.paddingBottom,
+                            insets,
                         });
 
                         return (
diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index 775ebeed563b..d49c8b6e13a3 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -420,7 +420,14 @@ function getModalPaddingStyles({
     modalContainerStyleMarginBottom,
     modalContainerStylePaddingTop,
     modalContainerStylePaddingBottom,
+    insets,
 }) {
+    // set fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
+    // // More info: issue #17376
+    if (insets.bottom === 0) {
+        // eslint-disable-next-line no-param-reassign
+        safeAreaPaddingBottom = modalContainerStylePaddingTop;
+    }
     return {
         marginTop: (modalContainerStyleMarginTop || 0) + (shouldAddTopSafeAreaMargin ? safeAreaPaddingTop : 0),
         marginBottom: (modalContainerStyleMarginBottom || 0) + (shouldAddBottomSafeAreaMargin ? safeAreaPaddingBottom : 0),

From c2665b6e79efb18eeff3795ab226cb06023e50eb Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Tue, 18 Apr 2023 00:46:19 +0200
Subject: [PATCH 57/92] add padding bottom to base modal

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

diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index d49c8b6e13a3..4a2bcac6c183 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -423,7 +423,7 @@ function getModalPaddingStyles({
     insets,
 }) {
     // set fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
-    // // More info: issue #17376
+    // More info: issue #17376
     if (insets.bottom === 0) {
         // eslint-disable-next-line no-param-reassign
         safeAreaPaddingBottom = modalContainerStylePaddingTop;

From 87288e59ca5642bdd9ef4c6bbca9bb9fd762b252 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Tue, 18 Apr 2023 08:51:41 +0530
Subject: [PATCH 58/92] fix: remove unnecessary flex

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/components/EmojiPicker/EmojiPickerMenu/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index 5b0ca7a9a537..112ad8ffa7cc 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -520,8 +520,6 @@ class EmojiPickerMenu extends Component {
                             style={[
                                 styles.disabledText,
                                 styles.emojiPickerList,
-                                styles.dFlex,
-                                styles.flexGrow1,
                                 styles.textLabel,
                                 styles.colorMuted,
                                 this.isMobileLandscape() && styles.emojiPickerListLandscape,

From 23ae29aff442028b04122ad27fbd1b1fe795aa78 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Tue, 18 Apr 2023 09:55:40 +0530
Subject: [PATCH 59/92] fix: consistent padding on back button

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/iou/ModalHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/ModalHeader.js b/src/pages/iou/ModalHeader.js
index a89b184fb897..cbf416a33bc7 100644
--- a/src/pages/iou/ModalHeader.js
+++ b/src/pages/iou/ModalHeader.js
@@ -28,7 +28,7 @@ const defaultProps = {
 };
 
 const ModalHeader = props => (
-    <View style={[styles.headerBar]}>
+    <View style={[styles.headerBar, props.shouldShowBackButton && styles.pl2]}>
         <View style={[
             styles.dFlex,
             styles.flexRow,

From 6278deedea256d24e62578576e051deabd0915c8 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Apr 2023 15:50:27 +0700
Subject: [PATCH 60/92] early return if visibleActions were empty

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

diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index d8ab71a8cbdb..d48ddae1ba40 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -134,7 +134,12 @@ function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) {
 function getLastVisibleAction(reportID, actionsToMerge = {}) {
     const actions = _.toArray(lodashMerge({}, allReportActions[reportID], actionsToMerge));
     const visibleActions = _.filter(actions, action => (!isDeletedAction(action)));
-    return _.max(visibleActions, action => moment.utc(action.created).valueOf()) || {};
+
+    if (_.isEmpty(visibleActions)) {
+        return {};
+    }
+
+    return _.max(visibleActions, action => moment.utc(action.created).valueOf());
 }
 
 /**

From a7359eab4bfa5083540c97cdda1ec4d1f8a6f72f Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Apr 2023 16:28:47 +0700
Subject: [PATCH 61/92] remove shouldConvertTwo2DigitsFormat

---
 src/components/MoneyRequestConfirmationList.js | 6 ++----
 src/libs/IOUUtils.js                           | 9 ++-------
 src/libs/actions/IOU.js                        | 4 ++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 420f47733f11..d2ce71a9d39b 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -139,11 +139,10 @@ class MoneyRequestConfirmationList extends Component {
      */
     getParticipantsWithAmount(participants) {
         const iouAmount = IOUUtils.calculateAmount(participants, this.props.iouAmount, this.props.iou.selectedCurrencyCode);
-        const currencyUnit = IOUUtils.getCurrencyUnit(this.props.iou.selectedCurrencyCode);
 
         return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(
             participants,
-            this.props.numberFormat(iouAmount / currencyUnit, {
+            this.props.numberFormat(iouAmount / 100, {
                 style: 'currency',
                 currency: this.props.iou.selectedCurrencyCode,
             }),
@@ -176,10 +175,9 @@ class MoneyRequestConfirmationList extends Component {
             const formattedParticipants = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
             const myIOUAmount = IOUUtils.calculateAmount(selectedParticipants, this.props.iouAmount, this.props.iou.selectedCurrencyCode, true);
-            const currencyUnit = IOUUtils.getCurrencyUnit(this.props.iou.selectedCurrencyCode);
             const formattedMyPersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromMyPersonalDetail(
                 this.props.currentUserPersonalDetails,
-                this.props.numberFormat(myIOUAmount / currencyUnit, {
+                this.props.numberFormat(myIOUAmount / 100, {
                     style: 'currency',
                     currency: this.props.iou.selectedCurrencyCode,
                 }),
diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.js
index f3ffc21ea107..1151f9c77225 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.js
@@ -46,10 +46,9 @@ function getCurrencyUnit(currency = CONST.CURRENCY.USD) {
  * @param {Number} total - IOU total amount
  * @param {String} currency - IOU currency
  * @param {Boolean} isDefaultUser - Whether we are calculating the amount for the current user
- * @param {Boolean} shouldConvertTo2DigitsFormat - Whether to convert the amount to 2-digits format
  * @returns {Number}
  */
-function calculateAmount(participants, total, currency, isDefaultUser = false, shouldConvertTo2DigitsFormat = false) {
+function calculateAmount(participants, total, currency, isDefaultUser = false) {
     // Convert to cents before working with iouAmount to avoid
     // javascript subtraction with decimal problem -- when dealing with decimals,
     // because they are encoded as IEEE 754 floating point numbers, some of the decimal
@@ -70,11 +69,7 @@ function calculateAmount(participants, total, currency, isDefaultUser = false, s
         finalAmount = iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
     }
 
-    if (shouldConvertTo2DigitsFormat) {
-        finalAmount = (finalAmount * 100) / currencyUnit;
-    }
-
-    return finalAmount;
+    return (finalAmount * 100) / currencyUnit;
 }
 
 /**
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 4126a12e8592..ed8c90cb8193 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -311,8 +311,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, amount, comment
     ];
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
-    const splitAmount = IOUUtils.calculateAmount(participants, amount, currency, false, true);
-    const splits = [{email: currentUserEmail, amount: IOUUtils.calculateAmount(participants, amount, currency, true, true)}];
+    const splitAmount = IOUUtils.calculateAmount(participants, amount, currency, false);
+    const splits = [{email: currentUserEmail, amount: IOUUtils.calculateAmount(participants, amount, currency, true)}];
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {

From 8d19eab4e2e2338cc4ffc46587045d83699d91bc Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Apr 2023 16:34:42 +0700
Subject: [PATCH 62/92] update unit test for calculateAmount

---
 tests/unit/IOUUtilsTest.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 03ab29412aca..4ae4f3c5bc4b 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -178,14 +178,14 @@ describe('calculateAmount', () => {
     beforeAll(() => initCurrencyList());
     test('103 JPY split among 3 participants including the default user should be [35, 34, 34]', () => {
         const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com'];
-        expect(IOUUtils.calculateAmount(participants, 103, 'JPY', true)).toBe(35);
-        expect(IOUUtils.calculateAmount(participants, 103, 'JPY')).toBe(34);
+        expect(IOUUtils.calculateAmount(participants, 103, 'JPY', true)).toBe(3500);
+        expect(IOUUtils.calculateAmount(participants, 103, 'JPY')).toBe(3400);
     });
 
     test('10 AFN split among 4 participants including the default user should be [1, 3, 3, 3]', () => {
         const participants = ['tonystark@expensify.com', 'reedrichards@expensify.com', 'suestorm@expensify.com'];
-        expect(IOUUtils.calculateAmount(participants, 10, 'AFN', true)).toBe(1);
-        expect(IOUUtils.calculateAmount(participants, 10, 'AFN')).toBe(3);
+        expect(IOUUtils.calculateAmount(participants, 10, 'AFN', true)).toBe(100);
+        expect(IOUUtils.calculateAmount(participants, 10, 'AFN')).toBe(300);
     });
 
     test('10 BHD split among 3 participants including the default user should be [334, 333, 333]', () => {

From 36e33e8f41b04f030908bb1d8e1c3673476579e0 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Apr 2023 17:18:49 +0700
Subject: [PATCH 63/92] fix json indent

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

diff --git a/tests/unit/currencyList.json b/tests/unit/currencyList.json
index 3995569912b7..3a4230d2eabf 100644
--- a/tests/unit/currencyList.json
+++ b/tests/unit/currencyList.json
@@ -872,4 +872,4 @@
       "cacheBurst": 1,
       "ISO4217": "967"
     }
-  }
\ No newline at end of file
+}
\ No newline at end of file

From 1837007d231e9aa063834630288a49353bb288db Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Tue, 18 Apr 2023 17:34:34 +0700
Subject: [PATCH 64/92] add line break json

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

diff --git a/tests/unit/currencyList.json b/tests/unit/currencyList.json
index 3a4230d2eabf..c6eda7bdd766 100644
--- a/tests/unit/currencyList.json
+++ b/tests/unit/currencyList.json
@@ -872,4 +872,4 @@
       "cacheBurst": 1,
       "ISO4217": "967"
     }
-}
\ No newline at end of file
+}

From 34640e971ededf6516b6c0667409c96a7a05bc1b Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 18 Apr 2023 15:12:00 +0300
Subject: [PATCH 65/92] Refactor ValidateCodeModal to function component

---
 .../ValidateCode/ValidateCodeModal.js         | 97 ++++++++-----------
 1 file changed, 43 insertions(+), 54 deletions(-)

diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index f7ca07c7c543..59266d26a840 100644
--- a/src/components/ValidateCode/ValidateCodeModal.js
+++ b/src/components/ValidateCode/ValidateCodeModal.js
@@ -39,64 +39,53 @@ const defaultProps = {
     },
 };
 
-class ValidateCodeModal extends PureComponent {
-    constructor(props) {
-        super(props);
-
-        this.signInHere = this.signInHere.bind(this);
-    }
-
-    signInHere() {
-        Session.signInWithValidateCode(this.props.accountID, this.props.code);
-    }
-
-    render() {
-        return (
-            <View style={styles.deeplinkWrapperContainer}>
-                <View style={styles.deeplinkWrapperMessage}>
-                    <View style={styles.mb2}>
-                        <Icon
-                            width={variables.modalTopIconWidth}
-                            height={variables.modalTopIconHeight}
-                            src={Illustrations.MagicCode}
-                        />
-                    </View>
-                    <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}>
-                        {this.props.translate('validateCodeModal.title')}
-                    </Text>
-                    <View style={[styles.mt2, styles.mb2]}>
-                        <Text style={[styles.fontSizeNormal, styles.textAlignCenter]}>
-                            {this.props.translate('validateCodeModal.description')}
-                            {!lodashGet(this.props, 'session.authToken', null)
-                                && (
-                                    <>
-                                        {this.props.translate('validateCodeModal.or')}
-                                        {' '}
-                                        <TextLink onPress={this.signInHere}>
-                                            {this.props.translate('validateCodeModal.signInHere')}
-                                        </TextLink>
-                                    </>
-                                )}
-                            {this.props.shouldShowSignInHere ? '!' : '.'}
-                        </Text>
-                    </View>
-                    <View style={styles.mt6}>
-                        <Text style={styles.validateCodeDigits}>
-                            {this.props.code}
-                        </Text>
-                    </View>
-                </View>
-                <View style={styles.deeplinkWrapperFooter}>
+function ValidateCodeModal(props) {
+    return (
+        <View style={styles.deeplinkWrapperContainer}>
+            <View style={styles.deeplinkWrapperMessage}>
+                <View style={styles.mb2}>
                     <Icon
-                        width={variables.modalWordmarkWidth}
-                        height={variables.modalWordmarkHeight}
-                        fill={colors.green}
-                        src={Expensicons.ExpensifyWordmark}
+                        width={variables.modalTopIconWidth}
+                        height={variables.modalTopIconHeight}
+                        src={Illustrations.MagicCode}
                     />
                 </View>
+                <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}>
+                    {props.translate('validateCodeModal.title')}
+                </Text>
+                <View style={[styles.mt2, styles.mb2]}>
+                    <Text style={[styles.fontSizeNormal, styles.textAlignCenter]}>
+                        {props.translate('validateCodeModal.description')}
+                        {!lodashGet(props, 'session.authToken', null)
+                            && (
+                                <>
+                                    {props.translate('validateCodeModal.or')}
+                                    {' '}
+                                    <TextLink onPress={() => Session.signInWithValidateCode(props.accountID, props.code)}>
+                                        {props.translate('validateCodeModal.signInHere')}
+                                    </TextLink>
+                                </>
+                            )}
+                        {props.shouldShowSignInHere ? '!' : '.'}
+                    </Text>
+                </View>
+                <View style={styles.mt6}>
+                    <Text style={styles.validateCodeDigits}>
+                        {props.code}
+                    </Text>
+                </View>
             </View>
-        );
-    }
+            <View style={styles.deeplinkWrapperFooter}>
+                <Icon
+                    width={variables.modalWordmarkWidth}
+                    height={variables.modalWordmarkHeight}
+                    fill={colors.green}
+                    src={Expensicons.ExpensifyWordmark}
+                />
+            </View>
+        </View>
+    );
+
 }
 
 ValidateCodeModal.propTypes = propTypes;

From 23f866b66e203641d459d214ed63e3cbe2187c8f Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 18 Apr 2023 13:36:39 +0100
Subject: [PATCH 66/92] Fix variable name, set max width of hero to 680

---
 src/pages/signin/SignInPageHero.js | 2 +-
 src/styles/variables.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/signin/SignInPageHero.js b/src/pages/signin/SignInPageHero.js
index 36edb388283a..633a709758d1 100644
--- a/src/pages/signin/SignInPageHero.js
+++ b/src/pages/signin/SignInPageHero.js
@@ -17,7 +17,7 @@ const SignInPageHero = props => (
         StyleUtils.getMinimumHeight(variables.signInContentMinHeight),
         props.windowWidth <= variables.tabletResponsiveWidthBreakpoint ? styles.flexColumn : styles.flexColumn,
         styles.pt20,
-        StyleUtils.getMaximumWidth(variables.signInContextMaxWidth),
+        StyleUtils.getMaximumWidth(variables.signInHeroContextMaxWidth),
         styles.alignSelfCenter,
     ]}
     >
diff --git a/src/styles/variables.js b/src/styles/variables.js
index b97aa3e0e1bc..97fb157020fc 100644
--- a/src/styles/variables.js
+++ b/src/styles/variables.js
@@ -118,7 +118,7 @@ export default {
     signInHeroBackgroundWidth: 2000,
     signInHeroBackgroundWidthMobile: 800,
     signInContentMaxWidth: 1360,
-    signInHeroContextMaxWidth: 740,
+    signInHeroContextMaxWidth: 680,
     signInContentMinHeight: 800,
     signInLogoHeightSmallScreen: 28,
     signInLogoHeight: 34,

From d0b8f1b67ceaaa07b7bf14f9581d35a532f82566 Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Tue, 18 Apr 2023 15:41:56 +0300
Subject: [PATCH 67/92] Make Lint happy.

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

diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index 59266d26a840..1418e2e2be4f 100644
--- a/src/components/ValidateCode/ValidateCodeModal.js
+++ b/src/components/ValidateCode/ValidateCodeModal.js
@@ -1,4 +1,4 @@
-import React, {PureComponent} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import {compose} from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -85,7 +85,6 @@ function ValidateCodeModal(props) {
             </View>
         </View>
     );
-
 }
 
 ValidateCodeModal.propTypes = propTypes;

From 22d257c5fe29fc6240b3d4cff5c7c43dbb58f51a Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Tue, 18 Apr 2023 18:13:02 +0530
Subject: [PATCH 68/92] fix: remove unnecessary margin

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/iou/ModalHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/ModalHeader.js b/src/pages/iou/ModalHeader.js
index cbf416a33bc7..3a2ca94f1d1a 100644
--- a/src/pages/iou/ModalHeader.js
+++ b/src/pages/iou/ModalHeader.js
@@ -40,7 +40,7 @@ const ModalHeader = props => (
         >
             {props.shouldShowBackButton
                     && (
-                    <View style={[styles.mr2]}>
+                    <View>
                         <Tooltip text={props.translate('common.back')}>
                             <TouchableOpacity
                                 onPress={props.onBackButtonPress}

From 70b1f9c8c5504cb32e40fb4e6ad03ac57b3750d5 Mon Sep 17 00:00:00 2001
From: Prince Mendiratta <prince.mendi@gmail.com>
Date: Tue, 18 Apr 2023 18:52:45 +0530
Subject: [PATCH 69/92] feat: get rid of unnecessary view

Signed-off-by: Prince Mendiratta <prince.mendi@gmail.com>
---
 src/pages/iou/ModalHeader.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pages/iou/ModalHeader.js b/src/pages/iou/ModalHeader.js
index 3a2ca94f1d1a..990a8ccecceb 100644
--- a/src/pages/iou/ModalHeader.js
+++ b/src/pages/iou/ModalHeader.js
@@ -40,16 +40,14 @@ const ModalHeader = props => (
         >
             {props.shouldShowBackButton
                     && (
-                    <View>
-                        <Tooltip text={props.translate('common.back')}>
-                            <TouchableOpacity
-                                onPress={props.onBackButtonPress}
-                                style={[styles.touchableButtonImage]}
-                            >
-                                <Icon src={Expensicons.BackArrow} />
-                            </TouchableOpacity>
-                        </Tooltip>
-                    </View>
+                    <Tooltip text={props.translate('common.back')}>
+                        <TouchableOpacity
+                            onPress={props.onBackButtonPress}
+                            style={[styles.touchableButtonImage]}
+                        >
+                            <Icon src={Expensicons.BackArrow} />
+                        </TouchableOpacity>
+                    </Tooltip>
                     )}
             <Header title={props.title} />
             <View style={[styles.reportOptions, styles.flexRow, styles.pr5]}>

From 4a2f39c837232887b4c6c1ff46725b2cda270fc7 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 18 Apr 2023 22:20:35 +0700
Subject: [PATCH 70/92] fix: update html message and get last message in lhn

---
 src/libs/actions/Report.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 492cf231e41b..3284decc62d1 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -878,12 +878,16 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
     ];
 
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, optimisticReportActions);
+    const reportComment = parser.htmlToText(ReportUtils.getParsedComment(textForNewComment));
+    const lastCommentText = ReportUtils.formatReportLastMessageText(reportComment);
+    const currentTime = DateUtils.getDBTime();
+
     if (reportActionID === lastVisibleAction.reportActionID) {
         const optimisticReport = {
-            lastMessageHtml: lodashGet(lastVisibleAction, 'message[0].html'),
-            lastMessageText: lodashGet(lastVisibleAction, 'message[0].text'),
-            lastVisibleActionCreated: lastVisibleAction.created,
-            lastActorEmail: lastVisibleAction.actorEmail,
+            lastVisibleActionCreated: currentTime,
+            lastMessageText: Str.htmlDecode(lastCommentText),
+            lastActorEmail: currentUserEmail,
+            lastReadTime: currentTime,
         };
         optimisticData.push({
             onyxMethod: CONST.ONYX.METHOD.MERGE,

From 6ad2c6abd4b685512de80e314531f21222fd6196 Mon Sep 17 00:00:00 2001
From: Aman Ansari <amanansari.a2@gmail.com>
Date: Tue, 18 Apr 2023 21:14:17 +0530
Subject: [PATCH 71/92] Update translations for better UX

---
 src/languages/en.js                         | 2 ++
 src/languages/es.js                         | 2 ++
 src/pages/workspace/WorkspaceMembersPage.js | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 913d4669aac1..bee03b40ab66 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -192,6 +192,7 @@ export default {
     },
     optionsSelector: {
         nameEmailOrPhoneNumber: 'Name, email, or phone number',
+        findMember: 'Find a member',
     },
     videoChatButtonAndMenu: {
         tooltip: 'Start a Call',
@@ -970,6 +971,7 @@ export default {
             growlMessageOnDelete: 'Workspace deleted',
             growlMessageOnDeleteError: 'This workspace cannot be deleted right now because reports are actively being processed',
             unavailable: 'Unavailable workspace',
+            memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
         },
         emptyWorkspace: {
             title: 'Create a new workspace',
diff --git a/src/languages/es.js b/src/languages/es.js
index ba6e38232047..46f14b8a9d29 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -191,6 +191,7 @@ export default {
     },
     optionsSelector: {
         nameEmailOrPhoneNumber: 'Nombre, email o número de teléfono',
+        findMember: 'Encuentra un miembro',
     },
     videoChatButtonAndMenu: {
         tooltip: 'Iniciar una llamada',
@@ -971,6 +972,7 @@ export default {
             deleteConfirmation: '¿Estás seguro de que quieres eliminar este espacio de trabajo?',
             growlMessageOnDeleteError: 'No se puede eliminar el espacio de trabajo porque tiene informes que están siendo procesados',
             unavailable: 'Espacio de trabajo no disponible',
+            memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
         },
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index a10e39b03293..9400bd7561f9 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -409,7 +409,7 @@ class WorkspaceMembersPage extends React.Component {
                                 <TextInput
                                     value={this.state.searchValue}
                                     onChangeText={this.updateSearchValue}
-                                    placeholder={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
+                                    placeholder={this.props.translate('optionsSelector.findMember')}
                                 />
                             </View>
                             {data.length > 0 ? (
@@ -439,7 +439,7 @@ class WorkspaceMembersPage extends React.Component {
                             ) : (
                                 <View style={[styles.ph5]}>
                                     <Text style={[styles.textLabel, styles.colorMuted]}>
-                                        {this.props.translate('common.noResultsFound')}
+                                        {this.props.translate('workspace.common.memberNotFound')}
                                     </Text>
                                 </View>
                             )}

From 4b9e70cb8377224c437b924c4da1109d34200d86 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 18 Apr 2023 23:07:40 +0700
Subject: [PATCH 72/92] fix: move the logic into if block

---
 ios/Podfile.lock           | 4 ++--
 src/libs/actions/Report.js | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 86707162d74c..a2f965fe463b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1007,7 +1007,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Airship: 19ead2c0bdc791c1b9d6ebb7940aaac99614414e
   AirshipFrameworkProxy: 037a0ad6491757c45de2c70a6cc47bae5fcfa32b
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ff54429f0110d3c722630a98096ba689c39f6d5f
@@ -1050,7 +1050,7 @@ SPEC CHECKSUMS:
   Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4
   Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
+  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: e9e7b8b45aa9bedb2fdad71740adf07a7265b9be
   RCTTypeSafety: 9ae0e9206625e995f0df4d5b9ddc94411929fb30
   React: a71c8e1380f07e01de721ccd52bcf9c03e81867d
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 26bd47682dd2..3eae157be8d2 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -923,11 +923,10 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
     ];
 
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, optimisticReportActions);
-    const reportComment = parser.htmlToText(ReportUtils.getParsedComment(textForNewComment));
-    const lastCommentText = ReportUtils.formatReportLastMessageText(reportComment);
-    const currentTime = DateUtils.getDBTime();
-
     if (reportActionID === lastVisibleAction.reportActionID) {
+        const reportComment = parser.htmlToText(ReportUtils.getParsedComment(textForNewComment));
+        const lastCommentText = ReportUtils.formatReportLastMessageText(reportComment);
+        const currentTime = DateUtils.getDBTime();
         const optimisticReport = {
             lastVisibleActionCreated: currentTime,
             lastMessageText: Str.htmlDecode(lastCommentText),

From 8293396b1966fdadf990ab9142c0564d3dde54aa Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 18 Apr 2023 23:32:39 +0700
Subject: [PATCH 73/92] fix: remove redundant

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 3eae157be8d2..04357f2cb08f 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -924,14 +924,10 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
 
     const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, optimisticReportActions);
     if (reportActionID === lastVisibleAction.reportActionID) {
-        const reportComment = parser.htmlToText(ReportUtils.getParsedComment(textForNewComment));
-        const lastCommentText = ReportUtils.formatReportLastMessageText(reportComment);
-        const currentTime = DateUtils.getDBTime();
+        const reportComment = parser.htmlToText(htmlForNewComment);
+        const lastMessageText = ReportUtils.formatReportLastMessageText(reportComment);
         const optimisticReport = {
-            lastVisibleActionCreated: currentTime,
-            lastMessageText: Str.htmlDecode(lastCommentText),
-            lastActorEmail: currentUserEmail,
-            lastReadTime: currentTime,
+            lastMessageText: Str.htmlDecode(lastMessageText),
         };
         optimisticData.push({
             onyxMethod: CONST.ONYX.METHOD.MERGE,

From 56d466fe21d56f4bf502d248ebbc52283c95c4ab Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 18 Apr 2023 23:33:47 +0700
Subject: [PATCH 74/92] fix: remove redundant

---
 ios/Podfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a2f965fe463b..86707162d74c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1007,7 +1007,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Airship: 19ead2c0bdc791c1b9d6ebb7940aaac99614414e
   AirshipFrameworkProxy: 037a0ad6491757c45de2c70a6cc47bae5fcfa32b
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: ff54429f0110d3c722630a98096ba689c39f6d5f
@@ -1050,7 +1050,7 @@ SPEC CHECKSUMS:
   Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4
   Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
+  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
   RCTRequired: e9e7b8b45aa9bedb2fdad71740adf07a7265b9be
   RCTTypeSafety: 9ae0e9206625e995f0df4d5b9ddc94411929fb30
   React: a71c8e1380f07e01de721ccd52bcf9c03e81867d

From bea7af00a6a04786e612293508679300b4ae1d34 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 18 Apr 2023 18:16:23 +0100
Subject: [PATCH 75/92] add some comments

---
 src/pages/iou/steps/MoneyRequestAmountPage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/iou/steps/MoneyRequestAmountPage.js b/src/pages/iou/steps/MoneyRequestAmountPage.js
index 912da7f18939..7fb169fa3d84 100755
--- a/src/pages/iou/steps/MoneyRequestAmountPage.js
+++ b/src/pages/iou/steps/MoneyRequestAmountPage.js
@@ -127,6 +127,8 @@ class MoneyRequestAmountPage extends React.Component {
      * @returns {Object}
      */
     getNewState(prevState, newAmount) {
+        // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
+        // More info: https://github.com/Expensify/App/issues/16974
         const newAmountWithoutSpaces = this.stripSpacesFromAmount(newAmount);
         if (!this.validateAmount(newAmountWithoutSpaces)) {
             // Use a shallow copy of selection to trigger setSelection

From 0f38d3dea04e161d6c9552845aee7319ecbc45cc Mon Sep 17 00:00:00 2001
From: Vit Horacek <vit@expensify.com>
Date: Tue, 18 Apr 2023 10:49:33 -0700
Subject: [PATCH 76/92] Revert "Merge pull request #17310 from
 akinwale/task-16946"

This reverts commit 4607dcb69b6d5bb7607f652f8a78327c7e002183, reversing
changes made to 6ee5e7a5afa5c7066368be9cee1f6b80f4699389.
---
 src/components/MenuItem.js                    | 25 ++-----
 src/components/MenuItemList.js                | 45 +++---------
 .../index.js                                  | 31 +++-----
 .../index.native.js                           |  3 -
 ...ssableWithSecondaryInteractionPropTypes.js | 16 +---
 src/components/menuItemPropTypes.js           | 12 ---
 src/libs/actions/Link.js                      | 47 ++++++------
 src/pages/GetAssistancePage.js                |  1 -
 .../ReimbursementAccount/Enable2FAPrompt.js   | 53 ++++++--------
 src/pages/settings/AboutPage/AboutPage.js     | 10 ---
 src/pages/settings/AppDownloadLinks.js        | 44 ++++++++---
 src/pages/settings/InitialSettingsPage.js     |  8 --
 .../bills/WorkspaceBillsFirstSection.js       |  4 +-
 .../workspace/bills/WorkspaceBillsVBAView.js  | 51 ++++++-------
 .../card/WorkspaceCardVBAWithECardView.js     | 15 +---
 .../invoices/WorkspaceInvoicesFirstSection.js | 73 +++++++++----------
 .../invoices/WorkspaceInvoicesVBAView.js      | 51 ++++++-------
 .../reimburse/WorkspaceReimburseSection.js    |  4 +-
 .../reimburse/WorkspaceReimburseView.js       |  5 +-
 .../travel/WorkspaceTravelVBAView.js          |  5 +-
 src/styles/stylePropTypes.js                  |  1 -
 21 files changed, 196 insertions(+), 308 deletions(-)

diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index 070b639c2796..c8dc826a316c 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -1,6 +1,8 @@
 import _ from 'underscore';
 import React from 'react';
-import {View} from 'react-native';
+import {
+    View, Pressable,
+} from 'react-native';
 import Text from './Text';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
@@ -16,14 +18,9 @@ import colors from '../styles/colors';
 import variables from '../styles/variables';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
-import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
-import * as DeviceCapabilities from '../libs/DeviceCapabilities';
-import ControlSelection from '../libs/ControlSelection';
 
 const propTypes = {
     ...menuItemPropTypes,
-    ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
@@ -49,13 +46,11 @@ const defaultProps = {
     subtitle: undefined,
     iconType: CONST.ICON_TYPE_ICON,
     onPress: () => {},
-    onSecondaryInteraction: undefined,
     interactive: true,
     fallbackIcon: Expensicons.FallbackAvatar,
     brickRoadIndicator: '',
     floatRightAvatars: [],
     shouldStackHorizontally: false,
-    shouldBlockSelection: false,
 };
 
 const MenuItem = (props) => {
@@ -76,7 +71,7 @@ const MenuItem = (props) => {
     ]);
 
     return (
-        <PressableWithSecondaryInteraction
+        <Pressable
             onPress={(e) => {
                 if (props.disabled) {
                     return;
@@ -88,9 +83,6 @@ const MenuItem = (props) => {
 
                 props.onPress(e);
             }}
-            onPressIn={() => props.shouldBlockSelection && props.isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
-            onPressOut={ControlSelection.unblock}
-            onSecondaryInteraction={props.onSecondaryInteraction}
             style={({hovered, pressed}) => ([
                 props.style,
                 StyleUtils.getButtonBackgroundColorStyle(getButtonState(props.focused || hovered, pressed, props.success, props.disabled, props.interactive), true),
@@ -98,7 +90,6 @@ const MenuItem = (props) => {
                 styles.popoverMaxWidth,
             ])}
             disabled={props.disabled}
-            ref={props.forwardedRef}
         >
             {({hovered, pressed}) => (
                 <>
@@ -221,14 +212,12 @@ const MenuItem = (props) => {
                     </View>
                 </>
             )}
-        </PressableWithSecondaryInteraction>
+        </Pressable>
     );
 };
 
 MenuItem.propTypes = propTypes;
 MenuItem.defaultProps = defaultProps;
 MenuItem.displayName = 'MenuItem';
-export default withWindowDimensions(React.forwardRef((props, ref) => (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    <MenuItem {...props} forwardedRef={ref} />
-)));
+
+export default MenuItem;
diff --git a/src/components/MenuItemList.js b/src/components/MenuItemList.js
index fe7d40b582f8..e442d3766893 100644
--- a/src/components/MenuItemList.js
+++ b/src/components/MenuItemList.js
@@ -3,8 +3,6 @@ import _ from 'underscore';
 import PropTypes from 'prop-types';
 import MenuItem from './MenuItem';
 import menuItemPropTypes from './menuItemPropTypes';
-import * as ReportActionContextMenu from '../pages/home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../pages/home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     /** An array of props that are pass to individual MenuItem components */
@@ -14,38 +12,17 @@ const defaultProps = {
     menuItems: [],
 };
 
-const MenuItemList = (props) => {
-    let popoverAnchor;
-
-    /**
-     * Handle the secondary interaction for a menu item.
-     *
-     * @param {*} link the menu item link or function to get the link
-     * @param {Event} e the interaction event
-     */
-    const secondaryInteraction = (link, e) => {
-        if (typeof link === 'function') {
-            link().then(url => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, url, popoverAnchor));
-        } else if (!_.isEmpty(link)) {
-            ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, link, popoverAnchor);
-        }
-    };
-
-    return (
-        <>
-            {_.map(props.menuItems, menuItemProps => (
-                <MenuItem
-                    key={menuItemProps.title}
-                    onSecondaryInteraction={!_.isUndefined(menuItemProps.link) ? e => secondaryInteraction(menuItemProps.link, e) : undefined}
-                    ref={el => popoverAnchor = el}
-                    shouldBlockSelection={Boolean(menuItemProps.link)}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...menuItemProps}
-                />
-            ))}
-        </>
-    );
-};
+const MenuItemList = props => (
+    <>
+        {_.map(props.menuItems, menuItemProps => (
+            <MenuItem
+                key={menuItemProps.title}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...menuItemProps}
+            />
+        ))}
+    </>
+);
 
 MenuItemList.displayName = 'MenuItemList';
 MenuItemList.propTypes = propTypes;
diff --git a/src/components/PressableWithSecondaryInteraction/index.js b/src/components/PressableWithSecondaryInteraction/index.js
index 412755a4ccef..f3ea25a471fd 100644
--- a/src/components/PressableWithSecondaryInteraction/index.js
+++ b/src/components/PressableWithSecondaryInteraction/index.js
@@ -4,7 +4,6 @@ import {Pressable} from 'react-native';
 import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
 import styles from '../../styles/styles';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
-import * as StyleUtils from '../../styles/StyleUtils';
 
 /**
  * This is a special Pressable that calls onSecondaryInteraction when LongPressed, or right-clicked.
@@ -12,7 +11,6 @@ import * as StyleUtils from '../../styles/StyleUtils';
 class PressableWithSecondaryInteraction extends Component {
     constructor(props) {
         super(props);
-        this.executeSecondaryInteraction = this.executeSecondaryInteraction.bind(this);
         this.executeSecondaryInteractionOnContextMenu = this.executeSecondaryInteractionOnContextMenu.bind(this);
     }
 
@@ -27,28 +25,11 @@ class PressableWithSecondaryInteraction extends Component {
         this.pressableRef.removeEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
     }
 
-    /**
-     * @param {Event} e - the secondary interaction event
-     */
-    executeSecondaryInteraction(e) {
-        if (DeviceCapabilities.hasHoverSupport()) {
-            return;
-        }
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
-        }
-        this.props.onSecondaryInteraction(e);
-    }
-
     /**
      * @param {contextmenu} e - A right-click MouseEvent.
      * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
      */
     executeSecondaryInteractionOnContextMenu(e) {
-        if (!this.props.onSecondaryInteraction) {
-            return;
-        }
-
         e.stopPropagation();
         if (this.props.preventDefaultContentMenu) {
             e.preventDefault();
@@ -73,9 +54,17 @@ class PressableWithSecondaryInteraction extends Component {
         // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
         return (
             <Pressable
-                style={StyleUtils.combineStyles(this.props.inline ? styles.dInline : this.props.style)}
+                style={this.props.inline && styles.dInline}
                 onPressIn={this.props.onPressIn}
-                onLongPress={this.props.onSecondaryInteraction ? this.executeSecondaryInteraction : undefined}
+                onLongPress={(e) => {
+                    if (DeviceCapabilities.hasHoverSupport()) {
+                        return;
+                    }
+                    if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
+                        this.pressableRef.blur();
+                    }
+                    this.props.onSecondaryInteraction(e);
+                }}
                 onPressOut={this.props.onPressOut}
                 onPress={this.props.onPress}
                 ref={el => this.pressableRef = el}
diff --git a/src/components/PressableWithSecondaryInteraction/index.native.js b/src/components/PressableWithSecondaryInteraction/index.native.js
index 744c92e4f81b..c51671ba835c 100644
--- a/src/components/PressableWithSecondaryInteraction/index.native.js
+++ b/src/components/PressableWithSecondaryInteraction/index.native.js
@@ -19,9 +19,6 @@ const PressableWithSecondaryInteraction = (props) => {
             ref={props.forwardedRef}
             onPress={props.onPress}
             onLongPress={(e) => {
-                if (!props.onSecondaryInteraction) {
-                    return;
-                }
                 e.preventDefault();
                 HapticFeedback.longPress();
                 props.onSecondaryInteraction(e);
diff --git a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
index 0964edaa9506..bffe11bc4cd8 100644
--- a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
+++ b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import stylePropTypes from '../../styles/stylePropTypes';
 
 const propTypes = {
     /** The function that should be called when this pressable is pressed */
@@ -12,19 +11,13 @@ const propTypes = {
     onPressOut: PropTypes.func,
 
     /** The function that should be called when this pressable is LongPressed or right-clicked. */
-    onSecondaryInteraction: PropTypes.func,
+    onSecondaryInteraction: PropTypes.func.isRequired,
 
     /** The children which should be contained in this wrapper component. */
-    children: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.node,
-    ]).isRequired,
+    children: PropTypes.node.isRequired,
 
     /** The ref to the search input (may be null on small screen widths) */
-    forwardedRef: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.object,
-    ]),
+    forwardedRef: PropTypes.func,
 
     /** Prevent the default ContextMenu on web/Desktop */
     preventDefaultContentMenu: PropTypes.bool,
@@ -41,9 +34,6 @@ const propTypes = {
 
     /** Disable focus trap for the element on secondary interaction  */
     withoutFocusOnSecondaryInteraction: PropTypes.bool,
-
-    /** Used to apply styles to the Pressable */
-    style: stylePropTypes,
 };
 
 const defaultProps = {
diff --git a/src/components/menuItemPropTypes.js b/src/components/menuItemPropTypes.js
index 78486cb5a848..c1759d127cfe 100644
--- a/src/components/menuItemPropTypes.js
+++ b/src/components/menuItemPropTypes.js
@@ -88,18 +88,6 @@ const propTypes = {
 
     /** Prop to identify if we should load avatars vertically instead of diagonally */
     shouldStackHorizontally: PropTypes.bool,
-
-    /** The function that should be called when this component is LongPressed or right-clicked. */
-    onSecondaryInteraction: PropTypes.func,
-
-    /** Flag to indicate whether or not text selection should be disabled from long-pressing the menu item. */
-    shouldBlockSelection: PropTypes.bool,
-
-    /** The ref to the menu item */
-    forwardedRef: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.object,
-    ]),
 };
 
 export default propTypes;
diff --git a/src/libs/actions/Link.js b/src/libs/actions/Link.js
index 2cccfc447f6b..c38f901bb391 100644
--- a/src/libs/actions/Link.js
+++ b/src/libs/actions/Link.js
@@ -34,35 +34,33 @@ function showGrowlIfOffline() {
 }
 
 /**
- * @param {String} [url] the url path
- * @param {String} [shortLivedAuthToken]
- *
- * @returns {Promise<string>}
+ * @param {String} url
  */
-function buildOldDotURL(url, shortLivedAuthToken) {
-    const hasHashParams = url.indexOf('#') !== -1;
-    const hasURLParams = url.indexOf('?') !== -1;
+function openOldDotLink(url) {
+    /**
+     * @param {String} [shortLivedAuthToken]
+     * @returns {Promise<string>}
+     */
+    function buildOldDotURL(shortLivedAuthToken) {
+        const hasHashParams = url.indexOf('#') !== -1;
+        const hasURLParams = url.indexOf('?') !== -1;
 
-    const authTokenParam = shortLivedAuthToken ? `authToken=${shortLivedAuthToken}` : '';
-    const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
+        const authTokenParam = shortLivedAuthToken ? `authToken=${shortLivedAuthToken}` : '';
+        const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
 
-    const params = _.compact([authTokenParam, emailParam]).join('&');
+        const params = _.compact([authTokenParam, emailParam]).join('&');
 
-    return Environment.getOldDotEnvironmentURL()
-        .then((environmentURL) => {
-            const oldDotDomain = Url.addTrailingForwardSlash(environmentURL);
+        return Environment.getOldDotEnvironmentURL()
+            .then((environmentURL) => {
+                const oldDotDomain = Url.addTrailingForwardSlash(environmentURL);
 
-            // If the URL contains # or ?, we can assume they don't need to have the `?` token to start listing url parameters.
-            return `${oldDotDomain}${url}${hasHashParams || hasURLParams ? '&' : '?'}${params}`;
-        });
-}
+                // If the URL contains # or ?, we can assume they don't need to have the `?` token to start listing url parameters.
+                return `${oldDotDomain}${url}${hasHashParams || hasURLParams ? '&' : '?'}${params}`;
+            });
+    }
 
-/**
- * @param {String} url the url path
- */
-function openOldDotLink(url) {
     if (isNetworkOffline) {
-        buildOldDotURL(url).then(oldDotURL => Linking.openURL(oldDotURL));
+        buildOldDotURL().then(oldDotURL => Linking.openURL(oldDotURL));
         return;
     }
 
@@ -71,11 +69,11 @@ function openOldDotLink(url) {
     API.makeRequestWithSideEffects(
         'OpenOldDotLink', {}, {},
     ).then((response) => {
-        buildOldDotURL(url, response.shortLivedAuthToken).then((oldDotUrl) => {
+        buildOldDotURL(response.shortLivedAuthToken).then((oldDotUrl) => {
             Linking.openURL(oldDotUrl);
         });
     }).catch(() => {
-        buildOldDotURL(url).then((oldDotUrl) => {
+        buildOldDotURL().then((oldDotUrl) => {
             Linking.openURL(oldDotUrl);
         });
     });
@@ -94,7 +92,6 @@ function openExternalLink(url, shouldSkipCustomSafariLogic = false) {
 }
 
 export {
-    buildOldDotURL,
     openOldDotLink,
     openExternalLink,
 };
diff --git a/src/pages/GetAssistancePage.js b/src/pages/GetAssistancePage.js
index 89544b25dcfe..e2115c6d7814 100644
--- a/src/pages/GetAssistancePage.js
+++ b/src/pages/GetAssistancePage.js
@@ -57,7 +57,6 @@ const GetAssistancePage = (props) => {
         shouldShowRightIcon: true,
         iconRight: Expensicons.NewWindow,
         wrapperStyle: [styles.cardMenuItem],
-        link: CONST.NEWHELP_URL,
     }];
 
     // If the user is eligible for calls with their Guide, add the 'Schedule a setup call' item at the second position in the list
diff --git a/src/pages/ReimbursementAccount/Enable2FAPrompt.js b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
index cb7bc1f004d3..51c62b8957c1 100644
--- a/src/pages/ReimbursementAccount/Enable2FAPrompt.js
+++ b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
@@ -13,36 +13,31 @@ import themeColors from '../../styles/themes/default';
 const propTypes = {
     ...withLocalizePropTypes,
 };
-const Enable2FAPrompt = (props) => {
-    const secureYourAccountUrl = encodeURI(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.getBankAccountRoute()}","isFromNewDot":"true"}`);
-
-    return (
-        <Section
-            title={props.translate('validationStep.enable2FATitle')}
-            icon={Illustrations.ShieldYellow}
-            menuItems={[
-                {
-                    title: props.translate('validationStep.secureYourAccount'),
-                    onPress: () => {
-                        Link.openOldDotLink(secureYourAccountUrl);
-                    },
-                    icon: Expensicons.Shield,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    iconFill: themeColors.success,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(secureYourAccountUrl),
+const Enable2FAPrompt = props => (
+    <Section
+        title={props.translate('validationStep.enable2FATitle')}
+        icon={Illustrations.ShieldYellow}
+        menuItems={[
+            {
+                title: props.translate('validationStep.secureYourAccount'),
+                onPress: () => {
+                    Link.openOldDotLink(encodeURI(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.getBankAccountRoute()}","isFromNewDot":"true"}`));
                 },
-            ]}
-        >
-            <View style={[styles.mv3]}>
-                <Text>
-                    {props.translate('validationStep.enable2FAText')}
-                </Text>
-            </View>
-        </Section>
-    );
-};
+                icon: Expensicons.Shield,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                iconFill: themeColors.success,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+        ]}
+    >
+        <View style={[styles.mv3]}>
+            <Text>
+                {props.translate('validationStep.enable2FAText')}
+            </Text>
+        </View>
+    </Section>
+);
 
 Enable2FAPrompt.propTypes = propTypes;
 Enable2FAPrompt.displayName = 'Enable2FAPrompt';
diff --git a/src/pages/settings/AboutPage/AboutPage.js b/src/pages/settings/AboutPage/AboutPage.js
index b4a816ea5740..7c7840fdbbdb 100644
--- a/src/pages/settings/AboutPage/AboutPage.js
+++ b/src/pages/settings/AboutPage/AboutPage.js
@@ -19,8 +19,6 @@ import * as Report from '../../../libs/actions/Report';
 import * as Link from '../../../libs/actions/Link';
 import getPlatformSpecificMenuItems from './getPlatformSpecificMenuItems';
 import compose from '../../../libs/compose';
-import * as ReportActionContextMenu from '../../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -28,8 +26,6 @@ const propTypes = {
 };
 
 const AboutPage = (props) => {
-    let popoverAnchor;
-
     const platformSpecificMenuItems = getPlatformSpecificMenuItems(props.isSmallScreenWidth);
 
     const menuItems = [
@@ -48,7 +44,6 @@ const AboutPage = (props) => {
             action: () => {
                 Link.openExternalLink(CONST.GITHUB_URL);
             },
-            link: CONST.GITHUB_URL,
         },
         {
             translationKey: 'initialSettingsPage.aboutPage.viewOpenJobs',
@@ -57,7 +52,6 @@ const AboutPage = (props) => {
             action: () => {
                 Link.openExternalLink(CONST.UPWORK_URL);
             },
-            link: CONST.UPWORK_URL,
         },
         {
             translationKey: 'initialSettingsPage.aboutPage.reportABug',
@@ -113,10 +107,6 @@ const AboutPage = (props) => {
                                     icon={item.icon}
                                     iconRight={item.iconRight}
                                     onPress={() => item.action()}
-                                    shouldBlockSelection={Boolean(item.link)}
-                                    onSecondaryInteraction={!_.isEmpty(item.link)
-                                        ? e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, popoverAnchor) : undefined}
-                                    ref={el => popoverAnchor = el}
                                     shouldShowRightIcon
                                 />
                             ))}
diff --git a/src/pages/settings/AppDownloadLinks.js b/src/pages/settings/AppDownloadLinks.js
index 8acd2e95dafb..9b47bdb644ef 100644
--- a/src/pages/settings/AppDownloadLinks.js
+++ b/src/pages/settings/AppDownloadLinks.js
@@ -11,9 +11,12 @@ import compose from '../../libs/compose';
 import MenuItem from '../../components/MenuItem';
 import styles from '../../styles/styles';
 import * as Link from '../../libs/actions/Link';
+import PressableWithSecondaryInteraction from '../../components/PressableWithSecondaryInteraction';
+import ControlSelection from '../../libs/ControlSelection';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import * as ReportActionContextMenu from '../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../home/report/ContextMenu/ContextMenuActions';
+import * as ContextMenuActions from '../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -53,6 +56,21 @@ const AppDownloadLinksPage = (props) => {
         },
     ];
 
+    /**
+     * Show the ReportActionContextMenu modal popover.
+     *
+     * @param {Object} [event] - A press event.
+     * @param {String} [selection] - Copied content.
+     */
+    const showPopover = (event, selection) => {
+        ReportActionContextMenu.showContextMenu(
+            ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
+            event,
+            selection,
+            popoverAnchor,
+        );
+    };
+
     return (
         <ScreenWrapper>
             <HeaderWithCloseButton
@@ -63,20 +81,24 @@ const AppDownloadLinksPage = (props) => {
             />
             <ScrollView style={[styles.mt5]}>
                 {_.map(menuItems, item => (
-                    <MenuItem
+                    <PressableWithSecondaryInteraction
                         key={item.translationKey}
-                        onPress={() => item.action()}
-                        onSecondaryInteraction={e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, popoverAnchor)}
+                        onPressIn={() => props.isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+                        onPressOut={() => ControlSelection.unblock()}
+                        onSecondaryInteraction={e => showPopover(e, item.link)}
+                        ref={el => popoverAnchor = el}
                         onKeyDown={(event) => {
                             event.target.blur();
                         }}
-                        ref={el => popoverAnchor = el}
-                        title={props.translate(item.translationKey)}
-                        icon={item.icon}
-                        iconRight={item.iconRight}
-                        shouldBlockSelection
-                        shouldShowRightIcon
-                    />
+                    >
+                        <MenuItem
+                            title={props.translate(item.translationKey)}
+                            icon={item.icon}
+                            iconRight={item.iconRight}
+                            onPress={() => item.action()}
+                            shouldShowRightIcon
+                        />
+                    </PressableWithSecondaryInteraction>
                 ))}
             </ScrollView>
         </ScreenWrapper>
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index ef001593a7c0..71578843b7a3 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -36,8 +36,6 @@ import * as Link from '../../libs/actions/Link';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import * as UserUtils from '../../libs/UserUtils';
 import policyMemberPropType from '../policyMemberPropType';
-import * as ReportActionContextMenu from '../home/report/ContextMenu/ReportActionContextMenu';
-import {CONTEXT_MENU_TYPES} from '../home/report/ContextMenu/ContextMenuActions';
 
 const propTypes = {
     /* Onyx Props */
@@ -119,8 +117,6 @@ class InitialSettingsPage extends React.Component {
     constructor(props) {
         super(props);
 
-        this.popoverAnchor = React.createRef();
-
         this.getWalletBalance = this.getWalletBalance.bind(this);
         this.getDefaultMenuItems = this.getDefaultMenuItems.bind(this);
         this.getMenuItem = this.getMenuItem.bind(this);
@@ -207,7 +203,6 @@ class InitialSettingsPage extends React.Component {
                 action: () => { Link.openExternalLink(CONST.NEWHELP_URL); },
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
-                link: CONST.NEWHELP_URL,
             },
             {
                 translationKey: 'initialSettingsPage.about',
@@ -241,9 +236,6 @@ class InitialSettingsPage extends React.Component {
                 brickRoadIndicator={item.brickRoadIndicator}
                 floatRightAvatars={item.floatRightAvatars}
                 shouldStackHorizontally={item.shouldStackHorizontally}
-                ref={this.popoverAnchor}
-                shouldBlockSelection={Boolean(item.link)}
-                onSecondaryInteraction={!_.isEmpty(item.link) ? e => ReportActionContextMenu.showContextMenu(CONTEXT_MENU_TYPES.LINK, e, item.link, this.popoverAnchor.current) : undefined}
             />
         );
     }
diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
index 15397ea96776..f97b6ba946ae 100644
--- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
+++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
@@ -42,7 +42,6 @@ const defaultProps = {
 
 const WorkspaceBillsFirstSection = (props) => {
     const emailDomain = Str.extractEmailDomain(props.session.email);
-    const manageYourBillsUrl = `reports?policyID=${props.policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`;
     return (
         <Section
             title={props.translate('workspace.bills.manageYourBills')}
@@ -51,13 +50,12 @@ const WorkspaceBillsFirstSection = (props) => {
                 {
                     title: props.translate('workspace.bills.viewAllBills'),
                     onPress: () => (
-                        Link.openOldDotLink(manageYourBillsUrl)
+                        Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`)
                     ),
                     icon: Expensicons.Bill,
                     shouldShowRightIcon: true,
                     iconRight: Expensicons.NewWindow,
                     wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(manageYourBillsUrl),
                 },
             ]}
             containerStyles={[styles.cardSection]}
diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
index dcb625777c7d..3731a9cc7b8f 100644
--- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js
+++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
@@ -17,35 +17,30 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceBillsVBAView = (props) => {
-    const reportsUrl = `reports?policyID=${props.policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`;
+const WorkspaceBillsVBAView = props => (
+    <>
+        <WorkspaceBillsFirstSection policyID={props.policyID} />
 
-    return (
-        <>
-            <WorkspaceBillsFirstSection policyID={props.policyID} />
-
-            <Section
-                title={props.translate('workspace.bills.hassleFreeBills')}
-                icon={Illustrations.MoneyBadge}
-                menuItems={[
-                    {
-                        title: props.translate('workspace.common.bills'),
-                        onPress: () => Link.openOldDotLink(reportsUrl),
-                        icon: Expensicons.Bill,
-                        shouldShowRightIcon: true,
-                        iconRight: Expensicons.NewWindow,
-                        wrapperStyle: [styles.cardMenuItem],
-                        link: () => Link.buildOldDotURL(reportsUrl),
-                    },
-                ]}
-            >
-                <View style={[styles.mv3]}>
-                    <Text>{props.translate('workspace.bills.VBACopy')}</Text>
-                </View>
-            </Section>
-        </>
-    );
-};
+        <Section
+            title={props.translate('workspace.bills.hassleFreeBills')}
+            icon={Illustrations.MoneyBadge}
+            menuItems={[
+                {
+                    title: props.translate('workspace.common.bills'),
+                    onPress: () => Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`),
+                    icon: Expensicons.Bill,
+                    shouldShowRightIcon: true,
+                    iconRight: Expensicons.NewWindow,
+                    wrapperStyle: [styles.cardMenuItem],
+                },
+            ]}
+        >
+            <View style={[styles.mv3]}>
+                <Text>{props.translate('workspace.bills.VBACopy')}</Text>
+            </View>
+        </Section>
+    </>
+);
 
 WorkspaceBillsVBAView.propTypes = propTypes;
 WorkspaceBillsVBAView.displayName = 'WorkspaceBillsVBAView';
diff --git a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
index 4c1213800bac..a9a551f23131 100644
--- a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
+++ b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
@@ -13,40 +13,31 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const MENU_LINKS = {
-    ISSUE_AND_MANAGE_CARDS: 'domain_companycards',
-    RECONCILE_CARDS: encodeURI('domain_companycards?param={"section":"cardReconciliation"}'),
-    SETTLEMENT_FREQUENCY: encodeURI('domain_companycards?param={"section":"configureSettings"}'),
-};
-
 const WorkspaceCardVBAWithECardView = (props) => {
     const menuItems = [
         {
             title: props.translate('workspace.common.issueAndManageCards'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.ISSUE_AND_MANAGE_CARDS),
+            onPress: () => Link.openOldDotLink('domain_companycards'),
             icon: Expensicons.ExpensifyCard,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.ISSUE_AND_MANAGE_CARDS),
         },
         {
             title: props.translate('workspace.common.reconcileCards'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.RECONCILE_CARDS),
+            onPress: () => Link.openOldDotLink(encodeURI('domain_companycards?param={"section":"cardReconciliation"}')),
             icon: Expensicons.ReceiptSearch,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.RECONCILE_CARDS),
         },
         {
             title: props.translate('workspace.common.settlementFrequency'),
-            onPress: () => Link.openOldDotLink(MENU_LINKS.SETTLEMENT_FREQUENCY),
+            onPress: () => Link.openOldDotLink(encodeURI('domain_companycards?param={"section":"configureSettings"}')),
             icon: Expensicons.Gear,
             shouldShowRightIcon: true,
             iconRight: Expensicons.NewWindow,
             wrapperStyle: [styles.cardMenuItem],
-            link: () => Link.buildOldDotURL(MENU_LINKS.SETTLEMENT_FREQUENCY),
         },
     ];
 
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
index 9f3c84d28ff1..4d027542b155 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
@@ -16,46 +16,39 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceInvoicesFirstSection = (props) => {
-    const sendInvoiceUrl = encodeURI('reports?param={"createInvoice":true}');
-    const viewAllInvoicesUrl = `reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`;
-
-    return (
-        <Section
-            title={props.translate('workspace.invoices.invoiceClientsAndCustomers')}
-            icon={Illustrations.InvoiceBlue}
-            menuItems={[
-                {
-                    title: props.translate('workspace.invoices.sendInvoice'),
-                    onPress: () => Link.openOldDotLink(sendInvoiceUrl),
-                    icon: Expensicons.Send,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(sendInvoiceUrl),
-                },
-                {
-                    title: props.translate('workspace.invoices.viewAllInvoices'),
-                    onPress: () => (
-                        Link.openOldDotLink(viewAllInvoicesUrl)
-                    ),
-                    icon: Expensicons.Invoice,
-                    shouldShowRightIcon: true,
-                    iconRight: Expensicons.NewWindow,
-                    wrapperStyle: [styles.cardMenuItem],
-                    link: () => Link.buildOldDotURL(viewAllInvoicesUrl),
-                },
-            ]}
-            containerStyles={[styles.cardSection]}
-        >
-            <View style={[styles.mv3]}>
-                <Text>
-                    {props.translate('workspace.invoices.invoiceFirstSectionCopy')}
-                </Text>
-            </View>
-        </Section>
-    );
-};
+const WorkspaceInvoicesFirstSection = props => (
+    <Section
+        title={props.translate('workspace.invoices.invoiceClientsAndCustomers')}
+        icon={Illustrations.InvoiceBlue}
+        menuItems={[
+            {
+                title: props.translate('workspace.invoices.sendInvoice'),
+                onPress: () => Link.openOldDotLink(encodeURI('reports?param={"createInvoice":true}')),
+                icon: Expensicons.Send,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+            {
+                title: props.translate('workspace.invoices.viewAllInvoices'),
+                onPress: () => (
+                    Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`)
+                ),
+                icon: Expensicons.Invoice,
+                shouldShowRightIcon: true,
+                iconRight: Expensicons.NewWindow,
+                wrapperStyle: [styles.cardMenuItem],
+            },
+        ]}
+        containerStyles={[styles.cardSection]}
+    >
+        <View style={[styles.mv3]}>
+            <Text>
+                {props.translate('workspace.invoices.invoiceFirstSectionCopy')}
+            </Text>
+        </View>
+    </Section>
+);
 
 WorkspaceInvoicesFirstSection.propTypes = propTypes;
 WorkspaceInvoicesFirstSection.displayName = 'WorkspaceInvoicesFirstSection';
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
index c4f50bb9d49d..c88a61eef18b 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
@@ -17,35 +17,30 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-const WorkspaceInvoicesVBAView = (props) => {
-    const viewUnpaidInvoicesUrl = `reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`;
+const WorkspaceInvoicesVBAView = props => (
+    <>
+        <WorkspaceInvoicesFirstSection policyID={props.policyID} />
 
-    return (
-        <>
-            <WorkspaceInvoicesFirstSection policyID={props.policyID} />
-
-            <Section
-                title={props.translate('workspace.invoices.moneyBackInAFlash')}
-                icon={Illustrations.MoneyBadge}
-                menuItems={[
-                    {
-                        title: props.translate('workspace.invoices.viewUnpaidInvoices'),
-                        onPress: () => Link.openOldDotLink(viewUnpaidInvoicesUrl),
-                        icon: Expensicons.Hourglass,
-                        shouldShowRightIcon: true,
-                        iconRight: Expensicons.NewWindow,
-                        wrapperStyle: [styles.cardMenuItem],
-                        link: () => Link.buildOldDotURL(viewUnpaidInvoicesUrl),
-                    },
-                ]}
-            >
-                <View style={[styles.mv3]}>
-                    <Text>{props.translate('workspace.invoices.unlockVBACopy')}</Text>
-                </View>
-            </Section>
-        </>
-    );
-};
+        <Section
+            title={props.translate('workspace.invoices.moneyBackInAFlash')}
+            icon={Illustrations.MoneyBadge}
+            menuItems={[
+                {
+                    title: props.translate('workspace.invoices.viewUnpaidInvoices'),
+                    onPress: () => Link.openOldDotLink(`reports?policyID=${props.policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`),
+                    icon: Expensicons.Hourglass,
+                    shouldShowRightIcon: true,
+                    iconRight: Expensicons.NewWindow,
+                    wrapperStyle: [styles.cardMenuItem],
+                },
+            ]}
+        >
+            <View style={[styles.mv3]}>
+                <Text>{props.translate('workspace.invoices.unlockVBACopy')}</Text>
+            </View>
+        </Section>
+    </>
+);
 
 WorkspaceInvoicesVBAView.propTypes = propTypes;
 WorkspaceInvoicesVBAView.displayName = 'WorkspaceInvoicesVBAView';
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js b/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
index 3928816fb686..20f443bf5671 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseSection.js
@@ -57,7 +57,6 @@ class WorkspaceReimburseSection extends React.Component {
     render() {
         const achState = lodashGet(this.props.reimbursementAccount, 'achData.state', '');
         const hasVBA = achState === BankAccount.STATE.OPEN;
-        const reimburseReceiptsUrl = `reports?policyID=${this.props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
 
         if (this.props.network.isOffline) {
             return (
@@ -94,12 +93,11 @@ class WorkspaceReimburseSection extends React.Component {
                         menuItems={[
                             {
                                 title: this.props.translate('workspace.reimburse.reimburseReceipts'),
-                                onPress: () => Link.openOldDotLink(reimburseReceiptsUrl),
+                                onPress: () => Link.openOldDotLink(`reports?policyID=${this.props.policy.id}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`),
                                 icon: Expensicons.Bank,
                                 shouldShowRightIcon: true,
                                 iconRight: Expensicons.NewWindow,
                                 wrapperStyle: [styles.cardMenuItem],
-                                link: () => Link.buildOldDotURL(reimburseReceiptsUrl),
                             },
                         ]}
                     >
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
index ccb40d053e7f..d103121b9e2a 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
@@ -214,8 +214,6 @@ class WorkspaceReimburseView extends React.Component {
     }
 
     render() {
-        const viewAllReceiptsUrl = `expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
-
         return (
             <>
                 <Section
@@ -224,12 +222,11 @@ class WorkspaceReimburseView extends React.Component {
                     menuItems={[
                         {
                             title: this.props.translate('workspace.reimburse.viewAllReceipts'),
-                            onPress: () => Link.openOldDotLink(viewAllReceiptsUrl),
+                            onPress: () => Link.openOldDotLink(`expenses?policyIDList=${this.props.policy.id}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`),
                             icon: Expensicons.Receipt,
                             shouldShowRightIcon: true,
                             iconRight: Expensicons.NewWindow,
                             wrapperStyle: [styles.cardMenuItem],
-                            link: () => Link.buildOldDotURL(viewAllReceiptsUrl),
                         },
                     ]}
                 >
diff --git a/src/pages/workspace/travel/WorkspaceTravelVBAView.js b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
index 79b256136028..9c79b55c90b4 100644
--- a/src/pages/workspace/travel/WorkspaceTravelVBAView.js
+++ b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
@@ -8,7 +8,6 @@ import * as Illustrations from '../../../components/Icon/Illustrations';
 import Section from '../../../components/Section';
 import * as Link from '../../../libs/actions/Link';
 import * as Report from '../../../libs/actions/Report';
-import CONST from '../../../CONST';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -26,7 +25,6 @@ const WorkspaceTravelVBAView = props => (
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
                 wrapperStyle: [styles.cardMenuItem],
-                link: () => Link.buildOldDotURL('domain_companycards'),
             },
             {
                 title: props.translate('workspace.travel.bookTravelWithConcierge'),
@@ -39,12 +37,11 @@ const WorkspaceTravelVBAView = props => (
             },
             {
                 title: props.translate('requestorStep.learnMore'),
-                onPress: () => Link.openExternalLink(CONST.CONCIERGE_TRAVEL_URL),
+                onPress: () => Link.openExternalLink('https://community.expensify.com/discussion/7066/introducing-concierge-travel'),
                 icon: Expensicons.Info,
                 shouldShowRightIcon: true,
                 iconRight: Expensicons.NewWindow,
                 wrapperStyle: [styles.cardMenuItem],
-                link: CONST.CONCIERGE_TRAVEL_URL,
             },
         ]}
     >
diff --git a/src/styles/stylePropTypes.js b/src/styles/stylePropTypes.js
index edc5d0383a75..4c7e825a8848 100644
--- a/src/styles/stylePropTypes.js
+++ b/src/styles/stylePropTypes.js
@@ -3,5 +3,4 @@ import PropTypes from 'prop-types';
 export default PropTypes.oneOfType([
     PropTypes.object,
     PropTypes.arrayOf(PropTypes.object),
-    PropTypes.func,
 ]);

From 2e939ffc82d6b403024eb25ba58a34d809901b88 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 18 Apr 2023 17:52:18 +0000
Subject: [PATCH 77/92] Update version to 1.3.1-2

---
 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 aee47932ef02..ba8d6958b62a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030101
-        versionName "1.3.1-1"
+        versionCode 1001030102
+        versionName "1.3.1-2"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 65dea8a3d78a..72158c761829 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.1.1</string>
+	<string>1.3.1.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index eb369c6b82e8..2717b3e6dec8 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.1.1</string>
+	<string>1.3.1.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index ca90e80bd9cf..eae11b81bb03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-1",
+  "version": "1.3.1-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.1-1",
+      "version": "1.3.1-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1320678f43db..779ed8da568c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-1",
+  "version": "1.3.1-2",
   "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 f56c9b1cdd0fb2dec9ca0d0f7e003966d63ce399 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 18 Apr 2023 19:17:45 +0000
Subject: [PATCH 78/92] Update version to 1.3.1-3

---
 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 ba8d6958b62a..a1a19290e3c3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030102
-        versionName "1.3.1-2"
+        versionCode 1001030103
+        versionName "1.3.1-3"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 72158c761829..85007ad6690f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.1.2</string>
+	<string>1.3.1.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 2717b3e6dec8..18f96a4cb305 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.1.2</string>
+	<string>1.3.1.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 85089af332e9..9f07c5a1ad97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-2",
+  "version": "1.3.1-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.1-2",
+      "version": "1.3.1-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 2749f23caedf..9348c8e771ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-2",
+  "version": "1.3.1-3",
   "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 85d5c290cb23f999195d80b9d615913c06e28451 Mon Sep 17 00:00:00 2001
From: Florent De Neve <florent@expensify.com>
Date: Tue, 18 Apr 2023 15:43:03 -0400
Subject: [PATCH 79/92] Prevent App crash when report participant personal
 details do not exist

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

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 50dc46c8d4b5..2f15a6689ae8 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -230,7 +230,7 @@ function getOptionData(reportID) {
     };
 
     const participantPersonalDetailList = _.values(OptionsListUtils.getPersonalDetailsForLogins(report.participants, personalDetails));
-    const personalDetail = participantPersonalDetailList[0] || {};
+    const personalDetail = participantPersonalDetailList[0] || {login: ''};
 
     result.isChatRoom = ReportUtils.isChatRoom(report);
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);

From 5ef2901ccec5a34009226635c88aa8ecba4e64b5 Mon Sep 17 00:00:00 2001
From: Ionatan Wiznia <ionatan@expensify.com>
Date: Tue, 18 Apr 2023 22:10:57 +0200
Subject: [PATCH 80/92] Update CONTRIBUTING.md to allow posting proposals
 before help wanted label

---
 contributingGuides/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index e4264a5cb56e..7e0fb7c93640 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -111,7 +111,7 @@ Additionally if you want to discuss an idea with the open source community witho
 3. If you cannot reproduce the problem, pause on this step and add a comment to the issue explaining where you are stuck or that you don't think the issue can be reproduced.
 
 #### Propose a solution for the job
-4. Do not propose solutions to jobs without the `Help Wanted` label applied. Any proposals submitted when that label is not present will not be reviewed.
+4. If you propose solutions to jobs without the Help Wanted label applied, know that the proposals will not be reviewed till the label is added and that we might never add the label, thus never hire a contributor
 5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
 6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).

From 99fb33786a725178e1b39c9c54988deb8707d8e6 Mon Sep 17 00:00:00 2001
From: Ionatan Wiznia <ionatan@expensify.com>
Date: Tue, 18 Apr 2023 22:57:39 +0200
Subject: [PATCH 81/92] Update wording slightly

---
 contributingGuides/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 7e0fb7c93640..6ef477886af8 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -111,7 +111,7 @@ Additionally if you want to discuss an idea with the open source community witho
 3. If you cannot reproduce the problem, pause on this step and add a comment to the issue explaining where you are stuck or that you don't think the issue can be reproduced.
 
 #### Propose a solution for the job
-4. If you propose solutions to jobs without the Help Wanted label applied, know that the proposals will not be reviewed till the label is added and that we might never add the label, thus never hire a contributor
+4. You can propose solutions on any issue at at any time, but if you propose solutions to jobs before the `Help Wanted` is label applied, you do so at your own risk. Proposals will not be reviewed until the label is added and there is always a chance that we might not add the label or hire an external contributor for the job.
 5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
 6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).

From b7c52f9adcfe26ff2682e312bff3d630a5209d15 Mon Sep 17 00:00:00 2001
From: Ionatan Wiznia <ionatan@expensify.com>
Date: Tue, 18 Apr 2023 23:07:20 +0200
Subject: [PATCH 82/92] Update contributingGuides/CONTRIBUTING.md

Co-authored-by: Puneet Lath <puneet@expensify.com>
---
 contributingGuides/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 6ef477886af8..3c6bcd30e6bc 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -111,7 +111,7 @@ Additionally if you want to discuss an idea with the open source community witho
 3. If you cannot reproduce the problem, pause on this step and add a comment to the issue explaining where you are stuck or that you don't think the issue can be reproduced.
 
 #### Propose a solution for the job
-4. You can propose solutions on any issue at at any time, but if you propose solutions to jobs before the `Help Wanted` is label applied, you do so at your own risk. Proposals will not be reviewed until the label is added and there is always a chance that we might not add the label or hire an external contributor for the job.
+4. You can propose solutions on any issue at at any time, but if you propose solutions to jobs before the `Help Wanted` label is applied, you do so at your own risk. Proposals will not be reviewed until the label is added and there is always a chance that we might not add the label or hire an external contributor for the job.
 5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
 6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).

From 39b93f258679484cc0d82e05968b0fa1bc3406c0 Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Tue, 18 Apr 2023 23:12:19 +0200
Subject: [PATCH 83/92] add padding bottom to base modal

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

diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index 4a2bcac6c183..e35bc940f7e0 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -422,20 +422,17 @@ function getModalPaddingStyles({
     modalContainerStylePaddingBottom,
     insets,
 }) {
-    // set fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
+    // use fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
     // More info: issue #17376
-    if (insets.bottom === 0) {
-        // eslint-disable-next-line no-param-reassign
-        safeAreaPaddingBottom = modalContainerStylePaddingTop;
-    }
+    const safeAreaPaddingBottomWithFallback = insets.bottom === 0 ? modalContainerStylePaddingTop : safeAreaPaddingBottom;
     return {
         marginTop: (modalContainerStyleMarginTop || 0) + (shouldAddTopSafeAreaMargin ? safeAreaPaddingTop : 0),
-        marginBottom: (modalContainerStyleMarginBottom || 0) + (shouldAddBottomSafeAreaMargin ? safeAreaPaddingBottom : 0),
+        marginBottom: (modalContainerStyleMarginBottom || 0) + (shouldAddBottomSafeAreaMargin ? safeAreaPaddingBottomWithFallback : 0),
         paddingTop: shouldAddTopSafeAreaPadding
             ? (modalContainerStylePaddingTop || 0) + safeAreaPaddingTop
             : modalContainerStylePaddingTop || 0,
         paddingBottom: shouldAddBottomSafeAreaPadding
-            ? (modalContainerStylePaddingBottom || 0) + safeAreaPaddingBottom
+            ? (modalContainerStylePaddingBottom || 0) + safeAreaPaddingBottomWithFallback
             : modalContainerStylePaddingBottom || 0,
         paddingLeft: safeAreaPaddingLeft || 0,
         paddingRight: safeAreaPaddingRight || 0,

From b1affebcbfa6df53dde2132a2a37ace0f949ec73 Mon Sep 17 00:00:00 2001
From: ahmedGaber93 <a.gaber0093@gmail.com>
Date: Tue, 18 Apr 2023 23:17:48 +0200
Subject: [PATCH 84/92] add padding bottom to base modal

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

diff --git a/src/styles/StyleUtils.js b/src/styles/StyleUtils.js
index e35bc940f7e0..b113feb07d3c 100644
--- a/src/styles/StyleUtils.js
+++ b/src/styles/StyleUtils.js
@@ -424,7 +424,7 @@ function getModalPaddingStyles({
 }) {
     // use fallback value for safeAreaPaddingBottom to keep padding bottom consistent with padding top.
     // More info: issue #17376
-    const safeAreaPaddingBottomWithFallback = insets.bottom === 0 ? modalContainerStylePaddingTop : safeAreaPaddingBottom;
+    const safeAreaPaddingBottomWithFallback = insets.bottom === 0 ? (modalContainerStylePaddingTop || 0) : safeAreaPaddingBottom;
     return {
         marginTop: (modalContainerStyleMarginTop || 0) + (shouldAddTopSafeAreaMargin ? safeAreaPaddingTop : 0),
         marginBottom: (modalContainerStyleMarginBottom || 0) + (shouldAddBottomSafeAreaMargin ? safeAreaPaddingBottomWithFallback : 0),

From 31e980c4776616cf1fca34addde8ea36e11f98b1 Mon Sep 17 00:00:00 2001
From: Jack Nam <jack@expensify.com>
Date: Tue, 18 Apr 2023 14:53:06 -0700
Subject: [PATCH 85/92] Add note

---
 src/pages/NewTaskPage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/NewTaskPage.js b/src/pages/NewTaskPage.js
index a102038e998e..a93025dfd5a6 100644
--- a/src/pages/NewTaskPage.js
+++ b/src/pages/NewTaskPage.js
@@ -24,6 +24,7 @@ const defaultProps = {
     betas: [],
 };
 
+// NOTE: This page is going to be updated in https://github.com/Expensify/App/issues/16855, this is just a placeholder for now
 const NewTaskPage = (props) => {
     /**
      * @param {Object} values - form input values passed by the Form component

From 41f98782fa92179c69ba5dd93fb68a54609360b5 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 19 Apr 2023 10:14:46 +0700
Subject: [PATCH 86/92] readd lastMessageText in optimistic report, remove
 guard condition for empty message

---
 src/libs/ReportActionsUtils.js | 4 ----
 src/libs/actions/Report.js     | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index d48ddae1ba40..2e9ea66f7fd4 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -151,10 +151,6 @@ function getLastVisibleMessageText(reportID, actionsToMerge = {}) {
     const lastVisibleAction = getLastVisibleAction(reportID, actionsToMerge);
     const message = lodashGet(lastVisibleAction, ['message', 0], {});
 
-    if (_.isEmpty(message)) {
-        return '';
-    }
-
     if (isReportMessageAttachment(message)) {
         return CONST.ATTACHMENT_MESSAGE_TEXT;
     }
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 513a70c1e743..5f6b81dab4f2 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -693,6 +693,7 @@ function deleteReportComment(reportID, reportAction) {
     // If we are deleting the last visible message, let's find the previous visible one (or set an empty one if there are none) and update the lastMessageText in the LHN.
     // Similarly, if we are deleting the last read comment we will want to update the lastVisibleActionCreated to use the previous visible message.
     let optimisticReport = {
+        lastMessageText: '',
         lastVisibleActionCreated: '',
     };
     const lastMessageText = ReportActionsUtils.getLastVisibleMessageText(reportID, optimisticReportActions);

From 66742fe37865ccddadff844d3b86bc5cc41fa2a6 Mon Sep 17 00:00:00 2001
From: laurenreidexpensify
 <62073721+laurenreidexpensify@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:08:43 +0100
Subject: [PATCH 87/92] Updating translation of DC

---
 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 46f14b8a9d29..de7b2e8be756 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -1451,7 +1451,7 @@ export default {
         },
         DC: {
             stateISO: 'DC',
-            stateName: 'District Of Columbia',
+            stateName: 'Distrito de Columbia',
         },
     },
     allCountries: {

From c8c2d0fcc60d6b7fdf139d6f37b4909668af96a0 Mon Sep 17 00:00:00 2001
From: Cristi Paval <cristi@expensify.com>
Date: Wed, 19 Apr 2023 15:14:17 +0300
Subject: [PATCH 88/92] useCallback for the click event

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

diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index 1418e2e2be4f..0363f939cf77 100644
--- a/src/components/ValidateCode/ValidateCodeModal.js
+++ b/src/components/ValidateCode/ValidateCodeModal.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import PropTypes from 'prop-types';
 import {compose} from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -40,6 +40,8 @@ const defaultProps = {
 };
 
 function ValidateCodeModal(props) {
+    const signInHere = useCallback(() => Session.signInWithValidateCode(props.accountID, props.code), [props.accountID, props.code]);
+
     return (
         <View style={styles.deeplinkWrapperContainer}>
             <View style={styles.deeplinkWrapperMessage}>
@@ -61,7 +63,7 @@ function ValidateCodeModal(props) {
                                 <>
                                     {props.translate('validateCodeModal.or')}
                                     {' '}
-                                    <TextLink onPress={() => Session.signInWithValidateCode(props.accountID, props.code)}>
+                                    <TextLink onPress={signInHere}>
                                         {props.translate('validateCodeModal.signInHere')}
                                     </TextLink>
                                 </>

From 0e64b4127acd2c675f934f59e659d20a8b8a1bd1 Mon Sep 17 00:00:00 2001
From: Florent De Neve <florent@expensify.com>
Date: Wed, 19 Apr 2023 11:20:32 -0400
Subject: [PATCH 89/92] Move the default to where we use the undefined value

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

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 2f15a6689ae8..5fc03ab77e67 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -230,7 +230,7 @@ function getOptionData(reportID) {
     };
 
     const participantPersonalDetailList = _.values(OptionsListUtils.getPersonalDetailsForLogins(report.participants, personalDetails));
-    const personalDetail = participantPersonalDetailList[0] || {login: ''};
+    const personalDetail = participantPersonalDetailList[0] || {};
 
     result.isChatRoom = ReportUtils.isChatRoom(report);
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
@@ -252,7 +252,7 @@ function getOptionData(reportID) {
     const hasMultipleParticipants = participantPersonalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
     const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
 
-    const login = Str.removeSMSDomain(personalDetail.login);
+    const login = Str.removeSMSDomain(personalDetail.login || '');
     const formattedLogin = Str.isSMSLogin(login) ? LocalePhoneNumber.formatPhoneNumber(login) : login;
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.

From 66b37f343c03d895d9aae86221394020b5aa82fa Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 19 Apr 2023 16:56:10 +0000
Subject: [PATCH 90/92] Update version to 1.3.2-0

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index a1a19290e3c3..dca09c9c3980 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030103
-        versionName "1.3.1-3"
+        versionCode 1001030200
+        versionName "1.3.2-0"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 85007ad6690f..93bcb85ce50d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.1.3</string>
+	<string>1.3.2.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 18f96a4cb305..5bfda0c53514 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.1.3</string>
+	<string>1.3.2.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 9f07c5a1ad97..6873f96a4c12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-3",
+  "version": "1.3.2-0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.1-3",
+      "version": "1.3.2-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9348c8e771ba..4f344ea61115 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.1-3",
+  "version": "1.3.2-0",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From ff6f7776764cdfc5542fd45459a9f5351d3d55cc Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 19 Apr 2023 16:59:58 +0000
Subject: [PATCH 91/92] Update version to 1.3.2-1

---
 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 dca09c9c3980..b9fdba0b4425 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030200
-        versionName "1.3.2-0"
+        versionCode 1001030201
+        versionName "1.3.2-1"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 93bcb85ce50d..302a16f65f69 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.2.0</string>
+	<string>1.3.2.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5bfda0c53514..899b011d7311 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.2.0</string>
+	<string>1.3.2.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6873f96a4c12..056291c35c0d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.2-0",
+  "version": "1.3.2-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.2-0",
+      "version": "1.3.2-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 4f344ea61115..e443008d97c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.2-0",
+  "version": "1.3.2-1",
   "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 f0d20a37fcb026f9c15834bffec1edc015c73ac8 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 19 Apr 2023 17:53:43 +0000
Subject: [PATCH 92/92] Update version to 1.3.2-2

---
 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 b9fdba0b4425..76e6e8fbba5b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030201
-        versionName "1.3.2-1"
+        versionCode 1001030202
+        versionName "1.3.2-2"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 302a16f65f69..8cc92a42a4a0 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.2.1</string>
+	<string>1.3.2.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 899b011d7311..eb4f6d0326a7 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.2.1</string>
+	<string>1.3.2.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 056291c35c0d..b4291421f19c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.2-1",
+  "version": "1.3.2-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.2-1",
+      "version": "1.3.2-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e443008d97c6..2315146aed39 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.2-1",
+  "version": "1.3.2-2",
   "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.",