Skip to content

Commit

Permalink
Merge pull request #1760 from nervosnetwork/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith-CY authored Aug 28, 2024
2 parents 866fdc0 + d2c4a46 commit 4e7f6ee
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 34 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"@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",
"camelcase": "7.0.1",
"camelcase": "8.0.0",
"camelcase-keys": "7.0.2",
"classnames": "2.5.1",
"cytoscape": "^3.29.2",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "L1L2",
"leap_out": "L2L1",
"leap_with_in_btc": "L1 → L1",
"leap_in_tip": "This RGB++ transaction is marked as \"L1L2\", 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 \"L2L1\", 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": "BTCCKB",
"leap_out": "CKBBTC",
"leap_with_in_btc": "Transfer",
"leap_in_tip": "This RGB++ transaction is marked as \"BTCCKB\", 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 \"CKBBTC\", 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)",
Expand Down
10 changes: 5 additions & 5 deletions src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "L1L2",
"leap_out": "L2L1",
"leap_with_in_btc": "L1 → L1",
"leap_in_tip": "本笔 RGB++ 交易被标记为\"L1L2\",即存在一般 CKB 资产转化为 RGB++ 资产。",
"leap_out_tip": "本笔 RGB++ 交易被标记为\"L2L1\",即存在 RGB++ 资产转化为一般 CKB 资产。",
"leap_in": "BTCCKB",
"leap_out": "CKBBTC",
"leap_with_in_btc": "Transfer",
"leap_in_tip": "本笔 RGB++ 交易被标记为\"BTCCKB\",即存在一般 CKB 资产转化为 RGB++ 资产。",
"leap_out_tip": "本笔 RGB++ 交易被标记为\"CKBBTC\",即存在 RGB++ 资产转化为一般 CKB 资产。",
"view_in_btc_explorer": "在 Bitcoin 浏览器查看",
"view-as-asset-items": "查看资产分布",
"view-as-merged-assets": "查看资产合计(不含 CKB)",
Expand Down
33 changes: 12 additions & 21 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5820,10 +5820,10 @@
"@types/estree" "*"
"@types/json-schema" "*"

"@types/[email protected].10":
version "8.56.10"
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d"
integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==
"@types/[email protected].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" "*"
Expand Down Expand Up @@ -7567,19 +7567,10 @@ [email protected]:
form-data "^4.0.0"
proxy-from-env "^1.1.0"

[email protected]:
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==
[email protected], 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"
Expand Down Expand Up @@ -8241,10 +8232,10 @@ [email protected], 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"
Expand Down

0 comments on commit 4e7f6ee

Please sign in to comment.