Skip to content

Commit 5dcede9

Browse files
marc-aurele-besnermarc-aurele-besner
committed
Merge branch 'sync-to-latest-release' into feat/improve-transaction-page
2 parents ba5733a + 392dad7 commit 5dcede9

24 files changed

+0
-535
lines changed

‎deploy/tools/envs-validator/schema.ts

-36
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ declare module 'yup' {
99

1010
import * as yup from 'yup';
1111

12-
import type { AdButlerConfig } from '../../../types/client/adButlerConfig';
1312
import type { AddressProfileAPIConfig } from '../../../types/client/addressProfileAPIConfig';
1413
import { SUPPORTED_AD_TEXT_PROVIDERS, SUPPORTED_AD_BANNER_PROVIDERS, SUPPORTED_AD_BANNER_ADDITIONAL_PROVIDERS } from '../../../types/client/adProviders';
1514
import type { AdTextProviders, AdBannerProviders, AdBannerAdditionalProviders } from '../../../types/client/adProviders';
@@ -424,40 +423,6 @@ const celoSchema = yup
424423
}),
425424
});
426425

427-
const adButlerConfigSchema = yup
428-
.object<AdButlerConfig>()
429-
.transform(replaceQuotes)
430-
.json()
431-
.when('NEXT_PUBLIC_AD_BANNER_PROVIDER', {
432-
is: (value: AdBannerProviders) => value === 'adbutler',
433-
then: (schema) => schema
434-
.shape({
435-
id: yup.string().required(),
436-
width: yup.number().positive().required(),
437-
height: yup.number().positive().required(),
438-
})
439-
.required(),
440-
})
441-
.when('NEXT_PUBLIC_AD_BANNER_ADDITIONAL_PROVIDER', {
442-
is: (value: AdBannerProviders) => value === 'adbutler',
443-
then: (schema) => schema
444-
.shape({
445-
id: yup.string().required(),
446-
width: yup.number().positive().required(),
447-
height: yup.number().positive().required(),
448-
})
449-
.required(),
450-
});
451-
452-
const adsBannerSchema = yup
453-
.object()
454-
.shape({
455-
NEXT_PUBLIC_AD_BANNER_PROVIDER: yup.string<AdBannerProviders>().oneOf(SUPPORTED_AD_BANNER_PROVIDERS),
456-
NEXT_PUBLIC_AD_BANNER_ADDITIONAL_PROVIDER: yup.string<AdBannerAdditionalProviders>().oneOf(SUPPORTED_AD_BANNER_ADDITIONAL_PROVIDERS),
457-
NEXT_PUBLIC_AD_ADBUTLER_CONFIG_DESKTOP: adButlerConfigSchema,
458-
NEXT_PUBLIC_AD_ADBUTLER_CONFIG_MOBILE: adButlerConfigSchema,
459-
});
460-
461426
// DEPRECATED
462427
const sentrySchema = yup
463428
.object()
@@ -1053,7 +1018,6 @@ const schema = yup
10531018
NEXT_PUBLIC_USE_NEXT_JS_PROXY: yup.boolean(),
10541019
})
10551020
.concat(accountSchema)
1056-
.concat(adsBannerSchema)
10571021
.concat(marketplaceSchema)
10581022
.concat(rollupSchema)
10591023
.concat(celoSchema)

‎nextjs/csp/policies/ad.ts

-38
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import Base64 from 'crypto-js/enc-base64';
2-
import sha256 from 'crypto-js/sha256';
31
import type CspDev from 'csp-dev';
42

5-
import { connectAdbutler, placeAd } from 'ui/shared/ad/adbutlerScript';
6-
import { hypeInit } from 'ui/shared/ad/hypeBannerScript';
7-
83
export function ad(): CspDev.DirectiveDescriptor {
94
return {
105
'connect-src': [
@@ -28,38 +23,5 @@ export function ad(): CspDev.DirectiveDescriptor {
2823
'v1.getittech.io',
2924
'ipapi.co',
3025
],
31-
'frame-src': [
32-
// coinzilla
33-
'https://request-global.czilladx.com',
34-
],
35-
'script-src': [
36-
// coinzilla
37-
'coinzillatag.com',
38-
39-
// adbutler
40-
'servedbyadbutler.com',
41-
`'sha256-${ Base64.stringify(sha256(connectAdbutler)) }'`,
42-
`'sha256-${ Base64.stringify(sha256(placeAd(undefined) ?? '')) }'`,
43-
`'sha256-${ Base64.stringify(sha256(placeAd('mobile') ?? '')) }'`,
44-
45-
// slise
46-
'*.slise.xyz',
47-
48-
//hype
49-
`'sha256-${ Base64.stringify(sha256(hypeInit ?? '')) }'`,
50-
'https://api.hypelab.com',
51-
'd1q98dzwj6s2rb.cloudfront.net',
52-
],
53-
'img-src': [
54-
// coinzilla
55-
'cdn.coinzilla.io',
56-
57-
// adbutler
58-
'servedbyadbutler.com',
59-
],
60-
'font-src': [
61-
// coinzilla
62-
'https://request-global.czilladx.com',
63-
],
6426
};
6527
}

‎ui/blob/BlobInfo.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Skeleton from 'ui/shared/chakra/Skeleton';
77
import CopyToClipboard from 'ui/shared/CopyToClipboard';
88
import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
99
import DetailsInfoItemDivider from 'ui/shared/DetailsInfoItemDivider';
10-
import DetailsSponsoredItem from 'ui/shared/DetailsSponsoredItem';
1110
import TxEntity from 'ui/shared/entities/tx/TxEntity';
1211

1312
import BlobData from './BlobData';
@@ -98,8 +97,6 @@ const BlobInfo = ({ data, isLoading }: Props) => {
9897
</>
9998
) }
10099

