Merge pull request #1808 from CityOfZion/feature/fixes-minor-bugs-in-…

…release chore: fixes minor bugs in release
CityOfZion · Feb 27, 2019 · 82c883c · 82c883c
2 parents 2fe174e + c73495e
commit 82c883c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/__tests__/components/__snapshots__/TransactionHistoryPanel.test.js.snap b/__tests__/components/__snapshots__/TransactionHistoryPanel.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`TransactionHistoryPanel renders without crashing 1`] = `
-<withData(Connect(withData(withProps(Connect(withActions(Connect(withProgress(withProgressComponents(Connect(withActions(Connect(withCall(Connect(withData(Connect(withProgress(withProps(Connect(withData(TransactionHistory))))))))))))))))))))
+<withData(Connect(withData(withProps(Connect(withActions(Connect(withProgress(withProgressComponents(Connect(withActions(Connect(withActions(Connect(withCall(Connect(withData(Connect(withProgress(withProps(Connect(withData(TransactionHistory))))))))))))))))))))))
   address="AWy7RNBVr9vDadRMK9p7i7Z1tL7GrLAxoh"
   dispatch={[Function]}
   store={

diff --git a/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx b/app/components/TransactionHistory/TransactionHistoryPanel/TransactionHistoryPanel.jsx
@@ -11,7 +11,8 @@ import styles from './TransactionHistoryPanel.scss'
 type Props = {
   className: ?string,
   transactions: Array<Object>,
-  handleFetchAdditionalTxData: () => any,
+  handleFetchAdditionalTxData: () => void,
+  handleGetPendingTransactionInfo: () => void,
   pendingTransactions: Array<Object>,
   address: string,
 }
@@ -51,12 +52,18 @@ export default class TransactionHistory extends React.Component<Props> {
   }
 
   async pruneReturnedTransactionsFromStorage() {
-    const { transactions, pendingTransactions, address } = this.props
-    const toBePurged = intersectionBy(transactions, pendingTransactions, 'txId')
+    const {
+      transactions,
+      pendingTransactions,
+      address,
+      handleGetPendingTransactionInfo,
+    } = this.props
+    const toBePurged = intersectionBy(transactions, pendingTransactions, 'txid')
     // eslint-disable-next-line
     for (const transaction of toBePurged) {
       // eslint-disable-next-line
       await pruneConfirmedOrStaleTransaction(address, transaction.txid)
+      handleGetPendingTransactionInfo()
     }
   }
 

diff --git a/app/components/TransactionHistory/TransactionHistoryPanel/index.js b/app/components/TransactionHistory/TransactionHistoryPanel/index.js
@@ -14,15 +14,23 @@ const mapTransactionsDataToProps = transactions => ({
   transactions,
 })
 
-const mapAccountActionsToProps = (actions, props) => ({
+const mapAccountActionsToProps = (actions, { net, address }) => ({
   handleFetchAdditionalTxData: () =>
     actions.call({
-      net: props.net,
-      address: props.address,
+      net,
+      address,
       shouldIncrementPagination: true,
     }),
 })
 
+const mapPendingTransactionActionsToProps = (actions, { net, address }) => ({
+  handleGetPendingTransactionInfo: () =>
+    actions.call({
+      net,
+      address,
+    }),
+})
+
 const mapPendingTransactionInfoToProps = pendingTransactions => ({
   pendingTransactions: pendingTransactions || [],
 })
@@ -34,6 +42,7 @@ export default compose(
     title: 'Transaction History',
   }),
   withActions(transactionHistoryActions, mapAccountActionsToProps),
+  withActions(getPendingTransactionInfo, mapPendingTransactionActionsToProps),
   withCall(getPendingTransactionInfo),
   withData(getPendingTransactionInfo, mapPendingTransactionInfoToProps),
   withLoadingProp(transactionHistoryActions),