diff --git a/frontend/common/utils/utils.tsx b/frontend/common/utils/utils.tsx index 210d7e3cd7f1..2c720016911c 100644 --- a/frontend/common/utils/utils.tsx +++ b/frontend/common/utils/utils.tsx @@ -242,7 +242,10 @@ const Utils = Object.assign({}, require('./base/_utils'), { if (plan && plan.includes('start-up')) { return planNames.startup } - if (plan && plan.includes('enterprise')) { + if ( + global.flagsmithVersion?.backend.is_enterprise || + (plan && plan.includes('enterprise')) + ) { return planNames.enterprise } return planNames.free @@ -250,9 +253,7 @@ const Utils = Object.assign({}, require('./base/_utils'), { getPlanPermission: (plan: string, permission: string) => { let valid = true const planName = Utils.getPlanName(plan) - if (!Utils.getFlagsmithHasFeature('plan_based_access')) { - return true - } + if (!plan || planName === planNames.free) { return false } @@ -306,9 +307,6 @@ const Utils = Object.assign({}, require('./base/_utils'), { }, getPlansPermission: (permission: string) => { - if (!Utils.getFlagsmithHasFeature('plan_based_access')) { - return true - } const isOrgPermission = permission !== '2FA' const plans = isOrgPermission ? AccountStore.getActiveOrgPlan()