From 0faf70aea620dd0987560e8f16c5e1fdbba345de Mon Sep 17 00:00:00 2001
From: Magdalena Markusik <magdalena.markusik@mirumee.com>
Date: Wed, 23 Sep 2020 14:03:15 +0200
Subject: [PATCH] wip

---
 .../components/ProductList/ProductList.tsx     | 18 +++++++-----------
 .../ProductListPage/ProductListPage.tsx        |  1 +
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx
index 0a163a684..a45d0c456 100644
--- a/src/products/components/ProductList/ProductList.tsx
+++ b/src/products/components/ProductList/ProductList.tsx
@@ -118,6 +118,7 @@ export const ProductList: React.FC<ProductListProps> = props => {
     pageInfo,
     products,
     selected,
+    loading,
     sort,
     toggle,
     toggleAll,
@@ -137,11 +138,11 @@ export const ProductList: React.FC<ProductListProps> = props => {
   );
   const numberOfColumns = 2 + settings.columns.length;
 
-  const getProductPrice = (
-    priceRangeUndiscounted: ProductList_products_edges_node_pricing_priceRangeUndiscounted
-  ) => {
+  const getProductPrice = product => {
+    const priceRangeUndiscounted = product?.pricing?.priceRangeUndiscounted;
+
     if (!priceRangeUndiscounted) {
-      return null;
+      return "-";
     }
 
     const { start, stop } = priceRangeUndiscounted;
@@ -182,6 +183,7 @@ export const ProductList: React.FC<ProductListProps> = props => {
     }
   };
 
+  console.log(123, { loading });
   return (
     <div className={classes.tableContainer}>
       <ResponsiveTable className={classes.table}>
@@ -445,13 +447,7 @@ export const ProductList: React.FC<ProductListProps> = props => {
                     displayColumns={settings.columns}
                   >
                     <TableCell className={classes.colPrice}>
-                      {product?.pricing?.priceRangeUndiscounted ? (
-                        getProductPrice(
-                          product?.pricing?.priceRangeUndiscounted
-                        )
-                      ) : (
-                        <Skeleton />
-                      )}
+                      {loading ? <Skeleton /> : getProductPrice(product)}
                     </TableCell>
                   </DisplayColumn>
                 </TableRow>
diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx
index 8bc6b452c..892ddeceb 100644
--- a/src/products/components/ProductListPage/ProductListPage.tsx
+++ b/src/products/components/ProductListPage/ProductListPage.tsx
@@ -185,6 +185,7 @@ export const ProductListPage: React.FC<ProductListPageProps> = props => {
         />
         <ProductList
           {...listProps}
+          loading={loading}
           gridAttributes={gridAttributes}
           settings={settings}
           onUpdateListSettings={onUpdateListSettings}