diff options
author | 2018-01-17 12:08:33 +0100 | |
---|---|---|
committer | 2018-01-17 12:08:33 +0100 | |
commit | 10fda09d0331baa9856657769bf7dd80b0f3e80d (patch) | |
tree | 00157c7abd93cb56042a2a9eb4f346d23f0de63c /src | |
parent | Fix #32 service tooltips not initialized properly (diff) | |
download | ferdium-app-10fda09d0331baa9856657769bf7dd80b0f3e80d.tar.gz ferdium-app-10fda09d0331baa9856657769bf7dd80b0f3e80d.tar.zst ferdium-app-10fda09d0331baa9856657769bf7dd80b0f3e80d.zip |
Merge branch 'develop' into fix-service-tooltips-initialization
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 2 | ||||
-rw-r--r-- | src/components/ui/Subscription.js | 2 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 2 | ||||
-rw-r--r-- | src/containers/ui/SubscriptionFormScreen.js | 1 | ||||
-rw-r--r-- | 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 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape, FormattedMessage } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
5 | import ReactTooltip from 'react-tooltip'; | 5 | import ReactTooltip from 'react-tooltip'; |
6 | import moment from 'moment'; | 6 | import moment from 'moment'; |
7 | 7 | ||
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 { | |||
84 | skipAction: PropTypes.func, | 84 | skipAction: PropTypes.func, |
85 | skipButtonLabel: PropTypes.string, | 85 | skipButtonLabel: PropTypes.string, |
86 | hideInfo: PropTypes.bool.isRequired, | 86 | hideInfo: PropTypes.bool.isRequired, |
87 | openExternalUrl: PropTypes.func.isRequired, | ||
88 | }; | 87 | }; |
89 | 88 | ||
90 | static defaultProps ={ | 89 | static defaultProps ={ |
@@ -146,7 +145,6 @@ export default class SubscriptionForm extends Component { | |||
146 | skipAction, | 145 | skipAction, |
147 | skipButtonLabel, | 146 | skipButtonLabel, |
148 | hideInfo, | 147 | hideInfo, |
149 | openExternalUrl, | ||
150 | } = this.props; | 148 | } = this.props; |
151 | const { intl } = this.context; | 149 | const { intl } = this.context; |
152 | 150 | ||
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 { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | render() { | 61 | render() { |
62 | const { user, payment, app } = this.props.stores; | 62 | const { user, payment } = this.props.stores; |
63 | const { openExternalUrl } = this.props.actions.app; | 63 | const { openExternalUrl } = this.props.actions.app; |
64 | const { user: userActions } = this.props.actions; | 64 | const { user: userActions } = this.props.actions; |
65 | 65 | ||
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 { | |||
34 | actions, | 34 | actions, |
35 | stores, | 35 | stores, |
36 | onCloseWindow, | 36 | onCloseWindow, |
37 | skipAction, | ||
38 | } = this.props; | 37 | } = this.props; |
39 | 38 | ||
40 | const interval = plan; | 39 | 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 { | |||
124 | this.stores.router.push(data.url); | 124 | this.stores.router.push(data.url); |
125 | }); | 125 | }); |
126 | 126 | ||
127 | const TIMEOUT = 5000; | ||
128 | // Check system idle time every minute | ||
129 | setInterval(() => { | ||
130 | this.idleTime = idleTimer.getIdleTime(); | ||
131 | }, TIMEOUT); | ||
132 | |||
133 | // Reload all services after a healthy nap | 127 | // Reload all services after a healthy nap |
134 | // Alternative solution for powerMonitor as the resume event is not fired | 128 | // Alternative solution for powerMonitor as the resume event is not fired |
135 | // More information: https://github.com/electron/electron/issues/1615 | 129 | // More information: https://github.com/electron/electron/issues/1615 |
130 | const TIMEOUT = 5000; | ||
136 | let lastTime = (new Date()).getTime(); | 131 | let lastTime = (new Date()).getTime(); |
137 | setInterval(() => { | 132 | setInterval(() => { |
138 | const currentTime = (new Date()).getTime(); | 133 | const currentTime = (new Date()).getTime(); |