gatsby-matrix-theme 53.24.0 → 53.25.0

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+# [53.25.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.24.0...v53.25.0) (2026-07-02)
+
+
+* Merge branch 'EN-574/update-lottery-api' into 'master' ([3d24359](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/3d24359cb39c9ec8d592e6bb83d7cf04124821d0))
+* Merge branch 'master' of gitlab.com:g2m-gentoo/team-floyd/themes/matrix-theme into EN-574/update-lottery-api ([5e77ea7](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/5e77ea7b15a7298f11f10b3b4d258227c1fa4f95))
+
+
+### Features
+
+* replace sportstake api with matchplay ([f2e3410](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/commit/f2e34100aa28cecf371abd16e9f6e10d87ff20fa))
+
 # [53.24.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/matrix-theme/compare/v53.23.0...v53.24.0) (2026-07-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "53.24.0",
+  "version": "53.25.0",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",

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

@@ -24,10 +24,9 @@ const Fixtures = ({ module, serverData }) => {
     return;
   }
 
-  const isCricket = moduleName.includes('cricket');
-  const isSportstake4 = moduleName.includes('sportstake4');
-  const hasTwoTables = moduleName.includes('sportstake8') || isSportstake4;
   const query = getApiQueryParams(moduleName);
+  const isMatchplay8 = query.lotteryName === 'matchplay8';
+  const hasTwoTables = query.lotteryName === 'matchplay8' || query.lotteryName === 'matchplay14';
 
   const headerList = tableHeader.slice(0, 4);
 
@@ -69,7 +68,7 @@ const Fixtures = ({ module, serverData }) => {
       const { games } = activeFixture?.drawDetails || {};
 
       const firstTableGames = games
-        ? hasTwoTables || isCricket
+        ? hasTwoTables
           ? Object.values(games).slice(...query.firstTable)
           : Object.values(games)
         : [];
@@ -94,11 +93,11 @@ const Fixtures = ({ module, serverData }) => {
         return (
           <div label={label} results={results} key={res} className={`${styles.sportstake} ${hasTwoTables && styles.twoHalfs}`}>
             <SportstakeHeader fixture={activeFixture} />
-            {isSportstake4 && <h3>1st half</h3>}
+            {isMatchplay8 && <h3>1st half</h3>}
             <Table headerList={headerList} rowList={firstTableGames} />
             {hasTwoTables && (
               <>
-                <h3>{!isSportstake4 ? '2nd Half' : 'Full Time'}</h3>
+                <h3>{!isMatchplay8 ? '2nd Half' : 'Full Time'}</h3>
                 <Table headerList={headerList} rowList={secondTableGames} />
               </>
             )}
@@ -121,15 +120,18 @@ Fixtures.propTypes = {
     module_introduction: PropTypes.string,
   }).isRequired,
   pageContext: PropTypes.shape({}),
-  serverData: PropTypes.arrayOf(
-    PropTypes.shape({
-      _id: PropTypes.string,
-      data: PropTypes.shape({}),
-      drawDate: PropTypes.string,
-      drawDetails: PropTypes.shape({
-        games: PropTypes.shape({}),
-        divs: PropTypes.shape({}),
-      }),
-    }),
-  ) 
+  serverData: PropTypes.shape({
+    data: PropTypes.objectOf(
+      PropTypes.arrayOf(
+        PropTypes.shape({
+          _id: PropTypes.string,
+          drawDate: PropTypes.string,
+          drawDetails: PropTypes.shape({
+            games: PropTypes.shape({}),
+            divs: PropTypes.shape({}),
+          }),
+        })
+      )
+    ),
+  }),
 };

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

@@ -5,11 +5,8 @@ import React, {useState} from 'react';
 import PropTypes from 'prop-types';
 import Tabs from 'gatsby-core-theme/src/hooks/tabs';
 import { getResultsById } from '../../../../gatsby-core-theme/helpers/services';
-import { getApiQueryParams } from '../../../../gatsby-core-theme/helpers/sportstake';
-import {
-  tableHeader,
-  tableHeaderCricket,
-} from '../../../../gatsby-core-theme/constants/sportstake';
+import { getApiQueryParams, formatMatchResult } from '../../../../gatsby-core-theme/helpers/sportstake';
+import { tableHeader } from '../../../../gatsby-core-theme/constants/sportstake';
 import SportstakeHeader from './header';
 import SportstakeTable from './table';
 import Table from '../table';
@@ -29,11 +26,10 @@ const Results = ({ module, serverData }) => {
     setTabData(response);
   }
 
-  const isCricket = moduleName.includes('cricket');
-  const isSportstake4 = moduleName.includes('sportstake4');
-  const hasTwoTables = moduleName.includes('sportstake8') || isSportstake4;
   const query = getApiQueryParams(moduleName);
-  const headerList = isCricket ? tableHeaderCricket : tableHeader;
+  const isMatchplay8 = query.lotteryName === 'matchplay8';
+  const hasTwoTables = query.lotteryName === 'matchplay8' || query.lotteryName === 'matchplay14';
+  const headerList = tableHeader;
 
   if(!serverData?.data[moduleName]) return;
   const daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -51,10 +47,8 @@ const Results = ({ module, serverData }) => {
         awayTeam: element.awayTeam,
         toss: element.toss_winner || element.toss,
         dateTime: element.eventDate || element.dateTime || fallbackDate,
-        score: isCricket
-          ? `${element.homeScore || element.score || '0/0'}`
-          : element.score || fallbackScore,
-        results: element.result || element.results,
+        score: element.score || fallbackScore,
+        results: formatMatchResult(element.result ?? element.results),
       };
     });
   };
