@faststore/core 4.4.0-dev.3 → 4.4.0-dev.5

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.4.0-dev.2 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.4.0-dev.4 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.4.0-dev.2 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.4.0-dev.4 gen-types /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run generate-types .
 
 [STARTED] Parse Configuration
@@ -19,7 +19,7 @@
 [COMPLETED] Generate to /home/runner/work/faststore/faststore/packages/core/@generated/
 [COMPLETED] Generate outputs
 
-> @faststore/core@4.4.0-dev.2 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.4.0-dev.4 cache-graphql /home/runner/work/faststore/faststore/packages/core
 > node ../cli/bin/run cache-graphql --config=./discovery.config.default.js --queries=./@generated/persisted-documents.json
 
 [Info] - Config file location: /home/runner/work/faststore/faststore/packages/core/discovery.config.default.js

package/.turbo/turbo-test.log

@@ -1,18 +1,18 @@
 
-> @faststore/core@4.4.0-dev.2 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.4.0-dev.4 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
  RUN  v4.0.7 /home/runner/work/faststore/faststore/packages/core
 
- ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (6 tests) 32ms
- ✓  browser  test/sdk/session/installLocaleCorrector.browser.test.ts (7 tests) 74ms
- ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 14ms
+ ✓  browser  test/sdk/session/getInitialSession.browser.test.ts (6 tests) 26ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.browser.test.ts (5 tests) 34ms
+ ✓  browser  test/utils/isLocalHost.browser.test.ts (3 tests) 10ms
 stderr | test/sdk/localization/store-url.browser.test.ts
 Error in optimistic validation: TypeError: Cannot read properties of undefined (reading 'read')
     at validateCart (/home/runner/work/faststore/faststore/packages/core/src/sdk/cart/index.ts:119:27)
     at onValidate (/home/runner/work/faststore/faststore/packages/core/src/sdk/useStore.ts:18:20)
-    at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:353:23)
+    at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:354:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
 stderr | test/pages/password-protection.browser.test.tsx > PasswordProtectionLogin > posts the password and redirects to the requested return path
