From e44e7e83547346e6215f5ff436909b8b05389722 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 22 Jul 2022 16:57:03 -0400 Subject: [PATCH 1/2] Merge pull request #10063 from Expensify/version-BUILD-AAA6EAA6-F264-46C6-B7D8-89D87F5E1F50 Update version to 1.1.85-8 on main (cherry picked from commit 4b9f884c5539211effaee842e525fb27118f63e1) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index aed76e6becb4..363d01f59456 100644 --- 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 1001018507 - versionName "1.1.85-7" + versionCode 1001018508 + versionName "1.1.85-8" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 780c3cd4780a..9bbbbf689168 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.85.7 + 1.1.85.8 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index ad0bf14ea4ef..d75ea9a05b32 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.85.7 + 1.1.85.8 diff --git a/package-lock.json b/package-lock.json index 4c530b4ed044..338ef72417d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.85-7", + "version": "1.1.85-8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a1c25573e12f..6783ec12df91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.85-7", + "version": "1.1.85-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.", From 15481ce93a7ea576ac5c5bddd33a768e73ca4c12 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Fri, 22 Jul 2022 13:48:48 -0700 Subject: [PATCH 2/2] Merge pull request #10062 from Expensify/chirag-comment-update-to-CP Minor comment change to test CP (cherry picked from commit 954f89121ce9fb298acea8e33e0db28485eec299) --- src/libs/actions/Report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index ee146c5d1515..6137ed45df53 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -132,7 +132,7 @@ function getParticipantEmailsFromReport({sharedReportList, reportNameValuePairs, /** * Only store the minimal amount of data in Onyx that needs to be stored - * because space is limited + * because space is limited. * * @param {Object} report * @param {Number} report.reportID