@faststore/core 3.86.4 → 3.88.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.86.2 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.86.2 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.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.86.2 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.86.2 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.86.2 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.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.86.2 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.86.2 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.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
@@ -73,44 +73,43 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
    Collecting build traces ...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      3.66 kB         141 kB
+┌ ● /                                      3.69 kB         142 kB
 ├   └ css/b1806cbafd0c1f81.css             3.06 kB
 ├   /_app                                  0 B             107 kB
-├ ● /[...slug]                             2.45 kB         155 kB
-├ ● /[slug]/p                              33.5 kB         171 kB
+├ ● /[...slug]                             2.49 kB         156 kB
+├ ● /[slug]/p                              97.4 kB         236 kB
 ├   ├ css/6cd282d958f613bc.css             5.9 kB
-├   ├ css/3d7be7043aee15df.css             6.26 kB
-├   └ css/37ee6a2c6adab309.css             16.2 kB
-├ ○ /404                                   1.55 kB         139 kB
-├ ● /500                                   1.55 kB         139 kB
+├   └ css/175fa823349dc534.css             22 kB
+├ ○ /404                                   1.57 kB         140 kB
+├ ● /500                                   1.57 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
+├ ● /checkout                              749 B           139 kB
+├ ● /login                                 1.7 kB          140 kB
+├ λ /pvt/account                           247 B           108 kB
+├ ● /pvt/account/[...unknown]              287 B           108 kB
+├ λ /pvt/account/403                       2.47 kB         141 kB
 ├   └ css/b7bba8fce075688b.css             4.2 kB
-├ λ /pvt/account/404                       2.14 kB         140 kB
+├ λ /pvt/account/404                       2.16 kB         140 kB
 ├   └ css/5347dbc8b71de47d.css             4.25 kB
-├ λ /pvt/account/orders                    10.5 kB         148 kB
+├ λ /pvt/account/orders                    10.5 kB         149 kB
 ├   └ css/b7fc24e8f1eb011f.css             12.8 kB
 ├ λ /pvt/account/orders/[id]               12.2 kB         150 kB
 ├   └ css/297be4be3be36ff0.css             12.6 kB
-├ λ /pvt/account/profile                   1.79 kB         139 kB
+├ λ /pvt/account/profile                   1.81 kB         140 kB
 ├   └ css/831a1f72fe4b2d80.css             3.97 kB
-├ λ /pvt/account/security                  3.77 kB         141 kB
+├ λ /pvt/account/security                  3.79 kB         142 kB
 ├   └ css/ec7fdad03808422d.css             5.22 kB
-├ λ /pvt/account/user-details              1.74 kB         139 kB
+├ λ /pvt/account/user-details              1.76 kB         140 kB
 ├   └ css/e46393a76c5d93a9.css             4.17 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-02ac96e27a9cbbb4.js  24.7 kB
