Skip to content

🍒 Cherry pick PR #6531 to staging 🍒 #6533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OSBotify merged 2 commits into from
Nov 30, 2021
Merged

🍒 Cherry pick PR #6531 to staging 🍒 #6533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fabfe68
Merge pull request #6532 from Expensify/version-BUILD-8d8395f8ff2bb19…
OSBotify Nov 30, 2021
45ceecf
Merge pull request #6531 from Expensify/Rory-FixInfiniteLoopInWithFul…
chiragsalian Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
22 changes: 19 additions & 3 deletions src/pages/workspace/withFullPolicy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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({
Expand Down Expand Up @@ -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 (
Expand Down