Merge branch 'mercury' of https://github.com/kvhnuke/etherwallet into…

… mercury
MyEtherWallet · Feb 23, 2017 · 2bb492d · 2bb492d
2 parents 4ec5530 + bf2da37
commit 2bb492d
Show file tree

Hide file tree

Showing 3 changed files with 105,871 additions and 93,939 deletions.
diff --git a/app/scripts/controllers/sendTxCtrl.js b/app/scripts/controllers/sendTxCtrl.js
@@ -2,7 +2,7 @@
 var sendTxCtrl = function($scope, $sce, walletService) {
     $scope.ajaxReq = ajaxReq;
     $scope.unitReadable = ajaxReq.type;
-   // $scope.sendTxModal = new Modal(document.getElementById('sendTransaction'));
+    $scope.sendTxModal = new Modal(document.getElementById('sendTransaction'));
     walletService.wallet = null;
     walletService.password = '';
     $scope.showAdvance = $scope.showRaw = false;