Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import useTransactionViolations from '@hooks/useTransactionViolations';
import useViolations from '@hooks/useViolations';
import type {ViolationField} from '@hooks/useViolations';
import {getCompanyCardDescription} from '@libs/CardUtils';
import {isCategoryMissing} from '@libs/CategoryUtils';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import DistanceRequestUtils from '@libs/DistanceRequestUtils';
import {isReceiptError} from '@libs/ErrorUtils';
Expand Down Expand Up @@ -223,10 +224,8 @@ function MoneyRequestView({report, shouldShowAnimatedBackground, readonly = fals
return CONST.IOU.TYPE.SUBMIT;
}, [isTrackExpense, isInvoice]);

const emptyCategories = CONST.SEARCH.CATEGORY_EMPTY_VALUE.split(',');

const category = transactionCategory ?? '';
const categoryForDisplay = emptyCategories.includes(category) ? '' : category;
const categoryForDisplay = isCategoryMissing(category) ? '' : category;

// Flags for showing categories and tags
// transactionCategory can be an empty string
Expand Down
4 changes: 2 additions & 2 deletions src/libs/TransactionPreviewUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import ROUTES from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import {abandonReviewDuplicateTransactions, setReviewDuplicatesKey} from './actions/Transaction';
import {isCategoryMissing} from './CategoryUtils';
import {convertToDisplayString} from './CurrencyUtils';
import DateUtils from './DateUtils';
import type {PlatformStackRouteProp} from './Navigation/PlatformStackNavigation/types';
Expand Down Expand Up @@ -310,8 +311,7 @@ function createTransactionPreviewConditionals({
const shouldShowSkeleton = isEmptyObject(transaction) && !isMessageDeleted(action) && action?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
const shouldShowTag = !!tag && isReportAPolicyExpenseChat;

const emptyCategories = CONST.SEARCH.CATEGORY_EMPTY_VALUE.split(',');
const categoryForDisplay = emptyCategories.includes(category ?? '') ? '' : category;
const categoryForDisplay = isCategoryMissing(category) ? '' : category;

const shouldShowCategory = !!categoryForDisplay && isReportAPolicyExpenseChat;

Expand Down
4 changes: 2 additions & 2 deletions src/pages/iou/request/step/IOURequestStepCategory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import {getIOURequestPolicyID, setDraftSplitTransaction, setMoneyRequestCategory, updateMoneyRequestCategory} from '@libs/actions/IOU';
import {enablePolicyCategories, getPolicyCategories} from '@libs/actions/Policy/Category';
import {isCategoryMissing} from '@libs/CategoryUtils';
import Navigation from '@libs/Navigation/Navigation';
import {hasEnabledOptions} from '@libs/OptionsListUtils';
import {isPolicyAdmin} from '@libs/PolicyUtils';
Expand Down Expand Up @@ -76,8 +77,7 @@ function IOURequestStepCategory({
const currentTransaction = isEditingSplit && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction;
const transactionCategory = getTransactionDetails(currentTransaction)?.category ?? '';

const emptyCategories = CONST.SEARCH.CATEGORY_EMPTY_VALUE.split(',');
const categoryForDisplay = emptyCategories.includes(transactionCategory) ? '' : transactionCategory;
const categoryForDisplay = isCategoryMissing(transactionCategory) ? '' : transactionCategory;

// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const reportAction = reportActions?.[report?.parentReportActionID || reportActionID] ?? null;
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/CategoryUtilsTest.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {isCategoryMissing} from '@libs/CategoryUtils';

describe(`isMissingCategory`, () => {
it('returns true if category is undefined', () => {
expect(isCategoryMissing(undefined)).toBe(true);
});

it('returns true if category is an empty string', () => {
expect(isCategoryMissing('')).toBe(true);
});

it('returns true if category "none" or "Uncategorized"', () => {
expect(isCategoryMissing('none')).toBe(true);
expect(isCategoryMissing('Uncategorized')).toBe(true);
});

it('returns false if category is a valid string', () => {
expect(isCategoryMissing('Travel')).toBe(false);
expect(isCategoryMissing('Meals')).toBe(false);
});
});
Loading