gatsby-core-theme 44.3.1 → 45.0.0-beta.2

package/CHANGELOG.md

@@ -1,173 +1,34 @@
-## [44.3.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.3.0...v44.3.1) (2025-06-30)
+# [45.0.0-beta.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v45.0.0-beta.1...v45.0.0-beta.2) (2025-06-13)
 
 
 ### Bug Fixes
 
-* flag module as toplist ([b0715ee](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b0715ee5aa6ad3d2f9ed86d8f5381b7e67e2181f))
-* move filters to page, flag toplist that has filters ([7f40833](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7f408336481a5f53febc7eb8504364971d3683d0))
+* merge conflict bug ([2f72a23](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2f72a2341858cd254daccb61d79b33c5beadeafd))
+* merge conflicts ([6467656](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6467656ec248e670f59b346fe9eb66f49025a609))
+* phase one ([59040df](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/59040df4a9acabb7ab079123421eddddadb08e62))
+* phase three - testing ([7f320d1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/7f320d181c6b4f903d7867c62bf21662ac91c7ac))
+* phase two ([b4562f3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b4562f36fc376a5bb6a1446a868e2de265a6b244))
 
 
-* Merge branch 'tm-5525-toplist-filters' into 'master' ([30427fb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/30427fbdaa89b0abf48243ad80ed81e1af23047f))
+* Merge branch 'tm-5493-user-comments' into 'beta' ([bd6381e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bd6381e86bba4ea84439e01a01e702ba8bfdee7e))
+* Merge branch 'master' into tm-5493-user-comments ([88c32c5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/88c32c57c503e4bb8dd1fb155b8a572e5a89fc2e))
+* Merge branch 'master' into tm-5493-user-comments ([a4fb3af](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a4fb3af3e7e1ba0b9bda2764b024bc4d1ca72565))
 
-# [44.3.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.20...v44.3.0) (2025-06-25)
+# [45.0.0-beta.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.6...v45.0.0-beta.1) (2025-06-13)
 
 
 ### Bug Fixes
 
