diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-02-12 13:26:50 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-02-12 13:26:50 +0100 |
commit | 3d2b58b387ce8b22cd7b674445d56d81019ef16c (patch) | |
tree | 7bf922ae2932ca9467246fca7288a49deb29ea9b /src/containers | |
parent | Add withTheme context to button (diff) | |
parent | Fix windows token login (diff) | |
download | ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.gz ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.tar.zst ferdium-app-3d2b58b387ce8b22cd7b674445d56d81019ef16c.zip |
Merge branch 'develop' into chore/lerna
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 1 | ||||
-rw-r--r-- | src/containers/settings/AccountScreen.js | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 430b49b55..749912c59 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -108,7 +108,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
108 | openWindow={openWindow} | 108 | openWindow={openWindow} |
109 | reload={reload} | 109 | reload={reload} |
110 | openSettings={openSettings} | 110 | openSettings={openSettings} |
111 | isAppMuted={settings.all.app.isAppMuted} | ||
112 | update={updateService} | 111 | update={updateService} |
113 | /> | 112 | /> |
114 | ); | 113 | ); |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 019b3d7d6..d681d5226 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -14,6 +14,14 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; | |||
14 | const { BrowserWindow } = remote; | 14 | const { BrowserWindow } = remote; |
15 | 15 | ||
16 | export default @inject('stores', 'actions') @observer class AccountScreen extends Component { | 16 | export default @inject('stores', 'actions') @observer class AccountScreen extends Component { |
17 | componentWillMount() { | ||
18 | const { | ||
19 | user, | ||
20 | } = this.props.stores; | ||
21 | |||
22 | user.getUserInfoRequest.invalidate({ immediately: true }); | ||
23 | } | ||
24 | |||
17 | componentDidMount() { | 25 | componentDidMount() { |
18 | gaPage('Settings/Account Dashboard'); | 26 | gaPage('Settings/Account Dashboard'); |
19 | } | 27 | } |