diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml index 9a8e374dc628..2ed47950b5f9 100644 --- a/.github/workflows/deploy-proxy.yml +++ b/.github/workflows/deploy-proxy.yml @@ -1,9 +1,7 @@ name: Publish Proxy Package on: - push: - branches: [hyper-proxy-deploy] - + workflow_dispatch: jobs: build: runs-on: ubuntu-20.04 diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx index b05b29c89c96..f86694883128 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx @@ -163,8 +163,8 @@ export function NFTAvatar(props: NFTAvatarProps) { ) .filter( (token: ERC721TokenDetailed) => - token.info.mediaUrl && - !token.info.mediaUrl?.match(/\.(mp4|webm|mov|ogg|mp3|wav)$/i), + token.info.imageURL && + !token.info.imageURL?.match(/\.(mp4|webm|mov|ogg|mp3|wav)$/i), ) .map((token: ERC721TokenDetailed, i) => ( onChange(token)} - src={token.info.mediaUrl} + src={token.info.imageURL} className={classNames(classes.image, isSameNFT(token, selectedToken) ? classes.selected : '')} /> diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/ProfileNFTAvatar.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/ProfileNFTAvatar.tsx index 0cee95ba5f46..643107f7359d 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/ProfileNFTAvatar.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/ProfileNFTAvatar.tsx @@ -67,8 +67,8 @@ function NFTAvatarInTwitter() { const [avatarEvent, setAvatarEvent] = useState() const onChange = async (token: ERC721TokenDetailed) => { - if (!token.info.mediaUrl) return - const image = await toPNG(token.info.mediaUrl) + if (!token.info.imageURL) return + const image = await toPNG(token.info.imageURL) if (!image) return changeImageToActiveElements(image) diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts index 9c456d5f6c24..d3dc4860d078 100644 --- a/packages/web3-providers/src/opensea/index.ts +++ b/packages/web3-providers/src/opensea/index.ts @@ -61,13 +61,14 @@ function createERC721TokenFromAsset( chainId: ChainId, asset: OpenSeaResponse, ): ERC721TokenDetailed { + const imageURL = asset?.image_original_url ?? asset?.image_url ?? asset?.image_preview_url ?? '' return createERC721Token( createERC721ContractFromAssetContract(asset?.asset_contract?.address, chainId, asset?.asset_contract), { name: asset?.name ?? asset?.asset_contract.name ?? '', description: asset?.description ?? '', - mediaUrl: - asset?.animation_url ?? asset.image_original_url ?? asset?.image_url ?? asset?.image_preview_url ?? '', + imageURL, + mediaUrl: asset?.animation_url || imageURL, owner: asset?.owner.address ?? '', }, tokenId, diff --git a/packages/web3-providers/src/rarible/index.ts b/packages/web3-providers/src/rarible/index.ts index 4c995aa0e84d..b267e3743f30 100644 --- a/packages/web3-providers/src/rarible/index.ts +++ b/packages/web3-providers/src/rarible/index.ts @@ -51,6 +51,7 @@ function createERC721TokenFromAsset( tokenId: string, asset?: RaribleNFTItemMapResponse, ): ERC721TokenDetailed { + const imageURL = toRaribleImage(asset?.meta.image?.url.ORIGINAL ?? asset?.meta.image?.url.PREVIEW ?? '') return { contractDetailed: { type: EthereumTokenType.ERC721, @@ -62,7 +63,10 @@ function createERC721TokenFromAsset( info: { name: asset?.meta.name ?? '', description: asset?.meta.description ?? '', - mediaUrl: toRaribleImage(asset?.meta.image?.url.ORIGINAL ?? asset?.meta.image?.url.PREVIEW ?? ''), + mediaUrl: + toRaribleImage(asset?.meta.animation?.url.ORIGINAL ?? asset?.meta.animation?.url.PREVIEW ?? '') || + imageURL, + imageURL, owner: asset?.owners[0], }, tokenId: tokenId, diff --git a/packages/web3-shared/base/proxy/index.ts b/packages/web3-shared/base/proxy/index.ts index 4ce1ec514e47..74b4ded352f8 100644 --- a/packages/web3-shared/base/proxy/index.ts +++ b/packages/web3-shared/base/proxy/index.ts @@ -40,7 +40,7 @@ export class ProviderProxy { private readonly _globalNotify?: NotifyFn constructor(point: string, notifyFn?: NotifyFn) { - this._socket = new ReconnectingWebSocket(point) + this._socket = new ReconnectingWebSocket(point, undefined, { minUptime: 20000 }) this._pool = new Map() this._globalNotify = notifyFn } diff --git a/packages/web3-shared/evm/types/index.ts b/packages/web3-shared/evm/types/index.ts index cb8226ccf0bb..153c06a108ab 100644 --- a/packages/web3-shared/evm/types/index.ts +++ b/packages/web3-shared/evm/types/index.ts @@ -194,6 +194,7 @@ export interface ERC721TokenInfo { description?: string tokenURI?: string mediaUrl?: string + imageURL?: string owner?: string // loading tokenURI hasTokenDetailed?: boolean