Skip to content

Commit f818ae4

Browse files
Remove adroll (#4029)
* Remove adroll * related stuff removal * bring back cookie info * Update public/locales/cn/common.json Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent b7d9bfd commit f818ae4

12 files changed

+12
-62
lines changed

.env.template

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ COMMIT_SHA="dev"
33
# Analitycs
44
MIXPANEL_ENV="development"
55
MIXPANEL_KEY="b10b850880cb0a8557d878c2e6024d03"
6-
ADROLL_ADV_ID="5VWGFTJXUZF6BPUDCH3WWM"
7-
ADROLL_PIX_ID="4PSXWPAQTJEIXJSPHJCRW4"
86

97
# RPCs
108
INFURA_PROJECT_ID="de82b2d602264e4fbc0929dec0c45baa"

.github/workflows/aws-prod.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555
--build-arg AJNA_SUBGRAPH_V2_URL_GOERLI=${{ secrets.AJNA_SUBGRAPH_V2_URL_GOERLI }} \
5656
--build-arg MIXPANEL_ENV=production \
5757
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_KEY_PROD }} \
58-
--build-arg ADROLL_ADV_ID=${{ secrets.ADROLL_ADV_ID_PROD }} \
59-
--build-arg ADROLL_PIX_ID=${{ secrets.ADROLL_PIX_ID_PROD }} \
6058
--build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL_PROD }} \
6159
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID_PROD }} \
6260
--build-arg ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }} \

.github/workflows/aws-staging.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828

2929
- name: Check required secrets
3030
env:
31-
ADROLL_ADV_ID_STAGING: ${{ secrets.ADROLL_ADV_ID_STAGING }}
32-
ADROLL_PIX_ID_STAGING: ${{ secrets.ADROLL_PIX_ID_STAGING }}
3331
AJNA_SUBGRAPH_URL_GOERLI: ${{ secrets.AJNA_SUBGRAPH_URL_GOERLI }}
3432
AJNA_SUBGRAPH_URL_STAGING: ${{ secrets.AJNA_SUBGRAPH_URL_STAGING }}
3533
AJNA_SUBGRAPH_V2_URL_GOERLI: ${{ secrets.AJNA_SUBGRAPH_V2_URL_GOERLI }}
@@ -48,7 +46,7 @@ jobs:
4846
NEWSLETTER_PUBLICATION_ID: ${{ secrets.NEWSLETTER_PUBLICATION_ID }}
4947
NEWSLETTER_ENDPOINT: ${{ secrets.NEWSLETTER_ENDPOINT }}
5048
run: |
51-
required_secrets=("AJNA_SUBGRAPH_URL_STAGING" "AJNA_SUBGRAPH_URL_GOERLI" "AJNA_SUBGRAPH_V2_URL_STAGING" "AJNA_SUBGRAPH_V2_URL_GOERLI" "MIXPANEL_KEY_STAGING" "ADROLL_ADV_ID_STAGING" "ADROLL_PIX_ID_STAGING" "MAINNET_CACHE_URL_STAGING" "INFURA_PROJECT_ID_STAGING" "ETHERSCAN_API_KEY" "BLOCKNATIVE_API_KEY_STAGING" "SENTRY_AUTH_TOKEN" "PRODUCT_HUB_KEY" "ONE_INCH_API_KEY_STAGING" "ONE_INCH_API_URL_STAGING" "REFERRAL_SUBGRAPH_URL_STAGING" "NEWSLETTER_API_KEY" "NEWSLETTER_PUBLICATION_ID" "NEWSLETTER_ENDPOINT")
49+
required_secrets=("AJNA_SUBGRAPH_URL_STAGING" "AJNA_SUBGRAPH_URL_GOERLI" "AJNA_SUBGRAPH_V2_URL_STAGING" "AJNA_SUBGRAPH_V2_URL_GOERLI" "MIXPANEL_KEY_STAGING" "MAINNET_CACHE_URL_STAGING" "INFURA_PROJECT_ID_STAGING" "ETHERSCAN_API_KEY" "BLOCKNATIVE_API_KEY_STAGING" "SENTRY_AUTH_TOKEN" "PRODUCT_HUB_KEY" "ONE_INCH_API_KEY_STAGING" "ONE_INCH_API_URL_STAGING" "REFERRAL_SUBGRAPH_URL_STAGING" "NEWSLETTER_API_KEY" "NEWSLETTER_PUBLICATION_ID" "NEWSLETTER_ENDPOINT")
5250
fail=false
5351
for secret in "${required_secrets[@]}"; do
5452
secret_value=$(printenv $secret)
@@ -99,8 +97,6 @@ jobs:
9997
AJNA_SUBGRAPH_V2_URL_GOERLI: ${{ secrets.AJNA_SUBGRAPH_V2_URL_GOERLI }}
10098
MIXPANEL_ENV: staging
10199
MIXPANEL_KEY: ${{ secrets.MIXPANEL_KEY_STAGING }}
102-
ADROLL_ADV_ID: ${{ secrets.ADROLL_ADV_ID_STAGING }}
103-
ADROLL_PIX_ID: ${{ secrets.ADROLL_PIX_ID_STAGING }}
104100
MAINNET_CACHE_URL: ${{ secrets.MAINNET_CACHE_URL_STAGING }}
105101
INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID_STAGING }}
106102
ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
@@ -177,4 +173,4 @@ jobs:
177173
-H "X-GitHub-Api-Version: 2022-11-28" \
178174
https://api.github.com/repos/OasisDEX/e2e-tests/actions/workflows/ci_e2e_tests.yml/dispatches \
179175
-d "{\"ref\":\"main\", \"inputs\":{\"run_id\":\"${{ github.run_id }}\"}}"
180-
echo 'See test results in https://github.com/OasisDEX/e2e-tests/actions/workflows/ci_e2e_tests.yml --> Job with RUN_ID ${{ github.run_id }} in the logs.'
176+
echo 'See test results in https://github.com/OasisDEX/e2e-tests/actions/workflows/ci_e2e_tests.yml --> Job with RUN_ID ${{ github.run_id }} in the logs.'

