Skip to content

Commit e4bc57f

Browse files
committed
Fix - Phone contact added as approver is displayed as number@expensify.sms
1 parent 8815437 commit e4bc57f

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

src/components/ApprovalWorkflowSection.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {Str} from 'expensify-common';
12
import React, {useCallback, useMemo} from 'react';
23
import {View} from 'react-native';
34
import useLocalize from '@hooks/useLocalize';
@@ -38,7 +39,7 @@ function ApprovalWorkflowSection({approvalWorkflow, onPress}: ApprovalWorkflowSe
3839
}
3940

4041
return sortAlphabetically(approvalWorkflow.members, 'displayName')
41-
.map((m) => m.displayName)
42+
.map((m) => Str.removeSMSDomain(m.displayName))
4243
.join(', ');
4344
}, [approvalWorkflow.isDefault, approvalWorkflow.members, translate]);
4445

@@ -90,7 +91,7 @@ function ApprovalWorkflowSection({approvalWorkflow, onPress}: ApprovalWorkflowSe
9091
style={styles.p0}
9192
titleStyle={styles.textLabelSupportingNormal}
9293
descriptionTextStyle={[styles.textNormalThemeText, styles.lineHeightXLarge]}
93-
description={approver.displayName}
94+
description={Str.removeSMSDomain(approver.displayName)}
9495
icon={Expensicons.UserCheck}
9596
iconHeight={20}
9697
iconWidth={20}

src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {Str} from 'expensify-common';
12
import type {ForwardedRef} from 'react';
23
import React, {forwardRef, useCallback, useMemo} from 'react';
34
import {View} from 'react-native';
@@ -67,7 +68,7 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
6768
}
6869

6970
return sortAlphabetically(approvalWorkflow.members, 'displayName')
70-
.map((m) => m.displayName)
71+
.map((m) => Str.removeSMSDomain(m.displayName))
7172
.join(', ');
7273
}, [approvalWorkflow.isDefault, approvalWorkflow.members, translate]);
7374

@@ -85,8 +86,8 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
8586
return;
8687
}
8788
return translate('workflowsPage.approverCircularReference', {
88-
name1: approver.displayName,
89-
name2: previousApprover.displayName,
89+
name1: Str.removeSMSDomain(approver.displayName),
90+
name2: Str.removeSMSDomain(previousApprover.displayName),
9091
});
9192
}
9293

@@ -156,7 +157,7 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
156157
pendingAction={getApprovalPendingAction(approverIndex)}
157158
>
158159
<MenuItemWithTopDescription
159-
title={approver?.displayName}
160+
title={Str.removeSMSDomain(approver?.displayName ?? '')}
160161
titleStyle={styles.textNormalThemeText}
161162
wrapperStyle={styles.sectionMenuItemTopDescription}
162163
description={approverDescription(approverIndex)}

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {Str} from 'expensify-common';
12
import React, {useCallback, useEffect, useMemo, useState} from 'react';
23
import type {SectionListData} from 'react-native';
34
import {useOnyx} from 'react-native-onyx';
@@ -78,12 +79,12 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
7879
const isAdmin = policy?.employeeList?.[member.email]?.role === CONST.REPORT.ROLE.ADMIN;
7980

8081
return {
81-
text: member.displayName,
82+
text: Str.removeSMSDomain(member.displayName),
8283
alternateText: member.email,
8384
keyForList: member.email,
8485
isSelected: true,
8586
login: member.email,
86-
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
87+
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: Str.removeSMSDomain(member.displayName), id: accountID}],
8788
rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
8889
};
8990
}),
@@ -102,12 +103,12 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat
102103
const accountID = Number(policyMemberEmailsToAccountIDs[member.email] ?? '');
103104

104105
return {
105-
text: member.displayName,
106+
text: Str.removeSMSDomain(member.displayName),
106107
alternateText: member.email,
107108
keyForList: member.email,
108109
isSelected: false,
109110
login: member.email,
110-
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
111+
icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: Str.removeSMSDomain(member.displayName), id: accountID}],
111112
rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
112113
};
113114
})

0 commit comments

Comments
 (0)