Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into testnet #1760

Merged
merged 7 commits into from
Aug 28, 2024
Merged

Merge develop into testnet #1760

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
beb2942
Merge pull request #1756 from nervosnetwork/testnet
Keith-CY Aug 15, 2024
cb18e12
Merge pull request #1758 from nervosnetwork/testnet
Keith-CY Aug 21, 2024
83c34c7
fix(deps): update dependency camelcase to v8 (#375)
renovate[bot] Aug 23, 2024
65422d5
build(deps): bump axios from 1.7.2 to 1.7.4
dependabot[bot] Aug 23, 2024
fa4a8ad
chore(deps): update dependency @types/eslint to v8.56.11 (#423)
renovate[bot] Aug 23, 2024
96865cf
feat: replace L1 and L2 by BTC and CKB
Keith-CY Aug 28, 2024
d2c4a46
Merge pull request #1761 from nervosnetwork/dependabot/npm_and_yarn/a…
Keith-CY Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
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
View file
Open in desktop
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": "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)",
Expand Down
10 changes: 5 additions & 5 deletions src/locales/zh.json
View file
Open in desktop
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": "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)",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
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 @@ -8241,10 +8241,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