.github/workflows/dockerhub.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ jobs:
3838
docker build --build-arg COMMIT_SHA=${{ env.SHA_TAG }} \
3939
--build-arg MIXPANEL_ENV=staging \
4040
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_STAGING_KEY }} \
41-
--build-arg ADROLL_ADV_ID=${{ secrets.ADROLL_ADV_ID_STAGING }} \
42-
--build-arg ADROLL_PIX_ID=${{ secrets.ADROLL_PIX_ID_STAGING }} \
4341
--build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL }} \
4442
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID }} \
4543
--build-arg ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }} \

Dockerfile.production

-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ ARG COMMIT_SHA='' \
2626
AJNA_SUBGRAPH_V2_URL_GOERLI='' \
2727
MIXPANEL_ENV='' \
2828
MIXPANEL_KEY='' \
29-
ADROLL_ADV_ID='' \
30-
ADROLL_PIX_ID='' \
3129
MAINNET_CACHE_URL='' \
3230
SHOW_BUILD_INFO='' \
3331
ETHERSCAN_API_KEY='' \
@@ -48,8 +46,6 @@ ENV COMMIT_SHA=$COMMIT_SHA \
4846
AJNA_SUBGRAPH_V2_URL_GOERLI=$AJNA_SUBGRAPH_V2_URL_GOERLI \
4947
MIXPANEL_ENV=$MIXPANEL_ENV \
5048
MIXPANEL_KEY=$MIXPANEL_KEY \
51-
ADROLL_ADV_ID=$ADROLL_ADV_ID \
52-
ADROLL_PIX_ID=$ADROLL_PIX_ID \
5349
MAINNET_CACHE_URL=$MAINNET_CACHE_URL \
5450
ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY \
5551
BLOCKNATIVE_API_KEY=$BLOCKNATIVE_API_KEY \

README.md

+3-8
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ git clone https://github.com/OasisDEX/oasis-borrow.git
3434

3535
Navigate to the project folder and install all dependencies
3636

37-
NOTE: to install private packages from NPM you need to have an env variable called `NPM_TOKEN` containing your personal NPM access token.
38-
We recommend to set `NPM_TOKEN` in your `.env` file using our `.env.template`, this way you can just `source .env` before install.
37+
NOTE: to install private packages from NPM you need to have an env variable called `NPM_TOKEN`
38+
containing your personal NPM access token. We recommend to set `NPM_TOKEN` in your `.env` file using
39+
our `.env.template`, this way you can just `source .env` before install.
3940

