From c4964c1929d997cbaccba5864e674b71b3cae91f Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 11 Sep 2015 11:37:34 -0300 Subject: [PATCH] fix preDerivation --- src/js/services/bwsError.js | 2 +- src/js/services/profileService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js index 84959aa63..f598946e5 100644 --- a/src/js/services/bwsError.js +++ b/src/js/services/bwsError.js @@ -100,7 +100,7 @@ angular.module('copayApp.services') default: $log.warn('Unknown error type:', err.code); - body = err.code + ':' + err.message ; + body = err.message || err.code; break; } } diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 46b0ac3da..21bdf377e 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -170,7 +170,7 @@ angular.module('copayApp.services') var walletClient = bwcService.getClient(); var network = opts.networkName || 'livenet'; - if (opts.mnemonic && opts.mnemonic.indexOf('m/' != 0)) { + if (opts.mnemonic && opts.mnemonic.indexOf('m/') == 0) { var xPrivKey = root._preDerivation(opts.mnemonic, network); if (!xPrivKey) return bwsError.cb('Bad derivation', gettext('Could not import'), cb);