diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index 0a163a684..22113f45f 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -22,10 +22,7 @@ import { isAttributeColumnValue } from "@saleor/products/components/ProductListPage/utils"; import { GridAttributes_grid_edges_node } from "@saleor/products/types/GridAttributes"; -import { - ProductList_products_edges_node, - ProductList_products_edges_node_pricing_priceRangeUndiscounted -} from "@saleor/products/types/ProductList"; +import { ProductList_products_edges_node } from "@saleor/products/types/ProductList"; import { ProductListUrlSortField } from "@saleor/products/urls"; import { ListActions, ListProps, SortPage } from "@saleor/types"; import TDisplayColumn, { @@ -106,6 +103,7 @@ interface ProductListProps activeAttributeSortId: string; gridAttributes: GridAttributes_grid_edges_node[]; products: ProductList_products_edges_node[]; + loading: boolean; } export const ProductList: React.FC = props => { @@ -118,6 +116,7 @@ export const ProductList: React.FC = props => { pageInfo, products, selected, + loading, sort, toggle, toggleAll, @@ -137,11 +136,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; @@ -445,13 +444,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 => { /> - - ‌ - + -