From df6b6a07669bad5cc96db2ff309e24bd6bb9b00e Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Fri, 9 May 2025 18:20:46 -0400
Subject: [PATCH] ToastNotifications Updates

---
 .../components/NotificationComponent.tsx         | 16 +++++++---------
 .../toastNotifications/components/styles.css     |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
index 207d99bb..da91fc97 100644
--- a/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
+++ b/src/equicordplugins/toastNotifications/components/NotificationComponent.tsx
@@ -123,14 +123,12 @@ export default ErrorBoundary.wrap(function NotificationComponent({
                         </button>
                     </div>
                     <div>
-                        {renderBody ? (
-                            richBody ?? (
-                                <p className="toastnotifications-notification-p">
-                                    {body.length > 500 ? body.slice(0, 500) + "..." : body}
-                                </p>
-                            )
-                        ) : null}
-
+                        {renderBody && (
+                            <p className="toastnotifications-notification-p">
+                                {(richBody ?? body).toString().slice(0, 500)}
+                                {(richBody ?? body).toString().length > 500 && "..."}
+                            </p>
+                        )}
                         {PluginSettings.store.renderImages && image && <img className="toastnotifications-notification-img" src={image} alt="ToastNotification Image" />}
                         {footer && <p className="toastnotifications-notification-footer">{`${attachments} attachment${attachments > 1 ? "s" : ""} ${attachments > 1 ? "were" : "was"} sent.`}</p>}
                     </div>
@@ -139,7 +137,7 @@ export default ErrorBoundary.wrap(function NotificationComponent({
             {AppearanceSettings.timeout !== 0 && !permanent && (
                 <div
                     className="toastnotifications-notification-progressbar"
-                    style={{ width: `${(1 - timeoutProgress) * 100}%`, backgroundColor: "var(--brand-experiment)" }}
+                    style={{ width: `${(1 - timeoutProgress) * 100}%`, backgroundColor: "var(--toastnotifications-progressbar-color)" }}
                 />
             )}
         </button>
diff --git a/src/equicordplugins/toastNotifications/components/styles.css b/src/equicordplugins/toastNotifications/components/styles.css
index 89fd0ba0..54b24cd0 100644
--- a/src/equicordplugins/toastNotifications/components/styles.css
+++ b/src/equicordplugins/toastNotifications/components/styles.css
@@ -25,6 +25,7 @@
 
     /* Progress Bar */
     --toastnotifications-progressbar-height: 0.25rem;
+    --toastnotifications-progressbar-color: var(--brand-500);
 
     /* Position Offset - Global inherited offset by all positions */
     --toastnotifications-position-offset: 1rem;