Merge branch 'redux' into 'tx-history-improvements'

react/src/components/dashboard/walletsData/walletsData.js

@@ -26,6 +26,7 @@ import {
   AddressRender,
   AddressItemRender,
   TxTypeRender,
+  TxAmountRender,
   TxHistoryListRender,
   AddressListRender,
   WalletsDataRender
@@ -113,7 +114,7 @@ class WalletsData extends React.Component {
         id: 'amount',
         Header: translate('INDEX.AMOUNT'),
         Footer: translate('INDEX.AMOUNT'),
-        accessor: (tx) => tx.amount || translate('DASHBOARD.UNKNOWN')
+        accessor: (tx) => TxAmountRender.call(this, tx)
       },
       {
         id: 'timestamp',

react/src/components/dashboard/walletsData/walletsData.render.js

@@ -132,6 +132,18 @@ export const TxTypeRender = function(category) {
   }
 };
 
+export const TxAmountRender = function (tx) {
+  if (Config.roundValues) {
+    return (
+      <td title={ tx.amount }>{ formatValue('round', tx.amount, -6) || translate('DASHBOARD.UNKNOWN') }</td>
+    );
+  }
+
+  return (
+    <td>{ tx.amount || translate('DASHBOARD.UNKNOWN') }</td>
+  );
+};
+
 export const TxHistoryListRender = function() {
   return (
     <ReactTable