Skip to content

[No QA] ReportActionItemSingle Typing Refactor #33837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 1 commit into from
Jan 2, 2024
Merged

[No QA] ReportActionItemSingle Typing Refactor #33837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 4 additions & 23 deletions src/pages/home/report/ReportActionItemSingle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ import * as UserUtils from '@libs/UserUtils';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
import type {Report, ReportAction} from '@src/types/onyx';
import {AvatarType} from '@src/types/onyx/OnyxCommon';
import {Icon} from '@src/types/onyx/OnyxCommon';
import ChildrenProps from '@src/types/utils/ChildrenProps';
import ReportActionItemDate from './ReportActionItemDate';
import ReportActionItemFragment from './ReportActionItemFragment';

type ReportActionItemSingleProps = {
type ReportActionItemSingleProps = ChildrenProps & {
/** All the data of the action */
action: ReportAction;

/** Styles for the outermost View */
wrapperStyle?: StyleProp<ViewStyle>;

/** Children view component for this action item */
children: React.ReactNode;

/** Report for this action */
report: Report;

Expand All @@ -54,23 +52,6 @@ type ReportActionItemSingleProps = {
isHovered?: boolean;
};

type SubAvatar = {
/** Avatar source to display */
source: UserUtils.AvatarSource;

/** Denotes whether it is a user avatar or a workspace avatar */
type: AvatarType;

/** Owner of the avatar. If user, displayName. If workspace, policy name */
name: string;

/** Avatar id */
id?: number | string;

/** A fallback avatar icon to display when there is an error on loading avatar from remote URL */
fallbackIcon?: UserUtils.AvatarSource;
};

const showUserDetails = (accountID: string) => {
Navigation.navigate(ROUTES.PROFILE.getRoute(accountID));
};
Expand Down Expand Up @@ -119,7 +100,7 @@ function ReportActionItemSingle({
}

// If this is a report preview, display names and avatars of both people involved
let secondaryAvatar: SubAvatar;
let secondaryAvatar: Icon;
const primaryDisplayName = displayName;
if (displayAllActors) {
// The ownerAccountID and actorAccountID can be the same if the a user requests money back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
Expand Down