Fix integration tests

4 files changed, 10 insertions, 4 deletions

diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index 4334aacba..b87bf959e 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -35,12 +35,13 @@ function ShiftListItem () {
 }
 
 ShiftListItem.prototype.render = function () {
-  return h('div.tx-list-item.tx-list-clickable', {
+  return h('div.transaction-list-item.tx-list-clickable', {
     style: {
       paddingTop: '20px',
       paddingBottom: '20px',
       justifyContent: 'space-around',
       alignItems: 'center',
+      flexDirection: 'row',
     },
   }, [
     h('div', {
diff --git a/ui/app/components/transaction-list-item/transaction-list-item.component.js b/ui/app/components/transaction-list-item/transaction-list-item.component.js
index d4b1bec94..6e1abd0e4 100644
--- a/ui/app/components/transaction-list-item/transaction-list-item.component.js
+++ b/ui/app/components/transaction-list-item/transaction-list-item.component.js
@@ -67,7 +67,10 @@ export default class TransactionListItem extends PureComponent {
     const { txParams = {} } = transaction
     const nonce = hexToDecimal(txParams.nonce)
 
-    const nonceAndDateText = `#${nonce} - ${formatDate(transaction.time)}`
+    const nonceAndDateText = nonce
+      ? `#${nonce} - ${formatDate(transaction.time)}`
+      : formatDate(transaction.time)
+
     const fiatDisplayText = `-${fiatDisplayValue}`
     const ethDisplayText = ethTransactionAmount && `-${ethTransactionAmount} ETH`
 
diff --git a/ui/app/components/transaction-list/transaction-list.container.js b/ui/app/components/transaction-list/transaction-list.container.js
index 5a63d916d..e1d19e787 100644
--- a/ui/app/components/transaction-list/transaction-list.container.js
+++ b/ui/app/components/transaction-list/transaction-list.container.js
@@ -4,6 +4,7 @@ import { compose } from 'recompose'
 import TransactionList from './transaction-list.component'
 import {
   pendingTransactionsSelector,
+  submittedPendingTransactionsSelector,
   completedTransactionsSelector,
 } from '../../selectors/transactions'
 import { selectedTokenSelector } from '../../selectors/tokens'
@@ -11,11 +12,12 @@ import { getLatestSubmittedTxWithEarliestNonce } from '../../helpers/transaction
 
 const mapStateToProps = state => {
   const pendingTransactions = pendingTransactionsSelector(state)
+  const submittedPendingTransactions = submittedPendingTransactionsSelector(state)
 
   return {
     completedTransactions: completedTransactionsSelector(state),
     pendingTransactions,
-    transactionToRetry: getLatestSubmittedTxWithEarliestNonce(pendingTransactions),
+    transactionToRetry: getLatestSubmittedTxWithEarliestNonce(submittedPendingTransactions),
     selectedToken: selectedTokenSelector(state),
   }
 }
diff --git a/ui/app/components/transaction-status/index.scss b/ui/app/components/transaction-status/index.scss
index 95d29f6d3..35be550f7 100644
--- a/ui/app/components/transaction-status/index.scss
+++ b/ui/app/components/transaction-status/index.scss
@@ -21,7 +21,7 @@
     color: #609a1c;
   }
 
-  &--approved {
+  &--approved, &--submitted {
     background-color: #FFF2DB;
     color: #CA810A;
   }