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
4 changes: 3 additions & 1 deletion src/components/Modal/BaseModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {useCallback, useContext, useEffect, useMemo, useRef, useState} fr
import type {LayoutChangeEvent} from 'react-native';
// Animated required for side panel navigation
// eslint-disable-next-line no-restricted-imports
import {Animated, View} from 'react-native';
import {Animated, DeviceEventEmitter, View} from 'react-native';
import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
import NavigationBar from '@components/NavigationBar';
import ScreenWrapperOfflineIndicatorContext from '@components/ScreenWrapper/ScreenWrapperOfflineIndicatorContext';
Expand Down Expand Up @@ -157,6 +157,8 @@ function BaseModal({
[],
);

useEffect(() => () => DeviceEventEmitter.emit(CONST.MODAL_EVENTS.CLOSED), []);

const handleShowModal = useCallback(() => {
if (shouldSetModalVisibility) {
setModalVisibility(true, type);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {InteractionManager} from 'react-native';
import ConfirmModal from '@components/ConfirmModal';
// eslint-disable-next-line no-restricted-imports
import * as Expensicons from '@components/Icon/Expensicons';
Expand Down Expand Up @@ -160,18 +159,17 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
icon: Expensicons.Camera,
text: translate('common.replace'),
onSelected: () => {
Navigation.dismissModal();
// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => {
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
action ?? CONST.IOU.ACTION.EDIT,
iouType,
draftTransactionID ?? transaction?.transactionID,
report?.reportID,
Navigation.getActiveRoute(),
Navigation.dismissModal({
callback: () =>
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
action ?? CONST.IOU.ACTION.EDIT,
iouType,
draftTransactionID ?? transaction?.transactionID,
report?.reportID,
Navigation.getActiveRoute(),
),
),
);
});
},
});
Expand Down
Loading