gatsby-core-theme 44.24.2 → 44.25.0

package/.ci.yml

@@ -36,6 +36,8 @@ Theme Publish:
     - yarn config set cache-folder .yarn
     - yarn
     - cd gatsby-theme/
+    - rm -rf /root/.npmrc /root/.npm
+    - npm cache clean --force
     - npx semantic-release@22.0.0 -b $CI_COMMIT_REF_NAME
   when: manual
   only:

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [44.25.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.24.2...v44.25.0) (2026-05-20)
+
+
+### Bug Fixes
+
+* add ribbon from hercules on spotlight module ([2c751d3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2c751d3c97c06668ff53ba5e7616308cde00800a))
+* resolver the burger menu issue on minimized screen ([5424878](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/54248783100f950a79509505e17e466beaee6d52))
+* update ci yml ([4f152ca](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4f152cab1cad735d4d003891c49012537fb0fbc3))
+
+
+* Merge branch 'update-ci' into 'master' ([99888c5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/99888c5cc0ad79a5e7409177088131048928c1d9))
+* Merge branch 'en-397-burger-menu-issue' into 'master' ([1076c0b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1076c0b35a165bdc624eac186d1989da3b8b6fe4))
+* Merge branch 'EN-533' into 'master' ([da87f4b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/da87f4b7eb04d717660f562bb4a2e7e070e32925))
+* Merge branch 'en-505-xff-tracking' into 'master' ([1af8d32](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1af8d32658e6d0c4bf1bd17ff77853b584980470))
+
+
+### Features
+
+* priorite xff ip if enabled ([20b1b71](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/20b1b719e33ce41c15a773c4fba1d381fed27510))
+
 ## [44.24.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.24.1...v44.24.2) (2026-05-18)
 
 

package/package.json

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

package/src/components/atoms/menu/items/index.js

