Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Work around mismatch for QR checksum #5374

Merged
merged 3 commits into from
Apr 11, 2017
Merged

Work around mismatch for QR checksum #5374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cce4c8
Work around current native-signer encoding
jacogr Apr 1, 2017
71acd6a
Merge remote-tracking branch 'origin/master' into jg-qr-address
gavofyork Apr 11, 2017
2187364
Avoid trying to use non-existant util function.
gavofyork Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/src/i18n/zh/writeContract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default {
params: `An error occurred with the following description`
},
input: {
abi: `ABI Interface`,
abi: `ABI Definition`,
code: `Bytecode`,
metadata: `Metadata`,
swarm: `Swarm Metadata Hash`
Expand Down
6 changes: 5 additions & 1 deletion js/src/modals/CreateAccount/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export default class Store {
}

@computed get qrAddressValid () {
console.log('qrValid', this.qrAddress, this._api.util.isAddressValid(this.qrAddress));
return this._api.util.isAddressValid(this.qrAddress);
}

Expand Down Expand Up @@ -155,7 +156,10 @@ export default class Store {
qrAddress = `0x${qrAddress}`;
}

this.qrAddress = qrAddress;
// FIXME: Current native signer encoding is not 100% for EIP-55, lowercase for now
this.qrAddress = this._api.util
? this._api.util.toChecksumAddress(qrAddress.toLowerCase())
: qrAddress;
}

@action setVaultName = (vaultName) => {
Expand Down
2 changes: 1 addition & 1 deletion js/src/views/WriteContract/writeContract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ class WriteContract extends Component {
label={
<FormattedMessage
id='writeContract.input.abi'
defaultMessage='ABI Interface'
defaultMessage='ABI Definition'
/>
}
readOnly
Expand Down