4041
```sh
4142
source .env
@@ -136,12 +137,6 @@ PRODUCT_HUB_KEY="<any value of your choice>"
136137
- `MIXPANEL_KEY` - The value will be used for `production` environments. This is the project key
137138
that is generated from Mixpanel.
138139

139-
- `ADROLL_PIX_ID` - The value will be used for `production` environments. This is the project key
140-
that is generated from AdRoll Pixel.
141-
142-
- `ADROLL_ADV_ID` - The value will be used for `production` environments. This is the project key
143-
that is generated from AdRoll Pixel.
144-
145140
- `USE_TERMS_OF_SERVICE` - In order to use some functionalities the user should read and accept
146141
Terms of Service. For development purposes, this feature can be disabled. You can disable this
147142
feature if you'd like to remove that functionality at all. The values are either `0` (disabled) or

analytics/adroll.ts

-31
This file was deleted.

analytics/manageCookie.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { CookieName, Switch } from './common'
55
export const manageCookie: Record<CookieName, Switch> = {
66
marketing: {
77
enable: () => {},
8-
disable: () => {}, // no needed since adding adRoll instance to app is 0/1 like
8+
disable: () => {},
99
},
1010
analytics: {
1111
enable: () => mixpanel.opt_in_tracking(),

pages/_app.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { CacheProvider, Global } from '@emotion/core'
22
import { Web3OnboardProvider } from '@web3-onboard/react'
33
import type { AbstractConnector } from '@web3-react/abstract-connector'
44
import { Web3ReactProvider } from '@web3-react/core'
5-
import { adRollPixelScript } from 'analytics/adroll'
65
import { COOKIE_NAMES_LOCASTORAGE_KEY } from 'analytics/common'
76
import { mixpanelInit } from 'analytics/mixpanel'
87
import { trackingEvents } from 'analytics/trackingEvents'
@@ -155,7 +154,10 @@ function App({ Component, pageProps }: AppProps & CustomAppProps) {
155154
<meta name="viewport" content="width=device-width, initial-scale=1" />
156155
</Head>
157156
{cookiesValue?.enabledCookies?.marketing && (
158-
<Script dangerouslySetInnerHTML={{ __html: adRollPixelScript }} async />
157+
// Use when there is a need to load extra script required for marketing
158+
// Example usage:
159+
// <Script dangerouslySetInnerHTML={{ __html: scriptToBeLoaded }} async />
160+
<></>
159161
)}
160162
<ThemeUIProvider theme={theme}>
161163
<CacheProvider value={cache}>

public/locales/cn/common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
"cookies": {
303303
"marketing": {
304304
"title": "行销 Cookies",
305-
"description": "Summer.fi 使用来自 adRoll 的匿名 Cookies 在广告平台上重新定位营销策略。"
305+
"description": "Summer.fi 使用匿名 Cookies 在广告平台上重新定位营销策略。"
306306
},
307307
"analytics": {
308308
"title": "分析 Cookies",

public/locales/en/common.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@
667667
"cookies": {
668668
"marketing": {
669669
"title": "Marketing Cookies",
670-
"description": "Summer.fi uses anonymised cookies from adRoll to be able to apply retargeting campaigns on advertising platforms."
670+
"description": "Summer.fi uses anonymised cookies to be able to apply retargeting campaigns on advertising platforms."
671671
},
672672
"analytics": {
673673
"title": "Analytics Cookies",

runtime.config.js

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ const publicRuntimeConfig = {
44
buildDate: Date.now(),
55
mixpanelEnv: process.env.MIXPANEL_ENV,
66
mixpanelAPIKey: process.env.MIXPANEL_KEY,
7-
adRollAdvId: process.env.ADROLL_ADV_ID,
8-
adRollPixId: process.env.ADROLL_PIX_ID,
97
useTermsOfService: process.env.USE_TERMS_OF_SERVICE === '1',
108
useTrmApi: process.env.USE_TRM_API === '1',
119
showBuildInfo: process.env.SHOW_BUILD_INFO === '1',

0 commit comments

Comments
 (0)