Merge branch 'develop' of github.com:getferdi/ferdi into develop

2 files changed, 6 insertions, 1 deletions

diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index c45acc961..0cfefc92b 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -13,6 +13,7 @@ import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler';
 import ServiceDisabled from './ServiceDisabled';
 import ServiceWebview from './ServiceWebview';
 import SettingsStore from '../../../stores/SettingsStore';
+import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 
 export default @observer @inject('stores') class ServiceView extends Component {
   static propTypes = {
@@ -177,6 +178,9 @@ export default @observer @inject('stores') class ServiceView extends Component {
           </Fragment>
         ) : (
           <>
+            {service.recipe.id === 'franz-custom-website' && (
+              <WebControlsScreen service={service} />
+            )}
             {!this.state.hibernate ? (
               <ServiceWebview
                 service={service}
@@ -187,7 +191,7 @@ export default @observer @inject('stores') class ServiceView extends Component {
               <div>
                 <span role="img" aria-label="Sleeping Emoji">😴</span>
                 {' '}
-This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
+                This service is currently hibernating. If this page doesn&#x27;t close soon, please try reloading Ferdi.
               </div>
             )}
           </>
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 647e31d52..03d6d5bcc 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -59,6 +59,7 @@ class ServiceWebview extends Component {
         }}
         onUpdateTargetUrl={this.updateTargetUrl}
         useragent={service.userAgent}
+        disablewebsecurity={service.recipe.disablewebsecurity}
         allowpopups
       />
     );