self subscribe to useCurrentUserPersonalDetails

Author: LukasMod

src/pages/inbox/report/PureReportActionItem.tsx

@@ -77,7 +77,6 @@ import {
     getIOUReportIDFromReportActionPreview,
     getOriginalMessage,
     getPlaidBalanceFailureMessage,
-    getReimbursedMessage,
     getRenamedAction,
     getReportActionHtml,
     getReportActionMessage,
@@ -149,6 +148,7 @@ import MentionWhisperContent from './actionContents/MentionWhisperContent';
 import ModifiedExpenseContent from './actionContents/ModifiedExpenseContent';
 import PaymentContent from './actionContents/PaymentContent';
 import PolicyChangeLogContent, {isHandledPolicyChangeLogAction} from './actionContents/PolicyChangeLogContent';
+import ReimbursedContent from './actionContents/ReimbursedContent';
 import ReimbursementDeQueuedContent from './actionContents/ReimbursementDeQueuedContent';
 import ReportMentionWhisperContent from './actionContents/ReportMentionWhisperContent';
 import SimpleMessageContent, {isSimpleMessageAction} from './actionContents/SimpleMessageContent';
@@ -942,7 +942,12 @@ function PureReportActionItem({
                 />
             );
         } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.REIMBURSED)) {
-            children = <ReportActionItemBasicMessage message={getReimbursedMessage(translate, action, report, currentUserAccountID)} />;
+            children = (
+                <ReimbursedContent
+                    action={action}
+                    report={report}
+                />
+            );
         } else if (isSimpleMessageAction(action)) {
             children = <SimpleMessageContent action={action} />;
         } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.FORWARDED)) {
@@ -1021,7 +1026,6 @@ function PureReportActionItem({
                     report={report}
                     originalReport={originalReport}
                     policy={policy}
-                    currentUserAccountID={currentUserAccountID}
                     personalPolicyID={personalPolicyID}
                     originalReportID={originalReportID}
                     resolveActionableMentionWhisper={resolveActionableMentionWhisper}
@@ -1186,7 +1190,6 @@ function PureReportActionItem({
                             accountIDs={oldestFourAccountIDs}
                             onSecondaryInteraction={showPopover}
                             isActive={isReportActionActive && !isContextMenuActive}
-                            currentUserAccountID={currentUserAccountID}
                         />
                     </View>
                 )}

src/pages/inbox/report/ReportActionItemThread.tsx

@@ -5,6 +5,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import ReportActionAvatars from '@components/ReportActionAvatars';
 import Text from '@components/Text';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -37,24 +38,11 @@ type ReportActionItemThreadProps = {
 
     /** The function that should be called when the thread is LongPressed or right-clicked */
     onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) => void;
-
-    /** The accountID of the current user, used for creating optimistic report if needed */
-    currentUserAccountID: number;
 };
 
-function ReportActionItemThread({
-    numberOfReplies,
-    accountIDs,
-    mostRecentReply,
-    report,
-    reportAction,
-    isHovered,
-    onSecondaryInteraction,
-    isActive,
-    currentUserAccountID,
-}: ReportActionItemThreadProps) {
+function ReportActionItemThread({numberOfReplies, accountIDs, mostRecentReply, report, reportAction, isHovered, onSecondaryInteraction, isActive}: ReportActionItemThreadProps) {
     const styles = useThemeStyles();
-
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const {translate, datetimeToCalendarTime} = useLocalize();
     const [childReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportAction.childReportID}`);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);

src/pages/inbox/report/actionContents/MentionWhisperContent.tsx

@@ -4,6 +4,7 @@ import type {ValueOf} from 'type-fest';
 import RenderHTML from '@components/RenderHTML';
 import type {ActionableItem} from '@components/ReportActionItem/ActionableItemButtons';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import {isPolicyAdmin, isPolicyMember, isPolicyOwner} from '@libs/PolicyUtils';
@@ -17,7 +18,6 @@ type MentionWhisperContentProps = {
     report: OnyxEntry<Report>;
     originalReport: OnyxEntry<Report>;
     policy: OnyxEntry<Policy>;
-    currentUserAccountID: number;
     personalPolicyID: string | undefined;
     originalReportID: string | undefined;
     resolveActionableMentionWhisper: (
@@ -28,18 +28,10 @@ type MentionWhisperContentProps = {
     ) => void;
 };
 
-function MentionWhisperContent({
-    action,
-    report,
-    originalReport,
-    policy,
-    currentUserAccountID,
-    personalPolicyID,
-    originalReportID,
-    resolveActionableMentionWhisper,
-}: MentionWhisperContentProps) {
+function MentionWhisperContent({action, report, originalReport, policy, personalPolicyID, originalReportID, resolveActionableMentionWhisper}: MentionWhisperContentProps) {
     const {translate} = useLocalize();
     const isOriginalReportArchived = useReportIsArchived(originalReportID);
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const reportActionReport = originalReport ?? report;
     const reportPolicyID = report?.policyID;

src/pages/inbox/report/actionContents/ReimbursedContent.tsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import {getReimbursedMessage} from '@libs/ReportActionsUtils';
+import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
+import type {Report, ReportAction} from '@src/types/onyx';
+
+type ReimbursedContentProps = {
+    action: ReportAction;
+    report: OnyxEntry<Report>;
+};
+
+function ReimbursedContent({action, report}: ReimbursedContentProps) {
+    const {translate} = useLocalize();
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+    const message = getReimbursedMessage(translate, action, report, currentUserAccountID);
+
+    return <ReportActionItemBasicMessage message={message} />;
+}
+
+ReimbursedContent.displayName = 'ReimbursedContent';
+
+export default ReimbursedContent;