@faststore/core 3.84.5 → 3.86.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.84.4 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.84.4 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.84.4 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.84.4 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.84.4 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.84.4 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.84.4 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -64,8 +64,8 @@ Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
  ✓ Compiled successfully
    Collecting page data ...
    Generating static pages (0/6) ...
-Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (1/6) 
+Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Content documentation at https://developers.vtex.com/docs/guides/faststore/dynamic-content-overview for mapping the page and the corresponding data-fetching function.
 
   Generating static pages (2/6) 
 
   Generating static pages (4/6) 
 
 ✓ Generating static pages (6/6) 
@@ -83,34 +83,34 @@ Route (pages)                              Size     First Load JS
 ├   └ css/6d92375b6ee8276a.css             16.1 kB
 ├ ○ /404                                   1.55 kB         139 kB
 ├ ● /500                                   1.55 kB         139 kB
-├ λ /account                               240 B           107 kB
-├ ● /account/[...unknown]                  281 B           107 kB
-├ λ /account/403                           2.44 kB         140 kB
+├ λ /api/graphql                           0 B             107 kB
+├ λ /api/health/live                       0 B             107 kB
+├ λ /api/health/ready                      0 B             107 kB
+├ λ /api/preview                           0 B             107 kB
+├ ● /checkout                              737 B           138 kB
+├ ● /login                                 1.68 kB         139 kB
+├ λ /pvt/account                           245 B           107 kB
+├ ● /pvt/account/[...unknown]              283 B           107 kB
+├ λ /pvt/account/403                       2.45 kB         140 kB
 ├   └ css/b7bba8fce075688b.css             4.2 kB
-├ λ /account/404                           2.13 kB         140 kB
+├ λ /pvt/account/404                       2.14 kB         140 kB
 ├   └ css/5347dbc8b71de47d.css             4.25 kB
-├ λ /account/orders                        10.5 kB         148 kB
+├ λ /pvt/account/orders                    10.5 kB         148 kB
 ├   └ css/b7fc24e8f1eb011f.css             12.8 kB
-├ λ /account/orders/[id]                   12.2 kB         150 kB
+├ λ /pvt/account/orders/[id]               12.2 kB         150 kB
 ├   └ css/297be4be3be36ff0.css             12.6 kB
-├ λ /account/profile                       1.79 kB         139 kB
+├ λ /pvt/account/profile                   1.79 kB         139 kB
 ├   └ css/831a1f72fe4b2d80.css             3.97 kB
-├ λ /account/security                      3.76 kB         141 kB
+├ λ /pvt/account/security                  3.77 kB         141 kB
 ├   └ css/ec7fdad03808422d.css             5.22 kB
-├ λ /account/user-details                  1.74 kB         139 kB
+├ λ /pvt/account/user-details              1.74 kB         139 kB
 ├   └ css/e46393a76c5d93a9.css             4.17 kB
-├ λ /api/graphql                           0 B             107 kB
-├ λ /api/health/live                       0 B             107 kB
-├ λ /api/health/ready                      0 B             107 kB
-├ λ /api/preview                           0 B             107 kB
-├ ● /checkout                              737 B           138 kB
-├ ● /login                                 1.68 kB         139 kB
 └ ● /s                                     3.24 kB         156 kB
 + First Load JS shared by all              110 kB
   ├ chunks/framework-807b0f81cbc129f0.js   45.4 kB
   ├ chunks/main-f658704b53a96ab1.js        33.1 kB
-  ├ chunks/pages/_app-423f11b0d7fff185.js  24.7 kB
-  ├ chunks/webpack-92cd0db592faf63b.js     3.85 kB
+  ├ chunks/pages/_app-02ac96e27a9cbbb4.js  24.7 kB
+  ├ chunks/webpack-7e1828f4509e6ef7.js     3.85 kB
   └ css/24a5e8f6808266fe.css               3.53 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @faststore/core@3.84.4 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.85.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (27.505 s)
