gatsby-core-theme 33.0.2 → 33.1.1

package/CHANGELOG.md

@@ -1,3 +1,60 @@
+## [33.1.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.1.0...v33.1.1) (2024-06-25)
+
+
+### Bug Fixes
+
+* fix relation pick keys for email and url ([a3cff32](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a3cff3220c99d07e84de76d27e179113027b6164))
+* search logic ([214d773](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/214d77330cdeb0a09fc7232a1d05903072995611))
+
+
+### Code Refactoring
+
+* add games amount to operator relation ([d20e0dc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d20e0dcfaacf439f2717b2cebe4953062c0516ae))
+* change to button titles ([1a430e1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1a430e19b831d1e23b8edacbc67263b7b7464317))
+* changes to aria-labels and buttons ([4d57af5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4d57af5349b06ae606b58c1a2c015488f98fe605))
+* changes to search button ([f0f0e9f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f0f0e9ffbe25a10c4c1e0584bac696e09b06f480))
+
+
+* Merge branch 'tm-4505' into 'master' ([d085a9e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d085a9e467dc3f139e99e05281186022f012dfcd))
+
+# [33.1.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.0.2...v33.1.0) (2024-06-20)
+
+
+### Bug Fixes
+
+* add alt text ([ff4455a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ff4455a521d4436df2c2dc5e8cf71fc457af39df))
+* added conditional indexing ([85fbd8e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/85fbd8eb1cedf0c65343a0f1ffbeb4d2890c0319))
+* added sanitize operator by market ([db27fc1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/db27fc12cad16cce357536ee6aa3f424454bd894))
+* added sanitize operator function + fixed references + testing ([2810f91](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2810f91efb44fd0f631c6bfd029a434e0f75fca4))
+* forgoten variable ([c4267b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c4267b19be1b61c88996f04f48774cef15e564b5))
+* image resize core ([5e40d81](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5e40d81917389e2cee668b0f12c9fb3a0037e014))
+* jest ([ba4b7c0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ba4b7c02f0654f6831d9993245f5cf939121cbef))
+* search for multimarket ([bfe7b3a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/bfe7b3a0df3121061a1bf9c38b8180d1fd6ef46c))
+* search showall and when no query is submitted ([07ad454](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/07ad454c92304369e53e6ac8cfacd052abd68735))
+* small changes ([ff60d70](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ff60d700a0722525e83cf96fa22adc723a205318))
+* update naming ([0daa09e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0daa09e0c5e6a3e15b26c0aed3d28aad7f59698d))
+
+
+### Code Refactoring
+
+* changes to css var values ([b6a03d3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b6a03d3d277ad71b0c5a6523c9dc6847530cf4c0))
+* changes to list padding ([43b7a84](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/43b7a845a131689d9d3b9512d9a268958e301f93))
+* remove padding on list soon after headings ([c8f3f50](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c8f3f5068770d6f7bdb4fe55012623cad189bfff))
+
+
+* Merge branch 'tm-4484-alt-text' into 'master' ([7328829](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/732882963632c20c413679990ccd2959bfc42367))
+* Merge branch 'tm-4398-search-refactoring' into 'master' ([b37c19b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b37c19b2503f35ff0b7e8b226efcb2a41ff3ae61))
+* Merge branch 'tm-4455-empty-menu' into 'master' ([567ea5b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/567ea5ba9390dd56dd9da7dccd24a91e6b6e57fe))
+* Merge branch 'tm-4293-improvements-rg-template' into 'master' ([ae964f3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ae964f394c630007ced3163f661784c5622f782d))
+* Merge branch 'tm-4428-sanitize-operator' into 'master' ([699b5e2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/699b5e22133830bf6262b16c85620a167496de37))
+* Merge branch 'tm-4358-images-resize' into 'master' ([e95e129](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e95e12965538a84f07bd001f999d78a1947a35f4))
+* Merge branch 'tm-4451-lists' into 'master' ([761a9a7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/761a9a7c8ffa82110edf3726b522331948e7bfde))
+
+
+### Features
+
+* search refactoring and tests ([ad6989b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ad6989b5b2eff85bb6a41c750a9f3b9d6aa639ad))
+
 ## [33.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.0.1...v33.0.2) (2024-06-19)
 
 

