From 54e7a3a33f7216349e91a9a62e805046bf5e2db5 Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidjcralph.co.uk>
Date: Tue, 17 Aug 2021 16:31:42 +0100
Subject: [PATCH] fix: widget order ui, tab name language etc

---
 src/components/modals/main/settings/Radio.jsx |  4 +++
 .../modals/main/settings/sections/Order.jsx   | 32 +++++++++++--------
 src/components/widgets/navbar/Navbar.jsx      |  2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/modals/main/settings/Radio.jsx b/src/components/modals/main/settings/Radio.jsx
index 01c793c0..d4b1fdd9 100644
--- a/src/components/modals/main/settings/Radio.jsx
+++ b/src/components/modals/main/settings/Radio.jsx
@@ -18,6 +18,10 @@ export default class Radio extends PureComponent {
       return;
     }
 
+    if (this.props.name === 'language') {
+      localStorage.setItem('tabName', require(`../../../../translations/${value.replace('-', '_')}.json`).tabname);
+    }
+
     localStorage.setItem(this.props.name, value);
   
     this.setState({
diff --git a/src/components/modals/main/settings/sections/Order.jsx b/src/components/modals/main/settings/sections/Order.jsx
index 23013074..bc780b9c 100644
--- a/src/components/modals/main/settings/sections/Order.jsx
+++ b/src/components/modals/main/settings/sections/Order.jsx
@@ -5,15 +5,6 @@ import { toast } from 'react-toastify';
 
 import EventBus from '../../../../../modules/helpers/eventbus';
 
-const enabled = (setting) => {
-  switch (setting) {
-    case 'quicklinks':
-      return (localStorage.getItem('quicklinksenabled') === 'true');
-    default:
-      return (localStorage.getItem(setting) === 'true');
-  }
-};
-
 const settings = window.language.modals.main.settings.sections;
 const widget_name = {
   greeting: settings.greeting.title,
@@ -24,7 +15,7 @@ const widget_name = {
 };
 
 const SortableItem = sortableElement(({ value }) => (
-  <li className='sortableitem' style={{ display: enabled(value) ? 'block' : 'none' }}>
+  <li className='sortableitem'>
     <DragIndicator style={{ verticalAlign: 'middle' }} />
     {widget_name[value]}
   </li>
@@ -77,6 +68,15 @@ export default class OrderSettings extends PureComponent {
     toast(window.language.toasts.reset);
   }
 
+  enabled = (setting) => {
+    switch (setting) {
+      case 'quicklinks':
+        return (localStorage.getItem('quicklinksenabled') === 'true');
+      default:
+        return (localStorage.getItem(setting) === 'true');
+    }
+  }
+
   componentDidUpdate() {
     localStorage.setItem('order', JSON.stringify(this.state.items));
     window.stats.postEvent('setting', 'Widget order');
@@ -89,9 +89,15 @@ export default class OrderSettings extends PureComponent {
         <h2>{this.language.sections.order.title}</h2>
         <span className='modalLink' onClick={this.reset}>{this.language.buttons.reset}</span>
         <SortableContainer onSortEnd={this.onSortEnd} lockAxis='y' lockToContainerEdges disableAutoscroll>
-          {this.state.items.map((value, index) => (
-            <SortableItem key={`item-${value}`} index={index} value={value} />
-          ))}
+          {this.state.items.map((value, index) => {
+            if (!this.enabled(value)) { 
+              return null;
+            }
+
+            return (
+              <SortableItem key={`item-${value}`} index={index} value={value} />
+            );
+          })}
         </SortableContainer>
       </>
     );
diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx
index 01fe7740..8fb824ad 100644
--- a/src/components/widgets/navbar/Navbar.jsx
+++ b/src/components/widgets/navbar/Navbar.jsx
@@ -21,7 +21,7 @@ export default class Navbar extends PureComponent {
 
   componentDidMount() {
     EventBus.on('refresh', (data) => {
-      if (data === 'navbar') {
+      if (data === 'navbar' || data === 'background') {
         this.forceUpdate();
         this.setZoom();
       }