ACP2E-1012: No space between a custom currency symbol and a price

Author: pradeep1819

app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php

@@ -239,8 +239,7 @@ public function getCurrencySymbol($code)
     {
         $customSymbols = $this->_unserializeStoreConfig(self::XML_PATH_CUSTOM_CURRENCY_SYMBOL);
         if (array_key_exists($code, $customSymbols)) {
-            // remove non-breaking space from custom currency symbol and allow custom NBSP in currency symbol
-            return preg_replace('/( |&nbsp|\xc2\xa0)*/iu', '', $customSymbols[$code]);
+            return $customSymbols[$code];
         }
 
         return false;

app/code/Magento/Directory/Model/Currency.php

@@ -432,11 +432,16 @@ private function formatCurrency(string $price, array $options): string
             $this->getCode() ?? $this->numberFormatter->getTextAttribute(\NumberFormatter::CURRENCY_CODE)
         );
 
-        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)
-            && !array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)) {
-            // remove only one non-breaking space from custom currency symbol to allow custom NBSP in currency symbol
-            $formattedCurrency = preg_replace('/ /u', '', $formattedCurrency, 1);
+        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)) {
+            // remove non-breaking space from custom currency code and allow custom NBSP in currency code
+            $formattedCurrency = preg_replace('/( |&nbsp|\xc2\xa0)*/iu', '', $formattedCurrency);
+
+            if (!array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)) {
+                // remove any space from intl supported custom currency symbol in formatted currency
+                $formattedCurrency = str_replace(' ', '', $formattedCurrency);
+            }
         }
+
         if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
             && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
             $formattedCurrency = str_replace(' ', '', $formattedCurrency);