Merge dev to master

.env

@@ -1,9 +1,10 @@
 REACT_APP_CHAIN_ID="137"
-REACT_APP_NETWORK_URL="https://rpc-mainnet.matic.network"
+REACT_APP_NETWORK_URL="https://polygon-rpc.com/"
 REACT_APP_GOOGLE_ANALYTICS_ID="UA-188438708-1"
 IPFS_DEPLOY_PINATA__API_KEY=16f568d2ab3bbb712be5
 IPFS_DEPLOY_PINATA__SECRET_API_KEY=d17f8f50c3e6a633b12843890a8fb537908f0632f642bc9b97e54f3ac321ecbb
 REACT_APP_PORTIS_ID="e086c1f2-2d26-4443-804f-3398bbab069e"
 REACT_APP_FORTMATIC_KEY="pk_live_F937DF033A1666BF"
 REACT_APP_MOONPAY_KEY="pk_live_72EGoobLnlgc8WB7AaxyiWu2S43dj8eY"
 REACT_APP_TRANSAK_KEY="258960cf-1e17-4419-bf7f-77443282f5da"
+REACT_APP_GRAPH_API_URL="https://polygon.furadao.org/subgraphs/name/quickswap"

.env.production

@@ -5,3 +5,4 @@ REACT_APP_FORTMATIC_KEY="pk_live_F937DF033A1666BF"
 REACT_APP_GOOGLE_ANALYTICS_ID="UA-188438708-1"
 REACT_APP_MOONPAY_KEY="pk_live_72EGoobLnlgc8WB7AaxyiWu2S43dj8eY"
 REACT_APP_TRANSAK_KEY="258960cf-1e17-4419-bf7f-77443282f5da"
+REACT_APP_GRAPH_API_URL="https://polygon.furadao.org/subgraphs/name/quickswap"

README.md

