Merge branch 'new-release' into feature/integrasi_biteship

1 files changed, 12 insertions, 6 deletions

diff --git a/src/lib/product/components/Product/ProductDesktopVariant.jsx b/src/lib/product/components/Product/ProductDesktopVariant.jsx
index f4569574..5dfd452b 100644
--- a/src/lib/product/components/Product/ProductDesktopVariant.jsx
+++ b/src/lib/product/components/Product/ProductDesktopVariant.jsx
@@ -264,11 +264,17 @@ const ProductDesktopVariant = ({
                         product.manufacture.id.toString()
                       )}
                     >
-                      <Image
-                        width={100}
-                        src={product.manufacture.logo}
-                        alt={product.manufacture.name}
-                      />
+                      {product?.manufacture.logo ? (
+                        <Image
+                          width={100}
+                          src={product.manufacture.logo}
+                          alt={product.manufacture.name}
+                        />
+                      ) : (
+                        <p className='font-bold text-red-500'>
+                          {product.manufacture.name}
+                        </p>
+                      )}
                     </Link>
                   </div>
                 </div>
@@ -434,7 +440,7 @@ const ProductDesktopVariant = ({
               </div>
               <div>
                 <Skeleton
-                  isLoaded={sla}
+                  isLoaded={!isLoadingSLA}
                   h='21px'
                   // w={16}
                   className={