Merge pull request bitpay#596 from JDonadio/fix/import-with-pk-encrypted

Fix import wallet with pk encrypted

src/js/services/profileService.js

@@ -601,6 +601,16 @@ angular.module('copayApp.services')
       $log.debug('Importing Wallet:', opts);
 
       try {
+        var c = JSON.parse(str);
+
+        if (c.xPrivKey && c.xPrivKeyEncrypted) {
+          $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version');
+          delete c.xPrivKeyEncrypted;
+          delete c.mnemonicEncrypted;
+        }
+
+        str = JSON.stringify(c);
+
         walletClient.import(str, {
           compressed: opts.compressed,
           password: opts.password
@@ -609,14 +619,6 @@ angular.module('copayApp.services')
         return cb(gettext('Could not import. Check input file and spending password'));
       }
 
-      str = JSON.parse(str);
-
-      if (str.xPrivKey && str.xPrivKeyEncrypted) {
-        $log.warn('Found both encrypted and decrypted key. Deleting the encrypted version');
-        delete str.xPrivKeyEncrypted;
-        delete str.mnemonicEncrypted;
-      }
-
       var addressBook = str.addressBook || {};
 
       addAndBindWalletClient(walletClient, {