aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-10-02 11:43:28 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-10-02 11:43:28 +0200
commit098c46e88349d36d44a479f47a6c8b5516f12879 (patch)
tree239879acfad1a17653fa15d49af0750ec08fbe43 /src/containers
parent Add @xthursdayx as a contributor (diff)
downloadferdium-app-098c46e88349d36d44a479f47a6c8b5516f12879.tar.gz
ferdium-app-098c46e88349d36d44a479f47a6c8b5516f12879.tar.zst
ferdium-app-098c46e88349d36d44a479f47a6c8b5516f12879.zip
Implement #87
Diffstat (limited to 'src/containers')
-rw-r--r--src/containers/settings/EditSettingsScreen.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 962dc1b65..463a290d2 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -109,6 +109,10 @@ const messages = defineMessages({
109 id: 'settings.app.form.beta', 109 id: 'settings.app.form.beta',
110 defaultMessage: '!!!Include beta versions', 110 defaultMessage: '!!!Include beta versions',
111 }, 111 },
112 noUpdates: {
113 id: 'settings.app.form.noUpdates',
114 defaultMessage: '!!!Disable updates',
115 },
112 enableTodos: { 116 enableTodos: {
113 id: 'settings.app.form.enableTodos', 117 id: 'settings.app.form.enableTodos',
114 defaultMessage: '!!!Enable Franz Todos', 118 defaultMessage: '!!!Enable Franz Todos',
@@ -161,12 +165,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
161 enableSpellchecking: settingsData.enableSpellchecking, 165 enableSpellchecking: settingsData.enableSpellchecking,
162 spellcheckerLanguage: settingsData.spellcheckerLanguage, 166 spellcheckerLanguage: settingsData.spellcheckerLanguage,
163 beta: settingsData.beta, // we need this info in the main process as well 167 beta: settingsData.beta, // we need this info in the main process as well
168 noUpdates: settingsData.noUpdates, // we need this info in the main process as well
164 locale: settingsData.locale, // we need this info in the main process as well 169 locale: settingsData.locale, // we need this info in the main process as well
165 }, 170 },
166 }); 171 });
167 172
168 user.update({ 173 user.update({
169 userData: { 174 userData: {
175 noUpdates: settingsData.noUpdates,
170 beta: settingsData.beta, 176 beta: settingsData.beta,
171 locale: settingsData.locale, 177 locale: settingsData.locale,
172 }, 178 },
@@ -319,6 +325,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
319 value: user.data.beta, 325 value: user.data.beta,
320 default: DEFAULT_APP_SETTINGS.beta, 326 default: DEFAULT_APP_SETTINGS.beta,
321 }, 327 },
328 noUpdates: {
329 label: intl.formatMessage(messages.noUpdates),
330 value: settings.app.noUpdates,
331 default: DEFAULT_APP_SETTINGS.noUpdates,
332 },
322 }, 333 },
323 }; 334 };
324 335
@@ -381,6 +392,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
381 isWorkspaceEnabled={workspaces.isFeatureActive} 392 isWorkspaceEnabled={workspaces.isFeatureActive}
382 server={server || 'https://api.franzinfra.com'} 393 server={server || 'https://api.franzinfra.com'}
383 lockingFeatureEnabled={lockingFeatureEnabled} 394 lockingFeatureEnabled={lockingFeatureEnabled}
395 noUpdates={this.props.stores.settings.app.noUpdates}
384 /> 396 />
385 </ErrorBoundary> 397 </ErrorBoundary>
386 ); 398 );