poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into node-10-support

This commit is contained in:
Victor Baranov 2019-06-20 14:37:53 +03:00
parent 4c3ec4839d d65dd3b121
commit fcd730a38a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
old-ui/app/account-qr.js
View File

@ -5,7 +5,7 @@ const {qrcode: qrCode} = require('qrcode-npm')
const {connect} = require('react-redux')
const {isHexPrefixed} = require('ethereumjs-util')
const CopyButton = require('./components/copy/copy-button')
const { toChecksumAddress } = require('./util')
const { toChecksumAddress, ifRSK } = require('./util')
class AccountQrScreen extends PureComponent {
static defaultProps = {
@ -20,8 +20,8 @@ class AccountQrScreen extends PureComponent {
render () {
const {Qr, warning, network} = this.props
const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
const addressChecksum = toChecksumAddress(network, Qr.data)
const address = ifRSK ? addressChecksum : `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
const qrImage = qrCode(4, 'M')
qrImage.addData(address)

2
old-ui/app/util.js
View File

@ -390,7 +390,7 @@ function ifRSK (network) {
function toChecksumAddressRSK (address, chainId = null) {
const zeroX = '0x'
const stripAddress = ethUtil.stripHexPrefix(address).toLowerCase()
const prefix = chainId != null ? (chainId.toString() + zeroX) : ''
const prefix = chainId !== null ? (chainId.toString() + zeroX) : ''
const keccakHash = ethUtil.sha3(prefix + stripAddress).toString('hex')
let output = zeroX