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

Jump to bottom

[FIX] Add fallback message when show notification content is disabled #19516

Merged
merged 1 commit into from Dec 3, 2020
Merged

[FIX] Add fallback message when show notification content is disabled #19516

merged 1 commit into from Dec 3, 2020

Conversation

youssef-md
Copy link
Contributor

@youssef-md youssef-md commented Nov 12, 2020 •
edited by sampaiodiego

Proposed changes

Add fallback message "You have a new message" when "Show Message in Notification" is set to false.

Issue(s)

Closes #10364

How to test or reproduce

With the configuration for Push Notification working:

  • Toggle the "Show Message in Notification" under Admin > Push > Privacy. The content will be shown if set to true and "You have a new message" fallback will show when set to false.

Screenshots

  • When Show Message in Notification is set to true:
    image

  • When Show Message in Notification is set to false:
    image

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Changelog

Further comments

@youssef-md @rogerioo
Add fallback message when show notification content is disabled
d873f72 
Co-authored-by: Rogerio Junior <junior.rogerio8@gmail.com>
@youssef-md youssef-md marked this pull request as ready for review November 12, 2020 19:19
@ggazzo ggazzo added this to the 3.10.0 milestone Dec 3, 2020
@sampaiodiego sampaiodiego merged commit 10d9f32 into RocketChat:develop Dec 3, 2020
gabriellsh added a commit that referenced this pull request Dec 8, 2020
@gabriellsh
Merge branch 'header' of github.com:RocketChat/Rocket.Chat into heade…
2c161b6 
…r_render

* 'header' of github.com:RocketChat/Rocket.Chat:
  [IMPROVE] Replace useClipboard (#19764)
  Regression: contextualBar folder structure (#19761)
  [IMPROVE] Replace usePrefersReducedMotion (#19759)
  [FIX] Image preview for image URLs on messages (#19734)
  [FIX] Sidebar presence will now correctly update for Omnichannel rooms (#19746)
  Fix OTR tab
  [FIX] Startup error when using MongoDB with a password containing special characters (#19749)
  [FIX] File Tab Order (#19729)
  [FIX] Emails not showing up in Admin/Users (#19727)
  Regression: Add Members showing the wrong template  (#19748)
  Regression: "My Account" page doesn't load (#19753)
  [FIX] Add fallback message when show notification content is disabled (#19516)
  Frontend folder structure (#19631)
  bump fuselage (#19736)
  [IMPROVE] Removed useEndpointDataExperimental hook usage (#19496)
  Merge EE and Community translations and LingoHub manual sync (#19723)
  [FIX] Sidebar UI disappearing (#19725)
  [IMPROVE] Rewrite NotificationPreferences to React component (#19672)
  Skeleton
  Fix buttons
@sampaiodiego sampaiodiego mentioned this pull request Dec 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggazzo ggazzo ggazzo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.10.0
Development

Successfully merging this pull request may close these issues.

Add "New message" text to notifications when "Show Message" is set to false
3 participants
@youssef-md @ggazzo @sampaiodiego