Group transactions by nonce (#5886)

2 files changed, 216 insertions, 23 deletions

diff --git a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.component.test.js b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.component.test.js
index 8687dbbc7..a2946e53d 100644
--- a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.component.test.js
+++ b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.component.test.js
@@ -2,34 +2,100 @@ import React from 'react'
 import assert from 'assert'
 import { shallow } from 'enzyme'
 import TransactionActivityLog from '../transaction-activity-log.component'
-import Card from '../../card'
 
 describe('TransactionActivityLog Component', () => {
   it('should render properly', () => {
-    const transaction = {
-      history: [],
-      id: 1,
-      status: 'confirmed',
-      txParams: {
-        from: '0x1',
-        gas: '0x5208',
-        gasPrice: '0x3b9aca00',
-        nonce: '0xa4',
-        to: '0x2',
+    const activities = [
+      {
+        eventKey: 'transactionCreated',
+        hash: '0xe46c7f9b39af2fbf1c53e66f72f80343ab54c2c6dba902d51fb98ada08fe1a63',
+        id: 2005383477493174,
+        timestamp: 1543957986150,
         value: '0x2386f26fc10000',
+      }, {
+        eventKey: 'transactionSubmitted',
+        hash: '0xe46c7f9b39af2fbf1c53e66f72f80343ab54c2c6dba902d51fb98ada08fe1a63',
+        id: 2005383477493174,
+        timestamp: 1543957987853,
+        value: '0x1319718a5000',
+      }, {
+        eventKey: 'transactionResubmitted',
+        hash: '0x7d09d337fc6f5d6fe2dbf3a6988d69532deb0a82b665f9180b5a20db377eea87',
+        id: 2005383477493175,
+        timestamp: 1543957991563,
+        value: '0x1502634b5800',
+      }, {
+        eventKey: 'transactionConfirmed',
+        hash: '0x7d09d337fc6f5d6fe2dbf3a6988d69532deb0a82b665f9180b5a20db377eea87',
+        id: 2005383477493175,
+        timestamp: 1543958029960,
+        value: '0x1502634b5800',
       },
-    }
+    ]
 
     const wrapper = shallow(
       <TransactionActivityLog
-        transaction={transaction}
+        activities={activities}
         className="test-class"
+        inlineRetryIndex={-1}
+        inlineCancelIndex={-1}
+        nativeCurrency="ETH"
+        onCancel={() => {}}
+        onRetry={() => {}}
+        primaryTransactionStatus="confirmed"
       />,
       { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } }
     )
 
     assert.ok(wrapper.hasClass('transaction-activity-log'))
     assert.ok(wrapper.hasClass('test-class'))
-    assert.equal(wrapper.find(Card).length, 1)
+  })
+
+  it('should render inline retry and cancel buttons', () => {
+    const activities = [
+      {
+        eventKey: 'transactionCreated',
+        hash: '0xa',
+        id: 1,
+        timestamp: 1,
+        value: '0x1',
+      }, {
+        eventKey: 'transactionSubmitted',
+        hash: '0xa',
+        id: 1,
+        timestamp: 2,
+        value: '0x1',
+      }, {
+        eventKey: 'transactionResubmitted',
+        hash: '0x7d09d337fc6f5d6fe2dbf3a6988d69532deb0a82b665f9180b5a20db377eea87',
+        id: 2,
+        timestamp: 3,
+        value: '0x1',
+      }, {
+        eventKey: 'transactionCancelAttempted',
+        hash: '0x7d09d337fc6f5d6fe2dbf3a6988d69532deb0a82b665f9180b5a20db377eea87',
+        id: 3,
+        timestamp: 4,
+        value: '0x1',
+      },
+    ]
+
+    const wrapper = shallow(
+      <TransactionActivityLog
+        activities={activities}
+        className="test-class"
+        inlineRetryIndex={2}
+        inlineCancelIndex={3}
+        nativeCurrency="ETH"
+        onCancel={() => {}}
+        onRetry={() => {}}
+        primaryTransactionStatus="pending"
+      />,
+      { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } }
+    )
+
+    assert.ok(wrapper.hasClass('transaction-activity-log'))
+    assert.ok(wrapper.hasClass('test-class'))
+    assert.equal(wrapper.find('.transaction-activity-log__action-link').length, 2)
   })
 })
diff --git a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
index 586500408..d014b8886 100644
--- a/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
+++ b/ui/app/components/transaction-activity-log/tests/transaction-activity-log.util.test.js
@@ -1,5 +1,130 @@
 import assert from 'assert'
