Skip to content

Commit 1fce133

Browse files
paulnjspaulnjs
committed
Revert "fix: Split action does not trigger paywall in expired workspace"
1 parent 7012a03 commit 1fce133

7 files changed

Lines changed: 11 additions & 32 deletions

File tree

‎src/components/MoneyRequestHeaderSecondaryActions.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
140140
const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
141141
const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
142142
const [betas] = useOnyx(ONYXKEYS.BETAS);
143-
const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
144-
const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
145-
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
146143

147144
// Custom hooks
148145
const defaultExpensePolicy = useDefaultExpensePolicy();
@@ -333,7 +330,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
333330
icon: expensifyIcons.ArrowSplit,
334331
value: CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.SPLIT,
335332
onSelected: () => {
336-
initSplitExpense(transaction, policy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed);
333+
initSplitExpense(transaction, policy);
337334
},
338335
},
339336
[CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.MERGE]: {

‎src/components/ReportActionItem/MoneyRequestView.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ function MoneyRequestView({
182182
const {getReportRHPActiveRoute} = useActiveRoute();
183183
const {showConfirmModal} = useConfirmModal();
184184
const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH);
185-
const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
186-
const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
187-
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
188185

189186
const {currentSearchResults} = useSearchStateContext();
190187
const reportAttributes = useReportAttributes();
@@ -934,7 +931,7 @@ function MoneyRequestView({
934931
}
935932

936933
if (shouldShowSplitIndicator && isSplitAvailable) {
937-
initSplitExpense(transaction, policy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed);
934+
initSplitExpense(transaction, policy);
938935
return;
939936
}
940937

‎src/hooks/useExpenseActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplic
298298
if (transactions.length !== 1) {
299299
return;
300300
}
301-
initSplitExpense(currentTransaction, policy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed);
301+
initSplitExpense(currentTransaction, policy);
302302
},
303303
},
304304
[CONST.REPORT.SECONDARY_ACTIONS.MERGE]: {

‎src/hooks/useSearchBulkActions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1389,7 +1389,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
13891389
icon: expensifyIcons.ArrowSplit,
13901390
value: CONST.SEARCH.BULK_ACTION_TYPES.SPLIT,
13911391
onSelected: () => {
1392-
initSplitExpense(firstTransaction, firstTransactionPolicy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed);
1392+
initSplitExpense(firstTransaction, firstTransactionPolicy);
13931393
},
13941394
});
13951395
}

‎src/hooks/useSelectedTransactionsActions.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ function useSelectedTransactionsActions({
9191
const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
9292
const [allReportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
9393
const {getCurrencyDecimals} = useCurrencyListActions();
94-
const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
95-
const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
96-
const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
9794

9895
const expensifyIcons = useMemoizedLazyExpensifyIcons([
9996
'Stopwatch',
@@ -472,7 +469,7 @@ function useSelectedTransactionsActions({
472469
icon: expensifyIcons.ArrowSplit,
473470
value: SPLIT,
474471
onSelected: () => {
475-
initSplitExpense(firstTransaction, policy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed);
472+
initSplitExpense(firstTransaction, policy);
476473
},
477474
});
478475
}

‎src/libs/actions/SplitExpenses.ts‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTop
66
import Navigation from '@libs/Navigation/Navigation';
77
import {rand64} from '@libs/NumberUtils';
88
import {getTransactionDetails, isOpenReport} from '@libs/ReportUtils';
9-
import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
109
import {buildOptimisticTransaction, getChildTransactions, getOriginalTransactionWithSplitInfo, isDistanceRequest} from '@libs/TransactionUtils';
1110
import CONST from '@src/CONST';
1211
import ONYXKEYS from '@src/ONYXKEYS';
1312
import ROUTES from '@src/ROUTES';
14-
import type {BillingGraceEndPeriod, Policy, Report, Transaction} from '@src/types/onyx';
13+
import type {Policy, Report, Transaction} from '@src/types/onyx';
1514
import type {Attendee} from '@src/types/onyx/IOU';
1615
import type {TransactionCustomUnit} from '@src/types/onyx/Transaction';
1716
import {initSplitExpenseItemData, updateSplitExpenseDistanceFromAmount} from './IOU/SplitExpenseItems';
@@ -39,22 +38,11 @@ Onyx.connectWithoutView({
3938
/**
4039
* Create a draft transaction to set up split expense details for the split expense flow
4140
*/
42-
function initSplitExpense(
43-
transaction: OnyxEntry<Transaction>,
44-
policy: OnyxEntry<Policy>,
45-
ownerBillingGracePeriodEnd: OnyxEntry<number>,
46-
userBillingGracePeriodEnds: OnyxCollection<BillingGraceEndPeriod>,
47-
amountOwed: OnyxEntry<number>,
48-
): void {
41+
function initSplitExpense(transaction: OnyxEntry<Transaction>, policy?: OnyxEntry<Policy>): void {
4942
if (!transaction) {
5043
return;
5144
}
5245

53-
if (!!policy && shouldRestrictUserBillableActions(policy, ownerBillingGracePeriodEnd, userBillingGracePeriodEnds, amountOwed)) {
54-
Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
55-
return;
56-
}
57-
5846
const reportID = transaction.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
5947
const originalTransactionID = transaction?.comment?.originalTransactionID;
6048
const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`];

‎tests/actions/IOUTest/SplitTest.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4670,7 +4670,7 @@ describe('initSplitExpense', () => {
46704670
reportID: '456',
46714671
};
46724672

4673-
initSplitExpense(transaction, undefined, undefined, undefined, undefined);
4673+
initSplitExpense(transaction);
46744674
await waitForBatchedUpdates();
46754675

46764676
const draftTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transaction.transactionID}`);
@@ -4695,7 +4695,7 @@ describe('initSplitExpense', () => {
46954695
});
46964696
it('should not initialize split expense for null transaction', async () => {
46974697
const transaction: Transaction | undefined = undefined;
4698-
initSplitExpense(transaction, undefined, undefined, undefined, undefined);
4698+
initSplitExpense(transaction);
46994699
await waitForBatchedUpdates();
47004700

47014701
expect(transaction).toBeFalsy();
@@ -4719,7 +4719,7 @@ describe('initSplitExpense', () => {
47194719
reportID: '456',
47204720
};
47214721

4722-
initSplitExpense(transaction, undefined, undefined, undefined, undefined);
4722+
initSplitExpense(transaction);
47234723
await waitForBatchedUpdates();
47244724

47254725
const draftTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transaction.transactionID}`);
@@ -4788,7 +4788,7 @@ describe('initSplitExpense', () => {
47884788
reportID: '456',
47894789
};
47904790

4791-
initSplitExpense(transaction, policy, undefined, undefined, undefined);
4791+
initSplitExpense(transaction, policy);
47924792
await waitForBatchedUpdates();
47934793

47944794
const draftTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transaction.transactionID}`);

0 commit comments

Comments
 (0)