Skip to content

Commit e4fde5e

Browse files
sameepsisameepsi
authored
Merge pull request #235 from QuickSwap/dev
Merge from dev to master
2 parents f1c4428 + d47c269 commit e4fde5e

11 files changed

Lines changed: 53 additions & 29 deletions

File tree

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
env:
7474
CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
7575
RECORD_DOMAIN: 'quickswap.exchange'
76-
RECORD_NAME: '_dnslink.beta'
76+
RECORD_NAME: '_dnslink'
7777
CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
7878
uses: textileio/cloudflare-update-dnslink@0fe7b7a1ffc865db3a4da9773f0f987447ad5848
7979
with:
@@ -99,11 +99,11 @@ jobs:
9999
- CIDv0: `${{ steps.upload.outputs.hash }}`
100100
- CIDv1: `${{ steps.convert_cidv0.outputs.cidv1 }}`
101101
102-
The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [beta.quickswap.exchange](https://beta.quickswap.exchange).
102+
The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [quickswap.exchange](https://quickswap.exchange).
103103
104104
You can also access the QuickSwap Interface directly from an IPFS gateway.
105105
**BEWARE**: The QuickSwap interface uses [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported.
106-
**You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release at [beta.quickswap.exchange](https://beta.quickswap.exchange).
106+
**You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release at [quickswap.exchange](https://quickswap.exchange).
107107
Your QuickSwap settings are never remembered across different URLs.
108108
109109
IPFS gateways:

‎src/components/CurrencySearchModal/CurrencySearch.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ const CurrencySearch: React.FC<CurrencySearchProps> = ({
199199
</AutoSizer>
200200
</Box>
201201

202-
<Box className='footer' />
202+
<Box className='currencySearchFooter' />
203203
</Box>
204204
);
205205
};

‎src/components/StakeQuickModal/StakeQuickModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const StakeQuickModal: React.FC<StakeQuickModalProps> = ({ open, onClose }) => {
157157
<small>{Math.min(stakePercent, 100).toLocaleString()}%</small>
158158
</Box>
159159
</Box>
160-
<Box className='flex items-center justify-between'>
160+
<Box mt={3} className='flex items-center justify-between'>
161161
<Box width='48%'>
162162
<Button
163163
className='stakeButton'

‎src/components/StakeSyrupModal/StakeSyrupModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ const StakeSyrupModal: React.FC<StakeSyrupModalProps> = ({
232232
{syrup.token.symbol} / {t('day')}
233233
</p>
234234
</Box>
235-
<Box className='flex justify-between items-center'>
235+
<Box mt={3} className='flex justify-between items-center'>
236236
<Box width='48%'>
237237
<Button
238238
className='stakeButton'

‎src/components/styles/CurrencySearchModal.scss‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
background: $bgColor;
1111
backdrop-filter: blur(9.9px);
1212
border: 1px solid $grey2;
13+
overflow: hidden;
1314
.currencySearchHeader {
1415
display: flex;
1516
justify-content: space-between;
@@ -24,20 +25,20 @@
2425
font-weight: 600,
2526
}
2627
}
27-
.footer {
28-
background-image: linear-gradient(to bottom, $grey15, $bgColor 64%);
29-
width: 100%;
30-
height: 64px;
31-
position: absolute;
32-
bottom: 0;
33-
left: 0;
34-
z-index: 2;
35-
border-radius: 20px;
36-
}
3728
@include media("screen", "<phone") {
3829
height: 90vh;
3930
}
4031
}
32+
.currencySearchFooter {
33+
background-image: linear-gradient(to bottom, $grey15, $bgColor 64%);
34+
width: 100%;
35+
height: 64px;
36+
position: absolute;
37+
bottom: 0;
38+
left: 0;
39+
z-index: 2;
40+
pointer-events: none;
41+
}
4142
.searchInputWrapper {
4243
width: 100%;
4344
height: 50px;

‎src/components/styles/StakeModal.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
@use 'styles/breakpoints' as *;
33

44
.stakeButton {
5+
width: 100%;
6+
height: 48px;
7+
border-radius: 10px;
8+
display: flex;
9+
justify-content: center;
10+
border: 1px solid $primary;
11+
align-items: center;
12+
margin-top: 24px;
13+
cursor: pointer;
514
& span {
615
font-size: 16px;
716
font-weight: 600;

‎src/constants/index.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,13 @@ export const GlobalValue = {
341341
'FRAX',
342342
'FRAX',
343343
),
344+
GHST: new Token(
345+
ChainId.MATIC,
346+
'0x385eeac5cb85a38a9a07a70c73e0a3271cfb54a7',
347+
18,
348+
'GHST',
349+
'Aavegotchi GHST Token',
350+
),
344351
},
345352
},
346353
};
@@ -355,10 +362,11 @@ export const GlobalData = {
355362
GlobalValue.tokens.COMMON.USDC,
356363
GlobalValue.tokens.COMMON.USDT,
357364
GlobalValue.tokens.COMMON.OLD_QUICK,
365+
GlobalValue.tokens.COMMON.NEW_QUICK,
358366
GlobalValue.tokens.COMMON.ETHER,
359367
GlobalValue.tokens.COMMON.WBTC,
360368
GlobalValue.tokens.COMMON.DAI,
361-
GlobalValue.tokens.COMMON.MAUSDC,
369+
GlobalValue.tokens.COMMON.GHST,
362370
GlobalValue.tokens.COMMON.MI,
363371
],
364372
},
@@ -373,6 +381,7 @@ export const GlobalData = {
373381
GlobalValue.tokens.COMMON.USDC,
374382
GlobalValue.tokens.COMMON.USDT,
375383
GlobalValue.tokens.COMMON.OLD_QUICK,
384+
GlobalValue.tokens.COMMON.NEW_QUICK,
376385
GlobalValue.tokens.COMMON.ETHER,
377386
GlobalValue.tokens.COMMON.WBTC,
378387
GlobalValue.tokens.COMMON.SAND,
@@ -388,6 +397,7 @@ export const GlobalData = {
388397
GlobalValue.tokens.COMMON.USDC,
389398
GlobalValue.tokens.COMMON.USDT,
390399
GlobalValue.tokens.COMMON.OLD_QUICK,
400+
GlobalValue.tokens.COMMON.NEW_QUICK,
391401
GlobalValue.tokens.COMMON.ETHER,
392402
GlobalValue.tokens.COMMON.WBTC,
393403
],

‎src/constants/tokens.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,12 @@
336336
"symbol": "MAI",
337337
"name": "miMATIC"
338338
},
339+
"MAI": {
340+
"address": "0xa3Fa99A148fA48D14Ed51d610c367C61876997F1",
341+
"decimals": 18,
342+
"symbol": "MAI",
343+
"name": "miMATIC"
344+
},
339345
"POLYDOGE": {
340346
"address": "0x8A953CfE442c5E8855cc6c61b1293FA648BAE472",
341347
"decimals": 18,

‎src/index.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ body {
88
margin: 0;
99
}
1010

11+
[data-reach-dialog-overlay] {
12+
position: fixed;
13+
top: 0;
14+
right: 0;
15+
bottom: 0;
16+
left: 0;
17+
}
18+
1119
.page {
1220
background-color: $bgColor;
1321
width: 100%;

‎src/pages/styles/dragon.scss‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@
3939
}
4040
}
4141

42-
.stakeButton {
43-
width: 100%;
44-
height: 48px;
45-
border-radius: 10px;
46-
display: flex;
47-
justify-content: center;
48-
border: 1px solid $primary;
49-
align-items: center;
50-
margin-top: 24px;
51-
cursor: pointer;
52-
}
53-
5442
.dragonAlertWrapper {
5543
margin-bottom: 24px;
5644
display: flex;

0 commit comments

Comments
 (0)