Skip to content

Commit

Permalink
Merge pull request #3481 from Expensify/jules-iouFixPermissionsRegres…
Browse files Browse the repository at this point in the history
…sion

Update Permissions logic to fix IOU regression
  • Loading branch information
roryabraham authored Jun 9, 2021
2 parents e91af53 + e37cb15 commit 64f1307
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/libs/Permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,18 @@ function canUseIOU(betas) {
}

/**
* @param {Array<String>} betas
* @returns {Boolean}
*/
function canUsePayWithExpensify() {
function canUsePayWithExpensify(betas) {
return _.contains(betas, CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas();
}

/**
* @param {Array<String>} betas
* @returns {Boolean}
*/
function canUseFreePlan() {
function canUseFreePlan(betas) {
return _.contains(betas, CONST.BETAS.FREE_PLAN) || canUseAllBetas();
}

Expand Down
8 changes: 7 additions & 1 deletion src/pages/iou/IOUDetailsModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ const propTypes = {
email: PropTypes.string,
}).isRequired,

/** Beta features list */
betas: PropTypes.arrayOf(PropTypes.string).isRequired,

...withLocalizePropTypes,
};

Expand Down Expand Up @@ -181,7 +184,7 @@ class IOUDetailsModal extends Component {
*/
addExpensifyPaymentOptionIfAvailable() {
if (lodashGet(this.props, 'iouReport.currency') !== CONST.CURRENCY.USD
|| !Permissions.canUsePayWithExpensify()) {
|| !Permissions.canUsePayWithExpensify(this.props.betas)) {
return;
}

Expand Down Expand Up @@ -286,5 +289,8 @@ export default compose(
session: {
key: ONYXKEYS.SESSION,
},
betas: {
key: ONYXKEYS.BETAS,
},
}),
)(IOUDetailsModal);

0 comments on commit 64f1307

Please sign in to comment.