-* filters order ([78bae80](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/78bae801cd85a65cf30007997e7c8973d17d505a))
-* notification time ([355d437](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/355d4373ae1d7636c70e3822f1be52f502143927))
-* rm consoel logs ([9d02b9d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/9d02b9d9808b904d53f4fb63ee72bb7c76bc52d6))
-* rm old tests ([41d19a8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/41d19a859a1d9a76e16aa19c374ab5e27f7f8557))
-* sync with main ([dfcc323](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/dfcc323274e8578b9de12a04345ec77692c6ca6a))
-* use filterOperators in processFilters ([c6745f1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c6745f1c331746565a769bb3a77f77811f4febce))
+* merge conflicts + alignments to master ([c6815ca](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c6815cad23928ec02d7b8db27d7ee34ba467b3e6))
+* reset version ([b07bcd3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b07bcd34878e57aec199c7df1614b9ffeadece02))
 
 
-* Merge branch 'tm-5525-toplist-filters' into 'master' ([e5b1468](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e5b1468a565a367351fe065d44592383ed1d31f0))
-* Merge branch 'tm-5536-notifications-time' into 'master' ([48889f9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/48889f94b175238fffac8fa91e88e5bf15f504f2))
-
-
-### Features
-
-* build filters for enabled templates ([3d201c2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3d201c20fa5e1794b00a7522953d2ab195168bfb))
-* build filters on top list ([908a65f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/908a65fbb2b6fcf6869fadce2e83d96267e2c29e))
-* slice toplists on filters ([6074186](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/60741862f3bc6f9d30a107921a9c1866f9b1d7ac))
-* split filter operators, remove promises ([55483bb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/55483bbe76ed03673ce6feae7ed62bce6e8dda58))
-
-
-### Tests
-
-* buildTopListFilter ([ab811e7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ab811e791e631c6fffb1cd76c05cdce36ec07987))
-* process filters ([d396159](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d396159e6789b86b63d14cd743f7838e9d6dd7e3))
-
-## [44.2.20](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.19...v44.2.20) (2025-06-24)
-
-
-### Bug Fixes
-
-* typo ([68823f3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/68823f353806c946ff9602e61f9046c77d6fcd1c))
-
-
-* Merge branch 'fix-typo' into 'master' ([1cbb641](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1cbb641c00625d0d84668bc74e6c8249cd06d5c3))
-
-## [44.2.19](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.18...v44.2.19) (2025-06-24)
-
-
-### Bug Fixes
-
-* remove unecessary eslint disable ([976eea0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/976eea0ca4c72e1e3b7f60f66a388849889d0ed9))
-* replace coupon code extra field with promo code in sites data ([2c2fbd9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2c2fbd9dd48594c54fce741e28ca54c094276fc0))
-* replace coupon code extra field with promo code in sites data ([96166c2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/96166c2e3acb43f0806fbca588d672570166e5cb))
-
-
-* Merge branch 'tm-5539-replace-coupon-code' into 'master' ([ad894e3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/ad894e372eea6dab322cf04790cd91c528cef647))
-
-## [44.2.18](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.17...v44.2.18) (2025-06-23)
-
-
-### Bug Fixes
-
-* add time translations for notifications ([8635372](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8635372cb96cd6afb817bd25b1f6d094b16c077f))
-* add translation ([3646134](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/36461348749e99752e08ff4fc16ff8c11b9861bf))
-* conflicts ([b4a714f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b4a714f50b5da363067570f425be34be3b49cbd8))
-* operator cta ([2498397](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/24983978555b5d72b19e4e55e9c981266e4dcd4c))
-* resolve mentioned issues ([efc2af3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/efc2af3c70a2d000246d7b626ff7b681e5dd10b7))
-* test ([4e99e0b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4e99e0ba5fe28f0997d33379fd4b22e62de43334))
-* test ([5b776de](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5b776def206fd0472a53a3e44ded5505ffeda13c))
-* test ([3c20ccb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/3c20ccb5e3d6d7a0ca2ed4d227da330de016deb2))
-* validate data ([d76d52b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d76d52b3b58cb5412b6436fd8845482f61d2960c))
-
-
-* Merge branch 'tm-5453-cta-button' into 'master' ([5fd74f4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5fd74f4a828e8520e516760c0f462292866f7f19))
-* Merge branch 'tm-5536-time-translations' into 'master' ([d7f6855](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/d7f68553a167bddbdf44a4c5e091d491f4d735c4))
-
-## [44.2.17](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.16...v44.2.17) (2025-06-20)
-
-
-### Bug Fixes
-
-* autosuggest logic ([75fb409](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/75fb409a4b6f72d93adbb4b98525ba655599e51b))
-
-
-* Merge branch 'tm-5552-autosuggest-logic' into 'master' ([6520798](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6520798d46a2be6beaf5ff24f8bb37aad90de7dc))
-
-## [44.2.16](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.15...v44.2.16) (2025-06-19)
-
-
-### Bug Fixes
-
-* added var to cookie consets ([e569b0e](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e569b0e6af31ade16b8223665cc6fc0f655fee22))
-
-## [44.2.15](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.14...v44.2.15) (2025-06-19)
-
-
-### Bug Fixes
-
-* added no wrap to buttons on cookies ([62e0adc](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/62e0adc846d11ad1e66cf5a2d9b1c4452b2a5e2c))
-* fix the software label name ([65654fb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/65654fb209f5083031d35ab10ae9696bb77dc209))
-
-## [44.2.14](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.13...v44.2.14) (2025-06-19)
-
-
-### Bug Fixes
-
-* added props to floating area ([6868daa](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6868daab638a33bc7b73f0889901286dc20021c9))
-
-## [44.2.13](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.12...v44.2.13) (2025-06-18)
-
-
-### Bug Fixes
-
-* cookie consent not showing ([b081522](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b081522c26040bc00328ac5db67e45f19ccb38f1))
-
-## [44.2.12](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.11...v44.2.12) (2025-06-18)
-
-
-### Bug Fixes
-
-* recommended casino logic ([94eeea1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/94eeea1dee0bf2dd7cb37d26b8ba37613835ef84))
-
-
-* Merge branch 'tm-5521-recommended-casino-logic' into 'master' ([6a9b3e1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/6a9b3e1d822f4d481cc4668a9a021e1cf4b8e4f4))
-
-## [44.2.11](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.10...v44.2.11) (2025-06-17)
-
-
-### Bug Fixes
-
-* build issue with review links ([68d07f0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/68d07f0f5c17bb9b6f6070f02931485552a5c372))
-
-## [44.2.10](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.9...v44.2.10) (2025-06-17)
-
-
-### Bug Fixes
-
-* archive pages build fix ([04098d5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/04098d5545696ac5f2371e091f761e46f579cd2d))
-
-## [44.2.9](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.8...v44.2.9) (2025-06-16)
-
-
-### Bug Fixes
-
-* sports theme build fail ([c8ec05b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c8ec05ba3b5dd4bafc6e2f198c965aa11fc7c29a))
-
-## [44.2.8](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.7...v44.2.8) (2025-06-16)
-
-
-### Bug Fixes
-
-* add validation ([0953152](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/09531524240dcf834cec23fd0d1538fc9a3de4cf))
-* added bonus page type to sports data ([2ec5dac](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2ec5dac1c058d4d98aafa35a2012ff8f84a4910f))
-
-## [44.2.7](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.6...v44.2.7) (2025-06-16)
-
-
-### Bug Fixes
+### chore
 
