From ebec92354f5d840c78a5471fe904a74e24a1ab54 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 10 Dec 2015 16:40:40 -0300 Subject: [PATCH 1/2] fix backup flag from server --- src/js/controllers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index a72a7be04..669f4d67c 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -305,7 +305,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.updateError = bwsError.msg(err, gettext('Could not update Wallet')); } else { if (!opts.quiet) - self.setOngoingProcess('scanning', ret.wallet.scanning); + self.setOngoingProcess('scanning', ret.wallet.scanStatus == 'running'); } return cb(err, ret); }); From c90657361e4ee10b2385a178d4e98b1afd2fd84d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Thu, 10 Dec 2015 17:02:03 -0300 Subject: [PATCH 2/2] fix case in Copay OSX bundle --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Gruntfile.js b/Gruntfile.js index 2f496e1b3..efb5edc98 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -177,6 +177,7 @@ module.exports = function(grunt) { }, nodewebkit: { options: { + appName: 'Copay', platforms: ['win', 'osx', 'linux'], buildDir: './webkitbuilds', version: '0.12.2',