Skip to content

Commit 89ed15a

Browse files
committed
remove redundant manual memoization
1 parent a97f34c commit 89ed15a

2 files changed

Lines changed: 13 additions & 19 deletions

File tree

src/pages/inbox/ConciergeDraftContext.tsx

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {getReportChatType} from '@selectors/Report';
2-
import React, {createContext, useCallback, useContext, useEffect, useMemo, useState} from 'react';
2+
import React, {createContext, useContext, useEffect, useState} from 'react';
33
import useOnyx from '@hooks/useOnyx';
44
import {getReportChannelName} from '@libs/actions/Report';
55
import Log from '@libs/Log';
@@ -56,9 +56,9 @@ function ConciergeDraftProvider({reportID, children}: React.PropsWithChildren<{r
5656
function ConciergeDraftGate({reportID, children}: React.PropsWithChildren<{reportID: string}>) {
5757
const [draft, setDraft] = useState<ConciergeDraft | null>(null);
5858

59-
const clearDraft = useCallback(() => {
59+
const clearDraft = () => {
6060
setDraft(null);
61-
}, []);
61+
};
6262

6363
useEffect(() => {
6464
const channelName = getReportChannelName(reportID);
@@ -98,20 +98,14 @@ function ConciergeDraftGate({reportID, children}: React.PropsWithChildren<{repor
9898
};
9999
}, [clearDraft, reportID]);
100100

101-
const stateValue = useMemo<ConciergeDraftState>(
102-
() => ({
103-
draftReportAction: draft?.reportAction ?? null,
104-
hasActiveDraft: !!draft?.reportAction,
105-
}),
106-
[draft?.reportAction],
107-
);
101+
const stateValue: ConciergeDraftState = {
102+
draftReportAction: draft?.reportAction ?? null,
103+
hasActiveDraft: !!draft?.reportAction,
104+
};
108105

109-
const actionsValue = useMemo<ConciergeDraftActions>(
110-
() => ({
111-
clearDraft,
112-
}),
113-
[clearDraft],
114-
);
106+
const actionsValue: ConciergeDraftActions = {
107+
clearDraft,
108+
};
115109

116110
return (
117111
<ConciergeDraftActionsContext.Provider value={actionsValue}>

src/pages/inbox/report/ReportActionsList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ function ReportActionsList({
230230
return getSortedReportActions([...sortedVisibleReportActions, draftReportAction], true);
231231
}, [draftReportAction, sortedVisibleReportActions]);
232232
const draftMessageHTML = draftReportAction ? getReportActionMessage(draftReportAction)?.html : undefined;
233-
const isSyntheticDraftVisible = !!draftReportAction && !sortedVisibleReportActions.some((action) => action.reportActionID === draftReportAction.reportActionID);
233+
const isSyntheticDraftVisible = !!draftReportAction && renderedVisibleReportActions !== sortedVisibleReportActions;
234234
const draftAutoScrollKey = isSyntheticDraftVisible ? `${draftReportAction.reportActionID}:${draftMessageHTML ?? ''}` : '';
235235
const previousDraftAutoScrollKey = usePrevious(draftAutoScrollKey);
236236
const topReportAction = renderedVisibleReportActions.at(-1);
@@ -290,12 +290,12 @@ function ReportActionsList({
290290
}, [reportLastReadTime]);
291291

292292
useEffect(() => {
293-
if (!draftReportAction || !sortedVisibleReportActions.some((action) => action.reportActionID === draftReportAction.reportActionID)) {
293+
if (!draftReportAction || isSyntheticDraftVisible) {
294294
return;
295295
}
296296

297297
clearDraft();
298-
}, [clearDraft, draftReportAction, sortedVisibleReportActions]);
298+
}, [clearDraft, draftReportAction, isSyntheticDraftVisible]);
299299

300300
const prevUnreadMarkerReportActionID = useRef<string | null>(null);
301301

0 commit comments

Comments
 (0)