diff options
author | 2022-11-07 06:50:40 +0530 | |
---|---|---|
committer | 2022-11-07 01:20:40 +0000 | |
commit | 93a5de8d8e725cb6fff256a54544d39cf50a16f8 (patch) | |
tree | 6772686892a9e63e183109944c2845fcdeeb8939 /src/components/settings/services/EditServiceForm.js | |
parent | 6.2.1-nightly.40 [skip ci] (diff) | |
download | ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.tar.gz ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.tar.zst ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.zip |
Revert "Remove duplicated Toggle.js component" (#742)
Revert "Remove duplicated Toggle.js component (#741)"
This reverts commit dd238ae7949e72e3b90235f56e14686cc5231f34.
Diffstat (limited to 'src/components/settings/services/EditServiceForm.js')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 30a78c807..eeb9ef54d 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -342,22 +342,22 @@ class EditServiceForm extends Component { | |||
342 | <div className="settings__options"> | 342 | <div className="settings__options"> |
343 | <div className="settings__settings-group"> | 343 | <div className="settings__settings-group"> |
344 | <H3>{intl.formatMessage(messages.headlineNotifications)}</H3> | 344 | <H3>{intl.formatMessage(messages.headlineNotifications)}</H3> |
345 | <Toggle {...form.$('isNotificationEnabled').bind()} /> | 345 | <Toggle field={form.$('isNotificationEnabled')} /> |
346 | <Toggle {...form.$('isMuted').bind()} /> | 346 | <Toggle field={form.$('isMuted')} /> |
347 | <p className="settings__help indented__help"> | 347 | <p className="settings__help indented__help"> |
348 | {intl.formatMessage(messages.isMutedInfo)} | 348 | {intl.formatMessage(messages.isMutedInfo)} |
349 | </p> | 349 | </p> |
350 | <Toggle {...form.$('isMediaBadgeEnabled').bind()} /> | 350 | <Toggle field={form.$('isMediaBadgeEnabled')} /> |
351 | </div> | 351 | </div> |
352 | 352 | ||
353 | <div className="settings__settings-group"> | 353 | <div className="settings__settings-group"> |
354 | <H3>{intl.formatMessage(messages.headlineBadges)}</H3> | 354 | <H3>{intl.formatMessage(messages.headlineBadges)}</H3> |
355 | <Toggle {...form.$('isBadgeEnabled').bind()} /> | 355 | <Toggle field={form.$('isBadgeEnabled')} /> |
356 | {recipe.hasIndirectMessages && | 356 | {recipe.hasIndirectMessages && |
357 | form.$('isBadgeEnabled').value && ( | 357 | form.$('isBadgeEnabled').value && ( |
358 | <> | 358 | <> |
359 | <Toggle | 359 | <Toggle |
360 | {...form.$('isIndirectMessageBadgeEnabled').bind()} | 360 | field={form.$('isIndirectMessageBadgeEnabled')} |
361 | /> | 361 | /> |
362 | <p className="settings__help indented__help"> | 362 | <p className="settings__help indented__help"> |
363 | {intl.formatMessage(messages.indirectMessageInfo)} | 363 | {intl.formatMessage(messages.indirectMessageInfo)} |
@@ -365,21 +365,19 @@ class EditServiceForm extends Component { | |||
365 | </> | 365 | </> |
366 | )} | 366 | )} |
367 | {recipe.allowFavoritesDelineationInUnreadCount && ( | 367 | {recipe.allowFavoritesDelineationInUnreadCount && ( |
368 | <Toggle | 368 | <Toggle field={form.$('onlyShowFavoritesInUnreadCount')} /> |
369 | {...form.$('onlyShowFavoritesInUnreadCount').bind()} | ||
370 | /> | ||
371 | )} | 369 | )} |
372 | </div> | 370 | </div> |
373 | 371 | ||
374 | <div className="settings__settings-group"> | 372 | <div className="settings__settings-group"> |
375 | <H3>{intl.formatMessage(messages.headlineGeneral)}</H3> | 373 | <H3>{intl.formatMessage(messages.headlineGeneral)}</H3> |
376 | <Toggle {...form.$('isEnabled').bind()} /> | 374 | <Toggle field={form.$('isEnabled')} /> |
377 | <Toggle {...form.$('isHibernationEnabled').bind()} /> | 375 | <Toggle field={form.$('isHibernationEnabled')} /> |
378 | <p className="settings__help indented__help"> | 376 | <p className="settings__help indented__help"> |
379 | {intl.formatMessage(messages.isHibernationEnabledInfo)} | 377 | {intl.formatMessage(messages.isHibernationEnabledInfo)} |
380 | </p> | 378 | </p> |
381 | <Toggle {...form.$('isWakeUpEnabled').bind()} /> | 379 | <Toggle field={form.$('isWakeUpEnabled')} /> |
382 | <Toggle {...form.$('trapLinkClicks').bind()} /> | 380 | <Toggle field={form.$('trapLinkClicks')} /> |
383 | {/* TODO: Need to figure out how to effect this change without a reload of the recipe */} | 381 | {/* TODO: Need to figure out how to effect this change without a reload of the recipe */} |
384 | <p className="settings__help indented__help"> | 382 | <p className="settings__help indented__help"> |
385 | {intl.formatMessage(messages.serviceReloadRequired)} | 383 | {intl.formatMessage(messages.serviceReloadRequired)} |
@@ -388,7 +386,7 @@ class EditServiceForm extends Component { | |||
388 | 386 | ||
389 | <div className="settings__settings-group"> | 387 | <div className="settings__settings-group"> |
390 | <H3>{intl.formatMessage(messages.headlineAppearance)}</H3> | 388 | <H3>{intl.formatMessage(messages.headlineAppearance)}</H3> |
391 | <Toggle {...form.$('isDarkModeEnabled').bind()} /> | 389 | <Toggle field={form.$('isDarkModeEnabled')} /> |
392 | {form.$('isDarkModeEnabled').value && ( | 390 | {form.$('isDarkModeEnabled').value && ( |
393 | <> | 391 | <> |
394 | <H3> | 392 | <H3> |
@@ -401,7 +399,7 @@ class EditServiceForm extends Component { | |||
401 | <Slider field={form.$('darkReaderSepia')} /> | 399 | <Slider field={form.$('darkReaderSepia')} /> |
402 | </> | 400 | </> |
403 | )} | 401 | )} |
404 | <Toggle {...form.$('isProgressbarEnabled').bind()} /> | 402 | <Toggle field={form.$('isProgressbarEnabled')} /> |
405 | </div> | 403 | </div> |
406 | </div> | 404 | </div> |
407 | <div className="service-icon"> | 405 | <div className="service-icon"> |
@@ -431,7 +429,7 @@ class EditServiceForm extends Component { | |||
431 | {intl.formatMessage(messages.headlineProxy)} | 429 | {intl.formatMessage(messages.headlineProxy)} |
432 | <span className="badge badge--success">beta</span> | 430 | <span className="badge badge--success">beta</span> |
433 | </H3> | 431 | </H3> |
434 | <Toggle {...form.$('proxy.isEnabled').bind()} /> | 432 | <Toggle field={form.$('proxy.isEnabled')} /> |
435 | {form.$('proxy.isEnabled').value && ( | 433 | {form.$('proxy.isEnabled').value && ( |
436 | <> | 434 | <> |
437 | <div className="grid"> | 435 | <div className="grid"> |