Skip to content

Commit

Permalink
further send card refinement
Browse files Browse the repository at this point in the history
  • Loading branch information
phetter committed Aug 28, 2018
1 parent a44dcf1 commit d4e7699
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/app/components/PasswordModal/PasswordModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class PasswordModal extends Component {
</div>
</form>
<form>
<SecondaryButton classNames={ style.Button } buttonText={ 'cancel' } onClickHandler={ this.cancelSubmit }/>
<SecondaryButton classNames={ style.Button } buttonText={ 'cancel' } onClickHandler={ this.cancelSubmit } />
</form>
</Box>
</section>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/successPages/SendSuccessPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SendSuccessPage.propTypes = {
txid: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
onClickHandler: PropTypes.func.isRequired,
url: PropTypes.string.isRequired
url: PropTypes.string.isRequired,
}

export default SendSuccessPage
6 changes: 2 additions & 4 deletions src/app/containers/Send/Send.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export class Send extends Component {

rejectSend = () => {
const { reset } = this.props
resetState()
reset()
this.setState({ showConfirmation: false })
}

Expand All @@ -168,8 +168,6 @@ export class Send extends Component {
renderSelectField,
} = this.props



let content

if (loading) {
Expand Down Expand Up @@ -211,7 +209,7 @@ export class Send extends Component {
// TODO ELSE CUSTOM NET

content = (
<SendSuccessPage txid={ txid } title={ 'Transaction successful!' } onClickHandler={ () => history.push('/') } url={ successUrl }/>
<SendSuccessPage txid={ txid } title={ 'Transaction successful!' } onClickHandler={ () => history.push('/') } url={ successUrl } />
)
} else {
content = (
Expand Down
2 changes: 1 addition & 1 deletion src/app/utils/api/neon.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ export const sendAsset = (netUrl, toAddress, account, wif, assetAmounts, remark,
let fee
if (txFee) fee = txFee
else fee = 0

return new Promise((resolve, reject) => {
return api.neoscan.getBalance(netUrl, account.address).then(balance => {
logDeep('balance: ', balance)
Expand Down Expand Up @@ -197,6 +196,7 @@ export const sendAsset = (netUrl, toAddress, account, wif, assetAmounts, remark,
} else {
// console.log(`Transaction failed: ${signedTx.serialize()}`)
console.log('transaction failed')
// eslint-disable-next-line
reject('transaction failed')
}
})
Expand Down

0 comments on commit d4e7699

Please sign in to comment.