Skip to content

Revert production guard for selfDM splits #91995

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

Draft
ZhenjaHorbach wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Revert production guard for selfDM splits #91995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import type {PaymentActionParams} from '@components/SettlementButton/types';
import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies';
import {useCurrencyListActions} from '@hooks/useCurrencyList';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useEnvironment from '@hooks/useEnvironment';
import useExpenseActions from '@hooks/useExpenseActions';
import useExportActions from '@hooks/useExportActions';
import useHoldRejectActions from '@hooks/useHoldRejectActions';
Expand Down Expand Up @@ -317,8 +316,6 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
onPDFModalOpen: openPDFDownload,
});

const {isProduction} = useEnvironment();

// Compute list of applicable secondary action keys
const secondaryActions = moneyRequestReport
? getSecondaryReportActions({
Expand All @@ -337,7 +334,6 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
policies,
outstandingReportsByPolicyID,
isChatReportArchived,
isProduction,
})
: [];

Expand Down
4 changes: 0 additions & 4 deletions src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import useActiveAdminPolicies from '@hooks/useActiveAdminPolicies';
import useConfirmModal from '@hooks/useConfirmModal';
import {useCurrencyListActions} from '@hooks/useCurrencyList';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useEnvironment from '@hooks/useEnvironment';
import useExportActions from '@hooks/useExportActions';
import useLastWorkspaceNumber from '@hooks/useLastWorkspaceNumber';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
Expand Down Expand Up @@ -193,8 +192,6 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
isOnSearch: !!isReportInSearch,
});

const {isProduction} = useEnvironment();

const computedSecondaryActions = moneyRequestReport
? getSecondaryReportActions({
currentUserLogin: currentUserLogin ?? '',
Expand All @@ -212,7 +209,6 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
policies: allPolicies,
outstandingReportsByPolicyID,
isChatReportArchived,
isProduction,
})
: [];

Expand Down
6 changes: 1 addition & 5 deletions src/components/MoneyRequestHeaderSecondaryActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
import useDeleteTransactions from '@hooks/useDeleteTransactions';
import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
import useEnvironment from '@hooks/useEnvironment';
import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction';
import useHasMultipleSplitChildren from '@hooks/useHasMultipleSplitChildren';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
Expand Down Expand Up @@ -271,8 +270,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
setRejectModalAction(null);
};

const {isProduction} = useEnvironment();

// Secondary actions
const secondaryActions = (() => {
if (!transaction || !parentReportAction || !parentReport) {
Expand All @@ -290,7 +287,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
outstandingReportsByPolicyID,
isChatReportArchived: isChatIOUReportArchived,
grandParentReport,
isProduction,
});
})();

