diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 4 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 14 | ||||
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 5 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 3 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index eb36ea431..4474fe0f4 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -126,7 +126,7 @@ class AppLayout extends Component { | |||
126 | 126 | ||
127 | const { intl } = this.props; | 127 | const { intl } = this.props; |
128 | 128 | ||
129 | const { locked } = settings.app; | 129 | const { locked, automaticUpdates } = settings.app; |
130 | if (locked) { | 130 | if (locked) { |
131 | return <LockedScreen />; | 131 | return <LockedScreen />; |
132 | } | 132 | } |
@@ -191,7 +191,7 @@ class AppLayout extends Component { | |||
191 | {intl.formatMessage(messages.servicesUpdated)} | 191 | {intl.formatMessage(messages.servicesUpdated)} |
192 | </InfoBar> | 192 | </InfoBar> |
193 | )} | 193 | )} |
194 | {appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && ( | 194 | {automaticUpdates && appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && ( |
195 | <AppUpdateInfoBar | 195 | <AppUpdateInfoBar |
196 | onInstallUpdate={installAppUpdate} | 196 | onInstallUpdate={installAppUpdate} |
197 | onHide={() => { | 197 | onHide={() => { |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index e3df9c2ea..1cbdcfe46 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -233,12 +233,14 @@ class Sidebar extends Component { | |||
233 | )} (${settingsShortcutKey(false)})`} | 233 | )} (${settingsShortcutKey(false)})`} |
234 | > | 234 | > |
235 | <Icon icon={mdiCog} size={1.5} /> | 235 | <Icon icon={mdiCog} size={1.5} /> |
236 | {(this.props.stores.app.updateStatus === | 236 | { |
237 | this.props.stores.app.updateStatusTypes.AVAILABLE || | 237 | (this.props.stores.settings.app.automaticUpdates && |
238 | this.props.stores.app.updateStatus === | 238 | (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE || |
239 | this.props.stores.app.updateStatusTypes.DOWNLOADED) && ( | 239 | this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) |
240 | <span className="update-available">•</span> | 240 | ) && ( |
241 | )} | 241 | <span className="update-available">•</span> |
242 | ) | ||
243 | } | ||
242 | </button> | 244 | </button> |
243 | {this.state.tooltipEnabled && ( | 245 | {this.state.tooltipEnabled && ( |
244 | <ReactTooltip place="right" type="dark" effect="solid" /> | 246 | <ReactTooltip place="right" type="dark" effect="solid" /> |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index e8370d2ef..b58956f51 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -137,6 +137,11 @@ class SettingsNavigation extends Component { | |||
137 | activeClassName="is-active" | 137 | activeClassName="is-active" |
138 | > | 138 | > |
139 | {intl.formatMessage(globalMessages.settings)} | 139 | {intl.formatMessage(globalMessages.settings)} |
140 | {stores.settings.app.automaticUpdates && | ||
141 | (stores.app.updateStatus === stores.app.updateStatusTypes.AVAILABLE || | ||
142 | stores.app.updateStatus === stores.app.updateStatusTypes.DOWNLOADED) && ( | ||
143 | <span className="update-available">•</span> | ||
144 | )} | ||
140 | </Link> | 145 | </Link> |
141 | <Link | 146 | <Link |
142 | to="/settings/support" | 147 | to="/settings/support" |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 01e609580..3b2fe4af4 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -378,6 +378,9 @@ class EditSettingsForm extends Component { | |||
378 | }} | 378 | }} |
379 | > | 379 | > |
380 | {intl.formatMessage(messages.headlineUpdates)} | 380 | {intl.formatMessage(messages.headlineUpdates)} |
381 | {automaticUpdates && (updateIsReadyToInstall || isUpdateAvailable) && ( | ||
382 | <span className="update-available">•</span> | ||
383 | )} | ||
381 | </h2> | 384 | </h2> |
382 | </div> | 385 | </div> |
383 | 386 | ||