Commit 43f96e1b authored by Igor Stuev's avatar Igor Stuev Committed by GitHub

Merge pull request #561 from blockscout/filter-sort-blocks

blocks socket fix
parents 96ddfc0c 1344677f
...@@ -46,7 +46,13 @@ const BlocksContent = ({ type, query }: Props) => { ...@@ -46,7 +46,13 @@ const BlocksContent = ({ type, query }: Props) => {
next_page_params: null, next_page_params: null,
}; };
} }
return shouldAddToList ? { ...prevData, items: [ payload.block, ...prevData.items ] } : prevData;
if (!shouldAddToList || prevData.items.some((block => block.height === payload.block.height))) {
return prevData;
}
const newItems = [ payload.block, ...prevData.items ].sort((b1, b2) => b2.height - b1.height);
return { ...prevData, items: newItems };
}); });
}, [ queryClient, type ]); }, [ queryClient, type ]);
......
...@@ -32,7 +32,11 @@ const LatestBlocks = () => { ...@@ -32,7 +32,11 @@ const LatestBlocks = () => {
const newData = prevData ? [ ...prevData ] : []; const newData = prevData ? [ ...prevData ] : [];
return [ payload.block, ...newData ].slice(0, blocksMaxCount); if (newData.some((block => block.height === payload.block.height))) {
return newData;
}
return [ payload.block, ...newData ].sort((b1, b2) => b2.height - b1.height).slice(0, blocksMaxCount);
}); });
}, [ queryClient, blocksMaxCount ]); }, [ queryClient, blocksMaxCount ]);
......
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