diff options
author | kytwb <kytwb@pm.me> | 2022-01-05 18:18:55 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-05 18:18:55 +0100 |
commit | 7bffdc7f81dd365858003764beb3a921e6e043e7 (patch) | |
tree | 75c20658e95cb5d5c3e8a1c8cabb2b04ab3cab73 /src/components/layout | |
parent | Replace hard-coded popular services in internal server (diff) | |
download | ferdium-app-7bffdc7f81dd365858003764beb3a921e6e043e7.tar.gz ferdium-app-7bffdc7f81dd365858003764beb3a921e6e043e7.tar.zst ferdium-app-7bffdc7f81dd365858003764beb3a921e6e043e7.zip |
Link showServicesUpdatedInfoBar to automaticUpdates
Diffstat (limited to 'src/components/layout')
-rw-r--r-- | src/components/layout/AppLayout.js | 6 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 4474fe0f4..5d7b6b85c 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -87,7 +87,6 @@ class AppLayout extends Component { | |||
87 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | 87 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, |
88 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 88 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
89 | authRequestFailed: PropTypes.bool.isRequired, | 89 | authRequestFailed: PropTypes.bool.isRequired, |
90 | reloadServicesAfterUpdate: PropTypes.func.isRequired, | ||
91 | installAppUpdate: PropTypes.func.isRequired, | 90 | installAppUpdate: PropTypes.func.isRequired, |
92 | showRequiredRequestsError: PropTypes.bool.isRequired, | 91 | showRequiredRequestsError: PropTypes.bool.isRequired, |
93 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, | 92 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, |
@@ -115,7 +114,6 @@ class AppLayout extends Component { | |||
115 | showServicesUpdatedInfoBar, | 114 | showServicesUpdatedInfoBar, |
116 | appUpdateIsDownloaded, | 115 | appUpdateIsDownloaded, |
117 | authRequestFailed, | 116 | authRequestFailed, |
118 | reloadServicesAfterUpdate, | ||
119 | installAppUpdate, | 117 | installAppUpdate, |
120 | settings, | 118 | settings, |
121 | showRequiredRequestsError, | 119 | showRequiredRequestsError, |
@@ -175,12 +173,12 @@ class AppLayout extends Component { | |||
175 | {intl.formatMessage(messages.authRequestFailed)} | 173 | {intl.formatMessage(messages.authRequestFailed)} |
176 | </InfoBar> | 174 | </InfoBar> |
177 | )} | 175 | )} |
178 | {showServicesUpdatedInfoBar && | 176 | {automaticUpdates && showServicesUpdatedInfoBar && |
179 | this.state.shouldShowServicesUpdatedInfoBar && ( | 177 | this.state.shouldShowServicesUpdatedInfoBar && ( |
180 | <InfoBar | 178 | <InfoBar |
181 | type="primary" | 179 | type="primary" |
182 | ctaLabel={intl.formatMessage(messages.buttonReloadServices)} | 180 | ctaLabel={intl.formatMessage(messages.buttonReloadServices)} |
183 | onClick={reloadServicesAfterUpdate} | 181 | onClick={() => window.location.reload()} |
184 | onHide={() => { | 182 | onHide={() => { |
185 | this.setState({ | 183 | this.setState({ |
186 | shouldShowServicesUpdatedInfoBar: false, | 184 | shouldShowServicesUpdatedInfoBar: false, |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 1cbdcfe46..3e24c9230 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -74,6 +74,7 @@ class Sidebar extends Component { | |||
74 | toggleNotifications: PropTypes.func.isRequired, | 74 | toggleNotifications: PropTypes.func.isRequired, |
75 | toggleAudio: PropTypes.func.isRequired, | 75 | toggleAudio: PropTypes.func.isRequired, |
76 | toggleDarkMode: PropTypes.func.isRequired, | 76 | toggleDarkMode: PropTypes.func.isRequired, |
77 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | ||
77 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 78 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
78 | showServiceNameSetting: PropTypes.bool.isRequired, | 79 | showServiceNameSetting: PropTypes.bool.isRequired, |
79 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 80 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
@@ -234,10 +235,10 @@ class Sidebar extends Component { | |||
234 | > | 235 | > |
235 | <Icon icon={mdiCog} size={1.5} /> | 236 | <Icon icon={mdiCog} size={1.5} /> |
236 | { | 237 | { |
237 | (this.props.stores.settings.app.automaticUpdates && | 238 | this.props.stores.settings.app.automaticUpdates && |
238 | (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || | 239 | (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || |
239 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) | 240 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED || |
240 | ) && ( | 241 | this.props.showServicesUpdatedInfoBar) && ( |
241 | <span className="update-available">•</span> | 242 | <span className="update-available">•</span> |
242 | ) | 243 | ) |
243 | } | 244 | } |