Merge branch 'master' into development_tri/feedback_UAT

2 files changed, 7 insertions, 16 deletions

diff --git a/src/lib/brand/components/BrandCard.jsx b/src/lib/brand/components/BrandCard.jsx
index f8c01e6d..bb1a17f7 100644
--- a/src/lib/brand/components/BrandCard.jsx
+++ b/src/lib/brand/components/BrandCard.jsx
@@ -8,7 +8,9 @@ const BrandCard = ({ brand }) => {
   return (
     <Link
       href={createSlug('/shop/brands/', brand.name, brand.id)}
-      className={`py-1 px-2 rounded border border-gray_r-6 flex justify-center items-center ${isMobile ? 'h-16' : 'h-24'}`}
+      className={`py-1 px-2 rounded border border-gray_r-6 flex justify-center items-center ${
+        isMobile ? 'h-16' : 'h-24'
+      }`}
     >
       {brand.logo && (
         <Image
@@ -18,10 +20,7 @@ const BrandCard = ({ brand }) => {
         />
       )}
       {!brand.logo && (
-        <span
-          className='text-center'
-          style={{ fontSize: `${16 - brand.name.length * 0.5}px` }}
-        >
+        <span className='text-center' style={{ fontSize: `${16 - brand.name.length * 0.5}px` }}>
           {brand.name}
         </span>
       )}
diff --git a/src/lib/brand/components/Brands.jsx b/src/lib/brand/components/Brands.jsx
index 25fb1c67..c7483e40 100644
--- a/src/lib/brand/components/Brands.jsx
+++ b/src/lib/brand/components/Brands.jsx
@@ -1,9 +1,7 @@
 import odooApi from '@/core/api/odooApi'
-import Spinner from '@/core/components/elements/Spinner/Spinner'
-import DesktopView from '@/core/components/views/DesktopView'
-import MobileView from '@/core/components/views/MobileView'
 import { useCallback, useEffect, useState } from 'react'
 import BrandCard from './BrandCard'
+import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner'
 
 const Brands = () => {
   const alpha = Array.from(Array(26)).map((e, i) => i + 65)
@@ -41,7 +39,7 @@ const Brands = () => {
     return (
       <>
         <div className='container flex justify-center my-4'>
-          <Spinner className='w-6 text-gray_r-12/50 fill-gray_r-12 md:w-20 md:mt-28' />
+          <LogoSpinner width={48} height={48} />
         </div>
       </>
     )
@@ -68,13 +66,7 @@ const Brands = () => {
 
       <div className='grid grid-cols-4 gap-4 mt-4 md:grid-cols-7 !overflow-x-hidden'>
         {manufactures?.map(
-          (manufacture, index) =>
-            manufacture.name && (
-              <BrandCard
-                brand={manufacture}
-                key={index}
-              />
-            )
+          (manufacture, index) => manufacture.name && <BrandCard brand={manufacture} key={index} />
         )}
       </div>
     </div>