Skip to content

Enable report fields for unreported Expense #69155

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
cristipaval merged 18 commits into from
Sep 4, 2025
Merged

Enable report fields for unreported Expense #69155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b473b78
feat: create UnreportedTransaction type and isExpenseUnreported function
koko57 Aug 24, 2025
09f1d9b
feat: show report fields in selfDM
koko57 Aug 25, 2025
86b71bc
fix: show categories on the category page
koko57 Aug 25, 2025
050c976
fix: show tags and tax rates
koko57 Aug 25, 2025
bd85a1a
fix: minor fix
koko57 Aug 25, 2025
a157563
fix: prettier
koko57 Aug 28, 2025
28b9c01
fix: resolve conflicts
koko57 Aug 28, 2025
c9dd839
fix: eslint
koko57 Aug 28, 2025
e20bcc8
fix: resolve conflicts
koko57 Aug 29, 2025
f4022d4
fix: prettier
koko57 Aug 29, 2025
f84605c
fix: eslint
koko57 Aug 29, 2025
e4f2f25
fix: eslint
koko57 Aug 29, 2025
92e17a0
Merge branch 'main' into feat/68988-enable-report-fields
koko57 Sep 1, 2025
247d07f
Merge branch 'main' into feat/68988-enable-report-fields
koko57 Sep 1, 2025
cae23db
fix: minor fix
koko57 Sep 2, 2025
721c6c5
fix: add comment and fix lint
koko57 Sep 2, 2025
e2cc4c4
fix: resolve conflicts
koko57 Sep 2, 2025
59be151
fix: prettier
koko57 Sep 2, 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
58 changes: 36 additions & 22 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import {
isCardTransaction as isCardTransactionTransactionUtils,
isDistanceRequest as isDistanceRequestTransactionUtils,
isExpenseSplit,
isExpenseUnreported as isExpenseUnreportedTransactionUtils,
isManualDistanceRequest as isManualDistanceRequestTransactionUtils,
isPerDiemRequest as isPerDiemRequestTransactionUtils,
isScanning,
Expand All @@ -87,15 +88,15 @@ type MoneyRequestViewProps = {
report: OnyxEntry<OnyxTypes.Report>;

/** Policy that the report belongs to */
policy: OnyxEntry<OnyxTypes.Policy>;
expensePolicy: OnyxEntry<OnyxTypes.Policy>;

/** Whether we should display the animated banner above the component */
shouldShowAnimatedBackground: boolean;

/** Whether we should show Money Request with disabled all fields */
readonly?: boolean;

/** whether or not this report is from review duplicates */
/** whether this report is from review duplicates */
isFromReviewDuplicates?: boolean;

/** Updated transaction to show in duplicate & merge transaction flow */
Expand All @@ -108,7 +109,7 @@ type MoneyRequestViewProps = {
function MoneyRequestView({
allReports,
report,
policy,
expensePolicy,
shouldShowAnimatedBackground,
readonly = false,
updatedTransaction,
Expand All @@ -121,33 +122,42 @@ function MoneyRequestView({
const {isOffline} = useNetwork();
const {translate, toLocaleDigit} = useLocalize();
const {getReportRHPActiveRoute} = useActiveRoute();

const parentReportID = report?.parentReportID;
const policyID = report?.policyID;
const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
const allPolicyCategories = usePolicyCategories();
const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`];
const transactionReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${updatedTransaction?.reportID}`];
const targetPolicyID = updatedTransaction?.reportID ? transactionReport?.policyID : policyID;
const allPolicyTags = usePolicyTags();
const policyTagList = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${targetPolicyID}`];
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});
const [parentReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
canEvict: false,
canBeMissing: true,
});

const parentReportAction = report?.parentReportActionID ? parentReportActions?.[report.parentReportActionID] : undefined;
const isTrackExpense = isTrackExpenseReport(report);
const moneyRequestReport = parentReport;

const linkedTransactionID = useMemo(() => {
if (!parentReportAction) {
return undefined;
}
const originalMessage = parentReportAction && isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction) : undefined;
return originalMessage?.IOUTransactionID;
}, [parentReportAction]);

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(linkedTransactionID)}`, {canBeMissing: true});
const isExpenseUnreported = isExpenseUnreportedTransactionUtils(updatedTransaction ?? transaction);

const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {
canBeMissing: true,
selector: (policy) => (policy?.type !== CONST.POLICY.TYPE.PERSONAL ? policy : undefined),
});
// If the expense is unreported the policy should be the user's default policy, otherwise it should be the policy the expense was made for
const policy = isExpenseUnreported ? activePolicy : expensePolicy;

@parasharrajat parasharrajat Sep 1, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment about what is activePolicy

@koko57 koko57 Sep 2, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't have any comments about activePolicy anywhere else, why we would need it here?

@parasharrajat parasharrajat Sep 2, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear from the code what activePolicy is and how it is different from expensePolicy.

@koko57 koko57 Sep 2, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but as I mentioned before - there are a lot of other locations where we access activePolicy object and there is no additional explanation, but ok I will add the comment but I think it's not necessary here

@parasharrajat parasharrajat Sep 2, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense to me. Thanks for adding the comment. It is a no blocker for this PR.

@cristipaval cristipaval Sep 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we don't need to explain what active policy is. But I like adding the new comment explaining that we take the default policy when the expense is unreported. I added it in the backend as well when I fixed the UpdateMoneyRequestTaxRate command

const policyID = isExpenseUnreported ? activePolicy?.id : report?.policyID;

const allPolicyCategories = usePolicyCategories();
const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`];
const transactionReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${updatedTransaction?.reportID}`];
const targetPolicyID = updatedTransaction?.reportID ? transactionReport?.policyID : policyID;
const allPolicyTags = usePolicyTags();
const policyTagList = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${targetPolicyID}`];
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST, {canBeMissing: true});

const [transactionBackup] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${getNonEmptyStringOnyxID(linkedTransactionID)}`, {canBeMissing: true});
const transactionViolations = useTransactionViolations(transaction?.transactionID);
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true});
Expand Down Expand Up @@ -189,8 +199,11 @@ function MoneyRequestView({
const isCardTransaction = isCardTransactionTransactionUtils(transaction);
const cardProgramName = getCompanyCardDescription(transaction?.cardName, transaction?.cardID, cardList);
const shouldShowCard = isCardTransaction && cardProgramName;

const moneyRequestReport = parentReport;
const isApproved = isReportApproved({report: moneyRequestReport});
const isInvoice = isInvoiceReport(moneyRequestReport);
const isTrackExpense = isTrackExpenseReport(report);
const taxRates = policy?.taxRates;
const formattedTaxAmount = updatedTransaction?.taxAmount
? convertToDisplayString(Math.abs(updatedTransaction?.taxAmount), transactionCurrency)
Expand All @@ -211,7 +224,6 @@ function MoneyRequestView({
const isReportArchived = useReportIsArchived(report?.reportID);
const isEditable = !!canUserPerformWriteActionReportUtils(report, isReportArchived) && !readonly;
const canEdit = isMoneyRequestAction(parentReportAction) && canEditMoneyRequest(parentReportAction, transaction, isChatReportArchived) && isEditable;

const canEditTaxFields = canEdit && !isDistanceRequest;
const canEditAmount = isEditable && canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.AMOUNT, undefined, isChatReportArchived);
const canEditMerchant = isEditable && canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.MERCHANT, undefined, isChatReportArchived);
Expand All @@ -227,6 +239,8 @@ function MoneyRequestView({
// if the policy of the report is either Collect or Control, then this report must be tied to expense chat
const isPolicyExpenseChat = isReportInGroupPolicy(report);

const shouldShowPolicySpecificFields = isPolicyExpenseChat || isExpenseUnreported;

const policyTagLists = useMemo(() => getTagLists(policyTagList), [policyTagList]);

const iouType = useMemo(() => {
Expand All @@ -246,19 +260,19 @@ function MoneyRequestView({
// Flags for showing categories and tags
// transactionCategory can be an empty string
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const shouldShowCategory = isPolicyExpenseChat && (categoryForDisplay || hasEnabledOptions(policyCategories ?? {}));
const shouldShowCategory = shouldShowPolicySpecificFields && (categoryForDisplay || hasEnabledOptions(policyCategories ?? {}));
// transactionTag can be an empty string
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const shouldShowTag = isPolicyExpenseChat && (transactionTag || hasEnabledTags(policyTagLists));
const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true) || !!updatedTransaction?.billable);
const shouldShowTag = shouldShowPolicySpecificFields && (transactionTag || hasEnabledTags(policyTagLists));
const shouldShowBillable = shouldShowPolicySpecificFields && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true) || !!updatedTransaction?.billable);
const isCurrentTransactionReimbursableDifferentFromPolicyDefault =
policy?.defaultReimbursable !== undefined && !!(updatedTransaction?.reimbursable ?? transactionReimbursable) !== policy.defaultReimbursable;
const shouldShowReimbursable =
isPolicyExpenseChat && (!policy?.disabledFields?.reimbursable || isCurrentTransactionReimbursableDifferentFromPolicyDefault) && !isCardTransaction && !isInvoice;
const canEditReimbursable = isEditable && canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.REIMBURSABLE, undefined, isChatReportArchived);
const shouldShowAttendees = useMemo(() => shouldShowAttendeesTransactionUtils(iouType, policy), [iouType, policy]);

const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest, isPerDiemRequest);
const shouldShowTax = isTaxTrackingEnabled(shouldShowPolicySpecificFields, policy, isDistanceRequest, isPerDiemRequest);
const tripID = getTripIDFromTransactionParentReportID(parentReport?.parentReportID);
const shouldShowViewTripDetails = hasReservationList(transaction) && !!tripID;

Expand Down Expand Up @@ -297,12 +311,12 @@ function MoneyRequestView({
const saveBillable = useCallback(
(newBillable: boolean) => {
// If the value hasn't changed, don't request to save changes on the server and just close the modal
if (newBillable === getBillable(transaction) || !transaction?.transactionID || !report?.reportID) {
if (!isExpenseUnreported || newBillable === getBillable(transaction) || !transaction?.transactionID || !report?.reportID) {
return;
}
updateMoneyRequestBillable(transaction.transactionID, report?.reportID, newBillable, policy, policyTagList, policyCategories);
},
[transaction, report, policy, policyTagList, policyCategories],
[isExpenseUnreported, transaction, report?.reportID, policy, policyTagList, policyCategories],
);

const saveReimbursable = useCallback(
Expand Down
16 changes: 15 additions & 1 deletion src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,16 @@
import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
import type {OnyxData} from '@src/types/onyx/Request';
import type {SearchPolicy, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
import type {Comment, Receipt, TransactionChanges, TransactionCustomUnit, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
import type {
Comment,
Receipt,
TransactionChanges,
TransactionCustomUnit,
TransactionPendingFieldsKey,
UnreportedTransaction,
Waypoint,
WaypointCollection,
} from '@src/types/onyx/Transaction';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import getDistanceInMeters from './getDistanceInMeters';

Expand Down Expand Up @@ -103,7 +112,7 @@

let allTransactions: OnyxCollection<Transaction> = {};

Onyx.connect({

Check warning on line 115 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -115,7 +124,7 @@
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 127 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -124,7 +133,7 @@
});

let allTransactionViolations: OnyxCollection<TransactionViolations> = {};
Onyx.connect({

Check warning on line 136 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
waitForCollectionCallback: true,
callback: (value) => (allTransactionViolations = value),
Expand All @@ -132,7 +141,7 @@

let currentUserEmail = '';
let currentUserAccountID = -1;
Onyx.connect({

Check warning on line 144 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (val) => {
currentUserEmail = val?.email ?? '';
Expand Down Expand Up @@ -1910,6 +1919,10 @@
];
}

function isExpenseUnreported(transaction?: Transaction): transaction is UnreportedTransaction {
return transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
}

export {
buildOptimisticTransaction,
calculateTaxAmount,
Expand Down Expand Up @@ -2019,6 +2032,7 @@
isUnreportedAndHasInvalidDistanceRateTransaction,
getTransactionViolationsOfTransaction,
isExpenseSplit,
isExpenseUnreported,
};

export type {TransactionChanges};
10 changes: 6 additions & 4 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@
let allPersonalDetails: OnyxTypes.PersonalDetailsList = {};
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (value) => {

Check warning on line 661 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
allPersonalDetails = value ?? {};
},
});
Expand Down Expand Up @@ -699,13 +699,13 @@
let allBetas: OnyxEntry<OnyxTypes.Beta[]>;
Onyx.connect({
key: ONYXKEYS.BETAS,
callback: (value) => (allBetas = value),

Check warning on line 702 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
});

let allTransactions: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,

Check warning on line 708 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
if (!value) {
allTransactions = {};
Expand All @@ -719,7 +719,7 @@
let allTransactionDrafts: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,

Check warning on line 722 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
allTransactionDrafts = value ?? {};
},
Expand All @@ -728,7 +728,7 @@
let allTransactionViolations: NonNullable<OnyxCollection<OnyxTypes.TransactionViolations>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
waitForCollectionCallback: true,

Check warning on line 731 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
if (!value) {
allTransactionViolations = {};
Expand All @@ -742,7 +742,7 @@
let allDraftSplitTransactions: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT,
waitForCollectionCallback: true,

Check warning on line 745 in src/libs/actions/IOU.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
callback: (value) => {
allDraftSplitTransactions = value ?? {};
},
Expand Down Expand Up @@ -4830,12 +4830,12 @@
taxAmount,
};
const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories);
API.write('UpdateMoneyRequestTaxAmount', params, onyxData);
API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAX_AMOUNT, params, onyxData);
}

type UpdateMoneyRequestTaxRateParams = {
transactionID: string;
optimisticReportActionID: string;
transactionID: string | undefined;
optimisticReportActionID: string | undefined;
taxCode: string;
taxAmount: number;
policy: OnyxEntry<OnyxTypes.Policy>;
Expand All @@ -4850,7 +4850,8 @@
taxAmount,
};
const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories);
API.write('UpdateMoneyRequestTaxRate', params, onyxData);

API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAX_RATE, params, onyxData);
}

type UpdateMoneyRequestDistanceParams = {
Expand Down Expand Up @@ -10571,6 +10572,7 @@
wasInvited: true,
});
}

function payMoneyRequest(paymentType: PaymentMethodType, chatReport: OnyxTypes.Report, iouReport: OnyxEntry<OnyxTypes.Report>, paymentPolicyID?: string, full = true) {
if (chatReport.policyID && shouldRestrictUserBillableActions(chatReport.policyID)) {
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(chatReport.policyID));
Expand Down
2 changes: 1 addition & 1 deletion src/pages/TransactionDuplicate/Confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ function Confirmation() {
<MoneyRequestView
allReports={allReports}
report={report}
policy={policy}
expensePolicy={policy}
shouldShowAnimatedBackground={false}
readonly
isFromReviewDuplicates
Expand Down
2 changes: 1 addition & 1 deletion src/pages/TransactionMerge/ConfirmationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function ConfirmationPage({route}: ConfirmationPageProps) {
<ShowContextMenuContext.Provider value={contextValue}>
<MoneyRequestView
allReports={allReports}
policy={policy}
expensePolicy={policy}
report={targetTransactionThreadReport}
shouldShowAnimatedBackground={false}
readonly
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home/report/ReportActionItemContentCreated.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function ReportActionItemContentCreated({
<MoneyRequestView
allReports={allReports}
report={report}
policy={policy}
expensePolicy={policy}
shouldShowAnimatedBackground
/>
{renderThreadDivider}
Expand Down Expand Up @@ -184,7 +184,7 @@ function ReportActionItemContentCreated({
<MoneyRequestView
allReports={allReports}
report={transactionThreadReport}
policy={policy}
expensePolicy={policy}
shouldShowAnimatedBackground={false}
/>
{renderThreadDivider}
Expand Down
33 changes: 22 additions & 11 deletions src/pages/iou/request/step/IOURequestStepCategory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Navigation from '@libs/Navigation/Navigation';
import {hasEnabledOptions} from '@libs/OptionsListUtils';
import {isPolicyAdmin} from '@libs/PolicyUtils';
import {getTransactionDetails, isGroupPolicy, isReportInGroupPolicy} from '@libs/ReportUtils';
import {isExpenseUnreported as isExpenseUnreportedTransactionUtils} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand All @@ -44,22 +45,32 @@ function IOURequestStepCategory({
},
transaction,
}: IOURequestStepCategoryProps) {
const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getIOURequestPolicyID(transaction, reportReal)}`, {canBeMissing: true});
const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${getIOURequestPolicyID(transaction, reportDraft)}`, {canBeMissing: true});
const styles = useThemeStyles();
const theme = useTheme();
const {translate} = useLocalize();

const policyIdReal = getIOURequestPolicyID(transaction, reportReal);
const policyIdDraft = getIOURequestPolicyID(transaction, reportDraft);
const [policyReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyIdReal}`, {canBeMissing: true});
const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyIdDraft}`, {canBeMissing: true});
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {
canBeMissing: true,
selector: (policy) => (policy?.type !== CONST.POLICY.TYPE.PERSONAL ? policy : undefined),
});
const isExpenseUnreported = isExpenseUnreportedTransactionUtils(transaction);
const policy = isExpenseUnreported ? activePolicy : (policyReal ?? policyDraft);

const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, {canBeMissing: true});
const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getIOURequestPolicyID(transaction, reportReal)}`, {canBeMissing: true});
const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${getIOURequestPolicyID(transaction, reportDraft)}`, {canBeMissing: true});
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getIOURequestPolicyID(transaction, reportReal)}`, {canBeMissing: true});
const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy?.id}`, {canBeMissing: true});
const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyIdDraft}`, {canBeMissing: true});
const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`, {canBeMissing: true});

