Integrate Add Token

2 files changed, 10 insertions, 6 deletions

diff --git a/ui/app/components/token-balance.js b/ui/app/components/token-balance.js
index 3a923eb9d..0342c1da9 100644
--- a/ui/app/components/token-balance.js
+++ b/ui/app/components/token-balance.js
@@ -17,7 +17,8 @@ module.exports = connect(mapStateToProps)(TokenBalance)
 inherits(TokenBalance, Component)
 function TokenBalance () {
   this.state = {
-    balance: '',
+    string: '',
+    symbol: '',
     isLoading: true,
     error: null,
   }
@@ -26,11 +27,14 @@ function TokenBalance () {
 
 TokenBalance.prototype.render = function () {
   const state = this.state
-  const { balance, isLoading } = state
+  const { symbol, string, balanceOnly, isLoading } = state
 
   return isLoading
     ? h('span', '')
-    : h('span', balance)
+    : h('span.token-balance', [
+      h('span.token-balance__amount', string),
+      !balanceOnly && h('span.token-balance__symbol', symbol),
+    ])
 }
 
 TokenBalance.prototype.componentDidMount = function () {
@@ -93,10 +97,10 @@ TokenBalance.prototype.componentDidUpdate = function (nextProps) {
 
 TokenBalance.prototype.updateBalance = function (tokens = []) {
   const [{ string, symbol }] = tokens
-  const { balanceOnly } = this.props
 
   this.setState({
-    balance: balanceOnly ? string : `${string} ${symbol}`,
+    string,
+    symbol,
     isLoading: false,
   })
 }
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 7a147e942..f817d03a9 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -77,7 +77,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
   const { showConfTxPage } = this.props
 
   const opts = {
-    key: transActionId,
+    key: transActionId || transactionHash,
     txParams: transaction.txParams,
     transactionStatus,
     transActionId,