@akinon/pz-theme 2.0.162-rc.0 → 2.0.162

package/CHANGELOG.md

@@ -1,55 +1,12 @@
 # @akinon/pz-theme
 
-## 2.0.162-rc.0
-
-### Patch Changes
-
-- 8e040731e: ZERO-5235: let brands hang actions on order detail lines
-- c761b9fd: ZERO-5296: fall back to the storefront default language in the text block
-- 17a598da: ZERO-5296: report the storefront default language to the editor
-- 3b05a407: ZERO-5232: allow richtext settings on custom blocks
-- Updated dependencies [86187b1c2]
-- Updated dependencies [08390a87]
-- Updated dependencies [0cf9ea239]
-- Updated dependencies [324f97d55]
-- Updated dependencies [4c3465ae]
-- Updated dependencies [51ea06888]
-- Updated dependencies
-- Updated dependencies [549da545]
-- Updated dependencies [2fea41430]
-- Updated dependencies [b55acb768]
-- Updated dependencies [760258c1c]
-- Updated dependencies [143be2b9d]
-- Updated dependencies [7889b08fe]
-- Updated dependencies [9f8cd3bc5]
-- Updated dependencies [d635d345]
-- Updated dependencies [bfafa3f49]
-- Updated dependencies [d860c917]
-- Updated dependencies [ac6cada1]
-- Updated dependencies [e90c0e02]
-- Updated dependencies [dc7f9ca5]
-- Updated dependencies [57d7eb305]
-- Updated dependencies [0145dc3f]
-- Updated dependencies [d99a6a7d5]
-- Updated dependencies [92086b29]
-- Updated dependencies [227b7408]
-- Updated dependencies [9db81a714]
-- Updated dependencies [591e345e1]
-- Updated dependencies [4de5303c5]
-- Updated dependencies [95b139dc1]
-- Updated dependencies [1d00f2d06]
-- Updated dependencies [4ac7b2a1e]
-- Updated dependencies [4998a9631]
-- Updated dependencies [804d2bd6c]
-- Updated dependencies [3909d3224]
-- Updated dependencies [6a3d8a631]
-- Updated dependencies [e18836b20]
-- Updated dependencies [b1111d7b1]
-- Updated dependencies [1595d458e]
-- Updated dependencies [dca128112]
-- Updated dependencies [9a7b0937]
-  - @akinon/next@2.0.162-rc.0
-  - @akinon/theme-contract@2.0.162-rc.0
+## 2.0.162
+
+### Patch Changes
+
+- 8758f3a3: ZERO-5391: Per-country placeholder content. When the request locale names a country (`en-ae` → `ae`) and the `theme-regions` registry lists a placeholder for it, the placeholder renders from that country's copy (`<slug>-region-<cc>`; in draft mode its `-preview-<id>` blob first) instead of the shared default, with the data-source records the copy carries (`theme_region_dataSources`) filling in any id theme-config lacks (theme-config's record wins when it has the id). Unlisted placeholders, language-only locales and a missing or unreadable registry keep today's reads; a server process that has read the registry keeps using it for up to 15 minutes while reads fail. `PLACEHOLDERS_AVAILABLE` now carries `contentCapabilities`, `localeUrlStrategy` and `defaultLocale`, and placeholders always report their canonical slug as `placeholderId`.
+  - @akinon/next@2.0.162
+  - @akinon/theme-contract@2.0.162
 
 ## 2.0.161
 

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@akinon/pz-theme",
   "description": "Theme package for Project Zero Next — ThemePlaceholder system and theme editor infrastructure",
