From d5f7ef371c875fc0b9575340c4cd4c473d0400c2 Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Tue, 17 Dec 2019 16:09:39 +0100
Subject: [PATCH 1/7] Add missing selected products attributes

---
 src/@sdk/mutations/types/AccountUpdate.ts     | 26 +--------
 src/@sdk/mutations/types/CreateCheckout.ts    | 18 +-----
 src/@sdk/mutations/types/CreateUserAddress.ts | 26 +--------
 src/@sdk/mutations/types/DeleteUserAddress.ts | 24 --------
 .../types/SetCustomerDefaultAddress.ts        | 26 +--------
 .../types/UpdateCheckoutBillingAddress.ts     | 18 +-----
 .../mutations/types/UpdateCheckoutLine.ts     |  2 +-
 .../types/UpdateCheckoutShippingAddress.ts    | 34 +----------
 src/@sdk/mutations/types/UpdateUserAddress.ts | 26 +--------
 src/@sdk/queries/types/CheckoutDetails.ts     | 16 ------
 src/@sdk/queries/types/ProductList.ts         |  4 +-
 src/@sdk/queries/types/UserCheckoutDetails.ts | 16 ------
 src/@sdk/queries/types/UserDetails.ts         | 24 --------
 .../OverlayManager/Login/queries.ts           |  2 +-
 .../Login/types/RegisterCutomer.ts            | 12 ++--
 .../Search/types/SearchResults.ts             |  2 +-
 src/components/PasswordResetForm/queries.tsx  |  3 +-
 .../PasswordResetForm/types/ResetPassword.ts  | 12 ++--
 src/components/ProductDescription/index.tsx   | 18 +++++-
 .../ProductDescription/scss/index.scss        |  8 +++
 .../types/FeaturedProducts.ts                 |  2 +-
 src/sitemap/types/GetCategories.ts            | 57 +++++++++++++++++++
 src/sitemap/types/GetCollections.ts           | 57 +++++++++++++++++++
 src/sitemap/types/GetProducts.ts              | 57 +++++++++++++++++++
 src/views/Category/types/Category.ts          |  2 +-
 src/views/Collection/types/Collection.ts      |  2 +-
 src/views/Product/Page.tsx                    |  1 +
 src/views/Product/queries.ts                  | 15 +++++
 src/views/Product/types/ProductDetails.ts     | 36 +++++++++++-
 .../Product/types/SelectedAttributeFields.ts  | 35 ++++++++++++
 src/views/Search/types/SearchProducts.ts      |  2 +-
 31 files changed, 309 insertions(+), 274 deletions(-)
 create mode 100644 src/sitemap/types/GetCategories.ts
 create mode 100644 src/sitemap/types/GetCollections.ts
 create mode 100644 src/sitemap/types/GetProducts.ts
 create mode 100644 src/views/Product/types/SelectedAttributeFields.ts

