From 0645b9c4779b55cf281f9262f649252fadbc98b6 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 14:09:01 +0200 Subject: [PATCH 01/17] migrate StatusPage to transitionTracker --- .../Profile/CustomStatus/StatusPage.tsx | 41 ++----------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx index 6339352466c3..b1f045cd00fd 100644 --- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx +++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import type {ValueOf} from 'type-fest'; import Button from '@components/Button'; import DelegatorList from '@components/DelegatorList'; @@ -91,32 +90,9 @@ function StatusPage() { return DateUtils.isTimeAtLeastOneMinuteInFuture({dateTimeString: clearAfterTime}); }, [draftClearAfter, currentUserClearAfter]); - const navigateBackToPreviousScreenTask = useRef<{ - then: ( - onfulfilled?: () => typeof InteractionManager.runAfterInteractions, - onrejected?: () => typeof InteractionManager.runAfterInteractions, - ) => Promise; - done: (...args: Array) => typeof InteractionManager.runAfterInteractions; - cancel: () => void; - } | null>(null); - - useEffect( - () => () => { - if (!navigateBackToPreviousScreenTask.current) { - return; - } - - navigateBackToPreviousScreenTask.current.cancel(); - }, - [], - ); - const navigateBackToPreviousScreen = useCallback(() => Navigation.goBack(), []); const updateStatus = useCallback( ({emojiCode, statusText}: FormOnyxValues) => { - if (navigateBackToPreviousScreenTask.current) { - return; - } // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing const clearAfterTime = draftClearAfter || currentUserClearAfter || CONST.CUSTOM_STATUS_TYPES.NEVER; const isValid = DateUtils.isTimeAtLeastOneMinuteInFuture({dateTimeString: clearAfterTime}); @@ -129,18 +105,12 @@ function StatusPage() { emojiCode: !emojiCode && statusText ? initialEmoji : emojiCode, clearAfter: clearAfterTime !== CONST.CUSTOM_STATUS_TYPES.NEVER ? clearAfterTime : '', }); - navigateBackToPreviousScreenTask.current = InteractionManager.runAfterInteractions(() => { - clearDraftCustomStatus(); - navigateBackToPreviousScreen(); - }); + Navigation.goBack(undefined, {afterTransition: () => clearDraftCustomStatus()}); }, - [currentUserClearAfter, draftClearAfter, isValidClearAfterDate, navigateBackToPreviousScreen, currentUserPersonalDetails.accountID], + [currentUserClearAfter, draftClearAfter, isValidClearAfterDate, currentUserPersonalDetails.accountID], ); const clearStatus = () => { - if (navigateBackToPreviousScreenTask.current) { - return; - } clearCustomStatus(currentUserPersonalDetails.accountID); updateDraftCustomStatus({ text: '', @@ -148,10 +118,7 @@ function StatusPage() { clearAfter: DateUtils.getEndOfToday(), }); formRef.current?.resetForm({[INPUT_IDS.EMOJI_CODE]: ''}); - - navigateBackToPreviousScreenTask.current = InteractionManager.runAfterInteractions(() => { - navigateBackToPreviousScreen(); - }); + Navigation.goBack(); }; useEffect(() => setBrickRoadIndicator(isValidClearAfterDate() ? undefined : CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR), [isValidClearAfterDate]); From 7c4ee2142d73483268acd6748777439f5e45bc50 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 14:22:45 +0200 Subject: [PATCH 02/17] migrate InteractionManager from Dynamic2FAVerifyPage --- .../Security/TwoFactorAuth/DynamicVerifyPage.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pages/settings/Security/TwoFactorAuth/DynamicVerifyPage.tsx b/src/pages/settings/Security/TwoFactorAuth/DynamicVerifyPage.tsx index 10908943ab75..00a8ace12741 100644 --- a/src/pages/settings/Security/TwoFactorAuth/DynamicVerifyPage.tsx +++ b/src/pages/settings/Security/TwoFactorAuth/DynamicVerifyPage.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useEffect, useRef} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; // eslint-disable-next-line no-restricted-imports import type {ScrollView as RNScrollView} from 'react-native'; import expensifyLogo from '@assets/images/expensify-logo-round-transparent.png'; @@ -75,10 +74,8 @@ function DynamicVerifyPage() { const scrollViewRef = useRef(null); const handleInputFocus = useCallback(() => { - InteractionManager.runAfterInteractions(() => { - requestAnimationFrame(() => { - scrollViewRef.current?.scrollToEnd({animated: true}); - }); + requestAnimationFrame(() => { + scrollViewRef.current?.scrollToEnd({animated: true}); }); }, []); From 19916e06b863e1ddeeed03738320e0371d880ab5 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 14:51:48 +0200 Subject: [PATCH 03/17] migrate DebugReportActionPageProps to TransitionTracker --- .../Debug/ReportAction/DebugReportActionPage.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Debug/ReportAction/DebugReportActionPage.tsx b/src/pages/Debug/ReportAction/DebugReportActionPage.tsx index dd237e921dc0..fae25d00674e 100644 --- a/src/pages/Debug/ReportAction/DebugReportActionPage.tsx +++ b/src/pages/Debug/ReportAction/DebugReportActionPage.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useMemo} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import Button from '@components/Button'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; @@ -61,11 +60,12 @@ function DebugReportActionPage({ Debug.mergeDebugData(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[reportActionID]: data}); }} onDelete={() => { - Navigation.goBack(); - // We need to wait for navigation animations to finish before deleting an action, - // otherwise the user will see a not found page briefly. - InteractionManager.runAfterInteractions(() => { - Debug.mergeDebugData(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[reportActionID]: null}); + Navigation.goBack(undefined, { + // We need to wait for navigation animations to finish before deleting an action, + // otherwise the user will see a not found page briefly. + afterTransition: () => { + Debug.mergeDebugData(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[reportActionID]: null}); + }, }); }} validate={DebugUtils.validateReportActionDraftProperty} From c20f97505131e58c00054fa7406990445f373d58 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 14:54:42 +0200 Subject: [PATCH 04/17] migrate DebugTransactionPage to TransitionTracker --- .../Debug/Transaction/DebugTransactionPage.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Debug/Transaction/DebugTransactionPage.tsx b/src/pages/Debug/Transaction/DebugTransactionPage.tsx index c97a5e512b94..e7cae59ec6f2 100644 --- a/src/pages/Debug/Transaction/DebugTransactionPage.tsx +++ b/src/pages/Debug/Transaction/DebugTransactionPage.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useMemo} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import Button from '@components/Button'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; @@ -53,11 +52,12 @@ function DebugTransactionPage({ Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, data); }} onDelete={() => { - Navigation.goBack(); - // We need to wait for navigation animations to finish before deleting a transaction, - // otherwise the user will see a not found page briefly. - InteractionManager.runAfterInteractions(() => { - Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, null); + Navigation.goBack(undefined, { + // We need to wait for navigation animations to finish before deleting a transaction, + // otherwise the user will see a not found page briefly. + afterTransition: () => { + Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, null); + }, }); }} validate={DebugUtils.validateTransactionDraftProperty} From bfb0a1c696db3fbba4452ccb091447d0ab313cfb Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 15:29:49 +0200 Subject: [PATCH 05/17] migrate DebugTransactionViolationPageProps to TransitionTracker --- .../DebugTransactionViolationPage.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx b/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx index 4cdd1ef31e9b..0efda0c3c6f0 100644 --- a/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx +++ b/src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useMemo} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import useLocalize from '@hooks/useLocalize'; @@ -47,11 +46,12 @@ function DebugTransactionViolationPage({ const deleteTransactionViolation = useCallback(() => { const updatedTransactionViolations = [...(transactionViolations ?? [])]; updatedTransactionViolations.splice(Number(index), 1); - Navigation.goBack(); - // We need to wait for navigation animations to finish before deleting a violation, - // otherwise the user will see a not found page briefly. - InteractionManager.runAfterInteractions(() => { - Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, updatedTransactionViolations); + Navigation.goBack(undefined, { + // We need to wait for navigation animations to finish before deleting a violation, + // otherwise the user will see a not found page briefly. + afterTransition: () => { + Debug.setDebugData(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, updatedTransactionViolations); + }, }); }, [index, transactionID, transactionViolations]); From 673d97a090f05d778eabc76c5623db41fbbb6642 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 15:34:18 +0200 Subject: [PATCH 06/17] migrate AddExistingExpenseFooter to TransitionTracker --- src/components/AddExistingExpenseFooter.tsx | 63 ++++++++++----------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/src/components/AddExistingExpenseFooter.tsx b/src/components/AddExistingExpenseFooter.tsx index 14ee72779818..f08058f8e07a 100644 --- a/src/components/AddExistingExpenseFooter.tsx +++ b/src/components/AddExistingExpenseFooter.tsx @@ -1,6 +1,4 @@ import React from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; @@ -67,36 +65,37 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, reportN return; } - Navigation.dismissToSuperWideRHP(); - InteractionManager.runAfterInteractions(() => { - if (report && isIOUReport(report)) { - convertBulkTrackedExpensesToIOU({ - transactions: Object.values(selectedTransactions), - iouReport: report, - chatReport, - isASAPSubmitBetaEnabled, - currentUserAccountIDParam: session?.accountID ?? CONST.DEFAULT_NUMBER_ID, - currentUserEmailParam: session?.email ?? '', - transactionViolations, - policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [], - quickAction, - personalDetails, - betas, - }); - } else { - changeTransactionsReport({ - transactionIDs: [...selectedIds], - isASAPSubmitBetaEnabled, - accountID: session?.accountID ?? CONST.DEFAULT_NUMBER_ID, - email: session?.email ?? '', - newReport: reportToConfirm, - policy, - reportNextStep, - policyCategories, - allTransactions: selectedTransactions, - policyTagList, - }); - } + Navigation.dismissToSuperWideRHP({ + afterTransition: () => { + if (report && isIOUReport(report)) { + convertBulkTrackedExpensesToIOU({ + transactions: Object.values(selectedTransactions), + iouReport: report, + chatReport, + isASAPSubmitBetaEnabled, + currentUserAccountIDParam: session?.accountID ?? CONST.DEFAULT_NUMBER_ID, + currentUserEmailParam: session?.email ?? '', + transactionViolations, + policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [], + quickAction, + personalDetails, + betas, + }); + } else { + changeTransactionsReport({ + transactionIDs: [...selectedIds], + isASAPSubmitBetaEnabled, + accountID: session?.accountID ?? CONST.DEFAULT_NUMBER_ID, + email: session?.email ?? '', + newReport: reportToConfirm, + policy, + reportNextStep, + policyCategories, + allTransactions: selectedTransactions, + policyTagList, + }); + } + }, }); setErrorMessage(''); }; From eafe1efd175e5e1791f0895782faf89c6df42057 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 15:43:00 +0200 Subject: [PATCH 07/17] migrate RightModalNavigator to transitionTracker --- .../AppNavigator/Navigators/RightModalNavigator.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx index 26c80e3e4710..ac795d751c65 100644 --- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx +++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx @@ -2,7 +2,7 @@ import type {NavigatorScreenParams} from '@react-navigation/native'; import {useFocusEffect} from '@react-navigation/native'; import React, {useCallback, useEffect, useMemo, useRef} from 'react'; // eslint-disable-next-line no-restricted-imports -import {Animated, DeviceEventEmitter, InteractionManager} from 'react-native'; +import {Animated, DeviceEventEmitter} from 'react-native'; import {DialogLabelProvider} from '@components/DialogLabelContext'; import NoDropZone from '@components/DragAndDrop/NoDropZone'; import {MultifactorAuthenticationContextProviders} from '@components/MultifactorAuthentication/Context'; @@ -32,6 +32,7 @@ import {isFullScreenName} from '@libs/Navigation/helpers/isNavigatorName'; import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import TransitionTracker from '@libs/Navigation/TransitionTracker'; import createRightModalNavigator from '@navigation/AppNavigator/createRightModalNavigator'; import type {AuthScreensParamList, RightModalNavigatorParamList} from '@navigation/types'; import {PINContextProvider} from '@pages/MissingPersonalDetails/PINContext'; @@ -157,9 +158,7 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) { } // Delay clearing review duplicate data till the RHP is completely closed // to avoid not found showing briefly in confirmation page when RHP is closing - InteractionManager.runAfterInteractions(() => { - abandonReviewDuplicateTransactions(); - }); + TransitionTracker.runAfterTransitions({callback: () => abandonReviewDuplicateTransactions()}); }, }), [navigation, route.params?.screen], @@ -239,7 +238,7 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) { component={ModalStackNavigators.TwoFactorAuthenticatorStackNavigator} listeners={{ beforeRemove: () => { - InteractionManager.runAfterInteractions(() => clearTwoFactorAuthData(true)); + TransitionTracker.runAfterTransitions({callback: () => clearTwoFactorAuthData(true), waitForUpcomingTransition: true}); }, }} /> From 8bb6c9d37a9000e011324f58571886670704582b Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 16:07:40 +0200 Subject: [PATCH 08/17] migrate NetSuiteImportAddCustomSegmentContent (remove interactionManager) --- .../NetSuiteImportAddCustomSegmentContent.tsx | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx index d61b5a76c244..e6043b41daf3 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useMemo, useRef, useState} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; import ConnectionLayout from '@components/ConnectionLayout'; @@ -55,26 +54,24 @@ function NetSuiteImportAddCustomSegmentContent({policy, policyIDParam, draftValu const values = useMemo(() => getSubstepValues(draftValues), [draftValues]); const startFrom = useMemo(() => getCustomSegmentInitialSubstep(values), [values]); const handleFinishStep = useCallback(() => { - InteractionManager.runAfterInteractions(() => { - const updatedCustomSegments = customSegments.concat([ - { - segmentName: values[INPUT_IDS.SEGMENT_NAME], - internalID: values[INPUT_IDS.INTERNAL_ID], - scriptID: values[INPUT_IDS.SCRIPT_ID], - mapping: values[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, - }, - ]); - updateNetSuiteCustomSegments( - policyID, - updatedCustomSegments, - customSegments, - `${CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS}_${customSegments.length}`, - CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, - ); - clearDraftValues(ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM); + const updatedCustomSegments = customSegments.concat([ + { + segmentName: values[INPUT_IDS.SEGMENT_NAME], + internalID: values[INPUT_IDS.INTERNAL_ID], + scriptID: values[INPUT_IDS.SCRIPT_ID], + mapping: values[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, + }, + ]); + updateNetSuiteCustomSegments( + policyID, + updatedCustomSegments, + customSegments, + `${CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS}_${customSegments.length}`, + CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, + ); + clearDraftValues(ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM); - Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS)); - }); + Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS)); }, [values, customSegments, policyID]); const {CurrentPage, isEditing, nextPage, prevPage, pageIndex, moveTo, isRedirecting} = useSubPage({ From d3036a2ca8517d1aef0082024f35a1edf9af1786 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 26 May 2026 16:14:49 +0200 Subject: [PATCH 09/17] migrate NetSuiteImportAddCustomListContent (remove interactionManager) --- .../NetSuiteImportAddCustomListContent.tsx | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx index 1cf833446c7a..090642594854 100644 --- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx +++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListContent.tsx @@ -1,6 +1,5 @@ import React, {useCallback, useMemo, useRef} from 'react'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager, View} from 'react-native'; +import {View} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; import ConnectionLayout from '@components/ConnectionLayout'; import type {FormRef} from '@components/Form/types'; @@ -51,25 +50,23 @@ function NetSuiteImportAddCustomListContent({policy, draftValues, policyIDParam} const customLists = useMemo(() => config?.syncOptions?.customLists ?? [], [config?.syncOptions]); const handleFinishStep = useCallback(() => { - InteractionManager.runAfterInteractions(() => { - const updatedCustomLists = customLists.concat([ - { - listName: values[INPUT_IDS.LIST_NAME], - internalID: values[INPUT_IDS.INTERNAL_ID], - transactionFieldID: values[INPUT_IDS.TRANSACTION_FIELD_ID], - mapping: values[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, - }, - ]); - updateNetSuiteCustomLists( - policyID, - updatedCustomLists, - customLists, - `${CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS}_${customLists.length}`, - CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, - ); - clearDraftValues(ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM); - Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS)); - }); + const updatedCustomLists = customLists.concat([ + { + listName: values[INPUT_IDS.LIST_NAME], + internalID: values[INPUT_IDS.INTERNAL_ID], + transactionFieldID: values[INPUT_IDS.TRANSACTION_FIELD_ID], + mapping: values[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, + }, + ]); + updateNetSuiteCustomLists( + policyID, + updatedCustomLists, + customLists, + `${CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS}_${customLists.length}`, + CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, + ); + clearDraftValues(ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM); + Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS)); }, [values, customLists, policyID]); const {CurrentPage, isEditing, nextPage, prevPage, pageIndex, moveTo, isRedirecting} = useSubPage({ From d9a8d4f7488b954deb80e1b42faf272be8db8cec Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 27 May 2026 12:41:26 +0200 Subject: [PATCH 10/17] migrate Split to transitionTracker --- src/libs/actions/IOU/Split.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts index 7b5f762090cc..62056cad90f5 100644 --- a/src/libs/actions/IOU/Split.ts +++ b/src/libs/actions/IOU/Split.ts @@ -16,6 +16,7 @@ import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import * as Localize from '@libs/Localize'; import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator'; import Navigation from '@libs/Navigation/Navigation'; +import TransitionTracker from '@libs/Navigation/TransitionTracker'; import {roundToTwoDecimalPlaces} from '@libs/NumberUtils'; import * as NumberUtils from '@libs/NumberUtils'; import Parser from '@libs/Parser'; @@ -2161,7 +2162,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); const activeReportID = isMoneyRequestReport && report?.reportID ? report.reportID : parameters.chatReportID; if (shouldHandleNavigation) { From b4b8fb1cfc833969434754750d52a93a0bd80307 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 27 May 2026 12:49:24 +0200 Subject: [PATCH 11/17] migrate PerDiem to transitionTracker --- src/libs/actions/IOU/PerDiem.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/IOU/PerDiem.ts b/src/libs/actions/IOU/PerDiem.ts index 6f3cf44b29d7..c81e1ae39106 100644 --- a/src/libs/actions/IOU/PerDiem.ts +++ b/src/libs/actions/IOU/PerDiem.ts @@ -1,5 +1,3 @@ -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {OnyxEntry, OnyxInputValue} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import * as API from '@libs/API'; @@ -14,6 +12,7 @@ import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import {validateAmount} from '@libs/MoneyRequestUtils'; import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator'; import Navigation from '@libs/Navigation/Navigation'; +import TransitionTracker from '@libs/Navigation/TransitionTracker'; import {buildNextStepNew, buildOptimisticNextStep} from '@libs/NextStepUtils'; import * as NumberUtils from '@libs/NumberUtils'; import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber'; @@ -1016,7 +1015,7 @@ function submitPerDiemExpense(submitPerDiemExpenseInformation: PerDiemExpenseInf onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE); @@ -1099,7 +1098,7 @@ function submitPerDiemExpenseForSelfDM(submitPerDiemExpenseInformation: PerDiemE onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); if (shouldHandleNavigation) { dismissModalAndOpenReportInInboxTab(chatReport.reportID); From 4d813eec0cb3aef7b6496c68e61ac6d89cb0f939 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 27 May 2026 15:52:43 +0200 Subject: [PATCH 12/17] migrate removeDraftTransaction to transitionTracker --- src/libs/actions/IOU/DeleteMoneyRequest.ts | 16 +++++++--------- src/libs/actions/IOU/SendInvoice.ts | 8 ++++---- src/libs/actions/IOU/Split.ts | 14 +++++++------- src/libs/actions/IOU/SplitTransactionUpdate.ts | 5 ++--- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/libs/actions/IOU/DeleteMoneyRequest.ts b/src/libs/actions/IOU/DeleteMoneyRequest.ts index 43bb65974a08..82bae7c2fb82 100644 --- a/src/libs/actions/IOU/DeleteMoneyRequest.ts +++ b/src/libs/actions/IOU/DeleteMoneyRequest.ts @@ -1,6 +1,4 @@ import cloneDeep from 'lodash/cloneDeep'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import * as API from '@libs/API'; @@ -477,13 +475,13 @@ function cleanUpMoneyRequest( // First, update the reportActions to ensure related actions are not displayed. Onyx.update(reportActionsOnyxUpdates).then(() => { - Navigation.goBack(urlToNavigateBack); - InteractionManager.runAfterInteractions(() => { - if (shouldDeleteIOUReport) { - clearAllRelatedReportActionErrors(reportID, reportAction, originalReportID); - } - // After navigation, update the remaining data. - Onyx.update(onyxUpdates); + Navigation.goBack(urlToNavigateBack, { + afterTransition: () => { + if (shouldDeleteIOUReport) { + clearAllRelatedReportActionErrors(reportID, reportAction, originalReportID); + } + Onyx.update(onyxUpdates); + }, }); }); } diff --git a/src/libs/actions/IOU/SendInvoice.ts b/src/libs/actions/IOU/SendInvoice.ts index 63bd2d68bc16..83b86f9c9619 100644 --- a/src/libs/actions/IOU/SendInvoice.ts +++ b/src/libs/actions/IOU/SendInvoice.ts @@ -1,5 +1,3 @@ -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import * as API from '@libs/API'; @@ -11,6 +9,7 @@ import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils'; import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import Log from '@libs/Log'; import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator'; +import TransitionTracker from '@libs/Navigation/TransitionTracker'; import {getReportActionHtml, getReportActionText} from '@libs/ReportActionsUtils'; import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticIOUReportAction} from '@libs/ReportUtils'; import { @@ -807,17 +806,18 @@ function sendInvoice({ onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); - highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transactionID, CONST.SEARCH.DATA_TYPES.INVOICE); if (shouldHandleNavigation) { + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); handleNavigateAfterExpenseCreate({ activeReportID: invoiceRoom.reportID, transactionID, isFromGlobalCreate, isInvoice: true, }); + } else { + removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID); } notifyNewAction(invoiceRoom.reportID, undefined, true); diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts index 62056cad90f5..935c5ed14f7a 100644 --- a/src/libs/actions/IOU/Split.ts +++ b/src/libs/actions/IOU/Split.ts @@ -1,6 +1,4 @@ import {fastMerge} from 'expensify-common'; -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {OnyxCollection, OnyxEntry, OnyxInputValue, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; @@ -318,10 +316,11 @@ function splitBill({ onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }, ); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); - if (shouldHandleNavigation) { + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); dismissModalAndOpenReportInInboxTab(existingSplitChatReportID); + } else { + removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID); } notifyNewAction(splitData.chatReportID, undefined, true); @@ -427,10 +426,11 @@ function splitBillAndOpenReport({ onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }, ); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); - if (shouldHandleNavigation) { + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); dismissModalAndOpenReportInInboxTab(splitData.chatReportID); + } else { + removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID); } notifyNewAction(splitData.chatReportID, undefined, true); } @@ -1139,7 +1139,7 @@ function completeSplitBill( playSound(SOUNDS.DONE); API.write(WRITE_COMMANDS.COMPLETE_SPLIT_BILL, parameters, {optimisticData, successData, failureData}); - InteractionManager.runAfterInteractions(() => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID)); + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); dismissModalAndOpenReportInInboxTab(chatReportID); notifyNewAction(chatReportID, undefined, true); } diff --git a/src/libs/actions/IOU/SplitTransactionUpdate.ts b/src/libs/actions/IOU/SplitTransactionUpdate.ts index 599f2c69fd42..e6ee6176c321 100644 --- a/src/libs/actions/IOU/SplitTransactionUpdate.ts +++ b/src/libs/actions/IOU/SplitTransactionUpdate.ts @@ -1,5 +1,3 @@ -// eslint-disable-next-line no-restricted-imports -import {InteractionManager} from 'react-native'; import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {SearchActionsContextValue, SearchStateContextValue} from '@components/Search/types'; @@ -12,6 +10,7 @@ import {calculateAmount as calculateIOUAmount} from '@libs/IOUUtils'; import Log from '@libs/Log'; import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute'; import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; +import TransitionTracker from '@libs/Navigation/TransitionTracker'; import {rand64} from '@libs/NumberUtils'; import Parser from '@libs/Parser'; import {getDistanceRateCustomUnitRate} from '@libs/PolicyUtils'; @@ -1352,7 +1351,7 @@ function updateSplitTransactions({ apiWrite(WRITE_COMMANDS.UPDATE_SPLIT_TRANSACTION, splitParameters, onyxData); } } - InteractionManager.runAfterInteractions(() => removeDraftSplitTransaction(originalTransactionID)); + TransitionTracker.runAfterTransitions({callback: () => removeDraftSplitTransaction(originalTransactionID), waitForUpcomingTransition: true}); } function updateSplitTransactionsFromSplitExpensesFlow(params: UpdateSplitTransactionsParams) { From a3f217924fba9d63bb4a8cfd37d458778b6558bf Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 27 May 2026 16:15:08 +0200 Subject: [PATCH 13/17] add files to the eslint seatbelt --- config/eslint/eslint.seatbelt.tsv | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv index e079e977c660..0a7258e64628 100644 --- a/config/eslint/eslint.seatbelt.tsv +++ b/config/eslint/eslint.seatbelt.tsv @@ -262,6 +262,7 @@ "../../src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx" "no-restricted-syntax" 2 "../../src/libs/Navigation/AppNavigator/Navigators/ReportsSplitNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2 +"../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "no-restricted-imports" 1 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx" "no-restricted-syntax" 1 @@ -328,6 +329,7 @@ "../../src/libs/actions/IOU/PayMoneyRequest.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2 "../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 1 +"../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-syntax" 2 "../../src/libs/actions/IOU/Receipt.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/RejectMoneyRequest.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2 @@ -335,15 +337,18 @@ "../../src/libs/actions/IOU/ReportWorkflow.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 7 "../../src/libs/actions/IOU/ReportWorkflow.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/SendInvoice.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1 +"../../src/libs/actions/IOU/SendInvoice.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/SendInvoice.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/SendMoney.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 2 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1 +"../../src/libs/actions/IOU/Split.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/Split.ts" "no-restricted-syntax" 3 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1 +"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/TrackExpense.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 2 "../../src/libs/actions/IOU/TrackExpense.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/TrackExpense.ts" "no-restricted-syntax" 2 From 15dc92f40e277ec62f49b81b873d40b100b1ad93 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Thu, 28 May 2026 10:10:33 +0200 Subject: [PATCH 14/17] cleanup --- src/pages/settings/Profile/CustomStatus/StatusPage.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx index b1f045cd00fd..36db6b4e5a55 100644 --- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx +++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx @@ -90,7 +90,7 @@ function StatusPage() { return DateUtils.isTimeAtLeastOneMinuteInFuture({dateTimeString: clearAfterTime}); }, [draftClearAfter, currentUserClearAfter]); - const navigateBackToPreviousScreen = useCallback(() => Navigation.goBack(), []); + const updateStatus = useCallback( ({emojiCode, statusText}: FormOnyxValues) => { // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing @@ -176,7 +176,7 @@ function StatusPage() { > Date: Thu, 28 May 2026 13:43:50 +0200 Subject: [PATCH 15/17] fix prettier --- src/pages/settings/Profile/CustomStatus/StatusPage.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx index 36db6b4e5a55..f3e84c2a2622 100644 --- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx +++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx @@ -90,7 +90,6 @@ function StatusPage() { return DateUtils.isTimeAtLeastOneMinuteInFuture({dateTimeString: clearAfterTime}); }, [draftClearAfter, currentUserClearAfter]); - const updateStatus = useCallback( ({emojiCode, statusText}: FormOnyxValues) => { // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing From 667f834b68470f194adf3f3dbfea363eabf4d77d Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Tue, 9 Jun 2026 11:13:21 +0200 Subject: [PATCH 16/17] fix seatbelt --- config/eslint/eslint.seatbelt.tsv | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv index fc1110c7a1ec..379e62d6f9e1 100644 --- a/config/eslint/eslint.seatbelt.tsv +++ b/config/eslint/eslint.seatbelt.tsv @@ -665,6 +665,7 @@ "../../src/libs/Navigation/AppNavigator/Navigators/ReportsSplitNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1 +"../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "no-restricted-imports" 1 "../../src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx" "no-restricted-syntax" 1 "../../src/libs/Navigation/AppNavigator/Navigators/SettingsSplitNavigator.tsx" "@typescript-eslint/no-unsafe-type-assertion" 1 @@ -836,6 +837,7 @@ "../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2 "../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 1 "../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-unsafe-type-assertion" 3 +"../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-syntax" 2 "../../src/libs/actions/IOU/Receipt.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/RejectMoneyRequest.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2 @@ -847,18 +849,21 @@ "../../src/libs/actions/IOU/SearchUpdate.ts" "@typescript-eslint/no-unsafe-type-assertion" 2 "../../src/libs/actions/IOU/SendInvoice.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1 "../../src/libs/actions/IOU/SendInvoice.ts" "@typescript-eslint/no-unsafe-type-assertion" 1 +"../../src/libs/actions/IOU/SendInvoice.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/SendInvoice.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/SendMoney.ts" "@typescript-eslint/no-unsafe-type-assertion" 1 "../../src/libs/actions/IOU/SendMoney.ts" "no-restricted-syntax" 1 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 2 "../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-unsafe-type-assertion" 2 +"../../src/libs/actions/IOU/Split.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/Split.ts" "no-restricted-syntax" 3 "../../src/libs/actions/IOU/SplitExpenseItems.ts" "@typescript-eslint/no-unsafe-type-assertion" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1 "../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-unsafe-type-assertion" 20 +"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "no-restricted-imports" 1 "../../src/libs/actions/IOU/TrackExpense.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1 "../../src/libs/actions/IOU/TrackExpense.ts" "@typescript-eslint/no-unsafe-type-assertion" 2 "../../src/libs/actions/IOU/TrackExpense.ts" "no-restricted-syntax" 2 From f3f8bdfe7ccf27660bdc960b3b16e231e43e2261 Mon Sep 17 00:00:00 2001 From: Yehor Kharchenko Date: Wed, 10 Jun 2026 16:28:16 +0200 Subject: [PATCH 17/17] change removeDraftTransaction instance to consistent pattern --- src/libs/actions/IOU/Split.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts index 2092131183d9..8ef2ef968820 100644 --- a/src/libs/actions/IOU/Split.ts +++ b/src/libs/actions/IOU/Split.ts @@ -2181,10 +2181,10 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest onDeferred: () => addOptimization(CONST.TELEMETRY.SUBMIT_OPTIMIZATION.DEFERRED_WRITE), }); - TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); const activeReportID = isMoneyRequestReport && report?.reportID ? report.reportID : parameters.chatReportID; if (shouldHandleNavigation) { + TransitionTracker.runAfterTransitions({callback: () => removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID), waitForUpcomingTransition: true}); const navigationActiveReportID = backToReport ?? activeReportID; highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, parameters.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE); handleNavigateAfterExpenseCreate({ @@ -2193,6 +2193,8 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest transactionID: parameters.transactionID, shouldAddPendingNewTransactionIDs: navigationActiveReportID === parameters.chatReportID, }); + } else { + removeDraftTransaction(CONST.IOU.OPTIMISTIC_TRANSACTION_ID); } if (!isMoneyRequestReport) {