From 10fda09d0331baa9856657769bf7dd80b0f3e80d Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Wed, 17 Jan 2018 12:08:33 +0100
Subject: Merge branch 'develop' into fix-service-tooltips-initialization

---
 src/components/settings/account/AccountDashboard.js | 2 +-
 src/components/ui/Subscription.js                   | 2 --
 src/containers/settings/AccountScreen.js            | 2 +-
 src/containers/ui/SubscriptionFormScreen.js         | 1 -
 src/stores/AppStore.js                              | 7 +------
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 5d947954f..43272fe96 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape, FormattedMessage } from 'react-intl';
+import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
 import moment from 'moment';
 
diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js
index e402588b6..41f8ba5d7 100644
--- a/src/components/ui/Subscription.js
+++ b/src/components/ui/Subscription.js
@@ -84,7 +84,6 @@ export default class SubscriptionForm extends Component {
     skipAction: PropTypes.func,
     skipButtonLabel: PropTypes.string,
     hideInfo: PropTypes.bool.isRequired,
-    openExternalUrl: PropTypes.func.isRequired,
   };
 
   static defaultProps ={
@@ -146,7 +145,6 @@ export default class SubscriptionForm extends Component {
       skipAction,
       skipButtonLabel,
       hideInfo,
-      openExternalUrl,
     } = this.props;
     const { intl } = this.context;
 
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 21d0fe20a..c5c2982b0 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -59,7 +59,7 @@ export default class AccountScreen extends Component {
   }
 
   render() {
-    const { user, payment, app } = this.props.stores;
+    const { user, payment } = this.props.stores;
     const { openExternalUrl } = this.props.actions.app;
     const { user: userActions } = this.props.actions;
 
diff --git a/src/containers/ui/SubscriptionFormScreen.js b/src/containers/ui/SubscriptionFormScreen.js
index 3d9e413e1..ac4593670 100644
--- a/src/containers/ui/SubscriptionFormScreen.js
+++ b/src/containers/ui/SubscriptionFormScreen.js
@@ -34,7 +34,6 @@ export default class SubscriptionFormScreen extends Component {
       actions,
       stores,
       onCloseWindow,
-      skipAction,
     } = this.props;
 
     const interval = plan;
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index a05bfc055..06c43f83f 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -124,15 +124,10 @@ export default class AppStore extends Store {
       this.stores.router.push(data.url);
     });
 
-    const TIMEOUT = 5000;
-    // Check system idle time every minute
-    setInterval(() => {
-      this.idleTime = idleTimer.getIdleTime();
-    }, TIMEOUT);
-
     // Reload all services after a healthy nap
     // Alternative solution for powerMonitor as the resume event is not fired
     // More information: https://github.com/electron/electron/issues/1615
+    const TIMEOUT = 5000;
     let lastTime = (new Date()).getTime();
     setInterval(() => {
       const currentTime = (new Date()).getTime();
-- 
cgit v1.2.3-54-g00ecf