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/services/content/Services.js | |
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/services/content/Services.js')
-rw-r--r-- | src/components/services/content/Services.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index da2ee0b9e..f679eeed0 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -10,6 +10,7 @@ import injectSheet from 'react-jss'; | |||
10 | import ServiceView from './ServiceView'; | 10 | import ServiceView from './ServiceView'; |
11 | import Appear from '../../ui/effects/Appear'; | 11 | import Appear from '../../ui/effects/Appear'; |
12 | import serverlessLogin from '../../../helpers/serverless-helpers'; | 12 | import serverlessLogin from '../../../helpers/serverless-helpers'; |
13 | import { TODOS_RECIPE_ID } from '../../../features/todos'; | ||
13 | 14 | ||
14 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
15 | welcome: { | 16 | welcome: { |
@@ -58,6 +59,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services | |||
58 | hasActivatedTrial: PropTypes.bool.isRequired, | 59 | hasActivatedTrial: PropTypes.bool.isRequired, |
59 | classes: PropTypes.object.isRequired, | 60 | classes: PropTypes.object.isRequired, |
60 | actions: PropTypes.object.isRequired, | 61 | actions: PropTypes.object.isRequired, |
62 | isSpellcheckerEnabled: PropTypes.bool.isRequired, | ||
61 | }; | 63 | }; |
62 | 64 | ||
63 | static defaultProps = { | 65 | static defaultProps = { |
@@ -111,6 +113,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services | |||
111 | userHasCompletedSignup, | 113 | userHasCompletedSignup, |
112 | hasActivatedTrial, | 114 | hasActivatedTrial, |
113 | classes, | 115 | classes, |
116 | isSpellcheckerEnabled, | ||
114 | } = this.props; | 117 | } = this.props; |
115 | 118 | ||
116 | const { | 119 | const { |
@@ -168,7 +171,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services | |||
168 | </div> | 171 | </div> |
169 | </Appear> | 172 | </Appear> |
170 | )} | 173 | )} |
171 | {services.map(service => ( | 174 | {services.filter(service => service.recipe.id !== TODOS_RECIPE_ID).map(service => ( |
172 | <ServiceView | 175 | <ServiceView |
173 | key={service.id} | 176 | key={service.id} |
174 | service={service} | 177 | service={service} |
@@ -186,6 +189,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services | |||
186 | redirect: false, | 189 | redirect: false, |
187 | })} | 190 | })} |
188 | upgrade={() => openSettings({ path: 'user' })} | 191 | upgrade={() => openSettings({ path: 'user' })} |
192 | isSpellcheckerEnabled={isSpellcheckerEnabled} | ||
189 | /> | 193 | /> |
190 | ))} | 194 | ))} |
191 | </div> | 195 | </div> |