diff --git a/src/@sdk/mutations/types/AccountUpdate.ts b/src/@sdk/mutations/types/AccountUpdate.ts
index 52c773a519..7d94595cfb 100644
--- a/src/@sdk/mutations/types/AccountUpdate.ts
+++ b/src/@sdk/mutations/types/AccountUpdate.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AccountInput } from "./../../types/globalTypes";
+import { AccountInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: AccountUpdate
@@ -52,14 +52,6 @@ export interface AccountUpdate_accountUpdate_user_defaultShippingAddress {
   country: AccountUpdate_accountUpdate_user_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface AccountUpdate_accountUpdate_user_defaultBillingAddress_country {
@@ -93,14 +85,6 @@ export interface AccountUpdate_accountUpdate_user_defaultBillingAddress {
   country: AccountUpdate_accountUpdate_user_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface AccountUpdate_accountUpdate_user_addresses_country {
@@ -134,14 +118,6 @@ export interface AccountUpdate_accountUpdate_user_addresses {
   country: AccountUpdate_accountUpdate_user_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface AccountUpdate_accountUpdate_user {
diff --git a/src/@sdk/mutations/types/CreateCheckout.ts b/src/@sdk/mutations/types/CreateCheckout.ts
index d74f885523..53bec4a34b 100644
--- a/src/@sdk/mutations/types/CreateCheckout.ts
+++ b/src/@sdk/mutations/types/CreateCheckout.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { CheckoutCreateInput } from "./../../types/globalTypes";
+import { CheckoutCreateInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: CreateCheckout
@@ -169,14 +169,6 @@ export interface CreateCheckout_checkoutCreate_checkout_billingAddress {
   country: CreateCheckout_checkoutCreate_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CreateCheckout_checkoutCreate_checkout_shippingAddress_country {
@@ -210,14 +202,6 @@ export interface CreateCheckout_checkoutCreate_checkout_shippingAddress {
   country: CreateCheckout_checkoutCreate_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CreateCheckout_checkoutCreate_checkout_availableShippingMethods_price {
diff --git a/src/@sdk/mutations/types/CreateUserAddress.ts b/src/@sdk/mutations/types/CreateUserAddress.ts
index 4ed01407b2..26b0de51f4 100644
--- a/src/@sdk/mutations/types/CreateUserAddress.ts
+++ b/src/@sdk/mutations/types/CreateUserAddress.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AddressInput } from "./../../types/globalTypes";
+import { AddressInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: CreateUserAddress
@@ -52,14 +52,6 @@ export interface CreateUserAddress_accountAddressCreate_user_defaultShippingAddr
   country: CreateUserAddress_accountAddressCreate_user_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CreateUserAddress_accountAddressCreate_user_defaultBillingAddress_country {
@@ -93,14 +85,6 @@ export interface CreateUserAddress_accountAddressCreate_user_defaultBillingAddre
   country: CreateUserAddress_accountAddressCreate_user_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CreateUserAddress_accountAddressCreate_user_addresses_country {
@@ -134,14 +118,6 @@ export interface CreateUserAddress_accountAddressCreate_user_addresses {
   country: CreateUserAddress_accountAddressCreate_user_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CreateUserAddress_accountAddressCreate_user {
diff --git a/src/@sdk/mutations/types/DeleteUserAddress.ts b/src/@sdk/mutations/types/DeleteUserAddress.ts
index 76f08957ab..46dffe8376 100644
--- a/src/@sdk/mutations/types/DeleteUserAddress.ts
+++ b/src/@sdk/mutations/types/DeleteUserAddress.ts
@@ -50,14 +50,6 @@ export interface DeleteUserAddress_accountAddressDelete_user_defaultShippingAddr
   country: DeleteUserAddress_accountAddressDelete_user_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface DeleteUserAddress_accountAddressDelete_user_defaultBillingAddress_country {
@@ -91,14 +83,6 @@ export interface DeleteUserAddress_accountAddressDelete_user_defaultBillingAddre
   country: DeleteUserAddress_accountAddressDelete_user_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface DeleteUserAddress_accountAddressDelete_user_addresses_country {
@@ -132,14 +116,6 @@ export interface DeleteUserAddress_accountAddressDelete_user_addresses {
   country: DeleteUserAddress_accountAddressDelete_user_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface DeleteUserAddress_accountAddressDelete_user {
diff --git a/src/@sdk/mutations/types/SetCustomerDefaultAddress.ts b/src/@sdk/mutations/types/SetCustomerDefaultAddress.ts
index 2923bb4869..ca01eafc4b 100644
--- a/src/@sdk/mutations/types/SetCustomerDefaultAddress.ts
+++ b/src/@sdk/mutations/types/SetCustomerDefaultAddress.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AddressTypeEnum } from "./../../types/globalTypes";
+import { AddressTypeEnum } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: SetCustomerDefaultAddress
@@ -52,14 +52,6 @@ export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user_default
   country: SetCustomerDefaultAddress_accountSetDefaultAddress_user_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user_defaultBillingAddress_country {
@@ -93,14 +85,6 @@ export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user_default
   country: SetCustomerDefaultAddress_accountSetDefaultAddress_user_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user_addresses_country {
@@ -134,14 +118,6 @@ export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user_address
   country: SetCustomerDefaultAddress_accountSetDefaultAddress_user_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface SetCustomerDefaultAddress_accountSetDefaultAddress_user {
diff --git a/src/@sdk/mutations/types/UpdateCheckoutBillingAddress.ts b/src/@sdk/mutations/types/UpdateCheckoutBillingAddress.ts
index 078637906a..a489a63eaf 100644
--- a/src/@sdk/mutations/types/UpdateCheckoutBillingAddress.ts
+++ b/src/@sdk/mutations/types/UpdateCheckoutBillingAddress.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AddressInput } from "./../../types/globalTypes";
+import { AddressInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: UpdateCheckoutBillingAddress
@@ -169,14 +169,6 @@ export interface UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_check
   country: UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_checkout_shippingAddress_country {
@@ -210,14 +202,6 @@ export interface UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_check
   country: UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutBillingAddress_checkoutBillingAddressUpdate_checkout_availableShippingMethods_price {
diff --git a/src/@sdk/mutations/types/UpdateCheckoutLine.ts b/src/@sdk/mutations/types/UpdateCheckoutLine.ts
index 69e83f5530..3df1a86bf2 100644
--- a/src/@sdk/mutations/types/UpdateCheckoutLine.ts
+++ b/src/@sdk/mutations/types/UpdateCheckoutLine.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { CheckoutLineInput } from "./../../types/globalTypes";
+import { CheckoutLineInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: UpdateCheckoutLine
diff --git a/src/@sdk/mutations/types/UpdateCheckoutShippingAddress.ts b/src/@sdk/mutations/types/UpdateCheckoutShippingAddress.ts
index 59daf72680..842d4c6e32 100644
--- a/src/@sdk/mutations/types/UpdateCheckoutShippingAddress.ts
+++ b/src/@sdk/mutations/types/UpdateCheckoutShippingAddress.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AddressInput } from "./../../types/globalTypes";
+import { AddressInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: UpdateCheckoutShippingAddress
@@ -169,14 +169,6 @@ export interface UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_che
   country: UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_checkout_shippingAddress_country {
@@ -210,14 +202,6 @@ export interface UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_che
   country: UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutShippingAddress_checkoutShippingAddressUpdate_checkout_availableShippingMethods_price {
@@ -734,14 +718,6 @@ export interface UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_bill
   country: UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_shippingAddress_country {
@@ -775,14 +751,6 @@ export interface UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_ship
   country: UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateCheckoutShippingAddress_checkoutEmailUpdate_checkout_availableShippingMethods_price {
diff --git a/src/@sdk/mutations/types/UpdateUserAddress.ts b/src/@sdk/mutations/types/UpdateUserAddress.ts
index 8c4b7ae772..e16bedad1f 100644
--- a/src/@sdk/mutations/types/UpdateUserAddress.ts
+++ b/src/@sdk/mutations/types/UpdateUserAddress.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AddressInput } from "./../../types/globalTypes";
+import { AddressInput } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL mutation operation: UpdateUserAddress
@@ -52,14 +52,6 @@ export interface UpdateUserAddress_accountAddressUpdate_user_defaultShippingAddr
   country: UpdateUserAddress_accountAddressUpdate_user_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateUserAddress_accountAddressUpdate_user_defaultBillingAddress_country {
@@ -93,14 +85,6 @@ export interface UpdateUserAddress_accountAddressUpdate_user_defaultBillingAddre
   country: UpdateUserAddress_accountAddressUpdate_user_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateUserAddress_accountAddressUpdate_user_addresses_country {
@@ -134,14 +118,6 @@ export interface UpdateUserAddress_accountAddressUpdate_user_addresses {
   country: UpdateUserAddress_accountAddressUpdate_user_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UpdateUserAddress_accountAddressUpdate_user {
diff --git a/src/@sdk/queries/types/CheckoutDetails.ts b/src/@sdk/queries/types/CheckoutDetails.ts
index 90c31b518f..ffda17c76c 100644
--- a/src/@sdk/queries/types/CheckoutDetails.ts
+++ b/src/@sdk/queries/types/CheckoutDetails.ts
@@ -154,14 +154,6 @@ export interface CheckoutDetails_checkout_billingAddress {
   country: CheckoutDetails_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CheckoutDetails_checkout_shippingAddress_country {
@@ -195,14 +187,6 @@ export interface CheckoutDetails_checkout_shippingAddress {
   country: CheckoutDetails_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface CheckoutDetails_checkout_availableShippingMethods_price {
diff --git a/src/@sdk/queries/types/ProductList.ts b/src/@sdk/queries/types/ProductList.ts
index 5d605a1798..946853f91a 100644
--- a/src/@sdk/queries/types/ProductList.ts
+++ b/src/@sdk/queries/types/ProductList.ts
@@ -2,7 +2,7 @@
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
-import { AttributeInput, ProductOrder } from "./../../types/globalTypes";
+import { AttributeInput, ProductOrder } from "./../../../../types/globalTypes";
 
 // ====================================================
 // GraphQL query operation: ProductList
@@ -108,7 +108,7 @@ export interface ProductList_products_edges_node {
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
   pricing: ProductList_products_edges_node_pricing | null;
-  category: ProductList_products_edges_node_category;
+  category: ProductList_products_edges_node_category | null;
 }
 
 export interface ProductList_products_edges {
diff --git a/src/@sdk/queries/types/UserCheckoutDetails.ts b/src/@sdk/queries/types/UserCheckoutDetails.ts
index abfed62303..361068fea9 100644
--- a/src/@sdk/queries/types/UserCheckoutDetails.ts
+++ b/src/@sdk/queries/types/UserCheckoutDetails.ts
@@ -154,14 +154,6 @@ export interface UserCheckoutDetails_me_checkout_billingAddress {
   country: UserCheckoutDetails_me_checkout_billingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UserCheckoutDetails_me_checkout_shippingAddress_country {
@@ -195,14 +187,6 @@ export interface UserCheckoutDetails_me_checkout_shippingAddress {
   country: UserCheckoutDetails_me_checkout_shippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UserCheckoutDetails_me_checkout_availableShippingMethods_price {
diff --git a/src/@sdk/queries/types/UserDetails.ts b/src/@sdk/queries/types/UserDetails.ts
index b550bf7456..47ec52737c 100644
--- a/src/@sdk/queries/types/UserDetails.ts
+++ b/src/@sdk/queries/types/UserDetails.ts
@@ -37,14 +37,6 @@ export interface UserDetails_me_defaultShippingAddress {
   country: UserDetails_me_defaultShippingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UserDetails_me_defaultBillingAddress_country {
@@ -78,14 +70,6 @@ export interface UserDetails_me_defaultBillingAddress {
   country: UserDetails_me_defaultBillingAddress_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UserDetails_me_addresses_country {
@@ -119,14 +103,6 @@ export interface UserDetails_me_addresses {
   country: UserDetails_me_addresses_country;
   countryArea: string;
   phone: string | null;
-  /**
-   * Address is user's default billing address.
-   */
-  isDefaultBillingAddress: boolean | null;
-  /**
-   * Address is user's default shipping address.
-   */
-  isDefaultShippingAddress: boolean | null;
 }
 
 export interface UserDetails_me {
diff --git a/src/components/OverlayManager/Login/queries.ts b/src/components/OverlayManager/Login/queries.ts
index 66d5350cd5..6c6f2d254b 100644
--- a/src/components/OverlayManager/Login/queries.ts
+++ b/src/components/OverlayManager/Login/queries.ts
@@ -8,7 +8,7 @@ import {
 
 const customerRegisterMutation = gql`
   mutation RegisterCutomer($email: String!, $password: String!) {
-    customerRegister(input: { email: $email, password: $password }) {
+    accountRegister(input: { email: $email, password: $password }) {
       errors {
         field
         message
diff --git a/src/components/OverlayManager/Login/types/RegisterCutomer.ts b/src/components/OverlayManager/Login/types/RegisterCutomer.ts
index 23dbde74fc..379e090fa2 100644
--- a/src/components/OverlayManager/Login/types/RegisterCutomer.ts
+++ b/src/components/OverlayManager/Login/types/RegisterCutomer.ts
@@ -6,7 +6,7 @@
 // GraphQL mutation operation: RegisterCutomer
 // ====================================================
 
-export interface RegisterCutomer_customerRegister_errors {
+export interface RegisterCutomer_accountRegister_errors {
   __typename: "Error";
   /**
    * Name of a field that caused the error. A value of `null` indicates that the
@@ -19,19 +19,19 @@ export interface RegisterCutomer_customerRegister_errors {
   message: string | null;
 }
 
-export interface RegisterCutomer_customerRegister {
-  __typename: "CustomerRegister";
+export interface RegisterCutomer_accountRegister {
+  __typename: "AccountRegister";
   /**
    * List of errors that occurred executing the mutation.
    */
-  errors: RegisterCutomer_customerRegister_errors[] | null;
+  errors: RegisterCutomer_accountRegister_errors[] | null;
 }
 
 export interface RegisterCutomer {
   /**
-   * DEPRECATED: Will be removed in Saleor 2.10, use AccountRegister instead. Register a new user.
+   * Register a new user.
    */
-  customerRegister: RegisterCutomer_customerRegister | null;
+  accountRegister: RegisterCutomer_accountRegister | null;
 }
 
 export interface RegisterCutomerVariables {
diff --git a/src/components/OverlayManager/Search/types/SearchResults.ts b/src/components/OverlayManager/Search/types/SearchResults.ts
index 9bad09d915..9f8c1cd7c4 100644
--- a/src/components/OverlayManager/Search/types/SearchResults.ts
+++ b/src/components/OverlayManager/Search/types/SearchResults.ts
@@ -54,7 +54,7 @@ export interface SearchResults_products_edges_node {
    * The storefront URL for the product.
    */
   url: string;
-  category: SearchResults_products_edges_node_category;
+  category: SearchResults_products_edges_node_category | null;
 }
 
 export interface SearchResults_products_edges {
diff --git a/src/components/PasswordResetForm/queries.tsx b/src/components/PasswordResetForm/queries.tsx
index 8022b5ed52..9ffd08f40d 100644
--- a/src/components/PasswordResetForm/queries.tsx
+++ b/src/components/PasswordResetForm/queries.tsx
@@ -2,9 +2,10 @@ import gql from "graphql-tag";
 import { TypedMutation } from "../../core/mutations";
 import { ResetPassword, ResetPasswordVariables } from "./types/ResetPassword";
 
+// fixme: this will be fixed in issue https://github.com/mirumee/saleor-storefront/issues/500
 const passwordResetMutation = gql`
   mutation ResetPassword($email: String!) {
-    customerPasswordReset(input: { email: $email }) {
+    requestPasswordReset(email: $email, redirectUrl: "") {
       errors {
         field
         message
diff --git a/src/components/PasswordResetForm/types/ResetPassword.ts b/src/components/PasswordResetForm/types/ResetPassword.ts
index 4c3d79bf34..29a8e2511d 100644
--- a/src/components/PasswordResetForm/types/ResetPassword.ts
+++ b/src/components/PasswordResetForm/types/ResetPassword.ts
@@ -6,7 +6,7 @@
 // GraphQL mutation operation: ResetPassword
 // ====================================================
 
-export interface ResetPassword_customerPasswordReset_errors {
+export interface ResetPassword_requestPasswordReset_errors {
   __typename: "Error";
   /**
    * Name of a field that caused the error. A value of `null` indicates that the
@@ -19,19 +19,19 @@ export interface ResetPassword_customerPasswordReset_errors {
   message: string | null;
 }
 
-export interface ResetPassword_customerPasswordReset {
-  __typename: "CustomerPasswordReset";
+export interface ResetPassword_requestPasswordReset {
+  __typename: "RequestPasswordReset";
   /**
    * List of errors that occurred executing the mutation.
    */
-  errors: ResetPassword_customerPasswordReset_errors[] | null;
+  errors: ResetPassword_requestPasswordReset_errors[] | null;
 }
 
 export interface ResetPassword {
   /**
-   * DEPRECATED: Will be removed in Saleor 2.10, use RequestPasswordReset instead. Resets the customer's password.
+   * Sends an email with the account password modification link.
    */
-  customerPasswordReset: ResetPassword_customerPasswordReset | null;
+  requestPasswordReset: ResetPassword_requestPasswordReset | null;
 }
 
 export interface ResetPasswordVariables {
diff --git a/src/components/ProductDescription/index.tsx b/src/components/ProductDescription/index.tsx
index b5e8fd42c9..6418702459 100644
--- a/src/components/ProductDescription/index.tsx
+++ b/src/components/ProductDescription/index.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 
 import {
   ProductDetails_product_variants,
-  ProductDetails_product_variants_pricing
+  ProductDetails_product_variants_pricing,
 } from "@sdk/queries/types/ProductDetails";
 
 import { SelectField, TextField } from "..";
@@ -12,9 +12,11 @@ import { maybe } from "../../core/utils";
 import { CartContext, CartLine } from "../CartProvider/context";
 import { SelectValue } from "../SelectField";
 import AddToCart from "./AddToCart";
+import { ProductDetails_product_attributes } from "@temp/views/Product/types/ProductDetails";
 
 interface ProductDescriptionProps {
   productVariants: ProductDetails_product_variants[];
+  selectedAttributes: ProductDetails_product_attributes[];
   name: string;
   children: React.ReactNode;
   addToCart(varinatId: string, quantity?: number): void;
@@ -33,7 +35,7 @@ interface ProductDescriptionState {
 class ProductDescription extends React.Component<
   ProductDescriptionProps,
   ProductDescriptionState
-> {
+  > {
   constructor(props: ProductDescriptionProps) {
     super(props);
     const pickers =
@@ -179,7 +181,7 @@ class ProductDescription extends React.Component<
   };
 
   render() {
-    const { children, name } = this.props;
+    const { children, name, selectedAttributes } = this.props;
     const {
       pricing,
       primaryPicker,
@@ -240,6 +242,16 @@ class ProductDescription extends React.Component<
               this.setState({ quantity: Math.max(1, Number(e.target.value)) })
             }
           />
+          {selectedAttributes.map(({ attribute, values }) =>
+            <div className="product-description__selected-attributes">
+              <span>
+                {`${attribute.name}: `}
+              </span>
+              <span>
+                {values.map(({ name }) => name).join(', ')}
+              </span>
+            </div>
+          )}
         </div>
         <div className="product-description__about">
           <h4>Description</h4>
diff --git a/src/components/ProductDescription/scss/index.scss b/src/components/ProductDescription/scss/index.scss
index 507a44b9fc..0437a23ac0 100644
--- a/src/components/ProductDescription/scss/index.scss
+++ b/src/components/ProductDescription/scss/index.scss
@@ -84,4 +84,12 @@
       }
     }
   }
+
+  &__selected-attributes {
+    font-size: $small-font-size;
+    
+    > span:first-child {
+      color: $gray-dark;
+    }
+  }
 }
diff --git a/src/components/ProductsFeatured/types/FeaturedProducts.ts b/src/components/ProductsFeatured/types/FeaturedProducts.ts
index b90e93d1fc..d32bcfab73 100644
--- a/src/components/ProductsFeatured/types/FeaturedProducts.ts
+++ b/src/components/ProductsFeatured/types/FeaturedProducts.ts
@@ -270,7 +270,7 @@ export interface FeaturedProducts_shop_homepageCollection_products_edges_node {
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
   pricing: FeaturedProducts_shop_homepageCollection_products_edges_node_pricing | null;
-  category: FeaturedProducts_shop_homepageCollection_products_edges_node_category;
+  category: FeaturedProducts_shop_homepageCollection_products_edges_node_category | null;
 }
 
 export interface FeaturedProducts_shop_homepageCollection_products_edges {
diff --git a/src/sitemap/types/GetCategories.ts b/src/sitemap/types/GetCategories.ts
new file mode 100644
index 0000000000..81d45f6c34
--- /dev/null
+++ b/src/sitemap/types/GetCategories.ts
@@ -0,0 +1,57 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: GetCategories
+// ====================================================
+
+export interface GetCategories_categories_pageInfo {
+  __typename: "PageInfo";
+  /**
+   * When paginating forwards, the cursor to continue.
+   */
+  endCursor: string | null;
+  /**
+   * When paginating forwards, are there more items?
+   */
+  hasNextPage: boolean;
+}
+
+export interface GetCategories_categories_edges_node {
+  __typename: "Category";
+  /**
+   * The ID of the object.
+   */
+  id: string;
+  name: string;
+}
+
+export interface GetCategories_categories_edges {
+  __typename: "CategoryCountableEdge";
+  /**
+   * The item at the end of the edge.
+   */
+  node: GetCategories_categories_edges_node;
+}
+
+export interface GetCategories_categories {
+  __typename: "CategoryCountableConnection";
+  /**
+   * Pagination data for this connection.
+   */
+  pageInfo: GetCategories_categories_pageInfo;
+  edges: GetCategories_categories_edges[];
+}
+
+export interface GetCategories {
+  /**
+   * List of the shop's categories.
+   */
+  categories: GetCategories_categories | null;
+}
+
+export interface GetCategoriesVariables {
+  cursor?: string | null;
+  perPage?: number | null;
+}
diff --git a/src/sitemap/types/GetCollections.ts b/src/sitemap/types/GetCollections.ts
new file mode 100644
index 0000000000..3f55df0b19
--- /dev/null
+++ b/src/sitemap/types/GetCollections.ts
@@ -0,0 +1,57 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: GetCollections
+// ====================================================
+
+export interface GetCollections_collections_pageInfo {
+  __typename: "PageInfo";
+  /**
+   * When paginating forwards, the cursor to continue.
+   */
+  endCursor: string | null;
+  /**
+   * When paginating forwards, are there more items?
+   */
+  hasNextPage: boolean;
+}
+
+export interface GetCollections_collections_edges_node {
+  __typename: "Collection";
+  /**
+   * The ID of the object.
+   */
+  id: string;
+  name: string;
+}
+
+export interface GetCollections_collections_edges {
+  __typename: "CollectionCountableEdge";
+  /**
+   * The item at the end of the edge.
+   */
+  node: GetCollections_collections_edges_node;
+}
+
+export interface GetCollections_collections {
+  __typename: "CollectionCountableConnection";
+  /**
+   * Pagination data for this connection.
+   */
+  pageInfo: GetCollections_collections_pageInfo;
+  edges: GetCollections_collections_edges[];
+}
+
+export interface GetCollections {
+  /**
+   * List of the shop's collections.
+   */
+  collections: GetCollections_collections | null;
+}
+
+export interface GetCollectionsVariables {
+  cursor?: string | null;
+  perPage?: number | null;
+}
diff --git a/src/sitemap/types/GetProducts.ts b/src/sitemap/types/GetProducts.ts
new file mode 100644
index 0000000000..27f2125149
--- /dev/null
+++ b/src/sitemap/types/GetProducts.ts
@@ -0,0 +1,57 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: GetProducts
+// ====================================================
+
+export interface GetProducts_products_pageInfo {
+  __typename: "PageInfo";
+  /**
+   * When paginating forwards, the cursor to continue.
+   */
+  endCursor: string | null;
+  /**
+   * When paginating forwards, are there more items?
+   */
+  hasNextPage: boolean;
+}
+
+export interface GetProducts_products_edges_node {
+  __typename: "Product";
+  /**
+   * The ID of the object.
+   */
+  id: string;
+  name: string;
+}
+
+export interface GetProducts_products_edges {
+  __typename: "ProductCountableEdge";
+  /**
+   * The item at the end of the edge.
+   */
+  node: GetProducts_products_edges_node;
+}
+
+export interface GetProducts_products {
+  __typename: "ProductCountableConnection";
+  /**
+   * Pagination data for this connection.
+   */
+  pageInfo: GetProducts_products_pageInfo;
+  edges: GetProducts_products_edges[];
+}
+
+export interface GetProducts {
+  /**
+   * List of the shop's products.
+   */
+  products: GetProducts_products | null;
+}
+
+export interface GetProductsVariables {
+  cursor?: string | null;
+  perPage?: number | null;
+}
diff --git a/src/views/Category/types/Category.ts b/src/views/Category/types/Category.ts
index 68fa171083..0c740c77ae 100644
--- a/src/views/Category/types/Category.ts
+++ b/src/views/Category/types/Category.ts
@@ -272,7 +272,7 @@ export interface Category_products_edges_node {
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
   pricing: Category_products_edges_node_pricing | null;
-  category: Category_products_edges_node_category;
+  category: Category_products_edges_node_category | null;
 }
 
 export interface Category_products_edges {
diff --git a/src/views/Collection/types/Collection.ts b/src/views/Collection/types/Collection.ts
index d9eca11766..a100216f66 100644
--- a/src/views/Collection/types/Collection.ts
+++ b/src/views/Collection/types/Collection.ts
@@ -293,7 +293,7 @@ export interface Collection_products_edges_node {
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
   pricing: Collection_products_edges_node_pricing | null;
-  category: Collection_products_edges_node_category;
+  category: Collection_products_edges_node_category | null;
 }
 
 export interface Collection_products_edges {
diff --git a/src/views/Product/Page.tsx b/src/views/Product/Page.tsx
index 45fdf2a0bd..e85619f38e 100644
--- a/src/views/Product/Page.tsx
+++ b/src/views/Product/Page.tsx
@@ -81,6 +81,7 @@ class Page extends React.PureComponent<{ product: ProductDetails_product }> {
           <ProductDescription
             name={product.name}
             productVariants={product.variants}
+            selectedAttributes={product.attributes}
             addToCart={cart.add}
           >
             <RichTextContent descriptionJson={product.descriptionJson} />
diff --git a/src/views/Product/queries.ts b/src/views/Product/queries.ts
index 2f4984f92c..d1a25eb27b 100644
--- a/src/views/Product/queries.ts
+++ b/src/views/Product/queries.ts
@@ -61,6 +61,17 @@ export const productPricingFragment = gql`
   }
 `;
 
+export const selectedAttributeFragment = gql`
+  fragment SelectedAttributeFields on SelectedAttribute {
+    attribute {
+      name
+    }
+    values {
+      name
+    }
+  }
+`;
+
 export const productVariantFragment = gql`
   ${priceFragment}
   fragment ProductVariantFields on ProductVariant {
@@ -94,6 +105,7 @@ export const productVariantFragment = gql`
 
 export const productDetailsQuery = gql`
   ${basicProductFragment}
+  ${selectedAttributeFragment}
   ${productVariantFragment}
   ${productPricingFragment}
   query ProductDetails($id: ID!) {
@@ -121,6 +133,9 @@ export const productDetailsQuery = gql`
         id
         url
       }
+      attributes {
+        ...SelectedAttributeFields
+      }
       variants {
         ...ProductVariantFields
       }
diff --git a/src/views/Product/types/ProductDetails.ts b/src/views/Product/types/ProductDetails.ts
index 8d9a1f5b1a..1a8ab82ebc 100644
--- a/src/views/Product/types/ProductDetails.ts
+++ b/src/views/Product/types/ProductDetails.ts
@@ -506,7 +506,7 @@ export interface ProductDetails_product_category_products_edges_node {
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
   pricing: ProductDetails_product_category_products_edges_node_pricing | null;
-  category: ProductDetails_product_category_products_edges_node_category;
+  category: ProductDetails_product_category_products_edges_node_category | null;
 }
 
 export interface ProductDetails_product_category_products_edges {
@@ -547,6 +547,34 @@ export interface ProductDetails_product_images {
   url: string;
 }
 
+export interface ProductDetails_product_attributes_attribute {
+  __typename: "Attribute";
+  /**
+   * Name of an attribute displayed in the interface.
+   */
+  name: string | null;
+}
+
+export interface ProductDetails_product_attributes_values {
+  __typename: "AttributeValue";
+  /**
+   * Name of a value displayed in the interface.
+   */
+  name: string | null;
+}
+
+export interface ProductDetails_product_attributes {
+  __typename: "SelectedAttribute";
+  /**
+   * Name of an attribute displayed in the interface.
+   */
+  attribute: ProductDetails_product_attributes_attribute;
+  /**
+   * Values of an attribute.
+   */
+  values: (ProductDetails_product_attributes_values | null)[];
+}
+
 export interface ProductDetails_product_variants_pricing_priceUndiscounted_gross {
   __typename: "Money";
   /**
@@ -745,11 +773,15 @@ export interface ProductDetails_product {
    */
   pricing: ProductDetails_product_pricing | null;
   descriptionJson: any;
-  category: ProductDetails_product_category;
+  category: ProductDetails_product_category | null;
   /**
    * List of images for the product.
    */
   images: (ProductDetails_product_images | null)[] | null;
+  /**
+   * List of attributes assigned to this product.
+   */
+  attributes: ProductDetails_product_attributes[];
   /**
    * List of variants for the product.
    */
diff --git a/src/views/Product/types/SelectedAttributeFields.ts b/src/views/Product/types/SelectedAttributeFields.ts
new file mode 100644
index 0000000000..5f19d07e2d
--- /dev/null
+++ b/src/views/Product/types/SelectedAttributeFields.ts
@@ -0,0 +1,35 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL fragment: SelectedAttributeFields
+// ====================================================
+
+export interface SelectedAttributeFields_attribute {
+  __typename: "Attribute";
+  /**
+   * Name of an attribute displayed in the interface.
+   */
+  name: string | null;
+}
+
+export interface SelectedAttributeFields_values {
+  __typename: "AttributeValue";
+  /**
+   * Name of a value displayed in the interface.
+   */
+  name: string | null;
+}
+
+export interface SelectedAttributeFields {
+  __typename: "SelectedAttribute";
+  /**
+   * Name of an attribute displayed in the interface.
+   */
+  attribute: SelectedAttributeFields_attribute;
+  /**
+   * Values of an attribute.
+   */
+  values: (SelectedAttributeFields_values | null)[];
+}
diff --git a/src/views/Search/types/SearchProducts.ts b/src/views/Search/types/SearchProducts.ts
index 1cc2627c2e..0f8335a241 100644
--- a/src/views/Search/types/SearchProducts.ts
+++ b/src/views/Search/types/SearchProducts.ts
@@ -272,7 +272,7 @@ export interface SearchProducts_products_edges_node {
    * The main thumbnail for a product.
    */
   thumbnail2x: SearchProducts_products_edges_node_thumbnail2x | null;
-  category: SearchProducts_products_edges_node_category;
+  category: SearchProducts_products_edges_node_category | null;
 }
 
 export interface SearchProducts_products_edges {

From eb1eaf319685e043e705869620ca1a759462f25f Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Tue, 17 Dec 2019 16:25:33 +0100
Subject: [PATCH 2/7] Fix selected product attributes styles

---
 src/components/ProductDescription/scss/index.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ProductDescription/scss/index.scss b/src/components/ProductDescription/scss/index.scss
index 0437a23ac0..e96322c4c9 100644
--- a/src/components/ProductDescription/scss/index.scss
+++ b/src/components/ProductDescription/scss/index.scss
@@ -87,7 +87,8 @@
 
   &__selected-attributes {
     font-size: $small-font-size;
-    
+    margin: 0.2rem 0;
+
     > span:first-child {
       color: $gray-dark;
     }

From 0c7fa7bd434e0acbe47e444ed9dbd4d771bc04e7 Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Tue, 17 Dec 2019 16:50:07 +0100
Subject: [PATCH 3/7] Hide attribute label if it doesn't have values assigned

---
 src/components/ProductDescription/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ProductDescription/index.tsx b/src/components/ProductDescription/index.tsx
index 6418702459..aa66ee9b23 100644
--- a/src/components/ProductDescription/index.tsx
+++ b/src/components/ProductDescription/index.tsx
@@ -243,7 +243,7 @@ class ProductDescription extends React.Component<
             }
           />
           {selectedAttributes.map(({ attribute, values }) =>
-            <div className="product-description__selected-attributes">
+            values.length > 0 && <div className="product-description__selected-attributes">
               <span>
                 {`${attribute.name}: `}
               </span>

From 5042252fdb2fe7d4494a872b5295bd087c7fa13f Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Wed, 18 Dec 2019 12:34:03 +0100
Subject: [PATCH 4/7] Add prettier config

---
 src/components/ProductDescription/index.tsx | 24 ++++++++++-----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/ProductDescription/index.tsx b/src/components/ProductDescription/index.tsx
index aa66ee9b23..883a8af490 100644
--- a/src/components/ProductDescription/index.tsx
+++ b/src/components/ProductDescription/index.tsx
@@ -12,6 +12,7 @@ import { maybe } from "../../core/utils";
 import { CartContext, CartLine } from "../CartProvider/context";
 import { SelectValue } from "../SelectField";
 import AddToCart from "./AddToCart";
+
 import { ProductDetails_product_attributes } from "@temp/views/Product/types/ProductDetails";
 
 interface ProductDescriptionProps {
@@ -35,7 +36,7 @@ interface ProductDescriptionState {
 class ProductDescription extends React.Component<
   ProductDescriptionProps,
   ProductDescriptionState
-  > {
+> {
   constructor(props: ProductDescriptionProps) {
     super(props);
     const pickers =
@@ -175,9 +176,7 @@ class ProductDescription extends React.Component<
     const syncedQuantityWithCart = cartLine
       ? quantity + cartLine.quantity
       : quantity;
-    return (
-      quantity !== 0 && (variant && variantStock >= syncedQuantityWithCart)
-    );
+    return quantity !== 0 && variant && variantStock >= syncedQuantityWithCart;
   };
 
   render() {
@@ -242,15 +241,14 @@ class ProductDescription extends React.Component<
               this.setState({ quantity: Math.max(1, Number(e.target.value)) })
             }
           />
-          {selectedAttributes.map(({ attribute, values }) =>
-            values.length > 0 && <div className="product-description__selected-attributes">
-              <span>
-                {`${attribute.name}: `}
-              </span>
-              <span>
-                {values.map(({ name }) => name).join(', ')}
-              </span>
-            </div>
+          {selectedAttributes.map(
+            ({ attribute, values }) =>
+              values.length > 0 && (
+                <div className="product-description__selected-attributes">
+                  <span>{`${attribute.name}: `}</span>
+                  <span>{values.map(({ name }) => name).join(", ")}</span>
+                </div>
+              )
           )}
         </div>
         <div className="product-description__about">

From e264b5f960791b9bb256ef1c75f7665fe459deaf Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Wed, 18 Dec 2019 12:52:28 +0100
Subject: [PATCH 5/7] Update register and reset password forms

---
 src/components/OverlayManager/Login/RegisterForm.tsx | 6 +++---
 src/components/PasswordResetForm/index.tsx           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/OverlayManager/Login/RegisterForm.tsx b/src/components/OverlayManager/Login/RegisterForm.tsx
index 469259484e..46f864eb8c 100644
--- a/src/components/OverlayManager/Login/RegisterForm.tsx
+++ b/src/components/OverlayManager/Login/RegisterForm.tsx
@@ -14,7 +14,7 @@ const showSuccessNotification = (
   hide: () => void,
   alert: AlertManager
 ) => {
-  const successful = maybe(() => !data.customerRegister.errors.length);
+  const successful = maybe(() => !data.accountRegister.errors.length);
 
   if (successful) {
     hide();
@@ -36,7 +36,7 @@ const RegisterForm: React.FC<{ hide: () => void }> = ({ hide }) => {
       {(registerCustomer, { loading, data }) => {
         return (
           <Form
-            errors={maybe(() => data.customerRegister.errors, [])}
+            errors={maybe(() => data.accountRegister.errors, [])}
             onSubmit={(event, { email, password }) => {
               event.preventDefault();
               registerCustomer({ variables: { email, password } });
@@ -57,7 +57,7 @@ const RegisterForm: React.FC<{ hide: () => void }> = ({ hide }) => {
               required
             />
             <div className="login__content__button">
-              <Button type="submit" {...loading && { disabled: true }}>
+              <Button type="submit" {...(loading && { disabled: true })}>
                 {loading ? "Loading" : "Register"}
               </Button>
             </div>
diff --git a/src/components/PasswordResetForm/index.tsx b/src/components/PasswordResetForm/index.tsx
index 0f86be56d7..45b030e1ef 100644
--- a/src/components/PasswordResetForm/index.tsx
+++ b/src/components/PasswordResetForm/index.tsx
@@ -16,7 +16,7 @@ const PasswordResetForm: React.FC = () => (
       {(passwordReset, { loading, data }) => {
         return (
           <Form
-            errors={maybe(() => data.customerPasswordReset.errors, [])}
+            errors={maybe(() => data.requestPasswordReset.errors, [])}
             onSubmit={(event, { email }) => {
               event.preventDefault();
               passwordReset({ variables: { email } });
@@ -30,7 +30,7 @@ const PasswordResetForm: React.FC = () => (
               required
             />
             <div className="password-reset-form__button">
-              <Button type="submit" {...loading && { disabled: true }}>
+              <Button type="submit" {...(loading && { disabled: true })}>
                 {loading ? "Loading" : "Reset password"}
               </Button>
             </div>

From 6beea9f1b70c662f3da78041e0fe14438f9ad179 Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Wed, 18 Dec 2019 13:13:35 +0100
Subject: [PATCH 6/7] Keep .prettierrc config in repository

---
 .gitignore  | 1 +
 .prettierrc | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 .prettierrc

diff --git a/.gitignore b/.gitignore
index 3d304e2247..86e25d3c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !.plop
 !.jest
 !.linguirc
+!.prettierrc
 dist
 node_modules
 src/locales/_build
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000000..757fd64caa
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "trailingComma": "es5"
+}

From 55ce4d5ab88cc46e0b848ebf8cfa7c623ddf0fee Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Thu, 19 Dec 2019 10:37:34 +0100
Subject: [PATCH 7/7] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5106807245..d1d60efaec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable, unreleased changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Add missing product attributes on product page - #536 by @orzechdev
+
 ## 0.7.0
 
 - Fix login and registration overlay not showing - #322 by @mateuszkula