aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar haraldox <hnaumann+github@gmail.com>2018-01-17 12:08:33 +0100
committerLibravatar haraldox <hnaumann+github@gmail.com>2018-01-17 12:08:33 +0100
commit10fda09d0331baa9856657769bf7dd80b0f3e80d (patch)
tree00157c7abd93cb56042a2a9eb4f346d23f0de63c /src/components
parentFix #32 service tooltips not initialized properly (diff)
downloadferdium-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/components')
-rw-r--r--src/components/settings/account/AccountDashboard.js2
-rw-r--r--src/components/ui/Subscription.js2
2 files changed, 1 insertions, 3 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 @@
1import React, { Component } from 'react'; 1import React, { Component } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; 3import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
4import { defineMessages, intlShape, FormattedMessage } from 'react-intl'; 4import { defineMessages, intlShape } from 'react-intl';
5import ReactTooltip from 'react-tooltip'; 5import ReactTooltip from 'react-tooltip';
6import moment from 'moment'; 6import 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