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.

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

Set up Avatars for Workspace Chats #7852

Merged
merged 91 commits into from
Mar 4, 2022
Merged
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
08ffa3d
check if the given report is a Workspace Chat
marcochavezf Feb 21, 2022
86a1bbc
get the linked policy of the workspace chat
marcochavezf Feb 21, 2022
ef23069
return avatar of the workspace for non-admin users
marcochavezf Feb 21, 2022
a2dc66d
return participan and workspace avatar url for admins
marcochavezf Feb 21, 2022
57f4e6c
use report.reportName for workspace chats
marcochavezf Feb 21, 2022
be4c679
Merge branch 'main' into marco-avatarsWorkspaceChats
marcochavezf Feb 22, 2022
a61cafb
display workspace chat in search page
marcochavezf Feb 22, 2022
425e3b7
get reportName as option.text
marcochavezf Feb 22, 2022
d5a963b
expose option.isPolicyExpenseChat to use fullTitle
marcochavezf Feb 22, 2022
6dd30c9
dislay alternateText for non-admins for workspace chats
marcochavezf Feb 22, 2022
efe6be5
change name param name in getSearchText
marcochavezf Feb 22, 2022
0dab98c
show workspace chat in search page for admins
marcochavezf Feb 22, 2022
7195cd2
get the correct report icons when user is admin
marcochavezf Feb 23, 2022
3817498
create styles for SubscriptAvatar
marcochavezf Feb 23, 2022
39cc286
create SubscriptAvatar component
marcochavezf Feb 23, 2022
3763739
add showSubscript MultipleAvatars to render SubscriptAvatar
marcochavezf Feb 23, 2022
4ef49bc
add showSubscript to option
marcochavezf Feb 23, 2022
6543229
update subscript avatar styles
marcochavezf Feb 23, 2022
0690dee
show SubscriptAvatar in HeaderView
marcochavezf Feb 23, 2022
5cc113e
fix blank name in HeaderView for workspace chat
marcochavezf Feb 23, 2022
d83c3c2
save ReportUtils function results in variables
marcochavezf Feb 23, 2022
463e928
fix duplicate workspace chates for workspace members
marcochavezf Feb 23, 2022
5981680
fix a few jsdoc errors
marcochavezf Feb 23, 2022
0a0509a
fix array of strings jsdoc
marcochavezf Feb 23, 2022
533f851
fix duplicate admin rooms in Search Page
marcochavezf Feb 23, 2022
25fd44d
display policy name as alternateText for admins
marcochavezf Feb 23, 2022
3218eb3
fix displayed name in alternateText for workspace chats
marcochavezf Feb 24, 2022
6ad97fb
filter out workspace chat if user doesn't have permission
marcochavezf Feb 24, 2022
95aa9cc
add showSubscript to RoomHeaderAvatars
marcochavezf Feb 24, 2022
9fe06b7
show workspace icon for subscript avatar
marcochavezf Feb 24, 2022
f8f6975
add defaultSubscriptIcon to SubscriptAvatar
marcochavezf Feb 24, 2022
bedfc70
set Expensicons.Workspace in defaultSubscriptIcon
marcochavezf Feb 24, 2022
7652cf3
show SubscriptAvatar component in RoomHeaderAvatars
marcochavezf Feb 24, 2022
adc6ccc
create emptyAvatarLarge and add var avatarSizeLarge
marcochavezf Feb 24, 2022
1e54819
add size to SubscriptAvatar and use Avatar instead of Image
marcochavezf Feb 24, 2022
ec1dcec
add secondAvatarLarge and firstAvatar styles
marcochavezf Feb 25, 2022
b223cf2
apply different styles if size is large
marcochavezf Feb 25, 2022
4aff4d6
set large size in RoomHeaderAvatars
marcochavezf Feb 25, 2022
79a40ba
move chat room icons to Expensicons
marcochavezf Feb 25, 2022
2f73f0d
use Icon instead of RoomAvatar in Avatar
marcochavezf Feb 25, 2022
5b8b050
delete RoomAvatar (logic moved to Avatar)
marcochavezf Feb 25, 2022
704be62
display archived room in RoomHeaderAvatar
marcochavezf Feb 25, 2022
0e981d8
fix border for large avatar in RoomHeaderAvatar
marcochavezf Feb 25, 2022
00e207c
create LargeDualAvatars to remove complexity in SubscripAvatar
marcochavezf Feb 25, 2022
4290b91
remove LargeDualAvatars from RoomHeaderAvatars and call it directly
marcochavezf Feb 25, 2022
0a84fae
remove size from SubscriptAvatar
marcochavezf Feb 25, 2022
7818250
add new avatar sizes
marcochavezf Feb 25, 2022
9d39368
add size prop to Avatar to re-use it as Icon
marcochavezf Feb 25, 2022
752edb5
use size property to remove Icon from LargeDualAvatars
marcochavezf Feb 25, 2022
63d87a5
display workspace icon for empty workspace chats
marcochavezf Feb 25, 2022
6577c11
display workspace icon in OptionRow and RoomHeaderAvatar
marcochavezf Feb 25, 2022
b434b58
Merge branch 'main' into marco-avatarsWorkspaceChats
marcochavezf Feb 26, 2022
e2bdea4
add functions getAvatarSource
marcochavezf Feb 26, 2022
729301d
use OptionsListUtils.getAvatarSource
marcochavezf Feb 26, 2022
dd69004
remove logic to check avatar source from Avatar
marcochavezf Feb 26, 2022
00fb84e
get avatar sources (url or icon) for OptionRow
marcochavezf Feb 26, 2022
4775ec2
rename avatarImageURLs to avatarIcons and change props
marcochavezf Feb 26, 2022
ea668d8
remove unused isChatRoom, isArchivedRoom and isPolicyExpenseChat
marcochavezf Feb 26, 2022
a199aa6
change params to SubscriptAvatar
marcochavezf Feb 26, 2022
12ac881
use _.contains() instead of .includes()
marcochavezf Feb 26, 2022
d537a28
include participants in getParticipantEmailsFromReport
marcochavezf Feb 26, 2022
ca1b024
change showSubscript flag to shouldShowSubscript
marcochavezf Feb 26, 2022
d55c0f3
revert condition for reportMapForLogins (fixed with report.participan…
marcochavezf Feb 26, 2022
7aa05fa
give priority to isArchivedRoom in getAvatarSource
marcochavezf Feb 26, 2022
4687612
update comment about returning workspace avatar
marcochavezf Feb 26, 2022
8846c8d
use props.source directly
marcochavezf Feb 26, 2022
a7e2a00
move large dual avatars to RoomHeaderAvatars and remove LargeDualAvatars
marcochavezf Feb 26, 2022
40325c7
fix jsdoc for icons
marcochavezf Feb 26, 2022
9e69491
move avatar size logic to the new funciton getAvatarSize
marcochavezf Feb 28, 2022
d47652b
delete redundant comment
marcochavezf Feb 28, 2022
bbff6ef
move condition logic to one line
marcochavezf Feb 28, 2022
41b6c25
use {*} to follow jsdoc style guides
marcochavezf Feb 28, 2022
f11c423
merge logic of getAvatarSources
marcochavezf Feb 28, 2022
e827030
replace getAvatarSourceFromReport with getAvatarSources
marcochavezf Feb 28, 2022
b95477c
return Profile icon instead of personalDetail.avatar
marcochavezf Feb 28, 2022
5bcca5f
fix styles of large workspace room avatars
marcochavezf Feb 28, 2022
5ac4713
call SubscriptAvatar directly
marcochavezf Feb 28, 2022
2ac7de7
set avatarTooltips as optional prop
marcochavezf Mar 1, 2022
e8fa8f3
fix tooltips in SubscriptAvatar
marcochavezf Mar 1, 2022
41115dd
Update src/components/Avatar.js
marcochavezf Mar 1, 2022
34097c8
remove unnecessary View in SubscriptAvatar
marcochavezf Mar 1, 2022
dc34a8b
replace secondAvatarHovered with StyleUtils.getBackgroundAndBorderStyle
marcochavezf Mar 1, 2022
e3990d8
add missing displayName
marcochavezf Mar 1, 2022
5dc0073
get the first element of avatar sources in ReportDetailsPage
marcochavezf Mar 1, 2022
652a7d7
change SubscriptAvatar size in #focus mode
marcochavezf Mar 1, 2022
a884bc0
use Avatar size const instead in MultipleAvatars
marcochavezf Mar 1, 2022
b78492a
create getAvatarStyle function and add SMALL_SUBSCRIPT size
marcochavezf Mar 2, 2022
565cf0c
use StyleUtils.getAvatarStyle in Avatar
marcochavezf Mar 2, 2022
3f66b17
create OPTION_MODE and replace string literals
marcochavezf Mar 2, 2022
4b79410
add mode to SubscriptAvatar and secondAvatarSubscriptCompact style
marcochavezf Mar 2, 2022
45b90ae
set emptyAvatarSmall and update style for subscript avatar
marcochavezf Mar 2, 2022
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
Prev Previous commit
Next Next commit
delete RoomAvatar (logic moved to Avatar)
  • Loading branch information
marcochavezf committed Feb 25, 2022
commit 5b8b05055f9772672d6c775565ed6ee1e5517bee
31 changes: 0 additions & 31 deletions src/components/RoomAvatar.js

This file was deleted.