Skip to content
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

Remove beta categoryAndTagApprovers #56723

Merged
merged 7 commits into from
Feb 13, 2025
Merged

Remove beta categoryAndTagApprovers #56723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25188b9
Remove beta categoryAndTagApprovers
Beamanator Feb 12, 2025
19bf51f
Remove default imports from category settings page
Beamanator Feb 12, 2025
5ca5db1
Fix import spacing and order
Beamanator Feb 12, 2025
5daa6b6
Fix default imports on tag settings apge
Beamanator Feb 12, 2025
2c420b5
Fix a few more lint things
Beamanator Feb 12, 2025
12bbbe1
Merge branch 'main' of github.com:Expensify/App into beaman-removeBet…
Beamanator Feb 12, 2025
5165d3f
Use correct approach for changing fn names
Beamanator Feb 12, 2025
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
1 change: 0 additions & 1 deletion src/CONST.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,6 @@ const CONST = {
REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
NETSUITE_USA_TAX: 'netsuiteUsaTax',
COMBINED_TRACK_SUBMIT: 'combinedTrackSubmit',
CATEGORY_AND_TAG_APPROVERS: 'categoryAndTagApprovers',
PER_DIEM: 'newDotPerDiem',
NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest',
Expand Down
5 changes: 0 additions & 5 deletions src/libs/Permissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ function canUseNetSuiteUSATax(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas);
}

function canUseCategoryAndTagApprovers(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.CATEGORY_AND_TAG_APPROVERS) || canUseAllBetas(betas);
}

