From ef95c3e50715082c39aa9da4f63d8657ea929f41 Mon Sep 17 00:00:00 2001 From: maciejhirsz Date: Sat, 21 Jul 2018 08:25:27 +0200 Subject: [PATCH] Fix node sorting --- packages/frontend/src/components/Chain.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/frontend/src/components/Chain.tsx b/packages/frontend/src/components/Chain.tsx index 9a44b00..be6a7f9 100644 --- a/packages/frontend/src/components/Chain.tsx +++ b/packages/frontend/src/components/Chain.tsx @@ -32,16 +32,16 @@ export namespace Chain { } function sortNodes(a: Node.Props, b: Node.Props): number { - const aPropagation = a.blockDetails[4] == null ? Infinity : a.blockDetails[4] as number; - const bPropagation = b.blockDetails[4] == null ? Infinity : b.blockDetails[4] as number; + if (a.blockDetails[0] === b.blockDetails[0]) { + const aPropagation = a.blockDetails[4] == null ? Infinity : a.blockDetails[4] as number; + const bPropagation = b.blockDetails[4] == null ? Infinity : b.blockDetails[4] as number; - if (aPropagation === Infinity && bPropagation === Infinity) { - // Descending sort by block number - return b.blockDetails[0] - a.blockDetails[0]; + // Ascending sort by propagation time + return aPropagation - bPropagation; } - // Ascending sort by propagation time - return aPropagation - bPropagation; + // Descending sort by block number + return b.blockDetails[0] - a.blockDetails[0]; } export class Chain extends React.Component {