5 files changed, 15 insertions, 15 deletions

diff --git a/README.md b/README.md
index 4d024c3be..f7ad7d179 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 # Franz 5 (beta)
 [![Build status Windows](https://ci.appveyor.com/api/projects/status/9yman4ye19x4274o/branch/master?svg=true)](https://ci.appveyor.com/project/adlk/franz/branch/master)
- [![Build Status Mac](https://travis-ci.org/meetfranz/franz.svg?branch=master)](https://travis-ci.org/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html)
+ [![Build Status Mac & Linux](https://travis-ci.com/meetfranz/franz.svg?branch=master)](https://travis-ci.com/meetfranz/franz) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://meetfranz.com/payment.html)
 
 Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.
 
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 28eaa7fdc..bce792e56 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -9,7 +9,7 @@ import { Component as DelayApp } from '../../features/delayApp';
 import { Component as BasicAuth } from '../../features/basicAuth';
 import ErrorBoundary from '../util/ErrorBoundary';
 
-import globalMessages from '../../i18n/globalMessages';
+// import globalMessages from '../../i18n/globalMessages';
 
 import { isWindows } from '../../environment';
 
@@ -51,7 +51,7 @@ export default @observer class AppLayout extends Component {
     services: PropTypes.element.isRequired,
     children: PropTypes.element,
     news: MobxPropTypes.arrayOrObservableArray.isRequired,
-    isOnline: PropTypes.bool.isRequired,
+    // isOnline: PropTypes.bool.isRequired,
     showServicesUpdatedInfoBar: PropTypes.bool.isRequired,
     appUpdateIsDownloaded: PropTypes.bool.isRequired,
     removeNewsItem: PropTypes.func.isRequired,
@@ -79,7 +79,7 @@ export default @observer class AppLayout extends Component {
       sidebar,
       services,
       children,
-      isOnline,
+      // isOnline,
       news,
       showServicesUpdatedInfoBar,
       appUpdateIsDownloaded,
@@ -115,14 +115,15 @@ export default @observer class AppLayout extends Component {
                     <span dangerouslySetInnerHTML={createMarkup(item.message)} />
                   </InfoBar>
                 ))}
-                {!isOnline && (
+                {/* {!isOnline && (
                   <InfoBar
                     type="danger"
+                    sticky
                   >
                     <span className="mdi mdi-flash" />
                     {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
                   </InfoBar>
-                )}
+                )} */}
                 {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
                   <InfoBar
                     type="danger"
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index f79197c38..efd57a09d 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -292,6 +292,8 @@ export default class ServicesStore extends Store {
       this.all[index].isActive = false;
     });
     service.isActive = true;
+
+    this._focusActiveService();
   }
 
   @action _setActiveNext() {
@@ -342,6 +344,9 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (service.webview) {
+      if (document.activeElement) {
+        document.activeElement.blur();
+      }
       service.webview.focus();
     }
   }
diff --git a/src/styles/services.scss b/src/styles/services.scss
index 0e559501c..5acf92d2c 100644
--- a/src/styles/services.scss
+++ b/src/styles/services.scss
@@ -39,18 +39,12 @@
     webview {
       background: $theme-gray-lighter;
       display: inline-flex;
-      height: 0;
-      width: 0;
+      height: 100%;
+      width: 100%;
     }
 
     &.is-active {
       z-index: 100;
-
-      webview {
-        flex: 0 1;
-        height: 100%;
-        width: 100%;
-      }
     }
 
     &--force-repaint webview { z-index: 5; }
diff --git a/src/webview/recipe.js b/src/webview/recipe.js
index 9aa89ce01..c718b348e 100644
--- a/src/webview/recipe.js
+++ b/src/webview/recipe.js
@@ -73,7 +73,7 @@ class RecipeController {
       require(modulePath)(new RecipeWebview(), {...config, recipe,});
       debug('Initialize Recipe', config, recipe);
 
-      this.settings.service = config;
+      this.settings.service = Object.assign(config, { recipe });
     } catch (err) {
       console.error('Recipe initialization failed', err);
     }