update variables

app/actions/transactionHistoryActions.js

@@ -221,11 +221,6 @@ export default createActions(
       const network = net === 'MainNet' ? 'mainnet' : 'testnet'
       const data = await NeoRest.addressTXFull(address, page, network)
       parsedEntries = await computeN3Activity(data, address, net)
-      // check to see if there is another page
-      const nextPage = page + 1
-      const testData = await NeoRest.addressTXFull(address, nextPage, network)
-      const testCount = testData.totalCount
-      if (typeof testCount !== 'undefined') count = true
     } else {
       const network = net === 'MainNet' ? 'mainnet' : 'testnet'
       const data = await NeoLegacyREST.getAddressAbstracts(
@@ -237,21 +232,23 @@ export default createActions(
       parsedEntries = await parseAbstractData(data.entries, address, net)
     }
     page += 1
+
+    // check to see if there is another page
+    let nextPage = true
+    const network = net === 'MainNet' ? 'mainnet' : 'testnet'
+    const testData = await NeoRest.addressTXFull(address, page, network)
+    const testCount = testData.totalCount
+    if (typeof testCount === 'undefined') nextPage = false
+
     if (shouldIncrementPagination) {
       if (page === 1) entries = []
       entries.push(...parsedEntries)
       // handle the option to load more transactions for neo3
-      // eslint-disable-next-line
-      if (count == true) count = entries.length + 1
-      // eslint-disable-next-line
-      if (count == false) count = entries.length
+      if (chain === 'neo3' && nextPage === false) count = entries.length
       return { entries, count }
     }
     entries = [...parsedEntries]
-    // eslint-disable-next-line
-    if (count == true) count = entries.length + 1
-    // eslint-disable-next-line
-    if (count == false) count = entries.length
+    if (chain === 'neo3' && nextPage === false) count = entries.length
     return { entries, count }
   },
 )