gatsby-matrix-theme 53.17.3 → 53.18.0

package/.ci.yml

@@ -44,6 +44,8 @@ Theme Publish:
     - yarn
     - cd matrix-theme/
     - yarn
+    - 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,22 @@
+# [53.18.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.17.4...v53.18.0) (2026-05-21)
+
+
+* Merge branch 'EN-534/sportstake-data-fixes' into 'master' ([605ec4c](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/605ec4c5a7c682565a9f2fc24f794dbda4bb94d9))
+
+
+### Features
+
+* refactor and fix sportstake data ([60e980c](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/60e980ca8de6cd6a3222b586d9b875b234e7a169))
+* refactor results ([a9f9389](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/a9f9389da7308cfd4342c977ee78efa46a3e2535))
+
+## [53.17.4](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.17.3...v53.17.4) (2026-05-20)
+
+
+### Bug Fixes
+
+* remove cashe on ci ([7306c15](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/7306c15f0cc708e03a1f7ab64608c2975a936166))
+* update core theme version ([c63dead](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/c63dead4177bce839546b91feb24e756ceb806af))
+
 ## [53.17.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.17.2...v53.17.3) (2026-05-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "53.17.3",
+  "version": "53.18.0",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -26,7 +26,7 @@
     "@react-icons/all-files": "^4.1.0",
     "@gigmedia/enigma-utils": "^1.20.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "^44.24.2",
+    "gatsby-core-theme": "^44.25.0",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^6.13.1",
     "gatsby-transformer-sharp": "^5.11.0",

package/src/components/molecules/sportstake/fixtures/index.js

@@ -43,13 +43,13 @@ const Fixtures = ({ module, serverData }) => {
     }
   }, []);
 
