Skip to content

Commit

Permalink
Merge pull request #18178 from Expensify/OSBotify-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-18173

🍒 Cherry pick PR #18173 to staging 🍒
  • Loading branch information
OSBotify authored Apr 28, 2023
2 parents f31cb46 + 31a1fdb commit 985e209
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 27 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001030806
versionName "1.3.8-6"
versionCode 1001030807
versionName "1.3.8-7"
}

splits {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.3.8.6</string>
<string>1.3.8.7</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.3.8.6</string>
<string>1.3.8.7</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.3.8-6",
"version": "1.3.8-7",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
38 changes: 18 additions & 20 deletions src/pages/ReportParticipantsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,25 @@ const defaultProps = {
const getAllParticipants = (report, personalDetails) => {
const {participants} = report;

return _.chain(participants)
.compact()
.map(participants, (login) => {
const userLogin = Str.removeSMSDomain(login);
const userPersonalDetail = lodashGet(personalDetails, login, {displayName: userLogin, avatar: ''});
return _.map(participants, (login) => {
const userLogin = Str.removeSMSDomain(login);
const userPersonalDetail = lodashGet(personalDetails, login, {displayName: userLogin, avatar: ''});

return ({
alternateText: userLogin,
displayName: userPersonalDetail.displayName,
icons: [{
source: ReportUtils.getAvatar(userPersonalDetail.avatar, login),
name: login,
type: CONST.ICON_TYPE_AVATAR,
}],
keyForList: userLogin,
login,
text: userPersonalDetail.displayName,
tooltipText: userLogin,
participantsList: [{login, displayName: userPersonalDetail.displayName}],
});
}).value();
return ({
alternateText: userLogin,
displayName: userPersonalDetail.displayName,
icons: [{
source: ReportUtils.getAvatar(userPersonalDetail.avatar, login),
name: login,
type: CONST.ICON_TYPE_AVATAR,
}],
keyForList: userLogin,
login,
text: userPersonalDetail.displayName,
tooltipText: userLogin,
participantsList: [{login, displayName: userPersonalDetail.displayName}],
});
});
};

const ReportParticipantsPage = (props) => {
Expand Down

0 comments on commit 985e209

Please sign in to comment.