This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Fix limit banner show modal for cloud in-app purchases #7305
Merged
Merged
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
78f19c0
change super to system (#7076) (#7088)
mattermost-build a6f56ff
MM-20465 Fix for collapse/expand of image preview (#7085)
sudheerDev c6ee96f
MM-20465 Revert usage of getCurrentChannel to getCurrentChannelId whe…
mattermost-build c6ea89c
Automated cherry pick of #7096 (#7097)
mattermost-build 7d7be06
Automated cherry pick of #7101 (#7104)
mattermost-build 3d69740
MM-30477 Fix for autocomplete not closing (#7093)
sudheerDev 7bbe7eb
Add GitLab jobs
metanerd d93f0aa
Translations update from Weblate (#7122)
weblate d199d11
Translations update from Weblate (#7139)
weblate 928f93a
Merge latest master into cloud branch for next release (#7144)
jwilander d6b4d69
MM-30972 Add proper padding to code preview line numbers (#7155) (#7167)
mattermost-build a36a905
Automated cherry pick of #7133 (#7178)
mattermost-build f635879
Update NOTICE.txt (#7102) (#7179)
mattermost-build faadbf7
Automated cherry pick of #7183 (#7184)
mattermost-build 8f10cbd
Translations update from Weblate (#7182)
weblate a1023cb
Translations update from Weblate (#7220)
weblate a610efa
MM-31275 New sidebar performance improvements (#7207) (#7240)
mattermost-build 01ed232
MM-31466 Performance investigation part two (cloud) (#7245)
hmhealey 8c7b80a
Translations update from Weblate (#7273)
weblate 9ffd6be
Merge branch 'master' into cloud-ff-2021-01-05
jwilander 7fcac88
Merge branch 'cloud-ff-2021-01-05' into cloud
jwilander f107384
MM-31697- Remove OpenId from System Console (#7278) (#7294)
mattermost-build 5771f9f
[MM-31580] Fix call to getChannel to use new parameter format (#7284)…
mattermost-build 9f8ff45
MM-31189 Revert New Messages toast PRs (#7292) (#7301)
mattermost-build d4abc17
[MM-31708][MM-31726][MM-31739][MM-31727] - Fix regressions in RHS and…
mattermost-build 7278c69
Add onClick event to button so banner button works for cloud
nickmisasi cb60c01
Change to onButtonClick
nickmisasi c3da199
Reset changes for package-lock
nickmisasi ee35eb6
Put showModal back in case its used elsewhere
nickmisasi ebbd8b1
Fix invocation
nickmisasi bb22e69
Fix payment_announcement_bar
nickmisasi 074ded6
Merge branch 'master' into fix-limit-banner-show-modal
nickmisasi f146d54
Reset 2 files to master
nickmisasi 6024473
Merge branch 'master' into fix-limit-banner-show-modal
mattermod File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we rename this to
showButton
as well for consistency?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
showModal is used by
configuration_bar.tsx
as a boolean on whether or not to show the link in the banner (these will be for older banners). I think this is where the typescript conversion tripped up - javascript was a little more lenient on the type of that prop and would use it as a boolean or a function depending on the context. So I've left this in to support that case and then added the new prop for our bannersThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have we looked at refactoring what those other components are passing in? Probably OOS for this PR but i'm just curious what the effort would be, if it's even possible.