Merge pull request #3559 from bitpay/v1.5

Merge into v1.6 from v1.5
This commit is contained in:
Gustavo Maximiliano Cortez 2015-12-01 14:50:49 -03:00
commit 486b24eeb1
19 changed files with 24 additions and 25 deletions

View file

@ -28,6 +28,7 @@ angular.module('copayApp.controllers').controller('exportController',
return;
}
$rootScope.$emit('Local/BackupDone');
notification.success(gettext('Success'), gettext('Encrypted export file saved'));
go.walletHome();
});
@ -96,6 +97,7 @@ angular.module('copayApp.controllers').controller('exportController',
self.error = true;
} else {
self.error = false;
$rootScope.$emit('Local/BackupDone');
}
return cb(ew);
});