function canUsePerDiem(betas: OnyxEntry<Beta[]>): boolean {
return !!betas?.includes(CONST.BETAS.PER_DIEM) || canUseAllBetas(betas);
}
Expand Down Expand Up @@ -58,7 +54,6 @@ export default {
canUseLinkPreviews,
canUseSpotnanaTravel,
canUseNetSuiteUSATax,
canUseCategoryAndTagApprovers,
canUsePerDiem,
canUseMergeAccounts,
canUseManagerMcTest,
Expand Down
95 changes: 47 additions & 48 deletions src/pages/workspace/categories/CategorySettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import ConfirmModal from '@components/ConfirmModal';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import * as Expensicons from '@components/Icon/Expensicons';
import {Trashcan} from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
Expand All @@ -13,21 +13,25 @@ import Switch from '@components/Switch';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
import usePermissions from '@hooks/usePermissions';
import usePolicy from '@hooks/usePolicy';
import useThemeStyles from '@hooks/useThemeStyles';
import * as CategoryUtils from '@libs/CategoryUtils';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import * as ErrorUtils from '@libs/ErrorUtils';
import {formatDefaultTaxRateText, formatRequireReceiptsOverText, getCategoryApproverRule, getCategoryDefaultTaxRate} from '@libs/CategoryUtils';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import {getLatestErrorMessageField} from '@libs/ErrorUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import {isControlPolicy} from '@libs/PolicyUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import {getWorkflowApprovalsUnavailable, isControlPolicy} from '@libs/PolicyUtils';
import type {SettingsNavigatorParamList} from '@navigation/types';
import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import * as Category from '@userActions/Policy/Category';
import {
clearCategoryErrors,
deleteWorkspaceCategories,
setPolicyCategoryDescriptionRequired,
setWorkspaceCategoryDescriptionHint,
setWorkspaceCategoryEnabled,
} from '@userActions/Policy/Category';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand All @@ -44,7 +48,6 @@ function CategorySettingsPage({
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
const styles = useThemeStyles();
const {translate} = useLocalize();
const {canUseCategoryAndTagApprovers} = usePermissions();
const [deleteCategoryConfirmModalVisible, setDeleteCategoryConfirmModalVisible] = useState(false);
const policy = usePolicy(policyID);

Expand All @@ -71,19 +74,19 @@ function CategorySettingsPage({
return '';
}

return `${CurrencyUtils.convertToDisplayString(policyCategory?.maxExpenseAmount, policyCurrency)} ${CONST.DOT_SEPARATOR} ${translate(
return `${convertToDisplayString(policyCategory?.maxExpenseAmount, policyCurrency)} ${CONST.DOT_SEPARATOR} ${translate(
`workspace.rules.categoryRules.expenseLimitTypes.${policyCategoryExpenseLimitType}`,
)}`;
}, [policyCategory?.maxExpenseAmount, policyCategoryExpenseLimitType, policyCurrency, translate]);

const approverText = useMemo(() => {
const categoryApprover = CategoryUtils.getCategoryApproverRule(policy?.rules?.approvalRules ?? [], categoryName)?.approver ?? '';
const approver = PersonalDetailsUtils.getPersonalDetailByEmail(categoryApprover);
const categoryApprover = getCategoryApproverRule(policy?.rules?.approvalRules ?? [], categoryName)?.approver ?? '';
const approver = getPersonalDetailByEmail(categoryApprover);
return approver?.displayName ?? categoryApprover;
}, [categoryName, policy?.rules?.approvalRules]);

const defaultTaxRateText = useMemo(() => {
const taxID = CategoryUtils.getCategoryDefaultTaxRate(policy?.rules?.expenseRules ?? [], categoryName, policy?.taxRates?.defaultExternalID);
const taxID = getCategoryDefaultTaxRate(policy?.rules?.expenseRules ?? [], categoryName, policy?.taxRates?.defaultExternalID);

if (!taxID) {
return '';
Expand All @@ -95,22 +98,22 @@ function CategorySettingsPage({
return '';
}

return CategoryUtils.formatDefaultTaxRateText(translate, taxID, taxRate, policy?.taxRates);
return formatDefaultTaxRateText(translate, taxID, taxRate, policy?.taxRates);
}, [categoryName, policy?.rules?.expenseRules, policy?.taxRates, translate]);

const requireReceiptsOverText = useMemo(() => {
if (!policy) {
return '';
}
return CategoryUtils.formatRequireReceiptsOverText(translate, policy, policyCategory?.maxAmountNoReceipt);
return formatRequireReceiptsOverText(translate, policy, policyCategory?.maxAmountNoReceipt);
}, [policy, policyCategory?.maxAmountNoReceipt, translate]);

if (!policyCategory) {
return <NotFoundPage />;
}

const updateWorkspaceRequiresCategory = (value: boolean) => {
Category.setWorkspaceCategoryEnabled(policyID, {[policyCategory.name]: {name: policyCategory.name, enabled: value}});
setWorkspaceCategoryEnabled(policyID, {[policyCategory.name]: {name: policyCategory.name, enabled: value}});
};

const navigateToEditCategory = () => {
Expand All @@ -120,13 +123,13 @@ function CategorySettingsPage({
};

const deleteCategory = () => {
Category.deleteWorkspaceCategories(policyID, [categoryName]);
deleteWorkspaceCategories(policyID, [categoryName]);
setDeleteCategoryConfirmModalVisible(false);
navigateBack();
};

const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
const workflowApprovalsUnavailable = PolicyUtils.getWorkflowApprovalsUnavailable(policy);
const workflowApprovalsUnavailable = getWorkflowApprovalsUnavailable(policy);
const approverDisabled = !policy?.areWorkflowsEnabled || workflowApprovalsUnavailable;

return (
Expand Down Expand Up @@ -158,10 +161,10 @@ function CategorySettingsPage({
/>
<ScrollView contentContainerStyle={[styles.flexGrow1, safeAreaPaddingBottomStyle]}>
<OfflineWithFeedback
errors={ErrorUtils.getLatestErrorMessageField(policyCategory)}
errors={getLatestErrorMessageField(policyCategory)}
pendingAction={policyCategory?.pendingFields?.enabled}
errorRowStyles={styles.mh5}
onClose={() => Category.clearCategoryErrors(policyID, categoryName)}
onClose={() => clearCategoryErrors(policyID, categoryName)}
>
<View style={[styles.mt2, styles.mh5]}>
<View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
Expand Down Expand Up @@ -247,9 +250,9 @@ function CategorySettingsPage({
accessibilityLabel={translate('workspace.rules.categoryRules.requireDescription')}
onToggle={() => {
if (policyCategory.commentHint && areCommentsRequired) {
Category.setWorkspaceCategoryDescriptionHint(policyID, categoryName, '');
setWorkspaceCategoryDescriptionHint(policyID, categoryName, '');
}
Category.setPolicyCategoryDescriptionRequired(policyID, categoryName, !areCommentsRequired);
setPolicyCategoryDescriptionRequired(policyID, categoryName, !areCommentsRequired);
}}
/>
</View>
Expand All @@ -267,30 +270,26 @@ function CategorySettingsPage({
/>
</OfflineWithFeedback>
)}
{!!canUseCategoryAndTagApprovers && (
<>
<MenuItemWithTopDescription
title={approverText}
description={translate('workspace.rules.categoryRules.approver')}
onPress={() => {
Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_APPROVER.getRoute(policyID, policyCategory.name));
}}
shouldShowRightIcon
disabled={approverDisabled}
/>
{approverDisabled && (
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.mv2, styles.mh5]}>
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.goTo')}</Text>{' '}
<TextLink
style={[styles.link, styles.label]}
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID))}
>
{translate('workspace.common.moreFeatures')}
</TextLink>{' '}
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.andEnableWorkflows')}</Text>
</Text>
)}
</>
<MenuItemWithTopDescription
title={approverText}
description={translate('workspace.rules.categoryRules.approver')}
onPress={() => {
Navigation.navigate(ROUTES.WORSKPACE_CATEGORY_APPROVER.getRoute(policyID, policyCategory.name));
}}
shouldShowRightIcon
disabled={approverDisabled}
/>
{approverDisabled && (
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.mv2, styles.mh5]}>
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.goTo')}</Text>{' '}
<TextLink
style={[styles.link, styles.label]}
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID))}
>
{translate('workspace.common.moreFeatures')}
</TextLink>{' '}
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.categoryRules.andEnableWorkflows')}</Text>
</Text>
)}
{!!policy?.tax?.trackingEnabled && (
<MenuItemWithTopDescription
Expand Down Expand Up @@ -328,7 +327,7 @@ function CategorySettingsPage({

{!isThereAnyAccountingConnection && (
<MenuItem
icon={Expensicons.Trashcan}
icon={Trashcan}
title={translate('common.delete')}
onPress={() => setDeleteCategoryConfirmModalVisible(true)}
/>
Expand Down
Loading
Loading