-* add license and map for pages that needs that path ([62ffa4b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/62ffa4babe54d969b7513fe06bbcda0368f82e9b))
-* enable reading time in rocket theme ([01b0e50](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/01b0e5049052196fa4154a8f762e580c3e5d294d))
+* **release:** 44.0.37-beta.1 [skip ci] ([69335e5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/69335e500807bedebfe021b5fa0164c508e6a5ff))
 
 
-* Merge branch 'tm-5535-mapp-providers-license' into 'master' ([8ea899b](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/8ea899b2773c3a69c9f5d39cdec8acae1a6324ce))
+* Merge branch 'tm-5125-gatsby-node-update' into 'beta' ([b29ef69](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/b29ef6979f8e654ddb0e0c15cbd430b96cf10631))
 
 ## [44.2.6](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.2.5...v44.2.6) (2025-06-12)
 

package/gatsby-node.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable prefer-destructuring */
@@ -49,7 +50,6 @@ let siteSettingsData = null;
 let siteGeneralData = null;
 let allMarketsData = null;
 let providersData = null;
-let licensesData = null;
 let gamesData = null;
 let sportsData = null;
 let ribbonsData = null;
@@ -64,6 +64,7 @@ let schemaData = null;
 let templatesData = null;
 let defaultLanguage = null;
 const pagesToCreate = [];
+let commentsData = null;
 const relations = {};
 
 // eslint-disable-next-line import/prefer-default-export
@@ -97,7 +98,6 @@ export const createPages = async (
         crypto_exchanges: cryptoExchangesData,
         crypto_brokers: cryptoBrokersData,
         countries: countriesData,
-        operators_license: licensesData,
       },
     },
     themeOptions,
@@ -176,6 +176,7 @@ export const createPages = async (
           autogenerated,
           siteSchema,
           authors,
+          comments: commentsData?.[page?.id],
           lang: page.language,
           ...themeOptions,
         });
@@ -376,7 +377,7 @@ export const onPreBootstrap = async () => {
     cryptoExchangesData,
     cryptoBrokersData,
     countriesData,
-    licensesData,
+    commentsData
   } = await fetchSiteSettings(process.env.GATSBY_SITE_NAME));
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "44.3.1",
+  "version": "45.0.0-beta.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/admin/bar/layout-section/index.js

@@ -12,9 +12,9 @@ const LayoutSection = ({ menus }) => {
       case "page":
         return `site-pages/${id}`;
       case "operator":
-        return `operators/${id?.operator_id}/sites-data/edit/${id?.id}`;
+        return `operators/${id.operator_id}/sites-data/edit/${id.id}`;
       case "game":
-        return `games/${id?.game_id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
+        return `games/${id.game_id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
       case "author":
         return `site-authors/${id}`;
       case "payment_method":
@@ -40,9 +40,9 @@ const LayoutSection = ({ menus }) => {
                 <li key={keygen()}>
                   <Redirect
                     icon={link?.icon}
-                    path={paths(link?.type, link?.data)}
-                    linkText={link?.buttonText}
-                    description={link?.description}
+                    path={paths(link?.type, link.data)}
+                    linkText={link.buttonText}
+                    description={link.description}
                   />
                 </li>
               ))}

package/src/components/atoms/button/operator-cta.js

@@ -95,7 +95,8 @@ const OperatorCtaButton = ({
     } `;
 
   return (
-    trackerLinkActive(operator, tracker) && status === "active" ? (
+    trackerLinkActive(operator, tracker) &&
+    (status === "active" ? (
       <a
         href={prettyLink || "#"}
         title={`${typeof translateBtn === "string" ? translateBtn : ""} ${titleSuffix || ""
@@ -120,6 +121,7 @@ const OperatorCtaButton = ({
         {icon && icon}
       </div>
     ))
+  )
 }
 
 OperatorCtaButton.propTypes = {

package/src/components/atoms/contact-form/contact-form.test.js

@@ -29,7 +29,7 @@ describe('Contact Us form Component', () => {
     );
 
     await waitFor(() => {
-      expect(container).toBeTruthy();
+      expect(container).toBeInTheDocument();
       expect(container.querySelector('H1').innerHTML).toBe('Contact Us');
     });
   });
