Merge pull request #21134 from Expensify/OSBotify-cherry-pick-staging…

…-21113 🍒 Cherry pick PR #21113 to staging 🍒
Expensify · Jun 20, 2023 · 23f59d1 · 23f59d1
2 parents f7eb7c4 + a10b11c
commit 23f59d1
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git 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 1001032907
-        versionName "1.3.29-7"
+        versionCode 1001032908
+        versionName "1.3.29-8"
     }
 
     splits {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.29.7</string>
+	<string>1.3.29.8</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git 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.29.7</string>
+	<string>1.3.29.8</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.29-7",
+  "version": "1.3.29-8",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
@@ -155,15 +155,15 @@ function MoneyRequestConfirmationList(props) {
             const formattedParticipantsList = _.union(formattedSelectedParticipants, formattedUnselectedParticipants);
 
             const myIOUAmount = IOUUtils.calculateAmount(selectedParticipants.length, props.iouAmount, true);
-            const formattedPayeePersonalDetails = OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(
+            const formattedPayeeOption = OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(
                 payeePersonalDetails,
                 CurrencyUtils.convertToDisplayString(myIOUAmount, props.iouCurrencyCode),
             );
 
             sections.push(
                 {
                     title: translate('moneyRequestConfirmationList.whoPaid'),
-                    data: [formattedPayeePersonalDetails],
+                    data: [formattedPayeeOption],
                     shouldShow: true,
                     indexOffset: 0,
                 },
@@ -211,21 +211,21 @@ function MoneyRequestConfirmationList(props) {
     const toggleOption = useCallback(
         (option) => {
             // Return early if selected option is currently logged in user.
-            if (option.login === props.session.email) {
+            if (option.accountID === props.session.accountID) {
                 return;
             }
 
             setParticipants((prevParticipants) => {
                 const newParticipants = _.map(prevParticipants, (participant) => {
-                    if (participant.login === option.login) {
+                    if (participant.accountID === option.accountID) {
                         return {...participant, selected: !participant.selected};
                     }
                     return participant;
                 });
                 return newParticipants;
             });
         },
-        [props.session.email],
+        [props.session.accountID],
     );
 
     /**

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
@@ -135,7 +135,7 @@ class OptionRow extends Component {
 
         // 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(
-            (this.props.option.participantsList || this.props.option.login ? [this.props.option] : []).slice(0, 10),
+            (this.props.option.participantsList || this.props.option.accountID ? [this.props.option] : []).slice(0, 10),
             isMultipleParticipant,
         );
         let subscriptColor = themeColors.appBG;

diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
@@ -168,7 +168,7 @@ class BaseOptionsList extends Component {
                 hoverStyle={this.props.optionHoveredStyle}
                 optionIsFocused={!this.props.disableFocusOptions && !isDisabled && this.props.focusedIndex === index + section.indexOffset}
                 onSelectRow={this.props.onSelectRow}
-                isSelected={Boolean(_.find(this.props.selectedOptions, (option) => option.login === item.login))}
+                isSelected={Boolean(_.find(this.props.selectedOptions, (option) => option.accountID === item.accountID))}
                 showSelectedState={this.props.canSelectMultipleOptions}
                 boldStyle={this.props.boldStyle}
                 isDisabled={isDisabled}

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -216,18 +216,19 @@ function isPersonalDetailsReady(personalDetails) {
 function getParticipantsOptions(report, personalDetails) {
     const participants = lodashGet(report, 'participantAccountIDs', []);
     return _.map(getPersonalDetailsForAccountIDs(participants, personalDetails), (details) => ({
-        keyForList: details.login,
+        keyForList: String(details.accountID),
         login: details.login,
         accountID: details.accountID,
         text: details.displayName,
         firstName: lodashGet(details, 'firstName', ''),
         lastName: lodashGet(details, 'lastName', ''),
-        alternateText: Str.isSMSLogin(details.login || '') ? LocalePhoneNumber.formatPhoneNumber(details.login) : details.login,
+        alternateText: Str.isSMSLogin(details.login || '') ? LocalePhoneNumber.formatPhoneNumber(details.login) : details.login || details.displayName,
         icons: [
             {
                 source: UserUtils.getAvatar(details.avatar, details.accountID),
                 name: details.login,
                 type: CONST.ICON_TYPE_AVATAR,
+                id: details.accountID,
             },
         ],
         payPalMeAddress: lodashGet(details, 'payPalMeAddress', ''),
@@ -857,12 +858,13 @@ function getSearchOptions(reports, personalDetails, searchValue = '', betas) {
 function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail, amountText) {
     return {
         text: personalDetail.displayName ? personalDetail.displayName : personalDetail.login,
-        alternateText: personalDetail.login,
+        alternateText: personalDetail.login || personalDetail.displayName,
         icons: [
             {
                 source: UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID),
                 name: personalDetail.login,
                 type: CONST.ICON_TYPE_AVATAR,
+                id: personalDetail.accountID,
             },
         ],
         descriptiveText: amountText,

diff --git a/src/pages/iou/MoneyRequestModal.js b/src/pages/iou/MoneyRequestModal.js
@@ -52,7 +52,7 @@ const propTypes = {
     }),
 
     /** Personal details of all the users */
-    personalDetails: PropTypes.shape({
+    allPersonalDetails: PropTypes.shape({
         /** Primary login of participant */
         login: PropTypes.string,
 
@@ -81,7 +81,7 @@ const defaultProps = {
     currentUserPersonalDetails: {
         localCurrencyCode: CONST.CURRENCY.USD,
     },
-    personalDetails: {},
+    allPersonalDetails: {},
     iou: {
         error: false,
         selectedCurrencyCode: null,
@@ -108,7 +108,7 @@ function MoneyRequestModal(props) {
     const [selectedOptions, setSelectedOptions] = useState(
         ReportUtils.isPolicyExpenseChat(props.report)
             ? OptionsListUtils.getPolicyExpenseReportOptions(props.report)
-            : OptionsListUtils.getParticipantsOptions(props.report, props.personalDetails),
+            : OptionsListUtils.getParticipantsOptions(props.report, props.allPersonalDetails),
     );
     const [amount, setAmount] = useState(0);
 
@@ -442,7 +442,7 @@ export default compose(
         iou: {
             key: ONYXKEYS.IOU,
         },
-        personalDetails: {
+        allPersonalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
     }),