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/35934 | Workspaces - Сustom avatar is applied to all workspace rooms #36464

Merged
merged 7 commits into from
Feb 20, 2024
Merged

fix/35934 | Workspaces - Сustom avatar is applied to all workspace rooms #36464

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e986c2
fix: Fixing the getWorkspaceIcon function to return ther default work…
Tony-MK Feb 12, 2024
143cde1
Merge branch 'main' of https://github.com/Expensify/App into fix/35934
Tony-MK Feb 14, 2024
860043f
Applying suggestion
Tony-MK Feb 16, 2024
1c1a7c7
lint
Tony-MK Feb 18, 2024
ba3a617
Merge branch 'main' of https://github.com/Expensify/App into fix/35934
Tony-MK Feb 18, 2024
e971eb4
custom avatar negation for chat and archived room
Tony-MK Feb 18, 2024
add15f3
Merge branch 'main' of https://github.com/Expensify/App into fix/35934
Tony-MK Feb 18, 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 @@ -1475,9 +1475,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);
const rootParentReport = getRootParentReport(report);
const hasCustomAvatar =
!(isEmptyObject(rootParentReport) || isDefaultRoom(rootParentReport) || isChatRoom(rootParentReport) || isArchivedRoom(rootParentReport)) &&
allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
const policyExpenseChatAvatarSource = hasCustomAvatar ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar : getDefaultWorkspaceAvatar(workspaceName);

const workspaceIcon: Icon = {
source: policyExpenseChatAvatarSource ?? '',
Expand Down
Loading