Skip to content

Commit e95b3e6

Browse files
lakchotelakchote
authored
Merge pull request Expensify#72579 from ZhenjaHorbach/remove-NewDotUpdateSplitsBeta
[NO QA] Remove NewDotUpdateSplitsBeta
2 parents 5c27729 + fecf6cf commit e95b3e6

7 files changed

Lines changed: 14 additions & 37 deletions

File tree

‎src/CONST/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,6 @@ const CONST = {
703703
IS_TRAVEL_VERIFIED: 'isTravelVerified',
704704
PLAID_COMPANY_CARDS: 'plaidCompanyCards',
705705
NEWDOT_REVERT_SPLITS: 'newDotRevertSplits',
706-
NEWDOT_UPDATE_SPLITS: 'newDotUpdateSplits',
707706
EXPENSIFY_CARD_EU_UK: 'expensifyCardEuUk',
708707
EUR_BILLING: 'eurBilling',
709708
NO_OPTIMISTIC_TRANSACTION_THREADS: 'noOptimisticTransactionThreads',

‎src/components/MoneyReportHeader.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import useOnyx from '@hooks/useOnyx';
1616
import useParticipantsInvoiceReport from '@hooks/useParticipantsInvoiceReport';
1717
import usePaymentAnimations from '@hooks/usePaymentAnimations';
1818
import usePaymentOptions from '@hooks/usePaymentOptions';
19-
import usePermissions from '@hooks/usePermissions';
2019
import usePolicy from '@hooks/usePolicy';
2120
import useReportIsArchived from '@hooks/useReportIsArchived';
2221
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -205,7 +204,6 @@ function MoneyReportHeader({
205204
const expensifyIcons = useMemoizedLazyExpensifyIcons(['Buildings'] as const);
206205
const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true});
207206
const exportTemplates = useMemo(() => getExportTemplates(integrationsExportTemplates ?? [], csvExportLayouts ?? {}, policy), [integrationsExportTemplates, csvExportLayouts, policy]);
208-
const {isBetaEnabled} = usePermissions();
209207

210208
const requestParentReportAction = useMemo(() => {
211209
if (!reportActions || !transactionThreadReport?.parentReportActionID) {
@@ -892,9 +890,8 @@ function MoneyReportHeader({
892890
reportActions,
893891
policies,
894892
isChatReportArchived,
895-
isNewDotUpdateSplitsBeta: isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS),
896893
});
897-
}, [moneyRequestReport, currentUserLogin, chatReport, transactions, violations, policy, reportNameValuePairs, reportActions, policies, isChatReportArchived, isBetaEnabled]);
894+
}, [moneyRequestReport, currentUserLogin, chatReport, transactions, violations, policy, reportNameValuePairs, reportActions, policies, isChatReportArchived]);
898895

899896
const secondaryExportActions = useMemo(() => {
900897
if (!moneyRequestReport) {

‎src/components/MoneyRequestHeader.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactio
99
import useLoadingBarVisibility from '@hooks/useLoadingBarVisibility';
1010
import useLocalize from '@hooks/useLocalize';
1111
import useOnyx from '@hooks/useOnyx';
12-
import usePermissions from '@hooks/usePermissions';
1312
import useReportIsArchived from '@hooks/useReportIsArchived';
1413
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1514
import useTheme from '@hooks/useTheme';
@@ -120,8 +119,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
120119
const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP);
121120
const isParentReportArchived = useReportIsArchived(report?.parentReportID);
122121

123-
const {isBetaEnabled} = usePermissions();
124-
125122
const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations);
126123

127124
const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations);
@@ -263,8 +260,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
263260
if (!transaction || !parentReportAction || !parentReport) {
264261
return [];
265262
}
266-
return getSecondaryTransactionThreadActions(currentUserLogin ?? '', parentReport, transaction, parentReportAction, policy, report, isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS));
267-
}, [parentReport, transaction, parentReportAction, currentUserLogin, policy, report, isBetaEnabled]);
263+
return getSecondaryTransactionThreadActions(currentUserLogin ?? '', parentReport, transaction, parentReportAction, policy, report);
264+
}, [parentReport, transaction, parentReportAction, currentUserLogin, policy, report]);
268265

