remove more ads

Author: marc-aurele-besner

deploy/tools/envs-validator/schema.ts

@@ -9,7 +9,6 @@ declare module 'yup' {
 
 import * as yup from 'yup';
 
-import type { AdButlerConfig } from '../../../types/client/adButlerConfig';
 import type { AddressProfileAPIConfig } from '../../../types/client/addressProfileAPIConfig';
 import { SUPPORTED_AD_TEXT_PROVIDERS, SUPPORTED_AD_BANNER_PROVIDERS, SUPPORTED_AD_BANNER_ADDITIONAL_PROVIDERS } from '../../../types/client/adProviders';
 import type { AdTextProviders, AdBannerProviders, AdBannerAdditionalProviders } from '../../../types/client/adProviders';
@@ -424,40 +423,6 @@ const celoSchema = yup
       }),
   });
 
-const adButlerConfigSchema = yup
-  .object<AdButlerConfig>()
-  .transform(replaceQuotes)
-  .json()
-  .when('NEXT_PUBLIC_AD_BANNER_PROVIDER', {
-    is: (value: AdBannerProviders) => value === 'adbutler',
-    then: (schema) => schema
-      .shape({
-        id: yup.string().required(),
-        width: yup.number().positive().required(),
-        height: yup.number().positive().required(),
-      })
-      .required(),
-  })
-  .when('NEXT_PUBLIC_AD_BANNER_ADDITIONAL_PROVIDER', {
-    is: (value: AdBannerProviders) => value === 'adbutler',
-    then: (schema) => schema
-      .shape({
-        id: yup.string().required(),
-        width: yup.number().positive().required(),
-        height: yup.number().positive().required(),
-      })
-      .required(),
-  });
-
-const adsBannerSchema = yup
-  .object()
-  .shape({
-    NEXT_PUBLIC_AD_BANNER_PROVIDER: yup.string<AdBannerProviders>().oneOf(SUPPORTED_AD_BANNER_PROVIDERS),
-    NEXT_PUBLIC_AD_BANNER_ADDITIONAL_PROVIDER: yup.string<AdBannerAdditionalProviders>().oneOf(SUPPORTED_AD_BANNER_ADDITIONAL_PROVIDERS),
-    NEXT_PUBLIC_AD_ADBUTLER_CONFIG_DESKTOP: adButlerConfigSchema,
-    NEXT_PUBLIC_AD_ADBUTLER_CONFIG_MOBILE: adButlerConfigSchema,
-  });
-
 // DEPRECATED
 const sentrySchema = yup
   .object()
@@ -1053,7 +1018,6 @@ const schema = yup
     NEXT_PUBLIC_USE_NEXT_JS_PROXY: yup.boolean(),
   })
   .concat(accountSchema)
-  .concat(adsBannerSchema)
   .concat(marketplaceSchema)
   .concat(rollupSchema)
   .concat(celoSchema)

nextjs/csp/policies/ad.ts

@@ -1,10 +1,5 @@
-import Base64 from 'crypto-js/enc-base64';
-import sha256 from 'crypto-js/sha256';
 import type CspDev from 'csp-dev';
 
-import { connectAdbutler, placeAd } from 'ui/shared/ad/adbutlerScript';
-import { hypeInit } from 'ui/shared/ad/hypeBannerScript';
-
 export function ad(): CspDev.DirectiveDescriptor {
   return {
     'connect-src': [
@@ -28,38 +23,5 @@ export function ad(): CspDev.DirectiveDescriptor {
       'v1.getittech.io',
       'ipapi.co',
     ],
-    'frame-src': [
-      // coinzilla
-      'https://request-global.czilladx.com',
-    ],
-    'script-src': [
-      // coinzilla
-      'coinzillatag.com',
-
-      // adbutler
-      'servedbyadbutler.com',
-      `'sha256-${ Base64.stringify(sha256(connectAdbutler)) }'`,
-      `'sha256-${ Base64.stringify(sha256(placeAd(undefined) ?? '')) }'`,
-      `'sha256-${ Base64.stringify(sha256(placeAd('mobile') ?? '')) }'`,
-
-      // slise
-      '*.slise.xyz',
-
-      //hype
-      `'sha256-${ Base64.stringify(sha256(hypeInit ?? '')) }'`,
-      'https://api.hypelab.com',
-      'd1q98dzwj6s2rb.cloudfront.net',
-    ],
-    'img-src': [
-      // coinzilla
-      'cdn.coinzilla.io',
-
-      // adbutler
-      'servedbyadbutler.com',
-    ],
-    'font-src': [
-      // coinzilla
-      'https://request-global.czilladx.com',
-    ],
   };
 }

ui/home/HeroBanner.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 
 import config from 'configs/app';
 import RewardsButton from 'ui/rewards/RewardsButton';
-import AdBanner from 'ui/shared/ad/AdBanner';
 import SearchBar from 'ui/snippets/searchBar/SearchBar';
 import UserProfileDesktop from 'ui/snippets/user/profile/UserProfileDesktop';
 import UserWalletDesktop from 'ui/snippets/user/wallet/UserWalletDesktop';
@@ -79,7 +78,6 @@ const HeroBanner = () => {
         </Flex>
         <SearchBar isHomepage/>
       </Box>
-      <AdBanner platform="mobile" w="fit-content" flexShrink={ 0 } borderRadius="md" overflow="hidden" display={{ base: 'none', lg: 'block ' }}/>
     </Flex>
   );
 };

