From ad01dac3bb8b836a0f82d5bc99626189bae4b72d Mon Sep 17 00:00:00 2001
From: jseagrave21 <jseagrave.navy@gmail.com>
Date: Wed, 31 Jan 2024 07:43:54 -0500
Subject: [PATCH] merge from dev

---
 app/actions/transactionHistoryActions.js             | 12 +++++++++++-
 .../TransactionHistoryPanel.jsx                      |  6 +-----
 yarn.lock                                            |  5 -----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/actions/transactionHistoryActions.js b/app/actions/transactionHistoryActions.js
index 37786973d..275610b8a 100644
--- a/app/actions/transactionHistoryActions.js
+++ b/app/actions/transactionHistoryActions.js
@@ -220,7 +220,6 @@ export default createActions(
     if (chain === 'neo3') {
       const network = net === 'MainNet' ? 'mainnet' : 'testnet'
       const data = await NeoRest.addressTXFull(address, page, network)
-      count = data.totalCount
       parsedEntries = await computeN3Activity(data, address, net)
     } else {
       const network = net === 'MainNet' ? 'mainnet' : 'testnet'
@@ -233,12 +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
+      if (chain === 'neo3' && nextPage === false) count = entries.length
       return { entries, count }
     }
     entries = [...parsedEntries]
+    if (chain === 'neo3' && nextPage === false) count = entries.length
     return { entries, count }
   },
 )
diff --git a/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx b/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx
index 31e96a535..8cb4a2fc3 100644
--- a/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx
+++ b/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx
@@ -60,15 +60,11 @@ export default class TransactionHistory extends React.Component<Props> {
           <Center
             width="300px"
             margin="auto"
-            paddingTop="12px"
+            paddingTop="36px"
             paddingBottom="12px"
             display="flex"
             flexDirection="column"
           >
-            <Box fontSize="14px" opacity={0.5} marginBottom="12px">
-              Displaying {transactions.length} of {count} transactions
-            </Box>
-
             <Button
               onClick={handleFetchAdditionalTxData}
               primary
diff --git a/yarn.lock b/yarn.lock
index 28256ba07..630072c8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7538,11 +7538,6 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv@16.3.1:
-  version "16.3.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
-  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
-
 dotenv@^8.1.0, dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"