Expand Down Expand Up @@ -343,7 +339,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
icon: expensifyIcons.ArrowSplit,
value: CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.SPLIT,
onSelected: () => {
initSplitExpense(transaction, policy, report, accountID, {isProduction});
initSplitExpense(transaction, policy, report, accountID);
},
},
[CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.MERGE]: {
Expand Down
6 changes: 3 additions & 3 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function MoneyRequestView({
const theme = useTheme();
const StyleUtils = useStyleUtils();
const {isOffline} = useNetwork();
const {environmentURL, isProduction} = useEnvironment();
const {environmentURL} = useEnvironment();
const {translate, toLocaleDigit, localeCompare} = useLocalize();
const {convertToDisplayString, getCurrencySymbol} = useCurrencyListActions();
const {getReportRHPActiveRoute} = useActiveRoute();
Expand Down Expand Up @@ -357,7 +357,7 @@ function MoneyRequestView({
const isSplitAvailable =
moneyRequestReport &&
transaction &&
isSplitAction(moneyRequestReport, [transaction], originalTransaction, currentUserPersonalDetails.login ?? '', currentUserPersonalDetails.accountID, policy, undefined, isProduction);
isSplitAction(moneyRequestReport, [transaction], originalTransaction, currentUserPersonalDetails.login ?? '', currentUserPersonalDetails.accountID, policy);

const canEditTaxFields = canEdit && !isDistanceRequest;
const canEditAmount =
Expand Down Expand Up @@ -956,7 +956,7 @@ function MoneyRequestView({
}

if (shouldShowSplitIndicator && isSplitAvailable) {
initSplitExpense(transaction, policy, transactionThreadReport, currentUserAccountIDParam, {isProduction});
initSplitExpense(transaction, policy, transactionThreadReport, currentUserAccountIDParam);
return;
}

Expand Down
43 changes: 11 additions & 32 deletions src/components/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
import useArchivedReportsIdSet from '@hooks/useArchivedReportsIdSet';
import {useCurrencyListActions} from '@hooks/useCurrencyList';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useEnvironment from '@hooks/useEnvironment';
import type {ActionHandledType} from '@hooks/useHoldMenuSubmit';
import useLocalize from '@hooks/useLocalize';
import useMultipleSnapshots from '@hooks/useMultipleSnapshots';
Expand Down Expand Up @@ -125,11 +124,10 @@ function mapTransactionItemToSelectedEntry(
originalItemTransaction: OnyxEntry<Transaction>,
currentUserLogin: string,
currentUserAccountID: number,
outstandingReportsByPolicyID: OutstandingReportsByPolicyIDDerivedValue | undefined,
allowNegativeAmount: boolean,
parentReport: OnyxEntry<Report> | undefined,
selfDMReport: OnyxEntry<Report> | undefined,
isProduction: boolean,
outstandingReportsByPolicyID?: OutstandingReportsByPolicyIDDerivedValue,
allowNegativeAmount = true,
parentReport?: OnyxEntry<Report>,
selfDMReport?: OnyxEntry<Report>,
): [string, SelectedTransactionInfo] {
const {canHoldRequest, canUnholdRequest} = canHoldUnholdReportAction(item.report, item.reportAction, item.holdReportAction, item, item.policy, currentUserAccountID);
const canRejectRequest = item.report ? canRejectReportAction(currentUserLogin, item.report) : false;
Expand All @@ -146,7 +144,7 @@ function mapTransactionItemToSelectedEntry(
canHold: canHoldRequest,
isHeld: isOnHold(item),
canUnhold: canUnholdRequest,
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, currentUserLogin, currentUserAccountID, item.policy, parentReport, isProduction),
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, currentUserLogin, currentUserAccountID, item.policy, parentReport),
hasBeenSplit: getOriginalTransactionWithSplitInfo(itemTransaction, originalItemTransaction).isExpenseSplit,
canChangeReport: canEditFieldOfMoneyRequest({
reportAction: item.reportAction,
Expand Down Expand Up @@ -202,10 +200,9 @@ function prepareTransactionsList(
selectedTransactions: SelectedTransactions,
currentUserLogin: string,
currentUserAccountID: number,
outstandingReportsByPolicyID: OutstandingReportsByPolicyIDDerivedValue | undefined,
parentReport: OnyxEntry<Report> | undefined,
selfDMReport: OnyxEntry<Report> | undefined,
isProduction: boolean,
outstandingReportsByPolicyID?: OutstandingReportsByPolicyIDDerivedValue,
parentReport?: OnyxEntry<Report>,
selfDMReport?: OnyxEntry<Report>,
) {
if (selectedTransactions[item.keyForList]?.isSelected) {
const {[item.keyForList]: omittedTransaction, ...transactions} = selectedTransactions;
Expand All @@ -223,7 +220,6 @@ function prepareTransactionsList(
false,
parentReport,
selfDMReport,
isProduction,
);

return {
Expand All @@ -248,7 +244,6 @@ function Search({
const {type, status, sortBy, sortOrder, hash, similarSearchHash, groupBy, view} = queryJSON;

const {isOffline} = useNetwork();
const {isProduction} = useEnvironment();
const prevIsOffline = usePrevious(isOffline);
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {shouldUseNarrowLayout, isSmallScreenWidth, isLargeScreenWidth, isInLandscapeMode} = useResponsiveLayout();
Expand Down Expand Up @@ -811,7 +806,7 @@ function Search({
canHold: canHoldRequest,
isHeld: isOnHold(transactionItem),
canUnhold: canUnholdRequest,
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, login ?? '', accountID, transactionItem.policy, itemParentReport, isProduction),
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, login ?? '', accountID, transactionItem.policy, itemParentReport),
hasBeenSplit: getOriginalTransactionWithSplitInfo(itemTransaction, originalItemTransaction).isExpenseSplit,
canChangeReport: canEditFieldOfMoneyRequest({
reportAction: transactionItem.reportAction,
Expand Down Expand Up @@ -870,7 +865,7 @@ function Search({
canHold: canHoldRequest,
isHeld: isOnHold(transactionItem),
canUnhold: canUnholdRequest,
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, login ?? '', accountID, transactionItem.policy, itemParentReport, isProduction),
canSplit: isSplitAction(reportForSplit, [itemTransaction], originalItemTransaction, login ?? '', accountID, transactionItem.policy, itemParentReport),
hasBeenSplit: getOriginalTransactionWithSplitInfo(itemTransaction, originalItemTransaction).isExpenseSplit,
canChangeReport: canEditFieldOfMoneyRequest({
reportAction: transactionItem.reportAction,
Expand Down Expand Up @@ -1037,7 +1032,6 @@ function Search({
outstandingReportsByPolicyID,
itemParentReport,
selfDMReport,
isProduction,
);
setSelectedTransactions(updatedTransactions);
updateSelectAllMatchingItemsState(updatedTransactions);
Expand Down Expand Up @@ -1114,26 +1108,14 @@ function Search({
true,
itemParentReport,
selfDMReport,
isProduction,
);
}),
),
};
setSelectedTransactions(updatedTransactions);
updateSelectAllMatchingItemsState(updatedTransactions);
},
[
selectedTransactions,
setSelectedTransactions,
updateSelectAllMatchingItemsState,
transactions,
searchResults?.data,
email,
accountID,
outstandingReportsByPolicyID,
selfDMReport,
isProduction,
],
[selectedTransactions, setSelectedTransactions, updateSelectAllMatchingItemsState, transactions, email, accountID, outstandingReportsByPolicyID, searchResults?.data, selfDMReport],
);

const onSelectRowInMobileSelectionMode = (item: SearchListItem) => {
Expand Down Expand Up @@ -1447,7 +1429,6 @@ function Search({
true,
itemParentReport,
selfDMReport,
isProduction,
);
});
});
Expand All @@ -1471,7 +1452,6 @@ function Search({
true,
itemParentReport,
selfDMReport,
isProduction,
);
}),
);
Expand All @@ -1491,7 +1471,6 @@ function Search({
outstandingReportsByPolicyID,
searchResults?.data,
selfDMReport,
isProduction,
]);

const onLayoutBase = useCallback(() => {
Expand Down
33 changes: 5 additions & 28 deletions src/hooks/useDeleteTransactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import type {Policy, Report, ReportAction, Transaction, TransactionViolations} f
import type {SplitExpense} from '@src/types/onyx/IOU';
import useArchivedReportsIdSet from './useArchivedReportsIdSet';
import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
import useEnvironment from './useEnvironment';
import useNetwork from './useNetwork';
import useOnyx from './useOnyx';
import usePermissions from './usePermissions';
Expand Down Expand Up @@ -82,7 +81,6 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID);
const {isOffline} = useNetwork();
const {isProduction} = useEnvironment();

const getSplitExpenseEditTransactionOnDelete = useCallback(
(transactionIDs: string[]): Transaction | undefined => {
Expand All @@ -97,26 +95,15 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
}

const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.comment?.originalTransactionID}`];

if (isProduction) {
if (!shouldRedirectDeleteToSplitExpenseEdit(transaction, originalTransaction, false, isProduction)) {
return undefined;
}
return transaction;
}

const isSelfDMSplit = isSelfDM(report) || (!!selfDMReportID && transaction.reportID === CONST.REPORT.UNREPORTED_REPORT_ID);
const hasMultipleSplits = getChildTransactions(allTransactions, originalTransaction?.transactionID, isProduction).length > 1;
if (
!shouldRedirectDeleteToSplitExpenseEdit(transaction, originalTransaction, isSelfDMSplit, isProduction) ||
(!hasMultipleSplits && isPerDiemRequestTransactionUtils(originalTransaction))
) {
const hasMultipleSplits = getChildTransactions(allTransactions, originalTransaction?.transactionID).length > 1;
if (!shouldRedirectDeleteToSplitExpenseEdit(transaction, originalTransaction, isSelfDMSplit) || (!hasMultipleSplits && isPerDiemRequestTransactionUtils(originalTransaction))) {
return undefined;
}

return transaction;
},
[allTransactions, report, selfDMReportID, isProduction],
[allTransactions, report, selfDMReportID],
);

const shouldOpenSplitExpenseEditFlowOnDelete = useCallback(
Expand Down Expand Up @@ -154,10 +141,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
const transactionReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${splitExpenseEditTransaction.reportID}`];
const selfDMReport = isSelfDM(report) ? report : allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${selfDMReportID}`];
const splitExpenseEditTransactionReport = transactionReport ?? selfDMReport;
initSplitExpense(splitExpenseEditTransaction, policy, splitExpenseEditTransactionReport, currentUserPersonalDetails.accountID, {
navigateToEditSplitExpense: true,
isProduction,
});
initSplitExpense(splitExpenseEditTransaction, policy, splitExpenseEditTransactionReport, currentUserPersonalDetails.accountID, {navigateToEditSplitExpense: true});
return {
action: 'redirected',
};
Expand All @@ -182,12 +166,6 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction, originalTransaction);
const originalTransactionID = transaction?.comment?.originalTransactionID;

const isUnreportedSelfDMSplit = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
if (isProduction && isUnreportedSelfDMSplit) {
acc.nonSplitTransactions.push(item);
return acc;
}

if (isExpenseSplit && originalTransactionID) {
acc.splitTransactionsByOriginalTransactionID[originalTransactionID] ??= [];
acc.splitTransactionsByOriginalTransactionID[originalTransactionID].push(item);
Expand All @@ -205,7 +183,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac

for (const transactionID of Object.keys(splitTransactionsByOriginalTransactionID)) {
const splitIDs = new Set((splitTransactionsByOriginalTransactionID[transactionID] ?? []).map((transaction) => transaction.transactionID));
const allChildTransactions = getChildTransactions(allTransactions, transactionID, isProduction);
const allChildTransactions = getChildTransactions(allTransactions, transactionID);
const childTransactions = allChildTransactions.filter((transaction) => !splitIDs.has(transaction?.transactionID ?? String(CONST.DEFAULT_NUMBER_ID)));

if (childTransactions.length === 0) {
Expand Down Expand Up @@ -353,7 +331,6 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
selfDMReportID,
getSplitExpenseEditTransactionOnDelete,
isOffline,
isProduction,
],
);

Expand Down
Loading
Loading