gatsby-core-theme 44.15.0 → 44.15.2

package/CHANGELOG.md

@@ -1,3 +1,39 @@
+## [44.15.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.15.1...v44.15.2) (2026-02-26)
+
+
+### Bug Fixes
+
+* add jackpot on pick keys for games ([ad29abd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ad29abdb66c06d33d4ea0c2dc8a2d1dcc24c592e))
+* block crawling for develop environment ([ca986f6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ca986f649be3f90dac3b4bdc181415e5aa05bf56))
+* clean data for pages that contain archive module ([3a2aaf0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3a2aaf005042d1a1c1649fa286b86fc1fc5a6a86))
+* update isMeutimao constant ([b888337](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b888337b2530e90e5a12eb1e8feccf26115c4164))
+* update logic on gatsby node to have all the operators ([39f07ed](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/39f07edacac4c57b813d689b144a17ebba9a5c64))
+* update module introduction to accept short codes ([acdf3df](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/acdf3dfa9325c63a230a92a9f9037b8d1adde68f))
+* update modules function ([5851809](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/58518099f23e1774da43de91c38e8f384b47d562))
+* update name ([a36746a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a36746a5f06d49217bef0bf3900ac461ded8d640))
+* update regex and naming ([f0f08b5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f0f08b5e80b94865d2fdfb717212cc1f596c55a1))
+
+
+* Merge branch 'en-221-update-logic-modules' into 'master' ([b888646](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b88864634144e41667d8da50bf9d3bc964114e07))
+* Merge branch 'en-330-jackpot-data' into 'master' ([dff9e12](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dff9e12a7242c7ef1768109ba55ab81f7f62903a))
+* Merge branch 'EN-371' into 'master' ([537296e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/537296e0ff9db0aa02d3c75575e45d6056d86474))
+* Merge branch 'EN-359' into 'master' ([0f6f3e3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/0f6f3e307e1f5c007b73be2b4eb8f8aedfa3f6a7))
+* Merge branch 'en-221-update-logic' into 'master' ([7641052](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7641052265fbf88550073ff0b4300c60e03592ee))
+* Merge branch 'en-372-short-codes-module-intro' into 'master' ([bac2830](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bac283079b3bf2e99d8e49e373bbb5e706ec7860))
+
+## [44.15.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.15.0...v44.15.1) (2026-02-19)
+
+
+### Bug Fixes
+
+* add validation for api ([75a44d6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75a44d6aacc3a4d7702773d040edcc23b271d298))
+* imporve test ([a2ef17b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a2ef17b491f4130a08769fd2f5982d2825743234))
+* remove unnacessary use effects block, remove unnacessary function from dependency array ([fbda456](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/fbda456a83e61d044a722ba031f61f7f532df763))
+
+
+* Merge branch 'EN/fix-scroll-behaviour' into 'master' ([1065b8e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1065b8e457790256826258d4b520b4340fa14600))
+* Merge branch 'em-367-api-handle' into 'master' ([e6289c8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e6289c858230ebc9c5efea9f9c67189d7d396723))
+
 # [44.15.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.14.0...v44.15.0) (2026-02-11)
 
 

package/gatsby-node.mjs

