Skip to content

Commit

Permalink
dashboard: update output_id field name in transaction builder
Browse files Browse the repository at this point in the history
Closes #438
  • Loading branch information
dominic authored and iampogo committed Jan 26, 2017
1 parent 0536e8a commit be47761
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class ActionItem extends React.Component {

render() {
const {
id,
output_id,
type,
account_id,
account_alias,
Expand Down Expand Up @@ -102,7 +102,7 @@ export default class ActionItem extends React.Component {
<TextField title='Control Program' fieldProps={control_program} />}

{visible.output_id &&
<TextField title='Output ID' fieldProps={id} />}
<TextField title='Output ID' fieldProps={output_id} />}

{visible.asset &&
<ObjectSelectorField
Expand Down
4 changes: 2 additions & 2 deletions dashboard/src/features/transactions/components/New/New.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ export default BaseNew.connect(
form: 'NewTransactionForm',
fields: [
'base_transaction',
'actions[].id',
'actions[].type',
'actions[].account_id',
'actions[].account_alias',
'actions[].asset_id',
'actions[].asset_alias',
'actions[].amount',
'actions[].control_program',
'actions[].output_id',
'actions[].reference_data',
'actions[].type',
'submit_action',
],
validate,
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/features/unspents/components/List.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ListItem from './ListItem'

const type = 'unspent'
const firstTimeContent = <EmptyContent
title="There are no unspent outputs on the blockchain" />
title='There are no unspent outputs on the blockchain' />

const newStateToProps = (state, ownProps) => ({
...BaseList.mapStateToProps(type, ListItem)(state, ownProps),
Expand Down
3 changes: 2 additions & 1 deletion dashboard/src/features/unspents/components/ListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import { buildInOutDisplay } from 'features/transactions/utility'
class ListItem extends React.Component {
render() {
const item = {...this.props.item}
const id = item.id
delete item.id
return(<KeyValueTable
title={
<span>
ID <code>{item.id}</code>
ID <code>{id}</code>
</span>
}
actions={[
Expand Down
28 changes: 14 additions & 14 deletions generated/dashboard/dashboard.go

Large diffs are not rendered by default.

0 comments on commit be47761

Please sign in to comment.