diff --git a/.babelrc b/.babelrc index c064a26682..ff9e845bd6 100644 --- a/.babelrc +++ b/.babelrc @@ -9,5 +9,5 @@ } ] ], - "plugins": ["macros"] + "plugins": ["macros", "lodash"] } diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index c72a026cf8..338df4027a 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -48,11 +48,11 @@ jobs: REF_BRANCH=${REF/refs\/tags\//} BRANCH=$REF_BRANCH fi - echo "::set-output name=value::$BRANCH" + echo "value=$BRANCH" >> $GITHUB_OUTPUT - name: Extract GitHub HEAD SHA id: head_sha - run: echo "::set-output name=value::$(git rev-parse HEAD)" + run: echo "value=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Get Docker image tag id: get_tag @@ -60,7 +60,7 @@ jobs: HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | short_sha="$(echo $HEAD_SHA | head -c7)" - echo "::set-output name=image_tag::adpr-$short_sha" + echo "image_tag=adpr-$short_sha" >> $GITHUB_OUTPUT cypress-test: runs-on: ubuntu-latest @@ -87,7 +87,7 @@ jobs: sudo apt-get install --no-install-recommends -y \ fluxbox \ xvfb - + - name: Yarn Build env: CI: false @@ -95,26 +95,32 @@ jobs: CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }} NODE_OPTIONS: '--max_old_space_size=4096' run: yarn build-adpr - + - name: Install cypress - run: yarn cypress install --force - + run: yarn cypress install --force + - name: Run xvfb and fluxbox run: | Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac & fluxbox & env: - DISPLAY: :0.0 + DISPLAY: :0.0 + + - name: Create env file + run: | + touch .env + echo ENV=${ENV} > .env + echo CYPRESS_BASE_URL='http://127.0.0.1:4173/' > .env - name: Run Cypress Test run: |+ #!/bin/bash yarn preview & - yarn test-e2e -e grepTags=smoke,NETWORK=Ethereum + yarn test-e2e -c baseUrl='http://127.0.0.1:4173/' -e grepTags=smoke,NETWORK=Ethereum env: DISPLAY: :0.0 - - - name: Archive e2e artifacts + + - name: Archive e2e artifacts uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 if: always() with: @@ -122,4 +128,4 @@ jobs: path: | cypress/videos cypress/screenshots - continue-on-error: true + continue-on-error: true diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index 04862cd183..ad37319e3d 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -2,7 +2,8 @@ name: 'E2E Testing Schedule' on: schedule: - - cron: '0 1,5 * * *' # run at 8AM and 12PM (GTM+7) + - cron: '*/20 1-12 * * *' + - cron: '0 13 * * *' workflow_dispatch: jobs: @@ -11,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - network: ['Ethereum', 'Arbitrum','Optimism', 'Avalanche', 'BNB'] + network: ['Ethereum', 'Arbitrum', 'Optimism', 'Avalanche', 'BNB'] steps: - name: Trigger Code Checkout uses: actions/checkout@v3 @@ -30,44 +31,39 @@ jobs: - name: Install linux deps run: | - sudo apt-get install --no-install-recommends -y \ - fluxbox \ - xvfb - + sudo apt-get install --no-install-recommends -y \ + fluxbox \ + xvfb + - name: Install cypress - run: yarn cypress install --force - + run: yarn cypress install --force + - name: Run xvfb and fluxbox run: Xvfb :0 -screen 0 1024x768x24 -listen tcp -ac & fluxbox & env: - DISPLAY: :0.0 + DISPLAY: :0.0 + + - name: Create env file + run: | + touch .env + echo ENV=${ENV} > .env + echo GITHUB_RUN_ID=${GITHUB_RUN_ID} > .env + echo CORE_PUSH_GATEWAY_URL=${{ secrets.CORE_PUSH_GATEWAY_URL }} > .env - name: Run Cypress Test run: |+ #!/bin/bash - yarn test-schedule -e grepTags=regression,NETWORK=${{ matrix.network }} - env: - DISPLAY: :0.0 - - - name: Notify on failure - if: ${{ failure() }} - uses: rtCamp/action-slack-notify@v2 + yarn test-schedule -c baseUrl='https://kyberswap.com/' -e grepTags=regression,NETWORK=${{ matrix.network }} env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_CHANEL: automation-test-bot - SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff' - SLACK_ICON: https://icon-library.com/images/star-wars-icon-png/star-wars-icon-png-16.jpg?size=48 - SLACK_TITLE: E2E Test ${{inputs.BASE_URL}} - SLACK_USERNAME: autoBot - SLACK_LINK_NAMES: true - - - name: Archive e2e artifacts + DISPLAY: :0.0 + + - name: Archive e2e artifacts uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 if: always() with: - name: e2e-artifacts - path: | - cypress/videos - cypress/screenshots + name: e2e-artifacts + path: | + cypress/videos + cypress/screenshots continue-on-error: true diff --git a/cypress.config.ts b/cypress.config.ts index 5da0b93d20..1085451248 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -1,8 +1,10 @@ import synpressPlugins from '@synthetixio/synpress/plugins' import { defineConfig } from 'cypress' +import client from 'prom-client' + +require('dotenv').config() export default defineConfig({ - projectId: '4x4jf8', component: { devServer: { framework: 'create-react-app', @@ -14,15 +16,133 @@ export default defineConfig({ viewportWidth: 1920, viewportHeight: 1080, env: { - grepFilterSpecs:true, - grepOmitFiltered:true + grepFilterSpecs: true, + grepOmitFiltered: true, }, e2e: { setupNodeEvents(on, config) { // eslint-disable-next-line @typescript-eslint/no-var-requires require('@cypress/grep/src/plugin')(config) synpressPlugins(on, config) + on('after:run', async results => { + if (results) { + const register = new client.Registry() + const prefix = 'e2e_cypress' + const suite = new client.Counter({ + name: `${prefix}_suite`, + help: `${prefix}_suite`, + labelNames: ['buildId', 'result', 'baseName', 'duration', 'chain'] as const, + }) + suite.reset() + const { totalPassed, totalFailed, totalTests, totalDuration, runs } = results + runs.forEach(run => { + const { stats, spec } = run + const { tests, passes, pending, failures, duration } = stats + const { baseName } = spec + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'failed', + baseName: baseName, + duration: duration, + chain: config.env.NETWORK, + }) + .inc(failures) + + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'passed', + baseName: baseName, + duration: duration, + chain: config.env.NETWORK, + }) + .inc(passes) + + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'pending', + baseName: baseName, + duration: duration, + chain: config.env.NETWORK, + }) + .inc(pending) + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'tests', + baseName: baseName, + duration: duration, + chain: config.env.NETWORK, + }) + .inc(tests) + }) + + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'passed', + baseName: 'All Specs', + duration: totalDuration, + chain: config.env.NETWORK, + }) + .inc(totalPassed) + + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'failed', + baseName: 'All Specs', + duration: totalDuration, + chain: config.env.NETWORK, + }) + .inc(totalFailed) + suite + .labels({ + buildId: `${process.env.GITHUB_RUN_ID}`, + result: 'total', + baseName: 'All Specs', + duration: totalDuration, + chain: config.env.NETWORK, + }) + .inc(totalTests) + + const testPass = new client.Counter({ + name: `${prefix}_test_passed`, + help: `${prefix}_pass`, + labelNames: ['buildId', 'chain'] as const, + }) + + const testFail = new client.Counter({ + name: `${prefix}_test_failed`, + help: `${prefix}_fail`, + labelNames: ['buildId', 'chain'] as const, + }) + + testPass.reset() + testFail.reset() + + testFail.labels({ buildId: `${process.env.GITHUB_RUN_ID}`, chain: config.env.NETWORK }).inc(totalFailed) + testPass.labels({ buildId: `${process.env.GITHUB_RUN_ID}`, chain: config.env.NETWORK }).inc(totalPassed) + + register.registerMetric(testPass) + register.registerMetric(testFail) + register.registerMetric(suite) + + const gateway = new client.Pushgateway(`${process.env.CORE_PUSH_GATEWAY_URL}`, [], register) + await gateway + .push({ jobName: 'ui-automation' }) + .then(({ resp, body }) => { + console.log(`Body: ${body}`) + console.log(`Response status: ${resp}`) + }) + .catch((err: any) => { + console.log('err: ', err) + }) + } + }) }, - specPattern: 'cypress/e2e/specs/*.e2e.cy.ts' + specPattern: 'cypress/e2e/specs/*.e2e.cy.ts', }, }) diff --git a/cypress/e2e/pages/farm-page.po.cy.ts b/cypress/e2e/pages/farm-page.po.cy.ts new file mode 100644 index 0000000000..3575e57f45 --- /dev/null +++ b/cypress/e2e/pages/farm-page.po.cy.ts @@ -0,0 +1,46 @@ +import { FarmLocators, HeaderLocators } from "../selectors/selectors.cy" + +export class FarmPage { + + getTvlValues() { + const arr: string[] = [] + const listData = cy.get(FarmLocators.lblTvl) + listData + .each(item => { + arr.push(item.text().split('$')[1]) + }) + return arr + } + + getAprValues() { + const arr: string[] = [] + const listData = cy.get(FarmLocators.lblApr) + listData + .each(item => { + arr.push(item.text().split('%')[0]) + }) + return arr + } + + countInvalidFarms(arrApr: string[], arrTvl: string[]) { + const totalFarms = arrApr.length + let count = 0; + for (let i = 0; i < totalFarms; i++) { + if (((arrTvl[i]) === undefined || Number(arrTvl[i]) === 0) && Number(arrApr[i]) === 0) { + count = count + 1; + } + } + return count + } + + checkExistData() { + return cy.get(FarmLocators.lblApr, {timeout: 5000}).should(() => { }).then($obj => { + if ($obj.length > 0) { + return true + } + else { + return false + } + }) + } +} \ No newline at end of file diff --git a/cypress/e2e/pages/swap-page.po.cy.ts b/cypress/e2e/pages/swap-page.po.cy.ts index 6da235890b..31dc3d5fe6 100644 --- a/cypress/e2e/pages/swap-page.po.cy.ts +++ b/cypress/e2e/pages/swap-page.po.cy.ts @@ -1,4 +1,4 @@ -import { NetworkLocators, SwapPageLocators, TokenCatalogLocators, WalletLocators } from "../selectors/selectors.cy" +import { HeaderLocators, NetworkLocators, SwapPageLocators, TokenCatalogLocators, WalletLocators } from "../selectors/selectors.cy" export interface myCallbackType { (myArgument: T): void @@ -35,14 +35,29 @@ export const SwapPage = { getStatusConnectedWallet() { cy.get(WalletLocators.statusConnected, { timeout: 10000 }).should('be.visible') - } + }, + + goToFarmPage() { + cy.get(HeaderLocators.dropdownEarn).click({ force: true }) + cy.get(HeaderLocators.lblFarms).click({ force: true }) + }, + + goToPoolPage() { + cy.get(HeaderLocators.dropdownEarn).click({ force: true }) + cy.get(HeaderLocators.lblPools).click({ force: true }) + }, + + goToMyPoolsPage() { + cy.get(HeaderLocators.dropdownEarn).click({ force: true }) + cy.get(HeaderLocators.lblMyPools).click({ force: true }) + }, } export class Network { selectNetwork(network: string) { cy.get(NetworkLocators.btnSelectNetwork, { timeout: 30000 }).should('be.visible').click() cy.get(NetworkLocators.btnNetwork).contains(network).click({ force: true }) - } + } } export class TokenCatalog { diff --git a/cypress/e2e/selectors/selectors.cy.ts b/cypress/e2e/selectors/selectors.cy.ts index e7af50485a..f3a85e1eb3 100644 --- a/cypress/e2e/selectors/selectors.cy.ts +++ b/cypress/e2e/selectors/selectors.cy.ts @@ -39,3 +39,8 @@ export const HeaderLocators = { lblMyPools: '[data-testid=my-pools-nav-link]', lblFarms: '[data-testid=farms-nav-link]', } + +export const FarmLocators = { + lblApr: '[data-testid=apr-value]', + lblTvl: '[data-testid=tvl-value]', +} \ No newline at end of file diff --git a/cypress/e2e/specs/farm-page.e2e.cy.ts b/cypress/e2e/specs/farm-page.e2e.cy.ts new file mode 100644 index 0000000000..2015017a57 --- /dev/null +++ b/cypress/e2e/specs/farm-page.e2e.cy.ts @@ -0,0 +1,24 @@ +import { FarmPage } from "../pages/farm-page.po.cy"; +import { SwapPage } from "../pages/swap-page.po.cy" +import { DEFAULT_URL, TAG, } from "../selectors/constants.cy" +const farm = new FarmPage() + +describe('Farm', { tags: TAG.regression }, () => { + beforeEach(() => { + SwapPage.open(DEFAULT_URL) + SwapPage.goToFarmPage() + farm.checkExistData().then((value) => { + if (value === true) { + cy.wrap(farm.getAprValues()).as('arrApr') + cy.wrap(farm.getTvlValues()).as('arrTvl') + } + cy.wrap(value).as('checkData') + }) + }) + it('Should be displayed APR and TVL values', function () { + if (this.checkData === true) { + const count = farm.countInvalidFarms(this.arrApr, this.arrTvl) + expect(count).not.to.equal(this.arrApr.length) + } + }) +}) diff --git a/cypress/e2e/specs/intercept.e2e.cy.ts b/cypress/e2e/specs/intercept.e2e.cy.ts index cefd5f6ce7..163e19ca92 100644 --- a/cypress/e2e/specs/intercept.e2e.cy.ts +++ b/cypress/e2e/specs/intercept.e2e.cy.ts @@ -1,7 +1,10 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { SwapPage } from "../pages/swap-page.po.cy" -import { DEFAULT_URL, TAG, } from "../selectors/constants.cy" +import { FarmPage } from "../pages/farm-page.po.cy"; +import { SwapPage, TokenCatalog } from "../pages/swap-page.po.cy" +import { DEFAULT_URL, TAG, } from "../selectors/constants.cy" import { HeaderLocators } from "../selectors/selectors.cy" +const tokenCatalog = new TokenCatalog() +const farm = new FarmPage() describe('Intercept', { tags: TAG.regression }, () => { beforeEach(() => { @@ -19,19 +22,32 @@ describe('Intercept', { tags: TAG.regression }, () => { cy.intercept('GET', '**/farm-pools?**').as('get-farm-list') cy.intercept('GET', '**/pools?**').as('get-pool-list') cy.intercept('GET', '**/block?**').as('get-block') - cy.get(HeaderLocators.dropdownEarn).click({ force: true }) - cy.get(HeaderLocators.lblPools).click({ force: true }) + SwapPage.goToPoolPage() cy.wait('@get-farm-list', { timeout: 5000 }).its('response.statusCode').should('equal', 200) cy.wait('@get-pool-list', { timeout: 5000 }).its('response.statusCode').should('equal', 200) cy.wait('@get-block', { timeout: 60000 }).its('response.statusCode').should('equal', 200) }) + + it('Should be displayed APR and TVL values', () => { + cy.intercept('GET', '**/pools?**').as('get-pools') + SwapPage.goToPoolPage() + cy.wait('@get-pools', { timeout: 20000 }).its('response.body.data').then(response => { + const totalPools = response.pools.length; + const count = response.pools.reduce((acc: number, pool: { totalValueLockedUsd: string; apr: string }) => { + if (pool.totalValueLockedUsd === '0' && pool.apr === '0') { + return acc + 1; + } + return acc; + }, 0); + expect(count).not.to.equal(totalPools); + }) + }) }) describe('My Pools', () => { it('Should get farm list successfully', () => { cy.intercept('GET', '**/farm-pools?**').as('get-farm-list') - cy.get(HeaderLocators.dropdownEarn).click({ force: true }) - cy.get(HeaderLocators.lblPools).click({ force: true }) + SwapPage.goToMyPoolsPage() cy.wait('@get-farm-list', { timeout: 5000 }).its('response.statusCode').should('equal', 200) }) }) @@ -41,8 +57,7 @@ describe('Intercept', { tags: TAG.regression }, () => { cy.intercept('GET', '**/farm-pools?**').as('get-farm-list') cy.intercept('GET', '**/pools?**').as('get-pool-list') cy.intercept('GET', '**/block?**').as('get-block') - cy.get(HeaderLocators.dropdownEarn).click({ force: true }) - cy.get(HeaderLocators.lblFarms).click({ force: true }) + SwapPage.goToFarmPage() cy.get('[data-testid=farm-block]') .should(_ => {}) .then($list => { diff --git a/index.html b/index.html index 8a0ee5abac..ed49b2f07f 100644 --- a/index.html +++ b/index.html @@ -1,211 +1,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - KyberSwap - Trading Smart - - - - - - - -
- - - -
-
- -
-
Swap
-
Earn
-
- - - - - - - KyberAI -
+
+ +
+
Swap
+
Earn
+
+ + + + + + + KyberAI +
- beta -
+ "> + beta
- -
Campaigns
-
Analytics
-
About
-
Blog
+ +
Campaigns
+
Analytics
+
About
+
Blog
-
- DmmLogo - DmmLogo -
- - - + + - - - + + diff --git a/package.json b/package.json index 3e71b5286d..bb9bfc0cfd 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "start-dev": "vite --mode dev --host", "start-stg": "vite --mode stg --host", "start-prod": "vite --mode production --host", - "test-e2e": "synpress run -cf cypress.config.ts -c baseUrl=http://127.0.0.1:4173/", - "test-schedule": "synpress run -cf cypress.config.ts -c baseUrl=https://kyberswap.com/" + "test-e2e": "synpress run -cf cypress.config.ts", + "test-schedule": "synpress run -cf cypress.config.ts" }, "browserslist": [ "chrome >= 52", @@ -45,11 +45,12 @@ "dependencies": { "@0xsquid/sdk": "^1.4.1", "@apollo/client": "^3.7.1", - "@datadog/browser-rum": "^4.23.3", + "@blocto/web3-react-connector": "^1.0.0", + "@coinbase/wallet-sdk": "^3.0.4", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@kybernetwork/oauth2": "1.0.0", "@kyberswap/ks-sdk-classic": "^1.0.3", - "@kyberswap/ks-sdk-core": "1.0.9", + "@kyberswap/ks-sdk-core": "1.0.11", "@kyberswap/ks-sdk-elastic": "^1.1.2", "@kyberswap/ks-sdk-solana": "^1.0.2", "@lingui/loader": "~3.14.0", @@ -69,12 +70,12 @@ "@solana/wallet-adapter-wallets": "^0.19.5", "@solana/web3.js": "^1.66.2", "@use-gesture/react": "^10.2.27", - "@web3-react/coinbase-wallet": "^8.2.0", - "@web3-react/core": "^8.2.0", + "@web3-react/coinbase-wallet": "8.2.0", + "@web3-react/core": "8.2.0", + "@web3-react/gnosis-safe": "8.2.0", "@web3-react/metamask": "^8.2.1", - "@web3-react/types": "^8.2.0", + "@web3-react/types": "8.2.0", "@web3-react/walletconnect-v2": "^8.3.3", - "@web3-react/walletlink-connector": "^6.2.14", "aos": "^2.3.4", "axios": "1.2.1", "base64-js": "^1.5.1", @@ -120,9 +121,7 @@ "react-redux": "^7.2.9", "react-rnd": "10.4.1", "react-router-dom": "6.5.0", - "react-spring": "^9.6.1", "react-use": "^15.3.4", - "react-use-gesture": "^6.0.14", "react-virtualized-auto-sizer": "^1.0.7", "react-window": "^1.8.9", "react-window-infinite-loader": "^1.0.8", @@ -150,13 +149,12 @@ "@cypress/grep": "^3.1.5", "@lingui/cli": "~3.14.0", "@lingui/vite-plugin": "~3.16.1", - "@synthetixio/synpress": "^3.7.0", + "@synthetixio/synpress": "^3.7.2-beta.7", "@trivago/prettier-plugin-sort-imports": "^3.3.1", "@types/aos": "^3.0.4", "@types/big.js": "^6.0.0", "@types/crypto-js": "4.1.1", "@types/d3": "^7.1.0", - "@types/jest": "^25.2.1", "@types/mixpanel-browser": "^2.38.0", "@types/multicodec": "^1.0.0", "@types/node": "^13.13.52", @@ -180,6 +178,8 @@ "@typescript-eslint/eslint-plugin": "^5.58.0", "@typescript-eslint/parser": "^5.58.0", "@vitejs/plugin-react": "^3.1.0", + "@welldone-software/why-did-you-render": "^7.0.1", + "babel-plugin-lodash": "^3.3.4", "babel-plugin-macros": "^3.1.0", "env-cmd": "^10.1.0", "eslint": "^8.38.0", @@ -191,6 +191,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-unused-imports": "^2.0.0", "prettier": "^2.7.1", + "prom-client": "^14.2.0", "ts-node": "^10.9.1", "typescript": "4.8.4", "vite": "^4.3.9", @@ -199,7 +200,8 @@ "vite-tsconfig-paths": "^4.0.8" }, "resolutions": { - "@kyberswap/ks-sdk-core": "1.0.9", + "@kyberswap/ks-sdk-core": "1.0.11", + "babel-plugin-lodash/@babel/types": "~7.20.0", "react-error-overlay": "6.0.9", "@lingui/babel-plugin-extract-messages": "3.14.0", "@lingui/cli": "3.14.0", diff --git a/public/files/Kyber - Privacy Policy - 23 Aug 2023.pdf b/public/files/Kyber - Privacy Policy - 23 Aug 2023.pdf new file mode 100644 index 0000000000..055ba27c0b Binary files /dev/null and b/public/files/Kyber - Privacy Policy - 23 Aug 2023.pdf differ diff --git a/public/libs/cookie3.js b/public/libs/cookie3.js new file mode 100644 index 0000000000..f4e73d6596 --- /dev/null +++ b/public/libs/cookie3.js @@ -0,0 +1,3403 @@ +/*!! + * Matomo - free/libre analytics platform + * + * JavaScript tracking client + * + * @link https://piwik.org + * @source https://github.com/matomo-org/matomo/blob/master/js/piwik.js + * @license https://piwik.org/free-software/bsd/ BSD-3 Clause (also in js/LICENSE.txt) + * @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt BSD-3-Clause + */ 'object' != typeof _paq && (_paq = []), + 'object' != typeof window.Matomo && + (window.Matomo = window.Piwik = + (function () { + var _ = Math.round + function $(e) { + try { + return t(e) + } catch (t) { + return unescape(e) + } + } + function p(e) { + var t = typeof e + return 'undefined' != t + } + function M(e) { + return 'function' == typeof e + } + function C(e) { + return 'object' == typeof e + } + function Z(e) { + return 'string' == typeof e || e instanceof String + } + function x(e) { + return 'number' == typeof e || e instanceof Number + } + function ee(e) { + return p(e) && (x(e) || (Z(e) && e.length)) + } + function te(e) { + if (!e) return !0 + var t + for (t in e) if (Object.prototype.hasOwnProperty.call(e, t)) return !1 + return !0 + } + function D(e) { + var t = typeof console + 'undefined' != t && console && console.error && console.error(e) + } + function ne() { + var e, t, n, i, o + for (e = 0; e < arguments.length; e += 1) { + ;(o = null), + arguments[e] && arguments[e].slice && (o = arguments[e].slice()), + (i = arguments[e]), + (n = i.shift()) + var a, + r, + s = Z(n) && 0 < n.indexOf('::') + if (s) + (a = n.split('::')), + (r = a[0]), + (n = a[1]), + 'object' == typeof fe[r] && 'function' == typeof fe[r][n] ? fe[r][n].apply(fe[r], i) : o && L.push(o) + else + for (t = 0; t < k.length; t++) + if (Z(n)) { + r = k[t] + var d = 0 < n.indexOf('.') + if (d) + if (((a = n.split('.')), r && 'object' == typeof r[a[0]])) (r = r[a[0]]), (n = a[1]) + else if (o) { + L.push(o) + break + } + if (r[n]) r[n].apply(r, i) + else { + var l = + "The method '" + + n + + '\' was not found in "_paq" variable. Please have a look at the Matomo tracker documentation: https://developer.matomo.org/api-reference/tracking-javascript' + if ((D(l), !d)) throw new TypeError(l) + } + if ('addTracker' === n) break + if ('setTrackerUrl' === n || 'setSiteId' === n) break + } else n.apply(k[t], i) + } + } + function ie(e, t, n, i) { + return e.addEventListener + ? (e.addEventListener(t, n, i), !0) + : e.attachEvent + ? e.attachEvent('on' + t, n) + : void (e['on' + t] = n) + } + function oe(e) { + 'complete' === z.readyState + ? e() + : Te.addEventListener + ? Te.addEventListener('load', e, !1) + : Te.attachEvent && Te.attachEvent('onload', e) + } + function n(e) { + var t = !1 + if (((t = z.attachEvent ? 'complete' === z.readyState : 'loading' !== z.readyState), t)) return void e() + var n + z.addEventListener + ? ie(z, 'DOMContentLoaded', function n() { + z.removeEventListener('DOMContentLoaded', n, !1), t || ((t = !0), e()) + }) + : z.attachEvent && + (z.attachEvent('onreadystatechange', function n() { + 'complete' === z.readyState && (z.detachEvent('onreadystatechange', n), !t && ((t = !0), e())) + }), + z.documentElement.doScroll && + Te === Te.top && + (function n() { + if (!t) { + try { + z.documentElement.doScroll('left') + } catch (e) { + return void setTimeout(n, 0) + } + ;(t = !0), e() + } + })()), + ie( + Te, + 'load', + function () { + t || ((t = !0), e()) + }, + !1, + ) + } + function q(e, t, n) { + if (!e) return '' + var i, + o, + a, + r, + s = '' + for (i in Ce) + Object.prototype.hasOwnProperty.call(Ce, i) && + ((r = Ce[i] && 'function' == typeof Ce[i][e]), r && ((o = Ce[i][e]), (a = o(t || {}, n)), a && (s += a))) + return s + } + function re(e) { + var t + ;(ve = !0), q('unload'), (t = new Date()) + var n = t.getTimeAlias() + if ((3e3 < he - n && (he = n + 3e3), he)) + do t = new Date() + while (t.getTimeAlias() < he) + } + function se(e, t) { + var n = z.createElement('script') + ;(n.type = 'text/javascript'), + (n.src = e), + n.readyState + ? (n.onreadystatechange = function () { + var e = this.readyState + ;('loaded' === e || 'complete' === e) && ((n.onreadystatechange = null), t()) + }) + : (n.onload = t), + z.getElementsByTagName('head')[0].appendChild(n) + } + function o() { + var e = '' + try { + e = Te.top.document.referrer + } catch (t) { + if (Te.parent) + try { + e = Te.parent.document.referrer + } catch (t) { + e = '' + } + } + return '' === e && (e = z.referrer), e + } + function N(e) { + var t = /^([a-z]+):/, + n = t.exec(e) + return n ? n[1] : null + } + function s(e) { + var t = /^(?:(?:https?|ftp):)\/*(?:[^@]+@)?([^:/#]+)/, + n = t.exec(e) + return n ? n[1] : e + } + function d(e) { + return /^[0-9][0-9]*(\.[0-9]+)?$/.test(e) + } + function G(e, t) { + var n, + i = {} + for (n in e) e.hasOwnProperty(n) && t(e[n]) && (i[n] = e[n]) + return i + } + function Q(e) { + var t, + n = {} + for (t in e) + if (e.hasOwnProperty(t)) + if (d(e[t])) n[t] = _(e[t]) + else + throw new Error( + 'Parameter "' + t + '" provided value "' + e[t] + '" is not valid. Please provide a numeric value.', + ) + return n + } + function B(e) { + var t, + n = '' + for (t in e) e.hasOwnProperty(t) && (n += '&' + h(t) + '=' + h(e[t])) + return n + } + function l(e, t) { + return (e += ''), 0 === e.lastIndexOf(t, 0) + } + function de(e, t) { + return (e += ''), -1 !== e.indexOf(t, e.length - t.length) + } + function U(e, t) { + return (e += ''), -1 !== e.indexOf(t) + } + function A(e, t) { + return (e += ''), e.substr(0, e.length - t) + } + function le(e, t, n) { + ;(e += ''), n || (n = '') + var i = e.indexOf('#'), + o = e.length + ;-1 === i && (i = o) + var a = e.substr(0, i), + r = e.substr(i, o - i) + return -1 === a.indexOf('?') ? (a += '?') : !de(a, '?') && (a += '&'), a + h(t) + '=' + h(n) + r + } + function I(e, t) { + if (((e += ''), -1 === e.indexOf('?' + t + '=') && -1 === e.indexOf('&' + t + '='))) return e + var n = e.indexOf('?') + if (-1 === n) return e + var i = e.substr(n + 1), + o = e.substr(0, n) + if (i) { + var a = '', + r = i.indexOf('#') + ;-1 !== r && ((a = i.substr(r + 1)), (i = i.substr(0, r))) + var s, + d = i.split('&'), + l = d.length - 1 + for (l; 0 <= l; l--) (s = d[l].split('=')[0]), s === t && d.splice(l, 1) + var c = d.join('&') + c && (o = o + '?' + c), a && (o += '#' + a) + } + return o + } + function j(e, t) { + var n = '[\\?&#]' + t + '=([^&#]*)', + i = new RegExp(n), + o = i.exec(e) + return o ? $(o[1]) : '' + } + function e(e) { + return e && e + '' === e ? e.replace(/^\s+|\s+$/g, '') : e + } + function a(e) { + return unescape(h(e)) + } + function F(e) { + var t, + n, + i, + o, + r, + s, + d, + l, + c, + u, + m = function (e, t) { + return (e << t) | (e >>> (32 - t)) + }, + g = function (e) { + var t, + n, + i = '' + for (t = 7; 0 <= t; t--) (n = 15 & (e >>> (4 * t))), (i += n.toString(16)) + return i + }, + h = [], + p = 1732584193, + C = 4023233417, + T = 2562383102, + N = 271733878, + k = 3285377520, + b = [] + for (e = a(e), u = e.length, n = 0; n < u - 3; n += 4) + (i = + (e.charCodeAt(n) << 24) | (e.charCodeAt(n + 1) << 16) | (e.charCodeAt(n + 2) << 8) | e.charCodeAt(n + 3)), + b.push(i) + switch (3 & u) { + case 0: + n = 2147483648 + break + case 1: + n = 8388608 | (e.charCodeAt(u - 1) << 24) + break + case 2: + n = 32768 | ((e.charCodeAt(u - 2) << 24) | (e.charCodeAt(u - 1) << 16)) + break + case 3: + n = 128 | ((e.charCodeAt(u - 3) << 24) | (e.charCodeAt(u - 2) << 16) | (e.charCodeAt(u - 1) << 8)) + } + for (b.push(n); 14 != (15 & b.length); ) b.push(0) + for (b.push(u >>> 29), b.push(4294967295 & (u << 3)), t = 0; t < b.length; t += 16) { + for (n = 0; 16 > n; n++) h[n] = b[t + n] + for (n = 16; 79 >= n; n++) h[n] = m(h[n - 3] ^ h[n - 8] ^ h[n - 14] ^ h[n - 16], 1) + for (o = p, r = C, s = T, d = N, l = k, n = 0; 19 >= n; n++) + (c = 4294967295 & (m(o, 5) + ((r & s) | (~r & d)) + l + h[n] + 1518500249)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 20; 39 >= n; n++) + (c = 4294967295 & (m(o, 5) + (r ^ s ^ d) + l + h[n] + 1859775393)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 40; 59 >= n; n++) + (c = 4294967295 & (m(o, 5) + ((r & s) | (r & d) | (s & d)) + l + h[n] + 2400959708)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + for (n = 60; 79 >= n; n++) + (c = 4294967295 & (m(o, 5) + (r ^ s ^ d) + l + h[n] + 3395469782)), + (l = d), + (d = s), + (s = m(r, 30)), + (r = o), + (o = c) + ;(p = 4294967295 & (p + o)), + (C = 4294967295 & (C + r)), + (T = 4294967295 & (T + s)), + (N = 4294967295 & (N + d)), + (k = 4294967295 & (k + l)) + } + return (c = g(p) + g(C) + g(T) + g(N) + g(k)), c.toLowerCase() + } + function ue(e, t, n) { + return ( + e || (e = ''), + t || (t = ''), + 'translate.googleusercontent.com' === e + ? ('' === n && (n = t), (t = j(t, 'u')), (e = s(t))) + : ('cc.bingj.com' === e || 'webcache.googleusercontent.com' === e || '74.6.' === e.slice(0, 5)) && + ((t = z.links[0].href), (e = s(t))), + [e, t, n] + ) + } + function ae(e) { + var t = e.length + return ( + '.' === e.charAt(--t) && (e = e.slice(0, t)), + '*.' === e.slice(0, 2) && (e = e.slice(1)), + -1 !== e.indexOf('/') && (e = e.substr(0, e.indexOf('/'))), + e + ) + } + function O(e) { + if (((e = e && e.text ? e.text : e), !Z(e))) { + var t = z.getElementsByTagName('title') + t && p(t[0]) && (e = t[0].text) + } + return e + } + function ce(e) { + return e ? (!p(e.children) && p(e.childNodes) ? e.children : p(e.children) ? e.children : []) : [] + } + function S(e, t) { + return ( + !!(e && t) && + (e.contains + ? e.contains(t) + : e === t || (!!e.compareDocumentPosition && !!(16 & e.compareDocumentPosition(t)))) + ) + } + function Y(e, t) { + if (e && e.indexOf) return e.indexOf(t) + if (!p(e) || null === e) return -1 + if (!e.length) return -1 + var n = e.length + if (0 === n) return -1 + for (var i = 0; i < n; ) { + if (e[i] === t) return i + i++ + } + return -1 + } + function P(e) { + function t(e, t) { + return Te.getComputedStyle + ? z.defaultView.getComputedStyle(e, null)[t] + : e.currentStyle + ? e.currentStyle[t] + : void 0 + } + function n(e) { + for (e = e.parentNode; e; ) { + if (e === z) return !0 + e = e.parentNode + } + return !1 + } + function i(o, a, r, s, d, l, c) { + var u = o.parentNode, + m = 1 + return ( + !!n(o) && + (9 === u.nodeType || + ('0' !== t(o, 'opacity') && + 'none' !== t(o, 'display') && + 'hidden' !== t(o, 'visibility') && + ((p(a) && p(r) && p(s) && p(d) && p(l) && p(c)) || + ((a = o.offsetTop), + (d = o.offsetLeft), + (s = a + o.offsetHeight), + (r = d + o.offsetWidth), + (l = o.offsetWidth), + (c = o.offsetHeight)), + (e !== o || (0 !== c && 0 !== l) || 'hidden' !== t(o, 'overflow')) && + (!u || + (!( + ('hidden' === t(u, 'overflow') || 'scroll' === t(u, 'overflow')) && + (d + 1 > u.offsetWidth + u.scrollLeft || + d + l - 1 < u.scrollLeft || + a + 1 > u.offsetHeight + u.scrollTop || + a + c - 1 < u.scrollTop) + ) && + (o.offsetParent === u && ((d += u.offsetLeft), (a += u.offsetTop)), i(u, a, r, s, d, l, c))))))) + ) + } + return !!e && i(e) + } + function i(e, t) { + if (t) return t + if (((e = Ae.toAbsoluteUrl(e)), U(e, '?'))) { + var n = e.indexOf('?') + e = e.slice(0, n) + } + if (de(e, 'matomo.php')) e = A(e, 10) + else if (de(e, 'piwik.php')) e = A(e, 9) + else if (de(e, '.php')) { + var i = e.lastIndexOf('/'), + o = 1 + e = e.slice(0, i + o) + } + return de(e, '/js/') && (e = A(e, 3)), e + } + function me(e) { + var t = 'Matomo_Overlay', + n = + /index\.php\?module=Overlay&action=startOverlaySession&idSite=([0-9]+)&period=([^&]+)&date=([^&]+)(&segment=[^&]*)?/, + i = n.exec(z.referrer) + if (i) { + var o = i[1] + if (o !== e + '') return !1 + var a = i[2], + r = i[3], + s = i[4] + s ? 0 === s.indexOf('&segment=') && (s = s.substr(9)) : (s = ''), + (Te.name = 'Matomo_Overlay###' + a + '###' + r + '###' + s) + } + var d = Te.name.split('###') + return 4 === d.length && 'Matomo_Overlay' === d[0] + } + function R(e, t, n) { + var o = Te.name.split('###'), + a = o[1], + r = o[2], + s = o[3], + d = i(e, t) + se(d + 'plugins/Overlay/client/client.js?v=1', function () { + Matomo_Overlay_Client.initialize(d, n, a, r, s) + }) + } + function ge() { + var e + try { + e = Te.frameElement + } catch (e) { + return !0 + } + if (p(e)) return !!(e && 'iframe' === (e.nodeName + '').toLowerCase()) + try { + return Te.self !== Te.top + } catch (e) { + return !0 + } + } + function v(a, r) { + var d = Math.floor + function c(e) { + if (Zn && 'mtm_consent_removed' !== e) return 0 + var n = new RegExp('(^|;)[ ]*' + e + '=([^;]*)'), + i = n.exec(z.cookie) + return i ? t(i[2]) : 0 + } + function u(e, t, n, i, o, a, r) { + if (!(Zn && 'mtm_consent_removed' !== e)) { + var s + if ( + (n && ((s = new Date()), s.setTime(s.getTime() + n)), + r || (r = 'Lax'), + (z.cookie = + e + + '=' + + h(t) + + (n ? ';expires=' + s.toGMTString() : '') + + ';path=' + + (i || '/') + + (o ? ';domain=' + o : '') + + (a ? ';secure' : '') + + ';SameSite=' + + r), + (!n || 0 <= n) && c(e) !== t + '') + ) { + var d = 'There was an error setting cookie `' + e + '`. Please check domain and path.' + D(d) + } + } + } + function m(e) { + var t, n + for (e = I(e, 'pk_vid'), e = I(e, 'ignore_referrer'), e = I(e, 'ignore_referer'), n = 0; n < Mn.length; n++) + e = I(e, Mn[n]) + return en ? ((t = /#.*/), e.replace(t, '')) : e + } + function T(e, t) { + var n, + i = N(t) + return i + ? t + : '/' === t.slice(0, 1) + ? N(e) + '://' + s(e) + t + : ((e = m(e)), + (n = e.indexOf('?')), + 0 <= n && (e = e.slice(0, n)), + (n = e.lastIndexOf('/')), + n !== e.length - 1 && (e = e.slice(0, n + 1)), + e + t) + } + function b(e, t) { + var n + if (((e = (e + '').toLowerCase()), (t = (t + '').toLowerCase()), e === t)) return !0 + if ('.' === t.slice(0, 1)) { + if (e === t.slice(1)) return !0 + if (((n = e.length - t.length), 0 < n && e.slice(n) === t)) return !0 + } + return !1 + } + function A(e) { + var t = document.createElement('a') + return ( + 0 !== e.indexOf('//') && + 0 !== e.indexOf('http') && + (0 === e.indexOf('*') && (e = e.substr(1)), + 0 === e.indexOf('.') && (e = e.substr(1)), + (e = 'http://' + e)), + (t.href = Ae.toAbsoluteUrl(e)), + t.pathname ? t.pathname : '' + ) + } + function E(e, t) { + l(t, '/') || (t = '/' + t), l(e, '/') || (e = '/' + e) + var n = '/' === t || '/*' === t + return ( + !!n || + e === t || + (((t = (t + '').toLowerCase()), (e = (e + '').toLowerCase()), de(t, '*')) + ? ((t = t.slice(0, -1)), (n = !t || '/' === t), !!n || e === t || 0 === e.indexOf(t)) + : (de(e, '/') || (e += '/'), de(t, '/') || (t += '/'), 0 === e.indexOf(t))) + ) + } + function y(e, t) { + var n, i, o, a, r + for (n = 0; n < Vn.length; n++) if (((a = ae(Vn[n])), (r = A(Vn[n])), b(e, a) && E(t, r))) return !0 + return !1 + } + function w(e) { + var t, n, i + for (t = 0; t < Vn.length; t++) { + if (((n = ae(Vn[t].toLowerCase())), e === n)) return !0 + if ('.' === n.slice(0, 1)) { + if (e === n.slice(1)) return !0 + if (((i = e.length - n.length), 0 < i && e.slice(i) === n)) return !0 + } + } + return !1 + } + function L(e) { + var t, n, i, o, a + if (!e.length || !Un.length) return !1 + for (n = s(e), i = A(e), 0 === n.indexOf('www.') && (n = n.substr(4)), t = 0; t < Un.length; t++) + if (((o = ae(Un[t])), (a = A(Un[t])), 0 === o.indexOf('www.') && (o = o.substr(4)), b(n, o) && E(i, a))) + return !0 + return !1 + } + function x(e, t) { + e = e.replace('send_image=0', 'send_image=1') + var n = new Image(1, 1) + ;(n.onload = function () { + ;(pe = 0), 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !0 }) + }), + (n.onerror = function () { + 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1 }) + }), + (n.src = wn + (0 > wn.indexOf('?') ? '?' : '&') + e) + } + function P(e) { + return 'POST' === An || (e && (2e3 < e.length || 0 === e.indexOf('{"requests"'))) + } + function V() { + return 'object' == typeof J && 'function' == typeof J.sendBeacon && 'function' == typeof Blob + } + function U(e, t, n) { + var i = V() + if (!i) return !1 + var o = { type: 'application/x-www-form-urlencoded; charset=UTF-8' }, + a = !1, + r = wn + try { + var s = new Blob([e], o) + n && !P(e) && ((s = new Blob([], o)), (r = r + (0 > r.indexOf('?') ? '?' : '&') + e)), + (a = J.sendBeacon(r, s)) + } catch (e) { + return !1 + } + return a && 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !0, isSendBeacon: !0 }), a + } + function H(e, t, n) { + ;(p(n) && null !== n) || (n = !0), + (ve && U(e, t, n)) || + setTimeout(function () { + if (!(ve && U(e, t, n))) { + var i + try { + var o = Te.XMLHttpRequest + ? new Te.XMLHttpRequest() + : Te.ActiveXObject + ? new ActiveXObject('Microsoft.XMLHTTP') + : null + o.open('POST', wn, !0), + (o.onreadystatechange = function () { + if (4 === this.readyState && !(200 <= this.status && 300 > this.status)) { + var i = ve && U(e, t, n) + !i && n + ? x(e, t) + : 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1, xhr: this }) + } else + 4 === this.readyState && + 'function' == typeof t && + t({ request: e, trackerUrl: wn, success: !0, xhr: this }) + }), + o.setRequestHeader('Content-Type', yn), + (o.withCredentials = !0), + o.send(e) + } catch (o) { + ;(i = ve && U(e, t, n)), + !i && n ? x(e, t) : 'function' == typeof t && t({ request: e, trackerUrl: wn, success: !1 }) + } + } + }, 50) + } + function X(e) { + var t = new Date(), + n = t.getTime() + e + ;(!he || n > he) && (he = n) + } + function K() { + ;(Ai = !0), (Ei = new Date().getTime()) + } + function ne() { + var e = new Date().getTime() + return !Ei || e - Ei > Kt + } + function re() { + ne() && $t() + } + function se() { + 'hidden' === z.visibilityState && ne() + ? $t() + : 'visible' === z.visibilityState && (Ei = new Date().getTime()) + } + function Ee() { + _i || + !Kt || + ((_i = !0), + ie(Te, 'focus', K), + ie(Te, 'blur', re), + ie(Te, 'visibilitychange', se), + ke++, + fe.addPlugin('HeartBeat' + ke, { + unload: function () { + _i && ne() && $t() + }, + })) + } + function ye(e) { + var t = new Date(), + n = t.getTime() + if (((yi = n), Ni && n < Ni)) { + var i = Ni - n + return setTimeout(e, i), X(i + 50), void (Ni += 50) + } + if (!1 === Ni) { + var o = 800 + Ni = n + 800 + } + e() + } + function we() { + c('mtm_consent_removed') ? (Ii = !1) : c('mtm_consent') && (Ii = !0) + } + function Se(e) { + if (!hi) return e + var t, + n = '&uadata=' + h(Te.JSON.stringify(hi)) + if (e instanceof Array) for (t = 0; t < e.length; t++) e[t] += n + else e += n + return e + } + function Oe(e) { + return qi && p(J.userAgentData) && M(J.userAgentData.getHighEntropyValues) + ? void ((hi = { brands: J.userAgentData.brands, platform: J.userAgentData.platform }), + J.userAgentData + .getHighEntropyValues([ + 'brands', + 'model', + 'platform', + 'platformVersion', + 'uaFullVersion', + 'fullVersionList', + ]) + .then( + function (t) { + var n + t.fullVersionList && (delete t.brands, delete t.uaFullVersion), (hi = t), e() + }, + function (t) { + e() + }, + )) + : void e() + } + function Le(e, t, n) { + return fi + ? (we(), + Ii + ? void ((Vi = !0), + !an && + e && + (xi && Ii && (e += '&consent=1'), + (e = Se(e)), + ye(function () { + return jn && U(e, n, !0) ? void X(100) : void (P(e) ? H(e, n) : x(e, n), X(t)) + })), + !_i && Ee()) + : void Pi.push(e)) + : void pi.push(e) + } + function xe(e) { + return !an && e && e.length + } + function Ie(e, t) { + if (!t || t >= e.length) return [e] + var n = 0, + i = e.length, + o = [] + for (n; n < i; n += t) o.push(e.slice(n, n + t)) + return o + } + function Pe(e, t) { + return xe(e) + ? fi + ? Ii + ? void ((Vi = !0), + ye(function () { + var n, + i = Ie(e, 50), + o = 0 + for (o; o < i.length; o++) + (n = '{"requests":["?' + Se(i[o]).join('","?') + '"],"send_image":0}'), + jn && U(n, null, !1) ? X(100) : H(n, null, !1) + X(t) + })) + : void Pi.push(e) + : void pi.push(e) + : void 0 + } + function Re(e) { + return zn + e + '.' + xn + '.' + mn + } + function De(e, t, n) { + u(e, '', -1296e5, t, n) + } + function Ve() { + if (Zn) return '0' + if (!p(Te.showModalDialog) && p(J.cookieEnabled)) return J.cookieEnabled ? '1' : '0' + var e = zn + 'testcookie' + u(e, '1', void 0, on, nn, Xn, Qn) + var t = '1' === c(e) ? '1' : '0' + return De(e), t + } + function ce() { + mn = wi((nn || Nn) + (on || '/')).slice(0, 4) + } + function qe() { + if ( + (Oe(function () { + var e, t + for (fi = !0, e = 0; e < pi.length; e++) + (t = typeof pi[e]), 'string' === t ? Le(pi[e], Gn) : 'object' == t && Pe(pi[e], Gn) + pi = [] + }), + !qi) + ) + return {} + if (p(gi.res)) return gi + var e, + t, + n = { + pdf: 'application/pdf', + qt: 'video/quicktime', + realp: 'audio/x-pn-realaudio-plugin', + wma: 'application/x-mplayer2', + fla: 'application/x-shockwave-flash', + java: 'application/x-java-vm', + ag: 'application/x-silverlight', + } + if (!/MSIE/.test(J.userAgent)) { + if (J.mimeTypes && J.mimeTypes.length) + for (e in n) + Object.prototype.hasOwnProperty.call(n, e) && + ((t = J.mimeTypes[n[e]]), (gi[e] = t && t.enabledPlugin ? '1' : '0')) + !/Edge[ /](\d+[\.\d]+)/.test(J.userAgent) && + 'unknown' != typeof navigator.javaEnabled && + p(J.javaEnabled) && + J.javaEnabled() && + (gi.java = '1'), + (gi.cookie = !p(Te.showModalDialog) && p(J.cookieEnabled) ? (J.cookieEnabled ? '1' : '0') : Ve()) + } + var i = parseInt(g.width, 10), + o = parseInt(g.height, 10) + return (gi.res = parseInt(i, 10) + 'x' + parseInt(o, 10)), gi + } + function Ue() { + var e = Re('cvar'), + t = c(e) + return t && t.length && ((t = Te.JSON.parse(t)), C(t)) ? t : {} + } + function Me() { + !1 === ai && (ai = Ue()) + } + function We() { + var e = qe() + return wi( + (J.userAgent || '') + (J.platform || '') + Te.JSON.stringify(e) + new Date().getTime() + Math.random(), + ).slice(0, 16) + } + function Fe() { + var e = qe() + return wi((J.userAgent || '') + (J.platform || '') + Te.JSON.stringify(e)).slice(0, 6) + } + function Ge() { + return d(new Date().getTime() / 1e3) + } + function je() { + var e = Ge(), + t = Fe(), + n = e + '' + t + return n + } + function He(e) { + e += '' + var t = Fe(), + n = t.length, + i = e.substr(-1 * n, n), + o = parseInt(e.substr(0, e.length - n), 10) + if (o && i && i === t) { + var a = Ge() + if (0 >= Yn) return !0 + if (a >= o && a <= o + Yn) return !0 + } + return !1 + } + function Be(e) { + if (!vi) return '' + var t = j(e, 'pk_vid') + if (!t) return '' + t += '' + var n = /^[a-zA-Z0-9]+$/ + if (32 === t.length && n.test(t)) { + var i = t.substr(16, 32) + if (He(i)) { + var o = t.substr(0, 16) + return o + } + } + return '' + } + function ze() { + Pn || (Pn = Be(kn)) + var e, + t, + n = new Date(), + i = _(n.getTime() / 1e3), + o = Re('id'), + a = c(o) + return a + ? ((e = a.split('.')), e.unshift('0'), Pn.length && (e[1] = Pn), e) + : ((t = Pn.length ? Pn : '0' === Ve() ? '' : We()), (e = ['1', t, i]), e) + } + function Je() { + var e = ze(), + t = e[0], + n = e[1], + i = e[2] + return { newVisitor: t, uuid: n, createTs: i } + } + function Ye() { + var e = new Date(), + t = e.getTime(), + n = Je().createTs, + i = parseInt(n, 10), + o = 1e3 * i + Kn - t + return o + } + function Xe(e) { + if (xn) { + var t = new Date(), + n = _(t.getTime() / 1e3) + p(e) || (e = Je()) + var i = e.uuid + '.' + e.createTs + '.' + u(Re('id'), i, Ye(), on, nn, Xn, Qn) + } + } + function Qe() { + var e = c(Re('ref')) + if (e.length) + try { + if (((e = Te.JSON.parse(e)), C(e))) return e + } catch (e) {} + return ['', '', 0, ''] + } + function Ze(e) { + var t = zn + 'testcookie_domain', + n = 'testvalue' + return u(t, n, 1e4, null, e, Xn, Qn), c(t) === n && (De(t, null, e), !0) + } + function Ke() { + var e = Zn + Zn = !1 + var t, n + for (t = 0; t < Li.length; t++) + (n = Re(Li[t])), 'mtm_consent_removed' !== n && 'mtm_consent' !== n && 0 !== c(n) && De(n, on, nn) + Zn = e + } + function $e(e) { + xn = e + } + function et(e) { + if (e && C(e)) { + var t, + n = [] + for (t in e) Object.prototype.hasOwnProperty.call(e, t) && n.push(t) + var i = {} + n.sort() + var o, + a = n.length + for (o = 0; o < a; o++) i[n[o]] = e[n[o]] + return i + } + } + function tt() { + u(Re('ses'), '1', $n, on, nn, Xn, Qn) + } + function nt() { + var e, + t = '', + n = 'abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ', + i = n.length + for (e = 0; 6 > e; e++) t += n.charAt(d(Math.random() * i)) + return t + } + function it(e) { + if ('' !== Ln) return (e += Ln), (ii = !0), e + if (!W) return e + var t = 'object' == typeof W.timing && W.timing ? W.timing : void 0 + if ( + (t || + (t = + 'function' == typeof W.getEntriesByType && W.getEntriesByType('navigation') + ? W.getEntriesByType('navigation')[0] + : void 0), + !t) + ) + return e + var n = '' + if (t.connectEnd && t.fetchStart) { + if (t.connectEnd < t.fetchStart) return e + n += '&pf_net=' + _(t.connectEnd - t.fetchStart) + } + if (t.responseStart && t.requestStart) { + if (t.responseStart < t.requestStart) return e + n += '&pf_srv=' + _(t.responseStart - t.requestStart) + } + if (t.responseStart && t.responseEnd) { + if (t.responseEnd < t.responseStart) return e + n += '&pf_tfr=' + _(t.responseEnd - t.responseStart) + } + if (p(t.domLoading)) { + if (t.domInteractive && t.domLoading) { + if (t.domInteractive < t.domLoading) return e + n += '&pf_dm1=' + _(t.domInteractive - t.domLoading) + } + } else if (t.domInteractive && t.responseEnd) { + if (t.domInteractive < t.responseEnd) return e + n += '&pf_dm1=' + _(t.domInteractive - t.responseEnd) + } + if (t.domComplete && t.domInteractive) { + if (t.domComplete < t.domInteractive) return e + n += '&pf_dm2=' + _(t.domComplete - t.domInteractive) + } + if (t.loadEventEnd && t.loadEventStart) { + if (t.loadEventEnd < t.loadEventStart) return e + n += '&pf_onl=' + _(t.loadEventEnd - t.loadEventStart) + } + return e + n + } + function ot(e) { + return '1' === j(e, 'ignore_referrer') || '1' === j(e, 'ignore_referer') + } + function rt() { + var e, + t, + n, + i, + o, + a, + r, + d = new Date(), + l = _(d.getTime() / 1e3), + g = 1024, + p = Re('ses'), + C = Re('ref'), + T = c(p), + N = Qe(), + k = Qt || kn, + b = {} + if (((a = N[0]), (r = N[1]), (t = N[2]), (n = N[3]), !ot(k) && !T)) { + if (!sn || !a.length) { + for (e in Hn) if (Object.prototype.hasOwnProperty.call(Hn, e) && ((a = j(k, Hn[e])), a.length)) break + for (e in Bn) if (Object.prototype.hasOwnProperty.call(Bn, e) && ((r = j(k, Bn[e])), r.length)) break + } + ;(i = s(bn)), + (o = n.length ? s(n) : ''), + !i.length || w(i) || L(bn) || (sn && o.length && !w(o) && !L(n)) || (n = bn), + (n.length || a.length) && + ((t = l), (N = [a, r, t, m(n.slice(0, 1024))]), u(C, Te.JSON.stringify(N), ei, on, nn, Xn, Qn)) + } + return ( + a.length && (b._rcn = h(a)), + r.length && (b._rck = h(r)), + (b._refts = t), + (n + '').length && (b._ref = h(m(n.slice(0, 1024)))), + b + ) + } + function st(e, t, n) { + function i(e, t) { + var n = Te.JSON.stringify(e) + return 2 < n.length ? '&' + t + '=' + h(n) : '' + } + var o, + a = new Date(), + r = ai, + s = Re('cvar'), + d = Qt || kn, + l = ot(d) + if ((Zn && Ke(), an)) return '' + var c = Je(), + g = z.characterSet || z.charset + ;(g && 'utf-8' !== g.toLowerCase()) || (g = null), + (e += + '&idsite=' + + xn + + '&rec=1&r=' + + (Math.random() + '').slice(2, 8) + + '&h=' + + a.getHours() + + '&m=' + + a.getMinutes() + + '&s=' + + a.getSeconds() + + '&url=' + + h(m(d)) + + (!bn.length || L(bn) || l ? '' : '&urlref=' + h(m(bn))) + + (ee(In) ? '&uid=' + h(In) : '') + + '&_id=' + + c.uuid + + '&_idn=' + + c.newVisitor + + (g ? '&cs=' + h(g) : '') + + '&send_image=0') + var p = rt() + for (o in p) Object.prototype.hasOwnProperty.call(p, o) && (e += '&' + o + '=' + p[o]) + var C = qe() + for (o in C) Object.prototype.hasOwnProperty.call(C, o) && (e += '&' + o + '=' + C[o]) + var T = [] + if (t) + for (o in t) + if (Object.prototype.hasOwnProperty.call(t, o) && /^dimension\d+$/.test(o)) { + var N = o.replace('dimension', '') + T.push(parseInt(N, 10)), T.push(N + ''), (e += '&' + o + '=' + h(t[o])), delete t[o] + } + for (o in (t && te(t) && (t = null), ui)) + Object.prototype.hasOwnProperty.call(ui, o) && (e += '&' + o + '=' + h(ui[o])) + for (o in li) + if (Object.prototype.hasOwnProperty.call(li, o)) { + var k = -1 === Y(T, o) + k && (e += '&dimension' + o + '=' + h(li[o])) + } + t ? (e += '&data=' + h(Te.JSON.stringify(t))) : tn && (e += '&data=' + h(Te.JSON.stringify(tn))) + var b = et(ri), + v = et(si) + if (((e += i(b, 'cvar')), (e += i(v, 'e_cvar')), ai)) { + for (o in ((e += i(ai, '_cvar')), r)) + Object.prototype.hasOwnProperty.call(r, o) && ('' === ai[o][0] || '' === ai[o][1]) && delete ai[o] + oi && u(s, Te.JSON.stringify(ai), $n, on, nn, Xn, Qn) + } + return ( + ti && ni && !ii && ((e = it(e)), (ii = !0)), + gn && (e += '&pv_id=' + gn), + Xe(c), + tt(), + (e += q(n, { tracker: hn, request: e })), + On.length && (e += '&' + On), + M(ln) && (e = ln(e)), + e + ) + } + function lt(e, t, n, i, o, a) { + var r, + s = 'idgoal=0', + d = new Date(), + l = [], + c = (e + '').length + if ( + (c && (s += '&ec_id=' + h(e)), + (s += '&revenue=' + t), + (n + '').length && (s += '&ec_st=' + n), + (i + '').length && (s += '&ec_tx=' + i), + (o + '').length && (s += '&ec_sh=' + o), + (a + '').length && (s += '&ec_dt=' + a), + mi) + ) { + for (r in mi) + Object.prototype.hasOwnProperty.call(mi, r) && + (p(mi[r][1]) || (mi[r][1] = ''), + p(mi[r][2]) || (mi[r][2] = ''), + (p(mi[r][3]) && 0 !== (mi[r][3] + '').length) || (mi[r][3] = 0), + (p(mi[r][4]) && 0 !== (mi[r][4] + '').length) || (mi[r][4] = 1), + l.push(mi[r])) + s += '&ec_items=' + h(Te.JSON.stringify(l)) + } + ;(s = st(s, tn, 'ecommerce')), Le(s, Gn), c && (mi = {}) + } + function ut(e, t, n, i, o, a) { + ;(e + '').length && p(t) && lt(e, t, n, i, o, a) + } + function mt(e) { + p(e) && lt('', e, '', '', '', '') + } + function gt(e, t, n) { + Si || (gn = nt()) + var i = st('action_name=' + h(O(e || Rn)), t, 'log') + ti && !ii && (i = it(i)), Le(i, Gn, n) + } + function ht(e, t) { + var n, + i = '(^| )(piwik[_-]' + t + '|matomo[_-]' + t + if (e) for (n = 0; n < e.length; n++) i += '|' + e[n] + return (i += ')( |$)'), new RegExp(i) + } + function pt(e) { + return wn && e && 0 === (e + '').indexOf(wn) + } + function ft(e, t, n, i) { + if (pt(t)) return 0 + var o = ht(Wn, 'download'), + a = ht(Fn, 'link'), + r = new RegExp('\\.(' + Dn.join('|') + ')([?&#]|$)', 'i') + return a.test(e) ? 'link' : i || o.test(e) || r.test(t) ? 'download' : n ? 0 : 'link' + } + function Ct(e) { + var t + for (t = e.parentNode; null !== t && p(t) && !_e.isLinkElement(e); ) (e = t), (t = e.parentNode) + return e + } + function Tt(e) { + if (((e = Ct(e)), !!_e.hasNodeAttribute(e, 'href')) && p(e.href)) { + var t = _e.getAttributeValueFromNode(e, 'href'), + n = e.pathname || A(e.href), + i = e.hostname || s(e.href), + o = i.toLowerCase(), + a = e.href.replace(i, o), + r = /^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):/i + if (!r.test(a)) { + var d = ft(e.className, a, y(o, n), _e.hasNodeAttribute(e, 'download')) + if (d) return { type: d, href: a } + } + } + } + function Nt(e, t, n, i) { + var o = Ae.buildInteractionRequestParams(e, t, n, i) + return o ? st(o, null, 'contentInteraction') : void 0 + } + function kt(e, t) { + if (!e || !t) return !1 + var n = Ae.findTargetNode(e) + return !Ae.shouldIgnoreInteraction(n) && ((n = Ae.findTargetNodeNoDefault(e)), !n || S(n, t)) + } + function vt(e, t, n) { + if (e) { + var i = Ae.findParentContentNode(e) + if (i && kt(i, e)) { + var o = Ae.buildContentBlock(i) + if (o) + return ( + !o.target && n && (o.target = n), Ae.buildInteractionRequestParams(t, o.name, o.piece, o.target) + ) + } + } + } + function _t(e) { + if (!Ci || !Ci.length) return !1 + var t, n + for (t = 0; t < Ci.length; t++) + if (((n = Ci[t]), n && n.name === e.name && n.piece === e.piece && n.target === e.target)) return !0 + return !1 + } + function At(e) { + return function (t) { + if (e) { + var n, + i = Ae.findParentContentNode(e) + if ((t && (n = t.target || t.srcElement), n || (n = e), !!kt(i, n))) { + if (!i) return !1 + var o = Ae.findTargetNode(i) + if (!o || Ae.shouldIgnoreInteraction(o)) return !1 + var a = Tt(o) + return bi && a && a.type ? a.type : hn.trackContentInteractionNode(n, 'click') + } + } + } + } + function Et(e) { + if (e && e.length) { + var t, n + for (t = 0; t < e.length; t++) + (n = Ae.findTargetNode(e[t])), + n && + !n.contentInteractionTrackingSetupDone && + ((n.contentInteractionTrackingSetupDone = !0), ie(n, 'click', At(n))) + } + } + function yt(e, t) { + if (!e || !e.length) return [] + var n, i + for (n = 0; n < e.length; n++) _t(e[n]) ? (e.splice(n, 1), n--) : Ci.push(e[n]) + if (!e || !e.length) return [] + Et(t) + var o = [] + for (n = 0; n < e.length; n++) + (i = st( + Ae.buildImpressionRequestParams(e[n].name, e[n].piece, e[n].target), + void 0, + 'contentImpressions', + )), + i && o.push(i) + return o + } + function wt(e) { + var t = Ae.collectContent(e) + return yt(t, e) + } + function St(e) { + if (!e || !e.length) return [] + var t + for (t = 0; t < e.length; t++) Ae.isNodeVisible(e[t]) || (e.splice(t, 1), t--) + return e && e.length ? wt(e) : [] + } + function Ot(e, t, n) { + var i = Ae.buildImpressionRequestParams(e, t, n) + return st(i, null, 'contentImpression') + } + function Lt(e, t) { + if (e) { + var n = Ae.findParentContentNode(e), + i = Ae.buildContentBlock(n) + if (i) return t || (t = 'Unknown'), Nt(t, i.name, i.piece, i.target) + } + } + function xt(e, t, n, i) { + return ( + 'e_c=' + h(e) + '&e_a=' + h(t) + (p(n) ? '&e_n=' + h(n) : '') + (p(i) ? '&e_v=' + h(i) : '') + '&ca=1' + ) + } + function It(e, t, n, i, o, a) { + if (!ee(e) || !ee(t)) + return ( + D( + 'Error while logging event: Parameters `category` and `action` must not be empty or filled with whitespaces', + ), + !1 + ) + var r = st(xt(e, t, n, i), o, 'event') + Le(r, Gn, a) + } + function Pt(e, t, n, i) { + var o = st( + 'search=' + h(e) + (t ? '&search_cat=' + h(t) : '') + (p(n) ? '&search_count=' + n : ''), + i, + 'sitesearch', + ) + Le(o, Gn) + } + function Rt(e, t, n, i) { + var o = st('idgoal=' + e + (t ? '&revenue=' + t : ''), n, 'goal') + Le(o, Gn, i) + } + function Dt(e, t, n, i, o) { + var a = t + '=' + h(m(e)), + r = vt(o, 'click', e) + r && (a += '&' + r) + var s = st(a, n, 'link') + Le(s, Gn, i) + } + function Vt(e, t) { + return '' === e ? t : e + t.charAt(0).toUpperCase() + t.slice(1) + } + function qt(e) { + var t, + n, + i, + o = ['', 'webkit', 'ms', 'moz'] + if (!rn) + for (n = 0; n < o.length; n++) + if (((i = o[n]), Object.prototype.hasOwnProperty.call(z, Vt(i, 'hidden')))) { + 'prerender' === z[Vt(i, 'visibilityState')] && (t = !0) + break + } + return t + ? void ie(z, i + 'visibilitychange', function t() { + z.removeEventListener(i + 'visibilitychange', t, !1), e() + }) + : void e() + } + function Ut() { + var e = hn.getVisitorId(), + t = je() + return e + t + } + function Mt(e) { + if (e && _e.hasNodeAttribute(e, 'href')) { + var t = _e.getAttributeValueFromNode(e, 'href') + if (t && !pt(t) && hn.getVisitorId()) { + t = I(t, 'pk_vid') + var n = Ut() + ;(t = le(t, 'pk_vid', n)), _e.setAnyAttribute(e, 'href', t) + } + } + } + function Wt(e) { + var t = _e.getAttributeValueFromNode(e, 'href') + if (!t) return !1 + t += '' + var n = 0 === t.indexOf('//') || 0 === t.indexOf('http://') || 0 === t.indexOf('https://') + if (!n) return !1 + var i = e.pathname || A(e.href), + o = (e.hostname || s(e.href)).toLowerCase() + return !!y(o, i) && !b(Nn, ae(o)) + } + function Ft(e) { + var t = Tt(e) + return t && t.type + ? ((t.href = $(t.href)), void Dt(t.href, t.type, void 0, null, e)) + : void (vi && ((e = Ct(e)), Wt(e) && Mt(e))) + } + function Gt() { + return z.all && !z.addEventListener + } + function jt(e) { + var t = e.which, + n = typeof e.button + return ( + t || + 'undefined' === n || + (Gt() + ? 1 & e.button + ? (t = 1) + : 2 & e.button + ? (t = 3) + : 4 & e.button && (t = 2) + : 0 === e.button || '0' === e.button + ? (t = 1) + : 1 & e.button + ? (t = 2) + : 2 & e.button && (t = 3)), + t + ) + } + function Ht(e) { + switch (jt(e)) { + case 1: + return 'left' + case 2: + return 'middle' + case 3: + return 'right' + } + } + function Bt(e) { + return e.target || e.srcElement + } + function zt(e) { + return 'A' === e || 'AREA' === e + } + function Jt(e) { + function t(e) { + for (var t = Bt(e), n = t.nodeName, i = ht(qn, 'ignore'); !zt(n) && t && t.parentNode; ) + (t = t.parentNode), (n = t.nodeName) + if (t && zt(n) && !i.test(t.className)) return t + } + return function (n) { + n = n || Te.event + var i = t(n) + if (i) { + var o = Ht(n) + if ('click' === n.type) { + var a = !1 + e && 'middle' === o && (a = !0), i && !a && Ft(i) + } else + 'mousedown' === n.type + ? 'middle' === o && i + ? ((cn = o), (un = i)) + : (cn = un = null) + : 'mouseup' === n.type + ? (o === cn && i === un && Ft(i), (cn = un = null)) + : 'contextmenu' === n.type && Ft(i) + } + } + } + function Yt(e, t, n) { + var i = typeof t + 'undefined' == i && (t = !0), + ie(e, 'click', Jt(t), n), + t && (ie(e, 'mouseup', Jt(t), n), ie(e, 'mousedown', Jt(t), n), ie(e, 'contextmenu', Jt(t), n)) + } + function Xt(e, t, n) { + function i() { + r = !0 + } + if (Ti) return !0 + Ti = !0 + var o, + a, + r = !1 + oe(function () { + function s(e) { + setTimeout(function () { + Ti && ((r = !1), n.trackVisibleContentImpressions(), s(e)) + }, e) + } + function d(e) { + setTimeout(function () { + Ti && (r && ((r = !1), n.trackVisibleContentImpressions()), d(e)) + }, e) + } + if (e) { + for (o = ['scroll', 'resize'], a = 0; a < o.length; a++) + z.addEventListener ? z.addEventListener(o[a], i, !1) : Te.attachEvent('on' + o[a], i) + d(100) + } + t && 0 < t && ((t = parseInt(t, 10)), s(t)) + }) + } + var Qt, + Zt, + Kt, + $t, + en, + tn, + nn, + on, + an, + rn, + sn, + ln, + cn, + un, + mn, + gn, + hn = this, + pn = 'mtm_consent', + fn = 'mtm_cookie_consent', + Cn = 'mtm_consent_removed', + Tn = ue(z.domain, Te.location.href, o()), + Nn = ae(Tn[0]), + kn = $(Tn[1]), + bn = $(Tn[2]), + vn = !1, + _n = 'GET', + An = 'GET', + En = 'application/x-www-form-urlencoded; charset=UTF-8', + yn = 'application/x-www-form-urlencoded; charset=UTF-8', + wn = a || '', + Sn = '', + On = '', + Ln = '', + xn = r || '', + In = '', + Pn = '', + Rn = '', + Dn = [ + '7z', + 'aac', + 'apk', + 'arc', + 'arj', + 'asf', + 'asx', + 'avi', + 'azw3', + 'bin', + 'csv', + 'deb', + 'dmg', + 'doc', + 'docx', + 'epub', + 'exe', + 'flv', + 'gif', + 'gz', + 'gzip', + 'hqx', + 'ibooks', + 'jar', + 'jpg', + 'jpeg', + 'js', + 'mobi', + 'mp2', + 'mp3', + 'mp4', + 'mpg', + 'mpeg', + 'mov', + 'movie', + 'msi', + 'msp', + 'odb', + 'odf', + 'odg', + 'ods', + 'odt', + 'ogg', + 'ogv', + 'pdf', + 'phps', + 'png', + 'ppt', + 'pptx', + 'qt', + 'qtm', + 'ra', + 'ram', + 'rar', + 'rpm', + 'rtf', + 'sea', + 'sit', + 'tar', + 'tbz', + 'tbz2', + 'bz', + 'bz2', + 'tgz', + 'torrent', + 'txt', + 'wav', + 'wma', + 'wmv', + 'wpd', + 'xls', + 'xlsx', + 'xml', + 'z', + 'zip', + ], + Vn = [Nn], + qn = [], + Un = ['.paypal.com'], + Mn = [], + Wn = [], + Fn = [], + Gn = 500, + jn = !0, + Hn = [ + 'pk_campaign', + 'mtm_campaign', + 'piwik_campaign', + 'matomo_campaign', + 'utm_campaign', + 'utm_source', + 'utm_medium', + ], + Bn = ['pk_kwd', 'mtm_kwd', 'piwik_kwd', 'matomo_kwd', 'utm_term'], + zn = '_pk_', + Jn = 'pk_vid', + Yn = 180, + Xn = !1, + Qn = 'Lax', + Zn = !1, + Kn = 339552e5, + $n = 18e5, + ei = 15768e6, + ti = !0, + ni = !1, + ii = !1, + oi = !1, + ai = !1, + ri = {}, + si = {}, + li = {}, + ci = 200, + ui = {}, + mi = {}, + gi = {}, + hi = {}, + pi = [], + fi = !1, + Ci = [], + Ti = !1, + Ni = !1, + ki = !1, + bi = !1, + vi = !1, + _i = !1, + Ai = ge(), + Ei = null, + yi = null, + wi = F, + Si = !1, + Oi = 0, + Li = ['id', 'ses', 'cvar', 'ref'], + xi = !1, + Ii = null, + Pi = [], + Ri = [], + Di = be++, + Vi = !1, + qi = !0 + try { + Rn = z.title + } catch (e) { + Rn = '' + } + ;(Ii = !c('mtm_consent_removed')), + ($t = function e() { + var t = new Date() + return (t = t.getTime()), !!yi && !!(yi + Kt <= t) && (hn.ping(), !0) + }) + var Ui = { + enabled: !0, + requests: [], + timeout: null, + interval: 2500, + sendRequests: function () { + var e = this.requests + ;(this.requests = []), 1 === e.length ? Le(e[0], Gn) : Pe(e, Gn) + }, + canQueue: function () { + return !ve && this.enabled + }, + pushMultiple: function (e) { + if (!this.canQueue()) return void Pe(e, Gn) + var t + for (t = 0; t < e.length; t++) this.push(e[t]) + }, + push: function (e) { + if (e) { + if (!this.canQueue()) return void Le(e, Gn) + Ui.requests.push(e), + this.timeout && (clearTimeout(this.timeout), (this.timeout = null)), + (this.timeout = setTimeout(function () { + ;(Ui.timeout = null), Ui.sendRequests() + }, Ui.interval)) + var t = 'RequestQueue' + Di + Object.prototype.hasOwnProperty.call(Ce, t) || + (Ce[t] = { + unload: function () { + Ui.timeout && clearTimeout(Ui.timeout), Ui.sendRequests() + }, + }) + } + }, + } + ce(), + (this.hasConsent = function () { + return Ii + }), + (this.getVisitorInfo = function () { + return c(Re('id')) || Xe(), ze() + }), + (this.getVisitorId = function () { + return this.getVisitorInfo()[1] + }), + (this.getAttributionInfo = function () { + return Qe() + }), + (this.getAttributionCampaignName = function () { + return Qe()[0] + }), + (this.getAttributionCampaignKeyword = function () { + return Qe()[1] + }), + (this.getAttributionReferrerTimestamp = function () { + return Qe()[2] + }), + (this.getAttributionReferrerUrl = function () { + return Qe()[3] + }), + (this.setTrackerUrl = function (e) { + wn = e + }), + (this.getTrackerUrl = function () { + return wn + }), + (this.getMatomoUrl = function () { + return i(this.getTrackerUrl(), Sn) + }), + (this.getPiwikUrl = function () { + return this.getMatomoUrl() + }), + (this.addTracker = function (e, t) { + ;(p(e) && null !== e) || (e = this.getTrackerUrl()) + var n = new v(e, t) + return k.push(n), fe.trigger('TrackerAdded', [this]), n + }), + (this.getSiteId = function () { + return xn + }), + (this.setSiteId = function (e) { + $e(e) + }), + (this.resetUserId = function () { + In = '' + }), + (this.setUserId = function (e) { + ee(e) && (In = e) + }), + (this.setVisitorId = function (e) { + var t = /[0-9A-Fa-f]{16}/g + Z(e) && t.test(e) ? (Pn = e) : D('Invalid visitorId set' + e) + }), + (this.getUserId = function () { + return In + }), + (this.setCustomData = function (e, t) { + C(e) ? (tn = e) : (!tn && (tn = {}), (tn[e] = t)) + }), + (this.getCustomData = function () { + return tn + }), + (this.setCustomRequestProcessing = function (e) { + ln = e + }), + (this.appendToTrackingUrl = function (e) { + On = e + }), + (this.getRequest = function (e) { + return st(e) + }), + (this.addPlugin = function (e, t) { + Ce[e] = t + }), + (this.setCustomDimension = function (e, t) { + ;(e = parseInt(e, 10)), 0 < e && (!p(t) && (t = ''), !Z(t) && (t += ''), (li[e] = t)) + }), + (this.getCustomDimension = function (e) { + if (((e = parseInt(e, 10)), 0 < e && Object.prototype.hasOwnProperty.call(li, e))) return li[e] + }), + (this.deleteCustomDimension = function (e) { + ;(e = parseInt(e, 10)), 0 < e && delete li[e] + }), + (this.setCustomVariable = function (e, t, n, i) { + var o + p(i) || (i = 'visit'), + p(t) && + (!p(n) && (n = ''), + 0 < e && + ((t = Z(t) ? t : t + ''), + (n = Z(n) ? n : n + ''), + (o = [t.slice(0, 200), n.slice(0, 200)]), + 'visit' === i || 2 === i + ? (Me(), (ai[e] = o)) + : 'page' === i || 3 === i + ? (ri[e] = o) + : 'event' === i && (si[e] = o))) + }), + (this.getCustomVariable = function (e, t) { + var n + return ( + p(t) || (t = 'visit'), + 'page' === t || 3 === t + ? (n = ri[e]) + : 'event' === t + ? (n = si[e]) + : ('visit' == t || 2 === t) && (Me(), (n = ai[e])), + p(n) && (!n || '' !== n[0]) && n + ) + }), + (this.deleteCustomVariable = function (e, t) { + this.getCustomVariable(e, t) && this.setCustomVariable(e, '', '', t) + }), + (this.deleteCustomVariables = function (e) { + 'page' === e || 3 === e ? (ri = {}) : 'event' === e ? (si = {}) : ('visit' == e || 2 === e) && (ai = {}) + }), + (this.storeCustomVariablesInCookie = function () { + oi = !0 + }), + (this.setLinkTrackingTimer = function (e) { + Gn = e + }), + (this.getLinkTrackingTimer = function () { + return Gn + }), + (this.setDownloadExtensions = function (e) { + Z(e) && (e = e.split('|')), (Dn = e) + }), + (this.addDownloadExtensions = function (e) { + var t + for (Z(e) && (e = e.split('|')), t = 0; t < e.length; t++) Dn.push(e[t]) + }), + (this.removeDownloadExtensions = function (e) { + var t, + n = [] + for (Z(e) && (e = e.split('|')), t = 0; t < Dn.length; t++) -1 === Y(e, Dn[t]) && n.push(Dn[t]) + Dn = n + }), + (this.setDomains = function (e) { + Vn = Z(e) ? [e] : e + var t, + n = !1, + i = 0 + for (i; i < Vn.length; i++) { + if (((t = Vn[i] + ''), b(Nn, ae(t)))) { + n = !0 + break + } + var o = A(t) + if (o && '/' !== o && '/*' !== o) { + n = !0 + break + } + } + n || Vn.push(Nn) + }), + (this.setExcludedReferrers = function (e) { + Un = Z(e) ? [e] : e + }), + (this.enableCrossDomainLinking = function () { + vi = !0 + }), + (this.disableCrossDomainLinking = function () { + vi = !1 + }), + (this.isCrossDomainLinkingEnabled = function () { + return vi + }), + (this.setCrossDomainLinkingTimeout = function (e) { + Yn = e + }), + (this.getCrossDomainLinkingUrlParameter = function () { + return h('pk_vid') + '=' + h(Ut()) + }), + (this.setIgnoreClasses = function (e) { + qn = Z(e) ? [e] : e + }), + (this.setRequestMethod = function (e) { + ;(An = e ? (e + '').toUpperCase() : 'GET'), 'GET' === An && this.disableAlwaysUseSendBeacon() + }), + (this.setRequestContentType = function (e) { + yn = e || 'application/x-www-form-urlencoded; charset=UTF-8' + }), + (this.setGenerationTimeMs = function (e) { + D( + 'setGenerationTimeMs is no longer supported since Matomo 4. The call will be ignored. The replacement is setPagePerformanceTiming.', + ) + }), + (this.setPagePerformanceTiming = function (e, t, n, i, o, a) { + var r = { pf_net: e, pf_srv: t, pf_tfr: n, pf_dm1: i, pf_dm2: o, pf_onl: a } + try { + if (((r = G(r, p)), (r = Q(r)), (Ln = B(r)), '' === Ln)) + return void D( + 'setPagePerformanceTiming() called without parameters. This function needs to be called with at least one performance parameter.', + ) + ;(ii = !1), (ni = !0) + } catch (e) { + D('setPagePerformanceTiming: ' + e.toString()) + } + }), + (this.setReferrerUrl = function (e) { + bn = e + }), + (this.setCustomUrl = function (e) { + Qt = T(kn, e) + }), + (this.getCurrentUrl = function () { + return Qt || kn + }), + (this.setDocumentTitle = function (e) { + Rn = e + }), + (this.setPageViewId = function (e) { + ;(gn = e), (Si = !0) + }), + (this.setAPIUrl = function (e) { + Sn = e + }), + (this.setDownloadClasses = function (e) { + Wn = Z(e) ? [e] : e + }), + (this.setLinkClasses = function (e) { + Fn = Z(e) ? [e] : e + }), + (this.setCampaignNameKey = function (e) { + Hn = Z(e) ? [e] : e + }), + (this.setCampaignKeywordKey = function (e) { + Bn = Z(e) ? [e] : e + }), + (this.discardHashTag = function (e) { + en = e + }), + (this.setCookieNamePrefix = function (e) { + ;(zn = e), ai && (ai = Ue()) + }), + (this.setCookieDomain = function (e) { + var t = ae(e) + Zn || Ze(t) ? ((nn = t), ce()) : D("Can't write cookie on domain " + e) + }), + (this.setExcludedQueryParams = function (e) { + Mn = Z(e) ? [e] : e + }), + (this.getCookieDomain = function () { + return nn + }), + (this.hasCookies = function () { + return '1' === Ve() + }), + (this.setSessionCookie = function (e, t, n) { + if (!e) throw new Error('Missing cookie name') + p(n) || (n = $n), Li.push(e), u(Re(e), t, n, on, nn, Xn, Qn) + }), + (this.getCookie = function (e) { + var t = c(Re(e)) + return 0 === t ? null : t + }), + (this.setCookiePath = function (e) { + ;(on = e), ce() + }), + (this.getCookiePath = function (e) { + return on + }), + (this.setVisitorCookieTimeout = function (e) { + Kn = 1e3 * e + }), + (this.setSessionCookieTimeout = function (e) { + $n = 1e3 * e + }), + (this.getSessionCookieTimeout = function () { + return $n + }), + (this.setReferralCookieTimeout = function (e) { + ei = 1e3 * e + }), + (this.setConversionAttributionFirstReferrer = function (e) { + sn = e + }), + (this.setSecureCookie = function (e) { + return e && 'https:' !== location.protocol + ? void D('Error in setSecureCookie: You cannot use `Secure` on http.') + : void (Xn = e) + }), + (this.setCookieSameSite = function (e) { + return ( + (e += ''), + (e = e.charAt(0).toUpperCase() + e.toLowerCase().slice(1)), + 'None' !== e && 'Lax' !== e && 'Strict' !== e + ? void D('Ignored value for sameSite. Please use either Lax, None, or Strict.') + : void ('None' === e && + ('https:' === location.protocol + ? this.setSecureCookie(!0) + : (D('sameSite=None cannot be used on http, reverted to sameSite=Lax.'), (e = 'Lax'))), + (Qn = e)) + ) + }), + (this.disableCookies = function () { + ;(Zn = !0), xn && Ke() + }), + (this.areCookiesEnabled = function () { + return !Zn + }), + (this.setCookieConsentGiven = function () { + if (Zn && !an && ((Zn = !1), (qi = !0), xn && Vi)) { + Xe() + var e = st('ping=1', null, 'ping') + Le(e, Gn) + } + }), + (this.requireCookieConsent = function () { + return !this.getRememberedCookieConsent() && (this.disableCookies(), !0) + }), + (this.getRememberedCookieConsent = function () { + return c('mtm_cookie_consent') + }), + (this.forgetCookieConsentGiven = function () { + De('mtm_cookie_consent', on, nn), this.disableCookies() + }), + (this.rememberCookieConsentGiven = function (e) { + ;(e = e ? 1e3 * (60 * (60 * e)) : 946080000000), this.setCookieConsentGiven() + var t = new Date().getTime() + u('mtm_cookie_consent', t, e, on, nn, Xn, Qn) + }), + (this.deleteCookies = function () { + Ke() + }), + (this.setDoNotTrack = function (e) { + var t = J.doNotTrack || J.msDoNotTrack + ;(an = e && ('yes' === t || '1' === t)), an && this.disableCookies() + }), + (this.alwaysUseSendBeacon = function () { + jn = !0 + }), + (this.disableAlwaysUseSendBeacon = function () { + jn = !1 + }), + (this.addListener = function (e, t) { + Yt(e, t, !1) + }), + (this.enableLinkTracking = function (e) { + if (!bi) { + bi = !0 + var t = this + n(function () { + ki = !0 + var t = z.body + Yt(t, e, !0) + }) + } + }), + (this.enableJSErrorTracking = function () { + if (!vn) { + vn = !0 + var e = Te.onerror + Te.onerror = function (t, n, i, o, a) { + return ( + qt(function () { + var e = 'JavaScript Errors', + a = n + ':' + i + o && (a += ':' + o), + -1 === Y(Ri, 'JavaScript Errors' + a + t) && + (Ri.push('JavaScript Errors' + a + t), It('JavaScript Errors', a, t)) + }), + !!e && e(t, n, i, o, a) + ) + } + } + }), + (this.disablePerformanceTracking = function () { + ti = !1 + }), + (this.enableHeartBeatTimer = function (e) { + var t = Math.max + ;(e = t(e || 15, 5)), (Kt = 1e3 * e), null !== yi && Ee() + }), + (this.disableHeartBeatTimer = function () { + ;(Kt || _i) && + (Te.removeEventListener + ? (Te.removeEventListener('focus', K), + Te.removeEventListener('blur', re), + Te.removeEventListener('visibilitychange', se)) + : Te.detachEvent && + (Te.detachEvent('onfocus', K), + Te.detachEvent('onblur', re), + Te.detachEvent('visibilitychange', se))), + (Kt = null), + (_i = !1) + }), + (this.killFrame = function () { + Te.location !== Te.top.location && (Te.top.location = Te.location) + }), + (this.redirectFile = function (e) { + 'file:' === Te.location.protocol && (Te.location = e) + }), + (this.setCountPreRendered = function (e) { + rn = e + }), + (this.trackGoal = function (e, t, n, i) { + qt(function () { + Rt(e, t, n, i) + }) + }), + (this.trackLink = function (e, t, n, i) { + qt(function () { + Dt(e, t, n, i) + }) + }), + (this.getNumTrackedPageViews = function () { + return Oi + }), + (this.trackPageView = function (e, t, n) { + ;(Ci = []), + (Pi = []), + (Ri = []), + me(xn) + ? qt(function () { + R(wn, Sn, xn) + }) + : qt(function () { + Oi++, gt(e, t, n) + }) + }), + (this.disableBrowserFeatureDetection = function () { + qi = !1 + }), + (this.enableBrowserFeatureDetection = function () { + qi = !0 + }), + (this.trackAllContentImpressions = function () { + me(xn) || + qt(function () { + n(function () { + var e = Ae.findContentNodes(), + t = wt(e) + Ui.pushMultiple(t) + }) + }) + }), + (this.trackVisibleContentImpressions = function (e, t) { + me(xn) || + (!p(e) && (e = !0), + !p(t) && (t = 750), + Xt(e, t, this), + qt(function () { + oe(function () { + var e = Ae.findContentNodes(), + t = St(e) + Ui.pushMultiple(t) + }) + })) + }), + (this.trackContentImpression = function (t, n, i) { + me(xn) || + ((t = e(t)), + (n = e(n)), + (i = e(i)), + t && + ((n = n || 'Unknown'), + qt(function () { + var e = Ot(t, n, i) + Ui.push(e) + }))) + }), + (this.trackContentImpressionsWithinNode = function (e) { + me(xn) || + !e || + qt(function () { + Ti + ? oe(function () { + var t = Ae.findContentNodesWithinNode(e), + n = St(t) + Ui.pushMultiple(n) + }) + : n(function () { + var t = Ae.findContentNodesWithinNode(e), + n = wt(t) + Ui.pushMultiple(n) + }) + }) + }), + (this.trackContentInteraction = function (t, n, i, o) { + me(xn) || + ((t = e(t)), + (n = e(n)), + (i = e(i)), + (o = e(o)), + t && + n && + ((i = i || 'Unknown'), + qt(function () { + var e = Nt(t, n, i, o) + e && Ui.push(e) + }))) + }), + (this.trackContentInteractionNode = function (e, t) { + if (!me(xn) && e) { + var n = null + return ( + qt(function () { + ;(n = Lt(e, t)), n && Ui.push(n) + }), + n + ) + } + }), + (this.logAllContentBlocksOnPage = function () { + var e = Ae.findContentNodes(), + t = Ae.collectContent(e), + n = typeof console + 'undefined' !== n && console && console.log && console.log(t) + }), + (this.trackEvent = function (e, t, n, i, o, a) { + qt(function () { + It(e, t, n, i, o, a) + }) + }), + (this.trackSiteSearch = function (e, t, n, i) { + ;(Ci = []), + qt(function () { + Pt(e, t, n, i) + }) + }), + (this.setEcommerceView = function (e, t, n, i) { + ;(ui = {}), + ee(n) && (n += ''), + p(n) && null !== n && !1 !== n && n.length ? n instanceof Array && (n = Te.JSON.stringify(n)) : (n = '') + var o = '_pkc' + ;(ui[o] = n), + p(i) && null !== i && !1 !== i && (i + '').length && ((o = '_pkp'), (ui[o] = i)), + (ee(e) || ee(t)) && + (ee(e) && ((o = '_pks'), (ui[o] = e)), !ee(t) && (t = ''), (o = '_pkn'), (ui[o] = t)) + }), + (this.getEcommerceItems = function () { + return JSON.parse(JSON.stringify(mi)) + }), + (this.addEcommerceItem = function (e, t, n, i, o) { + ee(e) && (mi[e] = [e + '', t, n, i, o]) + }), + (this.removeEcommerceItem = function (e) { + ee(e) && ((e += ''), delete mi[e]) + }), + (this.clearEcommerceCart = function () { + mi = {} + }), + (this.trackEcommerceOrder = function (e, t, n, i, o, a) { + ut(e, t, n, i, o, a) + }), + (this.trackEcommerceCartUpdate = function (e) { + mt(e) + }), + (this.trackRequest = function (e, t, n, i) { + qt(function () { + var o = st(e, t, i) + Le(o, Gn, n) + }) + }), + (this.ping = function () { + this.trackRequest('ping=1', null, null, 'ping') + }), + (this.disableQueueRequest = function () { + Ui.enabled = !1 + }), + (this.setRequestQueueInterval = function (e) { + if (1e3 > e) throw new Error('Request queue interval needs to be at least 1000ms') + Ui.interval = e + }), + (this.queueRequest = function (e) { + qt(function () { + var t = st(e) + Ui.push(t) + }) + }), + (this.isConsentRequired = function () { + return xi + }), + (this.getRememberedConsent = function () { + var e = c('mtm_consent') + return c('mtm_consent_removed') ? (e && De('mtm_consent', on, nn), null) : e && 0 !== e ? e : null + }), + (this.hasRememberedConsent = function () { + return !!this.getRememberedConsent() + }), + (this.requireConsent = function () { + ;(xi = !0), + (Ii = this.hasRememberedConsent()), + Ii || (Zn = !0), + Ne++, + (Ce['CoreConsent' + Ne] = { + unload: function () { + Ii || Ke() + }, + }) + }), + (this.setConsentGiven = function (e) { + ;(Ii = !0), (qi = !0), De('mtm_consent_removed', on, nn) + var t, n + for (t = 0; t < Pi.length; t++) + (n = typeof Pi[t]), 'string' === n ? Le(Pi[t], Gn) : 'object' == n && Pe(Pi[t], Gn) + ;(Pi = []), (!p(e) || e) && this.setCookieConsentGiven() + }), + (this.rememberConsentGiven = function (e) { + e = e ? 1e3 * (60 * (60 * e)) : 946080000000 + var t = !0 + this.setConsentGiven(!0) + var n = new Date().getTime() + u('mtm_consent', n, e, on, nn, Xn, Qn) + }), + (this.forgetConsentGiven = function (e) { + ;(e = e ? 1e3 * (60 * (60 * e)) : 946080000000), + De('mtm_consent', on, nn), + u('mtm_consent_removed', new Date().getTime(), e, on, nn, Xn, Qn), + this.forgetCookieConsentGiven(), + this.requireConsent() + }), + (this.isUserOptedOut = function () { + return !Ii + }), + (this.optUserOut = this.forgetConsentGiven), + (this.forgetUserOptOut = function () { + this.setConsentGiven(!1) + }), + oe(function () { + setTimeout(function () { + ni = !0 + }, 0) + }), + fe.trigger('TrackerSetup', [this]), + fe.addPlugin('TrackerVisitorIdCookie' + Di, { + unload: function () { + Vi || (Xe(), rt()) + }, + }) + } + function T() { + return { push: ne } + } + function K(e, t) { + var n, + i, + o = {} + for (n = 0; n < t.length; n++) { + var a = t[n] + for (o[a] = 1, i = 0; i < e.length; i++) + if (e[i] && e[i][0]) { + var r = e[i][0] + a === r && + (ne(e[i]), + delete e[i], + 1 < o[r] && + 'addTracker' !== r && + 'enableLinkTracking' !== r && + D( + 'The method ' + + r + + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Matomo trackers documentation: https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers', + ), + o[r]++) + } + } + return e + } + function c(e, t) { + var n = new v(e, t) + for (k.push(n), _paq = K(_paq, w), pe = 0; pe < _paq.length; pe++) _paq[pe] && ne(_paq[pe]) + return (_paq = new T()), fe.trigger('TrackerAdded', [n]), n + } + var he, + pe, + fe, + Ce = {}, + b = {}, + z = document, + J = navigator, + g = screen, + Te = window, + W = Te.performance || Te.mozPerformance || Te.msPerformance || Te.webkitPerformance, + h = Te.encodeURIComponent, + t = Te.decodeURIComponent, + V = unescape, + k = [], + L = [], + Ne = 0, + ke = 0, + be = 0, + ve = !1, + _e = { + htmlCollectionToArray: function (e) { + var t, + n = [] + if (!e || !e.length) return n + for (t = 0; t < e.length; t++) n.push(e[t]) + return n + }, + find: function (e) { + if (!document.querySelectorAll || !e) return [] + var t = document.querySelectorAll(e) + return this.htmlCollectionToArray(t) + }, + findMultiple: function (e) { + if (!e || !e.length) return [] + var t, + n, + i = [] + for (t = 0; t < e.length; t++) (n = this.find(e[t])), (i = i.concat(n)) + return (i = this.makeNodesUnique(i)), i + }, + findNodesByTagName: function (e, t) { + if (!e || !t || !e.getElementsByTagName) return [] + var n = e.getElementsByTagName(t) + return this.htmlCollectionToArray(n) + }, + makeNodesUnique: function (e) { + var t = [].concat(e) + if ( + (e.sort(function (e, n) { + if (e === n) return 0 + var i = Y(t, e), + o = Y(t, n) + return i === o ? 0 : i > o ? -1 : 1 + }), + 1 >= e.length) + ) + return e + var n, + i = 0, + o = 0, + a = [] + for (n = e[i++]; n; ) n === e[i] && (o = a.push(i)), (n = e[i++] || null) + for (; o--; ) e.splice(a[o], 1) + return e + }, + getAttributeValueFromNode: function (e, t) { + if (this.hasNodeAttribute(e, t)) { + if (e && e.getAttribute) return e.getAttribute(t) + if (e && e.attributes) { + var n = typeof e.attributes[t] + if ('undefined' != n) { + if (e.attributes[t].value) return e.attributes[t].value + if (e.attributes[t].nodeValue) return e.attributes[t].nodeValue + var i, + o = e.attributes + if (o) { + for (i = 0; i < o.length; i++) if (o[i].nodeName === t) return o[i].nodeValue + return null + } + } + } + } + }, + hasNodeAttributeWithValue: function (e, t) { + var n = this.getAttributeValueFromNode(e, t) + return !!n + }, + hasNodeAttribute: function (e, t) { + if (e && e.hasAttribute) return e.hasAttribute(t) + if (e && e.attributes) { + var n = typeof e.attributes[t] + return 'undefined' != n + } + return !1 + }, + hasNodeCssClass: function (e, t) { + if (e && t && e.className) { + var n = 'string' == typeof e.className ? e.className.split(' ') : [] + if (-1 !== Y(n, t)) return !0 + } + return !1 + }, + findNodesHavingAttribute: function (e, t, n) { + if ((n || (n = []), !e || !t)) return n + var i = ce(e) + if (!i || !i.length) return n + var o, a + for (o = 0; o < i.length; o++) + (a = i[o]), this.hasNodeAttribute(a, t) && n.push(a), (n = this.findNodesHavingAttribute(a, t, n)) + return n + }, + findFirstNodeHavingAttribute: function (e, t) { + if (e && t) { + if (this.hasNodeAttribute(e, t)) return e + var n = this.findNodesHavingAttribute(e, t) + if (n && n.length) return n[0] + } + }, + findFirstNodeHavingAttributeWithValue: function (e, t) { + if (e && t) { + if (this.hasNodeAttributeWithValue(e, t)) return e + var n = this.findNodesHavingAttribute(e, t) + if (n && n.length) { + var i + for (i = 0; i < n.length; i++) if (this.getAttributeValueFromNode(n[i], t)) return n[i] + } + } + }, + findNodesHavingCssClass: function (e, t, n) { + if ((n || (n = []), !e || !t)) return n + if (e.getElementsByClassName) { + var i = e.getElementsByClassName(t) + return this.htmlCollectionToArray(i) + } + var o = ce(e) + if (!o || !o.length) return [] + var a, r + for (a = 0; a < o.length; a++) + (r = o[a]), this.hasNodeCssClass(r, t) && n.push(r), (n = this.findNodesHavingCssClass(r, t, n)) + return n + }, + findFirstNodeHavingClass: function (e, t) { + if (e && t) { + if (this.hasNodeCssClass(e, t)) return e + var n = this.findNodesHavingCssClass(e, t) + if (n && n.length) return n[0] + } + }, + isLinkElement: function (e) { + if (!e) return !1 + var t = (e.nodeName + '').toLowerCase(), + n = ['a', 'area'], + i = Y(n, t) + return -1 !== i + }, + setAnyAttribute: function (e, t, n) { + e && t && (e.setAttribute ? e.setAttribute(t, n) : (e[t] = n)) + }, + }, + Ae = { + CONTENT_ATTR: 'data-track-content', + CONTENT_CLASS: 'matomoTrackContent', + LEGACY_CONTENT_CLASS: 'piwikTrackContent', + CONTENT_NAME_ATTR: 'data-content-name', + CONTENT_PIECE_ATTR: 'data-content-piece', + CONTENT_PIECE_CLASS: 'matomoContentPiece', + LEGACY_CONTENT_PIECE_CLASS: 'piwikContentPiece', + CONTENT_TARGET_ATTR: 'data-content-target', + CONTENT_TARGET_CLASS: 'matomoContentTarget', + LEGACY_CONTENT_TARGET_CLASS: 'piwikContentTarget', + CONTENT_IGNOREINTERACTION_ATTR: 'data-content-ignoreinteraction', + CONTENT_IGNOREINTERACTION_CLASS: 'matomoContentIgnoreInteraction', + LEGACY_CONTENT_IGNOREINTERACTION_CLASS: 'piwikContentIgnoreInteraction', + location: void 0, + findContentNodes: function () { + var e = '.' + this.CONTENT_CLASS, + t = '.' + this.LEGACY_CONTENT_CLASS, + n = '[' + this.CONTENT_ATTR + ']', + i = _e.findMultiple([e, t, n]) + return i + }, + findContentNodesWithinNode: function (e) { + if (!e) return [] + var t = _e.findNodesHavingCssClass(e, this.CONTENT_CLASS) + t = _e.findNodesHavingCssClass(e, this.LEGACY_CONTENT_CLASS, t) + var n = _e.findNodesHavingAttribute(e, this.CONTENT_ATTR) + if (n && n.length) { + var i + for (i = 0; i < n.length; i++) t.push(n[i]) + } + return ( + _e.hasNodeAttribute(e, this.CONTENT_ATTR) + ? t.push(e) + : _e.hasNodeCssClass(e, this.CONTENT_CLASS) + ? t.push(e) + : _e.hasNodeCssClass(e, this.LEGACY_CONTENT_CLASS) && t.push(e), + (t = _e.makeNodesUnique(t)), + t + ) + }, + findParentContentNode: function (e) { + if (e) + for (var t = e, n = 0; t && t !== z && t.parentNode; ) { + if (_e.hasNodeAttribute(t, this.CONTENT_ATTR)) return t + if (_e.hasNodeCssClass(t, this.CONTENT_CLASS)) return t + if (_e.hasNodeCssClass(t, this.LEGACY_CONTENT_CLASS)) return t + if (((t = t.parentNode), 1e3 < n)) break + n++ + } + }, + findPieceNode: function (e) { + var t + return ( + (t = _e.findFirstNodeHavingAttribute(e, this.CONTENT_PIECE_ATTR)), + t || (t = _e.findFirstNodeHavingClass(e, this.CONTENT_PIECE_CLASS)), + t || (t = _e.findFirstNodeHavingClass(e, this.LEGACY_CONTENT_PIECE_CLASS)), + t ? t : e + ) + }, + findTargetNodeNoDefault: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_TARGET_ATTR) + if (t) return t + if (((t = _e.findFirstNodeHavingAttribute(e, this.CONTENT_TARGET_ATTR)), t)) return t + if (((t = _e.findFirstNodeHavingClass(e, this.CONTENT_TARGET_CLASS)), t)) return t + if (((t = _e.findFirstNodeHavingClass(e, this.LEGACY_CONTENT_TARGET_CLASS)), t)) return t + } + }, + findTargetNode: function (e) { + var t = this.findTargetNodeNoDefault(e) + return t ? t : e + }, + findContentName: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_NAME_ATTR) + if (t) return _e.getAttributeValueFromNode(t, this.CONTENT_NAME_ATTR) + var n = this.findContentPiece(e) + if (n) return this.removeDomainIfIsInLink(n) + if (_e.hasNodeAttributeWithValue(e, 'title')) return _e.getAttributeValueFromNode(e, 'title') + var i = this.findPieceNode(e) + if (_e.hasNodeAttributeWithValue(i, 'title')) return _e.getAttributeValueFromNode(i, 'title') + var o = this.findTargetNode(e) + if (_e.hasNodeAttributeWithValue(o, 'title')) return _e.getAttributeValueFromNode(o, 'title') + } + }, + findContentPiece: function (e) { + if (e) { + var t = _e.findFirstNodeHavingAttributeWithValue(e, this.CONTENT_PIECE_ATTR) + if (t) return _e.getAttributeValueFromNode(t, this.CONTENT_PIECE_ATTR) + var n = this.findPieceNode(e), + i = this.findMediaUrlInNode(n) + if (i) return this.toAbsoluteUrl(i) + } + }, + findContentTarget: function (e) { + if (e) { + var t = this.findTargetNode(e) + if (_e.hasNodeAttributeWithValue(t, this.CONTENT_TARGET_ATTR)) + return _e.getAttributeValueFromNode(t, this.CONTENT_TARGET_ATTR) + var n + if (_e.hasNodeAttributeWithValue(t, 'href')) + return (n = _e.getAttributeValueFromNode(t, 'href')), this.toAbsoluteUrl(n) + var i = this.findPieceNode(e) + if (_e.hasNodeAttributeWithValue(i, 'href')) + return (n = _e.getAttributeValueFromNode(i, 'href')), this.toAbsoluteUrl(n) + } + }, + isSameDomain: function (e) { + if (!e || !e.indexOf) return !1 + if (0 === e.indexOf(this.getLocation().origin)) return !0 + var t = e.indexOf(this.getLocation().host) + return !!(8 >= t && 0 <= t) + }, + removeDomainIfIsInLink: function (e) { + var t = '^https?://[^/]+', + n = '^.*//[^/]+' + return ( + e && + e.search && + -1 !== e.search(/^https?:\/\/[^/]+/) && + this.isSameDomain(e) && + ((e = e.replace(new RegExp(n), '')), !e && (e = '/')), + e + ) + }, + findMediaUrlInNode: function (e) { + if (e) { + var t = ['img', 'embed', 'video', 'audio'], + n = e.nodeName.toLowerCase() + if (-1 !== Y(t, n) && _e.findFirstNodeHavingAttributeWithValue(e, 'src')) { + var i = _e.findFirstNodeHavingAttributeWithValue(e, 'src') + return _e.getAttributeValueFromNode(i, 'src') + } + if ('object' === n && _e.hasNodeAttributeWithValue(e, 'data')) + return _e.getAttributeValueFromNode(e, 'data') + if ('object' === n) { + var o = _e.findNodesByTagName(e, 'param') + if (o && o.length) { + var a + for (a = 0; a < o.length; a++) + if ( + 'movie' === _e.getAttributeValueFromNode(o[a], 'name') && + _e.hasNodeAttributeWithValue(o[a], 'value') + ) + return _e.getAttributeValueFromNode(o[a], 'value') + } + var r = _e.findNodesByTagName(e, 'embed') + if (r && r.length) return this.findMediaUrlInNode(r[0]) + } + } + }, + trim: function (t) { + return e(t) + }, + isOrWasNodeInViewport: function (e) { + if (!e || !e.getBoundingClientRect || 1 !== e.nodeType) return !0 + var t = e.getBoundingClientRect(), + n = z.documentElement || {}, + i = 0 > t.top + i && e.offsetTop && (i = 0 < e.offsetTop + t.height) + var o = n.clientWidth + Te.innerWidth && o > Te.innerWidth && (o = Te.innerWidth) + var a = n.clientHeight + return ( + Te.innerHeight && a > Te.innerHeight && (a = Te.innerHeight), + (0 < t.bottom || i) && 0 < t.right && t.left < o && (t.top < a || i) + ) + }, + isNodeVisible: function (e) { + var t = P(e), + n = this.isOrWasNodeInViewport(e) + return t && n + }, + buildInteractionRequestParams: function (e, t, n, i) { + var o = '' + return ( + e && (o += 'c_i=' + h(e)), + t && (o && (o += '&'), (o += 'c_n=' + h(t))), + n && (o && (o += '&'), (o += 'c_p=' + h(n))), + i && (o && (o += '&'), (o += 'c_t=' + h(i))), + o && (o += '&ca=1'), + o + ) + }, + buildImpressionRequestParams: function (e, t, n) { + var i = 'c_n=' + h(e) + '&c_p=' + h(t) + return n && (i += '&c_t=' + h(n)), i && (i += '&ca=1'), i + }, + buildContentBlock: function (e) { + if (e) { + var t = this.findContentName(e), + n = this.findContentPiece(e), + i = this.findContentTarget(e) + return ( + (t = this.trim(t)), + (n = this.trim(n)), + (i = this.trim(i)), + { name: t || 'Unknown', piece: n || 'Unknown', target: i || '' } + ) + } + }, + collectContent: function (e) { + if (!e || !e.length) return [] + var t, + n, + i = [] + for (t = 0; t < e.length; t++) (n = this.buildContentBlock(e[t])), p(n) && i.push(n) + return i + }, + setLocation: function (e) { + this.location = e + }, + getLocation: function () { + var e = this.location || Te.location + return e.origin || (e.origin = e.protocol + '//' + e.hostname + (e.port ? ':' + e.port : '')), e + }, + toAbsoluteUrl: function (e) { + if ((!e || e + '' !== e) && '' !== e) return e + if ('' === e) return this.getLocation().href + if (-1 !== e.search(/^\/\//)) return this.getLocation().protocol + e + if (-1 !== e.search(/:\/\//)) return e + if (0 === e.indexOf('#')) return this.getLocation().origin + this.getLocation().pathname + e + if (0 === e.indexOf('?')) return this.getLocation().origin + this.getLocation().pathname + e + if (0 === e.search('^[a-zA-Z]{2,11}:')) return e + if (-1 !== e.search(/^\//)) return this.getLocation().origin + e + var t = '(.*/)', + n = this.getLocation().origin + this.getLocation().pathname.match(/(.*\/)/)[0] + return n + e + }, + isUrlToCurrentDomain: function (e) { + var t = this.toAbsoluteUrl(e) + if (!t) return !1 + var n = this.getLocation().origin + return n === t || (0 === (t + '').indexOf(n) && ':' !== (t + '').substr(n.length, 1)) + }, + setHrefAttribute: function (e, t) { + e && t && _e.setAnyAttribute(e, 'href', t) + }, + shouldIgnoreInteraction: function (e) { + return ( + !!_e.hasNodeAttribute(e, this.CONTENT_IGNOREINTERACTION_ATTR) || + !!_e.hasNodeCssClass(e, this.CONTENT_IGNOREINTERACTION_CLASS) || + !!_e.hasNodeCssClass(e, this.LEGACY_CONTENT_IGNOREINTERACTION_CLASS) + ) + }, + }, + w = [ + 'addTracker', + 'forgetCookieConsentGiven', + 'requireCookieConsent', + 'disableBrowserFeatureDetection', + 'disableCookies', + 'setTrackerUrl', + 'setAPIUrl', + 'enableCrossDomainLinking', + 'setCrossDomainLinkingTimeout', + 'setSessionCookieTimeout', + 'setVisitorCookieTimeout', + 'setCookieNamePrefix', + 'setCookieSameSite', + 'setSecureCookie', + 'setCookiePath', + 'setCookieDomain', + 'setDomains', + 'setUserId', + 'setVisitorId', + 'setSiteId', + 'alwaysUseSendBeacon', + 'disableAlwaysUseSendBeacon', + 'enableLinkTracking', + 'setCookieConsentGiven', + 'requireConsent', + 'setConsentGiven', + 'disablePerformanceTracking', + 'setPagePerformanceTiming', + 'setExcludedQueryParams', + 'setExcludedReferrers', + ] + return ( + ie(Te, 'beforeunload', re, !1), + ie( + Te, + 'visibilitychange', + function () { + ve || ('hidden' === z.visibilityState && q('unload')) + }, + !1, + ), + ie( + Te, + 'online', + function () { + p(J.serviceWorker) && + J.serviceWorker.ready.then( + function (e) { + if (e && e.sync) return e.sync.register('matomoSync') + }, + function () {}, + ) + }, + !1, + ), + ie( + Te, + 'message', + function (e) { + function t(t) { + var n = z.getElementsByTagName('iframe') + for (i = 0; i < n.length; i++) { + var o = n[i], + r = s(o.src) + if (o.contentWindow && p(o.contentWindow.postMessage) && r === a) { + var d = JSON.stringify(t) + o.contentWindow.postMessage(d, e.origin) + } + } + } + if (e && e.origin) { + var n, + i, + o, + a = s(e.origin), + r = fe.getAsyncTrackers() + for (i = 0; i < r.length; i++) + if (((o = s(r[i].getMatomoUrl())), o === a)) { + n = r[i] + break + } + if (n) { + var d = null + try { + d = JSON.parse(e.data) + } catch (e) { + return + } + if (d) + if (p(d.maq_initial_value)) + t({ + maq_opted_in: d.maq_initial_value && n.hasConsent(), + maq_url: n.getMatomoUrl(), + maq_optout_by_default: n.isConsentRequired(), + }) + else if (p(d.maq_opted_in)) { + for (r = fe.getAsyncTrackers(), i = 0; i < r.length; i++) + (n = r[i]), d.maq_opted_in ? n.rememberConsentGiven() : n.forgetConsentGiven() + t({ + maq_confirm_opted_in: n.hasConsent(), + maq_url: n.getMatomoUrl(), + maq_optout_by_default: n.isConsentRequired(), + }) + } + } + } + }, + !1, + ), + (Date.prototype.getTimeAlias = Date.prototype.getTime), + (fe = { + initialized: !1, + JSON: Te.JSON, + DOM: { + addEventListener: function (e, t, n, i) { + var o = typeof i + 'undefined' == o && (i = !1), ie(e, t, n, i) + }, + onLoad: oe, + onReady: n, + isNodeVisible: P, + isOrWasNodeVisible: Ae.isNodeVisible, + }, + on: function (e, t) { + b[e] || (b[e] = []), b[e].push(t) + }, + off: function (e, t) { + if (b[e]) { + var n = 0 + for (n; n < b[e].length; n++) b[e][n] === t && b[e].splice(n, 1) + } + }, + trigger: function (e, t, n) { + if (b[e]) { + var i = 0 + for (i; i < b[e].length; i++) b[e][i].apply(n || Te, t) + } + }, + addPlugin: function (e, t) { + Ce[e] = t + }, + getTracker: function (e, t) { + return ( + p(t) || (t = this.getAsyncTracker().getSiteId()), + p(e) || (e = this.getAsyncTracker().getTrackerUrl()), + new v(e, t) + ) + }, + getAsyncTrackers: function () { + return k + }, + addTracker: function (e, t) { + var n + return (n = k.length ? k[0].addTracker(e, t) : c(e, t)), n + }, + getAsyncTracker: function (e, t) { + var n + if (k.length && k[0]) n = k[0] + else return c(e, t) + if (!t && !e) return n + ;(!p(t) || null === t) && n && (t = n.getSiteId()), (!p(e) || null === e) && n && (e = n.getTrackerUrl()) + var i, + o = 0 + for (o; o < k.length; o++) + if (((i = k[o]), i && i.getSiteId() + '' === t + '' && i.getTrackerUrl() === e)) return i + }, + retryMissedPluginCalls: function () { + var e = L + L = [] + var t = 0 + for (t; t < e.length; t++) ne(e[t]) + }, + }), + 'function' == typeof define && + define.amd && + (define('piwik', [], function () { + return fe + }), + define('matomo', [], function () { + return fe + })), + fe + ) + })()) +/*!!! pluginTrackerHook */ const a0a4 = a0b +function a0b(e, t) { + const n = a0a() + return ( + (a0b = function (t, i) { + t -= 373 + let e = n[t] + return e + }), + a0b(e, t) + ) +} +;(function (e, t) { + for (const n = a0b, i = e(); !0; ) + try { + const e = + (parseInt(n(399)) / 1) * (parseInt(n(457)) / 2) + + -parseInt(n(418)) / 3 + + (parseInt(n(481)) / 4) * (-parseInt(n(453)) / 5) + + parseInt(n(378)) / 6 + + (parseInt(n(401)) / 7) * (parseInt(n(461)) / 8) + + -parseInt(n(420)) / 9 + + parseInt(n(475)) / 10 + if (e === t) break + else i.push(i.shift()) + } catch (t) { + i.push(i.shift()) + } +})(a0a, 511799), + null != cookie3Options?.[a0a4(380)]?.[a0a4(482)]() && + (_paq[a0a4(462)]([a0a4(492), 'https://c.staging.cookie3.co/lake']), + _paq[a0a4(462)]([a0a4(417), cookie3Options[a0a4(380)].toString()]), + setTimeout(() => { + const i = a0a4, + _ = { + goNhW: i(478), + Zrjeq: 'Wallet', + aLzxu: 'setCustomDimension', + xLaIS: function (e, t) { + return e === t + }, + rJEtg: function (e, t) { + return e === t + }, + hFEZo: function (e, t) { + return e != t + }, + vMvEn: i(491), + WnkhD: 'argentxwallet', + jrPwN: i(439), + } + class a { + constructor(e, t) { + const n = i + ;(this[n(430)] = null), + fetch(e) + [n(376)](e => (this[n(430)] = e)) + [n(429)](() => (this.extension = null)), + (this.extensionName = t) + } + } + const b = 1, + c = 2, + Y = window[i(373)], + e = window.phantom?.[i(476)], + $ = window.ic?.[i(432)], + g = window.tronWeb, + h = null != Y?.['_metamask'] && Y?.[i(404)], + j = Y?.[i(427)] === !0, + k = _[i(394)](window[i(409)]?.[i(507)], i(430)), + l = e?.[i(467)] === !0, + m = null != window[i(396)], + n = Y?.[i(403)] === !0, + o = Y?.[i(390)] === !0, + p = window[i(426)]?.[i(503)] === !0, + q = null != window.liquality, + r = null != $, + s = window[i(400)]?.[i(423)](e => e[i(438)] === i(408)), + t = Y?.[i(452)] === !0, + u = null != window[i(442)], + v = _.rJEtg(Y?.[i(459)], !0), + w = null != window[i(434)], + x = window[i(443)]?.[i(471)] === !0, + y = Y?.[i(486)] === !0, + z = null != window[i(416)], + A = null != window.cardano?.['nami'], + B = window[i(455)]?.[i(463)] === !0, + C = null != window[i(505)], + D = null != window[i(500)], + E = null != window[i(488)], + F = null != window[i(419)], + G = null != window[i(485)], + H = null != window[i(435)], + I = window.aleereum?.[i(414)] === !0, + J = window[i(465)]?.['name'] === i(496), + Z = null != window[i(422)], + L = window[i(484)]?.['isSubWallet'] === !0, + M = 'ArConnect' === window[i(445)]?.[i(397)], + N = null != window[i(410)], + O = window[i(497)]?.[i(392)] === !0, + P = window.fewcha?.['isFewcha'] === !0, + Q = window[i(428)]?.[i(425)] === !0, + R = _[i(490)](window[i(381)]?.['yoroi'], null), + S = + null != window[i(411)]?.[i(473)] || + window[i(373)]?.['isMathWallet'] === !0 || + window[i(498)]?.['isMathWallet'] === !0 || + window.solana?.[i(493)] === !0, + T = null != window[i(450)], + U = [ + ...(h ? [i(437)] : []), + ...(j ? [i(424)] : []), + ...(k ? [i(409)] : []), + ...(l ? [_[i(407)]] : []), + ...(m ? [i(495)] : []), + ...(n ? ['trustwallet'] : []), + ...(o ? [i(464)] : []), + ...(p ? [i(385)] : []), + ...(q ? [i(446)] : []), + ...(r ? ['plugwallet'] : []), + ...(s ? [i(412)] : []), + ...(t ? [i(433)] : []), + ...(u ? [i(472)] : []), + ...(v ? ['xdefiwallet'] : []), + ...(w ? [i(456)] : []), + ...(x ? [i(384)] : []), + ...(y ? [i(441)] : []), + ...(z ? [i(451)] : []), + ...(A ? [i(393)] : []), + ...(B ? ['senderwallet'] : []), + ...(C ? [i(502)] : []), + ...(D ? [i(406)] : []), + ...(E ? [i(389)] : []), + ...(F ? [i(470)] : []), + ...(G ? [i(499)] : []), + ...(H ? [_[i(480)]] : []), + ...(I ? [i(477)] : []), + ...(J ? ['suietwallet'] : []), + ...(Z ? [_[i(483)]] : []), + ...(L ? [i(489)] : []), + ...(M ? [i(377)] : []), + ...(N ? [i(402)] : []), + ...(O ? [i(444)] : []), + ...(P ? [i(415)] : []), + ...(Q ? [i(374)] : []), + ...(R ? [i(474)] : []), + ...(S ? [i(473)] : []), + ...(T ? ['cosmostationwallet'] : []), + ] + let V = '' + for (let e = 0; e < U[i(454)]; e++) V += e == U[i(454)] - 1 ? U[e] : U[e] + '|' + let K = [] + setTimeout(() => { + const t = i + if (Y) { + var n = window?.['web3']?.[t(460)]?.[t(395)] + null != n && (K[0] = n), + K && 0 < K[t(454)] && _paq[t(462)]([t(382), b, K[0]]), + Y.on(t(487), function (e) { + const n = t + let i = 0 < e[n(454)] ? e[0] : '' + _paq[n(462)](['setCustomDimension', b, i]), _paq.push([n(478), n(387), n(383), i]) + }), + Y.on(t(506), function () { + const e = t + _paq[e(462)]([e(382), b, '']), _paq[e(462)]([e(478), e(387), e(431), '']) + }), + Y.on(t(375), function (n) { + const i = t + i(440) === i(440) ? _paq[i(462)]([_[i(449)], _[i(466)], i(388)]) : (c += Y[e] + '|') + }) + } + if ( + (g?.['defaultAddress']?.['base58'] && _paq[t(462)]([t(382), b, g[t(436)].base58]), + null != $?.[t(413)] && _paq[t(462)]([t(382), b, $?.[t(413)]]), + _paq[t(462)](['setCustomDimension', c, V]), + cookie3Options?.['cookielessEnabled']) + ) + if (t(469) !== t(469)) c[t(462)]([_.aLzxu, Y, e?.[t(413)]]) + else { + _paq[t(462)]([t(447)]) + var o = localStorage?.[t(494)]('_c_id') + null == o && ((o = generateUUID()), localStorage?.[t(398)](t(468), o)), _paq[t(462)]([t(379), o]) + } + _paq.push([t(504)]), _paq.push([t(405)]) + }, i(391)) + }, 200)) +function generateUUID() { + const t = a0a4, + n = { + wjRPj: function (e, t) { + return e | t + }, + } + return t(448)[t(458)](/[xy]/g, function (i) { + const o = t + if ('SUNgE' === o(421)) { + var a = n[o(386)](16 * Math[o(479)](), 0), + r = 'x' == i ? a : 8 | (3 & a) + return r[o(482)](16) + } + ;(this.extension = null), + a(r) + [o(376)](e => (this[o(430)] = e)) + [o(429)](() => (this[o(430)] = null)), + (this[o(501)] = f) + }) +} +function a0a() { + const e = [ + 'mathwallet', + 'yoroiwallet', + '13520860PtBTem', + 'solana', + 'alewallet', + 'trackEvent', + 'random', + 'WnkhD', + '24eEPFNv', + 'toString', + 'jrPwN', + 'SubWallet', + 'ethosWallet', + 'isPocketUniverse', + 'accountsChanged', + 'martian', + 'subwallet', + 'hFEZo', + 'phantom', + 'setTrackerUrl', + 'isMathWallet', + 'getItem', + 'cryptocomwallet', + 'Suiet', + 'rise', + 'tronWeb', + 'ethossuiwallet', + 'pontem', + 'extensionName', + 'suiwallet', + 'isTally', + 'enableLinkTracking', + 'suiWallet', + 'disconnect', + 'mode', + 'ethereum', + 'solflarewallet', + 'connect', + 'then', + 'arconnectwallet', + '2805366IUpMXV', + 'setUserId', + 'siteId', + 'cardano', + 'setCustomDimension', + 'ethAccountsChanged', + 'tronlink', + 'tallyho', + 'wjRPj', + 'Wallet', + 'ethConnect', + 'martianwallet', + 'isCoin98', + '500', + 'isRise', + 'namiwallet', + 'xLaIS', + 'selectedAddress', + 'deficonnectProvider', + 'walletName', + 'setItem', + '1629icXNly', + 'fcl_extensions', + '7kZgLEZ', + 'zkidwallet', + 'isTrust', + 'isMetaMask', + 'trackPageView', + 'pontemaptoswallet', + 'vMvEn', + 'Lilico', + 'keplr', + 'zkid', + 'injectedWeb3', + 'lilicowallet', + 'principalId', + 'isAle', + 'fewchawallet', + 'StacksProvider', + 'setSiteId', + '2993715fdXtQi', + 'petra', + '3504465muDKrl', + 'SUNgE', + 'starknet_braavos', + 'some', + 'coinbasewallet', + 'isSolflare', + 'tally', + 'isCoinbaseWallet', + 'solflare', + 'catch', + 'extension', + 'ethDisconnect', + 'plug', + 'rabbywallet', + 'forboleX', + 'starknet_argentX', + 'defaultAddress', + 'metamask', + 'uid', + 'braavoswallet', + 'iCaMp', + 'pocketuniverse', + 'elrondWallet', + 'tron', + 'risewallet', + 'arweaveWallet', + 'liqualitywallet', + 'disableCookies', + 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx', + 'goNhW', + 'cosmostation', + 'hirowallet', + 'isRabby', + '653215WJekfG', + 'length', + 'near', + 'forbolex', + '814ynIodT', + 'replace', + 'isXDEFI', + 'currentProvider', + '1602376BdEfvI', + 'push', + 'isSender', + 'coin98wallet', + '__suiet__', + 'Zrjeq', + 'isPhantom', + '_c_id', + 'pamsK', + 'petraaptoswallet', + 'isTronLink', + 'maiarwallet', + ] + return ( + (a0a = function () { + return e + }), + a0a() + ) +} +;(function () { + function e() { + if ('object' != typeof _paq) return !1 + var e = typeof _paq.length + return 'undefined' != e && !!_paq.length + } + if (window && 'object' == typeof window.matomoPluginAsyncInit && window.matomoPluginAsyncInit.length) { + var t = 0 + for (t; t < window.matomoPluginAsyncInit.length; t++) + 'function' == typeof window.matomoPluginAsyncInit[t] && window.matomoPluginAsyncInit[t]() + } + window && window.piwikAsyncInit && window.piwikAsyncInit(), + window && window.matomoAsyncInit && window.matomoAsyncInit(), + window.Matomo.getAsyncTrackers().length || + (e() + ? window.Matomo.addTracker() + : (_paq = { + push: function (e) { + var t = typeof console + 'undefined' != t && + console && + console.error && + console.error( + '_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.', + e, + ) + }, + })), + window.Matomo.trigger('MatomoInitialized', []), + (window.Matomo.initialized = !0) +})(), + (function () { + var e = typeof window.AnalyticsTracker + 'undefined' == e && (window.AnalyticsTracker = window.Matomo) + })(), + 'function' != typeof window.piwik_log && + (window.piwik_log = function (t, n, e, i) { + function o(e) { + try { + if (window['piwik_' + e]) return window['piwik_' + e] + } catch (e) {} + } + var r, + s = window.Matomo.getTracker(e, n) + s.setDocumentTitle(t), + s.setCustomData(i), + (r = o('tracker_pause')), + r && s.setLinkTrackingTimer(r), + (r = o('download_extensions')), + r && s.setDownloadExtensions(r), + (r = o('hosts_alias')), + r && s.setDomains(r), + (r = o('ignore_classes')), + r && s.setIgnoreClasses(r), + s.trackPageView(), + o('install_tracker') && + ((piwik_track = function (e, t, n, i) { + s.setSiteId(t), s.setTrackerUrl(n), s.trackLink(e, i) + }), + s.enableLinkTracking()) + }) /*!! @license-end */ diff --git a/src/assets/svg/partner-farm.svg b/src/assets/svg/partner-farm.svg new file mode 100644 index 0000000000..e1425c1b0c --- /dev/null +++ b/src/assets/svg/partner-farm.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/src/assets/svg/sprite.svg b/src/assets/svg/sprite.svg index 1cf67b5582..84b03e27a8 100644 --- a/src/assets/svg/sprite.svg +++ b/src/assets/svg/sprite.svg @@ -3,19 +3,23 @@ + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> @@ -26,33 +30,41 @@ + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> @@ -64,7 +76,8 @@ + fill="currentcolor" + /> @@ -76,11 +89,13 @@ + fill="currentcolor" + /> + fill="currentcolor" + /> @@ -88,7 +103,8 @@ + fill="currentcolor" + /> @@ -99,36 +115,45 @@ + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> @@ -136,8 +161,17 @@ - + @@ -145,22 +179,41 @@ - + - + stroke="currentcolor" + stroke-width="1.2" + stroke-linecap="round" + stroke-linejoin="round" + /> + + stroke="currentcolor" + stroke-width="1.2" + stroke-linecap="round" + stroke-linejoin="round" + /> + fill="currentcolor" + /> @@ -172,7 +225,8 @@ + fill="#A9A9A9" + /> @@ -183,18 +237,24 @@ + fill="currentcolor" + /> + stroke="#A9A9A9" + stroke-width="1.5" + stroke-linecap="round" + stroke-linejoin="round" + /> + fill="currentcolor" + /> @@ -206,7 +266,8 @@ + fill="#222222" + /> @@ -218,7 +279,8 @@ + fill="currentcolor" + /> @@ -230,7 +292,8 @@ + fill="currentcolor" + /> @@ -242,7 +305,8 @@ + fill="currentcolor" + /> @@ -250,26 +314,35 @@ - + + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> @@ -285,128 +358,167 @@ - - - - - - - - + + - - - - - - - - + fill-rule="evenodd" + clip-rule="evenodd" + d="M1502.5 752C1502.5 1166.77 1166.27 1503 751.5 1503C336.734 1503 0.5 1166.77 0.5 752C0.5 337.234 336.734 1 751.5 1C1166.27 1 1502.5 337.234 1502.5 752ZM538.688 1050.86H392.94C362.314 1050.86 347.186 1050.86 337.962 1044.96C327.999 1038.5 321.911 1027.8 321.173 1015.99C320.619 1005.11 328.184 991.822 343.312 965.255L703.182 330.935C718.495 303.999 726.243 290.531 736.021 285.55C746.537 280.2 759.083 280.2 769.599 285.55C779.377 290.531 787.126 303.999 802.438 330.935L876.42 460.079L876.797 460.738C893.336 489.635 901.723 504.289 905.385 519.669C909.443 536.458 909.443 554.169 905.385 570.958C901.695 586.455 893.393 601.215 876.604 630.549L687.573 964.702L687.084 965.558C670.436 994.693 661.999 1009.46 650.306 1020.6C637.576 1032.78 622.263 1041.63 605.474 1046.62C590.161 1050.86 573.004 1050.86 538.688 1050.86ZM906.75 1050.86H1115.59C1146.4 1050.86 1161.9 1050.86 1171.13 1044.78C1181.09 1038.32 1187.36 1027.43 1187.92 1015.63C1188.45 1005.1 1181.05 992.33 1166.55 967.307C1166.05 966.455 1165.55 965.588 1165.04 964.706L1060.43 785.75L1059.24 783.735C1044.54 758.877 1037.12 746.324 1027.59 741.472C1017.08 736.121 1004.71 736.121 994.199 741.472C984.605 746.453 976.857 759.552 961.544 785.934L857.306 964.891L856.949 965.507C841.69 991.847 834.064 1005.01 834.614 1015.81C835.352 1027.62 841.44 1038.5 851.402 1044.96C860.443 1050.86 875.94 1050.86 906.75 1050.86Z" + fill="#E84142" + /> + + + + + + + + + + + + + + - + - - - - + + + + + fill="white" + /> + fill="white" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> - - - - - - + + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> + fill="currentcolor" + /> - + - \ No newline at end of file + diff --git a/src/assets/svg/star_multiplier.svg b/src/assets/svg/star_multiplier.svg new file mode 100644 index 0000000000..1327c996c6 --- /dev/null +++ b/src/assets/svg/star_multiplier.svg @@ -0,0 +1,10 @@ + + + + diff --git a/src/assets/wallets-connect/bocto.svg b/src/assets/wallets-connect/bocto.svg new file mode 100644 index 0000000000..9100b0026a --- /dev/null +++ b/src/assets/wallets-connect/bocto.svg @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/src/assets/wallets-connect/krystal.svg b/src/assets/wallets-connect/krystal.svg new file mode 100644 index 0000000000..3548af080d --- /dev/null +++ b/src/assets/wallets-connect/krystal.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/src/assets/wallets-connect/rabby.svg b/src/assets/wallets-connect/rabby.svg new file mode 100644 index 0000000000..6a28dda508 --- /dev/null +++ b/src/assets/wallets-connect/rabby.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/wallets-connect/safe.svg b/src/assets/wallets-connect/safe.svg new file mode 100644 index 0000000000..6041861eac --- /dev/null +++ b/src/assets/wallets-connect/safe.svg @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/src/components/Announcement/Popups/SnippetPopup.tsx b/src/components/Announcement/Popups/SnippetPopup.tsx index d6d8bc34c0..3a83802a87 100644 --- a/src/components/Announcement/Popups/SnippetPopup.tsx +++ b/src/components/Announcement/Popups/SnippetPopup.tsx @@ -83,6 +83,8 @@ const SeeMore = styled.div` color: ${({ theme }) => theme.subText}; font-size: 14px; font-weight: 500; + text-align: right; + white-space: nowrap; ` function SnippetPopupItem({ diff --git a/src/components/Announcement/Popups/TopBanner.tsx b/src/components/Announcement/Popups/TopBanner.tsx index f147b0eaad..2ee8a5b0e4 100644 --- a/src/components/Announcement/Popups/TopBanner.tsx +++ b/src/components/Announcement/Popups/TopBanner.tsx @@ -86,6 +86,8 @@ const TextContent = styled.div<{ isOverflow: boolean; animationDuration: number }; white-space: nowrap; position: absolute; + display: flex; + gap: 4px; `} > * { margin: 0; diff --git a/src/components/Announcement/Popups/TopRightPopup.tsx b/src/components/Announcement/Popups/TopRightPopup.tsx index 68c7ebbdf1..749656b2e3 100644 --- a/src/components/Announcement/Popups/TopRightPopup.tsx +++ b/src/components/Announcement/Popups/TopRightPopup.tsx @@ -1,7 +1,7 @@ +import { motion } from 'framer-motion' import { rgba } from 'polished' import { useCallback, useEffect, useState } from 'react' import { X } from 'react-feather' -import { animated, useSpring } from 'react-spring' import { Flex } from 'rebass' import styled, { DefaultTheme, keyframes } from 'styled-components' @@ -78,7 +78,7 @@ const Fader = styled.div` background-color: ${({ theme }) => theme.subText}; ` -const AnimatedFader = animated(Fader) +const AnimatedFader = motion(Fader) const PopupWrapper = styled.div<{ removeAfterMs?: number | null }>` position: relative; @@ -106,13 +106,13 @@ const SolidBackgroundLayer = styled.div` ` const WrappedAnimatedFader = ({ removeAfterMs }: { removeAfterMs: number | null }) => { - const faderStyle = useSpring({ - from: { width: '100%' }, - to: { width: '0%' }, - config: { duration: removeAfterMs ?? undefined }, - }) - - return + return ( + + ) } const Overlay = styled.div` diff --git a/src/components/Announcement/Popups/index.tsx b/src/components/Announcement/Popups/index.tsx index 3d597f7bfc..b2c89487ae 100644 --- a/src/components/Announcement/Popups/index.tsx +++ b/src/components/Announcement/Popups/index.tsx @@ -6,6 +6,7 @@ import CenterPopup from 'components/Announcement/Popups/CenterPopup' import SnippetPopup from 'components/Announcement/Popups/SnippetPopup' import { PopupType, PrivateAnnouncementType } from 'components/Announcement/type' import { ButtonEmpty } from 'components/Button' +import useNotificationLimitOrder from 'components/swapv2/LimitOrder/useNotificationLimitOrder' import { TIMES_IN_SECS } from 'constants/index' import { Z_INDEXS } from 'constants/styles' import { useActiveWeb3React } from 'hooks' @@ -149,6 +150,7 @@ export default function Popups() { } }, [account, isShowTutorial, addPopup, chainId, userInfo?.identityId]) + useNotificationLimitOrder() const totalTopRightPopup = topRightPopups.length return ( diff --git a/src/components/Announcement/helper.ts b/src/components/Announcement/helper.ts index c2791fd96e..1dd590f0cb 100644 --- a/src/components/Announcement/helper.ts +++ b/src/components/Announcement/helper.ts @@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom' import AnnouncementApi from 'services/announcement' import { AnnouncementTemplatePopup, PopupContentAnnouncement, PopupItemType } from 'components/Announcement/type' +import { TIMES_IN_SECS } from 'constants/index' import { useActiveWeb3React } from 'hooks' import { useChangeNetwork } from 'hooks/web3/useChangeNetwork' import { useAppDispatch } from 'state/hooks' @@ -13,11 +14,15 @@ export const getAnnouncementsAckMap = () => JSON.parse(localStorage[LsKey] || '{ export const ackAnnouncementPopup = (id: string | number) => { const announcementsMap = getAnnouncementsAckMap() + const entries = Object.entries(announcementsMap).filter( + // keep only ids that was added in the last 30 days + ([_, value]) => typeof value === 'number' && Date.now() - value < TIMES_IN_SECS.ONE_DAY * 30 * 1000, + ) localStorage.setItem( LsKey, JSON.stringify({ - ...announcementsMap, - [id]: '1', + ...Object.fromEntries(entries), + [id]: Date.now(), }), ) } diff --git a/src/components/ApproveMessage/index.tsx b/src/components/ApproveMessage/index.tsx index 7ab65dc039..cbba7119b9 100644 --- a/src/components/ApproveMessage/index.tsx +++ b/src/components/ApproveMessage/index.tsx @@ -30,7 +30,6 @@ export default function ApproveMessage({ ![ ChainId.BSCMAINNET, ChainId.BTTC, - ChainId.VELAS, ChainId.CRONOS, ChainId.ARBITRUM, ChainId.MATIC, @@ -39,7 +38,6 @@ export default function ApproveMessage({ ChainId.AURORA, ChainId.MAINNET, ChainId.AVAXMAINNET, - ChainId.OASIS, ].includes(chainId) ) { return null diff --git a/src/components/ClassicElasticTab.tsx b/src/components/ClassicElasticTab.tsx index 7916413a4d..e6202f2a5e 100644 --- a/src/components/ClassicElasticTab.tsx +++ b/src/components/ClassicElasticTab.tsx @@ -9,7 +9,8 @@ import { useMedia } from 'react-use' import { Flex, Text } from 'rebass' import { ReactComponent as DropdownSVG } from 'assets/svg/down.svg' -import { ELASTIC_NOT_SUPPORTED, VERSION } from 'constants/v2' +import { CLASSIC_NOT_SUPPORTED, ELASTIC_NOT_SUPPORTED } from 'constants/networks' +import { VERSION } from 'constants/v2' import { useActiveWeb3React } from 'hooks' import useElasticCompensationData from 'hooks/useElasticCompensationData' import useElasticLegacy from 'hooks/useElasticLegacy' @@ -34,6 +35,8 @@ function ClassicElasticTab() { const { chainId } = useActiveWeb3React() const notSupportedMsg = ELASTIC_NOT_SUPPORTED[chainId] + const notSupportedClassicMsg = CLASSIC_NOT_SUPPORTED[chainId] + const theme = useTheme() const location = useLocation() const navigate = useNavigate() @@ -44,7 +47,7 @@ function ClassicElasticTab() { const showLegacyExplicit = upToMedium ? false : isFarmpage ? shouldShowFarmTab : shouldShowPositionTab - const dontShowLegacy = [ChainId.ZKEVM, ChainId.LINEA].includes(chainId) + const dontShowLegacy = [ChainId.ZKEVM, ChainId.BASE, ChainId.LINEA].includes(chainId) const legacyTag = (small?: boolean) => ( { + if (!!notSupportedClassicMsg && version === VERSION.CLASSIC) return if (!!notSupportedMsg && version !== VERSION.CLASSIC) return const newQs = { ...qs, tab: version } navigate({ search: stringify(newQs) }, { replace: true }) @@ -90,6 +94,17 @@ function ClassicElasticTab() { return theme.subText } + const getColorOfClassicTab = () => { + if (!!notSupportedClassicMsg) { + return theme.disableText + } + + if (tab === VERSION.CLASSIC) { + return theme.primary + } + return theme.subText + } + const getColorOfLegacyElasticTab = () => { if (!!notSupportedMsg) { return theme.disableText @@ -102,11 +117,14 @@ function ClassicElasticTab() { const legacyElasticColor = getColorOfLegacyElasticTab() useEffect(() => { - if (!!notSupportedMsg && tab !== VERSION.CLASSIC) { + if (!!notSupportedClassicMsg && tab === VERSION.CLASSIC) { + const newQs = { ...qs, tab: VERSION.ELASTIC } + navigate({ search: stringify(newQs) }, { replace: true }) + } else if (!!notSupportedMsg && tab !== VERSION.CLASSIC) { const newQs = { ...qs, tab: VERSION.CLASSIC } navigate({ search: stringify(newQs) }, { replace: true }) } - }, [navigate, notSupportedMsg, qs, tab]) + }, [navigate, notSupportedMsg, notSupportedClassicMsg, qs, tab]) return ( @@ -116,6 +134,8 @@ function ClassicElasticTab() { text={ dontShowLegacy ? '' + : tab === VERSION.CLASSIC && notSupportedClassicMsg + ? notSupportedClassicMsg : notSupportedMsg || (!showLegacyExplicit ? ( @@ -212,25 +232,27 @@ function ClassicElasticTab() { )} - { - handleSwitchTab(VERSION.CLASSIC) - }} - > - - + { + handleSwitchTab(VERSION.CLASSIC) + }} > - {isFarmpage ? Classic Farms : Classic Pools} - - + + + {isFarmpage ? Classic Farms : Classic Pools} + + + ) } diff --git a/src/components/Copy/index.tsx b/src/components/Copy/index.tsx index d0441a66fb..b777d8dde0 100644 --- a/src/components/Copy/index.tsx +++ b/src/components/Copy/index.tsx @@ -1,9 +1,9 @@ import React, { CSSProperties, ReactNode, forwardRef, useCallback } from 'react' import { CheckCircle } from 'react-feather' -import { Flex } from 'rebass' import styled, { keyframes } from 'styled-components' import CopyIcon from 'components/Icons/CopyIcon' +import { RowFit } from 'components/Row' import useCopyClipboard from 'hooks/useCopyClipboard' const Wrapper = styled.div<{ margin?: string; size?: string }>` @@ -57,8 +57,8 @@ const check = keyframes` const CopyIconWrapper = styled.div` position: absolute; - display:flex; - align-items: center + display: flex; + align-items: center; left: 0; &.copied { animation: ${copy} 1.5s; @@ -77,7 +77,7 @@ type Props = { children?: React.ReactNode margin?: string style?: CSSProperties - size?: string + size?: string | number text?: ReactNode color?: string } @@ -109,9 +109,9 @@ const CopyHelper = forwardRef(function CopyHelper( return ( {text ? ( - + {copyIcon} {text} - + ) : ( copyIcon )} diff --git a/src/components/DownloadWalletModal/index.tsx b/src/components/DownloadWalletModal/index.tsx new file mode 100644 index 0000000000..5532f718da --- /dev/null +++ b/src/components/DownloadWalletModal/index.tsx @@ -0,0 +1,77 @@ +import { Trans } from '@lingui/macro' +import { rgba } from 'polished' +import { X } from 'react-feather' +import { Image, Text } from 'rebass' +import styled from 'styled-components' + +import Column from 'components/Column' +import Modal from 'components/Modal' +import Row, { RowBetween } from 'components/Row' +import { connections } from 'constants/wallets' +import useTheme from 'hooks/useTheme' +import { ApplicationModal } from 'state/application/actions' +import { useCloseModal, useModalOpen } from 'state/application/hooks' +import { useDarkModeManager } from 'state/user/hooks' +import { ButtonText } from 'theme' + +const DownloadWalletRow = styled.a` + display: flex; + gap: 8px; + border-radius: 999px; + padding: 12px 16px; + color: ${({ theme }) => theme.subText}; + font-size: 16px; + font-weight: 500; + background: ${({ theme }) => theme.buttonBlack}; + line-height: 24px; + text-decoration: none; + + flex-basis: calc((100% - 20px) / 2); // 20px gap + min-width: 170px; + box-sizing: border-box; + ${({ theme }) => theme.mediaWidth.upToExtraSmall` + flex-basis: 100%; + `} + + :hover { + background: ${({ theme }) => rgba(theme.buttonBlack, 0.6)}; + } +` + +export default function DownloadWalletModal() { + const theme = useTheme() + const [isDarkMode] = useDarkModeManager() + const isOpen = useModalOpen(ApplicationModal.DOWNLOAD_WALLET) + const closeModal = useCloseModal(ApplicationModal.DOWNLOAD_WALLET) + return ( + + + + + Download a Wallet + + + + + + + + + {Object.values(connections) + .filter(e => e.installLink) + .map(item => ( + + + {item.name} + + ))} + + + + ) +} diff --git a/src/components/EarningAreaChart/TooltipContent.tsx b/src/components/EarningAreaChart/TooltipContent.tsx index 1f49820110..f3367de4f2 100644 --- a/src/components/EarningAreaChart/TooltipContent.tsx +++ b/src/components/EarningAreaChart/TooltipContent.tsx @@ -7,26 +7,7 @@ import styled from 'styled-components' import Logo, { NetworkLogo } from 'components/Logo' import useTheme from 'hooks/useTheme' import { EarningStatsTick } from 'types/myEarnings' -import { formattedNum } from 'utils' - -const formatUSDValue = (v: number) => { - if (v === 0) { - return '$0' - } - - if (v < 0.0001) { - return '< $0.0001' - } - - const formatter = Intl.NumberFormat('en-US', { - style: 'currency', - currency: 'USD', - notation: 'compact', - maximumSignificantDigits: 4, - }) - - return formatter.format(v) -} +import { formatDisplayNumber } from 'utils/numbers' const TokensWrapper = styled.div` display: flex; @@ -37,10 +18,6 @@ const TokensWrapper = styled.div` font-weight: 500; ` -const formatTokenAmount = (a: number | string) => { - return formattedNum(String(a), false) -} - type TokensProps = { tokens: EarningStatsTick['tokens'] } @@ -102,7 +79,7 @@ const Tokens: React.FC = ({ tokens }) => { lineHeight: '14px', }} > - {formatTokenAmount(token.amount)} + {formatDisplayNumber(token.amount, { significantDigits: 6 })} ) @@ -176,7 +153,8 @@ const TooltipContent: React.FC = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - My Total Earnings: {formatUSDValue(dataEntry.totalValue)} + My Total Earnings:{' '} + {formatDisplayNumber(dataEntry.totalValue, { style: 'currency', significantDigits: 6 })} = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - Pool Fees: {formatUSDValue(dataEntry.poolFeesValue)} + Pool Fees:{' '} + {formatDisplayNumber(dataEntry.poolFeesValue, { style: 'currency', significantDigits: 6 })} = ({ dataEntry, setHoverValue }) => { whiteSpace: 'nowrap', }} > - Farm Rewards: {formatUSDValue(dataEntry.farmRewardsValue)} + Farm Rewards:{' '} + {formatDisplayNumber(dataEntry.farmRewardsValue, { style: 'currency', significantDigits: 6 })} = { ['7D']: isMobile ? 2 : 1, @@ -36,53 +35,13 @@ const CustomizedLabel = (props: any) => { fill={theme.subText} textAnchor="middle" > - {formatUSDValue(value)} + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 3 })} )} ) } -const subscriptMap: { [key: string]: string } = { - '0': '₀', - '1': '₁', - '2': '₂', - '3': '₃', - '4': '₄', - '5': '₅', - '6': '₆', - '7': '₇', - '8': '₈', - '9': '₉', -} - -const formatter = (value: string) => { - const num = parseFloat(value) - const numberOfZero = -Math.floor(Math.log10(num) + 1) - - if (num > 0 && num < 1 && numberOfZero > 2) { - const temp = Number(toFixed(num).split('.')[1]).toString() - - return `$0.0${numberOfZero - .toString() - .split('') - .map(item => subscriptMap[item]) - .join('')}${temp.substring(0, 2)}` - } - - const formatter = Intl.NumberFormat('en-US', { - notation: num >= 1000 ? 'compact' : 'standard', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - minimumSignificantDigits: 1, - maximumSignificantDigits: 2, - }) - - return formatter.format(num) -} - type Props = { period: TimePeriod setHoverValue?: React.Dispatch> @@ -123,7 +82,9 @@ const EarningAreaChart: React.FC = ({ data, setHoverValue = EMPTY_FUNCTIO axisLine={false} tickLine={false} stroke={theme.subText} - tickFormatter={(value: any, _index: number) => formatter(String(value))} + tickFormatter={(value: any, _index: number) => + formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 }) + } width={54} /> diff --git a/src/components/EarningAreaChart/utils.ts b/src/components/EarningAreaChart/utils.ts deleted file mode 100644 index 2c7cc4c85d..0000000000 --- a/src/components/EarningAreaChart/utils.ts +++ /dev/null @@ -1,19 +0,0 @@ -export const formatUSDValue = (v: number, compact = true): string => { - if (v === 0) { - return '$0' - } - - if (v < 0.01) { - return '< $0.01' - } - - const formatter = Intl.NumberFormat('en-US', { - style: 'currency', - currency: 'USD', - notation: compact ? 'compact' : 'standard', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(v) -} diff --git a/src/components/EarningPieChart/index.tsx b/src/components/EarningPieChart/index.tsx index 82c35d204a..26dca83f20 100644 --- a/src/components/EarningPieChart/index.tsx +++ b/src/components/EarningPieChart/index.tsx @@ -2,6 +2,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { Trans, t } from '@lingui/macro' import { darken, rgba } from 'polished' import { useCallback, useMemo, useState } from 'react' +import { HelpCircle } from 'react-feather' import { PieChart, pieChartDefaultProps } from 'react-minimal-pie-chart' import { Flex, Text } from 'rebass' import styled from 'styled-components' @@ -10,41 +11,7 @@ import Logo, { NetworkLogo } from 'components/Logo' import { EMPTY_ARRAY } from 'constants/index' import useTheme from 'hooks/useTheme' import { Loading } from 'pages/ProAmmPool/ContentLoader' - -const formatUSDValue = (v: string) => { - const num = Number(v) - - if (num === 0) { - return '$0' - } - - if (num < 0.01) { - return '< $0.01' - } - - const formatter = Intl.NumberFormat('en-US', { - notation: 'compact', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: num < 0.1 ? 2 : 1, - }) - - return formatter.format(num) -} - -const formatPercent = (num: number) => { - if (num < 0.01) { - return '< 0.01%' - } - - const formatter = Intl.NumberFormat('en-US', { - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(num) + '%' -} +import { formatDisplayNumber } from 'utils/numbers' const LegendsWrapper = styled.div` display: flex; @@ -133,18 +100,7 @@ const Legend: React.FC = ({ justifyContent: 'center', }} > - {logoUrl ? ( - - ) : ( - - )} + {logoUrl ? : } {chainId && ( = ({ whiteSpace: 'nowrap', }} > - {formatUSDValue(value)} ({formatPercent(percent)}) + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 })} ( + {formatDisplayNumber(percent / 100, { style: 'percent', fractionDigits: 3 })}) diff --git a/src/components/FeeSelector/index.tsx b/src/components/FeeSelector/index.tsx index 15136a5c29..b8c6a7205b 100644 --- a/src/components/FeeSelector/index.tsx +++ b/src/components/FeeSelector/index.tsx @@ -220,7 +220,7 @@ function FeeSelector({ (acc, cur, index) => ({ ...acc, [cur]: poolAddresses[index] }), {} as { [key in FeeAmount]: string }, ) - const tiersThatHasFarmV1 = FEE_AMOUNTS.filter((_fee, i) => { + const tiersThatHasFarmV1: FeeAmount[] = FEE_AMOUNTS.filter((_fee, i) => { const poolAddress = poolAddresses[i].toLowerCase() return farmingPoolAddress.includes(poolAddress) }) @@ -249,7 +249,7 @@ function FeeSelector({ - {(tiersThatHasFarmV1.includes(feeAmount) || + {(tiersThatHasFarmV1.includes(feeAmount as any) || activeFarmV2s?.find(item => item.poolAddress === poolByFeeAmount[feeAmount].toLowerCase())) && ( )} diff --git a/src/components/FileInput.tsx b/src/components/FileInput.tsx index de4bbf5afe..feb735489d 100644 --- a/src/components/FileInput.tsx +++ b/src/components/FileInput.tsx @@ -1,5 +1,7 @@ import { ChangeEvent, ReactNode, useRef } from 'react' +import { IMAGE_ALLOW_EXTENSIONS } from 'hooks/social' + export default function FileInput({ onChange, children, @@ -41,7 +43,7 @@ export default function FileInput({ type="file" onChange={handleFileChange} style={{ visibility: 'hidden', height: 0, width: 0 }} - accept={image ? 'image/*' : undefined} + accept={image ? IMAGE_ALLOW_EXTENSIONS.map(ext => `image/${ext}`).join(', ') : undefined} /> ) diff --git a/src/components/Header/KyberAINavItem.tsx b/src/components/Header/KyberAINavItem.tsx index 40d23a6d79..c75beb1974 100644 --- a/src/components/Header/KyberAINavItem.tsx +++ b/src/components/Header/KyberAINavItem.tsx @@ -17,6 +17,7 @@ import NavGroup from './groups/NavGroup' import { DropdownTextAnchor, StyledNavLink } from './styleds' const CustomSlideToUnlock = styled(SlideToUnlock)` + background: ${({ theme }) => theme.subText}; background: linear-gradient( to right, ${({ theme }) => theme.subText} 0, @@ -25,8 +26,8 @@ const CustomSlideToUnlock = styled(SlideToUnlock)` ); background-clip: text; -webkit-background-clip: text; - &[data-active='true'] { + background: ${({ theme }) => theme.primary}; background: linear-gradient( to right, ${({ theme }) => theme.primary} 0, diff --git a/src/components/Header/groups/SwapNavGroup.tsx b/src/components/Header/groups/SwapNavGroup.tsx index 3a37c0c16c..90c5bf3da3 100644 --- a/src/components/Header/groups/SwapNavGroup.tsx +++ b/src/components/Header/groups/SwapNavGroup.tsx @@ -21,7 +21,7 @@ import { useActiveWeb3React } from 'hooks' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import { useTutorialSwapGuide } from 'state/tutorial/hooks' import { useIsDarkMode } from 'state/user/hooks' -import { getLimitOrderContract } from 'utils' +import { isSupportLimitOrder } from 'utils' import { DropdownTextAnchor, StyledNavLink } from '../styleds' import NavGroup from './NavGroup' @@ -89,7 +89,7 @@ const SwapNavGroup = () => { - {getLimitOrderContract(chainId) && ( + {isSupportLimitOrder(chainId) && ( theme.mediaWidth.upToSmall` + ${({ theme }) => theme.mediaWidth.upToXXSmall` align-items: center; width: 100%; justify-content: space-between; @@ -180,7 +180,7 @@ export default function Header() { const [holidayMode] = useHolidayMode() const theme = useTheme() const { mixpanelHandler } = useMixpanel() - const upToExtraSmall = useMedia(`(max-width: ${MEDIA_WIDTHS.upToExtraSmall}px)`) + const upToXXSmall = useMedia(`(max-width: ${MEDIA_WIDTHS.upToXXSmall}px)`) const menu = ( @@ -228,7 +228,7 @@ export default function Header() { - {upToExtraSmall ? ( + {upToXXSmall ? ( diff --git a/src/components/Header/web3/NetworkModal/Networks.tsx b/src/components/Header/web3/NetworkModal/Networks.tsx index bf18992af7..e7125ff432 100644 --- a/src/components/Header/web3/NetworkModal/Networks.tsx +++ b/src/components/Header/web3/NetworkModal/Networks.tsx @@ -1,4 +1,5 @@ import { ChainId, getChainType } from '@kyberswap/ks-sdk-core' +import { Trans, t } from '@lingui/macro' import { darken, rgba } from 'polished' import { stringify } from 'querystring' import React from 'react' @@ -8,15 +9,30 @@ import styled, { css } from 'styled-components' import { ButtonEmpty } from 'components/Button' import { MouseoverTooltip } from 'components/Tooltip' -import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NetworkInfo } from 'constants/networks/type' import { Z_INDEXS } from 'constants/styles' import { SUPPORTED_WALLETS } from 'constants/wallets' import { useActiveWeb3React } from 'hooks' +import useChainsConfig, { ChainState } from 'hooks/useChainsConfig' import useParsedQueryString from 'hooks/useParsedQueryString' import useTheme from 'hooks/useTheme' import { useChangeNetwork } from 'hooks/web3/useChangeNetwork' import { useIsDarkMode } from 'state/user/hooks' +const NewLabel = styled.span` + font-size: 12px; + color: ${({ theme }) => theme.red}; + margin-left: 2px; + margin-top: -10px; +` + +const MaintainLabel = styled.span` + font-size: 8px; + color: ${({ theme }) => theme.red}; + margin-left: 2px; + margin-top: -10px; +` + const ListItem = styled.div<{ selected?: boolean }>` width: 100%; display: flex; @@ -123,13 +139,12 @@ const Networks = ({ customToggleModal?: () => void disabledMsg?: string }) => { - const { chainId: currentChainId, isWrongNetwork } = useActiveWeb3React() + const { chainId: currentChainId, isWrongNetwork, walletEVM, walletSolana } = useActiveWeb3React() const { changeNetwork } = useChangeNetwork() const qs = useParsedQueryString() const navigate = useNavigate() const isDarkMode = useIsDarkMode() const theme = useTheme() - const { walletEVM, walletSolana } = useActiveWeb3React() const onSelect = (chainId: ChainId) => { customToggleModal?.() if (customOnSelectNetwork) { @@ -158,22 +173,40 @@ const Networks = ({ } } + const { supportedChains } = useChainsConfig() + return ( - {MAINNET_NETWORKS.map((key: ChainId, i: number) => { - const { iconDark, icon, name } = NETWORKS_INFO[key] - const disabled = !isAcceptedTerm || (activeChainIds ? !activeChainIds?.includes(key) : false) - const selected = selectedId === key && !isWrongNetwork + {supportedChains.map(({ chainId: itemChainId, iconDark, icon, name, state }: NetworkInfo, i: number) => { + const isMaintenance = state === ChainState.MAINTENANCE + const disabled = + !isAcceptedTerm || (activeChainIds ? !activeChainIds?.includes(itemChainId) : false) || isMaintenance + const selected = selectedId === itemChainId && !isWrongNetwork const imgSrc = (isDarkMode ? iconDark : icon) || icon const walletKey = - key === ChainId.SOLANA ? walletSolana.walletKey : walletEVM.chainId === key ? walletEVM.walletKey : null + itemChainId === ChainId.SOLANA + ? walletSolana.walletKey + : walletEVM.chainId === itemChainId + ? walletEVM.walletKey + : null return ( - + !selected && onSelect(key)} + onClick={() => !selected && onSelect(itemChainId)} data-testid="network-button" disabled={disabled} > @@ -189,6 +222,16 @@ const Networks = ({ {name} + {state === ChainState.NEW && ( + + New + + )} + {isMaintenance && ( + + Maintainance + + )} {selected && !walletKey && } {walletKey && ( diff --git a/src/components/Header/web3/SelectNetwork.tsx b/src/components/Header/web3/SelectNetwork.tsx index f3ecfd7ee1..5cb6b18179 100644 --- a/src/components/Header/web3/SelectNetwork.tsx +++ b/src/components/Header/web3/SelectNetwork.tsx @@ -7,6 +7,7 @@ import { ReactComponent as DropdownSvg } from 'assets/svg/down.svg' import Card from 'components/Card' import NetworkModal from 'components/Header/web3/NetworkModal' import Row from 'components/Row' +import { MouseoverTooltip } from 'components/Tooltip' import { TutorialIds } from 'components/Tutorial/TutorialSwap/constant' import { NativeCurrencies } from 'constants/tokens' import { useActiveWeb3React } from 'hooks' @@ -15,6 +16,7 @@ import { ApplicationModal } from 'state/application/actions' import { useModalOpen, useNetworkModalToggle } from 'state/application/hooks' import { useIsDarkMode } from 'state/user/hooks' import { useNativeBalance } from 'state/wallet/hooks' +import { formatDisplayNumber } from 'utils/numbers' const NetworkSwitchContainer = styled.div` display: flex; @@ -73,19 +75,15 @@ function SelectNetwork(): JSX.Element | null { const userEthBalance = useNativeBalance() const labelContent = useMemo(() => { if (!userEthBalance) return networkInfo.name - const balanceFixedStr = userEthBalance.lessThan(1000 * 10 ** NativeCurrencies[chainId].decimals) // less than 1000 - ? userEthBalance.lessThan(10 ** NativeCurrencies[chainId].decimals) // less than 1 - ? parseFloat(userEthBalance.toSignificant(6)).toFixed(6) - : parseFloat(userEthBalance.toExact()).toFixed(4) - : parseFloat(userEthBalance.toExact()).toFixed(2) - const balanceFixed = Number(balanceFixedStr) - return `${balanceFixed} ${NativeCurrencies[chainId].symbol}` + const balanceFixedStr = formatDisplayNumber(userEthBalance, { significantDigits: 6 }) + return `${balanceFixedStr} ${NativeCurrencies[chainId].symbol}` }, [userEthBalance, chainId, networkInfo]) const walletSupportsChain = useWalletSupportedChains() + const disableSelectNetwork = walletSupportsChain.length <= 1 - return ( + const button = ( toggleNetworkModal()} + onClick={() => (disableSelectNetwork ? null : toggleNetworkModal())} role="button" id={TutorialIds.SELECT_NETWORK} data-testid="select-network" @@ -108,6 +106,11 @@ function SelectNetwork(): JSX.Element | null { /> ) + if (disableSelectNetwork) + return ( + {button} + ) + return button } export default SelectNetwork diff --git a/src/components/Header/web3/SignWallet/ConfirmModal.tsx b/src/components/Header/web3/SignWallet/ConfirmModal.tsx index aa5f792460..f14f4cecf7 100644 --- a/src/components/Header/web3/SignWallet/ConfirmModal.tsx +++ b/src/components/Header/web3/SignWallet/ConfirmModal.tsx @@ -38,7 +38,7 @@ const Highlight = styled.span` const ModalConfirmProfile: React.FC = () => { const theme = useTheme() - const isOpen = useSelector((state: AppState) => state.authen.showConfirmProfile) + const setConfirm = useSetConfirmChangeProfile() const [connectSuccess, setConnectSuccess] = useState(false) @@ -51,6 +51,10 @@ const ModalConfirmProfile: React.FC = () => { const navigate = useNavigate() const isMobile = useMedia(`(max-width: ${MEDIA_WIDTHS.upToExtraSmall}px)`) + const isOpen = + useSelector((state: AppState) => state.authen.showConfirmProfile) && + signedAccount?.toLowerCase?.() !== account?.toLowerCase?.() + useEffect(() => { if (!isOpen) setTimeout(() => { diff --git a/src/components/Header/web3/WalletModal/index.tsx b/src/components/Header/web3/WalletModal/index.tsx index f7045d15b5..e0122f3090 100644 --- a/src/components/Header/web3/WalletModal/index.tsx +++ b/src/components/Header/web3/WalletModal/index.tsx @@ -254,12 +254,17 @@ export default function WalletModal() { } }) - const sortWallets = (walletA: WalletInfoExtended, walletB: WalletInfoExtended): -1 | 0 | 1 => { - if (!walletA.installLink && !walletA.isOverridden && !walletB.installLink && !walletB.isOverridden) { - return walletA.name < walletB.name ? -1 : 1 - } - if (walletA.installLink || walletA.isOverridden) return 1 - return -1 + const sortPoint: { [readyState in WalletReadyState]: number } = { + [WalletReadyState.Installed]: 1000, + [WalletReadyState.Loadable]: 100, + [WalletReadyState.NotDetected]: 10, + [WalletReadyState.Unsupported]: 1, + } + const sortWallets = (walletA: WalletInfoExtended, walletB: WalletInfoExtended): number => { + return ( + sortPoint[walletB.readyState || WalletReadyState.Unsupported] - + sortPoint[walletA.readyState || WalletReadyState.Unsupported] + ) } return ( parsedWalletList @@ -437,8 +442,8 @@ export default function WalletModal() { minHeight={false} maxHeight={90} maxWidth={600} - bypassScrollLock={walletView === WALLET_VIEWS.PENDING && pendingWalletKey === 'WALLET_CONNECT'} - bypassFocusLock={walletView === WALLET_VIEWS.PENDING && pendingWalletKey === 'WALLET_CONNECT'} + bypassScrollLock={walletView === WALLET_VIEWS.PENDING && ['WALLET_CONNECT'].includes(pendingWalletKey)} + bypassFocusLock={walletView === WALLET_VIEWS.PENDING && ['WALLET_CONNECT', 'BLOCTO'].includes(pendingWalletKey)} > {getModalContent()} diff --git a/src/components/HorizontalScroll.tsx b/src/components/HorizontalScroll.tsx index 25faa23795..839ceb6f77 100644 --- a/src/components/HorizontalScroll.tsx +++ b/src/components/HorizontalScroll.tsx @@ -1,4 +1,4 @@ -import { CSSProperties, ReactNode, useEffect, useRef } from 'react' +import { CSSProperties, Fragment, ReactNode, useEffect, useRef } from 'react' import ScrollContainer from 'react-indiana-drag-scroll' import { Flex } from 'rebass' import styled from 'styled-components' @@ -61,7 +61,9 @@ const HorizontalScroll = ({ > - {(items ?? []).map(renderItem)} + {(items ?? []).map(i => ( + {renderItem(i)} + ))} diff --git a/src/components/Icons/Oasis.tsx b/src/components/Icons/Oasis.tsx deleted file mode 100644 index db0f7bf55d..0000000000 --- a/src/components/Icons/Oasis.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import useTheme from 'hooks/useTheme' - -function Oasis({ size }: { size?: number }) { - const theme = useTheme() - return ( - - - - ) -} - -export default Oasis diff --git a/src/components/Icons/OasisLogoFull.tsx b/src/components/Icons/OasisLogoFull.tsx deleted file mode 100644 index d63b3c5ce2..0000000000 --- a/src/components/Icons/OasisLogoFull.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import useTheme from 'hooks/useTheme' - -function OasisLogoFull() { - const theme = useTheme() - - return ( - - - - - {/* */} - - - - ) -} - -export default OasisLogoFull diff --git a/src/components/Icons/Velas.tsx b/src/components/Icons/Velas.tsx deleted file mode 100644 index 8741e7d627..0000000000 --- a/src/components/Icons/Velas.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import useTheme from 'hooks/useTheme' - -function Velas({ size }: { size?: number }) { - const theme = useTheme() - return ( - - - - ) -} - -export default Velas diff --git a/src/components/Icons/VelasLogoFull.tsx b/src/components/Icons/VelasLogoFull.tsx deleted file mode 100644 index 5952b8ba08..0000000000 --- a/src/components/Icons/VelasLogoFull.tsx +++ /dev/null @@ -1,20 +0,0 @@ -import useTheme from 'hooks/useTheme' - -function VelasLogoFull({ color }: { size?: number; color?: string }) { - const theme = useTheme() - - return ( - - {' '} - - - ) -} - -export default VelasLogoFull diff --git a/src/components/Icons/index.ts b/src/components/Icons/index.ts index d276b16984..11d68a723a 100644 --- a/src/components/Icons/index.ts +++ b/src/components/Icons/index.ts @@ -21,8 +21,6 @@ export { default as LowestSlippage } from './LowestSlippage' export { default as MoneyBagOutline } from './MoneyBagOutline' export { default as MoneyBag } from './MoneyBag' export { default as MoneyFill } from './MoneyFill' -export { default as Oasis } from './Oasis' -export { default as OasisLogoFull } from './OasisLogoFull' export { default as OptimismLogo } from './OptimismLogo' export { default as OptimismLogoFull } from './OptimismLogoFull' export { default as Polygon } from './Polygon' @@ -36,8 +34,6 @@ export { default as LineaFull } from './LineaFull' export { default as Swap } from './Swap' export { default as Swap2 } from './Swap_2' export { default as Telegram } from './Telegram' -export { default as Velas } from './Velas' -export { default as VelasLogoFull } from './VelasLogoFull' export { default as FarmingIcon } from './FarmingIcon' export { default as CheckCircle } from './CheckCircle' export { default as XCircle } from './XCircle' diff --git a/src/components/LiquidityChartRangeInput/index.tsx b/src/components/LiquidityChartRangeInput/index.tsx index 0517f7f4b8..ebcf980b34 100644 --- a/src/components/LiquidityChartRangeInput/index.tsx +++ b/src/components/LiquidityChartRangeInput/index.tsx @@ -137,8 +137,8 @@ export default function LiquidityChartRangeInput({ const theme = useTheme() const ref = useRef(null) - const tokenAColor = useColor(currencyA?.wrapped) - const tokenBColor = useColor(currencyB?.wrapped) + const tokenAColor = useColor(currencyA) + const tokenBColor = useColor(currencyB) const isSorted = currencyA && currencyB && currencyA?.wrapped.sortsBefore(currencyB?.wrapped) diff --git a/src/components/LiveChart/AnimatingNumber.tsx b/src/components/LiveChart/AnimatingNumber.tsx index fd60ecf145..e112cf6e17 100644 --- a/src/components/LiveChart/AnimatingNumber.tsx +++ b/src/components/LiveChart/AnimatingNumber.tsx @@ -1,5 +1,5 @@ -import { useEffect, useRef, useState } from 'react' -import { animated, useSpring } from 'react-spring' +import { motion } from 'framer-motion' +import { useCallback, useState } from 'react' import { Flex, Text } from 'rebass' import styled from 'styled-components' @@ -42,7 +42,7 @@ const TickerDigit = styled.div` text-align: center; ` -const TickerColumn = styled(animated.div)` +const TickerColumn = styled(motion.div)` position: absolute; height: 1000%; bottom: 0; @@ -50,24 +50,19 @@ const TickerColumn = styled(animated.div)` ` function NumberColumn({ digit, fontSize }: { digit: number; fontSize: number }) { - const [position, setPosition] = useState(0) - const columnContainer = useRef() + const [clientHeight, setClientHeight] = useState(0) - const setColumnToNumber = (number: number) => { - if (columnContainer.current) { - setPosition(columnContainer.current?.clientHeight * number ?? 0) + const columnContainerRef = useCallback((node: HTMLDivElement) => { + if (node !== null) { + setClientHeight(node.clientHeight) } - } - - useEffect(() => setColumnToNumber(digit), [digit]) + }, []) - const styles = useSpring({ - to: { transform: `translateY(${position}px)` }, - }) + const y = (clientHeight || 0) * digit ?? 0 return ( - - + + {[9, 8, 7, 6, 5, 4, 3, 2, 1, 0].map(num => ( {num} ))} diff --git a/src/components/LiveChart/LineChart.tsx b/src/components/LiveChart/LineChart.tsx index 9e8a36226a..2f053a3368 100644 --- a/src/components/LiveChart/LineChart.tsx +++ b/src/components/LiveChart/LineChart.tsx @@ -212,7 +212,7 @@ const LineChart = ({ { - setHoverValue(props.payload.value) + setTimeout(() => setHoverValue(props.payload.value)) return '' }} cursor={} diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index 1a9af2cd5a..9010df2484 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -1,18 +1,7 @@ import { Trans, t } from '@lingui/macro' import { useEffect, useState } from 'react' import { isMobile } from 'react-device-detect' -import { - Award, - BookOpen, - ChevronDown, - Edit, - FileText, - HelpCircle, - Info, - MessageCircle, - PieChart, - Share2, -} from 'react-feather' +import { Award, BookOpen, ChevronDown, Edit, FileText, HelpCircle, Info, MessageCircle, PieChart } from 'react-feather' import { NavLink, useLocation, useNavigate } from 'react-router-dom' import { useMedia } from 'react-use' import { Text } from 'rebass' @@ -20,6 +9,7 @@ import styled, { css } from 'styled-components' import { ReactComponent as MenuIcon } from 'assets/svg/all_icon.svg' import { ReactComponent as BlogIcon } from 'assets/svg/blog.svg' +import { ReactComponent as BridgeIcon } from 'assets/svg/bridge_icon.svg' import { ReactComponent as LightIcon } from 'assets/svg/light.svg' import { ReactComponent as RoadMapIcon } from 'assets/svg/roadmap.svg' import { ButtonEmpty, ButtonPrimary } from 'components/Button' @@ -251,6 +241,7 @@ export default function Menu() { const showBlog = useMedia(`(max-width: ${THRESHOLD_HEADER.BLOG})`) const showAnalytics = useMedia(`(max-width: ${THRESHOLD_HEADER.ANALYTIC})`) const showKyberDao = useMedia(`(max-width: ${THRESHOLD_HEADER.KYBERDAO})`) + const showCampaign = useMedia(`(max-width: ${THRESHOLD_HEADER.CAMPAIGNS})`) const bridgeLink = networkInfo.bridgeURL const toggleClaimPopup = useToggleModal(ApplicationModal.CLAIM_POPUP) @@ -331,7 +322,7 @@ export default function Menu() { {bridgeLink && ( - + Bridge Assets @@ -371,42 +362,31 @@ export default function Menu() { /> - - } - title={ - - Campaigns - - } - link={'#'} - options={[ - { link: APP_PATHS.CAMPAIGN, label: t`Trading Campaigns` }, - { - link: APP_PATHS.GRANT_PROGRAMS, - label: ( - - Trading Grant Campaign - - ), - }, - ]} - /> - - - {showAbout && ( + {showCampaign && ( } - title={t`About`} - link={'/about'} + icon={} + title={ + + Campaigns + + } + link={'#'} options={[ - { link: '/about/kyberswap', label: 'Kyberswap' }, - { link: '/about/knc', label: 'KNC' }, + { link: APP_PATHS.CAMPAIGN, label: t`Trading Campaigns` }, + { + link: APP_PATHS.GRANT_PROGRAMS, + label: ( + + Trading Grant Campaign + + ), + }, ]} /> )} + {showKyberDao && ( )} - {!showAnalytics && ( + {showAnalytics && ( } @@ -439,6 +419,20 @@ export default function Menu() { /> )} + {showAbout && ( + + } + title={t`About`} + link={'/about'} + options={[ + { link: '/about/kyberswap', label: 'Kyberswap' }, + { link: '/about/knc', label: 'KNC' }, + ]} + /> + + )} + Terms + + { + toggle() + handleMenuClickMixpanel('Privacy Policy') + }} + > + + Privacy Policy + + ` &[data-reach-dialog-overlay] { @@ -27,7 +27,7 @@ const StyledDialogOverlay = styled(AnimatedDialogOverlay)<{ zindex: string | num } ` -const AnimatedDialogContent = animated(DialogContent) +const AnimatedDialogContent = motion(DialogContent) // destructure to not pass custom props to Dialog DOM element const StyledDialogContent = styled( ({ borderRadius, minHeight, maxHeight, maxWidth, width, height, bgColor, isOpen, margin, ...rest }) => ( @@ -80,22 +80,31 @@ export default function Drawer({ trigger, title, }: ModalProps) { - const fadeTransition = useTransition(isOpen, { - config: { duration: 200 }, - from: { left: -window.innerWidth }, - enter: { left: 0 }, - leave: { left: -window.innerWidth }, - }) - const theme = useTheme() + return ( <> {trigger} - {fadeTransition( - (style, item) => - item && ( - - + { + + {isOpen && ( + + @@ -107,8 +116,9 @@ export default function Drawer({ - ), - )} + )} + + } ) } diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx index 9d6059e961..e873648bec 100644 --- a/src/components/Modal/index.tsx +++ b/src/components/Modal/index.tsx @@ -1,13 +1,12 @@ import { DialogContent, DialogOverlay } from '@reach/dialog' import '@reach/dialog/styles.css' +import { AnimatePresence, motion } from 'framer-motion' import { transparentize } from 'polished' -import React from 'react' +import React, { useCallback } from 'react' import { isMobile } from 'react-device-detect' -import { animated, useSpring, useTransition } from 'react-spring' -import { useGesture } from 'react-use-gesture' import styled, { css } from 'styled-components' -const AnimatedDialogOverlay = animated(DialogOverlay) +const AnimatedDialogOverlay = motion(DialogOverlay) const StyledDialogOverlay = styled(AnimatedDialogOverlay)<{ zindex: string | number }>` &[data-reach-dialog-overlay] { @@ -22,7 +21,7 @@ const StyledDialogOverlay = styled(AnimatedDialogOverlay)<{ zindex: string | num } ` -const AnimatedDialogContent = animated(DialogContent) +const AnimatedDialogContent = motion(DialogContent) // destructure to not pass custom props to Dialog DOM element const StyledDialogContent = styled( ({ borderRadius, minHeight, maxHeight, maxWidth, width, height, bgColor, mobile, isOpen, margin, ...rest }) => ( @@ -99,6 +98,7 @@ export interface ModalProps { bypassScrollLock?: boolean bypassFocusLock?: boolean } + export default function Modal({ isOpen, onDismiss = () => { @@ -117,67 +117,61 @@ export default function Modal({ transition = true, zindex = 100, borderRadius = '20px', - enableSwipeGesture = true, + enableSwipeGesture = false, bypassScrollLock = false, bypassFocusLock = false, }: ModalProps) { - const fadeTransition = useTransition(isOpen, { - config: { duration: transition ? 200 : 0 }, - from: { opacity: 0 }, - enter: { opacity: 1 }, - leave: { opacity: 0 }, - }) + const animateValues = { + initial: { opacity: 0 }, + animate: { opacity: 1 }, + exit: { opacity: 0 }, + transition: { duration: transition ? 0.2 : 0 }, + } - const [{ y }, set] = useSpring(() => ({ y: 0, config: { mass: 1, tension: 210, friction: 20 } })) - const bind = useGesture({ - onDrag: state => { - set({ - y: state.down ? state.movement[1] : 0, - }) - if (state.movement[1] > 300 || (state.velocity > 3 && state.direction[1] > 0)) { + const handleDrag = useCallback( + (e: any, info: any) => { + if (info.offset.y > 500 || info.velocity.y > 2000) { onDismiss() } }, - }) + [onDismiss], + ) + return ( - <> - {fadeTransition( - (style, item) => - item && ( - - `translateY(${(y as number) > 0 ? y : 0}px)`) }, - } - : {})} - aria-label="dialog content" - minHeight={minHeight} - maxHeight={maxHeight} - maxWidth={maxWidth} - margin={margin} - width={width} - height={height} - bgColor={bgColor} - borderRadius={borderRadius} - mobile={isMobile} - className={className} - > - {/* prevents the automatic focusing of inputs on mobile by the reach dialog */} - {!enableInitialFocusInput && isMobile ?
: null} - {children} - - - ), + + {isOpen && ( + + + {/* prevents the automatic focusing of inputs on mobile by the reach dialog */} + {!enableInitialFocusInput && isMobile ?
: null} + {children} + + )} - + ) } diff --git a/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx b/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx index 6c73ef8e2b..c1a48aadcb 100644 --- a/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx +++ b/src/components/ProAmm/ProAmmPriceRangeConfirm.tsx @@ -15,8 +15,8 @@ import useTheme from 'hooks/useTheme' import { Bound } from 'state/mint/proamm/type' import { useUserSlippageTolerance } from 'state/user/hooks' import { ExternalLink, TYPE } from 'theme' -import { toSignificantOrMaxIntegerPart } from 'utils/formatCurrencyAmount' import { formatTickPrice } from 'utils/formatTickPrice' +import { formatDisplayNumber } from 'utils/numbers' import { checkWarningSlippage, formatSlippage } from 'utils/slippage' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -80,7 +80,7 @@ export default function ProAmmPriceRangeConfirm({ - 1 {baseCurrency.symbol} = {toSignificantOrMaxIntegerPart(price, 6)} {quoteCurrency.symbol} + 1 {baseCurrency.symbol} = {formatDisplayNumber(price, { significantDigits: 6 })} {quoteCurrency.symbol} diff --git a/src/components/SubscribeButton/NotificationPreference/index.tsx b/src/components/SubscribeButton/NotificationPreference/index.tsx index f6d7253857..2086585c85 100644 --- a/src/components/SubscribeButton/NotificationPreference/index.tsx +++ b/src/components/SubscribeButton/NotificationPreference/index.tsx @@ -137,7 +137,7 @@ export const useValidateEmail = (defaultEmail?: string) => { [defaultEmail], ) - return { inputEmail, onChangeEmail, errorInput, errorColor, hasErrorInput, reset } + return { inputEmail: inputEmail.trim(), onChangeEmail, errorInput, errorColor, hasErrorInput, reset } } function NotificationPreference({ diff --git a/src/components/SwapForm/AddMEVProtectionModal.tsx b/src/components/SwapForm/AddMEVProtectionModal.tsx index cefff1d597..7fe6b3676f 100644 --- a/src/components/SwapForm/AddMEVProtectionModal.tsx +++ b/src/components/SwapForm/AddMEVProtectionModal.tsx @@ -138,17 +138,20 @@ export default function AddMEVProtectionModal({ isOpen, onClose }: { isOpen: boo - We suggest using the{' '} + + MEV + {' '} + Protection safeguards you from front-running attacks on Ethereum. We suggest you employing the{' '} RPC endpoint {' '} - of trusted third-parties like{' '} + of reliable third-parties such as{' '} Flashbots or{' '} - MEVBlocker to protect you from MEV Bots.{' '} + MEVBlocker.

- Please note that adding a RPC endpoint automatically is only supported via the MetaMask wallet. If you - wish to add the RPC endpoint to your wallet manually, refer to this{' '} + Note that adding the RPC endpoint automatically is only available via the MetaMask wallet. If you would + like to add the RPC endpoint to your wallet manually, please refer to this{' '} guide diff --git a/src/components/SwapForm/SlippageSettingGroup.tsx b/src/components/SwapForm/SlippageSettingGroup.tsx index 978ee0f1dd..c110b4dc4f 100644 --- a/src/components/SwapForm/SlippageSettingGroup.tsx +++ b/src/components/SwapForm/SlippageSettingGroup.tsx @@ -8,11 +8,10 @@ import styled from 'styled-components' import { Shield } from 'components/Icons' import SlippageSetting from 'components/SwapForm/SlippageSetting' -import { MouseoverTooltip } from 'components/Tooltip' import { useActiveWeb3React } from 'hooks' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' -import { ExternalLink, MEDIA_WIDTHS } from 'theme' +import { MEDIA_WIDTHS } from 'theme' import AddMEVProtectionModal from './AddMEVProtectionModal' @@ -52,25 +51,12 @@ export default function SlippageSettingGroup({ const rightButton = chainId === ChainId.MAINNET && walletEVM.isConnected ? ( - - MEV Protection will protect you from front-running and sandwich attacks on Ethereum. Learn more{' '} - - here ↗ - - - } - > - - - {upToXXSmall ? null : ( - - Add MEV Protection - - )} - - + + + + {upToXXSmall ? MEV Protection : Add MEV Protection} + + ) : null return ( diff --git a/src/components/SwapForm/SwapActionButton/SwapButtonWithPriceImpact.tsx b/src/components/SwapForm/SwapActionButton/SwapButtonWithPriceImpact.tsx index 7184a009d4..e841642f26 100644 --- a/src/components/SwapForm/SwapActionButton/SwapButtonWithPriceImpact.tsx +++ b/src/components/SwapForm/SwapActionButton/SwapButtonWithPriceImpact.tsx @@ -1,4 +1,5 @@ import { Trans, t } from '@lingui/macro' +import { ReactNode } from 'react' import { Info } from 'react-feather' import { Text } from 'rebass' import styled from 'styled-components' @@ -44,8 +45,8 @@ export const SwapButtonWithPriceImpact = ({ route: any disabled?: boolean showNoteGetRoute?: boolean - disabledText?: string - text?: string + disabledText?: ReactNode + text?: ReactNode showTooltipPriceImpact?: boolean }) => { const theme = useTheme() diff --git a/src/components/SwapForm/SwapActionButton/index.tsx b/src/components/SwapForm/SwapActionButton/index.tsx index 4a69dfc999..bd418a4a99 100644 --- a/src/components/SwapForm/SwapActionButton/index.tsx +++ b/src/components/SwapForm/SwapActionButton/index.tsx @@ -136,10 +136,10 @@ const SwapActionButton: React.FC = ({ const toggleApprovalModal = useToggleModal(ApplicationModal.SWAP_APPROVAL) const handleApproveClick = () => { - if (walletKey && ['METAMASK', 'TRUST_WALLET'].includes(walletKey?.toString())) { - approveCallback() - } else { + if (['COIN98', 'BRAVE', 'COINBASE'].includes(walletKey)) { toggleApprovalModal() + } else { + approveCallback() } } diff --git a/src/components/SwapForm/TradeSummary.tsx b/src/components/SwapForm/TradeSummary.tsx index 6018b935dd..6bbc3825e8 100644 --- a/src/components/SwapForm/TradeSummary.tsx +++ b/src/components/SwapForm/TradeSummary.tsx @@ -20,6 +20,7 @@ import { ExternalLink, TYPE } from 'theme' import { DetailedRouteSummary } from 'types/route' import { formattedNum } from 'utils' import { minimumAmountAfterSlippage } from 'utils/currencyAmount' +import { formatDisplayNumber } from 'utils/numbers' import { checkPriceImpact, formatPriceImpact } from 'utils/prices' const IconWrapper = styled.div<{ $flip: boolean }>` @@ -64,22 +65,15 @@ const Wrapper = styled.div.attrs(props => ({ } ` -const formatPercent = (v: number) => { - const formatter = Intl.NumberFormat('en-US', { - minimumFractionDigits: 0, - maximumFractionDigits: 2, - style: 'percent', - }) - - return formatter.format(v) -} - type TooltipTextOfSwapFeeProps = { feeBips: string | undefined feeAmountText: string } export const TooltipTextOfSwapFee: React.FC = ({ feeBips, feeAmountText }) => { - const feePercent = formatPercent(Number(feeBips) / Number(BIPS_BASE.toString())) + const feePercent = formatDisplayNumber(Number(feeBips) / Number(BIPS_BASE.toString()), { + style: 'percent', + fractionDigits: 2, + }) const hereLink = ( diff --git a/src/components/SwapForm/hooks/useGetRoute.ts b/src/components/SwapForm/hooks/useGetRoute.ts index 49e17673bd..34e26cfb2d 100644 --- a/src/components/SwapForm/hooks/useGetRoute.ts +++ b/src/components/SwapForm/hooks/useGetRoute.ts @@ -1,5 +1,5 @@ import { ChainId, Currency, CurrencyAmount, Price, WETH } from '@kyberswap/ks-sdk-core' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import routeApi from 'services/route' import { GetRouteParams } from 'services/route/types/getRoute' diff --git a/src/components/TabButton.tsx b/src/components/TabButton.tsx new file mode 100644 index 0000000000..4dd003618f --- /dev/null +++ b/src/components/TabButton.tsx @@ -0,0 +1,58 @@ +import { forwardRef } from 'react' +import styled, { CSSProperties, css } from 'styled-components' + +const ButtonWrapper = styled.div<{ active?: boolean; separator?: boolean }>` + font-size: 12px; + line-height: 16px; + transition: all 0.2s ease; + display: flex; + align-items: center; + justify-content: center; + height: 40px; + flex: 1; + box-sizing: border-box; + cursor: pointer; + user-select: none; + ${({ theme, separator, active }) => + separator && + !active && + css` + position: relative; + &::before { + content: ''; + position: absolute; + left: 0; + height: 16px; + border: 1px solid ${theme.border}; + } + `} + ${({ theme, active }) => + active + ? css` + color: ${theme.primary}; + background-color: ${theme.primary + '40'}; + box-shadow: inset 0 -2px 0 0 ${theme.primary}; + ` + : css` + color: ${theme.subText}; + background-color: ${theme.background}; + `} + + :hover { + filter: brightness(1.2); + } +` + +type Props = { text?: string; active?: boolean; onClick?: () => void; style?: CSSProperties; separator?: boolean } +const TabButton = forwardRef(function TabButton( + { text, active, onClick, style, separator }, + ref, +) { + return ( + + {text} + + ) +}) + +export default TabButton diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx index 7015a0deba..e19d577876 100644 --- a/src/components/Tooltip/index.tsx +++ b/src/components/Tooltip/index.tsx @@ -1,9 +1,10 @@ import { ReactNode, useCallback, useRef, useState } from 'react' import { isMobile } from 'react-device-detect' -import { Flex, Text } from 'rebass' +import { Text } from 'rebass' import styled from 'styled-components' import Popover, { PopoverProps } from 'components/Popover' +import Row from 'components/Row' const TooltipContainer = styled.div<{ width?: string; maxWidth?: string; size?: number }>` width: ${({ width }) => width || '228px'}; @@ -87,9 +88,9 @@ export function MouseoverTooltip({ children, disableTooltip, delay, ...rest }: O if (disableTooltip) return <>{children} return ( - + {children} - + ) } diff --git a/src/components/TransactionConfirmationModal/index.tsx b/src/components/TransactionConfirmationModal/index.tsx index cf6ccc8e87..5b3a9aad75 100644 --- a/src/components/TransactionConfirmationModal/index.tsx +++ b/src/components/TransactionConfirmationModal/index.tsx @@ -260,7 +260,7 @@ export function TransactionErrorContent({ confirmText?: string }) { const theme = useTheme() - const [showDetail, setShowDetail] = useState(true) + const [showDetail, setShowDetail] = useState(false) return ( diff --git a/src/components/Tutorial/TutorialSwap/index.tsx b/src/components/Tutorial/TutorialSwap/index.tsx index 62679d7967..3030606536 100644 --- a/src/components/Tutorial/TutorialSwap/index.tsx +++ b/src/components/Tutorial/TutorialSwap/index.tsx @@ -18,7 +18,7 @@ import SwapSettingBtn from 'assets/images/tutorial_swap/swap_setting_btn.png' import WelcomeImage from 'assets/images/tutorial_swap/welcome.png' import { ButtonOutlined, ButtonPrimary } from 'components/Button' import { ToggleItemType } from 'components/Collapse' -import { SUPPORTED_WALLETS } from 'constants/wallets' +import { connections } from 'constants/wallets' import { useActiveWeb3React } from 'hooks' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import { useTutorialSwapGuide } from 'state/tutorial/hooks' @@ -81,6 +81,9 @@ const NetworkItemWrapper = styled.div` padding: 10px 15px; gap: 10px; cursor: pointer; + flex-basis: calc((100% - 10px) / 2); // 10px gap + min-width: 160px; + box-sizing: border-box; ` const NetworkWrapper = styled.div` @@ -89,7 +92,7 @@ const NetworkWrapper = styled.div` padding: 15px; gap: 10px; display: flex; - flex-direction: column; + flex-wrap: wrap; ` const ImageMobile = ({ @@ -162,11 +165,15 @@ function ConnectWallet() { {isExpanded && ( - {Object.values(SUPPORTED_WALLETS) + {Object.values(connections) .filter(e => e.installLink) .map(item => ( window.open(item.installLink)}> - {item.name} + {item.name} {item.name} ))} diff --git a/src/components/WalletPopup/Transactions/Status.tsx b/src/components/WalletPopup/Transactions/Status.tsx index 4f2f0e2118..16b0053a85 100644 --- a/src/components/WalletPopup/Transactions/Status.tsx +++ b/src/components/WalletPopup/Transactions/Status.tsx @@ -1,6 +1,6 @@ import { t } from '@lingui/macro' import axios from 'axios' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { Repeat } from 'react-feather' import { useDispatch } from 'react-redux' @@ -52,7 +52,7 @@ function StatusIcon({ const [isPendingState, setIsPendingState] = useState(needCheckActuallyPending ? null : pendingRpc) const dispatch = useDispatch() - const { cancellingOrdersIds, cancellingOrdersNonces, loading } = cancellingOrderInfo + const { loading, isOrderCancelling } = cancellingOrderInfo const interval = useRef() @@ -68,7 +68,7 @@ function StatusIcon({ switch (type) { case TRANSACTION_TYPE.CANCEL_LIMIT_ORDER: const orderId = extraInfo?.arbitrary?.order_id - isPending = cancellingOrdersIds.includes(orderId) || cancellingOrdersNonces.length > 0 + isPending = isOrderCancelling(orderId) break case TRANSACTION_TYPE.BRIDGE: { const { data: response } = await axios.get(`${BFF_API}/v1/cross-chain-history/multichain-transfers/${hash}`) @@ -95,7 +95,7 @@ function StatusIcon({ console.error('Checking txs status error: ', error) interval.current && clearInterval(interval.current) } - }, [cancellingOrdersIds, cancellingOrdersNonces, chainId, dispatch, transaction, extraInfo, hash, type, loading]) + }, [isOrderCancelling, chainId, dispatch, transaction, extraInfo, hash, type, loading]) const checkStatusDebounced = useMemo(() => debounce(checkStatus, 1000), [checkStatus]) diff --git a/src/components/Web3ReactManager/index.tsx b/src/components/Web3ReactManager/index.tsx index 8b66d41e37..b43c750ff4 100644 --- a/src/components/Web3ReactManager/index.tsx +++ b/src/components/Web3ReactManager/index.tsx @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { useDispatch, useSelector } from 'react-redux' import LocalLoader from 'components/LocalLoader' -import { useActiveWeb3React, useInactiveListener, useWeb3React } from 'hooks' +import { useActiveWeb3React, useWeb3React } from 'hooks' import { useEagerConnect } from 'hooks/web3/useEagerConnect' import { AppState } from 'state' import { updateChainId } from 'state/user/actions' @@ -16,20 +16,18 @@ export default function Web3ReactManager({ children }: { children: JSX.Element } // try to eagerly connect to an injected provider, if it exists and has granted access already const triedEager = useEagerConnect() - // when there's no account connected, react to logins (broadly speaking) on the injected provider, if it exists - useInactiveListener(!triedEager) const dispatch = useDispatch() /** On user change network from wallet, update chainId in store, only work on EVM wallet */ useEffect(() => { - if (triedEager && chainIdEVM && chainIdState !== chainIdEVM && active && isEVM) { + if (triedEager.current && chainIdEVM && chainIdState !== chainIdEVM && active && isEVM) { dispatch(updateChainId(chainIdEVM)) } // Only run on change network from wallet // eslint-disable-next-line react-hooks/exhaustive-deps - }, [chainIdEVM, triedEager, active]) + }, [chainIdEVM, triedEager.current, active]) // on page load, do nothing until we've tried to connect to the injected connector - if (isEVM && !triedEager) { + if (isEVM && !triedEager.current) { return } diff --git a/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx b/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx index d4d3a888f4..aa17263fa2 100644 --- a/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx +++ b/src/components/YieldPools/ElasticFarmGroup/FarmCard.tsx @@ -17,6 +17,7 @@ import { Swap as SwapIcon } from 'components/Icons' import Harvest from 'components/Icons/Harvest' import InfoHelper from 'components/InfoHelper' import { MouseoverTooltip } from 'components/Tooltip' +import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag' import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index' import { TOBE_EXTENDED_FARMING_POOLS } from 'constants/v2' import { useActiveWeb3React } from 'hooks' @@ -125,6 +126,7 @@ const FarmCard = ({ FEE {(pool.pool.fee * 100) / ELASTIC_BASE_FEE_UNIT}% + @@ -207,7 +209,7 @@ const FarmCard = ({ - + {(pool.farmAPR + pool.poolAPR).toFixed(2)}% @@ -230,7 +232,9 @@ const FarmCard = ({ - {formatDollarAmount(pool.tvl)} + + {formatDollarAmount(pool.tvl)} + {pool.startTime > currentTimestamp ? ( {getFormattedTimeFromSecond(pool.startTime - currentTimestamp)} ) : pool.endTime > currentTimestamp ? ( diff --git a/src/components/YieldPools/ElasticFarmGroup/PostionDetail.tsx b/src/components/YieldPools/ElasticFarmGroup/PostionDetail.tsx index 158b82b7dd..97c4a17256 100644 --- a/src/components/YieldPools/ElasticFarmGroup/PostionDetail.tsx +++ b/src/components/YieldPools/ElasticFarmGroup/PostionDetail.tsx @@ -11,7 +11,7 @@ import PriceVisualize from 'components/ProAmm/PriceVisualize' import { MouseoverTooltipDesktopOnly } from 'components/Tooltip' import useIsTickAtLimit from 'hooks/useIsTickAtLimit' import useTheme from 'hooks/useTheme' -import { useElasticFarms, useFarmAction } from 'state/farms/elastic/hooks' +import { useFarmAction, useUserInfoByFarm } from 'state/farms/elastic/hooks' import { FarmingPool, NFTPosition } from 'state/farms/elastic/types' import { Bound } from 'state/mint/proamm/type' import { formatTickPrice } from 'utils/formatTickPrice' @@ -42,8 +42,8 @@ const PositionDetail = ({ }: Props) => { const theme = useTheme() - const { userFarmInfo } = useElasticFarms() - const joinedPositions = userFarmInfo?.[farmAddress]?.joinedPositions[pool.pid] || [] + const userInfo = useUserInfoByFarm(farmAddress) + const joinedPositions = userInfo?.joinedPositions[pool.pid] || [] const { unstake } = useFarmAction(farmAddress) const joinedInfo = joinedPositions.find(jp => jp.nftId.toString() === item.nftId.toString()) @@ -61,7 +61,7 @@ const PositionDetail = ({ const priceLower = !isRevertPrice ? item.token0PriceLower : item.token0PriceUpper.invert() const priceUpper = !isRevertPrice ? item.token0PriceUpper : item.token0PriceLower.invert() - const rewardByNft = userFarmInfo?.[farmAddress]?.rewardByNft + const rewardByNft = userInfo?.rewardByNft const rewards = rewardByNft?.[pool.pid + '_' + item.nftId.toString()] || [] const rewardValue = rewards.reduce( diff --git a/src/components/YieldPools/ElasticFarmGroup/Row.tsx b/src/components/YieldPools/ElasticFarmGroup/Row.tsx index 9d6e8c9826..e12f791dea 100644 --- a/src/components/YieldPools/ElasticFarmGroup/Row.tsx +++ b/src/components/YieldPools/ElasticFarmGroup/Row.tsx @@ -1,9 +1,8 @@ -import { ChainId, CurrencyAmount, Fraction } from '@kyberswap/ks-sdk-core' -import { computePoolAddress } from '@kyberswap/ks-sdk-elastic' +import { CurrencyAmount, Fraction } from '@kyberswap/ks-sdk-core' import { Trans, t } from '@lingui/macro' import dayjs from 'dayjs' import { BigNumber } from 'ethers' -import { useEffect, useState } from 'react' +import React, { useEffect, useState } from 'react' import { Info, Minus, Plus, Share2 } from 'react-feather' import { Link } from 'react-router-dom' import { useMedia } from 'react-use' @@ -18,16 +17,17 @@ import { MoneyBag, Swap2 as SwapIcon } from 'components/Icons' import Harvest from 'components/Icons/Harvest' import InfoHelper from 'components/InfoHelper' import { MouseoverTooltip, MouseoverTooltipDesktopOnly } from 'components/Tooltip' +import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag' import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index' -import { NETWORKS_INFO, isEVM } from 'constants/networks' import { TOBE_EXTENDED_FARMING_POOLS } from 'constants/v2' import { useActiveWeb3React } from 'hooks' import { useProMMFarmContract } from 'hooks/useContract' import { useProAmmPositions } from 'hooks/useProAmmPositions' import useTheme from 'hooks/useTheme' import { useShareFarmAddress } from 'state/farms/classic/hooks' -import { useElasticFarms, usePositionFilter } from 'state/farms/elastic/hooks' +import { useDepositedNftsByFarm, usePositionFilter, useUserInfoByFarm } from 'state/farms/elastic/hooks' import { FarmingPool, NFTPosition } from 'state/farms/elastic/types' +import { getPoolAddress } from 'state/mint/proamm/utils' import { useViewMode } from 'state/user/hooks' import { VIEW_MODE } from 'state/user/reducer' import { shortenAddress } from 'utils' @@ -73,26 +73,22 @@ const Row = ({ const above1000 = useMedia('(min-width: 1000px)') const [isRevertPrice, setIsRevertPrice] = useState(false) - const { userFarmInfo } = useElasticFarms() - const joinedPositions = userFarmInfo?.[fairlaunchAddress]?.joinedPositions[farmingPool.pid] || [] + const userInfo = useUserInfoByFarm(fairlaunchAddress) + + const joinedPositions = userInfo?.joinedPositions[farmingPool.pid] || [] + + const depositedPositionsByFarm = useDepositedNftsByFarm(fairlaunchAddress) const depositedPositions = - userFarmInfo?.[fairlaunchAddress]?.depositedPositions.filter(pos => { + depositedPositionsByFarm.filter(pos => { return ( pos.liquidity.toString() !== '0' && - farmingPool.poolAddress.toLowerCase() === - computePoolAddress({ - factoryAddress: NETWORKS_INFO[isEVM(chainId) ? chainId : ChainId.MAINNET].elastic.coreFactory, - tokenA: pos.pool.token0, - tokenB: pos.pool.token1, - fee: pos.pool.fee, - initCodeHashManualOverride: NETWORKS_INFO[isEVM(chainId) ? chainId : ChainId.MAINNET].elastic.initCodeHash, - }).toLowerCase() + farmingPool.poolAddress.toLowerCase() === getPoolAddress(pos.pool).toLowerCase() ) }) || [] const rewardPendings = - userFarmInfo?.[fairlaunchAddress]?.rewardPendings[farmingPool.pid] || + userInfo?.rewardPendings[farmingPool.pid] || farmingPool.rewardTokens.map(token => CurrencyAmount.fromRawAmount(token, 0)) const rewardValue = rewardPendings.reduce( @@ -108,7 +104,7 @@ const Row = ({ useEffect(() => { const getFeeTargetInfo = async () => { if (!contract || farmingPool.feeTarget === '0') return - const userJoinedPos = userFarmInfo?.[fairlaunchAddress].joinedPositions[farmingPool.pid] || [] + const userJoinedPos = userInfo.joinedPositions[farmingPool.pid] || [] if (!userJoinedPos.length) { setTargetPercent('') @@ -143,7 +139,7 @@ const Row = ({ } getFeeTargetInfo() - }, [contract, farmingPool.feeTarget, fairlaunchAddress, farmingPool.pid, userFarmInfo]) + }, [contract, farmingPool.feeTarget, fairlaunchAddress, farmingPool.pid, userInfo]) const { positions } = useProAmmPositions(account) @@ -342,8 +338,10 @@ const Row = ({ - - FEE {(farmingPool.pool.fee * 100) / ELASTIC_BASE_FEE_UNIT}% + + FEE {(farmingPool.pool.fee * 100) / ELASTIC_BASE_FEE_UNIT}% + + void pools: FarmingPool[] - userInfo?: UserInfo onShowStepGuide: () => void tokenPrices: { [key: string]: number } } @@ -80,11 +79,14 @@ enum SORT_DIRECTION { DESC = 'desc', } -const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo, onShowStepGuide, tokenPrices }) => { +const ElasticFarmGroup: React.FC = ({ address, onOpenModal, pools, onShowStepGuide, tokenPrices }) => { const theme = useTheme() const { account, chainId } = useActiveWeb3React() const above1000 = useMedia('(min-width: 1000px)') + const depositedPositions = useDepositedNftsByFarm(address) + const userInfo = useUserInfoByFarm(address) + const [searchParams, setSearchParams] = useSearchParams() const sortField = searchParams.get('orderBy') || SORT_FIELD.MY_DEPOSIT const sortDirection = searchParams.get('orderDirection') || SORT_DIRECTION.DESC @@ -92,7 +94,7 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo const { poolFeeLast24h } = useElasticFarms() const depositedUsd = - userInfo?.depositedPositions.reduce( + depositedPositions.reduce( (acc, cur) => acc + Number(cur.amount0.toExact()) * (tokenPrices[cur.amount0.currency.wrapped.address] || 0) + @@ -101,7 +103,7 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo ) || 0 const userDepositedTokenAmounts = - userInfo?.depositedPositions.reduce<{ + depositedPositions.reduce<{ [address: string]: CurrencyAmount }>((result, pos) => { const address0 = pos.amount0.currency.address @@ -156,8 +158,8 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo } const joinedPositions = userInfo?.joinedPositions[pool.pid] || [] - const depositedPositions = - userInfo?.depositedPositions.filter(pos => { + const poolDepositedPositions = + depositedPositions.filter(pos => { return ( pool.poolAddress.toLowerCase() === computePoolAddress({ @@ -171,7 +173,7 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo ) }) || [] - const depositedUsd = depositedPositions.reduce( + const depositedUsd = poolDepositedPositions.reduce( (usd, pos) => usd + Number(pos.amount1.toExact()) * (tokenPrices[pos.pool.token1.address.toLowerCase()] || 0) + @@ -258,7 +260,7 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo if (!pools) return null const canHarvest = Object.values(userInfo?.rewardPendings || {}).some(rw => rw.some(item => item.greaterThan('0'))) - const canWithdraw = !!userInfo?.depositedPositions.length + const canWithdraw = !!depositedPositions.length const renderApproveButton = () => { if (isApprovedForAll || tab === 'ended') { @@ -747,4 +749,4 @@ const ProMMFarmGroup: React.FC = ({ address, onOpenModal, pools, userInfo ) } -export default ProMMFarmGroup +export default ElasticFarmGroup diff --git a/src/components/YieldPools/ElasticFarmModals/DepositModal.tsx b/src/components/YieldPools/ElasticFarmModals/DepositModal.tsx index 052d3ebfab..cf18fc4a2a 100644 --- a/src/components/YieldPools/ElasticFarmModals/DepositModal.tsx +++ b/src/components/YieldPools/ElasticFarmModals/DepositModal.tsx @@ -221,7 +221,7 @@ function ProMMDepositNFTModal({ setShowMenu(prev => !prev)}> {filterOptions.find(item => item.code === activeFilter)?.value} - + {showMenu && ( diff --git a/src/components/YieldPools/ElasticFarmModals/styled.tsx b/src/components/YieldPools/ElasticFarmModals/styled.tsx index a57b2c3431..9ea12eca6f 100644 --- a/src/components/YieldPools/ElasticFarmModals/styled.tsx +++ b/src/components/YieldPools/ElasticFarmModals/styled.tsx @@ -88,13 +88,13 @@ export const SelectOption = styled.div` color: ${({ theme }) => theme.subText}; ` -export const DropdownIcon = styled.div<{ rotate?: boolean }>` - transform: rotate(${({ rotate }) => (rotate ? '-180deg' : '0')}); +export const DropdownIcon = styled.div<{ isRotate?: boolean }>` + transform: rotate(${({ isRotate: rotate }) => (rotate ? '-180deg' : '0')}); height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent; border-top: 4px solid ${({ theme }) => theme.text}; transition: transform 300ms; - transform: rotate(${({ rotate }) => (rotate ? '-180deg' : '0')}); + transform: rotate(${({ isRotate: rotate }) => (rotate ? '-180deg' : '0')}); ` diff --git a/src/components/YieldPools/ElasticFarms.tsx b/src/components/YieldPools/ElasticFarms.tsx index 7b93807166..5ef78a234f 100644 --- a/src/components/YieldPools/ElasticFarms.tsx +++ b/src/components/YieldPools/ElasticFarms.tsx @@ -1,7 +1,6 @@ -import { useRef, useState } from 'react' +import { useState } from 'react' import { Flex } from 'rebass' -import { useOnClickOutside } from 'hooks/useOnClickOutside' import { useFilteredFarms } from 'state/farms/elastic/hooks' import { FarmingPool } from 'state/farms/elastic/types' import { useTokenPrices } from 'state/tokenPrices/hooks' @@ -14,11 +13,7 @@ import WithdrawModal from './ElasticFarmModals/WithdrawModal' type ModalType = 'deposit' | 'withdraw' | 'stake' | 'unstake' | 'harvest' | 'forcedWithdraw' function ElasticFarms({ onShowStepGuide }: { onShowStepGuide: () => void }) { - const ref = useRef() - const [open, setOpen] = useState(false) - useOnClickOutside(ref, open ? () => setOpen(prev => !prev) : undefined) - - const { filteredFarms, farms, userFarmInfo } = useFilteredFarms() + const { filteredFarms, farms } = useFilteredFarms() const [selectedFarm, setSeletedFarm] = useState(null) const [selectedModal, setSeletedModal] = useState(null) @@ -85,7 +80,6 @@ function ElasticFarms({ onShowStepGuide }: { onShowStepGuide: () => void }) { setSeletedPool(pool) }} pools={farm.pools} - userInfo={userFarmInfo?.[farm.id]} tokenPrices={tokenPrices} /> ) diff --git a/src/components/YieldPools/FarmingPoolAPRCell.tsx b/src/components/YieldPools/FarmingPoolAPRCell.tsx index bebfd9565f..c2406faf64 100644 --- a/src/components/YieldPools/FarmingPoolAPRCell.tsx +++ b/src/components/YieldPools/FarmingPoolAPRCell.tsx @@ -15,6 +15,7 @@ import { useElasticFarms } from 'state/farms/elastic/hooks' import { useTokenPrices } from 'state/tokenPrices/hooks' import { MEDIA_WIDTHS } from 'theme' import { useFarmApr } from 'utils/dmm' +import { formatDisplayNumber } from 'utils/numbers' export const APRTooltipContent = ({ poolAPR, @@ -43,7 +44,7 @@ export const APRTooltipContent = ({ Total APR:{' '} - {(poolAPR + maxFarmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + maxFarmAPR) / 100, { style: 'percent', fractionDigits: 2 })} Pool APR:{' '} - {poolAPR.toFixed(2)}% + {formatDisplayNumber(poolAPR / 100, { style: 'percent', fractionDigits: 2 })} Farm APR:{' '} - {farmAPR.toFixed(2)}% + {formatDisplayNumber(farmAPR / 100, { style: 'percent', fractionDigits: 2 })} Farm APR:{' '} - {farmV2APR.toFixed(2)}% + {formatDisplayNumber(farmV2APR / 100, { style: 'percent', fractionDigits: 2 })} = ({ } + text={} > - {(poolAPR + maxFarmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + maxFarmAPR) / 100, { style: 'percent', fractionDigits: 2 })} @@ -217,7 +218,7 @@ export const ClassicFarmingPoolAPRCell = ({ poolAPR, farm }: { poolAPR: number; gap: '4px', }} > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} }> diff --git a/src/components/YieldPools/PartnerFarmTag.tsx b/src/components/YieldPools/PartnerFarmTag.tsx new file mode 100644 index 0000000000..6c17ff643c --- /dev/null +++ b/src/components/YieldPools/PartnerFarmTag.tsx @@ -0,0 +1,39 @@ +import { Trans } from '@lingui/macro' + +import { ReactComponent as PartnerFarmSvg } from 'assets/svg/partner-farm.svg' +import { MouseoverTooltip } from 'components/Tooltip' +import { FeeTag } from 'components/YieldPools/ElasticFarmGroup/styleds' +import { FRAX_FARMS } from 'constants/index' +import { useActiveWeb3React } from 'hooks' +import { ExternalLink } from 'theme' + +export const PartnerFarmTag = ({ farmPoolAddress }: { farmPoolAddress: string }) => { + const { chainId } = useActiveWeb3React() + const isFraxFarm = FRAX_FARMS[chainId]?.map(address => address.toLowerCase()).includes(farmPoolAddress.toLowerCase()) + if (!isFraxFarm) return null + + return ( +
+ + KyberSwap Frax farms do not currently receive KNC incentives. They are continuously available for staking so + that users can participate in KyberSwap Frax gauges to earn FXS emissions. The amount of FXS emissions + depends on the results of each weekly Frax gauge voting cycle. More info:{' '} + https://app.frax.finance/gauge and{' '} + + https://docs.frax.finance/vefxs/gauge + + + } + placement="top" + width="300px" + > + + + Partner Farm + + +
+ ) +} diff --git a/src/components/YieldPools/styleds.tsx b/src/components/YieldPools/styleds.tsx index 12f8d24e51..03207dcc0e 100644 --- a/src/components/YieldPools/styleds.tsx +++ b/src/components/YieldPools/styleds.tsx @@ -206,7 +206,7 @@ export const TableHeader = styled.div<{ fade?: boolean; oddRow?: boolean }>` export const ProMMFarmTableHeader = styled(TableHeader)` padding: 16px; - grid-template-columns: 230px 0.5fr 0.5fr 1fr 1fr 0.75fr 120px; + grid-template-columns: 280px 0.5fr 0.5fr 1fr 1fr 0.75fr 120px; grid-template-areas: 'token_pairs staked_tvl apr ending_in my_deposit reward action'; grid-gap: 2rem; @@ -215,7 +215,7 @@ export const ProMMFarmTableHeader = styled(TableHeader)` background-color: ${({ theme }) => theme.buttonGray}; ${({ theme }) => theme.mediaWidth.upToLarge` - grid-template-columns: 170px 0.5fr 0.75fr 1fr 1fr 0.75fr 120px; + grid-template-columns: 250px 0.5fr 0.75fr 1fr 1fr 0.75fr 120px; grid-gap: 1rem; `}; ` diff --git a/src/components/swapv2/LimitOrder/ActionButtonLimitOrder.tsx b/src/components/swapv2/LimitOrder/ActionButtonLimitOrder.tsx index b5a240d74a..5b10e548dd 100644 --- a/src/components/swapv2/LimitOrder/ActionButtonLimitOrder.tsx +++ b/src/components/swapv2/LimitOrder/ActionButtonLimitOrder.tsx @@ -1,4 +1,4 @@ -import { Currency } from '@kyberswap/ks-sdk-core' +import { Currency, WETH } from '@kyberswap/ks-sdk-core' import { Trans, t } from '@lingui/macro' import { Text } from 'rebass' @@ -15,11 +15,13 @@ import { RowBetween } from 'components/Row' import { useActiveWeb3React } from 'hooks' import { ApprovalState } from 'hooks/useApproveCallback' import { useWalletModalToggle } from 'state/application/hooks' +import { isTokenNative } from 'utils/tokenInfo' export default function ActionButtonLimitOrder({ showWrap, approval, currencyIn, + currencyOut, isWrappingEth, wrapInputError, approveCallback, @@ -34,6 +36,7 @@ export default function ActionButtonLimitOrder({ showWarning, }: { currencyIn: Currency | undefined + currencyOut: Currency | undefined approval: ApprovalState showWrap: boolean isWrappingEth: boolean @@ -59,7 +62,8 @@ export default function ActionButtonLimitOrder({ !!hasInputError || approval !== ApprovalState.APPROVED || isWrappingEth || - (showWrap && !isWrappingEth) + (showWrap && !isWrappingEth) || + (currencyIn?.equals(WETH[currencyIn.chainId]) && isTokenNative(currencyOut, currencyOut?.chainId)) const { account } = useActiveWeb3React() const toggleWalletModal = useWalletModalToggle() diff --git a/src/components/swapv2/LimitOrder/EditOrderModal.tsx b/src/components/swapv2/LimitOrder/EditOrderModal.tsx index 3af151040f..191113f482 100644 --- a/src/components/swapv2/LimitOrder/EditOrderModal.tsx +++ b/src/components/swapv2/LimitOrder/EditOrderModal.tsx @@ -1,8 +1,8 @@ import { Trans } from '@lingui/macro' import { ethers } from 'ethers' -import { useEffect, useState } from 'react' import { X } from 'react-feather' import { Flex, Text } from 'rebass' +import { useGetTotalActiveMakingAmountQuery } from 'services/limitOrder' import styled from 'styled-components' import Modal from 'components/Modal' @@ -13,7 +13,6 @@ import { TransactionFlowState } from 'types/TransactionFlowState' import LimitOrderForm, { Label } from './LimitOrderForm' import { calcInvert, calcPercentFilledOrder, calcRate, removeTrailingZero } from './helpers' -import { getTotalActiveMakingAmount } from './request' import { LimitOrder, LimitOrderStatus, RateInfo } from './type' const Wrapper = styled.div` @@ -61,15 +60,10 @@ export default function EditOrderModal({ const defaultRate: RateInfo = { rate, invertRate: calcInvert(rate), invert: false } const filled = currencyOut ? calcPercentFilledOrder(filledTakingAmount, takingAmount, currencyOut.decimals) : 0 - const [defaultActiveMakingAmount, setDefaultActiveMakingAmount] = useState('') - - // prefetch - useEffect(() => { - if (!currencyIn || !account) return - getTotalActiveMakingAmount(chainId, currencyIn.wrapped.address, account) - .then(({ activeMakingAmount }) => setDefaultActiveMakingAmount(activeMakingAmount)) - .catch(console.error) - }, [currencyIn, account, chainId]) + const { data: defaultActiveMakingAmount } = useGetTotalActiveMakingAmountQuery( + { chainId, tokenAddress: currencyIn?.wrapped.address ?? '', account: account ?? '' }, + { skip: !currencyIn || !account }, + ) return ( diff --git a/src/components/swapv2/LimitOrder/LimitOrderForm.tsx b/src/components/swapv2/LimitOrder/LimitOrderForm.tsx index e8d7989645..b8b3d55812 100644 --- a/src/components/swapv2/LimitOrder/LimitOrderForm.tsx +++ b/src/components/swapv2/LimitOrder/LimitOrderForm.tsx @@ -3,11 +3,17 @@ import { Trans, t } from '@lingui/macro' import dayjs from 'dayjs' import { ethers } from 'ethers' import JSBI from 'jsbi' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { rgba } from 'polished' import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react' import { Info, Repeat } from 'react-feather' import { Flex, Text } from 'rebass' +import { + useCreateOrderMutation, + useCreateOrderSignatureMutation, + useGetLOContractAddressQuery, + useGetTotalActiveMakingAmountQuery, +} from 'services/limitOrder' import styled from 'styled-components' import { NotificationType } from 'components/Announcement/type' @@ -40,7 +46,6 @@ import { useLimitActionHandlers, useLimitState } from 'state/limit/hooks' import { tryParseAmount } from 'state/swap/hooks' import { useCurrencyBalance } from 'state/wallet/hooks' import { TransactionFlowState } from 'types/TransactionFlowState' -import { getLimitOrderContract } from 'utils' import { subscribeNotificationOrderCancelled, subscribeNotificationOrderExpired } from 'utils/firebase' import { maxAmountSpend } from 'utils/maxAmountSpend' @@ -63,7 +68,6 @@ import { parseFraction, removeTrailingZero, } from './helpers' -import { clearCacheActiveMakingAmount, getMessageSignature, getTotalActiveMakingAmount, submitOrder } from './request' import { CreateOrderParam, LimitOrder, RateInfo } from './type' export const Label = styled.div` @@ -144,7 +148,6 @@ const LimitOrderForm = function LimitOrderForm({ const [inputAmount, setInputAmount] = useState(defaultInputAmount) const [outputAmount, setOuputAmount] = useState(defaultOutputAmount) - const [activeOrderMakingAmount, setActiveOrderMakingAmount] = useState(defaultActiveMakingAmount) const [rateInfo, setRateInfo] = useState(defaultRate) const displayRate = rateInfo.invert ? rateInfo.invertRate : rateInfo.rate @@ -160,6 +163,12 @@ const LimitOrderForm = function LimitOrderForm({ const { loading: loadingTrade, tradeInfo } = useBaseTradeInfoLimitOrder(currencyIn, currencyOut) const deltaRate = useGetDeltaRateLimitOrder({ marketPrice: tradeInfo, rateInfo }) + const { data: activeOrderMakingAmount = defaultActiveMakingAmount, refetch: getActiveMakingAmount } = + useGetTotalActiveMakingAmountQuery( + { chainId, tokenAddress: currencyIn?.wrapped.address ?? '', account: account ?? '' }, + { skip: !currencyIn || !account }, + ) + const { execute: onWrap, inputError: wrapInputError } = useWrapCallback(currencyIn, currencyOut, inputAmount, true) const showWrap = !!currencyIn?.isNative @@ -276,10 +285,13 @@ const LimitOrderForm = function LimitOrderForm({ } const parseInputAmount = tryParseAmount(inputAmount, currencyIn ?? undefined) + const { data, isError } = useGetLOContractAddressQuery(chainId) + const limitOrderContract = isError ? undefined : data + const currentAllowance = useTokenAllowance( currencyIn as Token, account ?? undefined, - getLimitOrderContract(chainId) ?? '', + limitOrderContract, ) as CurrencyAmount const parsedActiveOrderMakingAmount = useMemo(() => { @@ -325,7 +337,7 @@ const LimitOrderForm = function LimitOrderForm({ const [approval, approveCallback] = useApproveCallback( parseInputAmount, - getLimitOrderContract(chainId) ?? '', + limitOrderContract || undefined, !enoughAllowance, ) @@ -380,20 +392,6 @@ const LimitOrderForm = function LimitOrderForm({ } } - const getActiveMakingAmount = useCallback( - async (currencyIn: Currency) => { - try { - const address = currencyIn?.wrapped.address - if (!address || !account) return - const { activeMakingAmount } = await getTotalActiveMakingAmount(chainId, address, account) - setActiveOrderMakingAmount(activeMakingAmount) - } catch (error) { - console.log(error) - } - }, - [account, chainId], - ) - const onResetForm = () => { setInputAmount(defaultInputAmount) setOuputAmount(defaultOutputAmount) @@ -415,6 +413,7 @@ const LimitOrderForm = function LimitOrderForm({ [setFlowState], ) + const [getMessageSignature] = useCreateOrderSignatureMutation() const signOrder = async (params: CreateOrderParam) => { const { currencyIn, currencyOut, inputAmount, outputAmount, signature, salt } = params if (signature && salt) return { signature, salt } @@ -428,7 +427,7 @@ const LimitOrderForm = function LimitOrderForm({ outputAmount, )} ${currencyOut.symbol}`, })) - const messagePayload = await getMessageSignature(payload) + const messagePayload = await getMessageSignature(payload).unwrap() const rawSignature = await library.send('eth_signTypedData_v4', [account, JSON.stringify(messagePayload)]) @@ -442,6 +441,7 @@ const LimitOrderForm = function LimitOrderForm({ return { signature: ethers.utils.hexlify(bytes), salt: messagePayload?.message?.salt } } + const [submitOrder] = useCreateOrderMutation() const onSubmitCreateOrder = async (params: CreateOrderParam) => { try { const { currencyIn, currencyOut, account, inputAmount, outputAmount, expiredAt } = params @@ -452,7 +452,7 @@ const LimitOrderForm = function LimitOrderForm({ const { signature, salt } = await signOrder(params) const payload = getPayloadCreateOrder(params) setFlowState(state => ({ ...state, pendingText: t`Placing order` })) - const response = await submitOrder({ ...payload, salt, signature }) + const response = await submitOrder({ ...payload, salt, signature }).unwrap() setFlowState(state => ({ ...state, showConfirm: false })) notify( @@ -468,6 +468,7 @@ const LimitOrderForm = function LimitOrderForm({ return response?.id } catch (error) { handleError(error) + return } } @@ -526,19 +527,16 @@ const LimitOrderForm = function LimitOrderForm({ const refreshActiveMakingAmount = useMemo( () => debounce(() => { - clearCacheActiveMakingAmount() - if (currencyIn) { - getActiveMakingAmount(currencyIn) - } + try { + getActiveMakingAmount() + } catch (error) {} }, 100), - [currencyIn, getActiveMakingAmount], + [getActiveMakingAmount], ) - const isInit = useRef(false) useEffect(() => { - if (isInit.current && currencyIn) getActiveMakingAmount(currencyIn) // skip the first time - isInit.current = true - }, [currencyIn, getActiveMakingAmount, isEdit]) + if (currencyIn) refreshActiveMakingAmount() + }, [currencyIn, refreshActiveMakingAmount, isEdit]) // use ref to prevent too many api call when firebase update status const refSubmitCreateOrder = useRef(onSubmitCreateOrder) @@ -842,6 +840,7 @@ const LimitOrderForm = function LimitOrderForm({ (function ListLimitOrder(props, ref) { const [keyword, setKeyword] = useState('') const [isOpenCancel, setIsOpenCancel] = useState(false) const [isOpenEdit, setIsOpenEdit] = useState(false) - const limitOrderContract = useContract(getLimitOrderContract(chainId) ?? '', LIMIT_ORDER_ABI) - const notify = useNotify() const { ordersUpdating } = useLimitState() const addTransactionWithType = useTransactionAdder() const { isOrderCancelling, setCancellingOrders, cancellingOrdersIds } = useCancellingOrders() - const transactions = useAllTransactions() const { mixpanelHandler } = useMixpanel() - const [orders, setOrders] = useState([]) - const [totalOrder, setTotalOrder] = useState(0) + const { + data: { orders = [], totalOrder = 0 } = {}, + isFetching, + refetch: refetchOrders, + } = useGetListOrdersQuery( + { + chainId, + maker: account, + status: orderType, + query: keyword, + page: curPage, + pageSize: PAGE_SIZE, + }, + { skip: !account, refetchOnFocus: true }, + ) + + const loading = useShowLoadingAtLeastTime(isFetching) + const [flowState, setFlowState] = useState(TRANSACTION_STATE_DEFAULT) const [currentOrder, setCurrentOrder] = useState() const [isCancelAll, setIsCancelAll] = useState(false) - const [loading, setLoading] = useState(true) const tokenAddresses = useMemo(() => { const activeOrders = orders.filter(checkOrderActive) @@ -185,211 +192,36 @@ export default forwardRef(function ListLimitOrder(props, ref) { setCurPage(1) } - const controller = useRef(new AbortController()) - const fetchListOrder = useCallback( - async (orderType: LimitOrderStatus, query: string, curPage: number) => { - try { - let orders: LimitOrder[] = [] - let totalItems = 0 - if (account) { - controller.current.abort() - controller.current = new AbortController() - const response = await getListOrder( - { - chainId, - maker: account, - status: orderType, - query, - page: curPage, - pageSize: PAGE_SIZE, - }, - controller.current.signal, - ) - orders = response.orders ?? [] - totalItems = response.pagination.totalItems ?? 0 - } - setOrders(orders) - setTotalOrder(totalItems) - } catch (error) { - if (error?.name === 'AbortError') return - console.error(error) - } - setLoading(false) - }, - [account, chainId], - ) - - const fetchListOrderDebounce = useMemo(() => debounce(fetchListOrder, 400), [fetchListOrder]) - useEffect(() => { - setLoading(true) - setOrders([]) - fetchListOrderDebounce(orderType, keyword, curPage) - }, [orderType, keyword, fetchListOrderDebounce, curPage]) - useEffect(() => { onReset() - }, [chainId]) + }, [chainId, orderType]) const refreshListOrder = useCallback(() => { - onReset() - fetchListOrderDebounce(orderType, '', 1) - }, [fetchListOrderDebounce, orderType]) + try { + onReset() + refetchOrders() + } catch (error) {} + }, [refetchOrders]) useImperativeHandle(ref, () => ({ refreshListOrder, })) - const isTransactionFailed = (txHash: string) => { - const transactionInfo = findTx(transactions, txHash) - return transactionInfo ? getTransactionStatus(transactionInfo).error : false - } - - const isTxFailed = useRef(isTransactionFailed) - isTxFailed.current = isTransactionFailed - - const showedNotificationOrderIds = useRef<{ [id: string]: boolean }>({}) - const ackNotiLocal = (id: string | number) => { - showedNotificationOrderIds.current = { ...showedNotificationOrderIds.current, [id]: true } - } - useEffect(() => { if (!account) return - const unsubscribeCancelled = subscribeNotificationOrderCancelled(account, chainId, data => { - refreshListOrder() - const cancelAllData = data?.all?.[0] - const cancelAllSuccess = cancelAllData?.isSuccessful - if (cancelAllSuccess !== undefined) { - // not show Notification when cancel failed because duplicate. - if ( - !isTxFailed.current(cancelAllData?.txHash ?? '') && - !showedNotificationOrderIds.current[cancelAllData.id ?? ''] - ) { - notify( - { - type: cancelAllSuccess ? NotificationType.WARNING : NotificationType.ERROR, - title: cancelAllSuccess ? t`Order Cancelled` : t`Cancel Orders Failed`, - summary: ( - - ), - }, - 10000, - ) - } - const nonces = - data?.all.map((e: { id: string }) => { - ackNotiLocal(e.id) - return e.id - }) ?? [] - if (nonces.length) { - ackNotificationOrder(nonces, account, chainId, LimitOrderStatus.CANCELLED).catch(console.error) - } - } - + const callback = (data: any) => { const orders: LimitOrder[] = data?.orders ?? [] - const orderCancelSuccess = orders.filter(e => e.isSuccessful && !showedNotificationOrderIds.current[e.id]) - const orderCancelFailed = orders.filter( - e => !e.isSuccessful && !isTxFailed.current(e.txHash) && !showedNotificationOrderIds.current[e.id], - ) - - if (orderCancelSuccess.length) - notify( - { - type: NotificationType.WARNING, - title: t`Order Cancelled`, - summary: , - }, - 10000, - ) - if (orderCancelFailed.length) - notify( - { - type: NotificationType.ERROR, - title: t`Order Cancel Failed`, - summary: , - }, - 10000, - ) - if (orders.length) - ackNotificationOrder( - orders.map(({ id }) => { - ackNotiLocal(id) - return id.toString() - }), - account, - chainId, - LimitOrderStatus.CANCELLED, - ).catch(console.error) - }) - const unsubscribeExpired = subscribeNotificationOrderExpired(account, chainId, data => { - refreshListOrder() - const orders: LimitOrder[] = data?.orders ?? [] - if (orders.length) { - notify( - { - type: NotificationType.WARNING, - title: t`Order Expired`, - summary: , - }, - 10000, - ) - ackNotificationOrder( - orders.map(e => e.id.toString()), - account, - chainId, - LimitOrderStatus.EXPIRED, - ).catch(console.error) - } - }) - const unsubscribeFilled = subscribeNotificationOrderFilled(account, chainId, data => { - refreshListOrder() - const orders: LimitOrder[] = data?.orders ?? [] - const orderFilled = orders.filter( - order => order.status === LimitOrderStatus.FILLED || order.takingAmount === order.filledTakingAmount, - ) - const orderPartialFilled = orders.filter( - order => order.status === LimitOrderStatus.PARTIALLY_FILLED || order.takingAmount !== order.filledTakingAmount, - ) - if (orderFilled.length) { - notify( - { - type: NotificationType.SUCCESS, - title: t`Order Filled`, - summary: , - }, - 10000, - ) - } - orderPartialFilled.forEach(order => { - notify( - { - type: NotificationType.SUCCESS, - title: t`Order Partially Filled`, - summary: , - }, - 10000, - ) - }) - if (orders.length) { - ackNotificationOrder( - orders.map(e => e.uuid), - account, - chainId, - LimitOrderStatus.FILLED, - ).catch(console.error) - } - }) + if (orders.length) refreshListOrder() + } + const unsubscribeCancelled = subscribeNotificationOrderCancelled(account, chainId, refreshListOrder) + const unsubscribeExpired = subscribeNotificationOrderExpired(account, chainId, callback) + const unsubscribeFilled = subscribeNotificationOrderFilled(account, chainId, callback) return () => { unsubscribeCancelled?.() unsubscribeExpired?.() unsubscribeFilled?.() } - }, [account, chainId, notify, refreshListOrder]) + }, [account, chainId, refreshListOrder]) const hideConfirmCancel = useCallback(() => { setFlowState(state => ({ ...state, showConfirm: false })) @@ -446,8 +278,10 @@ export default forwardRef(function ListLimitOrder(props, ref) { return orders.filter(e => !isOrderCancelling(e)).length }, [orders, isOrderCancelling]) + const [insertCancellingOrder] = useInsertCancellingOrderMutation() + const [getEncodeData] = useGetEncodeDataMutation() const requestCancelOrder = async (order: LimitOrder | undefined) => { - if (!library || !account || !limitOrderContract) return Promise.reject('Wrong input') + if (!library || !account) return Promise.reject('Wrong input') setFlowState(state => ({ ...state, @@ -456,58 +290,69 @@ export default forwardRef(function ListLimitOrder(props, ref) { attemptingTxn: true, })) - const [{ encodedData }, nonce] = await Promise.all([ - getEncodeData([order?.id].filter(Boolean) as number[], isCancelAll), - isCancelAll ? limitOrderContract.nonce(account) : Promise.resolve(BigNumber.from(0)), - ]) - - const response = await sendEVMTransaction( - account, - library, - getLimitOrderContract(chainId) ?? '', - encodedData, - BigNumber.from(0), - ) const newOrders = isCancelAll ? orders.map(e => e.id) : order?.id ? [order?.id] : [] - setCancellingOrders({ orderIds: cancellingOrdersIds.concat(newOrders) }) - - if (response?.hash) { - insertCancellingOrder({ - maker: account, - chainId: chainId.toString(), - txHash: response.hash, - [isCancelAll ? 'nonce' : 'orderIds']: isCancelAll ? nonce?.toNumber() : newOrders, - }) + + const sendTransaction = async (encodedData: string, contract: string, payload: any) => { + const response = await sendEVMTransaction(account, library, contract, encodedData, BigNumber.from(0)) + if (response?.hash) { + insertCancellingOrder({ + maker: account, + chainId: chainId.toString(), + txHash: response.hash, + contractAddress: contract ?? '', + ...payload, + }).unwrap() + } + + if (response) { + const { + makerAssetDecimals, + takerAssetDecimals, + takerAssetSymbol, + takingAmount, + makingAmount, + takerAsset, + makerAssetSymbol, + makerAsset, + } = order || ({} as LimitOrder) + const amountIn = order ? formatAmountOrder(makingAmount, makerAssetDecimals) : '' + const amountOut = order ? formatAmountOrder(takingAmount, takerAssetDecimals) : '' + addTransactionWithType({ + ...response, + type: TRANSACTION_TYPE.CANCEL_LIMIT_ORDER, + extraInfo: order + ? { + tokenAddressIn: makerAsset, + tokenAddressOut: takerAsset, + tokenSymbolIn: makerAssetSymbol, + tokenSymbolOut: takerAssetSymbol, + tokenAmountIn: amountIn, + tokenAmountOut: amountOut, + arbitrary: getPayloadTracking(order), + } + : { arbitrary: { totalOrder } }, + }) + } } - if (response) { - const { - makerAssetDecimals, - takerAssetDecimals, - takerAssetSymbol, - takingAmount, - makingAmount, - takerAsset, - makerAssetSymbol, - makerAsset, - } = order || ({} as LimitOrder) - const amountIn = order ? formatAmountOrder(makingAmount, makerAssetDecimals) : '' - const amountOut = order ? formatAmountOrder(takingAmount, takerAssetDecimals) : '' - addTransactionWithType({ - ...response, - type: TRANSACTION_TYPE.CANCEL_LIMIT_ORDER, - extraInfo: order - ? { - tokenAddressIn: makerAsset, - tokenAddressOut: takerAsset, - tokenSymbolIn: makerAssetSymbol, - tokenSymbolOut: takerAssetSymbol, - tokenAmountIn: amountIn, - tokenAmountOut: amountOut, - arbitrary: getPayloadTracking(order), - } - : { arbitrary: { totalOrder } }, - }) + + if (isCancelAll) { + const contracts = [...new Set(orders.map(e => e.contractAddress))] + for (const address of contracts) { + const limitOrderContract = getContract(address, LIMIT_ORDER_ABI, library, account) + const [{ encodedData }, nonce] = await Promise.all([ + getEncodeData({ orderIds: [], isCancelAll }).unwrap(), + limitOrderContract?.nonce?.(account), + ]) + await sendTransaction(encodedData, address, { nonce: nonce.toNumber() }) + } + } else { + const { encodedData } = await getEncodeData({ + orderIds: [order?.id].filter(Boolean) as number[], + isCancelAll, + }).unwrap() + await sendTransaction(encodedData, order?.contractAddress ?? '', { orderIds: newOrders }) } + setCancellingOrders(cancellingOrdersIds.concat(newOrders)) return } diff --git a/src/components/swapv2/LimitOrder/request.ts b/src/components/swapv2/LimitOrder/request.ts deleted file mode 100644 index c1675a3985..0000000000 --- a/src/components/swapv2/LimitOrder/request.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { ChainId } from '@kyberswap/ks-sdk-core' -import axios from 'axios' -import { stringify } from 'querystring' - -import { LIMIT_ORDER_API_READ, LIMIT_ORDER_API_WRITE } from 'constants/env' - -import { LimitOrder, LimitOrderStatus } from './type' - -const formatData = (data: any) => data.data.data -export const getListOrder = ( - params: any, - signal: AbortSignal, -): Promise<{ orders: LimitOrder[]; pagination: { totalItems: number } }> => { - return fetch(`${LIMIT_ORDER_API_READ}/v1/orders?${stringify(params)}`, { signal }) - .then(data => data.json()) - .then(data => data.data) - .then(data => { - data.orders.forEach((order: any) => { - order.chainId = Number(order.chainId) as ChainId - }) - - return data - }) -} - -export const getNumberOfInsufficientFundOrders = async ( - params: { - chainId: ChainId - maker: string - }, - signal?: AbortSignal, -): Promise => { - return fetch(`${LIMIT_ORDER_API_READ}/v1/orders/insufficient-funds?${stringify(params)}`, { signal }) - .then(data => data.json()) - .then(data => data?.data?.total || 0) -} - -export const submitOrder = (data: any) => { - return axios.post(`${LIMIT_ORDER_API_WRITE}/v1/orders`, data).then(formatData) -} - -export const getMessageSignature = (data: any) => { - return axios.post(`${LIMIT_ORDER_API_WRITE}/v1/orders/sign-message`, data).then(formatData) -} - -let activeMakingAmountCache: { [address: string]: string } = {} -export const clearCacheActiveMakingAmount = () => { - activeMakingAmountCache = {} -} - -export const getTotalActiveMakingAmount = async ( - chainId: ChainId, - tokenAddress: string, - account: string, -): Promise<{ activeMakingAmount: string }> => { - if (activeMakingAmountCache[tokenAddress]) { - return { activeMakingAmount: activeMakingAmountCache[tokenAddress] } - } - return axios - .get(`${LIMIT_ORDER_API_READ}/v1/orders/active-making-amount`, { - params: { - chainId: chainId + '', - makerAsset: tokenAddress, - maker: account, - }, - }) - .then(formatData) - .then(data => { - activeMakingAmountCache[tokenAddress] = data.activeMakingAmount - return data - }) -} - -export const getEncodeData = (orderIds: number[], isCancelAll = false) => { - const method = isCancelAll ? 'increase-nonce' : 'cancel-batch-orders' - return axios.post(`${LIMIT_ORDER_API_READ}/v1/encode/${method}`, isCancelAll ? {} : { orderIds }).then(formatData) -} - -const mapPath: Partial> = { - [LimitOrderStatus.CANCELLED]: 'cancelled', - [LimitOrderStatus.EXPIRED]: 'expired', - [LimitOrderStatus.FILLED]: 'filled', -} -export const ackNotificationOrder = (docIds: string[], maker: string, chainId: ChainId, type: LimitOrderStatus) => { - return axios - .delete(`${LIMIT_ORDER_API_WRITE}/v1/events/${mapPath[type]}`, { - data: { maker, chainId: chainId + '', [type === LimitOrderStatus.FILLED ? 'uuids' : 'docIds']: docIds }, - }) - .then(formatData) -} - -export const insertCancellingOrder = (data: { - orderIds?: number[] - nonce?: number - maker: string - chainId: string - txHash: string -}) => { - return axios.post(`${LIMIT_ORDER_API_WRITE}/v1/orders/cancelling`, data).then(formatData) -} diff --git a/src/components/swapv2/LimitOrder/type.ts b/src/components/swapv2/LimitOrder/type.ts index 383b5a16d7..a2211ce38c 100644 --- a/src/components/swapv2/LimitOrder/type.ts +++ b/src/components/swapv2/LimitOrder/type.ts @@ -44,6 +44,7 @@ export type LimitOrder = { isSuccessful: boolean uuid: string txHash: string + contractAddress: string } export type RateInfo = { diff --git a/src/components/swapv2/LimitOrder/useCancellingOrders.ts b/src/components/swapv2/LimitOrder/useCancellingOrders.ts index 4457b0988f..8107da276f 100644 --- a/src/components/swapv2/LimitOrder/useCancellingOrders.ts +++ b/src/components/swapv2/LimitOrder/useCancellingOrders.ts @@ -1,7 +1,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react' +import { useGetLOContractAddressQuery } from 'services/limitOrder' import { useActiveWeb3React } from 'hooks' -import { subscribeCancellingOrders } from 'utils/firebase' +import { OrderNonces, subscribeCancellingOrders } from 'utils/firebase' import { isActiveStatus } from './helpers' import { LimitOrder } from './type' @@ -9,8 +10,7 @@ import { LimitOrder } from './type' export type CancellingOrderInfo = { loading: boolean cancellingOrdersIds: number[] - cancellingOrdersNonces: number[] - setCancellingOrders: (data: { orderIds?: number[]; nonces?: number[] }) => void + setCancellingOrders: (orderIds: number[]) => void isOrderCancelling: (order: LimitOrder) => boolean } @@ -18,35 +18,40 @@ export default function useCancellingOrders(): CancellingOrderInfo { const { account, chainId } = useActiveWeb3React() const [cancellingOrdersIds, setCancellingOrdersIds] = useState([]) - const [cancellingOrdersNonces, setCancellingOrdersNonces] = useState([]) + const [cancellingOrdersNonces, setCancellingOrdersNonces] = useState({}) const [loading, setLoading] = useState(true) + const { data = '', isError } = useGetLOContractAddressQuery(chainId) + const contract = isError ? '' : data - const setCancellingOrders = useCallback((data: { orderIds?: number[]; nonces?: number[] }) => { - if (data.orderIds) setCancellingOrdersIds(data.orderIds) - if (data.nonces) setCancellingOrdersNonces(data.nonces) + const setCancellingOrders = useCallback((orderIds: number[]) => { + setCancellingOrdersIds(orderIds) }, []) useEffect(() => { if (!account) return const unsubscribe = subscribeCancellingOrders(account, chainId, data => { setCancellingOrdersIds(data?.orderIds ?? []) - setCancellingOrdersNonces(data?.nonces ?? []) + setCancellingOrdersNonces(data?.noncesByContract ?? {}) setLoading(false) }) return () => unsubscribe?.() - }, [account, chainId, setCancellingOrders]) + }, [account, chainId]) const isOrderCancelling = useCallback( - (order: LimitOrder) => { + (order: LimitOrder | string | undefined) => { + if (!order) return false + const nonces = cancellingOrdersNonces[contract] || [] + if (typeof order === 'string') { + return cancellingOrdersIds.includes(+order) && nonces.length > 0 + } return ( - isActiveStatus(order.status) && - (cancellingOrdersNonces.includes(order.nonce) || cancellingOrdersIds?.includes(order.id)) + isActiveStatus(order.status) && (nonces?.includes?.(order.nonce) || cancellingOrdersIds?.includes(order.id)) ) }, - [cancellingOrdersNonces, cancellingOrdersIds], + [cancellingOrdersNonces, cancellingOrdersIds, contract], ) return useMemo(() => { - return { cancellingOrdersIds, cancellingOrdersNonces, loading, setCancellingOrders, isOrderCancelling } - }, [cancellingOrdersIds, cancellingOrdersNonces, loading, setCancellingOrders, isOrderCancelling]) + return { cancellingOrdersIds, loading, setCancellingOrders, isOrderCancelling } + }, [cancellingOrdersIds, loading, setCancellingOrders, isOrderCancelling]) } diff --git a/src/components/swapv2/LimitOrder/useNotificationLimitOrder.tsx b/src/components/swapv2/LimitOrder/useNotificationLimitOrder.tsx new file mode 100644 index 0000000000..a1b5909a88 --- /dev/null +++ b/src/components/swapv2/LimitOrder/useNotificationLimitOrder.tsx @@ -0,0 +1,178 @@ +import { t } from '@lingui/macro' +import { useCallback, useEffect, useRef } from 'react' +import { useAckNotificationOrderMutation } from 'services/limitOrder' + +import { NotificationType } from 'components/Announcement/type' +import { LimitOrder, LimitOrderStatus } from 'components/swapv2/LimitOrder/type' +import { useActiveWeb3React } from 'hooks' +import { useNotify } from 'state/application/hooks' +import { useAllTransactions } from 'state/transactions/hooks' +import { GroupedTxsByHash } from 'state/transactions/type' +import { findTx } from 'utils' +import { + subscribeNotificationOrderCancelled, + subscribeNotificationOrderExpired, + subscribeNotificationOrderFilled, +} from 'utils/firebase' +import { getTransactionStatus } from 'utils/transaction' + +import SummaryNotify from './ListOrder/SummaryNotify' + +const isTransactionFailed = (txHash: string, transactions: GroupedTxsByHash | undefined) => { + const transactionInfo = findTx(transactions, txHash) + return transactionInfo ? getTransactionStatus(transactionInfo).error : false +} + +const useNotificationLimitOrder = () => { + const notify = useNotify() + const { account, chainId } = useActiveWeb3React() + const showedNotificationOrderIds = useRef<{ [id: string]: boolean }>({}) + + const ackNotiLocal = useCallback((id: string | number) => { + showedNotificationOrderIds.current = { ...showedNotificationOrderIds.current, [id]: true } + }, []) + + const transactions = useAllTransactions() + + const [ackNotificationOrder] = useAckNotificationOrderMutation() + + useEffect(() => { + if (!account) return + const unsubscribeCancelled = subscribeNotificationOrderCancelled(account, chainId, data => { + const cancelAllData = data?.all?.[0] + const cancelAllSuccess = cancelAllData?.isSuccessful + if (cancelAllSuccess !== undefined) { + // not show Notification when cancel failed because duplicate. + if ( + !isTransactionFailed(cancelAllData?.txHash ?? '', transactions) && + !showedNotificationOrderIds.current[cancelAllData.id ?? ''] + ) { + notify( + { + type: cancelAllSuccess ? NotificationType.WARNING : NotificationType.ERROR, + title: cancelAllSuccess ? t`Order Cancelled` : t`Cancel Orders Failed`, + summary: ( + + ), + }, + 10000, + ) + } + const nonces = + data?.all.map((e: { id: string }) => { + ackNotiLocal(e.id) + return e.id + }) ?? [] + if (nonces.length) { + ackNotificationOrder({ docIds: nonces, maker: account, chainId, type: LimitOrderStatus.CANCELLED }).catch( + console.error, + ) + } + } + + const orders: LimitOrder[] = data?.orders ?? [] + const orderCancelSuccess = orders.filter(e => e.isSuccessful && !showedNotificationOrderIds.current[e.id]) + const orderCancelFailed = orders.filter( + e => + !e.isSuccessful && !isTransactionFailed(e.txHash, transactions) && !showedNotificationOrderIds.current[e.id], + ) + + if (orderCancelSuccess.length) + notify( + { + type: NotificationType.WARNING, + title: t`Order Cancelled`, + summary: , + }, + 10000, + ) + if (orderCancelFailed.length) + notify( + { + type: NotificationType.ERROR, + title: t`Order Cancel Failed`, + summary: , + }, + 10000, + ) + if (orders.length) + ackNotificationOrder({ + docIds: orders.map(({ id }) => { + ackNotiLocal(id) + return id.toString() + }), + maker: account, + chainId, + type: LimitOrderStatus.CANCELLED, + }).catch(console.error) + }) + const unsubscribeExpired = subscribeNotificationOrderExpired(account, chainId, data => { + const orders: LimitOrder[] = data?.orders ?? [] + if (orders.length) { + notify( + { + type: NotificationType.WARNING, + title: t`Order Expired`, + summary: , + }, + 10000, + ) + ackNotificationOrder({ + docIds: orders.map(e => e.id.toString()), + maker: account, + chainId, + type: LimitOrderStatus.EXPIRED, + }).catch(console.error) + } + }) + const unsubscribeFilled = subscribeNotificationOrderFilled(account, chainId, data => { + const orders: LimitOrder[] = data?.orders ?? [] + const orderFilled = orders.filter( + order => order.status === LimitOrderStatus.FILLED || order.takingAmount === order.filledTakingAmount, + ) + const orderPartialFilled = orders.filter( + order => order.status === LimitOrderStatus.PARTIALLY_FILLED || order.takingAmount !== order.filledTakingAmount, + ) + if (orderFilled.length) { + notify( + { + type: NotificationType.SUCCESS, + title: t`Order Filled`, + summary: , + }, + 10000, + ) + } + orderPartialFilled.forEach(order => { + notify( + { + type: NotificationType.SUCCESS, + title: t`Order Partially Filled`, + summary: , + }, + 10000, + ) + }) + if (orders.length) { + ackNotificationOrder({ + docIds: orders.map(e => e.uuid), + maker: account, + chainId, + type: LimitOrderStatus.FILLED, + }).catch(console.error) + } + }) + return () => { + unsubscribeCancelled?.() + unsubscribeExpired?.() + unsubscribeFilled?.() + } + }, [account, chainId, notify, ackNotificationOrder, ackNotiLocal, transactions]) +} +export default useNotificationLimitOrder diff --git a/src/components/swapv2/PairSuggestion/index.tsx b/src/components/swapv2/PairSuggestion/index.tsx index 75b162dfc2..57c3f3c8b6 100644 --- a/src/components/swapv2/PairSuggestion/index.tsx +++ b/src/components/swapv2/PairSuggestion/index.tsx @@ -1,6 +1,6 @@ import { Currency, NativeCurrency, Token } from '@kyberswap/ks-sdk-core' import { t } from '@lingui/macro' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { stringify } from 'querystring' import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react' import { BrowserView, MobileView, isIOS, isMobile } from 'react-device-detect' diff --git a/src/components/swapv2/SwapSettingsPanel/index.tsx b/src/components/swapv2/SwapSettingsPanel/index.tsx index 5444727d8e..eb3caa2591 100644 --- a/src/components/swapv2/SwapSettingsPanel/index.tsx +++ b/src/components/swapv2/SwapSettingsPanel/index.tsx @@ -1,6 +1,6 @@ import { Trans, t } from '@lingui/macro' import { rgba } from 'polished' -import React, { useRef, useState } from 'react' +import React, { RefObject, useRef, useState } from 'react' import { ChevronLeft } from 'react-feather' import { Box, Flex, Text } from 'rebass' import styled from 'styled-components' @@ -36,6 +36,7 @@ type Props = { isLimitOrder?: boolean isSwapPage?: boolean isCrossChainPage?: boolean + swapActionsRef: RefObject } const BackText = styled.span` @@ -52,6 +53,7 @@ const SettingsPanel: React.FC = ({ onBack, onClickLiquiditySources, onClickGasPriceTracker, + swapActionsRef, }) => { const theme = useTheme() @@ -83,7 +85,7 @@ const SettingsPanel: React.FC = ({ const [showConfirmation, setShowConfirmation] = useState(false) const containerRef = useRef(null) - useOnClickOutside(containerRef, () => !showConfirmation && onBack()) + useOnClickOutside([containerRef, swapActionsRef], () => !showConfirmation && onBack()) return ( diff --git a/src/components/swapv2/TradePrice.tsx b/src/components/swapv2/TradePrice.tsx index 3bb77e043f..be8b493881 100644 --- a/src/components/swapv2/TradePrice.tsx +++ b/src/components/swapv2/TradePrice.tsx @@ -7,6 +7,7 @@ import { CSSProperties } from 'styled-components' import useTheme from 'hooks/useTheme' import { useCurrencyConvertedToNative } from 'utils/dmm' +import { formatDisplayNumber } from 'utils/numbers' import { Dots, StyledBalanceMaxMini } from './styleds' @@ -23,7 +24,7 @@ export default function TradePrice({ price, label, icon, style = {}, color }: Tr const [showInverted, setShowInverted] = useState(false) let formattedPrice try { - formattedPrice = showInverted ? price?.invert()?.toSignificant(6) : price?.toSignificant(6) + formattedPrice = formatDisplayNumber(showInverted ? price?.invert() : price, { significantDigits: 7 }) } catch (error) {} const show = Boolean(price?.baseCurrency && price?.quoteCurrency && formattedPrice) diff --git a/src/constants/bases.ts b/src/constants/bases.ts index 65457134b1..8a4bd0bae2 100644 --- a/src/constants/bases.ts +++ b/src/constants/bases.ts @@ -22,13 +22,12 @@ const WETH_ONLY: ChainTokenList = { [ChainId.AURORA]: [WETH[ChainId.AURORA]], [ChainId.BTTC]: [WETH[ChainId.BTTC]], [ChainId.ARBITRUM]: [WETH[ChainId.ARBITRUM]], - [ChainId.VELAS]: [WETH[ChainId.VELAS]], - [ChainId.OASIS]: [WETH[ChainId.OASIS]], [ChainId.OPTIMISM]: [WETH[ChainId.OPTIMISM]], [ChainId.ZKSYNC]: [WETH[ChainId.ZKSYNC]], [ChainId.SOLANA]: [WETH[ChainId.SOLANA]], [ChainId.LINEA]: [WETH[ChainId.LINEA]], [ChainId.ZKEVM]: [WETH[ChainId.ZKEVM]], + [ChainId.BASE]: [WETH[ChainId.BASE]], [ChainId.SOLANA_DEVNET]: [WETH[ChainId.SOLANA_DEVNET]], } @@ -80,8 +79,6 @@ export const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = { [ChainId.FANTOM]: [...WETH_ONLY[ChainId.FANTOM], DAI[ChainId.FANTOM], USDC[ChainId.FANTOM], USDT[ChainId.FANTOM]], [ChainId.CRONOS]: [...WETH_ONLY[ChainId.CRONOS], DAI[ChainId.CRONOS], USDC[ChainId.CRONOS], USDT[ChainId.CRONOS]], [ChainId.AURORA]: [...WETH_ONLY[ChainId.AURORA], DAI[ChainId.AURORA], USDC[ChainId.AURORA], USDT[ChainId.AURORA]], - [ChainId.VELAS]: [...WETH_ONLY[ChainId.VELAS], USDC[ChainId.VELAS], USDT[ChainId.VELAS]], - [ChainId.OASIS]: [...WETH_ONLY[ChainId.OASIS], USDC[ChainId.OASIS], USDT[ChainId.OASIS]], [ChainId.BTTC]: [ ...WETH_ONLY[ChainId.BTTC], DAI[ChainId.BTTC], @@ -158,8 +155,6 @@ export const SUGGESTED_BASES: ChainTokenList = { new Token(ChainId.ARBITRUM, '0x5979D7b546E38E414F7E9822514be443A4800529', 18, 'wstETH', 'Lido Wrapped Staked ETH'), ], [ChainId.BTTC]: [...WETH_ONLY[ChainId.BTTC], DAI[ChainId.BTTC], USDC[ChainId.BTTC], USDT[ChainId.BTTC]], - [ChainId.VELAS]: [...WETH_ONLY[ChainId.VELAS], USDC[ChainId.VELAS], USDT[ChainId.VELAS]], - [ChainId.OASIS]: [...WETH_ONLY[ChainId.OASIS], USDC[ChainId.OASIS], USDT[ChainId.OASIS]], [ChainId.OPTIMISM]: [ ...WETH_ONLY[ChainId.OPTIMISM], USDC[ChainId.OPTIMISM], @@ -183,4 +178,5 @@ export const SUGGESTED_BASES: ChainTokenList = { ...WETH_ONLY[ChainId.LINEA], new Token(ChainId.LINEA, '0x7d43aabc515c356145049227cee54b608342c0ad', 18, 'BUSD', 'BUSD'), ], + [ChainId.BASE]: [...WETH_ONLY[ChainId.BASE], USDC[ChainId.BASE], DAI[ChainId.BASE]], } diff --git a/src/constants/connectors/evm.ts b/src/constants/connectors/evm.ts index 5a5e40c31c..707ecef9d8 100644 --- a/src/constants/connectors/evm.ts +++ b/src/constants/connectors/evm.ts @@ -1,7 +1,9 @@ +import { BloctoConnector } from '@blocto/web3-react-connector' import { ChainId } from '@kyberswap/ks-sdk-core' import { OPTIONAL_EVENTS } from '@walletconnect/ethereum-provider' import { CoinbaseWallet } from '@web3-react/coinbase-wallet' import { initializeConnector } from '@web3-react/core' +import { GnosisSafe } from '@web3-react/gnosis-safe' import { MetaMask } from '@web3-react/metamask' import { WalletConnect as WalletConnectV2 } from '@web3-react/walletconnect-v2' @@ -16,10 +18,21 @@ import { } from 'constants/networks' export const [injected, injectedHooks] = initializeConnector(actions => new MetaMask({ actions })) +export const [rabby, rabbyHooks] = initializeConnector(actions => new MetaMask({ actions })) +export const [krystal, krystalHooks] = initializeConnector(actions => new MetaMask({ actions })) export const [metaMask, metamaskHooks] = initializeConnector(actions => new MetaMask({ actions })) +export const [gnosisSafe, gnosisSafeHooks] = initializeConnector(actions => new GnosisSafe({ actions })) export const [coin98, coin98Hooks] = initializeConnector(actions => new MetaMask({ actions })) export const [brave, braveHooks] = initializeConnector(actions => new MetaMask({ actions })) -export const [trustWallet, trustWalletHooks] = initializeConnector(actions => new MetaMask({ actions })) +export const [trust, trustHooks] = initializeConnector(actions => new MetaMask({ actions })) +export const [blocto, bloctoHooks] = initializeConnector( + actions => + new BloctoConnector({ + actions, + options: { chainId: ChainId.MATIC, rpc: NETWORKS_INFO[ChainId.MATIC].defaultRpcUrl }, + }), +) +export const [bloctoInject, bloctoInjectHooks] = initializeConnector(actions => new MetaMask({ actions })) const darkmode = Boolean(window.matchMedia('(prefers-color-scheme: dark)')) export const [walletConnectV2, walletConnectV2Hooks] = initializeConnector( @@ -50,7 +63,7 @@ export const [walletConnectV2, walletConnectV2Hooks] = initializeConnector { + console.log('capturing Injected window.ethereum', { level: 'info', extra: { 'window.ethereum': window.ethereum } }) + captureMessage('Injected window.ethereum', { level: 'info', extra: { 'window.ethereum': window.ethereum } }) + }, 2000) +} + export const getIsInjected = () => Boolean(window.ethereum) const allNonMetamaskFlags = [ @@ -9,23 +20,32 @@ const allNonMetamaskFlags = [ 'isTrustWallet', 'isLedgerConnect', 'isCoin98', + 'isKrystal', 'isKrystalWallet', + 'isPhantom', + 'isBlocto', ] as const - export const getIsMetaMaskWallet = () => Boolean(window.ethereum?.isMetaMask && !allNonMetamaskFlags.some(flag => window.ethereum?.[flag])) +export const getIsRabbyWallet = () => Boolean(window.ethereum?.isRabby) + +export const getIsKrystalWallet = () => Boolean(window.ethereum?.isKrystalWallet || window.ethereum?.isKrystal) + export const getIsCoinbaseWallet = () => Boolean( (window.ethereum?.isCoinbaseWallet || window.ethereum?.providers?.some(p => p?.isCoinbaseWallet)) && - !window.ethereum?.isKrystalWallet, + !getIsTrustWallet(), ) export const getIsBraveWallet = () => Boolean(checkForBraveBrowser() && window.ethereum?.isBraveWallet) +export const getIsBloctoWallet = () => Boolean(window.ethereum?.isBlocto) + export const getIsC98Wallet = () => Boolean(window.ethereum?.isCoin98 && window.coin98) -export const getIsTrustWallet = () => Boolean(window.ethereum?.isTrustWallet || window.ethereum?.isTrust) +export const getIsTrustWallet = () => + Boolean((window.ethereum?.isTrustWallet || window.ethereum?.isTrust) && !getIsKrystalWallet()) export const getIsGenericInjector = () => getIsInjected() && @@ -33,6 +53,9 @@ export const getIsGenericInjector = () => !getIsCoinbaseWallet() && !getIsBraveWallet() && !getIsC98Wallet() && + !getIsRabbyWallet() && + !getIsBloctoWallet() && + !getIsKrystalWallet() && !getIsTrustWallet() // https://eips.ethereum.org/EIPS/eip-1193#provider-errors @@ -55,17 +78,30 @@ export enum ErrorCode { ALPHA_WALLET_REJECTED = 'Request rejected', } -const rejectedPhrases: string[] = ['user rejected transaction', 'user denied transaction', 'you must accept'] +const rejectedPhrases: readonly string[] = [ + 'user rejected transaction', + 'User declined to send the transaction', + 'user denied transaction', + 'you must accept', +].map(phrase => phrase.toLowerCase()) export function didUserReject(error: any): boolean { + const message = String( + typeof error === 'string' ? error : error?.message || error?.code || error?.errorMessage || '', + ).toLowerCase() return ( - error?.code === ErrorCode.USER_REJECTED_REQUEST || - error?.code === ErrorCode.ACTION_REJECTED || - error?.code === ErrorCode.ALPHA_WALLET_REJECTED_CODE || - error?.message === ErrorCode.ALPHA_WALLET_REJECTED || - error?.message === ErrorCode.WALLETCONNECT_MODAL_CLOSED || - error?.message === ErrorCode.WALLETCONNECT_CANCELED || - error?.message === ErrorCode.WALLETCONNECT_MODAL_CLOSED || - rejectedPhrases.some(phrase => error?.message?.toLowerCase?.()?.includes?.(phrase.toLowerCase())) + [ErrorCode.USER_REJECTED_REQUEST, ErrorCode.ACTION_REJECTED, ErrorCode.ALPHA_WALLET_REJECTED_CODE] + .map(String) + .includes(error?.code?.toString?.()) || + ( + [ + ErrorCode.USER_REJECTED_REQUEST, + ErrorCode.ALPHA_WALLET_REJECTED, + ErrorCode.WALLETCONNECT_MODAL_CLOSED, + ErrorCode.WALLETCONNECT_CANCELED, + ErrorCode.WALLETCONNECT_MODAL_CLOSED, + ].map(String) as ErrorCode[] + ).includes(message) || + rejectedPhrases.some(phrase => message?.includes?.(phrase)) ) } diff --git a/src/constants/env.ts b/src/constants/env.ts index 27501c13fb..378da69d50 100644 --- a/src/constants/env.ts +++ b/src/constants/env.ts @@ -143,7 +143,12 @@ const ANNOUNCEMENT_TEMPLATE_IDS: { [key: string]: { [type: string]: string } } = }, } -export const ENV_KEY: 'production' | 'staging' | 'development' = import.meta.env.VITE_ENV +export enum EnvKeys { + PROD = 'production', + STG = 'staging', + DEV = 'development', +} +export const ENV_KEY: EnvKeys = import.meta.env.VITE_ENV export const getAnnouncementsTemplateIds = (type: PrivateAnnouncementType | 'EXCLUDE') => { return ANNOUNCEMENT_TEMPLATE_IDS[ENV_KEY]?.[type] @@ -156,6 +161,6 @@ export const MOCK_ACCOUNT_SOLANA = mock[1] ?? '' const isSupportTestNet = ENV_LEVEL < ENV_TYPE.PROD && new URLSearchParams(window.location.search).get('test') export const CROSS_CHAIN_CONFIG = { AXELAR_SCAN_URL: isSupportTestNet ? 'https://testnet.axelarscan.io/gmp/' : 'https://axelarscan.io/gmp/', - API_DOMAIN: isSupportTestNet ? 'https://testnet.api.0xsquid.com' : 'https://api.0xsquid.com', + API_DOMAIN: isSupportTestNet ? 'https://testnet.api.0xsquid.com' : 'https://api.squidrouter.com', INTEGRATOR_ID: 'kyberswap-api', } diff --git a/src/constants/index.ts b/src/constants/index.ts index 3b7218a4f2..741f6fa4fb 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -8,7 +8,6 @@ import { TransactionFlowState } from 'types/TransactionFlowState' import { CAMPAIGN_BASE_URL as CAMPAIGN_BASE_DOMAIN } from './env' import * as ENV from './env' import { EVM_NETWORK, NETWORKS_INFO, SUPPORTED_NETWORKS, isEVM } from './networks' -import { ENV_TYPE } from './type' export const EMPTY_OBJECT: any = {} export const EMPTY_ARRAY: any[] = [] @@ -126,6 +125,8 @@ export const DEFAULT_DEADLINE_FROM_NOW = 60 * 20 // denominated in seconds export const TIME_TO_REFRESH_SWAP_RATE = 10 +export const BIG_INT_ONE = JSBI.BigInt(1) +export const BIG_INT_MINUS_ONE = JSBI.BigInt(-1) export const BIG_INT_ZERO = JSBI.BigInt(0) // one basis point @@ -236,9 +237,9 @@ export const APP_PATHS = { export const TERM_FILES_PATH = { KYBERSWAP_TERMS: '/files/Kyber - Terms of Service - 1 August 2023.pdf', - PRIVACY_POLICY: '/files/privacy.pdf', + PRIVACY_POLICY: '/files/Kyber - Privacy Policy - 23 Aug 2023.pdf', // Timestamp of changed date, update this to latest timestamp whenever change any above files. This also used to check on client side for updated to force user to disconnect and re-accept terms. - VERSION: 1690848000000, + VERSION: 1692748800000, } export enum FARM_TAB { @@ -261,12 +262,6 @@ export const EIP712Domain = [ { name: 'verifyingContract', type: 'address' }, ] -if (ENV.ENV_LEVEL < ENV_TYPE.PROD) { - console.groupCollapsed('ENV') - console.log(JSON.stringify(ENV, null, 4)) - console.groupEnd() -} - export const INPUT_DEBOUNCE_TIME = 300 export const ENABLE_CLICK_TO_REFRESH_GET_ROUTE = false @@ -305,9 +300,9 @@ export const TRANSACTION_STATE_DEFAULT: TransactionFlowState = { pendingText: '', } -export const CHAINS_SUPPORT_FEE_CONFIGS = [ChainId.OASIS, ChainId.VELAS, ChainId.AURORA, ChainId.CRONOS] +export const CHAINS_SUPPORT_FEE_CONFIGS = [ChainId.AURORA, ChainId.CRONOS] export const CHAINS_SUPPORT_CROSS_CHAIN = - ENV.ENV_KEY === 'production' || ENV.ENV_KEY === 'staging' + ENV.ENV_KEY === ENV.EnvKeys.PROD || ENV.ENV_KEY === ENV.EnvKeys.STG ? [ ChainId.MAINNET, ChainId.BSCMAINNET, @@ -317,10 +312,16 @@ export const CHAINS_SUPPORT_CROSS_CHAIN = ChainId.OPTIMISM, ChainId.FANTOM, ChainId.LINEA, + ChainId.BASE, ] : SUPPORTED_NETWORKS -export const TYPE_AND_SWAP_NOT_SUPPORTED_CHAINS: ChainId[] = [ChainId.ZKSYNC, ChainId.LINEA, ChainId.ZKEVM] +export const TYPE_AND_SWAP_NOT_SUPPORTED_CHAINS: ChainId[] = [ + ChainId.ZKSYNC, + ChainId.LINEA, + ChainId.ZKEVM, + ChainId.BASE, +] export const SWAP_FEE_RECEIVER_ADDRESS = '0x4f82e73EDb06d29Ff62C91EC8f5Ff06571bdeb29' @@ -379,3 +380,14 @@ export const ICON_IDS = [ 'discord', ] as const export type ICON_ID = typeof ICON_IDS[number] + +export const FRAX_FARMS: { [chainId in ChainId]?: string[] } = { + [ChainId.MAINNET]: [ + '0xe5379f5ee90d70a0f9de0ed8b3cdde3b9427524a', + '0xfd7b111aa83b9b6f547e617c7601efd997f64703', + '0x36240069ff26cecbde04d9e49a2af8d39146263e', + ], + [ChainId.MATIC]: ['0xa5ebdde0f2e657d77bebeda085dd49f6decf8504'], + [ChainId.ARBITRUM]: ['0x6a7dccf168fba624a81b293c2538d31427b5b4bd'], + [ChainId.OPTIMISM]: ['0xa837d04a64acf66912d05cfd9b951e4e399ab680'], +} diff --git a/src/constants/networks.ts b/src/constants/networks.ts index 3bf526dd5e..51149291d8 100644 --- a/src/constants/networks.ts +++ b/src/constants/networks.ts @@ -1,4 +1,5 @@ import { ChainId, ChainType, getChainType } from '@kyberswap/ks-sdk-core' +import { t } from '@lingui/macro' import { SolanaNetworkInfo } from 'constants/networks/type' @@ -7,6 +8,7 @@ import { aurora, avax, avaxTestnet, + base, bnb, bnbTestnet, bttc, @@ -17,15 +19,13 @@ import { linea, matic, mumbai, - oasis, optimism, solana, solanaDevnet, - velas, + zkEvm, zksync, } from './networks/index' import { EVMNetworkInfo } from './networks/type' -import zkEvm from './networks/zkevm' type SOLANA_NETWORK = ChainId.SOLANA | ChainId.SOLANA_DEVNET @@ -45,13 +45,12 @@ const NETWORKS_INFO_CONFIG: NETWORKS_INFO_CONFIG_TYPE = { [ChainId.CRONOS]: cronos, [ChainId.ARBITRUM]: arbitrum, [ChainId.BTTC]: bttc, - [ChainId.VELAS]: velas, [ChainId.AURORA]: aurora, - [ChainId.OASIS]: oasis, [ChainId.OPTIMISM]: optimism, [ChainId.ZKSYNC]: zksync, [ChainId.LINEA]: linea, [ChainId.ZKEVM]: zkEvm, + [ChainId.BASE]: base, [ChainId.SOLANA]: solana, [ChainId.SOLANA_DEVNET]: solanaDevnet, } as const @@ -67,7 +66,7 @@ export const NETWORKS_INFO = new Proxy(NETWORKS_INFO_CONFIG, { // temporary disable Solana // todo: either enable back or completely remove Solana from codebase -export const SUPPORTED_NETWORKS = Object.keys(NETWORKS_INFO).map(Number).filter(isEVM) as ChainId[] +export const SUPPORTED_NETWORKS = Object.keys(NETWORKS_INFO).map(Number).filter(isEVM) export const MAINNET_NETWORKS = [ ChainId.MAINNET, @@ -77,14 +76,13 @@ export const MAINNET_NETWORKS = [ ChainId.MATIC, ChainId.ZKEVM, ChainId.ZKSYNC, + ChainId.BASE, ChainId.BSCMAINNET, ChainId.AVAXMAINNET, // ChainId.SOLANA, ChainId.FANTOM, ChainId.BTTC, ChainId.CRONOS, - ChainId.VELAS, - ChainId.OASIS, ChainId.AURORA, ] as const @@ -132,30 +130,11 @@ export function isSupportedChainId(chainId?: number): chainId is ChainId { } export const FAUCET_NETWORKS = [ChainId.BTTC] -export const CHAINS_SUPPORT_NEW_POOL_FARM_API: readonly ChainId[] = [ - ChainId.MAINNET, - // ChainId.MUMBAI, - // ChainId.MATIC, - // ChainId.BSCTESTNET, - ChainId.BSCMAINNET, - // ChainId.AVAXTESTNET, - ChainId.AVAXMAINNET, - ChainId.FANTOM, - ChainId.CRONOS, - ChainId.BTTC, - ChainId.ARBITRUM, - ChainId.AURORA, - // ChainId.VELAS, - // ChainId.OASIS, - ChainId.OPTIMISM, -] // Fee options instead of dynamic fee export const STATIC_FEE_OPTIONS: { [chainId: number]: number[] | undefined } = { [ChainId.ARBITRUM]: [8, 10, 50, 300, 500, 1000], [ChainId.AURORA]: [8, 10, 50, 300, 500, 1000], - [ChainId.VELAS]: [8, 10, 50, 300, 500, 1000], - [ChainId.OASIS]: [8, 10, 50, 300, 500, 1000], [ChainId.MAINNET]: [8, 10, 50, 300, 500, 1000], [ChainId.MATIC]: [8, 10, 50, 300, 500, 1000], [ChainId.AVAXMAINNET]: [8, 10, 50, 300, 500, 1000], @@ -168,18 +147,18 @@ export const STATIC_FEE_OPTIONS: { [chainId: number]: number[] | undefined } = { [ChainId.ZKSYNC]: [8, 10, 50, 300, 500, 1000], [ChainId.LINEA]: [8, 10, 50, 300, 500, 1000], [ChainId.ZKEVM]: [8, 10, 50, 300, 500, 1000], + [ChainId.BASE]: [8, 10, 50, 300, 500, 1000], } export const ONLY_STATIC_FEE_CHAINS = [ ChainId.ARBITRUM, ChainId.AURORA, - ChainId.VELAS, - ChainId.OASIS, ChainId.OPTIMISM, ChainId.GÖRLI, ChainId.ZKSYNC, ChainId.LINEA, ChainId.ZKEVM, + ChainId.BASE, ] // hardcode for unavailable subgraph @@ -203,26 +182,33 @@ export const SUPPORTED_NETWORKS_FOR_MY_EARNINGS = [ ChainId.ARBITRUM, ChainId.OPTIMISM, ChainId.MATIC, + ChainId.LINEA, + ChainId.BASE, + ChainId.ZKSYNC, ChainId.BSCMAINNET, ChainId.AVAXMAINNET, ChainId.FANTOM, ChainId.CRONOS, ChainId.BTTC, - ChainId.VELAS, ChainId.AURORA, - ChainId.OASIS, ] export const COMING_SOON_NETWORKS_FOR_MY_EARNINGS: ChainId[] = [] export const COMING_SOON_NETWORKS_FOR_MY_EARNINGS_LEGACY: ChainId[] = [] -export const COMING_SOON_NETWORKS_FOR_MY_EARNINGS_CLASSIC: ChainId[] = [ - ChainId.CRONOS, - ChainId.OASIS, +export const COMING_SOON_NETWORKS_FOR_MY_EARNINGS_CLASSIC: ChainId[] = [ChainId.CRONOS, ChainId.AURORA] +export const BLOCTO_SUPPORTED_NETWORKS: ChainId[] = [ + ChainId.MAINNET, + ChainId.ARBITRUM, + ChainId.OPTIMISM, ChainId.MATIC, ChainId.BSCMAINNET, ChainId.AVAXMAINNET, - ChainId.CRONOS, - ChainId.BTTC, - ChainId.VELAS, - ChainId.AURORA, - ChainId.OASIS, ] + +export const ELASTIC_NOT_SUPPORTED: { [key: string]: string } = { + [ChainId.AURORA]: t`Elastic is not supported on Aurora. Please switch to other chains`, + [ChainId.ZKSYNC]: t`Elastic will be available soon`, +} + +export const CLASSIC_NOT_SUPPORTED: { [key: string]: string } = { + [ChainId.BASE]: t`Classic is not supported on Base. Please switch to other chains`, +} diff --git a/src/constants/networks/arbitrum.ts b/src/constants/networks/arbitrum.ts index be204b1d65..c071647a89 100644 --- a/src/constants/networks/arbitrum.ts +++ b/src/constants/networks/arbitrum.ts @@ -4,7 +4,6 @@ import EthereumLogo from 'assets/images/ethereum-logo.png' import ARBITRUM from 'assets/networks/arbitrum-network.svg' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const EMPTY_ARRAY: any[] = [] const NOT_SUPPORT = null @@ -23,7 +22,7 @@ const arbitrumInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://api.thegraph.com/subgraphs/name/kybernetwork/arbitrum-blocks', etherscanUrl: 'https://arbiscan.io', etherscanName: 'Arbiscan', - bridgeURL: EMPTY, + bridgeURL: 'https://bridge.arbitrum.io/', nativeToken: { symbol: 'ETH', name: 'ETH', @@ -68,10 +67,7 @@ const arbitrumInfo: EVMNetworkInfo = { '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd', ], }, - limitOrder: { - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - development: '0x9deCa89E0934a5E0F187a1865299a9a586550864', - }, + limitOrder: '*', averageBlockTimeInSeconds: 1, // TODO: check these info coingeckoNetworkId: 'arbitrum-one', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/aurora.ts b/src/constants/networks/aurora.ts index 28810ff814..d2c57244ae 100644 --- a/src/constants/networks/aurora.ts +++ b/src/constants/networks/aurora.ts @@ -62,10 +62,7 @@ const auroraInfo: EVMNetworkInfo = { routers: '0xC1e7dFE73E1598E3910EF4C7845B68A9Ab6F4c83', farms: [], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 1, coingeckoNetworkId: 'aurora', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/avax-testnet.ts b/src/constants/networks/avax-testnet.ts index e5e4fddc65..ed78e9ba48 100644 --- a/src/constants/networks/avax-testnet.ts +++ b/src/constants/networks/avax-testnet.ts @@ -59,10 +59,7 @@ const avaxTestnetInfo: EVMNetworkInfo = { routers: '0xd74134d330FB567abD08675b57dD588a7447b5Ac', farms: [], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 1.85, coingeckoNetworkId: 'avalanche', coingeckoNativeTokenId: 'avalanche-2', diff --git a/src/constants/networks/avax.ts b/src/constants/networks/avax.ts index 788137f7a6..30d026dc1f 100644 --- a/src/constants/networks/avax.ts +++ b/src/constants/networks/avax.ts @@ -2,7 +2,6 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const NOT_SUPPORT = null const avaxInfo: EVMNetworkInfo = { @@ -20,7 +19,7 @@ const avaxInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://api.thegraph.com/subgraphs/name/ducquangkstn/avalache-blocks', etherscanUrl: 'https://snowtrace.io', etherscanName: 'Snowtrace', - bridgeURL: EMPTY, + bridgeURL: 'https://core.app/bridge', nativeToken: { symbol: 'AVAX', name: 'AVAX', @@ -76,10 +75,7 @@ const avaxInfo: EVMNetworkInfo = { '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd', ], }, - limitOrder: { - development: '0x1877Ec0770901cc6886FDA7E7525a78c2Ed4e975', - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - }, + limitOrder: '*', averageBlockTimeInSeconds: 1.85, coingeckoNetworkId: 'avalanche', coingeckoNativeTokenId: 'avalanche-2', diff --git a/src/constants/networks/base.ts b/src/constants/networks/base.ts new file mode 100644 index 0000000000..cb19d25c0f --- /dev/null +++ b/src/constants/networks/base.ts @@ -0,0 +1,70 @@ +import { ChainId } from '@kyberswap/ks-sdk-core' + +import EthereumLogo from 'assets/images/ethereum-logo.png' +import { EVMNetworkInfo } from 'constants/networks/type' + +const EMPTY = '' +const EMPTY_ARRAY: any[] = [] +const NOT_SUPPORT = null + +const base: EVMNetworkInfo = { + chainId: ChainId.BASE, + route: 'base', + ksSettingRoute: 'base', + priceRoute: 'base', + poolFarmRoute: 'base', + aggregatorRoute: 'base', + name: 'Base', + icon: 'https://raw.githubusercontent.com/base-org/brand-kit/001c0e9b40a67799ebe0418671ac4e02a0c683ce/logo/in-product/Base_Network_Logo.svg', + iconDark: NOT_SUPPORT, + iconSelected: NOT_SUPPORT, + iconDarkSelected: NOT_SUPPORT, + defaultBlockSubgraph: 'https://base-graph.kyberengineering.io/subgraphs/name/kybernetwork/base-blocks', + etherscanUrl: 'https://basescan.org', + etherscanName: 'Base Explorer', + bridgeURL: 'https://bridge.base.org/deposit', + nativeToken: { + symbol: 'ETH', + name: 'ETH', + logo: EthereumLogo, + decimal: 18, + minForGas: 10 ** 16, + }, + defaultRpcUrl: 'https://mainnet.base.org', + multicall: '0xcA11bde05977b3631167028862bE2a173976CA11', + classic: { + defaultSubgraph: 'https://base-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-exchange-base', + static: { + zap: '0x2abE8750e4a65584d7452316356128C936273e0D', + router: '0x5649B4DD00780e99Bab7Abb4A3d581Ea1aEB23D0', + factory: '0x1c758aF0688502e49140230F6b0EBd376d429be5', + }, + oldStatic: NOT_SUPPORT, + dynamic: NOT_SUPPORT, + claimReward: NOT_SUPPORT, + fairlaunch: EMPTY_ARRAY, + fairlaunchV2: EMPTY_ARRAY, + }, + elastic: { + defaultSubgraph: 'https://base-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-elastic-base', + startBlock: 2949023, + coreFactory: '0xC7a590291e07B9fe9E64b86c58fD8fC764308C4A', + nonfungiblePositionManager: '0xe222fBE074A436145b255442D919E4E3A6c6a480', + tickReader: '0x8Fd8Cb948965d9305999D767A02bf79833EADbB3', + initCodeHash: '0x00e263aaa3a2c06a89b53217a9e7aad7e15613490a72e0f95f303c4de2dc7045', + quoter: '0x4d47fd5a29904Dae0Ef51b1c450C9750F15D7856', + routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', + farms: ['0x7D5ba536ab244aAA1EA42aB88428847F25E3E676'], + farmv2Quoter: '0x6AFeb9EDd6Cf44fA8E89b1eee28284e6dD7705C8', + farmV2S: ['0x3D6AfE2fB73fFEd2E3dD00c501A174554e147a43', '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd'], + }, + limitOrder: NOT_SUPPORT, + averageBlockTimeInSeconds: 2, // dont use for base + coingeckoNetworkId: 'base', + coingeckoNativeTokenId: 'ethereum', + deBankSlug: EMPTY, + dexToCompare: NOT_SUPPORT, + geckoTermialId: NOT_SUPPORT, +} + +export default base diff --git a/src/constants/networks/bnb-testnet.ts b/src/constants/networks/bnb-testnet.ts index cb87ef22f5..95e9861b72 100644 --- a/src/constants/networks/bnb-testnet.ts +++ b/src/constants/networks/bnb-testnet.ts @@ -65,10 +65,7 @@ const bnbTestnetInfo: EVMNetworkInfo = { routers: '0x785b8893342dfEf9B5D565f67be971b859d34a15', farms: [], }, - limitOrder: { - development: NOT_SUPPORT, - production: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 3, coingeckoNetworkId: 'binance-smart-chain', coingeckoNativeTokenId: 'binancecoin', diff --git a/src/constants/networks/bnb.ts b/src/constants/networks/bnb.ts index bb5d96704e..ebf59fdc6f 100644 --- a/src/constants/networks/bnb.ts +++ b/src/constants/networks/bnb.ts @@ -3,7 +3,6 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import BnbLogo from 'assets/images/bnb-logo.png' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const NOT_SUPPORT = null const bnbInfo: EVMNetworkInfo = { @@ -21,7 +20,7 @@ const bnbInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://api.thegraph.com/subgraphs/name/dynamic-amm/ethereum-blocks-bsc', etherscanUrl: 'https://bscscan.com', etherscanName: 'BscScan', - bridgeURL: EMPTY, + bridgeURL: 'https://www.bnbchain.org/en/bridge', nativeToken: { symbol: 'BNB', name: 'BNB', @@ -68,10 +67,7 @@ const bnbInfo: EVMNetworkInfo = { farmv2Quoter: '0x6AFeb9EDd6Cf44fA8E89b1eee28284e6dD7705C8', farmV2S: ['0x3D6AfE2fB73fFEd2E3dD00c501A174554e147a43', '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd'], }, - limitOrder: { - development: '0x26279604204aa9D3B530bcd8514fc4276bf0962C', - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - }, + limitOrder: '*', averageBlockTimeInSeconds: 3, coingeckoNetworkId: 'binance-smart-chain', coingeckoNativeTokenId: 'binancecoin', diff --git a/src/constants/networks/bttc.ts b/src/constants/networks/bttc.ts index 17153a778f..09e73420c4 100644 --- a/src/constants/networks/bttc.ts +++ b/src/constants/networks/bttc.ts @@ -21,7 +21,7 @@ const bttcInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://bttc-graph.kyberengineering.io/subgraphs/name/kybernetwork/bttc-blocks', etherscanUrl: 'https://bttcscan.com', etherscanName: 'Bttcscan', - bridgeURL: EMPTY, + bridgeURL: 'https://bttc.bittorrent.com/bridge/', nativeToken: { symbol: 'BTT', name: 'BTT', @@ -63,10 +63,7 @@ const bttcInfo: EVMNetworkInfo = { routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', farms: [], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 2, // TODO: check these info coingeckoNetworkId: 'tron', coingeckoNativeTokenId: 'bittorrent', diff --git a/src/constants/networks/cronos.ts b/src/constants/networks/cronos.ts index c6cebedcf0..e37a498175 100644 --- a/src/constants/networks/cronos.ts +++ b/src/constants/networks/cronos.ts @@ -5,7 +5,6 @@ import CRONOS from 'assets/networks/cronos-network.svg' import CronosLogo from 'assets/svg/cronos-token-logo.svg' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const EMPTY_ARRAY: any[] = [] const NOT_SUPPORT = null @@ -24,7 +23,7 @@ const cronosInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://cronos-graph.kyberengineering.io/subgraphs/name/kybernetwork/cronos-blocks', etherscanUrl: 'https://cronoscan.com', etherscanName: 'Cronos explorer', - bridgeURL: EMPTY, + bridgeURL: 'https://cronos.org/bridge/', nativeToken: { symbol: 'CRO', name: 'CRO', @@ -62,10 +61,7 @@ const cronosInfo: EVMNetworkInfo = { routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', farms: [], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 6, coingeckoNetworkId: 'cronos', coingeckoNativeTokenId: 'crypto-com-chain', diff --git a/src/constants/networks/ethereum.ts b/src/constants/networks/ethereum.ts index a6577db62c..a04d819cfd 100644 --- a/src/constants/networks/ethereum.ts +++ b/src/constants/networks/ethereum.ts @@ -2,7 +2,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import EthereumLogo from 'assets/images/ethereum-logo.png' import Mainnet from 'assets/networks/mainnet-network.svg' -import { KYBER_DAO_STATS_API } from 'constants/env' +import { EnvKeys, KYBER_DAO_STATS_API } from 'constants/env' import { EVMNetworkInfo } from 'constants/networks/type' const EMPTY = '' @@ -67,9 +67,9 @@ const ethereumInfo: EVMNetworkInfo = { routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', farms: ['0x7D5ba536ab244aAA1EA42aB88428847F25E3E676'], farmv2Quoter: '0x6AFeb9EDd6Cf44fA8E89b1eee28284e6dD7705C8', - farmV2S: ['0x3D6AfE2fB73fFEd2E3dD00c501A174554e147a43'], + farmV2S: ['0x3D6AfE2fB73fFEd2E3dD00c501A174554e147a43', '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd'], }, - limitOrder: { development: NOT_SUPPORT, production: '0x227B0c196eA8db17A665EA6824D972A64202E936' }, + limitOrder: [EnvKeys.PROD], averageBlockTimeInSeconds: 13.13, coingeckoNetworkId: 'ethereum', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/fantom.ts b/src/constants/networks/fantom.ts index e7dc201f3a..d1394e836c 100644 --- a/src/constants/networks/fantom.ts +++ b/src/constants/networks/fantom.ts @@ -1,6 +1,5 @@ import { ChainId } from '@kyberswap/ks-sdk-core' -import FTM from 'assets/networks/fantom-network.png' import { EVMNetworkInfo } from 'constants/networks/type' const EMPTY = '' @@ -15,7 +14,7 @@ const fantomInfo: EVMNetworkInfo = { poolFarmRoute: 'fantom', aggregatorRoute: 'fantom', name: 'Fantom', - icon: FTM, + icon: 'https://storage.googleapis.com/ks-setting-a3aa20b7/779366f0-c120-4827-ac5e-9ed77ca202b91692929044916.png', iconDark: NOT_SUPPORT, iconSelected: NOT_SUPPORT, iconDarkSelected: NOT_SUPPORT, @@ -26,7 +25,7 @@ const fantomInfo: EVMNetworkInfo = { nativeToken: { symbol: 'FTM', name: 'FTM', - logo: FTM, + logo: 'https://storage.googleapis.com/ks-setting-a3aa20b7/779366f0-c120-4827-ac5e-9ed77ca202b91692929044916.png', decimal: 18, minForGas: 10 ** 16, }, @@ -60,10 +59,7 @@ const fantomInfo: EVMNetworkInfo = { routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', farms: [], }, - limitOrder: { - development: '0x15a7e4A0BD7B96ada9db1219fA62c521bDCd8F81', - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - }, + limitOrder: '*', averageBlockTimeInSeconds: 1, coingeckoNetworkId: 'fantom', coingeckoNativeTokenId: 'fantom', diff --git "a/src/constants/networks/g\303\266rli.ts" "b/src/constants/networks/g\303\266rli.ts" index c7781c42cd..59a9d97004 100644 --- "a/src/constants/networks/g\303\266rli.ts" +++ "b/src/constants/networks/g\303\266rli.ts" @@ -2,6 +2,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import EthereumLogo from 'assets/images/ethereum-logo.png' import Mainnet from 'assets/networks/mainnet-network.svg' +import { EnvKeys } from 'constants/env' import { EVMNetworkInfo } from 'constants/networks/type' const EMPTY = '' @@ -60,7 +61,7 @@ const görliInfo: EVMNetworkInfo = { farmv2Quoter: '0x1e9C12303855433052A31815Dc28C146aF3e9C1F', farmV2S: ['0xdd463A7a71122D0248f3Fa1eF975202bAEe74B46'], }, - limitOrder: { development: '0x43E49489dD38dbFF4Aef0d7FC34026aBEF0e1134', production: NOT_SUPPORT }, + limitOrder: [EnvKeys.DEV], averageBlockTimeInSeconds: 13.13, coingeckoNetworkId: 'ethereum', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/index.ts b/src/constants/networks/index.ts index d1a7d0a58e..d5d210bd1b 100644 --- a/src/constants/networks/index.ts +++ b/src/constants/networks/index.ts @@ -11,10 +11,10 @@ export { default as fantom } from './fantom' export { default as görli } from './görli' export { default as matic } from './matic' export { default as mumbai } from './mumbai' -export { default as oasis } from './oasis' export { default as optimism } from './optimism' export { default as solana } from './solana' -export { default as velas } from './velas' export { default as zksync } from './zksync' export { default as linea } from './linea' +export { default as zkEvm } from './zkevm' +export { default as base } from './base' export { default as solanaDevnet } from './solana-devnet' diff --git a/src/constants/networks/linea.ts b/src/constants/networks/linea.ts index 4b1ff18f00..a4a3f17832 100644 --- a/src/constants/networks/linea.ts +++ b/src/constants/networks/linea.ts @@ -15,14 +15,14 @@ const lineaInfo: EVMNetworkInfo = { poolFarmRoute: 'linea', aggregatorRoute: 'linea', name: 'Linea', - icon: 'https://storage.googleapis.com/ks-setting-a3aa20b7/5c7ac975-e5af-4a02-8586-da6acfee9ec8.svg', + icon: 'https://storage.googleapis.com/ks-setting-1d682dca/12a257d3-65e3-4b16-8a84-03a4ca34a6bc1693378197244.svg', iconDark: NOT_SUPPORT, iconSelected: NOT_SUPPORT, iconDarkSelected: NOT_SUPPORT, defaultBlockSubgraph: 'https://graph-query.linea.build/subgraphs/name/kybernetwork/linea-blocks', etherscanUrl: 'https://lineascan.build', etherscanName: 'Linea Explorer', - bridgeURL: EMPTY, + bridgeURL: 'https://bridge.linea.build/', nativeToken: { symbol: 'ETH', name: 'LineaETH', @@ -58,10 +58,7 @@ const lineaInfo: EVMNetworkInfo = { farmv2Quoter: '0x6AFeb9EDd6Cf44fA8E89b1eee28284e6dD7705C8', farmV2S: ['0x3d6afe2fb73ffed2e3dd00c501a174554e147a43'], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 2, // TODO: check these info coingeckoNetworkId: NOT_SUPPORT, coingeckoNativeTokenId: NOT_SUPPORT, diff --git a/src/constants/networks/matic.ts b/src/constants/networks/matic.ts index 7d05a9e163..d402f948b4 100644 --- a/src/constants/networks/matic.ts +++ b/src/constants/networks/matic.ts @@ -2,7 +2,6 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const NOT_SUPPORT = null const maticInfo: EVMNetworkInfo = { @@ -20,7 +19,7 @@ const maticInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://api.thegraph.com/subgraphs/name/dynamic-amm/ethereum-blocks-polygon', etherscanUrl: 'https://polygonscan.com', etherscanName: 'Polygonscan', - bridgeURL: EMPTY, + bridgeURL: 'https://wallet.polygon.technology/', nativeToken: { symbol: 'MATIC', name: 'Polygon', @@ -71,10 +70,7 @@ const maticInfo: EVMNetworkInfo = { '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd', ], }, - limitOrder: { - development: '0x3C2E9227A6d3779e5b469E425CAa7067b40Ff124', - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - }, + limitOrder: '*', averageBlockTimeInSeconds: 2.6, coingeckoNetworkId: 'polygon-pos', coingeckoNativeTokenId: 'matic-network', diff --git a/src/constants/networks/mumbai.ts b/src/constants/networks/mumbai.ts index 5f6a045c48..23d02f27a3 100644 --- a/src/constants/networks/mumbai.ts +++ b/src/constants/networks/mumbai.ts @@ -59,7 +59,7 @@ const mumbaiInfo: EVMNetworkInfo = { routers: '0xC1e7dFE73E1598E3910EF4C7845B68A9Ab6F4c83', farms: [], }, - limitOrder: { development: NOT_SUPPORT, production: NOT_SUPPORT }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 2.6, coingeckoNetworkId: 'polygon-pos', coingeckoNativeTokenId: 'matic-network', diff --git a/src/constants/networks/oasis.ts b/src/constants/networks/oasis.ts deleted file mode 100644 index 25dfc2f9c7..0000000000 --- a/src/constants/networks/oasis.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { ChainId } from '@kyberswap/ks-sdk-core' - -import OASIS from 'assets/networks/oasis-network.svg' -import { EVMNetworkInfo } from 'constants/networks/type' - -const EMPTY = '' -const EMPTY_ARRAY: any[] = [] -const NOT_SUPPORT = null - -const oasisInfo: EVMNetworkInfo = { - chainId: ChainId.OASIS, - route: 'oasis', - ksSettingRoute: 'oasis', - priceRoute: 'oasis', - poolFarmRoute: 'oasis', - aggregatorRoute: 'oasis', - name: 'Oasis', - icon: OASIS, - iconDark: NOT_SUPPORT, - iconSelected: NOT_SUPPORT, - iconDarkSelected: NOT_SUPPORT, - defaultBlockSubgraph: 'https://oasis-graph.kyberengineering.io/subgraphs/name/kybernetwork/oasis-blocks', - etherscanUrl: 'https://explorer.emerald.oasis.dev', - etherscanName: 'Oasis Emerald Explorer', - bridgeURL: EMPTY, - nativeToken: { - symbol: 'ROSE', - name: 'ROSE', - logo: OASIS, - decimal: 18, - minForGas: 10 ** 16, - }, - defaultRpcUrl: 'https://oasis.kyberengineering.io', - multicall: '0xBF69a56D35B8d6f5A8e0e96B245a72F735751e54', - classic: { - defaultSubgraph: 'https://oasis-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-exchange-oasis', - static: { - zap: '0x2abE8750e4a65584d7452316356128C936273e0D', - router: '0x5649B4DD00780e99Bab7Abb4A3d581Ea1aEB23D0', - factory: '0x1c758aF0688502e49140230F6b0EBd376d429be5', - }, - oldStatic: { - zap: '0x83D4908c1B4F9Ca423BEE264163BC1d50F251c31', - router: '0xEaE47c5D99f7B31165a7f0c5f7E0D6afA25CFd55', - factory: '0xD9bfE9979e9CA4b2fe84bA5d4Cf963bBcB376974', - }, - dynamic: NOT_SUPPORT, - claimReward: NOT_SUPPORT, - fairlaunch: EMPTY_ARRAY, - fairlaunchV2: EMPTY_ARRAY, - }, - elastic: { - defaultSubgraph: 'https://oasis-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-elastic-oasis', - startBlock: 5735155, - coreFactory: '0xC7a590291e07B9fe9E64b86c58fD8fC764308C4A', - nonfungiblePositionManager: '0xe222fBE074A436145b255442D919E4E3A6c6a480', - tickReader: '0x8Fd8Cb948965d9305999D767A02bf79833EADbB3', - initCodeHash: '0x00e263aaa3a2c06a89b53217a9e7aad7e15613490a72e0f95f303c4de2dc7045', - quoter: '0x4d47fd5a29904Dae0Ef51b1c450C9750F15D7856', - routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', - farms: [], - }, - limitOrder: { - development: NOT_SUPPORT, - production: NOT_SUPPORT, - }, - averageBlockTimeInSeconds: 10, - coingeckoNetworkId: 'oasis', - coingeckoNativeTokenId: 'oasis-network', - deBankSlug: EMPTY, - dexToCompare: 'valleyswap-v2', - geckoTermialId: 'oasis', -} - -export default oasisInfo diff --git a/src/constants/networks/optimism.ts b/src/constants/networks/optimism.ts index 9e67cf54b1..3f5eedeb36 100644 --- a/src/constants/networks/optimism.ts +++ b/src/constants/networks/optimism.ts @@ -4,7 +4,6 @@ import EthereumLogo from 'assets/images/ethereum-logo.png' import OPTIMISM from 'assets/networks/optimism-network.svg' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const EMPTY_ARRAY: any[] = [] const NOT_SUPPORT = null @@ -23,7 +22,7 @@ const optimismInfo: EVMNetworkInfo = { defaultBlockSubgraph: 'https://api.thegraph.com/subgraphs/name/ianlapham/uni-testing-subgraph', etherscanUrl: 'https://optimistic.etherscan.io', etherscanName: 'Optimistic Ethereum Explorer', - bridgeURL: EMPTY, + bridgeURL: 'https://app.optimism.io/bridge/deposit', nativeToken: { symbol: 'ETH', name: 'ETH', @@ -63,10 +62,7 @@ const optimismInfo: EVMNetworkInfo = { '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd', ], }, - limitOrder: { - development: '0xAF800D3EB207BAFBadE540554DF8bDCe561166f8', - production: '0x227B0c196eA8db17A665EA6824D972A64202E936', - }, + limitOrder: '*', averageBlockTimeInSeconds: 120, coingeckoNetworkId: 'optimistic-ethereum', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/solana-devnet.ts b/src/constants/networks/solana-devnet.ts index d46f503bd8..39b3e011e8 100644 --- a/src/constants/networks/solana-devnet.ts +++ b/src/constants/networks/solana-devnet.ts @@ -35,7 +35,7 @@ const solanaInfo: SolanaNetworkInfo = { minForGas: 10 ** 7, }, aggregatorProgramAddress: 'GmgkeeJtcjHgeiSDdT5gxznUDr5ygq9jo8tmA4ny7ziv', - limitOrder: { development: NOT_SUPPORT, production: NOT_SUPPORT }, + limitOrder: NOT_SUPPORT, coingeckoNetworkId: 'solana', coingeckoNativeTokenId: 'solana', defaultRpcUrl: 'https://api.devnet.solana.com', diff --git a/src/constants/networks/solana.ts b/src/constants/networks/solana.ts index 489622a760..c5352dbf28 100644 --- a/src/constants/networks/solana.ts +++ b/src/constants/networks/solana.ts @@ -40,7 +40,7 @@ const solanaInfo: SolanaNetworkInfo = { // pool: 'EKdy97aMrjjxtq4CJh9vN24WuHVsuLz4qtDjyYqttviN', // router: '6VdLuZvVxdgFYQiCQ1VDBBdE27RahXzv2wCxwG4FAzAn', // }, - limitOrder: { development: NOT_SUPPORT, production: NOT_SUPPORT }, + limitOrder: NOT_SUPPORT, coingeckoNetworkId: 'solana', coingeckoNativeTokenId: 'solana', defaultRpcUrl: 'https://solana.kyberengineering.io', diff --git a/src/constants/networks/type.ts b/src/constants/networks/type.ts index 5c40c045b6..7862039b90 100644 --- a/src/constants/networks/type.ts +++ b/src/constants/networks/type.ts @@ -1,6 +1,9 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { PublicKey } from '@solana/web3.js' +import { EnvKeys } from 'constants/env' +import { ChainState } from 'hooks/useChainsConfig' + export interface NetworkInfo { readonly chainId: ChainId @@ -27,10 +30,7 @@ export interface NetworkInfo { readonly coingeckoNetworkId: string | null //https://api.coingecko.com/api/v3/asset_platforms readonly coingeckoNativeTokenId: string | null //https://api.coingecko.com/api/v3/coins/list readonly dexToCompare: string | null - readonly limitOrder: { - development: string | null - production: string | null - } + readonly limitOrder: null | '*' | EnvKeys[] readonly defaultRpcUrl: string // token: { // DAI: Token @@ -38,6 +38,7 @@ export interface NetworkInfo { // USDT: Token // } readonly geckoTermialId: string | null + readonly state?: ChainState } export interface EVMNetworkInfo extends NetworkInfo { @@ -79,10 +80,7 @@ export interface EVMNetworkInfo extends NetworkInfo { readonly farmv2Quoter?: string readonly farmV2S?: string[] } - readonly limitOrder: { - development: string | null - production: string | null - } + readonly limitOrder: null | '*' | EnvKeys[] readonly averageBlockTimeInSeconds: number readonly deBankSlug: string readonly kyberDAO?: { diff --git a/src/constants/networks/velas.ts b/src/constants/networks/velas.ts deleted file mode 100644 index 267483b7cb..0000000000 --- a/src/constants/networks/velas.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { ChainId } from '@kyberswap/ks-sdk-core' - -import VELAS from 'assets/networks/velas-network.png' -import { EVMNetworkInfo } from 'constants/networks/type' - -const EMPTY = '' -const EMPTY_ARRAY: any[] = [] -const NOT_SUPPORT = null - -const velasInfo: EVMNetworkInfo = { - chainId: ChainId.VELAS, - route: 'velas', - ksSettingRoute: 'velas', - priceRoute: 'velas', - poolFarmRoute: 'velas', - aggregatorRoute: 'velas', - name: 'Velas', - icon: VELAS, - iconDark: NOT_SUPPORT, - iconSelected: NOT_SUPPORT, - iconDarkSelected: NOT_SUPPORT, - defaultBlockSubgraph: 'https://velas-graph.kyberengineering.io/subgraphs/name/kybernetwork/velas-blocks', - etherscanUrl: 'https://evmexplorer.velas.com', - etherscanName: 'Velas EVM Explorer', - bridgeURL: EMPTY, - nativeToken: { - symbol: 'VLX', - name: 'VLX', - logo: VELAS, - decimal: 18, - minForGas: 10 ** 16, - }, - defaultRpcUrl: 'https://evmexplorer.velas.com/rpc', - multicall: '0x1877Ec0770901cc6886FDA7E7525a78c2Ed4e975', - classic: { - defaultSubgraph: 'https://velas-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-exchange-velas', - static: { - zap: '0x2abE8750e4a65584d7452316356128C936273e0D', - router: '0x5649B4DD00780e99Bab7Abb4A3d581Ea1aEB23D0', - factory: '0x1c758aF0688502e49140230F6b0EBd376d429be5', - }, - oldStatic: { - zap: '0x83D4908c1B4F9Ca423BEE264163BC1d50F251c31', - router: '0xEaE47c5D99f7B31165a7f0c5f7E0D6afA25CFd55', - factory: '0xD9bfE9979e9CA4b2fe84bA5d4Cf963bBcB376974', - }, - dynamic: NOT_SUPPORT, - claimReward: NOT_SUPPORT, - fairlaunch: EMPTY_ARRAY, - fairlaunchV2: EMPTY_ARRAY, - }, - elastic: { - defaultSubgraph: 'https://velas-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-elastic-velas', - startBlock: 63322472, - coreFactory: '0xC7a590291e07B9fe9E64b86c58fD8fC764308C4A', - nonfungiblePositionManager: '0xe222fBE074A436145b255442D919E4E3A6c6a480', - tickReader: '0x8Fd8Cb948965d9305999D767A02bf79833EADbB3', - initCodeHash: '0x00e263aaa3a2c06a89b53217a9e7aad7e15613490a72e0f95f303c4de2dc7045', - quoter: '0x4d47fd5a29904Dae0Ef51b1c450C9750F15D7856', - routers: '0xF9c2b5746c946EF883ab2660BbbB1f10A5bdeAb4', - farms: [], - }, - limitOrder: { - development: NOT_SUPPORT, - production: NOT_SUPPORT, - }, - averageBlockTimeInSeconds: 0.4, - coingeckoNetworkId: 'velas', - coingeckoNativeTokenId: 'velas', - deBankSlug: EMPTY, - dexToCompare: 'wagyuswap', - geckoTermialId: 'velas', -} - -export default velasInfo diff --git a/src/constants/networks/zkevm.ts b/src/constants/networks/zkevm.ts index 413f621558..5b34a6d314 100644 --- a/src/constants/networks/zkevm.ts +++ b/src/constants/networks/zkevm.ts @@ -15,7 +15,7 @@ const zkEvm: EVMNetworkInfo = { poolFarmRoute: 'polygon-zkevm', aggregatorRoute: 'polygon-zkevm', name: 'Polygon zkEVM', - icon: 'https://storage.googleapis.com/ks-setting-a3aa20b7/013aecc7-9868-4b06-a056-7dd5997b4139.svg', + icon: 'https://storage.googleapis.com/ks-setting-a3aa20b7/41cb81da-c7ed-4bc1-99ef-4bfe6d80861e1692928936919.svg', iconDark: NOT_SUPPORT, iconSelected: NOT_SUPPORT, iconDarkSelected: NOT_SUPPORT, @@ -23,7 +23,7 @@ const zkEvm: EVMNetworkInfo = { 'https://polygon-zkevm-graph.kyberengineering.io/subgraphs/name/kybernetwork/polygon-zkevm-blocks', etherscanUrl: 'https://zkevm.polygonscan.com', etherscanName: 'Polygon zkEVM Explorer', - bridgeURL: EMPTY, + bridgeURL: 'https://wallet.polygon.technology/', nativeToken: { symbol: 'ETH', name: 'ETH', @@ -61,10 +61,7 @@ const zkEvm: EVMNetworkInfo = { farmv2Quoter: '0x6AFeb9EDd6Cf44fA8E89b1eee28284e6dD7705C8', farmV2S: ['0x3D6AfE2fB73fFEd2E3dD00c501A174554e147a43', '0xf2BcDf38baA52F6b0C1Db5B025DfFf01Ae1d6dBd'], }, - limitOrder: { - production: NOT_SUPPORT, - development: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 2, // TODO: check these info coingeckoNetworkId: 'polygon-zkevm', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/networks/zksync.ts b/src/constants/networks/zksync.ts index 2178bd64fe..188b1e9330 100644 --- a/src/constants/networks/zksync.ts +++ b/src/constants/networks/zksync.ts @@ -3,7 +3,6 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import EthereumLogo from 'assets/images/ethereum-logo.png' import { EVMNetworkInfo } from 'constants/networks/type' -const EMPTY = '' const EMPTY_ARRAY: any[] = [] const NOT_SUPPORT = null @@ -17,14 +16,14 @@ const zkSyncInfo: EVMNetworkInfo = { poolFarmRoute: 'zksync', aggregatorRoute: 'zksync', name: 'zkSync Era', - icon: 'https://storage.googleapis.com/ks-setting-a3aa20b7/ad122023-76dd-4cdd-ad5a-7572726f004f.svg', + icon: 'https://storage.googleapis.com/ks-setting-1d682dca/bd11850b-6aef-48c6-a27d-f8ee833e0dbc1693378187666.svg', iconDark: NOT_SUPPORT, iconSelected: NOT_SUPPORT, iconDarkSelected: NOT_SUPPORT, defaultBlockSubgraph: 'https://zksync-graph.kyberengineering.io/subgraphs/name/kybernetwork/zksync-blocks', etherscanUrl: 'https://explorer.zksync.io', etherscanName: 'zkSync Era Explorer', - bridgeURL: EMPTY, + bridgeURL: 'https://portal.zksync.io/bridge/', nativeToken: { symbol: 'ETH', name: 'ETH', @@ -48,20 +47,18 @@ const zkSyncInfo: EVMNetworkInfo = { fairlaunchV2: [], }, elastic: { - defaultSubgraph: '', + // zkSync not supports elastic + defaultSubgraph: 'https://api.thegraph.com/subgraphs/name/kybernetwork/kyberswap-elastic-zksync', startBlock: 0, - coreFactory: '', - nonfungiblePositionManager: '', - tickReader: '', - initCodeHash: '', - quoter: '', - routers: '', + coreFactory: '0x5F1dddbf348aC2fbe22a163e30F99F9ECE3DD50a', + nonfungiblePositionManager: '0x2B1c7b41f6A8F2b2bc45C3233a5d5FB3cD6dC9A8', + tickReader: '0x165c68077ac06c83800d19200e6E2B08D02dE75D', + initCodeHash: '0xc597aba1bb02db42ba24a8878837965718c032f8b46be94a6e46452a9f89ca01', + quoter: '0x0D125c15D54cA1F8a813C74A81aEe34ebB508C1f', + routers: '0xC1e7dFE73E1598E3910EF4C7845B68A9Ab6F4c83', farms: [], }, - limitOrder: { - development: NOT_SUPPORT, - production: NOT_SUPPORT, - }, + limitOrder: NOT_SUPPORT, averageBlockTimeInSeconds: 15, coingeckoNetworkId: 'zksync-ethereum', coingeckoNativeTokenId: 'ethereum', diff --git a/src/constants/permit.ts b/src/constants/permit.ts index 15ecb4e302..752a27f274 100644 --- a/src/constants/permit.ts +++ b/src/constants/permit.ts @@ -38,26 +38,6 @@ export const PERMITTABLE_TOKENS: { '0xeEeEEb57642040bE42185f49C52F7E9B38f8eeeE': { type: PermitType.AMOUNT, version: '1' }, // ELK '0x8497842420cFdbc97896C2353D75d89Fc8D5Be5D': { type: PermitType.AMOUNT, version: '1' }, // VERSA }, - [ChainId.OASIS]: { - // '0x32847e63E99D3a044908763056e25694490082F8': { type: PermitType.SALT, version: '1' }, - // '0xd79Ef9A91b56c690C7b80570a3c060678667f469': { type: PermitType.SALT, version: '1' }, - // '0x4cA2A3De42eabC8fd8b0AC46127E64DB08b9150e': { type: PermitType.SALT, version: '1' }, - // '0x366EF31C8dc715cbeff5fA54Ad106dC9c25C6153': { type: PermitType.SALT, version: '1' }, - // '0x3223f17957Ba502cbe71401D55A0DB26E5F7c68F': { type: PermitType.SALT, version: '1' }, - // '0xE8A638b3B7565Ee7c5eb9755E58552aFc87b94DD': { type: PermitType.SALT, version: '1' }, - // '0xdC19A122e268128B5eE20366299fc7b5b199C8e3': { type: PermitType.SALT, version: '1' }, - // '0xd43ce0aa2a29DCb75bDb83085703dc589DE6C7eb': { type: PermitType.SALT, version: '1' }, - // '0x3E62a9c3aF8b810dE79645C4579acC8f0d06a241': { type: PermitType.SALT, version: '1' }, - // '0xFffD69E757d8220CEA60dc80B9Fe1a30b58c94F3': { type: PermitType.SALT, version: '1' }, - // '0x1d1149a53deB36F2836Ae7877c9176413aDfA4A8': { type: PermitType.SALT, version: '1' }, - // '0x24285C5232ce3858F00bacb950Cae1f59d1b2704': { type: PermitType.SALT, version: '1' }, - // '0xa1E73c01E0cF7930F5e91CB291031739FE5Ad6C2': { type: PermitType.SALT, version: '1' }, - // '0x4F43717B20ae319Aa50BC5B2349B93af5f7Ac823': { type: PermitType.SALT, version: '1' }, - '0xB44a9B6905aF7c801311e8F4E76932ee959c663C': { type: PermitType.AMOUNT, version: '1' }, //ETH - '0x80A16016cC4A2E6a2CACA8a4a498b1699fF0f844': { type: PermitType.AMOUNT, version: '1' }, //USDC - '0xE3F5a90F9cb311505cd691a46596599aA1A0AD7D': { type: PermitType.AMOUNT, version: '1' }, //BNB - '0x639A647fbe20b6c8ac19E48E2de44ea792c62c5C': { type: PermitType.AMOUNT, version: '1' }, //BUSD - }, [ChainId.CRONOS]: { '0xe6801928061CDbE32AC5AD0634427E140EFd05F9': { type: PermitType.AMOUNT, version: '1' }, //BIFI }, @@ -80,9 +60,6 @@ export const PERMITTABLE_TOKENS: { [ChainId.BSCMAINNET]: { // '0xD6Cce248263ea1e2b8cB765178C944Fc16Ed0727': { type: PermitType.SALT, version: '1' }, }, - [ChainId.VELAS]: { - // '0xcD7509b76281223f5B7d3aD5d47F8D7Aa5C2B9bf': { type: PermitType.SALT, version: '1' }, - }, [ChainId.OPTIMISM]: { // '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1': { type: PermitType.SALT, version: '1' }, // '0xbfD291DA8A403DAAF7e5E9DC1ec0aCEaCd4848B9': { type: PermitType.SALT, version: '1' }, diff --git a/src/constants/styles.ts b/src/constants/styles.ts index 9cfe3ba5aa..81e85c1732 100644 --- a/src/constants/styles.ts +++ b/src/constants/styles.ts @@ -19,4 +19,5 @@ export const THRESHOLD_HEADER = { ABOUT: '1440px', ANALYTIC: '1320px', KYBERDAO: '1040px', + CAMPAIGNS: '560px', } diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index dc7030a6c1..8087ffb1e5 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -28,16 +28,6 @@ export const NativeCurrencies = new Proxy(NativeCurrenciesLocal, { // This list is intentionally different from the list above // Was requested from product team, to implement Swap fee config export const STABLE_COIN_ADDRESSES_TO_TAKE_FEE: Record = { - [ChainId.OASIS]: [ - '0x80A16016cC4A2E6a2CACA8a4a498b1699fF0f844', // usdc - '0x6Cb9750a92643382e020eA9a170AbB83Df05F30B', // usdt - '0x639A647fbe20b6c8ac19E48E2de44ea792c62c5C', // busd - ], - [ChainId.VELAS]: [ - '0xe2C120f188eBd5389F71Cf4d9C16d05b62A58993', // usdc - '0x01445C31581c354b7338AC35693AB2001B50b9aE', // usdt - '0xc111c29A988AE0C0087D97b33C6E6766808A3BD3', // busd - ], [ChainId.AURORA]: [ '0xB12BFcA5A55806AaF64E99521918A4bf0fC40802', // usdc '0x4988a896b1227218e4A686fdE5EabdcAbd91571f', // usdt @@ -66,6 +56,7 @@ export const STABLE_COIN_ADDRESSES_TO_TAKE_FEE: Record = { [ChainId.ARBITRUM]: [], [ChainId.ZKEVM]: [], [ChainId.LINEA]: [], + [ChainId.BASE]: [], [ChainId.SOLANA_DEVNET]: [], } @@ -130,24 +121,11 @@ export const SUPER_STABLE_COINS_ADDRESS: { [chainId in ChainId]: string[] } = { '0xE887512ab8BC60BcC9224e1c3b5Be68E26048B8B', // usdt_e '0xAE17940943BA9440540940DB0F1877f101D39e8b', // usdc_e ], - [ChainId.VELAS]: [ - '0xe2C120f188eBd5389F71Cf4d9C16d05b62A58993', // usdc - '0x01445C31581c354b7338AC35693AB2001B50b9aE', // usdt - ], [ChainId.AURORA]: [ '0xe3520349F477A5F6EB06107066048508498A291b', // Dai '0xB12BFcA5A55806AaF64E99521918A4bf0fC40802', // usdc '0x4988a896b1227218e4A686fdE5EabdcAbd91571f', // usdt ], - [ChainId.OASIS]: [ - '0x80A16016cC4A2E6a2CACA8a4a498b1699fF0f844', // usdc - '0xdC19A122e268128B5eE20366299fc7b5b199C8e3', // usdtet - '0x639A647fbe20b6c8ac19E48E2de44ea792c62c5C', // busd - '0x6Cb9750a92643382e020eA9a170AbB83Df05F30B', // usdt - '0x5a4Ba16C2AeB295822A95280A7c7149E87769E6A', // ceDAI - '0x81ECac0D6Be0550A00FF064a4f9dd2400585FE9c', // ceUSDC - '0x4Bf769b05E832FCdc9053fFFBC78Ca889aCb5E1E', // ceUSDT - ], [ChainId.OPTIMISM]: [ '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', // Dai '0x94b008aA00579c1307B0EF2c499aD98a8ce58e58', // usdt @@ -168,7 +146,10 @@ export const SUPER_STABLE_COINS_ADDRESS: { [chainId in ChainId]: string[] } = { '0x1E4a5963aBFD975d8c9021ce480b42188849D41d', // USDT '0xC5015b9d9161Dca7e18e32f6f25C4aD850731Fd4', // DAI ], - + [ChainId.BASE]: [ + '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', // USDbC + '0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb', // DAI + ], [ChainId.LINEA]: [], [ChainId.SOLANA_DEVNET]: [], } @@ -209,9 +190,7 @@ export const CORRELATED_COINS_ADDRESS: { [chainId in ChainId]: string[][] } = { [ChainId.CRONOS]: [], [ChainId.ARBITRUM]: [], [ChainId.BTTC]: [], - [ChainId.VELAS]: [], [ChainId.AURORA]: [], - [ChainId.OASIS]: [], [ChainId.OPTIMISM]: [], [ChainId.SOLANA]: [], [ChainId.GÖRLI]: [], @@ -220,111 +199,49 @@ export const CORRELATED_COINS_ADDRESS: { [chainId in ChainId]: string[][] } = { [ChainId.AVAXTESTNET]: [], [ChainId.ZKEVM]: [], [ChainId.LINEA]: [], + [ChainId.BASE]: [], [ChainId.SOLANA_DEVNET]: [], } export const DAI: { [chainId in ChainId]: Token } = { - [ChainId.MAINNET]: new Token( - ChainId.MAINNET, - '0x6B175474E89094C44Da98b954EedeAC495271d0F', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.GÖRLI]: new Token(ChainId.GÖRLI, '0x1BBeeEdCF32dc2c1Ebc2F138e3FC7f3DeCD44D6A', 18, 'DAI', 'Dai Stablecoin'), - [ChainId.MATIC]: new Token(ChainId.MATIC, '0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063', 18, 'DAI', 'Dai Stablecoin'), - [ChainId.MUMBAI]: new Token( - ChainId.MUMBAI, - '0x5e2de02472aC02736b43054f095837725A5870eF', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.BSCTESTNET]: new Token( - ChainId.BSCTESTNET, - '0xBb843a2296F9AA49070EB2Dcd482f23548238f65', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.BSCMAINNET]: new Token( - ChainId.BSCMAINNET, - '0x1AF3F329e8BE154074D8769D1FFa4eE058B1DBc3', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.AVAXTESTNET]: new Token( - ChainId.AVAXTESTNET, - '0xE50c0F38a1890Db49d64ac1C4A5B4fe2f02f819d', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.AVAXMAINNET]: new Token( - ChainId.AVAXMAINNET, - '0xd586E7F844cEa2F87f50152665BCbc2C279D8d70', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.FANTOM]: new Token( - ChainId.FANTOM, - '0x91a40C733c97a6e1BF876EaF9ed8c08102eB491f', - 18, - 'DAI', - 'Dai Stablecoin', - ), - [ChainId.CRONOS]: new Token( - ChainId.CRONOS, - '0xF2001B145b43032AAF5Ee2884e456CCd805F677D', - 18, - 'DAI', - 'Dai Stablecoin', - ), + [ChainId.MAINNET]: new Token(ChainId.MAINNET, '0x6B175474E89094C44Da98b954EedeAC495271d0F', 18, 'DAI', 'DAI'), + [ChainId.GÖRLI]: new Token(ChainId.GÖRLI, '0x1BBeeEdCF32dc2c1Ebc2F138e3FC7f3DeCD44D6A', 18, 'DAI', 'DAI'), + [ChainId.MATIC]: new Token(ChainId.MATIC, '0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063', 18, 'DAI', 'DAI'), + [ChainId.MUMBAI]: new Token(ChainId.MUMBAI, '0x5e2de02472aC02736b43054f095837725A5870eF', 18, 'DAI', 'DAI'), + [ChainId.BSCTESTNET]: new Token(ChainId.BSCTESTNET, '0xBb843a2296F9AA49070EB2Dcd482f23548238f65', 18, 'DAI', 'DAI'), + [ChainId.BSCMAINNET]: new Token(ChainId.BSCMAINNET, '0x1AF3F329e8BE154074D8769D1FFa4eE058B1DBc3', 18, 'DAI', 'DAI'), + [ChainId.AVAXTESTNET]: new Token(ChainId.AVAXTESTNET, '0xE50c0F38a1890Db49d64ac1C4A5B4fe2f02f819d', 18, 'DAI', 'DAI'), + [ChainId.AVAXMAINNET]: new Token(ChainId.AVAXMAINNET, '0xd586E7F844cEa2F87f50152665BCbc2C279D8d70', 18, 'DAI', 'DAI'), + [ChainId.FANTOM]: new Token(ChainId.FANTOM, '0x91a40C733c97a6e1BF876EaF9ed8c08102eB491f', 18, 'DAI', 'DAI'), + [ChainId.CRONOS]: new Token(ChainId.CRONOS, '0xF2001B145b43032AAF5Ee2884e456CCd805F677D', 18, 'DAI', 'DAI'), [ChainId.ARBITRUM]: new Token( ChainId.ARBITRUM, '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', 18, 'DAI_e', - 'Dai Stablecoin_Ethereum', - ), - [ChainId.BTTC]: new Token(ChainId.BTTC, '0xe7dC549AE8DB61BDE71F22097BEcc8dB542cA100', 18, 'DAI', 'Dai Stablecoin'), - [ChainId.AURORA]: new Token( - ChainId.AURORA, - '0xe3520349F477A5F6EB06107066048508498A291b', - 18, - 'DAI', - 'Dai Stablecoin', + 'DAI_Ethereum', ), + [ChainId.BTTC]: new Token(ChainId.BTTC, '0xe7dC549AE8DB61BDE71F22097BEcc8dB542cA100', 18, 'DAI', 'DAI'), + [ChainId.AURORA]: new Token(ChainId.AURORA, '0xe3520349F477A5F6EB06107066048508498A291b', 18, 'DAI', 'DAI'), [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0xC5015b9d9161Dca7e18e32f6f25C4aD850731Fd4', 18, 'DAI', 'Dai'), [ChainId.LINEA]: new Token(ChainId.LINEA, '0x4AF15ec2A0BD43Db75dd04E62FAA3B8EF36b00d5', 18, 'DAI', 'Dai'), + [ChainId.BASE]: new Token(ChainId.BASE, '0x50c5725949a6f0c72e6c4a641f24049a917db0cb', 18, 'DAI', 'Dai'), - //not existing on Velas - [ChainId.VELAS]: new Token(ChainId.VELAS, '0xe7dC549AE8DB61BDE71F22097BEcc8dB542cA100', 18, 'DAI', 'Dai Stablecoin'), - //not existing on Oasis - [ChainId.OASIS]: new Token(ChainId.OASIS, '0xe7dC549AE8DB61BDE71F22097BEcc8dB542cA100', 18, 'DAI', 'Dai Stablecoin'), - [ChainId.OPTIMISM]: new Token( - ChainId.OPTIMISM, - '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', - 18, - 'DAI', - 'Dai Stablecoin', - ), + [ChainId.OPTIMISM]: new Token(ChainId.OPTIMISM, '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', 18, 'DAI', 'DAI'), [ChainId.ZKSYNC]: new Token(ChainId.ZKSYNC, '0x4BEf76b6b7f2823C6c1f4FcfEACD85C24548ad7e', 18, 'DAI', 'Dai'), [ChainId.SOLANA]: new Token( ChainId.SOLANA, 'EjmyN6qEC1Tf1JxiG1ae7UTJhUxSwk1TCWNWqxWV4J6o', 8, 'DAI', - 'Dai Stablecoin (Wormhole)', + 'DAI (Wormhole)', ), [ChainId.SOLANA_DEVNET]: new Token( ChainId.SOLANA_DEVNET, 'EjmyN6qEC1Tf1JxiG1ae7UTJhUxSwk1TCWNWqxWV4J6o', 8, 'DAI', - 'Dai Stablecoin (Wormhole)', + 'DAI (Wormhole)', ), } @@ -333,47 +250,27 @@ export const USDC: { [chainId in ChainId]: Token } = { [ChainId.GÖRLI]: new Token(ChainId.GÖRLI, '0x8e9Bd30D15420bAe4B7EC0aC014B7ECeE864373C', 18, 'USDC', 'USD Coin'), [ChainId.MATIC]: new Token(ChainId.MATIC, '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', 6, 'USDC', 'USD Coin'), [ChainId.MUMBAI]: new Token(ChainId.MUMBAI, '0x2CeC76B26A8d96BF3072D34A01BB3a4edE7c06BE', 6, 'USDC', 'USD Coin'), - [ChainId.BSCTESTNET]: new Token( - ChainId.BSCTESTNET, - '0xb448B701807E644f141a4E4a269aD2F567526505', - 6, - 'USDC', - 'USD Coin', - ), - [ChainId.BSCMAINNET]: new Token( - ChainId.BSCMAINNET, - '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d', - 18, - 'USDC', - 'USD Coin', - ), + [ChainId.BSCTESTNET]: new Token(ChainId.BSCTESTNET, '0xb448B701807E644f141a4E4a269aD2F567526505', 6, 'USDC', 'USDC'), + [ChainId.BSCMAINNET]: new Token(ChainId.BSCMAINNET, '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d', 18, 'USDC', 'USDC'), [ChainId.AVAXTESTNET]: new Token( ChainId.AVAXTESTNET, '0x5973774202E8b0ad563A69D502bb0e670e7d00Dd', 6, 'USDC', - 'USD Coin', + 'USDC', ), [ChainId.AVAXMAINNET]: new Token( ChainId.AVAXMAINNET, '0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664', 6, 'USDC.e', - 'USD Coin', + 'USDC', ), [ChainId.FANTOM]: new Token(ChainId.FANTOM, '0x28a92dde19D9989F39A49905d7C9C2FAc7799bDf', 6, 'USDC', 'USD Coin'), [ChainId.CRONOS]: new Token(ChainId.CRONOS, '0xc21223249CA28397B4B6541dfFaEcC539BfF0c59', 6, 'USDC', 'USD Coin'), [ChainId.ARBITRUM]: new Token(ChainId.ARBITRUM, '0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8', 6, 'USDC', 'USD Coin'), [ChainId.BTTC]: new Token(ChainId.BTTC, '0xCa424b845497f7204D9301bd13Ff87C0E2e86FCF', 18, 'USDC_b', 'USD Coin_BSC'), [ChainId.AURORA]: new Token(ChainId.AURORA, '0xB12BFcA5A55806AaF64E99521918A4bf0fC40802', 6, 'USDC', 'USD Coin'), - [ChainId.VELAS]: new Token(ChainId.VELAS, '0xe2C120f188eBd5389F71Cf4d9C16d05b62A58993', 6, 'USDC', 'Multichain USDC'), - [ChainId.OASIS]: new Token( - ChainId.OASIS, - '0x80a16016cc4a2e6a2caca8a4a498b1699ff0f844', - 6, - 'USDC', - 'USD Coin (Multichain)', - ), [ChainId.OPTIMISM]: new Token(ChainId.OPTIMISM, '0x7F5c764cBc14f9669B88837ca1490cCa17c31607', 6, 'USDC', 'USD Coin'), [ChainId.ZKSYNC]: new Token(ChainId.ZKSYNC, '0x3355df6D4c9C3035724Fd0e3914dE96A5a83aaf4', 6, 'USDC', 'USD Coin'), [ChainId.SOLANA]: new Token(ChainId.SOLANA, 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v', 6, 'USDC', 'USD Coin'), @@ -386,6 +283,7 @@ export const USDC: { [chainId in ChainId]: Token } = { ), [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0xA8CE8aee21bC2A48a5EF670afCc9274C7bbbC035', 6, 'USDC', 'USD Coin'), [ChainId.LINEA]: new Token(ChainId.LINEA, '0x176211869cA2b568f2A7D4EE941E073a821EE1ff', 6, 'USDC', 'USD Coin'), + [ChainId.BASE]: new Token(ChainId.BASE, '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', 6, 'USDC', 'USD Coin'), } export const USDT: { [chainId in ChainId]: Token } = { @@ -432,8 +330,6 @@ export const USDT: { [chainId in ChainId]: Token } = { ), [ChainId.BTTC]: new Token(ChainId.BTTC, '0x9B5F27f6ea9bBD753ce3793a07CbA3C74644330d', 18, 'USDT_b', 'Tether USD_BSC'), [ChainId.AURORA]: new Token(ChainId.AURORA, '0x4988a896b1227218e4A686fdE5EabdcAbd91571f', 6, 'USDT', 'Tether USD'), - [ChainId.VELAS]: new Token(ChainId.VELAS, '0x01445C31581c354b7338AC35693AB2001B50b9aE', 6, 'USDT', 'Multichain USDT'), - [ChainId.OASIS]: new Token(ChainId.OASIS, '0x6Cb9750a92643382e020eA9a170AbB83Df05F30B', 6, 'USDT', 'Tether USD'), [ChainId.OPTIMISM]: new Token( ChainId.OPTIMISM, '0x94b008aA00579c1307B0EF2c499aD98a8ce58e58', @@ -453,6 +349,9 @@ export const USDT: { [chainId in ChainId]: Token } = { 'USDT', 'Tether USD', ), + + // not existed + [ChainId.BASE]: new Token(ChainId.BASE, '0xA219439258ca9da29E9Cc4cE5596924745e12B93', 6, 'USDT', 'Tether USD'), } export const COMP = new Token(ChainId.MAINNET, '0xc00e94Cb662C3520282E6f5717214004A7f26888', 18, 'COMP', 'Compound') @@ -471,99 +370,36 @@ export const KNCL_ADDRESS = '0xdd974D5C2e2928deA5F71b9825b8b646686BD200' // todo: make it nullable export const KNC: { [chainId in ChainId]: Token } = { - [ChainId.MAINNET]: new Token(ChainId.MAINNET, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.GÖRLI]: new Token( - ChainId.GÖRLI, - '0xd19e5119Efc73FeA1e70f9fbbc105DaB89D914e4', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.MATIC]: new Token( - ChainId.MATIC, - '0x1C954E8fe737F99f68Fa1CCda3e51ebDB291948C', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.MUMBAI]: new Token( - ChainId.MUMBAI, - '0xFD1f9381Cb641Dc76Fe8087dbcf8ea84a2c77cbE', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.BSCTESTNET]: new Token( - ChainId.BSCTESTNET, - '0x51E8D106C646cA58Caf32A47812e95887C071a62', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.BSCMAINNET]: new Token( - ChainId.BSCMAINNET, - '0xfe56d5892BDffC7BF58f2E84BE1b2C32D21C308b', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.AVAXTESTNET]: new Token(ChainId.AVAXTESTNET, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.AVAXMAINNET]: new Token( - ChainId.AVAXMAINNET, - '0x39fC9e94Caeacb435842FADeDeCB783589F50f5f', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.FANTOM]: new Token(ChainId.FANTOM, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.CRONOS]: new Token(ChainId.CRONOS, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.AURORA]: new Token(ChainId.AURORA, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.BTTC]: new Token( - ChainId.BTTC, - '0x18fA72e0EE4C580a129b0CE5bD0694d716C7443E', - 18, - 'KNC_b', - 'Kyber Network Crystal v2 - BSC', - ), - - // UPDATE WHEN HAS BRIDGE KNC - [ChainId.ARBITRUM]: new Token(ChainId.ARBITRUM, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.VELAS]: new Token(ChainId.VELAS, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.OASIS]: new Token(ChainId.OASIS, KNC_ADDRESS, 18, 'KNC', 'Kyber Network Crystal'), - [ChainId.OPTIMISM]: new Token( - ChainId.OPTIMISM, - '0xa00e3a3511aac35ca78530c85007afcd31753819', - 18, - 'KNC', - 'Kyber Network Crystal', - ), + [ChainId.MAINNET]: new Token(ChainId.MAINNET, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.GÖRLI]: new Token(ChainId.GÖRLI, '0xd19e5119Efc73FeA1e70f9fbbc105DaB89D914e4', 18, 'KNC', 'KNC'), + [ChainId.MATIC]: new Token(ChainId.MATIC, '0x1C954E8fe737F99f68Fa1CCda3e51ebDB291948C', 18, 'KNC', 'KNC'), + [ChainId.BSCTESTNET]: new Token(ChainId.BSCTESTNET, '0x51E8D106C646cA58Caf32A47812e95887C071a62', 18, 'KNC', 'KNC'), + [ChainId.BSCMAINNET]: new Token(ChainId.BSCMAINNET, '0xfe56d5892BDffC7BF58f2E84BE1b2C32D21C308b', 18, 'KNC', 'KNC'), + [ChainId.AVAXMAINNET]: new Token(ChainId.AVAXMAINNET, '0x39fC9e94Caeacb435842FADeDeCB783589F50f5f', 18, 'KNC', 'KNC'), + [ChainId.BTTC]: new Token(ChainId.BTTC, '0x18fA72e0EE4C580a129b0CE5bD0694d716C7443E', 18, 'KNC_b', 'KNC v2 - BSC'), + [ChainId.ARBITRUM]: new Token(ChainId.ARBITRUM, '0xe4DDDfe67E7164b0FE14E218d80dC4C08eDC01cB', 18, 'KNC', 'KNC'), + [ChainId.OPTIMISM]: new Token(ChainId.OPTIMISM, '0xa00e3a3511aac35ca78530c85007afcd31753819', 18, 'KNC', 'KNC'), [ChainId.LINEA]: new Token(ChainId.LINEA, '0x3b2F62d42DB19B30588648bf1c184865D4C3B1D6', 18, 'KNC', 'KNC'), + [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0x6A80A465409ce8D36C513129C0FEEa61BEd579ba', 18, 'KNC', 'KNC'), - // TODO(viet-nv): this address doesn't exist. check again - [ChainId.ZKSYNC]: new Token( - ChainId.ZKSYNC, - '0xa00e3a3511aac35ca78530c85007afcd31753819', - 18, - 'KNC', - 'Kyber Network Crystal', - ), - [ChainId.SOLANA]: new Token( - ChainId.SOLANA, - 'KNCkfGAnBUvoG5EJipAzSBjjaF8iNL4ivYsBS14DKdg', - 18, - 'KNC', - 'Kyber Network Crystal', - ), // todo: not exists yet + // TODO(viet-nv): KNC does not exist on the below chain + [ChainId.CRONOS]: new Token(ChainId.CRONOS, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.AURORA]: new Token(ChainId.AURORA, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.FANTOM]: new Token(ChainId.FANTOM, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.BASE]: new Token(ChainId.BASE, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.ZKSYNC]: new Token(ChainId.ZKSYNC, KNC_ADDRESS, 18, 'KNC', 'KNC'), + + [ChainId.AVAXTESTNET]: new Token(ChainId.AVAXTESTNET, KNC_ADDRESS, 18, 'KNC', 'KNC'), + [ChainId.MUMBAI]: new Token(ChainId.MUMBAI, '0xFD1f9381Cb641Dc76Fe8087dbcf8ea84a2c77cbE', 18, 'KNC', 'KNC'), + + [ChainId.SOLANA]: new Token(ChainId.SOLANA, 'KNCkfGAnBUvoG5EJipAzSBjjaF8iNL4ivYsBS14DKdg', 18, 'KNC', 'KNC'), // todo: not exists yet [ChainId.SOLANA_DEVNET]: new Token( ChainId.SOLANA_DEVNET, 'KNCkfGAnBUvoG5EJipAzSBjjaF8iNL4ivYsBS14DKdg', 18, 'KNC', - 'Kyber Network Crystal', + 'KNC', ), - - // not existing - [ChainId.ZKEVM]: new Token(ChainId.ZKEVM, '0x3b2F62d42DB19B30588648bf1c184865D4C3B1D6', 18, 'KNC', 'KNC'), } export const PINNED_PAIRS: { readonly [chainId in ChainId]?: [Token, Token][] } = { @@ -586,15 +422,14 @@ export const DEFAULT_OUTPUT_TOKEN_BY_CHAIN: Partial> = { [ChainId.CRONOS]: USDC[ChainId.CRONOS], [ChainId.ARBITRUM]: new Token(ChainId.ARBITRUM, '0x912CE59144191C1204E64559FE8253a0e49E6548', 18, 'ARB', 'Arbitrum'), [ChainId.OPTIMISM]: USDC[ChainId.OPTIMISM], - [ChainId.VELAS]: USDC[ChainId.VELAS], [ChainId.AURORA]: USDC[ChainId.AURORA], - [ChainId.OASIS]: USDC[ChainId.OASIS], [ChainId.BTTC]: USDT[ChainId.BTTC], // USDT_b [ChainId.SOLANA]: USDC[ChainId.SOLANA], - [ChainId.GÖRLI]: KNC[ChainId.GÖRLI], + [ChainId.GÖRLI]: USDT[ChainId.GÖRLI], [ChainId.ZKSYNC]: USDC[ChainId.ZKSYNC], [ChainId.ZKEVM]: USDT[ChainId.ZKEVM], [ChainId.LINEA]: USDC[ChainId.LINEA], + [ChainId.BASE]: USDC[ChainId.BASE], } export const DEFAULT_SWAP_FEE_STABLE_PAIRS = 4 diff --git a/src/constants/v2.ts b/src/constants/v2.ts index 877ce443a1..e7fb9bd3dc 100644 --- a/src/constants/v2.ts +++ b/src/constants/v2.ts @@ -1,12 +1,3 @@ -import { ChainId } from '@kyberswap/ks-sdk-core' -import { t } from '@lingui/macro' - -export const ELASTIC_NOT_SUPPORTED: { [key: string]: string } = { - [ChainId.AURORA]: t`Elastic is not supported on Aurora. Please switch to other chains`, - [ChainId.ZKSYNC]: t`Elastic will be available soon`, - // [ChainId.VELAS]: t`Elastic will be available soon`, -} - export enum VERSION { ELASTIC = 'elastic', CLASSIC = 'classic', diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts index 9c7b9d3c54..931e6e2b5e 100644 --- a/src/constants/wallets.ts +++ b/src/constants/wallets.ts @@ -1,13 +1,18 @@ +import SafeAppsSDK from '@safe-global/safe-apps-sdk' import { BaseMessageSignerWalletAdapter, WalletReadyState } from '@solana/wallet-adapter-base' import { Web3ReactHooks } from '@web3-react/core' import { Connector } from '@web3-react/types' import { isMobile } from 'react-device-detect' +import BLOCTO from 'assets/wallets-connect/bocto.svg' import BRAVE from 'assets/wallets-connect/brave.svg' import COIN98 from 'assets/wallets-connect/coin98.svg' import COINBASE from 'assets/wallets-connect/coinbase.svg' +import KRYSTAL from 'assets/wallets-connect/krystal.svg' import METAMASK from 'assets/wallets-connect/metamask.svg' import PHANTOM from 'assets/wallets-connect/phantom.svg' +import RABBY from 'assets/wallets-connect/rabby.svg' +import SAFE from 'assets/wallets-connect/safe.svg' import SLOPE from 'assets/wallets-connect/slope.svg' import SOLFLARE from 'assets/wallets-connect/solflare.svg' import TRUSTWALLET from 'assets/wallets-connect/trust-wallet.svg' @@ -15,18 +20,28 @@ import WALLETCONNECT from 'assets/wallets-connect/wallet-connect.svg' import INJECTED_DARK_ICON from 'assets/wallets/browser-wallet-dark.svg' import INJECTED_LIGHT_ICON from 'assets/wallets/browser-wallet-light.svg' import { + blocto, + bloctoHooks, + bloctoInject, + bloctoInjectHooks, brave, braveHooks, coin98, coin98Hooks, coinbaseWallet, coinbaseWalletHooks, + gnosisSafe, + gnosisSafeHooks, injected, injectedHooks, + krystal, + krystalHooks, metaMask, metamaskHooks, - trustWallet, - trustWalletHooks, + rabby, + rabbyHooks, + trust, + trustHooks, walletConnectV2, walletConnectV2Hooks, } from 'constants/connectors/evm' @@ -39,11 +54,14 @@ import { solflareAdapter, } from 'constants/connectors/solana' import { + getIsBloctoWallet, getIsBraveWallet, getIsC98Wallet, getIsCoinbaseWallet, getIsGenericInjector, + getIsKrystalWallet, getIsMetaMaskWallet, + getIsRabbyWallet, getIsTrustWallet, } from 'constants/connectors/utils' @@ -58,6 +76,38 @@ const detectMetamask = (): WalletReadyState => { return WalletReadyState.NotDetected } +const detectBlocto = (): WalletReadyState => { + if (getIsBloctoWallet()) return WalletReadyState.Unsupported + return WalletReadyState.Installed +} + +const detectBloctoInjected = (): WalletReadyState => { + if (getIsBloctoWallet()) return WalletReadyState.Installed + return WalletReadyState.Unsupported +} + +let isSafe = false +const appsSdk = new SafeAppsSDK({}) +;(async () => { + try { + const result = await appsSdk.safe.getEnvironmentInfo() + if (result) isSafe = true + } catch (error) {} +})() +const detectSafe = (): WalletReadyState => { + return isSafe ? WalletReadyState.Installed : WalletReadyState.NotDetected +} + +const detectRabby = (): WalletReadyState => { + if (getIsRabbyWallet()) return WalletReadyState.Installed + return WalletReadyState.NotDetected +} + +const detectKrystal = (): WalletReadyState => { + if (getIsKrystalWallet()) return WalletReadyState.Installed + return WalletReadyState.NotDetected +} + const detectBrave = (): WalletReadyState => { //todo known issue: fail connect on mobile solana if (getIsBraveWallet()) return WalletReadyState.Installed @@ -117,7 +167,6 @@ export const SUPPORTED_WALLETS = { name: 'Browser Wallet', icon: INJECTED_DARK_ICON, iconLight: INJECTED_LIGHT_ICON, - installLink: 'https://metamask.io/download', readyState: detectInjected, } as EVMWalletInfo, METAMASK: { @@ -129,6 +178,33 @@ export const SUPPORTED_WALLETS = { installLink: 'https://metamask.io/download', readyState: detectMetamask, } as EVMWalletInfo, + KRYSTAL: { + connector: krystal, + hooks: krystalHooks, + name: 'Krystal', + icon: KRYSTAL, + iconLight: KRYSTAL, + installLink: 'https://wallet.krystal.app', + readyState: detectKrystal, + } as EVMWalletInfo, + RABBY: { + connector: rabby, + hooks: rabbyHooks, + name: 'Rabby', + icon: RABBY, + iconLight: RABBY, + installLink: 'https://rabby.io', + readyState: detectRabby, + } as EVMWalletInfo, + TRUST_WALLET: { + connector: trust, + hooks: trustHooks, + name: 'Trust Wallet', + icon: TRUSTWALLET, + iconLight: TRUSTWALLET, + installLink: 'https://trustwallet.com/vi/deeplink', + readyState: detectTrustWallet, + } as EVMWalletInfo, BRAVE: { connector: brave, hooks: braveHooks, @@ -141,17 +217,15 @@ export const SUPPORTED_WALLETS = { // If Phantom extension installed block Brave wallet readyStateSolana: () => (window.solana?.isBraveWallet ? braveAdapter.readyState : WalletReadyState.NotDetected), } as EVMWalletInfo & SolanaWalletInfo, - COIN98: { - connector: coin98, - hooks: coin98Hooks, - adapter: coin98Adapter, - name: 'Coin98', - icon: COIN98, - iconLight: COIN98, - installLink: 'https://wallet.coin98.com/', - readyState: detectCoin98, - readyStateSolana: () => coin98Adapter.readyState, - } as EVMWalletInfo & SolanaWalletInfo, + SAFE: { + connector: gnosisSafe, + hooks: gnosisSafeHooks, + name: 'Safe', + icon: SAFE, + iconLight: SAFE, + installLink: 'https://safe.global/wallet', + readyState: detectSafe, + } as EVMWalletInfo, COINBASE: { connector: coinbaseWallet, hooks: coinbaseWalletHooks, @@ -163,15 +237,42 @@ export const SUPPORTED_WALLETS = { readyState: detectCoinbase, readyStateSolana: () => (isMobile ? WalletReadyState.Unsupported : coinbaseAdapter.readyState), } as EVMWalletInfo & SolanaWalletInfo, + COIN98: { + connector: coin98, + hooks: coin98Hooks, + adapter: coin98Adapter, + name: 'Coin98', + icon: COIN98, + iconLight: COIN98, + installLink: 'https://wallet.coin98.com/', + readyState: detectCoin98, + readyStateSolana: () => coin98Adapter.readyState, + } as EVMWalletInfo & SolanaWalletInfo, + BLOCTO_INJECTED: { + connector: bloctoInject, + hooks: bloctoInjectHooks, + name: 'Blocto', + icon: BLOCTO, + iconLight: BLOCTO, + readyState: detectBloctoInjected, + } as EVMWalletInfo, WALLET_CONNECT: { connector: walletConnectV2, hooks: walletConnectV2Hooks, name: 'WalletConnect', icon: WALLETCONNECT, iconLight: WALLETCONNECT, - installLink: 'https://walletconnect.com/', readyState: () => WalletReadyState.Installed, } as EVMWalletInfo, + BLOCTO: { + connector: blocto, + hooks: bloctoHooks, + name: 'Blocto', + icon: BLOCTO, + iconLight: BLOCTO, + installLink: 'https://www.blocto.io/download', + readyState: detectBlocto, + } as EVMWalletInfo, SOLFLARE: { adapter: solflareAdapter, name: 'Solflare', @@ -196,20 +297,21 @@ export const SUPPORTED_WALLETS = { installLink: slopeAdapter.url, readyStateSolana: () => (isMobile ? WalletReadyState.Unsupported : slopeAdapter.readyState), } as SolanaWalletInfo, - TRUST_WALLET: { - connector: trustWallet, - hooks: trustWalletHooks, - name: 'Trust Wallet', - icon: TRUSTWALLET, - iconLight: TRUSTWALLET, - installLink: 'https://trustwallet.com/vi/deeplink', - readyState: detectTrustWallet, - } as EVMWalletInfo, } as const +export type SUPPORTED_WALLET = keyof typeof SUPPORTED_WALLETS export const connections = Object.values(SUPPORTED_WALLETS).filter(wallet => 'connector' in wallet) as EVMWalletInfo[] -export type SUPPORTED_WALLET = keyof typeof SUPPORTED_WALLETS - export const LOCALSTORAGE_LAST_WALLETKEY_EVM = 'last-wallet-key-evm' export const LOCALSTORAGE_LAST_WALLETKEY_SOLANA = 'last-wallet-key-solana' +export const INJECTED_KEYS = [ + 'COIN98', + 'BRAVE', + 'METAMASK', + 'COINBASE', + 'TRUST_WALLET', + 'KRYSTAL', + 'RABBY', + 'INJECTED', +] as const +export type INJECTED_KEY = typeof INJECTED_KEYS[number] diff --git a/src/hooks/Tokens.ts b/src/hooks/Tokens.ts index 0b3a22b6f4..9cc625a414 100644 --- a/src/hooks/Tokens.ts +++ b/src/hooks/Tokens.ts @@ -26,7 +26,7 @@ import useDebounce from './useDebounce' function useTokensFromMap(tokenMap: TokenAddressMap, lowercaseAddress?: boolean, customChainId?: ChainId): TokenMap { const { chainId: currentChainId } = useActiveWeb3React() const chainId = customChainId || currentChainId - const userAddedTokens = useUserAddedTokens() + const userAddedTokens = useUserAddedTokens(chainId) return useMemo(() => { if (!chainId) return {} diff --git a/src/hooks/index.ts b/src/hooks/index.ts index c3c8cfeb08..2b945bdab3 100644 --- a/src/hooks/index.ts +++ b/src/hooks/index.ts @@ -3,11 +3,11 @@ import { ChainId, ChainType, getChainType } from '@kyberswap/ks-sdk-core' import { Wallet, useWallet } from '@solana/wallet-adapter-react' import { useWeb3React as useWeb3ReactCore } from '@web3-react/core' import { Connector } from '@web3-react/types' -import { useEffect, useMemo } from 'react' +import { useMemo } from 'react' import { useSelector } from 'react-redux' import { useSearchParams } from 'react-router-dom' -import { metaMask, walletConnectV2 } from 'constants/connectors/evm' +import { blocto, gnosisSafe, walletConnectV2 } from 'constants/connectors/evm' import { MOCK_ACCOUNT_EVM, MOCK_ACCOUNT_SOLANA } from 'constants/env' import { NETWORKS_INFO, isSupportedChainId } from 'constants/networks' import { NetworkInfo } from 'constants/networks/type' @@ -57,10 +57,17 @@ export function useActiveWeb3React(): { const walletKeyEVM = useMemo(() => { if (!isConnectedEVM) return undefined - const detectedWallet = detectInjectedType() if (connectedConnectorEVM === walletConnectV2) { return 'WALLET_CONNECT' } + if (connectedConnectorEVM === gnosisSafe) { + return 'SAFE' + } + if (connectedConnectorEVM === blocto) { + return 'BLOCTO' + } + const detectedWallet = detectInjectedType() + return ( detectedWallet ?? (Object.keys(SUPPORTED_WALLETS) as SUPPORTED_WALLET[]).find(walletKey => { @@ -129,44 +136,3 @@ export const useWeb3Solana = () => { const { connection } = useKyberSwapConfig() return { connection } } - -/** - * Use for network and injected - logs user in - * and out after checking what network they're on - */ -export function useInactiveListener(suppress = false) { - const { isEVM } = useActiveWeb3React() - const { active } = useWeb3React() // specifically using useWeb3React because of what this hook does - - useEffect(() => { - const { ethereum } = window - if (isEVM && ethereum?.on && !active && !suppress) { - const handleChainChanged = () => { - // eat errors - metaMask.activate().catch(error => { - console.error('Failed to activate after chain changed', error) - }) - } - - const handleAccountsChanged = (accounts: string[]) => { - if (accounts.length > 0) { - // eat errors - metaMask.activate().catch(error => { - console.error('Failed to activate after accounts changed', error) - }) - } - } - - ethereum.on('chainChanged', handleChainChanged) - ethereum.on('accountsChanged', handleAccountsChanged) - - return () => { - if (ethereum.removeListener) { - ethereum.removeListener('chainChanged', handleChainChanged) - ethereum.removeListener('accountsChanged', handleAccountsChanged) - } - } - } - return undefined - }, [active, suppress, isEVM]) -} diff --git a/src/hooks/social.ts b/src/hooks/social.ts index 64b0bc2f5b..1eafb947a1 100644 --- a/src/hooks/social.ts +++ b/src/hooks/social.ts @@ -5,14 +5,18 @@ import { v4 as uuid } from 'uuid' import { BUCKET_NAME } from 'constants/env' +export const IMAGE_ALLOW_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif'] + export const useUploadImageToCloud = () => { const [uploadImage] = useUploadImageMutation() return useCallback( - async (blob: Blob) => { + async (fileObject: Blob | File) => { try { - const fileName = `${uuid()}.png` - const file = new File([blob], fileName, { type: 'image/png' }) + const file = fileObject as File + const ext = file.name?.split('.')?.pop() ?? '' + if (ext && !IMAGE_ALLOW_EXTENSIONS.includes(ext.toLowerCase())) throw new Error('File is not support') + const fileName = `${uuid() + Date.now()}.${ext || 'png'}` const res = await uploadImage({ fileName, }).unwrap() @@ -20,7 +24,14 @@ export const useUploadImageToCloud = () => { const url = res?.data?.signedURL if (!url) throw new Error('Upload error') - await axios({ url, method: 'PUT', data: file }) + await axios({ + url, + method: 'PUT', + data: file, + headers: { + 'Content-Type': file.type, + }, + }) return `https://storage.googleapis.com/${BUCKET_NAME}/${fileName}` } catch (error) { return diff --git a/src/hooks/useChainsConfig.ts b/src/hooks/useChainsConfig.ts new file mode 100644 index 0000000000..b522619af0 --- /dev/null +++ b/src/hooks/useChainsConfig.ts @@ -0,0 +1,42 @@ +import { ChainId } from '@kyberswap/ks-sdk-core' +import { useMemo } from 'react' +import { useGetChainsConfigurationQuery } from 'services/ksSetting' + +import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NetworkInfo } from 'constants/networks/type' +import { useKyberswapGlobalConfig } from 'hooks/useKyberSwapConfig' + +export enum ChainState { + NEW = 'new', + ACTIVE = 'active', + INACTIVE = 'inactive', + MAINTENANCE = 'maintained', +} + +export type ChainStateMap = { [chain in ChainId]: ChainState } + +const defaultData = MAINNET_NETWORKS.map(chainId => NETWORKS_INFO[chainId]) +export default function useChainsConfig() { + const { data } = useGetChainsConfigurationQuery() + const globalConfig = useKyberswapGlobalConfig() + + return useMemo(() => { + const hasConfig = !!data + const chains: NetworkInfo[] = (data || defaultData).map(chain => { + const chainId = +chain.chainId as ChainId + const chainState = hasConfig ? globalConfig?.chainStates?.[chainId] : ChainState.ACTIVE + return { + ...NETWORKS_INFO[chainId], + ...chain, // BE config + chainId, + state: chainState, + } + }) + return { + activeChains: chains.filter(e => [ChainState.ACTIVE, ChainState.NEW].includes(e.state)), + supportedChains: chains.filter(e => + [ChainState.ACTIVE, ChainState.NEW, ChainState.MAINTENANCE].includes(e.state), + ), + } + }, [data, globalConfig]) +} diff --git a/src/hooks/useColor.ts b/src/hooks/useColor.ts index 8ac3dc8af7..5d26208b46 100644 --- a/src/hooks/useColor.ts +++ b/src/hooks/useColor.ts @@ -6,9 +6,12 @@ import { hex } from 'wcag-contrast' import { NETWORKS_INFO } from 'constants/networks' import { getTokenLogoURL } from 'utils' +import { getProxyTokenLogo } from 'utils/tokenInfo' async function getColorFromToken(token: Currency): Promise { - const path = token.isNative ? NETWORKS_INFO[token.chainId].icon : getTokenLogoURL(token.address, token.chainId) + const path = getProxyTokenLogo( + token.isNative ? NETWORKS_INFO[token.chainId].icon : getTokenLogoURL(token.address, token.chainId), + ) return Vibrant.from(path) .getPalette() diff --git a/src/hooks/useElasticLegacy.ts b/src/hooks/useElasticLegacy.ts index 6699174773..204b1e02e4 100644 --- a/src/hooks/useElasticLegacy.ts +++ b/src/hooks/useElasticLegacy.ts @@ -92,20 +92,6 @@ export const config: { positionManagerContract: '0x2B1c7b41f6A8F2b2bc45C3233a5d5FB3cD6dC9A8', tickReaderContract: '0x165c68077ac06c83800d19200e6E2B08D02dE75D', }, - - [ChainId.VELAS]: { - subgraphUrl: 'https://velas-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-elastic-velas-legacy', - farmContract: '', - positionManagerContract: '0x2B1c7b41f6A8F2b2bc45C3233a5d5FB3cD6dC9A8', - tickReaderContract: '0x165c68077ac06c83800d19200e6E2B08D02dE75D', - }, - - [ChainId.OASIS]: { - subgraphUrl: 'https://oasis-graph.kyberengineering.io/subgraphs/name/kybernetwork/kyberswap-elastic-oasis-legacy', - farmContract: '', - positionManagerContract: '0x2B1c7b41f6A8F2b2bc45C3233a5d5FB3cD6dC9A8', - tickReaderContract: '0x165c68077ac06c83800d19200e6E2B08D02dE75D', - }, } const query = (user: string) => ` diff --git a/src/hooks/useKyberSwapConfig.ts b/src/hooks/useKyberSwapConfig.ts index 7fcdda1d55..13449c9268 100644 --- a/src/hooks/useKyberSwapConfig.ts +++ b/src/hooks/useKyberSwapConfig.ts @@ -16,6 +16,7 @@ import { NETWORKS_INFO, SUPPORTED_NETWORKS, isEVM, isSolana } from 'constants/ne import ethereumInfo from 'constants/networks/ethereum' import solanaInfo from 'constants/networks/solana' import { AppJsonRpcProvider } from 'constants/providers' +import { ChainStateMap } from 'hooks/useChainsConfig' import { AppState } from 'state' import { createClient } from 'utils/client' @@ -36,8 +37,8 @@ const parseResponse = ( return { rpc, - prochart: data?.prochart || false, isEnableBlockService: data?.isEnableBlockService || false, + isEnableKNProtocol: data?.isEnableKNProtocol || false, blockClient: isEVM(defaultChainId) ? createClient(data?.blockSubgraph || NETWORKS_INFO[defaultChainId].defaultBlockSubgraph) : createClient(ethereumInfo.defaultBlockSubgraph), @@ -58,6 +59,7 @@ type KyberswapGlobalConfig = { aggregatorDomain: string aggregatorAPI: string isEnableAuthenAggregator: boolean + chainStates: ChainStateMap } const parseGlobalResponse = ( @@ -68,6 +70,7 @@ const parseGlobalResponse = ( const aggregatorDomain = data?.aggregator ?? AGGREGATOR_API const isEnableAuthenAggregator = !!data?.isEnableAuthenAggregator return { + chainStates: data?.chainStates || ({} as ChainStateMap), aggregatorDomain: 'https://aggregator-api.stg.kyberengineering.io', aggregatorAPI: `${aggregatorDomain}/${NETWORKS_INFO[chainId].aggregatorRoute}/route/encode`, isEnableAuthenAggregator, diff --git a/src/hooks/useMixpanel.ts b/src/hooks/useMixpanel.ts index d7e6ac6e7e..cda967d80e 100644 --- a/src/hooks/useMixpanel.ts +++ b/src/hooks/useMixpanel.ts @@ -1739,6 +1739,7 @@ export const useGlobalMixpanelEvents = () => { 'notification-center': 'Notification', [APP_PATHS.KYBERAI_ABOUT]: 'KyberAI About', [APP_PATHS.KYBERDAO_KNC_UTILITY]: 'Gas refund - KNC Utility', + [APP_PATHS.MY_EARNINGS]: 'Earning Dashboard', } const protectedPaths: { [key: string]: string } = { [APP_PATHS.KYBERAI_RANKINGS]: 'KyberAI Rankings', diff --git a/src/hooks/useOnClickOutside.tsx b/src/hooks/useOnClickOutside.tsx index 0debf94971..7a7fd7c35f 100644 --- a/src/hooks/useOnClickOutside.tsx +++ b/src/hooks/useOnClickOutside.tsx @@ -2,17 +2,18 @@ import { RefObject, useEffect, useRef } from 'react' import { isMobile } from 'react-device-detect' export function useOnClickOutside( - node: RefObject, + node: RefObject | RefObject[], handler: undefined | (() => void), ) { const handlerRef = useRef void)>(handler) - useEffect(() => { - handlerRef.current = handler - }, [handler]) + handlerRef.current = handler useEffect(() => { const handleClickOutside = (e: MouseEvent | TouchEvent) => { - if (node.current?.contains(e.target as Node) ?? false) { + let nodes: RefObject[] + if (Array.isArray(node)) nodes = node + else nodes = [node] + if (nodes.some(node => node.current?.contains(e.target as Node) ?? false)) { return } if (handlerRef.current) handlerRef.current() diff --git a/src/hooks/useProAmmPositions.ts b/src/hooks/useProAmmPositions.ts index 8054ee1501..8202db984d 100644 --- a/src/hooks/useProAmmPositions.ts +++ b/src/hooks/useProAmmPositions.ts @@ -7,7 +7,7 @@ import { useMemo } from 'react' import { EVMNetworkInfo } from 'constants/networks/type' import { useActiveWeb3React } from 'hooks' -import { useElasticFarms } from 'state/farms/elastic/hooks' +import { useDepositedNfts, useElasticFarms, useJoinedPositions } from 'state/farms/elastic/hooks' import { Result, useSingleCallResult, useSingleContractMultipleData } from 'state/multicall/hooks' import { PositionDetails } from 'types/position' @@ -18,7 +18,7 @@ interface UseProAmmPositionsResults { positions: PositionDetails[] | undefined } -function useProAmmPositionsFromTokenIds(tokenIds: BigNumber[] | undefined): UseProAmmPositionsResults { +export function useProAmmPositionsFromTokenIds(tokenIds: BigNumber[] | undefined): UseProAmmPositionsResults { const positionManager = useProAmmNFTPositionManagerContract() const { isEVM, networkInfo } = useActiveWeb3React() @@ -132,68 +132,64 @@ export function useProAmmPositions(account: string | null | undefined): UseProAm export const useFarmPositions = () => { const { isEVM, networkInfo } = useActiveWeb3React() - const { farms, loading, userFarmInfo, loadingUserInfo } = useElasticFarms() + const { farms, loading } = useElasticFarms() + const userFarmInfo = useJoinedPositions() + const depositedPositions = useDepositedNfts() const farmingPools = useMemo(() => farms?.map(farm => farm.pools).flat() || [], [farms]) - const farmPositions = useMemo(() => { + const farmPositions: PositionDetails[] = useMemo(() => { if (!isEVM) return [] - return Object.values(userFarmInfo || {}) - .map(info => { - return info.depositedPositions - .map(pos => { - const poolAddress = computePoolAddress({ - factoryAddress: (networkInfo as EVMNetworkInfo).elastic.coreFactory, - tokenA: pos.pool.token0, - tokenB: pos.pool.token1, - fee: pos.pool.fee, - initCodeHashManualOverride: (networkInfo as EVMNetworkInfo).elastic.initCodeHash, - }) - const pool = farmingPools.filter(pool => pool.poolAddress.toLowerCase() === poolAddress.toLowerCase()) - - const joinedLiquidity = - // I'm sure we can always find pool - // eslint-disable-next-line - Object.values(info.joinedPositions) - .flat() - .filter(joinedPos => joinedPos.nftId.toString() === pos.nftId.toString()) - .reduce( - (acc, cur) => - acc.gt(BigNumber.from(cur.liquidity.toString())) ? acc : BigNumber.from(cur.liquidity.toString()), - BigNumber.from(0), - ) || BigNumber.from(0) - - return { - nonce: BigNumber.from('1'), - tokenId: pos.nftId, - operator: '0x0000000000000000000000000000000000000000', - poolId: poolAddress, - tickLower: pos.tickLower, - tickUpper: pos.tickUpper, - liquidity: BigNumber.from(pos.liquidity.toString()), - // not used - feeGrowthInsideLast: BigNumber.from(0), - stakedLiquidity: joinedLiquidity, - // not used - rTokenOwed: BigNumber.from(0), - token0: pos.pool.token0.address, - token1: pos.pool.token1.address, - fee: pos.pool.fee, - endTime: pool?.[0]?.endTime, - rewardPendings: [], - } - }) + return Object.values(depositedPositions) + .flat() + .map(pos => { + const poolAddress = computePoolAddress({ + factoryAddress: (networkInfo as EVMNetworkInfo).elastic.coreFactory, + tokenA: pos.pool.token0, + tokenB: pos.pool.token1, + fee: pos.pool.fee, + initCodeHashManualOverride: (networkInfo as EVMNetworkInfo).elastic.initCodeHash, + }) + const pool = farmingPools.filter(pool => pool.poolAddress.toLowerCase() === poolAddress.toLowerCase()) + + const joinedLiquidity = Object.values(userFarmInfo) + .map(item => Object.values(item.joinedPositions).flat()) .flat() + .filter(joinedPos => joinedPos.nftId.toString() === pos.nftId.toString()) + .reduce( + (acc, cur) => + acc.gt(BigNumber.from(cur.liquidity.toString())) ? acc : BigNumber.from(cur.liquidity.toString()), + BigNumber.from(0), + ) + + return { + nonce: BigNumber.from('1'), + tokenId: pos.nftId, + operator: '0x0000000000000000000000000000000000000000', + poolId: poolAddress, + tickLower: pos.tickLower, + tickUpper: pos.tickUpper, + liquidity: BigNumber.from(pos.liquidity.toString()), + // not used + feeGrowthInsideLast: BigNumber.from(0), + stakedLiquidity: joinedLiquidity, + // not used + rTokenOwed: BigNumber.from(0), + token0: pos.pool.token0.address, + token1: pos.pool.token1.address, + fee: pos.pool.fee, + endTime: pool?.[0]?.endTime, + rewardPendings: [], + } }) - .flat() - }, [farmingPools, userFarmInfo, isEVM, networkInfo]) + }, [farmingPools, isEVM, networkInfo, userFarmInfo, depositedPositions]) return useMemo(() => { return { farms, userFarmInfo, farmPositions, - loading: loadingUserInfo || loading, + loading: loading, } - }, [loading, loadingUserInfo, farmPositions, farms, userFarmInfo]) + }, [loading, farmPositions, farms, userFarmInfo]) } diff --git a/src/hooks/useShowLoadingAtLeastTime.ts b/src/hooks/useShowLoadingAtLeastTime.ts new file mode 100644 index 0000000000..1b6273a76a --- /dev/null +++ b/src/hooks/useShowLoadingAtLeastTime.ts @@ -0,0 +1,26 @@ +import { useEffect, useState } from 'react' + +/** + * This hook to ensure loading is displayed at least "duration" mili seconds + * @param loadingState: (ex: isFetch from rtk query) + * @param duration + * @returns + */ +export default function useShowLoadingAtLeastTime(loadingState = false, duration = 500) { + const [shouldShowLoading, setShouldShowLoading] = useState(true) + + useEffect(() => { + if (loadingState) setShouldShowLoading(true) + }, [loadingState]) + + useEffect(() => { + const existingTimeout = setTimeout(() => { + setShouldShowLoading(false) + }, duration) + return () => { + existingTimeout && clearTimeout(existingTimeout) + } + }, [duration, shouldShowLoading]) + + return shouldShowLoading || loadingState +} diff --git a/src/hooks/useThrottle.ts b/src/hooks/useThrottle.ts index 4bf10f721a..34229f7fe4 100644 --- a/src/hooks/useThrottle.ts +++ b/src/hooks/useThrottle.ts @@ -1,9 +1,9 @@ -import _ from 'lodash' +import throttle from 'lodash/throttle' import { useMemo, useRef } from 'react' export default function useThrottle(cb: (...args: any) => any, delay: number) { const cbRef = useRef(cb) // use mutable ref to make useMemo not depend on `cb` dep cbRef.current = cb - return useMemo(() => _.throttle(cbRef.current, delay), [delay]) + return useMemo(() => throttle(cbRef.current, delay), [delay]) } diff --git a/src/hooks/web3/useChangeNetwork.ts b/src/hooks/web3/useChangeNetwork.ts index 3039ecb17f..156adef803 100644 --- a/src/hooks/web3/useChangeNetwork.ts +++ b/src/hooks/web3/useChangeNetwork.ts @@ -11,13 +11,14 @@ import { useActiveWeb3React, useWeb3React } from 'hooks' import { useNotify } from 'state/application/hooks' import { useAppDispatch } from 'state/hooks' import { updateChainId } from 'state/user/actions' +import { friendlyError } from 'utils/errorMessage' import { wait } from 'utils/retry' import { useLazyKyberswapConfig } from '../useKyberSwapConfig' let latestChainId: ChainId export function useChangeNetwork() { - const { chainId, walletEVM, walletSolana } = useActiveWeb3React() + const { chainId, walletEVM, walletSolana, isWrongNetwork } = useActiveWeb3React() const { connector, library } = useWeb3React() const fetchKyberswapConfig = useLazyKyberswapConfig() @@ -36,7 +37,7 @@ export function useChangeNetwork() { const successCallback = useCallback( async (desiredChainId: ChainId, waitUtilUpdatedChainId: boolean, customSuccessCallback?: () => void) => { const initialChainId = latestChainId - /** although change chain successfully, but it take 1-2s for chainId has a new value + /** although change chain successfully, but it take 1-2s for chainId has a new value | update: or never change chain but still return success, e.g: safe, phantom evm * => this option will wait util chainId has actually update to new value to prevent some edge case */ while (waitUtilUpdatedChainId) { @@ -84,9 +85,8 @@ export function useChangeNetwork() { message = t`Your wallet not support chain ${NETWORKS_INFO[desiredChainId].name}` } else { message = error?.message || message - const e = new Error(`[Wallet] ${error.message}`) - e.name = 'Activate chain fail' - e.stack = '' + const e = new Error(`[Activate chain] ${walletEVM.walletKey} ${message}`) + e.name = 'Activate chain error' captureException(e, { level: 'warning', extra: { error, wallet: walletEVM.walletKey, chainId, desiredChainId, message }, @@ -116,8 +116,9 @@ export function useChangeNetwork() { customFailureCallback?: (error: Error) => void, waitUtilUpdatedChainId = false, ) => { - const wrappedSuccessCallback = () => + const wrappedSuccessCallback = () => { successCallback(desiredChainId, waitUtilUpdatedChainId, customSuccessCallback) + } const { rpc } = customRpc ? { rpc: customRpc } : await fetchKyberswapConfig(desiredChainId) const addChainParameter = { @@ -131,31 +132,95 @@ export function useChangeNetwork() { }, blockExplorerUrls: [NETWORKS_INFO[desiredChainId].etherscanUrl], } - console.info('Add new network', { addChainParameter }) - const activeProvider = library?.provider ?? window.ethereum - if (activeProvider && activeProvider.request) { + + enum Solution { + web3_react = 'web3_react', + provider_request = 'provider_request', + } + const solutions = { + [Solution.web3_react]: async () => await connector.activate(addChainParameter), + [Solution.provider_request]: async () => { + const activeProvider = library?.provider ?? window.ethereum + if (activeProvider?.request) { + await activeProvider.request({ + method: 'wallet_addEthereumChain', + params: [addChainParameter], + }) + } else { + throw new Error('empty request function') + } + }, + } + + const solutionPrefer: readonly Solution[] = (() => { + if (walletEVM.walletKey === 'KRYSTAL') { + // Krystal break when call by web3-react .activate + return [Solution.provider_request] + } else if (walletEVM.walletKey === 'BLOCTO') { + // Blocto break when call by provider.request + return [Solution.web3_react] + } + return [Solution.provider_request, Solution.web3_react] + })() + + const errors: Error[] = [] + for (let i = 0; i < solutionPrefer.length; i++) { try { - await activeProvider.request({ - method: 'wallet_addEthereumChain', - params: [addChainParameter], + console.info('[Add network] start:', { + wallet: walletEVM.walletKey, + solution: solutionPrefer[i], + addChainParameter, + }) + await solutions[solutionPrefer[i]]() + console.info('[Add network] success:', { + wallet: walletEVM.walletKey, + solution: solutionPrefer[i], + addChainParameter, }) wrappedSuccessCallback() + return } catch (error) { - console.error('Add new network failed', { addChainParameter, error }) - failureCallback(desiredChainId, error, customFailureCallback, customTexts) - if (!didUserReject(error)) { - const e = new Error(`[Wallet] ${error.message}`) - e.name = 'Add new network Error' - e.stack = '' - captureException(e, { - level: 'warning', - extra: { error, wallet: walletEVM.walletKey, chainId, addChainParameter }, - }) + console.error( + '[Add network] error:', + JSON.stringify( + { + wallet: walletEVM.walletKey, + desiredChainId, + solution: solutionPrefer[i], + message: friendlyError(error), + error, + addChainParameter, + didUserReject: didUserReject(error), + }, + null, + 2, + ), + ) + + if (didUserReject(error)) { + failureCallback(desiredChainId, error, customFailureCallback, customTexts) + return } + errors.push(error) } } + + failureCallback(desiredChainId, errors.at(-1), customFailureCallback, customTexts) + const e = new Error(`[Add network] ${walletEVM.walletKey} ${friendlyError(errors.at(-1) || '')}`) + e.name = 'Add new network Error' + e.stack = '' + captureException(e, { + level: 'error', + extra: { + wallet: walletEVM.walletKey, + desiredChainId, + addChainParameter, + friendlyMessages: errors.map(friendlyError), + errors, + }, + }) }, - [library?.provider, chainId, failureCallback, fetchKyberswapConfig, successCallback, walletEVM.walletKey], + [library?.provider, failureCallback, fetchKyberswapConfig, successCallback, walletEVM.walletKey, connector], ) const changeNetwork = useCallback( @@ -163,13 +228,13 @@ export function useChangeNetwork() { desiredChainId: ChainId, customSuccessCallback?: () => void, customFailureCallback?: (error: Error) => void, - waitUtilUpdatedChainId = false, + waitUtilUpdatedChainId = false, //todo: force all to true isAddNetworkIfPossible = true, ) => { const wrappedSuccessCallback = () => successCallback(desiredChainId, waitUtilUpdatedChainId, customSuccessCallback) // if connected, nothing todo, success return - if (desiredChainId === chainId) { + if (desiredChainId === chainId && !isWrongNetwork) { customSuccessCallback?.() return } @@ -185,12 +250,15 @@ export function useChangeNetwork() { if (isEVM(desiredChainId)) { try { - console.info('Switch network', { desiredChainId }) + console.info('[Switch network] start:', { desiredChainId }) await connector.activate(desiredChainId) - console.info('Switch network success', { desiredChainId }) + console.info('[Switch network] success:', { desiredChainId }) changeNetworkHandler(desiredChainId, wrappedSuccessCallback) } catch (error) { - console.error('Switch network failed', { desiredChainId, error }) + console.error( + '[Switch network] error:', + JSON.stringify({ desiredChainId, error, didUserReject: didUserReject(error) }, null, 2), + ) // walletconnect v2 not support add network, so halt execution here if (didUserReject(error) || connector === walletConnectV2) { @@ -230,6 +298,7 @@ export function useChangeNetwork() { successCallback, failureCallback, addNewNetwork, + isWrongNetwork, ], ) diff --git a/src/hooks/web3/useEagerConnect.ts b/src/hooks/web3/useEagerConnect.ts index ed6e35f592..7cd3bef043 100644 --- a/src/hooks/web3/useEagerConnect.ts +++ b/src/hooks/web3/useEagerConnect.ts @@ -10,7 +10,7 @@ import useDisconnectWallet from './useDisconnectWallet' // make sure this hook will be ran only once globally let trying = false -let tried = false +const tried = { current: false } // global ref export function useEagerConnect() { const { active } = useWeb3React() const disconnect = useDisconnectWallet() @@ -19,7 +19,10 @@ export function useEagerConnect() { const { tryActivation } = useActivationWallet() const setTried = () => { - tried = true + try { + tried.current = true + Object.freeze(tried) + } catch {} reRender({}) } @@ -32,26 +35,34 @@ export function useEagerConnect() { return } try { - if (trying || tried) return + if (trying || tried.current) return trying = true - let activated = false + let activatedSuccess = false + // must retrieve this before activate safe, or will be overriden to SAFE const lastWalletKeyEVM = localStorage.getItem(LOCALSTORAGE_LAST_WALLETKEY_EVM) const lastWalletKeySolana = localStorage.getItem(LOCALSTORAGE_LAST_WALLETKEY_SOLANA) + + try { + await tryActivation('SAFE', true) + activatedSuccess = true + setTried() + } catch {} + await Promise.all([ (async () => { if (lastWalletKeyEVM) { await tryActivation(lastWalletKeyEVM, true) - activated = true + activatedSuccess = true } })(), (async () => { if (lastWalletKeySolana) { await tryActivation(lastWalletKeySolana) - activated = true + activatedSuccess = true } })(), ]) - if (!activated) { + if (!activatedSuccess) { if (isMobile && window.ethereum) { await tryActivation('INJECTED', true) } diff --git a/src/hooks/web3/useSyncNetworkParamWithStore.ts b/src/hooks/web3/useSyncNetworkParamWithStore.ts index 78d52492b1..1b24eb12ec 100644 --- a/src/hooks/web3/useSyncNetworkParamWithStore.ts +++ b/src/hooks/web3/useSyncNetworkParamWithStore.ts @@ -18,13 +18,14 @@ export function useSyncNetworkParamWithStore() { const location = useLocation() const [requestingNetwork, setRequestingNetwork] = useState() const triedSync = useRef(false) + const tried = triedEager.current useEffect(() => { if (!paramChainId) { triedSync.current = true return } - if (!triedEager) { + if (!tried) { return } @@ -46,7 +47,7 @@ export function useSyncNetworkParamWithStore() { } }) })() - }, [changeNetwork, location, navigate, networkInfo.route, networkParam, paramChainId, triedEager]) + }, [changeNetwork, location, navigate, networkInfo.route, networkParam, paramChainId, tried]) useEffect(() => { if (NETWORKS_INFO[chainId].route === requestingNetwork) setRequestingNetwork(undefined) @@ -61,12 +62,12 @@ export function useSyncNetworkParamWithStore() { networkParam && networkInfo.route !== networkParam && triedSync.current && - triedEager + tried ) { navigate( { ...location, pathname: location.pathname.replace(encodeURIComponent(networkParam), networkInfo.route) }, { replace: true }, ) } - }, [location, networkInfo.route, navigate, triedEager, networkParam, requestingNetwork]) + }, [location, networkInfo.route, navigate, tried, networkParam, requestingNetwork]) } diff --git a/src/hooks/web3/useWalletSupportedChains.ts b/src/hooks/web3/useWalletSupportedChains.ts index 946bb0acf8..5817060ff2 100644 --- a/src/hooks/web3/useWalletSupportedChains.ts +++ b/src/hooks/web3/useWalletSupportedChains.ts @@ -1,8 +1,8 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { WalletConnect as WalletConnectV2 } from '@web3-react/walletconnect-v2' -import { walletConnectV2 } from 'constants/connectors/evm' -import { SUPPORTED_NETWORKS } from 'constants/networks' +import { blocto, bloctoInject, gnosisSafe, walletConnectV2 } from 'constants/connectors/evm' +import { BLOCTO_SUPPORTED_NETWORKS, SUPPORTED_NETWORKS } from 'constants/networks' import { useWeb3React } from 'hooks' function getChainsFromEIP155Accounts(accounts?: string[]): ChainId[] { @@ -15,15 +15,19 @@ function getChainsFromEIP155Accounts(accounts?: string[]): ChainId[] { .filter(x => x !== undefined) as ChainId[] } -export function useWalletSupportedChains() { - const { connector } = useWeb3React() +export function useWalletSupportedChains(): ChainId[] { + const { connector, chainId } = useWeb3React() switch (connector) { case walletConnectV2: return [ ...getChainsFromEIP155Accounts((connector as WalletConnectV2).provider?.session?.namespaces?.eip155?.accounts), - // ChainId.SOLANA, ] + case gnosisSafe: + return chainId ? [chainId] : SUPPORTED_NETWORKS + case blocto: + case bloctoInject: + return BLOCTO_SUPPORTED_NETWORKS default: return SUPPORTED_NETWORKS } diff --git a/src/index.tsx b/src/index.tsx index b52945aefd..418efc1a28 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,4 @@ -import { datadogRum } from '@datadog/browser-rum' +import '@/wdyr' import * as Sentry from '@sentry/react' import { BrowserTracing } from '@sentry/tracing' import { Web3ReactHooks, Web3ReactProvider } from '@web3-react/core' @@ -48,28 +48,13 @@ mixpanel.init(MIXPANEL_PROJECT_TOKEN, { }) if (ENV_LEVEL > ENV_TYPE.LOCAL) { - datadogRum.init({ - applicationId: '5bd0c243-6141-4bab-be21-5dac9b9efa9f', - clientToken: 'pub9163f29b2cdb31314b89ae232af37d5a', - site: 'datadoghq.eu', - service: 'kyberswap-interface', - - version: TAG, - sampleRate: ENV_LEVEL === ENV_TYPE.PROD ? 10 : 100, - sessionReplaySampleRate: 100, - trackInteractions: true, - trackResources: true, - trackLongTasks: true, - defaultPrivacyLevel: 'mask-user-input', - }) - datadogRum.startSessionReplayRecording() - Sentry.init({ dsn: SENTRY_DNS, environment: 'production', ignoreErrors: ['AbortError'], integrations: [new BrowserTracing()], tracesSampleRate: 0.1, + normalizeDepth: 5, }) Sentry.configureScope(scope => { scope.setTag('request_id', sentryRequestId) diff --git a/src/pages/About/AboutKyberSwap/index.tsx b/src/pages/About/AboutKyberSwap/index.tsx index c192e0ded4..bdaeac143c 100644 --- a/src/pages/About/AboutKyberSwap/index.tsx +++ b/src/pages/About/AboutKyberSwap/index.tsx @@ -42,18 +42,17 @@ import { LineaFull, LowestSlippage, MoneyBagOutline, - OasisLogoFull, OptimismLogoFull, PolygonLogoFull, - VelasLogoFull, } from 'components/Icons' import AntiSnippingAttack from 'components/Icons/AntiSnippingAttack' import ZkSyncFull from 'components/Icons/ZkSyncFull' import Loader from 'components/Loader' import { APP_PATHS } from 'constants/index' -import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' +import { NETWORKS_INFO } from 'constants/networks' import { VERSION } from 'constants/v2' import { useActiveWeb3React } from 'hooks' +import useChainsConfig from 'hooks/useChainsConfig' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' import { useGlobalData } from 'state/about/hooks' @@ -123,6 +122,7 @@ const ForTraderInfoCell = styled.div` export const KSStatistic = () => { const theme = useTheme() const upToLarge = useMedia(`(max-width: ${MEDIA_WIDTHS.upToLarge}px)`) + const { supportedChains } = useChainsConfig() return ( @@ -155,7 +155,7 @@ export const KSStatistic = () => { - {MAINNET_NETWORKS.length}+ + {supportedChains.length}+ Chains @@ -477,6 +477,8 @@ function AboutKyberSwap() { ) } + const { supportedChains } = useChainsConfig() + return (
@@ -497,14 +499,10 @@ function AboutKyberSwap() { - {MAINNET_NETWORKS.map(chain => ( + {supportedChains.map(({ chainId: chain, iconDark, icon, name }) => ( {NETWORKS_INFO[chain].name} - - btt {/* */} @@ -1034,12 +1030,17 @@ function AboutKyberSwap() { zkevm + Base diff --git a/src/pages/About/styleds.tsx b/src/pages/About/styleds.tsx index 8a3551a1b9..5dc86eb046 100644 --- a/src/pages/About/styleds.tsx +++ b/src/pages/About/styleds.tsx @@ -227,7 +227,7 @@ export const Powered = styled.div` justify-content: center; gap: 52px; & > * { - width: calc(100% / 6 - 52px); + width: calc(100% / 5 - 52px); } svg { max-width: 100%; diff --git a/src/pages/AddLiquidityV2/components/NewPoolNote.tsx b/src/pages/AddLiquidityV2/components/NewPoolNote.tsx index c67ee68be3..bf1bc4bc85 100644 --- a/src/pages/AddLiquidityV2/components/NewPoolNote.tsx +++ b/src/pages/AddLiquidityV2/components/NewPoolNote.tsx @@ -8,7 +8,7 @@ import SwitchIcon from 'components/Icons/SwitchIcon' import { RowBetween } from 'components/Row' import useTheme from 'hooks/useTheme' import { TYPE } from 'theme' -import { formattedNum } from 'utils' +import { formatDisplayNumber } from 'utils/numbers' import { Spin } from '../styled' @@ -43,10 +43,12 @@ function NewPoolNote({ maxCharacters={24} text={ !invertMarketPrice - ? `1 ${baseCurrency?.symbol} = ${formattedNum(marketPrice.toString())} ${quoteCurrency?.symbol}` - : `1 ${quoteCurrency?.symbol} = ${formattedNum((1 / marketPrice).toString())} ${ - baseCurrency?.symbol - }` + ? `1 ${baseCurrency?.symbol} = ${formatDisplayNumber(marketPrice, { + significantDigits: 6, + })} ${quoteCurrency?.symbol}` + : `1 ${quoteCurrency?.symbol} = ${formatDisplayNumber(1 / marketPrice, { + significantDigits: 6, + })} ${baseCurrency?.symbol}` } /> diff --git a/src/pages/AddLiquidityV2/index.tsx b/src/pages/AddLiquidityV2/index.tsx index a2baac7ae7..e1547b3d59 100644 --- a/src/pages/AddLiquidityV2/index.tsx +++ b/src/pages/AddLiquidityV2/index.tsx @@ -46,11 +46,10 @@ import Tooltip, { MouseoverTooltip } from 'components/Tooltip' import TransactionConfirmationModal, { ConfirmationModalContent } from 'components/TransactionConfirmationModal' import { TutorialType } from 'components/Tutorial' import { Dots } from 'components/swapv2/styleds' -import { ENV_LEVEL } from 'constants/env' import { APP_PATHS } from 'constants/index' +import { ELASTIC_NOT_SUPPORTED } from 'constants/networks' import { EVMNetworkInfo } from 'constants/networks/type' import { NativeCurrencies } from 'constants/tokens' -import { ENV_TYPE } from 'constants/type' import { useActiveWeb3React, useWeb3React } from 'hooks' import { useCurrency } from 'hooks/Tokens' import { ApprovalState, useApproveCallback } from 'hooks/useApproveCallback' @@ -63,7 +62,7 @@ import useTheme from 'hooks/useTheme' import useTransactionDeadline from 'hooks/useTransactionDeadline' import { convertTickToPrice } from 'pages/Farm/ElasticFarmv2/utils' import { ApplicationModal } from 'state/application/actions' -import { useNotify, useOpenModal, useWalletModalToggle } from 'state/application/hooks' +import { useNotify, useOpenModal, useOpenNetworkModal, useWalletModalToggle } from 'state/application/hooks' import { FarmUpdater } from 'state/farms/elastic/hooks' import { useElasticFarmsV2 } from 'state/farms/elasticv2/hooks' import ElasticFarmV2Updater from 'state/farms/elasticv2/updater' @@ -87,9 +86,8 @@ import { ExternalLink, MEDIA_WIDTHS, StyledInternalLink, TYPE } from 'theme' import { basisPointsToPercent, calculateGasMargin, formattedNum } from 'utils' import { currencyId } from 'utils/currencyId' import { friendlyError } from 'utils/errorMessage' -import { toSignificantOrMaxIntegerPart } from 'utils/formatCurrencyAmount' import { maxAmountSpend } from 'utils/maxAmountSpend' -import { formatNotDollarAmount } from 'utils/numbers' +import { formatDisplayNumber, toFixed } from 'utils/numbers' import { SLIPPAGE_STATUS, checkRangeSlippage } from 'utils/slippage' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -134,6 +132,7 @@ export default function AddLiquidity() { const { account, chainId, isEVM, networkInfo } = useActiveWeb3React() const { library } = useWeb3React() const theme = useTheme() + const openNetworkModal = useOpenNetworkModal() const toggleWalletModal = useWalletModalToggle() // toggle wallet when disconnected const [isDegenMode] = useDegenModeManager() const addTransactionWithType = useTransactionAdder() @@ -385,6 +384,10 @@ export default function AddLiquidity() { fetchPrices, refetch, } = useTokenPricesWithLoading(tokens.map(t => t?.wrapped.address || '')) + const marketPrice = + usdPrices[quoteCurrency?.wrapped.address || ''] && + usdPrices[baseCurrency?.wrapped.address || ''] && + usdPrices[baseCurrency?.wrapped.address || ''] / usdPrices[quoteCurrency?.wrapped.address || ''] useInterval(refetch, 10_000) @@ -617,14 +620,22 @@ export default function AddLiquidity() { }, [navigate, networkInfo.route, onFieldAInput, txHash]) const handleDismissConfirmationRef = useRef(handleDismissConfirmation) + + const [waitForMarketPrice, setWaitForMarketPrice] = useState(false) useEffect(() => { - if (ENV_LEVEL > ENV_TYPE.LOCAL) { - setPositionIndex(0) - onResetMintState() - handleDismissConfirmationRef.current() - } + setPositionIndex(0) + onResetMintState() + handleDismissConfirmationRef.current() + setWaitForMarketPrice(true) }, [onResetMintState, baseCurrency?.wrapped.address, quoteCurrency?.wrapped.address, feeAmount, chainId]) + useEffect(() => { + if (waitForMarketPrice && marketPrice) { + onStartPriceInput(toFixed(marketPrice)) + setWaitForMarketPrice(false) + } + }, [waitForMarketPrice, marketPrice, onStartPriceInput]) + const leftPrice = isSorted ? priceLower : priceUpper?.invert() const rightPrice = isSorted ? priceUpper : priceLower?.invert() @@ -806,10 +817,13 @@ export default function AddLiquidity() { - Note: A very small amount of your liquidity about {formattedNum(amountUnlockUSD.toString(), true)}{' '} + Note: A very small amount of your liquidity about{' '} + {formatDisplayNumber(amountUnlockUSD, { style: 'currency', significantDigits: 6 })}{' '} - ({amountUnlocks[Field.CURRENCY_A].toSignificant(6)} {amountUnlocks[Field.CURRENCY_A].currency.symbol},{' '} - {amountUnlocks[Field.CURRENCY_B].toSignificant(6)} {amountUnlocks[Field.CURRENCY_B].currency.symbol}) + ({formatDisplayNumber(amountUnlocks[Field.CURRENCY_A], { significantDigits: 6 })}{' '} + {amountUnlocks[Field.CURRENCY_A].currency.symbol},{' '} + {formatDisplayNumber(amountUnlocks[Field.CURRENCY_B], { significantDigits: 6 })}{' '} + {amountUnlocks[Field.CURRENCY_B].currency.symbol}) {' '} will be used to first initialize the pool. Read more{' '} @@ -828,17 +842,21 @@ export default function AddLiquidity() { {noLiquidity ? ( The pool’s current price of 1 {baseCurrency.symbol} ={' '} - {(invertPrice ? price.invert() : price).toSignificant(4)} {quoteCurrency.symbol} deviates from the - market price (1 {baseCurrency.symbol} ={' '} - {formatNotDollarAmount(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], 4)}{' '} + {formatDisplayNumber(invertPrice ? price.invert() : price, { significantDigits: 4 })}{' '} + {quoteCurrency.symbol} deviates from the market price (1 {baseCurrency.symbol} ={' '} + {formatDisplayNumber(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], { + significantDigits: 4, + })}{' '} {quoteCurrency.symbol}). You might have high impermanent loss after the pool is created ) : ( The pool’s current price of 1 {baseCurrency.symbol} ={' '} - {(invertPrice ? price.invert() : price).toSignificant(4)} {quoteCurrency.symbol} deviates from the - market price (1 {baseCurrency.symbol} ={' '} - {formatNotDollarAmount(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], 4)}{' '} + {formatDisplayNumber(invertPrice ? price.invert() : price, { significantDigits: 4 })}{' '} + {quoteCurrency.symbol} deviates from the market price (1 {baseCurrency.symbol} ={' '} + {formatDisplayNumber(usdPrices[tokenA.wrapped.address] / usdPrices[tokenB.wrapped.address], { + significantDigits: 4, + })}{' '} {quoteCurrency.symbol}). You might have high impermanent loss after you add liquidity to this pool )} @@ -1094,7 +1112,9 @@ export default function AddLiquidity() { @@ -1279,11 +1299,6 @@ export default function AddLiquidity() { const tightTokenSelect = !upToMedium && upToLarge - const marketPrice = - usdPrices[quoteCurrency?.wrapped.address || ''] && - usdPrices[baseCurrency?.wrapped.address || ''] && - usdPrices[baseCurrency?.wrapped.address || ''] / usdPrices[quoteCurrency?.wrapped.address || ''] - const onFarmRangeSelected = useCallback( (tickLower: number, tickUpper: number) => { const tickSpacing = TICK_SPACINGS[feeAmount] @@ -1387,221 +1402,243 @@ export default function AddLiquidity() { tutorialType={TutorialType.ELASTIC_ADD_LIQUIDITY} /> - - - - - Choose pool - -
- { - if (tokenA?.symbol && tokenB?.symbol) - mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_SWAP, { - token_1: tokenA?.symbol, - token_2: tokenB?.symbol, - }) - }} - > - - - Swap - - -
- - + {ELASTIC_NOT_SUPPORTED[chainId]} + - - - { - if (!!rightPrice) { - onLeftRangeInput(rightPrice?.invert().toString()) - } - if (!!leftPrice) { - onRightRangeInput(leftPrice?.invert().toString()) - } - setRotate(prev => !prev) - }} - > - {!currencyIdA && !currencyIdB ? ( - - ) : ( - - - - )} - - - - - - - Select fee tier - - - - - {noLiquidity ? ( - - - - - Set Starting Price - - - - - - To initialize this pool, select a starting price for the pool then enter your liquidity price - range. - - - - - - - - - - - - Starting Price - - - {price ? ( - - - - - - ) : ( - '-' - )} - - - fetchPrices(tokens.map(t => t?.wrapped.address || ''))} - marketPrice={marketPrice} - baseCurrency={baseCurrency} - quoteCurrency={quoteCurrency} - /> - - - ) : ( - poolStatRef.current && ( - <> - - - Pool Stats - - { + Change network + + + ) : ( + <> + + + + + Choose pool + +
+ { if (tokenA?.symbol && tokenB?.symbol) - mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_POOL_ANALYTIC, { + mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_SWAP, { token_1: tokenA?.symbol, token_2: tokenB?.symbol, }) }} - /> - - + + + Swap + + +
+ + + - - ) - )} - {upToMedium && chart} - - {!upToMedium && {chart}} - - - {warnings && ( - - {warnings} - - )} - - - - - - - + { + if (!!rightPrice) { + onLeftRangeInput(rightPrice?.invert().toString()) + } + if (!!leftPrice) { + onRightRangeInput(leftPrice?.invert().toString()) + } + setRotate(prev => !prev) + }} + > + {!currencyIdA && !currencyIdB ? ( + + ) : ( + + + + )} + + + + + + + Select fee tier + + + + + {noLiquidity ? ( + + + + + Set Starting Price + + + + + + To initialize this pool, select a starting price for the pool then enter your liquidity + price range. + + + + + + + + + + + + Starting Price + + + {price ? ( + + + + + + ) : ( + '-' + )} + + + fetchPrices(tokens.map(t => t?.wrapped.address || ''))} + marketPrice={marketPrice} + baseCurrency={baseCurrency} + quoteCurrency={quoteCurrency} + /> + + + ) : ( + poolStatRef.current && ( + <> + + + Pool Stats + + { + if (tokenA?.symbol && tokenB?.symbol) + mixpanelHandler(MIXPANEL_TYPE.ELASTIC_ADD_LIQUIDITY_CLICK_POOL_ANALYTIC, { + token_1: tokenA?.symbol, + token_2: tokenB?.symbol, + }) + }} + /> + + + + ) + )} + {upToMedium && chart} + + {!upToMedium && {chart}} + + + {warnings && ( + + {warnings} + + )} + + + + + + + + + + )} diff --git a/src/pages/App.tsx b/src/pages/App.tsx index e49426b87c..06a7ec8e40 100644 --- a/src/pages/App.tsx +++ b/src/pages/App.tsx @@ -1,4 +1,3 @@ -import { datadogRum } from '@datadog/browser-rum' import { ChainId } from '@kyberswap/ks-sdk-core' import { Trans } from '@lingui/macro' import * as Sentry from '@sentry/react' @@ -25,7 +24,7 @@ import Snowfall from 'components/Snowflake/Snowfall' import Web3ReactManager from 'components/Web3ReactManager' import { ENV_LEVEL } from 'constants/env' import { APP_PATHS, BLACKLIST_WALLETS, CHAINS_SUPPORT_CROSS_CHAIN } from 'constants/index' -import { NETWORKS_INFO, SUPPORTED_NETWORKS } from 'constants/networks' +import { CLASSIC_NOT_SUPPORTED, ELASTIC_NOT_SUPPORTED, NETWORKS_INFO, SUPPORTED_NETWORKS } from 'constants/networks' import { ENV_TYPE } from 'constants/type' import { useActiveWeb3React } from 'hooks' import { useAutoLogin } from 'hooks/useLogin' @@ -39,10 +38,9 @@ import TruesightFooter from 'pages/TrueSightV2/components/TruesightFooter' import KyberAILandingPage from 'pages/TrueSightV2/pages/LandingPage' import { useHolidayMode } from 'state/user/hooks' import DarkModeQueryParamReader from 'theme/DarkModeQueryParamReader' -import { getLimitOrderContract, isAddressString, shortenAddress } from 'utils' +import { isAddressString, isSupportLimitOrder, shortenAddress } from 'utils' import ElasticLegacyNotice from './ElasticLegacy/ElasticLegacyNotice' -import Icons from './Icons' import VerifyAuth from './Verify/VerifyAuth' // test page for swap only through elastic @@ -77,12 +75,12 @@ const BuyCrypto = lazy(() => import('pages/BuyCrypto')) const Campaign = lazy(() => import('pages/Campaign')) const GrantProgramPage = lazy(() => import('pages/GrantProgram')) const NotificationCenter = lazy(() => import('pages/NotificationCenter')) +const Icons = lazy(() => import('./Icons')) const AppWrapper = styled.div` display: flex; flex-flow: column; align-items: flex-start; - overflow-x: hidden; ` const HeaderWrapper = styled.div` @@ -156,7 +154,7 @@ const RedirectWithNetworkSuffix = () => { const RoutesWithNetworkPrefix = () => { const { network } = useParams() - const { networkInfo } = useActiveWeb3React() + const { networkInfo, chainId } = useActiveWeb3React() const location = useLocation() useSyncNetworkParamWithStore() @@ -176,25 +174,36 @@ const RoutesWithNetworkPrefix = () => { return ( - } /> - } - /> - } - /> - - } - /> - } - /> - } /> + {!CLASSIC_NOT_SUPPORTED[chainId] && ( + <> + } + /> + } + /> + } + /> + + )} + + {!ELASTIC_NOT_SUPPORTED[chainId] && ( + <> + } + /> + } + /> + } /> + + )} } /> @@ -223,7 +232,6 @@ export default function App() { useEffect(() => { if (account) { Sentry.setUser({ id: account }) - datadogRum.setUser({ id: account }) } }, [account]) @@ -233,10 +241,6 @@ export default function App() { chainId: chainId, network: networkInfo.name, }) - datadogRum.setGlobalContext({ - chainId, - networkName: networkInfo.name, - }) } }, [chainId, networkInfo.name]) @@ -321,7 +325,7 @@ export default function App() { } /> )} - {getLimitOrderContract(chainId) && ( + {isSupportLimitOrder(chainId) && ( } /> )} diff --git a/src/pages/Bridge/BridgeTransferHistory/RouteCell.tsx b/src/pages/Bridge/BridgeTransferHistory/RouteCell.tsx index 192bccca34..17a4a61647 100644 --- a/src/pages/Bridge/BridgeTransferHistory/RouteCell.tsx +++ b/src/pages/Bridge/BridgeTransferHistory/RouteCell.tsx @@ -6,7 +6,6 @@ import { useTheme } from 'styled-components' import QuestionHelper from 'components/QuestionHelper' import { NETWORKS_INFO, SUPPORTED_NETWORKS } from 'constants/networks' import { useIsDarkMode } from 'state/user/hooks' -import { includes } from 'utils/array' type Props = { fromChainID: number @@ -17,7 +16,7 @@ const RouteCell: React.FC = ({ fromChainID, toChainID }) => { const theme = useTheme() const renderChainIcon = (chainId: number) => { - if (includes(SUPPORTED_NETWORKS, chainId)) { + if (SUPPORTED_NETWORKS.includes(chainId)) { const chainInfo = NETWORKS_INFO[chainId] const src = isDark && chainInfo.iconDark ? chainInfo.iconDark : chainInfo.icon return {chainInfo.name} diff --git a/src/pages/Bridge/BridgeTransferHistory/TransferHistoryTable/Mobile.tsx b/src/pages/Bridge/BridgeTransferHistory/TransferHistoryTable/Mobile.tsx index 1375d8a27b..fe404d0ad2 100644 --- a/src/pages/Bridge/BridgeTransferHistory/TransferHistoryTable/Mobile.tsx +++ b/src/pages/Bridge/BridgeTransferHistory/TransferHistoryTable/Mobile.tsx @@ -11,7 +11,6 @@ import ActionCell from 'pages/Bridge/BridgeTransferHistory/ActionCell' import StatusBadge from 'pages/Bridge/BridgeTransferHistory/StatusBadge' import TimeStatusCell from 'pages/Bridge/BridgeTransferHistory/TimeStatusCell' import TokenReceiveCell from 'pages/Bridge/BridgeTransferHistory/TokenReceiveCell' -import { includes } from 'utils/array' import { Props } from './index' @@ -59,7 +58,7 @@ const ChainWrapper = styled.div` color: ${({ theme }) => theme.subText}; ` const ChainDisplay: React.FC<{ chainId: number }> = ({ chainId }) => { - if (includes(SUPPORTED_NETWORKS, chainId)) { + if (SUPPORTED_NETWORKS.includes(chainId)) { const chainInfo = NETWORKS_INFO[chainId] return ( diff --git a/src/pages/Bridge/BridgeTransferHistory/index.tsx b/src/pages/Bridge/BridgeTransferHistory/index.tsx index dc89698b24..038e75ec15 100644 --- a/src/pages/Bridge/BridgeTransferHistory/index.tsx +++ b/src/pages/Bridge/BridgeTransferHistory/index.tsx @@ -1,9 +1,9 @@ import { rgba } from 'polished' -import { useEffect, useState } from 'react' import { Flex } from 'rebass' import styled from 'styled-components' import { useActiveWeb3React } from 'hooks' +import useShowLoadingAtLeastTime from 'hooks/useShowLoadingAtLeastTime' import NoData from 'pages/Bridge/BridgeTransferHistory/NoData' import Pagination from 'pages/Bridge/BridgeTransferHistory/Pagination' import TransferHistoryTable from 'pages/Bridge/BridgeTransferHistory/TransferHistoryTable' @@ -15,19 +15,9 @@ type Props = { } const TransferHistory: React.FC = ({ className }) => { const { account } = useActiveWeb3React() - const [shouldShowLoading, setShouldShowLoading] = useState(true) const response = useTransferHistory(account || '') const { isCompletelyEmpty, transfers } = response - - useEffect(() => { - // This is to ensure loading is displayed at least 0.5s - const existingTimeout = setTimeout(() => { - setShouldShowLoading(false) - }, 500) - return () => { - existingTimeout && clearTimeout(existingTimeout) - } - }, []) + const shouldShowLoading = useShowLoadingAtLeastTime() if (shouldShowLoading || isCompletelyEmpty) { return diff --git a/src/pages/Bridge/ComfirmBridgeModal.tsx b/src/pages/Bridge/ComfirmBridgeModal.tsx index 5d18de085c..a90da3df6b 100644 --- a/src/pages/Bridge/ComfirmBridgeModal.tsx +++ b/src/pages/Bridge/ComfirmBridgeModal.tsx @@ -361,7 +361,7 @@ export const ConfirmCrossChainModal = memo(function ConfirmCrossChainModal({ }} type="checkbox" checked={accepted} - style={{ height: '16px', width: '16px', cursor: 'pointer' }} + style={{ height: '16px', width: '16px', minWidth: '16px', minHeight: '16px', cursor: 'pointer' }} /> diff --git a/src/pages/Bridge/helpers.ts b/src/pages/Bridge/helpers.ts index 701aa5652d..d25b756b84 100644 --- a/src/pages/Bridge/helpers.ts +++ b/src/pages/Bridge/helpers.ts @@ -166,6 +166,7 @@ export const formatPoolValue = (amount: PoolBridgeValue) => { 123456789012.123456 => 123.457B 1234567890123.123456 => 1.23457T */ +// todo: deprecated, use formatDisplayNumber instead export const formatAmountBridge = (rawAmount: string) => { const amount = parseFloat(String(rawAmount) ?? '0') if (amount > 100_000_000) { diff --git a/src/pages/BuyCrypto/index.tsx b/src/pages/BuyCrypto/index.tsx index 07161f875c..31034126cd 100644 --- a/src/pages/BuyCrypto/index.tsx +++ b/src/pages/BuyCrypto/index.tsx @@ -1,9 +1,8 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { Trans } from '@lingui/macro' -import { rgba } from 'polished' import { stringify } from 'querystring' -import React, { useEffect, useRef, useState } from 'react' -import { ArrowDown, ChevronDown, Repeat, X } from 'react-feather' +import React, { useEffect, useRef } from 'react' +import { ArrowDown, ChevronDown, Repeat } from 'react-feather' import { Link, useNavigate } from 'react-router-dom' import { useMedia } from 'react-use' import { Flex, Image, Text } from 'rebass' @@ -27,18 +26,18 @@ import metamask from 'assets/wallets-connect/metamask.svg' import walletConnect from 'assets/wallets-connect/wallet-connect.svg' import { ButtonLight, ButtonPrimary } from 'components/Button' import CopyHelper from 'components/Copy' +import DownloadWalletModal from 'components/DownloadWalletModal' import Cart from 'components/Icons/Cart' import Deposit from 'components/Icons/Deposit' -import Modal from 'components/Modal' import { TRANSAK_API_KEY, TRANSAK_URL } from 'constants/env' import { APP_PATHS } from 'constants/index' -import { SUPPORTED_WALLETS } from 'constants/wallets' import { useActiveWeb3React } from 'hooks' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useParsedQueryString from 'hooks/useParsedQueryString' import useTheme from 'hooks/useTheme' import { KSStatistic } from 'pages/About/AboutKyberSwap' -import { useWalletModalToggle } from 'state/application/hooks' +import { ApplicationModal } from 'state/application/actions' +import { useToggleModal, useWalletModalToggle } from 'state/application/hooks' import { useDarkModeManager } from 'state/user/hooks' import { ButtonText, ExternalLink } from 'theme' @@ -136,23 +135,6 @@ const Address = styled.div` width: fit-content; ` -const DownloadWalletRow = styled.a` - display: flex; - gap: 8px; - border-radius: 999px; - padding: 12px 16px; - color: ${({ theme }) => theme.subText}; - font-size: 16px; - font-weight: 500; - background: ${({ theme }) => theme.buttonBlack}; - line-height: 24px; - text-decoration: none; - - :hover { - background: ${({ theme }) => rgba(theme.buttonBlack, 0.6)}; - } -` - const Step = ({ currentStep = 1, direction = 'vertical', @@ -190,6 +172,7 @@ function BuyCrypto() { const { account, chainId, networkInfo } = useActiveWeb3React() const toggleWalletModal = useWalletModalToggle() + const toggleDownloadWalletModal = useToggleModal(ApplicationModal.DOWNLOAD_WALLET) const step0Ref = useRef(null) const step1Ref = useRef(null) @@ -204,7 +187,6 @@ function BuyCrypto() { [ChainId.BSCMAINNET]: 'bsc', [ChainId.AVAXMAINNET]: 'avaxcchain', [ChainId.FANTOM]: 'fantom', - [ChainId.VELAS]: 'velasevm', [ChainId.SOLANA]: 'solana', [ChainId.ZKSYNC]: null, @@ -215,7 +197,6 @@ function BuyCrypto() { [ChainId.AVAXTESTNET]: null, [ChainId.BTTC]: null, [ChainId.AURORA]: null, - [ChainId.OASIS]: null, } const supportedCurrencies = [ 'AVAX', @@ -248,8 +229,6 @@ function BuyCrypto() { const [isDarkMode] = useDarkModeManager() const { mixpanelHandler } = useMixpanel() - const [showDownloadModal, setShowDownloadModal] = useState(false) - const handleStepClick = (value: number) => { switch (value) { case 1: @@ -288,36 +267,7 @@ function BuyCrypto() { return ( <> - setShowDownloadModal(false)} maxWidth="512px"> - - - - Download a Wallet - - - setShowDownloadModal(false)} style={{ lineHeight: 0 }}> - - - - - - {Object.values(SUPPORTED_WALLETS) - .filter(e => e.installLink) - .map(item => ( - - - {item.name} - - ))} - - - - + {!upToMedium && } @@ -437,7 +387,7 @@ function BuyCrypto() { padding="10px" onClick={() => { mixpanelHandler(MIXPANEL_TYPE.TRANSAK_DOWNLOAD_WALLET_CLICKED) - setShowDownloadModal(true) + toggleDownloadWalletModal() }} > diff --git a/src/pages/Campaign/CampaignItem.tsx b/src/pages/Campaign/CampaignItem.tsx index 12739ead1d..28edc4ab68 100644 --- a/src/pages/Campaign/CampaignItem.tsx +++ b/src/pages/Campaign/CampaignItem.tsx @@ -10,12 +10,13 @@ import { Flex, Text } from 'rebass' import styled, { CSSProperties, css } from 'styled-components' import { ReactComponent as GrantCampaignIcon } from 'assets/svg/grant_campaign.svg' +import { ReactComponent as StarMultiplierIcon } from 'assets/svg/star_multiplier.svg' import ProgressBar from 'components/ProgressBar' import { MouseoverTooltip } from 'components/Tooltip' import { DEFAULT_SIGNIFICANT, RESERVE_USD_DECIMALS } from 'constants/index' import { NETWORKS_INFO } from 'constants/networks' import useTheme from 'hooks/useTheme' -import { CampaignData, CampaignStatus, CampaignUserInfoStatus } from 'state/campaigns/actions' +import { CampaignData, CampaignStatus, CampaignUserInfoStatus, ConditionGroupsType } from 'state/campaigns/actions' import { useIsDarkMode } from 'state/user/hooks' import CampaignActions from './CampaignActions' @@ -148,6 +149,9 @@ function CampaignItem({ campaign, onSelectCampaign, isSelected, style }: Campaig (isPassedVolume && !tradingNumberRequired) || (isPassedNumberOfTrade && !tradingVolumeRequired) const { showProgressBarVolume, showProgressBarNumberTrade, isShowProgressBar } = getCampaignInfo(campaign, account) + const hasBonusMultiplier = !!campaign?.conditionGroups?.find( + item => item.type === ConditionGroupsType.POINT_MULTIPLIER && !!item.conditions?.length, + ) return ( ) : null} + {hasBonusMultiplier && ( + Point multiplier is in effect}> + + + )} {rCampaignStatus} diff --git a/src/pages/CrossChain/SwapForm/index.tsx b/src/pages/CrossChain/SwapForm/index.tsx index 7bc0ff3724..46d5049f0e 100644 --- a/src/pages/CrossChain/SwapForm/index.tsx +++ b/src/pages/CrossChain/SwapForm/index.tsx @@ -368,7 +368,7 @@ export default function SwapForm() { {!!priceImpact && } - {inputError?.state && ( + {inputError?.state && !inputError?.insufficientFund && ( )} @@ -383,7 +383,7 @@ export default function SwapForm() { route={route} minimal={false} showNoteGetRoute={priceImpactResult.isHigh || priceImpactResult.isVeryHigh || priceImpactResult.isInvalid} - disabledText={t`Swap`} + disabledText={(inputError?.insufficientFund ? inputError?.tip : '') || t`Swap`} showTooltipPriceImpact={false} /> ) : ( diff --git a/src/pages/CrossChain/TransfersHistory/History.tsx b/src/pages/CrossChain/TransfersHistory/History.tsx index e4e191adf8..ae7fae0bf1 100644 --- a/src/pages/CrossChain/TransfersHistory/History.tsx +++ b/src/pages/CrossChain/TransfersHistory/History.tsx @@ -1,10 +1,10 @@ import { t } from '@lingui/macro' import { rgba } from 'polished' -import { useEffect, useState } from 'react' import { Flex } from 'rebass' import styled from 'styled-components' import { useActiveWeb3React } from 'hooks' +import useShowLoadingAtLeastTime from 'hooks/useShowLoadingAtLeastTime' import NoData from 'pages/Bridge/BridgeTransferHistory/NoData' import Pagination from 'pages/Bridge/BridgeTransferHistory/Pagination' @@ -16,19 +16,9 @@ type Props = { } const TransferHistory: React.FC = ({ className }) => { const { account } = useActiveWeb3React() - const [shouldShowLoading, setShouldShowLoading] = useState(true) const response = useTransferHistory(account || '') const { isCompletelyEmpty, transfers } = response - - useEffect(() => { - // This is to ensure loading is displayed at least 0.5s - const existingTimeout = setTimeout(() => { - setShouldShowLoading(false) - }, 500) - return () => { - existingTimeout && clearTimeout(existingTimeout) - } - }, []) + const shouldShowLoading = useShowLoadingAtLeastTime() if (shouldShowLoading || isCompletelyEmpty) { return ( diff --git a/src/pages/CrossChain/TransfersHistory/HistoryTable/Mobile.tsx b/src/pages/CrossChain/TransfersHistory/HistoryTable/Mobile.tsx index 3fdaeacaa9..dc8a558427 100644 --- a/src/pages/CrossChain/TransfersHistory/HistoryTable/Mobile.tsx +++ b/src/pages/CrossChain/TransfersHistory/HistoryTable/Mobile.tsx @@ -16,7 +16,6 @@ import ActionButtons from 'pages/CrossChain/TransfersHistory/HistoryTable/Action import { DetailTransaction } from 'pages/CrossChain/TransfersHistory/HistoryTable/DetailTransaction' import { useGetTransactionStatus } from 'pages/CrossChain/TransfersHistory/HistoryTable/TransactionItem' import { CrossChainTransfer } from 'pages/CrossChain/useTransferHistory' -import { includes } from 'utils/array' import TokenReceiveCell from './TokenReceiveCell' import { Props } from './index' @@ -65,7 +64,7 @@ const ChainWrapper = styled.div` color: ${({ theme }) => theme.subText}; ` const ChainDisplay: React.FC<{ chainId: number }> = ({ chainId }) => { - if (includes(SUPPORTED_NETWORKS, chainId)) { + if (SUPPORTED_NETWORKS.includes(chainId)) { const chainInfo = NETWORKS_INFO[chainId] return ( diff --git a/src/pages/CrossChain/useGetRoute.ts b/src/pages/CrossChain/useGetRoute.ts index 93d8a3c8d5..c0306540f9 100644 --- a/src/pages/CrossChain/useGetRoute.ts +++ b/src/pages/CrossChain/useGetRoute.ts @@ -1,5 +1,5 @@ import { GetRoute, RouteResponse } from '@0xsquid/sdk' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { INPUT_DEBOUNCE_TIME } from 'constants/index' diff --git a/src/pages/CrossChain/useValidateInput.ts b/src/pages/CrossChain/useValidateInput.ts index c88fcd49c7..18981dad81 100644 --- a/src/pages/CrossChain/useValidateInput.ts +++ b/src/pages/CrossChain/useValidateInput.ts @@ -20,6 +20,7 @@ export const useIsTokensSupport = () => { ) } +type InputError = undefined | { state: 'warn' | 'error'; tip: string; desc?: ReactNode; insufficientFund?: boolean } export default function useValidateInput({ inputAmount, route, @@ -37,7 +38,7 @@ export default function useValidateInput({ const showErrorGas = !isEnoughEth && route const isTokenSupport = useIsTokensSupport() - const inputError: undefined | { state: 'warn' | 'error'; tip: string; desc?: ReactNode } = useMemo(() => { + const inputError: InputError = useMemo(() => { if (!listTokenOut.length && !listTokenIn.length && !loadingToken) { return { state: 'error', tip: t`Cannot get token info. Please try again later.` } } @@ -65,7 +66,8 @@ export default function useValidateInput({ desc: t`Please decrease the size of your transaction and try again.`, } - if (balance?.lessThan(parseAmount)) return { state: 'warn', tip: t`Insufficient ${currencyIn?.symbol} balance` } + if (balance?.lessThan(parseAmount)) + return { state: 'warn', tip: t`Insufficient ${currencyIn?.symbol} balance`, insufficientFund: true } if (showErrorGas && account) { return { diff --git a/src/pages/Farm/ElasticFarmCombination.tsx b/src/pages/Farm/ElasticFarmCombination.tsx index 695f687ff9..fdec9e1c5b 100644 --- a/src/pages/Farm/ElasticFarmCombination.tsx +++ b/src/pages/Farm/ElasticFarmCombination.tsx @@ -1,5 +1,5 @@ import { Trans } from '@lingui/macro' -import { FC, useEffect, useMemo, useState } from 'react' +import { FC, Fragment, useCallback, useEffect, useMemo, useState } from 'react' import { useSearchParams } from 'react-router-dom' import { useMedia } from 'react-use' import { Flex, Text } from 'rebass' @@ -70,6 +70,9 @@ export const ElasticFarmCombination: FC = () => { const upToExtraSmall = useMedia(`(max-width: ${MEDIA_WIDTHS.upToExtraSmall}px)`) + const showFarmV2 = useCallback(() => setShowFarmStepGuide('v2'), []) + const showFarmV1 = useCallback(() => setShowFarmStepGuide('v1'), []) + if (loading && noFarms) { return ( { overflow: upToExtraSmall ? undefined : 'hidden', }} > - setShowFarmStepGuide('v1')} /> + {!!filteredFarmsV1.length && !!filteredFarmsV2.length && } {Object.keys(farmByContract).map((contract, index) => ( - <> - setShowFarmStepGuide('v2')} farmAddress={contract} key={contract} /> + + {index !== Object.keys(farmByContract).length - 1 && } - + ))} diff --git a/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx b/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx index a1defa6ae8..760f00cc17 100644 --- a/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx +++ b/src/pages/Farm/ElasticFarmv2/components/FarmCard.tsx @@ -26,6 +26,7 @@ import { MouseoverTooltip } from 'components/Tooltip' import TransactionConfirmationModal, { TransactionErrorContent } from 'components/TransactionConfirmationModal' import { FeeTag } from 'components/YieldPools/ElasticFarmGroup/styleds' import { APRTooltipContent } from 'components/YieldPools/FarmingPoolAPRCell' +import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag' import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index' import { useActiveWeb3React } from 'hooks' import useTheme from 'hooks/useTheme' @@ -229,10 +230,12 @@ function FarmCard({ - - - FEE {farm?.pool?.fee ? (farm?.pool?.fee * 100) / ELASTIC_BASE_FEE_UNIT : 0.03}% - + + + FEE {farm?.pool?.fee ? (farm?.pool?.fee * 100) / ELASTIC_BASE_FEE_UNIT : 0.03}% + + + @@ -262,34 +265,9 @@ function FarmCard({ - - - - {farm.tvlToken0.toSignificant(6)} {farm.token0.symbol} - - - - - {farm.tvlToken1.toSignificant(6)} {farm.token1.symbol} - - - ) : ( - '' - ) - } - > - - {farm.tvl ? formatDollarAmount(farm.tvl) : '--'} - - - {!!farm.tvl && } - - + + {farm.tvl ? formatDollarAmount(farm.tvl) : '--'} + {isEnded || farm.isSettled ? ( isEnded ? ( @@ -319,7 +297,13 @@ function FarmCard({ { mixpanel.track('ElasticFarmV2 - Range Selected', mixpanelPayload) }} @@ -377,7 +361,7 @@ function FarmCard({ - + {(poolAPR + (range?.apr || 0)).toFixed(2)}% diff --git a/src/pages/Farm/ElasticFarmv2/components/ListView.tsx b/src/pages/Farm/ElasticFarmv2/components/ListView.tsx index e002f9263b..8335109fdb 100644 --- a/src/pages/Farm/ElasticFarmv2/components/ListView.tsx +++ b/src/pages/Farm/ElasticFarmv2/components/ListView.tsx @@ -23,6 +23,7 @@ import { MouseoverTooltip, MouseoverTooltipDesktopOnly } from 'components/Toolti import TransactionConfirmationModal, { TransactionErrorContent } from 'components/TransactionConfirmationModal' import { ButtonColorScheme, MinimalActionButton } from 'components/YieldPools/ElasticFarmGroup/buttons' import { FeeTag } from 'components/YieldPools/ElasticFarmGroup/styleds' +import { PartnerFarmTag } from 'components/YieldPools/PartnerFarmTag' import { ElasticFarmV2TableRow } from 'components/YieldPools/styleds' import { APP_PATHS, ELASTIC_BASE_FEE_UNIT } from 'constants/index' import { useActiveWeb3React } from 'hooks' @@ -191,6 +192,7 @@ export const ListView = ({ > + @@ -211,7 +213,7 @@ export const ListView = ({ alignItems="center" minWidth="fit-content" sx={{ gap: '2px' }} - color={range.isRemoved ? theme.warning : theme.subText} + color={range.isRemoved ? theme.disableText : theme.primary} fontSize={12} fontWeight="500" > @@ -222,7 +224,6 @@ export const ListView = ({ {convertTickToPrice(farm.token0, farm.token1, range.tickUpper, farm.pool.fee)} - {index !== farm.ranges.length - 1 && ( | diff --git a/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx b/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx index 9e0d5124b1..a12f8ea50b 100644 --- a/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx +++ b/src/pages/GrantProgram/SingleProgram/LeaderBoardSection/index.tsx @@ -7,6 +7,7 @@ import Loader from 'components/Loader' import useGetLeaderboardGrantProgram, { RankByParam } from 'hooks/campaigns/useGetLeaderboardGrantProgram' import useTheme from 'hooks/useTheme' import { ProjectRanking } from 'types/grantProgram' +import { formatDisplayNumber } from 'utils/numbers' import { HeaderText } from '../../styleds' import LeaderBoard from './LeaderBoard' @@ -25,18 +26,6 @@ const EmptyRankings: any[] = [] export const ITEMS_PER_PAGE = 5 -const formatTradingVolume = (num: number) => { - const notation = num > 100_000_000 ? 'compact' : 'standard' - const formatter = new Intl.NumberFormat('en-US', { - notation, - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 0, - }) - return formatter.format(num) -} - export type RankByConfig = { extracter: (p: ProjectRanking) => string // used to extract the value param: RankByParam // used as param in GET request @@ -53,7 +42,7 @@ const rankByConfigs: RankByConfig[] = [ }, { extracter: (p: ProjectRanking) => { - return formatTradingVolume(Number(p.totalVolume)) + return formatDisplayNumber(p.totalVolume, { style: 'currency', significantDigits: 10, fractionDigits: 0 }) }, param: 'total_volume', title: t`Trading Volume`, diff --git a/src/pages/GrantProgram/SingleProgram/Stats.tsx b/src/pages/GrantProgram/SingleProgram/Stats.tsx index 49b2772ca4..5a1d28b5d6 100644 --- a/src/pages/GrantProgram/SingleProgram/Stats.tsx +++ b/src/pages/GrantProgram/SingleProgram/Stats.tsx @@ -6,6 +6,7 @@ import { ReactComponent as CampaignParticipants } from 'assets/svg/campaign_part import { ReactComponent as CampaignTrades } from 'assets/svg/campaign_trades.svg' import { ReactComponent as CampaignVolume } from 'assets/svg/campaign_volume.svg' import Loader from 'components/Loader' +import { formatDisplayNumber } from 'utils/numbers' const StatsCardWrapper = styled.div` display: flex; @@ -77,18 +78,6 @@ type Props = { trades?: number } -const formatTradingVolume = (v: string) => { - const formatter = Intl.NumberFormat('en-US', { - notation: 'compact', - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 1, - }) - - return formatter.format(Number(v)) -} - const formatNumber = (v: number) => { const formatter = Intl.NumberFormat('en-US', { notation: 'compact', @@ -134,7 +123,9 @@ const Stats: React.FC = ({ participants, trades, volume }) => { } - value={volume ? formatTradingVolume(volume) : volume} + value={ + volume ? formatDisplayNumber(volume, { style: 'currency', fractionDigits: 2, significantDigits: 6 }) : volume + } title="Total Trading Volume" /> = ({ poolEarning, chainId }) => { const myLiquidityBalance = poolEarning.liquidityTokenBalanceIncludingStake !== '0' && poolEarning.pool.totalSupply !== '0' - ? formatDollarAmount( + ? formatDisplayNumber( (+poolEarning.liquidityTokenBalanceIncludingStake * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 6, + }, ) : '--' @@ -96,10 +99,13 @@ const Position: React.FC = ({ poolEarning, chainId }) => { ) const liquidityStaked = +poolEarning.liquidityTokenBalanceIncludingStake - +poolEarning.liquidityTokenBalance - const myStakedBalance = - liquidityStaked !== 0 - ? formatDollarAmount((liquidityStaked * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply) - : '--' + const myStakedBalance = formatDisplayNumber( + (liquidityStaked * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 6, + }, + ) const stakedShare = liquidityStaked / +poolEarning.pool.totalSupply @@ -149,19 +155,19 @@ const Position: React.FC = ({ poolEarning, chainId }) => {
{myLiquidityBalance}} - disabled={poolEarning.liquidityTokenBalance === '0'} + disabled={poolEarning.liquidityTokenBalanceIncludingStake === '0'} text={
- {formattedNum(pooledToken0)} {unwrappedToken(token0).symbol} + {formatDisplayNumber(pooledToken0, { significantDigits: 6 })} {unwrappedToken(token0).symbol} - {formattedNum(pooledToken1)} {unwrappedToken(token1).symbol} + {formatDisplayNumber(pooledToken1, { significantDigits: 6 })} {unwrappedToken(token1).symbol}
@@ -183,13 +189,13 @@ const Position: React.FC = ({ poolEarning, chainId }) => { - {formattedNum(stakedToken0)} {unwrappedToken(token0).symbol} + {formatDisplayNumber(stakedToken0, { significantDigits: 6 })} {unwrappedToken(token0).symbol} - {formattedNum(stakedToken1)} {unwrappedToken(token1).symbol} + {formatDisplayNumber(stakedToken1, { significantDigits: 6 })} {unwrappedToken(token1).symbol}
@@ -199,11 +205,17 @@ const Position: React.FC = ({ poolEarning, chainId }) => { } /> - + - + - + ) diff --git a/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx b/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx index f6050cec5c..3047e1709f 100644 --- a/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx +++ b/src/pages/MyEarnings/ClassicPools/SinglePool/index.tsx @@ -31,7 +31,7 @@ import { TokenAddressMap } from 'state/lists/reducer' import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { isAddress, shortenAddress } from 'utils' import { currencyId } from 'utils/currencyId' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import { getTokenSymbolWithHardcode } from 'utils/tokenInfo' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -125,9 +125,14 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => { visibleCurrency1?.symbol || poolEarning.pool.token1.symbol, ) const myLiquidityBalance = - poolEarning.liquidityTokenBalance !== '0' && poolEarning.pool.totalSupply !== '0' - ? formatDollarAmount( - (+poolEarning.liquidityTokenBalance * +poolEarning.pool.reserveUSD) / +poolEarning.pool.totalSupply, + poolEarning.liquidityTokenBalanceIncludingStake !== '0' && poolEarning.pool.totalSupply !== '0' + ? formatDisplayNumber( + (+poolEarning.liquidityTokenBalanceIncludingStake * +poolEarning.pool.reserveUSD) / + +poolEarning.pool.totalSupply, + { + style: 'currency', + significantDigits: 4, + }, ) : '--' @@ -198,8 +203,10 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => { = ({ poolEarning, chainId }) => { }} > - + + + {NETWORKS_INFO[chainId].name} + = ({ poolEarning, chainId }) => { - + = ({ poolEarning, chainId }) => { value={ - {(+poolEarning.pool.apr).toFixed(2)}% + {formatDisplayNumber((+poolEarning.pool.apr + +poolEarning.pool.farmApr) / 100, { + style: 'percent', + fractionDigits: 2, + })} = ({ poolEarning, chainId }) => { /> - + @@ -389,10 +429,28 @@ const SinglePool: React.FC = ({ poolEarning, chainId }) => { gap: '8px', }} > - - {visibleCurrency0Symbol} - {visibleCurrency1Symbol} + + + + {visibleCurrency0Symbol} - {visibleCurrency1Symbol} + + - AMP {+poolEarning.pool.amp / 10000} + + + AMP {+poolEarning.pool.amp / 10000} + {isFarmingPool && ( = ({ poolEarning, chainId }) => {
- {formatDollarAmount(ampLiquidity)} + + {formatDisplayNumber(ampLiquidity, { + style: 'currency', + significantDigits: 7, + })} + - {formatDollarAmount(+poolEarning.pool.reserveUSD)} + {formatDisplayNumber(poolEarning.pool.reserveUSD, { style: 'currency', significantDigits: 7 })}
- {(+poolEarning.pool.apr + +poolEarning.pool.farmApr).toFixed(2)}% + {formatDisplayNumber((+poolEarning.pool.apr + +poolEarning.pool.farmApr) / 100, { + style: 'percent', + fractionDigits: 2, + })} = ({ poolEarning, chainId }) => { - {formatDollarAmount(Number(poolEarning.pool.volumeUsd) - Number(poolEarning.pool.volumeUsdOneDayAgo))} + {formatDisplayNumber(Number(poolEarning.pool.volumeUsd) - Number(poolEarning.pool.volumeUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + + {formatDisplayNumber(Number(poolEarning.pool.feeUSD) - Number(poolEarning.pool.feesUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} - {formatDollarAmount(Number(poolEarning.pool.feeUSD) - Number(poolEarning.pool.feesUsdOneDayAgo))} {myLiquidityBalance} - {formatDollarAmount(poolEarningToday)} + {formatDisplayNumber(poolEarningToday, { style: 'currency', significantDigits: 4 })} (({ $columns }) => ({ @@ -36,10 +40,63 @@ type Props = { horizontalLayout?: boolean } +type Token = { + address: string + chainId: ChainId + logoUrl?: string + symbol: string + value: string + percent: number +} const EarningsBreakdownPanel: React.FC = ({ isLoading, data, className, horizontalLayout }) => { const theme = useTheme() const numberOfTokens = data?.breakdowns.length || 0 + const [tokens, setTokens] = useState<{ [chainId: string]: { [address: string]: WrappedTokenInfo } }>({}) + + const missingTokensByChainId = useMemo(() => { + return ( + data?.breakdowns + .filter(item => (item.address && item.chainId ? item.symbol === '' : false)) + .reduce( + (acc, cur) => { + if (!cur.chainId || !cur.address) return acc + if (acc[cur.chainId]) { + acc[cur.chainId].push(cur as Token) + } else acc[cur.chainId] = [cur as Token] + return acc + }, + {} as { + [key: string]: Array + }, + ) || {} + ) + }, [data]) + + useEffect(() => { + const getData = async () => { + const chainIds = Object.keys(missingTokensByChainId) + const res = await Promise.all( + chainIds.map(chain => { + const missingTokens = missingTokensByChainId[chain].map(item => item.address) + return fetchListTokenByAddresses(missingTokens, +chain) + }), + ) + + setTokens( + chainIds.reduce((acc, id, idx) => { + acc[id] = res[idx].reduce( + (ac, item: WrappedTokenInfo) => ({ ...ac, [item.address]: item }), + {} as { [tokenAddress: string]: WrappedTokenInfo }, + ) + + return acc + }, {} as { [chainId: string]: { [address: string]: WrappedTokenInfo } }), + ) + } + + getData() + }, [missingTokensByChainId]) return ( 5 ? 2 : 1}> @@ -73,8 +130,18 @@ const EarningsBreakdownPanel: React.FC = ({ isLoading, data, className, h ) : ( ({ + ...item, + logoUrl: + item.chainId && item.address && !item.logoUrl + ? tokens[item.chainId]?.[item.address]?.logoURI + : item.logoUrl, + symbol: + item.chainId && item.address && !item.symbol + ? tokens[item.chainId]?.[item.address]?.symbol || '' + : item.symbol, + }))} + totalValue={formatDisplayNumber(data.totalValue, { style: 'currency', significantDigits: 3 })} /> )} diff --git a/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx b/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx index 4870eea577..c05561cdc3 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePool/index.tsx @@ -29,7 +29,7 @@ import { Badge, DownIcon, MobileStat, MobileStatWrapper, Row, Wrapper } from 'pa import { ButtonIcon } from 'pages/Pools/styleds' import { useAppSelector } from 'state/hooks' import { isAddress, shortenAddress } from 'utils' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import { getTokenSymbolWithHardcode } from 'utils/tokenInfo' import { unwrappedToken } from 'utils/wrappedCurrency' @@ -271,7 +271,14 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p - + = ({ poolEarning, chainId, positionEarnings, p } > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} @@ -304,14 +311,29 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p /> + + - - @@ -409,7 +431,13 @@ const SinglePool: React.FC = ({ poolEarning, chainId, positionEarnings, p {share} - {formatDollarAmount(+poolEarning.totalValueLockedUsd)} + + {formatDisplayNumber(poolEarning.totalValueLockedUsd, { + style: 'currency', + significantDigits: 7, + fractionDigits: 4, + })} + = ({ poolEarning, chainId, positionEarnings, p } > - {(poolAPR + farmAPR).toFixed(2)}% + {formatDisplayNumber((poolAPR + farmAPR) / 100, { style: 'percent', fractionDigits: 2 })} - {formatDollarAmount(Number(poolEarning.volumeUsd) - Number(poolEarning.volumeUsdOneDayAgo))} - {formatDollarAmount(Number(poolEarning.feesUsd) - Number(poolEarning.feesUsdOneDayAgo))} - {formatDollarAmount(myLiquidityUsd)} - {formatDollarAmount(poolEarningToday)} + + {formatDisplayNumber(Number(poolEarning.volumeUsd) - Number(poolEarning.volumeUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + + {formatDisplayNumber(Number(poolEarning.feesUsd) - Number(poolEarning.feesUsdOneDayAgo), { + style: 'currency', + significantDigits: 4, + })} + + {formatDisplayNumber(myLiquidityUsd, { style: 'currency', significantDigits: 4 })} + {formatDisplayNumber(poolEarningToday, { style: 'currency', significantDigits: 4 })} feeValue1: CurrencyAmount feeUsd: number @@ -43,9 +45,11 @@ type Props = { } const FarmInterface = new Interface(PROMM_FARM_ABI) +const FarmV2Interface = new Interface(FarmV2ABI) const CollectFeesPanel: React.FC = ({ nftId, + fId, chainId, feeUsd, feeValue0, @@ -140,14 +144,19 @@ const CollectFeesPanel: React.FC = ({ const amount0Min = feeValue0.subtract(feeValue0.multiply(basisPointsToPercent(allowedSlippage))) const amount1Min = feeValue1.subtract(feeValue1.multiply(basisPointsToPercent(allowedSlippage))) try { - const encoded = FarmInterface.encodeFunctionData('claimFee', [ - [nftId], - amount0Min.quotient.toString(), - amount1Min.quotient.toString(), - poolAddress, - true, - deadline?.toString(), - ]) + const encoded = (fId ? FarmV2Interface : FarmInterface).encodeFunctionData( + 'claimFee', + fId + ? [fId, [nftId], amount0Min.quotient.toString(), amount1Min.quotient.toString(), deadline?.toString(), true] + : [ + [nftId], + amount0Min.quotient.toString(), + amount1Min.quotient.toString(), + poolAddress, + true, + deadline?.toString(), + ], + ) sendTransaction({ to: farmAddress, diff --git a/src/pages/MyEarnings/ElasticPools/SinglePosition/EarningView.tsx b/src/pages/MyEarnings/ElasticPools/SinglePosition/EarningView.tsx index 4287084d73..bd52dd9e73 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePosition/EarningView.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePosition/EarningView.tsx @@ -4,7 +4,6 @@ import { Flex, Text } from 'rebass' import styled from 'styled-components' import { useGetNativeTokenLogo } from 'components/CurrencyLogo' -import { formatUSDValue } from 'components/EarningAreaChart/utils' import Logo from 'components/Logo' import { MouseoverTooltip } from 'components/Tooltip' import CommonView, { CommonProps } from 'pages/MyEarnings/ElasticPools/SinglePosition/CommonView' @@ -14,7 +13,7 @@ import OriginalMyEarningsOverTimePanel from 'pages/MyEarnings/MyEarningsOverTime import { calculateEarningStatsTick } from 'pages/MyEarnings/utils' import { useAppSelector } from 'state/hooks' import { EarningStatsTick } from 'types/myEarnings' -import { formattedNum } from 'utils' +import { formatDisplayNumber } from 'utils/numbers' const MyEarningsOverTimePanel = styled(OriginalMyEarningsOverTimePanel)` padding: 0; @@ -29,7 +28,12 @@ const EarningView: React.FC = props => { // format pool value const ticks: EarningStatsTick[] | undefined = useMemo(() => { - return calculateEarningStatsTick({ data: positionEarning.historicalEarning, chainId, tokensByChainId, nativeLogo }) + return calculateEarningStatsTick({ + data: positionEarning.historicalEarning, + chainId, + tokensByChainId: tokensByChainId[chainId], + nativeLogo, + }) }, [chainId, positionEarning.historicalEarning, tokensByChainId, nativeLogo]) const earningToday = ticks?.[0] @@ -57,7 +61,9 @@ const EarningView: React.FC = props => { {earningToday ? formatUSDValue(earningToday.totalValue, false) : '--'}} + anchor={ + {formatDisplayNumber(earningToday?.totalValue, { style: 'currency', significantDigits: 6 })} + } text={ <> {earningToday?.tokens.map((token, index) => ( @@ -69,8 +75,8 @@ const EarningView: React.FC = props => { }} > - - {formattedNum(token.amount, false)} {token.symbol} + + {formatDisplayNumber(token.amount, { significantDigits: 6 })} {token.symbol} ))} @@ -90,8 +96,8 @@ const EarningView: React.FC = props => { - {myPoolAPR ? myPoolAPR.toFixed(2) + '%' : '--'} - {myFarmAPR ? myFarmAPR.toFixed(2) + '%' : '--'} + {formatDisplayNumber(myPoolAPR / 100, { style: 'percent', fractionDigits: 2 })} + {formatDisplayNumber(myFarmAPR / 100, { style: 'percent', fractionDigits: 2 })} diff --git a/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx b/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx index 87d0b21586..77daf9abe8 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePosition/PositionView.tsx @@ -15,6 +15,7 @@ import Divider from 'components/Divider' import FormattedCurrencyAmount from 'components/FormattedCurrencyAmount' import { MouseoverTooltip } from 'components/Tooltip' import PROMM_FARM_ABI from 'constants/abis/v2/farm.json' +import FarmV2ABI from 'constants/abis/v2/farmv2.json' import { VERSION } from 'constants/v2' import { useActiveWeb3React, useWeb3React } from 'hooks' import { useAllTokens } from 'hooks/Tokens' @@ -34,11 +35,12 @@ import { useTransactionAdder } from 'state/transactions/hooks' import { TRANSACTION_TYPE } from 'state/transactions/type' import { updateChainId } from 'state/user/actions' import { calculateGasMargin } from 'utils' -import { formatDollarAmount } from 'utils/numbers' +import { formatDisplayNumber } from 'utils/numbers' import ActionButtons from './ActionButtons' const FarmInterface = new Interface(PROMM_FARM_ABI) +const FarmV2Interface = new Interface(FarmV2ABI) const PositionView: React.FC = props => { const { positionEarning, position, pendingFee, tokenPrices: prices, chainId, currency0, currency1 } = props @@ -65,9 +67,14 @@ const PositionView: React.FC = props => { parseFloat(position.amount0.toExact() || '0') * prices[currency0.wrapped.address || ''] + parseFloat(position.amount1.toExact() || '0') * prices[currency1.wrapped.address || ''] + const stakedLiqFarmv2 = positionEarning.farmV2DepositedPositions?.[0]?.liquidity || '0' + const weight = positionEarning.farmV2DepositedPositions?.[0]?.range?.weight || '1' + const stakedPosition = new Position({ pool: position.pool, - liquidity: positionEarning.joinedPositions?.[0]?.liquidity || '0', + liquidity: + positionEarning.joinedPositions?.[0]?.liquidity || + BigNumber.from(stakedLiqFarmv2).div(BigNumber.from(weight)).toString(), tickLower: position.tickLower, tickUpper: position.tickUpper, }) @@ -114,35 +121,61 @@ const PositionView: React.FC = props => { const theme = useTheme() const tokens = useAllTokens(true, chainId) - const farmRewards = positionEarning.joinedPositions?.[0]?.farmingPool?.rewardTokensIds?.map((rwId, index) => { - const token = tokens[rwId] || new Token(chainId, rwId, 18, '', '') + let farmRewards = + positionEarning.joinedPositions?.[0]?.farmingPool?.rewardTokensIds?.map((rwId, index) => { + const token = tokens[rwId] || new Token(chainId, rwId, 18, '', '') - return CurrencyAmount.fromRawAmount(token, positionEarning.joinedPositions?.[0]?.pendingRewards?.[index] || '0') - }) + return CurrencyAmount.fromRawAmount(token, positionEarning.joinedPositions?.[0]?.pendingRewards?.[index] || '0') + }) || [] + + const farmV2Rewards = + positionEarning.farmV2DepositedPositions?.[0].pendingRewards.map((amount, index) => { + const tokenId = positionEarning.farmV2DepositedPositions?.[0].farmV2.rewards[index].tokenID || '' + const token = tokens[tokenId] || new Token(chainId, tokenId, 18, '', '') + + return CurrencyAmount.fromRawAmount(token, amount) + }) || [] + + farmRewards = farmRewards.concat(farmV2Rewards) + + const disabledHarvest = + !positionEarning.joinedPositions?.[0]?.pendingRewards?.some(item => item !== '0') && + !positionEarning.farmV2DepositedPositions?.[0].pendingRewards?.some(item => item !== '0') const addTransactionWithType = useTransactionAdder() const handleHarvest = () => { - const farmContract = positionEarning.joinedPositions?.[0]?.farmId + const farmContract = + positionEarning.joinedPositions?.[0]?.farmId || + positionEarning.farmV2DepositedPositions?.[0].farmV2.id.split('_')[0] + const isInFarmV2 = !!positionEarning.farmV2DepositedPositions?.[0] const pId = positionEarning.joinedPositions?.[0]?.pid + const fId = positionEarning?.farmV2DepositedPositions?.[0].farmV2.id.split('_')[1] + const library = libraryRef.current dispatch(setShowPendingModal(MODAL_PENDING_TEXTS.HARVEST)) dispatch(setAttemptingTxn(true)) - if (!library || !pId || !farmContract) { + if (!library || (isInFarmV2 ? !fId : !pId) || !farmContract) { dispatch(setAttemptingTxn(false)) dispatch(setTxError('Something went wrong!')) return } - const encodedPid = defaultAbiCoder.encode(['tupple(uint256[] pIds)'], [{ pIds: [pId] }]) - const encodedData = FarmInterface.encodeFunctionData('harvestMultiplePools', [[positionEarning.id], [encodedPid]]) + let encodedData = '' + if (isInFarmV2) { + encodedData = FarmV2Interface.encodeFunctionData('claimReward', [fId, [positionEarning.id]]) + } else { + const encodedPid = defaultAbiCoder.encode(['tupple(uint256[] pIds)'], [{ pIds: [pId] }]) + encodedData = FarmInterface.encodeFunctionData('harvestMultiplePools', [[positionEarning.id], [encodedPid]]) + } const txn = { to: farmContract, data: encodedData, } + library .getSigner() .estimateGas(txn) @@ -199,7 +232,7 @@ const PositionView: React.FC = props => { {formatDollarAmount(liquidityInUsd)}} + anchor={{formatDisplayNumber(liquidityInUsd, { style: 'currency', significantDigits: 6 })}} disabled={!liquidityInUsd || Number.isNaN(liquidityInUsd)} text={
@@ -221,7 +254,9 @@ const PositionView: React.FC = props => { {myStakedBalance ? ( {formatDollarAmount(myStakedBalance)}} + anchor={ + {formatDisplayNumber(myStakedBalance, { style: 'currency', significantDigits: 6 })} + } text={
@@ -251,12 +286,17 @@ const PositionView: React.FC = props => { = props => { - + Farm Rewards - {+positionEarning.pendingRewardUSD ? formatDollarAmount(+positionEarning.pendingRewardUSD) : '--'} + {+positionEarning.pendingRewardUSD + ? formatDisplayNumber(positionEarning.pendingRewardUSD, { style: 'currency', significantDigits: 6 }) + : '--'} } disabled={!+positionEarning.pendingRewardUSD} @@ -299,7 +341,7 @@ const PositionView: React.FC = props => { item !== '0')} + disabled={disabledHarvest} style={{ height: '36px', width: 'fit-content', diff --git a/src/pages/MyEarnings/ElasticPools/SinglePosition/PriceRangeChart.tsx b/src/pages/MyEarnings/ElasticPools/SinglePosition/PriceRangeChart.tsx index 0edaf23c05..b4c334da86 100644 --- a/src/pages/MyEarnings/ElasticPools/SinglePosition/PriceRangeChart.tsx +++ b/src/pages/MyEarnings/ElasticPools/SinglePosition/PriceRangeChart.tsx @@ -75,6 +75,11 @@ const PriceRangeChart: React.FC = ({ position, disabled }) => { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', + ':hover': { + overflow: 'visible', + whiteSpace: 'normal', + height: 'auto', + }, }} > Current Price: diff --git a/src/pages/MyEarnings/HoverDropdown.tsx b/src/pages/MyEarnings/HoverDropdown.tsx index 86d6353014..ff5b003ae5 100644 --- a/src/pages/MyEarnings/HoverDropdown.tsx +++ b/src/pages/MyEarnings/HoverDropdown.tsx @@ -26,7 +26,7 @@ type Props = { } const HoverDropdown: React.FC = ({ anchor, text, disabled = false }) => { return ( - + {anchor} {!disabled && } diff --git a/src/pages/MyEarnings/MultipleChainSelect/PopoverBody.tsx b/src/pages/MyEarnings/MultipleChainSelect/PopoverBody.tsx index 288ce73c20..e431396389 100644 --- a/src/pages/MyEarnings/MultipleChainSelect/PopoverBody.tsx +++ b/src/pages/MyEarnings/MultipleChainSelect/PopoverBody.tsx @@ -17,6 +17,7 @@ import { SUPPORTED_NETWORKS_FOR_MY_EARNINGS, } from 'constants/networks' import { VERSION } from 'constants/v2' +import useChainsConfig from 'hooks/useChainsConfig' import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' import { AppState } from 'state' @@ -107,6 +108,7 @@ const PopoverBody: React.FC = ({ onClose }) => { const isLegacy = useAppSelector(state => state.myEarnings.activeTab === VERSION.ELASTIC_LEGACY) const isClassic = useAppSelector(state => state.myEarnings.activeTab === VERSION.CLASSIC) + const { activeChains } = useChainsConfig() const comingSoonList = isLegacy ? COMING_SOON_NETWORKS_FOR_MY_EARNINGS_LEGACY @@ -121,7 +123,9 @@ const PopoverBody: React.FC = ({ onClose }) => { const [localSelectedChains, setLocalSelectedChains] = useState(() => selectedChains) - const networkList = SUPPORTED_NETWORKS_FOR_MY_EARNINGS.filter(item => !comingSoonList.includes(item)) + const networkList = SUPPORTED_NETWORKS_FOR_MY_EARNINGS.filter( + item => !comingSoonList.includes(item) && activeChains.some(e => e.chainId === item), + ) const isAllSelected = localSelectedChains.length === networkList.length const handleChangeChains = (chains: ChainId[]) => { diff --git a/src/pages/MyEarnings/PoolEarningsSection.tsx b/src/pages/MyEarnings/PoolEarningsSection.tsx index 7d936728ed..c2f1d3d60e 100644 --- a/src/pages/MyEarnings/PoolEarningsSection.tsx +++ b/src/pages/MyEarnings/PoolEarningsSection.tsx @@ -16,6 +16,7 @@ import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { MEDIA_WIDTHS } from 'theme' import { EarningStatsTick, EarningsBreakdown } from 'types/myEarnings' import { isAddressString } from 'utils' +import { toFixed } from 'utils/numbers' import OriginalEarningsBreakdownPanel from './EarningsBreakdownPanel' import OriginalMyEarningsOverTimePanel from './MyEarningsOverTimePanel' @@ -150,19 +151,19 @@ const PoolEarningsSection: React.FC = ({ historicalEarning, chainId }) => ? latestData.map(data => ({ logoUrl: data.logoUrl, symbol: data.symbol, - value: String(data.amountUSD), + value: toFixed(data.amountUSD), percent: isAllZero ? (1 / visibleItems) * 100 : (data.amountUSD / totalValue) * 100, })) : [ ...latestData.slice(0, 9).map(data => ({ logoUrl: data.logoUrl, symbol: data.symbol, - value: String(data.amountUSD), + value: toFixed(data.amountUSD), percent: isAllZero ? 10 : (data.amountUSD / totalValue) * 100, })), { symbol: t`Others`, - value: String(totalValueOfOthers), + value: toFixed(totalValueOfOthers), percent: isAllZero ? 10 : (totalValueOfOthers / totalValue) * 100, }, ] @@ -175,8 +176,13 @@ const PoolEarningsSection: React.FC = ({ historicalEarning, chainId }) => // format pool value const ticks: EarningStatsTick[] | undefined = useMemo(() => { - return calculateEarningStatsTick({ data: historicalEarning, chainId, tokensByChainId, nativeLogo }) - }, [chainId, historicalEarning, tokensByChainId, nativeLogo]) + return calculateEarningStatsTick({ + data: historicalEarning, + chainId, + tokensByChainId: { ...tokensByChainId[chainId], ...tokens }, + nativeLogo, + }) + }, [chainId, historicalEarning, tokensByChainId, nativeLogo, tokens]) if (upToExtraSmall) { return ( diff --git a/src/pages/MyEarnings/ShareModal.tsx b/src/pages/MyEarnings/ShareModal.tsx index bbd2b02b1c..426565de64 100644 --- a/src/pages/MyEarnings/ShareModal.tsx +++ b/src/pages/MyEarnings/ShareModal.tsx @@ -27,18 +27,7 @@ import useShareImage from 'hooks/useShareImage' import useTheme from 'hooks/useTheme' import { ButtonText, MEDIA_WIDTHS } from 'theme' import { downloadImage } from 'utils' - -const formatValue = (num: number, isSharePc: boolean) => { - const notation = (num > 1_000_000 && !isSharePc) || (num > 100_000_000 && isSharePc) ? 'compact' : 'standard' - const formatter = new Intl.NumberFormat('en-US', { - notation, - style: 'currency', - currency: 'USD', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - return formatter.format(num) -} +import { formatDisplayNumber } from 'utils/numbers' const ButtonWrapper = styled.div` text-align: center; @@ -292,7 +281,7 @@ export default function ShareModal({ isOpen, setIsOpen, title, value, poolInfo } {renderPool()} - {formatValue(value, isSharePc)} + {formatDisplayNumber(value, { style: 'currency', fractionDigits: 2 })} diff --git a/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx b/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx index 5aeb85ed0b..764c1cee8d 100644 --- a/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx +++ b/src/pages/MyEarnings/TotalEarningsAndChainSelect.tsx @@ -11,7 +11,6 @@ import earningApi, { import styled, { keyframes } from 'styled-components' import { ReactComponent as RefreshIcon } from 'assets/svg/refresh.svg' -import { formatUSDValue } from 'components/EarningAreaChart/utils' import { MouseoverTooltip } from 'components/Tooltip' import { EMPTY_FUNCTION } from 'constants/index' import { @@ -23,18 +22,7 @@ import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' import ShareTotalEarningsButton from 'pages/MyEarnings/ShareTotalEarningsButton' import { useAppSelector } from 'state/hooks' - -// TODO: move to common -const formatPercent = (value: number) => { - const formatter = Intl.NumberFormat('en-US', { - notation: 'standard', - style: 'percent', - minimumFractionDigits: 0, - maximumFractionDigits: 2, - }) - - return formatter.format(value) -} +import { formatDisplayNumber } from 'utils/numbers' const Value = styled.span` max-width: 100%; @@ -148,11 +136,15 @@ const TotalEarningsAndChainSelect: React.FC = ({ totalEarningToday, total return -- } - const totalValue = formatUSDValue(totalEarningToday) - + const totalValue = formatDisplayNumber(totalEarningToday, { style: 'currency', significantDigits: 6 }) const diffPercent = totalEarningYesterday && !Number.isNaN(totalEarningYesterday) - ? formatPercent(totalEarningToday / totalEarningYesterday - 1) + ? formatDisplayNumber(totalEarningToday / totalEarningYesterday - 1, { + style: 'percent', + fractionDigits: 2, + significantDigits: 6, + allowNegative: true, + }) : '' return ( diff --git a/src/pages/MyEarnings/styled.tsx b/src/pages/MyEarnings/styled.tsx index 2aba73d535..c85e29ecf4 100644 --- a/src/pages/MyEarnings/styled.tsx +++ b/src/pages/MyEarnings/styled.tsx @@ -44,6 +44,7 @@ export const Row = styled.div` padding: 12px; font-size: 14px; font-weight: 500; + gap: 8px; display: grid; grid-template-columns: 3fr repeat(7, 1fr); diff --git a/src/pages/MyEarnings/utils.ts b/src/pages/MyEarnings/utils.ts index 37eb4abc8e..4ff4819e13 100644 --- a/src/pages/MyEarnings/utils.ts +++ b/src/pages/MyEarnings/utils.ts @@ -10,9 +10,11 @@ import { TokenEarning, } from 'services/earning/types' -import { NETWORKS_INFO, SUPPORTED_NETWORKS_FOR_MY_EARNINGS } from 'constants/networks' +import { ZERO_ADDRESS } from 'constants/index' +import { MAINNET_NETWORKS, NETWORKS_INFO } from 'constants/networks' import { NativeCurrencies } from 'constants/tokens' import { TokenAddressMap } from 'state/lists/reducer' +import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo' import { EarningStatsTick, EarningsBreakdown } from 'types/myEarnings' import { isAddress } from 'utils' @@ -114,7 +116,7 @@ const fillHistoricalEarningsForTicks = (ticks: EarningStatsTick[] | undefined): return results } -export const chainIdByRoute: Record = SUPPORTED_NETWORKS_FOR_MY_EARNINGS.map(chainId => ({ +export const chainIdByRoute: Record = MAINNET_NETWORKS.map(chainId => ({ route: NETWORKS_INFO[chainId].aggregatorRoute, chainId, })).reduce((acc, { route, chainId }) => { @@ -134,7 +136,7 @@ export const calculateEarningStatsTick = ({ }: { data: HistoricalEarning['historicalEarning'] chainId: ChainId - tokensByChainId: TokenAddressMap + tokensByChainId: { [tokenAddress: string]: WrappedTokenInfo } nativeLogo: string }): EarningStatsTick[] | undefined => { if (!data?.length) { @@ -153,18 +155,22 @@ export const calculateEarningStatsTick = ({ farmRewardsValue: farmRewardsValueUSD, totalValue: poolRewardsValueUSD + farmRewardsValueUSD, tokens: (singlePointData.total || []) - .filter(tokenEarning => { + .map(tokenEarning => { const tokenAddress = isAddress(chainId, tokenEarning.token) - if (!tokenAddress) { - return false + const currency = + tokenEarning.token === ZERO_ADDRESS ? NativeCurrencies[chainId] : tokensByChainId[String(tokenAddress)] + + if (!currency) { + return { + logoUrl: '', + amount: Number(tokenEarning.amountFloat), + amountUSD: Number(tokenEarning.amountUSD), + symbol: '', + chainId, + address: String(tokenAddress), + } } - const currency = tokensByChainId[chainId][tokenAddress] - return !!currency - }) - .map(tokenEarning => { - const tokenAddress = isAddress(chainId, tokenEarning.token) - const currency = tokensByChainId[chainId][String(tokenAddress)] const isNative = currency.isNative || tokenAddress === WETH[chainId].address const symbol = (isNative ? NativeCurrencies[chainId].symbol : currency.symbol) || 'NO SYMBOL' const logoUrl = (isNative ? nativeLogo : currency.logoURI) || '' @@ -204,13 +210,13 @@ export const calculateEarningStatsTick = ({ return ticks } -const mergeTokenEarnings = (earnings: Array): Array => { +const mergeTokenEarnings = (earnings: Array, chainId: ChainId): Array => { const earningByTokenId: Record = {} earnings.forEach(earning => { - const tokenId = earning.token + const tokenId = earning.token === ZERO_ADDRESS ? WETH[chainId].address.toLowerCase() : earning.token if (!earningByTokenId[tokenId]) { - earningByTokenId[tokenId] = cloneDeep(earning) + earningByTokenId[tokenId] = cloneDeep({ ...earning, token: tokenId }) } else { earningByTokenId[tokenId].amountFloat = String( Number(earningByTokenId[tokenId].amountFloat) + Number(earning.amountFloat), @@ -224,7 +230,10 @@ const mergeTokenEarnings = (earnings: Array): Array return Object.values(earningByTokenId) } -const mergeHistoricalEarningsByDay = (historicalData: HistoricalSingleData[]): HistoricalSingleData[] => { +const mergeHistoricalEarningsByDay = ( + historicalData: HistoricalSingleData[], + chainId: ChainId, +): HistoricalSingleData[] => { const dataByDay: Record = {} historicalData.forEach(singlePointData => { @@ -232,8 +241,11 @@ const mergeHistoricalEarningsByDay = (historicalData: HistoricalSingleData[]): H if (!dataByDay[day]) { dataByDay[day] = cloneDeep(singlePointData) } else { - const fees = mergeTokenEarnings([...(dataByDay[day].fees || []), ...(singlePointData.fees || [])]) - const rewards = mergeTokenEarnings([...(dataByDay[day].rewards || []), ...(singlePointData.rewards || [])]) + const fees = mergeTokenEarnings([...(dataByDay[day].fees || []), ...(singlePointData.fees || [])], chainId) + const rewards = mergeTokenEarnings( + [...(dataByDay[day].rewards || []), ...(singlePointData.rewards || [])], + chainId, + ) dataByDay[day].fees = fees dataByDay[day].rewards = rewards @@ -245,7 +257,10 @@ const mergeHistoricalEarningsByDay = (historicalData: HistoricalSingleData[]): H .sort((d1, d2) => d2 - d1) return days.map(day => { - dataByDay[day].total = mergeTokenEarnings([...(dataByDay[day].fees || []), ...(dataByDay[day].rewards || [])]) + dataByDay[day].total = mergeTokenEarnings( + [...(dataByDay[day].fees || []), ...(dataByDay[day].rewards || [])], + chainId, + ) return dataByDay[day] }) } @@ -315,15 +330,16 @@ export const aggregatePositionEarnings = < const chains = Object.keys(draft) chains.forEach(chain => { + const chainId = chainIdByRoute[chain] const { positions } = draft[chain] positions.forEach(position => { const earnings = position.historicalEarning || [] earnings.forEach(earning => { - const fees = mergeTokenEarnings(earning.fees || []) - const rewards = mergeTokenEarnings(earning.rewards || []) - const total = mergeTokenEarnings([...fees, ...rewards]) + const fees = mergeTokenEarnings(earning.fees || [], chainId) + const rewards = mergeTokenEarnings(earning.rewards || [], chainId) + const total = mergeTokenEarnings([...fees, ...rewards], chainId) earning.fees = fees earning.rewards = rewards earning.total = total @@ -346,6 +362,7 @@ export const aggregatePoolEarnings = ( const chains = Object.keys(draft) chains.forEach(chain => { + const chainId = chainIdByRoute[chain] const { positions } = draft[chain] // historical earning data only const byPool: Record = {} @@ -366,7 +383,7 @@ export const aggregatePoolEarnings = ( const poolIds = Object.keys(byPool) const pools = poolIds.map(poolId => { const historicalEarning = fillHistoricalEarningsForEmptyDays( - mergeHistoricalEarningsByDay(byPool[poolId].historicalEarning), + mergeHistoricalEarningsByDay(byPool[poolId].historicalEarning, chainId), ) byPool[poolId].historicalEarning = historicalEarning @@ -401,6 +418,7 @@ export const aggregateAccountEarnings = < chains.forEach(chain => { const { positions } = draft[chain] + const chainId = chainIdByRoute[chain] const byDay: Record = {} positions.forEach(position => { @@ -426,9 +444,9 @@ export const aggregateAccountEarnings = < Object.keys(byDay).forEach(day => { const earning = byDay[day] - const fees = mergeTokenEarnings(earning.fees || []) - const rewards = mergeTokenEarnings(earning.rewards || []) - const total = mergeTokenEarnings([...fees, ...rewards]) + const fees = mergeTokenEarnings(earning.fees || [], chainId) + const rewards = mergeTokenEarnings(earning.rewards || [], chainId) + const total = mergeTokenEarnings([...fees, ...rewards], chainId) earning.fees = fees earning.rewards = rewards earning.total = total @@ -525,18 +543,20 @@ export const calculateTicksOfAccountEarningsInMultipleChains = ( farmRewardsValue: farmRewardsValueUSD, totalValue: poolRewardsValueUSD + farmRewardsValueUSD, tokens: (singleDataPoint.total || []) - .filter(tokenEarning => { - const tokenAddress = isAddress(chainId, tokenEarning.token) - if (!tokenAddress) { - return false - } - - const currency = tokensByChainId[chainId][tokenAddress] - return !!currency - }) .map(tokenEarning => { const tokenAddress = isAddress(chainId, tokenEarning.token) const currency = tokensByChainId[chainId][String(tokenAddress)] + if (!currency) { + return { + logoUrl: '', + amount: Number(tokenEarning.amountFloat), + amountUSD: Number(tokenEarning.amountUSD), + symbol: '', + chainId, + address: String(tokenAddress), + } + } + const isNative = currency.isNative || tokenAddress === WETH[chainId].address const symbol = (isNative ? NativeCurrencies[chainId].symbol : currency.symbol) || 'NO SYMBOL' const logoUrl = (isNative ? NETWORKS_INFO[chainId].nativeToken.logo : currency.logoURI) || '' @@ -602,6 +622,7 @@ export const calculateEarningBreakdowns = ( const breakdowns: EarningsBreakdown['breakdowns'] = tokens.length <= 10 ? tokens.map(data => ({ + address: data.address, chainId: data.chainId, logoUrl: data.logoUrl, symbol: data.symbol, @@ -610,6 +631,7 @@ export const calculateEarningBreakdowns = ( })) : [ ...tokens.slice(0, 9).map(data => ({ + address: data.address, chainId: data.chainId, logoUrl: data.logoUrl, symbol: data.symbol, diff --git a/src/pages/Pools/index.tsx b/src/pages/Pools/index.tsx index 579f84aaf4..5d41df8e1c 100644 --- a/src/pages/Pools/index.tsx +++ b/src/pages/Pools/index.tsx @@ -33,6 +33,7 @@ import { Instruction } from 'pages/Pools/InstructionAndGlobalData' import ProAmmPoolList from 'pages/ProAmmPools' import { ApplicationModal } from 'state/application/actions' import { useOpenModal } from 'state/application/hooks' +import ElasticFarmV2Updater from 'state/farms/elasticv2/updater' import { Field } from 'state/pair/actions' import { MEDIA_WIDTHS } from 'theme' import { currencyId } from 'utils/currencyId' @@ -370,6 +371,7 @@ const Pools = () => { )} + ) } diff --git a/src/pages/ProAmmPools/ListItem.tsx b/src/pages/ProAmmPools/ListItem.tsx index 0c8b990b02..cd65570d58 100644 --- a/src/pages/ProAmmPools/ListItem.tsx +++ b/src/pages/ProAmmPools/ListItem.tsx @@ -128,7 +128,7 @@ export default function ProAmmPoolListItem({ pool, onShared, userPositions }: Li .find(farm => farm.poolAddress.toLowerCase() === pool.address.toLowerCase()) const isFarmV2 = !!farmV2 - const isFarmingPool = isFarmV1 || isFarmV2 + const isFarmingPool = isFarmV1 || isFarmV2 || !!pool.farmAPR const maxFarmV2Apr = Math.max(...(farmV2?.ranges.map(item => item.apr || 0) || []), 0) @@ -145,14 +145,7 @@ export default function ProAmmPoolListItem({ pool, onShared, userPositions }: Li ) } - return ( - - {pool.apr.toFixed(2)}% - - ) + return {pool.apr.toFixed(2)}% } return ( @@ -190,7 +183,7 @@ export default function ProAmmPoolListItem({ pool, onShared, userPositions }: Li Fee {(pool.feeTier * 100) / ELASTIC_BASE_FEE_UNIT}% - {isFarmingPool && } + {isFarmingPool && } diff --git a/src/pages/ProAmmPools/index.tsx b/src/pages/ProAmmPools/index.tsx index 0284ba8d9c..236af8b042 100644 --- a/src/pages/ProAmmPools/index.tsx +++ b/src/pages/ProAmmPools/index.tsx @@ -19,7 +19,6 @@ import { ApplicationModal } from 'state/application/actions' import { useModalOpen, useOpenModal } from 'state/application/hooks' import { FarmUpdater, useElasticFarms } from 'state/farms/elastic/hooks' import { useElasticFarmsV2 } from 'state/farms/elasticv2/hooks' -import ElasticFarmV2Updater from 'state/farms/elasticv2/updater' import { Field } from 'state/mint/proamm/type' import { useTopPoolAddresses, useUserProMMPositions } from 'state/prommPools/hooks' import useGetElasticPools from 'state/prommPools/useGetElasticPools' @@ -472,7 +471,6 @@ export default function ProAmmPoolList({ title={sharedPoolId ? t`Share this pool with your friends!` : t`Share this list of pools with your friends`} /> - ) } diff --git a/src/pages/RemoveLiquidity/TokenPair.tsx b/src/pages/RemoveLiquidity/TokenPair.tsx index a1cf53837a..9e0b968a48 100644 --- a/src/pages/RemoveLiquidity/TokenPair.tsx +++ b/src/pages/RemoveLiquidity/TokenPair.tsx @@ -582,7 +582,7 @@ export default function TokenPair({ ) : ( , - amountOut as CurrencyAmount, - ) + !priceToSwap.equalTo(0) && + !noZapDependentAmount.equalTo(0) && + computePriceImpact(priceToSwap, noZapDependentAmount, amountOut as CurrencyAmount) const priceImpactWithoutFee = pair && priceImpact ? computePriceImpactWithoutFee([pair], priceImpact) : undefined diff --git a/src/pages/SwapV2/index.tsx b/src/pages/SwapV2/index.tsx index 2d5596b157..953b827e33 100644 --- a/src/pages/SwapV2/index.tsx +++ b/src/pages/SwapV2/index.tsx @@ -416,6 +416,7 @@ export default function Swap() { const tradeRouteComposition = useMemo(() => { return getTradeComposition(chainId, trade?.inputAmount, trade?.tokens, trade?.swaps, defaultTokens) }, [chainId, defaultTokens, trade]) + const swapActionsRef = useRef(null) return ( <> @@ -429,7 +430,7 @@ export default function Swap() { -
+
{activeTab === TAB.SWAP && ( @@ -735,6 +736,7 @@ export default function Swap() { {activeTab === TAB.INFO && } {activeTab === TAB.SETTINGS && ( setActiveTab(TAB.LIQUIDITY_SOURCES)} diff --git a/src/pages/SwapV3/Header.tsx b/src/pages/SwapV3/Header.tsx index 209f1aa908..6cf5e23fe8 100644 --- a/src/pages/SwapV3/Header.tsx +++ b/src/pages/SwapV3/Header.tsx @@ -1,6 +1,6 @@ import { Trans, t } from '@lingui/macro' import { rgba } from 'polished' -import { Dispatch, SetStateAction, useState } from 'react' +import { Dispatch, RefObject, SetStateAction, useState } from 'react' import { useLocation } from 'react-router-dom' import { Text } from 'rebass' import styled from 'styled-components' @@ -24,9 +24,11 @@ const DegenBanner = styled(RowBetween)` export default function Header({ activeTab, setActiveTab, + swapActionsRef, }: { activeTab: TAB setActiveTab: Dispatch> + swapActionsRef: RefObject }) { const theme = useTheme() const [isDegenMode] = useDegenModeManager() @@ -41,7 +43,7 @@ export default function Header({ - + diff --git a/src/pages/SwapV3/HeaderRightMenu.tsx b/src/pages/SwapV3/HeaderRightMenu.tsx index f3b9919690..f1f7fef228 100644 --- a/src/pages/SwapV3/HeaderRightMenu.tsx +++ b/src/pages/SwapV3/HeaderRightMenu.tsx @@ -1,5 +1,5 @@ import { Trans, t } from '@lingui/macro' -import { Dispatch, SetStateAction, useState } from 'react' +import { Dispatch, RefObject, SetStateAction, useState } from 'react' import { isMobile } from 'react-device-detect' import { MoreHorizontal } from 'react-feather' import { useLocation } from 'react-router-dom' @@ -61,9 +61,11 @@ const TransactionSettingsIconWrapper = styled.span` export default function HeaderRightMenu({ activeTab, setActiveTab, + swapActionsRef, }: { activeTab: TAB setActiveTab: Dispatch> + swapActionsRef: RefObject }) { const theme = useTheme() @@ -96,7 +98,12 @@ export default function HeaderRightMenu({ const isShowMenu = Boolean(isShowHeaderMenu || forceShowMenu) return ( - + {isShowMenu && ( <> diff --git a/src/pages/SwapV3/Tabs/LimitTab.tsx b/src/pages/SwapV3/Tabs/LimitTab.tsx index 85e35dafe7..f2b1c1b2b5 100644 --- a/src/pages/SwapV3/Tabs/LimitTab.tsx +++ b/src/pages/SwapV3/Tabs/LimitTab.tsx @@ -1,16 +1,14 @@ import { Trans } from '@lingui/macro' import { rgba } from 'polished' -import { useEffect, useState } from 'react' import { useLocation } from 'react-router-dom' -import { useMountedState } from 'react-use' import { Text } from 'rebass' +import { useGetNumberOfInsufficientFundOrdersQuery } from 'services/limitOrder' import styled from 'styled-components' import { MouseoverTooltip } from 'components/Tooltip' -import { getNumberOfInsufficientFundOrders } from 'components/swapv2/LimitOrder/request' import { APP_PATHS } from 'constants/index' import { useActiveWeb3React } from 'hooks' -import { getLimitOrderContract } from 'utils' +import { isSupportLimitOrder } from 'utils' import { Tab } from './index' @@ -31,40 +29,18 @@ type Props = { export default function LimitTab({ onClick }: Props) { const { chainId, account } = useActiveWeb3React() const { pathname } = useLocation() - const [numberOfInsufficientFundOrders, setNumberOfInsufficientFundOrders] = useState(0) const isLimitPage = pathname.startsWith(APP_PATHS.LIMIT) - const isSupportLimitOrder = getLimitOrderContract(chainId) + const isSupport = isSupportLimitOrder(chainId) - const getMountedState = useMountedState() - - useEffect(() => { - if (!isSupportLimitOrder || !account) { - return - } - - const run = async () => { - try { - const num = await getNumberOfInsufficientFundOrders({ - chainId, - maker: account || '', - }) - - getMountedState() && setNumberOfInsufficientFundOrders(num) - } catch (e) { - console.error(e) - } - } - - run() - const interval = setInterval(run, 10_000) - - return () => { - clearInterval(interval) - } - }, [account, chainId, isSupportLimitOrder, getMountedState]) + const skip = !account || !isSupport + const { data } = useGetNumberOfInsufficientFundOrdersQuery( + { chainId, maker: account || '' }, + { skip, pollingInterval: 10_000 }, + ) + const numberOfInsufficientFundOrders = skip ? undefined : data - if (!isSupportLimitOrder) { + if (!isSupport) { return null } diff --git a/src/pages/SwapV3/Tabs/index.tsx b/src/pages/SwapV3/Tabs/index.tsx index 02fc97ef01..dd114da309 100644 --- a/src/pages/SwapV3/Tabs/index.tsx +++ b/src/pages/SwapV3/Tabs/index.tsx @@ -10,7 +10,7 @@ import { useActiveWeb3React } from 'hooks' import useParsedQueryString from 'hooks/useParsedQueryString' import { TAB } from 'pages/SwapV3' import LimitTab from 'pages/SwapV3/Tabs/LimitTab' -import { getLimitOrderContract } from 'utils' +import { isSupportLimitOrder } from 'utils' const TabContainer = styled.div` display: flex; @@ -102,7 +102,7 @@ export default function Tabs({ activeTab }: Props) { Swap - {getLimitOrderContract(chainId) && onClickTab(TAB.LIMIT)} />} + {isSupportLimitOrder(chainId) && onClickTab(TAB.LIMIT)} />} {CHAINS_SUPPORT_CROSS_CHAIN.includes(chainId) && ( onClickTab(TAB.CROSS_CHAIN)} isActive={isCrossChainPage}> diff --git a/src/pages/SwapV3/index.tsx b/src/pages/SwapV3/index.tsx index 6d6e456332..030d4b8600 100644 --- a/src/pages/SwapV3/index.tsx +++ b/src/pages/SwapV3/index.tsx @@ -205,6 +205,7 @@ export default function Swap() { const tradeRouteComposition = useMemo(() => { return getTradeComposition(chainId, routeSummary?.parsedAmountIn, undefined, routeSummary?.route, defaultTokens) }, [chainId, defaultTokens, routeSummary]) + const swapActionsRef = useRef(null) return ( <> @@ -218,7 +219,7 @@ export default function Swap() { -
+
{(isLimitPage || isSwapPage) && !TYPE_AND_SWAP_NOT_SUPPORTED_CHAINS.includes(chainId) && ( setActiveTab(TAB.LIQUIDITY_SOURCES)} onClickGasPriceTracker={() => setActiveTab(TAB.GAS_PRICE_TRACKER)} + swapActionsRef={swapActionsRef} /> )} {activeTab === TAB.GAS_PRICE_TRACKER && ( diff --git a/src/pages/SwapV3/redirects.tsx b/src/pages/SwapV3/redirects.tsx index 5bf3940a14..6ea82086e8 100644 --- a/src/pages/SwapV3/redirects.tsx +++ b/src/pages/SwapV3/redirects.tsx @@ -2,7 +2,7 @@ import { Navigate, useLocation } from 'react-router-dom' import { APP_PATHS } from 'constants/index' import { useActiveWeb3React } from 'hooks' -import { getLimitOrderContract } from 'utils' +import { isSupportLimitOrder } from 'utils' // Redirects to swap-v3 but only replace the pathname export function RedirectPathToSwapV3Network() { @@ -12,7 +12,7 @@ export function RedirectPathToSwapV3Network() { let redirectTo = '' - if (pathname.startsWith(APP_PATHS.LIMIT) && getLimitOrderContract(chainId)) { + if (pathname.startsWith(APP_PATHS.LIMIT) && isSupportLimitOrder(chainId)) { redirectTo = APP_PATHS.LIMIT } else { redirectTo = APP_PATHS.SWAP diff --git a/src/pages/TrueSightV2/components/LoadingTextAnimation.tsx b/src/pages/TrueSightV2/components/LoadingTextAnimation.tsx index 23da04deed..55f77ed36e 100644 --- a/src/pages/TrueSightV2/components/LoadingTextAnimation.tsx +++ b/src/pages/TrueSightV2/components/LoadingTextAnimation.tsx @@ -1,5 +1,8 @@ +import { useMedia } from 'react-use' import styled, { keyframes } from 'styled-components' +import { MEDIA_WIDTHS } from 'theme' + const bounce = keyframes` 15%, 35%, @@ -24,7 +27,6 @@ const Wrapper = styled.div` color: ${({ theme }) => theme.text}; animation: ${bounce} 3s infinite ease; min-width: 10px; - display: flex; justify-content: center; margin-bottom: 10px; } @@ -120,16 +122,34 @@ const Wrapper = styled.div` animation-delay: 1.55s; } ${({ theme }) => theme.mediaWidth.upToSmall` - font-size: 12px; + font-size: 14px; `} ` export default function LoadingTextAnimation() { + const isMobile = useMedia(`(max-width: ${MEDIA_WIDTHS.upToSmall}px)`) return ( - - {'Crafting your screenshot...'.split('').map((w, index) => ( - {w} - ))} - + <> + {isMobile ? ( + +
+ {'Crafting your'.split('').map((w, index) => ( + {w} + ))} +
+
+ {'screenshot...'.split('').map((w, index) => ( + {w} + ))} +
+ + ) : ( + + {'Crafting your screenshot...'.split('').map((w, index) => ( + {w} + ))} + + )} + ) } diff --git a/src/pages/TrueSightV2/components/MultipleChainDropdown.tsx b/src/pages/TrueSightV2/components/MultipleChainDropdown.tsx index 4f42cc20c0..fac2caac39 100644 --- a/src/pages/TrueSightV2/components/MultipleChainDropdown.tsx +++ b/src/pages/TrueSightV2/components/MultipleChainDropdown.tsx @@ -84,7 +84,7 @@ const MultipleChainDropdown = React.forwardRef( if (isMobile) { return ( - + e.stopPropagation()}> Select Chain @@ -169,6 +169,7 @@ const MultipleChainDropdown = React.forwardRef( color={theme.text} style={{ left: menuLeft !== undefined ? `${menuLeft}px` : undefined }} ref={ref} + onClick={e => e.stopPropagation()} > {tokens?.map((item: { address: string; logo: string; chain: string }) => { if (item.chain === 'ethereum') diff --git a/src/pages/TrueSightV2/components/SimpleTooltip.tsx b/src/pages/TrueSightV2/components/SimpleTooltip.tsx index 6661071d94..4c550df076 100644 --- a/src/pages/TrueSightV2/components/SimpleTooltip.tsx +++ b/src/pages/TrueSightV2/components/SimpleTooltip.tsx @@ -128,6 +128,8 @@ export default function SimpleTooltip({ } }, [show, x, y]) + const isShow = (show || (!!x && !!y)) && !(hideOnMobile && isMobile) + const { top, left, alphaLeft } = useMemo(() => { const clientRect = ref.current?.getBoundingClientRect() if (!bodyRect || !clientRect || !height || !width) return {} @@ -139,7 +141,9 @@ export default function SimpleTooltip({ } return { top, left, alphaLeft } - }, [height, width, x, y, bodyRect]) + + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [height, width, x, y, bodyRect, isShow]) useEffect(() => { if (x !== undefined && y !== undefined) { @@ -158,15 +162,12 @@ export default function SimpleTooltip({ window.addEventListener('resize', handleResize) window.addEventListener('scroll', handleResize) - return () => { window.removeEventListener('resize', handleResize) window.removeEventListener('scroll', handleResize) } }, []) - const isShow = (show || (!!x && !!y)) && !(hideOnMobile && isMobile) - const tooltipContent = useMemo(() => { if (!text) return null return ReactDOM.createPortal( @@ -187,6 +188,7 @@ export default function SimpleTooltip({ document.body, ) }, [alphaLeft, className, disappearOnHover, handleMouseLeave, left, maxWidthProp, text, top, widthProp]) + if (disabled) { return <>{children} } diff --git a/src/pages/TrueSightV2/components/TimeFrameLegend.tsx b/src/pages/TrueSightV2/components/TimeFrameLegend.tsx index 118d528579..f1b9df1bc0 100644 --- a/src/pages/TrueSightV2/components/TimeFrameLegend.tsx +++ b/src/pages/TrueSightV2/components/TimeFrameLegend.tsx @@ -31,6 +31,7 @@ const Element = styled.div<{ active?: boolean; count?: number }>` display: flex; justify-content: center; text-transform: uppercase; + font-style: normal; ${({ active, theme }) => active && `color: ${theme.text};`} :hover { filter: brightness(1.2); diff --git a/src/pages/TrueSightV2/components/TokenChartSVG.tsx b/src/pages/TrueSightV2/components/TokenChartSVG.tsx index f74ed51388..7f5d93b880 100644 --- a/src/pages/TrueSightV2/components/TokenChartSVG.tsx +++ b/src/pages/TrueSightV2/components/TokenChartSVG.tsx @@ -10,7 +10,7 @@ import { formatTokenPrice } from '../utils' import SimpleTooltip from './SimpleTooltip' const transformValue = (value: number, [from0, from1]: number[], [to0, to1]: number[]) => { - return ((value - from0) / (from1 - from0)) * (to1 - to0) + return ((value - from0) / (from1 - from0 || 1)) * (to1 - to0) } const PathHandleHover = ({ diff --git a/src/pages/TrueSightV2/components/chart/index.tsx b/src/pages/TrueSightV2/components/chart/index.tsx index f3a17e3cb4..16fa66b24a 100644 --- a/src/pages/TrueSightV2/components/chart/index.tsx +++ b/src/pages/TrueSightV2/components/chart/index.tsx @@ -3,6 +3,7 @@ import dayjs from 'dayjs' import { rgba } from 'polished' import React, { ReactNode, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react' import { isMobile } from 'react-device-detect' +import { Info } from 'react-feather' import { useParams } from 'react-router-dom' import { useMedia } from 'react-use' import { Text } from 'rebass' @@ -78,6 +79,7 @@ const CHART_GREEN_COLOR = '#246250' const LABEL_GAP_BY_TIMEFRAME: { [timeframe: string]: number } = { [KyberAITimeframe.ONE_DAY]: isMobile ? 4 : 2, + [KyberAITimeframe.THREE_DAY]: isMobile ? 12 : 6, [KyberAITimeframe.ONE_WEEK]: isMobile ? 2 : 1, [KyberAITimeframe.ONE_MONTH]: isMobile ? 4 : 2, [KyberAITimeframe.THREE_MONTHS]: isMobile ? 8 : 4, @@ -265,23 +267,26 @@ const LoadingHandleWrapper = ({ children: ReactNode }) => { return ( - + <> {!hasData ? ( <> {isLoading ? ( ) : ( - - We couldn't find any information for this token - + + + + We couldn't find any information for this token + + )} ) : ( <>{children} )} - + ) } @@ -385,33 +390,7 @@ export const NumberofTradesChart = ({ noAnimation }: { noAnimation?: boolean }) const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - - - Timeframe - - {totalStats.timeframe} - - - - Total Trades - - {totalStats.totalTrades} - - - - Total Buys - - {totalStats.totalBuys} - - - - Total Sells - - {totalStats.totalSells} - - - + {above768 && ( <> @@ -450,156 +429,187 @@ export const NumberofTradesChart = ({ noAnimation }: { noAnimation?: boolean }) ]} /> - - - - - - - - - - - - dayjs(value * 1000).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD') + 0}> + + + Timeframe + + {totalStats.timeframe} + + + + Total Trades + + {totalStats.totalTrades} + + + + Total Buys + + {totalStats.totalBuys} + + + + Total Sells + + {totalStats.totalSells} + + + + + + - `${formatShortNum(value)}`} - domain={dataRange} - /> - `${formatShortNum(value)}`} - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && - dayjs(payload.timestamp * 1000).format( - timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD, YYYY', - )} - - - Total Trades: {formatShortNum(payload.totalTrade, 2)} - - - Buys: {formatShortNum(payload.buy, 2)} - - - Sells: {formatShortNum(-payload.sell, 2)} - - - ) - }} - /> - {showSell && ( - + - )} - {showBuy && ( - + + + + + + + + dayjs(value * 1000).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD') + } + minTickGap={12} /> - )} - {showTotalTrade && ( - `${formatShortNum(value)}`} + domain={dataRange} + /> + , + fontSize={textFontSize} + tickLine={false} + axisLine={false} + tick={{ fill: theme.subText, fontWeight: 400 }} + width={20} + orientation="right" + tickFormatter={value => `${formatShortNum(value)}`} + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && + dayjs(payload.timestamp * 1000).format( + timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD, YYYY', + )} + + + Total Trades: {formatShortNum(payload.totalTrade, 2)} + + + Buys: {formatShortNum(payload.buy, 2)} + + + Sells: {formatShortNum(-payload.sell, 2)} + + + ) }} - isAnimationActive={false} /> - )} - - - {!above768 && ( - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showBuy' } })} - /> - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showSell' } })} - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showTotalTrade' } }) - } - /> - - )} - + {showSell && ( + + )} + {showBuy && ( + + )} + {showTotalTrade && ( + , + }} + isAnimationActive={false} + /> + )} + + + {!above768 && ( + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showBuy' } })} + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showSell' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showTotalTrade' } }) + } + /> + + )} + + ) } @@ -698,33 +708,7 @@ export const TradingVolumeChart = ({ noAnimation }: { noAnimation?: boolean }) = const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - - - Timeframe - - {totalStats.timeframe} - - - - Total Volume - - {totalStats.totalVolume} - - - - Total Buys - - {totalStats.totalBuys} - - - - Total Sells - - {totalStats.totalSells} - - - + {above768 && ( <> @@ -763,161 +747,192 @@ export const TradingVolumeChart = ({ noAnimation }: { noAnimation?: boolean }) = ]} /> - - - - - - - - - - - - dayjs(value * 1000).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD') + 0}> + + + Timeframe + + {totalStats.timeframe} + + + + Total Volume + + {totalStats.totalVolume} + + + + Total Buys + + {totalStats.totalBuys} + + + + Total Sells + + {totalStats.totalSells} + + + + + + - (value > 0 ? `$${formatShortNum(value)}` : `-$${formatShortNum(-value)}`)} - domain={dataRange} - /> - `$${formatShortNum(value)}`} - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && - dayjs(payload.timestamp * 1000).format( - timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm A, MMM DD' : 'MMM DD, YYYY', - )} - - - Total Volume: ${formatShortNum(payload.totalVolume, 2)} - - - Buys: ${formatShortNum(payload.buyVolume, 2)} - - - Sells: ${formatShortNum(-payload.sellVolume, 2)} - - - ) - }} - /> - {showSell && ( - + - )} - {showBuy && ( - + + + + + + + + dayjs(value * 1000).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD') + } + minTickGap={12} /> - )} - {showTotalVolume && ( - (value > 0 ? `$${formatShortNum(value)}` : `-$${formatShortNum(-value)}`)} + domain={dataRange} + /> + , + fontSize={textFontSize} + tickLine={false} + axisLine={false} + tick={{ fill: theme.subText, fontWeight: 400 }} + width={40} + orientation="right" + tickFormatter={value => `$${formatShortNum(value)}`} + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && + dayjs(payload.timestamp * 1000).format( + timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm A, MMM DD' : 'MMM DD, YYYY', + )} + + + Total Volume: ${formatShortNum(payload.totalVolume, 2)} + + + Buys: ${formatShortNum(payload.buyVolume, 2)} + + + Sells: ${formatShortNum(-payload.sellVolume, 2)} + + + ) }} /> - )} - - - {!above768 && ( - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showBuy' } })} - /> - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showSell' } })} - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showTotalVolume' } }) - } - /> - - )} - + {showSell && ( + + )} + {showBuy && ( + + )} + {showTotalVolume && ( + , + }} + /> + )} + + + {!above768 && ( + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showBuy' } })} + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showSell' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showTotalVolume' } }) + } + /> + + )} + + ) } @@ -925,12 +940,12 @@ export const NetflowToWhaleWallets = ({ tab, noAnimation }: { tab?: ChartTab; no const theme = useTheme() const { chain, address } = useParams() const { state, dispatch } = useChartStatesContext(KYBERAI_CHART_ID.NETFLOW_TO_WHALE_WALLET, { - timeframe: KyberAITimeframe.ONE_MONTH, + timeframe: KyberAITimeframe.ONE_WEEK, showOptions: ['showInflow', 'showOutflow', 'showNetflow'], noData: true, }) - const timeframe = state?.timeframe || KyberAITimeframe.ONE_MONTH + const timeframe = state?.timeframe || KyberAITimeframe.ONE_WEEK const showInflow = state?.showOptions?.includes('showInflow') const showOutflow = state?.showOptions?.includes('showOutflow') const showNetflow = state?.showOptions?.includes('showNetflow') @@ -940,6 +955,7 @@ export const NetflowToWhaleWallets = ({ tab, noAnimation }: { tab?: ChartTab; no const timerange = { [KyberAITimeframe.ONE_DAY]: 3600, + [KyberAITimeframe.THREE_DAY]: 3600, [KyberAITimeframe.ONE_WEEK]: 86400, [KyberAITimeframe.ONE_MONTH]: 86400, [KyberAITimeframe.THREE_MONTHS]: 86400, @@ -948,6 +964,7 @@ export const NetflowToWhaleWallets = ({ tab, noAnimation }: { tab?: ChartTab; no now - ({ [KyberAITimeframe.ONE_DAY]: 86400, + [KyberAITimeframe.THREE_DAY]: 259200, [KyberAITimeframe.ONE_WEEK]: 604800, [KyberAITimeframe.ONE_MONTH]: 2592000, [KyberAITimeframe.THREE_MONTHS]: 7776000, @@ -1099,258 +1116,266 @@ export const NetflowToWhaleWallets = ({ tab, noAnimation }: { tab?: ChartTab; no const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - {account ? ( - <> - - - Timeframe - - {totalStats.timeframe} - - - - Total Netflow - - {totalStats.totalNetflow} - - - - Total Inflow - - {totalStats.totalInflow} - - - - Total Outflow - - {totalStats.totalOutflow} - - - - - {above768 && ( - <> - {tab !== ChartTab.Third && ( - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) - } - /> - )} - {tab !== ChartTab.Second && ( - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) - } - /> - )} - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) - } - /> - - )} - - dispatch({ type: CHART_STATES_ACTION_TYPE.TIMEFRAME_CHANGE, payload: { timeframe } }) - } - timeframes={[ - KyberAITimeframe.ONE_DAY, - KyberAITimeframe.ONE_WEEK, - KyberAITimeframe.ONE_MONTH, - KyberAITimeframe.THREE_MONTHS, - ]} - /> - - - - - - - dayjs(value).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD') + + + {above768 && ( + <> + {tab !== ChartTab.Third && ( + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) } - minTickGap={12} - /> - `$${formatShortNum(value)}`} - domain={dataRange} - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && - dayjs(payload.timestamp).format( - timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm ,MMM DD' : 'MMM DD, YYYY', - )} - - - Netflow: ${formatShortNum(payload.netflow)} - - - - - Wallet - - - General Whales - - - Token Whales - - - - - Inflow - - - ${formatShortNum(payload.generalInflow)} - - - ${formatShortNum(payload.tokenInflow)} - - - - - Outflow - - - ${formatShortNum(payload.generalOutflow)} - - - ${formatShortNum(payload.tokenOutflow)} - - - - - ) - }} /> - - - - - - - - - + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) + } /> - - {showNetflow && ( - , + )} + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) + } + /> + + )} + dispatch({ type: CHART_STATES_ACTION_TYPE.TIMEFRAME_CHANGE, payload: { timeframe } })} + timeframes={[ + KyberAITimeframe.ONE_DAY, + KyberAITimeframe.THREE_DAY, + KyberAITimeframe.ONE_WEEK, + KyberAITimeframe.ONE_MONTH, + KyberAITimeframe.THREE_MONTHS, + ]} + /> + + 0}> + {account ? ( + <> + + + Timeframe + + {totalStats.timeframe} + + + + Total Netflow + + {totalStats.totalNetflow} + + + + Total Inflow + + {totalStats.totalInflow} + + + + Total Outflow + + {totalStats.totalOutflow} + + + + + + + + + + dayjs(value).format( + timeframe === KyberAITimeframe.ONE_DAY + ? 'HH:mm' + : KyberAITimeframe.THREE_DAY + ? 'HH:mm MMM DD' + : 'MMM DD', + ) + } + minTickGap={12} + /> + `$${formatShortNum(value)}`} + domain={dataRange} + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && + dayjs(payload.timestamp).format( + timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm ,MMM DD' : 'MMM DD, YYYY', + )} + + + Netflow: ${formatShortNum(payload.netflow)} + + + + + Wallet + + + General Whales + + + Token Whales + + + + + Inflow + + + ${formatShortNum(payload.generalInflow)} + + + ${formatShortNum(payload.tokenInflow)} + + + + + Outflow + + + ${formatShortNum(payload.generalOutflow)} + + + ${formatShortNum(payload.tokenOutflow)} + + + + + ) }} /> - )} - - - - ) : ( - <> - )} - {!above768 && ( - - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) - } - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) - } - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) - } - /> - - )} - + + + + + + + + + + + {showNetflow && ( + , + }} + /> + )} + + + + ) : ( + <> + )} + {!above768 && ( + + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) + } + /> + + )} + + ) } @@ -1358,12 +1383,12 @@ export const NetflowToCentralizedExchanges = ({ tab, noAnimation }: { tab?: Char const theme = useTheme() const { chain, address } = useParams() const { state, dispatch } = useChartStatesContext(KYBERAI_CHART_ID.NETFLOW_TO_CEX, { - timeframe: KyberAITimeframe.ONE_MONTH, + timeframe: KyberAITimeframe.ONE_WEEK, showOptions: ['showInflow', 'showOutflow', 'showNetflow'], noData: true, }) - const timeframe = state?.timeframe || KyberAITimeframe.ONE_MONTH + const timeframe = state?.timeframe || KyberAITimeframe.ONE_WEEK const showInflow = state?.showOptions?.includes('showInflow') const showOutflow = state?.showOptions?.includes('showOutflow') const showNetflow = state?.showOptions?.includes('showNetflow') @@ -1373,6 +1398,7 @@ export const NetflowToCentralizedExchanges = ({ tab, noAnimation }: { tab?: Char const timerange = { [KyberAITimeframe.ONE_DAY]: 3600, + [KyberAITimeframe.THREE_DAY]: 3600, [KyberAITimeframe.ONE_WEEK]: 86400, [KyberAITimeframe.ONE_MONTH]: 86400, [KyberAITimeframe.THREE_MONTHS]: 86400, @@ -1381,6 +1407,7 @@ export const NetflowToCentralizedExchanges = ({ tab, noAnimation }: { tab?: Char now - ({ [KyberAITimeframe.ONE_DAY]: 86400, + [KyberAITimeframe.THREE_DAY]: 259200, [KyberAITimeframe.ONE_WEEK]: 604800, [KyberAITimeframe.ONE_MONTH]: 2592000, [KyberAITimeframe.THREE_MONTHS]: 7776000, @@ -1498,33 +1525,7 @@ export const NetflowToCentralizedExchanges = ({ tab, noAnimation }: { tab?: Char const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - - - Timeframe - - {totalStats.timeframe} - - - - Total Netflow - - {totalStats.totalNetflow} - - - - Total Inflow - - {totalStats.totalInflow} - - - - Total Outflow - - {totalStats.totalOutflow} - - - + {above768 && ( <> @@ -1564,171 +1565,209 @@ export const NetflowToCentralizedExchanges = ({ tab, noAnimation }: { tab?: Char onSelect={timeframe => dispatch({ type: CHART_STATES_ACTION_TYPE.TIMEFRAME_CHANGE, payload: { timeframe } })} timeframes={[ KyberAITimeframe.ONE_DAY, + KyberAITimeframe.THREE_DAY, KyberAITimeframe.ONE_WEEK, KyberAITimeframe.ONE_MONTH, KyberAITimeframe.THREE_MONTHS, ]} /> - - - - - dayjs(value).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm' : 'MMM DD')} - minTickGap={12} - /> - (value > 0 ? `$${formatShortNum(value)}` : `-$${formatShortNum(-value)}`)} - domain={dataRange} - /> + 0}> + + + Timeframe + + {totalStats.timeframe} + + + + Total Netflow + + {totalStats.totalNetflow} + + + + Total Inflow + + {totalStats.totalInflow} + + + + Total Outflow + + {totalStats.totalOutflow} + + + + + + + + + + dayjs(value).format( + timeframe === KyberAITimeframe.ONE_DAY + ? 'HH:mm' + : KyberAITimeframe.THREE_DAY + ? 'HH:mm MMM DD' + : 'MMM DD', + ) + } + minTickGap={12} + /> + (value > 0 ? `$${formatShortNum(value)}` : `-$${formatShortNum(-value)}`)} + domain={dataRange} + /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && - dayjs(payload.timestamp).format( - timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm, MMM DD' : 'MMM DD, YYYY', - )} - - - Netflow: ${formatShortNum(payload.totalNetflow)} - - - - - Wallet - - {payload.cexes.map((item: INetflowToCEX, index: number) => ( - - {item.cex} + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && + dayjs(payload.timestamp).format( + timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm, MMM DD' : 'MMM DD, YYYY', + )} + + + Netflow: ${formatShortNum(payload.totalNetflow)} + + + + + Wallet - ))} - - - - Inflow - - {payload.cexes.map((item: INetflowToCEX, index: number) => ( - - ${formatShortNum(item.inflow)} + {payload.cexes.map((item: INetflowToCEX, index: number) => ( + + {item.cex} + + ))} + + + + Inflow - ))} - - - - Outflow - - {payload.cexes.map((item: INetflowToCEX, index: number) => ( - - ${formatShortNum(item.outflow)} + {payload.cexes.map((item: INetflowToCEX, index: number) => ( + + ${formatShortNum(item.inflow)} + + ))} + + + + Outflow - ))} - - - - ) - }} - /> - - - - - - - - - - - {showNetflow && ( - , + {payload.cexes.map((item: INetflowToCEX, index: number) => ( + + ${formatShortNum(item.outflow)} + + ))} + + + + ) + }} + /> + + + + + + + + + + + {showNetflow && ( + , + }} + /> + )} + + + {!above768 && ( + + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) + } + /> + + dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) + } /> - )} - - - {!above768 && ( - - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showInflow' } }) - } - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showOutflow' } }) - } - /> - - dispatch({ type: CHART_STATES_ACTION_TYPE.TOGGLE_OPTION, payload: { option: 'showNetflow' } }) - } - /> - - )} - + + )} + + ) } @@ -1809,21 +1848,7 @@ export const NumberofTransfers = ({ tab }: { tab: ChartTab }) => { const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - - - Timeframe - - {totalStats.timeframe} - - - - {tab === ChartTab.First ? 'Total Transfers' : 'Total Volume'} - - {tab === ChartTab.First ? totalStats.totalTranfers : totalStats.totalVolume} - - - + { ]} /> - - - - - - - - - - - dayjs(value).format('MMM DD')} - allowDataOverflow - minTickGap={12} - /> - `${tab === ChartTab.Second ? '$' : ''}${formatShortNum(value)}`} - allowDataOverflow - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} - - - {tab === ChartTab.First ? 'Total Transfers' : 'Total Volume'}:{' '} - - {formatShortNum(tab === ChartTab.First ? payload.numberOfTransfer : payload.volume)} - - - - ) - }} - /> - , - }} - /> - - - + + 0}> + + + Timeframe + + {totalStats.timeframe} + + + + {tab === ChartTab.First ? 'Total Transfers' : 'Total Volume'} + + {tab === ChartTab.First ? totalStats.totalTranfers : totalStats.totalVolume} + + + + + + + + + + + + + + + dayjs(value).format('MMM DD')} + allowDataOverflow + minTickGap={12} + /> + `${tab === ChartTab.Second ? '$' : ''}${formatShortNum(value)}`} + allowDataOverflow + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} + + + {tab === ChartTab.First ? 'Total Transfers' : 'Total Volume'}:{' '} + + {formatShortNum(tab === ChartTab.First ? payload.numberOfTransfer : payload.volume)} + + + + ) + }} + /> + , + }} + /> + + + + ) } @@ -1989,15 +2032,7 @@ export const NumberofHolders = () => { const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) const textFontSize = above768 ? '12px' : '10px' return ( - 0}> - - - Timeframe - - {totalStats.timeframe} - - - + { ]} /> - - - - - - - - - - - dayjs(value).format('MMM DD')} - minTickGap={12} - allowDataOverflow - /> - formatShortNum(value)} - allowDataOverflow - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} - - - Holders: {formatShortNum(payload.count)} - - - ) - }} - /> - , - }} - /> - - - + + 0}> + + + Timeframe + + {totalStats.timeframe} + + + + + + + + + + + + + + + dayjs(value).format('MMM DD')} + minTickGap={12} + allowDataOverflow + /> + formatShortNum(value)} + allowDataOverflow + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} + + + Holders: {formatShortNum(payload.count)} + + + ) + }} + /> + , + }} + /> + + + + ) } @@ -2323,237 +2370,238 @@ export const LiquidOnCentralizedExchanges = ({ noAnimation }: { noAnimation?: bo const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) return ( - 0}> - <> - {account ? ( + + + {above768 && ( <> - - - Timeframe - - {totalStats.timeframe} - - - - Total Longs - - ${totalStats.totalSells} - - - - Total Shorts - - ${totalStats.totalBuys} - - - - - {above768 && ( - <> - setShowLong(prev => !prev)} + setShowLong(prev => !prev)} + /> + setShowShort(prev => !prev)} + /> + setShowPrice(prev => !prev)} + /> + + )} + dispatch({ type: CHART_STATES_ACTION_TYPE.TIMEFRAME_CHANGE, payload: { timeframe } })} + timeframes={[ + KyberAITimeframe.ONE_DAY, + KyberAITimeframe.ONE_WEEK, + KyberAITimeframe.ONE_MONTH, + KyberAITimeframe.THREE_MONTHS, + ]} + /> + + 0}> + <> + {account ? ( + <> + + + Timeframe + + {totalStats.timeframe} + + + + Total Longs + + ${totalStats.totalSells} + + + + Total Shorts + + ${totalStats.totalBuys} + + + + + + + - setShowShort(prev => !prev)} + + + dayjs(value).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm A, MMM DD' : 'MMM DD') + } + minTickGap={12} /> - setShowPrice(prev => !prev)} + '$' + formatShortNum(value)} + domain={dataRange} /> - - )} - - dispatch({ type: CHART_STATES_ACTION_TYPE.TIMEFRAME_CHANGE, payload: { timeframe } }) - } - timeframes={[ - KyberAITimeframe.ONE_DAY, - KyberAITimeframe.ONE_WEEK, - KyberAITimeframe.ONE_MONTH, - KyberAITimeframe.THREE_MONTHS, - ]} - /> - - - - - - - dayjs(value).format(timeframe === KyberAITimeframe.ONE_DAY ? 'HH:mm A, MMM DD' : 'MMM DD') - } - minTickGap={12} - /> - '$' + formatShortNum(value)} - domain={dataRange} - /> - '$' + formatShortNum(value)} - domain={[(dataMin: any) => dataMin * 0.98, (dataMax: any) => dataMax * 1.01]} - /> - { - const payload = props.payload?.[0]?.payload - if (!payload) return <> - return ( - - - {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} - - - {tokenOverview?.symbol?.toUpperCase()} Price:{' '} - - ${formatTokenPrice(payload.price)} - - - - - - CEX - - {payload.exchanges.map((i: any) => ( - - {i.exchangeName}: + '$' + formatShortNum(value)} + domain={[(dataMin: any) => dataMin * 0.98, (dataMax: any) => dataMax * 1.01]} + /> + { + const payload = props.payload?.[0]?.payload + if (!payload) return <> + return ( + + + {payload.timestamp && dayjs(payload.timestamp).format('MMM DD, YYYY')} + + + {tokenOverview?.symbol?.toUpperCase()} Price:{' '} + + ${formatTokenPrice(payload.price)} + + + + + + CEX - ))} - - - - Longs - - {payload.exchanges.map((i: any) => ( - - ${formatShortNum(i.sellVolUsd)} + {payload.exchanges.map((i: any) => ( + + {i.exchangeName}: + + ))} + + + + Longs - ))} - - - - Shorts - - {payload.exchanges.map((i: any) => ( - - ${formatShortNum(i.buyVolUsd)} + {payload.exchanges.map((i: any) => ( + + ${formatShortNum(i.sellVolUsd)} + + ))} + + + + Shorts - ))} - - - - - - Total: - - - ${formatShortNum(payload.sellVolUsd)} - - - ${formatShortNum(-payload.buyVolUsd)} - - - - ) - }} - /> - {showLong && ( - - )} - {showShort && ( - - )} - {showPrice && ( - , + {payload.exchanges.map((i: any) => ( + + ${formatShortNum(i.buyVolUsd)} + + ))} + + + + + + Total: + + + ${formatShortNum(payload.sellVolUsd)} + + + ${formatShortNum(-payload.buyVolUsd)} + + + + ) }} /> - )} - - - - ) : ( - <> - )} - - + {showLong && ( + + )} + {showShort && ( + + )} + {showPrice && ( + , + }} + /> + )} + + + + ) : ( + <> + )} + + + ) } @@ -2627,7 +2675,7 @@ export const Prochart = ({ const widgetOptions: ChartingLibraryWidgetOptions = { symbol: 'BTC', datafeed: datafeed, - interval: '1h' as ResolutionString, + interval: '4H' as ResolutionString, container: ref, library_path: '/charting_library/', disabled_features: [ @@ -2648,7 +2696,7 @@ export const Prochart = ({ studies_overrides: {}, theme: theme.darkMode ? 'Dark' : 'Light', custom_css_url: '/charting_library/style.css', - timeframe: '2w', + timeframe: '1m', time_frames: [ { text: '2w', resolution: '1H' as ResolutionString, description: '2 Weeks' }, { text: '1m', resolution: '4H' as ResolutionString, description: '1 Month' }, @@ -2676,6 +2724,7 @@ export const Prochart = ({ 'mainSeriesProperties.priceAxisProperties.autoScale': true, 'scalesProperties.textColor': theme.text, }) + tvWidget .activeChart() .createStudy('Relative Strength Index') @@ -2690,7 +2739,7 @@ export const Prochart = ({ .subscribe( null, r => { - const resolution = { 60: '1h', 240: '4h', '1D': '1d', '4D': '4d' }[r as string] || '1h' + const resolution = { 60: '1h', 240: '4h', '1D': '1d', '4D': '4d' }[r as string] || '4h' if (resolution !== variablesRef.current?.resolution) { setResolution?.(resolution) } @@ -2716,7 +2765,7 @@ export const Prochart = ({ const addSRLevels = useCallback(() => { if (!currentPrice || !tvWidget) return SRLevels?.forEach((level: ISRLevel) => { - const entityId = tvWidget.activeChart().createMultipointShape([{ time: level.timestamp, price: level.value }], { + const entityId = tvWidget?.activeChart().createMultipointShape([{ time: level.timestamp, price: level.value }], { shape: 'horizontal_ray', lock: true, disableSelection: true, @@ -2751,10 +2800,12 @@ export const Prochart = ({ }, [tvWidget, SRLevels, showSRLevels, currentPrice, theme, removeSRLevels, addSRLevels]) useEffect(() => { - if (resolution && tvWidget?.activeChart().resolution() !== (resolution as ResolutionString)) { - tvWidget?.activeChart().setResolution(resolution as ResolutionString) - variablesRef.current.resolution = resolution - } + try { + if (resolution && tvWidget?.activeChart().resolution() !== (resolution as ResolutionString)) { + tvWidget?.activeChart().setResolution(resolution as ResolutionString) + variablesRef.current.resolution = resolution + } + } catch {} }, [resolution, tvWidget]) return ( diff --git a/src/pages/TrueSightV2/components/index.tsx b/src/pages/TrueSightV2/components/index.tsx index fbfe9068b5..9433823bba 100644 --- a/src/pages/TrueSightV2/components/index.tsx +++ b/src/pages/TrueSightV2/components/index.tsx @@ -1,5 +1,5 @@ import { Trans } from '@lingui/macro' -import React, { CSSProperties, ReactNode, useLayoutEffect, useRef, useState } from 'react' +import React, { ReactNode, useLayoutEffect, useRef, useState } from 'react' import { isMobile } from 'react-device-detect' import { useParams } from 'react-router' import { useMedia } from 'react-use' @@ -10,6 +10,7 @@ import Column from 'components/Column' import Icon from 'components/Icons/Icon' import Modal from 'components/Modal' import Row, { RowBetween, RowFit } from 'components/Row' +import TabButton from 'components/TabButton' import { MouseoverTooltip } from 'components/Tooltip' import { MIXPANEL_TYPE, useMixpanelKyberAI } from 'hooks/useMixpanel' import useTheme from 'hooks/useTheme' @@ -419,59 +420,3 @@ export const SectionWrapper = ({ ) } - -const StyledMobileTabButton = styled.div<{ active?: boolean }>` - font-size: 12px; - line-height: 16px; - transition: all 0.2s ease; - display: flex; - align-items: center; - justify-content: center; - height: 40px; - flex: 1; - box-sizing: border-box; - cursor: pointer; - ${({ theme, active }) => - active - ? css` - color: ${theme.primary}; - background-color: ${theme.primary + '40'}; - box-shadow: inset 0 -2px 0 0 ${theme.primary}; - ` - : css` - color: ${theme.subText}; - background-color: ${theme.background}; - `} - - :hover { - filter: brightness(1.2); - } -` - -export const TabButton = ({ - text, - active, - onClick, - style, -}: { - text?: string - active?: boolean - onClick?: () => void - style?: CSSProperties -}) => { - const above768 = useMedia(`(min-width: ${MEDIA_WIDTHS.upToSmall}px)`) - - return ( - <> - {above768 ? ( - - {text} - - ) : ( - - {text} - - )} - - ) -} diff --git a/src/pages/TrueSightV2/components/table/index.tsx b/src/pages/TrueSightV2/components/table/index.tsx index aac6929720..e3bc1fdc7c 100644 --- a/src/pages/TrueSightV2/components/table/index.tsx +++ b/src/pages/TrueSightV2/components/table/index.tsx @@ -4,6 +4,7 @@ import { BigNumber } from 'ethers' import { formatUnits } from 'ethers/lib/utils' import { ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react' import { isMobile } from 'react-device-detect' +import { Info } from 'react-feather' import Skeleton, { SkeletonTheme } from 'react-loading-skeleton' import { useNavigate, useParams } from 'react-router-dom' import { Text } from 'rebass' @@ -152,9 +153,12 @@ const LoadingHandleWrapper = ({ {isLoading ? ( ) : ( - - We couldn't find any information for this token - + + + + We couldn't find any information for this token + + )} @@ -202,7 +206,7 @@ export const Top10HoldersTable = () => { - + { window.open(getEtherscanLink(NETWORK_TO_CHAINID[chain], item.address, 'address'), '_blank') }} > - Analyze + Explore diff --git a/src/pages/TrueSightV2/pages/LandingPage.tsx b/src/pages/TrueSightV2/pages/LandingPage.tsx index fb4526c63f..51d132e52f 100644 --- a/src/pages/TrueSightV2/pages/LandingPage.tsx +++ b/src/pages/TrueSightV2/pages/LandingPage.tsx @@ -33,7 +33,9 @@ import tokenPriceLightImage from 'assets/images/truesight-v2/landing-page/token- import tokenPriceImage from 'assets/images/truesight-v2/landing-page/token-price.png' // import videoPlaceholderImage from 'assets/images/truesight-v2/landing-page/video-placeholder.png' import sprite from 'assets/svg/kyberAILandingPageSprite.svg' +import { ButtonPrimary } from 'components/Button' import Column from 'components/Column' +import DownloadWalletModal from 'components/DownloadWalletModal' import GlobalIcon from 'components/Icons/Icon' import Row from 'components/Row' import useTheme from 'hooks/useTheme' @@ -410,7 +412,7 @@ export default function KyberAILandingPage() { /> )} - + Ape Smart with{' '} @@ -796,12 +798,20 @@ export default function KyberAILandingPage() { - + { + const elem = document.getElementById('sign-in-form') + elem?.scrollIntoView({ behavior: 'smooth' }) + }} + > + Sign in + + ) } diff --git a/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx b/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx index 9292614c3f..fcacfc53b5 100644 --- a/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx +++ b/src/pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm.tsx @@ -1,7 +1,6 @@ import { Trans, t } from '@lingui/macro' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { FormEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { useMedia } from 'react-use' import { Text } from 'rebass' import { useLazyCheckReferralCodeQuery, useRequestWhiteListMutation } from 'services/kyberAISubscription' @@ -13,10 +12,9 @@ import useParsedQueryString from 'hooks/useParsedQueryString' import useTheme from 'hooks/useTheme' import { getErrorMessage, isReferrerCodeInvalid } from 'pages/TrueSightV2/utils' import { useSessionInfo } from 'state/authen/hooks' -import { MEDIA_WIDTHS } from 'theme' import { isEmailValid } from 'utils/string' -import { FormWrapper, Input, Label } from './styled' +import { FormWrapper, Input } from './styled' export default function EmailForm({ showVerify, @@ -28,7 +26,6 @@ export default function EmailForm({ const qs = useParsedQueryString<{ referrer: string }>() const [referredByCode, setCode] = useState(qs.referrer || '') const [errorInput, setErrorInput] = useState({ email: '', referredByCode: '' }) - const isMobile = useMedia(`(max-width: ${MEDIA_WIDTHS.upToSmall}px)`) const { userInfo } = useSessionInfo() const [requestWaitList] = useRequestWhiteListMutation() @@ -101,35 +98,33 @@ export default function EmailForm({ return ( <> - - + - We will never share your email with third parties + We will never share your email with third parties. - - + + + + Use a referral code to get access to KyberAI faster! + diff --git a/src/pages/TrueSightV2/pages/RegisterWhitelist/index.tsx b/src/pages/TrueSightV2/pages/RegisterWhitelist/index.tsx index 939dce6e67..b7dfeaeb18 100644 --- a/src/pages/TrueSightV2/pages/RegisterWhitelist/index.tsx +++ b/src/pages/TrueSightV2/pages/RegisterWhitelist/index.tsx @@ -5,7 +5,10 @@ import { Text } from 'rebass' import { useRequestWhiteListMutation } from 'services/kyberAISubscription' import styled from 'styled-components' -import { ButtonPrimary } from 'components/Button' +import { ButtonLight, ButtonPrimary } from 'components/Button' +import Column from 'components/Column' +import DownloadWalletModal from 'components/DownloadWalletModal' +import Row from 'components/Row' import { APP_PATHS } from 'constants/index' import { useActiveWeb3React } from 'hooks' import useLogin from 'hooks/useLogin' @@ -14,11 +17,13 @@ import useTheme from 'hooks/useTheme' import SubscribeForm from 'pages/TrueSightV2/pages/RegisterWhitelist/SubscribeForm' import WaitListForm from 'pages/TrueSightV2/pages/RegisterWhitelist/WaitListForm' import VerifyCodeModal from 'pages/Verify/VerifyCodeModal' -import { useWalletModalToggle } from 'state/application/hooks' +import { ApplicationModal } from 'state/application/actions' +import { useOpenModal, useWalletModalToggle } from 'state/application/hooks' import { useSessionInfo } from 'state/authen/hooks' import { useIsWhiteListKyberAI } from 'state/user/hooks' +import { ButtonText } from 'theme' -const ConnectWalletButton = styled(ButtonPrimary)` +const ConnectWalletButton = styled(ButtonLight)` height: 36px; width: 236px; ` @@ -40,6 +45,7 @@ export default function RegisterWhitelist({ showForm = true }: { showForm?: bool referredByCode: '', showVerifySuccess: false, }) + const openDownloadWalletModal = useOpenModal(ApplicationModal.DOWNLOAD_WALLET) const showVerify = (email: string, referredByCode: string, showVerifySuccess: boolean) => { setVerifyModalState({ isOpen: true, referredByCode, email, showVerifySuccess }) @@ -95,9 +101,18 @@ export default function RegisterWhitelist({ showForm = true }: { showForm?: bool if (!account) return ( - - Connect Wallet - + + + Sign in with wallet + + + Don't have a wallet? + + Get started here + + + + ) if (!isLogin) diff --git a/src/pages/TrueSightV2/pages/RegisterWhitelist/styled.tsx b/src/pages/TrueSightV2/pages/RegisterWhitelist/styled.tsx index 94944148fc..5cbdd5255e 100644 --- a/src/pages/TrueSightV2/pages/RegisterWhitelist/styled.tsx +++ b/src/pages/TrueSightV2/pages/RegisterWhitelist/styled.tsx @@ -49,12 +49,12 @@ export const InputWithCopy = (props: InputProps) => { } export const FormWrapper = styled.div` - width: 500px; + width: 380px; display: flex; gap: 1rem; z-index: 1; + flex-direction: column; ${({ theme }) => theme.mediaWidth.upToSmall` width: 100%; - flex-wrap: wrap; `} ` diff --git a/src/pages/TrueSightV2/pages/SingleToken.tsx b/src/pages/TrueSightV2/pages/SingleToken.tsx index 7d316b3d43..f47f5cfbe5 100644 --- a/src/pages/TrueSightV2/pages/SingleToken.tsx +++ b/src/pages/TrueSightV2/pages/SingleToken.tsx @@ -185,8 +185,9 @@ const TokenDescription = ({ description }: { description: string }) => { const [show, setShow] = useState(true) const [isTextExceeded, setIsTextExceeded] = useState(false) const ref = useRef(null) + useLayoutEffect(() => { - setIsTextExceeded((description && ref.current && ref.current?.clientWidth <= ref.current?.scrollWidth) || false) + setIsTextExceeded((!!description && ref.current && ref.current?.clientWidth <= ref.current?.scrollWidth) || false) }, [description]) useEffect(() => { @@ -206,9 +207,11 @@ const TokenDescription = ({ description }: { description: string }) => { dangerouslySetInnerHTML={{ __html: linkify(description) + - `${t`Hide`}`, + (isTextExceeded + ? `${t`Hide`}` + : ''), }} /> {isTextExceeded && !show && ( @@ -511,7 +514,7 @@ export default function SingleToken() { const [showShare, setShowShare] = useState(false) const above768 = useMedia(`(min-width:${MEDIA_WIDTHS.upToSmall}px)`) const { chain, address } = useParams() - const [currentTab, setCurrentTab] = useState(DiscoverTokenTab.OnChainAnalysis) + const [currentTab, setCurrentTab] = useState(DiscoverTokenTab.TechnicalAnalysis) const { data: token, isLoading } = useKyberAITokenOverview() @@ -596,8 +599,8 @@ export default function SingleToken() { - {currentTab === DiscoverTokenTab.OnChainAnalysis && } {currentTab === DiscoverTokenTab.TechnicalAnalysis && } + {currentTab === DiscoverTokenTab.OnChainAnalysis && } () const [liveChartTab, setLiveChartTab] = useState(ChartTab.First) const [showSRLevels, setShowSRLevels] = useState(true) - const [priceChartResolution, setPriceChartResolution] = useState('1h') + const [priceChartResolution, setPriceChartResolution] = useState('4h') const now = Math.floor(Date.now() / 60000) * 60 const { data, isLoading } = useChartingDataQuery({ chain: chain || defaultExplorePageToken.chain, @@ -139,6 +140,12 @@ export default function TechnicalAnalysis() { console.log(err) } } + + const handleTimeframeSelect = useCallback( + (t: KyberAITimeframe) => setPriceChartResolution?.(t as string), + [setPriceChartResolution], + ) + return ( + + Support / Resistance Levels @@ -211,7 +228,7 @@ export default function TechnicalAnalysis() { ]} > - {chain && getLimitOrderContract(NETWORK_TO_CHAINID[chain]) && ( + {chain && isSupportLimitOrder(NETWORK_TO_CHAINID[chain]) && ( navigateToLimitPage({ address, chain })}> diff --git a/src/pages/TrueSightV2/pages/TokenAnalysisList.tsx b/src/pages/TrueSightV2/pages/TokenAnalysisList.tsx index a73a638efa..c37d2bba0d 100644 --- a/src/pages/TrueSightV2/pages/TokenAnalysisList.tsx +++ b/src/pages/TrueSightV2/pages/TokenAnalysisList.tsx @@ -1,14 +1,13 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { Trans, t } from '@lingui/macro' import dayjs from 'dayjs' +import { motion } from 'framer-motion' import { rgba } from 'polished' import { ReactNode, useEffect, useRef, useState } from 'react' -import { isMobile } from 'react-device-detect' import { Info } from 'react-feather' import Skeleton, { SkeletonTheme } from 'react-loading-skeleton' import { useLocation, useNavigate, useSearchParams } from 'react-router-dom' import { useMedia } from 'react-use' -import { useGesture } from 'react-use-gesture' import { Text } from 'rebass' import styled, { DefaultTheme, css } from 'styled-components' @@ -19,6 +18,7 @@ import Icon from 'components/Icons/Icon' import AnimatedLoader from 'components/Loader/AnimatedLoader' import Pagination from 'components/Pagination' import Row, { RowBetween, RowFit } from 'components/Row' +import { MouseoverTooltipDesktopOnly } from 'components/Tooltip' import { APP_PATHS, ICON_ID } from 'constants/index' import { NETWORKS_INFO } from 'constants/networks' import { useActiveWeb3React } from 'hooks' @@ -204,7 +204,7 @@ const ActionButton = styled.button<{ color: string }>` gap: 4px; ` -const TabWrapper = styled.div` +const TabWrapper = styled(motion.div)` overflow: auto; cursor: grab; display: inline-flex; @@ -228,21 +228,18 @@ const TabWrapper = styled.div` } ${({ theme }) => theme.mediaWidth.upToSmall` min-width: initial; - flex:1; + flex: 1; `} ` const ButtonTypeActive = styled(ButtonLight)` height: 36px; - margin: 0 !important; - display: flex; gap: 4px; font-size: 14px; white-space: nowrap; border: 1px solid ${({ theme }) => theme.primary}; background-color: ${({ theme }) => rgba(theme.primary, 0.33)}; transition: all 0.1s ease; - flex: 1; :hover { background-color: ${({ theme }) => rgba(theme.primary, 0.5)}; filter: none; @@ -251,14 +248,10 @@ const ButtonTypeActive = styled(ButtonLight)` const ButtonTypeInactive = styled(ButtonOutlined)` height: 36px; - margin: 0 !important; - display: flex; gap: 4px; font-size: 14px; white-space: nowrap; transition: all 0.1s ease; - flex: 1; - ${({ theme }) => css` color: ${theme.subText}; border-color: ${theme.subText}; @@ -268,14 +261,32 @@ const ButtonTypeInactive = styled(ButtonOutlined)` } ` +const LoadingWrapper = styled(Row)` + position: absolute; + inset: 0 0 0 0; + background: ${({ theme }) => theme.background}; + opacity: 0.8; + z-index: 100; + border-radius: 20px; + padding-top: min(25vh, 20%); + justify-content: center; + align-items: flex-start; + box-sizing: border-box; + ${({ theme }) => theme.mediaWidth.upToSmall` + inset: 0 -16px 0 -16px; + width: 100vw; + border-radius: 0; + `} +` + const tokenTypeList: { type: KyberAIListType icon?: ICON_ID tooltip?: (theme: DefaultTheme) => ReactNode title: string }[] = [ - { type: KyberAIListType.ALL, title: t`All` }, { type: KyberAIListType.MYWATCHLIST, icon: 'star', title: t`My Watchlist` }, + { type: KyberAIListType.ALL, title: t`All` }, { type: KyberAIListType.BULLISH, title: t`Bullish`, @@ -361,20 +372,6 @@ const TokenListDraggableTabs = ({ tab, setTab }: { tab: KyberAIListType; setTab: const wrapperRef = useRef(null) const tabListRef = useRef([]) - const bind = useGesture({ - onDrag: state => { - if (isMobile || !wrapperRef.current) return - //state.event?.preventDefault() - if (wrapperRef.current?.scrollLeft !== undefined && state.dragging) { - wrapperRef.current.classList.add('no-scroll') - wrapperRef.current.scrollLeft -= state.values?.[0] - state.previous?.[0] || 0 - } - if (!state.dragging) { - setScrollLeftValue(wrapperRef.current.scrollLeft) - wrapperRef.current.classList.remove('no-scroll') - } - }, - }) useEffect(() => { wrapperRef.current?.scrollTo({ left: scrollLeftValue, behavior: 'smooth' }) }, [scrollLeftValue]) @@ -409,7 +406,7 @@ const TokenListDraggableTabs = ({ tab, setTab }: { tab: KyberAIListType; setTab: return ( <> - e.preventDefault()} {...bind()}> + e.preventDefault()}> {tokenTypeList.map(({ type, title, icon, tooltip }, index) => { const props = { onClick: () => { @@ -432,21 +429,21 @@ const TokenListDraggableTabs = ({ tab, setTab }: { tab: KyberAIListType; setTab: } if (tab === type) { return ( - + (tabListRef.current[index] = el)}> {icon && } {title} - + ) } else { return ( - + (tabListRef.current[index] = el)}> {icon && } {title} - + ) } })} @@ -574,14 +571,22 @@ const TokenRow = ({ -
+
tokenInList
@@ -872,21 +877,9 @@ export default function TokenAnalysisList() { {isFetching && ( -
+ -
+ )} @@ -1023,7 +1016,7 @@ export default function TokenAnalysisList() { ? 9 : 8 } - height={200} + height={550} style={{ pointerEvents: 'none' }} > @@ -1043,6 +1036,7 @@ export default function TokenAnalysisList() { height: '200px', justifyContent: 'center', backgroundColor: theme.background, + width: '100vw', }} > diff --git a/src/pages/TrueSightV2/types/index.tsx b/src/pages/TrueSightV2/types/index.tsx index 484ba9439a..a8103020ac 100644 --- a/src/pages/TrueSightV2/types/index.tsx +++ b/src/pages/TrueSightV2/types/index.tsx @@ -164,9 +164,8 @@ export interface ISRLevel { } export enum DiscoverTokenTab { - OnChainAnalysis = 'On-Chain Analysis', TechnicalAnalysis = 'Technical Analysis', - // News = 'News', + OnChainAnalysis = 'On-Chain Analysis', } export enum ChartTab { @@ -179,6 +178,7 @@ export enum KyberAITimeframe { ONE_HOUR = '1h', FOUR_HOURS = '4h', ONE_DAY = '1d', + THREE_DAY = '3d', FOUR_DAY = '4d', ONE_WEEK = '7d', ONE_MONTH = '1m', diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts index 167044713b..9b5b595417 100644 --- a/src/react-app-env.d.ts +++ b/src/react-app-env.d.ts @@ -10,11 +10,14 @@ interface Window { isMetaMask?: boolean isCoin98?: boolean isBraveWallet?: any + isPhantom?: boolean isCoinbaseWallet?: boolean isTrust?: boolean isTrustWallet?: boolean isRabby?: boolean + isBlocto?: boolean isLedgerConnect?: boolean + isKrystal?: boolean isKrystalWallet?: boolean on?: (...args: any[]) => void removeListener?: (...args: any[]) => void diff --git a/src/services/earning/index.ts b/src/services/earning/index.ts index d8e77c9d4b..d7fd8ffc0e 100644 --- a/src/services/earning/index.ts +++ b/src/services/earning/index.ts @@ -55,6 +55,7 @@ const earningApi = createApi({ const positionData: GetElasticEarningResponse = (positionsRes?.data as any).data as GetElasticEarningResponse const aggregateData = Object.keys(positionData).reduce((acc, chainName) => { + if (!positionData?.[chainName]) return acc return { ...acc, [chainName]: { diff --git a/src/services/earning/types.ts b/src/services/earning/types.ts index 3813e85228..93b6e775cb 100644 --- a/src/services/earning/types.ts +++ b/src/services/earning/types.ts @@ -85,6 +85,18 @@ export type ElasticPositionEarningWithDetails = { pendingRewardUSD: string[] liquidity: string }[] + + farmV2DepositedPositions: { + farmV2: { + id: string + rewards: Array<{ amount: string; index: number; tokenID: string }> + } + pendingRewards: Array + liquidity: string + range: { + weight: string + } + }[] } & HistoricalEarning export type ClassicPositionEarningWithDetails = { diff --git a/src/services/knprotocol.ts b/src/services/knprotocol.ts new file mode 100644 index 0000000000..fe1d7c0ee7 --- /dev/null +++ b/src/services/knprotocol.ts @@ -0,0 +1,24 @@ +import { ChainId } from '@kyberswap/ks-sdk-core' +import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react' + +import { POOL_FARM_BASE_URL } from 'constants/env' +import { NETWORKS_INFO } from 'constants/networks' +import { EVMNetworkInfo } from 'constants/networks/type' +import { SubgraphFarmV2 } from 'state/farms/elasticv2/types' + +const knProtocolApi = createApi({ + reducerPath: 'knProtocol', + baseQuery: fetchBaseQuery({ baseUrl: POOL_FARM_BASE_URL }), + endpoints: builder => ({ + getFarmV2: builder.query<{ data: { data: SubgraphFarmV2[] } }, ChainId>({ + query: (chainId: ChainId) => ({ + url: `/${ + (NETWORKS_INFO[chainId] as EVMNetworkInfo).poolFarmRoute + }/api/v1/elastic-new/farm-v2?perPage=1000&page=1`, + }), + }), + }), +}) + +export default knProtocolApi +export const { useLazyGetFarmV2Query } = knProtocolApi diff --git a/src/services/ksSetting.ts b/src/services/ksSetting.ts index 2b99fd8720..4e93177ee4 100644 --- a/src/services/ksSetting.ts +++ b/src/services/ksSetting.ts @@ -5,13 +5,14 @@ import { Connection } from '@solana/web3.js' import { KS_SETTING_API } from 'constants/env' import { AppJsonRpcProvider } from 'constants/providers' +import { ChainStateMap } from 'hooks/useChainsConfig' import { TokenInfo } from 'state/lists/wrappedTokenInfo' import { TopToken } from 'state/topTokens/type' export type KyberSwapConfig = { rpc: string - prochart: boolean isEnableBlockService: boolean + isEnableKNProtocol: boolean blockClient: ApolloClient classicClient: ApolloClient elasticClient: ApolloClient @@ -22,8 +23,8 @@ export type KyberSwapConfig = { export type KyberSwapConfigResponse = { rpc: string - prochart: boolean isEnableBlockService: boolean + isEnableKNProtocol: boolean blockSubgraph: string classicSubgraph: string elasticSubgraph: string @@ -41,6 +42,7 @@ export type KyberswapGlobalConfigurationResponse = { config: { aggregator: string isEnableAuthenAggregator: boolean + chainStates: ChainStateMap } } } @@ -77,6 +79,20 @@ const ksSettingApi = createApi({ }, }), }), + getChainsConfiguration: builder.query<{ chainId: string; name: string; icon: string }[], void>({ + query: () => ({ + url: '/configurations/fetch', + params: { + serviceCode: `chains`, + }, + }), + transformResponse: (data: any) => + data?.data?.config?.map((e: any) => ({ + ...e, + name: e.displayName, + icon: e.logoUrl, + })), + }), getTokenList: builder.query< TokenListResponse, @@ -111,6 +127,7 @@ export const { useGetTokenListQuery, useImportTokenMutation, useLazyGetTopTokensQuery, + useGetChainsConfigurationQuery, } = ksSettingApi export default ksSettingApi diff --git a/src/services/limitOrder.ts b/src/services/limitOrder.ts new file mode 100644 index 0000000000..665ec6dc5a --- /dev/null +++ b/src/services/limitOrder.ts @@ -0,0 +1,131 @@ +import { ChainId } from '@kyberswap/ks-sdk-core' +import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react' + +import { LimitOrder, LimitOrderStatus } from 'components/swapv2/LimitOrder/type' +import { LIMIT_ORDER_API_READ, LIMIT_ORDER_API_WRITE } from 'constants/env' + +const mapPath: Partial> = { + [LimitOrderStatus.CANCELLED]: 'cancelled', + [LimitOrderStatus.EXPIRED]: 'expired', + [LimitOrderStatus.FILLED]: 'filled', +} + +const limitOrderApi = createApi({ + reducerPath: 'limitOrderApi', + baseQuery: fetchBaseQuery({ baseUrl: '' }), + endpoints: builder => ({ + getLOContractAddress: builder.query({ + query: chainId => ({ + url: `${LIMIT_ORDER_API_READ}/v1/configs/contract-address`, + params: { chainId }, + }), + transformResponse: (data: any) => data?.data?.latest?.toLowerCase?.() ?? '', + }), + getListOrders: builder.query< + { orders: LimitOrder[]; totalOrder: number }, + { + chainId: ChainId + maker: string | undefined + status: string + query: string + page: number + pageSize: number + } + >({ + query: params => ({ + url: `${LIMIT_ORDER_API_READ}/v1/orders`, + params, + }), + transformResponse: ({ data }: any) => { + data.orders.forEach((order: any) => { + order.chainId = Number(order.chainId) as ChainId + }) + return { orders: data?.orders || [], totalOrder: data?.pagination?.totalItems || 0 } + }, + }), + getNumberOfInsufficientFundOrders: builder.query({ + query: params => ({ + url: `${LIMIT_ORDER_API_READ}/v1/orders/insufficient-funds`, + params, + }), + transformResponse: (data: any) => data?.data?.total || 0, + }), + insertCancellingOrder: builder.mutation< + any, + { + orderIds?: number[] + nonce?: number + maker: string + chainId: string + txHash: string + contractAddress: string + } + >({ + query: body => ({ + url: `${LIMIT_ORDER_API_WRITE}/v1/orders/cancelling`, + body, + method: 'POST', + }), + }), + createOrder: builder.mutation<{ id: number }, any>({ + query: body => ({ + url: `${LIMIT_ORDER_API_WRITE}/v1/orders`, + body, + method: 'POST', + }), + transformResponse: (data: any) => data?.data, + }), + createOrderSignature: builder.mutation({ + query: body => ({ + url: `${LIMIT_ORDER_API_WRITE}/v1/orders/sign-message`, + body, + method: 'POST', + }), + transformResponse: (data: any) => data?.data, + }), + getEncodeData: builder.mutation({ + query: ({ orderIds, isCancelAll = false }) => ({ + url: `${LIMIT_ORDER_API_READ}/v1/encode/${isCancelAll ? 'increase-nonce' : 'cancel-batch-orders'}`, + body: isCancelAll ? {} : { orderIds }, + method: 'POST', + }), + transformResponse: (data: any) => data?.data, + }), + ackNotificationOrder: builder.mutation< + any, + { docIds: string[]; maker: string; chainId: ChainId; type: LimitOrderStatus } + >({ + query: ({ maker, chainId, type, docIds }) => ({ + url: `${LIMIT_ORDER_API_WRITE}/v1/events/${mapPath[type]}`, + body: { maker, chainId: chainId + '', [type === LimitOrderStatus.FILLED ? 'uuids' : 'docIds']: docIds }, + method: 'DELETE', + }), + transformResponse: (data: any) => data?.data, + }), + getTotalActiveMakingAmount: builder.query({ + query: ({ chainId, tokenAddress, account }) => ({ + url: `${LIMIT_ORDER_API_READ}/v1/orders/active-making-amount`, + params: { + chainId: chainId + '', + makerAsset: tokenAddress, + maker: account, + }, + }), + transformResponse: (data: any) => data?.data?.activeMakingAmount, + }), + }), +}) + +export const { + useGetLOContractAddressQuery, + useGetListOrdersQuery, + useInsertCancellingOrderMutation, + useGetNumberOfInsufficientFundOrdersQuery, + useCreateOrderMutation, + useCreateOrderSignatureMutation, + useGetEncodeDataMutation, + useGetTotalActiveMakingAmountQuery, + useAckNotificationOrderMutation, +} = limitOrderApi + +export default limitOrderApi diff --git a/src/state/about/hooks.ts b/src/state/about/hooks.ts index 8f3274a843..b0510086dc 100644 --- a/src/state/about/hooks.ts +++ b/src/state/about/hooks.ts @@ -2,8 +2,8 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { useEffect, useState } from 'react' import { GLOBAL_DATA, GLOBAL_DATA_ELASTIC } from 'apollo/queries' -import { EVM_MAINNET_NETWORKS, isEVM } from 'constants/networks' -import { ELASTIC_NOT_SUPPORTED, VERSION } from 'constants/v2' +import { ELASTIC_NOT_SUPPORTED, EVM_MAINNET_NETWORKS, isEVM } from 'constants/networks' +import { VERSION } from 'constants/v2' import useAggregatorAPR from 'hooks/useAggregatorAPR' import useAggregatorVolume from 'hooks/useAggregatorVolume' import { useAllKyberswapConfig } from 'hooks/useKyberSwapConfig' diff --git a/src/state/application/actions.ts b/src/state/application/actions.ts index 4f8d5420d9..a2a704b940 100644 --- a/src/state/application/actions.ts +++ b/src/state/application/actions.ts @@ -17,6 +17,7 @@ export enum ApplicationModal { VOTE, PRICE_RANGE, POOL_DETAIL, + DOWNLOAD_WALLET, MOBILE_LIVE_CHART, MOBILE_TRADE_ROUTES, diff --git a/src/state/application/hooks.ts b/src/state/application/hooks.ts index 4a525bb2af..1572fc41fe 100644 --- a/src/state/application/hooks.ts +++ b/src/state/application/hooks.ts @@ -6,7 +6,7 @@ import { useCallback, useEffect, useMemo } from 'react' import { useDispatch, useSelector } from 'react-redux' import { KyberSwapConfig, KyberSwapConfigResponse } from 'services/ksSetting' -import { ETH_PRICE, PROMM_ETH_PRICE, TOKEN_DERIVED_ETH } from 'apollo/queries' +import { ETH_PRICE, PROMM_ETH_PRICE } from 'apollo/queries' import { ackAnnouncementPopup, getAnnouncementsAckMap, isPopupCanShow } from 'components/Announcement/helper' import { AnnouncementTemplatePopup, @@ -20,7 +20,7 @@ import { import { NETWORKS_INFO, isEVM, isSolana } from 'constants/networks' import ethereumInfo from 'constants/networks/ethereum' import { AppJsonRpcProvider } from 'constants/providers' -import { KNC, KNC_ADDRESS } from 'constants/tokens' +import { KNC_ADDRESS } from 'constants/tokens' import { VERSION } from 'constants/v2' import { useActiveWeb3React } from 'hooks/index' import { useAppSelector } from 'state/hooks' @@ -359,28 +359,6 @@ export function useETHPrice(version: string = VERSION.CLASSIC): AppState['applic return ethPrice } -/** - * Gets the current price of KNC by ETH - */ -export const getKNCPriceByETH = async (chainId: ChainId, apolloClient: ApolloClient) => { - let kncPriceByETH = 0 - - try { - const result = await apolloClient.query({ - query: TOKEN_DERIVED_ETH(KNC[chainId].address), - fetchPolicy: 'no-cache', - }) - - const derivedETH = result?.data?.tokens[0]?.derivedETH - - kncPriceByETH = parseFloat(derivedETH) || 0 - } catch (e) { - console.log(e) - } - - return kncPriceByETH -} - export function useKNCPrice() { const { data } = useTokenPricesWithLoading([KNC_ADDRESS], ChainId.MAINNET) if (!data) return 0 @@ -436,7 +414,7 @@ function getDefaultConfig(chainId: ChainId): KyberSwapConfigResponse { const evm = isEVM(chainId) return { rpc: NETWORKS_INFO[chainId].defaultRpcUrl, - prochart: false, + isEnableKNProtocol: false, isEnableBlockService: false, blockSubgraph: (evm ? NETWORKS_INFO[chainId] : ethereumInfo).defaultBlockSubgraph, elasticSubgraph: (evm ? NETWORKS_INFO[chainId] : ethereumInfo).elastic.defaultSubgraph, @@ -471,8 +449,8 @@ export const useKyberSwapConfig = (customChainId?: ChainId): KyberSwapConfig => return { rpc: config.rpc, isEnableBlockService: config.isEnableBlockService, + isEnableKNProtocol: config.isEnableKNProtocol, readProvider, - prochart: config.prochart, blockClient, elasticClient, classicClient, @@ -482,7 +460,7 @@ export const useKyberSwapConfig = (customChainId?: ChainId): KyberSwapConfig => }, [ config.rpc, config.isEnableBlockService, - config.prochart, + config.isEnableKNProtocol, config.commonTokens, readProvider, blockClient, diff --git a/src/state/application/reducer.ts b/src/state/application/reducer.ts index 2aa47c8bb3..fc7534ad81 100644 --- a/src/state/application/reducer.ts +++ b/src/state/application/reducer.ts @@ -172,6 +172,7 @@ export default createReducer(initialState, builder => const data = action.payload.data.config const rpc = data?.rpc || NETWORKS_INFO[chainId].defaultRpcUrl const isEnableBlockService = data?.isEnableBlockService ?? false + const isEnableKNProtocol = data?.isEnableKNProtocol ?? false const blockSubgraph = evm ? data?.blockSubgraph || NETWORKS_INFO[chainId].defaultBlockSubgraph @@ -191,7 +192,7 @@ export default createReducer(initialState, builder => [chainId]: { rpc, isEnableBlockService, - prochart: data?.prochart || false, + isEnableKNProtocol, blockSubgraph, elasticSubgraph, classicSubgraph, diff --git a/src/state/campaigns/actions.ts b/src/state/campaigns/actions.ts index 94ae2e94e0..d8c3013db9 100644 --- a/src/state/campaigns/actions.ts +++ b/src/state/campaigns/actions.ts @@ -91,6 +91,16 @@ export interface CampaignLuckyWinner { token: SerializedToken } +export enum ConditionGroupsType { + POINT_MULTIPLIER = 'POINT_MULTIPLIER', +} +export interface ConditionGroups { + conditions?: any[] + extra?: any + priority: number + type: ConditionGroupsType +} + export interface CampaignData { id: number name: string @@ -115,6 +125,7 @@ export interface CampaignData { tradingNumberRequired: number competitionId?: number competitorId?: number + conditionGroups?: ConditionGroups[] } export interface CampaignProofData { diff --git a/src/state/farms/elastic/hooks.ts b/src/state/farms/elastic/hooks.ts index 62303b369c..9d2b137203 100644 --- a/src/state/farms/elastic/hooks.ts +++ b/src/state/farms/elastic/hooks.ts @@ -3,9 +3,11 @@ import { Currency, CurrencyAmount, Token } from '@kyberswap/ks-sdk-core' import { FeeAmount, Position, computePoolAddress } from '@kyberswap/ks-sdk-elastic' import { t } from '@lingui/macro' import { BigNumber } from 'ethers' +import { Interface } from 'ethers/lib/utils' import { useCallback, useMemo, useState } from 'react' import { useSearchParams } from 'react-router-dom' +import ELASTIC_FARM_ABI from 'constants/abis/v2/farm.json' import { ELASTIC_FARM_TYPE, FARM_TAB } from 'constants/index' import { CONTRACT_NOT_FOUND_MSG } from 'constants/messages' import { isEVM as isEVMNetwork } from 'constants/networks' @@ -14,8 +16,11 @@ import { useActiveWeb3React } from 'hooks' import { useTokens } from 'hooks/Tokens' import { useProAmmNFTPositionManagerContract, useProMMFarmContract } from 'hooks/useContract' import { usePools } from 'hooks/usePools' -import { FarmingPool, NFTPosition } from 'state/farms/elastic/types' +import { useProAmmPositionsFromTokenIds } from 'hooks/useProAmmPositions' +import { FarmingPool, NFTPosition, UserFarmInfo, UserInfo } from 'state/farms/elastic/types' import { useAppSelector } from 'state/hooks' +import { getPoolAddress } from 'state/mint/proamm/utils' +import { toCallState, useCallsData, useMultipleContractSingleData } from 'state/multicall/hooks' import { useTransactionAdder } from 'state/transactions/hooks' import { TRANSACTION_TYPE, @@ -38,12 +43,13 @@ export const useElasticFarms = () => { export const useFilteredFarms = () => { const { isEVM, networkInfo, chainId } = useActiveWeb3React() + const depositedPositions = useDepositedNfts() const [searchParams] = useSearchParams() const filteredToken0Id = searchParams.get('token0') || undefined const filteredToken1Id = searchParams.get('token1') || undefined - const { farms, loading, userFarmInfo } = useElasticFarms() + const { farms, loading } = useElasticFarms() const type = searchParams.get('type') const activeTab: string = type || FARM_TAB.ACTIVE @@ -130,10 +136,10 @@ export const useFilteredFarms = () => { if (activeTab === FARM_TAB.MY_FARMS && isEVM) { result = result?.map(item => { - if (!userFarmInfo?.[item.id].depositedPositions.length) { + if (!depositedPositions[item.id]?.length) { return { ...item, pools: [] } } - const stakedPools = userFarmInfo?.[item.id].depositedPositions.map(pos => + const stakedPools = depositedPositions[item.id]?.map(pos => computePoolAddress({ factoryAddress: (networkInfo as EVMNetworkInfo).elastic.coreFactory, tokenA: pos.pool.token0, @@ -154,7 +160,7 @@ export const useFilteredFarms = () => { search, activeTab, chainId, - userFarmInfo, + depositedPositions, isEVM, networkInfo, filteredToken0Id, @@ -165,7 +171,6 @@ export const useFilteredFarms = () => { return { farms, loading, - userFarmInfo, filteredFarms, } } @@ -498,3 +503,176 @@ export const usePositionFilter = (positions: PositionDetails[], validPools: stri filterOptions, } } + +const farmInterface = new Interface(ELASTIC_FARM_ABI) + +export function useDepositedNfts(): { [address: string]: NFTPosition[] } { + const { farms } = useElasticFarms() + const farmAddresses = useMemo(() => { + return farms?.map(item => item.id) || [] + }, [farms]) + + const { account } = useActiveWeb3React() + + const inputs = useMemo(() => [account], [account]) + const options = useMemo( + () => ({ + blocksPerFetch: 40, + }), + [], + ) + const result = useMultipleContractSingleData(farmAddresses, farmInterface, 'getDepositedNFTs', inputs, options) + + const nftByFarmAddress = useMemo(() => { + const res: { [key: string]: BigNumber[] } = {} + result.forEach((item, idx) => { + res[farmAddresses[idx]] = item.result?.listNFTs || [] + }) + return res + }, [result, farmAddresses]) + + const tokenIds = useMemo(() => { + return Object.values(nftByFarmAddress).flat() + }, [nftByFarmAddress]) + const { positions = [] } = useProAmmPositionsFromTokenIds(tokenIds) + + return useMemo(() => { + const positionByFarmAddess: { [key: string]: Array } = {} + + farmAddresses.forEach(address => { + const { pools } = farms?.find(item => item.id === address) || {} + + positionByFarmAddess[address] = (nftByFarmAddress[address] || []) + .map((id: BigNumber) => { + const position = positions.find(item => item.tokenId.toString() === id.toString()) + const pool = pools?.find(pool => pool.poolAddress.toLowerCase() === position?.poolId.toLowerCase())?.pool + if (!pool || !position) return null + return new NFTPosition({ + nftId: id, + pool, + liquidity: position.liquidity.toString(), + tickLower: position.tickLower, + tickUpper: position.tickUpper, + }) + }) + .filter(item => item !== null) as NFTPosition[] + }) + + return positionByFarmAddess + }, [farms, positions, nftByFarmAddress, farmAddresses]) +} + +export function useDepositedNftsByFarm(farmAddress: string): NFTPosition[] { + const positionByFarm = useDepositedNfts() + return useMemo(() => positionByFarm[farmAddress] || [], [positionByFarm, farmAddress]) +} + +const getUserInfoFragment = farmInterface.getFunction('getUserInfo') + +export function useJoinedPositions() { + const positions = useDepositedNfts() + const { farms } = useElasticFarms() + + const params = useMemo(() => { + return (farms || []).map(farm => { + const calls: { address: string; callData: string; pos: NFTPosition; pid: string }[] = [] + + const deposited = positions[farm.id] || [] + deposited.forEach(pos => { + const poolAddress = getPoolAddress(pos.pool) + const matchedPools = farm.pools.filter(p => p.poolAddress.toLowerCase() === poolAddress.toLowerCase()) + + matchedPools.forEach(pool => { + if (pos.liquidity.toString() !== '0') + calls.push({ + address: farm.id, + callData: farmInterface.encodeFunctionData(getUserInfoFragment, [pos.nftId, pool.pid]), + pid: pool.pid.toString(), + pos: pos, + }) + }) + }) + return calls + }) + }, [farms, positions]) + + const options = useMemo( + () => ({ + blocksPerFetch: 30, + }), + [], + ) + const callInputs = useMemo(() => params.flat(), [params]) + const rawRes = useCallsData(callInputs, options) + + const result = useMemo(() => rawRes.map(item => toCallState(item, farmInterface, getUserInfoFragment)), [rawRes]) + + return useMemo(() => { + const userInfo: UserFarmInfo = {} + farms?.forEach((farm, idx) => { + const joinedPositions: { [pid: string]: NFTPosition[] } = {} + const rewardPendings: { [pid: string]: CurrencyAmount[] } = {} + const rewardByNft: { [pid_nftId: string]: CurrencyAmount[] } = {} + + const startIdx = idx === 0 ? 0 : params.slice(0, idx + 1).reduce((acc, cur) => acc + cur.length, 0) + const endIdx = startIdx + params[idx].length + + const res = result.slice(startIdx, endIdx) + + params[idx].forEach((param, index) => { + const pid = param.pid.toString() + const nftId = param.pos.nftId + + if (res[index].result) { + if (!joinedPositions[pid]) { + joinedPositions[pid] = [] + } + + const depositedPos = positions[farm.id].find(pos => pos.nftId.eq(nftId)) + const farmingPool = farm.pools.find(p => p.pid === pid) + + if (depositedPos && farmingPool) { + const pos = new NFTPosition({ + nftId, + liquidity: res[index].result?.liquidity, + tickLower: depositedPos.tickLower, + tickUpper: depositedPos.tickUpper, + pool: depositedPos.pool, + }) + joinedPositions[pid].push(pos) + + const id = `${pid}_${nftId.toString()}` + if (!rewardByNft[id]) { + rewardByNft[id] = [] + } + if (!rewardPendings[pid]) { + rewardPendings[pid] = [] + } + farmingPool.rewardTokens.forEach((currency, i) => { + const amount = CurrencyAmount.fromRawAmount(currency, res[index].result?.rewardPending[i]) + rewardByNft[id][i] = amount + + if (!rewardPendings[pid][i]) { + rewardPendings[pid][i] = amount + } else { + rewardPendings[pid][i] = rewardPendings[pid][i].add(amount) + } + }) + } + } + }) + + userInfo[farm.id] = { + joinedPositions, + rewardPendings, + rewardByNft, + } + }) + return userInfo + }, [result, params, farms, positions]) +} + +export function useUserInfoByFarm(farmAddress: string): UserInfo { + const userFarmsInfo = useJoinedPositions() + return useMemo(() => userFarmsInfo[farmAddress] || {}, [userFarmsInfo, farmAddress]) +} diff --git a/src/state/farms/elastic/index.ts b/src/state/farms/elastic/index.ts index 0662cd98e5..9788ef976f 100644 --- a/src/state/farms/elastic/index.ts +++ b/src/state/farms/elastic/index.ts @@ -1,13 +1,11 @@ import { createSlice } from '@reduxjs/toolkit' -import { ElasticFarm, UserFarmInfo } from './types' +import { ElasticFarm } from './types' interface ElasticFarmState { [chainId: number]: { loading: boolean farms: ElasticFarm[] | null - userFarmInfo?: UserFarmInfo - loadingUserInfo: boolean poolFeeLast24h: { [poolId: string]: number } @@ -18,7 +16,6 @@ export const defaultChainData = { loading: false, farms: [], poolFeeLast24h: {}, - loadingUserInfo: false, } as ElasticFarmState[number] const initialState: ElasticFarmState = {} @@ -38,25 +35,12 @@ const slice = createSlice({ } else state[chainId] = { ...state[chainId], loading } }, - setUserFarmInfo( - state, - { payload: { userInfo, chainId } }: { payload: { userInfo: UserFarmInfo; chainId: number } }, - ) { - state[chainId].userFarmInfo = userInfo - }, - setPoolFeeData(state, { payload: { chainId, data } }) { state[chainId].poolFeeLast24h = data }, - - setLoadingUserInfo(state, { payload: { loading, chainId } }) { - if (!state[chainId]) { - state[chainId] = { ...defaultChainData, loadingUserInfo: loading } - } else state[chainId] = { ...state[chainId], loadingUserInfo: loading } - }, }, }) -export const { setFarms, setLoading, setUserFarmInfo, setPoolFeeData, setLoadingUserInfo } = slice.actions +export const { setFarms, setLoading, setPoolFeeData } = slice.actions export default slice.reducer diff --git a/src/state/farms/elastic/types.ts b/src/state/farms/elastic/types.ts index e3c9f0c60a..cdeff655aa 100644 --- a/src/state/farms/elastic/types.ts +++ b/src/state/farms/elastic/types.ts @@ -50,7 +50,6 @@ export class NFTPosition extends Position { } export interface UserInfo { - depositedPositions: NFTPosition[] joinedPositions: { [pid: string]: NFTPosition[] } diff --git a/src/state/farms/elastic/updaters/index.tsx b/src/state/farms/elastic/updaters/index.tsx index 2dfa4e23a0..7dc46ae736 100644 --- a/src/state/farms/elastic/updaters/index.tsx +++ b/src/state/farms/elastic/updaters/index.tsx @@ -1,5 +1,4 @@ -import { CHAINS_SUPPORT_NEW_POOL_FARM_API } from 'constants/networks' -import { useActiveWeb3React } from 'hooks' +import { useKyberSwapConfig } from 'state/application/hooks' import useGetUserFarmingInfo from './useGetUserElasticFarmInfo' import FarmUpdaterV1 from './v1' @@ -10,15 +9,11 @@ export type CommonProps = { } const FarmUpdater: React.FC = ({ interval = true }) => { - const { chainId } = useActiveWeb3React() + const { isEnableKNProtocol } = useKyberSwapConfig() - useGetUserFarmingInfo(interval) + useGetUserFarmingInfo() - if (!chainId) { - return null - } - - if (CHAINS_SUPPORT_NEW_POOL_FARM_API.includes(chainId)) { + if (isEnableKNProtocol) { return } else { return diff --git a/src/state/farms/elastic/updaters/useGetUserElasticFarmInfo.ts b/src/state/farms/elastic/updaters/useGetUserElasticFarmInfo.ts index 40ae345941..e7937aa06d 100644 --- a/src/state/farms/elastic/updaters/useGetUserElasticFarmInfo.ts +++ b/src/state/farms/elastic/updaters/useGetUserElasticFarmInfo.ts @@ -1,27 +1,14 @@ import { gql, useLazyQuery } from '@apollo/client' -import { defaultAbiCoder } from '@ethersproject/abi' -import { getCreate2Address } from '@ethersproject/address' -import { keccak256 } from '@ethersproject/solidity' -import { Currency, CurrencyAmount } from '@kyberswap/ks-sdk-core' -import { BigNumber } from 'ethers' -import { Interface } from 'ethers/lib/utils' -import { useCallback, useEffect, useRef } from 'react' +import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import NFTPositionManagerABI from 'constants/abis/v2/ProAmmNFTPositionManager.json' -import ELASTIC_FARM_ABI from 'constants/abis/v2/farm.json' -import { NETWORKS_INFO, isEVM } from 'constants/networks' +import { isEVM } from 'constants/networks' import { useActiveWeb3React } from 'hooks' -import { useMulticallContract } from 'hooks/useContract' import { useKyberSwapConfig } from 'state/application/hooks' import { useAppSelector } from 'state/hooks' import { usePoolBlocks } from 'state/prommPools/hooks' -import { setLoadingUserInfo, setPoolFeeData, setUserFarmInfo } from '..' -import { NFTPosition, UserFarmInfo } from '../types' - -const farmInterface = new Interface(ELASTIC_FARM_ABI) -const positionManagerInterface = new Interface(NFTPositionManagerABI.abi) +import { setPoolFeeData } from '..' const POOL_FEE_HISTORY = gql` query poolFees($block: Int!, $poolIds: [String]!) { @@ -32,225 +19,12 @@ const POOL_FEE_HISTORY = gql` } ` -const defaultChainData = { - loading: false, - farms: null, - poolFeeLast24h: {}, -} -const useGetUserFarmingInfo = (interval?: boolean) => { +const useGetUserFarmingInfo = () => { const dispatch = useDispatch() - const { chainId, account } = useActiveWeb3React() - const multicallContract = useMulticallContract() + const { chainId } = useActiveWeb3React() const { elasticClient } = useKyberSwapConfig() - const elasticFarm = useAppSelector(state => state.elasticFarm[chainId || 1]) || defaultChainData - - const getUserFarmInfo = useCallback(async () => { - const farmAddresses = elasticFarm.farms?.map(farm => farm.id) - - if (isEVM(chainId) && account && farmAddresses?.length && multicallContract) { - dispatch(setLoadingUserInfo({ loading: true, chainId })) - // get userDepositedNFTs - const userDepositedNFTsFragment = farmInterface.getFunction('getDepositedNFTs') - const callData = farmInterface.encodeFunctionData(userDepositedNFTsFragment, [account]) - - const chunks = farmAddresses.map(address => ({ - target: address, - callData, - })) - - const multicallRes = await multicallContract.callStatic.tryBlockAndAggregate(false, chunks) - const returnData = multicallRes.returnData - // listNFTs by contract - const nftResults: Array> = returnData.map((data: [boolean, string]) => { - try { - return data[0] ? farmInterface.decodeFunctionResult(userDepositedNFTsFragment, data[1]).listNFTs : [] - } catch { - return [] - } - }) - - /* - * GET DETAIL NFT - */ - const allNFTs = nftResults.flat() - const nftDetailFragment = positionManagerInterface.getFunction('positions') - const nftDetailChunks = allNFTs.map(id => ({ - target: NETWORKS_INFO[chainId].elastic.nonfungiblePositionManager, - callData: positionManagerInterface.encodeFunctionData(nftDetailFragment, [id]), - })) - - const detailNFTMultiCallData = (await multicallContract.callStatic.tryBlockAndAggregate(false, nftDetailChunks)) - .returnData - - const nftDetailResult = detailNFTMultiCallData.map((data: [boolean, string]) => - data[0] ? positionManagerInterface.decodeFunctionResult(nftDetailFragment, data[1]) : null, - ) - - type NFT_INFO = { - [id: string]: { - poolAddress: string - liquidity: BigNumber - tickLower: BigNumber - tickUpper: BigNumber - } - } - const nftInfos = nftDetailResult.reduce((acc: NFT_INFO, item: any, index: number) => { - if (!item) return acc - return { - ...acc, - [allNFTs[index].toString()]: { - poolAddress: getCreate2Address( - NETWORKS_INFO[chainId].elastic.coreFactory, - keccak256( - ['bytes'], - [ - defaultAbiCoder.encode( - ['address', 'address', 'uint24'], - [item.info.token0, item.info.token1, item.info.fee], - ), - ], - ), - NETWORKS_INFO[chainId].elastic.initCodeHash, - ), - liquidity: item.pos.liquidity, - tickLower: item.pos.tickLower, - tickUpper: item.pos.tickUpper, - }, - } - }, {} as NFT_INFO) - - const promises = - elasticFarm.farms?.map(async (farm, index) => { - const nfts = nftResults[index] - - const depositedPositions: NFTPosition[] = [] - const joinedPositions: { [pid: string]: NFTPosition[] } = {} - const rewardPendings: { [pid: string]: CurrencyAmount[] } = {} - const rewardByNft: { [pid_nftId: string]: CurrencyAmount[] } = {} - - const userInfoParams: Array<[BigNumber, string]> = [] - nfts.forEach(id => { - const matchedPools = farm.pools.filter( - p => p.poolAddress.toLowerCase() === nftInfos[id.toString()]?.poolAddress.toLowerCase(), - ) - - matchedPools.forEach(pool => { - userInfoParams.push([id, pool.pid]) - }) - - if (matchedPools?.[0]) { - const pos = new NFTPosition({ - nftId: id, - pool: matchedPools[0].pool, - liquidity: nftInfos[id.toString()].liquidity, - tickLower: nftInfos[id.toString()].tickLower, - tickUpper: nftInfos[id.toString()].tickUpper, - }) - depositedPositions.push(pos) - } - }) - - const getUserInfoFragment = farmInterface.getFunction('getUserInfo') - if (nfts.length) { - const returnData = ( - await multicallContract.callStatic.tryBlockAndAggregate( - false, - userInfoParams.map(params => { - return { - target: farm.id, - callData: farmInterface.encodeFunctionData(getUserInfoFragment, params), - } - }), - ) - ).returnData.map((item: [boolean, string]) => item[1]) - - const result = returnData.map((data: string) => { - try { - return farmInterface.decodeFunctionResult(getUserInfoFragment, data) - } catch (e) { - return e - } - }) - userInfoParams.forEach((param, index) => { - const pid = param[1].toString() - const nftId = param[0] - if (!(result[index] instanceof Error)) { - if (!joinedPositions[pid]) { - joinedPositions[pid] = [] - } - - const depositedPos = depositedPositions.find(pos => pos.nftId.eq(nftId)) - const farmingPool = farm.pools.find(p => p.pid === pid) - - if (depositedPos && farmingPool) { - const pos = new NFTPosition({ - nftId, - liquidity: result[index].liquidity, - tickLower: depositedPos.tickLower, - tickUpper: depositedPos.tickUpper, - pool: depositedPos.pool, - }) - joinedPositions[pid].push(pos) - - const id = `${pid}_${nftId.toString()}` - if (!rewardByNft[id]) { - rewardByNft[id] = [] - } - if (!rewardPendings[pid]) { - rewardPendings[pid] = [] - } - farmingPool.rewardTokens.forEach((currency, i) => { - const amount = CurrencyAmount.fromRawAmount(currency, result[index].rewardPending[i]) - rewardByNft[id][i] = amount - - if (!rewardPendings[pid][i]) { - rewardPendings[pid][i] = amount - } else { - rewardPendings[pid][i] = rewardPendings[pid][i].add(amount) - } - }) - } - } - }) - } - return { - depositedPositions, - joinedPositions, - rewardPendings, - rewardByNft, - } - }) || [] - - const res = await Promise.all(promises) - - const userInfo = elasticFarm.farms?.reduce((userInfo, farm, index) => { - return { - ...userInfo, - [farm.id]: res[index], - } - }, {} as UserFarmInfo) - - dispatch(setLoadingUserInfo({ chainId, loading: false })) - if (userInfo) dispatch(setUserFarmInfo({ chainId, userInfo })) - } - }, [elasticFarm.farms, chainId, account, multicallContract, dispatch]) - - const getUserFarmInfoRef = useRef(getUserFarmInfo) - getUserFarmInfoRef.current = getUserFarmInfo - - useEffect(() => { - getUserFarmInfoRef.current() - - const i = interval - ? setInterval(() => { - getUserFarmInfoRef.current() - }, 10_000) - : undefined - return () => { - i && clearInterval(i) - } - }, [interval, account, elasticFarm.farms?.length]) + const farms = useAppSelector(state => state.elasticFarm[chainId || 1]?.farms) const { blockLast24h } = usePoolBlocks() const [getPoolInfo, { data: poolFeeData }] = useLazyQuery(POOL_FEE_HISTORY, { @@ -276,7 +50,7 @@ const useGetUserFarmingInfo = (interval?: boolean) => { useEffect(() => { if (!isEVM(chainId)) return - const poolIds = elasticFarm.farms?.map(item => item.pools.map(p => p.poolAddress.toLowerCase())).flat() + const poolIds = farms?.map(item => item.pools.map(p => p.poolAddress.toLowerCase())).flat() if (blockLast24h && poolIds?.length) { getPoolInfo({ @@ -286,7 +60,7 @@ const useGetUserFarmingInfo = (interval?: boolean) => { }, }) } - }, [elasticFarm.farms, blockLast24h, getPoolInfo, chainId]) + }, [farms, blockLast24h, getPoolInfo, chainId]) } export default useGetUserFarmingInfo diff --git a/src/state/farms/elastic/updaters/v1.tsx b/src/state/farms/elastic/updaters/v1.tsx index 028ac26b2f..6d1958b937 100644 --- a/src/state/farms/elastic/updaters/v1.tsx +++ b/src/state/farms/elastic/updaters/v1.tsx @@ -1,5 +1,5 @@ import { gql, useLazyQuery } from '@apollo/client' -import { ChainId, CurrencyAmount, Token, TokenAmount, WETH } from '@kyberswap/ks-sdk-core' +import { CurrencyAmount, Token, TokenAmount, WETH } from '@kyberswap/ks-sdk-core' import { FeeAmount, Pool, Position } from '@kyberswap/ks-sdk-elastic' import { useEffect } from 'react' @@ -153,9 +153,11 @@ const FarmUpdaterV1: React.FC = ({ interval }) => { useEffect(() => { if (!elasticFarm.farms && !elasticFarm.loading) { dispatch(setLoading({ chainId, loading: true })) - getElasticFarms().finally(() => { + try { + getElasticFarms() + } finally { dispatch(setLoading({ chainId, loading: false })) - }) + } } }, [elasticFarm, getElasticFarms, dispatch, chainId]) @@ -163,7 +165,7 @@ const FarmUpdaterV1: React.FC = ({ interval }) => { const i = interval ? setInterval(() => { getElasticFarms() - }, 10_000) + }, 20_000) : undefined return () => { i && clearInterval(i) @@ -178,7 +180,7 @@ const FarmUpdaterV1: React.FC = ({ interval }) => { }, [error, dispatch, chainId]) useEffect(() => { - if (data?.farms && chainId) { + if (data?.farms && chainId && !elasticFarm?.farms?.length) { // transform farm data const formattedData: ElasticFarm[] = data.farms.map((farm: SubgraphFarm) => { return { @@ -236,7 +238,7 @@ const FarmUpdaterV1: React.FC = ({ interval }) => { return { startTime: Number(pool.startTime), - endTime: chainId === ChainId.AVAXMAINNET && pool.pid === '125' ? 1680104783 : Number(pool.endTime), + endTime: Number(pool.endTime), pid: pool.pid, id: pool.id, feeTarget: pool.feeTarget, @@ -266,7 +268,7 @@ const FarmUpdaterV1: React.FC = ({ interval }) => { }) dispatch(setFarms({ chainId, farms: formattedData })) } - }, [data, dispatch, chainId]) + }, [data, dispatch, chainId, elasticFarm]) return null } diff --git a/src/state/farms/elastic/updaters/v2.tsx b/src/state/farms/elastic/updaters/v2.tsx index 88c31bd99f..0494a5e3c5 100644 --- a/src/state/farms/elastic/updaters/v2.tsx +++ b/src/state/farms/elastic/updaters/v2.tsx @@ -48,7 +48,9 @@ const useGetElasticFarms = () => { : '' return useSWR(endpoint, (url: string) => fetch(url).then(resp => resp.json()), { - refreshInterval: 10_000, + revalidateIfStale: false, + revalidateOnFocus: false, + revalidateOnReconnect: false, }) } diff --git a/src/state/farms/elasticv2/types.ts b/src/state/farms/elasticv2/types.ts index 7ee3b293ea..658062c1b1 100644 --- a/src/state/farms/elasticv2/types.ts +++ b/src/state/farms/elasticv2/types.ts @@ -27,8 +27,6 @@ export interface ElasticFarmV2 { token0: Currency token1: Currency tvl: number - tvlToken0: CurrencyAmount - tvlToken1: CurrencyAmount totalRewards: Array> ranges: Array } @@ -62,7 +60,8 @@ export interface SubgraphFarmV2 { endTime: string isSettled: boolean liquidity: string - depositedPositions: Array<{ + stakedTvl?: string + depositedPositions?: Array<{ id: string position: { id: string diff --git a/src/state/farms/elasticv2/updater.tsx b/src/state/farms/elasticv2/updater.tsx index b6aaa41b27..ef521f06dd 100644 --- a/src/state/farms/elasticv2/updater.tsx +++ b/src/state/farms/elasticv2/updater.tsx @@ -6,7 +6,8 @@ import { CurrencyAmount, Token, WETH } from '@kyberswap/ks-sdk-core' import { FeeAmount, Pool, Position } from '@kyberswap/ks-sdk-elastic' import { BigNumber } from 'ethers' import { Interface } from 'ethers/lib/utils' -import { useEffect } from 'react' +import { useEffect, useMemo, useRef } from 'react' +import { useLazyGetFarmV2Query } from 'services/knprotocol' import FarmV2QuoterABI from 'constants/abis/farmv2Quoter.json' import NFTPositionManagerABI from 'constants/abis/v2/ProAmmNFTPositionManager.json' @@ -107,6 +108,7 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b const { networkInfo, isEVM, chainId, account } = useActiveWeb3React() const elasticFarm = useAppSelector(state => state.elasticFarmV2[chainId] || defaultChainData) const { elasticClient } = useKyberSwapConfig() + const isEnableKNProtocol = true const multicallContract = useMulticallContract() const farmv2QuoterContract = useContract( @@ -114,30 +116,53 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b FarmV2QuoterABI, ) - const [getElasticFarmV2, { data, error }] = useLazyQuery(queryFarms, { + const [getElasticFarmV2, { data: subgraphData, error: subgraphError }] = useLazyQuery(queryFarms, { client: elasticClient, fetchPolicy: 'network-only', }) + const [getElasticFarmV2FromKnProtocol, { data: knProtocolData, error: knProtocolError }] = useLazyGetFarmV2Query() + + const latestKnProtocolData = useRef(knProtocolData) + + const data = useMemo(() => { + if (isEnableKNProtocol) { + return { + farmV2S: knProtocolData?.data?.data || latestKnProtocolData.current?.data?.data || [], + } + } else return subgraphData + }, [isEnableKNProtocol, knProtocolData, subgraphData]) + + const error = useMemo(() => { + if (isEnableKNProtocol) return knProtocolError + return subgraphError + }, [isEnableKNProtocol, subgraphError, knProtocolError]) + useEffect(() => { if (isEVM && !elasticFarm?.farms && !elasticFarm?.loading) { dispatch(setLoading({ chainId, loading: true })) - getElasticFarmV2().finally(() => { - dispatch(setLoading({ chainId, loading: false })) - }) + if (isEnableKNProtocol) { + getElasticFarmV2FromKnProtocol(chainId).finally(() => { + dispatch(setLoading({ chainId, loading: false })) + }) + } else + getElasticFarmV2().finally(() => { + dispatch(setLoading({ chainId, loading: false })) + }) } - }, [isEVM, chainId, dispatch, getElasticFarmV2, elasticFarm]) + }, [isEVM, chainId, dispatch, getElasticFarmV2, elasticFarm, getElasticFarmV2FromKnProtocol, isEnableKNProtocol]) useEffect(() => { const i = interval ? setInterval(() => { - getElasticFarmV2() + if (isEnableKNProtocol) getElasticFarmV2FromKnProtocol(chainId) + else getElasticFarmV2() }, 10_000) : undefined return () => { i && clearInterval(i) } - }, [interval, dispatch, getElasticFarmV2]) + }, [interval, chainId, dispatch, getElasticFarmV2, getElasticFarmV2FromKnProtocol, isEnableKNProtocol]) useEffect(() => { if (error && chainId) { @@ -148,9 +173,12 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b const { fetchPrices } = useTokenPricesWithLoading([]) + const tokensRef = useRef([]) + const pricesRef = useRef<{ [key: string]: number | undefined }>({}) + useEffect(() => { const getData = async () => { - if (data?.farmV2S && chainId) { + if (data?.farmV2S.length && chainId) { const tokens = [ ...new Set( data.farmV2S @@ -167,7 +195,12 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b ), ] as string[] - const prices = await fetchPrices(tokens) + let prices = pricesRef.current + if (tokensRef.current.sort().join() !== tokens.sort().join()) { + tokensRef.current = tokens + prices = await fetchPrices(tokens) + pricesRef.current = prices + } const formattedData: ElasticFarmV2[] = data.farmV2S.map((farm: SubgraphFarmV2) => { const getToken = (t: SubgraphToken, keepWrapped = false) => { @@ -193,23 +226,29 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b farm.pool.reinvestL, Number(farm.pool.tick), ) - let tvlToken0 = CurrencyAmount.fromRawAmount(token0.wrapped, 0) - let tvlToken1 = CurrencyAmount.fromRawAmount(token1.wrapped, 0) - - farm.depositedPositions.forEach(pos => { - const position = new Position({ - pool: p, - liquidity: pos.position.liquidity, - tickLower: Number(pos.position.tickLower.tickIdx), - tickUpper: Number(pos.position.tickUpper.tickIdx), - }) - tvlToken0 = tvlToken0.add(position.amount0) - tvlToken1 = tvlToken1.add(position.amount1) - }) - const tvl = - Number(tvlToken0.toExact() || '0') * (prices[farm.pool.token0.id] || 0) + - Number(tvlToken1.toExact() || '0') * (prices[farm.pool.token1.id] || 0) + let tvl = 0 + if (farm.stakedTvl) { + tvl = +farm.stakedTvl + } else { + let tvlToken0 = CurrencyAmount.fromRawAmount(token0.wrapped, 0) + let tvlToken1 = CurrencyAmount.fromRawAmount(token1.wrapped, 0) + + farm.depositedPositions?.forEach(pos => { + const position = new Position({ + pool: p, + liquidity: pos.position.liquidity, + tickLower: Number(pos.position.tickLower.tickIdx), + tickUpper: Number(pos.position.tickUpper.tickIdx), + }) + + tvlToken0 = tvlToken0.add(position.amount0) + tvlToken1 = tvlToken1.add(position.amount1) + }) + tvl = + Number(tvlToken0.toExact() || '0') * (prices[farm.pool.token0.id] || 0) + + Number(tvlToken1.toExact() || '0') * (prices[farm.pool.token1.id] || 0) + } const totalRewards = farm.rewards.map(item => CurrencyAmount.fromRawAmount(getToken(item.token, true), item.amount), @@ -227,8 +266,6 @@ export default function ElasticFarmV2Updater({ interval = true }: { interval?: b token0, token1, totalRewards, - tvlToken0, - tvlToken1, tvl, ranges: farm.ranges.map(r => { // https://www.notion.so/kybernetwork/LM-v2-APR-Formula-15b8606e820745b59a5a3aded8bf46e0 diff --git a/src/state/index.ts b/src/state/index.ts index 7b55412f68..caffdcdc0c 100644 --- a/src/state/index.ts +++ b/src/state/index.ts @@ -16,8 +16,10 @@ import crosschainApi from '../services/crossChain' import earningApi from '../services/earning' import geckoTerminalApi from '../services/geckoTermial' import identifyApi from '../services/identity' +import knProtocolApi from '../services/knprotocol' import ksSettingApi from '../services/ksSetting' import kyberDAO from '../services/kyberDAO' +import limitOrderApi from '../services/limitOrder' import socialApi from '../services/social' import application from './application/reducer' import authen from './authen/reducer' @@ -93,6 +95,7 @@ const store = configureStore({ [publicAnnouncementApi.reducerPath]: publicAnnouncementApi.reducer, [geckoTerminalApi.reducerPath]: geckoTerminalApi.reducer, [coingeckoApi.reducerPath]: coingeckoApi.reducer, + [limitOrderApi.reducerPath]: limitOrderApi.reducer, [kyberAIApi.reducerPath]: kyberAIApi.reducer, [kyberAISubscriptionApi.reducerPath]: kyberAISubscriptionApi.reducer, @@ -116,12 +119,14 @@ const store = configureStore({ [tokenApi.reducerPath]: tokenApi.reducer, [socialApi.reducerPath]: socialApi.reducer, [blockServiceApi.reducerPath]: blockServiceApi.reducer, + [knProtocolApi.reducerPath]: knProtocolApi.reducer, }, middleware: getDefaultMiddleware => getDefaultMiddleware({ thunk: true, immutableCheck: false, serializableCheck: false }) .concat(save({ states: PERSISTED_KEYS, debounce: 100 })) .concat(geckoTerminalApi.middleware) .concat(coingeckoApi.middleware) + .concat(limitOrderApi.middleware) .concat(kyberAIApi.middleware) .concat(kyberAISubscriptionApi.middleware) .concat(announcementApi.middleware) @@ -135,7 +140,8 @@ const store = configureStore({ .concat(earningApi.middleware) .concat(socialApi.middleware) .concat(tokenApi.middleware) - .concat(blockServiceApi.middleware), + .concat(blockServiceApi.middleware) + .concat(knProtocolApi.middleware), preloadedState, }) diff --git a/src/state/lists/updater.ts b/src/state/lists/updater.ts index ec913e12c9..cae41c91d5 100644 --- a/src/state/lists/updater.ts +++ b/src/state/lists/updater.ts @@ -1,7 +1,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import { useLazyGetTokenListQuery } from 'services/ksSetting' +import { useGetChainsConfigurationQuery, useLazyGetTokenListQuery } from 'services/ksSetting' import { MAINNET_NETWORKS } from 'constants/networks' import { TokenMap, formatAndCacheToken } from 'hooks/Tokens' @@ -29,6 +29,7 @@ export default function Updater(): null { const dispatch = useDispatch() const [fetchTokenList] = useLazyGetTokenListQuery() + useGetChainsConfigurationQuery() useEffect(() => { const getTokens = async () => { diff --git a/src/state/mint/proamm/utils.ts b/src/state/mint/proamm/utils.ts index a69b7d9eaf..d8efdc6afa 100644 --- a/src/state/mint/proamm/utils.ts +++ b/src/state/mint/proamm/utils.ts @@ -1,14 +1,20 @@ +import { defaultAbiCoder } from '@ethersproject/abi' +import { keccak256 } from '@ethersproject/solidity' import { Price, Token } from '@kyberswap/ks-sdk-core' import { FeeAmount, + Pool, TICK_SPACINGS, TickMath, encodeSqrtRatioX96, nearestUsableTick, priceToClosestTick, } from '@kyberswap/ks-sdk-elastic' +import { getCreate2Address } from 'ethers/lib/utils' import JSBI from 'jsbi' +import { NETWORKS_INFO } from 'constants/networks' +import { EVMNetworkInfo } from 'constants/networks/type' import { rangeData } from 'pages/AddLiquidityV2/constants' import { PairFactor } from 'state/topTokens/type' @@ -88,3 +94,15 @@ export const getRangeTicks = ( return result } + +export function getPoolAddress(pool: Pool): string { + const networkInfo = NETWORKS_INFO[pool.token0.chainId] as EVMNetworkInfo + return getCreate2Address( + networkInfo.elastic.coreFactory, + keccak256( + ['bytes'], + [defaultAbiCoder.encode(['address', 'address', 'uint24'], [pool.token0.address, pool.token1.address, pool.fee])], + ), + networkInfo.elastic.initCodeHash, + ) +} diff --git a/src/state/multicall/hooks.ts b/src/state/multicall/hooks.ts index 3b5a4b09c2..8460ae845b 100644 --- a/src/state/multicall/hooks.ts +++ b/src/state/multicall/hooks.ts @@ -2,12 +2,11 @@ import { FunctionFragment, Interface } from '@ethersproject/abi' import { BigNumber } from '@ethersproject/bignumber' import { Contract } from '@ethersproject/contracts' import { ChainId } from '@kyberswap/ks-sdk-core' -import { useEffect, useMemo } from 'react' +import { useEffect, useMemo, useRef } from 'react' import { useDispatch, useSelector } from 'react-redux' import { EMPTY_ARRAY } from 'constants/index' import { useActiveWeb3React } from 'hooks' -import { useBlockNumber } from 'state/application/hooks' import { AppDispatch, AppState } from 'state/index' import { @@ -53,7 +52,7 @@ export const NEVER_RELOAD: ListenerOptions = { } // the lowest level call for subscribing to contract data -function useCallsData(calls: (Call | undefined)[], options?: ListenerOptions): CallResult[] { +export function useCallsData(calls: (Call | undefined)[], options?: ListenerOptions): CallResult[] { const { chainId, isEVM } = useActiveWeb3React() const callResults = useSelector( state => state.multicall.callResults?.[chainId], @@ -98,23 +97,40 @@ function useCallsData(calls: (Call | undefined)[], options?: ListenerOptions): C } }, [isEVM, dispatch, options, serializedCallKeys, chainId]) - return useMemo( - () => - isEVM && calls.length - ? calls.map(call => { - if (!call) return INVALID_RESULT - - const result = callResults?.[toCallKey(call)] - let data - if (result?.data && result?.data !== '0x') { - data = result.data - } + const lastResults = useRef([]) + return useMemo(() => { + let isChanged = lastResults.current.length !== calls.length + + // Construct results using a for-loop to handle sparse arrays. + // Array.prototype.map would skip empty entries. + const results: CallResult[] = [] + for (let i = 0; i < calls.length; ++i) { + const call = calls[i] + let result = INVALID_RESULT + if (call) { + const callResult = callResults?.[toCallKey(call)] + result = { + valid: true, + data: callResult?.data && callResult.data !== '0x' ? callResult.data : undefined, + blockNumber: callResult?.blockNumber, + } + } - return { valid: true, data, blockNumber: result?.blockNumber } - }) - : EMPTY_ARRAY, - [callResults, calls, isEVM], - ) + isChanged = isChanged || !areCallResultsEqual(result, lastResults.current[i]) + results.push(result) + } + + // Force the results to be referentially stable if they have not changed. + // This is necessary because *all* callResults are passed as deps when initially memoizing the results. + if (isChanged) { + lastResults.current = results + } + return lastResults.current + }, [callResults, calls]) +} + +function areCallResultsEqual(a: CallResult, b: CallResult) { + return a.valid === b.valid && a.data === b.data && a.blockNumber === b.blockNumber } interface CallState { @@ -124,27 +140,24 @@ interface CallState { // true if the result has never been fetched readonly loading: boolean // true if the result is not for the latest block - readonly syncing: boolean + // readonly syncing: boolean // true if the call was made and is synced, but the return data is invalid readonly error: boolean } -const INVALID_CALL_STATE: CallState = { valid: false, result: undefined, loading: false, syncing: false, error: false } -const LOADING_CALL_STATE: CallState = { valid: true, result: undefined, loading: true, syncing: true, error: false } +const INVALID_CALL_STATE: CallState = { valid: false, result: undefined, loading: false, error: false } +const LOADING_CALL_STATE: CallState = { valid: true, result: undefined, loading: true, error: false } -function toCallState( +export function toCallState( callResult: CallResult | undefined, contractInterface: Interface | undefined, fragment: FunctionFragment | undefined, - latestBlockNumber: number | undefined, ): CallState { - if (!callResult) return INVALID_CALL_STATE - const { valid, data, blockNumber } = callResult - if (!valid) return INVALID_CALL_STATE - if (valid && !blockNumber) return LOADING_CALL_STATE - if (!contractInterface || !fragment || !latestBlockNumber) return LOADING_CALL_STATE + if (!callResult || !callResult.valid) return INVALID_CALL_STATE + const { data, blockNumber } = callResult + if (!blockNumber || !contractInterface || !fragment) return LOADING_CALL_STATE const success = data && data.length > 2 - const syncing = (blockNumber ?? 0) < latestBlockNumber + // const syncing = blockNumber < latestBlockNumber let result: Result | undefined = undefined if (success && data) { try { @@ -155,7 +168,6 @@ function toCallState( valid: true, loading: false, error: true, - syncing, result, } } @@ -163,7 +175,6 @@ function toCallState( return { valid: true, loading: false, - syncing, result: result, error: !success, } @@ -197,11 +208,9 @@ export function useSingleContractMultipleData( const results = useCallsData(calls, options) - const latestBlockNumber = useBlockNumber() - return useMemo(() => { - return isEVM ? results.map(result => toCallState(result, contract?.interface, fragment, latestBlockNumber)) : [] - }, [isEVM, fragment, contract, results, latestBlockNumber]) + return isEVM ? results.map(result => toCallState(result, contract?.interface, fragment)) : [] + }, [isEVM, fragment, contract, results]) } export function useMultipleContractSingleData( @@ -243,12 +252,10 @@ export function useMultipleContractSingleData( const results = useCallsData(calls, options) - const latestBlockNumber = useBlockNumber() - return useMemo(() => { - if (isEVM) return results.map(result => toCallState(result, contractInterface, fragment, latestBlockNumber)) + if (isEVM) return results.map(result => toCallState(result, contractInterface, fragment)) return [] - }, [isEVM, results, contractInterface, fragment, latestBlockNumber]) + }, [isEVM, results, contractInterface, fragment]) } export function useSingleCallResult( @@ -276,11 +283,10 @@ export function useSingleCallResult( }, [isEVM, contract, fragment, inputs, gasRequired]) const { valid, data, blockNumber } = useCallsData(calls, options)[0] || {} - const latestBlockNumber = useBlockNumber() return useMemo(() => { - return toCallState({ valid, data, blockNumber }, contract?.interface, fragment, latestBlockNumber) - }, [valid, data, blockNumber, contract, fragment, latestBlockNumber]) + return toCallState({ valid, data, blockNumber }, contract?.interface, fragment) + }, [valid, data, blockNumber, contract, fragment]) } export function useSingleContractWithCallData( @@ -305,16 +311,9 @@ export function useSingleContractWithCallData( const results = useCallsData(calls, options) - const latestBlockNumber = useBlockNumber() - return useMemo(() => { return results.map((result, i) => - toCallState( - result, - contract?.interface, - contract?.interface?.getFunction(callDatas[i].substring(0, 10)), - latestBlockNumber, - ), + toCallState(result, contract?.interface, contract?.interface?.getFunction(callDatas[i].substring(0, 10))), ) - }, [contract, results, latestBlockNumber, callDatas]) + }, [contract, results, callDatas]) } diff --git a/src/state/prommPools/useGetElasticPools/index.ts b/src/state/prommPools/useGetElasticPools/index.ts index f78f657c1f..127cda4f38 100644 --- a/src/state/prommPools/useGetElasticPools/index.ts +++ b/src/state/prommPools/useGetElasticPools/index.ts @@ -1,5 +1,4 @@ -import { CHAINS_SUPPORT_NEW_POOL_FARM_API } from 'constants/networks' -import { useActiveWeb3React } from 'hooks' +import { useKyberSwapConfig } from 'state/application/hooks' import { ElasticPoolDetail } from 'types/pool' import useGetElasticPoolsV1 from './useGetElasticPoolsV1' @@ -14,13 +13,12 @@ export type CommonReturn = { } const useGetElasticPools = (poolAddresses: string[]): CommonReturn => { - const { chainId } = useActiveWeb3React() + const { isEnableKNProtocol } = useKyberSwapConfig() - const shouldRunV2 = CHAINS_SUPPORT_NEW_POOL_FARM_API.includes(chainId) - const responseV1 = useGetElasticPoolsV1(poolAddresses, shouldRunV2) + const responseV1 = useGetElasticPoolsV1(poolAddresses) const responseV2 = useGetElasticPoolsV2() - if (shouldRunV2) { + if (isEnableKNProtocol) { return responseV2 } diff --git a/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV1.ts b/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV1.ts index 790ca9f6bc..512f9120f9 100644 --- a/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV1.ts +++ b/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV1.ts @@ -124,15 +124,15 @@ const parsedPoolData = ( return formatted } -const useGetElasticPoolsV1 = (poolAddresses: string[], skip?: boolean): CommonReturn => { - const { elasticClient } = useKyberSwapConfig() +const useGetElasticPoolsV1 = (poolAddresses: string[]): CommonReturn => { + const { elasticClient, isEnableKNProtocol } = useKyberSwapConfig() const { blockLast24h } = usePoolBlocks() const { loading, error, data } = useQuery(PROMM_POOLS_BULK(undefined, poolAddresses), { client: elasticClient, fetchPolicy: 'no-cache', - skip, + skip: isEnableKNProtocol, }) const { @@ -142,7 +142,7 @@ const useGetElasticPoolsV1 = (poolAddresses: string[], skip?: boolean): CommonRe } = useQuery(PROMM_POOLS_BULK(blockLast24h, poolAddresses), { client: elasticClient, fetchPolicy: 'no-cache', - skip, + skip: isEnableKNProtocol, }) const anyError = error24?.message.includes('Failed to decode `block.number`') diff --git a/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV2.ts b/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV2.ts index cdd34eeede..f071b96f8a 100644 --- a/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV2.ts +++ b/src/state/prommPools/useGetElasticPools/useGetElasticPoolsV2.ts @@ -1,8 +1,9 @@ import useSWRImmutable from 'swr/immutable' import { POOL_FARM_BASE_URL } from 'constants/env' -import { CHAINS_SUPPORT_NEW_POOL_FARM_API, NETWORKS_INFO, isEVM } from 'constants/networks' +import { NETWORKS_INFO, isEVM } from 'constants/networks' import { useActiveWeb3React } from 'hooks' +import { useKyberSwapConfig } from 'state/application/hooks' import { ElasticPoolDetail } from 'types/pool' import { CommonReturn } from '.' @@ -50,20 +51,20 @@ type PoolAccumulator = { [address: string]: ElasticPoolDetail } const useGetElasticPoolsV2 = (): CommonReturn => { const { chainId } = useActiveWeb3React() + const { isEnableKNProtocol } = useKyberSwapConfig() - const shouldSkip = !isEVM(chainId) || !CHAINS_SUPPORT_NEW_POOL_FARM_API.includes(chainId) const chainRoute = !isEVM(chainId) || NETWORKS_INFO[chainId].poolFarmRoute const { isValidating, error, data } = useSWRImmutable( - `${POOL_FARM_BASE_URL}/${chainRoute}/api/v1/elastic-new/pools?includeLowTvl=true&page=1&perPage=10000`, + `${POOL_FARM_BASE_URL}/${chainRoute}/api/v1/elastic-new/pools?includeLowTvl=true&page=1&perPage=10000&thisParamToForceRefresh=${isEnableKNProtocol}`, async (url: string) => { - if (shouldSkip) { + if (!isEnableKNProtocol) { return Promise.resolve({}) } return fetch(url).then(resp => resp.json()) }, { - refreshInterval: shouldSkip ? 0 : 60_000, + refreshInterval: isEnableKNProtocol ? 0 : 60_000, }, ) diff --git a/src/state/tokenPrices/hooks.ts b/src/state/tokenPrices/hooks.ts index 3f2270d044..cd0a59ce8d 100644 --- a/src/state/tokenPrices/hooks.ts +++ b/src/state/tokenPrices/hooks.ts @@ -1,5 +1,5 @@ import { ChainId } from '@kyberswap/ks-sdk-core' -import { debounce } from 'lodash' +import debounce from 'lodash/debounce' import { stringify } from 'querystring' import { useCallback, useEffect, useMemo, useState } from 'react' diff --git a/src/state/transactions/updater.tsx b/src/state/transactions/updater.tsx index a8119e4871..4813dd3cfa 100644 --- a/src/state/transactions/updater.tsx +++ b/src/state/transactions/updater.tsx @@ -13,7 +13,6 @@ import { useSetClaimingCampaignRewardId } from 'state/campaigns/hooks' import { AppDispatch, AppState } from 'state/index' import { revokePermit } from 'state/user/actions' import { findTx } from 'utils' -import { includes } from 'utils/array' import { checkedTransaction, finalizeTransaction, removeTx, replaceTx } from './actions' import { SerializableTransactionReceipt, TRANSACTION_TYPE, TransactionDetails } from './type' @@ -134,7 +133,7 @@ export default function Updater(): null { blockHash: receipt.blockHash, status: receipt.status, }, - needCheckSubgraph: includes(NEED_CHECK_SUBGRAPH_TRANSACTION_TYPES, transaction.type), + needCheckSubgraph: NEED_CHECK_SUBGRAPH_TRANSACTION_TYPES.includes(transaction.type), }), ) diff --git a/src/types/array.d.ts b/src/types/array.d.ts new file mode 100644 index 0000000000..8d250a1fb8 --- /dev/null +++ b/src/types/array.d.ts @@ -0,0 +1,8 @@ +interface Array { + /** + * Determines whether an array includes a certain element, returning true or false as appropriate. + * @param searchElement The element to search for. + * @param fromIndex The position in this array at which to begin searching for searchElement. + */ + includes(searchElement: any, fromIndex?: number): searchElement is T +} diff --git a/src/types/myEarnings.ts b/src/types/myEarnings.ts index 89e3a8ec69..5cd19e1e3e 100644 --- a/src/types/myEarnings.ts +++ b/src/types/myEarnings.ts @@ -3,6 +3,7 @@ import { ChainId } from '@kyberswap/ks-sdk-core' export type EarningsBreakdown = { totalValue: number breakdowns: Array<{ + address?: string chainId?: ChainId logoUrl?: string symbol: string diff --git a/src/types/object.d.ts b/src/types/object.d.ts new file mode 100644 index 0000000000..2bb60cea06 --- /dev/null +++ b/src/types/object.d.ts @@ -0,0 +1,7 @@ +interface ObjectConstructor { + /** + * Returns the names of the enumerable string properties and methods of an object. + * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object. + */ + keys(o: { [keys in T]: unknown }): T[] +} diff --git a/src/utils/array.ts b/src/utils/array.ts index bdaa63450f..2a348bbb9f 100644 --- a/src/utils/array.ts +++ b/src/utils/array.ts @@ -7,14 +7,6 @@ export const chunk = (arr: readonly T[], chunkSize: number): T[][] => { return result } -export const includes = ( - srcStr: readonly T[] | T[], - searchElement: any, - fromIndex?: number | undefined, -): searchElement is T => { - return (srcStr as any[]).includes(searchElement, fromIndex) -} - export const uniqueArray = (array: T[], keySelector = (item: T): U => item as any): T[] => { const set = new Set() const result: T[] = [] diff --git a/src/utils/errorMessage.ts b/src/utils/errorMessage.ts index 99246bcdd1..91eb790c42 100644 --- a/src/utils/errorMessage.ts +++ b/src/utils/errorMessage.ts @@ -2,13 +2,14 @@ import { t } from '@lingui/macro' import { didUserReject } from 'constants/connectors/utils' -function capitalizeFirstLetter(string: string) { +function capitalizeFirstLetter(str?: string) { + const string = str || '' return string.charAt(0).toUpperCase() + string.slice(1) } function parseKnownPattern(text: string): string | undefined { const error = text?.toLowerCase?.() || '' - console.info('parseError:', { text, error }) + if (!error || error.includes('router: expired')) return 'An error occurred. Refresh the page and try again ' if ( @@ -44,6 +45,7 @@ const patterns: { pattern: RegExp; getMessage: (match: RegExpExecArray) => strin getMessage: match => match[1], }, { pattern: /^([\w ]*\w+) \(.+?\)$/, getMessage: match => match[1] }, + { pattern: /"message": ?"[^"]+?"/, getMessage: match => match[1] }, ] function parseKnownRegexPattern(text: string): string | undefined { const pattern = patterns.find(pattern => pattern.pattern.exec(text)) diff --git a/src/utils/fee.ts b/src/utils/fee.ts index 8a2d798a00..daba1d412a 100644 --- a/src/utils/fee.ts +++ b/src/utils/fee.ts @@ -5,7 +5,8 @@ import { BuildRouteData } from 'services/route/types/buildRoute' import { BIPS_BASE, RESERVE_USD_DECIMALS } from 'constants/index' import { ChargeFeeBy, DetailedRouteSummary } from 'types/route' -import { formattedNum } from 'utils/index' + +import { formatDisplayNumber } from './numbers' export const calculateFeeFromBuildData = ( routeSummary: DetailedRouteSummary | undefined, @@ -39,8 +40,9 @@ export const calculateFeeFromBuildData = ( const feeUsd = buildData.feeUsd return { - feeAmount: formattedNum(fee, false), - feeAmountUsd: feeUsd && feeUsd !== '0' ? formattedNum(feeUsd, true, 4) : '', + feeAmount: formatDisplayNumber(fee, { significantDigits: 10 }), + feeAmountUsd: + feeUsd && feeUsd !== '0' ? formatDisplayNumber(feeUsd, { style: 'currency', significantDigits: 10 }) : '', currency: currencyAmountToTakeFee.currency, } } diff --git a/src/utils/firebase.ts b/src/utils/firebase.ts index 836cc74f87..d9757bc92e 100644 --- a/src/utils/firebase.ts +++ b/src/utils/firebase.ts @@ -19,7 +19,7 @@ const dbLimitOrder = getFirestore(firebaseAppLimitOrder) const COLLECTIONS = { LO_CANCELLING_ORDERS: 'cancellingOrders', - LO_CANCELLED_ORDERS: 'cancelledEvents', + LO_CANCELLED_ORDERS: 'cancelledEventsByContract', LO_EXPIRED_ORDERS: 'expiredEvents', LO_FILLED_ORDERS: 'filledEvents', @@ -82,7 +82,7 @@ function subscribeListLimitOrder( all: [], } data.forEach((e: any) => { - if (e.id.startsWith('nonce')) { + if (e.id.includes('nonce')) { result.all.push(e as AllItem) } else { result.orders.push({ ...e, id: Number(e.id) } as LimitOrder) @@ -95,10 +95,11 @@ function subscribeListLimitOrder( return unsubscribe } +export type OrderNonces = { [key: string]: number[] } export function subscribeCancellingOrders( account: string, chainId: ChainId, - callback: (data: { orderIds: number[]; nonces: number[] }) => void, + callback: (data: { orderIds: number[]; noncesByContract: OrderNonces }) => void, ) { return subscribeDocument( dbLimitOrder, diff --git a/src/utils/formatCurrencyAmount.tsx b/src/utils/formatCurrencyAmount.tsx index 505dc7a5ef..352a304226 100644 --- a/src/utils/formatCurrencyAmount.tsx +++ b/src/utils/formatCurrencyAmount.tsx @@ -3,6 +3,7 @@ import JSBI from 'jsbi' import { MouseoverTooltip } from 'components/Tooltip' +// todo: deprecated, use formatDisplayNumber instead export function formatCurrencyAmount(amount: CurrencyAmount | undefined, sigFigs: number) { if (!amount) { return '-' @@ -19,6 +20,7 @@ export function formatCurrencyAmount(amount: CurrencyAmount | undefine return amount.toSignificant(sigFigs) } +// todo: deprecated, use formatDisplayNumber instead export function toSignificantOrMaxIntegerPart(price: Price | undefined, sigFigs: number): string { if (!price) return '' @@ -28,6 +30,7 @@ export function toSignificantOrMaxIntegerPart(price: Price | return price.toSignificant(sigFigs) } +// todo: deprecated, use formatDisplayNumber instead export function formatPrice(price: Price | undefined, sigFigs: number) { if (!price) { return '-' diff --git a/src/utils/formatTickPrice.ts b/src/utils/formatTickPrice.ts index 1f2ebe62d2..fcd6fa47c9 100644 --- a/src/utils/formatTickPrice.ts +++ b/src/utils/formatTickPrice.ts @@ -2,7 +2,7 @@ import { Currency, Price } from '@kyberswap/ks-sdk-core' import { Bound } from 'state/mint/proamm/type' -import { formatPrice } from './formatCurrencyAmount' +import { formatDisplayNumber } from './numbers' export function formatTickPrice( price: Price | undefined, @@ -17,5 +17,5 @@ export function formatTickPrice( if (!price && placeholder !== undefined) { return placeholder } - return formatPrice(price, 5) + return formatDisplayNumber(price, { significantDigits: 6 }) } diff --git a/src/utils/index.ts b/src/utils/index.ts index 712f6c979b..81a45127d0 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,6 +1,7 @@ import { ApolloClient, NormalizedCacheObject } from '@apollo/client' import { BigNumber } from '@ethersproject/bignumber' import { ChainId, Currency, CurrencyAmount, Percent, Token, WETH } from '@kyberswap/ks-sdk-core' +import { WalletReadyState } from '@solana/wallet-adapter-base' import { PublicKey } from '@solana/web3.js' import dayjs from 'dayjs' import JSBI from 'jsbi' @@ -11,12 +12,19 @@ import { GET_BLOCKS } from 'apollo/queries' import { ENV_KEY } from 'constants/env' import { DEFAULT_GAS_LIMIT_MARGIN, ZERO_ADDRESS } from 'constants/index' import { NETWORKS_INFO, SUPPORTED_NETWORKS, isEVM } from 'constants/networks' -import { KNC, KNCL_ADDRESS } from 'constants/tokens' -import { EVMWalletInfo, SUPPORTED_WALLET, SolanaWalletInfo, WalletInfo } from 'constants/wallets' +import { KNCL_ADDRESS, KNC_ADDRESS } from 'constants/tokens' +import { + EVMWalletInfo, + INJECTED_KEY, + INJECTED_KEYS, + SUPPORTED_WALLET, + SUPPORTED_WALLETS, + SolanaWalletInfo, + WalletInfo, +} from 'constants/wallets' import store from 'state' import { GroupedTxsByHash, TransactionDetails } from 'state/transactions/type' import { chunk } from 'utils/array' -import checkForBraveBrowser from 'utils/checkForBraveBrowser' export const isWalletAddressSolana = async (addr: string) => { try { @@ -145,6 +153,7 @@ const formatDollarSignificantAmount = (num: number, minDigits: number, maxDigits return formatter.format(num) } +// todo: deprecated, use formatDisplayNumber instead export function formatNumberWithPrecisionRange(number: number, minPrecision = 2, maxPrecision = 2) { const options = { minimumFractionDigits: minPrecision, @@ -167,6 +176,7 @@ const truncateFloatNumber = (num: number, maximumFractionDigits = 6) => { return `${wholePart}.${fractionalPart.slice(0, maximumFractionDigits)}` } +// todo: deprecated, use formatDisplayNumber instead export function formattedNum(number: string | number, usd = false, fractionDigits = 5): string { if (number === 0 || number === '' || number === undefined) { return usd ? '$0' : '0' @@ -208,6 +218,7 @@ export function formattedNum(number: string | number, usd = false, fractionDigit return truncateFloatNumber(num, fractionDigits) } +// todo: deprecated, use formatDisplayNumber instead export function formattedNumLong(num: number, usd = false) { if (num === 0) { if (usd) { @@ -372,21 +383,12 @@ export const get24hValue = (valueNow: string, value24HoursAgo: string | undefine } export const getTokenLogoURL = (inputAddress: string, chainId: ChainId): string => { - // hardcode for testing in goerli - if (chainId === ChainId.GÖRLI) { - switch (inputAddress.toLowerCase()) { - case '0x1bbeeedcf32dc2c1ebc2f138e3fc7f3decd44d6a': - return 'https://s2.coinmarketcap.com/static/img/coins/64x64/4943.png' - case '0x2bf64acf7ead856209749d0d125e9ade2d908e7f': - return 'https://seeklogo.com/images/T/tether-usdt-logo-FA55C7F397-seeklogo.com.png' - } - } let address = inputAddress if (address === ZERO_ADDRESS) { address = WETH[chainId].address } - if (address.toLowerCase() === KNC[chainId].address.toLowerCase()) { + if (address.toLowerCase() === KNC_ADDRESS) { return 'https://raw.githubusercontent.com/KyberNetwork/kyberswap-interface/develop/src/assets/images/KNC.svg' } @@ -431,54 +433,26 @@ export const deleteUnique = (array: T[] | undefined, element: T): T[] => { export const isEVMWallet = (wallet?: WalletInfo): wallet is EVMWalletInfo => !!wallet && 'connector' in wallet export const isSolanaWallet = (wallet?: WalletInfo): wallet is SolanaWalletInfo => !!wallet && 'adapter' in wallet -enum WALLET_KEYS { - COIN98 = 'COIN98', - BRAVE = 'BRAVE', - METAMASK = 'METAMASK', - COINBASE = 'COINBASE', - TRUST_WALLET = 'TRUST_WALLET', - WALLET_CONNECT = 'WALLET_CONNECT', -} - // https://docs.metamask.io/guide/ethereum-provider.html#basic-usage // https://docs.cloud.coinbase.com/wallet-sdk/docs/injected-provider#properties // Coin98 and Brave wallet is overriding Metamask. So at a time, there is only 1 exists -export const detectInjectedType = (): WALLET_KEYS | null => { - const { ethereum } = window - // When Coinbase wallet connected will inject selectedProvider property and some others props - if (ethereum?.selectedProvider) { - if (ethereum?.selectedProvider?.isMetaMask) return WALLET_KEYS.METAMASK - if (ethereum?.selectedProvider?.isCoinbaseWallet) return WALLET_KEYS.COINBASE - } - - if (ethereum?.isCoinbaseWallet) return WALLET_KEYS.COINBASE - - if (ethereum?.isTrustWallet) return WALLET_KEYS.TRUST_WALLET - - if (checkForBraveBrowser() && ethereum?.isBraveWallet) return WALLET_KEYS.BRAVE - - if (ethereum?.isMetaMask) { - if (ethereum?.isCoin98) { - return WALLET_KEYS.COIN98 - } - return WALLET_KEYS.METAMASK - } - if (JSON.parse(localStorage.walletconnect || '{}').connected) { - return WALLET_KEYS.WALLET_CONNECT - } - return null +export const detectInjectedType = (): INJECTED_KEY | undefined => { + return INJECTED_KEYS.find(walletKey => { + const wallet = SUPPORTED_WALLETS[walletKey] + return wallet.readyState() === WalletReadyState.Installed + }) } export const isOverriddenWallet = (wallet: SUPPORTED_WALLET) => { const injectedType = detectInjectedType() return ( - (wallet === WALLET_KEYS.COIN98 && injectedType === WALLET_KEYS.METAMASK) || - (wallet === WALLET_KEYS.METAMASK && injectedType === WALLET_KEYS.COIN98) || - (wallet === WALLET_KEYS.BRAVE && injectedType === WALLET_KEYS.COIN98) || - (wallet === WALLET_KEYS.COIN98 && injectedType === WALLET_KEYS.BRAVE) || - (wallet === WALLET_KEYS.COINBASE && injectedType === WALLET_KEYS.COIN98) || + (wallet === 'COIN98' && injectedType === 'METAMASK') || + (wallet === 'METAMASK' && injectedType === 'COIN98') || + (wallet === 'BRAVE' && injectedType === 'COIN98') || + (wallet === 'COIN98' && injectedType === 'BRAVE') || + (wallet === 'COINBASE' && injectedType === 'COIN98') || // Coin98 turned off override MetaMask in setting - (wallet === WALLET_KEYS.COIN98 && window.coin98 && !window.ethereum?.isCoin98) + (wallet === 'COIN98' && window.coin98 && !window.ethereum?.isCoin98) ) } @@ -500,10 +474,10 @@ export const isChristmasTime = () => { return currentTime.month() === 11 && currentTime.date() >= 15 } -export const getLimitOrderContract = (chainId: ChainId): string | null => { - if (!SUPPORTED_NETWORKS.includes(chainId)) return null - const { production, development } = NETWORKS_INFO[chainId]?.limitOrder ?? {} - return ENV_KEY === 'production' || ENV_KEY === 'staging' ? production : development +export const isSupportLimitOrder = (chainId: ChainId): boolean => { + if (!SUPPORTED_NETWORKS.includes(chainId)) return false + const limitOrder = NETWORKS_INFO[chainId]?.limitOrder + return limitOrder === '*' || (limitOrder || []).includes(ENV_KEY) } export function openFullscreen(elem: any) { diff --git a/src/utils/numbers.ts b/src/utils/numbers.ts index 4ee69ea07a..69323955e8 100644 --- a/src/utils/numbers.ts +++ b/src/utils/numbers.ts @@ -1,9 +1,9 @@ -import { Fraction } from '@kyberswap/ks-sdk-core' +import { CurrencyAmount, Fraction, Percent, Price } from '@kyberswap/ks-sdk-core' import JSBI from 'jsbi' -import { RESERVE_USD_DECIMALS } from 'constants/index' +import { BIG_INT_ONE, BIG_INT_ZERO, RESERVE_USD_DECIMALS } from 'constants/index' -// using a currency library here in case we want to add more in future +// todo: deprecated, use formatDisplayNumber instead export const formatDollarAmount = (num: number | undefined, digits = 2) => { if (num === 0) return '$0.00' if (!num) return '-' @@ -22,7 +22,7 @@ export const formatDollarAmount = (num: number | undefined, digits = 2) => { .toLowerCase() } -// do the same with above, without the $ sign +// todo: deprecated, use formatDisplayNumber instead export const formatNotDollarAmount = (num: number | undefined, digits = 2) => { if (num === 0) return '0.00' if (!num) return '-' @@ -39,13 +39,16 @@ export const formatNotDollarAmount = (num: number | undefined, digits = 2) => { .toLowerCase() } +// stringify number without scientific format +// e.g: (123456789123456789123456789).toString() => 1.2345678912345679e+26 +// toFixed(123456789123456789123456789) => 123456789123456800000000000 // https://stackoverflow.com/a/1685917/8153505 export function toFixed(x: number): string { if (Math.abs(x) < 1.0) { const e = parseInt(x.toString().split('e-')[1]) if (e) { x *= Math.pow(10, e - 1) - return '0.' + '0'.repeat(e - 1) + x.toString().substring(2) + return x.toString().split('.')[0] + '.' + '0'.repeat(e - 1) + x.toString().split('.')[1] } } else { let e = parseInt(x.toString().split('+')[1]) @@ -60,3 +63,161 @@ export function toFixed(x: number): string { export const uint256ToFraction = (value: string, decimals = RESERVE_USD_DECIMALS) => new Fraction(value, JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(decimals))) + +const subscriptMap: { [key: string]: string } = { + '0': '₀', + '1': '₁', + '2': '₂', + '3': '₃', + '4': '₄', + '5': '₅', + '6': '₆', + '7': '₇', + '8': '₈', + '9': '₉', +} + +const log10 = (n: Fraction): number => { + const parsedN = Number(n.toSignificant(30)) + return Math.log10(parsedN) +} + +const parseNum = (value: FormatValue): Fraction => { + try { + if ( + typeof value === 'string' || + typeof value === 'number' || + value instanceof CurrencyAmount || + value instanceof Percent || + value instanceof Price + ) { + const valueStr = (() => { + if (typeof value === 'string') return value + if (typeof value === 'number') return toFixed(value) + if (value instanceof CurrencyAmount) return value.toFixed(value.currency.decimals) + if (value instanceof Price) return value.toFixed(18) + if (value instanceof Percent) return value.divide(100).toFixed(18) + return '0' + })() + return new Fraction(valueStr.replace('.', ''), '1' + '0'.repeat(valueStr.split('.')[1]?.length || 0)) + } + if (value instanceof Fraction) return value + if (value instanceof JSBI) return new Fraction(value) + if (typeof value === 'bigint') return new Fraction(value.toString(10)) + return new Fraction(0, 1) + } catch (error) { + console.error('parseNum error', { value, 'typeof value': typeof value, error }) + return new Fraction(0, 1) + } +} + +type FormatValue = string | number | bigint | JSBI | Fraction | undefined | null +type FormatOptions = { + style?: 'decimal' | 'currency' | 'percent' + fractionDigits?: number // usually for percent & currency styles + significantDigits?: number // usually for decimal style + fallback?: string + allowNegative?: boolean +} +interface RequiredFraction extends FormatOptions { + fractionDigits: number // usually for percent & currency styles +} +interface RequiredSignificant extends FormatOptions { + significantDigits: number // usually for percent & currency styles +} + +// todo: deprecated others format functions and all .toSignificant() to only use this function +/** + * Format number to displaying to the UI + * @example + * // returns 0.2 + * formatDisplayNumber(0.2, { style: 'decimal', significantDigits: 6 }) + * @example + * // returns $0.2 + * formatDisplayNumber(0.2, { style: 'currency', significantDigits: 6 }) + * @example + * // returns 20% + * formatDisplayNumber(0.2, { style: 'percent', significantDigits: 6 }) + * @example + * @returns {string} Returns the formatted number in string + */ +export const formatDisplayNumber = ( + value: FormatValue, + { + style = 'decimal', + significantDigits, + fractionDigits, + fallback = '--', + allowNegative = false, + }: RequiredFraction | RequiredSignificant, +): string => { + const currency = style === 'currency' ? '$' : '' + const percent = style === 'percent' ? '%' : '' + const fallbackResult = `${currency}${fallback}${percent}` + + if (value === undefined || value === null || Number.isNaN(value)) return fallbackResult + const parsedFraction = parseNum(value) + if (!allowNegative && parsedFraction.lessThan(BIG_INT_ZERO)) return fallbackResult + + const shownFraction = style === 'percent' ? parsedFraction.multiply(100) : parsedFraction + const absShownFraction = shownFraction.lessThan(0) ? shownFraction.multiply(-1) : shownFraction + + if (absShownFraction.lessThan(BIG_INT_ONE) && !shownFraction.equalTo(BIG_INT_ZERO)) { + const decimal = shownFraction.toSignificant(Math.max(30, significantDigits || 0, fractionDigits || 0)).split('.')[1] + const negative = shownFraction.lessThan(BIG_INT_ZERO) ? '-' : '' + const numberOfLeadingZeros = -Math.floor(log10(absShownFraction) + 1) + const slicedDecimal = decimal + .replace(/^0+/, '') + .slice(0, fractionDigits) + .slice(0, significantDigits || 6) + .replace(/0+$/, '') + + if (numberOfLeadingZeros > 2) { + const subscripts = numberOfLeadingZeros + .toString() + .split('') + .map(item => subscriptMap[item]) + .join('') + return `${negative}${currency}0.0${subscripts}${slicedDecimal}${percent}` + } + + return `${negative}${currency}0${ + slicedDecimal.length ? '.' + '0'.repeat(numberOfLeadingZeros) + slicedDecimal : '' + }${percent}` + } + + const formatter = Intl.NumberFormat('en-US', { + notation: absShownFraction.greaterThan(10 ** (significantDigits || fractionDigits || 4)) ? 'compact' : 'standard', + style, + currency: 'USD', + minimumFractionDigits: fractionDigits ? 0 : undefined, + maximumFractionDigits: fractionDigits, + minimumSignificantDigits: significantDigits ? 1 : undefined, + maximumSignificantDigits: significantDigits, + }) + + const result = formatter.format( + Number(parsedFraction.toSignificant(Math.max(30, significantDigits || 0, fractionDigits || 0))), + ) + + // Intl.NumberFormat does not handle maximumFractionDigits well when used along with maximumSignificantDigits + // It might return number with longer fraction digits than maximumFractionDigits + // Hence, we have to do an additional step that manually slice those oversize fraction digits + if (fractionDigits !== undefined) { + const [negative, currency, integer, decimal, unit] = parseNumPart(result) + const trimedSlicedDecimal = decimal?.slice(0, fractionDigits).replace(/0+$/, '') + if (trimedSlicedDecimal) return negative + currency + integer + '.' + trimedSlicedDecimal + unit + return negative + currency + integer + unit + } + return result +} + +const regex = /^(-\s*)?(\$\s*)?([\d,]+)(\.\d+)?\s*?(\w?.*?)$/ +const parseNumPart = (str: string): string[] => { + const parsedResult = regex.exec(str) + if (parsedResult) { + const [, negative, currency, integer, decimal, unit] = parsedResult + return [negative?.trim() || '', currency?.trim() || '', integer, decimal?.slice(1) || '', unit?.trim() || ''] + } + return ['', '', '', '', ''] +} diff --git a/src/utils/slippage.ts b/src/utils/slippage.ts index f4db43dec5..278a4b2c0b 100644 --- a/src/utils/slippage.ts +++ b/src/utils/slippage.ts @@ -19,7 +19,7 @@ export const checkRangeSlippage = (slippage: number, isStablePairSwap: boolean): return SLIPPAGE_STATUS.NORMAL } - if (slippage < 10) { + if (slippage < 5) { return SLIPPAGE_STATUS.LOW } diff --git a/src/utils/string.ts b/src/utils/string.ts index dbfb2b8153..4e56993b2f 100644 --- a/src/utils/string.ts +++ b/src/utils/string.ts @@ -37,7 +37,8 @@ export const escapeScriptHtml = (str: string) => { return str.replace(/<.*?script.*?>.*?<\/.*?script.*?>/gim, '') } -export const isEmailValid = (value: string | undefined) => value?.match(/^\w+([\.-]?\w)*@\w+([\.-]?\w)*(\.\w{2,10})+$/) +export const isEmailValid = (value: string | undefined) => + (value || '').trim().match(/^\w+([\.-]?\w)*@\w+([\.-]?\w)*(\.\w{2,10})+$/) export const getChainIdFromSlug = (network: string | undefined): ChainId | undefined => { return SUPPORTED_NETWORKS.find(chainId => NETWORKS_INFO[chainId].route === network) diff --git a/src/utils/tokenInfo.ts b/src/utils/tokenInfo.ts index bfeb5844cd..53328f997e 100644 --- a/src/utils/tokenInfo.ts +++ b/src/utils/tokenInfo.ts @@ -59,6 +59,8 @@ export const getTokenSymbolWithHardcode = ( return 'mKNC' } if (chainId === ChainId.ARBITRUM && formatAddress === '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8') return 'USDC.e' + if (chainId === ChainId.ARBITRUM && formatAddress === '0x9cfb13e6c11054ac9fcb92ba89644f30775436e4') + return 'axl.wstETH' return defaultSymbol ?? '' } diff --git a/src/wdyr.ts b/src/wdyr.ts new file mode 100644 index 0000000000..fb011c3ed6 --- /dev/null +++ b/src/wdyr.ts @@ -0,0 +1,14 @@ +// eslint-disable-next-line +/// +import whyDidYouRender from '@welldone-software/why-did-you-render' +import * as React from 'react' +import * as ReactRedux from 'react-redux' + +if (import.meta.env.DEV) { + whyDidYouRender(React, { + trackAllPureComponents: true, + trackExtraHooks: [[ReactRedux, 'useSelector']], + logOwnerReasons: true, + logOnDifferentValues: true, + }) +} diff --git a/tsconfig.json b/tsconfig.json index 26277df31c..8094043b36 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -25,7 +25,10 @@ "types": ["vite/client", "vite-plugin-svgr/client"], "typeRoots": ["./types"], "baseUrl": "src", - "useUnknownInCatchVariables": false + "useUnknownInCatchVariables": false, + "paths": { + "@/*": ["./src/*"] + } }, "exclude": ["node_modules", "cypress"], "include": ["./src/**/*.ts", "./src/**/*.tsx"] diff --git a/vite.config.ts b/vite.config.ts index e58c3226cb..6f9cf965cf 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,7 @@ import GlobalPolyFill from '@esbuild-plugins/node-globals-polyfill' import lingui from '@lingui/vite-plugin' import react from '@vitejs/plugin-react' +import path from 'path' import { defineConfig } from 'vite' import checker from 'vite-plugin-checker' import svgrPlugin from 'vite-plugin-svgr' @@ -13,6 +14,7 @@ export default defineConfig({ }, plugins: [ react({ + jsxImportSource: '@welldone-software/why-did-you-render', babel: { // Use .babelrc files, necessary to use LinguiJS CLI babelrc: true, @@ -53,6 +55,9 @@ export default defineConfig({ stream: 'stream-browserify', zlib: 'browserify-zlib', util: 'util', + 'react-redux': 'react-redux/dist/react-redux.js', + '@': path.resolve(__dirname, './src/'), + "react-dom/client": "react-dom/profiling", }, }, server: { diff --git a/yarn.lock b/yarn.lock index ab6ee27380..7ddf7f4678 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,19 +12,17 @@ ethers "^5.7.1" release-it "^15.5.0" -"@adraffy/ens-normalize@1.9.0", "@adraffy/ens-normalize@https://github.com/ricmoo/ens-normalize.js": - version "1.9.0" - resolved "https://github.com/ricmoo/ens-normalize.js#2d040533e57e4f25f9a7cc4715e219658ad454b5" +"@adraffy/ens-normalize@1.9.2": + version "1.9.2" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.2.tgz#60111a5d9db45b2e5cbb6231b0bb8d97e8659316" + integrity sha512-0h+FrQDqe2Wn+IIGFkTCd4aAwTJ+7834Ek1COohCyV26AXhwQ7WQaz+4F/nLOeVl/3BtWHOHLPsq46V8YB46Eg== -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" +"@adraffy/ens-normalize@1.9.4": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.9.4.tgz#aae21cb858bbb0411949d5b7b3051f4209043f62" + integrity sha512-UK0bHA7hh9cR39V+4gl2/NnBBjoXIxkuWAPCaY4X7fbH4L/azIi7ilWOCjMUYfpJgraLUAqkRi2BqrjME8Rynw== -"@ampproject/remapping@^2.2.0": +"@ampproject/remapping@^2.1.0", "@ampproject/remapping@^2.2.0": version "2.2.1" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== @@ -56,18 +54,31 @@ tslib "^2.3.0" zen-observable-ts "^1.2.5" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.21.4": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.0": +"@babel/code-frame@^7.16.7", "@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + +"@babel/compat-data@^7.22.0": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.3.tgz#cd502a6a0b6e37d7ad72ce7e71a7160a3ae36f7e" integrity sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ== +"@babel/compat-data@^7.22.9": + version "7.22.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" + integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== + "@babel/core@7.17.8": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" @@ -89,7 +100,7 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/core@^7.12.3", "@babel/core@^7.19.6", "@babel/core@^7.20.12", "@babel/core@^7.21.4", "@babel/core@^7.7.5": +"@babel/core@^7.12.3", "@babel/core@^7.19.6", "@babel/core@^7.21.4", "@babel/core@^7.7.5": version "7.22.1" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.1.tgz#5de51c5206f4c6f5533562838337a603c1033cfd" integrity sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA== @@ -110,6 +121,27 @@ json5 "^2.2.2" semver "^6.3.0" +"@babel/core@^7.20.12": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.15.tgz#15d4fd03f478a459015a4b94cfbb3bd42c48d2f4" + integrity sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-module-transforms" "^7.22.15" + "@babel/helpers" "^7.22.15" + "@babel/parser" "^7.22.15" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.22.15" + "@babel/types" "^7.22.15" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + "@babel/generator@7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" @@ -119,7 +151,7 @@ jsesc "^2.5.1" source-map "^0.5.0" -"@babel/generator@^7.11.6", "@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.22.0": +"@babel/generator@^7.11.6", "@babel/generator@^7.22.0": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.3.tgz#0ff675d2edb93d7596c5f6728b52615cfc0df01e" integrity sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A== @@ -129,6 +161,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" + integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== + dependencies: + "@babel/types" "^7.22.15" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" @@ -136,7 +178,18 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.22.1": +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" + integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== + dependencies: + "@babel/compat-data" "^7.22.9" + "@babel/helper-validator-option" "^7.22.15" + browserslist "^4.21.9" + lru-cache "^5.1.1" + semver "^6.3.1" + +"@babel/helper-compilation-targets@^7.22.1": version "7.22.1" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.1.tgz#bfcd6b7321ffebe33290d68550e2c9d7eb7c7a58" integrity sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ== @@ -161,24 +214,25 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" -"@babel/helper-define-polyfill-provider@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" - integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== - dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" +"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" + integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== -"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.1": +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.1": version "7.22.1" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.1.tgz#ac3a56dbada59ed969d712cf527bd8271fe3eba8" integrity sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA== -"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.21.0": +"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" + integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== + dependencies: + "@babel/template" "^7.22.5" + "@babel/types" "^7.22.5" + +"@babel/helper-function-name@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4" integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg== @@ -186,7 +240,14 @@ "@babel/template" "^7.20.7" "@babel/types" "^7.21.0" -"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.18.6": +"@babel/helper-hoist-variables@^7.16.7", "@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-hoist-variables@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== @@ -207,7 +268,25 @@ dependencies: "@babel/types" "^7.21.4" -"@babel/helper-module-transforms@^7.17.7", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.1": +"@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" + integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== + dependencies: + "@babel/types" "^7.22.15" + +"@babel/helper-module-transforms@^7.17.7": + version "7.22.17" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.17.tgz#7edf129097a51ccc12443adbc6320e90eab76693" + integrity sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-validator-identifier" "^7.22.15" + +"@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.22.1": version "7.22.1" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.1.tgz#e0cad47fedcf3cae83c11021696376e2d5a50c63" integrity sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw== @@ -221,6 +300,17 @@ "@babel/traverse" "^7.22.1" "@babel/types" "^7.22.0" +"@babel/helper-module-transforms@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz#40ad2f6950f143900e9c1c72363c0b431a606082" + integrity sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-validator-identifier" "^7.22.15" + "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" @@ -228,11 +318,16 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== +"@babel/helper-plugin-utils@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + "@babel/helper-replace-supers@^7.20.7": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" @@ -252,6 +347,13 @@ dependencies: "@babel/types" "^7.21.5" +"@babel/helper-simple-access@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" + integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== + dependencies: + "@babel/types" "^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers@^7.20.0": version "7.20.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" @@ -259,13 +361,25 @@ dependencies: "@babel/types" "^7.20.0" -"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.18.6": +"@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== dependencies: "@babel/types" "^7.18.6" +"@babel/helper-string-parser@^7.19.4", "@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== + "@babel/helper-string-parser@^7.21.5": version "7.21.5" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" @@ -276,12 +390,31 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== +"@babel/helper-validator-identifier@^7.22.15", "@babel/helper-validator-identifier@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" + integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== + "@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== -"@babel/helpers@^7.17.8", "@babel/helpers@^7.22.0": +"@babel/helper-validator-option@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040" + integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA== + +"@babel/helpers@^7.17.8", "@babel/helpers@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1" + integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/helpers@^7.22.0": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.3.tgz#53b74351da9684ea2f694bf0877998da26dd830e" integrity sha512-jBJ7jWblbgr7r6wYZHMdIqKc73ycaTcCaWRq4/2LpuPHcx7xMlZvpGQkOYc9HeSjn6rcx15CPlgVcBtZ4WZJ2w== @@ -299,6 +432,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" +"@babel/highlight@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" + integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== + dependencies: + "@babel/helper-validator-identifier" "^7.22.5" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539" @@ -309,16 +451,21 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.3.tgz#838ae31893373222cd9062568e2192c670037e00" integrity sha512-vrukxyW/ep8UD1UDzOYpTKQ6abgjFoeG6L+4ar9+c5TN9QnlqiOi6QK7LSR5ewm/ERyGkT/Ai6VboNrxhbr9Uw== -"@babel/parser@^7.16.4", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8" - integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA== +"@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.20.15", "@babel/parser@^7.21.3", "@babel/parser@^7.22.16": + version "7.22.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" + integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== "@babel/parser@^7.21.2": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== +"@babel/parser@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.15.tgz#d34592bfe288a32e741aa0663dbc4829fcd55160" + integrity sha512-RWmQ/sklUN9BvGGpCDgSubhHWfAx24XDTDObup4ffvxaYsptOg2P3KG0j+1eWKLxpkX0j0uHxmpq2Z1SP/VhxA== + "@babel/plugin-syntax-jsx@^7.10.4", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" @@ -357,18 +504,18 @@ "@babel/plugin-transform-react-jsx" "^7.18.6" "@babel/plugin-transform-react-jsx-self@^7.18.6": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.21.0.tgz#ec98d4a9baafc5a1eb398da4cf94afbb40254a54" - integrity sha512-f/Eq+79JEu+KUANFks9UZCcvydOOGMgF7jBrcwjHa5jTZD8JivnhCJYvmlhR/WTXBWonDExPoW0eO/CR4QJirA== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz#ca2fdc11bc20d4d46de01137318b13d04e481d8e" + integrity sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-react-jsx-source@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.19.6.tgz#88578ae8331e5887e8ce28e4c9dc83fb29da0b86" - integrity sha512-RpAi004QyMNisst/pvSanoRdJ4q+jMCWyk9zdw/CyLB9j8RXEahodR6l2GyttDRyEVWZtbN+TpLiHJ3t34LbsQ== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz#49af1615bfdf6ed9d3e9e43e425e0b2b65d15b6c" + integrity sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w== dependencies: - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.22.5" "@babel/plugin-transform-react-jsx@^7.18.6": version "7.21.0" @@ -389,18 +536,6 @@ "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-runtime@^7.5.5": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194" - integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - semver "^6.3.0" - "@babel/plugin-transform-typescript@^7.21.3": version "7.21.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b" @@ -449,7 +584,23 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/template@^7.16.7", "@babel/template@^7.20.7", "@babel/template@^7.21.9": +"@babel/runtime@^7.22.6": + version "7.22.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682" + integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/template@^7.16.7", "@babel/template@^7.22.15", "@babel/template@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/template@^7.20.7", "@babel/template@^7.21.9": version "7.21.9" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.21.9.tgz#bf8dad2859130ae46088a99c1f265394877446fb" integrity sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ== @@ -474,7 +625,23 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.17.3", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.1", "@babel/traverse@^7.4.5": +"@babel/traverse@^7.17.3": + version "7.22.17" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.17.tgz#b23c203ab3707e3be816043081b4a994fcacec44" + integrity sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.22.16" + "@babel/types" "^7.22.17" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/traverse@^7.20.7", "@babel/traverse@^7.22.1", "@babel/traverse@^7.4.5": version "7.22.1" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.1.tgz#bd22c50b1439cfcfc2fa137b7fdf6c06787456e9" integrity sha512-lAWkdCoUFnmwLBhIRLciFntGYsIIoC6vIbN8zrLPqBnJmPu7Z6nzqnKd7FsxQUNAvZfVZ0x6KdNvNp8zWIOHSQ== @@ -490,6 +657,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.15.tgz#75be4d2d6e216e880e93017f4e2389aeb77ef2d9" + integrity sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@7.17.0": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" @@ -498,7 +681,16 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" -"@babel/types@^7.11.5", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.22.0", "@babel/types@^7.22.3": +"@babel/types@^7.0.0-beta.49", "@babel/types@~7.20.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + +"@babel/types@^7.11.5", "@babel/types@^7.18.6", "@babel/types@^7.20.0", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.22.0", "@babel/types@^7.22.3": version "7.22.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.3.tgz#0cc6af178b91490acaeb4a2f70dcbf27cdf3d8f3" integrity sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg== @@ -507,6 +699,24 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@babel/types@^7.17.0", "@babel/types@^7.22.17": + version "7.22.17" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.17.tgz#f753352c4610ffddf9c8bc6823f9ff03e2303eee" + integrity sha512-YSQPHLFtQNE5xN9tHuZnzu8vPr61wVTBZdfv1meex1NBosa4iT05k/Jw06ddJugi4bk7The/oSwQGFcksmEJQg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.15" + to-fast-properties "^2.0.0" + +"@babel/types@^7.22.15", "@babel/types@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282" + integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.15" + to-fast-properties "^2.0.0" + "@blocto/sdk@^0.2.21": version "0.2.22" resolved "https://registry.yarnpkg.com/@blocto/sdk/-/sdk-0.2.22.tgz#c7fe62809de0640a0a3f7a043c5bbceb8be17e38" @@ -517,6 +727,24 @@ eip1193-provider "^1.0.1" js-sha3 "^0.8.0" +"@blocto/sdk@^0.5.5": + version "0.5.5" + resolved "https://registry.yarnpkg.com/@blocto/sdk/-/sdk-0.5.5.tgz#807b9eaeee924c3eb0c5517c6b32891025f1f6b0" + integrity sha512-u7bbAYmYDCf0QWvXleVOTeGFRbo8evT3uacsLJ6dv01HspmLDKZWjFyu7i3ARebJTpenHvwM78XHV7KTvBqTRg== + dependencies: + bs58 "^5.0.0" + buffer "^6.0.3" + eip1193-provider "^1.0.1" + js-sha3 "^0.8.0" + +"@blocto/web3-react-connector@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@blocto/web3-react-connector/-/web3-react-connector-1.0.0.tgz#22c62918c260fe2df5a8fbe1f79deef685998689" + integrity sha512-p3lo7K4Y86P50d6LxbxbSiN4ungg1wNmU85F0OEYDUK8NW8l/opG2EeeodFYSOo+MB7BgiaGMN9m+vPzrn+4pQ== + dependencies: + "@blocto/sdk" "^0.5.5" + "@web3-react/types" "^8.1.2-beta.0" + "@censo-custody/solana-wallet-adapter@^0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@censo-custody/solana-wallet-adapter/-/solana-wallet-adapter-0.1.0.tgz#064adae9f216dc4b726c1cc45b6b24cf0c734f07" @@ -528,18 +756,18 @@ uuid "^8.3.2" "@coinbase/wallet-sdk@^3.0.4": - version "3.6.2" - resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.6.2.tgz#e8633001136e0236a746f6462c0dff2f881db343" - integrity sha512-HzxajB+qS+G9//c+th5uJ8KSt+jQ6/U+cgL9Sv89Wx6Mif+Lg5HxGtc6JQcIdHuYk9AFX+nXNSXtTGRdpHkdDg== + version "3.7.1" + resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.7.1.tgz#44b3b7a925ff5cc974e4cbf7a44199ffdcf03541" + integrity sha512-LjyoDCB+7p0waQXfK+fUgcAs3Ezk6S6e+LYaoFjpJ6c9VTop3NyZF40Pi7df4z7QJohCwzuIDjz0Rhtig6Y7Pg== dependencies: "@metamask/safe-event-emitter" "2.0.0" - "@solana/web3.js" "1.52.0" + "@solana/web3.js" "^1.70.1" bind-decorator "^1.0.11" bn.js "^5.1.1" buffer "^6.0.3" clsx "^1.1.0" - eth-block-tracker "4.4.3" - eth-json-rpc-filters "4.2.2" + eth-block-tracker "6.1.0" + eth-json-rpc-filters "5.1.0" eth-rpc-errors "4.0.2" json-rpc-engine "6.1.0" keccak "^3.0.1" @@ -562,14 +790,14 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@cypress/code-coverage@^3.10.4": - version "3.10.6" - resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.10.6.tgz#85ac787ed968cc9e6e899683ce52927f52d67d0e" - integrity sha512-ewsNEqEFmirSGeWraOrrn/S64/jCsoA1tVwQ6ySFO+gUhOsaWveoPy8oeX5jzKS2HpqAihuuO3kXSEvVQoPTkw== +"@cypress/code-coverage@^3.11.0": + version "3.12.0" + resolved "https://registry.yarnpkg.com/@cypress/code-coverage/-/code-coverage-3.12.0.tgz#6ad692cd9dccd88c89f67450ae44368fa1643bf2" + integrity sha512-Z4Lk/ckBc9Mv11vXMp1ike5MtIYsHCCu7Wtp4uWTcFEshi9uSbBNS6v2cwhf0beUThph0EXsVtKMi7EFAdM1Mw== dependencies: "@cypress/webpack-preprocessor" "^5.11.0" chalk "4.1.2" - dayjs "1.10.7" + dayjs "1.11.9" debug "4.3.4" execa "4.1.0" globby "11.0.4" @@ -610,16 +838,41 @@ tunnel-agent "^0.6.0" uuid "^8.3.2" -"@cypress/webpack-dev-server@^3.4.1": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@cypress/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz#d706437624a386022d75fd9c326b9f010fd3a854" - integrity sha512-S6IUklDXIkcajtkjtLZz8nzVMuG/kjEKnRVkAiIyJL3EZ+EHcXgrUQegfRb15poFlk4SZ/AMLRMqLSB6KCCxkg== +"@cypress/request@^2.88.11": + version "2.88.12" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590" + integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + http-signature "~1.3.6" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + performance-now "^2.1.0" + qs "~6.10.3" + safe-buffer "^5.1.2" + tough-cookie "^4.1.3" + tunnel-agent "^0.6.0" + uuid "^8.3.2" + +"@cypress/webpack-dev-server@^3.5.2": + version "3.6.1" + resolved "https://registry.yarnpkg.com/@cypress/webpack-dev-server/-/webpack-dev-server-3.6.1.tgz#0e0d5f6bac5aba3ad30df6771049a9759620e4ba" + integrity sha512-v9tn8SW5ot9jxlei0LqnU1hmR8Cy/A4mOKJOmrcU8KI0qWH6cadwmtiifRMgn8obQCJxiBSAeSWP3l2P4XoSAA== dependencies: find-up "6.3.0" fs-extra "9.1.0" html-webpack-plugin-4 "npm:html-webpack-plugin@^4" html-webpack-plugin-5 "npm:html-webpack-plugin@^5" local-pkg "0.4.1" + semver "^7.5.3" speed-measure-webpack-plugin "1.4.2" tslib "^2.3.1" webpack-dev-server "^4.7.4" @@ -642,26 +895,6 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@datadog/browser-core@4.26.0": - version "4.26.0" - resolved "https://registry.yarnpkg.com/@datadog/browser-core/-/browser-core-4.26.0.tgz#ada776c93354f8ffebb2914ae9cd4107385e5bd6" - integrity sha512-Zm5P+MA6B/LpKvH6Xw1CMUOSrOLodLJ3UG/SDwndVW/0ALx9l70vpH4+/MaW3BiBDLKPriTZ6rQIovyv0k19fw== - -"@datadog/browser-rum-core@4.26.0": - version "4.26.0" - resolved "https://registry.yarnpkg.com/@datadog/browser-rum-core/-/browser-rum-core-4.26.0.tgz#3c573cc53bd626d98eaf358f8c93b7f02d96ab30" - integrity sha512-STn/DsQaSCAebfBk1ce5lGAmnM/0ZtQp+1hTEEpkcDQkNXJvMWNYMVAYCCKcqkWR/DD32hnOKKv+SmHWXwVMeg== - dependencies: - "@datadog/browser-core" "4.26.0" - -"@datadog/browser-rum@^4.23.3": - version "4.26.0" - resolved "https://registry.yarnpkg.com/@datadog/browser-rum/-/browser-rum-4.26.0.tgz#7911fd7e6f7057eb501113e12259e88f646edc19" - integrity sha512-mcQwuL86h9hu5hyxnzyI91e/yfrtG1vDiIZL8APYw4foMMugDY5KMiJwEYu55FH5s6jA7l9D5ky7LY2oaZ7lbg== - dependencies: - "@datadog/browser-core" "4.26.0" - "@datadog/browser-rum-core" "4.26.0" - "@drptbl/gremlins.js@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@drptbl/gremlins.js/-/gremlins.js-2.2.1.tgz#1a0449af74afa1cf74238a36de611d4c9ce93b27" @@ -1169,7 +1402,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.5.0", "@ethersproject/sha2@^5.7.0": +"@ethersproject/sha2@5.7.0", "@ethersproject/sha2@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.7.0.tgz#9a5f7a7824ef784f7f7680984e593a800480c9fb" integrity sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw== @@ -1769,16 +2002,6 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/types@^25.5.0": - version "25.5.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d" - integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - "@jest/types@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" @@ -1907,14 +2130,6 @@ "@walletconnect/utils" "2.0.0-rc.3" bs58 "^5.0.0" -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" @@ -1934,7 +2149,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": +"@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== @@ -1952,7 +2167,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -2068,10 +2283,10 @@ tiny-warning "^1.0.3" toformat "^2.0.0" -"@kyberswap/ks-sdk-core@1.0.9", "@kyberswap/ks-sdk-core@^1.0.5": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@kyberswap/ks-sdk-core/-/ks-sdk-core-1.0.9.tgz#9cb4915a9703948e840e62f332daca1282fcf189" - integrity sha512-kl2o0sw3Q+rR6KHxQbe57Gl2ajWv9IGaboOaRSpxCKsmA27hRmVaaiMmbbWfJNh8h6UZB9WohEoG/U48kD7o4Q== +"@kyberswap/ks-sdk-core@1.0.11", "@kyberswap/ks-sdk-core@^1.0.5": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@kyberswap/ks-sdk-core/-/ks-sdk-core-1.0.11.tgz#59362240147001ccabcb49ed77991b2f78b0e440" + integrity sha512-A7pPRqr0lFeSYOsuitsld+WglV4G8Tl5FsKZpx9mBjOrSFKGLOtCE0oMwAeD4+Jjo8VyLJppkBINQYY7wAq8Xg== dependencies: "@ethersproject/address" "^5.0.2" "@solana/web3.js" "^1.66.2" @@ -2302,6 +2517,16 @@ resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c" integrity sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q== +"@metamask/utils@^3.0.1": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-3.6.0.tgz#b218b969a05ca7a8093b5d1670f6625061de707d" + integrity sha512-9cIRrfkWvHblSiNDVXsjivqa9Ak0RYo/1H6tqTqTbAx+oBK2Sva0lWDHxGchOqA7bySGUJKAWSNJvH6gdHZ0gQ== + dependencies: + "@types/debug" "^4.1.7" + debug "^4.3.4" + semver "^7.3.8" + superstruct "^1.0.3" + "@motionone/animation@^10.15.1": version "10.15.1" resolved "https://registry.yarnpkg.com/@motionone/animation/-/animation-10.15.1.tgz#4a85596c31cbc5100ae8eb8b34c459fb0ccf6807" @@ -2389,12 +2614,19 @@ jsbi "^3.1.5" sha.js "^2.4.11" -"@noble/curves@1.0.0", "@noble/curves@~1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.0.0.tgz#e40be8c7daf088aaf291887cbc73f43464a92932" - integrity sha512-2upgEu0iLiDVDZkNLeFV2+ht0BAVgQnEmCk6JsOch9Rp8xfkMCbvbAZlA2pBHQc73dbl+vFOXfqkf4uemdn0bw== +"@noble/curves@1.2.0", "@noble/curves@~1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35" + integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== + dependencies: + "@noble/hashes" "1.3.2" + +"@noble/curves@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.1.0.tgz#f13fc667c89184bc04cccb9b11e8e7bae27d8c3d" + integrity sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA== dependencies: - "@noble/hashes" "1.3.0" + "@noble/hashes" "1.3.1" "@noble/ed25519@^1.7.0": version "1.7.1" @@ -2406,7 +2638,17 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.2.tgz#e9e035b9b166ca0af657a7848eb2718f0f22f183" integrity sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA== -"@noble/hashes@1.3.0", "@noble/hashes@^1.1.2", "@noble/hashes@~1.3.0": +"@noble/hashes@1.3.1", "@noble/hashes@^1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.1.tgz#8831ef002114670c603c458ab8b11328406953a9" + integrity sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA== + +"@noble/hashes@1.3.2", "@noble/hashes@~1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" + integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== + +"@noble/hashes@^1.1.2", "@noble/hashes@~1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.0.tgz#085fd70f6d7d9d109671090ccae1d3bec62554a1" integrity sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg== @@ -2563,13 +2805,13 @@ resolved "https://registry.yarnpkg.com/@pedrouid/environment/-/environment-1.0.1.tgz#858f0f8a057340e0b250398b75ead77d6f4342ec" integrity sha512-HaW78NszGzRZd9SeoI3JD11JqY+lubnaOx7Pewj5pfjqWXOEATpeKIFb9Z4t2WBUK2iryiXX3lzWwmYWgUL0Ug== -"@playwright/test@^1.33.0": - version "1.34.3" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.34.3.tgz#d9f1ac3f1a09633b5ca5351c50c308bf802bde53" - integrity sha512-zPLef6w9P6T/iT6XDYG3mvGOqOyb6eHaV9XtkunYs0+OzxBtrPAAaHotc0X+PJ00WPPnLfFBTl7mf45Mn8DBmw== +"@playwright/test@^1.37.0": + version "1.37.1" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.37.1.tgz#e7f44ae0faf1be52d6360c6bbf689fd0057d9b6f" + integrity sha512-bq9zTli3vWJo8S3LwB91U0qDNQDpEXnw7knhxLM0nwDvexQAwx9tO8iKDZSqqneVq+URd/WIoz+BALMqUTgdSg== dependencies: "@types/node" "*" - playwright-core "1.34.3" + playwright-core "1.37.1" optionalDependencies: fsevents "2.3.2" @@ -2757,92 +2999,6 @@ tiny-warning "^1.0.3" tslib "^2.3.0" -"@react-spring/animated@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.6.1.tgz#ccc626d847cbe346f5f8815d0928183c647eb425" - integrity sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ== - dependencies: - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/core@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.6.1.tgz#ebe07c20682b360b06af116ea24e2b609e778c10" - integrity sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/rafz" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/konva@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.6.1.tgz#66e63da0e9681e42395e995402a7e73ba6892461" - integrity sha512-MevnU+tnG1LPsmMRpfJfevfLtI0ObIvrwYc+Xg+kmYJe00vwMRSdulQOztKANKalFXBewwk72XrQCeRLXFaUIg== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/core" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/native@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.6.1.tgz#b66e237f2faaa4f88569d5a03b6fb0136bcdf2b9" - integrity sha512-ZIfSytxFGLw4gYOb8gsmwG0+JZYxuM/Y1XPCXCkhuoMn+RmOYrr0kQ4gLczbmf+TRxth7OT1c8vBYz0+SCGcIQ== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/core" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/rafz@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.6.1.tgz#d71aafb92b78b24e4ff84639f52745afc285c38d" - integrity sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ== - -"@react-spring/shared@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.6.1.tgz#4e2e4296910656c02bd9fd54c559702bc836ac4e" - integrity sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw== - dependencies: - "@react-spring/rafz" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/three@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.6.1.tgz#095fcd1dc6509127c33c14486d88289b89baeb9d" - integrity sha512-Tyw2YhZPKJAX3t2FcqvpLRb71CyTe1GvT3V+i+xJzfALgpk10uPGdGaQQ5Xrzmok1340DAeg2pR/MCfaW7b8AA== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/core" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/types@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.6.1.tgz#913d3a68c5cbc1124fdb18eff919432f7b6abdde" - integrity sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q== - -"@react-spring/web@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.6.1.tgz#3e4c03b724d2b545dc2fa2649eb6109318ab9178" - integrity sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/core" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - -"@react-spring/zdog@~9.6.1": - version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.6.1.tgz#5292c374e23e3846db3eb9d7557ed5a7bb40dada" - integrity sha512-0jSGm2OFW/+/+4dkRp46KzEkcLVfzV2k6DO1om0dLDtQ4q6FpX4dmDTlRc7Apzin6VtfQONMFIGITtbqoS28MQ== - dependencies: - "@react-spring/animated" "~9.6.1" - "@react-spring/core" "~9.6.1" - "@react-spring/shared" "~9.6.1" - "@react-spring/types" "~9.6.1" - "@reduxjs/toolkit@1.9.3": version "1.9.3" resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.9.3.tgz#27e1a33072b5a312e4f7fa19247fec160bbb2df9" @@ -2876,24 +3032,60 @@ estree-walker "^2.0.2" picomatch "^2.3.1" +"@safe-global/safe-apps-provider@^0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.16.0.tgz#55cb8ef168900fa13d4f4508a99ef00b565bf55d" + integrity sha512-oeRlvU+2hjFx/7EbskGq30kkwL2hyfdseZZZYf6na/xD85mZ59zKO81lBxZcWnvofJFqjqtScz84PAKth9Sq2g== + dependencies: + "@safe-global/safe-apps-sdk" "7.10.0" + events "^3.3.0" + +"@safe-global/safe-apps-sdk@7.10.0": + version "7.10.0" + resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-7.10.0.tgz#e75fc581126f27c52ec2601da51bca5eb99b61f4" + integrity sha512-is0QAHVoGkP06YfOPcp4X3/YUEA3wRdgFUyKZ4rT47uOEnzxA9Sm8BFJrIZqZOjjqC+aJXRMF0cE2qucS953rg== + dependencies: + "@safe-global/safe-gateway-typescript-sdk" "^3.5.3" + ethers "^5.7.2" + +"@safe-global/safe-apps-sdk@^7.10.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-sdk/-/safe-apps-sdk-7.11.0.tgz#2cbc164fb70141cdf4d3331ff222cd98a2529316" + integrity sha512-RDamzPM1Lhhiiz0O+Dn6FkFqIh47jmZX+HCV/BBnBBOSKfBJE//IGD3+02zMgojXHTikQAburdPes9qmH1SA1A== + dependencies: + "@safe-global/safe-gateway-typescript-sdk" "^3.5.3" + ethers "^5.7.2" + +"@safe-global/safe-gateway-typescript-sdk@^3.5.3": + version "3.9.0" + resolved "https://registry.yarnpkg.com/@safe-global/safe-gateway-typescript-sdk/-/safe-gateway-typescript-sdk-3.9.0.tgz#5aa36c05b865f6fe754d1d460f83bc9bf3a0145e" + integrity sha512-DxRM/sBBQhv955dPtdo0z2Bf2fXxrzoRUnGyTa3+4Z0RAhcyiqnffRP1Bt3tyuvlyfZnFL0RsvkqDcAIKzq3RQ== + dependencies: + cross-fetch "^3.1.5" + "@scure/base@~1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938" integrity sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA== -"@scure/bip32@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.0.tgz#6c8d980ef3f290987736acd0ee2e0f0d50068d87" - integrity sha512-bcKpo1oj54hGholplGLpqPHRbIsnbixFtc06nwuNM5/dwSXOq/AAYoIBRsBmnZJSdfeNW5rnff7NTAz3ZCqR9Q== +"@scure/base@~1.1.2": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.3.tgz#8584115565228290a6c6c4961973e0903bb3df2f" + integrity sha512-/+SgoRjLq7Xlf0CWuLHq2LUZeL/w65kfzAPG5NH9pcmBhs+nunQTn4gvdwgMTIXnt9b2C/1SeL2XiysZEyIC9Q== + +"@scure/bip32@1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.2.tgz#90e78c027d5e30f0b22c1f8d50ff12f3fb7559f8" + integrity sha512-N1ZhksgwD3OBlwTv3R6KFEcPojl/W4ElJOeCZdi+vuI5QmTFwLq3OFf2zd2ROpKvxFdgZ6hUpb0dx9bVNEwYCA== dependencies: - "@noble/curves" "~1.0.0" - "@noble/hashes" "~1.3.0" - "@scure/base" "~1.1.0" + "@noble/curves" "~1.2.0" + "@noble/hashes" "~1.3.2" + "@scure/base" "~1.1.2" -"@scure/bip39@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.2.0.tgz#a207e2ef96de354de7d0002292ba1503538fc77b" - integrity sha512-SX/uKq52cuxm4YFXWFaVByaSHJh2w3BnokVSeUJVCv6K7WulT9u2BuNRBhuFl8vAuYnzx9bEu9WgpcNYTrYieg== +"@scure/bip39@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.2.1.tgz#5cee8978656b272a917b7871c981e0541ad6ac2a" + integrity sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg== dependencies: "@noble/hashes" "~1.3.0" "@scure/base" "~1.1.0" @@ -3437,13 +3629,15 @@ dependencies: "@solana/wallet-adapter-base" "^0.9.19" -"@solana/web3.js@1.52.0": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.52.0.tgz#71bd5c322a31e3e2fa8cda2261c594846810b8ea" - integrity sha512-oG1+BX4nVYZ0OBzmk6DRrY8oBYMsbXVQEf9N9JOfKm+wXSmjxVEEo8v3IPV8mKwR0JvUWuE8lOn3IUDiMlRLgg== +"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.44.3", "@solana/web3.js@^1.66.2": + version "1.70.1" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.70.1.tgz#4a2df47cc32a0f67be5161e772b2ceb6512281fa" + integrity sha512-AnaqCF1cJ3w7d0yhvLGAKAcRI+n5o+ursQihhoTe4cUh8/9d4gbT73SoHYElS7e67OtAgLmSfbcC5hcOAgdvnQ== dependencies: "@babel/runtime" "^7.12.5" - "@ethersproject/sha2" "^5.5.0" + "@noble/ed25519" "^1.7.0" + "@noble/hashes" "^1.1.2" + "@noble/secp256k1" "^1.6.3" "@solana/buffer-layout" "^4.0.0" bigint-buffer "^1.1.5" bn.js "^5.0.0" @@ -3452,33 +3646,29 @@ buffer "6.0.1" fast-stable-stringify "^1.0.0" jayson "^3.4.4" - js-sha3 "^0.8.0" node-fetch "2" - react-native-url-polyfill "^1.3.0" rpc-websockets "^7.5.0" - secp256k1 "^4.0.2" superstruct "^0.14.2" - tweetnacl "^1.0.3" -"@solana/web3.js@^1.17.0", "@solana/web3.js@^1.21.0", "@solana/web3.js@^1.32.0", "@solana/web3.js@^1.36.0", "@solana/web3.js@^1.44.3", "@solana/web3.js@^1.66.2": - version "1.70.1" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.70.1.tgz#4a2df47cc32a0f67be5161e772b2ceb6512281fa" - integrity sha512-AnaqCF1cJ3w7d0yhvLGAKAcRI+n5o+ursQihhoTe4cUh8/9d4gbT73SoHYElS7e67OtAgLmSfbcC5hcOAgdvnQ== +"@solana/web3.js@^1.70.1": + version "1.78.4" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.78.4.tgz#e8ca9abe4ec2af5fc540c1d272efee24aaffedb3" + integrity sha512-up5VG1dK+GPhykmuMIozJZBbVqpm77vbOG6/r5dS7NBGZonwHfTLdBbsYc3rjmaQ4DpCXUa3tUc4RZHRORvZrw== dependencies: - "@babel/runtime" "^7.12.5" - "@noble/ed25519" "^1.7.0" - "@noble/hashes" "^1.1.2" - "@noble/secp256k1" "^1.6.3" + "@babel/runtime" "^7.22.6" + "@noble/curves" "^1.0.0" + "@noble/hashes" "^1.3.1" "@solana/buffer-layout" "^4.0.0" + agentkeepalive "^4.3.0" bigint-buffer "^1.1.5" - bn.js "^5.0.0" + bn.js "^5.2.1" borsh "^0.7.0" bs58 "^4.0.1" - buffer "6.0.1" + buffer "6.0.3" fast-stable-stringify "^1.0.0" - jayson "^3.4.4" - node-fetch "2" - rpc-websockets "^7.5.0" + jayson "^4.1.0" + node-fetch "^2.6.12" + rpc-websockets "^7.5.1" superstruct "^0.14.2" "@solflare-wallet/sdk@^1.1.0": @@ -3834,20 +4024,20 @@ "@svgr/hast-util-to-babel-ast" "^6.5.1" svg-parser "^2.0.4" -"@synthetixio/synpress@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@synthetixio/synpress/-/synpress-3.7.0.tgz#69c3216e9105b590e01ad25b04d40e07d37770ea" - integrity sha512-nuINmdDD2N9Yw4atBYuvA5FSrIqdJaFvUkb8y6YFv6DKN8rb1dTAArhHp3oknE0E0rERhQrdDPgxfdzmC1gYjg== +"@synthetixio/synpress@^3.7.2-beta.7": + version "3.7.2-beta.7" + resolved "https://registry.yarnpkg.com/@synthetixio/synpress/-/synpress-3.7.2-beta.7.tgz#80a485c15c28de08f9b9e6219e38493b1122bf9c" + integrity sha512-V5Z59fbzMIv3BVjzfMElD+eR+3C1q3mKPR6RJh9C0GpAnsBLtH2c2cPgBV2QgHBdmaJLFxEQBBud6Sb05w2jcw== dependencies: - "@cypress/code-coverage" "^3.10.4" - "@cypress/webpack-dev-server" "^3.4.1" + "@cypress/code-coverage" "^3.11.0" + "@cypress/webpack-dev-server" "^3.5.2" "@drptbl/gremlins.js" "^2.2.1" "@foundry-rs/easy-foundryup" "^0.1.3" - "@playwright/test" "^1.33.0" + "@playwright/test" "^1.37.0" "@testing-library/cypress" "^9.0.0" "@testing-library/react" "^14.0.0" "@types/testing-library__cypress" "^5.0.9" - "@viem/anvil" "^0.0.5" + "@viem/anvil" "^0.0.6" app-root-path "^3.1.0" axios "^1.4.0" babel-plugin-istanbul "^6.1.1" @@ -3856,20 +4046,20 @@ babel-plugin-transform-react-qa-classes "^1.6.0" babel-plugin-transform-react-styled-components-qa "^2.1.0" bytes32 "^0.0.3" - commander "^10.0.1" - cypress "^12.11.0" - cypress-wait-until "^1.7.2" + commander "^11.0.0" + cypress "12.17.3" + cypress-wait-until "^2.0.1" debug "^4.3.4" - dotenv "^16.0.3" + dotenv "^16.3.1" dotenv-parse-variables "^2.0.0" download "^8.0.0" - ethers "^6.3.0" + ethers "^6.7.1" etherscan-api "^10.3.0" find-config "^1.0.0" - get-port "^6.1.2" + get-port "^7.0.0" node-fetch "^2.6.1" underscore "^1.13.6" - viem "^0.3.17" + viem "^1.6.0" wait-on "^7.0.1" "@szmarczak/http-timer@^5.0.1": @@ -4099,13 +4289,6 @@ resolved "https://registry.yarnpkg.com/@types/big.js/-/big.js-6.1.6.tgz#3d417e758483d55345a03a087f7e0c87137ca444" integrity sha512-0r9J+Zz9rYm2hOTwiMAVkm3XFQ4u5uTK37xrQMhc9bysn/sf/okzovWMYYIBMFTn/yrEZ11pusgLEaoarTlQbA== -"@types/bn.js@^4.11.3": - version "4.11.6" - resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.6.tgz#c306c70d9358aaea33cd4eda092a742b9505967c" - integrity sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg== - dependencies: - "@types/node" "*" - "@types/bn.js@^5.1.0": version "5.1.1" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682" @@ -4413,6 +4596,13 @@ "@types/d3-transition" "*" "@types/d3-zoom" "*" +"@types/debug@^4.1.7": + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" + integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== + dependencies: + "@types/ms" "*" + "@types/estree@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" @@ -4490,14 +4680,6 @@ dependencies: "@types/istanbul-lib-coverage" "*" -"@types/istanbul-reports@^1.1.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" - integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - "@types/istanbul-reports@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" @@ -4505,14 +4687,6 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^25.2.1": - version "25.2.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" - integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw== - dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" - "@types/js-cookie@2.2.6": version "2.2.6" resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f" @@ -4553,6 +4727,11 @@ resolved "https://registry.yarnpkg.com/@types/mixpanel-browser/-/mixpanel-browser-2.38.0.tgz#b3e28e1ba06c10a9f88510b88f1ac9d1b2adfc42" integrity sha512-TR8rvsILnqXA7oiiGOxuMGXwvDeCoQDonXJB5UR+TYvEAFpiK8ReFj5LhZT+Xhm3NpI9aPoju30jB2ssorSUww== +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== + "@types/multicodec@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/multicodec/-/multicodec-1.0.0.tgz#9c9c2df84ea5006c65a048873600f71c4565a397" @@ -4598,6 +4777,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.42.tgz#fa39b2dc8e0eba61bdf51c66502f84e23b66e114" integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg== +"@types/node@^16.18.39": + version "16.18.48" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.48.tgz#3bc872236cdb31cb51024d8875d655e25db489a4" + integrity sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -4924,6 +5108,13 @@ dependencies: "@types/node" "*" +"@types/ws@^8.5.5": + version "8.5.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.5.tgz#af587964aa06682702ee6dcbc7be41a80e4b28eb" + integrity sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "21.0.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" @@ -5065,10 +5256,10 @@ dependencies: "@use-gesture/core" "10.2.27" -"@viem/anvil@^0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@viem/anvil/-/anvil-0.0.5.tgz#9f65358e6b601e2c925f4bd7c1ffc2d4df1a5be9" - integrity sha512-aGgbwBNmCcxp08WcYwyL+n01HLLFYuhIczQLy6BPcomQ2CG4ngfTed8K73EOpsBTmvCxAcek0APcVS7UUWNALw== +"@viem/anvil@^0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@viem/anvil/-/anvil-0.0.6.tgz#0f6378d2e6a6f2cee1b09570eae994551a6835b4" + integrity sha512-OjKR/+FVwzuygXYFqP8MBal1SXG8bT2gbZwqqB0XuLw81LNBBvmE/Repm6+5kkBh4IUj0PhYdrqOsnayS14Gtg== dependencies: execa "^7.1.1" get-port "^6.1.2" @@ -5086,68 +5277,63 @@ magic-string "^0.27.0" react-refresh "^0.14.0" -"@vue/compiler-core@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.45.tgz#d9311207d96f6ebd5f4660be129fb99f01ddb41b" - integrity sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A== +"@vue/compiler-core@3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128" + integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g== dependencies: - "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.45" + "@babel/parser" "^7.21.3" + "@vue/shared" "3.3.4" estree-walker "^2.0.2" - source-map "^0.6.1" + source-map-js "^1.0.2" -"@vue/compiler-dom@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz#c43cc15e50da62ecc16a42f2622d25dc5fd97dce" - integrity sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw== +"@vue/compiler-dom@3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151" + integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w== dependencies: - "@vue/compiler-core" "3.2.45" - "@vue/shared" "3.2.45" + "@vue/compiler-core" "3.3.4" + "@vue/shared" "3.3.4" "@vue/compiler-sfc@^3.2.40": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz#7f7989cc04ec9e7c55acd406827a2c4e96872c70" - integrity sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.45" - "@vue/compiler-dom" "3.2.45" - "@vue/compiler-ssr" "3.2.45" - "@vue/reactivity-transform" "3.2.45" - "@vue/shared" "3.2.45" + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df" + integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ== + dependencies: + "@babel/parser" "^7.20.15" + "@vue/compiler-core" "3.3.4" + "@vue/compiler-dom" "3.3.4" + "@vue/compiler-ssr" "3.3.4" + "@vue/reactivity-transform" "3.3.4" + "@vue/shared" "3.3.4" estree-walker "^2.0.2" - magic-string "^0.25.7" + magic-string "^0.30.0" postcss "^8.1.10" - source-map "^0.6.1" + source-map-js "^1.0.2" -"@vue/compiler-ssr@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz#bd20604b6e64ea15344d5b6278c4141191c983b2" - integrity sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ== +"@vue/compiler-ssr@3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777" + integrity sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ== dependencies: - "@vue/compiler-dom" "3.2.45" - "@vue/shared" "3.2.45" + "@vue/compiler-dom" "3.3.4" + "@vue/shared" "3.3.4" -"@vue/reactivity-transform@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz#07ac83b8138550c83dfb50db43cde1e0e5e8124d" - integrity sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ== +"@vue/reactivity-transform@3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929" + integrity sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw== dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.45" - "@vue/shared" "3.2.45" + "@babel/parser" "^7.20.15" + "@vue/compiler-core" "3.3.4" + "@vue/shared" "3.3.4" estree-walker "^2.0.2" - magic-string "^0.25.7" + magic-string "^0.30.0" -"@vue/shared@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2" - integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg== - -"@wagmi/chains@0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-0.3.1.tgz#5d8e8ef1bcd8637c9f3ead8626595b12a01c35e4" - integrity sha512-NN5qziBLFeXnx0+3ywdiKKXUSW4H73Wc1jRrygl9GKXVPawU0GBMudwXUfV7VOu6E9vmG7Arj0pVsEwq63b2Ew== +"@vue/shared@3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780" + integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ== "@walletconnect/browser-utils@^1.8.0": version "1.8.0" @@ -5598,21 +5784,14 @@ "@walletconnect/window-getters" "^1.0.1" tslib "1.14.1" -"@web3-react/abstract-connector@^6.0.7": - version "6.0.7" - resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6" - integrity sha512-RhQasA4Ox8CxUC0OENc1AJJm8UTybu/oOCM61Zjg6y0iF7Z0sqv1Ai1VdhC33hrQpA8qSBgoXN9PaP8jKmtdqg== - dependencies: - "@web3-react/types" "^6.0.7" - -"@web3-react/coinbase-wallet@^8.2.0": +"@web3-react/coinbase-wallet@8.2.0": version "8.2.0" resolved "https://registry.yarnpkg.com/@web3-react/coinbase-wallet/-/coinbase-wallet-8.2.0.tgz#038bb9e915834046320621aa49db5ba79130e488" integrity sha512-SFPrsRbyw1gECyKJmE/TAB3iMhHAqh9DTa8X2FKPMgPyNPVPcha4+G0SuWy55rysh0MO6TJbj9pofX3HvXaYpw== dependencies: "@web3-react/types" "^8.2.0" -"@web3-react/core@^8.2.0": +"@web3-react/core@8.2.0": version "8.2.0" resolved "https://registry.yarnpkg.com/@web3-react/core/-/core-8.2.0.tgz#95fb615bb283be520e6f61b5e48cfb0047943808" integrity sha512-r7dmK2E8Jrpvm/DF93hGMB+8lECHSI3Oo0NrHbhxkisK6in6rdgAXeYFhZtM48LBAm9py6fQvLzjCM6Qx9q0oQ== @@ -5623,6 +5802,15 @@ optionalDependencies: "@ethersproject/providers" "^5" +"@web3-react/gnosis-safe@8.2.0": + version "8.2.0" + resolved "https://registry.yarnpkg.com/@web3-react/gnosis-safe/-/gnosis-safe-8.2.0.tgz#003e7f5b335751b6699152be301256c989631b51" + integrity sha512-52Z1uHcnIVsyfEPjj2C+cDF21wNCMrCT6kr1JTFXkvLMfZ3LvfWOX1j+C9lOBGUyZRBe5ZtkjiLiogGqRqZYmA== + dependencies: + "@safe-global/safe-apps-provider" "^0.16.0" + "@safe-global/safe-apps-sdk" "^7.10.0" + "@web3-react/types" "^8.2.0" + "@web3-react/metamask@^8.2.1": version "8.2.1" resolved "https://registry.yarnpkg.com/@web3-react/metamask/-/metamask-8.2.1.tgz#7ffac16e2a55ff8f1195e2831a9f9f99fa0bfba9" @@ -5640,12 +5828,7 @@ "@web3-react/types" "^8.2.0" zustand "^4.3.5" -"@web3-react/types@^6.0.7": - version "6.0.7" - resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-6.0.7.tgz#34a6204224467eedc6123abaf55fbb6baeb2809f" - integrity sha512-ofGmfDhxmNT1/P/MgVa8IKSkCStFiyvXe+U5tyZurKdrtTDFU+wJ/LxClPDtFerWpczNFPUSrKcuhfPX1sI6+A== - -"@web3-react/types@^8.2.0": +"@web3-react/types@8.2.0", "@web3-react/types@^8.1.2-beta.0", "@web3-react/types@^8.2.0": version "8.2.0" resolved "https://registry.yarnpkg.com/@web3-react/types/-/types-8.2.0.tgz#195464ebb94cb417e6dc3c16951573f9b6b3832a" integrity sha512-TBYTFlqJZaEpVbuAAKRJFX5PZc3lI1TqDZzY94zwCrCh4GBepwwK7+PxmRAppMFuNa5x0vFX/ghLEC44e6TCFg== @@ -5662,15 +5845,6 @@ "@web3-react/types" "^8.2.0" eventemitter3 "^4.0.7" -"@web3-react/walletlink-connector@^6.2.14": - version "6.2.14" - resolved "https://registry.yarnpkg.com/@web3-react/walletlink-connector/-/walletlink-connector-6.2.14.tgz#4adf7b94de5d7018a9fc9e3b6009e78cd33d6e15" - integrity sha512-F2v1Uu7Nhptt7AaUEJpz69+NVUJxyUfDEA5B/Vr1HkqAL1aJM5gv6B1m4M/VdXKLpmjZ9Kg6X0+VUEyAx1eQ4w== - dependencies: - "@coinbase/wallet-sdk" "^3.0.4" - "@web3-react/abstract-connector" "^6.0.7" - "@web3-react/types" "^6.0.7" - "@web3modal/core@2.4.7": version "2.4.7" resolved "https://registry.yarnpkg.com/@web3modal/core/-/core-2.4.7.tgz#e128be449bc5f6f23f6fb32f12021c096b5e7a07" @@ -5689,6 +5863,13 @@ motion "10.16.2" qrcode "1.5.3" +"@welldone-software/why-did-you-render@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-7.0.1.tgz#09f487d84844bd8e66435843c2e0305702e61efb" + integrity sha512-Qe/8Xxa2G+LMdI6VoazescPzjjkHYduCDa8aHOJR50e9Bgs8ihkfMBY+ev7B4oc3N59Zm547Sgjf8h5y0FOyoA== + dependencies: + lodash "^4" + "@wojtekmaj/date-utils@^1.0.2", "@wojtekmaj/date-utils@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@wojtekmaj/date-utils/-/date-utils-1.0.3.tgz#2dcfd92881425c5923e429c2aec86fb3609032a1" @@ -5738,10 +5919,10 @@ JSONStream@^1.0.4, JSONStream@^1.3.5: jsonparse "^1.2.0" through ">=2.2.7 <3" -abitype@0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.8.2.tgz#cacd330d07488a4020d84f54fc361361234b9c83" - integrity sha512-B1ViNMGpfx/qjVQi0RTc2HEFHuR9uoCoTEkwELT5Y7pBPtBbctYijz9BK6+Kd0hQ3S70FhYTO2dWWk0QNUEXMA== +abitype@0.9.8: + version "0.9.8" + resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.9.8.tgz#1f120b6b717459deafd213dfbf3a3dd1bf10ae8c" + integrity sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ== accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: version "1.3.8" @@ -5793,6 +5974,13 @@ agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2: dependencies: debug "4" +agentkeepalive@^4.3.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923" + integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew== + dependencies: + humanize-ms "^1.2.1" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -6307,6 +6495,17 @@ babel-plugin-istanbul@^6.1.1: istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" +babel-plugin-lodash@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196" + integrity sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg== + dependencies: + "@babel/helper-module-imports" "^7.0.0-beta.49" + "@babel/types" "^7.0.0-beta.49" + glob "^7.1.1" + lodash "^4.17.10" + require-package-name "^2.0.1" + babel-plugin-macros@^2.0.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" @@ -6325,30 +6524,6 @@ babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0: cosmiconfig "^7.0.0" resolve "^1.19.0" -babel-plugin-polyfill-corejs2@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" - integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.3" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" - integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - core-js-compat "^3.25.1" - -babel-plugin-polyfill-regenerator@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" - integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - babel-plugin-react-generate-property@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/babel-plugin-react-generate-property/-/babel-plugin-react-generate-property-1.1.2.tgz#2f861e2661795a242b80284af32573bb2c6cdf3b" @@ -6528,6 +6703,11 @@ bindings@^1.3.0, bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" +bintrees@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8" + integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw== + bip66@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22" @@ -6586,7 +6766,7 @@ bmp-js@^0.1.0: resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233" integrity sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.8, bn.js@^4.11.9: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.8, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -6738,7 +6918,7 @@ browserify-sign@^4.0.0: readable-stream "^3.6.0" safe-buffer "^5.2.0" -browserslist@^4.21.3, browserslist@^4.21.4: +browserslist@^4.21.3: version "4.21.4" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== @@ -6748,6 +6928,16 @@ browserslist@^4.21.3, browserslist@^4.21.4: node-releases "^2.0.6" update-browserslist-db "^1.0.9" +browserslist@^4.21.9: + version "4.21.10" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" + integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== + dependencies: + caniuse-lite "^1.0.30001517" + electron-to-chromium "^1.4.477" + node-releases "^2.0.13" + update-browserslist-db "^1.0.11" + bs58@^4.0.0, bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" @@ -6771,11 +6961,6 @@ bs58check@^2.1.2: create-hash "^1.1.0" safe-buffer "^5.1.2" -btoa@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73" - integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g== - buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" @@ -6983,6 +7168,11 @@ caniuse-lite@^1.0.30001400: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz" integrity sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q== +caniuse-lite@^1.0.30001517: + version "1.0.30001527" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba" + integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -6993,7 +7183,7 @@ cbor-sync@^1.0.4: resolved "https://registry.yarnpkg.com/cbor-sync/-/cbor-sync-1.0.4.tgz#5a11a1ab75c2a14d1af1b237fd84aa8c1593662f" integrity sha512-GWlXN4wiz0vdWWXBU71Dvc1q3aBo0HytqwAZnXF1wOwjqNnDWA1vZ1gDMFLlqohak31VQzmhiYfiCX5QSSfagA== -chalk@2.4.2, chalk@^2.0.0: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -7015,14 +7205,6 @@ chalk@5.2.0, chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chance@^1.1.4: version "1.1.11" resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.11.tgz#78e10e1f9220a5bbc60a83e3f28a5d8558d84d1b" @@ -7239,11 +7421,6 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -clone@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== - clsx@^1.1.0, clsx@^1.1.1, clsx@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" @@ -7295,7 +7472,7 @@ command-exists@^1.2.9: resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== -commander@*, commander@^10.0.1: +commander@*: version "10.0.1" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== @@ -7305,6 +7482,11 @@ commander@7: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67" + integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ== + commander@^2.18.0, commander@^2.20.0, commander@^2.20.3, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -7594,13 +7776,6 @@ copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1: dependencies: toggle-selection "^1.0.6" -core-js-compat@^3.25.1: - version "3.26.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df" - integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A== - dependencies: - browserslist "^4.21.4" - core-js-pure@^3.30.2: version "3.30.2" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.30.2.tgz#005a82551f4af3250dcfb46ed360fad32ced114e" @@ -7826,12 +8001,12 @@ csstype@^3.0.2, csstype@^3.0.6: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== -cypress-wait-until@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz#7f534dd5a11c89b65359e7a0210f20d3dfc22107" - integrity sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q== +cypress-wait-until@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-2.0.1.tgz#69c575c7207d83e4ae023e2aaecf2b66148c9fc0" + integrity sha512-+IyVnYNiaX1+C+V/LazrJWAi/CqiwfNoRSrFviECQEyolW1gDRy765PZosL2alSSGK8V10Y7BGfOQyZUDgmnjQ== -cypress@*, cypress@^12.11.0: +cypress@*: version "12.13.0" resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.13.0.tgz#725b6617ea19e41e5c59cc509fc3e08097142b01" integrity sha512-QJlSmdPk+53Zhy69woJMySZQJoWfEWun3X5OOenGsXjRPVfByVTHorxNehbzhZrEzH9RDUDqVcck0ahtlS+N/Q== @@ -7879,6 +8054,54 @@ cypress@*, cypress@^12.11.0: untildify "^4.0.0" yauzl "^2.10.0" +cypress@12.17.3: + version "12.17.3" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.3.tgz#1e2b19037236fc60e4a4b3a14f0846be17a1fc0e" + integrity sha512-/R4+xdIDjUSLYkiQfwJd630S81KIgicmQOLXotFxVXkl+eTeVO+3bHXxdi5KBh/OgC33HWN33kHX+0tQR/ZWpg== + dependencies: + "@cypress/request" "^2.88.11" + "@cypress/xvfb" "^1.2.4" + "@types/node" "^16.18.39" + "@types/sinonjs__fake-timers" "8.1.1" + "@types/sizzle" "^2.3.2" + arch "^2.2.0" + blob-util "^2.0.2" + bluebird "^3.7.2" + buffer "^5.6.0" + cachedir "^2.3.0" + chalk "^4.1.0" + check-more-types "^2.24.0" + cli-cursor "^3.1.0" + cli-table3 "~0.6.1" + commander "^6.2.1" + common-tags "^1.8.0" + dayjs "^1.10.4" + debug "^4.3.4" + enquirer "^2.3.6" + eventemitter2 "6.4.7" + execa "4.1.0" + executable "^4.1.1" + extract-zip "2.0.1" + figures "^3.2.0" + fs-extra "^9.1.0" + getos "^3.2.1" + is-ci "^3.0.0" + is-installed-globally "~0.4.0" + lazy-ass "^1.6.0" + listr2 "^3.8.3" + lodash "^4.17.21" + log-symbols "^4.0.0" + minimist "^1.2.8" + ospath "^1.2.2" + pretty-bytes "^5.6.0" + proxy-from-env "1.0.0" + request-progress "^3.0.0" + semver "^7.5.3" + supports-color "^8.1.1" + tmp "~0.2.1" + untildify "^4.0.0" + yauzl "^2.10.0" + d3-array@2, d3-array@^2.3.0: version "2.12.1" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" @@ -8240,10 +8463,10 @@ dateformat@^3.0.0, dateformat@^3.0.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -dayjs@1.10.7: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== +dayjs@1.11.9: + version "1.11.9" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a" + integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA== dayjs@^1.10.4, dayjs@^1.11.6: version "1.11.7" @@ -8549,11 +8772,6 @@ detect-node@2.1.0, detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== - diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -8702,11 +8920,16 @@ dotenv@10.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== -dotenv@^16.0.1, dotenv@^16.0.3: +dotenv@^16.0.1: version "16.0.3" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== +dotenv@^16.3.1: + version "16.3.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" + integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ== + download@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/download/-/download-8.0.0.tgz#afc0b309730811731aae9f5371c9f46be73e51b1" @@ -8788,6 +9011,11 @@ electron-to-chromium@^1.4.251: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== +electron-to-chromium@^1.4.477: + version "1.4.508" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz#5641ff2f5ba11df4bd960fe6a2f9f70aa8b9af96" + integrity sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg== + elliptic@6.5.4, elliptic@^6.5.2, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -9280,48 +9508,28 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== -eth-block-tracker@4.4.3: - version "4.4.3" - resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-4.4.3.tgz#766a0a0eb4a52c867a28328e9ae21353812cf626" - integrity sha512-A8tG4Z4iNg4mw5tP1Vung9N9IjgMNqpiMoJ/FouSFwNCGHv2X0mmOYwtQOJzki6XN7r7Tyo01S29p7b224I4jw== +eth-block-tracker@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/eth-block-tracker/-/eth-block-tracker-6.1.0.tgz#0481f97bbb88a100b9d45806fe7e37af741cbefc" + integrity sha512-K9SY8+/xMBi4M5HHTDdxnpEqEEGjbNpzHFqvxyjMZej8InV/B+CkFRKM6W+uvrFJ7m8Zd1E0qUkseU3vdIDFYQ== dependencies: - "@babel/plugin-transform-runtime" "^7.5.5" - "@babel/runtime" "^7.5.5" - eth-query "^2.1.0" + "@metamask/safe-event-emitter" "^2.0.0" + "@metamask/utils" "^3.0.1" json-rpc-random-id "^1.0.1" pify "^3.0.0" - safe-event-emitter "^1.0.1" -eth-json-rpc-filters@4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.2.tgz#eb35e1dfe9357ace8a8908e7daee80b2cd60a10d" - integrity sha512-DGtqpLU7bBg63wPMWg1sCpkKCf57dJ+hj/k3zF26anXMzkmtSBDExL8IhUu7LUd34f0Zsce3PYNO2vV2GaTzaw== +eth-json-rpc-filters@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-5.1.0.tgz#f0c2aeaec2a45e2dc6ca1b9843d8e85447821427" + integrity sha512-fos+9xmoa1A2Ytsc9eYof17r81BjdJOUcGcgZn4K/tKdCCTb+a8ytEtwlu1op5qsXFDlgGmstTELFrDEc89qEQ== dependencies: "@metamask/safe-event-emitter" "^2.0.0" async-mutex "^0.2.6" - eth-json-rpc-middleware "^6.0.0" eth-query "^2.1.2" json-rpc-engine "^6.1.0" pify "^5.0.0" -eth-json-rpc-middleware@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-6.0.0.tgz#4fe16928b34231a2537856f08a5ebbc3d0c31175" - integrity sha512-qqBfLU2Uq1Ou15Wox1s+NX05S9OcAEL4JZ04VZox2NS0U+RtCMjSxzXhLFWekdShUPZ+P8ax3zCO2xcPrp6XJQ== - dependencies: - btoa "^1.2.1" - clone "^2.1.1" - eth-query "^2.1.2" - eth-rpc-errors "^3.0.0" - eth-sig-util "^1.4.2" - ethereumjs-util "^5.1.2" - json-rpc-engine "^5.3.0" - json-stable-stringify "^1.0.1" - node-fetch "^2.6.1" - pify "^3.0.0" - safe-event-emitter "^1.0.1" - -eth-query@^2.1.0, eth-query@^2.1.2: +eth-query@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/eth-query/-/eth-query-2.1.2.tgz#d6741d9000106b51510c72db92d6365456a6da5e" integrity sha512-srES0ZcvwkR/wd5OQBRA1bIJMww1skfGS0s8wlwK3/oNP4+wnds60krvu5R1QbpRQjMmpG5OMIWro5s7gvDPsA== @@ -9336,13 +9544,6 @@ eth-rpc-errors@4.0.2: dependencies: fast-safe-stringify "^2.0.6" -eth-rpc-errors@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz#d7b22653c70dbf9defd4ef490fd08fe70608ca10" - integrity sha512-iPPNHPrLwUlR9xCSYm7HHQjWBasor3+KZfRvwEWxMz3ca0yqnlBeJrnyphkGIXZ4J7AMAaOLmwy4AWhnxOiLxg== - dependencies: - fast-safe-stringify "^2.0.6" - eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a" @@ -9350,14 +9551,6 @@ eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3: dependencies: fast-safe-stringify "^2.0.6" -eth-sig-util@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210" - integrity sha512-iNZ576iTOGcfllftB73cPB5AN+XUQAT/T8xzsILsghXC1o8gJUqe3RHlcDqagu+biFpYQ61KQrZZJza8eRSYqw== - dependencies: - ethereumjs-abi "git+https://github.com/ethereumjs/ethereumjs-abi.git" - ethereumjs-util "^5.1.1" - ethereum-cryptography@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191" @@ -9379,39 +9572,6 @@ ethereum-cryptography@^0.1.3: secp256k1 "^4.0.1" setimmediate "^1.0.5" -"ethereumjs-abi@git+https://github.com/ethereumjs/ethereumjs-abi.git": - version "0.6.8" - resolved "git+https://github.com/ethereumjs/ethereumjs-abi.git#ee3994657fa7a427238e6ba92a84d0b529bbcde0" - dependencies: - bn.js "^4.11.8" - ethereumjs-util "^6.0.0" - -ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2: - version "5.2.1" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.2.1.tgz#a833f0e5fca7e5b361384dc76301a721f537bf65" - integrity sha512-v3kT+7zdyCm1HIqWlLNrHGqHGLpGYIhjeHxQjnDXjLT2FyGJDsd3LWMYUo7pAFRrk86CR3nUJfhC81CCoJNNGQ== - dependencies: - bn.js "^4.11.0" - create-hash "^1.1.2" - elliptic "^6.5.2" - ethereum-cryptography "^0.1.3" - ethjs-util "^0.1.3" - rlp "^2.0.0" - safe-buffer "^5.1.1" - -ethereumjs-util@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz#fcb4e4dd5ceacb9d2305426ab1a5cd93e3163b69" - integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw== - dependencies: - "@types/bn.js" "^4.11.3" - bn.js "^4.11.0" - create-hash "^1.1.2" - elliptic "^6.5.2" - ethereum-cryptography "^0.1.3" - ethjs-util "0.1.6" - rlp "^2.2.3" - ethereumjs-util@^7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" @@ -9423,7 +9583,7 @@ ethereumjs-util@^7.1.5: ethereum-cryptography "^0.1.3" rlp "^2.2.4" -ethers@^5.4.6, ethers@^5.6.9, ethers@^5.7.1: +ethers@^5.4.6, ethers@^5.6.9, ethers@^5.7.1, ethers@^5.7.2: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -9459,12 +9619,12 @@ ethers@^5.4.6, ethers@^5.6.9, ethers@^5.7.1: "@ethersproject/web" "5.7.1" "@ethersproject/wordlists" "5.7.0" -ethers@^6.3.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.4.0.tgz#82c230a3a018a2627593d24ec4b9c20e9681c341" - integrity sha512-nksaMCwX+BOdV2NQ1/57OehSD2JtujbhrdC2+Fb9VpvBO0WO6h+WWwu3oMMw7aUiTa5lvQcWX1vl4aOy7Q3CTg== +ethers@^6.7.1: + version "6.7.1" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.7.1.tgz#9c65e8b5d8e9ad77b7e8cf1c46099892cfafad49" + integrity sha512-qX5kxIFMfg1i+epfgb0xF4WM7IqapIIu50pOJ17aebkxxa4BacW5jFrQRmCJpDEg2ZK2oNtR5QjrQ1WDBF29dA== dependencies: - "@adraffy/ens-normalize" "https://github.com/ricmoo/ens-normalize.js" + "@adraffy/ens-normalize" "1.9.2" "@noble/hashes" "1.1.2" "@noble/secp256k1" "1.7.1" "@types/node" "18.15.13" @@ -9481,14 +9641,6 @@ etherscan-api@^10.3.0: gh-pages "4.0.0" querystring "0.2.1" -ethjs-util@0.1.6, ethjs-util@^0.1.3: - version "0.1.6" - resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536" - integrity sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w== - dependencies: - is-hex-prefixed "1.0.0" - strip-hex-prefix "1.0.0" - event-stream@=3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" @@ -9512,7 +9664,7 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.1, eventemitter3@^4.0.4, eventemitter3@ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.3.0: +events@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== @@ -10274,6 +10426,11 @@ get-port@^6.1.2: resolved "https://registry.yarnpkg.com/get-port/-/get-port-6.1.2.tgz#c1228abb67ba0e17fb346da33b15187833b9c08a" integrity sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw== +get-port@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-7.0.0.tgz#ffcd83da826146529e307a341d7801cae351daff" + integrity sha512-mDHFgApoQd+azgMdwylJrv2DX47ywGq1i5VFJE7fZ0dttNq3iQMfsU4IvEgBHojA3KqEudyu7Vq+oN8kNaNkWw== + get-stream@3.0.0, get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -10431,7 +10588,7 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -10972,6 +11129,13 @@ human-signals@^4.3.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== +humanize-ms@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== + dependencies: + ms "^2.0.0" + hyphenate-style-name@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" @@ -11337,11 +11501,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-hex-prefixed@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" - integrity sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA== - is-inside-container@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" @@ -11759,20 +11918,23 @@ jayson@^3.4.4: uuid "^8.3.2" ws "^7.4.5" -jest-diff@^25.2.1: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" - integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== +jayson@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/jayson/-/jayson-4.1.0.tgz#60dc946a85197317f2b1439d672a8b0a99cea2f9" + integrity sha512-R6JlbyLN53Mjku329XoRT2zJAE6ZgOQ8f91ucYdMCD4nkGCF9kZSrcGXpHIU4jeKj58zUZke2p+cdQchU7Ly7A== dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" - -jest-get-type@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" - integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig== + "@types/connect" "^3.4.33" + "@types/node" "^12.12.54" + "@types/ws" "^7.4.4" + JSONStream "^1.3.5" + commander "^2.20.3" + delay "^5.0.0" + es6-promisify "^5.0.0" + eyes "^0.1.8" + isomorphic-ws "^4.0.1" + json-stringify-safe "^5.0.1" + uuid "^8.3.2" + ws "^7.4.5" jest-get-type@^26.3.0: version "26.3.0" @@ -11900,14 +12062,6 @@ json-rpc-engine@6.1.0, json-rpc-engine@^6.1.0: "@metamask/safe-event-emitter" "^2.0.0" eth-rpc-errors "^4.0.2" -json-rpc-engine@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-5.4.0.tgz#75758609d849e1dba1e09021ae473f3ab63161e5" - integrity sha512-rAffKbPoNDjuRnXkecTjnsE3xLLrb00rEkdgalINhaYVYIxDwWtvYBr9UFbhTvPB1B2qUOLoFd/cV6f4Q7mh7g== - dependencies: - eth-rpc-errors "^3.0.0" - safe-event-emitter "^1.0.1" - json-rpc-random-id@^1.0.0, json-rpc-random-id@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-rpc-random-id/-/json-rpc-random-id-1.0.1.tgz#ba49d96aded1444dbb8da3d203748acbbcdec8c8" @@ -11952,7 +12106,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2, json5@^2.2.2: +json5@^2.1.2, json5@^2.2.2, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -12006,7 +12160,7 @@ jsqr@^1.2.0: array-includes "^3.1.5" object.assign "^4.1.3" -keccak@^3.0.0, keccak@^3.0.1, keccak@^3.0.2: +keccak@^3.0.0, keccak@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0" integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ== @@ -12015,6 +12169,15 @@ keccak@^3.0.0, keccak@^3.0.1, keccak@^3.0.2: node-gyp-build "^4.2.0" readable-stream "^3.6.0" +keccak@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.3.tgz#4bc35ad917be1ef54ff246f904c2bbbf9ac61276" + integrity sha512-JZrLIAJWuZxKbCilMpNz5Vj7Vtb4scDG3dMXLOsbzBmQGyjwE61BbW7bJkfKKCShXiQZt3T6sBgALRtmd+nZaQ== + dependencies: + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + readable-stream "^3.6.0" + keyv@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373" @@ -12344,7 +12507,7 @@ lodash.upperfirst@4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@4.17.21, lodash@^4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -12443,13 +12606,6 @@ macos-release@^3.1.0: resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-3.1.0.tgz#6165bb0736ae567ed6649e36ce6a24d87cbb7aca" integrity sha512-/M/R0gCDgM+Cv1IuBG1XGdfTFnMEG6PZeT+KGWHO/OG+imqmaD9CH5vHBTycEM3+Kc4uG2Il+tFAuUWLqQOeUA== -magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== - dependencies: - sourcemap-codec "^1.4.8" - magic-string@^0.27.0: version "0.27.0" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" @@ -12457,6 +12613,13 @@ magic-string@^0.27.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" +magic-string@^0.30.0: + version "0.30.3" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.3.tgz#403755dfd9d6b398dfa40635d52e96c5ac095b85" + integrity sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.15" + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -12757,7 +12920,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1: +ms@2.1.3, ms@^2.0.0, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -12853,11 +13016,6 @@ nano-css@^5.2.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== - nanoid@^3.3.6: version "3.3.6" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" @@ -12929,6 +13087,13 @@ node-fetch@3.3.1: fetch-blob "^3.1.4" formdata-polyfill "^4.0.10" +node-fetch@^2.6.12: + version "2.6.13" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.13.tgz#a20acbbec73c2e09f9007de5cda17104122e0010" + integrity sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA== + dependencies: + whatwg-url "^5.0.0" + node-fetch@^2.6.7: version "2.6.11" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" @@ -12960,6 +13125,11 @@ node-preload@^0.2.1: dependencies: process-on-spawn "^1.0.0" +node-releases@^2.0.13: + version "2.0.13" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" + integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== + node-releases@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" @@ -13862,10 +14032,10 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -playwright-core@1.34.3: - version "1.34.3" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.34.3.tgz#bc906ea1b26bb66116ce329436ee59ba2e78fe9f" - integrity sha512-2pWd6G7OHKemc5x1r1rp8aQcpvDh7goMBZlJv6Co5vCNLVcQJdhxRL09SGaY6HcyHH9aT4tiynZabMofVasBYw== +playwright-core@1.37.1: + version "1.37.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.37.1.tgz#cb517d52e2e8cb4fa71957639f1cd105d1683126" + integrity sha512-17EuQxlSIYCmEMwzMqusJ2ztDgJePjrbttaefgdsiqeLWidjYz9BxXaTaZWxH1J95SHGk6tjE+dwgWILJoUZfA== plurals-cldr@^1.0.4: version "1.0.4" @@ -13962,11 +14132,11 @@ postcss@^7.0.2: source-map "^0.6.1" postcss@^8.1.10: - version "8.4.20" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56" - integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g== + version "8.4.29" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd" + integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw== dependencies: - nanoid "^3.3.4" + nanoid "^3.3.6" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -13990,9 +14160,9 @@ preact@10.4.1: integrity sha512-WKrRpCSwL2t3tpOOGhf2WfTpcmbpxaWtDbdJdKdjd0aEiTkvOmS4NBkG6kzlaAHI9AkQ3iVqbFWM3Ei7mZ4o1Q== preact@^10.5.9: - version "10.11.3" - resolved "https://registry.yarnpkg.com/preact/-/preact-10.11.3.tgz#8a7e4ba19d3992c488b0785afcc0f8aa13c78d19" - integrity sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg== + version "10.17.1" + resolved "https://registry.yarnpkg.com/preact/-/preact-10.17.1.tgz#0a1b3c658c019e759326b9648c62912cf5c2dde1" + integrity sha512-X9BODrvQ4Ekwv9GURm9AKAGaomqXmip7NQTZgY7gcNmr7XE83adOMJvd3N42id1tMFU7ojiynRsYnY6/BRFxLA== prelude-ls@^1.2.1: version "1.2.1" @@ -14042,16 +14212,6 @@ pretty-error@^4.0.0: lodash "^4.17.20" renderkid "^3.0.0" -pretty-format@^25.2.1, pretty-format@^25.5.0: - version "25.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" - integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== - dependencies: - "@jest/types" "^25.5.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - pretty-format@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" @@ -14093,6 +14253,13 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== +prom-client@^14.2.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-14.2.0.tgz#ca94504e64156f6506574c25fb1c34df7812cf11" + integrity sha512-sF308EhTenb/pDRPakm+WgiN+VdM/T1RaHj1x+MvAuT8UiQP8JmOEbxVqtkbfR4LrvOg5n7ic01kRBDGXjYikA== + dependencies: + tdigest "^0.1.1" + promise.allsettled@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.6.tgz#8dc8ba8edf429feb60f8e81335b920e109c94b6e" @@ -14212,7 +14379,7 @@ pseudolocale@^1.1.0: dependencies: commander "*" -psl@^1.1.28: +psl@^1.1.28, psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -14301,13 +14468,20 @@ qrcode@1.5.3: pngjs "^5.0.0" yargs "^15.3.1" -qs@6.11.0, qs@^6.10.3: +qs@6.11.0: version "6.11.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== dependencies: side-channel "^1.0.4" +qs@^6.10.3: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + qs@~6.10.3: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" @@ -14354,6 +14528,11 @@ querystring@0.2.1: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -14584,7 +14763,7 @@ react-is@16.10.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab" integrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA== -react-is@^16.10.2, react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: +react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14621,13 +14800,6 @@ react-modal@^3.12.1: react-lifecycles-compat "^3.0.0" warning "^4.0.3" -react-native-url-polyfill@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz#c1763de0f2a8c22cc3e959b654c8790622b6ef6a" - integrity sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ== - dependencies: - whatwg-url-without-unicode "8.0.0-3" - react-popper@^2.2.3: version "2.3.0" resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.3.0.tgz#17891c620e1320dce318bad9fede46a5f71c70ba" @@ -14750,18 +14922,6 @@ react-smooth@^2.0.2: fast-equals "^4.0.3" react-transition-group "2.9.0" -react-spring@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.6.1.tgz#e715b2fa523c1a3acfdcf1aaa93e081620b8cc8e" - integrity sha512-BeP80R4SLb1bZHW/Q62nECoScHw/fH+jzGkD7dc892HNGa+lbGIJXURc6U7N8JfZ8peEO46nPxR57aUMuYzquQ== - dependencies: - "@react-spring/core" "~9.6.1" - "@react-spring/konva" "~9.6.1" - "@react-spring/native" "~9.6.1" - "@react-spring/three" "~9.6.1" - "@react-spring/web" "~9.6.1" - "@react-spring/zdog" "~9.6.1" - react-style-singleton@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4" @@ -14786,11 +14946,6 @@ react-universal-interface@^0.6.2: resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== -react-use-gesture@^6.0.14: - version "6.0.14" - resolved "https://registry.yarnpkg.com/react-use-gesture/-/react-use-gesture-6.0.14.tgz#ab2d35ef72a5fb6060a6160eb12568c276f8a4b1" - integrity sha512-d9cnZJ0DOFd3FIO76J776DyhtbODgbxGKu19lvc1aSNTnRV5EKr9V4Uda188l2Qh0Va3pqWGxEQlw72r2cmnFQ== - react-use@^15.3.4: version "15.3.8" resolved "https://registry.yarnpkg.com/react-use/-/react-use-15.3.8.tgz#ca839ac7fb3d696e5ccbeabbc8dadc2698969d30" @@ -15052,6 +15207,11 @@ regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.3: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== +regenerator-runtime@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== + regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -15171,6 +15331,11 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +require-package-name@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9" + integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q== + requireindex@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162" @@ -15215,7 +15380,7 @@ resolve@^1.1.6, resolve@^1.10.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0: +resolve@^1.12.0, resolve@^1.19.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -15305,7 +15470,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rlp@^2.0.0, rlp@^2.2.3, rlp@^2.2.4: +rlp@^2.2.4: version "2.2.7" resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf" integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ== @@ -15337,6 +15502,19 @@ rpc-websockets@^7.5.0: bufferutil "^4.0.1" utf-8-validate "^5.0.2" +rpc-websockets@^7.5.1: + version "7.6.0" + resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.6.0.tgz#d3f4c0dac108ca35566b0e31552c32e58928cd04" + integrity sha512-Jgcs8q6t8Go98dEulww1x7RysgTkzpCMelVxZW4hvuyFtOGpeUz9prpr2KjUa/usqxgFCd9Tu3+yhHEP9GVmiQ== + dependencies: + "@babel/runtime" "^7.17.2" + eventemitter3 "^4.0.7" + uuid "^8.3.2" + ws "^8.5.0" + optionalDependencies: + bufferutil "^4.0.1" + utf-8-validate "^5.0.2" + rtcpeerconnection-shim@^1.2.15: version "1.2.15" resolved "https://registry.yarnpkg.com/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz#e7cc189a81b435324c4949aa3dfb51888684b243" @@ -15409,13 +15587,6 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-event-emitter@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/safe-event-emitter/-/safe-event-emitter-1.0.1.tgz#5b692ef22329ed8f69fdce607e50ca734f6f20af" - integrity sha512-e1wFe99A91XYYxoQbcq2ZJUWurxEyP8vfz7A7vuUe1s95q8r5ebraVaA1BukYJcpM6V16ugWoD9vngi8Ccu5fg== - dependencies: - events "^3.0.0" - safe-json-utils@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/safe-json-utils/-/safe-json-utils-1.1.1.tgz#0e883874467d95ab914c3f511096b89bfb3e63b1" @@ -15507,7 +15678,7 @@ secp256k1@^3.8.0: nan "^2.14.0" safe-buffer "^5.1.2" -secp256k1@^4.0.1, secp256k1@^4.0.2: +secp256k1@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== @@ -15561,11 +15732,16 @@ semver@7.5.0, semver@^7.3.4: dependencies: lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + semver@^7.3.2, semver@^7.3.5: version "7.5.1" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" @@ -15580,6 +15756,13 @@ semver@^7.3.7: dependencies: lru-cache "^6.0.0" +semver@^7.3.8, semver@^7.5.3: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -16248,13 +16431,6 @@ strip-final-newline@^3.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== -strip-hex-prefix@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz#0c5f155fef1151373377de9dbb588da05500e36f" - integrity sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A== - dependencies: - is-hex-prefixed "1.0.0" - strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -16329,6 +16505,11 @@ superstruct@^0.15.4: resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.5.tgz#0f0a8d3ce31313f0d84c6096cd4fa1bfdedc9dab" integrity sha512-4AOeU+P5UuE/4nOUkmcQdW5y7i9ndt1cQd/3iUe+LTz3RxESf/W/5lg4B74HbDMMv8PHnPnGCQFH45kBcrQYoQ== +superstruct@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-1.0.3.tgz#de626a5b49c6641ff4d37da3c7598e7a87697046" + integrity sha512-8iTn3oSS8nRGn+C2pgXSKPI3jmpm6FExNazNpjvqS6ZUJQCej3PUXEKM8NjHBOs54ExM+LPW/FBRhymrdcCiSg== + supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -16403,6 +16584,13 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" +tdigest@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced" + integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA== + dependencies: + bintrees "1.0.2" + terser@^4.6.3: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -16595,6 +16783,16 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -16667,9 +16865,9 @@ ts-node@^10.8.1, ts-node@^10.9.1: yn "3.1.1" tsconfck@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.1.tgz#9b51603d2712d1f4740fa14748ca886a2e1893e5" - integrity sha512-ZPCkJBKASZBmBUNqGHmRhdhM8pJYDdOXp4nRgj/O0JwUwsMq50lCDRQP/M5GBNAA0elPrq4gAeu4dkaVCuKWww== + version "2.1.2" + resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-2.1.2.tgz#f667035874fa41d908c1fe4d765345fcb1df6e35" + integrity sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg== tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" @@ -16715,11 +16913,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== -tweetnacl@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" - integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -16803,16 +16996,11 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@4.8.4: +typescript@4.8.4, typescript@^4.6.2: version "4.8.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== -typescript@^4.6.2: - version "4.9.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" - integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== - ua-parser-js@^0.7.24: version "0.7.35" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307" @@ -16897,6 +17085,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -16920,6 +17113,14 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== +update-browserslist-db@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + update-browserslist-db@^1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" @@ -16972,6 +17173,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url-to-options@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" @@ -17137,20 +17346,20 @@ victory-vendor@^36.6.8: d3-time "^3.0.0" d3-timer "^3.0.1" -viem@^0.3.17: - version "0.3.37" - resolved "https://registry.yarnpkg.com/viem/-/viem-0.3.37.tgz#0426863c52f4b77547bd3216b8ac66e32a38dda5" - integrity sha512-17jycP/1Hy9DsDpHlaaI7bbAHBDYGfVYHN6j0ltE7A/S30RXhPVFe4LAPRfmG+xR2QBq8xSUpjO78cRgDLBjZQ== - dependencies: - "@adraffy/ens-normalize" "1.9.0" - "@noble/curves" "1.0.0" - "@noble/hashes" "1.3.0" - "@scure/bip32" "1.3.0" - "@scure/bip39" "1.2.0" - "@wagmi/chains" "0.3.1" - abitype "0.8.2" +viem@^1.6.0: + version "1.10.7" + resolved "https://registry.yarnpkg.com/viem/-/viem-1.10.7.tgz#6ac6cae980237bbbc8f2a2b15b6fb15aa893fc79" + integrity sha512-yuaYSHgV1g794nfxhn+V89qgK5ziFTLBSNqSDt4KW8YpjLu0Ah6LLZTtpOj3+MRWKKDwJ1YL2rENb8cuXstUzg== + dependencies: + "@adraffy/ens-normalize" "1.9.4" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@scure/bip32" "1.3.2" + "@scure/bip39" "1.2.1" + "@types/ws" "^8.5.5" + abitype "0.9.8" isomorphic-ws "5.0.0" - ws "8.12.0" + ws "8.13.0" vite-plugin-checker@^0.5.6: version "0.5.6" @@ -17188,9 +17397,9 @@ vite-plugin-svgr@^2.4.0: "@svgr/core" "^6.5.1" vite-tsconfig-paths@^4.0.8: - version "4.2.0" - resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz#bd2647d3eadafb65a10fc98a2ca565211f2eaf63" - integrity sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw== + version "4.2.1" + resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.1.tgz#e53b89096b91d31a6d1e26f75999ea8c336a89ed" + integrity sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ== dependencies: debug "^4.1.1" globrex "^0.1.2" @@ -17333,11 +17542,6 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - webpack-dev-middleware@^5.3.1: version "5.3.3" resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" @@ -17415,15 +17619,6 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== -whatwg-url-without-unicode@8.0.0-3: - version "8.0.0-3" - resolved "https://registry.yarnpkg.com/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz#ab6df4bf6caaa6c85a59f6e82c026151d4bb376b" - integrity sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig== - dependencies: - buffer "^5.4.3" - punycode "^2.1.1" - webidl-conversions "^5.0.0" - whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" @@ -17603,10 +17798,10 @@ ws@7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -ws@8.12.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== +ws@8.13.0, ws@^8.13.0, ws@^8.5.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== ws@8.5.0: version "8.5.0" @@ -17618,11 +17813,6 @@ ws@^7.4.0, ws@^7.4.5, ws@^7.5.1: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@^8.13.0, ws@^8.5.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== - ws@~8.2.3: version "8.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"