diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2019-09-06 09:28:12 +0200 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2019-09-06 09:28:12 +0200 |
| commit | b5b2976f447779a584f0d2fdcce21c8e62156df3 (patch) | |
| tree | 9c13cf950b28f9d8824c5a1c028a53aae4bedeef /src/components | |
| parent | Update 3rd party recipe wording (diff) | |
| parent | Fix race condition when team data is not yet loaded (diff) | |
| download | ferdium-app-b5b2976f447779a584f0d2fdcce21c8e62156df3.tar.gz ferdium-app-b5b2976f447779a584f0d2fdcce21c8e62156df3.tar.zst ferdium-app-b5b2976f447779a584f0d2fdcce21c8e62156df3.zip | |
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/layout/AppLayout.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 941e60bfd..200777ae6 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
| @@ -125,7 +125,15 @@ class AppLayout extends Component { | |||
| 125 | sticky={item.sticky} | 125 | sticky={item.sticky} |
| 126 | onHide={() => removeNewsItem({ newsId: item.id })} | 126 | onHide={() => removeNewsItem({ newsId: item.id })} |
| 127 | > | 127 | > |
| 128 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 128 | <span |
| 129 | dangerouslySetInnerHTML={createMarkup(item.message)} | ||
| 130 | onClick={(event) => { | ||
| 131 | const { target } = event; | ||
| 132 | if (target && target.hasAttribute('data-is-news-cta')) { | ||
| 133 | removeNewsItem({ newsId: item.id }); | ||
| 134 | } | ||
| 135 | }} | ||
| 136 | /> | ||
| 129 | </InfoBar> | 137 | </InfoBar> |
| 130 | ))} | 138 | ))} |
| 131 | {hasActivatedTrial && ( | 139 | {hasActivatedTrial && ( |