@graphcommerce/magento-store 10.0.1-canary.0 → 10.0.1-canary.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 10.0.1-canary.1
+
+### Patch Changes
+
+- [#2571](https://github.com/graphcommerce-org/graphcommerce/pull/2571) [`d9c7545`](https://github.com/graphcommerce-org/graphcommerce/commit/d9c754570cd04da61ee3282bde465cc33395c8d9) - When switching stores unset the currency when there is no selection available for a given store. ([@paales](https://github.com/paales))
+
+- [#2571](https://github.com/graphcommerce-org/graphcommerce/pull/2571) [`6d5ff59`](https://github.com/graphcommerce-org/graphcommerce/commit/6d5ff59090b5fe37bf053a2540fcf13150331a27) - Do not send an unacceptable store currency due to a configuration error and make sure the correct currency is stored. Show a StoreSwitcherFab on mobile. ([@paales](https://github.com/paales))
+
 ## 10.0.1-canary.0
 
 ## 10.0.0

package/components/StoreSwitcher/StoreSwitcherStoreSelector.tsx

@@ -52,10 +52,6 @@ export function StoreSwitcherStoreSelector(props: StoreSwitcherSelectorProps) {
           ),
           value: store.store_code,
           disabled: store.disabled,
-          slotProps: {
-            title: { sx: { typography: 'subtitle1' } },
-            details: { sx: { typography: 'body1', color: 'text.secondary' } },
-          },
         }))}
         {...actionCardProps}
       />

package/components/StoreSwitcher/useStoreSwitcher.tsx

@@ -190,8 +190,12 @@ export function StoreSwitcherFormProvider(props: StoreSwitcherFormProviderProps)
     const formStore = context.stores.find((s) => s.store_code === formValues.storeCode)
     const isDefaultDisplayCurrency =
       formValues.currency === formStore?.default_display_currency_code
+    const isCurrencyAvailable = formStore?.currency?.available_currency_codes?.includes(
+      formValues.currency,
+    )
 
-    if (isDefaultDisplayCurrency) cookie('Magento-Content-Currency', null)
+    // Clear cookie if using default currency or if the currency is not available for the target store
+    if (isDefaultDisplayCurrency || !isCurrencyAvailable) cookie('Magento-Content-Currency', null)
     else cookie('Magento-Content-Currency', formValues.currency)
 
     await onSubmit?.(formValues, event)

package/components/StoreSwitcherButton/StoreSwitcherFab.tsx

@@ -1,20 +1,24 @@
-import { iconLanguage, IconSvg, sxx } from '@graphcommerce/next-ui'
-import { Fab, type FabProps } from '@mui/material'
-import { StoreSwitcherText } from './StoreSwitcherText'
+import type { FabProps } from '@graphcommerce/next-ui'
+import { Fab, iconLanguage } from '@graphcommerce/next-ui'
 import { useShowStoreSwitcherButton } from './useStoreSwitcherButton'
 
