From a96fa55be7f6a957fe5d153b9a2e1ff640c6b25b Mon Sep 17 00:00:00 2001
From: kytwb <kytwb@pm.me>
Date: Wed, 5 Jan 2022 19:29:02 +0100
Subject: Make dismissable services update infobar cta available in updates tab

---
 .../settings/settings/EditSettingsForm.js          | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 24ba644f4..bdb8484d4 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -5,7 +5,8 @@ import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { mdiGithub, mdiOpenInNew } from '@mdi/js';
+import { mdiGithub, mdiOpenInNew, mdiPowerPlug } from '@mdi/js';
+
 import Form from '../../../lib/Form';
 import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
@@ -175,6 +176,14 @@ const messages = defineMessages({
     id: 'settings.app.restartRequired',
     defaultMessage: 'Changes require restart',
   },
+  servicesUpdated: {
+    id: 'infobar.servicesUpdated',
+    defaultMessage: 'Your services have been updated.',
+  },
+  buttonReloadServices: {
+    id: 'infobar.buttonReloadServices',
+    defaultMessage: 'Reload services',
+  },
   numberOfColumns: {
     id: 'settings.app.form.splitColumns',
     defaultMessage: 'Number of columns',
@@ -768,9 +777,9 @@ class EditSettingsForm extends Component {
             {this.state.activeSetttingsTab === 'updates' && (
               <div>
                 <Toggle field={form.$('automaticUpdates')} />
-                {(isMac || isWindows || process.env.APPIMAGE) && (
+                {automaticUpdates && (
                   <>
-                    {automaticUpdates && (
+                    {(isMac || isWindows || process.env.APPIMAGE) && (
                       <>
                         <div>
                           <Toggle field={form.$('beta')} />
@@ -810,6 +819,23 @@ class EditSettingsForm extends Component {
                         )}
                       </>
                     )}
+                    {showServicesUpdatedInfoBar ? (
+                      <>
+                        <p>
+                          <Icon icon={mdiPowerPlug} />
+                          {intl.formatMessage(messages.servicesUpdated)}
+                        </p>
+                        <Button
+                          label={intl.formatMessage(messages.buttonReloadServices)}
+                          onClick={() => window.location.reload()}
+                        />
+                      </>
+                    ) : (
+                      <p>
+                        <Icon icon={mdiPowerPlug} />
+                        Your services are up-to-date.
+                      </p>
+                    )}
                   </>
                 )}
                 <p className="settings__message">
-- 
cgit v1.2.3-70-g09d2