-  ├ chunks/webpack-5b7c916f31abc68d.js     3.85 kB
+└ ● /s                                     3.28 kB         157 kB
++ First Load JS shared by all              111 kB
+  ├ chunks/framework-d514426edf885c68.js   45.4 kB
+  ├ chunks/main-595f5e3b626b9fff.js        33.2 kB
+  ├ chunks/pages/_app-8b7d8e9c9021b0cf.js  25 kB
+  ├ chunks/webpack-50869061879531a0.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.86.2 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.87.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (25.999 s)
-PASS test/server/cms/global.test.ts (26.296 s)
+PASS test/server/cms/global.test.ts (27.587 s)
+PASS test/utils/multipleTemplates.test.ts (27.756 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (29.916 s)
+PASS test/server/index.test.ts (31.164 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        31.045 s
+Time:        32.259 s
 Ran all test suites.

package/@generated/graphql.ts

@@ -1300,7 +1300,7 @@ export type StoreFacetValueBoolean = {
   /** Facet value label. */
   label: Scalars['String']['output']
   /** Number of items with this facet. */
-  quantity: Scalars['Int']['output']
+  quantity: Maybe<Scalars['Int']['output']>
   /** Indicates whether facet is selected. */
   selected: Scalars['Boolean']['output']
   /** Facet value. */
@@ -2470,7 +2470,7 @@ type Filter_Facets_StoreFacetBoolean_Fragment = {
     label: string
     value: string
     selected: boolean
-    quantity: number
+    quantity: number | null
   }>
 }
 
@@ -3346,7 +3346,7 @@ export type ClientProductGalleryQueryQuery = {
             label: string
             value: string
             selected: boolean
-            quantity: number
+            quantity: number | null
           }>
         }
       | {

package/@generated/schema.graphql

@@ -212,7 +212,7 @@ type StoreFacetValueBoolean {
   """Indicates whether facet is selected."""
   selected: Boolean!
   """Number of items with this facet."""
-  quantity: Int!
+  quantity: Int
 }
 
 """Image."""

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.88.0](https://github.com/vtex/faststore/compare/v3.87.0...v3.88.0) (2025-09-18)
+
+### Features
+
+- [CP-768] adding support for lexical rich text objects ([#3004](https://github.com/vtex/faststore/issues/3004)) ([3e8fdaa](https://github.com/vtex/faststore/commit/3e8fdaa4bb728d2bde038ac96a2045f5d8670744)), closes [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R189](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R189) [/github.com/vtex/faststore/pull/3004/files#diff-fe1a4c11824f3dfcc33af60e6612a2054705df8f7273932db1b5f9c0ed023172R20](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-fe1a4c11824f3dfcc33af60e6612a2054705df8f7273932db1b5f9c0ed023172R20) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R205](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R205) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R98](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R98) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R153](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R153) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R106](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R106) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R119](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R119) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R145](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R145) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R148](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R148) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R149](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R149) [/github.com/vtex/faststore/pull/3004/files#diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R150](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-0b1e74171da3dc2cd19600bd739a8db011c54e9032c01abe19ababa21b1cf947R150) [/github.com/vtex/faststore/pull/3004/files#diff-946e28ce25fa403debb36f7f2bb8bad070f7ddd8586e4dd834649afcf4b529eeR32](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-946e28ce25fa403debb36f7f2bb8bad070f7ddd8586e4dd834649afcf4b529eeR32) [/github.com/vtex/faststore/pull/3004/files#diff-3a4a8bba967d6107c9b71ef5c1a0835620593286a58dc65031f8a29e8584c071R27](https://github.com//github.com/vtex/faststore/pull/3004/files/issues/diff-3a4a8bba967d6107c9b71ef5c1a0835620593286a58dc65031f8a29e8584c071R27)
+
+# [3.87.0](https://github.com/vtex/faststore/compare/v3.86.4...v3.87.0) (2025-09-18)
+
+### Features
+
+- Delivery Promise 2.2 - in stock filter ([#2972](https://github.com/vtex/faststore/issues/2972)) ([7bfb830](https://github.com/vtex/faststore/commit/7bfb8308c76b0914d59875fbe95d3cab6e98eba3))
+
 ## [3.86.4](https://github.com/vtex/faststore/compare/v3.86.3...v3.86.4) (2025-09-17)
 
 **Note:** Version bump only for package @faststore/core

package/cms/faststore/content-types.json

@@ -287,6 +287,28 @@
                       "default": "Unavailable for pickup"
                     }
                   }
+                },
+                "inStock": {
+                  "title": "PLP/Search Filter: In Stock",
+                  "type": "object",
+                  "properties": {
+                    "enabled": {
+                      "title": "Should display In Stock filter?",
+                      "description": "Allow shoppers to filter only products that are currently in stock. Note: When enabling, ensure that the `hideUnavailableItems` property is set to `false` in the store's `discovery.config.js` file.",
+                      "type": "boolean",
+                      "default": false
+                    },
+                    "title": {
+                      "title": "In Stock title",
+                      "type": "string",
+                      "default": "Availability"
+                    },
+                    "label": {
+                      "title": "In Stock label",
+                      "type": "string",
+                      "default": "In-stock only"
+                    }
+                  }
                 }
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.86.4",
+  "version": "3.88.0",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,11 +44,11 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.85.0",
+    "@faststore/api": "^3.87.0",
     "@faststore/graphql-utils": "^3.81.0",
     "@faststore/lighthouse": "^3.81.0",
     "@faststore/sdk": "^3.85.0",
-    "@faststore/ui": "^3.86.4",
+    "@faststore/ui": "^3.88.0",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "4.0.7",
@@ -58,10 +58,17 @@
     "@graphql-tools/schema": "^10.0.3",
     "@graphql-tools/utils": "^10.2.0",
     "@graphql-typed-document-node/core": "^3.2.0",
+    "@lexical/code": "^0.34.0",
+    "@lexical/headless": "^0.34.0",
+    "@lexical/html": "^0.34.0",
+    "@lexical/link": "^0.34.0",
+    "@lexical/list": "^0.34.0",
+    "@lexical/react": "^0.34.0",
+    "@lexical/rich-text": "^0.34.0",
     "@parcel/watcher": "^2.4.0",
     "@types/react": "^18.2.42",
     "@vtex/client-cms": "^0.2.16",
-    "@vtex/client-cp": "0.3.0",
+    "@vtex/client-cp": "0.3.5",
     "@vtex/prettier-config": "1.0.0",
     "autoprefixer": "^10.4.0",
     "cookie": "^0.7.0",
@@ -73,6 +80,7 @@
     "graphql": "^15.6.0",
     "include-media": "^1.4.10",
     "isomorphic-unfetch": "^3.1.0",
+    "lexical": "^0.34.0",
     "next": "^13.5.9",
     "next-seo": "^6.6.0",
     "postcss": "^8.4.4",
@@ -108,5 +116,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "35335b8d18b1a5ef942d0e7a801f0be404687f44"
+  "gitHead": "c87a2fbc23b26a4d343d485586c4f2108a814612"
 }

package/src/components/search/Filter/FilterDesktop.tsx

@@ -18,7 +18,9 @@ import type { useFilter } from 'src/sdk/search/useFilter'
 import type { FilterSliderProps } from './FilterSlider'
 
 import {
+  DELIVERY_OPTIONS_FACET_KEY,
   PICKUP_ALL_FACET_VALUE,
+  SHIPPING_FACET_KEY,
   useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
 import { getGlobalSettings } from 'src/utils/globalSettings'
@@ -47,8 +49,7 @@ function FilterDesktop({
   const { openRegionSlider } = useUI()
   const {
     facets: filteredFacets,
-    deliveryLabel,
-    deliveryOptionsLabel,
+    labelsMap,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -74,7 +75,7 @@ function FilterDesktop({
             testId={testId}
             index={0}
             type=""
-            label={deliveryLabel}
+            label={labelsMap[SHIPPING_FACET_KEY] ?? 'Delivery'}
             description={deliveryPromiseSettings?.deliveryMethods?.description}
           >
             <UIButton
@@ -93,14 +94,11 @@ function FilterDesktop({
           const index = shouldDisplayDeliveryButton ? idx + 1 : idx
           const { __typename: type, label } = facet
           const isExpanded = expanded.has(index)
-          const isDeliveryMethodFacet = facet.key === 'shipping'
-          const isDeliveryOptionFacet = facet.key === 'delivery-options'
+          const isDeliveryMethodFacet = facet.key === SHIPPING_FACET_KEY
+          const isDeliveryOptionFacet = facet.key === DELIVERY_OPTIONS_FACET_KEY
 
-          const sectionLabel = isDeliveryMethodFacet
-            ? deliveryLabel
-            : isDeliveryOptionFacet
-              ? deliveryOptionsLabel
-              : label
+          const sectionLabel =
+            labelsMap[facet.key as keyof typeof labelsMap] ?? label
 
           return (
             <UIFilterFacets

package/src/components/search/Filter/FilterSlider.tsx

@@ -18,7 +18,9 @@ import type { Filter_FacetsFragment } from '@generated/graphql'
 import FilterDeliveryMethodFacet from './FilterDeliveryMethodFacet'
 
 import {
+  DELIVERY_OPTIONS_FACET_KEY,
   PICKUP_ALL_FACET_VALUE,
+  SHIPPING_FACET_KEY,
   useDeliveryPromise,
 } from 'src/sdk/deliveryPromise'
 import type { useFilter } from 'src/sdk/search/useFilter'
@@ -102,8 +104,7 @@ function FilterSlider({
 
   const {
     facets: filteredFacets,
-    deliveryLabel,
-    deliveryOptionsLabel,
+    labelsMap,
     isPickupAllEnabled,
     shouldDisplayDeliveryButton,
     onDeliveryFacetChange,
@@ -169,7 +170,7 @@ function FilterSlider({
               testId={testId}
               index={0}
               type=""
-              label={deliveryLabel}
+              label={labelsMap[SHIPPING_FACET_KEY] ?? 'Delivery'}
               description={
                 deliveryPromiseSettings?.deliveryMethods?.description
               }
@@ -190,14 +191,12 @@ function FilterSlider({
             const index = shouldDisplayDeliveryButton ? idx + 1 : idx
             const { __typename: type, label } = facet
             const isExpanded = expanded.has(index)
-            const isDeliveryMethodFacet = facet.key === 'shipping'
-            const isDeliveryOptionFacet = facet.key === 'delivery-options'
+            const isDeliveryMethodFacet = facet.key === SHIPPING_FACET_KEY
+            const isDeliveryOptionFacet =
+              facet.key === DELIVERY_OPTIONS_FACET_KEY
 
-            const sectionLabel = isDeliveryMethodFacet
-              ? deliveryLabel
-              : isDeliveryOptionFacet
-                ? deliveryOptionsLabel
-                : label
+            const sectionLabel =
+              labelsMap[facet.key as keyof typeof labelsMap] ?? label
 
             return (
               <UIFilterFacets

package/src/components/sections/Newsletter/section.module.scss

@@ -4,6 +4,8 @@
     @import "@faststore/ui/src/components/atoms/Icon/styles.scss";
     @import "@faststore/ui/src/components/atoms/Input/styles.scss";
     @import "@faststore/ui/src/components/atoms/Link/styles.scss";
+    @import "@faststore/ui/src/components/atoms/List/styles.scss";
+    @import "@faststore/ui/src/components/atoms/RichText/styles.scss";
     @import "@faststore/ui/src/components/molecules/InputField/styles.scss";
     @import "@faststore/ui/src/components/organisms/Newsletter/styles.scss";
   }

package/src/components/ui/Newsletter/NewsletterAddendum.tsx

@@ -1,86 +1,35 @@
-/**
- * TODO:
- *
- * This library hasn't been updated in 4 years at the time of writing.
- *
- * We're using it as a patch, and it is expected that some Rich Text use cases of draftjs are not supported by it.
- * We have the dependency on draftjs because of the way the headless CMS send us the data.
- *
- * This library should be removed as soon as possible, which will probably be possible through one of two cases:
- * 1. We support React Server Components and go back to using the official draftjs library for doing this, only on the server.
- *    This is still not the ideal solution, since it still relies on a unsupported, deprecated and archived library (draftjs).
- * 2. CMS uses a new library or changes how it sends the data to not depend on draftjs.
- *
- * This is a limitation not only for this component, but for every native & custom component that makes use of Rich Text.
- */
-
-// @ts-ignore motivation: cannot find the draftjs-to-html package types.
-import draftToHtml from 'draftjs-to-html'
-import { NewsletterAddendum as UINewsletterAddendum } from '@faststore/ui'
-import type { NewsletterAddendumProps as UINewsletterAddendumProps } from '@faststore/ui'
+import { RichText } from '../RichText'
 
 export interface NewsletterAddendumProps {
   /**
-   * Expects a string of a JSON object in the form of draftjs's raw content state.
+   * Addendum content. Can be:
+   * - A string of a JSON object in the form of draftjs's raw content state (for hCMS)
+   * - Lexical's serialized editor state (for Content Platform)
+   * - Plain HTML string
+   * - Plain text
    */
-  addendum: UINewsletterAddendumProps['addendum']
-}
-
-function getLinkElementAsString(url: string, text: string) {
-  return `
-    <a
-      data-fs-link="true"
-      data-fs-link-variant="inline"
-      data-fs-link-inverse="true"
-      data-fs-link-size="regular"
-      data-testid="fs-link"
-      href="${url}"
-    >${text}</a>`
-}
-
-function cmsToHtml(addendum: string) {
-  if (!addendum) {
-    return ''
-  }
-
-  let rawDraftContentState = null
-
-  try {
-    rawDraftContentState = JSON.parse(addendum)
-  } catch (e) {
-    throw new Error(
-      'Newsletter\'s prop "addendum" is not a JSON string. This is happening because the overridden prop is malformed or the CMS is providing malformed content for that prop.',
-      {
-        cause: e,
-      }
-    )
-  }
-
-  if (!rawDraftContentState) {
-    return ''
-  }
-
-  return draftToHtml(
-    rawDraftContentState,
-    undefined,
-    undefined,
-    (entity: { type: string; data: { url: string } }, text: string) => {
-      if (entity.type !== 'LINK') {
-        return null
-      }
-
-      return getLinkElementAsString(entity.data.url, text)
-    }
-  )
+  addendum: string
+  /**
+   * ID to find this component in testing tools (e.g.: Cypress, Testing Library, and Jest).
+   */
+  testId?: string
+  /**
+   * Additional props to pass to the RichText component
+   */
+  [key: string]: any
 }
 
 export function NewsletterAddendum({
   addendum,
+  testId = 'fs-newsletter-addendum',
   ...otherProps
-}: NewsletterAddendumProps) {
+}: Readonly<NewsletterAddendumProps>) {
   return (
-    <UINewsletterAddendum
-      dangerouslySetInnerHTML={{ __html: cmsToHtml(addendum) }}
+    <RichText
+      as="span"
+      content={addendum}
+      testId={testId}
+      data-fs-newsletter-addendum
       {...otherProps}
     />
   )