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

MM-21844 Fix toast text glitch on small window widths #4724

Merged
merged 2 commits into from
Jan 27, 2020
Merged

Conversation

sudheerDev
Copy link
Contributor

Summary

  • Use width to determine the text rather than isMobile func

Ticket Link

https://mattermost.atlassian.net/browse/MM-21844

Screenshots

Screenshot 2020-01-23 at 11 11 50 PM

   * Use width to determine the text rather than isMobile func
@sudheerDev sudheerDev added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Jan 23, 2020
@sudheerDev sudheerDev added this to the v5.20.0 milestone Jan 23, 2020
@sudheerDev sudheerDev requested a review from a team January 23, 2020 16:12
@ghost ghost requested review from stylianosrigas and Willyfrog and removed request for a team January 23, 2020 16:12
@sudheerDev sudheerDev added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Jan 23, 2020
@stylianosrigas stylianosrigas requested review from a team and removed request for stylianosrigas January 23, 2020 16:19
@ghost ghost requested review from levb and removed request for a team January 23, 2020 16:19
@jgilliam17 jgilliam17 added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Jan 24, 2020
Copy link
Contributor

@jgilliam17 jgilliam17 left a comment

Choose a reason for hiding this comment

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

Tested, looks good to merge.

  • No glitch, text and toast look good in small window widths, with or without RHS open

@jgilliam17 jgilliam17 added 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 Jan 24, 2020
@mattermod
Copy link
Contributor

Test server destroyed

@sudheerDev sudheerDev added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Jan 24, 2020
@sudheerDev sudheerDev self-assigned this Jan 24, 2020
@sudheerDev sudheerDev merged commit 85c3509 into master Jan 27, 2020
@sudheerDev sudheerDev deleted the MM-21844 branch January 27, 2020 12:54
@mattermod
Copy link
Contributor

@sudheerDev
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-#4724-upstream-release-5.20-1580129702
Branch 'automated-cherry-pick-of-#4724-upstream-release-5.20-1580129702' set up to track remote branch 'release-5.20' from 'upstream'.
+++ Downloading patch to /tmp/4724.patch (in case you need to do this again)

+++ About to attempt cherry pick of PR. To reattempt:
  $ git am -3 /tmp/4724.patch

Applying: MM-21844 Fix toast text glitch on small window widths
Using index info to reconstruct a base tree...
M	components/post_view/post_list_virtualized/post_list_virtualized.jsx
M	components/toast_wrapper/toast_wrapper.jsx
Falling back to patching base and 3-way merge...
Auto-merging components/toast_wrapper/toast_wrapper.jsx
CONFLICT (content): Merge conflict in components/toast_wrapper/toast_wrapper.jsx
Auto-merging components/post_view/post_list_virtualized/post_list_virtualized.jsx
Patch failed at 0001 MM-21844 Fix toast text glitch on small window widths
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

+++ Conflicts detected:

UU components/toast_wrapper/toast_wrapper.jsx

+++ Aborting in-progress git am.

+++ Returning you to the master branch and cleaning up.

sudheerDev added a commit that referenced this pull request Jan 27, 2020
* Use width to determine the text rather than isMobile func
@sudheerDev sudheerDev 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 Jan 27, 2020
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Jan 27, 2020
@jgilliam17 jgilliam17 added the Tests/Done Release tests have been written label Feb 3, 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 Tests/Done Release tests have been written
Projects
None yet
6 participants