Merge pull request #7243 from Expensify/update-staging-from-main

Expensify · Jan 14, 2022 · 91c7972 · 91c7972
2 parents 772de34 + a5439dc
commit 91c7972
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 37 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012907
-        versionName "1.1.29-7"
+        versionCode 1001012908
+        versionName "1.1.29-8"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.29.7</string>
+	<string>1.1.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.1.29.7</string>
+	<string>1.1.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.1.29-7",
+  "version": "1.1.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/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -358,6 +358,8 @@ function getOptions(reports, personalDetails, activeReportID, {
     includeRecentReports = false,
     prioritizePinnedReports = false,
     prioritizeDefaultRoomsInSearch = false,
+
+    // When sortByReportTypeInSearch flag is true, recentReports will include the personalDetails options as well.
     sortByReportTypeInSearch = false,
     sortByLastMessageTimestamp = false,
     searchValue = '',
@@ -371,7 +373,7 @@ function getOptions(reports, personalDetails, activeReportID, {
 }) {
     let recentReportOptions = [];
     const pinnedReportOptions = [];
-    const personalDetailsOptions = [];
+    let personalDetailsOptions = [];
     const iouDebtReportOptions = [];
     const draftReportOptions = [];
 
@@ -383,7 +385,10 @@ function getOptions(reports, personalDetails, activeReportID, {
         sortProperty = ['reportName'];
     }
     const sortDirection = [sortByAlphaAsc ? 'asc' : 'desc'];
-    const orderedReports = lodashOrderBy(reports, sortProperty, sortDirection);
+    let orderedReports = lodashOrderBy(reports, sortProperty, sortDirection);
+
+    // Move the archived Rooms to the last
+    orderedReports = _.sortBy(orderedReports, report => ReportUtils.isArchivedRoom(report));
 
     const allReportOptions = [];
     _.each(orderedReports, (report) => {
@@ -517,19 +522,6 @@ function getOptions(reports, personalDetails, activeReportID, {
         recentReportOptions = reportsSplitByDefaultChatRoom[0].concat(reportsSplitByDefaultChatRoom[1]);
     }
 
-    // If we are prioritizing 1:1 chats in search, do it only once we started searching
-    if (sortByReportTypeInSearch && searchValue !== '') {
-        recentReportOptions = lodashOrderBy(recentReportOptions, [(option) => {
-            if (option.isChatRoom || option.isArchivedRoom) {
-                return 3;
-            }
-            if (!option.login) {
-                return 2;
-            }
-            return 1;
-        }], ['asc']);
-    }
-
     if (includePersonalDetails) {
         // Next loop over all personal details removing any that are selectedUsers or recentChats
         _.each(allPersonalDetailsOptions, (personalDetailOption) => {
@@ -569,6 +561,22 @@ function getOptions(reports, personalDetails, activeReportID, {
         userToInvite.icons = [defaultAvatarForUserToInvite];
     }
 
+    // If we are prioritizing 1:1 chats in search, do it only once we started searching
+    if (sortByReportTypeInSearch && searchValue !== '') {
+        // When sortByReportTypeInSearch is true, recentReports will be returned with all the reports including personalDetailsOptions in the correct Order.
+        recentReportOptions.push(...personalDetailsOptions);
+        personalDetailsOptions = [];
+        recentReportOptions = lodashOrderBy(recentReportOptions, [(option) => {
+            if (option.isChatRoom || option.isArchivedRoom) {
+                return 3;
+            }
+            if (!option.login) {
+                return 2;
+            }
+            return 1;
+        }], ['asc']);
+    }
+
     return {
         personalDetails: personalDetailsOptions,
         recentReports: recentReportOptions,

diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
@@ -90,12 +90,18 @@ class SearchPage extends Component {
      * @returns {Array}
      */
     getSections() {
-        const sections = [{
-            title: this.props.translate('common.recents'),
-            data: this.state.recentReports.concat(this.state.personalDetails),
-            shouldShow: true,
-            indexOffset: 0,
-        }];
+        const sections = [
+            {
+                data: this.state.recentReports,
+                shouldShow: true,
+                indexOffset: 0,
+            },
+            {
+                data: this.state.personalDetails,
+                shouldShow: true,
+                indexOffset: this.state.recentReports.length,
+            },
+        ];
 
         if (this.state.userToInvite) {
             sections.push(({
@@ -169,16 +175,16 @@ class SearchPage extends Component {
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
                             <FullScreenLoadingIndicator visible={!didScreenTransitionEnd} />
                             {didScreenTransitionEnd && (
-                            <OptionsSelector
-                                sections={sections}
-                                value={this.state.searchValue}
-                                onSelectRow={this.selectReport}
-                                onChangeText={this.onChangeText}
-                                headerMessage={headerMessage}
-                                hideSectionHeaders
-                                hideAdditionalOptionStates
-                                showTitleTooltip
-                            />
+                                <OptionsSelector
+                                    sections={sections}
+                                    value={this.state.searchValue}
+                                    onSelectRow={this.selectReport}
+                                    onChangeText={this.onChangeText}
+                                    headerMessage={headerMessage}
+                                    hideSectionHeaders
+                                    hideAdditionalOptionStates
+                                    showTitleTooltip
+                                />
                             )}
                         </View>
                         <KeyboardSpacer />