diff options
-rw-r--r-- | src/components/auth/Pricing.js | 2 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 2 | ||||
-rw-r--r-- | src/components/services/content/ServiceView.js | 2 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 2 | ||||
-rw-r--r-- | src/components/subscription/TrialForm.js | 2 | ||||
-rw-r--r-- | src/components/ui/Button.js | 4 | ||||
-rw-r--r-- | src/components/ui/FullscreenLoader/index.js | 2 | ||||
-rw-r--r-- | src/components/ui/Loader.js | 2 | ||||
-rw-r--r-- | src/components/ui/WebviewLoader/index.js | 2 | ||||
-rw-r--r-- | src/config.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 2 | ||||
-rw-r--r-- | src/features/announcements/index.js | 7 | ||||
-rw-r--r-- | src/features/todos/components/TodosWebview.js | 2 | ||||
-rw-r--r-- | src/stores/RecipesStore.js | 2 |
14 files changed, 17 insertions, 18 deletions
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js index a77ad7742..aadb18d91 100644 --- a/src/components/auth/Pricing.js +++ b/src/components/auth/Pricing.js | |||
@@ -95,7 +95,7 @@ const styles = theme => ({ | |||
95 | }, | 95 | }, |
96 | }); | 96 | }); |
97 | 97 | ||
98 | export default @observer @injectSheet(styles) class Signup extends Component { | 98 | export default @injectSheet(styles) @observer class Signup extends Component { |
99 | static propTypes = { | 99 | static propTypes = { |
100 | onSubmit: PropTypes.func.isRequired, | 100 | onSubmit: PropTypes.func.isRequired, |
101 | isLoadingRequiredData: PropTypes.bool.isRequired, | 101 | isLoadingRequiredData: PropTypes.bool.isRequired, |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index d0cae3443..5e0be36bc 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -116,7 +116,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp | |||
116 | { stores.settings.all.app.lockingFeatureEnabled ? ( | 116 | { stores.settings.all.app.lockingFeatureEnabled ? ( |
117 | <button | 117 | <button |
118 | type="button" | 118 | type="button" |
119 | className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`} | 119 | className={`sidebar__button`} |
120 | onClick={() => { | 120 | onClick={() => { |
121 | // Disable lock first - otherwise the application might not update correctly | 121 | // Disable lock first - otherwise the application might not update correctly |
122 | actions.settings.update({ | 122 | actions.settings.update({ |
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 664a494c1..49ee24361 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -15,7 +15,7 @@ import SettingsStore from '../../../stores/SettingsStore'; | |||
15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; | 16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; |
17 | 17 | ||
18 | export default @observer @inject('stores', 'actions') class ServiceView extends Component { | 18 | export default @inject('stores', 'actions') @observer class ServiceView extends Component { |
19 | static propTypes = { | 19 | static propTypes = { |
20 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 20 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
21 | setWebviewReference: PropTypes.func.isRequired, | 21 | setWebviewReference: PropTypes.func.isRequired, |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index edff29ae8..caa3f3b23 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -39,7 +39,7 @@ const styles = { | |||
39 | }, | 39 | }, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | export default @observer @injectSheet(styles) class Services extends Component { | 42 | export default @injectSheet(styles) @observer class Services extends Component { |
43 | static propTypes = { | 43 | static propTypes = { |
44 | services: MobxPropTypes.arrayOrObservableArray, | 44 | services: MobxPropTypes.arrayOrObservableArray, |
45 | setWebviewReference: PropTypes.func.isRequired, | 45 | setWebviewReference: PropTypes.func.isRequired, |
diff --git a/src/components/subscription/TrialForm.js b/src/components/subscription/TrialForm.js index 9ed548f16..6ccdf20ae 100644 --- a/src/components/subscription/TrialForm.js +++ b/src/components/subscription/TrialForm.js | |||
@@ -56,7 +56,7 @@ const styles = theme => ({ | |||
56 | }, | 56 | }, |
57 | }); | 57 | }); |
58 | 58 | ||
59 | export default @observer @injectSheet(styles) class TrialForm extends Component { | 59 | export default @injectSheet(styles) @observer class TrialForm extends Component { |
60 | static propTypes = { | 60 | static propTypes = { |
61 | activateTrial: PropTypes.func.isRequired, | 61 | activateTrial: PropTypes.func.isRequired, |
62 | isActivatingTrial: PropTypes.bool.isRequired, | 62 | isActivatingTrial: PropTypes.bool.isRequired, |
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index f46fd34ea..5066b9c06 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js | |||
@@ -4,7 +4,7 @@ import { observer, inject } from 'mobx-react'; | |||
4 | import Loader from 'react-loader'; | 4 | import Loader from 'react-loader'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | 6 | ||
7 | export default @observer @inject('stores') class Button extends Component { | 7 | export default @inject('stores') @observer class Button extends Component { |
8 | static propTypes = { | 8 | static propTypes = { |
9 | className: PropTypes.string, | 9 | className: PropTypes.string, |
10 | label: PropTypes.string.isRequired, | 10 | label: PropTypes.string.isRequired, |
@@ -26,7 +26,7 @@ export default @observer @inject('stores') class Button extends Component { | |||
26 | static defaultProps = { | 26 | static defaultProps = { |
27 | className: null, | 27 | className: null, |
28 | disabled: false, | 28 | disabled: false, |
29 | onClick: () => {}, | 29 | onClick: () => { }, |
30 | type: 'button', | 30 | type: 'button', |
31 | buttonType: '', | 31 | buttonType: '', |
32 | loaded: true, | 32 | loaded: true, |
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index 334bb6c4a..d8cdc2e8a 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js | |||
@@ -8,7 +8,7 @@ import Loader from '../Loader'; | |||
8 | 8 | ||
9 | import styles from './styles'; | 9 | import styles from './styles'; |
10 | 10 | ||
11 | export default @observer @inject('stores') @withTheme @injectSheet(styles) class FullscreenLoader extends Component { | 11 | export default @inject('stores') @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component { |
12 | static propTypes = { | 12 | static propTypes = { |
13 | className: PropTypes.string, | 13 | className: PropTypes.string, |
14 | title: PropTypes.string.isRequired, | 14 | title: PropTypes.string.isRequired, |
diff --git a/src/components/ui/Loader.js b/src/components/ui/Loader.js index 627749273..4d7113aa1 100644 --- a/src/components/ui/Loader.js +++ b/src/components/ui/Loader.js | |||
@@ -5,7 +5,7 @@ import Loader from 'react-loader'; | |||
5 | 5 | ||
6 | import { oneOrManyChildElements } from '../../prop-types'; | 6 | import { oneOrManyChildElements } from '../../prop-types'; |
7 | 7 | ||
8 | export default @observer @inject('stores') class LoaderComponent extends Component { | 8 | export default @inject('stores') @observer class LoaderComponent extends Component { |
9 | static propTypes = { | 9 | static propTypes = { |
10 | children: oneOrManyChildElements, | 10 | children: oneOrManyChildElements, |
11 | loaded: PropTypes.bool, | 11 | loaded: PropTypes.bool, |
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js index 58b6b6f1b..923f10327 100644 --- a/src/components/ui/WebviewLoader/index.js +++ b/src/components/ui/WebviewLoader/index.js | |||
@@ -14,7 +14,7 @@ const messages = defineMessages({ | |||
14 | }, | 14 | }, |
15 | }); | 15 | }); |
16 | 16 | ||
17 | export default @observer @injectSheet(styles) class WebviewLoader extends Component { | 17 | export default @injectSheet(styles) @observer class WebviewLoader extends Component { |
18 | static propTypes = { | 18 | static propTypes = { |
19 | name: PropTypes.string.isRequired, | 19 | name: PropTypes.string.isRequired, |
20 | classes: PropTypes.object.isRequired, | 20 | classes: PropTypes.object.isRequired, |
diff --git a/src/config.js b/src/config.js index ae07ab0de..0673e994a 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -89,7 +89,7 @@ export const DEFAULT_FEATURES_CONFIG = { | |||
89 | }, | 89 | }, |
90 | isServiceProxyEnabled: false, | 90 | isServiceProxyEnabled: false, |
91 | isServiceProxyIncludedInCurrentPlan: true, | 91 | isServiceProxyIncludedInCurrentPlan: true, |
92 | isAnnouncementsEnabled: true, | 92 | isAnnouncementsEnabled: false, |
93 | isWorkspaceIncludedInCurrentPlan: true, | 93 | isWorkspaceIncludedInCurrentPlan: true, |
94 | isWorkspaceEnabled: false, | 94 | isWorkspaceEnabled: false, |
95 | isCommunityRecipesIncludedInCurrentPlan: true, | 95 | isCommunityRecipesIncludedInCurrentPlan: true, |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index e5dd2d4fc..3898d2b99 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -478,7 +478,7 @@ EditSettingsScreen.wrappedComponent.propTypes = { | |||
478 | toggleTodosFeatureVisibility: PropTypes.func.isRequired, | 478 | toggleTodosFeatureVisibility: PropTypes.func.isRequired, |
479 | }).isRequired, | 479 | }).isRequired, |
480 | workspaces: PropTypes.shape({ | 480 | workspaces: PropTypes.shape({ |
481 | toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired, | 481 | toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired, |
482 | }).isRequired, | 482 | }).isRequired, |
483 | }).isRequired, | 483 | }).isRequired, |
484 | }; | 484 | }; |
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js index 42823e74c..10f081bb1 100644 --- a/src/features/announcements/index.js +++ b/src/features/announcements/index.js | |||
@@ -12,13 +12,12 @@ export const ANNOUNCEMENTS_ROUTES = { | |||
12 | }; | 12 | }; |
13 | 13 | ||
14 | export default function initAnnouncements(stores, actions) { | 14 | export default function initAnnouncements(stores, actions) { |
15 | // const { features } = stores; | 15 | const { features } = stores; |
16 | 16 | ||
17 | // Toggle workspace feature | 17 | // Toggle announcement feature |
18 | reaction( | 18 | reaction( |
19 | () => ( | 19 | () => ( |
20 | true | 20 | features.features.isAnnouncementsEnabled |
21 | // features.features.isAnnouncementsEnabled | ||
22 | ), | 21 | ), |
23 | (isEnabled) => { | 22 | (isEnabled) => { |
24 | if (isEnabled) { | 23 | if (isEnabled) { |
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index 35c102220..e9b1963f7 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js | |||
@@ -79,7 +79,7 @@ const styles = theme => ({ | |||
79 | }, | 79 | }, |
80 | }); | 80 | }); |
81 | 81 | ||
82 | @injectSheet(styles) @observer @inject('stores') | 82 | @injectSheet(styles) @inject('stores') @observer |
83 | class TodosWebview extends Component { | 83 | class TodosWebview extends Component { |
84 | static propTypes = { | 84 | static propTypes = { |
85 | classes: PropTypes.object.isRequired, | 85 | classes: PropTypes.object.isRequired, |
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js index 7f91049df..8b2bde5df 100644 --- a/src/stores/RecipesStore.js +++ b/src/stores/RecipesStore.js | |||
@@ -108,7 +108,7 @@ export default class RecipesStore extends Store { | |||
108 | async _checkIfRecipeIsInstalled() { | 108 | async _checkIfRecipeIsInstalled() { |
109 | const { router } = this.stores; | 109 | const { router } = this.stores; |
110 | 110 | ||
111 | const match = matchRoute('/settings/services/add/:id', router.location.pathname); | 111 | const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname); |
112 | if (match) { | 112 | if (match) { |
113 | const recipeId = match.id; | 113 | const recipeId = match.id; |
114 | 114 | ||