fix merge conflits space

Author: rebeca

react/components/SKUSelector/components/SKUSelector.tsx

@@ -141,68 +141,68 @@ const parseOptionNameToDisplayOption =
     hideImpossibleCombinations: boolean
     disableUnavailableSelectOptions: boolean
   }) =>
-  (variationValue: {
-    name: string
-    originalName: string
-  }): DisplayOption | null => {
-    const isSelected = selectedVariations[variationName] === variationValue.name
-    const image = imagesMap?.[variationName]?.[variationValue.name]
-
-    const newSelectedVariation = clone(selectedVariations)
-
-    newSelectedVariation[variationName] = isSelected
-      ? null
-      : variationValue.name
-
-    const possibleItems = findListItemsWithSelectedVariations(
-      skuItems,
-      newSelectedVariation
-    )
+    (variationValue: {
+      name: string
+      originalName: string
+    }): DisplayOption | null => {
+      const isSelected = selectedVariations[variationName] === variationValue.name
+      const image = imagesMap?.[variationName]?.[variationValue.name]
+
+      const newSelectedVariation = clone(selectedVariations)
+
+      newSelectedVariation[variationName] = isSelected
+        ? null
+        : variationValue.name
+
+      const possibleItems = findListItemsWithSelectedVariations(
+        skuItems,
+        newSelectedVariation
+      )
 
-    if (possibleItems.length > 0) {
-      // This is a valid combination option
-      const [item] = possibleItems
-      const callbackFn = onSelectItemMemo({
-        name: variationName,
-        value: variationValue.name,
-        skuId: item.itemId,
-        isMainAndImpossible: false,
-        possibleItems,
-      })
-
-      return {
-        label: variationValue.name,
-        originalName: variationValue.originalName,
-        onSelectItem: callbackFn,
-        image,
-        available: showItemAsAvailable({
+      if (possibleItems.length > 0) {
+        // This is a valid combination option
+        const [item] = possibleItems
+        const callbackFn = onSelectItemMemo({
+          name: variationName,
+          value: variationValue.name,
+          skuId: item.itemId,
+          isMainAndImpossible: false,
           possibleItems,
-          selectedVariations,
-          variationCount,
-          isSelected,
-        }),
-        impossible: false,
-        disabled: disableUnavailableSelectOptions,
+        })
+
+        return {
+          label: variationValue.name,
+          originalName: variationValue.originalName,
+          onSelectItem: callbackFn,
+          image,
+          available: showItemAsAvailable({
+            possibleItems,
+            selectedVariations,
+            variationCount,
+            isSelected,
+          }),
+          impossible: false,
+          disabled: disableUnavailableSelectOptions,
+        }
       }
-    }
 
-    if (!hideImpossibleCombinations) {
-      // This is a impossible combination and will only appear if the prop allows.
-      return {
-        label: variationValue.name,
-        originalName: variationValue.originalName,
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-        onSelectItem: () => {},
-        image,
-        available: true,
-        impossible: true,
-        disabled: disableUnavailableSelectOptions,
+      if (!hideImpossibleCombinations) {
+        // This is a impossible combination and will only appear if the prop allows.
+        return {
+          label: variationValue.name,
+          originalName: variationValue.originalName,
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          onSelectItem: () => {},
+          image,
+          available: true,
+          impossible: true,
+          disabled: disableUnavailableSelectOptions,
+        }
       }
-    }
 
-    // This is a impossible combination and will be hidden.
-    return null
-  }
+      // This is a impossible combination and will be hidden.
+      return null
+    }
 
 const variationNameToDisplayVariation =
   ({
@@ -224,33 +224,33 @@ const variationNameToDisplayVariation =
     variationCount: number
     hideImpossibleCombinations: boolean
     disableUnavailableSelectOptions: boolean
-    sortVariationsByLabel:boolean
+    sortVariationsByLabel: boolean
   }) =>
-  (variationName: string): DisplayVariation => {
-    const name = variationName
-    const { values, originalName } = variations[variationName]
-    const options = values
-      .map(
-        parseOptionNameToDisplayOption({
-          selectedVariations,
-          variationName,
-          skuItems,
-          onSelectItemMemo,
-          imagesMap,
-          variationCount,
-          hideImpossibleCombinations,
-          disableUnavailableSelectOptions,
-        })
-      )
-      .filter(Boolean) as DisplayOption[]
+    (variationName: string): DisplayVariation => {
+      const name = variationName
+      const { values, originalName } = variations[variationName]
+      const options = values
+        .map(
+          parseOptionNameToDisplayOption({
+            selectedVariations,
+            variationName,
+            skuItems,
+            onSelectItemMemo,
+            imagesMap,
+            variationCount,
+            hideImpossibleCombinations,
+            disableUnavailableSelectOptions,
+          })
+        )
+        .filter(Boolean) as DisplayOption[]
 
-      if(sortVariationsByLabel) {
-        options.sort((a,b)=> {
+      if (sortVariationsByLabel) {
+        options.sort((a,b) => {
           return a.label < b.label ? -1 : a.label > b.label ? 1 : 0;
         })
-     }
-    return { name, originalName, options }
-  }
+      }
+      return { name, originalName, options }
+    }
 
 // Parameters are explained on PropTypes
 const getAvailableVariations = ({
@@ -320,12 +320,12 @@ function SKUSelector({
   const variationsSpacing = getValidMarginBottom(marginBottomProp)
   const onSelectItemMemo = useCallback(
     ({
-        name,
-        value,
-        skuId,
-        isMainAndImpossible,
-        possibleItems,
-      }: CallbackItem) =>
+      name,
+      value,
+      skuId,
+      isMainAndImpossible,
+      possibleItems,
+    }: CallbackItem) =>
       () =>
         onSelectItem({
           name,