From ea50a4d55491440160737755f1b548701c602ec7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:21:15 +0000 Subject: [PATCH 01/12] fix(deps): update dependency @mui/material to v5.11.3 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c00ee5a3..57f3449f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@fontsource/material-icons": "4.5.4", "@fontsource/roboto": "4.5.8", "@mui/icons-material": "5.11.0", - "@mui/material": "5.11.2", + "@mui/material": "5.11.3", "@mui/x-date-pickers": "5.0.13", "@nervosnetwork/ckb-sdk-utils": "0.103.1", "bignumber.js": "9.1.1", @@ -4745,9 +4745,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.2.tgz", - "integrity": "sha512-ztLQELdSSuJFXezng8g5eCzy8mogtzMM8JcfG3HIGgUJ2RlAiBXI2Qe0adKmrJlF4FMat8vTaTeoiRNBZH4t1Q==", + "version": "5.11.3", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.3.tgz", + "integrity": "sha512-Bgb6//KtxY7IC7M5Pa5RKFX1wttc213mqpKqydnz3wn4BGDXfA5c0vf5nTu5zqsJeB4T3ysAJTRJhQ/E1GsZDQ==", "funding": { "type": "opencollective", "url": "https://opencollective.com/mui" @@ -4779,13 +4779,13 @@ } }, "node_modules/@mui/material": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.2.tgz", - "integrity": "sha512-PeraRDsghnDLzejorfe9ps1syxlB8UrGs+UKwg9GGlndv5Tghm+9nwuibrP2TCDC14mlryF+u2WlAOYaPPMwGA==", + "version": "5.11.3", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.3.tgz", + "integrity": "sha512-Oz+rMFiMtxzzDLUxKyyj4mSxF9ShmsBoJ9qvglXCYqklgSrEl1R/Z4hfPZ+2pWd5CriO8U/0CFHr4DksrlTiCw==", "dependencies": { "@babel/runtime": "^7.20.7", "@mui/base": "5.0.0-alpha.112", - "@mui/core-downloads-tracker": "^5.11.2", + "@mui/core-downloads-tracker": "^5.11.3", "@mui/system": "^5.11.2", "@mui/types": "^7.2.3", "@mui/utils": "^5.11.2", @@ -29242,9 +29242,9 @@ } }, "@mui/core-downloads-tracker": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.2.tgz", - "integrity": "sha512-ztLQELdSSuJFXezng8g5eCzy8mogtzMM8JcfG3HIGgUJ2RlAiBXI2Qe0adKmrJlF4FMat8vTaTeoiRNBZH4t1Q==" + "version": "5.11.3", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.3.tgz", + "integrity": "sha512-Bgb6//KtxY7IC7M5Pa5RKFX1wttc213mqpKqydnz3wn4BGDXfA5c0vf5nTu5zqsJeB4T3ysAJTRJhQ/E1GsZDQ==" }, "@mui/icons-material": { "version": "5.11.0", @@ -29255,13 +29255,13 @@ } }, "@mui/material": { - "version": "5.11.2", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.2.tgz", - "integrity": "sha512-PeraRDsghnDLzejorfe9ps1syxlB8UrGs+UKwg9GGlndv5Tghm+9nwuibrP2TCDC14mlryF+u2WlAOYaPPMwGA==", + "version": "5.11.3", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.3.tgz", + "integrity": "sha512-Oz+rMFiMtxzzDLUxKyyj4mSxF9ShmsBoJ9qvglXCYqklgSrEl1R/Z4hfPZ+2pWd5CriO8U/0CFHr4DksrlTiCw==", "requires": { "@babel/runtime": "^7.20.7", "@mui/base": "5.0.0-alpha.112", - "@mui/core-downloads-tracker": "^5.11.2", + "@mui/core-downloads-tracker": "^5.11.3", "@mui/system": "^5.11.2", "@mui/types": "^7.2.3", "@mui/utils": "^5.11.2", diff --git a/package.json b/package.json index a2b5506df..8feff86e4 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@fontsource/material-icons": "4.5.4", "@fontsource/roboto": "4.5.8", "@mui/icons-material": "5.11.0", - "@mui/material": "5.11.2", + "@mui/material": "5.11.3", "@mui/x-date-pickers": "5.0.13", "@nervosnetwork/ckb-sdk-utils": "0.103.1", "bignumber.js": "9.1.1", From 8c3c731fb9cf18d48c085e6c4efe46b53fb586a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:25:00 +0000 Subject: [PATCH 02/12] chore(deps): update dependency eslint to v8.31.0 --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a79da40d..88fc95c13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "autoprefixer": "10.4.13", "babel-plugin-istanbul": "6.1.1", "cypress": "12.3.0", - "eslint": "8.30.0", + "eslint": "8.31.0", "eslint-config-next": "12.3.4", "husky": "8.0.3", "jest": "29.3.1", @@ -2828,9 +2828,9 @@ "license": "MIT" }, "node_modules/@eslint/eslintrc": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz", - "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -12661,12 +12661,12 @@ } }, "node_modules/eslint": { - "version": "8.30.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz", - "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz", + "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.4.0", + "@eslint/eslintrc": "^1.4.1", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -27903,9 +27903,9 @@ "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" }, "@eslint/eslintrc": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz", - "integrity": "sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -35131,12 +35131,12 @@ } }, "eslint": { - "version": "8.30.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz", - "integrity": "sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==", + "version": "8.31.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.31.0.tgz", + "integrity": "sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.4.0", + "@eslint/eslintrc": "^1.4.1", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/package.json b/package.json index fd664dd57..9548812c2 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "autoprefixer": "10.4.13", "babel-plugin-istanbul": "6.1.1", "cypress": "12.3.0", - "eslint": "8.30.0", + "eslint": "8.31.0", "eslint-config-next": "12.3.4", "husky": "8.0.3", "jest": "29.3.1", From 6f8b0927656dd6c86d5be16988a008f0ddcb4f67 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 23:24:08 +0000 Subject: [PATCH 03/12] chore(deps): update cypress-io/github-action action to v5.0.4 --- .github/workflows/test.e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.e2e.yml b/.github/workflows/test.e2e.yml index 405129c66..87c170c92 100644 --- a/.github/workflows/test.e2e.yml +++ b/.github/workflows/test.e2e.yml @@ -31,7 +31,7 @@ jobs: run: npx cypress info - name: Cypress run - uses: cypress-io/github-action@v5.0.2 + uses: cypress-io/github-action@v5.0.4 with: install: false build: npm run build From fea6ff218256b9c278537d56f7aa3d672e887bcd Mon Sep 17 00:00:00 2001 From: Qiwei Yang Date: Fri, 6 Jan 2023 12:16:06 +0800 Subject: [PATCH 04/12] feat: txs list filters (#740) * wip: txs list filters * fix: tx list filters style and i18n * fix: bugs * fix: bugs * fix: tests * fix: txs list filters * fix: pending txs page test * fix: pending txs page test --- components/TxList/index.tsx | 84 +++++++++++++++++----- components/TxList/styles.module.scss | 13 ++++ cypress/integration/block/index.spec.ts | 8 +-- cypress/integration/txs/index.spec.ts | 15 ++-- cypress/integration/txs/pendingTxs.spec.ts | 10 +-- cypress/support/commands.ts | 13 ++++ cypress/support/e2e.ts | 2 +- pages/account/[id].tsx | 36 ++++++++-- pages/block/[id].tsx | 40 +++++++++-- pages/txs/index.tsx | 35 ++++++++- public/locales/en-US/list.json | 4 ++ public/locales/zh-CN/list.json | 4 ++ 12 files changed, 222 insertions(+), 42 deletions(-) diff --git a/components/TxList/index.tsx b/components/TxList/index.tsx index 20016d656..063d36088 100644 --- a/components/TxList/index.tsx +++ b/components/TxList/index.tsx @@ -1,3 +1,4 @@ +import { useEffect, useState } from 'react' import { useTranslation } from 'next-i18next' import { useRouter } from 'next/router' import NextLink from 'next/link' @@ -9,6 +10,7 @@ import Address from 'components/TruncatedAddress' import Pagination from 'components/SimplePagination' import TransferDirection from 'components/TransferDirection' import FilterMenu from 'components/FilterMenu' +import AgeFilterMenu from 'components/FilterMenu/AgeFilterMenu' import RoundedAmount from 'components/RoundedAmount' import Tooltip from 'components/Tooltip' import NoDataIcon from 'assets/icons/no-data.svg' @@ -32,32 +34,44 @@ export type TxListProps = { metadata: GraphQLSchema.PageMetadata } viewer?: string + blockNumber?: number } const txListQuery = gql` - query ( - $address: HashAddress - $script_hash: HashFull + query txListQuery( + $address_from: HashAddress + $address_to: HashAddress + $from_script_hash: HashFull + $to_script_hash: HashFull $before: String $after: String $limit: Int $start_block_number: Int $end_block_number: Int $status: Status + $age_range_start: DateTime + $age_range_end: DateTime + $method_id: String + $method_name: String + $combine_from_to: Boolean ) { transactions( input: { - from_eth_address: $address - to_eth_address: $address - from_script_hash: $script_hash - to_script_hash: $script_hash + from_script_hash: $from_script_hash + to_script_hash: $to_script_hash before: $before after: $after limit: $limit start_block_number: $start_block_number end_block_number: $end_block_number - combine_from_to: true + combine_from_to: $combine_from_to status: $status + from_eth_address: $address_from + to_eth_address: $address_to + age_range_start: $age_range_start + age_range_end: $age_range_end + method_id: $method_id + method_name: $method_name } ) { entries { @@ -106,12 +120,20 @@ interface Filter { start_block_number?: number | null end_block_number?: number | null status?: Status + address_from: string + address_to: string + age_range_start: string + age_range_end: string + method_id: string + method_name: string + combine_from_to: boolean } interface EthAccountTxListVariables extends Nullable { address?: string | null } interface GwAccountTxListVariables extends Nullable { - script_hash?: string | null + from_script_hash?: string | null + to_script_hash?: string | null } interface BlockTxListVariables extends Nullable {} type Variables = Filter | EthAccountTxListVariables | GwAccountTxListVariables | BlockTxListVariables @@ -122,13 +144,23 @@ export const fetchTxList = ({ status = 'ON_CHAINED', ...variables }: Variables) .then(data => data.transactions) .catch(() => ({ entries: [], metadata: { before: null, after: null, total_count: 0 } })) -const FILTER_KEYS = ['block_from', 'block_to'] +const FILTER_KEYS = [ + 'block_from', + 'block_to', + 'method_id', + 'method_name', + 'address_from', + 'address_to', + 'age_range_start', + 'age_range_end', +] const TxList: React.FC = ({ transactions: { entries, metadata }, maxCount, pageSize, viewer, + blockNumber, }) => { const [t, { language }] = useTranslation('list') const { query } = useRouter() @@ -141,16 +173,36 @@ const TxList: React.FC = {t('txHash')} - {t('method')} -
+
+ {t('method')} + +
+ + +
{t('block')} - + +
+ + +
+ {t('age')} + +
+ + +
+ {t('from')} + +
+ + +
+ {t('to')} +
- {t('age')} - {t('from')} - {t('to')} {`${t('value')} (${PCKB_UDT_INFO.symbol})`} diff --git a/components/TxList/styles.module.scss b/components/TxList/styles.module.scss index c5c80be73..22f8fe517 100644 --- a/components/TxList/styles.module.scss +++ b/components/TxList/styles.module.scss @@ -7,6 +7,19 @@ text-align: right; } } + th { + .methodHeader, + .ageHeader, + .blockHeader, + .fromHeader, + .toHeader { + display: flex; + align-items: center; + svg { + margin-left: 0.25rem; + } + } + } &[data-is-filter-unnecessary='true'] { th { svg { diff --git a/cypress/integration/block/index.spec.ts b/cypress/integration/block/index.spec.ts index 6623cb1e0..e7d45e090 100644 --- a/cypress/integration/block/index.spec.ts +++ b/cypress/integration/block/index.spec.ts @@ -186,15 +186,15 @@ context('Block Page', () => { .first() .should('have.text', 'Txn Hash') .next() - .should('have.text', 'Method') + .should('contain.text', 'Method') .next() .should('contain.text', 'Block') .next() - .should('have.text', 'Age') + .should('contain.text', 'Age') .next() - .should('have.text', 'From') + .should('contain.text', 'From') .next() - .should('have.text', 'To') + .should('contain.text', 'To') .next() .next() .should('contain.text', 'Value (pCKB)') diff --git a/cypress/integration/txs/index.spec.ts b/cypress/integration/txs/index.spec.ts index 8b7efa98c..540038a46 100644 --- a/cypress/integration/txs/index.spec.ts +++ b/cypress/integration/txs/index.spec.ts @@ -85,7 +85,12 @@ context('Transactions List Pages Common Features', () => { cy.get('label[for="block_from_filter"]').click() cy.get('input[id="block_from_filter"]').should('be.visible').type(latestBlockNumber) cy.get('input[id="block_to_filter"]').should('be.visible').type(latestBlockNumber) - cy.get('button[type="submit"]').should('be.visible').click() + cy.get('input[id="block_to_filter"]') + .parent() + .siblings() + .find('button[type="submit"]') + .should('be.visible') + .click() waitForLoading() cy.get(`table tbody`).children().should('have.length.at.least', 1) cy.get('table tbody tr:nth-child(1) td:nth-child(3) a').should('have.text', latestBlockNumber) @@ -101,11 +106,11 @@ context('Transactions List Pages Common Features', () => { it('should have a list with required information', () => { waitForLoading() cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(1)`).should('have.text', 'Txn Hash') - cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(2)`).should('have.text', 'Method') + cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(2)`).should('contain.text', 'Method') cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(3)`).should('contain.text', 'Block') - cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(4)`).should('have.text', 'Age') - cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(5)`).should('have.text', 'From') - cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(6)`).should('have.text', 'To') + cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(4)`).should('contain.text', 'Age') + cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(5)`).should('contain.text', 'From') + cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(6)`).should('contain.text', 'To') cy.get(`${HEAD_ROOT_SELECTOR} th:nth-child(8)`).should('have.text', 'Value (pCKB)') cy.get(`${BODY_ROOT_SELECTOR}`).should('have.length', 30) cy.get(`${BODY_ROOT_SELECTOR}:nth-child(1)`) diff --git a/cypress/integration/txs/pendingTxs.spec.ts b/cypress/integration/txs/pendingTxs.spec.ts index e793d177f..ee9110d84 100644 --- a/cypress/integration/txs/pendingTxs.spec.ts +++ b/cypress/integration/txs/pendingTxs.spec.ts @@ -1,10 +1,10 @@ /// -/* - * skip for now, because pending transaction list is randomly empty - */ -context.skip('Pending Transactions List Page', () => { - before(() => cy.visit('/en-US/txs?status=pending')) +context('Pending Transactions List Page', () => { + before(() => { + cy.visit('/en-US/txs?status=pending') + cy.skipWhen(cy.contains("There're no matching entries") !== null) + }) it('should have a subtitle', () => { cy.get('h5+div p') diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index ca4d256f3..6c9917f99 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -23,3 +23,16 @@ // // -- This will overwrite an existing command -- // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... }) + +declare namespace Cypress { + interface Chainable { + skipWhen(expression: boolean): Chainable + } +} + +// command for skipping tests +Cypress.Commands.add('skipWhen', function (expression) { + if (expression) { + this.skip() + } +}) diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts index 6df9d8fa8..afa41e4c8 100644 --- a/cypress/support/e2e.ts +++ b/cypress/support/e2e.ts @@ -16,7 +16,7 @@ import '@cypress/code-coverage/support' // Import commands.js using ES2015 syntax: -// import './commands' +import './commands' // Alternatively you can use CommonJS syntax: // require('./commands') diff --git a/pages/account/[id].tsx b/pages/account/[id].tsx index 7ff2b03d1..8d3033b06 100644 --- a/pages/account/[id].tsx +++ b/pages/account/[id].tsx @@ -59,6 +59,8 @@ const Account = () => { address_to = null, age_range_start = null, age_range_end = null, + method_id = null, + method_name = null, }, } = useRouter() const [t] = useTranslation(['account', 'common']) @@ -107,9 +109,25 @@ const Account = () => { ) const { isLoading: isTxListLoading, data: txList } = useQuery( - ['account-tx-list', id, before, after, block_from, block_to, pageSize], - () => - fetchTxList({ + [ + 'account-tx-list', + id, + before, + after, + block_from, + block_to, + pageSize, + address_from, + address_to, + age_range_start, + age_range_end, + method_id, + method_name, + ], + () => { + let to_addr = (address_to as string) || (address_from === q.address ? null : q.address) + let from_addr = (address_from as string) || (address_to === q.address ? null : q.address) + return fetchTxList({ ...q, before: before as string, after: after as string, @@ -117,7 +135,17 @@ const Account = () => { end_block_number: block_to ? +block_to : null, limit: pageSize, status: null, - }), + address_from: isEthAddress(from_addr) ? from_addr : null, + address_to: isEthAddress(to_addr) ? to_addr : null, + from_script_hash: !isEthAddress(from_addr) ? from_addr : null, + to_script_hash: !isEthAddress(to_addr) ? to_addr : null, + age_range_start: age_range_start as string | null, + age_range_end: age_range_end as string | null, + method_id: method_id as string | null, + method_name: method_name as string | null, + combine_from_to: address_from || address_to ? false : true, + }) + }, { enabled: tab === 'transactions' && !!id, }, diff --git a/pages/block/[id].tsx b/pages/block/[id].tsx index f8b8eb270..afd8dd139 100644 --- a/pages/block/[id].tsx +++ b/pages/block/[id].tsx @@ -17,7 +17,7 @@ import HashLink from 'components/HashLink' import CopyBtn from 'components/CopyBtn' import OpenInNewIcon from 'assets/icons/open-in-new.svg' import DownloadMenu, { DOWNLOAD_HREF_LIST } from 'components/DownloadMenu' -import { fetchBlock, formatDatetime, CKB_EXPLORER_URL, formatInt, fetchBridgedRecordList } from 'utils' +import { fetchBlock, formatDatetime, CKB_EXPLORER_URL, formatInt, fetchBridgedRecordList, isEthAddress } from 'utils' import styles from './styles.module.scss' const tabs = ['transactions', 'bridged', 'raw-data'] @@ -27,7 +27,19 @@ const Block = () => { const [isFinalized, setIsFinalized] = useState(false) const { replace, - query: { id, tab = 'transactions', before = null, after = null, page = '1' }, + query: { + id, + tab = 'transactions', + before = null, + after = null, + page = '1', + address_from = null, + address_to = null, + age_range_start = null, + age_range_end = null, + method_id = null, + method_name = null, + }, } = useRouter() const { isLoading: isBlockLoading, data: block } = useQuery(['block', id], () => fetchBlock(id as string), { @@ -44,13 +56,33 @@ const Block = () => { }, [isBlockLoading, block, replace, setIsFinalized]) const { isLoading: isTxListLoading, data: txList } = useQuery( - ['block-tx-list', block?.number, before, after], + [ + 'block-tx-list', + block?.number, + before, + after, + address_from, + address_to, + age_range_start, + age_range_end, + method_id, + method_name, + ], () => fetchTxList({ start_block_number: block?.number, end_block_number: block?.number, before: before as string | null, after: after as string | null, + address_from: isEthAddress(address_from as string) ? (address_from as string) : null, + address_to: isEthAddress(address_to as string) ? (address_to as string) : null, + from_script_hash: !isEthAddress(address_from as string) ? (address_from as string) : null, + to_script_hash: !isEthAddress(address_to as string) ? (address_to as string) : null, + age_range_start: age_range_start as string | null, + age_range_end: age_range_end as string | null, + method_id: method_id as string | null, + method_name: method_name as string | null, + combine_from_to: address_from && address_to ? false : true, }), { enabled: tab === 'transactions' && !!block?.hash, @@ -216,7 +248,7 @@ const Block = () => { /> {tab === 'transactions' ? ( !isTxListLoading && txList ? ( - + ) : ( ) diff --git a/pages/txs/index.tsx b/pages/txs/index.tsx index bd19e9ace..bf72dd8a3 100644 --- a/pages/txs/index.tsx +++ b/pages/txs/index.tsx @@ -16,7 +16,7 @@ import FilterIcon from 'assets/icons/filter.svg' import PendingIcon from 'assets/icons/pending.svg' import IsPendingListIcon from 'assets/icons/is-pending-tx-list.svg' import { SIZES } from 'components/PageSize' -import { PCKB_UDT_INFO } from 'utils' +import { isEthAddress, PCKB_UDT_INFO } from 'utils' import styles from './styles.module.scss' const TxList = () => { @@ -29,6 +29,12 @@ const TxList = () => { block_from = null, block_to = null, status = 'ON_CHAINED', + address_from = null, + address_to = null, + age_range_start = null, + age_range_end = null, + method_id = null, + method_name = null, }, } = useRouter() @@ -40,7 +46,21 @@ const TxList = () => { const isPendingList = status === 'pending' const { isLoading, data: txList } = useQuery( - ['transactions', before, after, block_from, block_to, page_size, status], + [ + 'transactions', + before, + after, + block_from, + block_to, + page_size, + status, + address_from, + address_to, + age_range_start, + age_range_end, + method_id, + method_name, + ], () => fetchTxList({ limit: +page_size as number, @@ -49,6 +69,15 @@ const TxList = () => { start_block_number: block_from ? +block_from : null, end_block_number: block_to ? +block_to : null, status: isPendingList ? 'PENDING' : 'ON_CHAINED', + address_from: isEthAddress(address_from as string) ? (address_from as string) : null, + address_to: isEthAddress(address_from as string) ? (address_to as string) : null, + from_script_hash: !isEthAddress(address_from as string) ? (address_from as string) : null, + to_script_hash: !isEthAddress(address_to as string) ? (address_to as string) : null, + age_range_start: age_range_start as string | null, + age_range_end: age_range_end as string | null, + method_id: method_id as string | null, + method_name: method_name as string | null, + combine_from_to: address_from && address_to ? false : true, }), ) const theme = useTheme() @@ -201,7 +230,7 @@ const TxList = () => { ) : null} - + {txList && } diff --git a/public/locales/en-US/list.json b/public/locales/en-US/list.json index 80809c52b..1fb86ce78 100644 --- a/public/locales/en-US/list.json +++ b/public/locales/en-US/list.json @@ -41,6 +41,8 @@ "logs": "Logs", "eventsFilterPlaceholder": "Filter by BlockNo Or Topic0", "filterEventBy": "Apply filter by {{filter}}", + "method_id": "Method ID", + "method_name": "Method Name", "block_from": "from", "block_to": "to", "address_from": "from", @@ -53,6 +55,8 @@ "invalid_date": "Invalid Date", "filter_menu": { "name": "Name", + "method_id": "Method ID", + "method_name": "Method Name", "block_from": "Block Number", "block_to": "Block Number", "address_from": "Search by address", diff --git a/public/locales/zh-CN/list.json b/public/locales/zh-CN/list.json index c7f9a8511..9a6602d64 100644 --- a/public/locales/zh-CN/list.json +++ b/public/locales/zh-CN/list.json @@ -41,6 +41,8 @@ "logs": "日志", "eventsFilterPlaceholder": "输入区块号或者 Topic0 进行筛选", "filterEventBy": "筛选 {{filter}} 的事件", + "method_id": "方法 ID", + "method_name": "方法名", "block_from": "从", "block_to": "到", "address_from": "从", @@ -52,6 +54,8 @@ "invalid_date": "无效日期", "filter_menu": { "name": "名称", + "method_id": "方法 ID", + "method_name": "方法名", "block_from": "区块高度", "block_to": "区块高度", "address_from": "通过地址搜索", From a13bc2b83175e46256122bc7d40380a037cc1ffe Mon Sep 17 00:00:00 2001 From: Qiwei Yang Date: Fri, 6 Jan 2023 12:16:32 +0800 Subject: [PATCH 05/12] feat: add search result tokens page (#816) * feat: add search result tokens page * fix: tests * fix: search_keyword gql call * fix: address type redirect * fix: fuzzy search * refactor: code style and finish loading state * ci: upgrade to ubuntu-latest --- .github/workflows/test.e2e.yml | 2 +- components/AccountOverview/index.tsx | 2 +- cypress/integration/search/index.spec.ts | 6 +- pages/account/[id].tsx | 2 +- pages/search-result-tokens/index.tsx | 222 ++++++++++++++++++ pages/search-result-tokens/styles.module.scss | 106 +++++++++ pages/token/[id].tsx | 2 - public/locales/en-US/list.json | 3 +- public/locales/zh-CN/list.json | 3 +- utils/api/search.ts | 61 +++-- utils/handler.ts | 12 +- 11 files changed, 389 insertions(+), 32 deletions(-) create mode 100644 pages/search-result-tokens/index.tsx create mode 100644 pages/search-result-tokens/styles.module.scss diff --git a/.github/workflows/test.e2e.yml b/.github/workflows/test.e2e.yml index 405129c66..3b925e01d 100644 --- a/.github/workflows/test.e2e.yml +++ b/.github/workflows/test.e2e.yml @@ -12,7 +12,7 @@ on: jobs: e2e_tests: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 diff --git a/components/AccountOverview/index.tsx b/components/AccountOverview/index.tsx index 8129340a3..2b0bd0ae7 100644 --- a/components/AccountOverview/index.tsx +++ b/components/AccountOverview/index.tsx @@ -265,7 +265,7 @@ const AccountOverview: React.FC Promise< }) => { const [t] = useTranslation(['account', 'common']) - if (!account) { + if (isOverviewLoading) { return (
{ }) }) - it('should redirect to tokens page when keyword is not a number', () => { + it('should redirect to search tokens result page when keyword is not a number', () => { const UNKNOWN_STRING = 'unknown' cy.get(`${ROOT_SELECTOR} input`).type(UNKNOWN_STRING) cy.get(ROOT_SELECTOR).type('{enter}') - cy.url({ timeout: REDIRECT_TIMEOUT }).should('contain', `/tokens/native`) - cy.location('search').should('eq', `?name=${UNKNOWN_STRING}&search=${UNKNOWN_STRING}`) + cy.url({ timeout: REDIRECT_TIMEOUT }).should('contain', `/search-result-tokens`) + cy.location('search').should('eq', `?search=${UNKNOWN_STRING}`) }) it('404', () => { diff --git a/pages/account/[id].tsx b/pages/account/[id].tsx index 8d3033b06..00358194e 100644 --- a/pages/account/[id].tsx +++ b/pages/account/[id].tsx @@ -264,7 +264,7 @@ const Account = () => { accountType ? ( t(`accountType.${accountType}`) ) : ( - t(`accountType.Unknown`) + t(`accountType.UNKNOWN`) ) ) : ( diff --git a/pages/search-result-tokens/index.tsx b/pages/search-result-tokens/index.tsx new file mode 100644 index 000000000..b43265c4d --- /dev/null +++ b/pages/search-result-tokens/index.tsx @@ -0,0 +1,222 @@ +import type { GetStaticProps } from 'next' +import { useRouter } from 'next/router' +import { useTranslation } from 'next-i18next' +import NextLink from 'next/link' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { gql } from 'graphql-request' +import { useQuery } from 'react-query' +import { Skeleton } from '@mui/material' +import SubpageHead from 'components/SubpageHead' +import Pagination from 'components/SimplePagination' +import Table from 'components/Table' +import PageTitle from 'components/PageTitle' +import HashLink from 'components/HashLink' +import TokenLogo from 'components/TokenLogo' +import Tooltip from 'components/Tooltip' +import { SIZES } from 'components/PageSize' +import NoDataIcon from 'assets/icons/no-data.svg' +import { GraphQLSchema, client } from 'utils' +import styles from './styles.module.scss' + +type SearchUdtListProps = { + search_udt: { + entries: Array<{ + id: string + contract_address_hash: string | null + name: string + symbol: string + type: GraphQLSchema.UdtType + icon: string | null + eth_type: GraphQLSchema.TokenType + }> + metadata: GraphQLSchema.PageMetadata + } +} +interface Variables { + before: string | null + after: string | null + name: string + limit: number | null + address: string | null +} +// TODO: add sorter after backend support + +const searchUdtListQuery = gql` + query search_udt($limit: Int, $name: String, $before: String, $after: String, $address: String) { + search_udt( + input: { limit: $limit, fuzzy_name: $name, before: $before, after: $after, contract_address: $address } + ) { + entries { + id + name + symbol + icon + contract_address_hash + eth_type + type + } + metadata { + total_count + after + before + } + } + } +` + +const fetchSearchUdtList = (variables: Variables): Promise => + client + .request(searchUdtListQuery, variables) + .then(data => data.search_udt) + .catch(error => { + console.error(error) + return { + entries: [], + metadata: { + total_count: 0, + before: null, + after: null, + }, + } + }) + +const SearchUdtResultList = () => { + const [t] = useTranslation(['nft', 'common', 'list']) + const { + query: { before = null, after = null, search = null, address = null, page_size = SIZES[1] }, + } = useRouter() + + const title = t(`search_result_title`, { name: search, ns: 'list' }) + const { isLoading, data: list } = useQuery( + ['search-udt-list', page_size, before, after, search, address], + () => + fetchSearchUdtList({ + before: before as string, + after: after as string, + name: search ? `${search}%` : null, + limit: Number.isNaN(+page_size) ? +SIZES[1] : +page_size, + address: address as string, + }), + { refetchInterval: 10000 }, + ) + + const handleTokenLink = (type: GraphQLSchema.TokenType, tokenId: string, contractAddr?: string) => { + switch (type) { + case GraphQLSchema.TokenType.ERC20: + return `/token/${tokenId}` + case GraphQLSchema.TokenType.ERC721: + return `/nft-item/${contractAddr}/${tokenId}` + case GraphQLSchema.TokenType.ERC1155: + return `/multi-token-item/${contractAddr}/${tokenId}` + default: + return '' + } + } + + return ( + <> + +
+ {title} +
+
+ + {t(`n_kinds_in_total`, { + ns: 'list', + number: list?.metadata.total_count.toLocaleString('en') ?? '-', + })} + + {list?.metadata.total_count ? : null} +
+ + + + + + + + + + {list?.metadata.total_count ? ( + list.entries.map(item => { + const { id, eth_type, contract_address_hash, name, icon, symbol } = item + const tokenLink = handleTokenLink(eth_type, id, contract_address_hash) + return ( + + {tokenLink ? ( + + ) : ( + + )} + + {contract_address_hash ? ( + + ) : ( + + )} + + ) + }) + ) : isLoading ? ( + Array.from({ length: +page_size }).map((_, idx) => ( + + + + )) + ) : ( + + + + )} + +
{t('token', { ns: 'list' })}{t('type', { ns: 'list' })}{t('address')}
+ + + + + {name ?? '-'} + {symbol ? `(${symbol})` : ''} + + + + + + + + {name ?? '-'} + {symbol ? `(${symbol})` : ''} + + + {t(eth_type as string, { ns: 'account' })} + + + + + + + -
+ +
+
+ + {t(`no_records`, { ns: 'list' })} +
+
+ {list?.metadata.total_count ? : null} +
+
+ + ) +} + +export const getStaticProps: GetStaticProps = async ({ locale }) => { + const lng = await serverSideTranslations(locale, ['common', 'nft', 'list']) + return { props: lng } +} + +SearchUdtResultList.displayName = 'SearchUdtResultList' + +export default SearchUdtResultList diff --git a/pages/search-result-tokens/styles.module.scss b/pages/search-result-tokens/styles.module.scss new file mode 100644 index 000000000..68b7c073a --- /dev/null +++ b/pages/search-result-tokens/styles.module.scss @@ -0,0 +1,106 @@ +@import '../../styles/mixin.scss'; + +.container { + @include main-center; + form[data-role='filter-menu']:first-of-type { + left: 0; + transform: translateX(-20px); + } + &[data-is-filter-unnecessary='true'] { + th { + svg { + display: none; + } + } + } +} + +.subheader { + display: flex; + justify-content: space-between; + align-items: center; + height: 64px; + padding: 0 1.5rem; + font-size: 1rem; + font-weight: 500; + & > div { + padding: 0; + height: auto; + & > div:first-child { + display: none; + } + } + @media screen and (max-width: 600px) { + flex-direction: column; + font-size: 0.875rem; + height: 5.5rem; + padding: 1.125rem 0.75rem 0.75rem; + align-items: stretch; + } +} + +.tokenHeader { + width: 33%; + @media screen and (max-width: 600px) { + width: auto; + } +} + +.token { + display: flex; + align-items: center; + span { + margin-left: 0.5rem; + } +} + +.typeHeader { + width: 33%; + @media screen and (max-width: 600px) { + width: auto; + } +} + +.addr { + a:last-child { + display: none; + } + @media screen and (max-width: 1024px) { + a:first-child { + display: none; + } + a:last-child { + display: inline; + } + } +} + +.list { + margin-top: 1.5rem; + background-color: #fff; + border: 1px solid var(--border-color); + border-radius: 1rem; + font-size: 0.875rem; + + td { + padding-top: 17px !important; + padding-bottom: 17px !important; + } + + @media screen and (max-width: 1024px) { + border-radius: 0.5rem; + margin-top: 1rem; + } +} + +.sorter { + cursor: pointer; + + &[data-order='DESC'] { + transform: rotate(0.5turn); + } +} + +.noRecords { + @include empty-list; +} diff --git a/pages/token/[id].tsx b/pages/token/[id].tsx index f2d9c310a..df43092ea 100644 --- a/pages/token/[id].tsx +++ b/pages/token/[id].tsx @@ -52,7 +52,6 @@ interface TokenInfoProps { description: string | null supply: string holders_count: number - minted_count: number contract_address_hash: string token_exchange_rate: { exchange_rate: number | null @@ -77,7 +76,6 @@ const tokenInfoQuery = gql` description supply holders_count - minted_count contract_address_hash token_exchange_rate { exchange_rate diff --git a/public/locales/en-US/list.json b/public/locales/en-US/list.json index 1fb86ce78..8cf16b0bf 100644 --- a/public/locales/en-US/list.json +++ b/public/locales/en-US/list.json @@ -94,5 +94,6 @@ "price": "Price", "price-updated-at": "Price updated at {{time}}", "switch-to-price": "Switch to price", - "switch-to-amount": "Switch to amount" + "switch-to-amount": "Switch to amount", + "search_result_title": "Search results for the token name \"{{name}}\"" } diff --git a/public/locales/zh-CN/list.json b/public/locales/zh-CN/list.json index 9a6602d64..7439fd85b 100644 --- a/public/locales/zh-CN/list.json +++ b/public/locales/zh-CN/list.json @@ -93,5 +93,6 @@ "price": "价格", "price-updated-at": "价格更新于 {{time}}", "switch-to-price": "切换到价格", - "switch-to-amount": "切换到数量" + "switch-to-amount": "切换到数量", + "search_result_title": "代币名 \"{{name}}\" 搜索结果" } diff --git a/utils/api/search.ts b/utils/api/search.ts index f93c08ad0..eda19fabd 100644 --- a/utils/api/search.ts +++ b/utils/api/search.ts @@ -1,7 +1,34 @@ import { addressToScript } from '@nervosnetwork/ckb-sdk-utils' -import { isError, ErrorResponse, API_ENDPOINT, HttpStatus } from './utils' +import { gql } from 'graphql-request' +import { client } from 'utils/graphql' -export const fetchSearch = (search: string) => { +const searchKeywordQuery = gql` + query searchKeyword($text: String!) { + search_keyword(input: { keyword: $text }) { + type + id + } + } +` + +interface Variables { + text: string +} + +type SearchKeywordProps = { + search_keyword: { + type: string | null + id: string | null + } +} + +const fetchSearchResult = (variables: Variables): Promise => + client + .request(searchKeywordQuery, variables) + .then(data => data.search_keyword) + .catch(() => ({ type: null, id: null })) + +export const fetchSearchKeyword = (search: string) => { let query = search if (query.startsWith('ck')) { try { @@ -11,28 +38,26 @@ export const fetchSearch = (search: string) => { console.warn(err) } } - - return fetch(`${API_ENDPOINT}/search?keyword=${query}`) + return fetchSearchResult({ text: query }) .then(async res => { - if (res.status === HttpStatus.NotFound) { + if (!res || !res.id) { return `/404` } - const found: Record<'id' | 'type', string> | ErrorResponse = await res.json() - if (isError(found)) { - return `/404` - } - switch (found.type) { - case 'block': { - return `/block/${found.id}` + switch (res.type) { + case 'BLOCK': { + return `/block/${res.id}` + } + case 'TRANSACTION': { + return `/tx/${res.id}` } - case 'transaction': { - return `/tx/${found.id}` + case 'ACCOUNT': { + return `/account/${res.id}` } - case 'account': { - return `/account/${found.id}` + case 'ADDRESS': { + return `/account/${res.id}` } - case 'udt': { - return `/token/${found.id}` + case 'UDT': { + return `/token/${res.id}` } default: { return `/404` diff --git a/utils/handler.ts b/utils/handler.ts index 45894ead9..9cd0d62e6 100644 --- a/utils/handler.ts +++ b/utils/handler.ts @@ -1,6 +1,6 @@ import { ServerResponse } from 'http' import { NotFoundException } from './exceptions' -import { fetchSearch } from './api' +import { fetchSearchKeyword } from './api' export const handleApiError = (err: Error, _res: ServerResponse | null, locale: string, query?: string) => { // return { @@ -34,14 +34,18 @@ export const handleSearchKeyPress = async (e: React.KeyboardEvent Date: Fri, 6 Jan 2023 12:16:46 +0800 Subject: [PATCH 06/12] update --- components/CommonERCTransferlist/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/CommonERCTransferlist/index.tsx b/components/CommonERCTransferlist/index.tsx index 1a1398869..f328d2d31 100644 --- a/components/CommonERCTransferlist/index.tsx +++ b/components/CommonERCTransferlist/index.tsx @@ -77,6 +77,7 @@ const getTransferListQuery = (type: TransferlistType) => gql` token_id token_ids token_contract_address_hash + amount } metadata { total_count From 32c381876f4bc53849655ac455d32ddf10f441e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 17:46:45 +0000 Subject: [PATCH 07/12] fix(deps): update dependency wagmi to v0.10.5 --- package-lock.json | 190 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/package-lock.json b/package-lock.json index db7d40764..dcc4a5d96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "react-i18next": "12.1.1", "react-query": "3.39.2", "recharts": "2.2.0", - "wagmi": "0.10.4" + "wagmi": "0.10.5" }, "devDependencies": { "@cypress/code-coverage": "3.10.0", @@ -7979,9 +7979,9 @@ } }, "node_modules/@wagmi/chains": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/@wagmi/chains/-/chains-0.1.7.tgz", - "integrity": "sha512-t9qm4FyzwzJhAcLtnh9HUeOmueSEOXwXlR0RCcS/vhtLSUnzaUfEkjAeu4+7AIujYWjrtdS/Zvlc+PwTjuwTUQ==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@wagmi/chains/-/chains-0.1.8.tgz", + "integrity": "sha512-AweJEbQB0uC230XuZm1vaEirE6WgraYvATPTKTjJltn/Ik6QxRlV3oFNiIc3+XCOsBZr0CuhyPCaMK4zoUJ99g==", "funding": [ { "type": "gitcoin", @@ -7994,9 +7994,9 @@ ] }, "node_modules/@wagmi/connectors": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-0.1.3.tgz", - "integrity": "sha512-rNRDJsDdgb4R7n3AP6qbIu5L+3QYJU0raRFkFZLqBpA2dlX4d5RATALiDK6XdWw69iCb/q3BEsyj3Y+uNN/ODA==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-0.1.5.tgz", + "integrity": "sha512-LWRh/dD/pF3Bs6s7VmNEmkrj+Q0FAp6P2gBVDA2Ke31FyuYB0dIRu+2CnPsDe/4y3DGft5QYgI11jL+n+8R8YA==", "funding": [ { "type": "gitcoin", @@ -8012,7 +8012,7 @@ "@ledgerhq/connect-kit-loader": "^1.0.1", "@walletconnect/ethereum-provider": "^1.8.0", "@walletconnect/qrcode-modal": "^1.8.0", - "@walletconnect/universal-provider": "^2.1.4", + "@walletconnect/universal-provider": "^2.2.0", "abitype": "^0.1.8", "eventemitter3": "^4.0.7" }, @@ -8044,9 +8044,9 @@ } }, "node_modules/@wagmi/core": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-0.8.10.tgz", - "integrity": "sha512-TbXaKfZX0GD3LkhGoIWPWaitmwucNPxm0riRYStRncoe9JqSYJ82P3vwLn7zO9f1mwqwnf0EOnmotycH/adTwQ==", + "version": "0.8.11", + "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-0.8.11.tgz", + "integrity": "sha512-N7Hbmj2cPsl9CB4rJ4bAEIutLsZCHnwUa2SocmPCuPJFgYCmiImEP4d0recl2QEOogY4qkI81dYEZazigXczmg==", "funding": [ { "type": "gitcoin", @@ -8058,8 +8058,8 @@ } ], "dependencies": { - "@wagmi/chains": "0.1.7", - "@wagmi/connectors": "0.1.3", + "@wagmi/chains": "0.1.8", + "@wagmi/connectors": "0.1.5", "abitype": "^0.2.5", "eventemitter3": "^4.0.7", "zustand": "^4.1.4" @@ -8620,27 +8620,27 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@walletconnect/sign-client": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.1.5.tgz", - "integrity": "sha512-lEcP9Kk+2aKswWcJPBnTpZ+2V8r7mTLitA9F9cteFD0606k9xVGHoWEIt19YlVrB7sTKfXCdF/FWjmVTbHOBEw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.2.0.tgz", + "integrity": "sha512-7oEYp/t/uuR85/meMqJvaJBxVY/R9CR6xJOxL4sobOioL2Dy58m1HkxpODqxSpdZvJ1sCm6x7zYlqOWYbY1kdA==", "dependencies": { - "@walletconnect/core": "2.1.5", + "@walletconnect/core": "2.2.0", "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", "@walletconnect/jsonrpc-provider": "^1.0.6", "@walletconnect/jsonrpc-utils": "^1.0.4", "@walletconnect/logger": "^2.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "events": "^3.3.0", "pino": "7.11.0" } }, "node_modules/@walletconnect/sign-client/node_modules/@walletconnect/core": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.1.5.tgz", - "integrity": "sha512-UjQRIVNTJfUDwR0NATgJf2qQEjyX053JdG0PAZs1YxhpNevGuhAzAlOvWHf4hq9zV8uj9mUPkkkWXSY331uQig==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.2.0.tgz", + "integrity": "sha512-oucu/Ro1bYL9DQIRqB4Y5HUfOFRhl/sOMyQ3SVLtq9J6jrFs5uePiw13dvhz7+p1BzWVWV5Jw2+elmJllNiB/A==", "dependencies": { "@walletconnect/heartbeat": "^1.0.1", "@walletconnect/jsonrpc-provider": "^1.0.6", @@ -8652,8 +8652,8 @@ "@walletconnect/relay-auth": "^1.0.4", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "events": "^3.3.0", "lodash.isequal": "4.5.0", "pino": "7.11.0", @@ -8682,9 +8682,9 @@ } }, "node_modules/@walletconnect/sign-client/node_modules/@walletconnect/types": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.1.5.tgz", - "integrity": "sha512-KhJ+/Och+0W2i6gfSBLjn7yqu2496MXGPOHm9yosQ1t1X6i9j3FjA4yiyLCbmIdVOXvtU1JOdn15ATOhSUxc3Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.2.0.tgz", + "integrity": "sha512-mxxXcHTtRaa3FiLWWEYEOA3wyGzOc9Fdv2Objms/COcPAropAY/8A0kceqCDB0si1UFOl6KpEzvm5WHJpJi9tQ==", "dependencies": { "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", @@ -8695,9 +8695,9 @@ } }, "node_modules/@walletconnect/sign-client/node_modules/@walletconnect/utils": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.1.5.tgz", - "integrity": "sha512-ZJNS/3oXjyDxjQXfXCl4GtnNnnVKaLRYwbhSw6ECDaZHo3WdAGWKrg14eB0XYw9RxTM4bCgb5z21NtaeP3ck4A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.2.0.tgz", + "integrity": "sha512-nQqJHK3KMOKXSn277QhEVGQF5+LuP2PRZDDipl63Qz0ixz2okSpK7SGl1cfDm3728DVW1RxMi2qhmIiQwAU2tg==", "dependencies": { "@stablelib/chacha20poly1305": "1.0.1", "@stablelib/hkdf": "1.0.1", @@ -8708,7 +8708,7 @@ "@walletconnect/relay-api": "^1.0.7", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", + "@walletconnect/types": "2.2.0", "@walletconnect/window-getters": "^1.0.1", "@walletconnect/window-metadata": "^1.0.1", "detect-browser": "5.3.0", @@ -8822,18 +8822,18 @@ "integrity": "sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==" }, "node_modules/@walletconnect/universal-provider": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/universal-provider/-/universal-provider-2.1.5.tgz", - "integrity": "sha512-mjFexQrPk3xL8tIdFrDq0b4LfghKt5j9Fhd5wVwZWhcCf1i8tiRpOhuchY0v8B4r6rLla525dbdi3f2PKFE+EQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/universal-provider/-/universal-provider-2.2.0.tgz", + "integrity": "sha512-FJhk8YRbvLWRbVlwmI5LDzdPRZNpNfZ52BeCV8jcQYkxlZzZ/QtToxp3oYaYXECI2isQ3mvEwadC6qzzua7B1A==", "dependencies": { "@walletconnect/jsonrpc-http-connection": "^1.0.4", "@walletconnect/jsonrpc-provider": "^1.0.6", "@walletconnect/jsonrpc-types": "^1.0.2", "@walletconnect/jsonrpc-utils": "^1.0.4", "@walletconnect/logger": "^2.0.1", - "@walletconnect/sign-client": "2.1.5", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/sign-client": "2.2.0", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "eip1193-provider": "1.0.1", "events": "^3.3.0", "pino": "7.11.0" @@ -8861,9 +8861,9 @@ } }, "node_modules/@walletconnect/universal-provider/node_modules/@walletconnect/types": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.1.5.tgz", - "integrity": "sha512-KhJ+/Och+0W2i6gfSBLjn7yqu2496MXGPOHm9yosQ1t1X6i9j3FjA4yiyLCbmIdVOXvtU1JOdn15ATOhSUxc3Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.2.0.tgz", + "integrity": "sha512-mxxXcHTtRaa3FiLWWEYEOA3wyGzOc9Fdv2Objms/COcPAropAY/8A0kceqCDB0si1UFOl6KpEzvm5WHJpJi9tQ==", "dependencies": { "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", @@ -8874,9 +8874,9 @@ } }, "node_modules/@walletconnect/universal-provider/node_modules/@walletconnect/utils": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.1.5.tgz", - "integrity": "sha512-ZJNS/3oXjyDxjQXfXCl4GtnNnnVKaLRYwbhSw6ECDaZHo3WdAGWKrg14eB0XYw9RxTM4bCgb5z21NtaeP3ck4A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.2.0.tgz", + "integrity": "sha512-nQqJHK3KMOKXSn277QhEVGQF5+LuP2PRZDDipl63Qz0ixz2okSpK7SGl1cfDm3728DVW1RxMi2qhmIiQwAU2tg==", "dependencies": { "@stablelib/chacha20poly1305": "1.0.1", "@stablelib/hkdf": "1.0.1", @@ -8887,7 +8887,7 @@ "@walletconnect/relay-api": "^1.0.7", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", + "@walletconnect/types": "2.2.0", "@walletconnect/window-getters": "^1.0.1", "@walletconnect/window-metadata": "^1.0.1", "detect-browser": "5.3.0", @@ -25376,9 +25376,9 @@ } }, "node_modules/wagmi": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.4.tgz", - "integrity": "sha512-ifJSnmkG+5S+MgelY5gKiZmDJdYe4/ObtzpnfngLTKxmmH+bdevfDD+dqJCgZKTUx9KFytSVpOAHSibctf1I3g==", + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.5.tgz", + "integrity": "sha512-qQ1OXKkShc4MSaIFP5V6LbWnn+NQVyotT3EhGeCyVumUo9KHLHQsYkrNa5ZmADKiwaBec7cwDZl8QXP6OiPv/Q==", "funding": [ { "type": "gitcoin", @@ -25394,7 +25394,7 @@ "@tanstack/query-sync-storage-persister": "^4.14.5", "@tanstack/react-query": "^4.14.5", "@tanstack/react-query-persist-client": "^4.14.5", - "@wagmi/core": "0.8.10", + "@wagmi/core": "0.8.11", "@walletconnect/ethereum-provider": "^1.8.0", "abitype": "^0.2.5", "use-sync-external-store": "^1.2.0" @@ -31571,20 +31571,20 @@ } }, "@wagmi/chains": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/@wagmi/chains/-/chains-0.1.7.tgz", - "integrity": "sha512-t9qm4FyzwzJhAcLtnh9HUeOmueSEOXwXlR0RCcS/vhtLSUnzaUfEkjAeu4+7AIujYWjrtdS/Zvlc+PwTjuwTUQ==" + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/@wagmi/chains/-/chains-0.1.8.tgz", + "integrity": "sha512-AweJEbQB0uC230XuZm1vaEirE6WgraYvATPTKTjJltn/Ik6QxRlV3oFNiIc3+XCOsBZr0CuhyPCaMK4zoUJ99g==" }, "@wagmi/connectors": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-0.1.3.tgz", - "integrity": "sha512-rNRDJsDdgb4R7n3AP6qbIu5L+3QYJU0raRFkFZLqBpA2dlX4d5RATALiDK6XdWw69iCb/q3BEsyj3Y+uNN/ODA==", + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/@wagmi/connectors/-/connectors-0.1.5.tgz", + "integrity": "sha512-LWRh/dD/pF3Bs6s7VmNEmkrj+Q0FAp6P2gBVDA2Ke31FyuYB0dIRu+2CnPsDe/4y3DGft5QYgI11jL+n+8R8YA==", "requires": { "@coinbase/wallet-sdk": "^3.5.4", "@ledgerhq/connect-kit-loader": "^1.0.1", "@walletconnect/ethereum-provider": "^1.8.0", "@walletconnect/qrcode-modal": "^1.8.0", - "@walletconnect/universal-provider": "^2.1.4", + "@walletconnect/universal-provider": "^2.2.0", "abitype": "^0.1.8", "eventemitter3": "^4.0.7" }, @@ -31598,12 +31598,12 @@ } }, "@wagmi/core": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-0.8.10.tgz", - "integrity": "sha512-TbXaKfZX0GD3LkhGoIWPWaitmwucNPxm0riRYStRncoe9JqSYJ82P3vwLn7zO9f1mwqwnf0EOnmotycH/adTwQ==", + "version": "0.8.11", + "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-0.8.11.tgz", + "integrity": "sha512-N7Hbmj2cPsl9CB4rJ4bAEIutLsZCHnwUa2SocmPCuPJFgYCmiImEP4d0recl2QEOogY4qkI81dYEZazigXczmg==", "requires": { - "@wagmi/chains": "0.1.7", - "@wagmi/connectors": "0.1.3", + "@wagmi/chains": "0.1.8", + "@wagmi/connectors": "0.1.5", "abitype": "^0.2.5", "eventemitter3": "^4.0.7", "zustand": "^4.1.4" @@ -32113,27 +32113,27 @@ } }, "@walletconnect/sign-client": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.1.5.tgz", - "integrity": "sha512-lEcP9Kk+2aKswWcJPBnTpZ+2V8r7mTLitA9F9cteFD0606k9xVGHoWEIt19YlVrB7sTKfXCdF/FWjmVTbHOBEw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/sign-client/-/sign-client-2.2.0.tgz", + "integrity": "sha512-7oEYp/t/uuR85/meMqJvaJBxVY/R9CR6xJOxL4sobOioL2Dy58m1HkxpODqxSpdZvJ1sCm6x7zYlqOWYbY1kdA==", "requires": { - "@walletconnect/core": "2.1.5", + "@walletconnect/core": "2.2.0", "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", "@walletconnect/jsonrpc-provider": "^1.0.6", "@walletconnect/jsonrpc-utils": "^1.0.4", "@walletconnect/logger": "^2.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "events": "^3.3.0", "pino": "7.11.0" }, "dependencies": { "@walletconnect/core": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.1.5.tgz", - "integrity": "sha512-UjQRIVNTJfUDwR0NATgJf2qQEjyX053JdG0PAZs1YxhpNevGuhAzAlOvWHf4hq9zV8uj9mUPkkkWXSY331uQig==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/core/-/core-2.2.0.tgz", + "integrity": "sha512-oucu/Ro1bYL9DQIRqB4Y5HUfOFRhl/sOMyQ3SVLtq9J6jrFs5uePiw13dvhz7+p1BzWVWV5Jw2+elmJllNiB/A==", "requires": { "@walletconnect/heartbeat": "^1.0.1", "@walletconnect/jsonrpc-provider": "^1.0.6", @@ -32145,8 +32145,8 @@ "@walletconnect/relay-auth": "^1.0.4", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "events": "^3.3.0", "lodash.isequal": "4.5.0", "pino": "7.11.0", @@ -32163,9 +32163,9 @@ } }, "@walletconnect/types": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.1.5.tgz", - "integrity": "sha512-KhJ+/Och+0W2i6gfSBLjn7yqu2496MXGPOHm9yosQ1t1X6i9j3FjA4yiyLCbmIdVOXvtU1JOdn15ATOhSUxc3Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.2.0.tgz", + "integrity": "sha512-mxxXcHTtRaa3FiLWWEYEOA3wyGzOc9Fdv2Objms/COcPAropAY/8A0kceqCDB0si1UFOl6KpEzvm5WHJpJi9tQ==", "requires": { "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", @@ -32176,9 +32176,9 @@ } }, "@walletconnect/utils": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.1.5.tgz", - "integrity": "sha512-ZJNS/3oXjyDxjQXfXCl4GtnNnnVKaLRYwbhSw6ECDaZHo3WdAGWKrg14eB0XYw9RxTM4bCgb5z21NtaeP3ck4A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.2.0.tgz", + "integrity": "sha512-nQqJHK3KMOKXSn277QhEVGQF5+LuP2PRZDDipl63Qz0ixz2okSpK7SGl1cfDm3728DVW1RxMi2qhmIiQwAU2tg==", "requires": { "@stablelib/chacha20poly1305": "1.0.1", "@stablelib/hkdf": "1.0.1", @@ -32189,7 +32189,7 @@ "@walletconnect/relay-api": "^1.0.7", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", + "@walletconnect/types": "2.2.0", "@walletconnect/window-getters": "^1.0.1", "@walletconnect/window-metadata": "^1.0.1", "detect-browser": "5.3.0", @@ -32289,18 +32289,18 @@ "integrity": "sha512-Cn+3I0V0vT9ghMuzh1KzZvCkiAxTq+1TR2eSqw5E5AVWfmCtECFkVZBP6uUJZ8YjwLqXheI+rnjqPy7sVM4Fyg==" }, "@walletconnect/universal-provider": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/universal-provider/-/universal-provider-2.1.5.tgz", - "integrity": "sha512-mjFexQrPk3xL8tIdFrDq0b4LfghKt5j9Fhd5wVwZWhcCf1i8tiRpOhuchY0v8B4r6rLla525dbdi3f2PKFE+EQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/universal-provider/-/universal-provider-2.2.0.tgz", + "integrity": "sha512-FJhk8YRbvLWRbVlwmI5LDzdPRZNpNfZ52BeCV8jcQYkxlZzZ/QtToxp3oYaYXECI2isQ3mvEwadC6qzzua7B1A==", "requires": { "@walletconnect/jsonrpc-http-connection": "^1.0.4", "@walletconnect/jsonrpc-provider": "^1.0.6", "@walletconnect/jsonrpc-types": "^1.0.2", "@walletconnect/jsonrpc-utils": "^1.0.4", "@walletconnect/logger": "^2.0.1", - "@walletconnect/sign-client": "2.1.5", - "@walletconnect/types": "2.1.5", - "@walletconnect/utils": "2.1.5", + "@walletconnect/sign-client": "2.2.0", + "@walletconnect/types": "2.2.0", + "@walletconnect/utils": "2.2.0", "eip1193-provider": "1.0.1", "events": "^3.3.0", "pino": "7.11.0" @@ -32316,9 +32316,9 @@ } }, "@walletconnect/types": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.1.5.tgz", - "integrity": "sha512-KhJ+/Och+0W2i6gfSBLjn7yqu2496MXGPOHm9yosQ1t1X6i9j3FjA4yiyLCbmIdVOXvtU1JOdn15ATOhSUxc3Q==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/types/-/types-2.2.0.tgz", + "integrity": "sha512-mxxXcHTtRaa3FiLWWEYEOA3wyGzOc9Fdv2Objms/COcPAropAY/8A0kceqCDB0si1UFOl6KpEzvm5WHJpJi9tQ==", "requires": { "@walletconnect/events": "^1.0.1", "@walletconnect/heartbeat": "^1.0.1", @@ -32329,9 +32329,9 @@ } }, "@walletconnect/utils": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.1.5.tgz", - "integrity": "sha512-ZJNS/3oXjyDxjQXfXCl4GtnNnnVKaLRYwbhSw6ECDaZHo3WdAGWKrg14eB0XYw9RxTM4bCgb5z21NtaeP3ck4A==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@walletconnect/utils/-/utils-2.2.0.tgz", + "integrity": "sha512-nQqJHK3KMOKXSn277QhEVGQF5+LuP2PRZDDipl63Qz0ixz2okSpK7SGl1cfDm3728DVW1RxMi2qhmIiQwAU2tg==", "requires": { "@stablelib/chacha20poly1305": "1.0.1", "@stablelib/hkdf": "1.0.1", @@ -32342,7 +32342,7 @@ "@walletconnect/relay-api": "^1.0.7", "@walletconnect/safe-json": "^1.0.1", "@walletconnect/time": "^1.0.2", - "@walletconnect/types": "2.1.5", + "@walletconnect/types": "2.2.0", "@walletconnect/window-getters": "^1.0.1", "@walletconnect/window-metadata": "^1.0.1", "detect-browser": "5.3.0", @@ -44353,15 +44353,15 @@ } }, "wagmi": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.4.tgz", - "integrity": "sha512-ifJSnmkG+5S+MgelY5gKiZmDJdYe4/ObtzpnfngLTKxmmH+bdevfDD+dqJCgZKTUx9KFytSVpOAHSibctf1I3g==", + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.5.tgz", + "integrity": "sha512-qQ1OXKkShc4MSaIFP5V6LbWnn+NQVyotT3EhGeCyVumUo9KHLHQsYkrNa5ZmADKiwaBec7cwDZl8QXP6OiPv/Q==", "requires": { "@coinbase/wallet-sdk": "^3.6.0", "@tanstack/query-sync-storage-persister": "^4.14.5", "@tanstack/react-query": "^4.14.5", "@tanstack/react-query-persist-client": "^4.14.5", - "@wagmi/core": "0.8.10", + "@wagmi/core": "0.8.11", "@walletconnect/ethereum-provider": "^1.8.0", "abitype": "^0.2.5", "use-sync-external-store": "^1.2.0" diff --git a/package.json b/package.json index 7cec2f3e5..e55c18209 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "react-i18next": "12.1.1", "react-query": "3.39.2", "recharts": "2.2.0", - "wagmi": "0.10.4" + "wagmi": "0.10.5" }, "devDependencies": { "@cypress/code-coverage": "3.10.0", From ddd13b1b813d74815807eb4aee6dcc90d30ca1c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 00:26:41 +0000 Subject: [PATCH 08/12] chore(deps): update dependency postcss to v8.4.21 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index db7d40764..45fee8ee9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "jest": "29.3.1", "jest-environment-jsdom": "29.3.1", "lint-staged": "13.1.0", - "postcss": "8.4.20", + "postcss": "8.4.21", "postcss-flexbugs-fixes": "5.0.2", "postcss-import": "15.1.0", "postcss-nesting": "10.2.0", @@ -21477,9 +21477,9 @@ } }, "node_modules/postcss": { - "version": "8.4.20", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz", - "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==", + "version": "8.4.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "dev": true, "funding": [ { @@ -41628,9 +41628,9 @@ "peer": true }, "postcss": { - "version": "8.4.20", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz", - "integrity": "sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==", + "version": "8.4.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "dev": true, "requires": { "nanoid": "^3.3.4", diff --git a/package.json b/package.json index 7cec2f3e5..bab03e530 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "jest": "29.3.1", "jest-environment-jsdom": "29.3.1", "lint-staged": "13.1.0", - "postcss": "8.4.20", + "postcss": "8.4.21", "postcss-flexbugs-fixes": "5.0.2", "postcss-import": "15.1.0", "postcss-nesting": "10.2.0", From 75c5358e6f746a29f8387a9855cf65e64ac27f3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 08:28:16 +0000 Subject: [PATCH 09/12] fix(deps): update dependency react-i18next to v12.1.4 --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index dcc4a5d96..c9f5e6e30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "qrcode": "1.5.1", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "12.1.1", + "react-i18next": "12.1.4", "react-query": "3.39.2", "recharts": "2.2.0", "wagmi": "0.10.5" @@ -22422,11 +22422,11 @@ } }, "node_modules/react-i18next": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.1.tgz", - "integrity": "sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==", + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.4.tgz", + "integrity": "sha512-XQND7jYtgM7ht5PH3yIZljCRpAMTlH/zmngM9ZjToqa+0BR6xuu8c7QF0WIIOEjcMTB2S3iOfpN/xG/ZrAnO6g==", "dependencies": { - "@babel/runtime": "^7.14.5", + "@babel/runtime": "^7.20.6", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { @@ -42192,11 +42192,11 @@ } }, "react-i18next": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.1.tgz", - "integrity": "sha512-mFdieOI0LDy84q3JuZU6Aou1DoWW2fhapcTGeBS8+vWSJuViuoCLQAMYSb0QoHhXS8B0WKUOPpx4cffAP7r/aA==", + "version": "12.1.4", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.1.4.tgz", + "integrity": "sha512-XQND7jYtgM7ht5PH3yIZljCRpAMTlH/zmngM9ZjToqa+0BR6xuu8c7QF0WIIOEjcMTB2S3iOfpN/xG/ZrAnO6g==", "requires": { - "@babel/runtime": "^7.14.5", + "@babel/runtime": "^7.20.6", "html-parse-stringify": "^3.0.1" } }, diff --git a/package.json b/package.json index e55c18209..993a05510 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "qrcode": "1.5.1", "react": "18.2.0", "react-dom": "18.2.0", - "react-i18next": "12.1.1", + "react-i18next": "12.1.4", "react-query": "3.39.2", "recharts": "2.2.0", "wagmi": "0.10.5" From f5646e9fba7826964fd1f7877f776bf13ae8e1a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 11:53:20 +0000 Subject: [PATCH 10/12] chore(deps): update dependency prettier to v2.8.2 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4b69fcb9b..c7535b8c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,7 +62,7 @@ "postcss-import": "15.1.0", "postcss-nesting": "10.2.0", "postcss-preset-env": "7.8.3", - "prettier": "2.8.1", + "prettier": "2.8.2", "sass": "1.57.1", "ts-node": "10.9.1", "typescript": "4.8.4" @@ -22120,9 +22120,9 @@ } }, "node_modules/prettier": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", - "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz", + "integrity": "sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -41975,9 +41975,9 @@ "dev": true }, "prettier": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", - "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz", + "integrity": "sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==", "dev": true }, "pretty-bytes": { diff --git a/package.json b/package.json index 0ee113e12..cb0bedecf 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "postcss-import": "15.1.0", "postcss-nesting": "10.2.0", "postcss-preset-env": "7.8.3", - "prettier": "2.8.1", + "prettier": "2.8.2", "sass": "1.57.1", "ts-node": "10.9.1", "typescript": "4.8.4" From 203d75394dd56d2bcb0388e390dc1a76a958c891 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Jan 2023 07:41:33 +0000 Subject: [PATCH 11/12] fix(deps): update dependency wagmi to v0.10.6 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7535b8c2..f98a09497 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "react-i18next": "12.1.1", "react-query": "3.39.2", "recharts": "2.2.0", - "wagmi": "0.10.5" + "wagmi": "0.10.6" }, "devDependencies": { "@cypress/code-coverage": "3.10.0", @@ -25376,9 +25376,9 @@ } }, "node_modules/wagmi": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.5.tgz", - "integrity": "sha512-qQ1OXKkShc4MSaIFP5V6LbWnn+NQVyotT3EhGeCyVumUo9KHLHQsYkrNa5ZmADKiwaBec7cwDZl8QXP6OiPv/Q==", + "version": "0.10.6", + "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.6.tgz", + "integrity": "sha512-wFBlnxRLgP58QUo56rDI1kLWyyPNiyUE3DRaIsuzV9nVRmZO8TTFHIJQD7Vlmct8MftZZiYfwSMzjU0my2lNHw==", "funding": [ { "type": "gitcoin", @@ -44353,9 +44353,9 @@ } }, "wagmi": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.5.tgz", - "integrity": "sha512-qQ1OXKkShc4MSaIFP5V6LbWnn+NQVyotT3EhGeCyVumUo9KHLHQsYkrNa5ZmADKiwaBec7cwDZl8QXP6OiPv/Q==", + "version": "0.10.6", + "resolved": "https://registry.npmjs.org/wagmi/-/wagmi-0.10.6.tgz", + "integrity": "sha512-wFBlnxRLgP58QUo56rDI1kLWyyPNiyUE3DRaIsuzV9nVRmZO8TTFHIJQD7Vlmct8MftZZiYfwSMzjU0my2lNHw==", "requires": { "@coinbase/wallet-sdk": "^3.6.0", "@tanstack/query-sync-storage-persister": "^4.14.5", diff --git a/package.json b/package.json index cb0bedecf..f414955f6 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "react-i18next": "12.1.1", "react-query": "3.39.2", "recharts": "2.2.0", - "wagmi": "0.10.5" + "wagmi": "0.10.6" }, "devDependencies": { "@cypress/code-coverage": "3.10.0", From b11bfb26a77f06051825e58a0c56e7e1465e9e06 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Jan 2023 16:57:23 +0000 Subject: [PATCH 12/12] fix(deps): update dependency i18next to v22.4.9 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7535b8c2..ef4eba48c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "ethers": "5.7.2", "graphql": "16.6.0", "graphql-request": "5.1.0", - "i18next": "22.4.8", + "i18next": "22.4.9", "material-ui-popup-state": "5.0.4", "next": "12.3.4", "next-i18next": "13.0.3", @@ -14966,9 +14966,9 @@ } }, "node_modules/i18next": { - "version": "22.4.8", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.8.tgz", - "integrity": "sha512-XSOy17ZWqflOiJRYE/dzv6vDle2Se32dnHREHb93UnZzZ1+UnvQ8yKtt1fpNL3zvXz5AwCqqixrtTVZmRetaiQ==", + "version": "22.4.9", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.9.tgz", + "integrity": "sha512-8gWMmUz460KJDQp/ob3MNUX84cVuDRY9PLFPnV8d+Qezz/6dkjxwOaH70xjrCNDO+JrUL25iXfAIN9wUkInNZw==", "funding": [ { "type": "individual", @@ -36836,9 +36836,9 @@ "dev": true }, "i18next": { - "version": "22.4.8", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.8.tgz", - "integrity": "sha512-XSOy17ZWqflOiJRYE/dzv6vDle2Se32dnHREHb93UnZzZ1+UnvQ8yKtt1fpNL3zvXz5AwCqqixrtTVZmRetaiQ==", + "version": "22.4.9", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.4.9.tgz", + "integrity": "sha512-8gWMmUz460KJDQp/ob3MNUX84cVuDRY9PLFPnV8d+Qezz/6dkjxwOaH70xjrCNDO+JrUL25iXfAIN9wUkInNZw==", "requires": { "@babel/runtime": "^7.20.6" } diff --git a/package.json b/package.json index cb0bedecf..3c5f60791 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "ethers": "5.7.2", "graphql": "16.6.0", "graphql-request": "5.1.0", - "i18next": "22.4.8", + "i18next": "22.4.9", "material-ui-popup-state": "5.0.4", "next": "12.3.4", "next-i18next": "13.0.3",