diff options
author | 2019-09-07 18:18:24 +0200 | |
---|---|---|
committer | 2019-09-07 18:18:24 +0200 | |
commit | 861fa78258f354c066d500ddac5b59710b708a1f (patch) | |
tree | 6c208a25d9ad2a7934ec424e94832b4a75e5621f /src/components | |
parent | Make todo server editable (diff) | |
download | ferdium-app-861fa78258f354c066d500ddac5b59710b708a1f.tar.gz ferdium-app-861fa78258f354c066d500ddac5b59710b708a1f.tar.zst ferdium-app-861fa78258f354c066d500ddac5b59710b708a1f.zip |
Remove service restriction
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/services/content/ServiceView.js | 18 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index f65f51346..86bc06895 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -130,19 +130,11 @@ export default @observer class ServiceView extends Component { | |||
130 | </Fragment> | 130 | </Fragment> |
131 | ) : ( | 131 | ) : ( |
132 | <> | 132 | <> |
133 | {service.isServiceAccessRestricted ? ( | 133 | <ServiceWebview |
134 | <ServiceRestricted | 134 | service={service} |
135 | name={service.recipe.name} | 135 | setWebviewReference={setWebviewReference} |
136 | upgrade={upgrade} | 136 | detachService={detachService} |
137 | type={service.restrictionType} | 137 | /> |
138 | /> | ||
139 | ) : ( | ||
140 | <ServiceWebview | ||
141 | service={service} | ||
142 | setWebviewReference={setWebviewReference} | ||
143 | detachService={detachService} | ||
144 | /> | ||
145 | )} | ||
146 | </> | 138 | </> |
147 | )} | 139 | )} |
148 | {statusBar} | 140 | {statusBar} |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index da9d72009..df91929cb 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -28,7 +28,7 @@ const messages = defineMessages({ | |||
28 | }, | 28 | }, |
29 | todoServerInfo: { | 29 | todoServerInfo: { |
30 | id: 'settings.app.todoServerInfo', | 30 | id: 'settings.app.todoServerInfo', |
31 | defaultMessage: '!!!This server will be used for the "Franz Todo" feature. The default server will only work for premium users. (default: https://app.franztodos.com)' | 31 | defaultMessage: '!!!This server will be used for the "Franz Todo" feature. The default server will only work for premium users. (default: https://app.franztodos.com)', |
32 | }, | 32 | }, |
33 | headlineLanguage: { | 33 | headlineLanguage: { |
34 | id: 'settings.app.headlineLanguage', | 34 | id: 'settings.app.headlineLanguage', |