Skip to content

fix: magic eden response handle function #6531

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

Merged
Randolph314 merged 8 commits into from
Jun 14, 2022
Merged

fix: magic eden response handle function #6531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c277313
fix: magic eden response handle function
randolphph Jun 13, 2022
3e7fae7
fix: change magic eden handle function
randolphph Jun 14, 2022
b9c7fa3
fix: opensea response handle function
randolphph Jun 14, 2022
b126790
fix: magic eden tokenid from token title
randolphph Jun 14, 2022
85c5fb6
Merge branch 'develop' into fix/solana-web3-nft
randolphph Jun 14, 2022
a56fd9c
fix: nft list from alchemy will not display collection filter
randolphph Jun 14, 2022
4ebaf1f
feat: collections without name will not display in nft page
randolphph Jun 14, 2022
ccd46dc
feat: add address to nft collection
randolphph Jun 14, 2022
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
70 changes: 38 additions & 32 deletions packages/mask/src/extension/options-page/DashboardComponents/CollectibleList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ export function CollectionList({
.filter(Boolean) as Array<NonFungibleTokenCollection<Web3Helper.ChainIdAll>>
}, [allCollectibles.length])

const isFromAlchemy = collections?.findIndex((collection) => collection?.name?.length > 0) === -1

if (!allCollectibles.length && !done && !error && account) return <LoadingSkeleton />

if (!allCollectibles.length && error && account) return <RetryHint retry={nextPage} />
Expand Down Expand Up @@ -362,39 +364,43 @@ export function CollectionList({
{!done && <LoadingBase />}
</ElementAnchor>
</Box>
<Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
<AllNetworkButton
className={classes.networkSelected}
onClick={() => setSelectedCollection('all')}>
ALL
</AllNetworkButton>
{!isFromAlchemy && (
<Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
<AllNetworkButton
className={classes.networkSelected}
onClick={() => setSelectedCollection('all')}>
ALL
</AllNetworkButton>
</Box>
{collections.map((x, i) => {
return (
x?.name?.length > 0 && (
<Box
display="flex"
key={i}
alignItems="center"
justifyContent="center"
sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
<CollectionIcon
selectedCollection={
selectedCollection === 'all' ? undefined : selectedCollection?.address
}
collection={x}
onClick={() => {
setSelectedCollection(x)
}}
/>
</Box>
)
)
})}
</Box>
{collections.map((x, i) => {
return (
<Box
display="flex"
key={i}
alignItems="center"
justifyContent="center"
sx={{ marginTop: '8px', marginBottom: '12px', minWidth: 30, maxHeight: 24 }}>
<CollectionIcon
selectedCollection={
selectedCollection === 'all' ? undefined : selectedCollection?.address
}
collection={x}
onClick={() => {
setSelectedCollection(x)
}}
/>
</Box>
)
})}
</Box>
)}
</Stack>
</Box>
)
Expand Down
7 changes: 4 additions & 3 deletions packages/web3-providers/src/MagicEden/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
chainId: ChainId.Mainnet,
type: TokenType.NonFungible,
schema: SchemaType.NonFungible,
tokenId: token.mintAddress,
tokenId: token?.title?.match(/#\d+/)?.[0]?.replace('#', '') ?? '',
address: token.mintAddress,
metadata: {
chainId: ChainId.Mainnet,
name: token.collectionName,
name: token?.title,
symbol: '',
description: '',
imageURL: toImage(token.img),
Expand All @@ -137,11 +137,12 @@ export class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, Schem
},
collection: {
chainId: ChainId.Mainnet,
name: token.collectionName,
name: token.collectionName ?? token?.collectionTitle,
slug: '',
description: '',
iconURL: '',
verified: false,
address: token.mintAddress,
},
}
})
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/MagicEden/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export interface MagicEdenNFT {
price: number
owner: string
collectionName: string
collectionTittle: string
collectionTitle: string
img: string
title: string
content: string
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/alchemy/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function createNftToken_EVM(
collection: {
address: contractAddress,
chainId,
name: resolveCollectionName(asset),
name: '',
slug: '',
description: asset.description,
},
Expand Down
3 changes: 2 additions & 1 deletion packages/web3-providers/src/opensea/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ function createNFTToken(chainId: ChainId, asset: OpenSeaResponse): NonFungibleTo
owner: asset.owner.address,
},
collection: {
address: asset.token_address ?? asset.asset_contract.address,
chainId,
name: asset.collection.name,
slug: asset.collection.slug,
Expand All @@ -117,7 +118,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs
(x) => x.address.toLowerCase(),
)
const offerTokens = uniqBy(
asset.collection.payment_tokens.map((x) => createTokenDetailed(chainId, x)),
asset.collection?.payment_tokens?.map((x) => createTokenDetailed(chainId, x)),
(x) => x.address.toLowerCase(),
)
return {
Expand Down