@faststore/core 4.0.1-dev.1 → 4.1.0-dev.0

package/.turbo/turbo-generate.log

@@ -1,9 +1,9 @@
 
-> @faststore/core@4.0.1-dev.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.2 generate /home/runner/work/faststore/faststore/packages/core
 > pnpm run gen-types && pnpm run cache-graphql 
 
 
-> @faststore/core@4.0.1-dev.0 gen-types /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.2 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.0.1-dev.0 cache-graphql /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.2 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,13 +1,13 @@
 
-> @faststore/core@4.0.1-dev.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@4.0.1-dev.2 test /home/runner/work/faststore/faststore/packages/core
 > vitest run
 
 
  RUN  v4.0.7 /home/runner/work/faststore/faststore/packages/core
 
- ✓  node  test/utils/match-url.test.ts (10 tests) 37ms
+ ✓  node  test/utils/match-url.test.ts (10 tests) 31ms
  ✓  node  test/utils/localization/bindingPaths.test.ts (71 tests) 82ms
- ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 29ms
+ ✓  node  test/sdk/localization/bindingSelector.test.ts (18 tests) 27ms
 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)
@@ -23,25 +23,26 @@
     at a (/home/runner/work/faststore/faststore/packages/sdk/dist/es/index.mjs:342:23)
     at processTicksAndRejections (node:internal/process/task_queues:103:5)
 
- ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 45ms
- ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 12ms
- ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 145ms
- ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 19ms
- ✓  node  test/sdk/localization/useBindingSelector.test.tsx (12 tests) 23ms
- ✓  node  test/utils/clearCookies.test.ts (20 tests) 72ms
- ✓  node  test/server/cms/global.test.ts (3 tests) 24ms
- ✓  node  test/server/content/service.test.ts (5 tests) 7ms
- ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 34ms
- ✓  node  test/sdk/localization/store-url.test.ts (1 test) 16ms
- ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 14ms
- ✓  node  test/pages/api/preview.test.ts (2 tests) 18ms
- ✓  node  test/server/cms/index.test.ts (2 tests) 12ms
- ✓  node  test/server/index.test.ts (7 tests) 1205ms
-       ✓ should return a valid merged GraphQL schema  556ms
-       ✓ should handle options and execute  326ms
+ ✓  browser  test/sdk/localization/store-url.browser.test.ts (3 tests) 20ms
+ ✓  node  test/utils/cookieCacheBusting.test.ts (10 tests) 35ms
+ ✓  node  test/sdk/localization/useBindingSelector.test.tsx (12 tests) 26ms
+ ✓  node  test/sdk/search/useSearchHistory.test.ts (13 tests) 120ms
+ ✓  node  test/utils/multipleTemplates.test.ts (8 tests) 13ms
+ ✓  node  test/utils/clearCookies.test.ts (20 tests) 110ms
+ ✓  node  test/server/cms/global.test.ts (3 tests) 14ms
+ ✓  node  test/server/content/service.test.ts (5 tests) 13ms
+ ✓  node  test/utils/getRequestHostname.test.ts (12 tests) 18ms
+ ✓  node  test/sdk/localization/store-url.test.ts (1 test) 18ms
+ ✓  node  test/utils/validateSessionRefreshToken.test.ts (6 tests) 12ms
+ ✓  node  test/pages/api/preview.test.ts (2 tests) 29ms
+ ✓  node  test/server/cms/index.test.ts (2 tests) 17ms
+ ✓  node  test/server/index.test.ts (7 tests) 1380ms
+       ✓ should return a valid merged GraphQL schema  351ms
+       ✓ should exist with its plugins  521ms
+       ✓ should handle options and execute  469ms
 
  Test Files  17 passed (17)
       Tests  203 passed (203)
-   Start at  21:31:36
-   Duration  13.22s (transform 5.15s, setup 0ms, collect 15.16s, tests 1.79s, environment 7.75s, prepare 789ms)
+   Start at  17:05:10
+   Duration  13.05s (transform 5.17s, setup 0ms, collect 15.92s, tests 1.97s, environment 7.50s, prepare 664ms)
 

