From de24d1146395942ab17799ef9c7a6275a8e60feb Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidcralph.co.uk>
Date: Sun, 31 Dec 2023 22:20:35 +0000
Subject: [PATCH] fix: #514, alex's button and partially #515

---
 .../modals/main/settings/Header.jsx           | 56 +++++++++++--------
 .../main/settings/sections/QuickLinks.jsx     |  2 +-
 .../settings/sections/quicklinks/AddModal.jsx |  8 ++-
 src/translations/en_GB.json                   |  1 +
 4 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/src/components/modals/main/settings/Header.jsx b/src/components/modals/main/settings/Header.jsx
index 1d8a618d..aaa8660e 100644
--- a/src/components/modals/main/settings/Header.jsx
+++ b/src/components/modals/main/settings/Header.jsx
@@ -12,11 +12,43 @@ import {
 import Slider from './Slider';
 import Switch from './Switch';
 import SettingsItem from './SettingsItem';
+import EventBus from 'modules/helpers/eventbus';
 
 import { values } from 'modules/helpers/settings/modals';
 import Tooltip from 'components/helpers/tooltip/Tooltip';
 
 class Header extends PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      [this.props.setting]: localStorage.getItem(this.props.setting) === 'true',
+    };
+  }
+
+  changeSetting() {
+    if (localStorage.getItem(this.props.setting) === 'true') {
+      localStorage.setItem(this.props.setting, false);
+      this.setState({ [this.props.setting]: false });
+    } else {
+      localStorage.setItem(this.props.setting, true);
+      this.setState({ [this.props.setting]: true });
+    }
+
+    variables.stats.postEvent(
+      'setting',
+      `${this.props.name} ${this.state.checked === true ? 'enabled' : 'disabled'}`,
+    );
+
+    if (this.props.element) {
+      if (!document.querySelector(this.props.element)) {
+        document.querySelector('.reminder-info').style.display = 'flex';
+        return localStorage.setItem('showReminder', true);
+      }
+    }
+
+    EventBus.emit('refresh', this.props.category);
+  }
+
   render() {
     return (
       <>
@@ -35,15 +67,9 @@ class Header extends PureComponent {
           {this.props.switch && (
             <button
               className="sideload"
-              onClick={() => {
-                if (localStorage.getItem(this.props.settings) === 'true') {
-                  localStorage.setItem(this.props.setting, false);
-                } else {
-                  localStorage.setItem(this.props.setting, true);
-                }
-              }}
+              onClick={() => this.changeSetting()}
             >
-              {localStorage.getItem(this.props.setting) === 'true' ? (
+              {this.state[this.props.setting] ? (
                 <>
                   Hide
                   <MdOutlineVisibilityOff />
@@ -83,20 +109,6 @@ class Header extends PureComponent {
             <MdFlag /> {variables.getMessage('modals.main.settings.sections.header.report_issue')}
           </span>
         </div>
-        {this.props.switch ? (
-          <SettingsItem
-            title={variables.getMessage('modals.main.settings.enabled')}
-            subtitle={variables.getMessage('modals.main.settings.sections.header.enabled')}
-          >
-            <Switch
-              name={this.props.setting}
-              text={variables.getMessage('modals.main.settings.enabled')}
-              category={this.props.category}
-              element={this.props.element || null}
-              header={true}
-            />
-          </SettingsItem>
-        ) : null}
         {this.props.zoomSetting ? (
           <SettingsItem
             title={variables.getMessage(
diff --git a/src/components/modals/main/settings/sections/QuickLinks.jsx b/src/components/modals/main/settings/sections/QuickLinks.jsx
index ed4fc414..d84f5196 100644
--- a/src/components/modals/main/settings/sections/QuickLinks.jsx
+++ b/src/components/modals/main/settings/sections/QuickLinks.jsx
@@ -224,7 +224,7 @@ export default class QuickLinks extends PureComponent {
         </SettingsItem>
         <SettingsItem
           title={variables.getMessage('modals.main.settings.sections.quicklinks.styling')}
-          description={variables.getMessage(
+          subtitle={variables.getMessage(
             'modals.main.settings.sections.quicklinks.styling_description',
           )}
         >
diff --git a/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx b/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx
index 0c4394de..09b432f2 100644
--- a/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx
+++ b/src/components/modals/main/settings/sections/quicklinks/AddModal.jsx
@@ -9,12 +9,16 @@ import Tooltip from 'components/helpers/tooltip/Tooltip';
 function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, editLink }) {
   const [name, setName] = useState(edit ? editData.name : '');
   const [url, setUrl] = useState(edit ? editData.url : '');
-  const [icon, setIcon] = useState(edit ? editData.url : '');
+  const [icon, setIcon] = useState(edit ? editData.icon : '');
 
   return (
     <div className="smallModal" style={{ width: '260px' }}>
       <div className="shareHeader">
-        <span className="title">{variables.getMessage('widgets.quicklinks.new')}</span>
+        <span className="title">
+          {edit
+            ? variables.getMessage('widgets.quicklinks.edit')
+            : variables.getMessage('widgets.quicklinks.new')}
+        </span>
         <Tooltip title={variables.getMessage('modals.welcome.buttons.close')}>
           <div className="close" onClick={() => closeModal()}>
             <MdClose />
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index dd36a2b0..6cac26c0 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -30,6 +30,7 @@
     "search": "Search",
     "quicklinks": {
       "new": "New Link",
+      "edit": "Edit Link",
       "name": "Name",
       "url": "URL",
       "icon": "Icon (optional)",