@@ -15,7 +15,6 @@ const Items = ({ item, menuListRef, orientation = 'horizontal', gtmClass = '', l
 
   const parentMenuRef = useRef(null);
   const subMenuListRef = useRef(null);
-
   const closeOtherMenus = (target) => {
     const parentsWithOpenSubMenu = target.parentNode.getElementsByClassName(styles.showSubMenu)[0];
     const openSubmenus = parentsWithOpenSubMenu?.getElementsByClassName(styles.show)[0];
@@ -46,6 +45,18 @@ const Items = ({ item, menuListRef, orientation = 'horizontal', gtmClass = '', l
     target.getElementsByTagName('UL')[0]?.classList.toggle(styles.show);
   };
 
+  const handleClick = (e) => {
+    if (typeof window === "undefined") return;
+
+    const isMobileView = window.innerWidth < 1199;
+
+    if (isMobileDevice() || isMobileView) {
+      if (e.defaultPrevented) return;
+      e.preventDefault();
+      onClick(e);
+    }
+  };
+
   if (item.children) {
     link = <Item item={item} gtmClass={gtmClass} orientation={orientation} active={currentPage === item.value} />;
     menu = (
@@ -83,18 +94,10 @@ const Items = ({ item, menuListRef, orientation = 'horizontal', gtmClass = '', l
       role="menuitem"
       tabIndex="0"
       onKeyDown={(e) => {
-        if (isMobileDevice()) {
-          if (e.defaultPrevented) return;
-          e.preventDefault();
-          onClick(e);
-        }
+        handleClick(e);
       }}
       onClick={(e) => {
-        if (isMobileDevice()) {
-          if (e.defaultPrevented) return;
-          e.preventDefault();
-          onClick(e);
-        }
+        handleClick(e)
       }}
     >
       {link}

package/src/components/molecules/spotlights_v2/sport-odds/ribbon-header.js

@@ -0,0 +1,38 @@
+import React from "react";
+import PropTypes from "prop-types";
+import useTranslate from "~hooks/useTranslate/useTranslate";
+import FunIcon from "../../../../images/icons/funIcon";
+
+export const FUNBET_TRANSLATION_KEY = "funbet";
+export const FUNBET_DEFAULT_LABEL = "Funbet";
+
+export function getRibbonTranslationKey(item) {
+  const label = item?.page?.ribbons?.[0]?.label;
+  return typeof label === "string" ? label.trim() : "";
+}
+
+export default function RibbonHeader({ item }) {
+  const ribbonKey = getRibbonTranslationKey(item);
+  const translationKey = ribbonKey || FUNBET_TRANSLATION_KEY;
+  const defaultValue = ribbonKey || FUNBET_DEFAULT_LABEL;
+  const label = useTranslate(translationKey, defaultValue);
+
+  return (
+    <>
+      <FunIcon />
+      <span>{label}</span>
+    </>
+  );
+}
+
+RibbonHeader.propTypes = {
+  item: PropTypes.shape({
+    page: PropTypes.shape({
+      ribbons: PropTypes.arrayOf(
+        PropTypes.shape({
+          label: PropTypes.string,
+        })
+      ),
+    }),
+  }),
+};

package/src/components/molecules/spotlights_v2/sport-odds/template-one/index.js

@@ -5,7 +5,7 @@ import LazyImage from "~hooks/lazy-image";
 import Button from "../../../../atoms/button/operator-cta";
 import Tnc from '../../../tnc'
 import useTranslate from "~hooks/useTranslate/useTranslate";
-import FunIcon from "../../../../../images/icons/funIcon";
+import RibbonHeader from "../ribbon-header";
 import styles from "./template-one.module.scss";
 
 const DEFAULT_CTA_TRANSLATE = {
@@ -33,7 +33,6 @@ export default function TemplateOne({
   const items = module?.items;
   const ctaText = module?.link_text;
   const date = useTranslate('date', 'Date:');
-  const funbetLabel = useTranslate('funbet', 'Funbet');
 
   return (
     <div className={styles.sportOdds}>
@@ -58,10 +57,9 @@ export default function TemplateOne({
                       <span className={styles.operatorIcon} aria-hidden="true" />
                     )}
                     {operatorName && <span>{operatorName}</span>}
-                  </> : <>
-                    <FunIcon />
-                    <span>{funbetLabel}</span>
-                  </>
+                  </> : (
+                    <RibbonHeader item={item} />
+                  )
               }
             </div>
 

package/src/components/molecules/spotlights_v2/sport-odds/template-one/template-one.test.js

@@ -54,4 +54,18 @@ describe('Sport Odds TemplateOne Component', () => {
     const { container } = render(<TemplateOne module={module} />);
     expect(container.querySelectorAll('div').length).toBeGreaterThan(0);
   });
+
+  test('renders translated ribbon label when page ribbon exists', () => {
+    const module = buildModule();
+    module.items[0].page = {
+      ribbons: [{ label: '  fun bet  ' }],
+    };
+    const { getByText } = render(<TemplateOne module={module} />);
+    expect(getByText('fun bet')).toBeInTheDocument();
+  });
+
+  test('falls back to Funbet label when ribbon label is missing', () => {
+    const { getAllByText } = render(<TemplateOne module={buildModule()} />);
+    expect(getAllByText('Funbet').length).toBeGreaterThan(0);
+  });
 });

package/src/components/molecules/spotlights_v2/sport-odds/template-two/index.js

@@ -8,7 +8,7 @@ import Button from "../../../../atoms/button/operator-cta";
 import Tnc from "../../../tnc";
 import ScrollX from "~hooks/scroll-x";
 import useTranslate from "~hooks/useTranslate/useTranslate";
-import FunIcon from "../../../../../images/icons/funIcon";
+import RibbonHeader from "../ribbon-header";
 import styles from "./template-two.module.scss";
 
 const DEFAULT_CTA_TRANSLATE = {
@@ -43,7 +43,6 @@ export default function TemplateTwo({
   const items = module?.items;
   const ctaText = module?.link_text;
   const date = useTranslate('date', 'Date:');
-  const funbetLabel = useTranslate('funbet', 'Funbet');
 
   const updateButtons = (shift) => {
     setScrollEnd(
@@ -110,10 +109,9 @@ export default function TemplateTwo({
                           <span className={styles.operatorIcon} aria-hidden="true" />
                         )}
                         {operatorName && <span>{operatorName}</span>}
-                      </> : <>
-                        <FunIcon />
-                        <span>{funbetLabel}</span>
-                      </>
+                      </> : (
+                        <RibbonHeader item={item} />
+                      )
                   }
                 </div>
 

package/src/components/molecules/spotlights_v2/sport-odds/template-two/template-two.test.js

@@ -54,4 +54,18 @@ describe('Sport Odds TemplateTwo Component', () => {
     const { container } = render(<TemplateTwo module={module} />);
     expect(container.querySelectorAll('div').length).toBeGreaterThan(0);
   });
+
+  test('renders translated ribbon label when page ribbon exists', () => {
+    const module = buildModule();
+    module.items[0].page = {
+      ribbons: [{ label: '  fun bet  ' }],
+    };
+    const { getByText } = render(<TemplateTwo module={module} />);
+    expect(getByText('fun bet')).toBeInTheDocument();
+  });
+
+  test('falls back to Funbet label when ribbon label is missing', () => {
+    const { getAllByText } = render(<TemplateTwo module={buildModule()} />);
+    expect(getAllByText('Funbet').length).toBeGreaterThan(0);
+  });
 });

package/src/helpers/tracker.mjs

@@ -105,7 +105,12 @@ function extractUrlParams(url) {
 
 // Helper to construct URL parameters
 function buildUrlParams(operator, trackerName, headers, cookie, extraParams) {
-  const ip = headers?.get("x-real-ip") || headers?.get("host") || "127.0.0.1";
+  const ip =
+    (process.env.TRUST_XFF === "true" &&
+      headers?.get("x-forwarded-for")?.split(",")[0].trim()) ||
+    headers?.get("x-real-ip") ||
+    headers?.get("host") ||
+    "127.0.0.1";
   const userAgent = headers?.get("user-agent") || null;
 
   const affObject = isJsonString(cookie.affObject)
@@ -177,7 +182,9 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
 
     const contentType = res.headers.get("content-type");
     if (!contentType || !contentType.includes("application/json")) {
-      console.error(`Tracking API returned non-JSON content-type: ${contentType}`);
+      console.error(
+        `Tracking API returned non-JSON content-type: ${contentType}`
+      );
       return { props: { success: false } };
     }
 
@@ -186,7 +193,10 @@ export async function getAffiliateLink(operator, path, page, headers, url) {
       const data = await res.json();
       return { props: data };
     } catch (jsonError) {
-      console.error("Failed to parse tracking API response as JSON:", jsonError);
+      console.error(
+        "Failed to parse tracking API response as JSON:",
+        jsonError
+      );
       return { props: { success: false } };
     }
   } catch (error) {