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

[MM-29559][MM-29558] Company Info Fixes #6764

Merged
merged 2 commits into from Oct 13, 2020

Conversation

devinbinnie
Copy link
Member

Summary

Two fixes:

  • Fixed the Company Info flickering by making sure the component doesn't render until customer is loaded
  • Fixed the missing address when company_address is not null but rather everything is blank, so now it checks if line1 is blank or not.

Ticket Link

https://mattermost.atlassian.net/browse/MM-29558
https://mattermost.atlassian.net/browse/MM-29559

@devinbinnie devinbinnie added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 13, 2020
@marianunez
Copy link
Member

This will be tested post-merge given that we still can't connect to CWS from PR test servers. Removing QA Label

@devinbinnie devinbinnie removed the 3: QA Review Requires review by a QA tester label Oct 13, 2020
@devinbinnie devinbinnie removed the request for review from stevemudie October 13, 2020 18:47
@devinbinnie devinbinnie removed the request for review from alifarooq0 October 13, 2020 20:49
@devinbinnie devinbinnie merged commit 9b7d71c into mattermost:master Oct 13, 2020
@devinbinnie
Copy link
Member Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Oct 13, 2020
* [MM-29559][MM-29558] Company Info Fixes

* Fixed so that the no company info screen loads when neither address exists

(cherry picked from commit 9b7d71c)
@mattermod mattermod added the CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone label Oct 13, 2020
devinbinnie added a commit that referenced this pull request Oct 13, 2020
* [MM-29559][MM-29558] Company Info Fixes

* Fixed so that the no company info screen loads when neither address exists

(cherry picked from commit 9b7d71c)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation and removed 2: Dev Review Requires review by a core commiter labels Oct 13, 2020
Tak-Iwamoto pushed a commit to Tak-Iwamoto/mattermost-webapp that referenced this pull request Oct 14, 2020
…o MM-20457

* 'master' of github.com:Tak-Iwamoto/mattermost-webapp: (87 commits)
  MM-T644 Integrations display on team where they were created (mattermost#6752)
  [MM-20478] Migrate post_header module to TypeScript (mattermost#6631)
  [MM-20599] Migrated select_team component to Typescript (mattermost#6574)
  MM-20554 Migrate 'components/delete_post_modal' module and associated tests to TypeScript (mattermost#6656)
  [MM-24436]- Add a threshold from bottom for new messages toast (mattermost#5828)
  [MM-20489] Migrate failed_post_options and its tests to typescript (mattermost#6717)
  [MM-28063] Cloud Telemetry - Admin Console (mattermost#6762)
  [MM-29559][MM-29558] Company Info Fixes (mattermost#6764)
  [MM-29557] [MM-29590] Update subscription when purchase modal closes (mattermost#6765)
  [MM-29615] Fixed subscription page so it doesn't load until subscription info is loaded (mattermost#6766)
  [MM-28064] Add telemetry in various places around cloud message banners (mattermost#6763)
  migrate changeCSS function CSS variable for mobile CSS .tutorial-steps__container selector. (mattermost#6743)
  [MM-27231]: cypress test for MM-T1837 (mattermost#6676)
  [MM-28062] Add telemetry for in-app purchase flow (mattermost#6760)
  MM-27454 - Contact Us and Billing Documentation Links (mattermost#6731)
  [MM-20514] Migrates components/password reset send link to typescript (mattermost#6584)
  Cloud Billing polish Soft GA (mattermost#6740)
  [MM-28221] Payment Info Edit/View (mattermost#6709)
  MM-T636 Description field for incoming and outgoing webhooks can hold 500 characters (mattermost#6682)
  Translations update from Weblate (mattermost#6748)
  ...
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
* [MM-29559][MM-29558] Company Info Fixes

* Fixed so that the no company info screen loads when neither address exists
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
* [MM-29559][MM-29558] Company Info Fixes

* Fixed so that the no company info screen loads when neither address exists
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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
Projects
None yet
5 participants