From e82c735c03496e3c228f47b6f4910d931d749d71 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:37:02 -0700
Subject: [PATCH 1/2] Merge pull request #4713 from
Expensify/version-BUILD-a27fbfca935c63b5284c51d90712b19ffbd8f296
(cherry picked from commit bd863d61b3e0161dcce0e0085f02a10923bea876)
---
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 87a6aacb8bbf..c5a2f3deabec 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001008601
- versionName "1.0.86-1"
+ versionCode 1001008602
+ versionName "1.0.86-2"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 121e687f2f42..4cc608c2c9da 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.86.1
+ 1.0.86.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f352246bf05c..bb95038faaf4 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.86.1
+ 1.0.86.2
diff --git a/package-lock.json b/package-lock.json
index a5a21ccb19fd..58d5b341c72a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.86-1",
+ "version": "1.0.86-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 97cbce2d4621..6eb828cbda42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.0.86-1",
+ "version": "1.0.86-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 774a28d9894fade86cb11a4bd59331f65efc4f5f Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Tue, 17 Aug 2021 13:35:01 -1000
Subject: [PATCH 2/2] Merge pull request #4676 from
Expensify/marcaaron-updateOnyx2
Update withOnyx to fix prop dependent key updates
(cherry picked from commit a27fbfca935c63b5284c51d90712b19ffbd8f296)
---
package-lock.json | 4 ++--
package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 58d5b341c72a..ab5d518b58ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36092,8 +36092,8 @@
}
},
"react-native-onyx": {
- "version": "git+https://github.com/Expensify/react-native-onyx.git#8ec207377f0fb1a83989118e60fb90b9bda0aaca",
- "from": "git+https://github.com/Expensify/react-native-onyx.git#8ec207377f0fb1a83989118e60fb90b9bda0aaca",
+ "version": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41",
+ "from": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41",
"requires": {
"ascii-table": "0.0.9",
"expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c",
diff --git a/package.json b/package.json
index 6eb828cbda42..8a4aab7649ab 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
"react-native-image-picker": "^4.0.3",
"react-native-keyboard-spacer": "^0.4.1",
"react-native-modal": "^11.10.0",
- "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#8ec207377f0fb1a83989118e60fb90b9bda0aaca",
+ "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#57ca276b3b83f38bc8825f98f7e68287a1e2af41",
"react-native-pdf": "^6.2.2",
"react-native-performance": "^2.0.0",
"react-native-permissions": "^3.0.1",