From a5d6156a7a9d91b7b0a86c8838ce1dc576d460fa Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 15 Jun 2016 10:06:57 -0300 Subject: [PATCH 1/2] update name --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 243be9a41..a6b7ae511 100644 --- a/package.json +++ b/package.json @@ -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, From cf58dfab2190b442c9a92d60ace2ccd0ca46a085 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Wed, 15 Jun 2016 11:17:52 -0300 Subject: [PATCH 2/2] fix join wallet --- src/js/services/profileService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index 5d738dbcb..3603d8691 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -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); }); });