Skip to content

🍒 Cherry pick PR #11634 to staging 🍒 #11649

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

Merged
OSBotify merged 2 commits into from
Oct 6, 2022
Merged

🍒 Cherry pick PR #11634 to staging 🍒 #11649

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
94f6fc6
Merge pull request #11648 from Expensify/version-BUILD-2B4A3FBF-C392-…
OSBotify Oct 6, 2022
f411797
Merge pull request #11634 from Expensify/john-fix-no-comment-reports
tgolen Oct 6, 2022
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 @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001021201
versionName "1.2.12-1"
versionCode 1001021202
versionName "1.2.12-2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
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.2.12.1</string>
<string>1.2.12.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.2.12.1</string>
<string>1.2.12.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.2.12-1",
"version": "1.2.12-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
4 changes: 2 additions & 2 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,9 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr
}

// Exclude reports that don't have any comments
// Archived rooms or user created policy rooms are OK to show when the don't have any comments
// User created policy rooms are OK to show when the don't have any comments, only if they aren't archived.
const hasNoComments = report.lastMessageTimestamp === 0;
if (hasNoComments && (isArchivedRoom(report) || isUserCreatedPolicyRoom(report))) {
if (hasNoComments && (isArchivedRoom(report) || !isUserCreatedPolicyRoom(report))) {
return false;
}

Expand Down
19 changes: 9 additions & 10 deletions tests/unit/LHNFilterTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,17 +247,16 @@ describe('Sidebar', () => {

// Given these combinations of booleans which result in the report being filtered out (not shown).
const booleansWhichRemovesInactiveReport = [
// isUserCreatedPolicyRoom
JSON.stringify([false, false, true, false, false, false, false]),
JSON.stringify([false, false, false, false, false, false, false]),

// isUserCreatedPolicyRoom, isUnread
JSON.stringify([false, false, true, false, true, false, false]),
// isUnread
JSON.stringify([false, false, false, false, true, false, false]),

// isUserCreatedPolicyRoom, hasAddWorkspaceError
JSON.stringify([false, false, true, true, false, false, false]),
// hasAddWorkspaceError, isUnread
JSON.stringify([false, false, false, true, true, false, false]),

// isUserCreatedPolicyRoom, hasAddWorkspaceError, isUnread
JSON.stringify([false, false, true, true, true, false, false]),
// hasAddWorkspaceError
JSON.stringify([false, false, false, true, false, false, false]),

// isArchived
JSON.stringify([false, true, false, false, false, false, false]),
Expand Down Expand Up @@ -563,10 +562,10 @@ describe('Sidebar', () => {
const booleansWhichRemovesInactiveReport = [
JSON.stringify([false, false, false, false, false, false, false]),
JSON.stringify([false, false, false, true, false, false, false]),
JSON.stringify([false, false, false, false, true, false, false]),
JSON.stringify([false, false, false, true, true, false, false]),
JSON.stringify([false, false, true, false, false, false, false]),
JSON.stringify([false, false, true, false, true, false, false]),
JSON.stringify([false, false, true, true, false, false, false]),
JSON.stringify([false, false, true, true, true, false, false]),
JSON.stringify([false, true, false, false, false, false, false]),
JSON.stringify([false, true, false, false, true, false, false]),
JSON.stringify([false, true, false, true, false, false, false]),
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/OptionsListUtilsTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ describe('OptionsListUtils', () => {
// Then the 2 personalDetails that don't have reports should be returned
expect(results.personalDetails.length).toBe(2);

// Then all of the reports should be shown, including the one that has no message on them.
expect(results.recentReports.length).toBe(_.size(REPORTS));
// Then all of the reports should be shown EXCEPT the archived room, including the one that has no message on them.
expect(results.recentReports.length).toBe(_.size(REPORTS) - 1);

// When we filter again but provide a searchValue
results = OptionsListUtils.getSearchOptions(REPORTS, PERSONAL_DETAILS, 'spider');
Expand Down