From c817b50c76e3fdff447cb7fde29e26a419c49dea Mon Sep 17 00:00:00 2001 From: Vasek Mlejnsky Date: Mon, 13 Aug 2018 09:44:31 +0200 Subject: [PATCH] Fix rebase conflict --- src/js/actions/SendFormActions.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js index fcb00973..b1711e6e 100644 --- a/src/js/actions/SendFormActions.js +++ b/src/js/actions/SendFormActions.js @@ -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,