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
2 changes: 2 additions & 0 deletions src/components/AddUnreportedExpenseFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor
const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
const [betas] = useOnyx(ONYXKEYS.BETAS);
const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.chatReportID}`);
const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);

const handleConfirm = () => {
if (selectedIds.size === 0) {
Expand Down Expand Up @@ -93,6 +94,7 @@ function AddUnreportedExpenseFooter({selectedIds, report, reportToConfirm, repor
reportNextStep,
policyCategories,
allTransactions: selectedTransactions,
policyTagList,
});
}
});
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useUndeleteTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ function useUndeleteTransactions() {
const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`);
const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);

return (transactions: Transaction[]) => {
const transactionIDs = transactions.map((transaction) => transaction.transactionID);
Expand All @@ -24,6 +25,7 @@ function useUndeleteTransactions() {
email: currentUserPersonalDetails.email ?? '',
policy,
allTransactions,
policyTagList,
});
};
}
Expand Down
21 changes: 5 additions & 16 deletions src/libs/actions/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
PersonalDetails,
Policy,
PolicyCategories,
PolicyTagLists,
RecentWaypoint,
Report,
ReportAction,
Expand All @@ -63,10 +64,9 @@
import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
import type {Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
import type TransactionState from '@src/types/utils/TransactionStateType';
import {getPolicyTags} from './IOU/index';

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

Check warning on line 69 in src/libs/actions/Transaction.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 @@ -78,7 +78,7 @@
});

const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
Onyx.connect({

Check warning on line 81 in src/libs/actions/Transaction.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,
callback: (transactionViolation, key) => {
if (!key || !transactionViolation) {
Expand All @@ -90,21 +90,11 @@
});

let allTransactionViolations: TransactionViolations = [];
Onyx.connect({

Check warning on line 93 in src/libs/actions/Transaction.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,
callback: (val) => (allTransactionViolations = val ?? []),
});

/**
* @deprecated This function uses Onyx.connect and should be replaced with useOnyx for reactive data access.
* TODO: remove `getPolicyTagsData` from this file (https://github.com/Expensify/App/issues/72720)
* All usages of this function should be replaced with useOnyx hook in React components.
*/
function getPolicyTagsData(policyID: string | undefined) {
const allPolicyTags = getPolicyTags();
return allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {};
}

// Helper to safely check for a string 'name' property
function isViolationWithName(violation: unknown): violation is {name: string} {
return !!(violation && typeof violation === 'object' && typeof (violation as {name?: unknown}).name === 'string');
Expand Down Expand Up @@ -842,6 +832,7 @@
reportNextStep?: OnyxEntry<ReportNextStepDeprecated>;
policyCategories?: OnyxEntry<PolicyCategories>;
allTransactions: OnyxCollection<Transaction>;
policyTagList: OnyxEntry<PolicyTagLists>;
};

function changeTransactionsReport({
Expand All @@ -854,6 +845,7 @@
reportNextStep,
policyCategories,
allTransactions,
policyTagList,
}: ChangeTransactionsReportProps) {
const reportID = newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID;

Expand Down Expand Up @@ -990,9 +982,6 @@
let transactionsMoved = false;
let shouldFixViolations = false;

// TODO: Replace getPolicyTagsData with useOnyx hook (https://github.com/Expensify/App/issues/72720)
// eslint-disable-next-line @typescript-eslint/no-deprecated
const policyTagList = getPolicyTagsData(policy?.id);
const policyHasDependentTags = hasDependentTags(policy, policyTagList);

// Determine the destination currency for convertedAmount clearing logic
Expand Down Expand Up @@ -1125,7 +1114,7 @@
transaction,
currentTransactionViolations[transaction.transactionID] ?? [],
policy,
policyTagList,
policyTagList ?? {},
policyCategories ?? {},
policyHasDependentTags,
false,
Expand Down Expand Up @@ -1516,7 +1505,7 @@
transaction,
currentTransactionViolations[transaction.transactionID] ?? [],
policy,
policyTagList,
policyTagList ?? {},
policyCategories ?? {},
policyHasDependentTags,
false,
Expand Down
4 changes: 4 additions & 0 deletions src/pages/NewReportWorkspaceSelectionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag
const shouldShowLoadingIndicator = isLoadingApp && !isOffline;
const [pendingPolicySelection, setPendingPolicySelection] = useState<{policy: WorkspaceListItem; shouldShowEmptyReportConfirmation: boolean} | null>(null);

const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);

const [policiesWithEmptyReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {
selector: (reports: OnyxCollection<OnyxTypes.Report>) => {
if (!accountID) {
Expand Down Expand Up @@ -121,6 +123,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag

if (isMovingExpenses && (!!selectedTransactionsKeys.length || !!selectedTransactionIDs.length)) {
const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`];
const policyTagList = policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] : {};
setNavigationActionToMicrotaskQueue(() => {
changeTransactionsReport({
transactionIDs: selectedTransactionsKeys.length ? selectedTransactionsKeys : selectedTransactionIDs,
Expand All @@ -132,6 +135,7 @@ function NewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelectionPag
reportNextStep,
policyCategories: undefined,
allTransactions,
policyTagList,
});

// eslint-disable-next-line rulesdir/no-default-id-values
Expand Down
7 changes: 7 additions & 0 deletions src/pages/Search/SearchTransactionsChangeReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function SearchTransactionsChangeReport() {
const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
const [betas] = useOnyx(ONYXKEYS.BETAS);
const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
const hasPerDiemTransactions = useHasPerDiemTransactions(selectedTransactionsKeys);
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
const {isBetaEnabled} = usePermissions();
Expand Down Expand Up @@ -105,6 +106,7 @@ function SearchTransactionsChangeReport() {
shouldDismissEmptyReportsConfirmation,
);
const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReport.reportID}`];
const policyTagList = policyForMovingExpenses?.id ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyForMovingExpenses.id}`] : {};
setNavigationActionToMicrotaskQueue(() => {
changeTransactionsReport({
transactionIDs: selectedTransactionsKeys,
Expand All @@ -116,6 +118,7 @@ function SearchTransactionsChangeReport() {
reportNextStep,
policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyForMovingExpensesID}`],
allTransactions: transactions,
policyTagList,
});
clearSelectedTransactions();
});
Expand Down Expand Up @@ -148,6 +151,7 @@ function SearchTransactionsChangeReport() {

const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${item.value}`];
const destinationReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`];
const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {};
changeTransactionsReport({
transactionIDs: selectedTransactionsKeys,
isASAPSubmitBetaEnabled,
Expand All @@ -158,6 +162,7 @@ function SearchTransactionsChangeReport() {
reportNextStep,
policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`],
allTransactions: transactions,
policyTagList,
});
// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => {
Expand All @@ -171,13 +176,15 @@ function SearchTransactionsChangeReport() {
if (selectedTransactionsKeys.length === 0) {
return;
}
const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {};
changeTransactionsReport({
transactionIDs: selectedTransactionsKeys,
isASAPSubmitBetaEnabled,
accountID: session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
email: session?.email ?? '',
policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`],
allTransactions: transactions,
policyTagList,
});
clearSelectedTransactions();
Navigation.goBack();
Expand Down
5 changes: 5 additions & 0 deletions src/pages/iou/request/step/IOURequestEditReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) {
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [allPolicyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}`);
const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
const personalDetails = usePersonalDetails();
const ownerPersonalDetails = useMemo(
() => getPersonalDetailsForAccountID(selectedReport?.ownerAccountID, personalDetails) as PersonalDetails,
Expand All @@ -70,6 +71,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) {
}

const newReport = report ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${item.value}`];
const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {};

