From 9a695291b363726c6ea76db25be7d2e4b0919766 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 28 Nov 2022 14:48:51 -0500
Subject: [PATCH 1/2] Merge pull request #13094 from
Expensify/version-BUILD-BA1A2C4E-20DC-480B-8BA9-6C251F786BA6
Update version to 1.2.32-2 on main
(cherry picked from commit c5cce9ba1221ea02bbb54858ea83d6ffc39e3dfe)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6aed5160a7702..ed7825d461e41 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001023201
- versionName "1.2.32-1"
+ versionCode 1001023202
+ versionName "1.2.32-2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index d6f5550d8cbc5..7c154d59d46b6 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.32.1
+ 1.2.32.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 3e6b38479d825..640ffee68a346 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.32.1
+ 1.2.32.2
diff --git a/package-lock.json b/package-lock.json
index b23b6424926e3..789c9bde717d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.32-1",
+ "version": "1.2.32-2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.32-1",
+ "version": "1.2.32-2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index b2d4fc06e9549..26c16ac9386d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.32-1",
+ "version": "1.2.32-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.",
From 0688e9e6a80643346f1dab8b287052be85190294 Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian
Date: Mon, 28 Nov 2022 11:42:11 -0800
Subject: [PATCH 2/2] Merge pull request #13093 from Expensify/cmartins-fixSort
Sort archived rooms using Unix epoch
(cherry picked from commit 3d3feee72b0229e54d23f597e10a291eb83b95f4)
---
src/CONST.js | 1 +
src/libs/OptionsListUtils.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/CONST.js b/src/CONST.js
index e1fbe4c194d39..a307f203d3e1f 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -40,6 +40,7 @@ const CONST = {
},
DATE: {
MOMENT_FORMAT_STRING: 'YYYY-MM-DD',
+ UNIX_EPOCH: '1970-01-01 00:00:00.000',
},
SMS: {
DOMAIN: '@expensify.sms',
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 50c60eeea5a92..15c531aa6da95 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -464,7 +464,7 @@ function getOptions(reports, personalDetails, {
// - All archived reports should remain at the bottom
const orderedReports = _.sortBy(filteredReports, (report) => {
if (ReportUtils.isArchivedRoom(report)) {
- return -Infinity;
+ return CONST.DATE.UNIX_EPOCH;
}
return report.lastActionCreated;