Skip to content

Commit 7d6117e

Browse files
marcinciarkacristidaspiotrkonowrocki
authored
Rebranding (#2433)
Co-authored-by: cristidas <cristi.dascalu@gmail.com> Co-authored-by: Piotr Konowrocki <piotr@oazoapps.com>
1 parent efd0c56 commit 7d6117e

File tree

211 files changed

+4010
-3365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+4010
-3365
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ EXCHANGE=0xb5eB8cB6cED6b6f8E13bcD502fb489Db4a726C7B
2525
DUMMY_EXCHANGE=0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650
2626
USE_DUMMY=0
2727
BLOCK_NUMBER=15875752
28-
MAINNET_CACHE_URL="https://oazo-bcache-mainnet-staging.new.oasis.app/api/v1"
28+
MAINNET_CACHE_URL="https://cache-mainnet-staging.staging.summer.fi/api/v1"
2929

3030
SNOWFLAKE_ACCOUNT=
3131
SNOWFLAKE_USER=

.github/workflows/aws-prod.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
env:
1313
AWS_REGION: us-east-1
14-
ECR_REPO_NAME: oasis-borrow-prod
15-
SERVICE_NAME: oasis-borrow-prod
16-
CLUSTER_NAME: oasis-borrow-prod
14+
ECR_REPO_NAME: summer-fi-prod
15+
SERVICE_NAME: summer-fi-prod
16+
CLUSTER_NAME: summer-fi-prod
1717

1818
steps:
1919
- name: Checkout
@@ -22,8 +22,8 @@ jobs:
2222
- name: Configure AWS credentials
2323
uses: aws-actions/configure-aws-credentials@v2
2424
with:
25-
aws-access-key-id: ${{ secrets.OAZO_PROD_AWS_ACCESS_KEY_ID }}
26-
aws-secret-access-key: ${{ secrets.OAZO_PROD_AWS_SECRET_ACCESS_KEY }}
25+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }}
26+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }}
2727
aws-region: ${{ env.AWS_REGION }}
2828

2929
- name: Login to Amazon ECR
@@ -48,22 +48,22 @@ jobs:
4848
# push it to ECR so that it can
4949
# be deployed to ECS.
5050
docker build --build-arg COMMIT_SHA=${{ env.SHA_TAG }} \
51-
--build-arg API_HOST=${{ secrets.API_HOST }} \
51+
--build-arg API_HOST=${{ secrets.API_HOST_PROD }} \
5252
--build-arg NOTIFICATIONS_HOST=${{ secrets.NOTIFICATIONS_HOST_PROD }} \
5353
--build-arg NOTIFICATIONS_HOST_GOERLI=${{ secrets.NOTIFICATIONS_HOST_PROD_GOERLI }} \
54-
--build-arg AJNA_SUBGRAPH_URL=${{ secrets.AJNA_SUBGRAPH_URL }} \
54+
--build-arg AJNA_SUBGRAPH_URL=${{ secrets.AJNA_SUBGRAPH_URL_PROD }} \
5555
--build-arg AJNA_SUBGRAPH_URL_GOERLI=${{ secrets.AJNA_SUBGRAPH_URL_GOERLI }} \
5656
--build-arg APP_FULL_DOMAIN=${{ secrets.APP_FULL_DOMAIN_PROD }} \
5757
--build-arg MIXPANEL_ENV=production \
58-
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_PROD_KEY }} \
58+
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_KEY_PROD }} \
5959
--build-arg ADROLL_ADV_ID=${{ secrets.ADROLL_ADV_ID_PROD }} \
6060
--build-arg ADROLL_PIX_ID=${{ secrets.ADROLL_PIX_ID_PROD }} \
61-
--build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL }} \
61+
--build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL_PROD }} \
6262
--build-arg MAILCHIMP_ENDPOINT=${{ secrets.MAILCHIMP_ENDPOINT }} \
6363
--build-arg MAILCHIMP_API_KEY=${{ secrets.MAILCHIMP_API_KEY }} \
64-
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID }} \
64+
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID_PROD }} \
6565
--build-arg ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }} \
66-
--build-arg BLOCKNATIVE_API_KEY=${{ secrets.BLOCKNATIVE_API_KEY }} \
66+
--build-arg BLOCKNATIVE_API_KEY=${{ secrets.BLOCKNATIVE_API_KEY_PROD }} \
6767
--build-arg SHOW_BUILD_INFO=0 \
6868
--build-arg NODE_ENV=production \
6969
--build-arg NEXT_PUBLIC_SENTRY_ENV=production \