setNavigationActionToMicrotaskQueue(() => {
changeTransactionsReport({
Expand All @@ -82,6 +84,7 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) {
reportNextStep,
policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`],
allTransactions,
policyTagList,
});
turnOffMobileSelectionMode();
clearSelectedTransactions(true);
Expand All @@ -94,13 +97,15 @@ function IOURequestEditReport({route}: IOURequestEditReportProps) {
if (!selectedReport || transactionIDs.length === 0) {
return;
}
const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {};
changeTransactionsReport({
transactionIDs,
isASAPSubmitBetaEnabled,
accountID: session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
email: session?.email ?? '',
policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`],
allTransactions,
policyTagList,
});
if (shouldTurnOffSelectionMode) {
turnOffMobileSelectionMode();
Expand Down
5 changes: 5 additions & 0 deletions src/pages/iou/request/step/IOURequestStepReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
const [selectedReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selectedReportID}`);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [allPolicyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
Expand Down Expand Up @@ -174,6 +175,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
);

if (isEditing) {
const policyTagList = item?.policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${item.policyID}`] : {};
changeTransactionsReport({
transactionIDs: [transaction.transactionID],
isASAPSubmitBetaEnabled,
Expand All @@ -184,6 +186,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
reportNextStep: undefined,
policyCategories: allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${item.policyID}`],
allTransactions,
policyTagList,
});
removeTransaction(transaction.transactionID);
}
Expand Down Expand Up @@ -221,13 +224,15 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
Navigation.dismissToSuperWideRHP();
// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => {
const policyTagList = personalPolicyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${personalPolicyID}`] : {};
changeTransactionsReport({
transactionIDs: [transaction.transactionID],
isASAPSubmitBetaEnabled,
accountID: session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
email: session?.email ?? '',
policy: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`],
allTransactions,
policyTagList,
});
removeTransaction(transaction.transactionID);
});
Expand Down
11 changes: 7 additions & 4 deletions tests/actions/IOUTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6172,6 +6172,8 @@ describe('actions/IOU', () => {
expect(result.current.report).toBeDefined();
});

const policyTagList = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${mockPolicy.id}`)) ?? {};

changeTransactionsReport({
transactionIDs: [transaction?.transactionID],
isASAPSubmitBetaEnabled: false,
Expand All @@ -6180,6 +6182,7 @@ describe('actions/IOU', () => {
newReport: result.current.report,
policy: mockPolicy,
allTransactions,
policyTagList,
});

let updatedTransaction: OnyxEntry<Transaction>;
Expand Down Expand Up @@ -6360,7 +6363,7 @@ describe('actions/IOU', () => {
});

const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
const policyTags = await getPolicyTags(reportID);
const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {};
const reports = getTransactionAndExpenseReports(reportID);

updateSplitTransactionsFromSplitExpensesFlow({
Expand Down Expand Up @@ -6536,7 +6539,7 @@ describe('actions/IOU', () => {
});

const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
const policyTags = await getPolicyTags(reportID);
const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {};
const reports = getTransactionAndExpenseReports(reportID);

updateSplitTransactionsFromSplitExpensesFlow({
Expand Down Expand Up @@ -6725,7 +6728,7 @@ describe('actions/IOU', () => {
});

const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
const policyTags = await getPolicyTags(reportID);
const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {};
const reports = getTransactionAndExpenseReports(reportID);

// it should use splitExpensesTotal in its calculation
Expand Down Expand Up @@ -6938,7 +6941,7 @@ describe('actions/IOU', () => {
});

const reportID = draftTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
const policyTags = await getPolicyTags(reportID);
const policyTags = (await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${reportID}`)) ?? {};
const reports = getTransactionAndExpenseReports(reportID);

// When splitting the held expense
Expand Down
Loading
Loading