--- a/modules/cookie/src/Form/CurrencyResolverCookieSelectForm.php +++ b/modules/cookie/src/Form/CurrencyResolverCookieSelectForm.php @@ -48,7 +48,8 @@ // Get cookies. $cookie_name = $this->currencyResolverManager->getCookieName(); $cookie = $request->cookies->get($cookie_name); - $selected_currency = $this->currentStore->getStore()->getDefaultCurrency()->getCurrencyCode(); + $store = $this->currentStore->getStore(); + $selected_currency = $store?->getDefaultCurrency()?->getCurrencyCode(); $options = []; foreach ($active_currencies as $currency) { @@ -55,8 +56,8 @@ $options[$currency->getCurrencyCode()] = $currency->label(); } - if ($cookie && isset($options[$cookie_name])) { - $selected_currency = $options[$cookie_name]; + if ($cookie && isset($options[$cookie])) { + $selected_currency = $cookie; } $form['currency'] = [