fixes tx export bug and bumps version in package.json

CityOfZion · Apr 19, 2019 · 5ce13e6 · 5ce13e6
1 parent ed0d046
commit 5ce13e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/containers/TransactionHistory/TransactionHistory.jsx b/app/containers/TransactionHistory/TransactionHistory.jsx
@@ -69,14 +69,22 @@ export default class TransactionHistory extends Component<Props, State> {
     const endpoint = api.neoscan.getAPIEndpoint(net)
     let numberOfPages = 1
     let currentPage = 1
+    let shouldFetchAdditionalPages = true
 
-    while (currentPage !== numberOfPages || currentPage === 1) {
+    while (
+      (currentPage - 1 !== numberOfPages || currentPage === 1) &&
+      shouldFetchAdditionalPages
+    ) {
       const { data } = await axios.get(
         `${endpoint}/v1/get_address_abstracts/${address}/${currentPage}`,
       )
       abstracts.push(...data.entries)
       numberOfPages = data.total_pages
       currentPage += 1
+
+      if (data.total_pages === 1 || data.total_pages === 0) {
+        shouldFetchAdditionalPages = false
+      }
     }
 
     const parsedAbstracts = await parseAbstractData(abstracts, address, net)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Neon",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": "./main.js",
   "description": "Light wallet for NEO blockchain",
   "homepage": "https://github.com/CityOfZion/neon-wallet",