-export function StoreSwitcherFab(props: FabProps) {
+export type StoreSwitcherFabProps = Omit<FabProps, 'icon' | 'onClick'>
+
+export function StoreSwitcherFab(props: StoreSwitcherFabProps) {
+  const { sx, ...fabProps } = props
   const { show, onClick } = useShowStoreSwitcherButton()
+
   if (!show) return null
 
   return (
     <Fab
-      variant='extended'
+      color='inherit'
+      size='medium'
+      sx={sx}
+      icon={iconLanguage}
       onClick={onClick}
-      sx={sxx({ width: 'max-content', columnGap: '3px', typography: 'body1' })}
-      {...props}
-    >
-      <IconSvg src={iconLanguage} /> <StoreSwitcherText />
-    </Fab>
+      slotProps={{ icon: { size: 'default' } }}
+      {...fabProps}
+    />
   )
 }

package/components/StoreSwitcherButton/useStoreSwitcherButton.ts

@@ -8,17 +8,23 @@ export function useShowStoreSwitcherButton(options?: Record<string, never>) {
   const country = config.data?.storeConfig?.locale?.split('_')?.[1]?.toLowerCase() ?? ''
   const router = useRouter()
   const multiLocale = (router.locales?.length ?? 0) > 1
-  const multiCurrency =
-    new Set(config.data?.storeConfig?.currency?.available_currency_codes ?? []).size > 1
+  const availableCurrencies = config.data?.storeConfig?.currency?.available_currency_codes ?? []
+  const multiCurrency = new Set(availableCurrencies).size > 1
 
-  const [currency] = useCookie('Magento-Content-Currency')
+  const [cookieCurrency] = useCookie('Magento-Content-Currency')
+
+  // Validate cookie currency against available currencies
+  const currency =
+    cookieCurrency && availableCurrencies.includes(cookieCurrency)
+      ? cookieCurrency
+      : config.data?.storeConfig?.default_display_currency_code
 
   return {
     show: multiLocale || multiCurrency,
     multiCurrency,
     country,
     multiLocale,
-    currency: currency ?? config.data?.storeConfig?.default_display_currency_code,
+    currency,
     storeName: config.data?.storeConfig?.store_name,
     onClick: () => router.push('/switch-stores'),
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-store",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "10.0.1-canary.0",
+  "version": "10.0.1-canary.1",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -19,15 +19,15 @@
     "./mesh/resolvers.ts": "./mesh/resolvers.ts"
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^10.0.1-canary.0",
-    "@graphcommerce/eslint-config-pwa": "^10.0.1-canary.0",
-    "@graphcommerce/framer-utils": "^10.0.1-canary.0",
-    "@graphcommerce/graphql": "^10.0.1-canary.0",
-    "@graphcommerce/graphql-mesh": "^10.0.1-canary.0",
-    "@graphcommerce/image": "^10.0.1-canary.0",
-    "@graphcommerce/next-ui": "^10.0.1-canary.0",
-    "@graphcommerce/prettier-config-pwa": "^10.0.1-canary.0",
-    "@graphcommerce/typescript-config-pwa": "^10.0.1-canary.0",
+    "@graphcommerce/ecommerce-ui": "^10.0.1-canary.1",
+    "@graphcommerce/eslint-config-pwa": "^10.0.1-canary.1",
+    "@graphcommerce/framer-utils": "^10.0.1-canary.1",
+    "@graphcommerce/graphql": "^10.0.1-canary.1",
+    "@graphcommerce/graphql-mesh": "^10.0.1-canary.1",
+    "@graphcommerce/image": "^10.0.1-canary.1",
+    "@graphcommerce/next-ui": "^10.0.1-canary.1",
+    "@graphcommerce/prettier-config-pwa": "^10.0.1-canary.1",
+    "@graphcommerce/typescript-config-pwa": "^10.0.1-canary.1",
     "@lingui/core": "^5",
     "@lingui/macro": "^5",
     "@lingui/react": "^5",

package/plugins/magentoStoreGraphqlConfig.ts

@@ -1,6 +1,7 @@
 import { SetContextLink, type graphqlConfig as graphqlConfigType } from '@graphcommerce/graphql'
 import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
 import { cookie } from '@graphcommerce/next-ui'
+import { StoreConfigDocument } from '../graphql/queries/StoreConfig.gql'
 
 export const config: PluginConfig = {
   type: 'function',
@@ -14,7 +15,7 @@ export const graphqlConfig: FunctionPlugin<typeof graphqlConfigType> = (prev, co
     ...results,
     links: [
       ...results.links,
-      new SetContextLink((prevContext) => {
+      new SetContextLink((prevContext, operation) => {
         const headers: Record<string, string> = { ...prevContext.headers }
 
         if (!headers.store) {
@@ -22,8 +23,16 @@ export const graphqlConfig: FunctionPlugin<typeof graphqlConfigType> = (prev, co
         }
 
         const contentCurrency = cookie('Magento-Content-Currency')
-        if (contentCurrency && typeof headers['content-currency'] === 'undefined')
-          headers['content-currency'] = contentCurrency
+        if (contentCurrency && typeof headers['content-currency'] === 'undefined') {
+          // Validate currency against available currencies from StoreConfig cache
+          const storeConfig = operation.client.cache.readQuery({ query: StoreConfigDocument })
+          const availableCurrencies = storeConfig?.storeConfig?.currency?.available_currency_codes
+
+          if (!availableCurrencies || availableCurrencies.includes(contentCurrency)) {
+            headers['content-currency'] = contentCurrency
+          }
+          // If currency is not valid, don't set the header - backend will use default
+        }
 
         if (conf.preview) {
           // To disable caching from the backend, we provide a bogus cache ID.