From 20f24ff2837f72479ca8a81c05420fb2c9291849 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 5 May 2016 15:36:54 -0300 Subject: [PATCH] Revert "Bump bwc version 2.3.1" --- package.json | 2 +- src/js/services/profileService.js | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index ba85a4ea1..673c6cb4a 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "url": "https://github.com/bitpay/copay/issues" }, "dependencies": { - "bitcore-wallet-client": "2.3.1", + "bitcore-wallet-client": "2.3.0", "express": "^4.11.2", "fs": "0.0.2", "grunt": "^0.4.5", diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 30764e0fc..1dc8deb8e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -75,11 +75,6 @@ angular.module('copayApp.services') var client = bwcService.getClient(JSON.stringify(credentials)); root.walletClients[credentials.walletId] = client; - if(client.incorrectDerivation) { - storageService.clearLastAddress(credentials.walletId, function(err) { - if (err) $log.warn(err); - }); - } client.removeAllListeners(); client.on('report', function(n) { $log.info('BWC Report:'+ n); @@ -683,10 +678,10 @@ angular.module('copayApp.services') $log.debug('Wallet is encrypted'); $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) { - if (err2) + if (err2) return cb(err2); - if (!password) + if (!password) return cb(gettext('Password needed')); try {