diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-10-08 19:46:50 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-10-08 19:46:50 +0200 |
commit | d3009b91b487627e5d510ac01d79c29c90c82053 (patch) | |
tree | 739eb684c3c227ca121df2df445ed352a32c8129 /src/components | |
parent | Fix non-related issues (diff) | |
parent | remove external url event (diff) | |
download | ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.tar.gz ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.tar.zst ferdium-app-d3009b91b487627e5d510ac01d79c29c90c82053.zip |
Merge branch 'release/5.4.0-beta.3' into fix/only-load-workspace-related-services
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/services/content/ServiceView.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index e8df58a1e..3b09518c5 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -13,6 +13,7 @@ import ServiceDisabled from './ServiceDisabled'; | |||
13 | import ServiceRestricted from './ServiceRestricted'; | 13 | import ServiceRestricted from './ServiceRestricted'; |
14 | import ServiceWebview from './ServiceWebview'; | 14 | import ServiceWebview from './ServiceWebview'; |
15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; | ||
16 | 17 | ||
17 | export default @observer class ServiceView extends Component { | 18 | export default @observer class ServiceView extends Component { |
18 | static propTypes = { | 19 | static propTypes = { |
@@ -139,7 +140,7 @@ export default @observer class ServiceView extends Component { | |||
139 | /> | 140 | /> |
140 | ) : ( | 141 | ) : ( |
141 | <> | 142 | <> |
142 | {service.recipe.id === 'franz-custom-website' && ( | 143 | {service.recipe.id === CUSTOM_WEBSITE_ID && ( |
143 | <WebControlsScreen service={service} /> | 144 | <WebControlsScreen service={service} /> |
144 | )} | 145 | )} |
145 | <ServiceWebview | 146 | <ServiceWebview |