gatsby-core-theme 20.0.1 → 20.0.3

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [20.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.2...v20.0.3) (2023-04-17)
+
+
+### Bug Fixes
+
+* preview operator review pages ([98d853f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/98d853f0bbead6363014459ebbbc254c7f1a2be4))
+* preview operator review pages ([094954d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/094954df51989e44b52513523d050e100d7523a7))
+
+## [20.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.1...v20.0.2) (2023-04-13)
+
+
+### Bug Fixes
+
+* fix for tnc issue on matrix ([b0fe49e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b0fe49e5d344aad42b311e343ee1c5e2b697ad37))
+
+
+### Code Refactoring
+
+* correction to tnc props ([6ea3616](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6ea3616ef5fcf5dad80801a130971ea50cd7ded6))
+* update page.relation check in processor ([ab92c2d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ab92c2d78808d06eb4fa40aa94332d4194587b8b))
+
+
+* Merge branch 'tm-tnc-issue' into 'master' ([d29e1aa](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d29e1aab514b494197ab1f305e308d03ce776e9a))
+
 ## [20.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.0...v20.0.1) (2023-04-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "20.0.1",
+  "version": "20.0.3",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/atoms/author-box/index.js

@@ -110,7 +110,7 @@ export default function AuthorBox({
             <div
               ref={biographyRef}
               className={`${styles.biography} ${
-                author?.biography.split(' ').length > 30 && styles.showReadMore
+                author?.biography?.split(' ').length > 30 && styles.showReadMore
               }`}
               role="button"
               onClick={toggleReadMore}
@@ -119,7 +119,7 @@ export default function AuthorBox({
               tabIndex={0}
               dangerouslySetInnerHTML={{
                 __html:
-                  author?.biography.split(' ').length > 30 && isReadMore
+                  author?.biography?.split(' ').length > 30 && isReadMore
                     ? `${textWordsLimit(author?.biography, 30)} <span class='${
                         styles.contReadText
                       }'>...${translate(translations, 'cont_read', 'continue reading')}</span>`

package/src/components/atoms/collapse/collapse.module.scss

@@ -1,16 +1,4 @@
 .collapseContainer {
-  .buttonM {
-    @include max(tablet) {
-      display: block;
-    }
-  }
-
-  .buttonD {
-    @include min(tablet) {
-      display: block;
-    }
-  }
-
   .button {
     display: none;
     position: relative;
@@ -23,6 +11,18 @@
       left: 115%;
       top: 42%;
     }
+
+    &.buttonM {
+      @include max(tablet) {
+        display: block;
+      }
+    }
+  
+    &.buttonD {
+      @include min(tablet) {
+        display: block;
+      }
+    }
   }
 
   .active {

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

@@ -6,8 +6,8 @@ import Collapse from '~atoms/collapse';
 
 const Tnc = ({
   hasCollapse = true,
-  onlyMobile,
-  onlyDesktop,
+  onlyMobile = true,
+  onlyDesktop = true,
   buttonText = 'Terms and Conditions Apply',
   contentText = '18+ New Players only. Play responsibly.',
   initOpen = false,

package/src/components/molecules/tnc/tnc.stories.js

@@ -143,8 +143,8 @@ export const Default = Template.bind({});
 Default.args = {
   hasCollapse: true,
   contentText: tncText,
-  onlyMobile: false,
-  onlyDesktop: false,
+  onlyMobile: true,
+  onlyDesktop: true,
   buttonText: 'Terms and Conditions Apply',
   initOpen: false,
   isFixed: false,

package/src/helpers/processor/index.js

@@ -259,13 +259,13 @@ export default {
       prefilledMarketModules = data.prefilled_market_modules || {};
       prefilledMarketModulesRaw = cloneDeep(data.prefilled_market_modules);
       Object.keys(transformedPages[market]).forEach((pageType) => {
-        transformedPages[market][pageType].forEach((page, index) => {
+        transformedPages[market][pageType].forEach(async (page, index) => {
           // process page extra fields
           page.extra_fields && processExtraFields(page.extra_fields);
           updatePlaceholders(page, data);
 
           // set page relation
-          processRelations(page, pageType, transformedPages, market, data, index);
+          await processRelations(page, pageType, transformedPages, market, data, index);
 
           // add author object to page
           if (page.author_id !== null && data.authors[page.author_id]) {
@@ -354,7 +354,12 @@ export default {
                       cloneDeep(prefilledMarketModules[item.value_id])
                     );
                   } else {
-                    if (checkForInactiveOperatorToplist(item, page.relation.status)) return;
+                    if (
+                      transformedPages[market][pageType][index].relation &&
+                      checkForInactiveOperatorToplist(item, page.relation.status)
+                    )
+                      return;
+
                     res === 'pre_main_operators'
                       ? page.sections.main.modules.unshift(cloneDeep(item))
                       : page.sections.main.modules.push(cloneDeep(item));

package/src/helpers/processor/relations.js

@@ -9,7 +9,7 @@ export const processRelations = (page, pageType, transformedPages, market, data,
     switch (page.relation_type) {
       // Add path for payment page from payment method
       case 'operator':
-        if (hasRelation) {
+        if (page.relation && hasRelation) {
           // eslint-disable-next-line camelcase, prefer-const
           const { ribbons, extra_fields, bonus } = page.relation;
           bonus &&