Skip to content
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

Fix room chat avatar is different for user who creates room & who has been invited to room #35792

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix room chat avatar is different for user who creates room & who has been invited to room #35792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72dee1d
Add policy avatar
dukenv0307 Feb 5, 2024
1e3e91e
fix lint
dukenv0307 Feb 5, 2024
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
8 changes: 5 additions & 3 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,9 +1458,11 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo
*/
function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = null): Icon {
const workspaceName = getPolicyName(report, false, policy);
const policyExpenseChatAvatarSource = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar
? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar
: getDefaultWorkspaceAvatar(workspaceName);
// disabling to protect against empty strings
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const policyAvatarURL = report?.policyAvatar || allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const policyExpenseChatAvatarSource = policyAvatarURL || getDefaultWorkspaceAvatar(workspaceName);

const workspaceIcon: Icon = {
source: policyExpenseChatAvatarSource ?? '',
Expand Down
2 changes: 2 additions & 0 deletions src/pages/home/ReportScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ function ReportScreen({
visibility: reportProp.visibility,
oldPolicyName: reportProp.oldPolicyName,
policyName: reportProp.policyName,
policyAvatar: reportProp.policyAvatar,
isOptimisticReport: reportProp.isOptimisticReport,
}),
[
Expand Down Expand Up @@ -241,6 +242,7 @@ function ReportScreen({
reportProp.visibility,
reportProp.oldPolicyName,
reportProp.policyName,
reportProp.policyAvatar,
reportProp.isOptimisticReport,
],
);
Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ type Report = {
/** The current user's notification preference for this report */
notificationPreference?: NotificationPreference;

/** The policy avatar to use, if any */
policyAvatar?: string | null;

/** The policy name to use */
policyName?: string | null;

Expand Down
Loading