@@ -73,7 +67,7 @@ const Results = ({ module, serverData }) => {
       const { games } = activeFixture?.drawDetails || {};
 
       const firstTableGames = games
-        ? hasTwoTables || isCricket
+        ? hasTwoTables
           ? Object.values(games).slice(...query.firstTable)
           : Object.values(games)
         : [];
@@ -98,15 +92,15 @@ const Results = ({ module, serverData }) => {
         return (
           <div label={label} results={results} key={res} className={`${styles.sportstake} ${hasTwoTables && styles.twoHalfs}`}>
             <SportstakeHeader fixture={activeFixture} />
-            {isSportstake4 && <h3>1st half</h3>}
+            {isMatchplay8 && <h3>1st half</h3>}
             <Table headerList={headerList} rowList={firstTableGames} isResult />
             {hasTwoTables && (
               <>
-                <h3>{!isSportstake4 ? '2nd Half' : 'Full Time'}</h3>
+                <h3>{!isMatchplay8 ? '2nd Half' : 'Full Time'}</h3>
                 <Table headerList={headerList} rowList={secondTableGames} isResult />
               </>
             )}
-            <SportstakeTable fixture={activeFixture} query={query} isCricket={isCricket} />
+            <SportstakeTable fixture={activeFixture} query={query} />
           </div>
         );
     })}

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

@@ -4,16 +4,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Table from '../../table';
-import { divHeader, tossResultsHeader } from '../../../../../gatsby-core-theme/constants/sportstake';
+import { divHeader } from '../../../../../gatsby-core-theme/constants/sportstake';
 import { commaSeperate } from '../../../../../gatsby-core-theme/helpers/lotto';
 import styles from '../results.module.scss';
 
