Merge pull request #235 from QuickSwap/dev

Merge from dev to master
QuickSwap · Jul 14, 2022 · e4fde5e · e4fde5e
2 parents f1c4428 + d47c269
commit e4fde5e
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 29 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -73,7 +73,7 @@ jobs:
         env:
           CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }}
           RECORD_DOMAIN: 'quickswap.exchange'
-          RECORD_NAME: '_dnslink.beta'
+          RECORD_NAME: '_dnslink'
           CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
         uses: textileio/cloudflare-update-dnslink@0fe7b7a1ffc865db3a4da9773f0f987447ad5848
         with:
@@ -99,11 +99,11 @@ jobs:
             - CIDv0: `${{ steps.upload.outputs.hash }}`
             - CIDv1: `${{ steps.convert_cidv0.outputs.cidv1 }}`
 
-            The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [beta.quickswap.exchange](https://beta.quickswap.exchange).
+            The latest release is always accessible via our alias to the Cloudflare IPFS gateway at [quickswap.exchange](https://quickswap.exchange).
 
             You can also access the QuickSwap Interface directly from an IPFS gateway.
             **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.
-            **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).
+            **You should always use an IPFS gateway that enforces origin separation**, or our alias to the latest release at [quickswap.exchange](https://quickswap.exchange).
             Your QuickSwap settings are never remembered across different URLs.
 
             IPFS gateways:

diff --git a/src/components/CurrencySearchModal/CurrencySearch.tsx b/src/components/CurrencySearchModal/CurrencySearch.tsx
@@ -199,7 +199,7 @@ const CurrencySearch: React.FC<CurrencySearchProps> = ({
         </AutoSizer>
       </Box>
 
-      <Box className='footer' />
+      <Box className='currencySearchFooter' />
     </Box>
   );
 };

diff --git a/src/components/StakeQuickModal/StakeQuickModal.tsx b/src/components/StakeQuickModal/StakeQuickModal.tsx
@@ -157,7 +157,7 @@ const StakeQuickModal: React.FC<StakeQuickModalProps> = ({ open, onClose }) => {
             <small>{Math.min(stakePercent, 100).toLocaleString()}%</small>
           </Box>
         </Box>
-        <Box className='flex items-center justify-between'>
+        <Box mt={3} className='flex items-center justify-between'>
           <Box width='48%'>
             <Button
               className='stakeButton'

diff --git a/src/components/StakeSyrupModal/StakeSyrupModal.tsx b/src/components/StakeSyrupModal/StakeSyrupModal.tsx
@@ -232,7 +232,7 @@ const StakeSyrupModal: React.FC<StakeSyrupModalProps> = ({
             {syrup.token.symbol} / {t('day')}
           </p>
         </Box>
-        <Box className='flex justify-between items-center'>
+        <Box mt={3} className='flex justify-between items-center'>
           <Box width='48%'>
             <Button
               className='stakeButton'

diff --git a/src/components/styles/CurrencySearchModal.scss b/src/components/styles/CurrencySearchModal.scss
@@ -10,6 +10,7 @@
   background: $bgColor;
   backdrop-filter: blur(9.9px);
   border: 1px solid $grey2;
+  overflow: hidden;
   .currencySearchHeader {
     display: flex;
     justify-content: space-between;
@@ -24,20 +25,20 @@
       font-weight: 600,
     }
   }
-  .footer {
-    background-image: linear-gradient(to bottom, $grey15, $bgColor 64%);
-    width: 100%;
-    height: 64px;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    z-index: 2;
-    border-radius: 20px;
-  }
   @include media("screen", "<phone") {
     height: 90vh;
   }
 }
+.currencySearchFooter {
+  background-image: linear-gradient(to bottom, $grey15, $bgColor 64%);
+  width: 100%;
+  height: 64px;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 2;
+  pointer-events: none;
+}
 .searchInputWrapper {
   width: 100%;
   height: 50px;

diff --git a/src/components/styles/StakeModal.scss b/src/components/styles/StakeModal.scss
@@ -2,6 +2,15 @@
 @use 'styles/breakpoints' as *;
 
 .stakeButton {
+  width: 100%;
+  height: 48px;
+  border-radius: 10px;
+  display: flex;
+  justify-content: center;
+  border: 1px solid $primary;
+  align-items: center;
+  margin-top: 24px;
+  cursor: pointer;
   & span {
     font-size: 16px;
     font-weight: 600;

diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -341,6 +341,13 @@ export const GlobalValue = {
         'FRAX',
         'FRAX',
       ),
+      GHST: new Token(
+        ChainId.MATIC,
+        '0x385eeac5cb85a38a9a07a70c73e0a3271cfb54a7',
+        18,
+        'GHST',
+        'Aavegotchi GHST Token',
+      ),
     },
   },
 };
@@ -355,10 +362,11 @@ export const GlobalData = {
         GlobalValue.tokens.COMMON.USDC,
         GlobalValue.tokens.COMMON.USDT,
         GlobalValue.tokens.COMMON.OLD_QUICK,
+        GlobalValue.tokens.COMMON.NEW_QUICK,
         GlobalValue.tokens.COMMON.ETHER,
         GlobalValue.tokens.COMMON.WBTC,
         GlobalValue.tokens.COMMON.DAI,
-        GlobalValue.tokens.COMMON.MAUSDC,
+        GlobalValue.tokens.COMMON.GHST,
         GlobalValue.tokens.COMMON.MI,
       ],
     },
@@ -373,6 +381,7 @@ export const GlobalData = {
         GlobalValue.tokens.COMMON.USDC,
         GlobalValue.tokens.COMMON.USDT,
         GlobalValue.tokens.COMMON.OLD_QUICK,
+        GlobalValue.tokens.COMMON.NEW_QUICK,
         GlobalValue.tokens.COMMON.ETHER,
         GlobalValue.tokens.COMMON.WBTC,
         GlobalValue.tokens.COMMON.SAND,
@@ -388,6 +397,7 @@ export const GlobalData = {
         GlobalValue.tokens.COMMON.USDC,
         GlobalValue.tokens.COMMON.USDT,
         GlobalValue.tokens.COMMON.OLD_QUICK,
+        GlobalValue.tokens.COMMON.NEW_QUICK,
         GlobalValue.tokens.COMMON.ETHER,
         GlobalValue.tokens.COMMON.WBTC,
       ],

diff --git a/src/constants/tokens.json b/src/constants/tokens.json
@@ -336,6 +336,12 @@
     "symbol": "MAI",
     "name": "miMATIC"
   },
+  "MAI": {
+    "address": "0xa3Fa99A148fA48D14Ed51d610c367C61876997F1",
+    "decimals": 18,
+    "symbol": "MAI",
+    "name": "miMATIC"
+  },
   "POLYDOGE": {
     "address": "0x8A953CfE442c5E8855cc6c61b1293FA648BAE472",
     "decimals": 18,

diff --git a/src/index.scss b/src/index.scss
@@ -8,6 +8,14 @@ body {
   margin: 0;
 }
 
+[data-reach-dialog-overlay] {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
 .page {
   background-color: $bgColor;
   width: 100%;

diff --git a/src/pages/styles/dragon.scss b/src/pages/styles/dragon.scss
@@ -39,18 +39,6 @@
   }
 }
 
-.stakeButton {
-  width: 100%;
-  height: 48px;
-  border-radius: 10px;
-  display: flex;
-  justify-content: center;
-  border: 1px solid $primary;
-  align-items: center;
-  margin-top: 24px;
-  cursor: pointer;
-}
-
 .dragonAlertWrapper {
   margin-bottom: 24px;
   display: flex;

diff --git a/src/pages/styles/landing.scss b/src/pages/styles/landing.scss
@@ -64,6 +64,8 @@
     align-items: center;
     justify-content: center;
     border-radius: 24px;
+    background-color: $secondary1;
+    cursor: pointer;
   }
 }
 .featureHeading {