@@ -12,6 +12,7 @@ Enabling users to:
 
 Useful links:
 - Website: [quickswap.exchange](https://quickswap.exchange/)
+- Beta: [beta.quickswap.exchange](https://beta.quickswap.exchange/)
 - Info: [info.quickswap.exchange](https://info.quickswap.exchange)
 - Twitter: [@QuickswapDEX](https://twitter.com/QuickswapDEX)
 - Reddit: [/r/QuickSwap](https://www.reddit.com/r/QuickSwap)

package.json

@@ -57,7 +57,6 @@
  "hamburger-react": "^2.4.1",
  "i18next": "^20.4.0",
  "i18next-browser-languagedetector": "^6.1.2",
- "i18next-xhr-backend": "^3.2.2",
  "ipfs-deploy": "^11.1.0",
  "lodash.flatmap": "^4.5.0",
  "multicodec": "^3.0.1",
@@ -98,7 +97,10 @@
  "glob-parent": "^5.1.2",
  "browserslist": "^4.16.5",
  "ajv": "^6.12.3",
- "async": "^3.2.2"
+ "async": "^3.2.2",
+ "ejs": "^3.1.7",
+ "cross-fetch": "^3.1.5",
+ "eventsource": "^2.0.2"
  },
  "scripts": {
  "analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -134,11 +136,15 @@
  "@material-ui/icons": "^4.11.2",
  "@material-ui/lab": "^4.0.0-alpha.60",
  "apexcharts": "3.32.1",
+ "i18next-http-backend": "^1.4.1",
  "react-apexcharts": "1.3.9",
  "react-cool-inview": "^2.0.8",
  "react-error-overlay": "^6.0.10",
  "react-ga": "^3.3.0",
+ "react-reflex": "^4.0.6",
  "react-slick": "^0.28.1",
+ "react-virtuoso": "^2.8.4",
+ "sass": "^1.51.0",
  "slick-carousel": "^1.8.1",
  "styled-components": "^5.3.3"
  }

public/locales/de.json

@@ -1,89 +1,21 @@
 {
- "noWallet": "Keine Ethereum-Wallet gefunden",
- "wrongNetwork": "Du bist auf dem falschen Netzwerk.",
- "switchNetwork": "Bitte wechsle zum {{ correctNetwork }}",
- "installWeb3MobileBrowser": "Bitte besuche uns mit einem web3-fähigen mobilen Browser wie z.B. Trust Wallet oder Coinbase Wallet.",
- "installMetamask": "Bitte besuch uns erneut, nachdem du Metamask oder Brave installiert hast.",
- "disconnected": "Nicht verbunden",
  "swap": "Tauschen",
- "swapAnyway": "Trotzdem tauschen",
- "send": "Senden",
- "sendAnyway": "Trotzdem senden",
  "pool": "Pool",
- "betaWarning": "Dieses Projekt ist in beta. Nutzung auf eigenes Risiko.",
  "input": "Input",
  "output": "Output",
- "estimated": "geschätzt",
- "balance": "Guthaben: {{ balanceInput }}",
- "unlock": "Freischalten",
  "pending": "hängige",
- "selectToken": "Token auswählen",
- "searchOrPaste": "Token Name, Symbol oder Adresse suchen",
- "searchOrPasteMobile": "Name, Symbol oder Adresse",
- "noExchange": "Exchange nicht gefunden",
- "exchangeRate": "Wechselkurs",
- "invertedRate": "Invertierter Wechselkurs",
  "unknownError": "Oops! Ein unbekannter Fehler ist aufgetreten. Bitte Seite neu laden oder uns von einem anderen Browser oder Gerät erneut besuchen.",
- "enterValueCont": "Wert {{ missingCurrencyValue }} eingeben um fortzufahren.",
- "selectTokenCont": "Token auswählen um fortzufahren.",
  "noLiquidity": "Keine Liquidität.",
- "insufficientLiquidity": "Liquidität ungenügend.",
- "unlockTokenCont": "Token freischalten um fortzufahren.",
- "transactionDetails": "Details der Transaktion",
- "hideDetails": "Details ausblenden",
- "slippageWarning": "Wechselkursrutsch",
- "highSlippageWarning": "Hoher Wechselkursrutsch",
- "youAreSelling": "Du verkaufst",
- "orTransFail": "oder die Transaktion wird fehlschlagen.",
  "youWillReceive": "Du erhältst mindestens",
- "youAreBuying": "Du kaufst",
- "itWillCost": "Es kostet höchstens",
- "forAtMost": "für maximal",
- "insufficientBalance": "Guthaben ungenügend",
- "inputNotValid": "Eingabewert ungültig",
- "differentToken": "Es müssen unterschiedliche Token sein.",
- "noRecipient": "Empfängeradresse angeben.",
- "invalidRecipient": "Bitte gib eine gültige Empfängeradresse an.",
- "recipientAddress": "Adresse des Empfängers",
- "youAreSending": "Du schickst",
- "willReceive": "erhält mindestens",
  "to": "zu",
  "addLiquidity": "Liquidität hinzufügen",
  "deposit": "Depot",
- "currentPoolSize": "Aktuelle Größe des Pools",
  "yourPoolShare": "Dein Anteil am Pool",
- "noZero": "Wert darf nicht Null sein.",
- "mustBeETH": "Einer der Inputs muß ETH sein.",
- "enterCurrencyOrLabelCont": "{{ inputCurrency }} oder {{ label }} Wert eingeben um fortzufahren.",
- "youAreAdding": "Du fügst zwischen",
  "and": "und",
- "intoPool": "in den Liquiditätspool.",
- "outPool": "vom Liquiditätspool.",
- "youWillMint": "Du prägst",
- "liquidityTokens": "Liquiditätstokens.",
- "totalSupplyIs": "Die gesamte Anzahl Liquiditätstokens ist aktuell",
- "youAreSettingExRate": "Du setzt den anfänglichen Wechselkurs auf",
- "totalSupplyIs0": "Die gesamte Anzahl Liquiditätstokens ist aktuell 0.",
- "tokenWorth": "Zum gegenwärtigen Wechselkurs ist jeder Pool Token so viel Wert",
- "firstLiquidity": "Du bist die erste Person die Liquidität bereitstellt!",
- "initialExchangeRate": "Der initiale Wechselkurs wird auf deiner Überweisung basieren. Stelle sicher, dass deine ETH und {{ label }} denselben Fiatwert haben.",
  "removeLiquidity": "Liquidität entfernen",
- "poolTokens": "Pool Tokens",
- "enterLabelCont": "{{ label }} Wert eingeben um fortzufahren.",
- "youAreRemoving": "Du entfernst zwischen",
- "youWillRemove": "Du entfernst",
- "createExchange": "Exchange erstellen",
- "invalidTokenAddress": "Ungültige Tokenadresse",
- "exchangeExists": "{{ label }} Exchange existiert bereits!",
- "invalidSymbol": "Symbol ungültig",
- "invalidDecimals": "Dezimalstellen ungültig",
  "tokenAddress": "Tokenadresse",
  "label": "Label",
  "name": "Name",
  "symbol": "Symbol",
- "decimals": "Dezimalstellen",
- "enterTokenCont": "Tokenadresse eingeben um fortzufahren",
- "priceChange": "Geschätzter Wechselkursrutsch",
- "forAtLeast": "für mindestens ",
- "brokenToken": "Der ausgewählte Token ist nicht kompatibel mit Uniswap V1. Liquidität hinzufügen wird zu nicht mehr zugänglichen Token führen!"
+ "decimals": "Dezimalstellen"
 }

public/locales/en.json

@@ -1,91 +1,4 @@
 {
- "noWallet": "No Ethereum wallet found",
- "wrongNetwork": "You are on the wrong network",
- "switchNetwork": "Please switch to {{ correctNetwork }}",
- "installWeb3MobileBrowser": "Please visit us from a web3-enabled mobile browser such as Trust Wallet or Coinbase Wallet.",
- "installMetamask": "Please visit us after installing Metamask on Chrome or Brave.",
- "disconnected": "Disconnected",
- "swap": "Swap",
- "swapAnyway": "Swap Anyway",
- "send": "Send",
- "sendAnyway": "Send Anyway",
- "pool": "Pool",
- "betaWarning": "This project is in beta. Use at your own risk.",
- "input": "Input",
- "output": "Output",
- "estimated": "estimated",
- "balance": "Balance: {{ balanceInput }}",
- "unlock": "Unlock",
- "pending": "Pending",
- "selectToken": "Select a token",
- "searchOrPaste": "Search Token Name, Symbol, or Address",
- "searchOrPasteMobile": "Name, Symbol, or Address",
- "noExchange": "No Exchange Found",
- "noToken": "No Token Found",
- "exchangeRate": "Exchange Rate",
- "unknownError": "Oops! An unknown error occurred. Please refresh the page, or visit from another browser or device.",
- "enterValueCont": "Enter a {{ missingCurrencyValue }} value to continue.",
- "selectTokenCont": "Select a token to continue.",
- "noLiquidity": "No liquidity.",
- "insufficientLiquidity": "Insufficient liquidity.",
- "unlockTokenCont": "Please unlock token to continue.",
- "transactionDetails": "Advanced Details",
- "hideDetails": "Hide Details",
- "slippageWarning": "Slippage Warning",
- "highSlippageWarning": "High Slippage Warning",
- "youAreSelling": "You are selling",
- "orTransFail": "or the transaction will fail.",
- "youWillReceive": "You will receive at least",
- "youAreBuying": "You are buying",
- "itWillCost": "It will cost at most",
- "forAtMost": "for at most",
- "inputNotValid": "Not a valid input value",
- "differentToken": "Must be different token.",
- "noRecipient": "Enter a wallet address to send to.",
- "invalidRecipient": "Please enter a valid wallet address recipient.",
- "recipientAddress": "Recipient Address",
- "youAreSending": "You are sending",
- "willReceive": "will receive at least",
- "to": "to",
- "addLiquidity": "Add Liquidity",
- "deposit": "Deposit",
- "currentPoolSize": "Current Pool Size",
- "yourPoolShare": "Your Pool Share",
- "noZero": "Amount cannot be zero.",
- "mustBeETH": "One of the input must be ETH.",
- "enterCurrencyOrLabelCont": "Enter a {{ inputCurrency }} or {{ label }} value to continue.",
- "youAreAdding": "You are adding",
- "and": "and",
- "intoPool": "into the liquidity pool.",
- "outPool": "from the liquidity pool.",
- "youWillMint": "You will mint",
- "liquidityTokens": "liquidity tokens.",
- "totalSupplyIs": "Current total supply of liquidity tokens is",
- "youAreSettingExRate": "You are setting the initial exchange rate to",
- "totalSupplyIs0": "Current total supply of liquidity tokens is 0.",
- "tokenWorth": "At current exchange rate, each pool token is worth",
- "firstLiquidity": "You are the first person to add liquidity!",
- "initialExchangeRate": "The initial exchange rate will be set based on your deposits. Please make sure that your ETH and {{ label }} deposits have the same fiat value.",
- "removeLiquidity": "Remove Liquidity",
- "poolTokens": "Pool Tokens",
- "enterLabelCont": "Enter a {{ label }} value to continue.",
- "youAreRemoving": "You are removing between",
- "youWillRemove": "You will remove",
- "createExchange": "Create Exchange",
- "invalidTokenAddress": "Not a valid token address",
- "exchangeExists": "{{ label }} Exchange already exists!",
- "invalidSymbol": "Invalid symbol",
- "invalidDecimals": "Invalid decimals",
- "tokenAddress": "Token Address",
- "label": "Label",
- "name": "Name",
- "symbol": "Symbol",
- "decimals": "Decimals",
- "enterTokenCont": "Enter a token address to continue",
- "priceChange": "Expected price slippage",
- "forAtLeast": "for at least ",
- "brokenToken": "The selected token is not compatible with Uniswap V1. Adding liquidity will result in locked funds.",
- "toleranceExplanation": "Lowering this limit decreases your risk of frontrunning. However, this makes more likely that your transaction will fail due to normal price movements.",
  "tokenSearchPlaceholder": "Search name or paste address",
  "txnSwapMessage": "Swap {{ token0Symbol }} for {{ token1Symbol }}",
  "txnAddMessage": "Add {{ token0Symbol }} and {{ token1Symbol }}",
@@ -162,7 +75,7 @@
  "claiming": "Claiming",
  "claim": "Claim",
  "convert": "Convert",
- "convertQUICK": "Convert your QUICK(old) to QUICK(new). Read more about QUICK token split <1>here</1>",
+ "convertQUICK": "Convert your QUICK(OLD) to QUICK(NEW). Read more about QUICK token split <alink>here</alink>.",
  "conversionRate": "Conversion Rate",
  "yourbalance": "Your balance",
  "youwillreceive": "You will receive",
@@ -172,5 +85,117 @@
  "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"
+ "successConvertedQUICKtoQUICKV2": "Sucessfully Converted {{ quickAmount }} QUICK -> {{ quickV2Amount }} QUICK-v2",
+ "totalValueLocked": "Total Value Locked",
+ "topAssetExchange": "Top Asset Exchange on the Polygon Network",
+ "buyCryptoFiat": "Buy crypto with Fiat",
+ "buyCryptoFiatDesc": "Simple way to buy or sell crypto with a credit card, bank transfer and more",
+ "buyNow": "Buy Now",
+ "enterApp": "Enter App",
+ "swap": "Swap",
+ "liquidity": "Liquidity",
+ "swapSectionShortDesc": "Swap tokens at near-zero gas fees",
+ "liquiditySectionShortDesc": "Let your crypto work for you",
+ "swapSectionLongDesc": "Deposit your Liquidity Provider tokens to receive Rewards in $QUICK on top of LP Fees.",
+ "liquiditySectionLongDesc": "Provide Liquidity and earn 0.25% fee on all trades proportional to your share of the pool. Earn additional rewards by depositing your LP Tokens in Rewards Pools.",
+ "24hTxs": "24h Transactions",
+ "24hTradingVol": "24H TRADING VOLUME",
+ "24hRewardsDistributed": "24H REWARDS DISTRIBUTED",
+ "totalTradingPairs": "TOTAL TRADING PAIRS",
+ "stake": "Stake",
+ "24hVol": "24H Volume",
+ "liquidityPools": "Liquidity Pools",
+ "all": "All",
+ "transactions": "Transactions",
+ "buys": "Buys",
+ "sells": "Sells",
+ "volume": "Volume",
+ "market": "Market",
+ "limit": "Limit",
+ "proMode": "Pro Mode",
+ "limitOrderDisclaimer": "<bold>* Disclaimer:</bold> Limit Orders on QuickSwap are provided by Gelato, a 3rd party protocol and should be considered in beta. DYOR and use at your own risk. QuickSwap is not responsible. More info can be found <alink>here</alink>.",
+ "date": "date",
+ "type": "type",
+ "usd": "usd",
+ "price": "Price",
+ "txn": "txn",
+ "chart": "chart",
+ "trades": "trades",
+ "info": "info",
+ "left": "left",
+ "right": "right",
+ "none": "none",
+ "hour": "h",
+ "min": "m",
+ "supplyLiquidityHelp": "When you add liquidity, you are given pool tokens representing your position. These tokens automatically earn fees proportional to your share of the pool, and can be redeemed at any time.",
+ "yourliquidityPools": "Your Liquidity Pools",
+ "poolMissingComment": "Don’t see a pool you joined? <pspan>Import it</pspan>.<br/> Unstake your LP Tokens from Farms to see them here.",
+ "farm": "Farm",
+ "help": "Help",
+ "lpMining": "LP Mining",
+ "dualMining": "Dual Mining",
+ "totalRewards": "Total Rewards",
+ "fees24h": "Fees [24h]",
+ "rewardRate": "Reward Rate",
+ "stakedOnly": "Staked Only",
+ "active": "Active",
+ "ended": "Ended",
+ "stakeMessageLP": "Stake LP Tokens to earn dQUICK + Pool Fees",
+ "stakeMessageDual": "Stake LP Tokens to earn dQUICK + WMATIC rewards",
+ "search": "Search",
+ "searchPlaceHolder": "Search name, symbol or paste address",
+ "sortBy": "Sort By",
+ "sortdesc": "Sort Desc",
+ "sortasc": "Sort Asc",
+ "pool": "Pool",
+ "input": "Input",
+ "output": "Output",
+ "pending": "Pending",
+ "unknownError": "Oops! An unknown error occurred. Please refresh the page, or visit from another browser or device.",
+ "noLiquidity": "No liquidity.",
+ "youWillReceive": "You will receive at least",
+ "to": "to",
+ "addLiquidity": "Add Liquidity",
+ "deposit": "Deposit",
+ "yourPoolShare": "Your Pool Share",
+ "and": "and",
+ "removeLiquidity": "Remove Liquidity",
+ "tokenAddress": "Token Address",
+ "label": "Label",
+ "name": "Name",
+ "symbol": "Symbol",
+ "decimals": "Decimals",
+ "quickswapAnalytics": "Quickswap Analytics",
+ "tokens": "Tokens",
+ "pairs": "Pairs",
+ "overview": "Overview",
+ "24hFees": "24h Fees",
+ "topTokens": "Top Tokens",
+ "seeAll": "See All",
+ "topPairs": "Top Pairs",
+ "allPairs": "All Pairs",
+ "allCryptos": "All Cryptos",
+ "favourites": "Favourites",
+ "newListing": "New Listing",
+ "24hr": "24hr",
+ "dayAbb": "D",
+ "weekAbb": "W",
+ "fees": "Fees",
+ "totalTokensLocked": "Total Tokens Locked",
+ "7dTradingVol": "7d Trading Vol",
+ "totalLiquidity": "Total Liquidity",
+ "24hTradingVol1": "24h Trading Vol",
+ "contractAddress": "Contract Address",
+ "pools": "Pools",
+ "dragonAlertDesc": "As of May 2022, you can stake QUICK(NEW) in Syrup Pools. Note that there are some Syrup Pools that will still accept QUICK(OLD) for staking, until they run out of rewards.",
+ "dragonLairTitle": "Stake QUICK to earn QUICK",
+ "dragonSyrup": "Dragon’s Syrup",
+ "dragonSyrupTitle": "Earn tokens of your choice over time",
+ "stakeQUICKTitle": "Single Stake — Auto compounding",
+ "total": "Total",
+ "yourdeposits": "Your Deposits",
+ "unstake": "Unstake",
+ "unstakeQUICKDesc": "⭐️ When you unstake, the contract will automatically claim QUICK on your behalf.",
+ "earn": "Earn",
+ "apr": "APR"
 }