Merge pull request #6533 from Expensify/OSBotify-cherry-pick-staging-…

…6531

android/app/build.gradle

@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001011701
-        versionName "1.1.17-1"
+        versionCode 1001011702
+        versionName "1.1.17-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.17.1</string>
+	<string>1.1.17.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.17.1</string>
+	<string>1.1.17.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.17-1",
+  "version": "1.1.17-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.",

src/pages/workspace/withFullPolicy.js

@@ -2,14 +2,16 @@ import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import React from 'react';
 import PropTypes from 'prop-types';
+import Str from 'expensify-common/lib/str';
 import {withOnyx} from 'react-native-onyx';
 import {useNavigationState} from '@react-navigation/native';
 import CONST from '../../CONST';
 import getComponentDisplayName from '../../libs/getComponentDisplayName';
 import * as Policy from '../../libs/actions/Policy';
 import ONYXKEYS from '../../ONYXKEYS';
 
-let previousRoute = '';
+let previousRouteName = '';
+let previousRoutePolicyID = '';
 
 /**
  * @param {Object} route
@@ -19,6 +21,19 @@ function getPolicyIDFromRoute(route) {
     return lodashGet(route, 'params.policyID', '');
 }
 
+/**
+ * @param {String} routeName
+ * @param {String} policyID
+ * @returns {Boolean}
+ */
+function isPreviousRouteInSameWorkspace(routeName, policyID) {
+    return (
+        Str.startsWith(routeName, 'Workspace')
+        && Str.startsWith(previousRouteName, 'Workspace')
+        && policyID === previousRoutePolicyID
+    );
+}
+
 const fullPolicyPropTypes = {
     /** The full policy object for the current route (as opposed to the policy summary object) */
     policy: PropTypes.shape({
@@ -74,11 +89,12 @@ export default function (WrappedComponent) {
         const currentRoute = _.last(useNavigationState(state => state.routes || []));
         const policyID = getPolicyIDFromRoute(currentRoute);
 
-        if (_.isString(policyID) && !previousRoute.includes(policyID)) {
+        if (_.isString(policyID) && !_.isEmpty(policyID) && !isPreviousRouteInSameWorkspace(currentRoute.name, policyID)) {
             Policy.loadFullPolicy(policyID);
         }
 
-        previousRoute = lodashGet(currentRoute, 'path', '');
+        previousRouteName = currentRoute.name;
+        previousRoutePolicyID = policyID;
 
         const rest = _.omit(props, ['forwardedRef', 'policy']);
         return (