Merge pull request #2263 from isocolsky/fix/import_wallet

Fix/import wallet

Gruntfile.js

@@ -53,7 +53,7 @@ module.exports = function(grunt) {
           '!js/copayBundle.js',
           '!js/copayMain.js'
         ],
-        tasks: ['shell:dev']
+        tasks: ['exec:dev']
       },
       css: {
         files: ['css/src/*.css'],

js/models/Identity.js

@@ -468,11 +468,16 @@ Identity.prototype.close = function() {
 Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
   var self = this;
   preconditions.checkArgument(cb);
+
+  self.verifyChecksum(function(err, match) {
+    if (err) return cb(err);
+    if (!match) return cb('The profile is out of sync. Please re-login to get the latest changes.');
+
     var importFunction = opts.importWallet || Wallet.fromUntrustedObj;
 
     var readOpts = {
-    networkOpts: this.networkOpts,
+      networkOpts: self.networkOpts,
-    blockchainOpts: this.blockchainOpts,
+      blockchainOpts: self.blockchainOpts,
       skipFields: opts.skipFields,
     };
 
@@ -484,10 +489,21 @@ Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
     log.debug('Updating Indexes for wallet:' + w.getName());
     w.updateIndexes(function(err) {
       log.debug('Adding wallet to profile:' + w.getName());
+      self.storeWallet(w, function (err) {
+        if (err) return cb(err);
+
         self.addWallet(w);
         self.updateFocusedTimestamp(w.getId());
         self.bindWallet(w);
-    self.storeWallet(w, cb);
+
+        self.backupNeeded = true;
+        self.store({
+          noWallets: true,
+        }, function(err) {
+          return cb(err);
+        });
+      });
+    });
   });
 };