From ec41135d14291b23676b7c63b1279d78c611a03e Mon Sep 17 00:00:00 2001 From: bluezdot <72647326+bluezdot@users.noreply.github.com> Date: Fri, 21 Jun 2024 19:45:25 +0700 Subject: [PATCH 1/5] [Issue-183] Update chainlist --- package.json | 2 +- .../extension-base/src/services/chain-service/index.ts | 3 ++- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b5e3b92e087..e883881faca 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "@polkadot/types-codec": "10.10.1", "@polkadot/util": "^12.6.2", "@polkadot/util-crypto": "^12.6.2", - "@subwallet/chain-list": "0.2.68-beta.1", + "@subwallet/chain-list": "0.2.70-beta.3", "@subwallet/keyring": "file:./local-libs/keyring", "@subwallet/ui-keyring": "file:./local-libs/ui-keyring", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/extension-base/src/services/chain-service/index.ts b/packages/extension-base/src/services/chain-service/index.ts index a098d6d532c..9dc0e7c7a51 100644 --- a/packages/extension-base/src/services/chain-service/index.ts +++ b/packages/extension-base/src/services/chain-service/index.ts @@ -55,7 +55,8 @@ const openbitChainInfoMap = (() => { 'bobMainnet', 'merlinEvm', 'botanixEvmTest', - 'bounceBitEvm' + 'bounceBitEvm', + 'bounceBitEvmTest' ]; const enableList = nativeList.concat(bitcoinL2List); diff --git a/yarn.lock b/yarn.lock index 387f1fe60dd..cf69eb03961 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6241,14 +6241,14 @@ __metadata: languageName: node linkType: hard -"@subwallet/chain-list@npm:0.2.68-beta.1": - version: 0.2.68-beta.1 - resolution: "@subwallet/chain-list@npm:0.2.68-beta.1" +"@subwallet/chain-list@npm:0.2.70-beta.3": + version: 0.2.70-beta.3 + resolution: "@subwallet/chain-list@npm:0.2.70-beta.3" dependencies: "@polkadot/dev": 0.67.167 "@polkadot/util": ^12.5.1 eventemitter3: ^5.0.1 - checksum: d34f43df3a6ebd3b83bde7d4bcf73966b156c1b5d166c1cceae415c1c1363e4c4a0b933d9c9649907ae2c2aadb612cc52ed4f966a01cd75164e115c8c3cc41d0 + checksum: 08f6ee905c652661cfd66373af0620ad372e9733a3a75fc9c45de06cb1358f8ae0a6660a4ac24361ecc0117661292c8cc2d8aeaf30b8901cd722d07a9020cbc6 languageName: node linkType: hard From fd3d17d6c1efae9f2bb751608a7ad8b7ff8fb995 Mon Sep 17 00:00:00 2001 From: bluezdot <72647326+bluezdot@users.noreply.github.com> Date: Sat, 22 Jun 2024 10:22:39 +0700 Subject: [PATCH 2/5] [Issue-183] Update chainlist --- package.json | 2 +- .../src/services/chain-service/constants.ts | 3 ++- .../extension-base/src/services/chain-service/index.ts | 3 ++- yarn.lock | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e883881faca..0c3a63bbe0e 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "@polkadot/types-codec": "10.10.1", "@polkadot/util": "^12.6.2", "@polkadot/util-crypto": "^12.6.2", - "@subwallet/chain-list": "0.2.70-beta.3", + "@subwallet/chain-list": "0.2.70-beta.4", "@subwallet/keyring": "file:./local-libs/keyring", "@subwallet/ui-keyring": "file:./local-libs/ui-keyring", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/extension-base/src/services/chain-service/constants.ts b/packages/extension-base/src/services/chain-service/constants.ts index 29e73c3a5ac..9a1d63872ed 100644 --- a/packages/extension-base/src/services/chain-service/constants.ts +++ b/packages/extension-base/src/services/chain-service/constants.ts @@ -258,7 +258,8 @@ export const _ALWAYS_ACTIVE_CHAINS: string[] = [ export const EVM_PASS_CONNECT_STATUS: Record = { arbitrum_one: ['*'], okxTest: ['*'], - merlinEvm: ['*'] + merlinEvm: ['*'], + layerEdge_testnet: ['*'] }; export const EVM_REFORMAT_DECIMALS = { diff --git a/packages/extension-base/src/services/chain-service/index.ts b/packages/extension-base/src/services/chain-service/index.ts index 9dc0e7c7a51..29a02104ef5 100644 --- a/packages/extension-base/src/services/chain-service/index.ts +++ b/packages/extension-base/src/services/chain-service/index.ts @@ -56,7 +56,8 @@ const openbitChainInfoMap = (() => { 'merlinEvm', 'botanixEvmTest', 'bounceBitEvm', - 'bounceBitEvmTest' + 'bounceBitEvmTest', + 'layerEdge_testnet' ]; const enableList = nativeList.concat(bitcoinL2List); diff --git a/yarn.lock b/yarn.lock index cf69eb03961..6954349ed48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6241,14 +6241,14 @@ __metadata: languageName: node linkType: hard -"@subwallet/chain-list@npm:0.2.70-beta.3": - version: 0.2.70-beta.3 - resolution: "@subwallet/chain-list@npm:0.2.70-beta.3" +"@subwallet/chain-list@npm:0.2.70-beta.4": + version: 0.2.70-beta.4 + resolution: "@subwallet/chain-list@npm:0.2.70-beta.4" dependencies: "@polkadot/dev": 0.67.167 "@polkadot/util": ^12.5.1 eventemitter3: ^5.0.1 - checksum: 08f6ee905c652661cfd66373af0620ad372e9733a3a75fc9c45de06cb1358f8ae0a6660a4ac24361ecc0117661292c8cc2d8aeaf30b8901cd722d07a9020cbc6 + checksum: 615d527f6baef295ea06d5d95abc539ec4d33ffad235bf1fa762df8e117c6a39b3945dbab056b3dbf329293ed5c9c064f4891de84409d7dd03d9888df7914deb languageName: node linkType: hard From bdd9a9576fd17dbe552ff4193cc35c47b365d1b3 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Sat, 22 Jun 2024 15:13:44 +0700 Subject: [PATCH 3/5] [Issue-183] Add function check valid json file --- .../src/Popup/Home/Nfts/NftCollectionDetail.tsx | 4 ++-- .../src/Popup/Home/Nfts/NftItemDetail.tsx | 4 ++-- .../extension-koni-ui/src/Popup/Home/Nfts/utils.ts | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx index b6f7bc550b0..94f0b0dba2c 100644 --- a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx +++ b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx @@ -10,7 +10,7 @@ import { useNavigateOnChangeAccount } from '@subwallet/extension-koni-ui/hooks'; import useTranslation from '@subwallet/extension-koni-ui/hooks/common/useTranslation'; import { InscriptionGalleryWrapper } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/component/InscriptionGalleryWrapper'; import { NftGalleryWrapper } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/component/NftGalleryWrapper'; -import { INftCollectionDetail, INftItemDetail } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; +import { INftCollectionDetail, INftItemDetail, isValidJson } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; import { ThemeProps } from '@subwallet/extension-koni-ui/types'; import { SwList } from '@subwallet/react-ui'; import CN from 'classnames'; @@ -47,7 +47,7 @@ function Component ({ className = '' }: Props): React.ReactElement { const renderNft = useCallback((nftItem: NftItem) => { const routingParams = { collectionInfo, nftItem } as INftItemDetail; - if (nftItem.description) { + if (nftItem.description && isValidJson(nftItem.description)) { const ordinalNftItem = JSON.parse(nftItem.description) as OrdinalRemarkData; if ('p' in ordinalNftItem && 'op' in ordinalNftItem && 'tick' in ordinalNftItem && 'amt' in ordinalNftItem) { diff --git a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftItemDetail.tsx b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftItemDetail.tsx index bd9f5557b71..68e6dcaa25d 100644 --- a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftItemDetail.tsx +++ b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftItemDetail.tsx @@ -13,7 +13,7 @@ import useDefaultNavigate from '@subwallet/extension-koni-ui/hooks/router/useDef import useGetChainInfo from '@subwallet/extension-koni-ui/hooks/screen/common/useFetchChainInfo'; import useGetAccountInfoByAddress from '@subwallet/extension-koni-ui/hooks/screen/common/useGetAccountInfoByAddress'; import InscriptionImage from '@subwallet/extension-koni-ui/Popup/Home/Nfts/component/InscriptionImage'; -import { INftItemDetail } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; +import { INftItemDetail, isValidJson } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; import { RootState } from '@subwallet/extension-koni-ui/stores'; import { Theme, ThemeProps } from '@subwallet/extension-koni-ui/types'; import { BackgroundIcon, Field, Icon, Image, Logo, ModalContext, SwModal } from '@subwallet/react-ui'; @@ -137,7 +137,7 @@ function Component ({ className = '' }: Props): React.ReactElement { }, [nftItem.externalUrl]); const show3DModel = SHOW_3D_MODELS_CHAIN.includes(nftItem.chain); - const ordinalNftItem = nftItem.description && JSON.parse(nftItem.description) as OrdinalRemarkData; + const ordinalNftItem = nftItem.description && isValidJson(nftItem.description) && JSON.parse(nftItem.description) as OrdinalRemarkData; const isInscription = useMemo(() => { if (ordinalNftItem && 'p' in ordinalNftItem && 'op' in ordinalNftItem && 'tick' in ordinalNftItem && 'amt' in ordinalNftItem) { return true; diff --git a/packages/extension-koni-ui/src/Popup/Home/Nfts/utils.ts b/packages/extension-koni-ui/src/Popup/Home/Nfts/utils.ts index 60441e6f86b..cc6e93d4df2 100644 --- a/packages/extension-koni-ui/src/Popup/Home/Nfts/utils.ts +++ b/packages/extension-koni-ui/src/Popup/Home/Nfts/utils.ts @@ -15,3 +15,13 @@ export interface INftItemDetail { // might set perPage based on screen height export const NFT_PER_PAGE = 4; + +export const isValidJson = (str: string): boolean => { + try { + JSON.parse(str); + + return true; + } catch { + return false; + } +}; From 77d6fc4364203c43bc3a856668dc956e37831588 Mon Sep 17 00:00:00 2001 From: bluezdot <72647326+bluezdot@users.noreply.github.com> Date: Sat, 22 Jun 2024 15:26:46 +0700 Subject: [PATCH 4/5] [Issue-183] Update chainlist --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0c3a63bbe0e..2d23e1afb56 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "@polkadot/types-codec": "10.10.1", "@polkadot/util": "^12.6.2", "@polkadot/util-crypto": "^12.6.2", - "@subwallet/chain-list": "0.2.70-beta.4", + "@subwallet/chain-list": "0.2.70-beta.6", "@subwallet/keyring": "file:./local-libs/keyring", "@subwallet/ui-keyring": "file:./local-libs/ui-keyring", "babel-core": "^7.0.0-bridge.0", diff --git a/yarn.lock b/yarn.lock index 6954349ed48..111477e1890 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6241,14 +6241,14 @@ __metadata: languageName: node linkType: hard -"@subwallet/chain-list@npm:0.2.70-beta.4": - version: 0.2.70-beta.4 - resolution: "@subwallet/chain-list@npm:0.2.70-beta.4" +"@subwallet/chain-list@npm:0.2.70-beta.6": + version: 0.2.70-beta.6 + resolution: "@subwallet/chain-list@npm:0.2.70-beta.6" dependencies: "@polkadot/dev": 0.67.167 "@polkadot/util": ^12.5.1 eventemitter3: ^5.0.1 - checksum: 615d527f6baef295ea06d5d95abc539ec4d33ffad235bf1fa762df8e117c6a39b3945dbab056b3dbf329293ed5c9c064f4891de84409d7dd03d9888df7914deb + checksum: d4e5085eb6501555202879233cdbc23c37e4926fb0488ab3691c7b5e0354e763f6e34c3029918944346cc3f1eaa3e201a3e9eec78f01d1332c41a8d10c2331e2 languageName: node linkType: hard From 93037ad9268002b4865338fa7a71cc9c2bfe1d12 Mon Sep 17 00:00:00 2001 From: nguyentiendung Date: Mon, 24 Jun 2024 18:10:04 +0700 Subject: [PATCH 5/5] [Issue-183] Merge openbit-dev into issue-183 and resolve conflicts. --- .../src/Popup/Home/Nfts/NftCollectionDetail.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx index c2b6a78cabc..d82fbef4c67 100644 --- a/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx +++ b/packages/extension-koni-ui/src/Popup/Home/Nfts/NftCollectionDetail.tsx @@ -11,8 +11,7 @@ import useTranslation from '@subwallet/extension-koni-ui/hooks/common/useTransla import { loadMoreInscription } from '@subwallet/extension-koni-ui/messaging'; import { InscriptionGalleryWrapper } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/component/InscriptionGalleryWrapper'; import { NftGalleryWrapper } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/component/NftGalleryWrapper'; -import { INftCollectionDetail, INftItemDetail, isValidJson } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; -import { getTotalCollectionItems, INftCollectionDetail, INftItemDetail } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; +import { getTotalCollectionItems, INftCollectionDetail, INftItemDetail, isValidJson } from '@subwallet/extension-koni-ui/Popup/Home/Nfts/utils'; import { RootState } from '@subwallet/extension-koni-ui/stores'; import { ThemeProps } from '@subwallet/extension-koni-ui/types'; import { Input, SwList } from '@subwallet/react-ui';