From df6c42f526c6bdde7a7fb807ce2ef61e1262f728 Mon Sep 17 00:00:00 2001
From: alexsparkes <alexsparkes@gmail.com>
Date: Tue, 21 May 2024 16:56:24 +0100
Subject: [PATCH] fix: achievement toast styling, marketplace general
 improvements

Co-authored-by: David Ralph <me@davidcralph.co.uk>
Co-authored-by: Isaac <contact@eartharoid.me>
---
 .../marketplace/components/Items/Items.jsx    |  6 ++--
 src/features/marketplace/views/Browse.jsx     | 36 +++++++++----------
 src/features/marketplace/views/ItemPage.jsx   |  3 --
 src/features/misc/sections/Experimental.jsx   | 11 ++++++
 src/scss/_toast.scss                          |  5 +++
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/features/marketplace/components/Items/Items.jsx b/src/features/marketplace/components/Items/Items.jsx
index 5b3127ec..0c362e27 100644
--- a/src/features/marketplace/components/Items/Items.jsx
+++ b/src/features/marketplace/components/Items/Items.jsx
@@ -72,8 +72,8 @@ function Items({
   showCreateYourOwn,
 }) {
   const shouldShowCollection =
-    (collection && !onCollection && (filter === null || filter === '')) ||
-    (type === 'collections' && !onCollection && (filter === null || filter === ''));
+    ((collection && !onCollection && (filter === null || filter === '')) ||
+    (type === 'collections' && !onCollection && (filter === null || filter === ''))) && type !== 'preset_settings';
 
   return (
     <>
@@ -126,7 +126,7 @@ function Items({
           ))}
       </div>
       <div className="loader"></div>
-      {showCreateYourOwn ? (
+      {!onCollection && showCreateYourOwn ? (
         <div className="createYourOwn">
           <MdAutoFixHigh />
           <span className="title">{variables.getMessage('modals.main.marketplace.cant_find')}</span>
diff --git a/src/features/marketplace/views/Browse.jsx b/src/features/marketplace/views/Browse.jsx
index dc077d5b..d57185c8 100644
--- a/src/features/marketplace/views/Browse.jsx
+++ b/src/features/marketplace/views/Browse.jsx
@@ -310,31 +310,23 @@ class Marketplace extends PureComponent {
 
     if (this.state.done === false) {
       return errorMessage(
-        <>
-          <div className="loaderHolder">
-            <div id="loader"></div>
-            <span className="subtitle">{variables.getMessage('modals.main.loading')}</span>
-          </div>
-        </>,
+        <div className="loaderHolder">
+          <div id="loader"></div>
+          <span className="subtitle">{variables.getMessage('modals.main.loading')}</span>
+        </div>,
       );
     }
 
     if (!this.state.items || this.state.items?.length === 0) {
       this.getItems();
-      return (
+      return errorMessage(
         <>
-          {errorMessage(
-            <>
-              <MdLocalMall />
-              <span className="title">
-                {variables.getMessage('modals.main.addons.empty.title')}
-              </span>
-              <span className="subtitle">
-                {variables.getMessage('modals.main.marketplace.no_items')}
-              </span>
-            </>,
-          )}
-        </>
+          <MdLocalMall />
+          <span className="title">{variables.getMessage('modals.main.addons.empty.title')}</span>
+          <span className="subtitle">
+            {variables.getMessage('modals.main.marketplace.no_items')}
+          </span>
+        </>,
       );
     }
 
@@ -380,7 +372,11 @@ class Marketplace extends PureComponent {
                 onClick={() => this.installCollection()}
                 disabled={this.state.busy}
                 icon={<MdLibraryAdd />}
-                label={this.state.busy ? variables.getMessage('modals.main.marketplace.installing') : variables.getMessage('modals.main.marketplace.add_all')}
+                label={
+                  this.state.busy
+                    ? variables.getMessage('modals.main.marketplace.installing')
+                    : variables.getMessage('modals.main.marketplace.add_all')
+                }
               />
             </div>
           </>
diff --git a/src/features/marketplace/views/ItemPage.jsx b/src/features/marketplace/views/ItemPage.jsx
index e4c5f78b..b4449164 100644
--- a/src/features/marketplace/views/ItemPage.jsx
+++ b/src/features/marketplace/views/ItemPage.jsx
@@ -54,7 +54,6 @@ class ItemPage extends PureComponent {
           (item) => item.type === convertedType && item.name !== this.props.data.data.name,
         ),
       });
-      console.log(this.state.curator);
     } catch (e) {
       console.error(e);
     }
@@ -157,8 +156,6 @@ class ItemPage extends PureComponent {
       </div>
     );
 
-    console.log(this.props.data.data)
-
     return (
       <>
         <Modal
diff --git a/src/features/misc/sections/Experimental.jsx b/src/features/misc/sections/Experimental.jsx
index 9ed13ecf..88e6e965 100644
--- a/src/features/misc/sections/Experimental.jsx
+++ b/src/features/misc/sections/Experimental.jsx
@@ -3,6 +3,7 @@ import { useState, memo } from 'react';
 import { Checkbox, Slider } from 'components/Form/Settings';
 import { Button } from 'components/Elements';
 import { TextField } from '@mui/material';
+import { toast } from 'react-toastify';
 
 import EventBus from 'utils/eventbus';
 import values from 'utils/data/slider_values.json';
@@ -59,6 +60,16 @@ function ExperimentalOptions() {
             onClick={() => EventBus.emit(eventType, eventName)}
             label="Send"
           />
+          <Button
+            type="settings"
+            onClick={() => toast('Toasted successfully')}
+            label="Normal Toast"
+          />
+          <Button
+            type="settings"
+            onClick={() => toast.success('Toasted successfully')}
+            label="Achievement Unlocked Toast"
+          />
         </Action>
       </Row>
       <Row final={true}>
diff --git a/src/scss/_toast.scss b/src/scss/_toast.scss
index 4921c2b8..00a6361f 100644
--- a/src/scss/_toast.scss
+++ b/src/scss/_toast.scss
@@ -32,3 +32,8 @@
 .Toastify__toast--default {
   @extend %basic;
 }
+
+.Toastify__toast--success {
+  @extend %basic;
+}
+