diff options
author | Amine El Mouafik <412895+kytwb@users.noreply.github.com> | 2021-02-08 10:34:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 10:34:45 +0100 |
commit | 035002ceedf78d5ec73eabc0df7f06139939b967 (patch) | |
tree | 1c0d1e9531bae05fb65d70b9ea25baf404b74fe1 /src/components/ui | |
parent | docs: add k0staa as a contributor (#1193) (diff) | |
download | ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.gz ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.tar.zst ferdium-app-035002ceedf78d5ec73eabc0df7f06139939b967.zip |
Synchronize with Franz 5.6.0 (#1033)
Co-authored-by: FranzBot <i18n@meetfranz.com>
Co-authored-by: vantezzen <hello@vantezzen.io>
Co-authored-by: Makazzz <makazzzpro@live.ca>
Co-authored-by: Stefan Malzner <stefan@adlk.io>
Co-authored-by: Amine Mouafik <amine@mouafik.fr>
Diffstat (limited to 'src/components/ui')
-rw-r--r-- | src/components/ui/FeatureList.js | 2 | ||||
-rw-r--r-- | src/components/ui/Modal/index.js | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js index dbc2a9078..72c799819 100644 --- a/src/components/ui/FeatureList.js +++ b/src/components/ui/FeatureList.js | |||
@@ -76,7 +76,7 @@ export class FeatureList extends Component { | |||
76 | static propTypes = { | 76 | static propTypes = { |
77 | className: PropTypes.string, | 77 | className: PropTypes.string, |
78 | featureClassName: PropTypes.string, | 78 | featureClassName: PropTypes.string, |
79 | plan: PropTypes.oneOf(Object.values(PLANS)), | 79 | plan: PropTypes.oneOf(Object.keys(PLANS)), |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static defaultProps = { | 82 | static defaultProps = { |
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js index 0af521452..a9fa0cd1b 100644 --- a/src/components/ui/Modal/index.js +++ b/src/components/ui/Modal/index.js | |||
@@ -41,8 +41,6 @@ export default @injectCSS(styles) class Modal extends Component { | |||
41 | showClose, | 41 | showClose, |
42 | } = this.props; | 42 | } = this.props; |
43 | 43 | ||
44 | const appRoot = document.getElementById('root'); | ||
45 | |||
46 | return ( | 44 | return ( |
47 | <ReactModal | 45 | <ReactModal |
48 | isOpen={isOpen} | 46 | isOpen={isOpen} |
@@ -55,7 +53,7 @@ export default @injectCSS(styles) class Modal extends Component { | |||
55 | portal={portal} | 53 | portal={portal} |
56 | onRequestClose={close} | 54 | onRequestClose={close} |
57 | shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} | 55 | shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} |
58 | appElement={appRoot} | 56 | appElement={document.getElementById('root')} |
59 | > | 57 | > |
60 | {showClose && close && ( | 58 | {showClose && close && ( |
61 | <button | 59 | <button |