-  const mutateObjectAtributes = (obj) => {
+  const mutateObjectAtributes = (obj, fallbackDate) => {
     obj.forEach((element, index) => {
       obj[index] = {
         homeTeam: element.homeTeam,
         awayTeam: element.awayTeam,
         toss: element.toss_winner,
-        dateTime: element.eventDate || element.dateTime,
+        dateTime: element.eventDate || element.dateTime || element.date || fallbackDate,
       };
     });
   };
@@ -73,19 +73,23 @@ const Fixtures = ({ module, serverData }) => {
           ? Object.values(games).slice(...query.firstTable)
           : Object.values(games)
         : [];
-      mutateObjectAtributes(firstTableGames);
+      mutateObjectAtributes(firstTableGames, activeFixture?.drawDate);
 
       const secondTableGames = games ? Object.values(games).slice(...query.secondTable) : [];
-      mutateObjectAtributes(secondTableGames);
+      mutateObjectAtributes(secondTableGames, activeFixture?.drawDate);
       
       const isLatestTab = (index === 0);
+      const drawDate = res?.drawDate ? new Date(res.drawDate) : null;
+      const hasValidDrawDate = drawDate && !Number.isNaN(drawDate.getTime());
       const label = isLatestTab
         ? 'Latest'
-        : daysOfWeek[new Date(res.drawDate).getDay()];
+        : hasValidDrawDate
+          ? daysOfWeek[drawDate.getDay()]
+          : '';
 
-      const results = `${monthsOfYear[new Date(res.drawDate).getMonth()]} ${new Date(
-          res.drawDate
-          ).getDate()}`;
+      const results = hasValidDrawDate
+        ? `${monthsOfYear[drawDate.getMonth()]} ${drawDate.getDate()}`
+        : '';
 
         return (
           <div label={label} results={results} key={res} className={`${styles.sportstake} ${hasTwoTables && styles.twoHalfs}`}>

package/src/components/molecules/sportstake/results/index.js

@@ -30,10 +30,8 @@ const Results = ({ module, serverData }) => {
   }
 
   const isCricket = moduleName.includes('cricket');
-  const isRugby = moduleName.includes('rugby');
   const isSportstake4 = moduleName.includes('sportstake4');
   const hasTwoTables = moduleName.includes('sportstake8') || isSportstake4;
-  const newSportStakes = isCricket || isSportstake4 || isRugby;
   const query = getApiQueryParams(moduleName);
   const headerList = isCricket ? tableHeaderCricket : tableHeader;
 
@@ -42,17 +40,21 @@ const Results = ({ module, serverData }) => {
   const monthsOfYear = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec',];
   const tabs = Object.values(serverData?.data[moduleName]);
 
-  const mutateObjectAtributes = (obj) => {
+  const mutateObjectAtributes = (obj, fallbackDate) => {
     obj.forEach((element, index) => {
+      const fallbackScore =
+        element?.homeScore !== undefined && element?.awayScore !== undefined
+          ? `${element.homeScore}-${element.awayScore}`
+          : '';
       obj[index] = {
         homeTeam: element.homeTeam,
         awayTeam: element.awayTeam,
-        toss: element.toss_winner,
-        dateTime: element.eventDate,
+        toss: element.toss_winner || element.toss,
+        dateTime: element.eventDate || element.dateTime || fallbackDate,
         score: isCricket
-          ? `${element.homeScore || '0/0'}`
-          : `${element.homeScore}-${element.awayScore}`,
-        results: element.result,
+          ? `${element.homeScore || element.score || '0/0'}`
+          : element.score || fallbackScore,
+        results: element.result || element.results,
       };
     });
   };
@@ -75,19 +77,23 @@ const Results = ({ module, serverData }) => {
           ? Object.values(games).slice(...query.firstTable)
           : Object.values(games)
         : [];
-      newSportStakes && mutateObjectAtributes(firstTableGames);
+      mutateObjectAtributes(firstTableGames, activeFixture?.drawDate);
 
       const secondTableGames = games ? Object.values(games).slice(...query.secondTable) : [];
-      newSportStakes && mutateObjectAtributes(secondTableGames);
+      mutateObjectAtributes(secondTableGames, activeFixture?.drawDate);
       
       const isLatestTab = (index === 0);
+      const drawDate = res?.drawDate ? new Date(res.drawDate) : null;
+      const hasValidDrawDate = drawDate && !Number.isNaN(drawDate.getTime());
       const label = isLatestTab
         ? 'Latest'
-        : daysOfWeek[new Date(res.drawDate).getDay()];
+        : hasValidDrawDate
+          ? daysOfWeek[drawDate.getDay()]
+          : '';
 
-      const results = res ? `${monthsOfYear[new Date(res.drawDate).getMonth()]} ${new Date(
-          res.drawDate
-          ).getDate()}` : '';
+      const results = hasValidDrawDate
+        ? `${monthsOfYear[drawDate.getMonth()]} ${drawDate.getDate()}`
+        : '';
 
         return (
           <div label={label} results={results} key={res} className={`${styles.sportstake} ${hasTwoTables && styles.twoHalfs}`}>

package/src/components/molecules/sportstake/results/table/index.js

@@ -17,7 +17,23 @@ const SportstakeTable = ({
     const { divs } = fixture?.drawDetails || {};
     const { winnerData } = fixture?.more_info || {};
     const { totalPrizePool, estimatedJackpot, nextEstimatedJackpotAmt } = fixture?.more_info || {};
-    const divsList = divs ? Object.values(divs) : winnerData ? Object.values(winnerData) : [];
+
+    const normalizeCurrencyValue = (value) => {
+      if (value === null || value === undefined || value === '') return null;
+      if (typeof value === 'number') return value;
+      const parsedValue = parseFloat(String(value).replace(/,/g, '').replace(/[^\d.-]/g, ''));
+      return Number.isNaN(parsedValue) ? null : parsedValue;
+    };
+
+    const rawDivsList = divs ? Object.values(divs) : winnerData ? Object.values(winnerData) : [];
+    const divsList = rawDivsList.map((item) => ({
+      ...item,
+      winners: item?.winners ?? item?.no_of_winners,
+      payout:
+        normalizeCurrencyValue(item?.payout) ??
+        normalizeCurrencyValue(item?.payout_per_winner_system) ??
+        normalizeCurrencyValue(item?.prizeAmount),
+    }));
 
     return (
         <div className={styles.divTable}>

package/src/gatsby-core-theme/helpers/server-data.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-prototype-builtins */
 /* eslint-disable no-nested-ternary */
+/* eslint-disable no-underscore-dangle */
 /* eslint-disable import/prefer-default-export */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import chalk from 'chalk';
@@ -177,22 +178,21 @@ export async function getAPIData(page, url, header, preview) {
         const previousMonth = month === 1 ? 12 : month - 1;
 
         const calendarData = await getCalendarData(query.lotteryName, month, date.getFullYear());
-
-        const prevMonth =
+        const prevMonthData =
           calendarData.length <= 2
             ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear())
             : [];
 
         const orderedPrevMonth =
           calendarData.length === 0
-            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
-            : prevMonth;
+            ? [prevMonthData[prevMonthData.length - 1], ...prevMonthData.slice(0, prevMonthData.length - 1)]
+            : prevMonthData;
 
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
           ...orderedPrevMonth,
-        ].filter((item) => item && !Array.isArray(item));
+        ].filter((item) => item && !Array.isArray(item) && item._id);
 
         reorderedResultData.sort((a, b) => {
           const dateA = new Date(a.drawDate);
@@ -200,10 +200,10 @@ export async function getAPIData(page, url, header, preview) {
           return dateB.getTime() - dateA.getTime();
         });
 
-        reorderedResultData[0] = reorderedResultData[0]
-          ? // eslint-disable-next-line no-underscore-dangle
-            await getResultsById(reorderedResultData[0]._id)
-          : {};
+        if (reorderedResultData[0]?._id) {
+          const latestResult = await getResultsById(reorderedResultData[0]._id);
+          if (latestResult) reorderedResultData[0] = latestResult;
+        }
 
         return { [moduleName]: reorderedResultData };
       })
@@ -233,23 +233,21 @@ export async function getAPIData(page, url, header, preview) {
 
         const calendarData = await getCalendarData(query.lotteryName, month, date.getFullYear());
 
-        if (!calendarData) return;
-
-        const prevMonth =
+        const prevMonthData =
           calendarData.length <= 2
             ? await getCalendarData(query.lotteryName, previousMonth, date.getFullYear())
             : [];
 
         const orderedPrevMonth =
           calendarData.length === 0
-            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
-            : prevMonth;
+            ? [prevMonthData[prevMonthData.length - 1], ...prevMonthData.slice(0, prevMonthData.length - 1)]
+            : prevMonthData;
 
         const reorderedResultData = [
           calendarData[calendarData.length - 1],
           ...calendarData.slice(0, calendarData.length - 1),
           ...orderedPrevMonth,
-        ].filter((item) => item && !Array.isArray(item));
+        ].filter((item) => item && !Array.isArray(item) && item._id);
 
         reorderedResultData.sort((a, b) => {
           const dateA = new Date(a.drawDate);
@@ -257,10 +255,10 @@ export async function getAPIData(page, url, header, preview) {
           return dateB.getTime() - dateA.getTime();
         });
 
-        reorderedResultData[0] = reorderedResultData[0]
-          ? // eslint-disable-next-line no-underscore-dangle
-            await getResultsById(reorderedResultData[0]._id)
-          : null;
+        if (reorderedResultData[0]?._id) {
+          const latestResult = await getResultsById(reorderedResultData[0]._id);
+          if (latestResult) reorderedResultData[0] = latestResult;
+        }
 
         return { [moduleName]: reorderedResultData };
       })
@@ -292,17 +290,15 @@ export async function getAPIData(page, url, header, preview) {
 
         const availableDates = await getAvailableDrawDays(apiBaseNames[0], 'WEEKEND', month, year);
 
-        if (!availableDates) return;
-
-        const prevMonth =
+        const prevMonthData =
           availableDates.length <= 2
             ? await getAvailableDrawDays(apiBaseNames[0], 'WEEKEND', previousMonth, year)
             : [];
 
         const orderedPrevMonth =
           availableDates.length === 0
-            ? [prevMonth[prevMonth.length - 1], ...prevMonth.slice(0, prevMonth.length - 1)]
-            : prevMonth;
+            ? [prevMonthData[prevMonthData.length - 1], ...prevMonthData.slice(0, prevMonthData.length - 1)]
+            : prevMonthData;
 
         const reorderedDates = [
           availableDates[availableDates.length - 1],
@@ -342,10 +338,10 @@ export async function getAPIData(page, url, header, preview) {
       types.map(async (type) => {
         const data = await getLottoUKdata(true, false, type);
         const calendarData = await getCalendarData(type, month, year);
-        const prevMonth =
+        const prevMonthData =
           calendarData.length <= 2 ? await getCalendarData(type, previousMonth, year) : [];
 
-        const reorderedDates = [...calendarData, ...prevMonth].filter(
+        const reorderedDates = [...calendarData, ...prevMonthData].filter(
           (item) => item && !Array.isArray(item)
         );
 

package/src/gatsby-core-theme/helpers/services.js

@@ -53,7 +53,7 @@ export const getAvailableDrawDays = async (
 
   const data = res ? await res.json() : { success: false };
 
-  return data.data;
+  return Array.isArray(data?.data) ? data.data : [];
 };
 
 /* -------------------------------------------------------------------------- */
@@ -76,5 +76,5 @@ export const getCalendarData = async (type, month, year) => {
     `${process.env.LOTTERY_API_URL}calendar/${type}?month=${month}&year=${year}`
   ).catch(() => null);
   const data = res ? await res.json() : { success: false };
-  return data.data;
+  return Array.isArray(data?.data) ? data.data : [];
 };

package/src/gatsby-core-theme/helpers/sportstake.js

@@ -1,11 +1,13 @@
 export const formatScore = (val) => {
   let scores = val?.split('-');
   scores = scores?.map((score) => {
-    if (score.length === 2 && score.charAt(0) === '0') {
-      return score.substring(1);
+    const trimmedScore = score?.trim();
+
+    if (/^0\d$/.test(trimmedScore)) {
+      return trimmedScore.substring(1);
     }
 
-    return score;
+    return trimmedScore;
   });
 
   return scores?.join(' - ');