Merge pull request #149 from QuickSwap/dev

Merge dev to master
QuickSwap · May 2, 2022 · 68081d1 · 68081d1
2 parents 5191de0 + 8df84db
commit 68081d1
Show file tree

Hide file tree

Showing 20 changed files with 45,325 additions and 312 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -39,7 +39,6 @@
   "youAreBuying": "You are buying",
   "itWillCost": "It will cost at most",
   "forAtMost": "for at most",
-  "insufficientBalance": "Insufficient Balance",
   "inputNotValid": "Not a valid input value",
   "differentToken": "Must be different token.",
   "noRecipient": "Enter a wallet address to send to.",
@@ -133,5 +132,45 @@
   "depositLPTokensRewards": "Deposit your Liquidity Provider tokens to receive rewards in addition to LP fees.",
   "seeAllPairs": "See all pairs",
   "features": "Features",
-  "joinCommunity": "Join our ever-growing Community"
+  "joinCommunity": "Join our ever-growing Community",
+  "day": "day",
+  "stakingLPTokens": "Staking LP Tokens",
+  "stakeLPTokens": "Stake LP Tokens",
+  "mydeposits": "My deposits",
+  "unstakingLPTokens": "Unstaking LP Tokens",
+  "unstakeLPTokens": "Unstake LP Tokens",
+  "unclaimedRewards": "Unclaimed Rewards",
+  "yourRate": "Your {{ symbol }} Rate",
+  "yourFees": "Your Fees",
+  "dailyRewards": "Daily Rewards",
+  "inwallet": "In wallet",
+  "staked": "Staked",
+  "earned": "Earned",
+  "deposits": "Deposits",
+  "withdrawliquidity": "Withdraw deposited liquidity",
+  "claimrewards": "Claim accumulated rewards",
+  "depositliquidity": "Deposit liquidity",
+  "stakewithoutapproval": "Attempting to stake without approval or a signature. Please contact support.",
+  "missingdependencies": "Missing dependencies",
+  "missingliquidity": "Missing liquidity amount",
+  "rewards": "Rewards",
+  "apy": "APY",
+  "tvl": "TVL",
+  "max": "MAX",
+  "lp": "LP",
+  "get": "Get",
+  "claiming": "Claiming",
+  "claim": "Claim",
+  "convert": "Convert",
+  "convertQUICK": "Convert your QUICK(old) to QUICK(new). Read more about QUICK token split <1>here</1>",
+  "conversionRate": "Conversion Rate",
+  "yourbalance": "Your balance",
+  "youwillreceive": "You will receive",
+  "insufficientBalance": "Insufficient {{ symbol }} Balance",
+  "enterAmount": "Enter Amount",
+  "convertingQUICK": "Converting QUICK",
+  "convertingQUICKtoQUICKV2": "Converting {{ quickAmount }} QUICK -> {{ quickV2Amount }} QUICK-v2",
+  "convertedQUICKtoQUICKV2": "Converted {{ quickAmount }} QUICK -> {{ quickV2Amount }} QUICK-v2",
+  "submittedTxQUICKConvert": "Submitted Transction to convert {{ quickAmount }} QUICK -> {{ quickV2Amount }} QUICK-v2",
+  "successConvertedQUICKtoQUICKV2": "Sucessfully Converted {{ quickAmount }} QUICK -> {{ quickV2Amount }} QUICK-v2"
 }
diff --git a/src/App.tsx b/src/App.tsx
@@ -13,6 +13,7 @@ const FarmPage = lazy(() => import('./pages/FarmPage'));
 const LandingPage = lazy(() => import('./pages/LandingPage'));
 const PoolsPage = lazy(() => import('./pages/PoolsPage'));
 const SwapPage = lazy(() => import('./pages/SwapPage'));
+const ConvertQUICKPage = lazy(() => import('./pages/ConvertQUICKPage'));
 const AnalyticsTokenDetails = lazy(() =>
   import('./pages/AnalyticsTokenDetails'),
 );
@@ -137,6 +138,11 @@ const App: React.FC = () => {
                         <DragonPage />
                       </PageLayout>
                     </Route>
+                    <Route exact path='/convert'>
+                      <PageLayout>
+                        <ConvertQUICKPage />
+                      </PageLayout>
+                    </Route>
                     <Route exact path='/analytics'>
                       <PageLayout>
                         <AnalyticsHeader />

diff --git a/src/assets/images/QUICKV2.svg b/src/assets/images/QUICKV2.svg
diff --git a/src/components/FarmCard/FarmCard.tsx b/src/components/FarmCard/FarmCard.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { Box, Typography, useMediaQuery } from '@material-ui/core';
 import { makeStyles, useTheme } from '@material-ui/core/styles';
+import cx from 'classnames';
 import { DualStakingInfo, StakingInfo } from 'types';
 import { unwrappedToken } from 'utils/wrappedCurrency';
 import { DoubleCurrencyLogo, CurrencyLogo } from 'components';
@@ -18,7 +19,7 @@ import {
 } from 'utils';
 import { KeyboardArrowDown, KeyboardArrowUp } from '@material-ui/icons';
 
-const useStyles = makeStyles(({ palette }) => ({
+const useStyles = makeStyles(({ palette, breakpoints }) => ({
   farmLPCard: {
     background: palette.secondary.dark,
     width: '100%',
@@ -27,15 +28,26 @@ const useStyles = makeStyles(({ palette }) => ({
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',
+    padding: '0 16px',
+    [breakpoints.down('xs')]: {
+      padding: 0,
+    },
+  },
+  highlightedCard: {
+    border: `1px solid ${palette.primary.main}`,
+    boxShadow: '0 0 5px 5px rgba(68, 138, 255, 0.3)',
   },
   farmLPCardUp: {
     background: palette.secondary.dark,
     width: '100%',
     borderRadius: 10,
     display: 'flex',
     alignItems: 'center',
-    padding: '16px',
+    padding: '16px 0',
     cursor: 'pointer',
+    [breakpoints.down('xs')]: {
+      padding: 16,
+    },
   },
   farmLPText: {
     fontSize: 14,
@@ -53,6 +65,7 @@ const FarmCard: React.FC<{
   const { palette, breakpoints } = useTheme();
   const isMobile = useMediaQuery(breakpoints.down('xs'));
   const [isExpandCard, setExpandCard] = useState(false);
+
   const lpStakingInfo = stakingInfo as StakingInfo;
   const dualStakingInfo = stakingInfo as DualStakingInfo;
 
@@ -116,7 +129,12 @@ const FarmCard: React.FC<{
   );
 
   return (
-    <Box className={classes.farmLPCard}>
+    <Box
+      className={cx(
+        classes.farmLPCard,
+        isExpandCard && classes.highlightedCard,
+      )}
+    >
       <Box
         className={classes.farmLPCardUp}
         onClick={() => setExpandCard(!isExpandCard)}