package/gatsby-node.mjs

@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 /* eslint-disable import/no-extraneous-dependencies */
 /* eslint-disable prefer-destructuring */
 /* eslint-disable no-unused-vars */
@@ -13,10 +14,11 @@ import { getData, getLocalData } from './src/helpers/api.mjs';
 
 import { generateTrackerLink } from './src/helpers/generators.mjs';
 import processor, { processSitemapPages } from './src/helpers/processor/index.mjs';
-import { pickAuthorsPageKeys } from './src/constants/pick-keys.mjs';
+import { pickAuthorsPageKeys, pickRelationKeys } from './src/constants/pick-keys.mjs';
 import settings from './src/constants/settings.mjs';
 import { translate } from './src/helpers/getters.mjs';
 import { groupBy } from './src/helpers/processor/common.mjs';
+import { sanitizeOperatorData } from './src/helpers/processor/operators.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const { cloneDeep, chunk, pick } = loadash;
@@ -297,11 +299,19 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
               templates,
             },
           });
+        } else if (page.path === `${pathPrefix || ''}s`) {
+          createPage({
+            path: `/${page.path}`,
+            component: `${__dirname}/src/components/app-ssr.js`,
+            context: {
+              ...contextData,
+              isPreview: page.path === 'preview',
+            },
+          });
         } else {
-          const component =
-          settings.app_ssr.includes(page.template)
-              ? `${__dirname}/src/components/app-ssr.js`
-              : `${__dirname}/src/components/app.js`;
+          const component = settings.app_ssr.includes(page.template)
+            ? `${__dirname}/src/components/app-ssr.js`
+            : `${__dirname}/src/components/app.js`;
 
           createPage({
             path: page.path.charAt(0) === '/' ? page.path : `/${page.path}`,
@@ -392,7 +402,10 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
             meta_robots: ['noindex', 'nofollow'],
           };
 
-          const trackerComp = process.env.IS_TRACKING_SSR === 'true' ? `${__dirname}/src/components/pages/tracker-geo/index-ssr.js` : `${__dirname}/src/components/pages/tracker-geo/index.js`;
+          const trackerComp =
+            process.env.IS_TRACKING_SSR === 'true'
+              ? `${__dirname}/src/components/pages/tracker-geo/index-ssr.js`
+              : `${__dirname}/src/components/pages/tracker-geo/index.js`;
 
           createPage({
             path: trackerLinkPath,
@@ -400,7 +413,12 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
             context: {
               page: trackerPageObject,
               siteInfo,
-              operatorsByMarket,
+              operator: Object.fromEntries(
+                Object.entries(operatorsByMarket).map(([key, operator]) => [
+                  key, 
+                  pick(cloneDeep(sanitizeOperatorData(operator)), pickRelationKeys.operator)
+                ])
+              ),
               isTrackeGeo: true,
               isLiveStreamProvider: false,
             },
@@ -443,7 +461,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
               page: trackerPageObject,
               translations: processed.relations.translations[marketOperator],
               siteInfo,
-              operator,
+              operator: pick(cloneDeep(sanitizeOperatorData(operator, [], [], translations, [])), pickRelationKeys.operator),
               isTracker: true,
               isLiveStreamProvider: false,
             },

package/jest.config.js

@@ -18,16 +18,18 @@ module.exports = {
     '^~context(.*)$': '<rootDir>/src/context$1',
     '^~constants(.*)$': '<rootDir>/src/constants$1',
     // JSON Data
-    'data.json': '<rootDir>/__mocks__/search-data.json',
+    // 'data.json': '<rootDir>/__mocks__/search-data.json',
     '^gatsby-plugin-utils/(.*)$': [`gatsby-plugin-utils/dist/$1`, `gatsby-plugin-utils/$1`],
     '^gatsby-core-utils/(.*)$': `gatsby-core-utils/dist/$1`,
   },
   // testPathIgnorePatterns: [`node_modules`, `\\.cache`, `<rootDir>.*/public`],
   coveragePathIgnorePatterns: [
     'tests/helpers',
-    'src/components/organisms/search',
-    'src/components/molecules/search',
+    'src/components/organisms/carousel',
+    'src/components/atoms/author-box',
+    'src/components/pages/search',
     'src/components/app.js',
+    'src/components/app-ssr.js',
   ],
   transformIgnorePatterns: [`node_modules/(?!(gatsby|gatsby-script|gatsby-link)/)`],
   globals: {
@@ -41,7 +43,7 @@ module.exports = {
   collectCoverage: true,
   coverageThreshold: {
     global: {
-      statements: 79,
+      statements: 81,
     },
   },
 };

package/package.json

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

package/src/components/app-ssr.js

@@ -88,9 +88,10 @@ AppSSR.propTypes = {
   serverData: PropTypes.any,
 };
 
-export async function getServerData({ pageContext, url }) {
+export async function getServerData(props) {
+  const { pageContext, url, query, headers } = props;
   let res = '';
-  res = await getAPIData(pageContext.page, url);
+  res = await getAPIData(pageContext.page, query.s ? url : headers.get('referer'));
   return res;
 }
 export default AppSSR;

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

@@ -0,0 +1,69 @@
+import React from 'react';
+import { render, screen, cleanup, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { act } from 'react-dom/test-utils';
+import getAuthorList from '../../../../tests/factories/authors/author.factory';
+
+import Index from '.';
+
+describe('Author Box Tests', () => {
+  test('render template one', async () => {
+    const currentAuthor = getAuthorList({ count: 1 })[1];
+    // eslint-disable-next-line react/style-prop-object
+    const args = {
+      author: currentAuthor,
+      style: 'template_one',
+    };
+
+    await act(async () => {
+      render(<Index {...args} />);
+    });
+
+    // Use waitFor or findBy* methods to wait for elements to appear
+    await waitFor(() => {
+      const authorBox = document.getElementById('authorbox');
+      expect(authorBox).toBeInTheDocument();
+    });
+  });
+
+  test('render template two', async () => {
+    const currentAuthor = getAuthorList({ count: 1 })[1];
+    // eslint-disable-next-line react/style-prop-object
+    const args = {
+      author: currentAuthor,
+      style: 'template_two',
+    };
+
+    await act(async () => {
+      render(<Index {...args} />);
+    });
+
+    // Use waitFor or findBy* methods to wait for elements to appear
+    await waitFor(() => {
+      const authorBox = document.getElementById('authorbox');
+      expect(authorBox).toBeInTheDocument();
+    });
+  });
+
+  test('render template three', async () => {
+    const currentAuthor = getAuthorList({ count: 1 })[1];
+    // eslint-disable-next-line react/style-prop-object
+    const args = {
+      author: currentAuthor,
+      style: 'template_three',
+    };
+
+    await act(async () => {
+      render(<Index {...args} />);
+    });
+
+    // Use waitFor or findBy* methods to wait for elements to appear
+    await waitFor(() => {
+      const authorBox = document.getElementById('authorbox');
+      expect(authorBox).toBeInTheDocument();
+    });
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/atoms/author-box/template-one/author-box.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, cleanup } from '@testing-library/react';
+import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 
 import { authorObject } from '~tests/factories/modules/author-box.factory';
@@ -22,7 +22,9 @@ describe('author box component', () => {
     author.biography =
       "The purpose of lorem ipsum is to create a natural looking block of text (sentence, paragraph, page, etc.) that doesn't distract from the layout";
 
-    const { container, getByText } = render(<AuthorBox author={author} />);
+    const { container, getByText, getByRole } = render(<AuthorBox author={author} />);
+    const readMoreButton = getByRole('button');
+    fireEvent.click(readMoreButton);
 
     expect(container).toBeTruthy();
     expect(getByText(author.biography)).toBeTruthy();

package/src/components/atoms/author-box/template-three/expertion/index.js

@@ -9,9 +9,9 @@ export default function Expertion({ expertise }) {
       {expertise && (
         <div className={styles.expertion}>
           <p>Expert on:</p>
-          {expertise?.map((res) => (
+          {expertise?.map((res, index) => (
             <span>
-              <Check />
+              <Check id={`${res}_${index}`} />
               {res}
             </span>
           ))}

package/src/components/atoms/button/button.js

@@ -28,6 +28,13 @@ function Button({
   }
 
   const linkAttr = to ? { href: to } : { onClick };
+  let extraProps;
+
+  if (onClick) {
+    extraProps = {
+      role: 'button',
+    };
+  }
 
   return (
     <a
@@ -37,6 +44,7 @@ function Button({
       rel="nofollow noreferrer"
       className={`${classes || ''}`}
       {...linkAttr}
+      {...extraProps}
     >
       {btnText}
       {icon && icon}

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

@@ -94,9 +94,6 @@ const OperatorCtaButton = ({
       title={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
         titleSuffix || ''
       }`.trimEnd()}
-      aria-label={`${typeof translateBtn === 'string' ? translateBtn : ''} ${
-        titleSuffix || ''
-      }`.trimEnd()}
       className={`${classes || ''} ${gtmClass || ''}`}
     >
       {translateBtn}

package/src/components/atoms/custom-select/custom-select.module.scss

@@ -3,7 +3,7 @@
   height: 4.8rem;
   position: relative;
   @include min(tablet) {
-    max-width: 30rem;
+    width: 60%;
     margin-left: auto;
   }
   .select {
@@ -18,6 +18,7 @@
     color: var(--color-22);
     font-weight: 700;
     box-shadow: 0 0.1rem 0.2rem 0 rgba(0, 0, 0, 0.2);
+    max-width: 100%;
 
     &:after {
       @include arrow(var(--color-22), 1rem, down, false);
@@ -48,6 +49,6 @@
     font-weight: 700;
     color: var(--color-22);
     width: 100%;
-    text-align: left;
+    text-align: left; 
   }
 }

package/src/components/atoms/disclaimer/disclaimer.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-expressions */
 import React from 'react';
-import { render, cleanup } from '@testing-library/react';
+import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import Disclaimer from '.';
 
@@ -10,9 +10,13 @@ describe('Disclaimer Component', () => {
     const func = require('../../../helpers/device-detect');
     func.isNativeImageLazyLoadingSupported = jest.fn(() => true);
     const { container } = render(<Disclaimer dmcaImage="../../../../../images/dmca.png" />);
+
     expect(container.querySelector('img')).toBeTruthy();
     expect(container.querySelector('img')).toHaveAttribute('src', '../../../../../images/dmca.png');
     expect(container.querySelector('img')).toHaveAttribute('loading', 'eager');
+
+    const Button = container.querySelector('a');
+    fireEvent.click(Button);
   });
 });
 afterEach(() => {

package/src/components/atoms/menu/items/items.test.js

@@ -25,6 +25,33 @@ describe('Menu Component', () => {
       expect(container.querySelectorAll('.menuItem.level1 > ul').length).toEqual(1);
       expect(container.querySelectorAll('.menuItem.level1 > ul > li').length).toEqual(4);
       expect(container.querySelectorAll('ul')).toHaveLength(5);
+
+      const Button = container.querySelector('li');
+      fireEvent.click(Button);
+      fireEvent.focus(Button);
+    });
+  });
+
+  test('render menu and lists on mobile', async () => {
+    Object.defineProperty(window.navigator, 'userAgent', {
+      value:
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0 Mobile/15E148 Safari/604.1',
+      writable: true,
+    });
+
+    const { container } = render(<Items item={menus.children[3]} canOpenAllSubMenus={false} />);
+    const Button = container.querySelector('.menuItem.level1 > ul > li');
+    await waitFor(() => {
+      fireEvent.click(Button);
+      expect(container.querySelectorAll('.menuItem.level1 > ul > li.showSubMenu').length).toEqual(
+        1
+      );
+
+      fireEvent.focus(Button);
+      fireEvent.mouseOver(Button);
+      fireEvent.keyDown(Button);
+
+      expect(container.querySelectorAll('ul')).toHaveLength(5);
     });
   });
 });

package/src/components/atoms/not-found/not-found.test.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import NotFound from '.';
+
+describe('Not Found Tests', () => {
+  test('test not found component', () => {
+    const { getAllByText } = render(<NotFound />);
+    expect(getAllByText('Oops, Something Went Wrong.')).toHaveLength(1);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/atoms/search/autocomplete/operator.js

@@ -8,7 +8,7 @@ import styles from './operator.module.scss';
 
 const Operator = ({ item = {}, width = '56', height = '56' }) => {
   const { relation } = item;
-  const img = relation?.standardised_logo_url_object?.filename || relation.logo_url;
+  const img = relation?.logo?.filename;
 
   return (
     <div className={styles.row || ''}>
@@ -28,7 +28,7 @@ Operator.propTypes = {
   item: PropTypes.shape({
     title: PropTypes.string,
     relation: PropTypes.shape({
-      logo_url: PropTypes.string,
+      logo: PropTypes.shape({}),
     }),
   }).isRequired,
   width: PropTypes.string,

package/src/components/atoms/sitemap/sitemap.test.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import Sitemap from '.';
+
+const pageContext = {
+  sitemapData: {
+    ie_en: {
+      1: [
+        {
+          title: 'test one',
+          path: '/test_one',
+        },
+        {
+          title: 'test two',
+          path: '/test_two',
+        },
+        {
+          title: 'test three',
+          path: '/test_three',
+        },
+      ],
+      2: [
+        {
+          title: 'template page one',
+          path: '/template_page_one',
+        },
+        {
+          title: 'template page two',
+          path: '/template_page_two',
+        },
+      ],
+      3: [
+        {
+          title: 'template two page',
+          path: 'template_teo_page',
+        },
+      ],
+    },
+  },
+  templates: {
+    ie_en: {
+      short_name: 'template one',
+    },
+    2: {
+      short_name: 'template two',
+    },
+    3: {
+      short_name: 'template three',
+    },
+  },
+};
+
+describe('Sitemap Tests', () => {
+  test('test sitemap', () => {
+    const { getAllByText } = render(<Sitemap pageContext={pageContext} />);
+    expect(getAllByText('Link Icon')).toHaveLength(3);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/molecules/bonus/template-one/bonus.test.js

@@ -4,9 +4,9 @@ import Bonus from '.';
 
 describe('Bonus', () => {
   const operator = {
-    standardised_logo_url: 'logo-url',
-    logo: 'standardised-logo',
-    logo_url: 'logo-url',
+    logo: {
+      filename: 'standardised-logo',
+    },
     bonus: {
       rating: '4.5',
     },

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

@@ -23,9 +23,7 @@ export default function Bonus({
   height = '120',
   showRoundedRating = false,
 }) {
-  const { standardised_logo_url, logo_url, bonus, name } = operator || {};
-  const logo = standardised_logo_url || logo_url;
-
+  const { logo, bonus, name } = operator || {};
   const showTncFixed = tncEnable && tncFixed;
 
   return (
@@ -46,9 +44,9 @@ export default function Bonus({
           >
             <LazyImage
               alt={operator?.name}
-              src={imagePrettyUrl(logo, width, height)}
-              height={height}
-              width={width}
+              src={imagePrettyUrl(logo?.filename)}
+              height={120}
+              width={100}
             />
             <div className={styles.details}>
               {(bonus?.operator_name || name) && <span>{bonus?.operator_name || name}</span>}
@@ -82,9 +80,7 @@ export default function Bonus({
 
 Bonus.propTypes = {
   operator: PropTypes.shape({
-    standardised_logo_url: PropTypes.string,
-    logo: PropTypes.string,
-    logo_url: PropTypes.string,
+    logo: PropTypes.shape({}),
     bonus: PropTypes.shape({
       rating: PropTypes.string,
     }),

package/src/components/molecules/bonus/template-two/bonus.test.js

@@ -18,9 +18,7 @@ function renderComponent(operator) {
 
 describe('TemplateOne', () => {
   const operator = {
-    standardised_logo_url: 'logo_st',
     logo: 'logo',
-    logo_url: 'logo-url',
     bonus: {
       rating: '4.5',
     },

package/src/components/molecules/bonus/template-two/index.js

@@ -31,8 +31,7 @@ export default function TemplateOne({
   height = '120',
 }) {
   const { translations } = useContext(Context) || {};
-  const { standardised_logo_url, logo_url, bonus, name } = operator || {};
-  const logo = standardised_logo_url || logo_url;
+  const { logo, bonus, name } = operator || {};
 
   const showTncFixed = tncEnable && tncFixed;
 
@@ -66,7 +65,7 @@ export default function TemplateOne({
           >
             <LazyImage
               alt={operator?.name}
-              src={imagePrettyUrl(logo, width, height)}
+              src={imagePrettyUrl(logo?.filename, 120, 120)}
               loading="eager"
               height={height}
               width={width}
@@ -120,9 +119,7 @@ TemplateOne.propTypes = {
   closedBanner: PropTypes.bool,
   setClosedBanner: PropTypes.func,
   operator: PropTypes.shape({
-    standardised_logo_url: PropTypes.string,
-    logo: PropTypes.string,
-    logo_url: PropTypes.string,
+    logo: PropTypes.shape({}),
     bonus: PropTypes.shape({
       rating: PropTypes.string,
     }),

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

@@ -50,7 +50,7 @@ const Content = ({
       `}
     >
       {parse(content, {
-        replace: (node) => replaceMedia(node, page, translations),
+        replace: (node) => replaceMedia(node, page, translations, moduleWidth),
       })}
     </div>
   );
@@ -78,10 +78,13 @@ const Content = ({
       {mainContent(module.value)}
       <button
         type="button"
-        className={`${isContentCollapsible ? styles.showMoreTwoButton : styles.showMoreButton} ${
-          !isContentCollapsible && showMore && styles.hide
-        } ${showMore && isContentCollapsible && styles.showMoreTwoButtonOpen}`}
+        className={`${
+          isContentCollapsible ? styles.showMoreTwoButton || '' : styles.showMoreButton || ''
+        } ${(!isContentCollapsible && showMore && styles.hide) || ''} ${
+          (showMore && isContentCollapsible && styles.showMoreTwoButtonOpen) || ''
+        }`}
         onClick={handleChange}
+        title="showMoreContentButton"
       >
         {show_more_label}
         {icon && isContentCollapsible && icon}

package/src/components/molecules/content/lists/lists.module.scss

@@ -4,7 +4,7 @@
     color: #515156;
     font-size: 1.6rem;
     list-style-position: inside;
-    padding: 0 1.6rem 1.6rem 5.3rem;
+    padding: var(--content-list-padding, 1.6rem 1.6rem 1.6rem 5.3rem);
     font-weight: 400;
     line-height: 27px;
     li {
@@ -50,7 +50,7 @@
 
   ol {
     list-style-type: decimal;
-    padding: 0 1.6rem 1.6rem 5.2rem;
+    padding: var(--content-list-padding, 1.6rem 1.6rem 1.6rem 5.2rem);
 
     li {
       counter-increment: li;
@@ -95,4 +95,16 @@
     list-style-position: inside;
     margin-left: 1.5rem;
   }
+
+  p:not(:last-of-type),
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    + ol,
+    + ul {
+      padding-top: var(--content-list-last-padding, 0);
+    }
+  }
 }