deep-stack/wallet-connect-web-examples
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: check for the whole chain identifier ( namespace + ":" + reference ) (#300)

Browse Source
This commit is contained in:
Radu Mojic 2023-10-12 16:51:54 +03:00 committed by GitHub
parent 7882b3e101
commit 653b362e5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dapps/react-dapp-v2/src/constants/default.ts
View File

@ -125,6 +125,7 @@ export enum DEFAULT_MULTIVERSX_METHODS {
MULTIVERSX_SIGN_MESSAGE = "mvx_signMessage",
MULTIVERSX_SIGN_LOGIN_TOKEN = "mvx_signLoginToken",
MULTIVERSX_SIGN_NATIVE_AUTH_TOKEN = "mvx_signNativeAuthToken",
MULTIVERSX_CANCEL_ACTION = "mvx_cancelAction"
}
export enum DEFAULT_MULTIVERSX_EVENTS {}

4
wallets/react-wallet-v2/src/components/ChainDataMini.tsx
View File

@ -12,13 +12,13 @@ import { Card, Row, styled, Image, Avatar } from '@nextui-org/react'
import { ReactNode, useMemo } from 'react'
interface Props {
chainId?: string | number
chainId?: string // namespace + ":" + reference
}
// const StyledLogo = styled(Image, {})
export default function ChainDataMini({ chainId }: Props) {
const chainData = useMemo(() => getChainData(chainId!), [chainId])
const chainData = useMemo(() => getChainData(chainId), [chainId])
console.log(chainData)
if (!chainData) return <></>

10
wallets/react-wallet-v2/src/data/MultiversxData.ts
View File

@ -13,7 +13,7 @@ export const MULTIVERSX_MAINNET_CHAINS = {
logo: '/chain-logos/multiversx-1.svg',
rgb: '43, 45, 46',
rpc: '',
namespace: 'mutiversx'
namespace: 'mvx'
}
}
@ -24,7 +24,7 @@ export const MULTIVERSX_TEST_CHAINS = {
logo: '/chain-logos/multiversx-1.svg',
rgb: '43, 45, 46',
rpc: '',
namespace: 'mutiversx'
namespace: 'mvx'
}
// Keep only one Test Chain visible
// 'mvx:T': {
@ -32,7 +32,8 @@ export const MULTIVERSX_TEST_CHAINS = {
// name: 'MultiversX Testnet',
// logo: '/chain-logos/multiversx-1.svg',
// rgb: '43, 45, 46',
// rpc: ''
// rpc: '',
// namespace: 'mvx'
// }
}
@ -46,5 +47,6 @@ export const MULTIVERSX_SIGNING_METHODS = {
MULTIVERSX_SIGN_TRANSACTIONS: 'mvx_signTransactions',
MULTIVERSX_SIGN_MESSAGE: 'mvx_signMessage',
MULTIVERSX_SIGN_LOGIN_TOKEN: 'mvx_signLoginToken',
MULTIVERSX_SIGN_NATIVE_AUTH_TOKEN: 'mvx_signNativeAuthToken'
MULTIVERSX_SIGN_NATIVE_AUTH_TOKEN: 'mvx_signNativeAuthToken',
MULTIVERSX_CANCEL_ACTION: 'mvx_cancelAction'
}

8
wallets/react-wallet-v2/src/data/chainsUtil.ts
View File

@ -20,8 +20,10 @@ export const ALL_CHAINS = {
...TRON_CHAINS
}
export function getChainData(chainId: string | number) {
export function getChainData(chainId?: string) {
if (!chainId) return
chainId = chainId.toString().includes(':') ? chainId.toString().split(':')[1] : chainId
return Object.values(ALL_CHAINS).find(chain => chain.chainId == chainId)
const [namespace, reference] = chainId.toString().split(':')
return Object.values(ALL_CHAINS).find(
chain => chain.chainId == reference && chain.namespace === namespace
)
}

10
wallets/react-wallet-v2/src/views/SessionProposalModal.tsx
View File

@ -102,7 +102,7 @@ export default function SessionProposalModal() {
events: [],
accounts: kadenaChains.map(chain => `${chain}:${kadenaAddresses[0]}`).flat()
},
multiversx: {
mvx: {
chains: multiversxChains,
methods: multiversxMethods,
events: [],
@ -198,7 +198,7 @@ export default function SessionProposalModal() {
return cosmosAddresses[0]
case 'kadena':
return kadenaAddresses[0]
case 'multiversx':
case 'mvx':
return multiversxAddresses[0]
case 'near':
return nearAddresses[0]
@ -324,9 +324,13 @@ export default function SessionProposalModal() {
</Row>
{supportedChains.length &&
supportedChains.map((chain, i) => {
if (!chain) {
return <></>
}
return (
<Row key={i}>
<ChainDataMini key={i} chainId={chain?.chainId!} />
<ChainDataMini key={i} chainId={`${chain?.namespace}:${chain?.chainId}`} />
</Row>
)
})}

2
wallets/react-wallet-v2/src/views/SessionSignMultiversxModal.tsx
View File

@ -67,7 +67,7 @@ export default function SessionSignMultiversxModal() {
return (
<RequestModal
intention="sign a Mtvx message"
intention="sign a MultiversX message"
metadata={requestSession.peer.metadata}
onApprove={onApprove}
onReject={onReject}