Merge pull request #3559 from bitpay/v1.5

Merge into v1.6 from v1.5

cordova/config.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="com.bitpay.copay" 
-  version="1.5.2"
-  android-versionCode="56"
-  ios-CFBundleVersion="1.5.2">
+  version="1.5.3"
+  android-versionCode="57"
+  ios-CFBundleVersion="1.5.3">
     <name>Copay</name>
     <description>
       A secure bitcoin wallet for friends and companies.

cordova/ios/Copay-Info.plist

@@ -57,11 +57,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>

cordova/wp/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
-  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.5.2.0" />
+  <Identity Name="18C7659D.CopayWallet" Publisher="CN=F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" Version="1.5.3.0" />
   <mp:PhoneIdentity PhoneProductId="5381aa50-9069-11e4-84cc-293caf9cbdc8" PhonePublisherId="F89609D1-EB3E-45FD-A58A-C2E3895FCE7B" />
   <Properties>
     <DisplayName>Copay Bitcoin Wallet</DisplayName>

cordova/wp/Properties/WMAppManifest.xml

@@ -8,7 +8,7 @@
     <Language code="ja" />
     <Language code="es" />
   </Languages>
-  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.5.2.0" xmlns="" NotificationService="MPN">
+  <App Author="Bitpay Inc." BitsPerPixel="32" Description="A multisignature Bitcoin Wallet" Genre="apps.normal" ProductID="{5381aa50-9069-11e4-84cc-293caf9cbdc8}" Publisher="Copay Bitcoin Wallet" PublisherID="{31cdd08b-457c-413d-b440-f6665eec847d}" RuntimeType="Silverlight" Title="Copay Bitcoin Wallet" Version="1.5.3.0" xmlns="" NotificationService="MPN">
     <IconPath IsRelative="true" IsResource="false">Assets\icon@2.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />

package.json

@@ -2,7 +2,7 @@
   "name": "copay",
   "description": "A multisignature wallet",
   "author": "BitPay",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "keywords": [
     "wallet",
     "copay",

public/views/walletHome.html

@@ -447,7 +447,7 @@
       <div ng-show="index.updatingTxHistory[index.walletId]">
         <div ng-show="index.txProgress > 6" class="row m20t text-center">
           <div class="circle-icon">
-            <img src="/img/icon-sync.svg" alt="sync" width="70">
+            <img src="img/icon-sync.svg" alt="sync" width="70">
           </div>
           <div translate class="size-12 text-gray m20t small-10 small-centered columns">
             Initial transaction history synchronization can take some minutes for wallets with many transactions.

src/js/controllers/export.js

@@ -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);
       });

src/js/controllers/index.js

@@ -434,9 +434,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
   // This handles errors from BWS/index with are nomally
-  // trigger from async events (like updates)
-  self.handleError = function(err) {
-    $log.warn('Client ERROR:', err);
+  // trigger from async events (like updates).
+  // Debounce function avoids multiple popups
+  var _handleError = function(err) {
+    $log.warn('Client ERROR: ', err);
     if (err.code === 'NOT_AUTHORIZED') {
       self.notAuthorized = true;
       go.walletHome();
@@ -449,6 +450,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.showErrorPopup(msg);
     }
   };
+
+  self.handleError = lodash.debounce(_handleError, 1000);
+
   self.openWallet = function() {
     var fc = profileService.focusedClient;
     $timeout(function() {
@@ -940,9 +944,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $log.warn('Showing err popup:' + msg);
     self.showAlert = {
       msg: msg,
-      close: function(err) {
+      close: function() {
         self.showAlert = null;
-        if (cb) return cb(err);
+        if (cb) return cb();
       },
     };
     $timeout(function() {
@@ -1371,10 +1375,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     );
   });
 
-  $rootScope.$on('Local/ShowAlert', function(event, msg, cb) {
-    self.showErrorPopup(msg, cb);
-  });
-
   $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
     self.askPassword = {
       isSetup: isSetup,

src/js/init.js

@@ -32,9 +32,6 @@ angular.element(document).ready(function() {
             window.location = '#/cordova/pause/';
           }, 100);
         }
-        setTimeout(function() {
-          window.ignoreMobilePause = false;
-        }, 100);
       }, false);
 
       document.addEventListener('resume', function() {

src/js/services/profileService.js

@@ -637,7 +637,7 @@ angular.module('copayApp.services')
           name: config.aliasFor[c.walletId] || c.walletName,
           id: c.walletId,
           network: c.network,
-          color: config.colorFor[c.walletId] || '#2C3E50'
+          color: config.colorFor[c.walletId] || '#4A90E2'
         };
       });
       ret = lodash.filter(ret, function(w) {

webkitbuilds/.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.5.2
+Version=1.5.3
 Name=Copay
 Comment=A multisignature wallet
 Exec=copay

webkitbuilds/setup-win32.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Copay"
-#define MyAppVersion "1.5.2"
+#define MyAppVersion "1.5.3"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://copay.io"
 #define MyAppExeName "copay.exe"

webkitbuilds/setup-win64.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Copay"
-#define MyAppVersion "1.5.2"
+#define MyAppVersion "1.5.3"
 #define MyAppPublisher "BitPay"
 #define MyAppURL "https://copay.io"
 #define MyAppExeName "copay.exe"