Skip to content

Commit 9e0de70

Browse files
committed
fix: typescheck
1 parent f963dcb commit 9e0de70

2 files changed

Lines changed: 7 additions & 23 deletions

File tree

src/pages/inbox/report/ReportActionsList.tsx

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import type {LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent} from 'r
77
import {DeviceEventEmitter, InteractionManager, View} from 'react-native';
88
import type {OnyxEntry} from 'react-native-onyx';
99
import {renderScrollComponent as renderActionSheetAwareScrollView} from '@components/ActionSheetAwareScrollView';
10-
import FlatList from '@components/FlatList';
1110
import Button from '@components/Button';
11+
import FlatList from '@components/FlatList/FlatList';
1212
import {usePersonalDetails} from '@components/OnyxListItemProvider';
1313
import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
1414
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -63,7 +63,6 @@ import {
6363
import Visibility from '@libs/Visibility';
6464
import type {ReportsSplitNavigatorParamList} from '@navigation/types';
6565
import ConciergeThinkingMessage from '@pages/home/report/ConciergeThinkingMessage';
66-
import {ActionListContext} from '@pages/inbox/ReportScreenContext';
6766
import variables from '@styles/variables';
6867
import {openReport, readNewestAction, subscribeToNewActionEvent} from '@userActions/Report';
6968
import CONST from '@src/CONST';
@@ -75,7 +74,7 @@ import FloatingMessageCounter from './FloatingMessageCounter';
7574
import getInitialNumToRender from './getInitialNumReportActionsToRender';
7675
import ListBoundaryLoader from './ListBoundaryLoader';
7776
import ReportActionsListItemRenderer from './ReportActionsListItemRenderer';
78-
import shouldDisplayNewMarkerOnReportAction, {getUnreadMarkerReportAction} from './shouldDisplayNewMarkerOnReportAction';
77+
import shouldDisplayNewMarkerOnReportAction from './shouldDisplayNewMarkerOnReportAction';
7978
import StaticReportActionsPreview from './StaticReportActionsPreview';
8079
import useReportUnreadMessageScrollTracking from './useReportUnreadMessageScrollTracking';
8180

@@ -323,14 +322,15 @@ function ReportActionsList({
323322
unreadMarkerTime,
324323
scrollingVerticalOffset: scrollingVerticalOffset.current,
325324
prevUnreadMarkerReportActionID: prevUnreadMarkerReportActionID.current,
325+
isOffline,
326326
});
327327
if (shouldDisplayNewMarker) {
328328
return [reportAction.reportActionID, index];
329329
}
330330
}
331331

332332
return [null, -1];
333-
}, [currentUserAccountID, isAnonymousUser, earliestReceivedOfflineMessageIndex, prevSortedVisibleReportActionsObjects, sortedVisibleReportActions, unreadMarkerTime]);
333+
}, [currentUserAccountID, isAnonymousUser, earliestReceivedOfflineMessageIndex, prevSortedVisibleReportActionsObjects, sortedVisibleReportActions, unreadMarkerTime, isOffline]);
334334
prevUnreadMarkerReportActionID.current = unreadMarkerReportActionID;
335335

336336
/**
@@ -398,22 +398,9 @@ function ReportActionsList({
398398
hasOnceLoadedReportActions: !!reportMetadata?.hasOnceLoadedReportActions,
399399
});
400400

401-
useEffect(() => {
402-
if (
403-
scrollingVerticalOffset.current < AUTOSCROLL_TO_TOP_THRESHOLD &&
404-
previousLastIndex.current !== lastActionIndex &&
405-
reportActionSize.current !== sortedVisibleReportActions.length &&
406-
hasNewestReportAction
407-
) {
408-
setIsFloatingMessageCounterVisible(false);
409-
reportScrollManager.scrollToBottom();
410-
}
411-
previousLastIndex.current = lastActionIndex;
412-
reportActionSize.current = sortedVisibleReportActions.length;
413-
}, [lastActionIndex, sortedVisibleReportActions.length, reportScrollManager, hasNewestReportAction, linkedReportActionID, setIsFloatingMessageCounterVisible]);
414401
useScrollToEndOnNewMessageReceived({
415402
sizeChangeType: 'changed',
416-
scrollOffsetRef,
403+
scrollOffsetRef: scrollingVerticalOffset,
417404
lastActionID: lastAction?.reportActionID,
418405
visibleActionsLength: sortedVisibleReportActions.length,
419406
hasNewestReportAction,
@@ -446,7 +433,7 @@ function ReportActionsList({
446433
// To handle this, we use the 'referrer' parameter to check if the current navigation is triggered from a notification.
447434
const isFromNotification = route?.params?.referrer === CONST.REFERRER.NOTIFICATION;
448435
if ((isVisible || isFromNotification) && scrollingVerticalOffset.current < CONST.REPORT.ACTIONS.ACTION_VISIBLE_THRESHOLD) {
449-
readNewestAction(report.reportID);
436+
readNewestAction(report.reportID, !!reportMetadata?.hasOnceLoadedReportActions);
450437
if (isFromNotification) {
451438
Navigation.setParams({referrer: undefined});
452439
}
@@ -792,7 +779,6 @@ function ReportActionsList({
792779
styles,
793780
translate,
794781
expensifyIcons.UpArrow,
795-
isOffline,
796782
],
797783
);
798784

src/pages/inbox/report/ReportActionsView.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {useIsFocused, useRoute} from '@react-navigation/native';
2-
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
3-
import {InteractionManager} from 'react-native';
2+
import React, {useCallback, useEffect, useMemo, useRef} from 'react';
43
import type {LayoutChangeEvent} from 'react-native';
54
import type {OnyxEntry} from 'react-native-onyx';
65
import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
@@ -142,7 +141,6 @@ function ReportActionsView({
142141
const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
143142
const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
144143
const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
145-
const prevTransactionThreadReport = usePrevious(transactionThreadReport);
146144
const reportActionID = route?.params?.reportActionID;
147145
const prevReportActionID = usePrevious(reportActionID);
148146
const reportPreviewAction = useMemo(() => getReportPreviewAction(report.chatReportID, report.reportID), [report.chatReportID, report.reportID]);

0 commit comments

Comments
 (0)