diff --git a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx index 4c6415941a8b30e4218c2836b7c51633dfa6f668..a856ebf204bd116a7207427b202e81ff233b653e 100644 --- a/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/message-list/message-list-item/component.jsx @@ -6,7 +6,7 @@ import Icon from '/imports/ui/components/icon/component'; import UserAvatar from '/imports/ui/components/user-avatar/component'; import cx from 'classnames'; import Message from './message/component'; - +import PollService from '/imports/ui/components/poll/service'; import { styles } from './styles'; const propTypes = { @@ -192,7 +192,7 @@ class MessageListItem extends Component { <div className={styles.avatarWrapper}> <UserAvatar className={styles.avatar} - color={user.color} + color={PollService.POLL_AVATAR_COLOR} moderator={user.isModerator} > {<Icon className={styles.isPoll} iconName="polling" />} @@ -217,7 +217,7 @@ class MessageListItem extends Component { lastReadMessageTime={lastReadMessageTime} handleReadMessage={handleReadMessage} scrollArea={scrollArea} - color={user.color} + color={PollService.POLL_AVATAR_COLOR} isDefaultPoll={isDefaultPoll(messages[0].text.replace('bbb-published-poll-<br/>', ''))} /> </div> diff --git a/bigbluebutton-html5/imports/ui/components/poll/service.js b/bigbluebutton-html5/imports/ui/components/poll/service.js index 0c209524827c22bae2b864dc4902c544141f4af4..38ba164618b3643f76a037edf17e2f2bc959810d 100644 --- a/bigbluebutton-html5/imports/ui/components/poll/service.js +++ b/bigbluebutton-html5/imports/ui/components/poll/service.js @@ -3,6 +3,8 @@ import Users from '/imports/api/users'; import Auth from '/imports/ui/services/auth'; import Polls from '/imports/api/polls'; +const POLL_AVATAR_COLOR = '#3B48A9'; + // 'YN' = Yes,No // 'YNA' = Yes,No,Abstention // 'TF' = True,False @@ -82,4 +84,5 @@ export default { currentPoll: () => Polls.findOne({ meetingId: Auth.meetingID }), pollAnswerIds, sendGroupMessage, + POLL_AVATAR_COLOR, };