const report = reportReal ?? reportDraft;
const policy = policyReal ?? policyDraft;
const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true});
const [policyTagLists] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`, {canBeMissing: true});
const {currentSearchHash} = useSearchContext();
const styles = useThemeStyles();
const theme = useTheme();
const {translate} = useLocalize();
const isEditing = action === CONST.IOU.ACTION.EDIT;
const isEditingSplit = (iouType === CONST.IOU.TYPE.SPLIT || iouType === CONST.IOU.TYPE.SPLIT_EXPENSE) && isEditing;
const currentTransaction = isEditingSplit && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction;
Expand All @@ -68,7 +79,7 @@ function IOURequestStepCategory({
const categoryForDisplay = isCategoryMissing(transactionCategory) ? '' : transactionCategory;

const shouldShowCategory =
(isReportInGroupPolicy(report) || isGroupPolicy(policy?.type ?? '')) &&
(isExpenseUnreported || isReportInGroupPolicy(report) || isGroupPolicy(policy?.type ?? '')) &&
// The transactionCategory can be an empty string, so to maintain the logic we'd like to keep it in this shape until utils refactor
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
(!!categoryForDisplay || hasEnabledOptions(Object.values(policyCategories ?? {})));
Expand Down Expand Up @@ -191,7 +202,7 @@ function IOURequestStepCategory({
<Text style={[styles.ph5, styles.pv3]}>{translate('iou.categorySelection')}</Text>
<CategoryPicker
selectedCategory={categoryForDisplay}
policyID={report?.policyID ?? policy?.id}
policyID={policy?.id ?? report?.policyID}
onSubmit={updateCategory}
/>
</>
Expand Down
Loading
Loading