Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

[MM-23995] [MM-23996] Fix improper rendering of bot profile picture and bot roles #5294

Merged

Conversation

fmunshi
Copy link
Contributor

@fmunshi fmunshi commented Apr 8, 2020

Summary

  • Fixes a case where FormattedMessage was used as a select option resulting in object Object being shown as the text
  • Fixes user not being passed as prop to add bot
  • Also modified call to getUsers(state)[id] into getUser(state, id)

Ticket Link

Screenshots

Screen Shot 2020-04-08 at 1 58 29 PM

@fmunshi fmunshi added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Apr 8, 2020
@fmunshi fmunshi requested review from crspeller and a team April 8, 2020 17:59
@ghost ghost requested review from jespino and removed request for a team April 8, 2020 18:00
@fmunshi fmunshi added this to the v5.22.0 milestone Apr 8, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Apr 8, 2020
Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crspeller crspeller removed the 2: Dev Review Requires review by a core commiter label Apr 9, 2020
@DHaussermann DHaussermann added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Apr 13, 2020
Copy link

@DHaussermann DHaussermann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and passed
Both issues are resolved.
When editing am existing bot, the profile image remains visible. The role drop down displays correctly.

LGTM! Thanks @fmunshi for this fix!
Please merge.

@DHaussermann DHaussermann added 4: Reviews Complete All reviewers have approved the pull request QA Review Done and removed 3: QA Review Requires review by a QA tester Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Apr 13, 2020
@mattermod
Copy link
Contributor

Test server destroyed

@fmunshi fmunshi merged commit bcb86d7 into mattermost:master Apr 13, 2020
@mattermod mattermod added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Apr 13, 2020
fmunshi pushed a commit that referenced this pull request Apr 13, 2020
* MM-23995 Pass bot user to props correctly

* MM-23996 Dont use formatted message inside of option select instead use utils method

Co-authored-by: fm2munsh <[email protected]>
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Apr 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation QA Review Done
Projects
None yet
6 participants