aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar Markus Hatvan <markus_hatvan@aon.at>2021-07-02 19:49:55 -0600
committerLibravatar GitHub <noreply@github.com>2021-07-03 07:19:55 +0530
commit33123c354b79f7951423dd75097b11e7eb075f99 (patch)
tree29f6e857f02d0e0fc67d89a657a54a865ed5538a /src/containers
parentMinor refactoring to move all runtime configs from 'config.js' into 'environm... (diff)
downloadferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.gz
ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.zst
ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.zip
Upgrade various dependencies to latest part 2 (#1557)
* Upgrade various dependencies to latest, remove unnecessary electron-hunspell - upgrade eslint and friends to latest - remove deprecated 'node-sass' in favor of 'sass' - disable new rules from 'eslint-config-airbnb' that are conflicting with current code style - add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote * Run yarn lint to autofix with new ruleset and worked down lint issues to zero
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/settings/AccountScreen.js3
-rw-r--r--src/containers/settings/SettingsWindow.js1
-rw-r--r--src/containers/subscription/SubscriptionPopupScreen.js2
3 files changed, 1 insertions, 5 deletions
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 2c9cac084..db3b2a4a7 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -85,8 +85,7 @@ class AccountScreen extends Component {
85 openEditAccount={() => this.handleWebsiteLink('/user/profile')} 85 openEditAccount={() => this.handleWebsiteLink('/user/profile')}
86 upgradeToPro={() => upgradeAccount({ 86 upgradeToPro={() => upgradeAccount({
87 planId: features.features.pricingConfig.plans.pro.yearly.id, 87 planId: features.features.pricingConfig.plans.pro.yearly.id,
88 }) 88 })}
89 }
90 openBilling={() => this.handleWebsiteLink('/user/billing')} 89 openBilling={() => this.handleWebsiteLink('/user/billing')}
91 openInvoices={() => this.handleWebsiteLink('/user/invoices')} 90 openInvoices={() => this.handleWebsiteLink('/user/invoices')}
92 /> 91 />
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js
index 89c2aaa27..9bb64b6fe 100644
--- a/src/containers/settings/SettingsWindow.js
+++ b/src/containers/settings/SettingsWindow.js
@@ -28,7 +28,6 @@ export default @inject('stores', 'actions') @observer class SettingsContainer ex
28 const { children, stores } = this.props; 28 const { children, stores } = this.props;
29 const { closeSettings } = this.props.actions.ui; 29 const { closeSettings } = this.props.actions.ui;
30 30
31
32 const navigation = ( 31 const navigation = (
33 <Navigation 32 <Navigation
34 serviceCount={stores.services.all.length} 33 serviceCount={stores.services.all.length}
diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js
index 0de5a87c4..43966b6a4 100644
--- a/src/containers/subscription/SubscriptionPopupScreen.js
+++ b/src/containers/subscription/SubscriptionPopupScreen.js
@@ -5,7 +5,6 @@ import { inject, observer } from 'mobx-react';
5import SubscriptionPopup from '../../components/subscription/SubscriptionPopup'; 5import SubscriptionPopup from '../../components/subscription/SubscriptionPopup';
6import { isDevMode } from '../../environment'; 6import { isDevMode } from '../../environment';
7 7
8
9export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component { 8export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component {
10 state = { 9 state = {
11 complete: false, 10 complete: false,
@@ -33,7 +32,6 @@ export default @inject('stores', 'actions') @observer class SubscriptionPopupScr
33 } 32 }
34} 33}
35 34
36
37SubscriptionPopupScreen.wrappedComponent.propTypes = { 35SubscriptionPopupScreen.wrappedComponent.propTypes = {
38 router: PropTypes.shape({ 36 router: PropTypes.shape({
39 params: PropTypes.shape({ 37 params: PropTypes.shape({