gatsby-matrix-theme 48.0.1 → 48.0.3

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## [48.0.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.2...v48.0.3) (2024-07-17)
+
+
+### Bug Fixes
+
+* rename const ([32980a1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/32980a1b36405211e1c38e1c66f81f5ffaed92e0))
+* resolve conflicts ([09766f6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/09766f64b3c05d1fd348ec15d0a47b4f8364917b))
+* update core version ([8012e9d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8012e9dabce33b6214bf8f84e7e3f85138592811))
+* update pages body ([74837a0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/74837a0cfe5c6fc5f91792af6c80853be09a7850))
+
+
+* Merge branch 'tm-4420-info-page-type' into 'master' ([561b0e3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/561b0e3b101f1c058d044c2743d4c90c0c7f78aa))
+
+## [48.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.1...v48.0.2) (2024-07-16)
+
+
+### Bug Fixes
+
+* feedback translation fix ([3c913b7](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3c913b7e5db66e208d57a23d6bcf2c7c132746d3))
+
+
+### Config
+
+* update theme ([7984b59](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7984b59c609c89e8c529ba5cf3acb45cafeb7080))
+
 ## [48.0.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v48.0.0...v48.0.1) (2024-07-16)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "48.0.1",
+  "version": "48.0.3",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "34.0.6",
+    "gatsby-core-theme": "35.0.1",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-transformer-sharp": "^5.11.0",
     "prop-types": "15.7.2",

package/src/components/atoms/feedback/template-two/index.js

@@ -60,10 +60,10 @@ const FeedBack = ({
   const feedbackText = () => (
     <>
       {voted === null ? (
-        <div className={styles?.details || ''}>{`${trueVotes} $useTranslate(
+        <div className={styles?.details || ''}>{`${trueVotes} ${useTranslate(
           'of_feedback',
           'of'
-        )} ${trueVotes + falseVotes} $useTranslate(
+        )} ${trueVotes + falseVotes} ${useTranslate(
           'user_recomend_feedback',
           'users recommend [casinoTitle]'
         ).replace('[casinoTitle]', casinoTitle)} `}</div>

package/src/gatsby-core-theme/components/pages/body/index.js

@@ -18,7 +18,7 @@ import { isSearchPath } from '~helpers/isSearchPath';
 import ExclusiveOperator from '../../../../components/molecules/operator-exclusive';
 import { setCookie, getCookie } from '~helpers/cookies';
 
-function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }) {
+function Body({ pageContext, children, serverData }) {
   useEffect(() => {
     if (!getCookie('affUUID')) {
       setCookie('affUUID', uuidv4());
@@ -53,6 +53,8 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
   const exclusiveOperator =
     pageTypes[template]?.exclusiveOperator ?? pageTypes.default.exclusiveOperator;
 
+  const disablePopup = pageTypes[template]?.disablePopup ?? pageTypes.default.disablePopup;
+
   const showExclusiveOperator = excOperator && pageType !== 'operator' && exclusiveOperator;
 
   const popupData = pageContext?.marketSections?.popup?.modules?.find((m) => m.name === 'top_list');
@@ -112,15 +114,13 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
           dmcaImage="../../../../../../images/dmca.png"
         />
       )}
-      {!excludeTemplateInPopup.includes(pageContext?.page?.template) &&
-        pageContext?.marketSections?.popup &&
-        popupData && (
-          <Popup
-            module={popupData}
-            template={pageContext?.page?.template}
-            operatorStatus={pageContext?.page?.relation?.status}
-          />
-        )}
+      {!disablePopup && pageContext?.marketSections?.popup && popupData && (
+        <Popup
+          module={popupData}
+          template={pageContext?.page?.template}
+          operatorStatus={pageContext?.page?.relation?.status}
+        />
+      )}
       <FloatingArea pageContext={pageContext} template={template} />
     </>
   );
@@ -148,7 +148,6 @@ Body.propTypes = {
       }),
     }),
   }).isRequired,
-  excludeTemplateInPopup: PropTypes.arrayOf(PropTypes.string),
   children: PropTypes.element,
   serverData: PropTypes.shape({}),
 };