Merge pull request #3 from aiworksla/SHR-1933

Shr 1933
aiworksla · Jun 5, 2023 · cc419b5 · cc419b5
2 parents 8ddde2c + eab4691
commit cc419b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx b/src/components/MultiAutocompleteSelectField/MultiAutocompleteSelectField.tsx
@@ -137,7 +137,7 @@ const MultiAutocompleteSelectFieldComponent: React.FC<MultiAutocompleteSelectFie
                 if (fetchOnFocus) {
                   fetchChoices(inputValue);
                 }
-                input.current.select();
+                input?.current?.select();
               };
 
               const handleToggleMenu = () => {

diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
@@ -185,7 +185,7 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
   );
 
   const [selectedTaxType, setSelectedTaxType] = useStateFromProps(
-    product?.taxType.description,
+    product?.taxType?.description,
   );
 
   const categories = getChoices(categoryChoiceList);

diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts
@@ -201,10 +201,10 @@ export function getProductUpdatePageFormData(
 
   return {
     category: maybe(() => product.category.id, ""),
-    changeTaxCode: !!product?.taxType.taxCode,
-    chargeTaxes: maybe(() => product.chargeTaxes, false),
+    changeTaxCode: !!product?.taxType?.taxCode,
+    chargeTaxes: maybe(() => product?.chargeTaxes, false),
     collections: maybe(
-      () => product.collections.map(collection => collection.id),
+      () => product?.collections?.map(collection => collection.id),
       [],
     ),
     isAvailable: !!product?.isAvailable,
@@ -224,7 +224,7 @@ export function getProductUpdatePageFormData(
       "",
     ),
     slug: product?.slug || "",
-    taxCode: product?.taxType.taxCode,
+    taxCode: product?.taxType?.taxCode,
     trackInventory: !!variant?.trackInventory,
     weight: product?.weight?.value.toString() || "",
     isPreorder: !!variant?.preorder || false,