gatsby-core-theme 44.4.25 → 44.4.27

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [44.4.27](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.26...v44.4.27) (2025-07-28)
+
+
+### Bug Fixes
+
+* add wallets data ([5338ab1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5338ab162c121e07c6622092a27060c8179d012d))
+* fix tests ([ba15ed7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ba15ed7a960acb9a753c012fc90d048183ffdd6b))
+
+
+* Merge branch 'tm-5662-crypto-wallets' into 'master' ([ed6aa81](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ed6aa8168846c895d06bd3c00cd029efd445837b))
+* Edit fetch.mjs ([49eb99c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/49eb99c6ccde080643835ae2c96c8434b6f2cccd))
+
+## [44.4.26](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.25...v44.4.26) (2025-07-28)
+
+
+### Bug Fixes
+
+* reply issue with checkboxes ([151a5a3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/151a5a3f22d7b36657121c9060d0e543e1694134))
+
 ## [44.4.25](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.4.24...v44.4.25) (2025-07-25)
 
 

package/gatsby-node.mjs

@@ -57,6 +57,7 @@ let ribbonsData = null;
 let operatorData = null;
 let cryptoExchangesData = null;
 let cryptoBrokersData = null;
+let cryptoWalletsData = null;
 let countriesData = null;
 let paymentData = null;
 let allMarketPrefixes = [];
@@ -98,6 +99,7 @@ export const createPages = async (
         sports_data: sportsData,
         crypto_exchanges: cryptoExchangesData,
         crypto_brokers: cryptoBrokersData,
+        crypto_wallets: cryptoWalletsData,
         countries: countriesData,
         operators_license: licensesData,
       },
@@ -381,6 +383,7 @@ export const onPreBootstrap = async () => {
     countriesData,
     commentsData,
     licensesData,
+    cryptoWalletsData,
   } = await fetchSiteSettings(process.env.GATSBY_SITE_NAME));
 };
 

package/package.json

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

package/src/components/molecules/leave-comment-form/index.js

