Commit 95be7b1d authored by Jack Short's avatar Jack Short Committed by GitHub

fix: sweep marketplaces (#5231)

* fix: sweep marketplaces

* responding to pr comments
parent 7ce022b2
...@@ -177,13 +177,17 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => { ...@@ -177,13 +177,17 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => {
const nft20Assets = useLazyLoadSweepAssetsQuery(nft20Params) const nft20Assets = useLazyLoadSweepAssetsQuery(nft20Params)
const { sortedAssets, sortedAssetsTotalEth } = useMemo(() => { const { sortedAssets, sortedAssetsTotalEth } = useMemo(() => {
if (!collectionAssets || !nftxAssets || !nft20Assets) if (!collectionAssets && !nftxAssets && !nft20Assets) {
return { sortedAssets: undefined, sortedAssetsTotalEth: BigNumber.from(0) } return { sortedAssets: undefined, sortedAssetsTotalEth: BigNumber.from(0) }
}
let counterNFTX = 0 let counterNFTX = 0
let counterNFT20 = 0 let counterNFT20 = 0
let jointCollections = [...nftxAssets, ...nft20Assets] let jointCollections: GenieAsset[] = []
if (nftxAssets) jointCollections = [...jointCollections, ...nftxAssets]
if (nft20Assets) jointCollections = [...jointCollections, ...nft20Assets]
jointCollections.forEach((asset) => { jointCollections.forEach((asset) => {
if (!asset.susFlag) { if (!asset.susFlag) {
...@@ -196,7 +200,7 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => { ...@@ -196,7 +200,7 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => {
} }
}) })
jointCollections = collectionAssets.concat(jointCollections) jointCollections = collectionAssets ? collectionAssets.concat(jointCollections) : jointCollections
jointCollections.sort((a, b) => { jointCollections.sort((a, b) => {
return BigNumber.from(a.priceInfo.ETHPrice).gt(BigNumber.from(b.priceInfo.ETHPrice)) ? 1 : -1 return BigNumber.from(a.priceInfo.ETHPrice).gt(BigNumber.from(b.priceInfo.ETHPrice)) ? 1 : -1
...@@ -206,7 +210,10 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => { ...@@ -206,7 +210,10 @@ export const Sweep = ({ contractAddress, minPrice, maxPrice }: SweepProps) => {
(asset) => BigNumber.from(asset.priceInfo.ETHPrice).gte(0) && !asset.susFlag (asset) => BigNumber.from(asset.priceInfo.ETHPrice).gte(0) && !asset.susFlag
) )
validAssets = validAssets.slice(0, Math.max(collectionAssets.length, nftxAssets.length, nft20Assets.length)) validAssets = validAssets.slice(
0,
Math.max(collectionAssets?.length ?? 0, nftxAssets?.length ?? 0, nft20Assets?.length ?? 0)
)
return { return {
sortedAssets: validAssets, sortedAssets: validAssets,
...@@ -413,7 +420,7 @@ export function useSweepFetcherParams( ...@@ -413,7 +420,7 @@ export function useSweepFetcherParams(
if (market === 'others') { if (market === 'others') {
return { contractAddress, traits, markets } return { contractAddress, traits, markets }
} }
if (!markets.includes(market)) return { contractAddress: '', traits: [], markets: [] } return { contractAddress: '', traits: [], markets: [] }
} }
switch (market) { switch (market) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment