mirror of
https://github.com/trezor/trezor-wallet
synced 2025-07-07 23:28:09 +00:00
Fix rebase conflict
This commit is contained in:
parent
f35673ddd2
commit
c817b50c76
@ -830,25 +830,6 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
|
|||||||
if (!selected) return;
|
if (!selected) return;
|
||||||
|
|
||||||
const signedTransaction = await TrezorConnect.ethereumSignTransaction({
|
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: {
|
device: {
|
||||||
path: selected.path,
|
path: selected.path,
|
||||||
instance: selected.instance,
|
instance: selected.instance,
|
||||||
|
Loading…
Reference in New Issue
Block a user