Updated wallets

entaxy-project · Jul 3, 2019 · e29508e · e29508e
1 parent 364ce87
commit e29508e
Show file tree

Hide file tree

Showing 12 changed files with 213 additions and 250 deletions.
diff --git a/src/common/TableToolbar/__tests__/__snapshots__/index.test.jsx.snap b/src/common/TableToolbar/__tests__/__snapshots__/index.test.jsx.snap
@@ -38,7 +38,7 @@ exports[`TableToolbar matches snapshot with some selected items 1`] = `
       className="MuiTypography-root-10 MuiTypography-subtitle1-28 MuiTypography-colorInherit-39"
     >
       1
-      selected
+       selected
     </h6>
   </div>
   <div

diff --git a/src/common/TableToolbar/index.jsx b/src/common/TableToolbar/index.jsx
@@ -43,7 +43,7 @@ const TableToolbar = ({
       {selectedItems.length > 0 ? (
         <Typography color="inherit" variant="subtitle1">
           {selectedItems.length}
-          selected
+          &nbsp;selected
         </Typography>
       ) : (
         <div>

diff --git a/src/core/Accounts/ImportTransactions/__tests__/__snapshots__/ResultsToolbar.test.jsx.snap b/src/core/Accounts/ImportTransactions/__tests__/__snapshots__/ResultsToolbar.test.jsx.snap
@@ -90,7 +90,7 @@ exports[`ResultsToolbar matches snapshot with some selected transactions 1`] = `
       className="MuiTypography-root-10 MuiTypography-subtitle1-28 MuiTypography-colorInherit-39"
     >
       2
-      selected
+       selected
     </h6>
   </div>
   <div

diff --git a/src/core/Accounts/Transactions/TransactionsTable.jsx b/src/core/Accounts/Transactions/TransactionsTable.jsx
@@ -168,22 +168,22 @@ export class TransactionsTableComponent extends React.Component {
     })
   }
 
-  displayCurrency = ({ amount, nativeAmount }) => {
+  displayCurrency = ({ amount }) => {
     const {
-      classes,
-      account,
-      formatCurrency,
+      // classes,
+      // account,
+      // formatCurrency,
       formatDecimal
     } = this.props
-    if (account.type === 'wallet') {
-      return (
-        <div>
-          {formatDecimal(amount)}
-          {account.symbol}
-          <small className={classes.nativeAmount}>{formatCurrency(nativeAmount)}</small>
-        </div>
-      )
-    }
+    // if (account.type === 'wallet') {
+    //   return (
+    //     <div>
+    //       {formatDecimal(amount)}
+    //       {account.symbol}
+    //       <small className={classes.nativeAmount}>{formatCurrency(nativeAmount)}</small>
+    //     </div>
+    //   )
+    // }
     return formatDecimal(amount)
   }
 

diff --git a/src/core/Accounts/Transactions/__tests__/__snapshots__/TransactionsToolbar.test.jsx.snap b/src/core/Accounts/Transactions/__tests__/__snapshots__/TransactionsToolbar.test.jsx.snap
@@ -163,7 +163,7 @@ exports[`TransactionsToolbar matches snapshot with some selected transactions 1`
       className="MuiTypography-root-10 MuiTypography-subtitle1-28 MuiTypography-colorInherit-39"
     >
       2
-      selected
+       selected
     </h6>
   </div>
   <div