From a2fea201ac89da15d9121f9740ecc3233457ee7b Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 17 May 2018 15:51:43 +0200
Subject: [PATCH] Fix block sorting when numbers change (#53)

* Fix block sorting when numbers change

* Formatting

* Update @polkadot/dev (bn.js type fix)
---
 package.json                              |  2 +-
 packages/app-explorer/src/BlockHeaders.js |  9 +++++++--
 packages/apps/package.json                |  1 -
 yarn.lock                                 | 14 +++++++-------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index bd4fe35c2f..f37e38847f 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "test": "echo 'no tests executed'"
   },
   "devDependencies": {
-    "@polkadot/dev-react": "^0.19.9",
+    "@polkadot/dev-react": "^0.19.10",
     "gh-pages": "^1.1.0"
   }
 }
diff --git a/packages/app-explorer/src/BlockHeaders.js b/packages/app-explorer/src/BlockHeaders.js
index 820ac5a2d1..68e630321d 100644
--- a/packages/app-explorer/src/BlockHeaders.js
+++ b/packages/app-explorer/src/BlockHeaders.js
@@ -25,12 +25,17 @@ const apiOptions = {
     }
 
     blockHeaders = blockHeaders
-      .filter((header, index) => index < 9)
+      .filter((old, index) =>
+        index < 9 && old.number.lt(header.number)
+      )
       .reduce((next, header) => {
         next.push(header);
 
         return next;
-      }, [header]);
+      }, [header])
+      .sort((a, b) =>
+        b.number.cmp(a.number)
+      );
 
     return blockHeaders;
   }
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 4c37a7f23d..a692f843af 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -25,7 +25,6 @@
     "@polkadot/ui-app": "^0.6.1"
   },
   "devDependencies": {
-    "@polkadot/dev-react": "^0.19.9",
     "babel-loader": "^8.0.0-beta.2",
     "copy-webpack-plugin": "^4.5.1",
     "css-loader": "^0.28.9",
diff --git a/yarn.lock b/yarn.lock
index 521f2d1f1f..6088283977 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -766,13 +766,13 @@
     "@polkadot/api-provider" "^0.11.3"
     "@polkadot/util" "^0.20.5"
 
-"@polkadot/dev-react@^0.19.9":
-  version "0.19.9"
-  resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.19.9.tgz#57c999b774452d62ec9fabe065d29246f0fb3f21"
+"@polkadot/dev-react@^0.19.10":
+  version "0.19.10"
+  resolved "https://registry.yarnpkg.com/@polkadot/dev-react/-/dev-react-0.19.10.tgz#4f4a4ccbfe1aedd38fee94f77534b1ac554fb761"
   dependencies:
     "@babel/core" "^7.0.0-beta.47"
     "@babel/preset-react" "^7.0.0-beta.47"
-    "@polkadot/dev" "^0.19.9"
+    "@polkadot/dev" "^0.19.10"
     browserslist "^3.2.7"
     eslint "^4.19.1"
     eslint-config-standard-jsx "^5.0.0"
@@ -785,9 +785,9 @@
     webpack-cli "^2.1.3"
     webpack-serve "^1.0.2"
 
-"@polkadot/dev@^0.19.9":
-  version "0.19.9"
-  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.19.9.tgz#cc37c7364e010d96f45132d0069eda32f52e8462"
+"@polkadot/dev@^0.19.10":
+  version "0.19.10"
+  resolved "https://registry.yarnpkg.com/@polkadot/dev/-/dev-0.19.10.tgz#ccfbfb8632371876456a8e3e89ff26f10b27ba26"
   dependencies:
     "@babel/cli" "^7.0.0-beta.47"
     "@babel/core" "^7.0.0-beta.47"