From 12f8cf6a9078716b3db6e3efe20bdc4e3cce6e1e Mon Sep 17 00:00:00 2001
From: David Ralph <me@davidcralph.co.uk>
Date: Mon, 29 Aug 2022 10:50:27 +0100
Subject: [PATCH] fix: marketplace collections, weather settings

---
 .../modals/main/marketplace/Collection.jsx    | 24 -------------------
 .../main/marketplace/sections/Marketplace.jsx |  2 +-
 .../modals/main/settings/sections/Weather.jsx | 14 ++++++-----
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 src/components/modals/main/marketplace/Collection.jsx

diff --git a/src/components/modals/main/marketplace/Collection.jsx b/src/components/modals/main/marketplace/Collection.jsx
deleted file mode 100644
index 8998b1a7..00000000
--- a/src/components/modals/main/marketplace/Collection.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import variables from 'modules/variables';
-
-export default function Collection({ items }) {
-  return (
-    <>
-      <div className="items">
-        {items.slice(0, 99).map((item) => (
-          <div className="item" onClick={() => toggleFunction(item)} key={item.name}>
-            <img
-              alt="icon"
-              draggable="false"
-              src={variables.constants.DDG_IMAGE_PROXY + item.icon_url}
-            />
-            <div className="card-details">
-              <span className="card-title">{item.display_name || item.name}</span>
-              <span className="card-subtitle">{item.author}</span>
-            </div>
-          </div>
-        ))}
-      </div>
-      <div className="loader"></div>
-    </>
-  );
-}
diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx
index c71398e7..5856fd5e 100644
--- a/src/components/modals/main/marketplace/sections/Marketplace.jsx
+++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx
@@ -47,7 +47,7 @@ export default class Marketplace extends PureComponent {
       // get item info
       try {
         let type = this.props.type;
-        if (type === 'all') {
+        if (type === 'all' || type === 'collections') {
           type = data.type;
         }
         info = await (
diff --git a/src/components/modals/main/settings/sections/Weather.jsx b/src/components/modals/main/settings/sections/Weather.jsx
index 7f9c7bd1..a03ee0a0 100644
--- a/src/components/modals/main/settings/sections/Weather.jsx
+++ b/src/components/modals/main/settings/sections/Weather.jsx
@@ -59,6 +59,7 @@ export default class TimeSettings extends PureComponent {
   }
 
   render() {
+    const weatherType = localStorage.getItem('weatherType');
     return (
       <>
         <Header
@@ -70,11 +71,11 @@ export default class TimeSettings extends PureComponent {
           switch={true}
         />
         <SettingsItem title={variables.getMessage('modals.main.settings.sections.weather.widget_type')}>
-          <Dropdown label="Type" name="weatherType" category="weather">
+          <Dropdown label={variables.getMessage('modals.main.settings.sections.time.type')} name="weatherType" category="weather" onChange={() => this.forceUpdate()}>
             <option value="1">{variables.getMessage('modals.main.settings.sections.weather.options.basic')}</option>
-            <option value="2">{variables.getMessage('modals.main.settings.sections.weather.standard')}</option>
-            <option value="3">{variables.getMessage('modals.main.settings.sections.weather.expanded')}</option>
-            <option value="4">{variables.getMessage('modals.main.settings.sections.weather.custom')}</option>
+            <option value="2">{variables.getMessage('modals.main.settings.sections.weather.options.standard')}</option>
+            <option value="3">{variables.getMessage('modals.main.settings.sections.weather.options.expanded')}</option>
+            <option value="4">{variables.getMessage('modals.main.settings.sections.weather.options.custom')}</option>
           </Dropdown>
         </SettingsItem>
         <SettingsItem
@@ -94,6 +95,7 @@ export default class TimeSettings extends PureComponent {
         </SettingsItem>
         <SettingsItem
           title={variables.getMessage('modals.main.settings.sections.weather.temp_format.title')}
+          final={weatherType !== '4'}
         >
           <Radio
             name="tempformat"
@@ -122,10 +124,10 @@ export default class TimeSettings extends PureComponent {
             category="weather"
           />
         </SettingsItem>
-        {localStorage.getItem('weatherType') === 4 && (
+        {weatherType === '4' && (
           <SettingsItem title={variables.getMessage(
             'modals.main.settings.sections.weather.custom_settings',
-          )}>
+          )} final={true}>
             <Checkbox
               name="weatherdescription"
               text={variables.getMessage(