-PASS test/server/cms/global.test.ts (27.696 s)
+PASS test/server/cms/global.test.ts (26.637 s)
+PASS test/utils/multipleTemplates.test.ts (27.384 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (31.154 s)
+PASS test/server/index.test.ts (30.522 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        32.216 s
+Time:        31.74 s
 Ran all test suites.

package/@generated/gql.ts

@@ -86,7 +86,7 @@ const documents = {
     types.ClientSearchSuggestionsQueryDocument,
   '\n  query ClientTopSearchSuggestionsQuery(\n    $term: String!\n    $selectedFacets: [IStoreSelectedFacet!]\n  ) {\n    ...ClientTopSearchSuggestions\n    search(first: 5, term: $term, selectedFacets: $selectedFacets) {\n      suggestions {\n        terms {\n          value\n        }\n      }\n    }\n  }\n':
     types.ClientTopSearchSuggestionsQueryDocument,
-  '\n  mutation ValidateSession($session: IStoreSession!, $search: String!) {\n    validateSession(session: $session, search: $search) {\n      locale\n      channel\n      country\n      addressType\n      postalCode\n      city\n      deliveryMode {\n        deliveryChannel\n        deliveryMethod\n        deliveryWindow {\n          startDate\n          endDate\n        }\n      }\n      geoCoordinates {\n        latitude\n        longitude\n      }\n      currency {\n        code\n        symbol\n      }\n      person {\n        id\n        email\n        givenName\n        familyName\n      }\n      b2b {\n        customerId\n        isRepresentative\n        unitName\n        unitId\n        firstName\n        lastName\n        userName\n        userEmail\n        savedPostalCode\n      }\n      marketingData {\n        utmCampaign\n        utmMedium\n        utmSource\n        utmiCampaign\n        utmiPage\n        utmiPart\n      }\n      refreshAfter\n    }\n  }\n':
+  '\n  mutation ValidateSession($session: IStoreSession!, $search: String!) {\n    validateSession(session: $session, search: $search) {\n      locale\n      channel\n      country\n      addressType\n      postalCode\n      city\n      deliveryMode {\n        deliveryChannel\n        deliveryMethod\n        deliveryWindow {\n          startDate\n          endDate\n        }\n      }\n      geoCoordinates {\n        latitude\n        longitude\n      }\n      currency {\n        code\n        symbol\n      }\n      person {\n        id\n        email\n        givenName\n        familyName\n      }\n      b2b {\n        customerId\n        isRepresentative\n        unitName\n        unitId\n        firstName\n        lastName\n        userName\n        userEmail\n        savedPostalCode\n        permissions {\n          canManageOrganization\n        }\n      }\n      marketingData {\n        utmCampaign\n        utmMedium\n        utmSource\n        utmiCampaign\n        utmiPage\n        utmiPart\n      }\n      refreshAfter\n    }\n  }\n':
     types.ValidateSessionDocument,
   '\n  query ClientShippingSimulationQuery(\n    $postalCode: String!\n    $country: String!\n    $items: [IShippingItem!]!\n  ) {\n    ...ClientShippingSimulation\n    shipping(items: $items, postalCode: $postalCode, country: $country) {\n      logisticsInfo {\n        slas {\n          carrier\n          price\n          availableDeliveryWindows {\n            startDateUtc\n            endDateUtc\n            price\n            listPrice\n          }\n          shippingEstimate\n          localizedEstimates\n          deliveryChannel\n        }\n      }\n      address {\n        city\n        neighborhood\n        state\n      }\n    }\n  }\n':
     types.ClientShippingSimulationQueryDocument,
@@ -320,7 +320,7 @@ export function gql(
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function gql(
-  source: '\n  mutation ValidateSession($session: IStoreSession!, $search: String!) {\n    validateSession(session: $session, search: $search) {\n      locale\n      channel\n      country\n      addressType\n      postalCode\n      city\n      deliveryMode {\n        deliveryChannel\n        deliveryMethod\n        deliveryWindow {\n          startDate\n          endDate\n        }\n      }\n      geoCoordinates {\n        latitude\n        longitude\n      }\n      currency {\n        code\n        symbol\n      }\n      person {\n        id\n        email\n        givenName\n        familyName\n      }\n      b2b {\n        customerId\n        isRepresentative\n        unitName\n        unitId\n        firstName\n        lastName\n        userName\n        userEmail\n        savedPostalCode\n      }\n      marketingData {\n        utmCampaign\n        utmMedium\n        utmSource\n        utmiCampaign\n        utmiPage\n        utmiPart\n      }\n      refreshAfter\n    }\n  }\n'
+  source: '\n  mutation ValidateSession($session: IStoreSession!, $search: String!) {\n    validateSession(session: $session, search: $search) {\n      locale\n      channel\n      country\n      addressType\n      postalCode\n      city\n      deliveryMode {\n        deliveryChannel\n        deliveryMethod\n        deliveryWindow {\n          startDate\n          endDate\n        }\n      }\n      geoCoordinates {\n        latitude\n        longitude\n      }\n      currency {\n        code\n        symbol\n      }\n      person {\n        id\n        email\n        givenName\n        familyName\n      }\n      b2b {\n        customerId\n        isRepresentative\n        unitName\n        unitId\n        firstName\n        lastName\n        userName\n        userEmail\n        savedPostalCode\n        permissions {\n          canManageOrganization\n        }\n      }\n      marketingData {\n        utmCampaign\n        utmMedium\n        utmSource\n        utmiCampaign\n        utmiPage\n        utmiPart\n      }\n      refreshAfter\n    }\n  }\n'
 ): typeof import('./graphql').ValidateSessionDocument
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.

package/@generated/graphql.ts

@@ -417,6 +417,7 @@ export type IStoreB2B = {
   firstName: InputMaybe<Scalars['String']['input']>
   isRepresentative: InputMaybe<Scalars['Boolean']['input']>
   lastName: InputMaybe<Scalars['String']['input']>
+  permissions: IStoreB2BPermissions
   savedPostalCode: InputMaybe<Scalars['String']['input']>
   unitId: InputMaybe<Scalars['String']['input']>
   unitName: InputMaybe<Scalars['String']['input']>
@@ -424,6 +425,10 @@ export type IStoreB2B = {
   userName: InputMaybe<Scalars['String']['input']>
 }
 
+export type IStoreB2BPermissions = {
+  canManageOrganization: Scalars['Boolean']['input']
+}
+
 /** Shopping cart input. */
 export type IStoreCart = {
   /** Order information, including `orderNumber`, `acceptedOffer` and `shouldSplitItem`. */
@@ -1130,6 +1135,7 @@ export type StoreB2B = {
   firstName: Maybe<Scalars['String']['output']>
   isRepresentative: Maybe<Scalars['Boolean']['output']>
   lastName: Maybe<Scalars['String']['output']>
+  permissions: StoreB2BPermissions
   savedPostalCode: Maybe<Scalars['String']['output']>
   unitId: Maybe<Scalars['String']['output']>
   unitName: Maybe<Scalars['String']['output']>
@@ -1137,6 +1143,10 @@ export type StoreB2B = {
   userName: Maybe<Scalars['String']['output']>
 }
 
+export type StoreB2BPermissions = {
+  canManageOrganization: Scalars['Boolean']['output']
+}
+
 /** Brand of a given product. */
 export type StoreBrand = {
   /** Brand name. */
@@ -3599,6 +3609,7 @@ export type ValidateSessionMutation = {
       userName: string | null
       userEmail: string | null
       savedPostalCode: string | null
+      permissions: { canManageOrganization: boolean }
     } | null
     marketingData: {
       utmCampaign: string | null
@@ -4495,7 +4506,7 @@ export const ClientTopSearchSuggestionsQueryDocument = {
 export const ValidateSessionDocument = {
   __meta__: {
     operationName: 'ValidateSession',
-    operationHash: '5da2700f5a69ee8835b1cb6c69e14f4b6e12c4df',
+    operationHash: '15d85b65b36cb2c30fead1c68a01c3492319a819',
   },
 } as unknown as TypedDocumentString<
   ValidateSessionMutation,

package/@generated/persisted-documents.json

@@ -22,7 +22,7 @@
   "34ea14c0d4a57ddf9bc11e4be0cd2b5a6506d3d4": "query ClientProfileQuery($id: String!) { profile(id: $id) { addresses { city country geoCoordinate postalCode } } }",
   "bbaa2ed75c4fb04842189e8d53a1d65481154e2b": "fragment ClientSearchSuggestions on Query { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } } fragment ProductSummary_product on StoreProduct { additionalProperty { name propertyID value valueReference } advertisement { adId adResponseId } brand { brandName: name } brand { name } deliveryPromiseBadges { typeName } gtin hasSpecifications image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations allVariantsByName availableVariations slugsMap } } isVariantOf { name productGroupID skuVariants { activeVariations allVariantProducts { name productID } availableVariations slugsMap } } name offers { lowPrice lowPriceWithTaxes offers { availability listPrice listPriceWithTaxes price priceWithTaxes quantity seller { identifier } } } id: productID sku slug unitMultiplier unitMultiplier } fragment SearchEvent_metadata on SearchMetadata { fuzzy isTermMisspelled logicalOperator } query ClientSearchSuggestionsQuery($selectedFacets: [IStoreSelectedFacet!], $term: String!) { search(first: 5, term: $term, selectedFacets: $selectedFacets) { metadata { ...SearchEvent_metadata } products { pageInfo { totalCount } } suggestions { products { ...ProductSummary_product } terms { value } } } ...ClientSearchSuggestions }",
   "e2385b0f11726d0068f96548f57a8dd441c064e3": "fragment ClientTopSearchSuggestions on Query { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } } query ClientTopSearchSuggestionsQuery($selectedFacets: [IStoreSelectedFacet!], $term: String!) { search(first: 5, term: $term, selectedFacets: $selectedFacets) { suggestions { terms { value } } } ...ClientTopSearchSuggestions }",
-  "5da2700f5a69ee8835b1cb6c69e14f4b6e12c4df": "mutation ValidateSession($search: String!, $session: IStoreSession!) { validateSession(session: $session, search: $search) { addressType b2b { customerId firstName isRepresentative lastName savedPostalCode unitId unitName userEmail userName } channel city country currency { code symbol } deliveryMode { deliveryChannel deliveryMethod deliveryWindow { endDate startDate } } geoCoordinates { latitude longitude } locale marketingData { utmCampaign utmMedium utmSource utmiCampaign utmiPage utmiPart } person { email familyName givenName id } postalCode refreshAfter } }",
+  "15d85b65b36cb2c30fead1c68a01c3492319a819": "mutation ValidateSession($search: String!, $session: IStoreSession!) { validateSession(session: $session, search: $search) { addressType b2b { customerId firstName isRepresentative lastName permissions { canManageOrganization } savedPostalCode unitId unitName userEmail userName } channel city country currency { code symbol } deliveryMode { deliveryChannel deliveryMethod deliveryWindow { endDate startDate } } geoCoordinates { latitude longitude } locale marketingData { utmCampaign utmMedium utmSource utmiCampaign utmiPage utmiPart } person { email familyName givenName id } postalCode refreshAfter } }",
   "c35bad22f67f3eb34fea52bb49efa6b1da6b728d": "fragment ClientShippingSimulation on Query { shipping(items: $items, postalCode: $postalCode, country: $country) { address { city } } } query ClientShippingSimulationQuery($country: String!, $items: [IShippingItem!]!, $postalCode: String!) { shipping(items: $items, postalCode: $postalCode, country: $country) { address { city neighborhood state } logisticsInfo { slas { availableDeliveryWindows { endDateUtc listPrice price startDateUtc } carrier deliveryChannel localizedEstimates price shippingEstimate } } } ...ClientShippingSimulation }",
   "4b769cda49004c85d0d427c601eba36c37a52224": "fragment ClientManyProducts on Query { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets sponsoredCount: $sponsoredCount ) { products { pageInfo { totalCount } } } } fragment ProductSummary_product on StoreProduct { additionalProperty { name propertyID value valueReference } advertisement { adId adResponseId } brand { brandName: name } brand { name } deliveryPromiseBadges { typeName } gtin hasSpecifications image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations allVariantsByName availableVariations slugsMap } } isVariantOf { name productGroupID skuVariants { activeVariations allVariantProducts { name productID } availableVariations slugsMap } } name offers { lowPrice lowPriceWithTaxes offers { availability listPrice listPriceWithTaxes price priceWithTaxes quantity seller { identifier } } } id: productID sku slug unitMultiplier unitMultiplier } fragment SearchEvent_metadata on SearchMetadata { fuzzy isTermMisspelled logicalOperator } query ServerManyProductsQuery($after: String, $first: Int!, $selectedFacets: [IStoreSelectedFacet!]!, $sort: StoreSort!, $sponsoredCount: Int, $term: String!) { search( first: $first after: $after sort: $sort term: $term selectedFacets: $selectedFacets sponsoredCount: $sponsoredCount ) { metadata { ...SearchEvent_metadata } products { edges { node { ...ProductSummary_product } } pageInfo { totalCount } } } ...ClientManyProducts }"
 }

package/@generated/schema.graphql

@@ -1252,6 +1252,10 @@ type StoreSession {
   refreshAfter: String
 }
 
+type StoreB2BPermissions {
+  canManageOrganization: Boolean!
+}
+
 type StoreB2B {
   customerId: String!
   isRepresentative: Boolean
@@ -1262,6 +1266,11 @@ type StoreB2B {
   userName: String
   userEmail: String
   savedPostalCode: String
+  permissions: StoreB2BPermissions!
+}
+
+input IStoreB2BPermissions {
+  canManageOrganization: Boolean!
 }
 
 input IStoreB2B {
@@ -1274,6 +1283,7 @@ input IStoreB2B {
   userName: String
   userEmail: String
   savedPostalCode: String
+  permissions: IStoreB2BPermissions!
 }
 
 """Session input."""

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.
 
+# [3.86.0](https://github.com/vtex/faststore/compare/v3.85.0...v3.86.0) (2025-09-15)
+
+### Features
+
+- ensure pvt route in my account pages SFS-2852 ([#3026](https://github.com/vtex/faststore/issues/3026)) ([93b089a](https://github.com/vtex/faststore/commit/93b089abd3bca04ef8fbdbecc7f81dd00a852987))
+
+# [3.85.0](https://github.com/vtex/faststore/compare/v3.84.5...v3.85.0) (2025-09-15)
+
+### Features
+
+- add organization management permission validation ([#3029](https://github.com/vtex/faststore/issues/3029)) ([67d6125](https://github.com/vtex/faststore/commit/67d61252cba42045a4c225f2cba14656645a1dbb))
+
 ## [3.84.5](https://github.com/vtex/faststore/compare/v3.84.4...v3.84.5) (2025-09-15)
 
 **Note:** Version bump only for package @faststore/core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.84.5",
+  "version": "3.86.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,10 +44,10 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.84.5",
+    "@faststore/api": "^3.85.0",
     "@faststore/graphql-utils": "^3.81.0",
     "@faststore/lighthouse": "^3.81.0",
-    "@faststore/sdk": "^3.83.1",
+    "@faststore/sdk": "^3.85.0",
     "@faststore/ui": "^3.84.0",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
@@ -108,5 +108,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "add61f1da0d18a1a8473a6f61857cb413147fbc9"
+  "gitHead": "3161c22026aedd19edb41f61c7717b4cc2a019b2"
 }

package/src/components/account/MyAccountDrawer/OrganizationDrawer/OrganizationDrawer.tsx

@@ -30,6 +30,11 @@ export const OrganizationDrawer = ({
 
   const contractName = person?.givenName ?? ''
 
+  const contractUrl =
+    b2b?.unitId && b2b?.permissions?.canManageOrganization
+      ? `/pvt/buyer-portal/org-unit/${b2b?.unitId}`
+      : null
+
   return (
     <SlideOver
       data-fs-organization-drawer
@@ -46,7 +51,7 @@ export const OrganizationDrawer = ({
       <OrganizationDrawerHeader
         onCloseDrawer={closeDrawer}
         contractName={contractName}
-        contractUrl="/buyer-portal"
+        contractUrl={contractUrl}
       />
       <OrganizationDrawerBody isRepresentative={isRepresentative} />
       <footer data-fs-organization-drawer-footer-wrapper>

package/src/components/account/MyAccountDrawer/OrganizationDrawer/OrganizationDrawerHeader.tsx

@@ -14,11 +14,13 @@ export const OrganizationDrawerHeader = ({
   contractImage,
   onCloseDrawer,
 }: OrganizationDrawerHeaderProps) => {
+  const TitleComponent = contractUrl ? Link : 'div'
+
   return (
     <>
       <SlideOverHeader onClose={() => onCloseDrawer?.()} />
       <div data-fs-organization-drawer-header>
-        <Link
+        <TitleComponent
           data-fs-organization-drawer-header-contract-link
           href={contractUrl}
         >
@@ -32,7 +34,7 @@ export const OrganizationDrawerHeader = ({
           <h1 data-fs-organization-drawer-header-contract-name>
             {contractName}
           </h1>
-        </Link>
+        </TitleComponent>
       </div>
     </>
   )

package/src/components/account/MyAccountDrawer/OrganizationDrawer/section.module.scss

@@ -20,8 +20,8 @@
     @import "../ProfileSummary/profile-summary.scss";
 
     [data-fs-organization-drawer] {
-      --fs-organization-drawer-header-contract-color             : #cbe9ff;
-      --fs-organization-drawer-body-link-color                   : #f5f5f5;
+      --fs-organization-drawer-header-contract-color: #cbe9ff;
+      --fs-organization-drawer-body-link-color: #f5f5f5;
 
       display: flex;
       flex-direction: column;
@@ -61,8 +61,10 @@
         transition: all 1s ease;
       }
 
-      [data-fs-organization-drawer-header-contract-name]:hover {
-        text-decoration: underline;
+      a[data-fs-organization-drawer-header-contract-link] {
+        [data-fs-organization-drawer-header-contract-name]:hover {
+          text-decoration: underline;
+        }
       }
 
       [data-fs-organization-drawer-header-contract-image] {

package/src/components/account/MyAccountDrawer/ProfileSummary/ProfileSummary.tsx

@@ -24,6 +24,10 @@ export const ProfileSummary = ({
   ...otherProps
 }: ProfileSummaryProps) => {
   const { b2b } = useSession()
+
+  const showBuyerPortalManageLink =
+    showManageLink && b2b?.permissions?.canManageOrganization && b2b?.unitId
+
   return (
     <section
       data-fs-profile-summary
@@ -32,14 +36,10 @@ export const ProfileSummary = ({
     >
       <div data-fs-profile-summary-header>
         <h2 data-fs-profile-summary-org-name>{orgName}</h2>
-        {showManageLink && (
+        {showBuyerPortalManageLink && (
           <Link
             data-fs-profile-summary-org-link
-            href={
-              b2b?.unitId
-                ? `/buyer-portal/org-unit/${b2b?.unitId}`
-                : '/buyer-portal'
-            }
+            href={`/pvt/buyer-portal/org-unit/${b2b?.unitId}`}
           >
             Manage <Icon name="OpenInNew" width={23} height={23} />
           </Link>

package/src/components/account/orders/MyAccountListOrders/MyAccountFilterSlider/MyAccountFilterSlider.tsx

@@ -115,7 +115,7 @@ function MyAccountFilterSlider({
       }
     })
 
-    window.location.href = `/account/orders?${params.toString()}`
+    window.location.href = `/pvt/account/orders?${params.toString()}`
   }
 
   return (

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

@@ -6,9 +6,9 @@ import { useRouter } from 'next/router'
 import {
   Button,
   EmptyState,
-  Icon as UIIcon,
   LinkButton,
   SearchInputField,
+  Icon as UIIcon,
   useUI,
   type SearchInputFieldRef,
 } from '@faststore/ui'
@@ -169,7 +169,7 @@ export default function MyAccountListOrders({
           params.set('text', value)
         }
 
-        window.location.href = `/account/orders?${params.toString()}`
+        window.location.href = `/pvt/account/orders?${params.toString()}`
       }
     },
     300,
@@ -247,7 +247,7 @@ export default function MyAccountListOrders({
             purchaseAgentId: filters.purchaseAgentId,
           }}
           onClearAll={() => {
-            window.location.href = '/account/orders'
+            window.location.href = '/pvt/account/orders'
           }}
           onRemoveFilter={(key, value) => {
             const { page, clientEmail, ...updatedFilters } = { ...filters }
@@ -288,7 +288,7 @@ export default function MyAccountListOrders({
             const params = new URLSearchParams(
               filteredQuery as Record<string, string>
             )
-            window.location.href = `/account/orders?${params.toString()}`
+            window.location.href = `/pvt/account/orders?${params.toString()}`
           }}
         />
 

package/src/components/account/orders/MyAccountListOrders/MyAccountListOrdersTable/MyAccountListOrdersTable.tsx

@@ -1,6 +1,5 @@
 import { Button, Icon } from '@faststore/ui'
 import type { ServerListOrdersQueryQuery } from '@generated/graphql'
-import { useRouter } from 'next/router'
 import { useState } from 'react'
 
 import MyAccountStatusBadge from 'src/components/account/components/MyAccountStatusBadge'
@@ -43,7 +42,6 @@ export function Pagination({
   total: number
   perPage: number
 }) {
-  const router = useRouter()
   const totalPages = Math.ceil(total / perPage)
   const firstIndexLabel = page === 1 ? 1 : (page - 1) * perPage + 1
   const lastIndexLabel =
@@ -53,12 +51,12 @@ export function Pagination({
 
   const handlePageChange = (newPage: number) => {
     const params = new URLSearchParams(window.location.search)
-    if (newPage === 1) {
+    if (newPage === 1 || newPage === 0) {
       params.delete('page')
     } else {
       params.set('page', String(newPage))
     }
-    window.location.href = `/account/orders${params.toString() ? `?${params}` : ''}`
+    window.location.href = `/pvt/account/orders${params.toString() ? `?${params}` : ''}`
   }
 
   return (
@@ -161,7 +159,7 @@ export default function MyAccountListOrdersTable({
               max: MAX_ORDER_FIELDS,
             })
 
-            const orderUrl = `/account/orders/${item.orderId}`
+            const orderUrl = `/pvt/account/orders/${item.orderId}`
             const shippingEstimatedDate = item.ShippingEstimatedDate
               ? formatOrderDate(item.ShippingEstimatedDate, locale)
               : '-'

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

@@ -31,7 +31,7 @@ export default function MyAccountOrderDetails({
     <div className={styles.page} data-fs-order-details>
       <header data-fs-order-details-header>
         <div data-fs-order-details-header-title>
-          <a href="/account/orders">
+          <a href="/pvt/account/orders">
             <UIIconButton
               data-fs-order-details-header-back-button
               size="small"

package/src/components/ui/Button/ButtonSignIn/ButtonSignIn.tsx

@@ -16,7 +16,7 @@ const ButtonSignIn = ({
   return (
     <LinkButton
       data-fs-button-signin-link
-      href={person?.id ? `/account` : `/login`}
+      href={person?.id ? `/pvt/account` : `/login`}
       className="text__title-mini"
       aria-label={alt}
       variant="tertiary"

package/src/pages/{account → pvt/account}/403.tsx

@@ -54,7 +54,7 @@ function Page({ globalSections: globalSectionsProp, accountName }: Props) {
             subtitle="You don't have permission to access this page."
             showLoader={false}
           >
-            <LinkButton variant="secondary" href="/account">
+            <LinkButton variant="secondary" href="/pvt/account">
               Back to Account
             </LinkButton>
           </EmptyState>

package/src/pages/{account → pvt/account}/[...unknown].tsx

@@ -23,7 +23,7 @@ export const getStaticProps: GetStaticProps<
 
   return {
     redirect: {
-      destination: '/account/404',
+      destination: '/pvt/account/404',
       permanent: false,
     },
   }

package/src/pages/{account → pvt/account}/index.tsx

@@ -1,5 +1,5 @@
-import { validateUser } from 'src/sdk/account/validateUser'
 import type { GetServerSideProps, NextPage } from 'next'
+import { validateUser } from 'src/sdk/account/validateUser'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 const MyAccountRedirectPage: NextPage = () => {
@@ -31,7 +31,7 @@ export const getServerSideProps: GetServerSideProps = async ({
 
   return {
     redirect: {
-      destination: '/account/profile',
+      destination: '/pvt/account/profile',
       permanent: false,
     },
   }

package/src/pages/{account → pvt/account}/orders/[id].tsx

@@ -24,7 +24,7 @@ import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { extractStatusFromError } from 'src/utils/utilities'
-import storeConfig from '../../../../discovery.config'
+import storeConfig from 'discovery.config'
 
 const COMPONENTS: Record<string, ComponentType<any>> = {
   ...GLOBAL_COMPONENTS,
@@ -329,7 +329,7 @@ export const getServerSideProps: GetServerSideProps<
 
     return {
       redirect: {
-        destination: isForbidden ? '/account/403' : '/account/404',
+        destination: isForbidden ? '/pvt/account/403' : '/pvt/account/404',
         permanent: false,
       },
     }

package/src/pages/{account → pvt/account}/orders/index.tsx

@@ -27,7 +27,7 @@ import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
 import { validateUser } from 'src/sdk/account/validateUser'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { extractStatusFromError } from 'src/utils/utilities'
-import storeConfig from '../../../../discovery.config'
+import storeConfig from 'discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -225,7 +225,7 @@ export const getServerSideProps: GetServerSideProps<
 
     return {
       redirect: {
-        destination: isForbidden ? '/account/403' : '/account/404',
+        destination: isForbidden ? '/pvt/account/403' : '/pvt/account/404',
         permanent: false,
       },
     }

package/src/pages/{account → pvt/account}/profile.tsx

@@ -28,7 +28,7 @@ import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
-import storeConfig from '../../../discovery.config'
+import storeConfig from 'discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -134,7 +134,7 @@ export const getServerSideProps: GetServerSideProps<
   if (profile.errors) {
     const statusCode: number = (profile.errors[0] as any)?.extensions?.status
     const destination: string =
-      statusCode === 403 ? '/account/403' : '/account/404'
+      statusCode === 403 ? '/pvt/account/403' : '/pvt/account/404'
 
     return {
       redirect: {

package/src/pages/{account → pvt/account}/security.tsx

@@ -30,7 +30,7 @@ import { validateUser } from 'src/sdk/account/validateUser'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 
 import { SecuritySection } from 'src/components/account/security'
-import storeConfig from '../../../discovery.config'
+import storeConfig from 'discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -131,7 +131,7 @@ export const getServerSideProps: GetServerSideProps<
   if (security.errors) {
     const statusCode: number = (security.errors[0] as any)?.extensions?.status
     const destination: string =
-      statusCode === 403 ? '/account/403' : '/account/404'
+      statusCode === 403 ? '/pvt/account/403' : '/pvt/account/404'
 
     return {
       redirect: {