Merge pull request #4406 from matiu/bug/join

Bug/join
This commit is contained in:
Matias Alejo Garcia 2016-06-15 11:30:16 -03:00 committed by GitHub
commit 1c602bc7fd
2 changed files with 3 additions and 3 deletions

View file

@ -1,6 +1,6 @@
{
"name": "copay",
"description": "A multisignature wallet",
"description": "A multisignature bitcoin wallet",
"author": "BitPay",
"version": "2.0.0",
"androidVersionCode": "105",
@ -13,7 +13,7 @@
],
"main": "public/index.html",
"window": {
"title": "Copay - A multisignature wallet",
"title": "Copay - A multisignature bitcoin wallet",
"icon": "./public/img/icons/icon-256.png",
"toolbar": false,
"show": true,

View file

@ -95,7 +95,7 @@ angular.module('copayApp.services')
client.on('walletCompleted', function() {
$log.debug('Wallet completed');
root.updateCredentials(client.export(), function() {
root.updateCredentials(JSON.parse(client.export()), function() {
$rootScope.$emit('Local/WalletCompleted', walletId);
});
});