From b4d3dd6cb6ca30ff6db8a0a866339e1ba9d95683 Mon Sep 17 00:00:00 2001
From: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Date: Sat, 21 Oct 2023 17:39:51 -0600
Subject: [PATCH] implement PR feedback

---
 src/components/settings/account/AccountDashboard.tsx        | 2 +-
 src/components/settings/recipes/RecipesDashboard.tsx        | 2 +-
 src/components/settings/services/ServicesDashboard.tsx      | 2 +-
 src/components/settings/team/TeamDashboard.tsx              | 2 +-
 src/components/ui/FullscreenLoader/index.tsx                | 6 ++----
 src/components/ui/InfoBar.tsx                               | 2 +-
 src/components/ui/Infobox.tsx                               | 2 +-
 src/components/ui/button/index.tsx                          | 2 +-
 src/components/ui/loader/index.tsx                          | 6 +++---
 .../workspaces/components/WorkspaceSwitchingIndicator.tsx   | 2 +-
 src/features/workspaces/components/WorkspacesDashboard.tsx  | 2 +-
 11 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/components/settings/account/AccountDashboard.tsx b/src/components/settings/account/AccountDashboard.tsx
index c94eb044a9..ffa684458d 100644
--- a/src/components/settings/account/AccountDashboard.tsx
+++ b/src/components/settings/account/AccountDashboard.tsx
@@ -123,7 +123,7 @@ class AccountDashboard extends Component<IProp> {
           )}
           {!isUsingWithoutAccount && (
             <>
-              {isLoading && <Loader />}
+              {isLoading && <Loader color="#FFFFFF" />}
 
               {!isLoading && userInfoRequestFailed && (
                 <Infobox
diff --git a/src/components/settings/recipes/RecipesDashboard.tsx b/src/components/settings/recipes/RecipesDashboard.tsx
index dfc3bd08bd..c7aeaa9b35 100644
--- a/src/components/settings/recipes/RecipesDashboard.tsx
+++ b/src/components/settings/recipes/RecipesDashboard.tsx
@@ -221,7 +221,7 @@ class RecipesDashboard extends Component<IProps, IState> {
           </div>
 
           {isLoading ? (
-            <Loader color="primary" />
+            <Loader />
           ) : (
             <>
               {recipeFilter === 'dev' && (
diff --git a/src/components/settings/services/ServicesDashboard.tsx b/src/components/settings/services/ServicesDashboard.tsx
index 135d16e64e..b8c3ce3f08 100644
--- a/src/components/settings/services/ServicesDashboard.tsx
+++ b/src/components/settings/services/ServicesDashboard.tsx
@@ -155,7 +155,7 @@ class ServicesDashboard extends Component<IProps> {
             </div>
           )}
           {isLoading ? (
-            <Loader color="primary" />
+            <Loader />
           ) : (
             <table className="service-table" role="grid">
               <tbody>
diff --git a/src/components/settings/team/TeamDashboard.tsx b/src/components/settings/team/TeamDashboard.tsx
index 06bb576555..4066561608 100644
--- a/src/components/settings/team/TeamDashboard.tsx
+++ b/src/components/settings/team/TeamDashboard.tsx
@@ -128,7 +128,7 @@ class TeamDashboard extends Component<IProps> {
           </span>
         </div>
         <div className="settings__body">
-          {isLoading && <Loader />}
+          {isLoading && <Loader color="#FFFFFF" />}
 
           {!isLoading && userInfoRequestFailed && (
             <Infobox
diff --git a/src/components/ui/FullscreenLoader/index.tsx b/src/components/ui/FullscreenLoader/index.tsx
index 3674f487c9..09c1d5fbb4 100644
--- a/src/components/ui/FullscreenLoader/index.tsx
+++ b/src/components/ui/FullscreenLoader/index.tsx
@@ -21,7 +21,7 @@ class FullscreenLoader extends Component<IProps> {
   render(): ReactElement {
     const {
       classes,
-      theme = '',
+      theme,
       className = '',
       spinnerColor = '',
       children = null,
@@ -39,9 +39,7 @@ class FullscreenLoader extends Component<IProps> {
         >
           <H1 className={classes.title}>{title}</H1>
           <Loader
-            color={
-              spinnerColor || (theme && theme.colorFullscreenLoaderSpinner)
-            }
+            color={spinnerColor || theme?.colorFullscreenLoaderSpinner}
             loaded={loaded}
           />
           {children && <div className={classes.content}>{children}</div>}
diff --git a/src/components/ui/InfoBar.tsx b/src/components/ui/InfoBar.tsx
index 4a660c9769..ae37546dfb 100644
--- a/src/components/ui/InfoBar.tsx
+++ b/src/components/ui/InfoBar.tsx
@@ -71,7 +71,7 @@ class InfoBar extends Component<IProps> {
                 className="contentWrapper"
                 style={{ display: 'flex', gap: '8px' }}
               >
-                <Loader size={18} loaded={!ctaLoading} />
+                <Loader size={18} loaded={!ctaLoading} color="#FFFFFF" />
                 {ctaLabel}
               </div>
             </button>
diff --git a/src/components/ui/Infobox.tsx b/src/components/ui/Infobox.tsx
index 2031daa949..742717ed74 100644
--- a/src/components/ui/Infobox.tsx
+++ b/src/components/ui/Infobox.tsx
@@ -84,7 +84,7 @@ class Infobox extends Component<IProps, IState> {
               className="contentWrapper"
               style={{ display: 'flex', gap: '8px' }}
             >
-              <Loader size={18} loaded={!ctaLoading} />
+              <Loader size={18} loaded={!ctaLoading} color="#FFFFFF" />
               {ctaLabel}
             </div>
           </button>
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 88bfaf7443..f8bcf76b24 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -194,7 +194,7 @@ class ButtonComponent extends Component<IProps, IState> {
       <>
         {showLoader && (
           <div className={classes.loaderContainer}>
-            <Loader size={18} />
+            <Loader size={18} color="#FFFFFF" />
           </div>
         )}
         <div className={classes.label}>
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx
index 3c99df76df..2cee00d969 100644
--- a/src/components/ui/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
@@ -30,11 +30,11 @@ class LoaderComponent extends Component<IProps> {
       classes,
       className,
       size = 36,
-      color = '#FFF',
+      color = this.props.stores?.settings.app.accentColor,
       loaded = false,
     } = this.props;
-    const loaderColor =
-      color === 'primary' ? this.props.stores?.settings.app.accentColor : color;
+    const loaderColor = color || '#FFFFFF';
+
     return (
       <div
         className={classnames({
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
index 0948d7224b..f3d6516548 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
@@ -45,7 +45,7 @@ const styles = theme => ({
   message: {
     fontSize: 16,
     whiteSpace: 'nowrap',
-    color: '#FFFFFF',
+    color: theme.colorAppLoaderSpinner,
   },
 });
 
diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx
index 94917be311..0a417bffd9 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.tsx
+++ b/src/features/workspaces/components/WorkspacesDashboard.tsx
@@ -137,7 +137,7 @@ class WorkspacesDashboard extends Component<IProps> {
             />
           </div>
           {getUserWorkspacesRequest.isExecuting ? (
-            <Loader color="primary" />
+            <Loader />
           ) : (
             <>
               {/* ===== Workspace could not be loaded error ===== */}