Merge branch 'v4.0.1'

Author: proletesseract

app-template/copay/appConfig.json

@@ -23,7 +23,7 @@
   "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
   "pushSenderId": "1036948132229",
   "description": "A Secure Nav Coin Wallet",
-  "version": "1.0.1",
+  "version": "4.0.1",
   "androidVersion": "100001",
   "_extraCSS": null,
   "_enabledExtensions": {

src/js/controllers/tab-send.js

@@ -1,13 +1,26 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout, $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService, platformInfo, bwcError, gettextCatalog, scannerService, $window, externalLinkService) {
+angular.module('copayApp.controllers').controller('tabSendController', function($scope, $rootScope, $log, $timeout,
+  $ionicScrollDelegate, addressbookService, profileService, lodash, $state, walletService, incomingData, popupService,
+   platformInfo, bwcError, gettextCatalog, scannerService, $window, externalLinkService, bitcore) {
 
   var originalList;
   var CONTACTS_SHOW_LIMIT;
   var currentContactsPage;
+  $scope.isSweeping = false;
   $scope.isChromeApp = platformInfo.isChromeApp;
 
 
+  $scope.sweepBtnDisabled = function() {
+    var isDisabled = true;
+
+    if ($scope.checkPrivateKey($scope.formData.search)) {
+      isDisabled = false;
+    }
+    return isDisabled;
+  };
+
+
   var hasWallets = function() {
     $scope.wallets = profileService.getWallets({
       onlyComplete: true
@@ -232,6 +245,28 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
     });
   };
 
+  $scope.sweepAddressClickHandler = function(privateKey) {
+    console.log('privateKey', privateKey);
+
+    $state.go('tabs.home').then(function() {
+      $timeout(function() {
+        $state.transitionTo('tabs.home.paperWallet', {
+          privateKey: privateKey
+        });
+        }, 50);
+    });
+  };
+
+
+  $scope.checkPrivateKey = function(privateKey) {
+    try {
+      new bitcore.PrivateKey(privateKey, 'livenet');
+    } catch (err) {
+      return false;
+    }
+    return true;
+  }
+
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
 
     $scope.checkingBalance = true;
@@ -250,11 +285,14 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       $scope.checkingBalance = false;
       return;
     }
-
     updateHasFunds();
 
     if (data.stateParams.address) {
-      $scope.formData.search = data.stateParams.address;
+      if (data.stateParams.address === 'sweep') {
+        $scope.isSweeping = true;
+      } else {
+        $scope.formData.search = data.stateParams.address;
+      }
       $timeout(function() {
         $scope.searchFocus = true;
         var element = $window.document.getElementById('tab-send-address');

src/sass/forms.scss

@@ -1,3 +1,8 @@
 .button-clear{
   background: none !important;
-}
+}
+
+#sweep-option {
+  padding-top: 20px;
+  padding-bottom: 20px;
+}

www/views/advancedSettings.html

@@ -28,6 +28,17 @@
       <ion-toggle ng-model="hideNextSteps.value" ng-if="!isWindowsPhoneApp" toggle-class="toggle-balanced" ng-change="nextStepsChange()">
         <span class="toggle-label" translate>Hide Next Steps Card</span>
       </ion-toggle>
+
+      <div class="item item-divider"></div>
+
+      <a id="sweep-option" class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.send({address: 'sweep'})">
+        <i class="icon icon-svg">
+          <img src="img/icon-receive.svg" class="bg"/>
+        </i>
+        <span class="setting-title">{{'Sweep Private Key' | translate}}</span>
+      </a>
+      <div class="item item-divider"></div>
+
     </div>
   </ion-content>
 </ion-view>

www/views/tab-send.html

@@ -3,8 +3,36 @@
     <ion-nav-title>{{'Send' | translate}}</ion-nav-title>
   </ion-nav-bar>
   <ion-content>
+    <div ng-if="isSweeping">
+      <div class="send-header-wrapper card">
+        <div class="item item-heading send-heading"><span translate>Private Key</span></div>
+        <div class="item input search-wrapper" ng-class="{'focus': searchFocus}">
+          <i class="icon icon-svg abs-v-center"><img class="svg" src="img/icon-bitcoin-symbol.svg"></i>
+          <div class="item-icon-right">
+            <input  ng-model="formData.search"
+                    ng-change="findContact(formData.search)"
+                    ng-model-onblur ng-focus="searchInFocus()"
+                    ng-blur="searchBlurred()"
+                    placeholder="{{'Enter a Nav Coin Private Key to sweep with' | translate}}"
+                    type="text"
+                    class="search-input"
+                    id="tab-sweep-address"  >
+            <i class="icon icon-svg qr abs-v-center separator-left" on-tap="openScanner()"><img src="img/scan-ico.svg"></i>
+          </div>
+        </div>
+        <div class="send-next-button">
 
-    <div ng-if="hasFunds">
+          <button ng-disabled="sweepBtnDisabled()"
+                  ng-class="{disable: sweepBtnDisabled()}"
+                  ng-click="sweepAddressClickHandler(formData.search)"
+                  class="button button-standard button-primary" >
+            <span class="button-label" translate>Sweep Address</span>
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <div ng-if="hasFunds && !isSweeping">
       <div class="send-header-wrapper card">
         <div class="item item-heading send-heading"><span translate>Recipient</span></div>
         <div class="item input search-wrapper" ng-class="{'focus': searchFocus}">
@@ -20,15 +48,15 @@
           </ion-toggle>
         </div>
         <div class="send-next-button">
-          <button ng-disabled="nextDisabled" class="button button-standard button-primary" ng-class="{disable: nextDisabled}" ng-click="nextClicked(formData.search)">
+          <button ng-disabled="nextDisabled" class="button button-standard button-primary"
+          ng-class="{disable: nextDisabled}" ng-click="nextClicked(formData.search)">
             <span class="button-label" translate>Next</span>
           </button>
         </div>
       </div>
-
     </div>
 
-    <div ng-if="!checkingBalance && (!hasFunds || !hasWallets)">
+    <div ng-if="!checkingBalance && !isSweeping && (!hasFunds || !hasWallets)">
       <div class="list card sendTip">
         <div class="item item-icon-right item-heading"></div>
         <div>
@@ -51,7 +79,7 @@
       </div>
     </div>
 
-    <div class="card" ng-if="hasContacts && hasWallets && hasFunds">
+    <div class="card" ng-if="hasContacts && hasWallets && hasFunds && !isSweeping">
       <div class="item item-icon-right item-heading">
         <span translate>Contacts</span>
         <a ng-if="hasContacts" ui-sref="tabs.send.addressbook">
@@ -73,7 +101,7 @@
       </div>
     </div>
 
-    <div class="card" ng-if="showTransferCard && hasFunds">
+    <div class="card" ng-if="showTransferCard && hasFunds && !isSweeping">
       <div class="item item-heading">
         <span translate>Transfer to Wallet</span>
       </div>