-  "version": "2.0.162-rc.0",
+  "version": "2.0.162",
   "license": "MIT",
   "main": "src/index.ts",
   "scripts": {
     "test": "jest"
   },
   "peerDependencies": {
-    "@akinon/next": "2.0.162-rc.0",
+    "@akinon/next": "2.0.162",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@akinon/theme-contract": "2.0.162-rc.0",
+    "@akinon/theme-contract": "2.0.162",
     "clsx": "2.1.1",
     "lottie-web": "^5.13.0",
     "react-multi-carousel": "2.8.4",
@@ -21,7 +21,7 @@
     "zod": "4.4.1"
   },
   "devDependencies": {
-    "@akinon/next": "2.0.162-rc.0",
+    "@akinon/next": "2.0.162",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.1.1",

package/readme.md

@@ -26,6 +26,28 @@ export default async function Page() {
 
 Developer-authored sections and blocks are written against `@akinon/pz-theme/src/custom` — see [`src/custom/README.md`](./src/custom/README.md) and [`src/custom/README-sections.md`](./src/custom/README-sections.md). Reference examples live in `examples/header/` at the root of the pz-next repository; they are not shipped in the npm package.
 
+## Per-country content (ZERO-5391)
+
+The theme editor can give one country its own copy of a placeholder (a page body, the header or footer, a custom page, a modal) while every other visitor keeps the shared content. pz-theme serves it without any change in the brand's code:
+
+- The country ("region") is the last part of the request locale when that part is a two-letter code: `en-ae` and `ar-ae` both read `ae`, `zh-hant-tw` reads `tw`. A language-only locale (`en`, `tr`) has no region, and its requests make no new reads.
+- The editor lists each country's customised placeholders in the `theme-regions` widget. A listed placeholder renders from `<slug>-region-<cc>`, with the data-source records that copy carries (`theme_region_dataSources`) filling in any id theme-config lacks; theme-config's record wins when it has the id. An unlisted placeholder is never looked up under a country slug.
+- Country content that cannot be read is replaced by the shared content, which is what the country's visitors saw before the area was customised. That covers a listed copy that does not answer or has no section order, and a registry that is missing or unreadable (a server process that has read the registry before keeps using that one for a while; see below).
+- Placeholders report their canonical slug (`header`, never `header-region-ae`) as `placeholderId`.
+- Every `PLACEHOLDERS_AVAILABLE` frame carries `contentCapabilities: ['region-content']`, `localeUrlStrategy` and `defaultLocale` (from `settings.localization`). The editor offers countries only to a storefront that announces the capability, does not use `LocaleUrlStrategy.Subdomain` (switching the preview's locale would change its origin) and has at least two audiences: its distinct countries, plus one if any locale is language-only.
+
+There is no on-demand revalidation, so changes reach visitors as caches expire:
+
+- Customising or reverting an area: up to about two minutes (the registry is cached for 60 s in Redis and kept for 60 s per server process), plus the page's ISR window. An area reverted and customised again inside the widget cache window can briefly show its previous country content.
+- When a registry read fails, is unreadable or finds no registry, a server process that has read one before keeps serving that one for up to 15 minutes after its last successful read, trying again every 10 seconds, so an outage does not flip countries back to the shared content. A registry that is deleted on purpose stays in effect just as long.
+- Publishing a country's edits: the same caching as any widget (Redis 900 s, then ISR).
+
+Requirements and known limits:
+
+- Live country content works on every core this package supports.
+- Country previews (the editor's draft, "View on site" and signed draft links in a country locale) need `@akinon/next` 1.126.15 or later and the `[pz]` route segment, as named previews do. Without them a country's draft cannot be previewed on the storefront, and its pages show live content.
+- A signed draft link opened in a country locale shows the shared DRAFT in the areas that country has not customised, while the editor's canvas shows the shared LIVE content there. Customised areas show the country's own draft in both.
+
 ## Using pz-theme on the v1 line
 
 `@akinon/pz-theme` and `@akinon/theme-contract` have a single release line. They are developed on `main` and published with the 2.x packages; the `v1` branch has no copy of them and publishes no 1.x version. A brand still on v1 (Next 14.2, React 18, `@akinon/next` 1.x) installs the same releases as a v2 brand.

package/src/__tests__/custom-catalog-announce.test.ts

@@ -460,4 +460,114 @@ describe('PLACEHOLDERS_AVAILABLE announce', () => {
     ]);
     expect(second.placeholders).toEqual(['header', 'footer']);
   });
+
+  // ZERO-5391 — per-country content.
+
+  it('announces per-country content and the locale settings before the editor proves itself', () => {
+    const { registry } = load();
+
+    registry.registerPlaceholder('header');
+    jest.advanceTimersByTime(100);
+
+    // On the gated frame, like the action list: for a build with no custom
+    // catalog it is the only frame the editor ever gets, and a frame without
+    // the capability keeps the editor's country picker hidden.
+    //
+    // Literals rather than the constants, for the same reason as the action
+    // list: these pin the wire values. The locale values are the ones
+    // jest/__mocks__/settings.js carries.
+    const [payload] = frames();
+    expect(payload.contentCapabilities).toEqual(['region-content']);
+    expect(payload.localeUrlStrategy).toBe('hide-default-locale');
+    expect(payload.defaultLocale).toBe('en-us');
+  });
+
+  it('keeps the per-country fields on both frames of the designer re-announce', () => {
+    const { registry, register } = load();
+
+    register.registerCustomBlocks('acme', { 'promo-strip': Promo });
+    registry.registerPlaceholder('header');
+    jest.advanceTimersByTime(100);
+
+    (window as { __themeEditorDesigner?: boolean }).__themeEditorDesigner =
+      true;
+    window.dispatchEvent(
+      new MessageEvent('message', {
+        origin: EDITOR_ORIGIN,
+        source: window.parent as Window,
+        data: { type: 'SET_THEME_EDITOR_COOKIE', data: true }
+      })
+    );
+    jest.advanceTimersByTime(100);
+
+    // Every frame, not just the first. The editor replaces what it holds with
+    // each announce, so a later frame without the capability would take the
+    // country picker away halfway through a session.
+    expect(postMessage).toHaveBeenCalledTimes(2);
+    expect(
+      frames().map(
+        ({ contentCapabilities, localeUrlStrategy, defaultLocale }) => ({
+          contentCapabilities,
+          localeUrlStrategy,
+          defaultLocale
+        })
+      )
+    ).toEqual([
+      {
+        contentCapabilities: ['region-content'],
+        localeUrlStrategy: 'hide-default-locale',
+        defaultLocale: 'en-us'
+      },
+      {
+        contentCapabilities: ['region-content'],
+        localeUrlStrategy: 'hide-default-locale',
+        defaultLocale: 'en-us'
+      }
+    ]);
+  });
+
+  it('announces the locale settings the build actually routes by', () => {
+    // The stub's strategy is also the fallback, so only settings of another
+    // shape prove the frame reads them rather than a constant.
+    jest.doMock('settings', () => ({
+      localization: { localeUrlStrategy: 'subdomain', defaultLocaleValue: 'tr' }
+    }));
+    try {
+      const { registry } = load();
+
+      registry.registerPlaceholder('header');
+      jest.advanceTimersByTime(100);
+
+      const [payload] = frames();
+      expect(payload.localeUrlStrategy).toBe('subdomain');
+      expect(payload.defaultLocale).toBe('tr');
+      expect(payload.contentCapabilities).toEqual(['region-content']);
+    } finally {
+      jest.dontMock('settings');
+    }
+  });
+
+  it('still announces when the settings cannot be read', () => {
+    jest.doMock('settings', () => ({
+      get localization() {
+        throw new Error('settings are not readable');
+      }
+    }));
+    try {
+      const { registry } = load();
+
+      registry.registerPlaceholder('header');
+      jest.advanceTimersByTime(100);
+
+      // The frame is what every editor load waits for. Losing it to a settings
+      // read would cost the whole canvas, not just the country picker.
+      expect(postMessage).toHaveBeenCalledTimes(1);
+      const [payload] = frames();
+      expect(payload.placeholders).toEqual(['header']);
+      expect(payload.localeUrlStrategy).toBe('hide-default-locale');
+      expect(payload.defaultLocale).toBe('');
+    } finally {
+      jest.dontMock('settings');
+    }
+  });
 });

