Fix rebase conflict

pull/2/head
Vasek Mlejnsky 6 years ago
parent f35673ddd2
commit c817b50c76

@ -830,25 +830,6 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
if (!selected) return;
const signedTransaction = await TrezorConnect.ethereumSignTransaction({
device: {
path: selected.path,
instance: selected.instance,
state: selected.state
},
useEmptyPassphrase: !selected.instance,
path: txData.address_n,
transaction: {
to: strip(txData.to),
value: strip(txData.value),
gasPrice: strip(txData.gasPrice),
gasLimit: strip(txData.gasLimit),
nonce: strip(txData.nonce),
data: strip(txData.data),
chainId: txData.chainId,
r: txData.r,
s: txData.s,
v: txData.v,
},
device: {
path: selected.path,
instance: selected.instance,

Loading…
Cancel
Save