m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into 761-FixCustomMordenIndication

Browse Source
This commit is contained in:
Dan Finlay 2016-10-26 10:51:07 -07:00
commit f1bbaeea50
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
- Add a check for improper Transaction data. - Add a check for improper Transaction data.
- Fix bug where custom provider selection could show duplicate items. - Fix bug where custom provider selection could show duplicate items.
- Fix bug where connecting to a local morden node would make two providers appear selected. - Fix bug where connecting to a local morden node would make two providers appear selected.
- Fix bug that was sometimes preventing transactions from being sent.
## 2.13.5 2016-10-18 ## 2.13.5 2016-10-18

4
app/scripts/lib/idStore.js
View File

@ -247,9 +247,9 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
// perform static analyis on the target contract code // perform static analyis on the target contract code
function analyzeForDelegateCall(cb){ function analyzeForDelegateCall(cb){
if (txParams.to) { if (txParams.to) {
query.getCode(txParams.to, function (err, result) { query.getCode(txParams.to, (err, result) => {
if (err) return cb(err) if (err) return cb(err)
var containsDelegateCall = this.checkForDelegateCall(result) var containsDelegateCall = self.checkForDelegateCall(result)
txData.containsDelegateCall = containsDelegateCall txData.containsDelegateCall = containsDelegateCall
cb() cb()
}) })