package/src/__tests__/editor-locale-bridge.test.tsx

@@ -28,7 +28,6 @@ const SETTINGS_LOCALES = [
 const mockLocalization = {
   locale: 'tr',
   locales: SETTINGS_LOCALES as Array<Record<string, unknown>>,
-  defaultLocaleValue: 'tr',
   setLocale: jest.fn()
 };
 
@@ -107,7 +106,6 @@ beforeEach(() => {
   postMessage.mockClear();
   mockLocalization.locale = 'tr';
   mockLocalization.locales = SETTINGS_LOCALES;
-  mockLocalization.defaultLocaleValue = 'tr';
   mockLocalization.setLocale = jest.fn();
   delete (window as { __iframeReadySent?: boolean }).__iframeReadySent;
 });
@@ -146,8 +144,7 @@ describe('inside the editor', () => {
             { value: 'en', label: 'English' },
             { value: 'tr', label: 'Türkçe' },
             { value: 'de', label: 'de' }
-          ],
-          defaultLocale: 'tr'
+          ]
         }
       })
     ]);
@@ -157,34 +154,6 @@ describe('inside the editor', () => {
     expect(targetOrigin).toBe(EDITOR_ORIGIN);
   });
 
-  it('posts the languages before the document reports ready', () => {
-    // The editor holds every per-language write until IFRAME_READY and takes
-    // "ready without languages" to mean they are never coming, so the order
-    // of the two frames is part of the contract.
-    render(placeholder('header'));
-
-    const types = postMessage.mock.calls.map(([message]) => message?.type);
-    expect(types).toContain('LOCALE_UPDATE');
-    expect(types).toContain('IFRAME_READY');
-    expect(types.indexOf('LOCALE_UPDATE')).toBeLessThan(
-      types.indexOf('IFRAME_READY')
-    );
-  });
-
-  it("posts the brand's default language, whichever it is", () => {
-    // The editor's per-language text controls take the plain-string form to
-    // mean this language; left to guess, the editor assumed English.
-    mockLocalization.defaultLocaleValue = 'de';
-
-    render(<EditorLocaleBridge />);
-
-    expect(localeFrames()).toEqual([
-      expect.objectContaining({
-        data: expect.objectContaining({ locale: 'tr', defaultLocale: 'de' })
-      })
-    ]);
-  });
-
   it("follows the editor's switch exactly once, with several placeholders mounted", () => {
     render(
       <>

package/src/blocks/__tests__/text-block.test.tsx

@@ -2,31 +2,9 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import TextBlock from '../text-block';
 
-// The page's language and the storefront's default, as the localization
-// provider reports them. Most cases run on an English-default store showing
-// English; the fallback case moves both.
-const mockLocalization = { locale: 'en-us', defaultLocaleValue: 'en-us' };
-
-jest.mock('@akinon/next/hooks', () => ({
-  __esModule: true,
-  useLocalization: () => ({
-    t: (path: string) => path,
-    setLocale: () => {},
-    setCurrency: () => {},
-    locale: mockLocalization.locale,
-    currency: 'USD',
-    locales: [{ value: 'en-us' }, { value: 'tr-tr' }],
-    currencies: ['USD'],
-    defaultLocaleValue: mockLocalization.defaultLocaleValue,
-    defaultCurrencyCode: 'USD',
-    localeUrlStrategy: 'hide-default-locale'
-  })
-}));
-
-beforeEach(() => {
-  mockLocalization.locale = 'en-us';
-  mockLocalization.defaultLocaleValue = 'en-us';
-});
+// The mocked useLocalization (jest/__mocks__/akinon-next-hooks.js) returns
+// locale: 'en-us'. process.env.NEXT_PUBLIC_DEFAULT_LOCALE is unset in the
+// jest env, so the component's defaultLocale falls back to 'en'.
 
 const renderBlock = (value: unknown, styles?: Record<string, unknown>) => {
   const block: any = { id: 'b1', type: 'text', value, styles };
@@ -56,16 +34,10 @@ describe('TextBlock value-shape resolution', () => {
     );
   });
 
-  it("falls back to the storefront's default language when the active one is absent", () => {
-    // A Turkish-default store showing German. The entry under `en` is what
-    // the block used to show: its default was read from an env variable
-    // that falls back to English, not from the storefront (ZERO-5296).
-    mockLocalization.locale = 'de-de';
-    mockLocalization.defaultLocaleValue = 'tr-tr';
-
-    const { container } = renderBlock({ en: 'EN', 'tr-tr': 'TR' });
+  it('falls back to defaultLocale ("en") when active locale is absent', () => {
+    const { container } = renderBlock({ en: 'EN', fr: 'FR' });
     expect((container.querySelector('div') as HTMLDivElement).innerHTML).toBe(
-      'TR'
+      'EN'
     );
   });
 

package/src/blocks/order-detail-block.tsx

@@ -9,7 +9,6 @@ import { getResponsiveValue, partAttrs } from '../utils';
 import { formatDate, formatMoney } from './commerce-format';
 import { readMoneyStyle } from './money-style';
 import { hasItemTemplate, ItemTemplateList } from './item-template';
-import { renderOrderLineActions } from './order-line-actions';
 import { BlockRendererProps } from './block-renderer-registry';
 import {
   DesignerPlaceholder,
@@ -25,7 +24,7 @@ import {
   useOrderActionRules
 } from '../utils/order-action-rules';
 
-type OrderItemLike = {
+interface OrderItemLike {
   id?: number;
   price?: string;
   quantity?: string | number;
@@ -44,7 +43,7 @@ type OrderItemLike = {
     absolute_url?: string;
     attributes?: Record<string, unknown>;
   } | null;
-};
+}
 
 interface AddressLike {
   first_name?: string;
@@ -409,7 +408,7 @@ const formatAddress = (address: AddressLike | null | undefined): string[] => {
  * currencyText, currencyPosition.
  * Parts: detail, header, number, date, header-total, status,
  * invoice-link, cancel-link, return-link, list, item, image, name, quantity,
- * color, size, item-status, item-tracking, item-return-code, item-actions,
+ * color, size, item-status, item-tracking, item-return-code,
  * item-return-method, item-return-carrier, item-pickup-date, price, shipment,
  * delivery, tracking, addresses, address, address-label, totals, total-row,
  * total-label, total-value, grand-total, payment-info, payment-info-label.
@@ -956,21 +955,6 @@ const OrderDetailBlock = ({
                 showPickupDate && returnDetails.pickupDate
                   ? formatPickupDate(returnDetails.pickupDate, locale)
                   : '';
-              const lineActions = renderOrderLineActions({
-                order,
-                line,
-                isDesigner
-              });
-              const showLineMeta =
-                showShipmentStatus &&
-                Boolean(
-                  item.status?.label ||
-                    trackingValue ||
-                    returnCodeValue ||
-                    returnMethodValue ||
-                    returnCarrierValue ||
-                    pickupDateValue
-                );
 
               return (
                 <li
@@ -1086,100 +1070,98 @@ const OrderDetailBlock = ({
                       </div>
                     </div>
 
-                    {(showLineMeta || lineActions) && (
-                      <div
-                        style={{
-                          display: 'flex',
-                          flexDirection: 'column',
-                          alignItems: isMobile ? 'flex-start' : 'flex-end',
-                          textAlign: isMobile ? 'left' : 'right',
-                          gap: '4px',
-                          flex: isMobile ? '1 1 100%' : '0 0 auto'
-                        }}
-                      >
-                        {lineActions && (
-                          <div
-                            data-order-detail-item-actions=""
-                            {...partAttrs('item-actions')}
-                          >
-                            {lineActions}
-                          </div>
-                        )}
-                        {showLineMeta && item.status?.label && (
-                          <span
-                            data-order-detail-item-status=""
-                            data-order-status-value={item.status.value}
-                            {...partAttrs('item-status')}
-                            style={{ display: 'inline-block' }}
-                          >
-                            {item.status.label}
-                          </span>
-                        )}
-                        {/* Label and value in their own spans, so a
-                            composition can colour them apart. */}
-                        {showLineMeta && returnMethodValue && (
-                          <span
-                            data-order-detail-item-return-method=""
-                            {...partAttrs('item-return-method')}
-                            style={{ opacity: 0.8 }}
-                          >
-                            <span data-label="">{returnMethodLabel}</span>{' '}
-                            <span data-value="">{returnMethodValue}</span>
-                          </span>
-                        )}
-                        {showLineMeta && returnCarrierValue && (
-                          <span
-                            data-order-detail-item-return-carrier=""
-                            {...partAttrs('item-return-carrier')}
-                            style={{ opacity: 0.8 }}
-                          >
-                            <span data-label="">{returnCarrierLabel}</span>{' '}
-                            <span data-value="">{returnCarrierValue}</span>
-                          </span>
-                        )}
-                        {showLineMeta && pickupDateValue && (
-                          <span
-                            data-order-detail-item-pickup-date=""
-                            {...partAttrs('item-pickup-date')}
-                            style={{ opacity: 0.8 }}
-                          >
-                            <span data-label="">{pickupDateLabel}</span>{' '}
-                            <span data-value="">{pickupDateValue}</span>
-                          </span>
-                        )}
-                        {showLineMeta && trackingValue && (
-                          <span
-                            data-order-detail-item-tracking=""
-                            {...partAttrs('item-tracking')}
-                            style={{ opacity: 0.8 }}
-                          >
-                            {lineTrackingLabel}{' '}
-                            {item.tracking_url ? (
-                              <a
-                                href={isDesigner ? '#' : item.tracking_url}
-                                onClick={guard}
-                                target={isDesigner ? undefined : '_blank'}
-                                rel="noreferrer"
-                                style={{ color: 'inherit' }}
-                              >
-                                {item.tracking_number || item.tracking_url}
-                              </a>
-                            ) : (
-                              trackingValue
-                            )}
-                          </span>
-                        )}
-                        {showLineMeta && returnCodeValue && (
-                          <span
-                            data-order-detail-item-return-code=""
-                            {...partAttrs('item-return-code')}
-                            style={{ opacity: 0.8 }}
-                          >
-                            {returnCodeLabel} {returnCodeValue}
-                          </span>
-                        )}
-                      </div>
-                    )}
+                    {showShipmentStatus &&
+                      (item.status?.label ||
+                        trackingValue ||
+                        returnCodeValue ||
+                        returnMethodValue ||
+                        returnCarrierValue ||
+                        pickupDateValue) && (
+                        <div
+                          style={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: isMobile ? 'flex-start' : 'flex-end',
+                            textAlign: isMobile ? 'left' : 'right',
+                            gap: '4px',
+                            flex: isMobile ? '1 1 100%' : '0 0 auto'
+                          }}
+                        >
+                          {item.status?.label && (
+                            <span
+                              data-order-detail-item-status=""
+                              data-order-status-value={item.status.value}
+                              {...partAttrs('item-status')}
+                              style={{ display: 'inline-block' }}
+                            >
+                              {item.status.label}
+                            </span>
+                          )}
+                          {/* Label and value in their own spans, so a
+                              composition can colour them apart. */}
+                          {returnMethodValue && (
+                            <span
+                              data-order-detail-item-return-method=""
+                              {...partAttrs('item-return-method')}
+                              style={{ opacity: 0.8 }}
+                            >
+                              <span data-label="">{returnMethodLabel}</span>{' '}
+                              <span data-value="">{returnMethodValue}</span>
+                            </span>
+                          )}
+                          {returnCarrierValue && (
+                            <span
+                              data-order-detail-item-return-carrier=""
+                              {...partAttrs('item-return-carrier')}
+                              style={{ opacity: 0.8 }}
+                            >
+                              <span data-label="">{returnCarrierLabel}</span>{' '}
+                              <span data-value="">{returnCarrierValue}</span>
+                            </span>
+                          )}
+                          {pickupDateValue && (
+                            <span
+                              data-order-detail-item-pickup-date=""
+                              {...partAttrs('item-pickup-date')}
+                              style={{ opacity: 0.8 }}
+                            >
+                              <span data-label="">{pickupDateLabel}</span>{' '}
+                              <span data-value="">{pickupDateValue}</span>
+                            </span>
+                          )}
+                          {trackingValue && (
+                            <span
+                              data-order-detail-item-tracking=""
+                              {...partAttrs('item-tracking')}
+                              style={{ opacity: 0.8 }}
+                            >
+                              {lineTrackingLabel}{' '}
+                              {item.tracking_url ? (
+                                <a
+                                  href={isDesigner ? '#' : item.tracking_url}
+                                  onClick={guard}
+                                  target={isDesigner ? undefined : '_blank'}
+                                  rel="noreferrer"
+                                  style={{ color: 'inherit' }}
+                                >
+                                  {item.tracking_number || item.tracking_url}
+                                </a>
+                              ) : (
+                                trackingValue
+                              )}
+                            </span>
+                          )}
+                          {returnCodeValue && (
+                            <span
+                              data-order-detail-item-return-code=""
+                              {...partAttrs('item-return-code')}
+                              style={{ opacity: 0.8 }}
+                            >
+                              {returnCodeLabel} {returnCodeValue}
+                            </span>
+                          )}
+                        </div>
+                      )}
                   </div>
                 </li>
               );

package/src/blocks/text-block.tsx

@@ -7,7 +7,6 @@ import { getInnerRootInlineStyles, partAttrs } from '../utils';
 import { useThemeSettingsContext } from '../theme-settings-context';
 import { useLocalizeHref } from '../hooks/use-localize-href';
 import { localizeHtmlLinks } from '../utils/localize-href';
-import { useValueLocale } from '../utils/localized-value';
 
 const TextBlock = ({
   block,
@@ -15,7 +14,7 @@ const TextBlock = ({
 }: BlockRendererProps) => {
   const { locale } = useLocalization();
   const localize = useLocalizeHref();
-  const { defaultLocale } = useValueLocale();
+  const defaultLocale = process.env.NEXT_PUBLIC_DEFAULT_LOCALE || 'en';
   const themeSettings = useThemeSettingsContext();
 
   const getLocalizedContent = (): string => {
@@ -31,10 +30,7 @@ const TextBlock = ({
 
     if (typeof value === 'object' && value !== null) {
       return (
-        value[locale] ||
-        (defaultLocale && value[defaultLocale]) ||
-        Object.values(value)[0] ||
-        ''
+        value[locale] || value[defaultLocale] || Object.values(value)[0] || ''
       );
     }