269266
const dismissModalAndUpdateUseReject = () => {
270267
setIsRejectEducationalModalVisible(false);

‎src/components/ReportActionItem/MoneyRequestView.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import useActiveRoute from '@hooks/useActiveRoute';
1717
import useLocalize from '@hooks/useLocalize';
1818
import useNetwork from '@hooks/useNetwork';
1919
import useOnyx from '@hooks/useOnyx';
20-
import usePermissions from '@hooks/usePermissions';
2120
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
2221
import usePrevious from '@hooks/usePrevious';
2322
import useReportIsArchived from '@hooks/useReportIsArchived';
@@ -129,7 +128,6 @@ function MoneyRequestView({
129128
const theme = useTheme();
130129
const StyleUtils = useStyleUtils();
131130
const {isOffline} = useNetwork();
132-
const {isBetaEnabled} = usePermissions();
133131
const {translate, toLocaleDigit} = useLocalize();
134132
const {getReportRHPActiveRoute} = useActiveRoute();
135133
const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true});
@@ -234,7 +232,7 @@ function MoneyRequestView({
234232
const isEditable = !!canUserPerformWriteActionReportUtils(report, isReportArchived) && !readonly;
235233
const canEdit = isMoneyRequestAction(parentReportAction) && canEditMoneyRequest(parentReportAction, transaction, isChatReportArchived) && isEditable;
236234
const {isExpenseSplit} = getOriginalTransactionWithSplitInfo(transaction);
237-
const isSplitAvailable = moneyRequestReport && transaction && isSplitAction(moneyRequestReport, [transaction], policy, isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS));
235+
const isSplitAvailable = moneyRequestReport && transaction && isSplitAction(moneyRequestReport, [transaction], policy);
238236

239237
const canEditTaxFields = canEdit && !isDistanceRequest;
240238
const canEditAmount =
@@ -451,7 +449,7 @@ function MoneyRequestView({
451449
return;
452450
}
453451

454-
if (isExpenseSplit && isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS)) {
452+
if (isExpenseSplit) {
455453
initSplitExpense(transaction);
456454
return;
457455
}
@@ -482,7 +480,7 @@ function MoneyRequestView({
482480
return;
483481
}
484482

485-
if (isExpenseSplit && isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS)) {
483+
if (isExpenseSplit) {
486484
initSplitExpense(transaction);
487485
return;
488486
}
@@ -631,7 +629,7 @@ function MoneyRequestView({
631629
return;
632630
}
633631

634-
if (isExpenseSplit && isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS)) {
632+
if (isExpenseSplit) {
635633
initSplitExpense(transaction);
636634
return;
637635
}

‎src/libs/ReportSecondaryActionUtils.ts‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function isAddExpenseAction(report: Report, reportTransactions: Transaction[], i
7474
return canAddTransaction(report, isReportArchived);
7575
}
7676

77-
function isSplitAction(report: Report, reportTransactions: Transaction[], policy?: Policy, isNewDotUpdateSplitsBeta = true): boolean {
77+
function isSplitAction(report: Report, reportTransactions: Transaction[], policy?: Policy): boolean {
7878
if (Number(reportTransactions?.length) !== 1) {
7979
return false;
8080
}
@@ -91,15 +91,11 @@ function isSplitAction(report: Report, reportTransactions: Transaction[], policy
9191
return false;
9292
}
9393

94-
const {isBillSplit, isExpenseSplit} = getOriginalTransactionWithSplitInfo(reportTransaction);
94+
const {isBillSplit} = getOriginalTransactionWithSplitInfo(reportTransaction);
9595
if (isBillSplit) {
9696
return false;
9797
}
9898

99-
if (isExpenseSplit && !isNewDotUpdateSplitsBeta) {
100-
return false;
101-
}
102-
10399
if (!isExpenseReportUtils(report)) {
104100
return false;
105101
}
@@ -578,7 +574,6 @@ function getSecondaryReportActions({
578574
reportActions,
579575
policies,
580576
isChatReportArchived = false,
581-
isNewDotUpdateSplitsBeta,
582577
}: {
583578
currentUserEmail: string;
584579
report: Report;
@@ -591,7 +586,6 @@ function getSecondaryReportActions({
591586
policies?: OnyxCollection<Policy>;
592587
canUseNewDotSplits?: boolean;
593588
isChatReportArchived?: boolean;
594-
isNewDotUpdateSplitsBeta?: boolean;
595589
}): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
596590
const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];
597591

@@ -651,7 +645,7 @@ function getSecondaryReportActions({
651645
options.push(CONST.REPORT.SECONDARY_ACTIONS.REJECT);
652646
}
653647

654-
if (isSplitAction(report, reportTransactions, policy, isNewDotUpdateSplitsBeta)) {
648+
if (isSplitAction(report, reportTransactions, policy)) {
655649
options.push(CONST.REPORT.SECONDARY_ACTIONS.SPLIT);
656650
}
657651

@@ -707,7 +701,6 @@ function getSecondaryTransactionThreadActions(
707701
reportAction: ReportAction | undefined,
708702
policy: OnyxEntry<Policy>,
709703
transactionThreadReport?: OnyxEntry<Report>,
710-
isNewDotUpdateSplitsBeta?: boolean,
711704
): Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> {
712705
const options: Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> = [];
713706

@@ -723,7 +716,7 @@ function getSecondaryTransactionThreadActions(
723716
options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT);
724717
}
725718

726-
if (isSplitAction(parentReport, [reportTransaction], policy, isNewDotUpdateSplitsBeta)) {
719+
if (isSplitAction(parentReport, [reportTransaction], policy)) {
727720
options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.SPLIT);
728721
}
729722

‎src/pages/iou/SplitExpenseEditPage.tsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import ScreenWrapper from '@components/ScreenWrapper';
99
import ScrollView from '@components/ScrollView';
1010
import useLocalize from '@hooks/useLocalize';
1111
import useOnyx from '@hooks/useOnyx';
12-
import usePermissions from '@hooks/usePermissions';
1312
import usePolicy from '@hooks/usePolicy';
1413
import usePrevious from '@hooks/usePrevious';
1514
import useThemeStyles from '@hooks/useThemeStyles';
@@ -25,7 +24,7 @@ import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
2524
import type {TransactionDetails} from '@libs/ReportUtils';
2625
import {getParsedComment, getReportName, getReportOrDraftReport, getTransactionDetails} from '@libs/ReportUtils';
2726
import {getTagVisibility, hasEnabledTags} from '@libs/TagsOptionsListUtils';
28-
import {getChildTransactions, getTag, getTagForDisplay} from '@libs/TransactionUtils';
27+
import {getTag, getTagForDisplay} from '@libs/TransactionUtils';
2928
import CONST from '@src/CONST';
3029
import ONYXKEYS from '@src/ONYXKEYS';
3130
import ROUTES from '@src/ROUTES';
@@ -37,7 +36,6 @@ type SplitExpensePageProps = PlatformStackScreenProps<SplitExpenseParamList, typ
3736
function SplitExpenseEditPage({route}: SplitExpensePageProps) {
3837
const styles = useThemeStyles();
3938
const {translate} = useLocalize();
40-
const {isBetaEnabled} = usePermissions();
4139

4240
const {reportID, transactionID, splitExpenseTransactionID = '', backTo} = route.params;
4341
const report = getReportOrDraftReport(reportID);
@@ -68,7 +66,6 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
6866
const isSplitAvailable = report && transaction && isSplitAction(report, [transaction], policy);
6967

7068
const isCategoryRequired = !!policy?.requiresCategory;
71-
const childTransactions = useMemo(() => getChildTransactions(transactionID), [transactionID]);
7269
const reportName = getReportName(report, policy);
7370

7471
const shouldShowTags = !!policy?.areTagsEnabled && !!(transactionTag || hasEnabledTags(policyTagLists));
@@ -87,9 +84,7 @@ function SplitExpenseEditPage({route}: SplitExpensePageProps) {
8784

8885
return (
8986
<ScreenWrapper testID={SplitExpenseEditPage.displayName}>
90-
<FullPageNotFoundView
91-
shouldShow={!reportID || isEmptyObject(splitExpenseDraftTransaction) || !isSplitAvailable || (!!childTransactions.length && !isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS))}
92-
>
87+
<FullPageNotFoundView shouldShow={!reportID || isEmptyObject(splitExpenseDraftTransaction) || !isSplitAvailable}>
9388
<View style={[styles.flex1]}>
9489
<HeaderWithBackButton
9590
title={translate('iou.splitExpenseEditTitle', {

‎src/pages/iou/SplitExpensePage.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,7 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
306306
keyboardAvoidingViewBehavior="height"
307307
shouldDismissKeyboardBeforeClose={false}
308308
>
309-
<FullPageNotFoundView
310-
shouldShow={!reportID || isEmptyObject(draftTransaction) || !isSplitAvailable || (!!childTransactions.length && !isBetaEnabled(CONST.BETAS.NEWDOT_UPDATE_SPLITS))}
311-
>
309+
<FullPageNotFoundView shouldShow={!reportID || isEmptyObject(draftTransaction) || !isSplitAvailable}>
312310
<View
313311
ref={viewRef}
314312
style={styles.flex1}

0 commit comments

Comments
 (0)