101-
<DetailsSponsoredItem isLoading={ isLoading }/>
102-
103100
{ data.blob_data && (
104101
<>
105102
<DetailsInfoItemDivider/>

‎ui/home/HeroBanner.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React from 'react';
33

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

‎ui/pages/ArbitrumL2TxnBatch.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { BLOCK } from 'stubs/block';
1212
import { TX } from 'stubs/tx';
1313
import { generateListStub } from 'stubs/utils';
1414
import BlocksContent from 'ui/blocks/BlocksContent';
15-
import TextAd from 'ui/shared/ad/TextAd';
1615
import PageTitle from 'ui/shared/Page/PageTitle';
1716
import Pagination from 'ui/shared/pagination/Pagination';
1817
import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
@@ -110,7 +109,6 @@ const ArbitrumL2TxnBatch = () => {
110109

111110
return (
112111
<>
113-
<TextAd mb={ 6 }/>
114112
<PageTitle
115113
title={ `Txn batch #${ batchQuery.data?.number }` }
116114
backLink={ backLink }

‎ui/pages/Blob.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import throwOnResourceLoadError from 'lib/errors/throwOnResourceLoadError';
66
import getQueryParamString from 'lib/router/getQueryParamString';
77
import { BLOB } from 'stubs/blobs';
88
import BlobInfo from 'ui/blob/BlobInfo';
9-
import TextAd from 'ui/shared/ad/TextAd';
109
import isCustomAppError from 'ui/shared/AppError/isCustomAppError';
1110
import DataFetchAlert from 'ui/shared/DataFetchAlert';
1211
import BlobEntity from 'ui/shared/entities/blob/BlobEntity';
@@ -46,7 +45,6 @@ const BlobPageContent = () => {
4645

4746
return (
4847
<>
49-
<TextAd mb={ 6 }/>
5048
<PageTitle
5149
title="Blob details"
5250
secondRow={ titleSecondRow }

‎ui/pages/Home.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import LatestZkEvmL2Batches from 'ui/home/latestBatches/LatestZkEvmL2Batches';
99
import LatestBlocks from 'ui/home/LatestBlocks';
1010
import Stats from 'ui/home/Stats';
1111
import Transactions from 'ui/home/Transactions';
12-
import AdBanner from 'ui/shared/ad/AdBanner';
1312

1413
const rollupFeature = config.features.rollup;
1514

@@ -35,7 +34,6 @@ const Home = () => {
3534
<Stats/>
3635
<ChainIndicators/>
3736
</Flex>
38-
<AdBanner mt={ 6 } mx="auto" display={{ base: 'flex', lg: 'none' }} justifyContent="center"/>
3937
<Flex mt={ 8 } direction={{ base: 'column', lg: 'row' }} columnGap={ 12 } rowGap={ 6 }>
4038
{ leftWidget }
4139
<Box flexGrow={ 1 }>

‎ui/pages/OptimisticL2TxnBatch.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { BLOCK } from 'stubs/block';
1212
import { TX } from 'stubs/tx';
1313
import { generateListStub } from 'stubs/utils';
1414
import BlocksContent from 'ui/blocks/BlocksContent';
15-
import TextAd from 'ui/shared/ad/TextAd';
1615
import PageTitle from 'ui/shared/Page/PageTitle';
1716
import Pagination from 'ui/shared/pagination/Pagination';
1817
import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
@@ -108,7 +107,6 @@ const OptimisticL2TxnBatch = () => {
108107

109108
return (
110109
<>
111-
<TextAd mb={ 6 }/>
112110
<PageTitle
113111
title={ `Batch #${ batchQuery.data?.internal_id }` }
114112
backLink={ backLink }

‎ui/pages/RewardsDashboard.tsx

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

‎ui/pages/ScrollL2TxnBatch.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { SCROLL_L2_TXN_BATCH } from 'stubs/scrollL2';
1414
import { TX } from 'stubs/tx';
1515
import { generateListStub } from 'stubs/utils';
1616
import BlocksContent from 'ui/blocks/BlocksContent';
17-
import TextAd from 'ui/shared/ad/TextAd';
1817
import PageTitle from 'ui/shared/Page/PageTitle';
1918
import Pagination from 'ui/shared/pagination/Pagination';
2019
import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
@@ -115,7 +114,6 @@ const ScrollL2TxnBatch = () => {
115114

116115
return (
117116
<>
118-
<TextAd mb={ 6 }/>
119117
<PageTitle
120118
title={ `Txn batch #${ number }` }
121119
backLink={ backLink }

‎ui/pages/ValidatorZilliqa.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { useAppContext } from 'lib/contexts/app';
77
import throwOnResourceLoadError from 'lib/errors/throwOnResourceLoadError';
88
import getQueryParamString from 'lib/router/getQueryParamString';
99
import { VALIDATOR_ZILLIQA } from 'stubs/validators';
10-
import TextAd from 'ui/shared/ad/TextAd';
1110
import ValidatorEntity from 'ui/shared/entities/validator/ValidatorEntity';
1211
import PageTitle from 'ui/shared/Page/PageTitle';
1312
import ValidatorDetails from 'ui/validators/zilliqa/ValidatorDetails';
@@ -62,7 +61,6 @@ const ValidatorZilliqa = () => {
6261

6362
return (
6463
<>
65-
<TextAd mb={ 6 }/>
6664
<PageTitle title="Validator details" secondRow={ titleSecondRow } backLink={ backLink }/>
6765
{ query.data && <ValidatorDetails data={ query.data } isLoading={ isLoading }/> }
6866
</>

‎ui/pages/ZkSyncL2TxnBatch.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import getQueryParamString from 'lib/router/getQueryParamString';
1212
import { TX } from 'stubs/tx';
1313
import { generateListStub } from 'stubs/utils';
1414
import { ZKSYNC_L2_TXN_BATCH } from 'stubs/zkSyncL2';
15-
import TextAd from 'ui/shared/ad/TextAd';
1615
import PageTitle from 'ui/shared/Page/PageTitle';
1716
import Pagination from 'ui/shared/pagination/Pagination';
1817
import useQueryWithPages from 'ui/shared/pagination/useQueryWithPages';
@@ -87,7 +86,6 @@ const ZkSyncL2TxnBatch = () => {
8786

8887
return (
8988
<>
90-
<TextAd mb={ 6 }/>
9189
<PageTitle
9290
title={ `Txn batch #${ number }` }
9391
backLink={ backLink }

‎ui/pool/PoolInfo.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type { Pool } from 'types/api/pools';
55

66
import Skeleton from 'ui/shared/chakra/Skeleton';
77
import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
8-
import DetailsSponsoredItem from 'ui/shared/DetailsSponsoredItem';
98
import TokenEntity from 'ui/shared/entities/token/TokenEntity';
109

1110
type Props = {
@@ -142,8 +141,6 @@ const PoolInfo = ({ data, isPlaceholderData }: Props) => {
142141
{ data.dex.name }
143142
</Skeleton>
144143
</DetailsInfoItem.Value>
145-
146-
<DetailsSponsoredItem isLoading={ isPlaceholderData }/>
147144
</Grid>
148145
);
149146
};

‎ui/shared/AppError/AppError.tsx

-7
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,17 @@ import React from 'react';
33

44
import { route } from 'nextjs-routes';
55

6-
import config from 'configs/app';
76
import getErrorCause from 'lib/errors/getErrorCause';
87
import getErrorCauseStatusCode from 'lib/errors/getErrorCauseStatusCode';
98
import getErrorObjStatusCode from 'lib/errors/getErrorObjStatusCode';
109
import getResourceErrorPayload from 'lib/errors/getResourceErrorPayload';
11-
import AdBannerContent from 'ui/shared/ad/AdBannerContent';
1210

1311
import AppErrorIcon from './AppErrorIcon';
1412
import AppErrorTitle from './AppErrorTitle';
1513
import AppErrorBlockConsensus from './custom/AppErrorBlockConsensus';
1614
import AppErrorTooManyRequests from './custom/AppErrorTooManyRequests';
1715
import AppErrorTxNotFound from './custom/AppErrorTxNotFound';
1816

19-
const adBannerConfig = config.features.adsBanner;
20-
2117
interface Props {
2218
className?: string;
2319
error: Error | undefined;
@@ -81,8 +77,6 @@ const AppError = ({ error, className }: Props) => {
8177
default: {
8278
const { title, text } = ERROR_TEXTS[String(statusCode)] ?? ERROR_TEXTS[500];
8379

84-
const adBannerProvider = adBannerConfig.isEnabled ? adBannerConfig.provider : null;
85-
8680
return (
8781
<>
8882
<AppErrorIcon statusCode={ statusCode }/>
@@ -97,7 +91,6 @@ const AppError = ({ error, className }: Props) => {
9791
>
9892
Back to home
9993
</Button>
100-
{ statusCode === 404 && adBannerProvider && <AdBannerContent mt={ 12 } provider={ adBannerProvider }/> }
10194
</>
10295
);
10396
}

‎ui/shared/ad/AdBanner.tsx

-39
This file was deleted.

0 commit comments

Comments
 (0)