@@ -100,7 +100,6 @@ act(() => {
 This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act
     at PasswordProtectionLogin (/home/runner/work/faststore/faststore/packages/core/src/pages/password-protection/index.tsx:19:69)
 
- ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 38ms
 stderr | test/pages/password-protection.browser.test.tsx > PasswordProtectionLogin > uses the fallback invalid-password message when API omits an error
 Warning: An update to PasswordProtectionLogin inside a test was not wrapped in act(...).
 
@@ -245,14 +244,17 @@ act(() => {
 This ensures that you're testing the behavior the user would see in the browser. Learn more at https://reactjs.org/link/wrap-tests-with-act
     at PasswordProtectionLogin (/home/runner/work/faststore/faststore/packages/core/src/pages/password-protection/index.tsx:19:69)
 
- ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1502ms
-     ✓ renders the password protection form  667ms
- ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 22ms
- ✓  node  test/utils/match-url.test.ts (10 tests) 34ms
- ✓  node  test/server/password-protection-service.test.ts (22 tests) 145ms
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 34ms
- ✓  node  test/pages/api/unlock.test.ts (15 tests) 790ms
-     ✓ returns 405 for non-POST requests  528ms
+ ✓  browser  test/pages/password-protection.browser.test.tsx (6 tests) 1906ms
+     ✓ renders the password protection form  799ms
+     ✓ posts the password and redirects to the requested return path  317ms
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 12ms
+ ✓  browser  test/sdk/session/reconcileSessionLocale.disabled.browser.test.ts (1 test) 11ms
+ ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 74ms
+ ✓  node  test/utils/match-url.test.ts (10 tests) 39ms
+ ✓  node  test/server/password-protection-service.test.ts (22 tests) 140ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 36ms
+ ✓  node  test/pages/api/unlock.test.ts (15 tests) 675ms
+     ✓ returns 405 for non-POST requests  477ms
 stderr | test/components/search/SearchInputComponent.test.tsx
 Warning: forwardRef render functions accept exactly two parameters: props and ref. Did you forget to use the ref parameter?
 
@@ -316,17 +318,18 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
     at Suspense
     at Wrapper (/home/runner/work/faststore/faststore/packages/core/test/components/search/SearchInputComponent.test.tsx:106:20)
 
- ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 198ms
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 40ms
+ ✓  node  test/components/search/SearchInputComponent.test.tsx (6 tests) 248ms
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 71ms
  ✓  node  test/sdk/localization/useBindingSelector.test.tsx (12 tests) 37ms
- ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 218ms
- ✓  node  test/utils/clearCookies.test.ts (20 tests) 99ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 17ms
+ ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 203ms
+ ✓  node  test/utils/clearCookies.test.ts (20 tests) 59ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 8ms
+ ✓  node  test/utils/localization/localizeRedirectDestination.test.ts (11 tests) 11ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 55ms
 stderr | test/sdk/account/useSetPassword.test.ts > useSetPassword > maps wrongcredentials error responses to the existing message
 Set password request failed: Bad Request
 
- ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 48ms
- ✓  node  test/sdk/orderEntry/useOrderEntryOperation.test.ts (8 tests) 73ms
+ ✓  node  test/sdk/account/useSetPassword.test.ts (6 tests) 44ms
 stderr | test/pages/api/graphql.test.ts > /api/graphql error status propagation > propagates the upstream 400 from a wrapped BadRequestError instead of 500
 Graphql execution returned with error:  [
   {
@@ -373,29 +376,31 @@ Warning: React does not recognize the `providerProps` prop on a DOM element. If
   { message: 'bad', status: 400, type: 'BadRequestError' }
 ]
 
- ✓  node  test/pages/api/graphql.test.ts (10 tests) 22ms
- ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 59ms
- ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 37ms
- ✓  node  test/proxy.test.ts (4 tests) 50ms
- ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 52ms
- ✓  node  test/server/webops-api.test.ts (9 tests) 18ms
- ✓  node  test/server/index.test.ts (7 tests) 667ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 7ms
- ✓  node  test/sdk/localization/store-url.test.ts (1 test) 4ms
- ✓  node  test/server/content/service.test.ts (5 tests) 4ms
- ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 7ms
- ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 32ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 6ms
- ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 4ms
- ✓  node  test/utils/unlockResponse.test.ts (11 tests) 5ms
- ✓  node  test/components/search/SearchInput.test.ts (6 tests) 7ms
- ✓  node  test/server/cms/index.test.ts (2 tests) 6ms
- ✓  node  test/utils/isLocalHost.test.ts (7 tests) 7ms
+ ✓  node  test/pages/api/graphql.test.ts (10 tests) 27ms
+ ✓  node  test/sdk/orderEntry/useOrderEntryUpload.test.ts (8 tests) 51ms
+ ✓  node  test/proxy.localization.test.ts (5 tests) 55ms
+ ✓  node  test/sdk/orderEntry/useOrderEntry.test.ts (8 tests) 42ms
+ ✓  node  test/proxy.test.ts (4 tests) 29ms
+ ✓  node  test/sdk/orderEntry/useOrderFormItems.test.ts (7 tests) 33ms
+ ✓  node  test/server/index.test.ts (7 tests) 921ms
+       ✓ should handle options and execute  464ms
+ ✓  node  test/server/webops-api.test.ts (9 tests) 16ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 6ms
+ ✓  node  test/sdk/localization/store-url.test.ts (1 test) 9ms
+ ✓  node  test/server/content/service.test.ts (5 tests) 6ms
+ ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 8ms
+ ✓  node  test/sdk/auth/useAuth.test.ts (5 tests) 31ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 9ms
+ ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 5ms
+ ✓  node  test/components/search/SearchInput.test.ts (6 tests) 8ms
+ ✓  node  test/utils/unlockResponse.test.ts (11 tests) 6ms
+ ✓  node  test/server/cms/index.test.ts (2 tests) 7ms
+ ✓  node  test/utils/isLocalHost.test.ts (7 tests) 5ms
  ✓  node  test/utils/userOrderStatus.test.ts (3 tests) 3ms
- ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 25ms
+ ✓  node  test/components/auth/ProfileChallenge.test.tsx (3 tests) 26ms
 
- Test Files  38 passed (38)
-      Tests  363 passed (363)
-   Start at  13:16:14
-   Duration  23.17s (transform 6.25s, setup 0ms, collect 17.58s, tests 4.44s, environment 28.99s, prepare 945ms)
+ Test Files  41 passed (41)
+      Tests  378 passed (378)
+   Start at  14:13:54
+   Duration  25.97s (transform 6.84s, setup 0ms, collect 19.27s, tests 5.00s, environment 35.56s, prepare 1.21s)
 

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.4.0-dev.5](https://github.com/vtex/faststore/compare/v4.4.0-dev.4...v4.4.0-dev.5) (2026-07-01)
+
+### Features
+
+- make cms-sync content-source aware (CMS + CP) ([#3406](https://github.com/vtex/faststore/issues/3406)) ([8e4e4ca](https://github.com/vtex/faststore/commit/8e4e4cab61b6e6fec05b8ae014e4ed2298028b92)), closes [#5c1a1](https://github.com/vtex/faststore/issues/5c1a1) [#ff6b6](https://github.com/vtex/faststore/issues/ff6b6) [#3a0d0](https://github.com/vtex/faststore/issues/3a0d0) [#ff6b6](https://github.com/vtex/faststore/issues/ff6b6) [#10391](https://github.com/vtex/faststore/issues/10391) [#3ddc84](https://github.com/vtex/faststore/issues/3ddc84) [#1](https://github.com/vtex/faststore/issues/1) [#14](https://github.com/vtex/faststore/issues/14) [#15](https://github.com/vtex/faststore/issues/15) [#18](https://github.com/vtex/faststore/issues/18)
+
+# [4.4.0-dev.4](https://github.com/vtex/faststore/compare/v4.4.0-dev.3...v4.4.0-dev.4) (2026-06-30)
+
+### Features
+
+- add i18n support for /pvt/account navigation ([#3400](https://github.com/vtex/faststore/issues/3400)) ([695dd0e](https://github.com/vtex/faststore/commit/695dd0ee8e06e32ad76c23925c5e095740430f0f))
+
 # [4.4.0-dev.3](https://github.com/vtex/faststore/compare/v4.4.0-dev.2...v4.4.0-dev.3) (2026-06-29)
 
 ### Bug Fixes

package/README.md

@@ -124,6 +124,21 @@ vtex content split-content-types -i cms/faststore/content-types.json -s cms/fast
 ```
 
 IMPORTANT: The Faststore Core Team is the only one that needs to add the -l base.jsonc to the output. Merchants will automatically use the base from the Schema Registry.
+
+**Store developers:** set `contentSource: { type: 'CP' }` in `discovery.config.js`, place custom schemas under `cms/faststore/components/` and/or `cms/faststore/pages/`, then run:
+
+```sh
+yarn cms-sync
+```
+
+`cms-sync` detects the content source automatically — in CP mode it generates the schema from your customizations and uploads it to the Schema Registry. Use `--dry-run` to generate locally without uploading.
+
+Before running anything in CP mode, `cms-sync` checks that the `vtex` toolbelt is installed and that you are logged into your store's account (`api.storeId` in `discovery.config.js`); otherwise it stops with a hint to run `vtex login <account>` / `vtex switch <account>`. The toolbelt is interactive: `generate-schema` asks you to confirm when one of your definitions overrides a base one, and `upload-schema` asks for the version to publish — answer the prompts in your terminal.
+
+If `experimental.enableFaststoreMyAccount` is enabled, `cms-sync` also merges the core My Account schemas (shipped in `@faststore/core`) into the generated schema. These schemas are intentionally excluded from the published base schema (so they are not in the Schema Registry). The command performs a file-level merge of the core My Account JSONC with your own `cms/faststore/{components,pages}` into a temporary staging directory under your store's `.faststore/` (your files override core on name collision), runs a single `generate-schema`/`upload-schema` over it, announces the merge, and removes the staging directory afterwards.
+
+**FastStore Core team** (publishing the base schema with the core layer):
+
 2. Generate the schema:
 ```sh
    vtex content generate-schema cms/faststore/components cms/faststore/pages -l cms/faststore/base.jsonc -o cms/faststore/schema.json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.4.0-dev.3",
+  "version": "4.4.0-dev.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -71,11 +71,11 @@
     "style-loader": "^3.3.1",
     "swr": "^2.2.5",
     "use-sync-external-store": "^1.6.0",
-    "@faststore/api": "4.4.0-dev.3",
-    "@faststore/diagnostics": "4.4.0-dev.3",
-    "@faststore/sdk": "4.4.0-dev.3",
-    "@faststore/lighthouse": "4.4.0-dev.3",
-    "@faststore/ui": "4.4.0-dev.3"
+    "@faststore/api": "4.4.0-dev.5",
+    "@faststore/diagnostics": "4.4.0-dev.5",
+    "@faststore/lighthouse": "4.4.0-dev.5",
+    "@faststore/ui": "4.4.0-dev.5",
+    "@faststore/sdk": "4.4.0-dev.5"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

package/src/components/account/Drawer/OrganizationDrawer/OrganizationDrawerBody.tsx

@@ -1,4 +1,4 @@
-import { Link } from '@faststore/ui'
+import Link from 'src/components/ui/Link'
 
 import menuRoutes from 'src/customizations/src/myAccount/navigation'
 import { useAccountNavigationLabels } from 'src/sdk/account/accountPageContext'

package/src/components/account/Menu/Menu.tsx

@@ -1,6 +1,7 @@
-import { Button, Link } from '@faststore/ui'
+import { Button } from '@faststore/ui'
 import { useRouter } from 'next/router'
 
+import Link from 'src/components/ui/Link'
 import styles from '../section.module.scss'
 
 import { useAccountNavigationLabels } from 'src/sdk/account/accountPageContext'

package/src/components/account/orders/ListOrders/FilterSlider/FilterSlider.tsx

@@ -8,6 +8,7 @@ import {
 } from '@faststore/ui'
 
 import { type MutableRefObject, useRef, useState } from 'react'
+import { useLink } from 'src/sdk/ui/useLink'
 import type {
   MyAccountFilter_FacetsFragment,
   useMyAccountFilter,
@@ -61,6 +62,7 @@ function FilterSlider({
   toLabel,
   invalidDateRangeLabel,
 }: FilterSliderProps & ReturnType<typeof useMyAccountFilter>) {
+  const { resolveLink } = useLink()
   const dateRangeInputRef = useRef<{
     clear: () => void
     getDataRangeFacet: () => {
@@ -121,7 +123,9 @@ function FilterSlider({
       }
     })
 
-    window.location.href = `/pvt/account/orders?${params.toString()}`
+    const ordersHref =
+      resolveLink('/pvt/account/orders') ?? '/pvt/account/orders'
+    window.location.href = `${ordersHref}?${params.toString()}`
   }
 
   return (

package/src/components/account/orders/ListOrders/ListOrders.tsx

@@ -20,6 +20,7 @@ import {
   type MyAccountFilter_FacetsFragment,
   type SelectedFacet,
 } from 'src/sdk/search/useMyAccountFilter'
+import { useLink } from 'src/sdk/ui/useLink'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
 import { FastStoreOrderStatus } from 'src/utils/userOrderStatus'
 import AccountHeader from '../../components/Header'
@@ -32,6 +33,8 @@ import ListOrdersTable, { Pagination } from './ListOrdersTable/ListOrdersTable'
 import SelectedFiltersTags from './SelectedTags/SelectedTags'
 import styles from './styles.module.scss'
 
+const ORDERS_PATH = '/pvt/account/orders'
+
 export type ListOrdersProps = {
   listOrders: ServerListOrdersQueryQuery['listUserOrders']
   total: number
@@ -145,6 +148,8 @@ export default function ListOrders({
 }: ListOrdersProps) {
   const labels = resolveListOrdersLabels(labelsProp)
   const router = useRouter()
+  const { resolveLink } = useLink()
+  const ordersHref = resolveLink(ORDERS_PATH) ?? ORDERS_PATH
   const { isDesktop } = useScreenResize()
   const searchInputRef = useRef(null) as MutableRefObject<SearchInputFieldRef>
 
@@ -179,7 +184,7 @@ export default function ListOrders({
           params.set('text', value)
         }
 
-        window.location.href = `/pvt/account/orders?${params.toString()}`
+        window.location.href = `${ordersHref}?${params.toString()}`
       }
     },
     300,
@@ -263,7 +268,7 @@ export default function ListOrders({
           pendingMyApproval: filters.pendingMyApproval,
         }}
         onClearAll={() => {
-          window.location.href = '/pvt/account/orders'
+          window.location.href = ordersHref
         }}
         onRemoveFilter={(key, value) => {
           const { page, clientEmail, ...updatedFilters } = { ...filters }
@@ -289,7 +294,7 @@ export default function ListOrders({
           const params = new URLSearchParams(
             filteredQuery as Record<string, string>
           )
-          window.location.href = `/pvt/account/orders?${params.toString()}`
+          window.location.href = `${ordersHref}?${params.toString()}`
         }}
       />
 

package/src/components/account/orders/ListOrders/ListOrdersTable/ListOrdersTable.tsx

@@ -1,10 +1,11 @@
 import { Icon, IconButton } from '@faststore/ui'
 
+import { useRouter } from 'next/router'
 import { useState } from 'react'
 
 import StatusBadge from 'src/components/account/components/StatusBadge'
 import { useFormatPrice } from 'src/components/account/utils/useFormatPrice'
-import { useSession } from 'src/sdk/session'
+import { useLink } from 'src/sdk/ui/useLink'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
 import { ExpandButton } from './ExpandButton/ExpandButton'
 
@@ -53,6 +54,8 @@ export function Pagination({
   labels?: ListOrdersSectionLabels
 }) {
   const labels = resolveListOrdersLabels(labelsProp)
+  const { resolveLink } = useLink()
+  const ordersHref = resolveLink('/pvt/account/orders') ?? '/pvt/account/orders'
   const totalPages = Math.ceil(total / perPage)
   const firstIndexLabel = page === 1 ? 1 : (page - 1) * perPage + 1
   const lastIndexLabel =
@@ -67,7 +70,7 @@ export function Pagination({
     } else {
       params.set('page', String(newPage))
     }
-    window.location.href = `/pvt/account/orders${params.toString() ? `?${params}` : ''}`
+    window.location.href = `${ordersHref}${params.toString() ? `?${params}` : ''}`
   }
 
   return (
@@ -105,7 +108,7 @@ export default function ListOrdersTable({
   const labels = resolveListOrdersLabels(labelsProp)
   const statusLabels = pickOrderStatusCmsLabels(labels)
   const { isDesktop } = useScreenResize()
-  const { locale } = useSession()
+  const { locale } = useRouter()
   const formatPrice = useFormatPrice()
 
   const [expandedRows, setExpandedRows] = useState<

package/src/components/account/orders/ListOrders/SelectedTags/SelectedTags.tsx

@@ -1,5 +1,5 @@
 import { Button } from '@faststore/ui'
-import { useSession } from 'src/sdk/session'
+import { useRouter } from 'next/router'
 import {
   type ListOrdersSectionLabels,
   getStatusDisplayLabels,
@@ -48,7 +48,7 @@ function Tags({
 }: Pick<SelectedTagsProps, 'filters' | 'onRemoveFilter' | 'labels'>) {
   const labels = resolveListOrdersLabels(labelsProp)
   const statusDisplayLabels = getStatusDisplayLabels(labels)
-  const { locale } = useSession()
+  const { locale } = useRouter()
   const { dateInitial, dateFinal, status, pendingMyApproval } = filters
 
   const formattedDateInitial = dateInitial

package/src/components/account/orders/OrderDetails/OrderDetailsHeader.tsx

@@ -1,6 +1,7 @@
 import { Icon as UIIcon, IconButton as UIIconButton } from '@faststore/ui'
 import type { PropsWithChildren } from 'react'
 import type { ServerOrderDetailsQueryQuery } from '@generated/graphql'
+import { useLink } from 'src/sdk/ui/useLink'
 import type { OrderStatusCmsLabels } from 'src/utils/userOrderStatus'
 import StatusBadge from '../../components/StatusBadge'
 import BuyingPolicyAlert from './BuyingPolicyAlert'
@@ -12,6 +13,8 @@ import {
 } from './orderDetailsLabels'
 import styles from './section.module.scss'
 
+const ORDERS_PATH = '/pvt/account/orders'
+
 export type OrderDetailsHeaderProps = {
   order: ServerOrderDetailsQueryQuery['userOrder']
   labels?: OrderDetailsHeaderLabels
@@ -24,12 +27,14 @@ export function OrderDetailsHeader({
   statusLabels,
 }: OrderDetailsHeaderProps) {
   const labels = resolveOrderDetailsHeaderLabels(labelsProp)
+  const { resolveLink } = useLink()
+  const ordersHref = resolveLink(ORDERS_PATH) ?? ORDERS_PATH
 
   return (
     <>
       <header data-fs-order-details-header>
         <div data-fs-order-details-header-title>
-          <a href="/pvt/account/orders">
+          <a href={ordersHref}>
             <UIIconButton
               data-fs-order-details-header-back-button
               size="small"

package/src/components/account/utils/useFormatPrice.ts

@@ -1,9 +1,10 @@
-import { useSession } from 'src/sdk/session'
+import { useRouter } from 'next/router'
 import { useCallback } from 'react'
 
 // Format price values according to the specified currency (converts cents to standard units)
 export const useFormatPrice = () => {
-  const { locale } = useSession()
+  // get locale from router instead of using useSession to avoid SSR hydration issues
+  const { locale } = useRouter()
 
   return useCallback(
     (value: number, currencyCode: string) => {

package/src/components/ui/Link/Link.tsx

@@ -45,6 +45,12 @@ const Link = forwardRef<HTMLAnchorElement, LinkProps>(function Link<
         inverse={inverse}
         passHref
         href={finalHref}
+        // resolveLink already produces the fully localized href (custom path or
+        // explicit locale prefix), so NextLink must not add its own locale
+        // prefix on top of it. Otherwise SSR over-localizes (e.g.
+        // /it-IT/europe/it/...) while the client keeps /europe/it/..., causing
+        // a hydration mismatch.
+        locale={false}
         legacyBehavior={false}
         prefetch={prefetch}
         {...otherProps}

package/src/experimental/index.ts

@@ -79,3 +79,6 @@ export type {
   Locale,
 } from '../sdk/localization/types'
 export type { UseBindingSelectorReturn } from '../sdk/localization/useBindingSelector'
+export { useLink as useLink_unstable } from '../sdk/ui/useLink'
+export { default as Link_unstable } from '../components/ui/Link'
+export { localizeRedirectDestination as localizeRedirectDestination_unstable } from '../utils/localization/localizeRedirectDestination'

package/src/experimental/myAccountServerSideProps.ts

@@ -15,6 +15,7 @@ import { execute } from 'src/server'
 
 import { validateUser } from 'src/sdk/account/validateUser'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import storeConfig from '../../discovery.config'
@@ -48,7 +49,7 @@ const getServerSidePropsBase: GetServerSideProps<
   if (!validationResult.isValid && !validationResult.needsRefresh) {
     return {
       redirect: {
-        destination: '/login',
+        destination: localizeRedirectDestination('/login', context),
         permanent: false,
       },
     }
@@ -59,7 +60,10 @@ const getServerSidePropsBase: GetServerSideProps<
     const currentPath = context.req.url || '/pvt/account'
     return {
       redirect: {
-        destination: `/pvt/account/403?from=${encodeURIComponent(currentPath)}`,
+        destination: localizeRedirectDestination(
+          `/pvt/account/403?from=${encodeURIComponent(currentPath)}`,
+          context
+        ),
         permanent: false,
       },
     }

package/src/pages/pvt/account/404.tsx

@@ -24,6 +24,7 @@ import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
 import { type PageContentType, getPage } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
@@ -128,7 +129,10 @@ const getServerSidePropsBase: GetServerSideProps<
     if (statusCode === 401 || statusCode === 403) {
       return {
         redirect: {
-          destination: `/pvt/account/403?from=${encodeURIComponent('/pvt/account/404')}`,
+          destination: localizeRedirectDestination(
+            `/pvt/account/403?from=${encodeURIComponent('/pvt/account/404')}`,
+            context
+          ),
           permanent: false,
         },
       }

package/src/pages/pvt/account/[...unknown].tsx

@@ -2,6 +2,7 @@ import type { Locator } from '@vtex/client-cms'
 import type { GetStaticPaths, GetStaticProps } from 'next'
 
 import type { MyAccountProps } from 'src/experimental/myAccountServerSideProps'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 export default function Page() {
@@ -12,7 +13,7 @@ export const getStaticProps: GetStaticProps<
   MyAccountProps,
   Record<string, string>,
   Locator
-> = async () => {
+> = async ({ locale, defaultLocale }) => {
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: {},
   })
@@ -23,7 +24,10 @@ export const getStaticProps: GetStaticProps<
 
   return {
     redirect: {
-      destination: '/pvt/account/404',
+      destination: localizeRedirectDestination('/pvt/account/404', {
+        locale,
+        defaultLocale,
+      }),
       permanent: false,
     },
   }

package/src/pages/pvt/account/index.tsx

@@ -1,14 +1,15 @@
 import type { GetServerSideProps, NextPage } from 'next'
-import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 const MyAccountRedirectPage: NextPage = () => {
   return null
 }
 
-const getServerSidePropsBase: GetServerSideProps = async ({ query, req }) => {
+const getServerSidePropsBase: GetServerSideProps = async (context) => {
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
-    query,
+    query: context.query,
   })
 
   if (!isFaststoreMyAccountEnabled) {
@@ -17,7 +18,7 @@ const getServerSidePropsBase: GetServerSideProps = async ({ query, req }) => {
 
   return {
     redirect: {
-      destination: '/pvt/account/profile',
+      destination: localizeRedirectDestination('/pvt/account/profile', context),
       permanent: false,
     },
   }

package/src/pages/pvt/account/profile.tsx

@@ -27,6 +27,7 @@ import { injectGlobalSections } from 'src/server/cms/global'
 import { extractAccountNavigationData } from 'src/server/cms/myAccountDefaultSections'
 import { fetchMyAccountPageContent } from 'src/server/cms/fetchMyAccountPageContent'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 
 import storeConfig from 'discovery.config'
@@ -157,7 +158,7 @@ const getServerSidePropsBase: GetServerSideProps<
 
     return {
       redirect: {
-        destination,
+        destination: localizeRedirectDestination(destination, context),
         permanent: false,
       },
     }

package/src/pages/pvt/account/user-details.tsx

@@ -27,8 +27,9 @@ import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
-import { extractAccountNavigationData } from 'src/server/cms/myAccountDefaultSections'
 import { fetchMyAccountPageContent } from 'src/server/cms/fetchMyAccountPageContent'
+import { extractAccountNavigationData } from 'src/server/cms/myAccountDefaultSections'
+import { localizeRedirectDestination } from 'src/utils/localization/localizeRedirectDestination'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 
@@ -119,7 +120,7 @@ const getServerSidePropsBase: GetServerSideProps<
   if (!isRepresentative) {
     return {
       redirect: {
-        destination: '/pvt/account',
+        destination: localizeRedirectDestination('/pvt/account', context),
         permanent: false,
       },
     }
@@ -175,7 +176,7 @@ const getServerSidePropsBase: GetServerSideProps<
 
     return {
       redirect: {
-        destination,
+        destination: localizeRedirectDestination(destination, context),
         permanent: false,
       },
     }