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 testnet into mainnet #1331

Merged
merged 6 commits into from
Sep 13, 2023
Merged

Merge testnet into mainnet #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecf2f46
chore(deps): update dependency eslint-config-prettier to v9 (#92)
renovate[bot] Sep 6, 2023
5f0edee
chore(deps): update dependency @sentry/webpack-plugin to v2.7.1 (#96)
renovate[bot] Sep 6, 2023
bf17651
feat(script-info): add refererring cells tab to script info page. (#95)
Daryl-L Sep 12, 2023
9119381
Merge branch 'develop' into develop
Keith-CY Sep 12, 2023
b921d23
Merge pull request #1328 from Magickbase/develop
Keith-CY Sep 13, 2023
625ab6c
Merge pull request #1329 from nervosnetwork/develop
Keith-CY Sep 13, 2023
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 @@ -39,7 +39,7 @@
"three": "0.149.0"
},
"devDependencies": {
"@sentry/webpack-plugin": "2.7.0",
"@sentry/webpack-plugin": "2.7.1",
"@testing-library/react": "12.1.5",
"@types/echarts": "4.9.18",
"@types/eslint": "7.29.0",
Expand All @@ -58,7 +58,7 @@
"create-react-app": "^5.0.0",
"eslint": "7.32.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-prettier": "8.10.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-import": "2.28.1",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-prettier": "3.4.1",
Expand Down
7 changes: 2 additions & 5 deletions src/pages/Script/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ const getScriptInfo = (scriptInfo: ScriptInfo) => {
},
]

// don't show `referring_cells` temporarily
return items.slice(0, 6)
return items
}

const ScriptsTitleOverview = ({ scriptInfo }: { scriptInfo: ScriptInfo }) => {
Expand Down Expand Up @@ -198,9 +197,7 @@ export const ScriptPage = () => {
key: 'referring_cells',
children: <ScriptCells page={currentPage} size={pageSize} cellType="referring_cells" />,
},
]
// don't show `referring_cells` temporarily
.slice(0, 2)}
]}
/>
</div>
</Content>
Expand Down
26 changes: 13 additions & 13 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2200,10 +2200,10 @@
"@sentry/utils" "7.65.0"
tslib "^2.4.1 || ^1.9.3"

"@sentry/[email protected].0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.7.0.tgz#6a6e2ac14646b92c932dfa46a7ea9a719782c6a3"
integrity sha512-ZxJG/DsRXJ9BMaKv+butL3TaiHsuuUy1bNkl56/FCbCt1rYuzltEPT2cBuuveieg66ZWtzerSF17QX3v6svtJQ==
"@sentry/[email protected].1":
version "2.7.1"
resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.7.1.tgz#60ca41f79393263911ae6bc5530f387cb1e48e47"
integrity sha512-ZC/B/7FzzgGpux2t54B2ioXudlq60MHMVPaUeuFzWwxmxiArrV4uBXcp18RMW5ns4biik5WBAD72vbsoloBfIQ==
dependencies:
"@sentry/cli" "^2.20.1"
"@sentry/node" "^7.60.0"
Expand Down Expand Up @@ -2288,12 +2288,12 @@
"@sentry/types" "7.65.0"
tslib "^2.4.1 || ^1.9.3"

"@sentry/[email protected].0":
version "2.7.0"
resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.7.0.tgz#3a350f190918c05ad13f585c57fbcae3d79c6708"
integrity sha512-RN/Z72P2rNPiNsnH2OCHx3rOSDZa/HDLKUUMn2QO//kkTZS/Iu0HCNgCg1Ik5Z6evxtPC0bPhWo9aBksKaXDbg==
"@sentry/[email protected].1":
version "2.7.1"
resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.7.1.tgz#f9475d24834a94cc6deba6c972afed28d491544e"
integrity sha512-YTlBFGVolXW7ZDoeg7cmLLCqIWNGvH9r3/q7FR1EBM5cDBf21juI+RVFM2mLf/bEu+Qf2uwt1tki8G1rfe7/0g==
dependencies:
"@sentry/bundler-plugin-core" "2.7.0"
"@sentry/bundler-plugin-core" "2.7.1"
unplugin "1.0.1"
uuid "^9.0.0"

Expand Down Expand Up @@ -5649,10 +5649,10 @@ [email protected]:
object.assign "^4.1.2"
object.entries "^1.1.2"

eslint-config-prettier@8.10.0:
version "8.10.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
eslint-config-prettier@9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f"
integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==

eslint-config-react-app@^7.0.1:
version "7.0.1"
Expand Down
Loading