From e7cdf9b5b7ba31487717d9ae8d41b135fe89a581 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 14 Oct 2021 08:10:14 -0700
Subject: [PATCH 1/2] Merge pull request #5844 from
Expensify/version-BUILD-c9926d910fd3ebe4ebb16d0c7cea43dea0a732c3
(cherry picked from commit daf81bcf39f720a6facb4823ca935b8354dc0949)
---
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 6a8f5a4d529..22e8e3b8650 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 1001010716
- versionName "1.1.7-16"
+ versionCode 1001010717
+ versionName "1.1.7-17"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2edf5cebebd..392b962e14b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
CFBundleVersion
- 1.1.7.16
+ 1.1.7.17
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b460baf60e0..96e91bd3fed 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.7.16
+ 1.1.7.17
diff --git a/package-lock.json b/package-lock.json
index 54356072678..aef5c331426 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-16",
+ "version": "1.1.7-17",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 1aa63fc3d5c..f9f6b3f4e1c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.7-16",
+ "version": "1.1.7-17",
"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 35c0dea039c0ffd5a22bd8df5b5bb1b869db89f5 Mon Sep 17 00:00:00 2001
From: Nathalie Kuoch
Date: Mon, 11 Oct 2021 13:58:31 +0200
Subject: [PATCH 2/2] Merge pull request #5747 from Expensify/alberto-routeCard
Route to the main workspace screen now that it is in rightpane
(cherry picked from commit 00d3ea47193b355d6bc14fd7c44d6a8a89285efe)
---
src/libs/actions/Policy.js | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 2dac2974a4c..cc2e4b356fc 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -106,6 +106,7 @@ function getPolicyList() {
API.GetPolicyList()
.then((data) => {
if (data.jsonCode === 200) {
+<<<<<<< HEAD
const policyDataToStore = _.reduce(data.policyList, (memo, policy) => ({
...memo,
[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: {
@@ -113,6 +114,22 @@ function getPolicyList() {
avatarURL: lodashGet(policy, 'value.avatarURL', ''),
},
}), {});
+=======
+ const policyDataToStore = transformPolicyListToOnyxCollection(data.policySummaryList || []);
+ updateAllPolicies(policyDataToStore);
+ }
+
+ if (shouldCreateNewPolicy) {
+ Navigation.dismissModal();
+ Navigation.navigate(newPolicyID ? ROUTES.getWorkspaceInitialRoute(newPolicyID) : ROUTES.HOME);
+ }
+
+ return API.GetPolicyList();
+ })
+ .then((data) => {
+ if (data.jsonCode === 200) {
+ const policyDataToStore = transformPolicyListToOnyxCollection(data.policyList || []);
+>>>>>>> 00d3ea471 (Merge pull request #5747 from Expensify/alberto-routeCard)
updateAllPolicies(policyDataToStore);
}
});