ui/pages/Home.tsx

@@ -9,7 +9,6 @@ import LatestZkEvmL2Batches from 'ui/home/latestBatches/LatestZkEvmL2Batches';
 import LatestBlocks from 'ui/home/LatestBlocks';
 import Stats from 'ui/home/Stats';
 import Transactions from 'ui/home/Transactions';
-import AdBanner from 'ui/shared/ad/AdBanner';
 
 const rollupFeature = config.features.rollup;
 
@@ -35,7 +34,6 @@ const Home = () => {
         <Stats/>
         <ChainIndicators/>
       </Flex>
-      <AdBanner mt={ 6 } mx="auto" display={{ base: 'flex', lg: 'none' }} justifyContent="center"/>
       <Flex mt={ 8 } direction={{ base: 'column', lg: 'row' }} columnGap={ 12 } rowGap={ 6 }>
         { leftWidget }
         <Box flexGrow={ 1 }>

ui/pages/RewardsDashboard.tsx

@@ -8,7 +8,6 @@ import DailyRewardClaimButton from 'ui/rewards/dashboard/DailyRewardClaimButton'
 import RewardsDashboardCard from 'ui/rewards/dashboard/RewardsDashboardCard';
 import RewardsDashboardCardValue from 'ui/rewards/dashboard/RewardsDashboardCardValue';
 import RewardsReadOnlyInputWithCopy from 'ui/rewards/RewardsReadOnlyInputWithCopy';
-import AdBanner from 'ui/shared/ad/AdBanner';
 import Skeleton from 'ui/shared/chakra/Skeleton';
 import LinkExternal from 'ui/shared/links/LinkExternal';
 import PageTitle from 'ui/shared/Page/PageTitle';
@@ -57,7 +56,6 @@ const RewardsDashboard = () => {
             </span>
           ) }
         />
-        <AdBanner platform="mobile" w="fit-content" flexShrink={ 0 } borderRadius="md" overflow="hidden" display={{ base: 'none', lg: 'block ' }}/>
       </Flex>
       <Flex flexDirection="column" alignItems="flex-start" w="full" gap={ 6 }>
         { isError && <Alert status="error">Failed to load some data. Please try again later.</Alert> }

ui/shared/AppError/AppError.tsx

@@ -3,21 +3,17 @@ import React from 'react';
 
 import { route } from 'nextjs-routes';
 
-import config from 'configs/app';
 import getErrorCause from 'lib/errors/getErrorCause';
 import getErrorCauseStatusCode from 'lib/errors/getErrorCauseStatusCode';
 import getErrorObjStatusCode from 'lib/errors/getErrorObjStatusCode';
 import getResourceErrorPayload from 'lib/errors/getResourceErrorPayload';
-import AdBannerContent from 'ui/shared/ad/AdBannerContent';
 
 import AppErrorIcon from './AppErrorIcon';
 import AppErrorTitle from './AppErrorTitle';
 import AppErrorBlockConsensus from './custom/AppErrorBlockConsensus';
 import AppErrorTooManyRequests from './custom/AppErrorTooManyRequests';
 import AppErrorTxNotFound from './custom/AppErrorTxNotFound';
 
-const adBannerConfig = config.features.adsBanner;
-
 interface Props {
   className?: string;
   error: Error | undefined;
@@ -81,8 +77,6 @@ const AppError = ({ error, className }: Props) => {
       default: {
         const { title, text } = ERROR_TEXTS[String(statusCode)] ?? ERROR_TEXTS[500];
 
-        const adBannerProvider = adBannerConfig.isEnabled ? adBannerConfig.provider : null;
-
         return (
           <>
             <AppErrorIcon statusCode={ statusCode }/>
@@ -97,7 +91,6 @@ const AppError = ({ error, className }: Props) => {
             >
               Back to home
             </Button>
-            { statusCode === 404 && adBannerProvider && <AdBannerContent mt={ 12 } provider={ adBannerProvider }/> }
           </>
         );
       }