Skip to content

Commit

Permalink
Merge pull request #318 from LiskHQ/302-show-tx-type
Browse files Browse the repository at this point in the history
Show transaction type on non-send transaction page - Closes #302
  • Loading branch information
gina contrino authored Feb 12, 2018
2 parents 8e4b3f6 + 1a21a86 commit 929ba8f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
"Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.": "Transaction is being processed and will be confirmed. It may take up to 15 minutes to be secured in the blockchain.",
"Transactions can’t be reversed": "Transactions can’t be reversed",
"Try using menu for navigation.": "Try using menu for navigation.",
"Type": "Type",
"URL is invalid": "URL is invalid",
"Unable to connect to the node": "Unable to connect to the node",
"Undo": "Undo",
Expand Down
13 changes: 11 additions & 2 deletions src/components/transactions/transactionDetailView.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import CopyToClipboard from '../copyToClipboard';
import AccountVisual from '../accountVisual';
import styles from './transactions.css';
import { FontIcon } from '../fontIcon';
import TransactionType from './transactionType';
import LiskAmount from '../liskAmount';
import Amount from './amount';
import routes from './../../constants/routes';
Expand Down Expand Up @@ -72,8 +73,16 @@ class TransactionsDetailView extends React.Component {
</div>
</div>
<div className={`${grid['col-xs-12']} ${grid['col-sm-6']} ${grid['col-md-6']} ${styles.column}`}>
<div className={styles.label}>{this.props.t('Amount (LSK)')}</div>
<div className={styles.value}><Amount {...this.props}></Amount></div>
{this.props.value.type === 0
? <div><div className={styles.label}>{this.props.t('Amount (LSK)')}</div>
<div className={styles.value}><Amount {...this.props}></Amount></div>
</div>
: <div><div className={styles.label}>{this.props.t('Type')}</div>
<div className={styles.value}>
<TransactionType {...this.props.value} address={this.props.value.senderId} />
</div>
</div>
}
</div>
</div>
<div className={`${grid.row} ${styles.row}`}>
Expand Down

0 comments on commit 929ba8f

Please sign in to comment.