Don't display pricing by default in Product List (#1891)

* Update build-types script

* Remove "pricing" where it's unused; exclude pricing query if no channel is selected

* Update fixtures

* Fix minor preorder issue

* Update types

* Fix build-types script

* Remove unnecessary product fragment

* Fetch only data that is visible in products list (#1892)

* Conditionally include attributes in product list query

* Add 'hasSelectedAtrributes' variable to product list query

* Refactor condition

* Create AttributeValueDetailsFragment fragment

* Use attributeValueDetailsFragment

* Update fragment in products

package.json

@@ -242,7 +242,7 @@
   "scripts": {
     "build-storybook": "build-storybook -c src/storybook/ -o build/storybook",
     "generate-fragment-types": "graphql-codegen",
-    "build-types": "apollo client:codegen --target=typescript types --globalTypesFile=src/types/globalTypes.ts && npm run generate-fragment-types",
+    "build-types": "npx apollo client:codegen --target=typescript types --globalTypesFile=src/types/globalTypes.ts && npm run generate-fragment-types",
     "build": "npm run generate-fragment-types && webpack -p",
     "check-strict-null-errors": "tsc --noEmit --strictNullChecks | node scripts/count-strict-null-check-errors.js",
     "check-types": "tsc --noEmit",

src/attributes/types/AttributeDetails.ts

@@ -42,11 +42,11 @@ export interface AttributeDetails_attribute_choices_edges_node {
   slug: string | null;
   file: AttributeDetails_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface AttributeDetails_attribute_choices_edges {

src/attributes/types/AttributeValueCreate.ts

@@ -30,11 +30,11 @@ export interface AttributeValueCreate_attributeValueCreate_attribute_choices_edg
   slug: string | null;
   file: AttributeValueCreate_attributeValueCreate_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface AttributeValueCreate_attributeValueCreate_attribute_choices_edges {

src/attributes/types/AttributeValueDelete.ts

@@ -30,11 +30,11 @@ export interface AttributeValueDelete_attributeValueDelete_attribute_choices_edg
   slug: string | null;
   file: AttributeValueDelete_attributeValueDelete_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface AttributeValueDelete_attributeValueDelete_attribute_choices_edges {

src/attributes/types/AttributeValueUpdate.ts

@@ -30,11 +30,11 @@ export interface AttributeValueUpdate_attributeValueUpdate_attribute_choices_edg
   slug: string | null;
   file: AttributeValueUpdate_attributeValueUpdate_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface AttributeValueUpdate_attributeValueUpdate_attribute_choices_edges {

src/channels/fixtures.ts

@@ -1,5 +1,6 @@
 import { ChannelErrorFragment } from "@saleor/fragments/types/ChannelErrorFragment";
 import { ProductDetails_product_channelListings } from "@saleor/products/types/ProductDetails";
+import { Money } from "@saleor/sdk/dist/apollo/types";
 import { ChannelErrorCode } from "@saleor/types/globalTypes";
 
 import { Channel_channel } from "./types/Channel";
@@ -130,7 +131,21 @@ export const channel: Channel_channel = {
   }
 };
 
-export const productChannels: ProductDetails_product_channelListings[] = [
+interface ProductDetails_product_channelListingsWithPricing
+  extends ProductDetails_product_channelListings {
+  pricing: {
+    priceRange: {
+      start: {
+        net: Money;
+      };
+      stop: {
+        net: Money;
+      };
+    };
+  };
+}
+
+export const productChannels: ProductDetails_product_channelListingsWithPricing[] = [
   {
     __typename: "ProductChannelListing",
     availableForPurchase: null,
@@ -143,21 +158,15 @@ export const productChannels: ProductDetails_product_channelListings[] = [
     isAvailableForPurchase: false,
     isPublished: true,
     pricing: {
-      __typename: "ProductPricingInfo",
       priceRange: {
-        __typename: "TaxedMoneyRange",
         start: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 1.2,
             currency: "USD"
           }
         },
         stop: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 3.5,
             currency: "USD"
           }
@@ -179,21 +188,15 @@ export const productChannels: ProductDetails_product_channelListings[] = [
     isAvailableForPurchase: false,
     isPublished: false,
     pricing: {
-      __typename: "ProductPricingInfo",
       priceRange: {
-        __typename: "TaxedMoneyRange",
         start: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 2.2,
             currency: "USD"
           }
         },
         stop: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 7.1,
             currency: "USD"
           }
@@ -215,21 +218,15 @@ export const productChannels: ProductDetails_product_channelListings[] = [
     isAvailableForPurchase: false,
     isPublished: false,
     pricing: {
-      __typename: "ProductPricingInfo",
       priceRange: {
-        __typename: "TaxedMoneyRange",
         start: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 30.1,
             currency: "USD"
           }
         },
         stop: {
-          __typename: "TaxedMoney",
           net: {
-            __typename: "Money",
             amount: 44.9,
             currency: "USD"
           }

src/components/Attributes/Attributes.tsx

@@ -3,6 +3,7 @@ import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown";
 import { AttributeReference } from "@saleor/attributes/utils/data";
 import CardTitle from "@saleor/components/CardTitle";
 import Hr from "@saleor/components/Hr";
+import { AttributeValueDetailsFragment } from "@saleor/fragments/types/AttributeValueDetailsFragment";
 import { AttributeValueFragment } from "@saleor/fragments/types/AttributeValueFragment";
 import { PageErrorWithAttributesFragment } from "@saleor/fragments/types/PageErrorWithAttributesFragment";
 import { ProductErrorWithAttributesFragment } from "@saleor/fragments/types/ProductErrorWithAttributesFragment";
@@ -27,8 +28,8 @@ export interface AttributeInputData {
   unit?: MeasurementUnitsEnum | null;
   variantAttributeScope?: VariantAttributeScope;
   isRequired: boolean;
-  values: AttributeValueFragment[];
+  values: AttributeValueDetailsFragment[];
-  selectedValues?: AttributeValueFragment[];
+  selectedValues?: AttributeValueDetailsFragment[];
   references?: AttributeReference[];
 }
 export type AttributeInput = FormsetAtomicData<AttributeInputData, string[]>;

src/fragments/attributes.ts

@@ -14,7 +14,6 @@ export const attributeValueFragment = gql`
       ...FileFragment
     }
     reference
-    richText
     boolean
     date
     dateTime
@@ -22,6 +21,14 @@ export const attributeValueFragment = gql`
   }
 `;
 
+export const attributeValueDetailsFragment = gql`
+  ${attributeValueFragment}
+  fragment AttributeValueDetailsFragment on AttributeValue {
+    ...AttributeValueFragment
+    richText
+  }
+`;
+
 export const attributeFragment = gql`
   fragment AttributeFragment on Attribute {
     id
@@ -52,7 +59,7 @@ export const attributeDetailsFragment = gql`
 `;
 
 export const attributeValueListFragment = gql`
-  ${attributeValueFragment}
+  ${attributeValueDetailsFragment}
   ${pageInfoFragment}
   fragment AttributeValueListFragment on AttributeValueCountableConnection {
     pageInfo {
@@ -61,7 +68,7 @@ export const attributeValueListFragment = gql`
     edges {
       cursor
       node {
-        ...AttributeValueFragment
+        ...AttributeValueDetailsFragment
       }
     }
   }

src/fragments/pages.ts

@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 
 import {
-  attributeValueFragment,
+  attributeValueDetailsFragment,
   attributeValueListFragment
 } from "./attributes";
 import { metadataFragment } from "./metadata";
@@ -16,7 +16,7 @@ export const pageFragment = gql`
 `;
 
 export const pageAttributesFragment = gql`
-  ${attributeValueFragment}
+  ${attributeValueDetailsFragment}
   ${attributeValueListFragment}
   fragment PageAttributesFragment on Page {
     attributes {
@@ -38,7 +38,7 @@ export const pageAttributesFragment = gql`
         }
       }
       values {
-        ...AttributeValueFragment
+        ...AttributeValueDetailsFragment
       }
     }
     pageType {

src/fragments/products.ts

@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 
 import {
-  attributeValueFragment,
+  attributeValueDetailsFragment,
   attributeValueListFragment
 } from "./attributes";
 import { metadataFragment } from "./metadata";
@@ -76,18 +76,6 @@ export const channelListingProductWithoutPricingFragment = gql`
     }
   }
 `;
-export const channelListingProductFragment = gql`
-  ${priceRangeFragment}
-  ${channelListingProductWithoutPricingFragment}
-  fragment ChannelListingProductFragment on ProductChannelListing {
-    ...ChannelListingProductWithoutPricingFragment
-    pricing {
-      priceRange {
-        ...PriceRangeFragment
-      }
-    }
-  }
-`;
 
 export const channelListingProductVariantFragment = gql`
   ${fragmentMoney}
@@ -111,7 +99,8 @@ export const channelListingProductVariantFragment = gql`
 `;
 
 export const productFragment = gql`
-  ${channelListingProductFragment}
+  ${channelListingProductWithoutPricingFragment}
+  ${priceRangeFragment}
   fragment ProductFragment on Product {
     id
     name
@@ -124,14 +113,18 @@ export const productFragment = gql`
       hasVariants
     }
     channelListings {
-      ...ChannelListingProductFragment
+      ...ChannelListingProductWithoutPricingFragment
+      pricing @include(if: $hasChannel) {
+        priceRange {
+          ...PriceRangeFragment
+        }
+      }
     }
   }
 `;
 
 export const productVariantAttributesFragment = gql`
-  ${priceRangeFragment}
+  ${attributeValueDetailsFragment}
-  ${attributeValueFragment}
   ${attributeValueListFragment}
   fragment ProductVariantAttributesFragment on Product {
     id
@@ -154,7 +147,7 @@ export const productVariantAttributesFragment = gql`
         }
       }
       values {
-        ...AttributeValueFragment
+        ...AttributeValueDetailsFragment
       }
     }
     productType {
@@ -181,11 +174,6 @@ export const productVariantAttributesFragment = gql`
         name
         currencyCode
       }
-      pricing {
-        priceRange {
-          ...PriceRangeFragment
-        }
-      }
     }
   }
 `;
@@ -198,7 +186,7 @@ export const productFragmentDetails = gql`
   ${weightFragment}
   ${metadataFragment}
   ${taxTypeFragment}
-  ${channelListingProductFragment}
+  ${channelListingProductWithoutPricingFragment}
   ${channelListingProductVariantFragment}
   fragment Product on Product {
     ...ProductVariantAttributesFragment
@@ -222,7 +210,7 @@ export const productFragmentDetails = gql`
     }
     chargeTaxes
     channelListings {
-      ...ChannelListingProductFragment
+      ...ChannelListingProductWithoutPricingFragment
     }
     media {
       ...ProductMediaFragment
@@ -287,14 +275,14 @@ export const variantAttributeFragment = gql`
 `;
 
 export const selectedVariantAttributeFragment = gql`
-  ${attributeValueFragment}
+  ${attributeValueDetailsFragment}
   ${variantAttributeFragment}
   fragment SelectedVariantAttributeFragment on SelectedAttribute {
     attribute {
       ...VariantAttributeFragment
     }
     values {
-      ...AttributeValueFragment
+      ...AttributeValueDetailsFragment
     }
   }
 `;
@@ -303,7 +291,6 @@ export const fragmentVariant = gql`
   ${fragmentPreorder}
   ${fragmentProductMedia}
   ${selectedVariantAttributeFragment}
-  ${priceRangeFragment}
   ${fragmentProductMedia}
   ${stockFragment}
   ${weightFragment}
@@ -347,11 +334,6 @@ export const fragmentVariant = gql`
           name
           currencyCode
         }
-        pricing {
-          priceRange {
-            ...PriceRangeFragment
-          }
-        }
       }
       variants {
         id

src/fragments/types/AttributeValueDetailsFragment.ts

@@ -0,0 +1,28 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL fragment: AttributeValueDetailsFragment
+// ====================================================
+
+export interface AttributeValueDetailsFragment_file {
+  __typename: "File";
+  url: string;
+  contentType: string | null;
+}
+
+export interface AttributeValueDetailsFragment {
+  __typename: "AttributeValue";
+  id: string;
+  name: string | null;
+  slug: string | null;
+  file: AttributeValueDetailsFragment_file | null;
+  reference: string | null;
+  boolean: boolean | null;
+  date: any | null;
+  dateTime: any | null;
+  value: string | null;
+  richText: any | null;
+}

src/fragments/types/AttributeValueFragment.ts

@@ -20,7 +20,6 @@ export interface AttributeValueFragment {
   slug: string | null;
   file: AttributeValueFragment_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;

src/fragments/types/AttributeValueListFragment.ts

@@ -28,11 +28,11 @@ export interface AttributeValueListFragment_edges_node {
   slug: string | null;
   file: AttributeValueListFragment_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface AttributeValueListFragment_edges {

src/fragments/types/ChannelListingProductFragment.ts

@@ -1,59 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-// ====================================================
-// GraphQL fragment: ChannelListingProductFragment
-// ====================================================
-
-export interface ChannelListingProductFragment_channel {
-  __typename: "Channel";
-  id: string;
-  name: string;
-  currencyCode: string;
-}
-
-export interface ChannelListingProductFragment_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ChannelListingProductFragment_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ChannelListingProductFragment_pricing_priceRange_start_net;
-}
-
-export interface ChannelListingProductFragment_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ChannelListingProductFragment_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ChannelListingProductFragment_pricing_priceRange_stop_net;
-}
-
-export interface ChannelListingProductFragment_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ChannelListingProductFragment_pricing_priceRange_start | null;
-  stop: ChannelListingProductFragment_pricing_priceRange_stop | null;
-}
-
-export interface ChannelListingProductFragment_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ChannelListingProductFragment_pricing_priceRange | null;
-}
-
-export interface ChannelListingProductFragment {
-  __typename: "ProductChannelListing";
-  isPublished: boolean;
-  publicationDate: any | null;
-  isAvailableForPurchase: boolean | null;
-  availableForPurchase: any | null;
-  visibleInListings: boolean;
-  channel: ChannelListingProductFragment_channel;
-  pricing: ChannelListingProductFragment_pricing | null;
-}

src/fragments/types/PageAttributesFragment.ts

@@ -30,11 +30,11 @@ export interface PageAttributesFragment_attributes_attribute_choices_edges_node
   slug: string | null;
   file: PageAttributesFragment_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageAttributesFragment_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface PageAttributesFragment_attributes_values {
   slug: string | null;
   file: PageAttributesFragment_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageAttributesFragment_attributes {
@@ -108,11 +108,11 @@ export interface PageAttributesFragment_pageType_attributes_choices_edges_node {
   slug: string | null;
   file: PageAttributesFragment_pageType_attributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageAttributesFragment_pageType_attributes_choices_edges {

src/fragments/types/PageDetailsFragment.ts

@@ -30,11 +30,11 @@ export interface PageDetailsFragment_attributes_attribute_choices_edges_node {
   slug: string | null;
   file: PageDetailsFragment_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetailsFragment_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface PageDetailsFragment_attributes_values {
   slug: string | null;
   file: PageDetailsFragment_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetailsFragment_attributes {
@@ -108,11 +108,11 @@ export interface PageDetailsFragment_pageType_attributes_choices_edges_node {
   slug: string | null;
   file: PageDetailsFragment_pageType_attributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetailsFragment_pageType_attributes_choices_edges {

src/fragments/types/Product.ts

@@ -30,11 +30,11 @@ export interface Product_attributes_attribute_choices_edges_node {
   slug: string | null;
   file: Product_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface Product_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface Product_attributes_values {
   slug: string | null;
   file: Product_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface Product_attributes {
@@ -108,11 +108,11 @@ export interface Product_productType_variantAttributes_choices_edges_node {
   slug: string | null;
   file: Product_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface Product_productType_variantAttributes_choices_edges {
@@ -159,43 +159,9 @@ export interface Product_channelListings_channel {
   currencyCode: string;
 }
 
-export interface Product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface Product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: Product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface Product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface Product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: Product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface Product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: Product_channelListings_pricing_priceRange_start | null;
-  stop: Product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface Product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: Product_channelListings_pricing_priceRange | null;
-}
-
 export interface Product_channelListings {
   __typename: "ProductChannelListing";
   channel: Product_channelListings_channel;
-  pricing: Product_channelListings_pricing | null;
   isPublished: boolean;
   publicationDate: any | null;
   isAvailableForPurchase: boolean | null;

src/fragments/types/ProductVariant.ts

@@ -42,11 +42,11 @@ export interface ProductVariant_selectionAttributes_attribute_choices_edges_node
   slug: string | null;
   file: ProductVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariant_selectionAttributes_attribute_choices_edges {
@@ -86,11 +86,11 @@ export interface ProductVariant_selectionAttributes_values {
   slug: string | null;
   file: ProductVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariant_selectionAttributes {
@@ -120,11 +120,11 @@ export interface ProductVariant_nonSelectionAttributes_attribute_choices_edges_n
   slug: string | null;
   file: ProductVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -164,11 +164,11 @@ export interface ProductVariant_nonSelectionAttributes_values {
   slug: string | null;
   file: ProductVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariant_nonSelectionAttributes {
@@ -212,45 +212,11 @@ export interface ProductVariant_product_channelListings_channel {
   currencyCode: string;
 }
 
-export interface ProductVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: ProductVariant_product_channelListings_channel;
-  pricing: ProductVariant_product_channelListings_pricing | null;
 }
 
 export interface ProductVariant_product_variants_media {

src/fragments/types/ProductVariantAttributesFragment.ts

@@ -30,11 +30,11 @@ export interface ProductVariantAttributesFragment_attributes_attribute_choices_e
   slug: string | null;
   file: ProductVariantAttributesFragment_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantAttributesFragment_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface ProductVariantAttributesFragment_attributes_values {
   slug: string | null;
   file: ProductVariantAttributesFragment_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantAttributesFragment_attributes {
@@ -108,11 +108,11 @@ export interface ProductVariantAttributesFragment_productType_variantAttributes_
   slug: string | null;
   file: ProductVariantAttributesFragment_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantAttributesFragment_productType_variantAttributes_choices_edges {
@@ -150,43 +150,9 @@ export interface ProductVariantAttributesFragment_channelListings_channel {
   currencyCode: string;
 }
 
-export interface ProductVariantAttributesFragment_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantAttributesFragment_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductVariantAttributesFragment_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductVariantAttributesFragment_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantAttributesFragment_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductVariantAttributesFragment_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductVariantAttributesFragment_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductVariantAttributesFragment_channelListings_pricing_priceRange_start | null;
-  stop: ProductVariantAttributesFragment_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductVariantAttributesFragment_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductVariantAttributesFragment_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductVariantAttributesFragment_channelListings {
   __typename: "ProductChannelListing";
   channel: ProductVariantAttributesFragment_channelListings_channel;
-  pricing: ProductVariantAttributesFragment_channelListings_pricing | null;
 }
 
 export interface ProductVariantAttributesFragment {

src/fragments/types/SelectedVariantAttributeFragment.ts

@@ -30,11 +30,11 @@ export interface SelectedVariantAttributeFragment_attribute_choices_edges_node {
   slug: string | null;
   file: SelectedVariantAttributeFragment_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SelectedVariantAttributeFragment_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface SelectedVariantAttributeFragment_values {
   slug: string | null;
   file: SelectedVariantAttributeFragment_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SelectedVariantAttributeFragment {

src/fragments/types/VariantAttributeFragment.ts

@@ -30,11 +30,11 @@ export interface VariantAttributeFragment_choices_edges_node {
   slug: string | null;
   file: VariantAttributeFragment_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantAttributeFragment_choices_edges {

src/pages/types/PageDetails.ts

@@ -30,11 +30,11 @@ export interface PageDetails_page_attributes_attribute_choices_edges_node {
   slug: string | null;
   file: PageDetails_page_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetails_page_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface PageDetails_page_attributes_values {
   slug: string | null;
   file: PageDetails_page_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetails_page_attributes {
@@ -108,11 +108,11 @@ export interface PageDetails_page_pageType_attributes_choices_edges_node {
   slug: string | null;
   file: PageDetails_page_pageType_attributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageDetails_page_pageType_attributes_choices_edges {

src/pages/types/PageType.ts

@@ -30,11 +30,11 @@ export interface PageType_pageType_attributes_choices_edges_node {
   slug: string | null;
   file: PageType_pageType_attributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageType_pageType_attributes_choices_edges {

src/pages/types/PageUpdate.ts

@@ -37,11 +37,11 @@ export interface PageUpdate_pageUpdate_page_attributes_attribute_choices_edges_n
   slug: string | null;
   file: PageUpdate_pageUpdate_page_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageUpdate_pageUpdate_page_attributes_attribute_choices_edges {
@@ -81,11 +81,11 @@ export interface PageUpdate_pageUpdate_page_attributes_values {
   slug: string | null;
   file: PageUpdate_pageUpdate_page_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageUpdate_pageUpdate_page_attributes {
@@ -115,11 +115,11 @@ export interface PageUpdate_pageUpdate_page_pageType_attributes_choices_edges_no
   slug: string | null;
   file: PageUpdate_pageUpdate_page_pageType_attributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface PageUpdate_pageUpdate_page_pageType_attributes_choices_edges {

src/products/fixtures.ts

@@ -1033,7 +1033,6 @@ export const products = (
             name: "Pineapple",
             reference: null,
             slug: "pineapple",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1147,7 +1146,6 @@ export const products = (
             name: "Coconut",
             reference: null,
             slug: "coconut",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1261,7 +1259,6 @@ export const products = (
             name: "Apple",
             reference: null,
             slug: "apple",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1376,7 +1373,6 @@ export const products = (
             name: "Orange",
             reference: null,
             slug: "orange",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1490,7 +1486,6 @@ export const products = (
             name: "Banana",
             reference: null,
             slug: "banana",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1604,7 +1599,6 @@ export const products = (
             name: "Bean",
             reference: null,
             slug: "bean",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1718,7 +1712,6 @@ export const products = (
             name: "Carrot",
             reference: null,
             slug: "carrot",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1832,7 +1825,6 @@ export const products = (
             name: "Sprouty",
             reference: null,
             slug: "sprouty",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -1946,7 +1938,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2060,7 +2051,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2174,7 +2164,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2288,7 +2277,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2402,7 +2390,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2516,7 +2503,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2630,7 +2616,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2744,7 +2729,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -2858,7 +2842,6 @@ export const products = (
             name: "Cotton",
             reference: null,
             slug: "cotton",
-            richText: null,
             boolean: null,
             date: null,
             dateTime: null,
@@ -3128,28 +3111,6 @@ export const variant = (placeholderImage: string): ProductVariant => ({
           currencyCode: "USD",
           id: "test1",
           name: "Test channel"
-        },
-        pricing: {
-          __typename: "ProductPricingInfo",
-          priceRange: {
-            __typename: "TaxedMoneyRange",
-            start: {
-              __typename: "TaxedMoney",
-              net: {
-                __typename: "Money",
-                amount: 1.2,
-                currency: "USD"
-              }
-            },
-            stop: {
-              __typename: "TaxedMoney",
-              net: {
-                __typename: "Money",
-                amount: 3.5,
-                currency: "USD"
-              }
-            }
-          }
         }
       },
       {
@@ -3161,28 +3122,6 @@ export const variant = (placeholderImage: string): ProductVariant => ({
           currencyCode: "USD",
           id: "test2",
           name: "Test channel other"
-        },
-        pricing: {
-          __typename: "ProductPricingInfo",
-          priceRange: {
-            __typename: "TaxedMoneyRange",
-            start: {
-              __typename: "TaxedMoney",
-              net: {
-                __typename: "Money",
-                amount: 1.2,
-                currency: "USD"
-              }
-            },
-            stop: {
-              __typename: "TaxedMoney",
-              net: {
-                __typename: "Money",
-                amount: 3.5,
-                currency: "USD"
-              }
-            }
-          }
         }
       }
     ],

src/products/mutations.ts

@@ -9,8 +9,8 @@ import {
   stockErrorFragment
 } from "@saleor/fragments/errors";
 import {
-  channelListingProductFragment,
   channelListingProductVariantFragment,
+  channelListingProductWithoutPricingFragment,
   exportFileFragment,
   fragmentPreorder,
   fragmentProductMedia,
@@ -611,7 +611,7 @@ export const useProductExport = makeMutation<
 >(productExportMutation);
 
 export const ProductChannelListingUpdateMutation = gql`
-  ${channelListingProductFragment}
+  ${channelListingProductWithoutPricingFragment}
   ${channelListingProductVariantFragment}
   ${productChannelListingErrorFragment}
   mutation ProductChannelListingUpdate(
@@ -622,7 +622,7 @@ export const ProductChannelListingUpdateMutation = gql`
       product {
         id
         channelListings {
-          ...ChannelListingProductFragment
+          ...ChannelListingProductWithoutPricingFragment
         }
         variants {
           id
@@ -665,7 +665,7 @@ export const useProductChannelListingUpdate = makeMutation<
 
 export const ProductVariantChannelListingUpdateMutation = gql`
   ${channelListingProductVariantFragment}
-  ${channelListingProductFragment}
+  ${channelListingProductWithoutPricingFragment}
   ${productChannelListingErrorFragment}
   mutation ProductVariantChannelListingUpdate(
     $id: ID!
@@ -680,7 +680,7 @@ export const ProductVariantChannelListingUpdateMutation = gql`
         product {
           id
           channelListings {
-            ...ChannelListingProductFragment
+            ...ChannelListingProductWithoutPricingFragment
           }
         }
       }

src/products/queries.ts

@@ -145,6 +145,8 @@ const productListQuery = gql`
     $filter: ProductFilterInput
     $channel: String
     $sort: ProductOrder
+    $hasChannel: Boolean!
+    $hasSelectedAttributes: Boolean!
   ) {
     products(
       before: $before
@@ -159,7 +161,7 @@ const productListQuery = gql`
         node {
           ...ProductFragment
           updatedAt
-          attributes {
+          attributes @include(if: $hasSelectedAttributes) {
             attribute {
               id
             }

src/products/types/CreateMultipleVariantsData.ts

@@ -30,11 +30,11 @@ export interface CreateMultipleVariantsData_product_attributes_attribute_choices
   slug: string | null;
   file: CreateMultipleVariantsData_product_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface CreateMultipleVariantsData_product_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface CreateMultipleVariantsData_product_attributes_values {
   slug: string | null;
   file: CreateMultipleVariantsData_product_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface CreateMultipleVariantsData_product_attributes {
@@ -108,11 +108,11 @@ export interface CreateMultipleVariantsData_product_productType_variantAttribute
   slug: string | null;
   file: CreateMultipleVariantsData_product_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface CreateMultipleVariantsData_product_productType_variantAttributes_choices_edges {
@@ -150,43 +150,9 @@ export interface CreateMultipleVariantsData_product_channelListings_channel {
   currencyCode: string;
 }
 
-export interface CreateMultipleVariantsData_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface CreateMultipleVariantsData_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: CreateMultipleVariantsData_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface CreateMultipleVariantsData_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface CreateMultipleVariantsData_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: CreateMultipleVariantsData_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface CreateMultipleVariantsData_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: CreateMultipleVariantsData_product_channelListings_pricing_priceRange_start | null;
-  stop: CreateMultipleVariantsData_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface CreateMultipleVariantsData_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: CreateMultipleVariantsData_product_channelListings_pricing_priceRange | null;
-}
-
 export interface CreateMultipleVariantsData_product_channelListings {
   __typename: "ProductChannelListing";
   channel: CreateMultipleVariantsData_product_channelListings_channel;
-  pricing: CreateMultipleVariantsData_product_channelListings_pricing | null;
 }
 
 export interface CreateMultipleVariantsData_product {

src/products/types/ProductChannelListingUpdate.ts

@@ -16,39 +16,6 @@ export interface ProductChannelListingUpdate_productChannelListingUpdate_product
   currencyCode: string;
 }
 
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings {
   __typename: "ProductChannelListing";
   isPublished: boolean;
@@ -57,7 +24,6 @@ export interface ProductChannelListingUpdate_productChannelListingUpdate_product
   availableForPurchase: any | null;
   visibleInListings: boolean;
   channel: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_channel;
-  pricing: ProductChannelListingUpdate_productChannelListingUpdate_product_channelListings_pricing | null;
 }
 
 export interface ProductChannelListingUpdate_productChannelListingUpdate_product_variants_channelListings_channel {

src/products/types/ProductDetails.ts

@@ -30,11 +30,11 @@ export interface ProductDetails_product_attributes_attribute_choices_edges_node
   slug: string | null;
   file: ProductDetails_product_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductDetails_product_attributes_attribute_choices_edges {
@@ -74,11 +74,11 @@ export interface ProductDetails_product_attributes_values {
   slug: string | null;
   file: ProductDetails_product_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductDetails_product_attributes {
@@ -108,11 +108,11 @@ export interface ProductDetails_product_productType_variantAttributes_choices_ed
   slug: string | null;
   file: ProductDetails_product_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductDetails_product_productType_variantAttributes_choices_edges {
@@ -159,43 +159,9 @@ export interface ProductDetails_product_channelListings_channel {
   currencyCode: string;
 }
 
-export interface ProductDetails_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductDetails_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductDetails_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductDetails_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductDetails_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductDetails_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductDetails_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductDetails_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductDetails_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductDetails_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductDetails_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductDetails_product_channelListings {
   __typename: "ProductChannelListing";
   channel: ProductDetails_product_channelListings_channel;
-  pricing: ProductDetails_product_channelListings_pricing | null;
   isPublished: boolean;
   publicationDate: any | null;
   isAvailableForPurchase: boolean | null;

src/products/types/ProductList.ts

@@ -90,7 +90,6 @@ export interface ProductList_products_edges_node_attributes_values {
   slug: string | null;
   file: ProductList_products_edges_node_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
@@ -146,4 +145,6 @@ export interface ProductListVariables {
   filter?: ProductFilterInput | null;
   channel?: string | null;
   sort?: ProductOrder | null;
+  hasChannel: boolean;
+  hasSelectedAttributes: boolean;
 }

src/products/types/ProductType.ts

@@ -30,11 +30,11 @@ export interface ProductType_productType_productAttributes_choices_edges_node {
   slug: string | null;
   file: ProductType_productType_productAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductType_productType_productAttributes_choices_edges {

src/products/types/ProductUpdate.ts

@@ -37,11 +37,11 @@ export interface ProductUpdate_productUpdate_product_attributes_attribute_choice
   slug: string | null;
   file: ProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductUpdate_productUpdate_product_attributes_attribute_choices_edges {
@@ -81,11 +81,11 @@ export interface ProductUpdate_productUpdate_product_attributes_values {
   slug: string | null;
   file: ProductUpdate_productUpdate_product_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductUpdate_productUpdate_product_attributes {
@@ -115,11 +115,11 @@ export interface ProductUpdate_productUpdate_product_productType_variantAttribut
   slug: string | null;
   file: ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges {
@@ -166,43 +166,9 @@ export interface ProductUpdate_productUpdate_product_channelListings_channel {
   currencyCode: string;
 }
 
-export interface ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductUpdate_productUpdate_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductUpdate_productUpdate_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductUpdate_productUpdate_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductUpdate_productUpdate_product_channelListings {
   __typename: "ProductChannelListing";
   channel: ProductUpdate_productUpdate_product_channelListings_channel;
-  pricing: ProductUpdate_productUpdate_product_channelListings_pricing | null;
   isPublished: boolean;
   publicationDate: any | null;
   isAvailableForPurchase: boolean | null;

src/products/types/ProductVariantChannelListingUpdate.ts

@@ -49,39 +49,6 @@ export interface ProductVariantChannelListingUpdate_productVariantChannelListing
   currencyCode: string;
 }
 
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings {
   __typename: "ProductChannelListing";
   isPublished: boolean;
@@ -90,7 +57,6 @@ export interface ProductVariantChannelListingUpdate_productVariantChannelListing
   availableForPurchase: any | null;
   visibleInListings: boolean;
   channel: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_channel;
-  pricing: ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product_channelListings_pricing | null;
 }
 
 export interface ProductVariantChannelListingUpdate_productVariantChannelListingUpdate_variant_product {

src/products/types/ProductVariantCreateData.ts

@@ -49,11 +49,11 @@ export interface ProductVariantCreateData_product_productType_selectionVariantAt
   slug: string | null;
   file: ProductVariantCreateData_product_productType_selectionVariantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantCreateData_product_productType_selectionVariantAttributes_choices_edges {
@@ -101,11 +101,11 @@ export interface ProductVariantCreateData_product_productType_nonSelectionVarian
   slug: string | null;
   file: ProductVariantCreateData_product_productType_nonSelectionVariantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantCreateData_product_productType_nonSelectionVariantAttributes_choices_edges {

src/products/types/ProductVariantDetails.ts

@@ -42,11 +42,11 @@ export interface ProductVariantDetails_productVariant_selectionAttributes_attrib
   slug: string | null;
   file: ProductVariantDetails_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantDetails_productVariant_selectionAttributes_attribute_choices_edges {
@@ -86,11 +86,11 @@ export interface ProductVariantDetails_productVariant_selectionAttributes_values
   slug: string | null;
   file: ProductVariantDetails_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantDetails_productVariant_selectionAttributes {
@@ -120,11 +120,11 @@ export interface ProductVariantDetails_productVariant_nonSelectionAttributes_att
   slug: string | null;
   file: ProductVariantDetails_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantDetails_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -164,11 +164,11 @@ export interface ProductVariantDetails_productVariant_nonSelectionAttributes_val
   slug: string | null;
   file: ProductVariantDetails_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface ProductVariantDetails_productVariant_nonSelectionAttributes {
@@ -212,45 +212,11 @@ export interface ProductVariantDetails_productVariant_product_channelListings_ch
   currencyCode: string;
 }
 
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface ProductVariantDetails_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: ProductVariantDetails_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface ProductVariantDetails_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: ProductVariantDetails_productVariant_product_channelListings_channel;
-  pricing: ProductVariantDetails_productVariant_product_channelListings_pricing | null;
 }
 
 export interface ProductVariantDetails_productVariant_product_variants_media {

src/products/types/SimpleProductUpdate.ts

@@ -37,11 +37,11 @@ export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_
   slug: string | null;
   file: SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productUpdate_product_attributes_attribute_choices_edges {
@@ -81,11 +81,11 @@ export interface SimpleProductUpdate_productUpdate_product_attributes_values {
   slug: string | null;
   file: SimpleProductUpdate_productUpdate_product_attributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productUpdate_product_attributes {
@@ -115,11 +115,11 @@ export interface SimpleProductUpdate_productUpdate_product_productType_variantAt
   slug: string | null;
   file: SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productUpdate_product_productType_variantAttributes_choices_edges {
@@ -166,43 +166,9 @@ export interface SimpleProductUpdate_productUpdate_product_channelListings_chann
   currencyCode: string;
 }
 
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_start | null;
-  stop: SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface SimpleProductUpdate_productUpdate_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: SimpleProductUpdate_productUpdate_product_channelListings_pricing_priceRange | null;
-}
-
 export interface SimpleProductUpdate_productUpdate_product_channelListings {
   __typename: "ProductChannelListing";
   channel: SimpleProductUpdate_productUpdate_product_channelListings_channel;
-  pricing: SimpleProductUpdate_productUpdate_product_channelListings_pricing | null;
   isPublished: boolean;
   publicationDate: any | null;
   isAvailableForPurchase: boolean | null;
@@ -405,11 +371,11 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_selecti
   slug: string | null;
   file: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -449,11 +415,11 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_selecti
   slug: string | null;
   file: SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_selectionAttributes {
@@ -483,11 +449,11 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSele
   slug: string | null;
   file: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -527,11 +493,11 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSele
   slug: string | null;
   file: SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_nonSelectionAttributes {
@@ -575,45 +541,11 @@ export interface SimpleProductUpdate_productVariantUpdate_productVariant_product
   currencyCode: string;
 }
 
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_channel;
-  pricing: SimpleProductUpdate_productVariantUpdate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface SimpleProductUpdate_productVariantUpdate_productVariant_product_variants_media {
@@ -768,11 +700,11 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -812,11 +744,11 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_selectionAttributes {
@@ -846,11 +778,11 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -890,11 +822,11 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_nonSelectionAttributes {
@@ -938,45 +870,11 @@ export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_p
   currencyCode: string;
 }
 
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_channel;
-  pricing: SimpleProductUpdate_productVariantStocksCreate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksCreate_productVariant_product_variants_media {
@@ -1130,11 +1028,11 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_attribute_choices_edges {
@@ -1174,11 +1072,11 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_selectionAttributes {
@@ -1208,11 +1106,11 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -1252,11 +1150,11 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_nonSelectionAttributes {
@@ -1300,45 +1198,11 @@ export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_p
   currencyCode: string;
 }
 
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_channel;
-  pricing: SimpleProductUpdate_productVariantStocksDelete_productVariant_product_channelListings_pricing | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksDelete_productVariant_product_variants_media {
@@ -1493,11 +1357,11 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -1537,11 +1401,11 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_s
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_selectionAttributes {
@@ -1571,11 +1435,11 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -1615,11 +1479,11 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_n
   slug: string | null;
   file: SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes {
@@ -1663,45 +1527,11 @@ export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_p
   currencyCode: string;
 }
 
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_channel;
-  pricing: SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface SimpleProductUpdate_productVariantStocksUpdate_productVariant_product_variants_media {

src/products/types/VariantCreate.ts

@@ -49,11 +49,11 @@ export interface VariantCreate_productVariantCreate_productVariant_selectionAttr
   slug: string | null;
   file: VariantCreate_productVariantCreate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantCreate_productVariantCreate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -93,11 +93,11 @@ export interface VariantCreate_productVariantCreate_productVariant_selectionAttr
   slug: string | null;
   file: VariantCreate_productVariantCreate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantCreate_productVariantCreate_productVariant_selectionAttributes {
@@ -127,11 +127,11 @@ export interface VariantCreate_productVariantCreate_productVariant_nonSelectionA
   slug: string | null;
   file: VariantCreate_productVariantCreate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantCreate_productVariantCreate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -171,11 +171,11 @@ export interface VariantCreate_productVariantCreate_productVariant_nonSelectionA
   slug: string | null;
   file: VariantCreate_productVariantCreate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantCreate_productVariantCreate_productVariant_nonSelectionAttributes {
@@ -219,45 +219,11 @@ export interface VariantCreate_productVariantCreate_productVariant_product_chann
   currencyCode: string;
 }
 
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface VariantCreate_productVariantCreate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: VariantCreate_productVariantCreate_productVariant_product_channelListings_channel;
-  pricing: VariantCreate_productVariantCreate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface VariantCreate_productVariantCreate_productVariant_product_variants_media {

src/products/types/VariantUpdate.ts

@@ -49,11 +49,11 @@ export interface VariantUpdate_productVariantUpdate_productVariant_selectionAttr
   slug: string | null;
   file: VariantUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantUpdate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -93,11 +93,11 @@ export interface VariantUpdate_productVariantUpdate_productVariant_selectionAttr
   slug: string | null;
   file: VariantUpdate_productVariantUpdate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantUpdate_productVariant_selectionAttributes {
@@ -127,11 +127,11 @@ export interface VariantUpdate_productVariantUpdate_productVariant_nonSelectionA
   slug: string | null;
   file: VariantUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -171,11 +171,11 @@ export interface VariantUpdate_productVariantUpdate_productVariant_nonSelectionA
   slug: string | null;
   file: VariantUpdate_productVariantUpdate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantUpdate_productVariant_nonSelectionAttributes {
@@ -219,45 +219,11 @@ export interface VariantUpdate_productVariantUpdate_productVariant_product_chann
   currencyCode: string;
 }
 
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface VariantUpdate_productVariantUpdate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_channel;
-  pricing: VariantUpdate_productVariantUpdate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface VariantUpdate_productVariantUpdate_productVariant_product_variants_media {
@@ -412,11 +378,11 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_selecti
   slug: string | null;
   file: VariantUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_attribute_choices_edges {
@@ -456,11 +422,11 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_selecti
   slug: string | null;
   file: VariantUpdate_productVariantStocksUpdate_productVariant_selectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_selectionAttributes {
@@ -490,11 +456,11 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_nonSele
   slug: string | null;
   file: VariantUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_attribute_choices_edges {
@@ -534,11 +500,11 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_nonSele
   slug: string | null;
   file: VariantUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes_values_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_nonSelectionAttributes {
@@ -582,45 +548,11 @@ export interface VariantUpdate_productVariantStocksUpdate_productVariant_product
   currencyCode: string;
 }
 
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start {
-  __typename: "TaxedMoney";
-  net: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start_net;
-}
-
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net {
-  __typename: "Money";
-  amount: number;
-  currency: string;
-}
-
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop {
-  __typename: "TaxedMoney";
-  net: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop_net;
-}
-
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange {
-  __typename: "TaxedMoneyRange";
-  start: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_start | null;
-  stop: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange_stop | null;
-}
-
-export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing {
-  __typename: "ProductPricingInfo";
-  priceRange: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing_priceRange | null;
-}
-
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings {
   __typename: "ProductChannelListing";
   publicationDate: any | null;
   isPublished: boolean;
   channel: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_channel;
-  pricing: VariantUpdate_productVariantStocksUpdate_productVariant_product_channelListings_pricing | null;
 }
 
 export interface VariantUpdate_productVariantStocksUpdate_productVariant_product_variants_media {

src/products/views/ProductList/ProductList.tsx

@@ -289,7 +289,9 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
     : null;
   const filter = getFilterVariables(params, !!selectedChannel);
   const sort = getSortQueryVariables(params, !!selectedChannel);
-  const queryVariables = React.useMemo<ProductListVariables>(
+  const queryVariables = React.useMemo<
+    Omit<ProductListVariables, "hasChannel" | "hasSelectedAttributes">
+  >(
     () => ({
       ...paginationState,
       filter,
@@ -298,22 +300,28 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
     }),
     [params, settings.rowNumber]
   );
-  // TODO: When channel is undefined we should skip detailed pricing listings
-  const { data, loading, refetch } = useProductListQuery({
-    displayLoader: true,
-    variables: queryVariables
-  });
 
   function filterColumnIds(columns: ProductListColumns[]) {
     return columns
       .filter(isAttributeColumnValue)
       .map(getAttributeIdFromColumnValue);
   }
+  const filteredColumnIds = filterColumnIds(settings.columns);
+
+  const { data, loading, refetch } = useProductListQuery({
+    displayLoader: true,
+    variables: {
+      ...queryVariables,
+      hasChannel: !!selectedChannel,
+      hasSelectedAttributes: filteredColumnIds.length > 0
+    }
+  });
+
   const availableInGridAttributes = useAvailableInGridAttributesQuery({
     variables: { first: 24 }
   });
   const gridAttributes = useGridAttributesQuery({
-    variables: { ids: filterColumnIds(settings.columns) }
+    variables: { ids: filteredColumnIds }
   });
 
   const [

src/products/views/ProductUpdate/ProductUpdate.tsx

@@ -677,7 +677,7 @@ export const ProductUpdate: React.FC<ProductUpdateProps> = ({ id, params }) => {
           option === "multiple" ? handleVariantsAdd() : handleVariantAdd()
         }
       />
-      {isSimpleProduct && !!product?.variants?.[0].preorder && (
+      {isSimpleProduct && !!product?.variants?.[0]?.preorder && (
         <ProductVariantEndPreorderDialog
           confirmButtonState={deactivatePreoderOpts.status}
           onClose={() => setIsEndPreorderModalOpened(false)}

src/searches/types/SearchAttributeValues.ts

@@ -20,11 +20,11 @@ export interface SearchAttributeValues_attribute_choices_edges_node {
   slug: string | null;
   file: SearchAttributeValues_attribute_choices_edges_node_file | null;
   reference: string | null;
-  richText: any | null;
   boolean: boolean | null;
   date: any | null;
   dateTime: any | null;
   value: string | null;
+  richText: any | null;
 }
 
 export interface SearchAttributeValues_attribute_choices_edges {

src/searches/useAttributeValueSearch.ts

@@ -1,5 +1,5 @@
 import { gql } from "@apollo/client";
-import { attributeValueFragment } from "@saleor/fragments/attributes";
+import { attributeValueDetailsFragment } from "@saleor/fragments/attributes";
 import { pageInfoFragment } from "@saleor/fragments/pageInfo";
 import makeSearch from "@saleor/hooks/makeSearch";
 
@@ -10,7 +10,7 @@ import {
 
 export const searchAttributeValues = gql`
   ${pageInfoFragment}
-  ${attributeValueFragment}
+  ${attributeValueDetailsFragment}
   query SearchAttributeValues(
     $id: ID
     $after: String
@@ -22,7 +22,7 @@ export const searchAttributeValues = gql`
       choices(after: $after, first: $first, filter: { search: $query }) {
         edges {
           node {
-            ...AttributeValueFragment
+            ...AttributeValueDetailsFragment
           }
         }
         pageInfo {