.github/workflows/aws-staging.yaml

+10-22
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
env:
1313
AWS_REGION: eu-central-1
14-
ECR_REPO_NAME: oasis-borrow-staging
15-
SERVICE_NAME: oasis-borrow-staging
16-
CLUSTER_NAME: oasis-borrow-staging
14+
ECR_REPO_NAME: summer-fi-staging
15+
SERVICE_NAME: summer-fi-staging
16+
CLUSTER_NAME: summer-fi-staging
1717

1818
steps:
1919
- name: Checkout
@@ -22,36 +22,27 @@ jobs:
2222
- name: Configure AWS credentials
2323
uses: aws-actions/configure-aws-credentials@v2
2424
with:
25-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
26-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
25+
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGING }}
26+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGING }}
2727
aws-region: ${{ env.AWS_REGION }}
2828

2929
- name: Login to Amazon ECR
3030
id: login-ecr
3131
uses: aws-actions/amazon-ecr-login@v1
3232

33-
- name: Log in to Docker Hub
34-
uses: docker/login-action@v2
35-
with:
36-
username: ${{ secrets.DOCKERHUB_USERNAME }}
37-
password: ${{ secrets.DOCKERHUB_TOKEN }}
38-
3933
- name: Extract commit hash
4034
id: vars
4135
shell: bash
4236
run: |
4337
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
4438
45-
- name: Build, tag, and push image to Amazon ECR and Dockerhub
39+
- name: Build, tag, and push image to Amazon ECR
4640
id: build-image
4741
env:
4842
SHA_TAG: ${{ steps.vars.outputs.sha_short }}
4943
LATEST_TAG: latest
5044
ENVIRONMENT_TAG: staging
5145
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
52-
REPO_NAME: ${{ github.event.repository.name }}
53-
DOCKERHUB_ORG: "oasisdexorg"
54-
DOCKER_BUILDKIT: 1
5546
run: |
5647
# Build a docker container and
5748
# push it to ECR so that it can
@@ -60,19 +51,19 @@ jobs:
6051
--build-arg API_HOST=${{ secrets.API_HOST_STAGING }} \
6152
--build-arg NOTIFICATIONS_HOST=${{ secrets.NOTIFICATIONS_HOST_STAGING }} \
6253
--build-arg NOTIFICATIONS_HOST_GOERLI=${{ secrets.NOTIFICATIONS_HOST_STAGING_GOERLI }} \
63-
--build-arg AJNA_SUBGRAPH_URL=${{ secrets.AJNA_SUBGRAPH_URL }} \
54+
--build-arg AJNA_SUBGRAPH_URL=${{ secrets.AJNA_SUBGRAPH_URL_STAGING }} \
6455
--build-arg AJNA_SUBGRAPH_URL_GOERLI=${{ secrets.AJNA_SUBGRAPH_URL_GOERLI }} \
6556
--build-arg APP_FULL_DOMAIN=${{ secrets.APP_FULL_DOMAIN_STAGING }} \
6657
--build-arg MIXPANEL_ENV=staging \
67-
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_STAGING_KEY }} \
58+
--build-arg MIXPANEL_KEY=${{ secrets.MIXPANEL_KEY_STAGING }} \
6859
--build-arg ADROLL_ADV_ID=${{ secrets.ADROLL_ADV_ID_STAGING }} \
6960
--build-arg ADROLL_PIX_ID=${{ secrets.ADROLL_PIX_ID_STAGING }} \
7061
--build-arg MAINNET_CACHE_URL=${{ secrets.MAINNET_CACHE_URL_STAGING }} \
7162
--build-arg MAILCHIMP_ENDPOINT=${{ secrets.MAILCHIMP_ENDPOINT }} \
7263
--build-arg MAILCHIMP_API_KEY=${{ secrets.MAILCHIMP_API_KEY }} \
73-
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID }} \
64+
--build-arg INFURA_PROJECT_ID=${{ secrets.INFURA_PROJECT_ID_STAGING }} \
7465
--build-arg ETHERSCAN_API_KEY=${{ secrets.ETHERSCAN_API_KEY }} \
75-
--build-arg BLOCKNATIVE_API_KEY=${{ secrets.BLOCKNATIVE_STAGING_API_KEY }} \
66+
--build-arg BLOCKNATIVE_API_KEY=${{ secrets.BLOCKNATIVE_API_KEY_STAGING }} \
7667
--build-arg SHOW_BUILD_INFO=1 \
7768
--build-arg NODE_ENV=production \
7869
--build-arg NEXT_PUBLIC_SENTRY_ENV=staging \
@@ -82,11 +73,8 @@ jobs:
8273
-t $ECR_REGISTRY/$ECR_REPO_NAME:$SHA_TAG \
8374
-t $ECR_REGISTRY/$ECR_REPO_NAME:$LATEST_TAG \
8475
-t $ECR_REGISTRY/$ECR_REPO_NAME:$ENVIRONMENT_TAG \
85-
-t $DOCKERHUB_ORG/$REPO_NAME:$SHA_TAG \
86-
-t $DOCKERHUB_ORG/$REPO_NAME:$LATEST_TAG \
8776
.
8877
docker push $ECR_REGISTRY/$ECR_REPO_NAME --all-tags
89-
docker push $DOCKERHUB_ORG/$REPO_NAME --all-tags
9078
9179
- name: Update ECS service with latest Docker image
9280
id: service-update

.graphqlconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"name": "Oasis Borrow Cache GraphQL API",
2+
"name": "Summer.fi Borrow Cache GraphQL API",
33
"schemaPath": "schema.graphql",
44
"extensions": {
55
"endpoints": {
66
"Default GraphQL Endpoint": {
7-
"url": "https://oazo-bcache-mainnet-staging.new.oasis.app/api/v1",
7+
"url": "https://cache-mainnet-staging.staging.summer.fi/api/v1",
88
"headers": {
99
"user-agent": "JS GraphQL"
1010
},

README.md

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div align="center">
2-
<img src="https://raw.githubusercontent.com/OasisDEX/oasis-borrow/dev/public/static/img/logo_footer_v2.svg" width="500" height="500" />
2+
<img src="https://raw.githubusercontent.com/OasisDEX/oasis-borrow/dev/public/static/img/logos/logo_dark.svg" width="500" height="500" />
33

44
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
55
[![codecov](https://codecov.io/gh/OasisDEX/oasis-borrow/branch/main/graph/badge.svg?token=KMXTAUFL48)](https://app.codecov.io/gh/OasisDEX/oasis-borrow/branch/main)
@@ -11,14 +11,14 @@
1111

1212
| Environment | URL | Branch | Build Status |
1313
| ----------- | ---------------------------------------------- | :----: | :----------------------------------------------------------------------------------: |
14-
| Production | [oasis.app](https://oasis.app) | `main` | ![](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=main) |
15-
| Staging | [staging.oasis.app](https://staging.oasis.app) | `dev` | ![](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=dev) |
14+
| Production | [summer.fi](https://summer.fi) | `main` | ![](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=main) |
15+
| Staging | [staging.summer.fi](https://staging.summer.fi) | `dev` | ![](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=dev) |
1616

1717
<br>
1818

19-
# Oasis.app
19+
# Summer.fi
2020

21-
[Oasis.app](https://oasis.app) is the most popular user-interface to interact with the
21+
[Summer.fi](https://summer.fi) is the most popular user-interface to interact with the
2222
[Maker protocol](https://docs.makerdao.com/). It enables users to generate Dai, the most used and
2323
decentralized stablecoin, using a variety of crypto assets as collateral.
2424

@@ -68,7 +68,7 @@ The application will be viewable on <http://localhost:3000> or <https://localhos
6868

6969
### Run staging site locally
7070

71-
You can run the current staging site, (found at <https://staging.oasis.app>) alongside the database,
71+
You can run the current staging site, (found at <https://staging.summer.fi>) alongside the database,
7272
by running:
7373

7474
```sh
@@ -249,11 +249,13 @@ yarn test:fix
249249
<br>
250250

251251
## Unit tests :construction_worker:
252-
We are currently in the process of moving our tests from Mocha (with Chai, Enzyme, and Sinon) to Jest (with React Testing Library).
253-
We are also in the process of adding more tests to increase our coverage.
254-
We have some tests skipped for now, but we are working on fixing them.
255-
**We needed to disable caching in the `build` action. Testing with collecting coverage was failing with caching enabled.**
256-
Skipped tests (Marked with `TODO: [Mocha -> Jest] Rewrite in Jest compatible format.`):
252+
253+
We are currently in the process of moving our tests from Mocha (with Chai, Enzyme, and Sinon) to
254+
Jest (with React Testing Library). We are also in the process of adding more tests to increase our
255+
coverage. We have some tests skipped for now, but we are working on fixing them. **We needed to
256+
disable caching in the `build` action. Testing with collecting coverage was failing with caching
257+
enabled.** Skipped tests (Marked with `TODO: [Mocha -> Jest] Rewrite in Jest compatible format.`):
258+
257259
- [Batch Manager](helpers/api/BatchManager.test.ts)
258260
- [Manage Vault Validations](features/borrow/manage/tests/manageVaultValidations.test.ts)
259261
- [Earn Calculations](features/earn/calculations.test.ts)

analytics/analytics.ts

+9
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ export enum SwapWidgetEvents {
151151
ExecutionCompleted = 'SwapWidgetExecutionCompleted',
152152
ExecutionFailed = 'SwapWidgetExecutionFailed',
153153
}
154+
export enum TopBannerEvents {
155+
TopBannerClosed = 'TopBannerClosed',
156+
TopBannerClicked = 'TopBannerClicked',
157+
}
154158

155159
export enum NotificationsEventIds {
156160
OpenNotificationCenter = 'OpenNotificationCenter',
@@ -184,6 +188,7 @@ export enum EventTypes {
184188
ButtonClick = 'btn-click',
185189
OnScroll = 'on-scroll',
186190
SwapWidgetEvent = 'swap-widget-event',
191+
TopBannerEvent = 'top-banner-event',
187192
}
188193

189194
// https://help.mixpanel.com/hc/en-us/articles/115004613766-Default-Properties-Collected-by-Mixpanel
@@ -1140,6 +1145,10 @@ export const trackingEvents = {
11401145
const eventBody = { id, section: 'SwapWidget', product: 'SwapWidget', eventData }
11411146
!mixpanel.has_opted_out_tracking() && mixpanelInternalAPI(EventTypes.SwapWidgetEvent, eventBody)
11421147
},
1148+
topBannerEvent: (id: TopBannerEvents, topBannerName: string) => {
1149+
const eventBody = { id, section: 'TopBanner', product: 'TopBanner', topBannerName }
1150+
!mixpanel.has_opted_out_tracking() && mixpanelInternalAPI(EventTypes.TopBannerEvent, eventBody)
1151+
},
11431152
}
11441153

11451154
export type Tracker = typeof trackingEvents

analytics/mixpanel.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ export const config = {
1818
test: {
1919
mixpanel: {
2020
token,
21-
config: { debug: false, ip: false, api_host: 'https://mpp.staging.oasis.app' },
21+
config: { debug: false, ip: false, api_host: 'https://mpp.staging.summer.fi' },
2222
},
2323
},
2424
prod: {
2525
mixpanel: {
2626
token,
27-
config: { ip: false, api_host: 'https://mpp.oasis.app', opt_out_tracking_by_default: true },
27+
config: { ip: false, api_host: 'https://mpp.summer.fi', opt_out_tracking_by_default: true },
2828
},
2929
},
3030
}[env]

blockchain/contracts/goerli.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export const goerliContracts: MainnetContracts = {
180180
// TODO update address
181181
ajnaRewardsClaimer: contractDesc(ajnaRewardsClaimer, goerli.ajna.AjnaRewardsClaimer),
182182
// NOT contracts
183-
cacheApi: 'https://oazo-bcache-goerli-staging.new.oasis.app/api/v1',
183+
cacheApi: 'https://oazo-bcache-goerli-staging.new.summer.fi/api/v1',
184184
safeConfirmations: 6,
185185
openVaultSafeConfirmations: 6,
186186
taxProxyRegistries: [],

blockchain/networks/networks-config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const goerliConfig: NetworkConfig = {
120120
}),
121121
),
122122
getCacheApi: memoize(
123-
() => new GraphQLClient('https://oazo-bcache-goerli-staging.new.oasis.app/api/v1'),
123+
() => new GraphQLClient('https://oazo-bcache-goerli-staging.new.summer.fi/api/v1'),
124124
),
125125
isCustomFork: false,
126126
getParentNetwork: () => undefined,
@@ -329,5 +329,5 @@ export const networks = [...mainnetNetworks, ...L2Networks]
329329
export const networksById = keyBy(networks, 'id')
330330
export const networksByName = keyBy(networks, 'name')
331331
export const networksByHexId = keyBy(networks, 'hexId')
332-
export const dappName = 'Oasis'
332+
export const dappName = 'Summer.fi'
333333
export const pollingInterval = 12000

components/BlockNativeAvatar.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ import React from 'react'
44
import { Box, Image, SxStyleProp } from 'theme-ui'
55

66
type BlockNativeAvatarProps = {
7-
small?: boolean
87
sx?: SxStyleProp
98
}
109

11-
export function BlockNativeAvatar({ small = false, sx }: BlockNativeAvatarProps) {
10+
export function BlockNativeAvatar({ sx }: BlockNativeAvatarProps) {
1211
const [{ wallet }] = useConnectWallet()
1312
const sizes = {
14-
box: small ? '32px' : '42px',
15-
icon: small ? '18px' : '24px',
13+
box: '32px',
14+
icon: '20px',
1615
}
1716
return (
1817
<Box

components/Footer.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { useTranslation } from 'next-i18next'
99
import getConfig from 'next/config'
1010
import React from 'react'
1111
import { Box, Card, Container, Flex, Grid, Image, Link, Text } from 'theme-ui'
12-
import { FooterBackground } from 'theme/FooterBackground'
1312

1413
import { ChevronUpDown } from './ChevronUpDown'
1514
import { SelectComponents } from 'react-select/src/components'
@@ -33,6 +32,7 @@ const FOOTER_SECTIONS = [
3332
{
3433
titleKey: 'nav.resources',
3534
links: [
35+
{ labelKey: 'nav.discover', url: INTERNAL_LINKS.discover, target: '_self' },
3636
{ labelKey: 'nav.blog', url: EXTERNAL_LINKS.BLOG.MAIN, target: '_self' },
3737
// add link
3838
{ labelKey: 'nav.knowledge-centre', url: EXTERNAL_LINKS.KB.HELP, target: '_blank' },
@@ -141,7 +141,7 @@ function SocialWithLogo() {
141141
return (
142142
<Grid gap={3}>
143143
<Image
144-
src={staticFilesRuntimeUrl('/static/img/logo_footer_v2.svg')}
144+
src={staticFilesRuntimeUrl('/static/img/logos/logo_dark.svg')}
145145
sx={{ height: '34px', position: 'relative', top: '-2px' }}
146146
/>
147147
<Flex sx={{ alignItems: 'center', a: { fontSize: '0px' }, my: 2 }}>
@@ -205,7 +205,6 @@ export function Footer() {
205205
</Flex>
206206
</Container>
207207
<TemporaryFooter />
208-
<FooterBackground />
209208
</Box>
210209
)
211210
}

components/GenericMultiselect.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ export function GenericMultiselect({
251251
opacity: isOpen ? 1 : 0,
252252
transform: isOpen ? 'translateY(0)' : 'translateY(-5px)',
253253
pointerEvents: isOpen ? 'auto' : 'none',
254+
zIndex: 1,
254255
transition: 'opacity 200ms, transform 200ms',
255256
}}
256257
>
@@ -267,7 +268,6 @@ export function GenericMultiselect({
267268
? 2
268269
: 0,
269270
overflowY: 'auto',
270-
zIndex: 1,
271271
'&::-webkit-scrollbar': {
272272
width: '6px',
273273
borderRadius: 'large',

components/HeadTags.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ export function PageSEOTags({
125125
)}
126126
/>
127127
<meta name="twitter:card" content="summary_large_image" />
128-
<meta name="twitter:creator" content="@oasisdotapp" />
128+
<meta name="twitter:creator" content="@Summerfi_" />
129129

130130
<meta property="og:type" content="website" />
131-
<meta property="og:site_name" content="Oasis" />
131+
<meta property="og:site_name" content="Summer.fi" />
132132
<meta
133133
name="keywords"
134134
content="dapp, dao, maker, protocol, vaults, ethereum, wallet, staking, yield, farming, apy, arbitrage, liquidity, L2, L3, lending, trade, buy, protection, safe, blockchain, best, earn, passive, income, profit, bear, bull, winter, 2023"
@@ -137,7 +137,7 @@ export function PageSEOTags({
137137
)
138138
}
139139

140-
const APP_NAME = 'Oasis'
140+
const APP_NAME = 'Summer.fi'
141141

142142
export function PWATags() {
143143
return (

0 commit comments

Comments
 (0)