Skip to content

Fix: Phone number user shows @expensify.sms on Reports #78418

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
marcaaron merged 4 commits into from
Jan 13, 2026
+7 −8
Merged

Fix: Phone number user shows @expensify.sms on Reports #78418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fbeba9
Fix: Phone number user shows @expensify.sms on Reports
nyomanjyotisa Dec 24, 2025
5b62ab0
lint fix
nyomanjyotisa Dec 24, 2025
f00b999
lint fix
nyomanjyotisa Dec 24, 2025
dc4b5ae
minor fix
nyomanjyotisa Dec 26, 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
4 changes: 2 additions & 2 deletions src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function ExpenseReportListItemRow({
<UserInfoCell
accountID={item.from.accountID}
avatar={item.from.avatar}
displayName={item.from.displayName ?? item.from.login ?? ''}
displayName={item.formattedFrom ?? ''}
/>
)}
</View>
Expand All @@ -141,7 +141,7 @@ function ExpenseReportListItemRow({
<UserInfoCell
accountID={item.to.accountID}
avatar={item.to.avatar}
displayName={item.to.displayName ?? item.to.login ?? ''}
displayName={item.formattedTo ?? ''}
/>
)}
</View>
Expand Down
6 changes: 2 additions & 4 deletions src/components/SelectionListWithSections/Search/UserInfoAndActionButtonRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import {View} from 'react-native';
import type {StyleProp, ViewStyle} from 'react-native';
import type {TransactionListItemType, TransactionReportGroupListItemType} from '@components/SelectionListWithSections/types';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
Expand All @@ -29,13 +28,12 @@ function UserInfoAndActionButtonRow({
}) {
const styles = useThemeStyles();
const {isLargeScreenWidth} = useResponsiveLayout();
const {translate} = useLocalize();
const transactionItem = item as unknown as TransactionListItemType;
const [isActionLoading] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${transactionItem.reportID}`, {canBeMissing: true, selector: isActionLoadingSelector});
const hasFromSender = !!item?.from && !!item?.from?.accountID && !!item?.from?.displayName;
const hasToRecipient = !!item?.to && !!item?.to?.accountID && !!item?.to?.displayName;
const participantFromDisplayName = item?.from?.displayName ?? item?.from?.login ?? translate('common.hidden');
const participantToDisplayName = item?.to?.displayName ?? item?.to?.login ?? translate('common.hidden');
Copy link
Contributor

@marcaaron marcaaron Dec 29, 2025

Choose a reason for hiding this comment

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

I'm confused about why we got rid of the common.hidden translation here.

Copy link
Contributor

@bernhardoj bernhardoj Dec 30, 2025

Choose a reason for hiding this comment

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

The formattedFrom and formattedTo uses getDisplayNameOrDefault which already handle the hidden logic.

App/src/libs/SearchUIUtils.ts

Lines 709 to 710 in a1fa8dc

const fromName = getDisplayNameOrDefault(from);
const formattedFrom = formatPhoneNumber(fromName);

This is also consistent with TransactionItemRow component which is being used on the large screen.

App/src/components/TransactionItemRow/index.tsx

Line 461 in 894cbc2

displayName={transactionItem.formattedFrom ?? transactionItem.from.displayName ?? ''}

const participantFromDisplayName = item.formattedFrom ?? item?.from?.displayName ?? '';
const participantToDisplayName = item.formattedTo ?? item?.to?.displayName ?? '';
const shouldShowToRecipient = hasFromSender && hasToRecipient && !!item?.to?.accountID && !!isCorrectSearchUserName(participantToDisplayName);
return (
<View
Expand Down
5 changes: 3 additions & 2 deletions ...ages/workspace/companyCards/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {Str} from 'expensify-common';
import React from 'react';
import {View} from 'react-native';
import Avatar from '@components/Avatar';
Expand Down Expand Up @@ -108,10 +109,10 @@ function WorkspaceCompanyCardTableItem({
}

const lastCardNumbers = isPlaidCardFeed ? lastFourNumbersFromCardName(cardName) : splitMaskedCardNumber(cardName)?.lastDigits;
const cardholderLoginText = !shouldUseNarrowTableLayout && isAssigned ? cardholder?.login : undefined;
const cardholderLoginText = !shouldUseNarrowTableLayout && isAssigned ? Str.removeSMSDomain(cardholder?.login ?? '') : undefined;
const narrowWidthCardName = isAssigned ? `${customCardName ?? ''}${lastCardNumbers ? ` - ${lastCardNumbers}` : ''}` : cardName;

const leftColumnTitle = isAssigned ? (cardholder?.displayName ?? '') : translate('workspace.moreFeatures.companyCards.unassignedCards');
const leftColumnTitle = isAssigned ? Str.removeSMSDomain(cardholder?.displayName ?? '') : translate('workspace.moreFeatures.companyCards.unassignedCards');
const leftColumnSubtitle = shouldUseNarrowTableLayout ? narrowWidthCardName : cardholderLoginText;

const resetFailedCompanyCardAssignment = () => {
Expand Down
Loading