diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js index dd4e7e985..548598e73 100644 --- a/js/controllers/homeWallet.js +++ b/js/controllers/homeWallet.js @@ -4,7 +4,8 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi $scope.initHome = function() { $rootScope.title = 'Home'; var w = $rootScope.wallet; - if (w.isShared()) + $scope.isShared = w.isShared(); + if ($scope.isShared) $scope.copayers = w.getRegisteredPeerIds(); }; diff --git a/js/controllers/send.js b/js/controllers/send.js index afc1d8fbf..371123545 100644 --- a/js/controllers/send.js +++ b/js/controllers/send.js @@ -10,9 +10,11 @@ angular.module('copayApp.controllers').controller('SendController', $scope.init = function() { var w = $rootScope.wallet; preconditions.checkState(w); + preconditions.checkState(w.settings.unitToSatoshi); - $rootScope.title = w.isShared() ? 'Send Proposal' : 'Send'; + $scope.isShared = w.isShared(); + $rootScope.title =$scope.isShared ? 'Send Proposal' : 'Send'; $scope.loading = false; $scope.error = $scope.success = null; @@ -125,7 +127,7 @@ angular.module('copayApp.controllers').controller('SendController', if (msg.match('expired')) msg = 'The payment request has expired'; - var message = 'The transaction' + (w.isShared() ? ' proposal' : '') + + var message = 'The transaction' + ($scope.isShared ? ' proposal' : '') + ' could not be created: ' + msg; $scope.error = message; diff --git a/js/util/log.js b/js/util/log.js index 31a5a3ba5..c0e7a13a9 100644 --- a/js/util/log.js +++ b/js/util/log.js @@ -48,8 +48,15 @@ _.each(levels, function(level, levelName) { if (Error.stackTraceLimit && this.level == 'debug') { var old = Error.stackTraceLimit; - Error.stackTraceLimit = 2 - var stack = new Error().stack; + Error.stackTraceLimit = 2; + var stack; + + // this hack is to be compatible with IE11 + try { + anerror(); + } catch (e) { + stack = e.stack; + } var lines = stack.split('\n'); var caller = lines[2]; caller = ':' + caller.substr(6); diff --git a/package.json b/package.json index 665b79b86..e192cb13c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "browser-request": "^0.3.2", + "browser-request": "git://github.com/matiu/browser-request.git#67200dd4ec133457fb7dc69f005540f92b543f0a", "inherits": "^2.0.1", "lodash": "^2.4.1", "optimist": "^0.6.1", @@ -45,7 +45,6 @@ "bitcore": "git://github.com/bitpay/bitcore.git#0d238f116500a732057ec9dd80a8a87b2190ca49", "blanket": "^1.1.6", "browser-pack": "^2.0.1", - "browser-request": "^0.3.2", "browserify": "^3.32.1", "buffertools": "^2.0.1", "chai": "^1.9.1", diff --git a/views/homeWallet.html b/views/homeWallet.html index 00e8f5314..12a83451f 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -37,8 +37,8 @@
- Personal Wallet - + Personal Wallet + Multisignature wallet [{{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ] in TESTNET @@ -50,7 +50,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
diff --git a/views/send.html b/views/send.html index 0771ef5c1..618072791 100644 --- a/views/send.html +++ b/views/send.html @@ -131,7 +131,8 @@ too long!
- + +