-const SportstakeTable = ({ 
-    fixture, 
-    query, 
-    isCricket = false 
-}) => {
-    if (!fixture) {return;}
+const SportstakeTable = ({ fixture, query }) => {
+  if (!fixture) {
+    return null;
+  }
+
     const { divs } = fixture?.drawDetails || {};
     const { winnerData } = fixture?.more_info || {};
     const { totalPrizePool, estimatedJackpot, nextEstimatedJackpotAmt } = fixture?.more_info || {};
@@ -56,15 +55,6 @@ const SportstakeTable = ({
             isDivTable
             resultTableNumber={query.secondTableStart}
             />
-
-            {isCricket && fixture?.toss_results?.winnerData && (
-            <Table
-                headerList={tossResultsHeader}
-                rowList={fixture?.toss_results?.winnerData}
-                isDivTable
-                resultTableNumber={query.secondTableStart}
-            />
-            )}
         </div>
         {(totalPrizePoolValue !== null || nextEstimatedJackpotValue !== null) && (
           <div className={styles.jackpotDiv}>
@@ -97,14 +87,10 @@ SportstakeTable.propTypes = {
         divs: PropTypes.shape({}),
       }),
       more_info: PropTypes.shape({}),
-      toss_results: PropTypes.shape({
-        winnerData: PropTypes.arrayOf(PropTypes.shape({})),
-      }),
       winnerData: PropTypes.arrayOf(PropTypes.shape({})),
     }),
     query: PropTypes.shape({
-        secondTableStart: PropTypes.shape({})
+      secondTableStart: PropTypes.number,
     }).isRequired,
-    isCricket: PropTypes.bool
   };
   

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

@@ -2,7 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { commaSeperate, formatDate } from '../../../../gatsby-core-theme/helpers/lotto';
-import { formatScore, formatLowerCase } from '../../../../gatsby-core-theme/helpers/sportstake';
+import { formatScore, formatLowerCase, formatMatchResult } from '../../../../gatsby-core-theme/helpers/sportstake';
 import styles from './table.module.scss';
 
 const Table = ({
@@ -13,7 +13,7 @@ const Table = ({
   resultTableNumber = 0,
 }) => {
   const getIcon = (result) => {
-    switch (result?.toLowerCase()) {
+    switch (formatMatchResult(result)) {
       case 'home':
       case 'home win':
         return (

package/src/gatsby-core-theme/components/molecules/module/module-constants.js

@@ -1,21 +1,13 @@
 export const SPORTSTAKE_FIXTURE_MODULES = [
-  'sportstake4fixturesmidweek',
-  'sportstake8fixturesmidweek',
-  'sportstake8fixturesweekend',
-  'sportstake13fixturesmidweek',
-  'sportstake13fixturesweekend',
-  'sportstakecricketfixturesweekend',
-  'sportstakerugbyfixturesweekend',
+  'matchplay8fixtures',
+  'matchplay14fixtures',
+  'matchplay13fixtures',
 ];
 
 export const SPORTSTAKE_RESULT_MODULES = [
-  'sportstake4resultsmidweek',
-  'sportstake8resultsmidweek',
-  'sportstake8resultsweekend',
-  'sportstake13resultsmidweek',
-  'sportstake13resultsweekend',
-  'sportstakecricketresultsweekend',
-  'sportstakerugbyresultsweekend',
+  'matchplay8results',
+  'matchplay14results',
+  'matchplay13results',
 ];
 
 export const SPORTSTAKE_MODULES = [...SPORTSTAKE_FIXTURE_MODULES, ...SPORTSTAKE_RESULT_MODULES];

package/src/gatsby-core-theme/components/molecules/module/module-registry.js

@@ -21,12 +21,15 @@ import {
   getSportstakeResultProps,
 } from './module-props';
 
+const hasSportstakeServerData = (dataKey) => (module, ctx) =>
+  Boolean(ctx.serverData?.[dataKey]?.data?.[module?.name]?.length);
+
 const sportstakeFixtureEntries = Object.fromEntries(
   SPORTSTAKE_FIXTURE_MODULES.map((name) => [
     name,
     {
       load: () => import('../../../../components/molecules/sportstake/fixtures'),
-      shouldRender: (_, ctx) => Boolean(ctx.serverData?.fixtures?.data?.length),
+      shouldRender: hasSportstakeServerData('fixtures'),
       getProps: getSportstakeFixtureProps,
       sportstakeSuspense: true,
     },
@@ -38,7 +41,7 @@ const sportstakeResultEntries = Object.fromEntries(
     name,
     {
       load: () => import('../../../../components/molecules/sportstake/results'),
-      shouldRender: (_, ctx) => Boolean(ctx.serverData?.results?.data?.length),
+      shouldRender: hasSportstakeServerData('results'),
       getProps: getSportstakeResultProps,
       sportstakeSuspense: true,
     },

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

@@ -1,15 +1,3 @@
 export const tableHeader = ['Fixture', 'Home Team', 'Away Team', 'Date', 'Score', 'Result'];
 
-export const tableHeaderCricket = [
-  'Fixture',
-  'Home Team',
-  'Away Team',
-  'Toss',
-  'Date',
-  'Score',
-  'Result',
-];
-
 export const divHeader = ['DIV', 'Matches', 'Number of Winners', 'Payout per Winner'];
-
-export const tossResultsHeader = ['DIV', 'Toss Results', 'Number of Winners', 'Payout per Winner'];

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

@@ -108,23 +108,9 @@ export const generateCustomHeadings = (moduleName, title = '') => {
     case 'daily_lotto':
       todaysDate.setDate(todaysDate.getDate() - 1);
       return `Daily Lotto Results for ${formatDate(todaysDate, 'dd/MMM/yy')}`;
-    case 'sportstake-4': {
-      const sportstake4Dates = [getLastWeekday(6), getLastWeekday(3)];
-      return `${title} for ${formatDate(sportstake4Dates.sort((a, b) => b - a)[0], 'dd/MMM/yy')}`;
-    }
-    case 'sportstake-cricket': {
-      const sportstakeCricketDates = [getLastWeekday(6)];
-      return `${title} for ${formatDate(
-        sportstakeCricketDates.sort((a, b) => b - a)[0],
-        'dd/MMM/yy'
-      )}`;
-    }
-    case 'sportstake-rugby': {
-      const sportstakeRugbyDates = [getLastWeekday(6)];
-      return `${title} for ${formatDate(
-        sportstakeRugbyDates.sort((a, b) => b - a)[0],
-        'dd/MMM/yy'
-      )}`;
+    case 'matchplay-8': {
+      const matchplay8Dates = [getLastWeekday(6), getLastWeekday(3)];
+      return `${title} for ${formatDate(matchplay8Dates.sort((a, b) => b - a)[0], 'dd/MMM/yy')}`;
     }
     default:
       return null;

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

@@ -123,20 +123,12 @@ export async function getAPIData(page, url, header, preview) {
   }
 
   const sportstakeTemplateBlocks = [
-    'sportstake4resultsmidweek',
-    'sportstake8resultsmidweek',
-    'sportstake8resultsweekend',
-    'sportstake13resultsmidweek',
-    'sportstake13resultsweekend',
-    'sportstakecricketresultsweekend',
-    'sportstakerugbyresultsweekend',
-    'sportstake4fixturesmidweek',
-    'sportstake8fixturesmidweek',
-    'sportstake8fixturesweekend',
-    'sportstake13fixturesmidweek',
-    'sportstake13fixturesweekend',
-    'sportstakecricketfixturesweekend',
-    'sportstakerugbyfixturesweekend',
+    'matchplay8results',
+    'matchplay14results',
+    'matchplay13results',
+    'matchplay8fixtures',
+    'matchplay14fixtures',
+    'matchplay13fixtures',
     'lotto',
     'daily_lotto',
     'powerball',
@@ -157,15 +149,22 @@ export async function getAPIData(page, url, header, preview) {
     (page?.categories &&
       page?.categories.filter((category) => category.short_name === 'lotto_uk_49')) ||
     [];
+  const sportstakeModules =
+    page?.sections?.main?.modules?.filter(
+      (x) => x.value_type === 'template_block' && sportstakeTemplateBlocks.includes(x.name)
+    ) || [];
+  const hasFixtureModules = sportstakeModules.some((m) => m.name.includes('fixtures'));
+  const hasResultModules = sportstakeModules.some((m) => m.name.includes('results'));
+  const hasLottoModules = sportstakeModules.some((m) =>
+    ['lotto', 'daily_lotto', 'powerball'].includes(m.name)
+  );
   let responseFixtures = {};
   let responseResults = {};
   let responseLotto = {};
   let lottoUK49 = [];
 
-  if (containsFixtures.length >= 1) {
-    const filteredArray = page?.sections?.main?.modules.filter(
-      (x) => x.value_type === 'template_block' && sportstakeTemplateBlocks.includes(x.name)
-    );
+  if (containsFixtures.length >= 1 || hasFixtureModules) {
+    const filteredArray = sportstakeModules;
 
     const date = new Date();
     const fixtureData = await Promise.all(
@@ -213,13 +212,11 @@ export async function getAPIData(page, url, header, preview) {
       data: Object.assign({}, ...fixtureData.filter(Boolean)),
     };
   } else {
-    responseFixtures = { data: [] };
+    responseFixtures = { data: {} };
   }
 
-  if (containsResults.length >= 1) {
-    const filteredArray = page?.sections?.main?.modules.filter(
-      (x) => x.value_type === 'template_block' && sportstakeTemplateBlocks.includes(x.name)
-    );
+  if (containsResults.length >= 1 || hasResultModules) {
+    const filteredArray = sportstakeModules;
 
     const date = new Date();
     const resultData = await Promise.all(
@@ -268,13 +265,11 @@ export async function getAPIData(page, url, header, preview) {
       data: Object.assign({}, ...resultData.filter(Boolean)),
     };
   } else {
-    responseResults = { data: [] };
+    responseResults = { data: {} };
   }
 
-  if (containsLotto.length >= 1) {
-    const filteredArray = page?.sections?.main?.modules.filter(
-      (x) => x.value_type === 'template_block' && sportstakeTemplateBlocks.includes(x.name)
-    );
+  if (containsLotto.length >= 1 || hasLottoModules) {
+    const filteredArray = sportstakeModules;
 
     const responseArray = await Promise.all(
       filteredArray.map(async (module) => {

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

@@ -13,6 +13,27 @@ export const formatScore = (val) => {
   return scores?.join(' - ');
 };
 
+export const formatMatchResult = (result) => {
+  if (result === null || result === undefined || result === '') {
+    return '';
+  }
+
+  const code = String(result).trim().toLowerCase();
+
+  switch (code) {
+    case '1':
+      return 'away win';
+    case '2':
+      return 'draw';
+    case '4':
+      return 'home win';
+    case '7':
+      return 'cancelled';
+    default:
+      return code;
+  }
+};
+
 export const formatLowerCase = (text) => {
   if (!text) {
     return '';
@@ -36,115 +57,52 @@ export const getLastWeekday = (weekday) => {
 export function getApiQueryParams(moduleName) {
   let type = '';
   let lotteryName = '';
-  let listType = '';
   let secondTableStart = 0;
   let firstTable = [0, 8];
   let secondTable = [8, 16];
   let title = '';
 
   switch (moduleName) {
-    case 'sportstake8resultsmidweek':
-      type = 'results';
-      lotteryName = 'sportstake8';
-      secondTableStart = 16;
-      listType = 'MIDWEEK';
-      title = 'Sportstake 8 Results Midweek';
-      break;
-    case 'sportstake8resultsweekend':
-      lotteryName = 'sportstake8';
+    case 'matchplay8results':
+      lotteryName = 'matchplay8';
       type = 'results';
-      secondTableStart = 16;
-      listType = 'WEEKEND';
-      title = 'Sportstake 8 Results Weekend';
-      break;
-    case 'sportstake8fixturesmidweek':
-      lotteryName = 'sportstake8';
-      type = 'fixtures';
-      listType = 'MIDWEEK';
-      title = 'Sportstake 8 Fixtures Midweek';
-      break;
-    case 'sportstake8fixturesweekend':
-      lotteryName = 'sportstake8';
-      type = 'fixtures';
-      listType = 'WEEKEND';
-      title = 'Sportstake 8 Fixtures Weekend';
-      break;
-    case 'sportstake13resultsmidweek':
-      lotteryName = 'sportstake13';
-      type = 'results';
-      secondTableStart = 13;
-      listType = 'MIDWEEK';
-      title = 'Sportstake 13 Results Midweek';
-      break;
-    case 'sportstake13resultsweekend':
-      lotteryName = 'sportstake13';
-      type = 'results';
-      secondTableStart = 13;
-      listType = 'WEEKEND';
-      title = 'Sportstake 13 Results Weekend';
-      break;
-    case 'sportstake13fixturesmidweek':
-      lotteryName = 'sportstake13';
-      type = 'fixtures';
-      listType = 'MIDWEEK';
-      title = 'Sportstake 13 Fixtures Midweek';
-      break;
-    case 'sportstake13fixturesweekend':
-      lotteryName = 'sportstake13';
-      type = 'fixtures';
-      listType = 'WEEKEND';
-      title = 'Sportstake 13 Fixtures Weekend';
-      break;
-    case 'sportstake4resultsmidweek':
-      lotteryName = 'sportstake4';
-      type = 'results';
-      listType = 'MIDWEEK';
       secondTableStart = 8;
       firstTable = [0, 4];
       secondTable = [4, 8];
-      title = 'Sportstake 4 Results Midweek';
+      title = 'Match Play 8 Results';
       break;
-    case 'sportstake4fixturesmidweek':
-      lotteryName = 'sportstake4';
+    case 'matchplay8fixtures':
+      lotteryName = 'matchplay8';
       type = 'fixtures';
-      listType = 'MIDWEEK';
       firstTable = [0, 4];
       secondTable = [4, 8];
-      title = 'Sportstake 4 Fixtures Midweek';
+      title = 'Match Play 8 Fixtures';
       break;
-    case 'sportstakecricketresultsweekend':
-      lotteryName = 'sportstake-cricket';
+    case 'matchplay14results':
+      lotteryName = 'matchplay14';
       type = 'results';
-      listType = 'WEEKEND';
-      secondTableStart = 10;
-      firstTable = [0, 10];
-      secondTable = [10, 20];
-      title = 'Sportstake Cricket Results Weekend';
+      secondTableStart = 14;
+      firstTable = [0, 7];
+      secondTable = [7, 14];
+      title = 'Match Play 14 Results';
       break;
-    case 'sportstakecricketfixturesweekend':
-      lotteryName = 'sportstake-cricket';
+    case 'matchplay14fixtures':
+      lotteryName = 'matchplay14';
       type = 'fixtures';
-      listType = 'WEEKEND';
-      firstTable = [0, 10];
-      secondTable = [10, 20];
-      title = 'Sportstake Cricket Fixtures Weekend';
+      firstTable = [0, 7];
+      secondTable = [7, 14];
+      title = 'Match Play 14 Fixtures';
       break;
-    case 'sportstakerugbyresultsweekend':
-      lotteryName = 'sportstake-rugby';
+    case 'matchplay13results':
+      lotteryName = 'matchplay13';
       type = 'results';
-      listType = 'WEEKEND';
-      secondTableStart = 10;
-      firstTable = [0, 10];
-      secondTable = [10, 20];
-      title = 'Sportstake Rugby Fixtures Weekend';
+      secondTableStart = 13;
+      title = 'Match Play 13 Results';
       break;
-    case 'sportstakerugbyfixturesweekend':
-      lotteryName = 'sportstake-rugby';
+    case 'matchplay13fixtures':
+      lotteryName = 'matchplay13';
       type = 'fixtures';
-      listType = 'WEEKEND';
-      firstTable = [0, 10];
-      secondTable = [10, 20];
-      title = 'Sportstake Rugby Fixtures Weekend';
+      title = 'Match Play 13 Fixtures';
       break;
     default:
       break;
@@ -153,7 +111,6 @@ export function getApiQueryParams(moduleName) {
   return {
     type,
     lotteryName,
-    listType,
     secondTableStart,
     firstTable,
     secondTable,