@@ -51,7 +51,7 @@ describe('Contact Us form Component', () => {
     );
 
     await waitFor(() => {
-      expect(container.querySelector('.contactForm')).toBeTruthy();
+      expect(container.querySelector('.contactForm')).toBeInTheDocument();
       expect(container.querySelector('.contactForm').querySelectorAll('input')).toHaveLength(4);
       expect(
         container.querySelector('.contactForm').querySelectorAll('input[type="text"]')
@@ -72,7 +72,7 @@ describe('Contact Us form Component', () => {
     );
 
     expect(container.querySelectorAll('input[type="text"]').length).toEqual(2);
-    expect(container.querySelector('textarea')).toBeTruthy();
+    expect(container.querySelector('textarea')).toBeInTheDocument();
     expect(container.querySelector('.formGroup').querySelector('label')).toBeFalsy();
     expect(container.querySelectorAll('label').length).toEqual(1);
   });

package/src/components/atoms/notifications/notification-items/cards-v2/index.js

@@ -1,5 +1,3 @@
-
-/* eslint-disable react/prop-types */
 import React from "react";
 import PropTypes from "prop-types";
 import LazyImage from "~hooks/lazy-image";
@@ -9,14 +7,38 @@ import { imagePrettyUrl, getExtraField } from "~helpers/getters";
 import { getAltText, getImageFilename } from "~helpers/image";
 import useTranslate from "~hooks/useTranslate/useTranslate";
 import CloseIcon from "~images/icons/close";
-import { getTimeAgo } from "~helpers/date-time";
 import styles from "./notification-items.module.scss";
 
 const CardsItems = ({ module, onClose, useBanner = false }) => {
   const { items } = module;
   const noNewUpdates = useTranslate("noNewUpdates", "No new items");
 
-  const Content = ({ item }) => {
+  const getTimeAgo = (dateString) => {
+    const date = new Date(dateString.replace(" ", "T")); // Make it ISO-compliant
+    const now = new Date();
+
+    const diffMs = now.getTime() - date.getTime();
+    const diffMinutes = Math.floor(diffMs / (1000 * 60));
+    const diffHours = Math.floor(diffMinutes / 60);
+    const diffDays = Math.floor(diffHours / 24);
+    const diffMonths = Math.floor(diffDays / 30);
+
+    let timeAgo = "";
+
+    if (diffDays >= 32) {
+      timeAgo = `${diffMonths} month${diffMonths > 1 ? "s" : ""} ago`;
+    } else if (diffDays >= 1) {
+      timeAgo = `${diffDays} day${diffDays > 1 ? "s" : ""} ago`;
+    } else if (diffHours >= 1) {
+      timeAgo = `${diffHours} hour${diffHours > 1 ? "s" : ""} ago`;
+    } else {
+      timeAgo = `${diffMinutes} minute${diffMinutes !== 1 ? "s" : ""} ago`;
+    }
+
+    return timeAgo;
+  };
+
+  const content = (item) => {
     const priorityImage = useBanner
       ? item?.banner || item?.relation?.logo?.fileName
       : item?.relation?.logo?.fileName;
@@ -30,14 +52,6 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
     const TitleTag = item?.title_tag || "label";
     const ribbon = getExtraField(item?.extra_fields, "notification_ribbon");
 
-    const { key, value } = getTimeAgo(
-      item?.manual_updated_at ||
-      item?.updated_at ||
-      item?.manual_created_at ||
-      item?.created_at
-    );
-    const timeAgo = `${value} ${useTranslate(key, key?.replace("_", " "))}`;
-
     return (
       <div className={styles.notificationContent}>
         {img && (
@@ -63,7 +77,12 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
             <div className={styles.ribbonAndTime}>
               {ribbon && <span className={styles.ribbon}>{ribbon}</span>}
               <span className={styles.extraContent}>
-                {timeAgo}
+                {getTimeAgo(
+                  item?.manual_updated_at ||
+                    item?.updated_at ||
+                    item?.manual_created_at ||
+                    item?.created_at
+                )}
               </span>
             </div>
           )}
@@ -71,7 +90,6 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
       </div>
     );
   };
-
   return (
     <div className={styles.container || ""}>
       <div className={styles.notificationsContainer || ""}>
@@ -102,7 +120,7 @@ const CardsItems = ({ module, onClose, useBanner = false }) => {
                   className={`${styles.notificationLink} cards-gtm`}
                   aria-label={`${item?.title} Link`}
                 >
-                  <Content item={item} />
+                  {content(item)}
                 </Link>
               </li>
             ))}

package/src/components/molecules/bonus-box/template-one/index.js

@@ -44,7 +44,6 @@ export default function BonusBox({
         {showVariablesComponent && (
           <VariableComponent
             item={item}
-            tracker={tracker}
             moduleName={moduleName}
             modulePosition={modulePosition}
             itemPosition={itemPosition}

package/src/components/molecules/bonus-box/template-three/index.js

@@ -88,7 +88,6 @@ export default function BonusBox({
           {showVariablesComponent && variableInsideContainer && (
             <VariableComponent
               item={item}
-              tracker={tracker}
               moduleName={moduleName}
               clickedElement={`${clickedElement}_cta`}
               modulePosition={modulePosition}
@@ -99,7 +98,7 @@ export default function BonusBox({
       )}
 
       {showVariablesComponent && !variableInsideContainer && (
-        <VariableComponent item={item} tracker={tracker} moduleName={moduleName} modulePosition={modulePosition}
+        <VariableComponent item={item} moduleName={moduleName} modulePosition={modulePosition}
           itemPosition={itemPosition} clickedElement={clickedElement} />
       )}
     </div>

package/src/components/molecules/comment/comment.module.scss

@@ -0,0 +1,100 @@
+.commentContainer{
+    @include flex-direction(column);
+
+    gap: 1.6rem;
+}
+
+.commentTopArea{
+    @include flex-align(center, start);
+
+    gap: .8rem;
+}
+
+.commentName{
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 28px;
+}
+
+.commentJobTitle{
+    height: 24px;
+    padding: .8rem;
+    font-size: 1.2rem;
+    font-weight: 400;
+    line-height: 1.8rem;
+
+    @include flex-align(center, center);
+
+    border-radius: 5rem;
+    background: #CFC7C0;
+}
+
+.commentDate{
+    color: #64748B;
+    font-size: 1.6rem;
+    font-weight: 400;
+    line-height: 2.6rem; 
+}
+
+.commentContent{
+    border-radius: .8rem;
+    border: .1rem solid #F4F4F4;
+    background: #FFF;
+    position: relative;
+    padding: 2.4rem;
+}
+
+.isReplyThread::before{
+    content: "";
+    position: absolute;
+    right: 100%;
+    border-left: .1rem solid #CFC7C0;
+    border-bottom: .1rem solid #CFC7C0;
+    border-bottom-left-radius: 2rem;
+    height: 30rem;
+    width: 3rem;
+    bottom: 50%;
+    z-index: -1;
+}
+
+.commentActions{
+    margin-left: auto;
+
+    @include flex-direction(row);
+}
+
+.buttonGroup{
+    background: #CFC7C0;
+    font-size: 1.2rem;
+    padding: .8rem;
+    gap: .4rem;
+
+    @include flex-align(center, center);
+
+    &.left{
+        border-bottom-left-radius: 5rem;
+        border-top-left-radius: 5rem;
+        padding-right: 0;
+    }
+
+    &.right{
+        border-bottom-right-radius: 5rem;
+        border-top-right-radius: 5rem;
+    }
+}
+
+.buttonGroupIcon{
+    width: 1.6rem;
+    height: 1.6rem;
+}
+
+.replyButton{
+    border-radius: 10rem;
+    border: 1.5px solid #161128;
+    font-size: 1.2rem;
+    font-weight: 700;
+    line-height: 1.8rem;
+    text-transform: capitalize;
+    margin-left: .8rem;
+    padding: 0 1.6rem;
+}

package/src/components/molecules/comment/index.js

@@ -0,0 +1,65 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
+/* eslint-disable import/no-extraneous-dependencies */
+import React from 'react';
+import PropTypes from 'prop-types';
+import LazyImage from '~hooks/lazy-image';
+
+import useTranslate from '~hooks/useTranslate/useTranslate';
+import styles from './comment.module.scss';
+
+const Comment = ({ comment, authors, isReply }) => {
+    const commentName = comment?.author_id ? authors?.[comment?.author_id]?.name : comment.name;
+    const commentJobTitle = comment?.author_id ? authors?.[comment?.author_id]?.author_title : undefined;
+
+    const date = new Date(comment.updated_at);
+    const day = String(date.getUTCDate()).padStart(2, '0');
+    const month = String(date.getUTCMonth() + 1).padStart(2, '0'); 
+    const year = date.getUTCFullYear();
+
+    const hours = String(date.getUTCHours()).padStart(2, '0');
+    const minutes = String(date.getUTCMinutes()).padStart(2, '0');
+    const commentDate = `${day}/${month}/${year} | ${hours}:${minutes}`;
+
+    
+    return  <div className={`${styles.commentContainer} ${isReply ? styles.isReply : ''}`}>
+                <div className={styles.commentTopArea}>
+                    <LazyImage src='/images/anon-user.svg' alt={`${commentName} user image`} />
+                    <span className={styles.commentName}>{commentName}</span>
+                    {comment?.author_id &&  <span className={styles.commentJobTitle}>{commentJobTitle}</span>}
+                    <span className={styles.commentDate}>{commentDate}</span>
+                </div>
+                <div className={`${styles.commentContent} ${isReply ? styles.isReplyThread : ''}`}>
+                    <p>{comment.comment}</p>
+                </div>
+                <div className={styles.commentActions}>
+                    <button aria-label='Like Button' type='button' className={`${styles.buttonGroup} ${styles.left}`}>
+                        <LazyImage className={styles.buttonGroupIcon} src='/images/like.svg' />
+                        {comment.votes_up}
+                    </button>
+                    <button aria-label='Dislike Button' type='button' className={`${styles.buttonGroup} ${styles.right}`}>
+                        <LazyImage className={styles.buttonGroupIcon} src='/images/dislike.svg' />
+                        {comment.votes_down}
+                    </button>
+                    <button aria-label='Reply Button' type='button' className={styles.replyButton}>
+                        {useTranslate('reply_button', 'Reply')}
+                    </button>
+                </div>
+            </div>
+};
+
+Comment.propTypes = {
+  comment: PropTypes.shape({
+    author_id: PropTypes.number,
+    name: PropTypes.string,
+    email: PropTypes.string,
+    comment: PropTypes.string,
+    updated_at: PropTypes.string,
+    votes_up: PropTypes.number,
+    votes_down: PropTypes.number,
+  }),
+  authors: PropTypes.shape({}),
+  isReply: PropTypes.bool
+};
+
+export default Comment;

package/src/components/molecules/floating-area/index.js

@@ -71,8 +71,7 @@ export default function FloatingArea({
 
   return (
     <div className={`${styles.floatingArea} ${showScroll ? styles.show : ""}`}>
-      {(pageTypes?.[pageTemplate]?.showScrollToTop ||
-        pageTypes.default?.showScrollToTop) && <ScrollToTop />}
+      <ScrollToTop />
       {OperatorBanner && (
         <Suspense fallback={<></>}>
           <OperatorBanner
@@ -88,26 +87,27 @@ export default function FloatingArea({
         </Suspense>
       )}
 
-      {CookieConsent && showCookies && (
-        <CookieConsent
-          market={pageContext?.page?.market}
-          type={pageType}
-          template={template}
-          settingsCookie
-          isPageHomepage={isPageHomepage}
-        >
-          {customCookieContent || (
-            <p>
-              We use cookies in order to optimise our site and improve your
-              experience with us. By using the site you consent to our
-              <a href="/cookies" className="cookie-consent-gtm">
-                Cookie Policy
-              </a>
-              .
-            </p>
-          )}
-        </CookieConsent>
-      )}
+      {CookieConsent &&
+        showCookies && (
+          <CookieConsent
+            market={pageContext?.page?.market}
+            type={pageType}
+            template={template}
+            settingsCookie
+            isPageHomepage={isPageHomepage}
+          >
+            {
+              customCookieContent || <p>
+                We use cookies in order to optimise our site and improve your
+                experience with us. By using the site you consent to our
+                <a href="/cookies" className="cookie-consent-gtm">
+                  Cookie Policy
+                </a>
+                .
+              </p>
+            }
+          </CookieConsent>
+        )}
       {FooterNavigation && (
         <Suspense fallback={<></>}>
           <FooterNavigation section={footerNavigationData} />