@@ -76,6 +76,21 @@ export const createPages = async (
   preconnectLinks = themeOptions.preconnectLinks || [];
   console.log(chalk.magenta("info") + chalk.whiteBright(" starting processor"));
 
+  const includeAllOperators = process.env.ENABLE_SHORT_CODES_OPERATOR;
+  const operatorsByShortName = includeAllOperators
+    ? Object.values(operatorData || {}).reduce((acc, operator) => {
+        if (operator?.short_name) {
+          acc[operator.short_name.toLowerCase()] = {
+            min_deposit: operator.min_deposit,
+            max_deposit: operator.max_deposit,
+            min_withdrawal: operator.min_withdrawal,
+            max_withdrawal: operator.max_withdrawal,
+          };
+        }
+        return acc;
+      }, {})
+    : {};
+
   // add data to modules
   const processed = processor.run(
     {
@@ -87,6 +102,7 @@ export const createPages = async (
       toplists: toplistData,
       content: contentData,
       ribbons: ribbonsData,
+      ...(includeAllOperators && { operators: operatorsByShortName }),
       relations: {
         operator: operatorData,
         payment_method: paymentData,
@@ -102,7 +118,7 @@ export const createPages = async (
     },
     themeOptions,
     fs,
-    translationsData
+    translationsData,
   );
   pages = processed.pages;
 
@@ -112,12 +128,14 @@ export const createPages = async (
   htmlSitemapPages = processSitemapPages(pages, processed.site_markets);
 
   // create robots.txt file
-  const robotsTxtContent = siteGeneralData.robots_txt
-    ? siteGeneralData.robots_txt
-    : "";
+  // block all crawlers to prevent indexing for non-production environments
+  const isProduction = process.env.GATSBY_ACTIVE_ENV === "production";
+  const robotsTxtContent = isProduction
+    ? (siteGeneralData.robots_txt || "")
+    : "User-agent: *\nDisallow: /\n";
   const streamRobotsTxt = fs.createWriteStream("./static/robots.txt");
   console.log(
-    chalk.magenta("info") + chalk.whiteBright(" creating robots.txt file")
+    chalk.magenta("info") + chalk.whiteBright(` creating robots.txt file (${isProduction ? "production" : "blocking"})`)
   );
   streamRobotsTxt.write(robotsTxtContent);
   streamRobotsTxt.end();
@@ -140,7 +158,7 @@ export const createPages = async (
 
         siteSchema = schemaData[page["market_id"]];
         authors = siteSettingsData.authors;
-        
+
 
         page.siteInfo = siteGeneralData;
         page.siteSchema = siteSchema;
@@ -158,6 +176,26 @@ export const createPages = async (
             __dirname
           );
 
+          const template = templatesData[page.template_id];
+          const autogenerated = template && template.autogenerated_content;
+
+          archivePages.forEach((archivePage) => {
+            archivePage.context = clean({
+              ...archivePage.context,
+              marketSections: removeUnwantedSections(
+                marketSection,
+                page.type,
+                ribbonsData
+              ),
+              authors,
+              autogenerated,
+              siteSchema,
+              comments: commentsData?.[page?.id],
+              lang: page.language,
+              ...themeOptions,
+            });
+          });
+
           pagesToCreate.push(...archivePages);
           return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "44.15.0",
+  "version": "44.15.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/organisms/navigation/index.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-named-as-default */
-import React, { useRef, useContext } from "react";
+import React, { useRef, useContext, useEffect } from "react";
 import PropTypes from "prop-types";
 import { Context } from "~context/MainProvider.js";
 import Search from "~organisms/search";
@@ -59,7 +59,9 @@ const Navigation = ({
     <img alt={useTranslate('nav_site_logo', logoAlt)} src={logo} width={logoWidth} height={logoHeight} />
   );
 
-  if (stopScrollOnOpen) toggleScroll("", true);
+  useEffect(() => {
+    if (stopScrollOnOpen) toggleScroll("", true);
+  }, [stopScrollOnOpen]);
 
   const activeMarket =
     pageContext?.allMarkets && pageContext?.allMarkets[pageContext.page.market];

package/src/constants/generators.mjs

@@ -1,7 +1,8 @@
 import { months } from "./common.mjs";
 
 const generatorsPlaceholderRegex =
-  /\[MONTH\]|\[YEAR\]|\[currentyear\]|\[sitename\]|\[currentmonth\]|\[title\]|\[currentdate\]|\[operator_name]|\[author_name]|\[link\]/gi;
+  /\[[a-z0-9_]+\.(min_deposit|max_deposit|min_withdrawal|max_withdrawal)\]|\[MONTH\]|\[YEAR\]|\[currentyear\]|\[sitename\]|\[currentmonth\]|\[title\]|\[currentdate\]|\[operator_name\]|\[author_name\]|\[link\]/gi;
+
 
 const generatorsPlaceholderReplaceObject = (
   data,

package/src/constants/pick-keys.mjs

@@ -116,6 +116,7 @@ export const pickRelationKeys = {
     "withdrawal_method",
     "support_email",
     "min_deposit",
+    "max_deposit",
     "max_withdrawal",
     "min_withdrawal",
     "license_objects",
@@ -179,7 +180,9 @@ export const pickRelationKeys = {
     "extra_fields",
     "game_categories",
     'maximum_bet',
-    "game_themes"
+    "game_themes",
+    'jackpot'
+
   ],
   software_provider: [
     "logo_filename_object",

package/src/helpers/generators.mjs

@@ -39,24 +39,40 @@ export function generateTrackerLink(operator, trackerType, provider = false) {
   }
 }
 
-export function generatePlaceholderString(string = "", translations, data) {
+export function generatePlaceholderString(
+  string = "",
+  translations,
+  data,
+  operators,
+) {
+ 
+  
   const date = new Date();
   const day = String(date.getDate()).padStart(2, "0");
   const month = String(date.getMonth() + 1).padStart(2, "0");
   const year = date.getFullYear();
   const regex = generatorsConstant.generatorsPlaceholderRegex;
 
-  return string.replace(
-    regex,
-    (match) =>
+  return string.replace(regex, (match) => {
+    const key = match.toLowerCase();
+    if (key.includes(".")) {
+      const [operatorKey, field] = key
+        .slice(1, -1)
+        .split(".");
+      const value = operators?.[operatorKey]?.[field];
+      return value ?? "";
+    }
+
+    return (
       generatorsConstant.generatorsPlaceholderReplaceObject(
         data,
         translations,
         month,
         day,
-        year
-      )[match.toLowerCase()]
-  );
+        year,
+      )[key] ?? ""
+    );
+  });
 }
 
 export function generateArray(obj) {

package/src/helpers/tracker.mjs

@@ -169,9 +169,26 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
       headers: headers ? filterCfKeys(Object.fromEntries(headers)) : {},
     });
 
-    // Parse the response
-    const data = res.ok ? await res.json() : { success: false };
-    return { props: data };
+    // Check if response is ok and content-type is JSON
+    if (!res.ok) {
+      console.error(`Tracking API error: ${res.status} ${res.statusText}`);
+      return { props: { success: false } };
+    }
+
+    const contentType = res.headers.get("content-type");
+    if (!contentType || !contentType.includes("application/json")) {
+      console.error(`Tracking API returned non-JSON content-type: ${contentType}`);
+      return { props: { success: false } };
+    }
+
+    // Try to parse JSON safely
+    try {
+      const data = await res.json();
+      return { props: data };
+    } catch (jsonError) {
+      console.error("Failed to parse tracking API response as JSON:", jsonError);
+      return { props: { success: false } };
+    }
   } catch (error) {
     console.error("Error fetching affiliate link:", error);
     return { props: { success: false } };

package/src/helpers/tracker.test.js

@@ -96,9 +96,14 @@ describe("Tracker Helper", () => {
 
   global.fetch = jest.fn(() =>
     Promise.resolve({
+      ok: true,
+      headers: {
+        get: (key) => (key === "content-type" ? "application/json" : null),
+      },
       json: () => Promise.resolve({ success: true }),
     })
   );
+
   beforeEach(() => {
     fetch.mockClear();
   });
@@ -153,6 +158,162 @@ describe("Tracker Helper", () => {
     );
   });
 
+  test("getAffiliateLink handles successful response", async () => {
+    fetch.mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: true,
+        headers: {
+          get: (key) => (key === "content-type" ? "application/json" : null),
+        },
+        json: () => Promise.resolve({ success: true, result: { link: "https://example.com" } }),
+      })
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: true, result: { link: "https://example.com" } } });
+  });
+
+  test("getAffiliateLink handles failed HTTP response", async () => {
+    const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation();
+
+    fetch.mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: false,
+        status: 500,
+        statusText: "Internal Server Error",
+        headers: {
+          get: () => null,
+        },
+      })
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: false } });
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "Tracking API error: 500 Internal Server Error"
+    );
+
+    consoleErrorSpy.mockRestore();
+  });
+
+  test("getAffiliateLink handles non-JSON content-type (HTML error page)", async () => {
+    const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation();
+
+    fetch.mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: true,
+        headers: {
+          get: (key) => (key === "content-type" ? "text/html" : null),
+        },
+      })
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: false } });
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "Tracking API returned non-JSON content-type: text/html"
+    );
+
+    consoleErrorSpy.mockRestore();
+  });
+
+  test("getAffiliateLink handles missing content-type", async () => {
+    const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation();
+
+    fetch.mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: true,
+        headers: {
+          get: () => null,
+        },
+      })
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: false } });
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "Tracking API returned non-JSON content-type: null"
+    );
+
+    consoleErrorSpy.mockRestore();
+  });
+
+  test("getAffiliateLink handles JSON parsing error", async () => {
+    const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation();
+
+    fetch.mockImplementationOnce(() =>
+      Promise.resolve({
+        ok: true,
+        headers: {
+          get: (key) => (key === "content-type" ? "application/json" : null),
+        },
+        json: () => Promise.reject(new Error("Unexpected token < in JSON at position 0")),
+      })
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: false } });
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "Failed to parse tracking API response as JSON:",
+      expect.any(Error)
+    );
+
+    consoleErrorSpy.mockRestore();
+  });
+
+  test("getAffiliateLink handles network error", async () => {
+    const consoleErrorSpy = jest.spyOn(console, "error").mockImplementation();
+
+    fetch.mockImplementationOnce(() =>
+      Promise.reject(new Error("Network error"))
+    );
+
+    const result = await Tracker.getAffiliateLink(
+      operator,
+      "/no/visit/rizk",
+      { template: "default" },
+      null
+    );
+
+    expect(result).toEqual({ props: { success: false } });
+    expect(consoleErrorSpy).toHaveBeenCalledWith(
+      "Error fetching affiliate link:",
+      expect.any(Error)
+    );
+
+    consoleErrorSpy.mockRestore();
+  });
+
   test("getTrackingAPIParams tests", async () => {
     const params = Tracker.getTrackingAPIParams(
       "temlateValue",

package/src/hooks/modal/modal-content.js

@@ -6,62 +6,47 @@ import PropTypes from "prop-types";
 import { ModalContext } from "./modalContext";
 import styles from "./modal.module.scss";
 import useTranslate from "~hooks/useTranslate/useTranslate";
+import { toggleScroll } from "~helpers/scroll";
 
 const ModalContent = ({ closeIcon, customCss, children }) => {
   const { showModal, setShowModal } = useContext(ModalContext);
   const modal = useRef(null);
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const close = () => {
-    document.body.style.overflow = "auto";
-    setShowModal(false);
-  };
-
   useEffect(() => {
-    if (showModal) {
-      modal.current.classList.toggle(styles.activeModal);
-    } else {
-      modal.current.classList.remove(styles.activeModal);
-    }
-  }, [showModal]);
+    if (!showModal) return;
+
+    toggleScroll("modal");
 
-  // Close on esc
-  useEffect(() => {
     const handleEsc = (event) => {
       if (event.keyCode === 27) {
-        close();
+        setShowModal(false);
       }
     };
-    if (typeof window !== "undefined")
-      window.addEventListener("keydown", handleEsc);
-    return () => {
-      if (typeof window !== "undefined")
-        window.removeEventListener("keydown", handleEsc);
-    };
-  }, [close]);
 
-  // Close on outside click
-  useEffect(() => {
     const handleOutsideClick = (event) => {
       if (
         modal.current &&
         !modal.current.contains(event.target) &&
-        !modal.current.previousElementSibling.contains(event.target)
+        !modal.current.previousElementSibling?.contains(event.target)
       ) {
-        close();
+        setShowModal(false);
       }
     };
-    if (typeof window !== "undefined")
-      window.addEventListener("mousedown", handleOutsideClick);
+
+    window.addEventListener("keydown", handleEsc);
+    window.addEventListener("mousedown", handleOutsideClick);
+
     return () => {
-      if (typeof window !== "undefined")
-        window.removeEventListener("mousedown", handleOutsideClick);
+      window.removeEventListener("keydown", handleEsc);
+      window.removeEventListener("mousedown", handleOutsideClick);
+      toggleScroll("modal");
     };
-  }, [close]);
+  }, [showModal, setShowModal]);
+
   const closeIconAriaLabel = useTranslate("ariaLabel-closeIcon", "Close Icon");
   return (
-    <div className={styles.modalInner || ""} ref={modal}>
-      <div className={styles.modalOverlay || ""} onClick={close} />
+    <div className={`${styles.modalInner || ""} ${showModal ? styles.activeModal || "" : ""}`} ref={modal}>
+      <div className={styles.modalOverlay || ""} onClick={() => setShowModal(false)} />
       <div
         className={`${styles.modalContent || ""} ${
           customCss ? customCss || "" : ""
@@ -72,7 +57,7 @@ const ModalContent = ({ closeIcon, customCss, children }) => {
             className={`${styles.closeIcon || ""} modal-gtm btn-cta`}
             aria-label={closeIconAriaLabel}
             type="button"
-            onClick={close}
+            onClick={() => setShowModal(false)}
           >
             {closeIcon}
           </button>

package/src/resolver/index.mjs

@@ -150,7 +150,8 @@ export function processSections(
   data,
   toplists,
   content,
-  previewPageID
+  previewPageID,
+  operators = {}
 ) {
   // pageId we will use it just on operator review pages
   const pageId = page ? page.id : null;
@@ -225,7 +226,8 @@ export function processSections(
             toplists,
             content,
             prefilledMarketModules,
-            previewPageID
+            previewPageID,
+            operators
           );
           sections[sectionKey].modules[key] = module;
           if (module?.filters) {
@@ -334,13 +336,15 @@ export function processExtraFields(
   });
 }
 
-function updatePlaceholders(page, data, translationsData) {
+function updatePlaceholders(page, data, translationsData, operators = {}) {
+
   page.title =
     page.title &&
     generatePlaceholderString(page.title, translationsData, {
       siteName: data.site_name,
       pageTitle: page.title,
       market: page.market,
+      operators
     });
 
   page.meta_title =
@@ -357,6 +361,7 @@ function updatePlaceholders(page, data, translationsData) {
       siteName: data.site_name,
       pageTitle: page.title,
       market: page.market,
+      operators
     });
 }
 
@@ -425,7 +430,7 @@ export default {
               relations,
               data.content
             );
-          updatePlaceholders(page, generalData, translations);
+          updatePlaceholders(page, generalData, translations, data.operators);
 
           // Set Affiliate relations
           processRelations(
@@ -477,7 +482,8 @@ export default {
                 siteName: generalData.site_name,
                 pageTitle: page.title,
                 market: page.market,
-              }
+              },
+              data.operators
             );
           }
 
@@ -651,7 +657,8 @@ export default {
           null,
           data.toplists,
           data.content,
-          previewPageID
+          previewPageID,
+          data.operators || {}
         );
       }
 
@@ -676,7 +683,8 @@ export default {
                   data,
                   data.toplists,
                   data.content,
-                  previewPageID
+                  previewPageID,
+                  data.operators || {}
                 ),
               });
             }

package/src/resolver/modules.mjs

@@ -515,7 +515,8 @@ export function processContentModule(
   translations,
   relationData,
   content,
-  previewPageID
+  previewPageID,
+  operators,
 ) {
   module.value = previewPageID
     ? module.value
@@ -524,7 +525,8 @@ export function processContentModule(
   module.value = generatePlaceholderString(
     module.value,
     translations,
-    relationData
+    relationData,
+    operators
   );
 
   module.value = trailingSlash(module.value);
@@ -536,7 +538,17 @@ export function processContentModule(
     module.show_more_content = generatePlaceholderString(
       module.show_more_content,
       translations,
-      relationData
+      relationData,
+      operators
+    );
+  }
+
+  if (module.module_introduction && Object.keys(operators).length) {
+    module.module_introduction = generatePlaceholderString(
+      module.module_introduction,
+      translations,
+      relationData,
+      operators,
     );
   }
 }
@@ -552,14 +564,14 @@ export function shouldSavePrefilled(module = {}, siteName) {
   );
 }
 
-export function processSpotlightModule(module = {}, content, previewPageID) {
+export function processSpotlightModule(module = {}, content, previewPageID, translations, relationData, operators) {
   module.items.forEach((item) => {
     item.content = trailingSlash(
       previewPageID ? item.content : (content && content[item.content]) || ""
     );
-    item.text = trailingSlash(
-      previewPageID ? item.text : (content && content[item.text]) || ""
-    );
+    item.text = generatePlaceholderString(trailingSlash(
+      previewPageID ? item.text : (content && content[item.text]) || "",
+    ), translations, relationData, operators);
   });
 
   return module;
@@ -572,30 +584,32 @@ export function processCarouselModule(module = {}, content) {
   return module;
 }
 
-export function processFaq(module = {}, content, relationData, previewPageID) {
+export function processFaq(module = {}, content, relationData, previewPageID, operators) {
   // eslint-disable-next-line no-unused-expressions
   module.items &&
     // eslint-disable-next-line array-callback-return
     module.items.map((item) => {
       item.question = trailingSlash(
         previewPageID
-          ? generatePlaceholderString(item.question, null, relationData)
+          ? generatePlaceholderString(item.question, null, relationData, operators)
           : (content
               ? generatePlaceholderString(
                   content[item.question],
                   null,
-                  relationData
+                  relationData,
+                  operators,
                 )
               : "") || ""
       );
       item.answer = trailingSlash(
         previewPageID
-          ? generatePlaceholderString(item.answer, null, relationData)
+          ? generatePlaceholderString(item.answer, null, relationData, operators)
           : (content &&
               generatePlaceholderString(
                 content[item.answer],
                 null,
-                relationData
+                relationData,
+                operators
               )) ||
               ""
       );
@@ -632,19 +646,29 @@ export function processModule(
   toplists,
   content,
   prefilledMarketModules,
-  previewPageID
+  previewPageID,
+  operators
 ) {
   module.module_title =
     module.module_title &&
-    generatePlaceholderString(module.module_title, translations, relationData);
+    generatePlaceholderString(module.module_title, translations, relationData, operators);
   module.title =
     module.title &&
-    generatePlaceholderString(module.title, translations, relationData);
+    generatePlaceholderString(module.title, translations, relationData, operators);
   
   module.anchor_slug =
     module.anchor_slug &&
     generatePlaceholderString(module.anchor_slug, translations, relationData);
 
+  module.module_introduction =
+    module.module_introduction &&
+    generatePlaceholderString(
+      module.module_introduction,
+      translations,
+      relationData,
+      operators,
+    ); 
+
   // See more link
   if (
     module.see_more_link?.value &&
@@ -671,7 +695,8 @@ export function processModule(
       translations,
       relationData,
       content,
-      previewPageID
+      previewPageID,
+      operators,
     );
   } else if (module.name === "bonus") {
     processBonus(module, relations, data);
@@ -686,11 +711,11 @@ export function processModule(
       translations
     );
   } else if (module.name === "faq") {
-    processFaq(module, content, relationData, previewPageID);
+    processFaq(module, content, relationData, previewPageID, operators);
   } else if (module.name === "anchor") {
     processAnchor(module, relationData, translations);
   } else if (module.name === "spotlights") {
-    processSpotlightModule(module, content, previewPageID);
+    processSpotlightModule(module, content, previewPageID, translations, relationData, operators);
   } else if (module.name === "menu" && menus && menus[module.menu_id]) {
     module = Object.assign(module, menus[module.menu_id]);
   } else if (module.name === "statistics_counter") {