Don't allow older transactions to hijack transactions.latest (#250)

* Moving transaction and locks to top level of store * Updating tests * Don't allow older transactions to hijack transactions.latest
unlock-protocol · Sep 19, 2018 · 73e8aaf · 73e8aaf
1 parent c179410
commit 73e8aaf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/...ests__/reducers/transactionReduce.test.js → ...sts__/reducers/transactionReducer.test.js b/...ests__/reducers/transactionReduce.test.js → ...sts__/reducers/transactionReducer.test.js
@@ -75,7 +75,7 @@ describe('transaction reducer', () => {
         latest: transaction,
       }
 
-      let updatedTransaction = Object.assign({}, transaction)
+      const updatedTransaction = Object.assign({}, transaction)
       updatedTransaction.status = 'mined'
       updatedTransaction.createdAt = transaction.createdAt + 100
 
@@ -86,6 +86,31 @@ describe('transaction reducer', () => {
 
       expect(transactionsResponse.latest.status).toEqual('pending')
     })
+
+    it('should not update latest transaction if new transaction was created earlier', () => {
+      const transaction = {
+        status: 'pending',
+        confirmations: 0,
+        createdAt: new Date().getTime(),
+      }
+
+      const transactions = {
+        all: {},
+        lastUpdated: 0,
+        latest: transaction,
+      }
+
+      const updatedTransaction = Object.assign({}, transaction)
+      updatedTransaction.status = 'mined'
+      updatedTransaction.createdAt = transaction.createdAt - 100
+
+      let transactionsResponse = reducer(transactions, {
+        type: UPDATE_TRANSACTION,
+        transaction: updatedTransaction,
+      })
+
+      expect(transactionsResponse.latest.status).toEqual('pending')
+    })
   })
 
 })
diff --git a/unlock-app/src/reducers/transactionReducer.js b/unlock-app/src/reducers/transactionReducer.js
@@ -11,15 +11,17 @@ const transactionReducer = (transactions = initialState, action) => {
 
   if (action.type === SET_TRANSACTION) {
     if (action.transaction) {
-      newTransactions.latest = Object.assign({}, action.transaction)
+      if (!newTransactions.latest || newTransactions.latest.createdAt >= action.transaction.createdAt)
+        newTransactions.latest = Object.assign({}, action.transaction)
       if (action.transaction.hash) newTransactions.all[action.transaction.hash] = Object.assign({}, action.transaction)
     } else {
       newTransactions.latest = null // Unset the latest transaction if SET_TRANSACTION was called with no transaction
     }
   }
   if (action.transaction) {
-    if  (action.type === UPDATE_TRANSACTION && action.transaction.createdAt === transactions.latest.createdAt) {
-      newTransactions.latest = Object.assign({}, action.transaction)
+    if (action.type === UPDATE_TRANSACTION && action.transaction.createdAt === transactions.latest.createdAt) {
+      if (!newTransactions.latest || newTransactions.latest.createdAt >= action.transaction.createdAt)
+        newTransactions.latest = Object.assign({}, action.transaction)
       if (action.transaction.hash) newTransactions.all[action.transaction.hash] = Object.assign({}, action.transaction)
     }
   }