@@ -26,20 +26,29 @@ const LeaveCommentForm = ({
         const formData = new FormData(form);
         const data = Object.fromEntries(formData.entries());
 
-        if(data?.["g-recaptcha-response"] === '' || !data?.tnc) return;
-        if(parentCommentID) data.parent_id = parentCommentID;
+        const cleanedData = isReply
+        ? Object.entries(data).reduce((acc, [key, value]) => {
+            if (key.startsWith('post_anonymously_')) acc.post_anonymously = value;
+            else if (key.startsWith('tnc_')) acc.tnc = value;
+            else acc[key] = value;
+            return acc;
+            }, {})
+        : data;
 
-        data.reference_id = page?.id;
-        data.site_id = parseInt(process.env.SITE_ID);
-        data.rate = parseInt(data.rate);
+        if(cleanedData?.["g-recaptcha-response"] === '' || !cleanedData?.tnc) return;
+        if(parentCommentID) cleanedData.parent_id = parentCommentID;
 
-        data.market_short_code = activeMarket;
+        cleanedData.reference_id = page?.id;
+        cleanedData.site_id = parseInt(process.env.SITE_ID);
+        cleanedData.rate = parseInt(data.rate);
+
+        cleanedData.market_short_code = activeMarket;
         
-        if(!data?.post_anonymously) data.author_name = data?.name;
-        if(!data?.rate) delete data?.rate;
+        if(!cleanedData?.post_anonymously) cleanedData.author_name = cleanedData?.name;
+        if(!cleanedData?.rate) delete cleanedData?.rate;
 
-        delete data?.post_anonymously;
-        delete data?.tnc;
+        delete cleanedData?.post_anonymously;
+        delete cleanedData?.tnc;
 
         const headers = {
             headers: {
@@ -50,7 +59,7 @@ const LeaveCommentForm = ({
 
         return new Promise((resolve, reject) => {
             axios
-            .post('/api/post-comment', data, headers)
+            .post('/api/post-comment', cleanedData, headers)
             .then((response) => {
                 response.ok = response.status === 200;
                 if (response.ok) resetForm();

package/src/constants/forms.js

@@ -170,7 +170,7 @@ export const commentForm = {
           {
             id: 'tnc',
             label:
-              'By checking this box, I agree to the Comments [Link] and Terms and Conditions.',
+              'By checking this box, I agree to the Comments Terms and Conditions.',
             link: {
               url: '/privacy-policy',
               text: 'Link',
@@ -231,7 +231,7 @@ export const replyForm = {
         required: true,
       },
       {
-        id: 'post_anonymously',
+        id: `post_anonymously_${Math.floor(Math.random() * 1000000)}`,
         type: 'checkbox',
         required: false,
         switch: true,
@@ -239,7 +239,7 @@ export const replyForm = {
         twoCol: false,
         options: [
           {
-            id: 'post_anonymously',
+            id: `post_anonymously_${Math.floor(Math.random() * 1000000)}`,
             label:
               'Post comment anonymously.',
             translationKey: 'post_anonymously_translation',
@@ -247,16 +247,16 @@ export const replyForm = {
         ],
       },
       {
-        id: 'tnc',
+        id: `tnc_${Math.floor(Math.random() * 1000000)}`,
         type: 'checkbox',
         required: true,
         translationKey: 'checkbox_label',
         twoCol: false,
         options: [
           {
-            id: 'tnc',
+            id: `tnc_${Math.floor(Math.random() * 1000000)}`,
             label:
-              'By checking this box, I agree to the Comments [Link] and Terms and Conditions.',
+              'By checking this box, I agree to the Comments Terms and Conditions.',
             link: {
               url: '/privacy-policy',
               text: 'Link',

package/src/resolver/cryptos.mjs

@@ -19,10 +19,10 @@ export function sanitizeCryptoData(data) {
 
 export function transformCryptosData(jsonData, relationsData) {
   const cryptos = {};
-
+  // TODO: After alpha implement the site data we need to do more logic here
   Object.values(jsonData).forEach(crypto => {
     const newCryptoData = {
-      ...crypto,
+      ...crypto.general_data,
     }
 
     // OPERATOR LOGO (temp fix included and will be removed)

package/src/resolver/cryptos.test.js

@@ -11,10 +11,10 @@ describe("Transform Cryptos Data", () => {
     const transformedCryptoExchanges = transformCryptosData(exchangesData, {payments: {}, currencies: getCurrenciesData(), countries: {}});
 
     // values before transforming
-    expect(Object.values(exchangesData)[0].name).toBe('Crypto Exchange 1');
-    expect(Object.values(exchangesData)[2].name).toBe('Crypto Exchange 3');
-    expect(Object.values(exchangesData)[1].crypto_currencies.length).toBe(2);
-    expect(Object.values(exchangesData)[1].crypto_currencies[0]).toBe(1);
+    expect(Object.values(transformedCryptoExchanges)[0].name).toBe('Crypto Exchange 1');
+    expect(Object.values(transformedCryptoExchanges)[2].name).toBe('Crypto Exchange 3');
+    expect(Object.values(transformedCryptoExchanges)[1].crypto_currencies.length).toBe(2);
+    expect(Object.values(transformedCryptoExchanges)[1].crypto_currencies[0].name).toBe('Bitcoin');
 
     // values after transforming
     expect(Object.values(transformedCryptoExchanges)[0].name).toBe('Crypto Exchange 1');

package/src/resolver/relations.mjs

@@ -87,6 +87,12 @@ export const processRelations = (
             data.relations.crypto_brokers[page.relation_id];
         }
         break;
+      case "crypto_wallets":       
+        if (!hasRelation) {          
+          transformedPages[market][pageType][index].relation =
+            data.relations.crypto_wallets[page.relation_id];
+        }
+        break;
       default:
         break;
     }

package/src/services/fetch.mjs

@@ -161,6 +161,12 @@ export const fetchSiteSettings = async (siteName, previewPath = null) => {
     payments: paymentData,
   })
 
+  const cryptoWalletsData = transformCryptosData(cryptoWallets, {
+    countries: countriesData,
+    currencies: currenciesData,
+    payments: paymentData,
+  })  
+
 
   if (["rage_seo", "rage_ppc", "sports"].includes(siteSettingsData.general[siteId].type)) {
     const teamIds = Object.values(sportsData.teams).map((team) => String(team.livegoals_v2_id));
@@ -192,6 +198,7 @@ export const fetchSiteSettings = async (siteName, previewPath = null) => {
     sportsData,
     cryptoExchangesData,
     cryptoBrokersData,
+    cryptoWalletsData,
     commentsData,
     licensesData
   };

package/tests/factories/crypto-exchanges/crypto-exchanges.factory.js

@@ -1,65 +1,69 @@
 export const getDefaultCryptoExchangesProps = (index = 1) => ({
-  id: index,
-  name: `Crypto Exchange ${index}`,
-  short_name: `crypto_exchange_${index}`,
-  founded: "2022-11-01 00:00:00",
-  headquarters: `Headquarters ${index}`,
-  best_for: "Selling",
-  url: "http://google.com/test222",
-  markets_amount: "3000 +",
-  currencies_amount: "3 including 25+",
-  rating_security: 1,
-  rating_fees: 3,
-  rating_usability: 3,
-  rating_features: 3,
-  rating_support: 3,
-  rating_average: 2.6,
-  exchange_type: "Decentralized",
-  crypto_currencies: [
-    1,
-    2
-  ],
-  fiat_currencies: [
-    3,
-    9
-  ],
-  restricted_countries: [
-    1,
-    254
-  ],
-  selling_points: [
-    "800games",
-    "1000_games"
-  ],
-  services: [
-    {
-      name: "g test",
-      short_name: "crypto_services_g",
-      id: 7
-    },
-    {
-      name: "kripo",
-      short_name: "crypto_services_kripo",
-      id: 8
+  general_data: {
+    id: index,
+    name: `Crypto Exchange ${index}`,
+    short_name: `crypto_exchange_${index}`,
+    founded: "2022-11-01 00:00:00",
+    headquarters: `Headquarters ${index}`,
+    best_for: "Selling",
+    url: "http://google.com/test222",
+    markets_amount: "3000 +",
+    currencies_amount: "3 including 25+",
+    rating_security: 1,
+    rating_fees: 3,
+    rating_usability: 3,
+    rating_features: 3,
+    rating_support: 3,
+    rating_average: 2.6,
+    exchange_type: "Decentralized",
+    crypto_currencies: [
+      1,
+      2
+    ],
+    fiat_currencies: [
+      3,
+      9
+    ],
+    restricted_countries: [
+      1,
+      254
+    ],
+    selling_points: [
+      "800games",
+      "1000_games"
+    ],
+    services: [
+      {
+        name: "g test",
+        short_name: "crypto_services_g",
+        id: 7
+      },
+      {
+        name: "kripo",
+        short_name: "crypto_services_kripo",
+        id: 8
+      }
+    ],
+    licences: [],
+    support_types: [
+      "support_type_facebook",
+      "support_type_faq_section"
+    ],
+    logo: {
+      title: "Picking Betting Sites - Step 3: markets",
+      filename: "1668091295/step-3-markets-casinotopsonline",
+      extension: ".png",
+      url: "https://assets-srv.s3.eu-west-1.amazonaws.com/1668091295/step-3-markets-casinotopsonline.png",
+      width: "512",
+      height: "512",
+      alt: "Picking Betting Sites - Step 3: markets",
+      color: null,
+      id: 97121,
+      raw_filename: "1668091295/step-3-markets-casinotopsonline"
     }
-  ],
-  licences: [],
-  support_types: [
-    "support_type_facebook",
-    "support_type_faq_section"
-  ],
-  logo: {
-    title: "Picking Betting Sites - Step 3: markets",
-    filename: "1668091295/step-3-markets-casinotopsonline",
-    extension: ".png",
-    url: "https://assets-srv.s3.eu-west-1.amazonaws.com/1668091295/step-3-markets-casinotopsonline.png",
-    width: "512",
-    height: "512",
-    alt: "Picking Betting Sites - Step 3: markets",
-    color: null,
-    id: 97121,
-    raw_filename: "1668091295/step-3-markets-casinotopsonline"
-  }
+
+  },
+ 
 })
 
 export const transformedCryptoExchanges = () => ({