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 = props => { pageInfo, products, selected, + loading, sort, toggle, toggleAll, @@ -137,11 +138,11 @@ export const ProductList: React.FC = 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 = props => { } }; + console.log(123, { loading }); return (
@@ -445,13 +447,7 @@ export const ProductList: React.FC = props => { displayColumns={settings.columns} > - {product?.pricing?.priceRangeUndiscounted ? ( - getProductPrice( - product?.pricing?.priceRangeUndiscounted - ) - ) : ( - - )} + {loading ? : getProductPrice(product)} 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 = props => { />