Skip to content

Expense preview in Reports > Chats keeps switching between main account and copilot avatar #68633

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
danieldoglas merged 5 commits into from
Aug 22, 2025
Merged

Expense preview in Reports > Chats keeps switching between main account and copilot avatar #68633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e58a76a
fix: main account avatar issue
lorretheboy Aug 18, 2025
87a6380
Merge branch 'main' of https://github.com/Expensify/App into fix/66874
lorretheboy Aug 18, 2025
adf54d7
Merge branch 'fix/66874' of https://github.com/lorretheboy/App into f…
lorretheboy Aug 18, 2025
ce4ca54
fix: logic
lorretheboy Aug 18, 2025
e90040e
Merge branch 'main' of https://github.com/Expensify/App into fix/66874
lorretheboy Aug 20, 2025
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
7 changes: 4 additions & 3 deletions src/components/ReportActionAvatars/useReportActionAvatars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {FallbackAvatar} from '@components/Icon/Expensicons';
import useOnyx from '@hooks/useOnyx';
import usePolicy from '@hooks/usePolicy';
import useReportIsArchived from '@hooks/useReportIsArchived';
import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {getDelegateAccountIDFromReportAction, getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
import {
getDefaultWorkspaceAvatar,
getDisplayNameForParticipant,
Expand Down Expand Up @@ -91,7 +91,8 @@ function useReportActionAvatars({
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const [policyChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportIDAnnounce || chatReportIDAdmins}`, {canBeMissing: true});

const delegatePersonalDetails = action?.delegateAccountID ? personalDetails?.[action?.delegateAccountID] : undefined;
const delegateAccountID = getDelegateAccountIDFromReportAction(action);
const delegatePersonalDetails = delegateAccountID ? personalDetails?.[delegateAccountID] : undefined;
const actorAccountID = getReportActionActorAccountID(action, iouReport, chatReport, delegatePersonalDetails);

const isAInvoiceReport = isInvoiceReport(iouReport ?? null);
Expand Down Expand Up @@ -315,7 +316,7 @@ function useReportActionAvatars({
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
actorHint: String(shouldUsePrimaryAvatarID ? primaryAvatar.id : login || defaultDisplayName || fallbackDisplayName).replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, ''),
accountID,
delegateAccountID: !isWorkspaceActor && delegatePersonalDetails ? actorAccountID : undefined,
delegateAccountID: !isWorkspaceActor && !!delegateAccountID ? actorAccountID : undefined,
},
source: {
iouReport,
Expand Down
22 changes: 22 additions & 0 deletions src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,27 @@ function getOriginalMessage<T extends ReportActionName>(reportAction: OnyxInputO
return reportAction.originalMessage;
}

function getDelegateAccountIDFromReportAction(reportAction: OnyxInputOrEntry<ReportAction>): number | undefined {
if (!reportAction) {

@suneox suneox Feb 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #80326 checklist: we're missing a case when using a copilot account, we also need to skip the actor being Concierge.

return undefined;
}

if (reportAction.delegateAccountID) {
return reportAction.delegateAccountID;
}

const originalMessage = getOriginalMessage(reportAction);
if (!originalMessage) {
return undefined;
}

if ('delegateAccountID' in originalMessage) {
return originalMessage.delegateAccountID;
}

return undefined;
}

function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION> {
return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;
}
Expand Down Expand Up @@ -3157,6 +3178,7 @@ export {
getVacationer,
getSubmittedTo,
getReceiptScanFailedMessage,
getDelegateAccountIDFromReportAction,
};

export type {LastVisibleMessage};
23 changes: 18 additions & 5 deletions src/pages/home/report/ReportActionItemSingle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,22 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
import ReportActionAvatars from '@components/ReportActionAvatars';
import useReportActionAvatars from '@components/ReportActionAvatars/useReportActionAvatars';
import useReportPreviewSenderID from '@components/ReportActionAvatars/useReportPreviewSenderID';
import Text from '@components/Text';
import Tooltip from '@components/Tooltip';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import ControlSelection from '@libs/ControlSelection';
import DateUtils from '@libs/DateUtils';
import Navigation from '@libs/Navigation/Navigation';
import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
import {getManagerOnVacation, getReportActionMessage, getSubmittedTo, getVacationer} from '@libs/ReportActionsUtils';
import {getDelegateAccountIDFromReportAction, getManagerOnVacation, getReportActionMessage, getSubmittedTo, getVacationer} from '@libs/ReportActionsUtils';
import {isOptimisticPersonalDetail} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {Report, ReportAction} from '@src/types/onyx';
import type ChildrenProps from '@src/types/utils/ChildrenProps';
Expand Down Expand Up @@ -78,14 +81,26 @@ function ReportActionItemSingle({
const StyleUtils = useStyleUtils();
const {translate} = useLocalize();

const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
canBeMissing: true,
});

const {avatarType, avatars, details, source} = useReportActionAvatars({report: potentialIOUReport ?? report, action});

const reportID = source.chatReport?.reportID;
const iouReportID = source.iouReport?.reportID;

const [primaryAvatar, secondaryAvatar] = avatars;

const accountOwnerDetails = getPersonalDetailByEmail(details.login ?? '');
const reportPreviewSenderID = useReportPreviewSenderID({
iouReport: potentialIOUReport,
action,
chatReport: source.chatReport,
});
const delegateAccountID = getDelegateAccountIDFromReportAction(action);
const mainAccountID = delegateAccountID ? (reportPreviewSenderID ?? potentialIOUReport?.ownerAccountID ?? action?.childOwnerAccountID) : (details.accountID ?? CONST.DEFAULT_NUMBER_ID);
const mainAccountLogin = mainAccountID ? (personalDetails?.[mainAccountID]?.login ?? details.login) : details.login;
const accountOwnerDetails = getPersonalDetailByEmail(String(mainAccountLogin ?? ''));

// Vacation delegate details for submitted action
const vacationer = getVacationer(action);
Expand Down Expand Up @@ -210,9 +225,7 @@ function ReportActionItemSingle({
<ReportActionItemDate created={action?.created ?? ''} />
</View>
) : null}
{!!action?.delegateAccountID && (
<Text style={[styles.chatDelegateMessage]}>{translate('delegate.onBehalfOfMessage', {delegator: accountOwnerDetails?.displayName ?? ''})}</Text>
)}
{!!delegateAccountID && <Text style={[styles.chatDelegateMessage]}>{translate('delegate.onBehalfOfMessage', {delegator: accountOwnerDetails?.displayName ?? ''})}</Text>}
{!!vacationer && !!submittedTo && (
<Text style={[styles.chatDelegateMessage]}>
{translate('statusPage.toAsVacationDelegate', {
Expand Down