Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #17792 to staging 🍒 #17794

Merged
merged 2 commits into from
Apr 21, 2023
Merged

🍒 Cherry pick PR #17792 to staging 🍒 #17794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0547096
Merge pull request #17793 from Expensify/version-BUILD-82DFF6C2-3E8D-…
OSBotify Apr 21, 2023
2b05edf
Merge pull request #17792 from Expensify/rocio-RemoveThis
johnmlee101 Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
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 1001030301
versionName "1.3.3-1"
versionCode 1001030302
versionName "1.3.3-2"
}

splits {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.3.3.1</string>
<string>1.3.3.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
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.3.1</string>
<string>1.3.3.2</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.3.3-1",
"version": "1.3.3-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.",
Expand Down
18 changes: 9 additions & 9 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,14 @@ function canLeaveRoom(report, isPolicyMember) {
return true;
}

/**
* @param {string[]} participants
* @returns {Boolean}
*/
function isCurrentUserTheOnlyParticipant(participants) {
return participants && participants.length === 1 && participants[0] === sessionEmail;
}

/**
* Returns display names for those that can see the whisper.
* However, it returns "you" if the current user is the only one who can see it besides the person that sent it.
Expand All @@ -1711,7 +1719,7 @@ function canLeaveRoom(report, isPolicyMember) {
* @returns {string}
*/
function getWhisperDisplayNames(participants) {
const isWhisperOnlyVisibleToCurrentUSer = this.isCurrentUserTheOnlyParticipant(participants);
const isWhisperOnlyVisibleToCurrentUSer = isCurrentUserTheOnlyParticipant(participants);

// When the current user is the only participant, the display name needs to be "you" because that's the only person reading it
if (isWhisperOnlyVisibleToCurrentUSer) {
Expand All @@ -1721,14 +1729,6 @@ function getWhisperDisplayNames(participants) {
return _.map(participants, login => getDisplayNameForParticipant(login, !isWhisperOnlyVisibleToCurrentUSer)).join(', ');
}

/**
* @param {string[]} participants
* @returns {Boolean}
*/
function isCurrentUserTheOnlyParticipant(participants) {
return participants && participants.length === 1 && participants[0] === sessionEmail;
}

export {
getReportParticipantsTitle,
isReportMessageAttachment,
Expand Down