From cdfac6de6b457d21f49248b83b030a123fafcfa4 Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Tue, 16 Jun 2020 14:57:22 +0200
Subject: [PATCH] Update product update page

---
 .../ProductUpdatePage/ProductUpdatePage.tsx   | 26 ++++++++++++-------
 src/products/utils/data.ts                    |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
index fb8b8d7ca..cff3c653c 100644
--- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
+++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
@@ -159,7 +159,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
 
   const categories = getChoices(categoryChoiceList);
   const collections = getChoices(collectionChoiceList);
-  const currency = maybe(() => product.basePrice.currency);
+  const currency = maybe(() => product.variants[0].price.currency);
   const hasVariants = maybe(() => product.productType.hasVariants, false);
 
   const handleSubmit = (data: ProductUpdatePageFormData) => {
@@ -246,19 +246,25 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
                     />
                   )}
                   <CardSpacer />
-                  <ProductPricing
-                    currency={currency}
-                    data={data}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={change}
-                  />
-                  <CardSpacer />
+                  {!!product?.productType && !hasVariants && (
+                    <>
+                      <ProductPricing
+                        currency={currency}
+                        data={data}
+                        disabled={disabled}
+                        errors={errors}
+                        onChange={change}
+                      />
+                      <CardSpacer />
+                    </>
+                  )}
                   {hasVariants ? (
                     <ProductVariants
                       disabled={disabled}
                       variants={variants}
-                      fallbackPrice={product ? product.basePrice : undefined}
+                      fallbackPrice={
+                        product ? product.variants[0].price : undefined
+                      }
                       onRowClick={onVariantShow}
                       onVariantAdd={onVariantAdd}
                       onVariantsAdd={onVariantsAdd}
diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts
index bef934eca..54a73afbc 100644
--- a/src/products/utils/data.ts
+++ b/src/products/utils/data.ts
@@ -188,7 +188,7 @@ export function getProductUpdatePageFormData(
   variants: ProductDetails_product_variants[]
 ): ProductUpdatePageFormData {
   return {
-    basePrice: maybe(() => product.basePrice.amount, 0),
+    basePrice: maybe(() => product.variants[0].price.amount, 0),
     category: maybe(() => product.category.id, ""),
     chargeTaxes: maybe(() => product.chargeTaxes, false),
     collections: maybe(