From 4164200d702df5abb48970d7bea976a0f6d9e02e Mon Sep 17 00:00:00 2001
From: Misha Medzhytov <mdg12v@gmail.com>
Date: Sun, 2 Sep 2018 20:16:50 +0300
Subject: [PATCH] #17890: show correct text swatch values per store view

---
 app/code/Magento/Swatches/Helper/Data.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index c17dc0b10a986..6f751068d543a 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -499,10 +499,10 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
                 && $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']
             ) {
                 $swatches[$optionId] = $optionsArray[$currentStoreId];
-            } else {
-                if (isset($optionsArray[self::DEFAULT_STORE_ID])) {
-                    $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
-                }
+            } elseif (isset($optionsArray[$currentStoreId])) {
+                $swatches[$optionId] = $optionsArray[$currentStoreId];
+            } elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {
+                $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
             }
         }