BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17327 from Scroody/I-16943

Browse Source 
Fixed: Note notification removed when shared notes pinned.
This commit is contained in:
Ramón Souza 2023-03-28 10:50:28 -03:00 committed by GitHub
commit 2138c98dc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
View File

@ -168,11 +168,12 @@ class NavBar extends Component {
amIModerator,
style,
main,
isPinned,
sidebarNavigation,
currentUserId,
} = this.props;
const hasNotification = hasUnreadMessages || hasUnreadNotes;
const hasNotification = hasUnreadMessages || (hasUnreadNotes && !isPinned);
let ariaLabel = intl.formatMessage(intlMessages.toggleUserListAria);
ariaLabel += hasNotification ? (` ${intl.formatMessage(intlMessages.newMessages)}`) : '';

1
bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
View File

@ -115,6 +115,7 @@ export default withTracker(() => {
}
return {
isPinned: NotesService.isSharedNotesPinned(),
currentUserId: Auth.userID,
meetingId,
presentationTitle: meetingTitle,