package/@generated/gql.ts

@@ -36,7 +36,7 @@ type Documents = {
     "\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String, $pendingMyApproval: Boolean) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail, pendingMyApproval: $pendingMyApproval) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          type\n          value\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n    accountProfile {\n      name\n    }\n  }\n": typeof types.ServerListOrdersQueryDocument,
     "\n  query ServerProfileQuery {\n    accountProfile {\n      name\n      email\n      id\n    }\n  }\n": typeof types.ServerProfileQueryDocument,
     "\n  query ServerSecurity {\n    accountProfile {\n      name\n    }\n    userDetails {\n      email\n    }\n  }\n": typeof types.ServerSecurityDocument,
-    "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      name\n      email\n      role\n      orgUnit\n    }\n  }\n": typeof types.ServerUserDetailsQueryDocument,
+    "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      username\n      name\n      email\n      phone\n      role\n      orgUnit\n    }\n  }\n": typeof types.ServerUserDetailsQueryDocument,
     "\n  mutation CancelOrderMutation($data: IUserOrderCancel!) {\n    cancelOrder(data: $data) {\n      data\n    }\n  }\n": typeof types.CancelOrderMutationDocument,
     "\n  mutation ProcessOrderAuthorizationMutation($data: IProcessOrderAuthorization!) {\n    processOrderAuthorization(data: $data) {\n      isPendingForOtherAuthorizer\n      ruleForAuthorization {\n        orderAuthorizationId\n        dimensionId\n        rule {\n          id\n          name\n          status\n          doId\n          authorizedEmails\n          priority\n          trigger {\n            condition {\n              conditionType\n              description\n              lessThan\n              greatherThan\n              expression\n            }\n            effect {\n              description\n              effectType\n              funcPath\n            }\n          }\n          timeout\n          notification\n          scoreInterval {\n            accept\n            deny\n          }\n          authorizationData {\n            requireAllApprovals\n            authorizers {\n              id\n              email\n              type\n              authorizationDate\n            }\n          }\n          isUserAuthorized\n          isUserNextAuthorizer\n        }\n      }\n    }\n  }\n": typeof types.ProcessOrderAuthorizationMutationDocument,
     "\n  query ValidateUser {\n    validateUser {\n      isValid\n    }\n  }\n": typeof types.ValidateUserDocument,
@@ -79,7 +79,7 @@ const documents: Documents = {
     "\n  query ServerListOrdersQuery ($page: Int,$perPage: Int, $status: [String], $dateInitial: String, $dateFinal: String, $text: String, $clientEmail: String, $pendingMyApproval: Boolean) {\n    listUserOrders (page: $page, perPage: $perPage, status: $status, dateInitial: $dateInitial, dateFinal: $dateFinal, text: $text, clientEmail: $clientEmail, pendingMyApproval: $pendingMyApproval) {\n      list {\n        orderId\n        creationDate\n        clientName\n        items {\n          seller\n          quantity\n          description\n          ean\n          refId\n          id\n          productId\n          sellingPrice\n          price\n        }\n        totalValue\n        status\n        statusDescription\n        ShippingEstimatedDate\n        currencyCode\n        customFields {\n          type\n          value\n        }\n      }\n      paging {\n        total\n        pages\n        currentPage\n        perPage\n      }\n    }\n    accountProfile {\n      name\n    }\n  }\n": types.ServerListOrdersQueryDocument,
     "\n  query ServerProfileQuery {\n    accountProfile {\n      name\n      email\n      id\n    }\n  }\n": types.ServerProfileQueryDocument,
     "\n  query ServerSecurity {\n    accountProfile {\n      name\n    }\n    userDetails {\n      email\n    }\n  }\n": types.ServerSecurityDocument,
-    "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      name\n      email\n      role\n      orgUnit\n    }\n  }\n": types.ServerUserDetailsQueryDocument,
+    "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      username\n      name\n      email\n      phone\n      role\n      orgUnit\n    }\n  }\n": types.ServerUserDetailsQueryDocument,
     "\n  mutation CancelOrderMutation($data: IUserOrderCancel!) {\n    cancelOrder(data: $data) {\n      data\n    }\n  }\n": types.CancelOrderMutationDocument,
     "\n  mutation ProcessOrderAuthorizationMutation($data: IProcessOrderAuthorization!) {\n    processOrderAuthorization(data: $data) {\n      isPendingForOtherAuthorizer\n      ruleForAuthorization {\n        orderAuthorizationId\n        dimensionId\n        rule {\n          id\n          name\n          status\n          doId\n          authorizedEmails\n          priority\n          trigger {\n            condition {\n              conditionType\n              description\n              lessThan\n              greatherThan\n              expression\n            }\n            effect {\n              description\n              effectType\n              funcPath\n            }\n          }\n          timeout\n          notification\n          scoreInterval {\n            accept\n            deny\n          }\n          authorizationData {\n            requireAllApprovals\n            authorizers {\n              id\n              email\n              type\n              authorizationDate\n            }\n          }\n          isUserAuthorized\n          isUserNextAuthorizer\n        }\n      }\n    }\n  }\n": types.ProcessOrderAuthorizationMutationDocument,
     "\n  query ValidateUser {\n    validateUser {\n      isValid\n    }\n  }\n": types.ValidateUserDocument,
@@ -188,7 +188,7 @@ export function gql(source: "\n  query ServerSecurity {\n    accountProfile {\n
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function gql(source: "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      name\n      email\n      role\n      orgUnit\n    }\n  }\n"): typeof import('./graphql').ServerUserDetailsQueryDocument;
+export function gql(source: "\n  query ServerUserDetailsQuery {\n    accountProfile {\n      name\n    }\n    userDetails {\n      username\n      name\n      email\n      phone\n      role\n      orgUnit\n    }\n  }\n"): typeof import('./graphql').ServerUserDetailsQueryDocument;
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */

package/@generated/graphql.ts

@@ -1658,8 +1658,12 @@ export type StoreUserDetails = {
   name: Maybe<Scalars['String']['output']>;
   /** User's organizational unit. */
   orgUnit: Maybe<Scalars['String']['output']>;
+  /** User's phone number. */
+  phone: Maybe<Scalars['String']['output']>;
   /** User's role. */
   role: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  /** User's username (login). May differ from email when Alternative Login is enabled. */
+  username: Maybe<Scalars['String']['output']>;
 };
 
 export type UserOrder = {
@@ -2560,7 +2564,7 @@ export type ServerSecurityQuery = { accountProfile: { name: string | null }, use
 export type ServerUserDetailsQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type ServerUserDetailsQueryQuery = { accountProfile: { name: string | null }, userDetails: { name: string | null, email: string | null, role: Array<string | null> | null, orgUnit: string | null } };
+export type ServerUserDetailsQueryQuery = { accountProfile: { name: string | null }, userDetails: { username: string | null, name: string | null, email: string | null, phone: string | null, role: Array<string | null> | null, orgUnit: string | null } };
 
 export type CancelOrderMutationMutationVariables = Exact<{
   data: IUserOrderCancel;
@@ -3247,7 +3251,7 @@ export const ServerOrderDetailsQueryDocument = {"__meta__":{"operationName":"Ser
 export const ServerListOrdersQueryDocument = {"__meta__":{"operationName":"ServerListOrdersQuery","operationHash":"70d06de1da9c11f10ebde31b66fd74eccd456af5"}} as unknown as TypedDocumentString<ServerListOrdersQueryQuery, ServerListOrdersQueryQueryVariables>;
 export const ServerProfileQueryDocument = {"__meta__":{"operationName":"ServerProfileQuery","operationHash":"672fe0f00b7b710b63fc6573c0a6b2ec54812b8f"}} as unknown as TypedDocumentString<ServerProfileQueryQuery, ServerProfileQueryQueryVariables>;
 export const ServerSecurityDocument = {"__meta__":{"operationName":"ServerSecurity","operationHash":"0890ba3456c40a426893b80b698df7a84cfdd6a1"}} as unknown as TypedDocumentString<ServerSecurityQuery, ServerSecurityQueryVariables>;
-export const ServerUserDetailsQueryDocument = {"__meta__":{"operationName":"ServerUserDetailsQuery","operationHash":"e5eb7e46c685d0c7a2ec62c865bfb0a66f81d557"}} as unknown as TypedDocumentString<ServerUserDetailsQueryQuery, ServerUserDetailsQueryQueryVariables>;
+export const ServerUserDetailsQueryDocument = {"__meta__":{"operationName":"ServerUserDetailsQuery","operationHash":"630ec1f47f2710ce3d7895e9131482641f30c837"}} as unknown as TypedDocumentString<ServerUserDetailsQueryQuery, ServerUserDetailsQueryQueryVariables>;
 export const CancelOrderMutationDocument = {"__meta__":{"operationName":"CancelOrderMutation","operationHash":"e2b06da6840614d3c72768e56579b9d3b8e80802"}} as unknown as TypedDocumentString<CancelOrderMutationMutation, CancelOrderMutationMutationVariables>;
 export const ProcessOrderAuthorizationMutationDocument = {"__meta__":{"operationName":"ProcessOrderAuthorizationMutation","operationHash":"8c25d37c8d6e7c20ab21bb8a4f4e6a2fe320ea8d"}} as unknown as TypedDocumentString<ProcessOrderAuthorizationMutationMutation, ProcessOrderAuthorizationMutationMutationVariables>;
 export const ValidateUserDocument = {"__meta__":{"operationName":"ValidateUser","operationHash":"32f99c73c3de958b64d6bece1afe800469f54548"}} as unknown as TypedDocumentString<ValidateUserQuery, ValidateUserQueryVariables>;

package/@generated/persisted-documents.json

@@ -6,7 +6,7 @@
   "70d06de1da9c11f10ebde31b66fd74eccd456af5": "query ServerListOrdersQuery($clientEmail: String, $dateFinal: String, $dateInitial: String, $page: Int, $pendingMyApproval: Boolean, $perPage: Int, $status: [String], $text: String) { accountProfile { name } listUserOrders( page: $page perPage: $perPage status: $status dateInitial: $dateInitial dateFinal: $dateFinal text: $text clientEmail: $clientEmail pendingMyApproval: $pendingMyApproval ) { list { ShippingEstimatedDate clientName creationDate currencyCode customFields { type value } items { description ean id price productId quantity refId seller sellingPrice } orderId status statusDescription totalValue } paging { currentPage pages perPage total } } }",
   "672fe0f00b7b710b63fc6573c0a6b2ec54812b8f": "query ServerProfileQuery { accountProfile { email id name } }",
   "0890ba3456c40a426893b80b698df7a84cfdd6a1": "query ServerSecurity { accountProfile { name } userDetails { email } }",
-  "e5eb7e46c685d0c7a2ec62c865bfb0a66f81d557": "query ServerUserDetailsQuery { accountProfile { name } userDetails { email name orgUnit role } }",
+  "630ec1f47f2710ce3d7895e9131482641f30c837": "query ServerUserDetailsQuery { accountProfile { name } userDetails { email name orgUnit phone role username } }",
   "e2b06da6840614d3c72768e56579b9d3b8e80802": "mutation CancelOrderMutation($data: IUserOrderCancel!) { cancelOrder(data: $data) { data } }",
   "8c25d37c8d6e7c20ab21bb8a4f4e6a2fe320ea8d": "mutation ProcessOrderAuthorizationMutation($data: IProcessOrderAuthorization!) { processOrderAuthorization(data: $data) { isPendingForOtherAuthorizer ruleForAuthorization { dimensionId orderAuthorizationId rule { authorizationData { authorizers { authorizationDate email id type } requireAllApprovals } authorizedEmails doId id isUserAuthorized isUserNextAuthorizer name notification priority scoreInterval { accept deny } status timeout trigger { condition { conditionType description expression greatherThan lessThan } effect { description effectType funcPath } } } } } }",
   "32f99c73c3de958b64d6bece1afe800469f54548": "query ValidateUser { validateUser { isValid } }",

package/@generated/schema.graphql

@@ -1697,10 +1697,16 @@ type StoreSuggestions {
 
 """User details information."""
 type StoreUserDetails {
+  """
+  User's username (login). May differ from email when Alternative Login is enabled.
+  """
+  username: String
   """User's name."""
   name: String
   """User's email."""
   email: String
+  """User's phone number."""
+  phone: String
   """User's role."""
   role: [String]
   """User's organizational unit."""

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.1.0-dev.0](https://github.com/vtex/faststore/compare/v4.0.1-dev.2...v4.1.0-dev.0) (2026-05-11)
+
+### Features
+
+- user details adjusts - SFS-2950 ([#3306](https://github.com/vtex/faststore/issues/3306)) ([70b018d](https://github.com/vtex/faststore/commit/70b018d713b4ec0da698bfc377332b356d9fa9cd))
+
+## [4.0.1-dev.2](https://github.com/vtex/faststore/compare/v4.0.1-dev.1...v4.0.1-dev.2) (2026-05-11)
+
+### Bug Fixes
+
+- localization selector stale and reset selection for unsaved changes ([#3301](https://github.com/vtex/faststore/issues/3301)) ([023e52e](https://github.com/vtex/faststore/commit/023e52ee3c8798cfc9f12ed98e99e8efacb1f1d5))
+
 ## [4.0.1-dev.1](https://github.com/vtex/faststore/compare/v4.0.1-dev.0...v4.0.1-dev.1) (2026-05-07)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.0.1-dev.1",
+  "version": "4.1.0-dev.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -39,11 +39,11 @@
     "@envelop/graphql-jit": "catalog:",
     "@envelop/parser-cache": "catalog:",
     "@envelop/validation-cache": "catalog:",
-    "@faststore/api": "4.0.1-dev.1",
-    "@faststore/diagnostics": "4.0.1-dev.1",
-    "@faststore/lighthouse": "4.0.1-dev.1",
-    "@faststore/sdk": "4.0.1-dev.1",
-    "@faststore/ui": "4.0.1-dev.1",
+    "@faststore/api": "4.1.0-dev.0",
+    "@faststore/diagnostics": "4.1.0-dev.0",
+    "@faststore/lighthouse": "4.1.0-dev.0",
+    "@faststore/sdk": "4.1.0-dev.0",
+    "@faststore/ui": "4.1.0-dev.0",
     "@graphql-codegen/cli": "catalog:",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "catalog:",
@@ -113,5 +113,5 @@
     "react": "catalog:",
     "react-dom": "catalog:"
   },
-  "gitHead": "de1a5b1ae2466025e8c007f8bca5b9dd34d82daa"
+  "gitHead": "e356beb2c1bfd3b06bc2a383c01d5957d18c8f34"
 }

package/src/components/account/MyAccountUserDetails/MyAccountUserDetails.tsx

@@ -5,15 +5,17 @@ import styles from './styles.module.scss'
 
 type MyAccountUserDetailsProps = {
   userDetails: {
+    username: string
     name: string
     email: string
+    phone: string
     role: string[]
     orgUnit: string
   }
 }
 
 export default function MyAccountUserDetails({
-  userDetails: { name, email, role, orgUnit },
+  userDetails: { username, name, email, phone, role, orgUnit },
 }: MyAccountUserDetailsProps) {
   return (
     <section className={styles.section}>
@@ -22,14 +24,18 @@ export default function MyAccountUserDetails({
         <AccountTable
           rows={[
             { heading: 'Name', data: name ? name : '–' },
+            { heading: 'Username', data: username ? username : '–' },
+            { heading: 'Phone number', data: phone ? phone : '–' },
             { heading: 'Email', data: email },
             {
               heading: 'Role',
-              data: role.map((r) => (
-                <span key={r} data-fs-user-details-row-value>
-                  <Tag>{r}</Tag>
+              data: (
+                <span data-fs-user-details-row-tags>
+                  {role.map((r) => (
+                    <Tag key={r}>{r}</Tag>
+                  ))}
                 </span>
-              )),
+              ),
             },
             { heading: 'Organizational unit', data: orgUnit },
           ]}

package/src/components/ui/LocalizationButton/LocalizationButton.tsx

@@ -49,6 +49,7 @@ const LocalizationButton = ({
     setLocaleCode,
     setCurrencyCode,
     save,
+    reset,
     isSaveEnabled,
     error,
   } = useBindingSelector()
@@ -97,7 +98,10 @@ const LocalizationButton = ({
       {isSelectorOpen && (
         <LocalizationSelector
           isOpen={isSelectorOpen}
-          onClose={() => setIsSelectorOpen(false)}
+          onClose={() => {
+            setIsSelectorOpen(false)
+            reset()
+          }}
           triggerRef={buttonRef}
           languages={languages}
           currencies={currencies}

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

@@ -35,8 +35,10 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
 
 type UserDetailsPagePros = {
   userDetails: {
+    username: string
     name: string
     email: string
+    phone: string
     role: string[]
     orgUnit: string
   }
@@ -75,8 +77,10 @@ const query = gql(`
       name
     }
     userDetails {
+      username
       name
       email
+      phone
       role
       orgUnit
     }

package/src/sdk/localization/useBindingSelector.ts

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import storeConfig from '../../../discovery.config'
 import { buildRedirectUrl } from '../../utils/localization/bindingPaths'
@@ -56,6 +56,8 @@ export interface UseBindingSelectorReturn {
   setCurrencyCode: (code: string) => void
   /** Action to save selections and redirect */
   save: () => void
+  /** Discards unsaved changes and resets selections to current session values */
+  reset: () => void
 }
 
 /**
@@ -77,6 +79,23 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   )
   const [error, setError] = useState<BindingSelectorError | null>(null)
 
+  const hasUserEditedSelection = useRef(false)
+
+  // Sync selections when session resolves after initial render (e.g. stale session
+  // from a previous locale when navigating between locale-prefixed paths).
+  // Skipped once the user has made an in-progress selection; call reset() on close to re-enable.
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setLocaleCode(currentLocale ?? null)
+    }
+  }, [currentLocale])
+
+  useEffect(() => {
+    if (!hasUserEditedSelection.current) {
+      setCurrencyCode(currentCurrency?.code ?? null)
+    }
+  }, [currentCurrency?.code])
+
   // Build language options with disambiguation - returns Record<localeCode, languageName>
   const languages = useMemo(
     () => buildLanguageOptions(localizationConfig.locales),
@@ -98,6 +117,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
   // Handle locale code change
   const handleSetLocaleCode = useCallback(
     (code: string) => {
+      hasUserEditedSelection.current = true
       setLocaleCode(code)
       setError(null)
 
@@ -126,6 +146,7 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   // Handle currency code change
   const handleSetCurrencyCode = useCallback((code: string) => {
+    hasUserEditedSelection.current = true
     setCurrencyCode(code)
     setError(null)
   }, [])
@@ -169,6 +190,14 @@ export function useBindingSelector(): UseBindingSelectorReturn {
 
   const isSaveEnabled = Boolean(localeCode && currencyCode && !error)
 
+  // Discards unsaved changes and re-enables session syncing
+  const reset = useCallback(() => {
+    hasUserEditedSelection.current = false
+    setLocaleCode(currentLocale ?? null)
+    setCurrencyCode(currentCurrency?.code ?? null)
+    setError(null)
+  }, [currentLocale, currentCurrency?.code])
+
   return {
     languages,
     currencies,
@@ -179,5 +208,6 @@ export function useBindingSelector(): UseBindingSelectorReturn {
     setLocaleCode: handleSetLocaleCode,
     setCurrencyCode: handleSetCurrencyCode,
     save,
+    reset,
   }
 }