From 83c34c7f0de0f82b9a3d305b0e6b70756ec3a33f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:40:28 +0900 Subject: [PATCH 1/4] fix(deps): update dependency camelcase to v8 (#375) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 79d1c1c70..7b321c892 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "bech32": "2.0.0", "bignumber.js": "9.1.2", "bs58check": "3.0.1", - "camelcase": "7.0.1", + "camelcase": "8.0.0", "camelcase-keys": "7.0.2", "classnames": "2.5.1", "cytoscape": "^3.29.2", diff --git a/yarn.lock b/yarn.lock index 3ce2706dd..dd8b2c6da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8241,10 +8241,10 @@ camelcase-keys@7.0.2, camelcase-keys@^7.0.2: quick-lru "^5.1.1" type-fest "^1.2.1" -camelcase@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048" - integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw== +camelcase@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz#c0d36d418753fb6ad9c5e0437579745c1c14a534" + integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA== camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" From 65422d5f3922eac0d1c01d471af32a000208663b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 03:59:43 +0000 Subject: [PATCH 2/4] build(deps): bump axios from 1.7.2 to 1.7.4 Bumps [axios](https://github.com/axios/axios) from 1.7.2 to 1.7.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.4) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 7b321c892..149f1a3af 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@tanstack/react-query": "4.0.5", "@types/cytoscape": "^3.21.2", "antd": "4.24.5", - "axios": "1.7.2", + "axios": "1.7.4", "bech32": "2.0.0", "bignumber.js": "9.1.2", "bs58check": "3.0.1", diff --git a/yarn.lock b/yarn.lock index dd8b2c6da..63b0e3cfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7567,19 +7567,10 @@ axios@1.6.7: form-data "^4.0.0" proxy-from-env "^1.1.0" -axios@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== - dependencies: - follow-redirects "^1.15.6" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - -axios@^1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" - integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== +axios@1.7.4, axios@^1.6.8: + version "1.7.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.4.tgz#4c8ded1b43683c8dd362973c393f3ede24052aa2" + integrity sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" From fa4a8ad9ca3521b2d824ab326a979305fdcab549 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:47:44 +0900 Subject: [PATCH 3/4] chore(deps): update dependency @types/eslint to v8.56.11 (#423) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7b321c892..d1a31815a 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@storybook/testing-library": "0.2.2", "@testing-library/react": "12.1.5", "@types/echarts": "4.9.22", - "@types/eslint": "8.56.10", + "@types/eslint": "8.56.11", "@types/jest": "29.5.12", "@types/lodash.debounce": "4.0.9", "@types/node": "16.18.98", diff --git a/yarn.lock b/yarn.lock index dd8b2c6da..9261f0204 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5820,10 +5820,10 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/eslint@8.56.10": - version "8.56.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" - integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== +"@types/eslint@8.56.11": + version "8.56.11" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.11.tgz#e2ff61510a3b9454b3329fe7731e3b4c6f780041" + integrity sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q== dependencies: "@types/estree" "*" "@types/json-schema" "*" From 96865cfca3238843f7e5e20090051c8ab096bd2f Mon Sep 17 00:00:00 2001 From: Keith Date: Thu, 29 Aug 2024 00:51:08 +0900 Subject: [PATCH 4/4] feat: replace L1 and L2 by BTC and CKB ref: https://github.com/Magickbase/ckb-explorer-public-issues/issues/773 --- src/locales/en.json | 10 +++++----- src/locales/zh.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 946ce1e79..c51a36d2b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -446,11 +446,11 @@ "transaction_rgbpp_digest": "RGB++ Digest", "seal_tx_on_bitcoin": "Seal Tx On Bitcoin", "tx_on_bitcoin": "Tx On Bitcoin", - "leap_in": "L1 → L2", - "leap_out": "L2 → L1", - "leap_with_in_btc": "L1 → L1", - "leap_in_tip": "This RGB++ transaction is marked as \"L1 → L2\", indicating that the number of cells with RGB++ lock in the output exceeds the number of cells with RGB++ lock in the input.", - "leap_out_tip": "This RGB++ transaction is marked as \"L2 → L1\", indicating that the number of cells with RGB++ lock in the input exceeds the number of cells with RGB++ lock in the output.", + "leap_in": "BTC → CKB", + "leap_out": "CKB → BTC", + "leap_with_in_btc": "Transfer", + "leap_in_tip": "This RGB++ transaction is marked as \"BTC → CKB\", indicating that the number of cells with RGB++ lock in the output exceeds the number of cells with RGB++ lock in the input.", + "leap_out_tip": "This RGB++ transaction is marked as \"CKB → BTC\", indicating that the number of cells with RGB++ lock in the input exceeds the number of cells with RGB++ lock in the output.", "view_in_btc_explorer": "View in Bitcoin Explorer", "view-as-asset-items": "View Asset Distribution", "view-as-merged-assets": "View Asset Amounts(CKB excluded)", diff --git a/src/locales/zh.json b/src/locales/zh.json index 9abd760e6..4f2b8947f 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -446,11 +446,11 @@ "transaction_rgbpp_digest": "RGB++ Digest", "seal_tx_on_bitcoin": "Seal Tx On Bitcoin", "tx_on_bitcoin": "Tx On Bitcoin", - "leap_in": "L1 → L2", - "leap_out": "L2 → L1", - "leap_with_in_btc": "L1 → L1", - "leap_in_tip": "本笔 RGB++ 交易被标记为\"L1 → L2\"，即存在一般 CKB 资产转化为 RGB++ 资产。", - "leap_out_tip": "本笔 RGB++ 交易被标记为\"L2 → L1\"，即存在 RGB++ 资产转化为一般 CKB 资产。", + "leap_in": "BTC → CKB", + "leap_out": "CKB → BTC", + "leap_with_in_btc": "Transfer", + "leap_in_tip": "本笔 RGB++ 交易被标记为\"BTC → CKB\"，即存在一般 CKB 资产转化为 RGB++ 资产。", + "leap_out_tip": "本笔 RGB++ 交易被标记为\"CKB → BTC\"，即存在 RGB++ 资产转化为一般 CKB 资产。", "view_in_btc_explorer": "在 Bitcoin 浏览器查看", "view-as-asset-items": "查看资产分布", "view-as-merged-assets": "查看资产合计(不含 CKB)",