aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-08-14 15:42:23 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-08-14 15:42:23 +0800
commitb77cc3d9690304362471fbfe207bdad461c2ca3a (patch)
tree7852afa9e9ca10a8420b24652be59c25d0a45e0f /app/scripts
parent61a279204a804ddf4815d0db6103c19c5640bbb9 (diff)
downloadtangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar.gz
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar.bz2
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar.lz
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar.xz
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.tar.zst
tangerine-wallet-browser-b77cc3d9690304362471fbfe207bdad461c2ca3a.zip
fix tx tests
Diffstat (limited to 'app/scripts')
-rw-r--r--app/scripts/controllers/transactions/index.js4
-rw-r--r--app/scripts/metamask-controller.js6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 7ac6ec2e6..8e2288aed 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -289,10 +289,10 @@ class TransactionController extends EventEmitter {
// sign tx
const fromAddress = txParams.from
const ethTx = new Transaction(txParams)
- const signedTx = await this.signEthTx(ethTx, fromAddress)
+ await this.signEthTx(ethTx, fromAddress)
// set state to signed
this.txStateManager.setTxStatusSigned(txMeta.id)
- const rawTx = ethUtil.bufferToHex(signedTx.serialize())
+ const rawTx = ethUtil.bufferToHex(ethTx.serialize())
return rawTx
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index b1473390b..c813c58ac 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -549,14 +549,14 @@ module.exports = class MetamaskController extends EventEmitter {
keyringName = LedgerBridgeKeyring.type
break
default:
- throw new Error('MetamaskController:connectHardware - Unknown device')
+ throw new Error('MetamaskController:getKeyringForDevice - Unknown device')
}
let keyring = await this.keyringController.getKeyringsByType(keyringName)[0]
if (!keyring) {
keyring = await this.keyringController.addNewKeyring(keyringName)
}
- if (hdPath) {
- keyring.hdPath = hdPath
+ if (hdPath && keyring.setHdPath) {
+ keyring.setHdPath(hdPath)
}
keyring.network = this.networkController.getProviderConfig().type