aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-07-06 14:01:09 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-07-06 18:25:30 +0530
commit00cde9a46d93d3de247a46a4b824f9842220a736 (patch)
tree471b37ad6f50e27c79d093428340fc666eda7f92 /src/components
parentBumped upto version same as nightly branch. [skip ci] (diff)
downloadferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.tar.gz
ferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.tar.zst
ferdium-app-00cde9a46d93d3de247a46a4b824f9842220a736.zip
Added new help text for lay-users to figure out what their user-agent value is.
Diffstat (limited to 'src/components')
-rw-r--r--src/components/settings/services/EditServiceForm.js8
-rw-r--r--src/components/settings/settings/EditSettingsForm.js4
2 files changed, 8 insertions, 4 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index a8501670b..513c75eed 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -21,6 +21,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
21import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox'; 21import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
22import { serviceLimitStore } from '../../../features/serviceLimit'; 22import { serviceLimitStore } from '../../../features/serviceLimit';
23import { isMac } from '../../../environment'; 23import { isMac } from '../../../environment';
24import globalMessages from '../../../i18n/globalMessages';
24 25
25const messages = defineMessages({ 26const messages = defineMessages({
26 saveService: { 27 saveService: {
@@ -351,7 +352,7 @@ export default @observer class EditServiceForm extends Component {
351 <h3>{intl.formatMessage(messages.headlineNotifications)}</h3> 352 <h3>{intl.formatMessage(messages.headlineNotifications)}</h3>
352 <Toggle field={form.$('isNotificationEnabled')} /> 353 <Toggle field={form.$('isNotificationEnabled')} />
353 <Toggle field={form.$('isMuted')} /> 354 <Toggle field={form.$('isMuted')} />
354 <p className="settings__help"> 355 <p className="settings__help indented__help">
355 {intl.formatMessage(messages.isMutedInfo)} 356 {intl.formatMessage(messages.isMutedInfo)}
356 </p> 357 </p>
357 </div> 358 </div>
@@ -362,7 +363,7 @@ export default @observer class EditServiceForm extends Component {
362 {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( 363 {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && (
363 <> 364 <>
364 <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> 365 <Toggle field={form.$('isIndirectMessageBadgeEnabled')} />
365 <p className="settings__help"> 366 <p className="settings__help indented__help">
366 {intl.formatMessage(messages.indirectMessageInfo)} 367 {intl.formatMessage(messages.indirectMessageInfo)}
367 </p> 368 </p>
368 </> 369 </>
@@ -375,7 +376,7 @@ export default @observer class EditServiceForm extends Component {
375 {isHibernationFeatureActive && ( 376 {isHibernationFeatureActive && (
376 <> 377 <>
377 <Toggle field={form.$('isHibernationEnabled')} /> 378 <Toggle field={form.$('isHibernationEnabled')} />
378 <p className="settings__help"> 379 <p className="settings__help indented__help">
379 {intl.formatMessage(messages.isHibernationEnabledInfo)} 380 {intl.formatMessage(messages.isHibernationEnabledInfo)}
380 </p> 381 </p>
381 </> 382 </>
@@ -456,6 +457,7 @@ export default @observer class EditServiceForm extends Component {
456 457
457 <div className="user-agent"> 458 <div className="user-agent">
458 <Input field={form.$('userAgentPref')} /> 459 <Input field={form.$('userAgentPref')} />
460 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
459 </div> 461 </div>
460 </form> 462 </form>
461 463
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 98a119bfa..52b26d65b 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,6 +18,7 @@ import {
18 GITHUB_FRANZ_URL, 18 GITHUB_FRANZ_URL,
19} from '../../../config'; 19} from '../../../config';
20import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment'; 20import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
21import globalMessages from '../../../i18n/globalMessages';
21 22
22const messages = defineMessages({ 23const messages = defineMessages({
23 headline: { 24 headline: {
@@ -595,7 +596,7 @@ export default @observer class EditSettingsForm extends Component {
595 { this.state.activeSetttingsTab === 'advanced' && ( 596 { this.state.activeSetttingsTab === 'advanced' && (
596 <div> 597 <div>
597 <Toggle field={form.$('enableGPUAcceleration')} /> 598 <Toggle field={form.$('enableGPUAcceleration')} />
598 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p> 599 <p className="settings__help indented__help">{intl.formatMessage(messages.appRestartRequired)}</p>
599 600
600 <Hr /> 601 <Hr />
601 602
@@ -604,6 +605,7 @@ export default @observer class EditSettingsForm extends Component {
604 onChange={e => this.submit(e)} 605 onChange={e => this.submit(e)}
605 field={form.$('userAgentPref')} 606 field={form.$('userAgentPref')}
606 /> 607 />
608 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
607 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p> 609 <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
608 610
609 <Hr /> 611 <Hr />