Merge pull request #1736 from LiskHQ/1705-replace-old-wallet-with-new…

…-wallet

Replace old wallet with new wallet - Closes #1705

src/components/dashboard/index.js

@@ -116,7 +116,7 @@ class Dashboard extends React.Component {
                   dashboard: true,
                   history,
                   loading,
-                  onClick: props => history.push(`${routes.wallet.path}?id=${props.value.id}`),
+                  onClick: props => history.push(`${routes.transactions.pathPrefix}${routes.transactions.path}/${props.value.id}`),
                   showMore: this.state.showMore,
                   isBarEnabledTransactions,
                   t,

src/components/singleTransaction/index.js

@@ -33,17 +33,19 @@ class SingleTransaction extends React.Component {
       { this.props.transaction.id && !this.props.transaction.error ?
         <Fragment>
           <header>
-            <h2>
+            <h2 className={'tx-header'}>
               <TransactionType
                 {...this.props.transaction}
                 address={this.props.transaction.senderId}
                 showTransaction />
             </h2>
-            <CopyToClipboard
-              value={this.props.match.params.id}
-              text={this.props.match.params.id}
-              className={`${styles.copyLabel} transaction-id`}
-              copyClassName={`${styles.copyIcon}`} />
+            <span className={'tx-id'}>
+              <CopyToClipboard
+                value={this.props.match.params.id}
+                text={this.props.match.params.id}
+                className={`${styles.copyLabel} transaction-id`}
+                copyClassName={`${styles.copyIcon}`} />
+            </span>
           </header>
           <div className={styles.content}>
             <div className={styles.detailsWrapper}>

src/components/transactionDashboard/index.js

@@ -2,9 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import grid from 'flexboxgrid/dist/flexboxgrid.css';
-import WalletTransactions from './../transactions/walletTransactions';
 import WalletTransactionsV2 from './../transactionsV2/walletTransactionsV2';
-import routes from '../../constants/routes';
 
 import styles from './transactionDasboard.css';
 
@@ -13,10 +11,7 @@ class TransactionsDashboard extends React.Component {
   render() {
     return <div className={`${grid.row} ${styles.wrapper}`}>
       <div className={`${grid['col-xs-10']} ${grid['col-sm-12']} ${grid['col-md-12']} ${grid['col-lg-12']} ${styles.transactions}`}>
-      { this.props.match.url === routes.wallet.path &&
-        <WalletTransactions {...this.props} /> }
-      { this.props.match.url === routes.walletV2.path &&
-        <WalletTransactionsV2 {...this.props} /> }
+        <WalletTransactionsV2 {...this.props} />
       </div>
     </div>;
   }

src/components/transactionsV2/transactionDetailV2.js

@@ -18,19 +18,22 @@ const generateVotes = (asset, t) => {
   );
 };
 
-const TransactionDetailV2 = ({ type, asset, t }) => {
+const TransactionDetailV2 = ({
+  transaction, t,
+}) => {
+  const { asset, username, type } = transaction;
   let data = '-';
   let className = '';
   switch (type) {
     case 2:
-      data = asset.delegate.username || data;
+      data = asset && asset.delegate ? asset.delegate.username : username;
       break;
     case 3:
       className = styles.delegateVote;
-      data = generateVotes(asset, t);
+      data = asset && asset.votes ? generateVotes(asset, t) : data;
       break;
     default:
-      data = asset.data || data;
+      data = asset && asset.data ? asset.data : data;
       break;
   }