Merge remote-tracking branch 'origin/develop' into execute-button
This commit is contained in:
commit
dd109d98fb
|
@ -117,8 +117,7 @@ class AccountDropdowns extends Component {
|
|||
)
|
||||
}
|
||||
|
||||
ifHardwareAcc (address) {
|
||||
const keyring = getCurrentKeyring(address, this.props.network, this.props.keyrings, this.props.identities)
|
||||
ifHardwareAcc (keyring) {
|
||||
if (keyring && keyring.type.search('Hardware') !== -1) {
|
||||
return true
|
||||
}
|
||||
|
@ -130,6 +129,8 @@ class AccountDropdowns extends Component {
|
|||
let label
|
||||
if (ifContractAcc(keyring)) {
|
||||
label = 'CONTRACT'
|
||||
} else if (this.ifHardwareAcc(keyring)) {
|
||||
label = 'HARDWARE'
|
||||
} else {
|
||||
label = 'IMPORTED'
|
||||
}
|
||||
|
@ -287,7 +288,7 @@ class AccountDropdowns extends Component {
|
|||
},
|
||||
'Copy address to clipboard',
|
||||
),
|
||||
(!this.ifHardwareAcc(selected) && !(ifContractAcc(keyring))) ? h(
|
||||
(!this.ifHardwareAcc(keyring) && !(ifContractAcc(keyring))) ? h(
|
||||
DropdownMenuItem,
|
||||
{
|
||||
closeMenu: () => {},
|
||||
|
|
|
@ -174,6 +174,16 @@ class SendTransactionScreen extends PersistentForm {
|
|||
/> : null}
|
||||
</h3>
|
||||
)
|
||||
// bytes field is not mandatory to fill: 0x is by default
|
||||
if (params.type.startsWith('bytes') && !Array.isArray(params.type)) {
|
||||
const inputValues = this.props.inputValues || {}
|
||||
if (!inputValues[ind]) {
|
||||
inputValues[ind] = '0x'
|
||||
this.setState({
|
||||
inputValues,
|
||||
})
|
||||
}
|
||||
}
|
||||
const field = (
|
||||
<SendTransactionField
|
||||
key={Math.random()}
|
||||
|
|
Loading…
Reference in New Issue