From 5fa2367e968b055eeb8295c48ac2425ccf4f2580 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 19 Jul 2022 15:29:53 -0400
Subject: [PATCH 1/2] Merge pull request #10011 from
Expensify/version-BUILD-60646A67-35A8-4CE6-A9BC-A9F93DB09EBD
Update version to 1.1.85-5 on main
(cherry picked from commit 4bbfc43755e527d723b618db83d01927e1f48d78)
---
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 c23b4520159..86b49122bad 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 1001018504
- versionName "1.1.85-4"
+ versionCode 1001018505
+ versionName "1.1.85-5"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 27e339d36c7..8c3237fe662 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.85.4
+ 1.1.85.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b8167c7200d..a66aa9c97c4 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.85.4
+ 1.1.85.5
diff --git a/package-lock.json b/package-lock.json
index d98703ee77e..b16198eb3ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-4",
+ "version": "1.1.85-5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 30bd832e0c2..e6dd7e18002 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-4",
+ "version": "1.1.85-5",
"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 caf8b5b8fdbf1987a02d5a02c8d749d5968e9599 Mon Sep 17 00:00:00 2001
From: Neil Marcellini
Date: Tue, 19 Jul 2022 12:10:39 -0700
Subject: [PATCH 2/2] Merge pull request #10008 from Expensify/neil-onyx-1.0.10
Update Onyx to 1.0.10
(cherry picked from commit 4bd5d589288f0f38e54fa1c7cb64cee4cbdf227d)
---
package-lock.json | 6 +++---
package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b16198eb3ab..8e31dc3aa8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43503,9 +43503,9 @@
}
},
"react-native-onyx": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.8.tgz",
- "integrity": "sha512-PcYb/EessNvcuQtRHhoax1P4xzzUdywCQTOl2OE9AGPGym/ob7Tj/IgP4XhyTj4K91lV004hNvTQdv8WpSd0VA==",
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.10.tgz",
+ "integrity": "sha512-cWKb/LEDtVCeVoYP8OIbb2Xz4aYjqtRaDxHrWmSB5TtSeEQa0JztJzJt9EnTQ0+Xbc2VE0eHBBvBbWUrPQVsVg==",
"requires": {
"ascii-table": "0.0.9",
"lodash": "^4.17.21",
diff --git a/package.json b/package.json
index e6dd7e18002..12ce50c8408 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
"react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
"react-native-keyboard-spacer": "^0.4.1",
"react-native-modal": "^13.0.0",
- "react-native-onyx": "1.0.8",
+ "react-native-onyx": "1.0.10",
"react-native-pdf": "^6.2.2",
"react-native-performance": "^2.0.0",
"react-native-permissions": "^3.0.1",