-import { getActivities } from '../transaction-activity-log.util'
+import { combineTransactionHistories, getActivities } from '../transaction-activity-log.util'
+
+describe('combineTransactionHistories', () => {
+  it('should return no activites for an empty list of transactions', () => {
+    assert.deepEqual(combineTransactionHistories([]), [])
+  })
+
+  it('should return activities for an array of transactions', () => {
+    const transactions = [
+      {
+        estimatedGas: '0x5208',
+        hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3',
+        history: [
+          {
+            'id': 6400627574331058,
+            'time': 1543958845581,
+            'status': 'unapproved',
+            'metamaskNetworkId': '3',
+            'loadingDefaults': true,
+            'txParams': {
+              'from': '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706',
+              'to': '0xc5ae6383e126f901dcb06131d97a88745bfa88d6',
+              'value': '0x2386f26fc10000',
+              'gas': '0x5208',
+              'gasPrice': '0x3b9aca00',
+            },
+            'type': 'standard',
+          },
+          [{ 'op': 'replace', 'path': '/status', 'value': 'approved', 'note': 'txStateManager: setting status to approved', 'timestamp': 1543958847813 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'submitted', 'note': 'txStateManager: setting status to submitted', 'timestamp': 1543958848147 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'dropped', 'note': 'txStateManager: setting status to dropped', 'timestamp': 1543958897181 }, { 'op': 'add', 'path': '/replacedBy', 'value': '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33' }],
+        ],
+        id: 6400627574331058,
+        loadingDefaults: false,
+        metamaskNetworkId: '3',
+        status: 'dropped',
+        submittedTime: 1543958848135,
+        time: 1543958845581,
+        txParams: {
+          from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706',
+          gas: '0x5208',
+          gasPrice: '0x3b9aca00',
+          nonce: '0x32',
+          to: '0xc5ae6383e126f901dcb06131d97a88745bfa88d6',
+          value: '0x2386f26fc10000',
+        },
+        type: 'standard',
+      }, {
+        hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33',
+        history: [
+          {
+            'id': 6400627574331060,
+            'time': 1543958857697,
+            'status': 'unapproved',
+            'metamaskNetworkId': '3',
+            'loadingDefaults': false,
+            'txParams': {
+              'from': '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706',
+              'to': '0xc5ae6383e126f901dcb06131d97a88745bfa88d6',
+              'value': '0x2386f26fc10000',
+              'gas': '0x5208',
+              'gasPrice': '0x3b9aca00',
+              'nonce': '0x32',
+            },
+            'lastGasPrice': '0x4190ab00',
+            'type': 'retry',
+          },
+          [{ 'op': 'replace', 'path': '/txParams/gasPrice', 'value': '0x481f2280', 'note': 'confTx: user approved transaction', 'timestamp': 1543958859470 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'approved', 'note': 'txStateManager: setting status to approved', 'timestamp': 1543958859485 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'signed', 'note': 'transactions#publishTransaction', 'timestamp': 1543958859889 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'submitted', 'note': 'txStateManager: setting status to submitted', 'timestamp': 1543958860061 }], [{ 'op': 'add', 'path': '/firstRetryBlockNumber', 'value': '0x45a0fd', 'note': 'transactions/pending-tx-tracker#event: tx:block-update', 'timestamp': 1543958896466 }],
+          [{ 'op': 'replace', 'path': '/status', 'value': 'confirmed', 'timestamp': 1543958897165 }],
+        ],
+        id: 6400627574331060,
+        lastGasPrice: '0x4190ab00',
+        loadingDefaults: false,
+        metamaskNetworkId: '3',
+        status: 'confirmed',
+        submittedTime: 1543958860054,
+        time: 1543958857697,
+        txParams: {
+          from: '0x50a9d56c2b8ba9a5c7f2c08c3d26e0499f23a706',
+          gas: '0x5208',
+          gasPrice: '0x481f2280',
+          nonce: '0x32',
+          to: '0xc5ae6383e126f901dcb06131d97a88745bfa88d6',
+          value: '0x2386f26fc10000',
+        },
+        txReceipt: {
+          status: '0x1',
+        },
+        type: 'retry',
+      },
+    ]
+
+    const expected = [
+      {
+        id: 6400627574331058,
+        hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3',
+        eventKey: 'transactionCreated',
+        timestamp: 1543958845581,
+        value: '0x2386f26fc10000',
+      }, {
+        id: 6400627574331058,
+        hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3',
+        eventKey: 'transactionSubmitted',
+        timestamp: 1543958848147,
+        value: '0x1319718a5000',
+      }, {
+        id: 6400627574331060,
+        hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33',
+        eventKey: 'transactionResubmitted',
+        timestamp: 1543958860061,
+        value: '0x171c3a061400',
+      }, {
+        id: 6400627574331060,
+        hash: '0xecbe181ee67c4291d04a7cb9ffbf1d5d831e4fbaa89994fd06bab5dd4cc79b33',
+        eventKey: 'transactionConfirmed',
+        timestamp: 1543958897165,
+        value: '0x171c3a061400',
+      },
+    ]
+
+    assert.deepEqual(combineTransactionHistories(transactions), expected)
+  })
+})
 
 describe('getActivities', () => {
   it('should return no activities for an empty history', () => {
@@ -178,6 +303,7 @@ describe('getActivities', () => {
         to: '0x2',
         value: '0x2386f26fc10000',
       },
+      hash: '0xabc',
     }
 
     const expectedResult = [
@@ -185,24 +311,25 @@ describe('getActivities', () => {
         'eventKey': 'transactionCreated',
         'timestamp': 1535507561452,
         'value': '0x2386f26fc10000',
-      },
-      {
-        'eventKey': 'transactionUpdatedGas',
-        'timestamp': 1535664571504,
-        'value': '0x77359400',
+        'id': 1,
+        'hash': '0xabc',
       },
       {
         'eventKey': 'transactionSubmitted',
         'timestamp': 1535507564665,
-        'value': undefined,
+        'value': '0x2632e314a000',
+        'id': 1,
+        'hash': '0xabc',
       },
       {
         'eventKey': 'transactionConfirmed',
         'timestamp': 1535507615993,
-        'value': undefined,
+        'value': '0x2632e314a000',
+        'id': 1,
+        'hash': '0xabc',
       },
     ]
 
-    assert.deepEqual(getActivities(transaction), expectedResult)
+    assert.deepEqual(getActivities(transaction, true), expectedResult)
   })
 })