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 => ({
   },
 });
 
-export default @observer @injectSheet(styles) class Signup extends Component {
+export default @injectSheet(styles) @observer class Signup extends Component {
   static propTypes = {
     onSubmit: PropTypes.func.isRequired,
     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
             { stores.settings.all.app.lockingFeatureEnabled ? (
               <button
                 type="button"
-                className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
+                className={`sidebar__button`}
                 onClick={() => {
                   // Disable lock first - otherwise the application might not update correctly
                   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';
 import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen';
 import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants';
 
-export default @observer @inject('stores', 'actions') class ServiceView extends Component {
+export default @inject('stores', 'actions') @observer class ServiceView extends Component {
   static propTypes = {
     service: PropTypes.instanceOf(ServiceModel).isRequired,
     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 = {
   },
 };
 
-export default @observer @injectSheet(styles) class Services extends Component {
+export default @injectSheet(styles) @observer class Services extends Component {
   static propTypes = {
     services: MobxPropTypes.arrayOrObservableArray,
     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 => ({
   },
 });
 
-export default @observer @injectSheet(styles) class TrialForm extends Component {
+export default @injectSheet(styles) @observer class TrialForm extends Component {
   static propTypes = {
     activateTrial: PropTypes.func.isRequired,
     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';
 import Loader from 'react-loader';
 import classnames from 'classnames';
 
-export default @observer @inject('stores') class Button extends Component {
+export default @inject('stores') @observer class Button extends Component {
   static propTypes = {
     className: PropTypes.string,
     label: PropTypes.string.isRequired,
@@ -26,7 +26,7 @@ export default @observer @inject('stores') class Button extends Component {
   static defaultProps = {
     className: null,
     disabled: false,
-    onClick: () => {},
+    onClick: () => { },
     type: 'button',
     buttonType: '',
     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';
 
 import styles from './styles';
 
-export default @observer @inject('stores') @withTheme @injectSheet(styles) class FullscreenLoader extends Component {
+export default @inject('stores') @withTheme @injectSheet(styles) @observer class FullscreenLoader extends Component {
   static propTypes = {
     className: PropTypes.string,
     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';
 
 import { oneOrManyChildElements } from '../../prop-types';
 
-export default @observer @inject('stores') class LoaderComponent extends Component {
+export default @inject('stores') @observer class LoaderComponent extends Component {
   static propTypes = {
     children: oneOrManyChildElements,
     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({
   },
 });
 
-export default @observer @injectSheet(styles) class WebviewLoader extends Component {
+export default @injectSheet(styles) @observer class WebviewLoader extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
     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 = {
   },
   isServiceProxyEnabled: false,
   isServiceProxyIncludedInCurrentPlan: true,
-  isAnnouncementsEnabled: true,
+  isAnnouncementsEnabled: false,
   isWorkspaceIncludedInCurrentPlan: true,
   isWorkspaceEnabled: false,
   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 = {
       toggleTodosFeatureVisibility: PropTypes.func.isRequired,
     }).isRequired,
     workspaces: PropTypes.shape({
-      toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
+      toggleKeepAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
     }).isRequired,
   }).isRequired,
 };
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 = {
 };
 
 export default function initAnnouncements(stores, actions) {
-  // const { features } = stores;
+  const { features } = stores;
 
-  // Toggle workspace feature
+  // Toggle announcement feature
   reaction(
     () => (
-      true
-      // features.features.isAnnouncementsEnabled
+      features.features.isAnnouncementsEnabled
     ),
     (isEnabled) => {
       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 => ({
   },
 });
 
-@injectSheet(styles) @observer @inject('stores')
+@injectSheet(styles) @inject('stores') @observer
 class TodosWebview extends Component {
   static propTypes = {
     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 {
   async _checkIfRecipeIsInstalled() {
     const { router } = this.stores;
 
-    const match = matchRoute('/settings/services/add/:id', router.location.pathname);
+    const match = router.location && matchRoute('/settings/services/add/:id', router.location.pathname);
     if (match) {
       const recipeId = match.id;