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

Jump to bottom

fix: NFTCard Displayed images that should not be displayed after swit… #549

Merged
merged 6 commits into from
Feb 18, 2024
Merged

fix: NFTCard Displayed images that should not be displayed after swit… #549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbb5d93
fix: NFTCard Displayed images that should not be displayed after swit…
shanchuan1 Feb 2, 2024
f2fb1ef
feat: modify code
shanchuan1 Feb 4, 2024
1ff6c94
Merge branch 'main' into feature-shanchuan-beta.9
shanchuan1 Feb 4, 2024
afa6781
feat: add test code
shanchuan1 Feb 18, 2024
65ddf7a
Merge branch 'main' into feature-shanchuan-beta.9
shanchuan1 Feb 18, 2024
fbffee5
feat: modify code
shanchuan1 Feb 18, 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
5 changes: 5 additions & 0 deletions .changeset/pink-planes-wait.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ant-design/web3': patch
---

fix: NFTCard Displayed images that should not be displayed after switch chain
18 changes: 16 additions & 2 deletions packages/web3/src/hooks/useNFT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react';
import type { NFTMetadata, Web3ConfigProviderProps } from '@ant-design/web3-common';
import type { Chain, NFTMetadata, Web3ConfigProviderProps } from '@ant-design/web3-common';

import useProvider from './useProvider';

Expand All @@ -11,10 +11,21 @@ export default function useNFT(
const [metadata, setMetadata] = useState<NFTMetadata>({});
const [loading, setLoading] = useState<boolean>(false);
const [error, setError] = useState<Error>();
const { getNFTMetadata: getNFTMetadataFunc } = useProvider({
const {
getNFTMetadata: getNFTMetadataFunc,
availableChains,
chain,
} = useProvider({
getNFTMetadata,
});

const findChainIndex = (availableChains: Chain[], chain: Chain) => {
const index = availableChains?.findIndex((chainItem) => {
return chainItem?.id === chain?.id;
});
return index + 1;
};

useEffect(() => {
if (!address || !tokenId) {
return;
Expand All @@ -26,6 +37,9 @@ export default function useNFT(
tokenId: BigInt(tokenId),
})
.then((data) => {
if (findChainIndex(availableChains as Chain[], chain as Chain) > 1) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉这样实现不是很好，应该这样搞：

  • 链切换的时候 chain 发生改变，这个时候重新调用 getNFTMetadata 请求新的数据
  • 调用 getNFTMetadata 失败后显示 fallback image 就行

这样从逻辑上更符合实际情况。

Copy link
Contributor Author

@shanchuan1 shanchuan1 Feb 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

但是getNFTMetadata 的入参address与tokenId是固定的如何控制使getNFTMetadata 失败呢

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没失败的情况就正常显示就好，一般切换链的情况下 address 如果不修改的话就请求不到数据了，就会失败。

不是我们要控制 getNFTMetadata 去失败，是 getNFTMetadata 失败的情况下显示 fallback 的图片就行。

你随便写一个错误的 address 应该就能模拟这种情况。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

data.image = '';
}
setMetadata(data);
})
.catch((err) => {
Expand Down
42 changes: 24 additions & 18 deletions packages/web3/src/nft-card/NFTCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,24 @@ const CardSkeleton: React.FC<PropsWithChildren<{ loading: boolean; prefixCls: st
return <>{children}</>;
};

const NFTCard: React.FC<NFTCardProps> = ({
style,
antdImageProps,
className,
type = 'default',
address,
tokenId,
price,
like: likeConfig,
showAction,
actionText,
footer,
onActionClick,
getNFTMetadata,
locale,
...metadataProps
}) => {
const NFTCard: React.FC<NFTCardProps> = (props) => {
const {
style,
antdImageProps,
className,
type = 'default',
address,
tokenId,
price,
like: likeConfig,
showAction,
actionText,
footer,
onActionClick,
getNFTMetadata,
locale,
...metadataProps
} = props;
const { liked, totalLikes = 0, onLikeChange } = likeConfig || {};
const { token } = useToken();
const { metadata, loading } = useNFT(address, parseNumberToBigint(tokenId), getNFTMetadata);
Expand Down Expand Up @@ -160,7 +161,12 @@ const NFTCard: React.FC<NFTCardProps> = ({
<div className={`${prefixCls}-serial-number`}>{`#${tokenId}`}</div>
) : null}
{typeof image === 'string' ? (
<Image width="100%" src={getWeb3AssetUrl(image)} {...antdImageProps} />
<Image
width="100%"
src={getWeb3AssetUrl(image)}
{...antdImageProps}
fallback="data:image/png;base64,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"
/>
) : (
image
)}
Expand Down
Loading