Skip to content

Commit 0c438fc

Browse files
committed
Change getSingleReportAvatar to the component
1 parent 470d389 commit 0c438fc

3 files changed

Lines changed: 20 additions & 16 deletions

File tree

src/components/AvatarWithDisplayName.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {View} from 'react-native';
33
import type {ColorValue, TextStyle} from 'react-native';
44
import type {OnyxEntry} from 'react-native-onyx';
55
import type {ValueOf} from 'type-fest';
6+
import SingleReportAvatar from '@components/ReportActionItem/SingleReportAvatar';
67
import useOnyx from '@hooks/useOnyx';
78
import type {ReportAvatarDetails} from '@hooks/useReportAvatarDetails';
89
import useReportIsArchived from '@hooks/useReportIsArchived';
910
import useStyleUtils from '@hooks/useStyleUtils';
1011
import useTheme from '@hooks/useTheme';
1112
import useThemeStyles from '@hooks/useThemeStyles';
12-
import getReportSingleAvatar from '@libs/getReportSingleAvatar';
1313
import Navigation from '@libs/Navigation/Navigation';
1414
import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
1515
import type {DisplayNameWithTooltips} from '@libs/ReportUtils';
@@ -267,12 +267,14 @@ function AvatarWithDisplayName({
267267
);
268268
}
269269

270-
return getReportSingleAvatar({
271-
reportPreviewDetails: singleAvatarDetails,
272-
personalDetails,
273-
containerStyles: [styles.actionAvatar, styles.mr3],
274-
actorAccountID: actorAccountID?.current,
275-
});
270+
return (
271+
<SingleReportAvatar
272+
reportPreviewDetails={singleAvatarDetails}
273+
personalDetails={personalDetails}
274+
containerStyles={[styles.actionAvatar, styles.mr3]}
275+
actorAccountID={actorAccountID.current}
276+
/>
277+
);
276278
}, [StyleUtils, avatarBorderColor, icons, personalDetails, shouldShowSubscriptAvatar, singleAvatarDetails, size, styles]);
277279

278280
const avatar = <View accessibilityLabel={title}>{getAvatar()}</View>;

src/libs/getReportSingleAvatar.tsx renamed to src/components/ReportActionItem/SingleReportAvatar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {ReportAvatarDetails} from '@hooks/useReportAvatarDetails';
77
import CONST from '@src/CONST';
88
import type {PersonalDetailsList} from '@src/types/onyx';
99

10-
function getReportSingleAvatar({
10+
function SingleReportAvatar({
1111
reportPreviewDetails,
1212
personalDetails,
1313
containerStyles,
@@ -41,4 +41,4 @@ function getReportSingleAvatar({
4141
);
4242
}
4343

44-
export default getReportSingleAvatar;
44+
export default SingleReportAvatar;

src/pages/home/report/ReportActionItemSingle.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
55
import MultipleAvatars from '@components/MultipleAvatars';
66
import OfflineWithFeedback from '@components/OfflineWithFeedback';
77
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
8+
import SingleReportAvatar from '@components/ReportActionItem/SingleReportAvatar';
89
import SubscriptAvatar from '@components/SubscriptAvatar';
910
import Text from '@components/Text';
1011
import Tooltip from '@components/Tooltip';
@@ -17,7 +18,6 @@ import useTheme from '@hooks/useTheme';
1718
import useThemeStyles from '@hooks/useThemeStyles';
1819
import ControlSelection from '@libs/ControlSelection';
1920
import DateUtils from '@libs/DateUtils';
20-
import getReportSingleAvatar from '@libs/getReportSingleAvatar';
2121
import Navigation from '@libs/Navigation/Navigation';
2222
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
2323
import {getReportActionMessage} from '@libs/ReportActionsUtils';
@@ -189,12 +189,14 @@ function ReportActionItemSingle({
189189
);
190190
}
191191

192-
return getReportSingleAvatar({
193-
reportPreviewDetails,
194-
personalDetails,
195-
containerStyles: [styles.actionAvatar],
196-
actorAccountID,
197-
});
192+
return (
193+
<SingleReportAvatar
194+
reportPreviewDetails={reportPreviewDetails}
195+
personalDetails={personalDetails}
196+
containerStyles={[styles.actionAvatar]}
197+
actorAccountID={actorAccountID}
198+
/>
199+
);
198200
};
199201

200202
const hasEmojiStatus = !shouldDisplayAllActors && status?.emojiCode;

0 commit comments

Comments
 (0)