From d3f77b37ad889ca5a0cc99da5f769d31ed5e93ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Fri, 17 Jul 2015 15:53:50 +0200
Subject: [PATCH 01/47] Ledger hardware wallet support

---
 public/views/create.html          |  27 +-
 public/views/join.html            |  30 +-
 public/views/preferences.html     |  11 +-
 src/js/controllers/create.js      |  42 ++-
 src/js/controllers/join.js        |  45 ++-
 src/js/controllers/preferences.js |   5 +-
 src/js/controllers/walletHome.js  |  53 +++-
 src/js/services/ledger.js         | 486 ++++++++++++++++++++++++++++++
 src/js/services/profileService.js |  17 +-
 9 files changed, 693 insertions(+), 23 deletions(-)
 create mode 100644 src/js/services/ledger.js

diff --git a/public/views/create.html b/public/views/create.html
index 83f02975d..489808cf3 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -8,7 +8,7 @@
 
 <div class="content p20v" ng-controller="createController as create" ng-init="create.setTotalCopayers(1)">
 
-  <div class="onGoingProcess" ng-show="create.loading">
+  <div class="onGoingProcess" ng-show="create.loading && !create.ledger">
     <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
     <div class="spinner">
       <div class="rect1"></div>
@@ -21,6 +21,19 @@
     </div>
   </div>
 
+  <div class="onGoingProcess" ng-show="create.ledger">
+    <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
+    <div class="spinner">
+      <div class="rect1"></div>
+      <div class="rect2"></div>
+      <div class="rect3"></div>
+      <div class="rect4"></div>
+      <div class="rect5"></div>
+    </div>
+    <span translate>Connecting to Ledger Wallet...</span>
+    </div>
+  </div>
+
   <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
     <div class="row">
     <div class="tab-container small-6 medium-3 large-2">
@@ -87,12 +100,22 @@
             <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
           </a>
         </div>
-        <div ng-hide="hideAdv" class="row">
+        <div ng-hide="hideAdv" class="row" ng-init="hideSlots=true">
           <div class="large-12 columns">
             <label for="network-name" class="line-b oh">
               <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
+            <label ng-show="create.isChromeApp()" for="hw-ledger" class="line-b oh">
+              <span translate>Use Ledger hardware wallet</span>
+              <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b" ng-change="hideSlots=false"></switch>
+            </label>
+            <div ng-hide="hideSlots">
+              <label class="line-b oh"><span translate>Select slot number for Ledger key</span>
+                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externatIndexValues">
+                </select>
+              </label>
+            </div>         
             <label for="ext-master" class="m10t">
               <span translate>Master extended private key</span>
               <small translate>If not given, a secure key will be generated</small>
diff --git a/public/views/join.html b/public/views/join.html
index 7c4a19f8a..437a07fdc 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -6,7 +6,7 @@
 
 
 <div class="content p20v" ng-controller="joinController as join">
-  <div class="onGoingProcess" ng-show="join.loading">
+  <div class="onGoingProcess" ng-show="join.loading && !join.ledger">
     <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
     <div class="spinner">
       <div class="rect1"></div>
@@ -19,6 +19,19 @@
     </div>
   </div>
 
+  <div class="onGoingProcess" ng-show="join.ledger">
+    <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
+    <div class="spinner">
+      <div class="rect1"></div>
+      <div class="rect2"></div>
+      <div class="rect3"></div>
+      <div class="rect4"></div>
+      <div class="rect5"></div>
+    </div>
+    <span translate>Connecting to Ledger Wallet...</span>
+    </div>
+  </div>
+
   <div class="row">
     <div class="large-12 columns">
 
@@ -71,7 +84,20 @@
             <i ng-show="!join.hideAdv" class="icon-arrow-down4"></i>
             <i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
           </a>
-          <div ng-show="join.hideAdv" class="row">
+          <div ng-show="join.hideAdv" class="row" ng-init="hideSlots=true">
+            <div class="large-12 columns" ng-show="join.isChromeApp()">
+              <label for="hw-ledger" class="line-b oh">
+                <span translate>Use Ledger hardware wallet</span>
+                <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b" ng-change="hideSlots=false"></switch>
+              </label>
+            </div>
+            <div class="large-12 columns" ng-hide="hideSlots">
+              <label class="line-b oh">
+                <span translate>Select slot number for Ledger key</span>
+                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in join.externatIndexValues">
+                </select>
+              </label>
+            </div>         
             <div class="large-12 columns">
               <label for="ext-master">{{'Master extended private key'|translate}}
               <small translate>If not given, a secure key will be generated</small>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index 6f46dba1f..fdc3f250f 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -36,10 +36,17 @@
         <span ng-style="{'color':index.backgroundColor}">&block;</span>
       </span>      
     </li>
-    <li class="line-b p20">
+    <li class="line-b p20" ng-hide="preferences.externalIndex >= 0">
       <span translate>Encrypt Private Key</span>
       <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
-  </li>
+    </li>
+    <li class="line-b p20" ng-show="preferences.externalIndex >= 0">
+      <span translate>Hardware wallet</span>
+      <span class="right text-gray">
+        {{preferences.externalSource}} 
+        (index {{preferences.externalIndex}})
+      </span>
+    </li>
  
     <h4 class="title m0">&nbsp;</h4>
     <li class="line-b p20" ng-click="$root.go('backup')">
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 8ac67f68a..7bcf141b5 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -1,12 +1,12 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('createController',
-  function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isMobile, isCordova, gettext) {
+  function($scope, $rootScope, $location, $timeout, $log, lodash, go, profileService, configService, isMobile, isCordova, gettext, isChromeApp, ledger) {
 
     var self = this;
     var defaults = configService.getDefaults();
     this.isWindowsPhoneApp = isMobile.Windows() && isCordova;
-
+   
     /* For compressed keys, m*73 + n*34 <= 496 */
     var COPAYER_PAIR_LIMITS = {
       1: 1,
@@ -35,6 +35,8 @@ angular.module('copayApp.controllers').controller('createController',
       $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
     };
 
+    this.externatIndexValues = lodash.range(0,20);
+    $scope.externalIndex = 0;
     this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
     $scope.totalCopayers = defaults.wallet.totalCopayers;
 
@@ -42,6 +44,10 @@ angular.module('copayApp.controllers').controller('createController',
       updateRCSelect(tc);
     };
 
+    this.isChromeApp = function() {
+      return isChromeApp;
+    };
+
     this.create = function(form) {
       if (form && form.$invalid) {
         this.error = gettext('Please enter the required fields');
@@ -53,14 +59,40 @@ angular.module('copayApp.controllers').controller('createController',
         name: form.walletName.$modelValue,
         extendedPrivateKey: form.privateKey.$modelValue,
         myName: $scope.totalCopayers > 1 ? form.myName.$modelValue : null,
-        networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet'
+        networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet',
       };
       self.loading = true;
 
+      if (form.hwLedger.$modelValue) {
+        self.ledger = true;
+        ledger.getXPubKey($scope.externalIndex, function(data) {
+          self.ledger = false;
+          $scope.$apply();
+          if (data.success) {
+            opts.extendedPublicKey = data.xpubkey;
+            opts.externalSource = 'ledger';
+            opts.externalIndex = $scope.externalIndex;
+            self._create(opts);
+          } else {
+            self.loading = false;
+            $log.debug(data.message);
+            self.error = data.message;
+            $scope.$apply();
+          }
+        });
+      } else {
+        self._create(opts);
+      }
+    };
+
+    this._create = function (opts) {
       $timeout(function() {
         profileService.createWallet(opts, function(err, secret) {
           self.loading = false;
           if (err) {
+            if (err == "Error creating wallet" && opts.extendedPublicKey) {
+              err = "This xpub index is already used by another wallet. Please select another index."
+            }
             $log.debug(err);
             self.error = err;
             $timeout(function() {
@@ -72,7 +104,7 @@ angular.module('copayApp.controllers').controller('createController',
           }
         });
       }, 100);
-    };
+    }
     
     this.formFocus = function(what) {
       if (!this.isWindowsPhoneApp) return
@@ -82,7 +114,7 @@ angular.module('copayApp.controllers').controller('createController',
         this.hideTabs = true;
       }
       else if (what && what == 'wallet-name'){
-        this.hideTabs = true;
+        this.hideTabs = true;
       }
       else {
         this.hideWalletName = false;
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 1ca442f8c..a5e732030 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,9 +1,15 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('joinController',
-  function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, $modal, gettext) {
+  function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, isChromeApp, $modal, gettext, lodash, ledger) {
 
     var self = this;
+    this.externatIndexValues = lodash.range(0,20);
+    $scope.externalIndex = 0;
+
+    this.isChromeApp = function() {
+      return isChromeApp;
+    };
 
     //TODO : make one function - this was copied from topbar.js
     var cordovaOpenScanner = function() {
@@ -145,12 +151,37 @@ angular.module('copayApp.controllers').controller('joinController',
       }
       self.loading = true;
 
+      var opts = {
+        secret: form.secret.$modelValue,
+        extendedPrivateKey: form.privateKey.$modelValue,
+        myName: form.myName.$modelValue
+      }
+
+      if (form.hwLedger.$modelValue) {
+        self.ledger = true;
+        ledger.getXPubKey($scope.externalIndex, function(data) {
+          self.ledger = false;
+          $scope.$apply();
+          if (data.success) {
+            opts.extendedPublicKey = data.xpubkey;
+            opts.externalSource = 'ledger';
+            opts.externalIndex = $scope.externalIndex;
+            self._join(opts);
+          } else {
+            self.loading = false;
+            $log.debug(data.message);
+            self.error = data.message;
+            $scope.$apply();
+          }
+        });
+      } else {
+        self._join(opts);
+      }
+    };
+
+    this._join = function(opts) {
       $timeout(function() {
-        profileService.joinWallet({
-          secret: form.secret.$modelValue,
-          extendedPrivateKey: form.privateKey.$modelValue,
-          myName: form.myName.$modelValue
-        }, function(err) {
+        profileService.joinWallet(opts, function(err) {
           if (err) {
             self.loading = false;
             self.error = err;
@@ -162,5 +193,5 @@ angular.module('copayApp.controllers').controller('joinController',
           }, 2000);
         });
       }, 100);
-    }
+    };
   });
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index c26db89e3..34130559d 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -13,8 +13,11 @@ angular.module('copayApp.controllers').controller('preferencesController',
     $scope.glideraEnabled = config.glidera.enabled;
     $scope.glideraTestnet = config.glidera.testnet;
     var fc = profileService.focusedClient;
-    if (fc)
+    if (fc) {
       $scope.encrypt = fc.hasPrivKeyEncrypted();
+      this.externalSource = fc.getPrivKeyExternalSourceName() == 'ledger' ? "Ledger" : null;
+      this.externalIndex = fc.getExternalIndex();
+    }
 
     var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
       if (newVal == oldVal) return;
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 3707b758a..4bc7599b6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, feeService, bwsError, txFormatService) {
+angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, utilService) {
 
   var self = this;
   $rootScope.hideMenuBar = false;
@@ -258,6 +258,33 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
           return;
         };
 
+        if (fc.isPrivKeyExternal()) {
+          if (fc.getPrivKeyExternalSourceName() == 'ledger') {
+            $log.debug('Requesting Ledger Chrome app to sign the transaction');
+            self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
+            $scope.loading = true;
+            $scope.error = null;
+            ledger.signTx(txp, fc.getExternalIndex(), function(result) {
+              if (result.success) {
+                txp.signatures = [];
+                for (var i=0; i<result.signatures.length; i++) {
+                  txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
+                }
+                $scope._doSign(txp);
+              } else {
+                $scope.loading = false;
+                $scope.error = result.message;
+                self.setOngoingProcess();
+                $scope.$digest();
+              }
+            });
+          }
+        } else {
+          $scope._doSign(txp);
+        }
+      };
+
+      $scope._doSign = function(txp) {
         self.setOngoingProcess(gettext('Signing payment'));
         $scope.loading = true;
         $scope.error = null;
@@ -804,6 +831,30 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   this.signAndBroadcast = function(txp, cb) {
     var fc = profileService.focusedClient;
+
+    if (fc.isPrivKeyExternal()) {
+      if (fc.getPrivKeyExternalSourceName() == 'ledger') {
+        $log.debug('Requesting Ledger Chrome app to sign the transaction');
+        self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
+        ledger.signTx(txp, fc.getExternalIndex(), function(result) {
+          if (result.success) {
+            txp.signatures = [];
+            for (var i=0; i<result.signatures.length; i++) {
+              txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
+            }
+            self._doSignAndBroadcast(txp, cb);
+          } else {
+            return cb(result);
+          }
+        });
+      }
+    } else {
+      self._doSignAndBroadcast(txp, cb);
+    }
+  };
+
+  this._doSignAndBroadcast = function(txp, cb) {
+    var fc = profileService.focusedClient;
     self.setOngoingProcess(gettext('Signing transaction'));
     fc.signTxProposal(txp, function(err, signedTx) {
       profileService.lockFC();
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
new file mode 100644
index 000000000..00c31542b
--- /dev/null
+++ b/src/js/services/ledger.js
@@ -0,0 +1,486 @@
+'use strict';
+
+angular.module('copayApp.services')
+  .factory('ledger', function(bwcService) {
+    var root = {};
+    var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf";
+
+    root.callbacks = {};
+
+    root.hasSession = function() {
+      root._message({ command:"has_session" });
+    }
+
+    root.getXPubKey = function(index, callback) {
+      root.callbacks["get_xpubkey"] = callback;
+      root._messageAfterSession({ command:"get_xpubkey", path:root._getPath(index) })
+    };
+
+    root.signTx = function(txp, index, callback) {
+      root.callbacks["sign_p2sh"] = callback;
+      var redeemScripts = [];
+      var paths = [];
+      var tx = bwcService.getUtils().buildTx(txp);
+      for (var i=0; i<tx.inputs.length; i++) {
+        redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
+        paths.push(root._getPath(index) + txp.inputs[i].path.substring(1));
+      }
+      var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
+      var inputs = [];
+      for (var i=0; i<splitTransaction.inputs.length; i++) {
+        var input = splitTransaction.inputs[i];
+        inputs.push([
+          root._reverseBytestring(input.prevout.bytes(0, 32)).toString(),
+          root._reverseBytestring(input.prevout.bytes(32)).toString()
+        ]);
+      }
+      root._messageAfterSession({ 
+        command:"sign_p2sh", 
+        inputs: inputs, 
+        scripts: redeemScripts,
+        outputs_number: splitTransaction.outputs.length, 
+        outputs_script: splitTransaction.outputScript.toString(), 
+        paths: paths });                   
+    }
+
+    root._message = function(data) {
+      chrome.runtime.sendMessage(
+        LEDGER_CHROME_ID, 
+        { request: data }, 
+        function(response) { 
+          root._callback(response);
+        }
+      );
+    }
+
+    root._messageAfterSession = function(data) {
+      root._after_session = data;
+      root._message({ command:"launch" });
+      root._should_poll_session = true;
+      root._do_poll_session();
+    }
+
+    root._do_poll_session = function() {
+      root.hasSession();
+      if (root._should_poll_session) {
+        setTimeout(root._do_poll_session, 500);
+      }
+    }
+
+    root._callback = function(data) {
+      if (typeof data == "object") {
+        if (data.command == "has_session" && data.success) {
+          root._message(root._after_session);
+          root._after_session = null;
+          root._should_poll_session = false;
+        } else if (typeof root.callbacks[data.command] == "function") {
+          root.callbacks[data.command](data);
+        }
+      } else {
+        root._should_poll_session = false;
+        Object.keys(root.callbacks).forEach(function (key) { 
+          root.callbacks[key]({ success: false, message: "The Ledger Chrome application is not installed" });
+        });       
+      }
+    }
+
+    root._getPath = function(index) {
+      return bwcService.getUtils().PATHS.BASE_ADDRESS_DERIVATION + "/" + index;
+    }
+
+    root._splitTransaction = function(transaction) {
+      var result = {};
+      var inputs = [];
+      var outputs = [];
+      var offset = 0;
+      var version = transaction.bytes(offset, 4);
+      offset += 4;
+      var varint = root._getVarint(transaction, offset);
+      var numberInputs = varint[0];
+      offset += varint[1];
+      for (var i=0; i<numberInputs; i++) {
+        var input = {};
+        input['prevout'] = transaction.bytes(offset, 36);
+        offset += 36;
+        varint = root._getVarint(transaction, offset);
+        offset += varint[1];
+        input['script'] = transaction.bytes(offset, varint[0]);
+        offset += varint[0];
+        input['sequence'] = transaction.bytes(offset, 4);
+        offset += 4;
+        inputs.push(input);
+      }   
+      varint = root._getVarint(transaction, offset);
+      var numberOutputs = varint[0];
+      offset += varint[1];
+      var outputStartOffset = offset;
+      for (var i=0; i<numberOutputs; i++) {
+        var output = {};
+        output['amount'] = transaction.bytes(offset, 8);
+        offset += 8;
+        varint = root._getVarint(transaction, offset);
+        offset += varint[1];
+        output['script'] = transaction.bytes(offset, varint[0]);
+        offset += varint[0];
+        outputs.push(output);
+      }
+      var locktime = transaction.bytes(offset, 4);
+      result['version'] = version;
+      result['inputs'] = inputs;
+      result['outputs'] = outputs;
+      result['locktime'] = locktime;
+      result['outputScript'] = transaction.bytes(outputStartOffset, offset - outputStartOffset);
+      return result;
+    }
+
+    root._getVarint = function(data, offset) {
+      if (data.byteAt(offset) < 0xfd) {
+        return [ data.byteAt(offset), 1 ];
+      }
+      if (data.byteAt(offset) == 0xfd) {
+        return [ ((data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 3 ];
+      }
+      if (data.byteAt(offset) == 0xfe) {
+        return [ ((data.byteAt(offset + 4) << 24) + (data.byteAt(offset + 3) << 16) + 
+            (data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 5 ];
+      }
+    }
+
+    root._reverseBytestring = function(x) {
+      var res = "";
+      for (var i=x.length - 1; i>=0; i--) {
+        res += Convert.toHexByte(x.byteAt(i));
+      }
+      return new ByteString(res, GP.HEX);
+    }
+
+    return root;
+  });
+
+var Convert = {}; 
+
+/**
+ * Convert a binary string to his hexadecimal representation
+ * @param {String} src binary string
+ * @static
+ * @returns {String} hexadecimal representation
+ */
+Convert.stringToHex = function(src) {
+  var r = "";
+  var hexes = new Array ("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f");
+  for (var i=0; i<src.length; i++) {r += hexes [src.charCodeAt(i) >> 4] + hexes [src.charCodeAt(i) & 0xf];}
+  return r; 
+}
+
+/**
+ * Convert an hexadecimal string to its binary representation
+ * @param {String} src hexadecimal string
+ * @static
+ * @return {Array} byte array
+ * @throws {InvalidString} if the string isn't properly formatted
+ */
+Convert.hexToBin = function(src) {
+   var result = "";
+   var digits = "0123456789ABCDEF";
+   if ((src.length % 2) != 0) {
+  throw "Invalid string";
+   }
+   src = src.toUpperCase();
+   for (var i=0; i<src.length; i+=2) {
+  var x1 = digits.indexOf(src.charAt(i));
+        if (x1 < 0) {
+    return "";
+  }
+  var x2 = digits.indexOf(src.charAt(i + 1));
+  if (x2 < 0) {
+    return "";
+  }
+  result += String.fromCharCode((x1 << 4) + x2);
+   }
+   return result;
+}
+
+/**
+ * Convert a double digit hexadecimal number to an integer
+ * @static
+ * @param {String} data buffer containing the digit to parse
+ * @param {Number} offset offset to the digit (default is 0)
+ * @returns {Number} converted digit
+ */
+Convert.readHexDigit = function(data, offset) {
+  var digits = '0123456789ABCDEF';
+  if (typeof offset == "undefined") {
+    offset = 0;
+  }
+  return (digits.indexOf(data.substring(offset, offset + 1).toUpperCase()) << 4) + (digits.indexOf(data.substring(offset + 1, offset + 2).toUpperCase()));  
+}
+
+/**
+ * Convert a number to a two digits hexadecimal string (deprecated)
+ * @static
+ * @param {Number} number number to convert
+ * @returns {String} converted number
+ */
+Convert.toHexDigit = function(number) {
+  var digits = '0123456789abcdef';
+  return digits.charAt(number >> 4) + digits.charAt(number & 0x0F);
+}
+
+/**
+ * Convert a number to a two digits hexadecimal string (similar to toHexDigit)
+ * @static
+ * @param {Number} number number to convert
+ * @returns {String} converted number
+ */
+Convert.toHexByte = function(number) {
+  return Convert.toHexDigit(number);
+}
+
+/**
+ * Convert a BCD number to a two digits hexadecimal string
+ * @static
+ * @param {Number} number number to convert
+ * @returns {String} converted number
+ */
+Convert.toHexByteBCD = function(numberBCD) {
+  var number = ((numberBCD / 10) * 16) + (numberBCD % 10);
+  return Convert.toHexDigit(number);
+}
+
+
+/**
+ * Convert a number to an hexadecimal short number
+ * @static
+ * @param {Number} number number to convert
+ * @returns {String} converted number
+ */
+Convert.toHexShort = function(number) {
+  return Convert.toHexDigit((number >> 8) & 0xff) + Convert.toHexDigit(number & 0xff);
+}
+
+/**
+ * Convert a number to an hexadecimal int number
+ * @static
+ * @param {Number} number number to convert
+ * @returns {String} converted number
+ */
+Convert.toHexInt = function(number) {
+  return Convert.toHexDigit((number >> 24) & 0xff) + Convert.toHexDigit((number >> 16) & 0xff) +
+       Convert.toHexDigit((number >> 8) & 0xff) + Convert.toHexDigit(number & 0xff);
+}
+
+
+var GP = {};
+GP.ASCII = 1;
+GP.HEX = 5;
+
+/**
+  * @class GPScript ByteString implementation
+  * @param {String} value initial value
+  * @param {HEX|ASCII} encoding encoding to use
+  * @property {Number} length length of the ByteString
+  * @constructs
+*/
+var ByteString = function(value, encoding) {
+    this.encoding = encoding;
+    this.hasBuffer = (typeof Buffer != 'undefined');
+    if (this.hasBuffer && (value instanceof Buffer)) {
+      this.value = value;
+      this.encoding = GP.HEX;     
+    }
+    else {
+      switch(encoding) {
+        case GP.HEX:
+          if (!this.hasBuffer) {
+            this.value = Convert.hexToBin(value);
+          }
+          else {
+            this.value = new Buffer(value, 'hex'); 
+          }
+          break;
+      
+        case GP.ASCII:
+          if (!this.hasBuffer) {
+            this.value = value;
+          }
+          else {
+            this.value = new Buffer(value, 'ascii'); 
+          }
+          break;
+        
+        default:
+          throw "Invalid arguments"; 
+      }
+    }
+    this.length = this.value.length;
+}
+
+/**
+ * Retrieve the byte value at the given index
+ * @param {Number} index index
+ * @returns {Number} byte value
+*/
+ByteString.prototype.byteAt = function(index) {
+    if (arguments.length < 1) {
+      throw "Argument missing";
+    }   
+    if (typeof index != "number") {
+      throw "Invalid index";
+    }   
+    if ((index < 0) || (index >= this.value.length)) {
+      throw "Invalid index offset";
+    }
+    if (!this.hasBuffer) {
+      return Convert.readHexDigit(Convert.stringToHex(this.value.substring(index, index + 1)));
+    }
+    else {
+      return this.value[index];
+    }
+}
+  
+/**
+ * Retrieve a subset of the ByteString
+ * @param {Number} offset offset to start at
+ * @param {Number} [count] size of the target ByteString (default : use the remaining length)
+ * @returns {ByteString} subset of the original ByteString 
+*/
+ByteString.prototype.bytes = function(offset, count) {
+    var result;
+    if (arguments.length < 1) {
+      throw "Argument missing";
+    }
+    if (typeof offset != "number") {
+      throw "Invalid offset";
+    }
+    //if ((offset < 0) || (offset >= this.value.length)) {
+    if (offset < 0) {
+      throw "Invalid offset";
+    }
+    if (typeof count == "number") {
+      if (count < 0) {
+        throw "Invalid count";
+      }
+      if (!this.hasBuffer) {
+        result = new ByteString(this.value.substring(offset, offset + count), GP.ASCII);
+      }
+      else {
+        result = new Buffer(count);
+        this.value.copy(result, 0, offset, offset + count);
+      }
+    }
+    else 
+    if (typeof count == "undefined") {
+      if (!this.hasBuffer) {
+        result = new ByteString(this.value.substring(offset), GP.ASCII);
+      }
+      else {
+        result = new Buffer(this.value.length - offset);
+        this.value.copy(result, 0, offset, this.value.length);
+      }
+    }
+    else {
+      throw "Invalid count";
+    }
+    if (!this.hasBuffer) {
+      result.encoding = this.encoding;
+      return result;      
+    }
+    else {
+      return new ByteString(result, GP.HEX);
+    }
+}
+
+/**
+ * Appends two ByteString
+ * @param {ByteString} target ByteString to append
+ * @returns {ByteString} result of the concatenation
+*/
+ByteString.prototype.concat = function(target) {
+    if (arguments.length < 1) {
+      throw "Not enough arguments";
+    }   
+    if (!(target instanceof ByteString)) {
+      throw "Invalid argument";
+    }
+    if (!this.hasBuffer) {
+      var result = this.value + target.value;
+      var x = new ByteString(result, GP.ASCII);
+      x.encoding = this.encoding;
+      return x;         
+    }
+    else {
+      var result = Buffer.concat([this.value, target.value]);
+      return new ByteString(result, GP.HEX);
+    }
+}
+  
+/**
+ * Check if two ByteString are equal
+ * @param {ByteString} target ByteString to check against
+ * @returns {Boolean} true if the two ByteString are equal
+*/
+ByteString.prototype.equals = function(target) {
+    if (arguments.length < 1) {
+      throw "Not enough arguments";
+    }   
+    if (!(target instanceof ByteString)) {
+      throw "Invalid argument";
+    }
+    if (!this.hasBuffer) {
+      return (this.value == target.value);
+    }
+    else {
+      return Buffer.equals(this.value, target.value);
+    }
+}
+  
+  
+/**
+ * Convert the ByteString to a String using the given encoding
+ * @param {HEX|ASCII|UTF8|BASE64|CN} encoding encoding to use
+ * @return {String} converted content
+*/
+ByteString.prototype.toString = function(encoding) {
+    var targetEncoding = this.encoding;
+    if (arguments.length >= 1) {
+      if (typeof encoding != "number") {
+        throw "Invalid encoding";
+      }
+      switch(encoding) {
+        case GP.HEX:
+        case GP.ASCII:
+          targetEncoding = encoding;
+          break;
+        
+        default:
+          throw "Unsupported arguments";
+      }
+      targetEncoding = encoding;
+    }
+    switch(targetEncoding) {
+      case GP.HEX:
+        if (!this.hasBuffer) {
+          return Convert.stringToHex(this.value);
+        }
+        else {
+          return this.value.toString('hex');
+        }
+      case GP.ASCII:
+        if (!this.hasBuffer) {
+          return this.value;
+        }
+        else {
+          return this.value.toString();
+        }
+      default:
+        throw "Unsupported";
+    }   
+  }
+  
+ByteString.prototype.toStringIE =  function(encoding) {
+  return this.toString(encoding);
+}
+
+ByteString.prototype.toBuffer = function() {
+  return this.value;
+}
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 0afbef3b8..c0bfe7ec7 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger) {
 
     var root = {};
 
@@ -193,6 +193,12 @@ angular.module('copayApp.services')
         } catch (ex) {
           return cb(gettext('Could not create using the specified extended private key'));
         }
+      } else if (opts.extendedPublicKey) {
+        try {
+          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex);
+        } catch (ex) {
+          return cb(gettext('Could not create using the specified extended public key'));
+        }
       }
       walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
         network: opts.networkName
@@ -219,8 +225,13 @@ angular.module('copayApp.services')
         } catch (ex) {
           return cb(gettext('Could not join using the specified extended private key'));
         }
-      }
-
+      } else if (opts.extendedPublicKey) {
+        try {
+          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex);
+        } catch (ex) {
+          return cb(gettext('Could not create using the specified extended public key'));
+        }
+      }      
 
       try {
         var walletData = this.getUtils().fromSecret(opts.secret);

From d3cbb03004b4bb1801422a23e46675e932bc645c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Fri, 17 Jul 2015 16:38:52 +0200
Subject: [PATCH 02/47] Cleanup

---
 public/views/create.html     | 2 +-
 public/views/join.html       | 2 +-
 src/js/controllers/create.js | 2 +-
 src/js/controllers/join.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 489808cf3..a408d08fb 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -112,7 +112,7 @@
             </label>
             <div ng-hide="hideSlots">
               <label class="line-b oh"><span translate>Select slot number for Ledger key</span>
-                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externatIndexValues">
+                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
                 </select>
               </label>
             </div>         
diff --git a/public/views/join.html b/public/views/join.html
index 437a07fdc..f7bf49656 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -94,7 +94,7 @@
             <div class="large-12 columns" ng-hide="hideSlots">
               <label class="line-b oh">
                 <span translate>Select slot number for Ledger key</span>
-                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in join.externatIndexValues">
+                <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in join.externalIndexValues">
                 </select>
               </label>
             </div>         
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 7bcf141b5..33a9339fb 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('createController',
       $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
     };
 
-    this.externatIndexValues = lodash.range(0,20);
+    this.externalIndexValues = lodash.range(0,20);
     $scope.externalIndex = 0;
     this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
     $scope.totalCopayers = defaults.wallet.totalCopayers;
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index a5e732030..8e338f751 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('joinController',
   function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, isChromeApp, $modal, gettext, lodash, ledger) {
 
     var self = this;
-    this.externatIndexValues = lodash.range(0,20);
+    this.externalIndexValues = lodash.range(0,20);
     $scope.externalIndex = 0;
 
     this.isChromeApp = function() {

From d173ef2e5070921b22ed7ef51db20a13e24b7588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Fri, 17 Jul 2015 16:49:56 +0200
Subject: [PATCH 03/47] Use gettext for error message

---
 src/js/controllers/create.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 33a9339fb..ed017f509 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -91,7 +91,7 @@ angular.module('copayApp.controllers').controller('createController',
           self.loading = false;
           if (err) {
             if (err == "Error creating wallet" && opts.extendedPublicKey) {
-              err = "This xpub index is already used by another wallet. Please select another index."
+              err = gettext("This xpub index is already used by another wallet. Please select another index.");
             }
             $log.debug(err);
             self.error = err;

From 239b5a5d9d36d19770ff9bee9dae88b7eaad6505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Fri, 17 Jul 2015 19:24:31 +0200
Subject: [PATCH 04/47] Fix hide/show of Ledger slots

---
 public/views/create.html | 6 +++---
 public/views/join.html   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index a408d08fb..eafb87723 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -100,7 +100,7 @@
             <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
           </a>
         </div>
-        <div ng-hide="hideAdv" class="row" ng-init="hideSlots=true">
+        <div ng-hide="hideAdv" class="row">
           <div class="large-12 columns">
             <label for="network-name" class="line-b oh">
               <span translate>Testnet</span>
@@ -108,9 +108,9 @@
             </label>
             <label ng-show="create.isChromeApp()" for="hw-ledger" class="line-b oh">
               <span translate>Use Ledger hardware wallet</span>
-              <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b" ng-change="hideSlots=false"></switch>
+              <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
             </label>
-            <div ng-hide="hideSlots">
+            <div ng-hide="!hwLedger">
               <label class="line-b oh"><span translate>Select slot number for Ledger key</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
                 </select>
diff --git a/public/views/join.html b/public/views/join.html
index f7bf49656..e42f615f8 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -84,14 +84,14 @@
             <i ng-show="!join.hideAdv" class="icon-arrow-down4"></i>
             <i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
           </a>
-          <div ng-show="join.hideAdv" class="row" ng-init="hideSlots=true">
+          <div ng-show="join.hideAdv" class="row">
             <div class="large-12 columns" ng-show="join.isChromeApp()">
               <label for="hw-ledger" class="line-b oh">
                 <span translate>Use Ledger hardware wallet</span>
-                <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b" ng-change="hideSlots=false"></switch>
+                <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
               </label>
             </div>
-            <div class="large-12 columns" ng-hide="hideSlots">
+            <div class="large-12 columns" ng-hide="!hwLedger">
               <label class="line-b oh">
                 <span translate>Select slot number for Ledger key</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in join.externalIndexValues">

From 0381e81de995dcacf5ee52acd6a527a1a9a1ca35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Thu, 23 Jul 2015 10:47:03 -0700
Subject: [PATCH 05/47] Refactor call of .apply()

---
 src/js/controllers/create.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index ed017f509..668d8dec2 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -67,17 +67,17 @@ angular.module('copayApp.controllers').controller('createController',
         self.ledger = true;
         ledger.getXPubKey($scope.externalIndex, function(data) {
           self.ledger = false;
-          $scope.$apply();
           if (data.success) {
+            $scope.$apply();
             opts.extendedPublicKey = data.xpubkey;
             opts.externalSource = 'ledger';
             opts.externalIndex = $scope.externalIndex;
             self._create(opts);
           } else {
             self.loading = false;
-            $log.debug(data.message);
             self.error = data.message;
             $scope.$apply();
+            $log.debug(data.message);
           }
         });
       } else {

From 300881a180cb17880c033be42d3c2688558327f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Larchev=C3=AAque?= <elarch@gmail.com>
Date: Fri, 24 Jul 2015 10:00:23 -0700
Subject: [PATCH 06/47] If Ledger hardware wallet is enabled, set Testnet as
 false (wallet creation)

---
 public/views/create.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index eafb87723..01e34ed24 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -102,13 +102,9 @@
         </div>
         <div ng-hide="hideAdv" class="row">
           <div class="large-12 columns">
-            <label for="network-name" class="line-b oh">
-              <span translate>Testnet</span>
-              <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
-            </label>
             <label ng-show="create.isChromeApp()" for="hw-ledger" class="line-b oh">
               <span translate>Use Ledger hardware wallet</span>
-              <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
+              <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
             </label>
             <div ng-hide="!hwLedger">
               <label class="line-b oh"><span translate>Select slot number for Ledger key</span>
@@ -116,6 +112,10 @@
                 </select>
               </label>
             </div>         
+            <label ng-hide="hwLedger" for="network-name" class="line-b oh">
+              <span translate>Testnet</span>
+              <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
+            </label>
             <label for="ext-master" class="m10t">
               <span translate>Master extended private key</span>
               <small translate>If not given, a secure key will be generated</small>

From 4c155b78953549e251a76b9175b839e9bf9fb41f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 8 Aug 2015 09:30:50 -0300
Subject: [PATCH 07/47] backup and export working with mnemonics

---
 public/views/backup.html              | 119 +++++++-------------------
 public/views/export.html              | 106 +++++++++++++++++++++++
 public/views/includes/password.html   |   2 +-
 public/views/preferences.html         |   9 +-
 public/views/preferencesAdvanced.html |   7 +-
 src/js/controllers/backup.js          |  87 ++-----------------
 src/js/controllers/export.js          |  86 +++++++++++++++++++
 src/js/routes.js                      |  11 +++
 src/js/services/profileService.js     |  16 ++++
 9 files changed, 271 insertions(+), 172 deletions(-)
 create mode 100644 public/views/export.html
 create mode 100644 src/js/controllers/export.js

diff --git a/public/views/backup.html b/public/views/backup.html
index f0f0d7a22..6db27ad45 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -6,101 +6,48 @@
 
 
 
-<div class="content p20v" ng-controller="backupController as backup">
+<div class="content p20v" ng-controller="wordsController as wordsC">
   <div class="row">
-    <div class="columns" ng-show="!backup.backupWalletPlainText">
-      <div class="text-warning size-14 m20b" ng-show="backup.error">
-        <i class="fi-alert size-12"></i>
-        <span translate> Failed to create backup </span>
-      </div>
-
-      <div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
-        <i class="fi-alert size-12"></i>
-        <span translate> The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive.</span>
-
-      </div>
-
-      <label for="password" translate>Set up a Password for your backup</label>
-      <div class="input">
-        <input type="password" class="form-control"
-        placeholder="{{'Your backup password'|translate}}"
-        name="password" ng-model="backup.password">
-      </div>
-
-      <label for="password" translate>Repeat password</label>
-      <div class="input">
-        <input type="password" class="form-control"
-        placeholder="{{'Repeat password'|translate}}"
-        name="password" ng-model="backup.repeatpassword">
-      </div>
-
-
-      <div class="m10t oh" ng-init="hideAdv=true">
-        <a class="button outline light-gray expand tiny" ng-click="hideAdv=!hideAdv">
+    <div class="m10 size-14 text-gray" translate>
+      <span translate>
+        In order to restore your Copay wallet you will need these 12 backup words. 
+      </span>
+      <span translate class="text-bold">
+        Write them down and keep them somethere safe
+      </span>
+    </div>
+  </div>
+ 
+  <div class="row">
+      <div class="m10t oh" ng-init="show=false">
+        <a class="button outline light-gray expand tiny" ng-click="show=!show">
           <i class="fi-widget m3r"></i>
-          <span translate ng-hide="!hideAdv">Show advanced options</span>
-          <span translate ng-hide="hideAdv">Hide advanced options</span>
-          <i ng-if="hideAdv" class="icon-arrow-down4"></i>
-          <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
+          <span translate ng-hide="show">Show Backup Words</span>
+          <span translate ng-hide="!show">Hide Backup Words</span>
+          <i ng-if="!show" class="icon-arrow-down4"></i>
+          <i ng-if="show" class="icon-arrow-up4"></i>
         </a>
       </div>
-      <div ng-hide="hideAdv" class="row">
-        <div class="large-12 columns">
-          <label for="no-sign" class="line-b oh">
-            <span translate>Do not include private key in backup</span>
-            <switch id="no-sign" name="noSign" ng-model="noSign" class="green right m5t m10b"></switch>
-          </label>
-        </div>
+  </div>
 
+  <div class="row" ng-show="show" ng-init="words = wordsC.getMnemonic()">
+      <span class="m10" ng-repeat="word in words">
+        {{word}}
+      </span>
+      <div class="m10 text-center">
         <div class="m10 size-14 text-gray" translate>
-          A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals.
-
+          <span translate>
+            Once you have wrote your backup words, it is recommended to delete them from Copay.
+          </span>
         </div>
+        <button class="button outline round dark-gray tiny" translate>DELETE WORDS</button>
       </div>
-
-
-      <button class="black round expand m0" ng-click="backup.downloadWalletBackup()"
-        ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
-        ng-style="{'background-color':index.backgroundColor}"
-        ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
-        <span translate>Download backup</span></button>
-      <button class="black round expand m0" ng-click="backup.viewWalletBackup()"
-        ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
-        ng-style="{'background-color':index.backgroundColor}"
-        ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
-        <span translate>View backup</span></button>
-      <div ng-show="backup.isCordova">
-        <h4 translate>Backup options</h4>
-        <button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
-          ng-style="{'background-color':index.backgroundColor}"
-          ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
-          <span translate>Copy to clipboard</span></button>
-        <button class="black round expand m0" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
-          ng-style="{'background-color':index.backgroundColor}"
-          ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
-          <span translate>Send by email</span></button>
-      </div>
-    </div>
   </div>
-
-  <div class="row" ng-show="backup.backupWalletPlainText">
-    <div class="large-12 columns">
-      <h3 translate>Copy backup to a safe place</h3>
-      <div class="input">
-        <textarea rows="12">{{backup.backupWalletPlainText}}</textarea>
-      </div>
-      <div class="size-12 text-gray text-right">
-        <i class="icon-compose"></i>
-        <span translate>Copy this text as it is to a safe place (notepad or email)</span>
-      </div>
-    </div>
+  <div class="row text-center m20t" >
+      <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
+        <span class="text-gray" translate>Learn more about Copay backups</span>
+      </button>
+ 
   </div>
-
-  <div class="row m10t">
-    <div class="columns size-14 text-gray" translate>
-      * You can safely install your backup on another device and use your wallet from multiple devices at the same time.
-    </div>
-  </div>
-
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/export.html b/public/views/export.html
new file mode 100644
index 000000000..5a62268ac
--- /dev/null
+++ b/public/views/export.html
@@ -0,0 +1,106 @@
+<div
+  class="topbar-container"
+  ng-include="'views/includes/topbar.html'"
+  ng-init="titleSection='Export'; goBackToState = 'preferences'">
+</div>
+
+
+
+<div class="content p20v" ng-controller="backupController as backup">
+  <div class="row">
+    <div class="columns" ng-show="!backup.backupWalletPlainText">
+      <div class="text-warning size-14 m20b" ng-show="backup.error">
+        <i class="fi-alert size-12"></i>
+        <span translate> Failed to export </span>
+      </div>
+
+      <div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
+        <i class="fi-alert size-12"></i>
+        <span translate> The private key for this wallet is encrypted. Exporting  keep the private key encrypted in the export archive.</span>
+
+      </div>
+
+      <label for="password" translate>Set up a Export Password </label>
+      <div class="input">
+        <input type="password" class="form-control"
+        placeholder="{{'Your export password'|translate}}"
+        name="password" ng-model="backup.password">
+      </div>
+
+      <label for="password" translate>Repeat password</label>
+      <div class="input">
+        <input type="password" class="form-control"
+        placeholder="{{'Repeat password'|translate}}"
+        name="password" ng-model="backup.repeatpassword">
+      </div>
+
+
+      <div class="m10t oh" ng-init="hideAdv=true">
+        <a class="button outline light-gray expand tiny" ng-click="hideAdv=!hideAdv">
+          <i class="fi-widget m3r"></i>
+          <span translate ng-hide="!hideAdv">Show Advanced options</span>
+          <span translate ng-hide="hideAdv">Hide Advanced options</span>
+          <i ng-if="hideAdv" class="icon-arrow-down4"></i>
+          <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
+        </a>
+      </div>
+      <div ng-hide="hideAdv" class="row">
+        <div class="large-12 columns">
+          <label for="no-sign" class="line-b oh">
+            <span translate>Do not include private key</span>
+            <switch id="no-sign" name="noSign" ng-model="noSign" class="green right m5t m10b"></switch>
+          </label>
+        </div>
+
+        <div class="m10 size-14 text-gray" translate>
+          Not including the private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals.
+
+        </div>
+      </div>
+
+
+      <button class="black round expand m0" ng-click="backup.downloadWalletBackup()"
+        ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
+        ng-style="{'background-color':index.backgroundColor}"
+        ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
+        <span translate>Download backup</span></button>
+      <button class="black round expand m0" ng-click="backup.viewWalletBackup()"
+        ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
+        ng-style="{'background-color':index.backgroundColor}"
+        ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
+        <span translate>View backup</span></button>
+      <div ng-show="backup.isCordova">
+        <h4 translate>Backup options</h4>
+        <button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
+          ng-style="{'background-color':index.backgroundColor}"
+          ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
+          <span translate>Copy to clipboard</span></button>
+        <button class="black round expand m0" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
+          ng-style="{'background-color':index.backgroundColor}"
+          ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
+          <span translate>Send by email</span></button>
+      </div>
+    </div>
+  </div>
+
+  <div class="row" ng-show="backup.backupWalletPlainText">
+    <div class="large-12 columns">
+      <h3 translate>Copy backup to a safe place</h3>
+      <div class="input">
+        <textarea rows="12">{{backup.backupWalletPlainText}}</textarea>
+      </div>
+      <div class="size-12 text-gray text-right">
+        <i class="icon-compose"></i>
+        <span translate>Copy this text as it is to a safe place (notepad or email)</span>
+      </div>
+    </div>
+  </div>
+
+  <div class="row m10t">
+    <div class="columns size-14 text-gray" translate>
+      * You can safely install your backup on another device and use your wallet from multiple devices at the same time.
+    </div>
+  </div>
+
+</div>
+<div class="extra-margin-bottom"></div>
diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index 64f5d0961..2cce4467b 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -37,7 +37,7 @@
 
     <p class="text-warning size-12 columns m20t text-center" ng-show="index.askPassword.isSetup">
       <i class="fi-alert"></i>
-      <span translate ng-show="!pass.error">Password cannot be recovered. Be sure to write it down</span>
+      <span translate ng-show="!pass.error"> Your wallet key will be encrypted. Password cannot be recovered. Be sure to write it down</span>
 
       <span ng-show="pass.error">{{pass.error|translate}}</span>
     </p>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index fdc3f250f..d2ee6d669 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -36,8 +36,9 @@
         <span ng-style="{'color':index.backgroundColor}">&block;</span>
       </span>      
     </li>
-    <li class="line-b p20" ng-hide="preferences.externalIndex >= 0">
-      <span translate>Encrypt Private Key</span>
+
+    <li class="line-b p20"  ng-hide="preferences.externalIndex >= 0">
+      <span translate>Request Password for Spending Funds</span>
       <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
     </li>
     <li class="line-b p20" ng-show="preferences.externalIndex >= 0">
@@ -49,9 +50,9 @@
     </li>
  
     <h4 class="title m0">&nbsp;</h4>
-    <li class="line-b p20" ng-click="$root.go('backup')">
+    <li class="line-b p20" ng-click="$root.go('export')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <span translate>Backup</span>
+      <span translate>Export</span>
     </li>
     <li class="line-b p20" ng-click="$root.go('preferencesAdvanced')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index c7fbd1d9e..c1de03794 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -16,7 +16,12 @@
     <li class="line-b p20" ng-click="index.retryScan(); $root.go('walletHome'); ">
       <span translate>Scan addresses for funds</span>
     </li>
- 
+
+    <li class="line-b p20" ng-click="$root.go('addaccess');">
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
+      <span translate>Add access (TODO)</span>
+    </li>
+
     <li class="line-b p20" ng-click="$root.go('delete')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Delete Wallet</span>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index ea9325a64..c270d41c6 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -1,86 +1,13 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('backupController',
-  function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext, gettextCatalog) {
-    this.isSafari = isMobile.Safari();
-    this.isCordova = isCordova;
-    this.error = null;
-    this.success = null;
-
-    var fc = profileService.focusedClient;
-    this.isEncrypted = fc.isPrivKeyEncrypted();
-
-    this.downloadWalletBackup = function() {
-      var self = this;
-      var opts = {
-        noSign: $scope.noSign,
-      };
-      backupService.walletDownload(this.password, opts, function(err) {
-        if (err) {
-          self.error = true;
-          return ;
-        }
-        $rootScope.$emit('Local/BackupDone');
-        notification.success(gettext('Backup created'), gettext('Encrypted backup file saved'));
-        go.walletHome();
-      });
-    };
-
-    this.getBackup = function() {
-      var opts = {
-        noSign: $scope.noSign,
-      };
-
-      var ew = backupService.walletExport(this.password, opts);
-      if (!ew) {
-        this.error = true;
-      } else {
-        this.error = false;
-      }
-      return ew;
-    };
-
-    this.viewWalletBackup = function() {
-      var self = this;
-      $timeout(function() {
-        var ew = self.getBackup();
-        if (!ew) return;
-        self.backupWalletPlainText = ew;
-        $rootScope.$emit('Local/BackupDone');
-      }, 100);
-    };
-
-    this.copyWalletBackup = function() {
-      var ew = this.getBackup();
-      if (!ew) return;
-      window.cordova.plugins.clipboard.copy(ew);
-      window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard'));
-      $rootScope.$emit('Local/BackupDone');
-    };
-
-    this.sendWalletBackup = function() {
+angular.module('copayApp.controllers').controller('wordsController',
+  function($rootScope, $scope, $timeout, profileService, go, gettext) {
+    this.getMnemonic = function() {
       var fc = profileService.focusedClient;
-      if (isMobile.Android() || isMobile.Windows()) {
-        window.ignoreMobilePause = true;
-      }
-      window.plugins.toast.showShortCenter(gettextCatalog.getString('Preparing backup...'));
-      var name = (fc.credentials.walletName || fc.credentials.walletId);
-      if (fc.alias) {
-        name = fc.alias + ' [' + name + ']';
-      }
-      var ew = this.getBackup();
-      if (!ew) return;
+      var words = fc.getMnemonic();
+console.log('[backup.js.7:words:]',words); //TODO
+      if (!words) return;
 
-      if( $scope.noSign) 
-        name = name + '(No Private Key)';
-
-      var properties = {
-        subject: 'Copay Wallet Backup: ' + name,
-        body: 'Here is the encrypted backup of the wallet ' + name + ': \n\n' + ew + '\n\n To import this backup, copy all text between {...}, including the symbols {}',
-        isHtml: false
-      };
-      $rootScope.$emit('Local/BackupDone');
-      window.plugin.email.open(properties);
+      return words.split(' ');
     };
-
   });
diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js
new file mode 100644
index 000000000..ea9325a64
--- /dev/null
+++ b/src/js/controllers/export.js
@@ -0,0 +1,86 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('backupController',
+  function($rootScope, $scope, $timeout, backupService, profileService, isMobile, isCordova, notification, go, gettext, gettextCatalog) {
+    this.isSafari = isMobile.Safari();
+    this.isCordova = isCordova;
+    this.error = null;
+    this.success = null;
+
+    var fc = profileService.focusedClient;
+    this.isEncrypted = fc.isPrivKeyEncrypted();
+
+    this.downloadWalletBackup = function() {
+      var self = this;
+      var opts = {
+        noSign: $scope.noSign,
+      };
+      backupService.walletDownload(this.password, opts, function(err) {
+        if (err) {
+          self.error = true;
+          return ;
+        }
+        $rootScope.$emit('Local/BackupDone');
+        notification.success(gettext('Backup created'), gettext('Encrypted backup file saved'));
+        go.walletHome();
+      });
+    };
+
+    this.getBackup = function() {
+      var opts = {
+        noSign: $scope.noSign,
+      };
+
+      var ew = backupService.walletExport(this.password, opts);
+      if (!ew) {
+        this.error = true;
+      } else {
+        this.error = false;
+      }
+      return ew;
+    };
+
+    this.viewWalletBackup = function() {
+      var self = this;
+      $timeout(function() {
+        var ew = self.getBackup();
+        if (!ew) return;
+        self.backupWalletPlainText = ew;
+        $rootScope.$emit('Local/BackupDone');
+      }, 100);
+    };
+
+    this.copyWalletBackup = function() {
+      var ew = this.getBackup();
+      if (!ew) return;
+      window.cordova.plugins.clipboard.copy(ew);
+      window.plugins.toast.showShortCenter(gettextCatalog.getString('Copied to clipboard'));
+      $rootScope.$emit('Local/BackupDone');
+    };
+
+    this.sendWalletBackup = function() {
+      var fc = profileService.focusedClient;
+      if (isMobile.Android() || isMobile.Windows()) {
+        window.ignoreMobilePause = true;
+      }
+      window.plugins.toast.showShortCenter(gettextCatalog.getString('Preparing backup...'));
+      var name = (fc.credentials.walletName || fc.credentials.walletId);
+      if (fc.alias) {
+        name = fc.alias + ' [' + name + ']';
+      }
+      var ew = this.getBackup();
+      if (!ew) return;
+
+      if( $scope.noSign) 
+        name = name + '(No Private Key)';
+
+      var properties = {
+        subject: 'Copay Wallet Backup: ' + name,
+        body: 'Here is the encrypted backup of the wallet ' + name + ': \n\n' + ew + '\n\n To import this backup, copy all text between {...}, including the symbols {}',
+        isHtml: false
+      };
+      $rootScope.$emit('Local/BackupDone');
+      window.plugin.email.open(properties);
+    };
+
+  });
diff --git a/src/js/routes.js b/src/js/routes.js
index 18f4206f8..e309bec55 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -453,6 +453,17 @@ angular
           },
         }
       })
+      .state('export', {
+        url: '/export',
+        templateUrl: 'views/export.html',
+        walletShouldBeComplete: true,
+        needProfile: true,
+        views: {
+          'main': {
+            templateUrl: 'views/export.html'
+          },
+        }
+      })
       .state('backup', {
         url: '/backup',
         templateUrl: 'views/backup.html',
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index c0bfe7ec7..d3dcf88ba 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -172,6 +172,17 @@ angular.module('copayApp.services')
       }
 
       var walletClient = bwcService.getClient();
+      // TODO LANG...
+      // TODO...
+      walletClient.seedFromRandomWithMnemonic('livenet');
+console.log('[profileService.js.200:walletClient:]',walletClient); //TODO
+
+console.log('[profileService.js.180]'); //TODO
+console.log('[profileService.js.180]'); //TODO
+console.log('[profileService.js.180]'); //TODO
+console.log('[profileService.js.180]'); //TODO
+console.log('[profileService.js.180]'); //TODO
+
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
         network: 'livenet'
       }, function(err) {
@@ -200,6 +211,11 @@ angular.module('copayApp.services')
           return cb(gettext('Could not create using the specified extended public key'));
         }
       }
+      // TODO LANG...
+      // TODO...
+      walletClient.seedFromRandomWithMnemonic(opts.networkName);
+console.log('[profileService.js.200:walletClient:]',walletClient); //TODO
+
       walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
         network: opts.networkName
       }, function(err, secret) {

From ee04b7f318e4179886027ff18b693ed7b868f1a3 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 8 Aug 2015 10:10:44 -0300
Subject: [PATCH 08/47] set backupFlag after showing the words

---
 public/views/backup.html              | 2 +-
 public/views/preferences.html         | 7 +++++++
 public/views/preferencesAdvanced.html | 5 -----
 src/js/controllers/backup.js          | 6 ++++--
 src/js/controllers/export.js          | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 6db27ad45..52aa511f5 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -22,7 +22,7 @@
       <div class="m10t oh" ng-init="show=false">
         <a class="button outline light-gray expand tiny" ng-click="show=!show">
           <i class="fi-widget m3r"></i>
-          <span translate ng-hide="show">Show Backup Words</span>
+          <span translate ng-hide="show" ng-click="wordsC.done()">Show Backup Words</span>
           <span translate ng-hide="!show">Hide Backup Words</span>
           <i ng-if="!show" class="icon-arrow-down4"></i>
           <i ng-if="show" class="icon-arrow-up4"></i>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index d2ee6d669..ea68b7fee 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -48,6 +48,13 @@
         (index {{preferences.externalIndex}})
       </span>
     </li>
+    <li class="line-b p20" ng-click="$root.go('backup')"  ng-show="preferences.externalIndex >= 0">
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
+      <span class="text-warning right" ng-show="index.needsBackup">
+        <i class="fi-alert"></i> <span translate> Still not done</span>
+      </span>
+      <span translate>Backup</span>
+    </li>
  
     <h4 class="title m0">&nbsp;</h4>
     <li class="line-b p20" ng-click="$root.go('export')">
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index c1de03794..7f1684cda 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -17,11 +17,6 @@
       <span translate>Scan addresses for funds</span>
     </li>
 
-    <li class="line-b p20" ng-click="$root.go('addaccess');">
-      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <span translate>Add access (TODO)</span>
-    </li>
-
     <li class="line-b p20" ng-click="$root.go('delete')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Delete Wallet</span>
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index c270d41c6..a2a502021 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -5,9 +5,11 @@ angular.module('copayApp.controllers').controller('wordsController',
     this.getMnemonic = function() {
       var fc = profileService.focusedClient;
       var words = fc.getMnemonic();
-console.log('[backup.js.7:words:]',words); //TODO
       if (!words) return;
-
       return words.split(' ');
     };
+
+    this.done = function() {
+        $rootScope.$emit('Local/BackupDone');
+    };
   });
diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js
index ea9325a64..3a125cc25 100644
--- a/src/js/controllers/export.js
+++ b/src/js/controllers/export.js
@@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('backupController',
           return ;
         }
         $rootScope.$emit('Local/BackupDone');
-        notification.success(gettext('Backup created'), gettext('Encrypted backup file saved'));
+        notification.success(gettext('Success'), gettext('Encrypted export file saved'));
         go.walletHome();
       });
     };

From 04c0d20525212f4443a08ffb85b792207811d0a4 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 8 Aug 2015 10:58:30 -0300
Subject: [PATCH 09/47] delete words option + confirmDialog refactor

---
 public/views/backup.html              | 72 ++++++++++++++++-----------
 public/views/export.html              | 19 +------
 public/views/preferences.html         |  3 +-
 public/views/preferencesAdvanced.html |  5 ++
 src/js/controllers/backup.js          | 21 +++++++-
 src/js/controllers/index.js           |  1 -
 src/js/controllers/walletHome.js      |  3 +-
 src/js/routes.js                      |  1 +
 src/js/services/confirmDialog.js      | 37 ++++++++++++++
 src/js/services/profileService.js     | 10 +---
 10 files changed, 115 insertions(+), 57 deletions(-)
 create mode 100644 src/js/services/confirmDialog.js

diff --git a/public/views/backup.html b/public/views/backup.html
index 52aa511f5..b3afff887 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -8,7 +8,7 @@
 
 <div class="content p20v" ng-controller="wordsController as wordsC">
   <div class="row">
-    <div class="m10 size-14 text-gray" translate>
+    <div class="m10t columns size-14 text-gray" translate>
       <span translate>
         In order to restore your Copay wallet you will need these 12 backup words. 
       </span>
@@ -17,37 +17,53 @@
       </span>
     </div>
   </div>
+  <div class="row m20t" ng-show="!wordsC.mywords">
+    <div class="columns size-14 text-gray" translate>
+        The backup words had been deleted from this device
+    </div>
+  </div>
  
-  <div class="row">
-      <div class="m10t oh" ng-init="show=false">
-        <a class="button outline light-gray expand tiny" ng-click="show=!show">
-          <i class="fi-widget m3r"></i>
-          <span translate ng-hide="show" ng-click="wordsC.done()">Show Backup Words</span>
-          <span translate ng-hide="!show">Hide Backup Words</span>
-          <i ng-if="!show" class="icon-arrow-down4"></i>
-          <i ng-if="show" class="icon-arrow-up4"></i>
+  <div ng-show="wordsC.mywords">
+    <div class="row">
+        <div class="m10t oh" ng-init="show=false">
+          <a class="button outline light-gray expand tiny" ng-click="show=!show">
+            <i class="fi-widget m3r"></i>
+            <span translate ng-hide="show" ng-click="wordsC.done()">Show Backup Words</span>
+            <span translate ng-hide="!show">Hide Backup Words</span>
+            <i ng-if="!show" class="icon-arrow-down4"></i>
+            <i ng-if="show" class="icon-arrow-up4"></i>
+          </a>
+        </div>
+    </div>
+
+    <div class="row" ng-show="show" >
+        <span class="m10" ng-repeat="word in wordsC.mywords">
+          {{word}}
+        </span>
+        <div class="m10 text-center">
+          <div class="m10 size-14 text-gray" translate>
+            <span translate>
+              Once you have wrote your backup words, it is recommended to delete them from this device.
+            </span>
+          </div>
+          <button class="button outline round dark-gray tiny" ng-click="wordsC.delete()">
+            <i class="fi-trash"></i> 
+            <span translate>
+              DELETE WORDS
+            </span>
+          </button>
+        </div>
+    </div>
+    <div class="row m20t">
+      <div class="columns size-14 text-gray" translate>
+        You can safely install your backup on another device and use your wallet from multiple devices at the same time.  <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
+            <span translate>Learn more about Copay backups</span>
         </a>
+  
       </div>
+    </div>
+
   </div>
 
-  <div class="row" ng-show="show" ng-init="words = wordsC.getMnemonic()">
-      <span class="m10" ng-repeat="word in words">
-        {{word}}
-      </span>
-      <div class="m10 text-center">
-        <div class="m10 size-14 text-gray" translate>
-          <span translate>
-            Once you have wrote your backup words, it is recommended to delete them from Copay.
-          </span>
-        </div>
-        <button class="button outline round dark-gray tiny" translate>DELETE WORDS</button>
-      </div>
-  </div>
-  <div class="row text-center m20t" >
-      <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
-        <span class="text-gray" translate>Learn more about Copay backups</span>
-      </button>
- 
-  </div>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/export.html b/public/views/export.html
index 5a62268ac..2196c87f8 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -1,7 +1,7 @@
 <div
   class="topbar-container"
   ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Export'; goBackToState = 'preferences'">
+  ng-init="titleSection='Export'; goBackToState = 'preferencesAdvanced'">
 </div>
 
 
@@ -35,16 +35,7 @@
       </div>
 
 
-      <div class="m10t oh" ng-init="hideAdv=true">
-        <a class="button outline light-gray expand tiny" ng-click="hideAdv=!hideAdv">
-          <i class="fi-widget m3r"></i>
-          <span translate ng-hide="!hideAdv">Show Advanced options</span>
-          <span translate ng-hide="hideAdv">Hide Advanced options</span>
-          <i ng-if="hideAdv" class="icon-arrow-down4"></i>
-          <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
-        </a>
-      </div>
-      <div ng-hide="hideAdv" class="row">
+      <div class="row">
         <div class="large-12 columns">
           <label for="no-sign" class="line-b oh">
             <span translate>Do not include private key</span>
@@ -96,11 +87,5 @@
     </div>
   </div>
 
-  <div class="row m10t">
-    <div class="columns size-14 text-gray" translate>
-      * You can safely install your backup on another device and use your wallet from multiple devices at the same time.
-    </div>
-  </div>
-
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index ea68b7fee..005df5bd5 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -57,10 +57,11 @@
     </li>
  
     <h4 class="title m0">&nbsp;</h4>
-    <li class="line-b p20" ng-click="$root.go('export')">
+    <li class="line-b p20" ng-click="$root.go('export')" ng-hide="preferences.externalIndex >= 0">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Export</span>
     </li>
+ 
     <li class="line-b p20" ng-click="$root.go('preferencesAdvanced')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Advanced</span>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 7f1684cda..da39f5c3d 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -16,6 +16,11 @@
     <li class="line-b p20" ng-click="index.retryScan(); $root.go('walletHome'); ">
       <span translate>Scan addresses for funds</span>
     </li>
+ 
+    <li class="line-b p20" ng-click="$root.go('export')">
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
+      <span translate>Export</span>
+    </li>
 
     <li class="line-b p20" ng-click="$root.go('delete')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index a2a502021..56f71c58f 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -1,7 +1,11 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('wordsController',
-  function($rootScope, $scope, $timeout, profileService, go, gettext) {
+  function($rootScope, $scope, $timeout, profileService, go, gettext, confirmDialog, notification) {
+
+    var msg = gettext('Are you to delete the backup words?');
+    var successMsg = gettext('Backup words deleted');
+
     this.getMnemonic = function() {
       var fc = profileService.focusedClient;
       var words = fc.getMnemonic();
@@ -12,4 +16,19 @@ angular.module('copayApp.controllers').controller('wordsController',
     this.done = function() {
         $rootScope.$emit('Local/BackupDone');
     };
+
+    this.delete = function() {
+      var fc = profileService.focusedClient;
+      confirmDialog.show(msg,function(ok){
+        if (ok) {
+          fc.clearMnemonic();
+          profileService.updateCredentialsFC(function() {
+            notification.success(successMsg);
+            go.walletHome();
+          });
+        }
+      });
+    };
+
+    this.mywords = this.getMnemonic();
   });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 9dfcd0efc..68796383d 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -773,7 +773,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     $timeout(function() {
       $rootScope.$apply();
     });
-
   };
 
   self.recreate = function(cb) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 4bc7599b6..fb59383c6 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, utilService) {
+angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, utilService) {
 
   var self = this;
   $rootScope.hideMenuBar = false;
@@ -1138,6 +1138,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     this.setForm(null, amount, null, feeRate);
   };
 
+  // TODO: showPopup alike
   this.confirmDialog = function(msg, cb) {
     if (isCordova) {
       navigator.notification.confirm(
diff --git a/src/js/routes.js b/src/js/routes.js
index e309bec55..97879ae17 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -577,6 +577,7 @@ angular
       preferencesBwsUrl: 12,
       preferencesAlias: 12,
       preferencesEmail: 12,
+      export: 13,
       logs: 13,
       information: 13,
       translators: 13,
diff --git a/src/js/services/confirmDialog.js b/src/js/services/confirmDialog.js
new file mode 100644
index 000000000..47d3ca358
--- /dev/null
+++ b/src/js/services/confirmDialog.js
@@ -0,0 +1,37 @@
+
+'use strict';
+
+angular.module('copayApp.services').factory('confirmDialog', function($log, profileService, configService, gettextCatalog, isCordova, isChromeApp) {
+  var root = {};
+
+
+  var acceptMsg = gettextCatalog.getString('Accept');
+  var cancelMsg = gettextCatalog.getString('Cancel');
+  var confirmMsg = gettextCatalog.getString('Confirm');
+
+  root.show = function(msg, cb) {
+    if (isCordova) { 
+      navigator.notification.confirm(
+        msg,
+        function(buttonIndex) {
+          if (buttonIndex == 1) {
+            $timeout(function() {
+              return cb(true);
+            }, 1);
+          } else {
+            return cb(false);
+          }
+        },
+        confirmMsg, [acceptMsg, cancelMsg]
+      );
+    } else if (isChromeApp) {
+      // No feedback, alert/confirm not supported.
+      return cb(true);
+    } else {
+      return cb(confirm(msg));
+    }
+  };
+
+  return root;
+});
+
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index d3dcf88ba..c4ef8f997 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -174,14 +174,8 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       // TODO LANG...
       // TODO...
+log.warn("TODO LANG!")
       walletClient.seedFromRandomWithMnemonic('livenet');
-console.log('[profileService.js.200:walletClient:]',walletClient); //TODO
-
-console.log('[profileService.js.180]'); //TODO
-console.log('[profileService.js.180]'); //TODO
-console.log('[profileService.js.180]'); //TODO
-console.log('[profileService.js.180]'); //TODO
-console.log('[profileService.js.180]'); //TODO
 
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
         network: 'livenet'
@@ -213,8 +207,8 @@ console.log('[profileService.js.180]'); //TODO
       }
       // TODO LANG...
       // TODO...
+log.warn("TODO LANG!")
       walletClient.seedFromRandomWithMnemonic(opts.networkName);
-console.log('[profileService.js.200:walletClient:]',walletClient); //TODO
 
       walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
         network: opts.networkName

From 35dc017ddabf764e9033284a143046d28f1bd583 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 10 Aug 2015 15:04:28 -0300
Subject: [PATCH 10/47] WIP - import

---
 public/views/import.html | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/views/import.html b/public/views/import.html
index 6c6213392..cea6ce572 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -4,7 +4,7 @@
   ng-init="titleSection='Import wallet';  goBackToState = 'add'; noColor = true">
 </div>
 
-<div class="content p20v" ng-controller="importController as import">
+<div class="content p20v" ng-controller="importController as import" ng-init="type='12'">
   <div class="onGoingProcess" ng-show="import.loading">
     <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
     <div class="spinner">
@@ -18,6 +18,30 @@
     </div>
   </div>
 
+  <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
+    <div class="row">
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type =='12'}"
+        ng-click="create.setTotalCopayers(1)" translate>12 Words Backup</a>
+      </div>
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type=='file'}"
+        ng-click="create.setTotalCopayers(3)" translate>File/Text Backup</a>
+      </div>
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type=='qr'}"
+        ng-click="create.setTotalCopayers(3)" translate>QR Code</a>
+      </div>
+ 
+    </div>
+ 
+  </div>
+
+ 
+
 
     <div class="row">
       <div class="large-12 columns">

From c58cad3d8b540d4337491a4f69bd17b6c0e4acb5 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 14 Aug 2015 14:13:53 -0300
Subject: [PATCH 11/47] skips scan if wallet is incomplete with changing bws
 server

---
 src/js/controllers/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 68796383d..8f1b6f806 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -810,6 +810,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   self.startScan = function(walletId) {
     var c = profileService.walletClients[walletId];
+    if (!c.isComplete()) return;
 
     if (self.walletId == walletId)
       self.setOngoingProcess('scanning', true);

From 1ab9d8507ff7db0cf4c8d8b7d03c3c34e352d024 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 24 Aug 2015 17:09:59 -0300
Subject: [PATCH 12/47] fix import

---
 public/views/backup.html          |   2 +-
 public/views/create.html          |   1 +
 public/views/import.html          |  65 +++++++++++++++++--
 src/js/controllers/import.js      | 101 ++++++++++++++++++++++++++----
 src/js/controllers/walletHome.js  |   2 +-
 src/js/services/profileService.js |  73 +++++++++++++++------
 6 files changed, 206 insertions(+), 38 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index b3afff887..ef8b0f3ee 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -36,7 +36,7 @@
         </div>
     </div>
 
-    <div class="row" ng-show="show" >
+    <div class="row enable_text_select" ng-show="show"  >
         <span class="m10" ng-repeat="word in wordsC.mywords">
           {{word}}
         </span>
diff --git a/public/views/create.html b/public/views/create.html
index 01e34ed24..20fe87eea 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -123,6 +123,7 @@
               type="text"
               placeholder="{{'BIP32 master extended private key'|translate}}"
               name="privateKey" ng-model="privateKey">
+            </label>
           </div>
         </div>
 
diff --git a/public/views/import.html b/public/views/import.html
index cea6ce572..74507f5eb 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -23,17 +23,17 @@
       <div class="tab-container small-4 medium-4 large-4">
       <a href
         ng-class="{'selected': type =='12'}"
-        ng-click="create.setTotalCopayers(1)" translate>12 Words Backup</a>
+        ng-click="import.setType('12')" translate>12 Words Backup</a>
       </div>
       <div class="tab-container small-4 medium-4 large-4">
       <a href
         ng-class="{'selected': type=='file'}"
-        ng-click="create.setTotalCopayers(3)" translate>File/Text Backup</a>
+        ng-click="import.setType('file')" translate>File/Text Backup</a>
       </div>
       <div class="tab-container small-4 medium-4 large-4">
       <a href
         ng-class="{'selected': type=='qr'}"
-        ng-click="create.setTotalCopayers(3)" translate>QR Code</a>
+        ng-click="import.setType('qr')" translate>QR Code</a>
       </div>
  
     </div>
@@ -42,10 +42,55 @@
 
  
 
-
-    <div class="row">
+    <div class="row" ng-show="type == '12' ">
       <div class="large-12 columns">
-          <form name="importForm" ng-submit="import.import(importForm)" novalidate>
+          <form name="importForm12" ng-submit="import.importMnemonic(importForm12)" novalidate>
+            <div class="box-notification" ng-show="import.error">
+              <span class="text-warning size-14">
+                {{import.error|translate}}
+              </span>
+            </div>
+
+            <div >
+              <label for="words">
+                <span translate>Type the 12 backup words here</span>:
+              </label>
+              <textarea class="form-control" name="words" ng-model="import.words" rows="5"></textarea>
+            </div>
+
+          <div class="m10t oh" ng-init="hideAdv=true">
+            <a class="button outline light-gray expand tiny" ng-click="hideAdv=!hideAdv">
+              <i class="fi-widget m3r"></i>
+              <span translate ng-hide="!hideAdv">Show advanced options</span>
+              <span translate ng-hide="hideAdv">Hide advanced options</span>
+              <i ng-if="hideAdv" class="icon-arrow-down4"></i>
+              <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
+            </a>
+          </div>
+          <div ng-hide="hideAdv" class="row">
+            <div class="large-12 columns">
+              <label for="passphrase" class="line-b oh"><span translate>Passphrase</span>  <small translate>Mnemonics could required a passphrase to be imported</small>
+              <div class="input">
+                <input type="password" class="form-control" placeholder="{{'Your backup passhrase'|translate}}"
+                name="passphrase" ng-model="import.passphrase">
+              </div>
+              </label>
+            </div>
+          </div>
+
+            <button translate type="submit" class="button round expand black"
+              ng-disabled="importForm12.$invalid || import.loading">
+              Import
+            </button>
+          </form>
+      </div>
+    </div>
+
+
+
+    <div class="row" ng-show="type == 'file' ">
+      <div class="large-12 columns">
+          <form name="importForm" ng-submit="import.importBlob(importForm)" novalidate>
             <div class="box-notification" ng-show="import.error">
               <span class="text-warning size-14">
                 {{import.error|translate}}
@@ -88,6 +133,14 @@
 
       </div>
     </div>
+
+    <div class="row" ng-show="type == 'qr'">
+      <div class="large-12 columns">
+TODO
+      </div>
+    </div>
+ 
+
 </div>
 
 <div class="extra-margin-bottom"></div>
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 9be197764..0f94e9574 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, isMobile, isCordova, sjcl, gettext) {
+  function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, isMobile, isCordova, sjcl, gettext, lodash) {
 
     var self = this;
 
@@ -11,15 +11,22 @@ angular.module('copayApp.controllers').controller('importController',
 
     window.ignoreMobilePause = true;
     $scope.$on('$destroy', function() {
-      $timeout(function(){
+      $timeout(function() {
         window.ignoreMobilePause = false;
       }, 100);
     });
 
-    var _import = function(str, opts) {
+    this.setType = function(type) {
+      $scope.type = type;
+      $timeout(function() {
+        $rootScope.$apply();
+      });
+    };
+
+    var _importBlob = function(str, opts) {
       var str2, err;
       try {
-       str2 = sjcl.decrypt(self.password, str);
+        str2 = sjcl.decrypt(self.password, str);
       } catch (e) {
         err = gettext('Could not decrypt file, check your password');
         $log.warn(e);
@@ -27,7 +34,9 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (err) {
         self.error = err;
-        $rootScope.$apply();
+        $timeout(function() {
+          $rootScope.$apply();
+        });
         return;
       }
 
@@ -41,8 +50,7 @@ angular.module('copayApp.controllers').controller('importController',
           self.loading = false;
           if (err) {
             self.error = err;
-          }
-          else {
+          } else {
             $rootScope.$emit('Local/WalletImported', walletId);
             go.walletHome();
             notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
@@ -51,19 +59,54 @@ angular.module('copayApp.controllers').controller('importController',
       }, 100);
     };
 
+
+    var _importMnemonic = function(words, passphrase, opts) {
+      self.loading = true;
+
+      console.log('[import.js.64:opts:]', opts); //TODO
+      $timeout(function() {
+        profileService.importWalletMnemonic(words, {
+          passphrase: passphrase,
+        }, function(err, ret) {
+  console.log('[import.js.70:err:]',err, ret); //TODO
+          self.loading = false;
+          if (err) {
+            self.error = err;
+            return $timeout(function() {
+              $scope.$apply();
+            });
+          }
+          return
+          $rootScope.$emit('Local/WalletImported', walletId);
+          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
+          go.walletHome();
+        });
+      }, 100);
+    };
+
+// {
+//         network: opts.network,
+//         m: opts.m,
+//         n: opts.n,
+//         publicKeyRing: opts.publicKeyRing,
+//       },
+//
     $scope.getFile = function() {
       // If we use onloadend, we need to check the readyState.
       reader.onloadend = function(evt) {
         if (evt.target.readyState == FileReader.DONE) { // DONE == 2
-          _import(evt.target.result);
+          _importBlob(evt.target.result);
         }
       }
     };
 
-    this.import = function(form) {
+    this.importBlob = function(form) {
       if (form.$invalid) {
         this.error = gettext('There is an error in the form');
-        $scope.$apply();
+
+        $timeout(function() {
+          $scope.$apply();
+        });
         return;
       }
 
@@ -73,14 +116,48 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (!backupFile && !backupText) {
         this.error = gettext('Please, select your backup file');
-        $scope.$apply();
+        $timeout(function() {
+          $scope.$apply();
+        });
+
         return;
       }
 
       if (backupFile) {
         reader.readAsBinaryString(backupFile);
       } else {
-        _import(backupText);
+        _importBlob(backupText);
       }
     };
+
+
+    this.importMnemonic = function(form) {
+      if (form.$invalid) {
+        this.error = gettext('There is an error in the form');
+
+        $timeout(function() {
+          $scope.$apply();
+        });
+        return;
+      }
+
+      var opts = {};
+
+      var passphrase = form.passphrase.$modelValue;
+      var words = form.words.$modelValue;
+
+      if (!words || words.split(' ').map(function(v) {
+        return lodash.trim(v);
+      }).length != 12) {
+        this.error = gettext('Please input 12 backup words');
+        $timeout(function() {
+          $scope.$apply();
+        });
+        return;
+      }
+
+      opts.passphrase = form.passphrase.$modelValue || null;
+
+      _importMnemonic(words, passphrase, opts);
+    };
   });
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index fb59383c6..20f9948bf 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -1164,7 +1164,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
   this.sendAll = function(amount, feeStr, feeRate) {
     var self = this;
-    var msg = gettextCatalog.getString("{{fee}} will be discounted for bitcoin networking fees", {
+    var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
       fee: feeStr
     });
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index c4ef8f997..143c2724d 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -25,7 +25,7 @@ angular.module('copayApp.services')
       // Set local object
       if (walletId)
         root.focusedClient = root.walletClients[walletId];
-      else 
+      else
         root.focusedClient = [];
 
       if (lodash.isEmpty(root.focusedClient)) {
@@ -174,7 +174,7 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       // TODO LANG...
       // TODO...
-log.warn("TODO LANG!")
+      $log.warn("TODO LANG!")
       walletClient.seedFromRandomWithMnemonic('livenet');
 
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
@@ -207,7 +207,7 @@ log.warn("TODO LANG!")
       }
       // TODO LANG...
       // TODO...
-log.warn("TODO LANG!")
+      $log.warn("TODO LANG!")
       walletClient.seedFromRandomWithMnemonic(opts.networkName);
 
       walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
@@ -250,7 +250,7 @@ log.warn("TODO LANG!")
         if (lodash.find(root.profile.credentials, {
           'walletId': walletData.walletId
         })) {
-            return cb(gettext('Cannot join the same wallet more that once'));
+          return cb(gettext('Cannot join the same wallet more that once'));
         }
       } catch (ex) {
         return cb(gettext('Bad wallet invitation'));
@@ -298,18 +298,7 @@ log.warn("TODO LANG!")
       });
     };
 
-    root.importWallet = function(str, opts, cb) {
-      var walletClient = bwcService.getClient();
-      $log.debug('Importing Wallet:', opts);
-      try {
-        walletClient.import(str, {
-          compressed: opts.compressed,
-          password: opts.password
-        });
-      } catch (err) {
-        return cb(gettext('Could not import. Check input file and password'));
-      }
-
+    root._addWalletClient = function(walletClient, cb) {
       var walletId = walletClient.credentials.walletId;
 
       // check if exist
@@ -327,8 +316,52 @@ log.warn("TODO LANG!")
           return cb(null, walletId);
         });
       });
+
     };
 
+    root.importWallet = function(str, opts, cb) {
+      var walletClient = bwcService.getClient();
+      $log.debug('Importing Wallet:', opts);
+      try {
+        walletClient.import(str, {
+          compressed: opts.compressed,
+          password: opts.password
+        });
+      } catch (err) {
+        return cb(gettext('Could not import. Check input file and password'));
+      }
+      root._addWalletClient(walletClient, cb);
+    };
+
+    root.importWalletMnemonic = function(words, opts, cb) {
+      var walletClient = bwcService.getClient();
+      $log.debug('Importing Wallet Mnemonic');
+
+      walletClient.importFromMnemonic(words, {
+        passphrase: opts.passphrase,
+      }, function(err) {
+        if (err)
+          return bwsError.cb(err, gettext('Could not import'), cb);
+
+        root._addWalletClient(walletClient, cb);
+      });
+    };
+
+
+    root.importWalletMnemonicEx = function(words, opts, cb) {
+      var walletClient = bwcService.getClient();
+      $log.debug('Importing Wallet Mnemonic EX', opts);
+
+      walletClient.importFromMnemonic(words, opts,
+        function(err) {
+          if (err)
+            return bwsError.cb(err, gettext('Could not import'), cb);
+
+          root._addWalletClient(walletClient, cb);
+        });
+    };
+
+
     root.create = function(opts, cb) {
       $log.info('Creating profile');
       configService.get(function(err) {
@@ -420,13 +453,17 @@ log.warn("TODO LANG!")
       $log.debug('Wallet is encrypted');
       $rootScope.$emit('Local/NeedsPassword', false, function(err2, password) {
         if (err2 || !password) {
-          return cb({message: (err2 || gettext('Password needed'))});
+          return cb({
+            message: (err2 || gettext('Password needed'))
+          });
         }
         try {
           fc.unlock(password);
         } catch (e) {
           $log.debug(e);
-          return cb({message: gettext('Wrong password')});
+          return cb({
+            message: gettext('Wrong password')
+          });
         }
         $timeout(function() {
           if (fc.isPrivKeyEncrypted()) {

From 39e6a81b626a61836a6b75c6891d38f24f97cfd8 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 27 Aug 2015 11:24:39 -0300
Subject: [PATCH 13/47] add controllers files to displaimer and splash

---
 public/views/disclaimer.html      |  6 ++--
 public/views/splash.html          |  2 +-
 src/js/controllers/disclaimer.js  | 28 ++++++++++++++++
 src/js/controllers/index.js       |  2 +-
 src/js/controllers/splash.js      | 32 ++++++++++++++++++
 src/js/routes.js                  | 54 -------------------------------
 src/js/services/profileService.js | 12 ++++---
 7 files changed, 74 insertions(+), 62 deletions(-)
 create mode 100644 src/js/controllers/disclaimer.js
 create mode 100644 src/js/controllers/splash.js

diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
index 6a3d86eba..751b7c863 100644
--- a/public/views/disclaimer.html
+++ b/public/views/disclaimer.html
@@ -2,12 +2,14 @@
   ng-if="agreed && index.hasProfile"
   class="topbar-container"
   ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Terms of Use';  goBackToState = 'about'; noColor = true">
+  ng-init="titleSection='Terms of Use';  goBackToState = 'about'; noColor = true"
+>
+
 </div>
 
 
 
-<div class="content p20b" ng-class="{'disclaimer':!index.hasProfile}">
+<div class="content p20b" ng-class="{'disclaimer':!index.hasProfile}" ng-controller="disclaimerController">
   <h4 class="title m0" ng-show="!index.hasProfile">
     <span translate>Terms of Use</span>
     <logo class="right" width="40"></logo>
diff --git a/public/views/splash.html b/public/views/splash.html
index 5c343df9b..754e969b6 100644
--- a/public/views/splash.html
+++ b/public/views/splash.html
@@ -1,4 +1,4 @@
-<div class="splash content text-center" ng-if="!index.hasProfile">
+<div class="splash content text-center" ng-if="!index.hasProfile" ng-controller="splashController">
 	<div class="row">
 		<div class="medium-centered small-centered large-centered columns">
 			<div class="m20t">
diff --git a/src/js/controllers/disclaimer.js b/src/js/controllers/disclaimer.js
new file mode 100644
index 000000000..1468a7025
--- /dev/null
+++ b/src/js/controllers/disclaimer.js
@@ -0,0 +1,28 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('disclaimerController',
+  function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) {
+    storageService.getCopayDisclaimerFlag(function(err, val) {
+      $scope.agreed = val;
+      $timeout(function() {
+        $scope.$digest();
+      }, 1);
+    });
+
+    $scope.agree = function() {
+      if (isCordova) {
+        window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true);
+      }
+      $scope.loading = true;
+      $timeout(function() {
+        storageService.setCopayDisclaimerFlag(function(err) {
+          $timeout(function() {
+            if (isCordova) {
+              window.plugins.spinnerDialog.hide();
+            }
+            applicationService.restart();
+          }, 1000);
+        });
+      }, 100);
+    };
+  });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 8f1b6f806..3b9af9078 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -273,7 +273,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
         return cb(null, opts.walletStatus);
       else {
         self.updateError = false;
-        return fc.getStatus(function(err, ret) {
+        return fc.getStatus({}, function(err, ret) {
           if (err) {
             self.updateError = bwsError.msg(err, gettext('Could not update Wallet'));
           } else {
diff --git a/src/js/controllers/splash.js b/src/js/controllers/splash.js
new file mode 100644
index 000000000..b957be3f9
--- /dev/null
+++ b/src/js/controllers/splash.js
@@ -0,0 +1,32 @@
+'use strict';
+
+angular.module('copayApp.controllers').controller('splashController',
+  function($scope, $timeout, $log, profileService, storageService, go) {
+    storageService.getCopayDisclaimerFlag(function(err, val) {
+      if (!val) go.path('disclaimer');
+
+      if (profileService.profile) {
+        go.walletHome();
+      }
+    });
+
+    $scope.create = function(noWallet) {
+      $scope.creatingProfile = true;
+
+      $timeout(function() {
+        profileService.create({
+          noWallet: noWallet
+        }, function(err) {
+          if (err) {
+            $scope.creatingProfile = false;
+            $log.warn(err);
+            $scope.error = err;
+            $scope.$apply();
+            $timeout(function() {
+              $scope.create(noWallet);
+            }, 3000);
+          }
+        });
+      }, 100);
+    };
+  });
diff --git a/src/js/routes.js b/src/js/routes.js
index 97879ae17..2487cd4fe 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -81,35 +81,6 @@ angular
         views: {
           'main': {
             templateUrl: 'views/splash.html',
-            controller: function($scope, $timeout, $log, profileService, storageService, go) {
-              storageService.getCopayDisclaimerFlag(function(err, val) {
-                if (!val) go.path('disclaimer');
-
-                if (profileService.profile) {
-                  go.walletHome();
-                }
-              });
-
-              $scope.create = function(noWallet) {
-                $scope.creatingProfile = true;
-
-                $timeout(function() {
-                  profileService.create({
-                    noWallet: noWallet
-                  }, function(err) {
-                    if (err) {
-                      $scope.creatingProfile = false;
-                      $log.warn(err);
-                      $scope.error = err;
-                      $scope.$apply();
-                      $timeout(function() {
-                        $scope.create(noWallet);
-                      }, 3000);
-                    }
-                  });
-                }, 100);
-              };
-            }
           }
         }
       });
@@ -131,31 +102,6 @@ angular
         views: {
           'main': {
             templateUrl: 'views/disclaimer.html',
-            controller: function($scope, $timeout, storageService, applicationService, go, gettextCatalog, isCordova) {
-              storageService.getCopayDisclaimerFlag(function(err, val) {
-                $scope.agreed = val;
-                $timeout(function() {
-                  $scope.$digest();
-                }, 1);
-              });
-
-              $scope.agree = function() {
-                if (isCordova) {
-                  window.plugins.spinnerDialog.show(null, gettextCatalog.getString('Loading...'), true);
-                }
-                $scope.loading = true;
-                $timeout(function() {
-                  storageService.setCopayDisclaimerFlag(function(err) {
-                    $timeout(function() {
-                      if (isCordova) {
-                        window.plugins.spinnerDialog.hide();
-                      }
-                      applicationService.restart();
-                    }, 1000);
-                  });
-                }, 100);
-              };
-            }
           }
         }
       })
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 143c2724d..05e5fbd34 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -165,6 +165,13 @@ angular.module('copayApp.services')
       });
     };
 
+    root._seedWallet = function(walletClient) {
+      var config = configService.getSync().wallet.settings;
+console.log('[profileService.js.169:config:]',config); //TODO
+asdd;
+      walletClient.seedFromRandomWithMnemonic('livenet',null, mnemonicLang);
+    };
+
     root._createNewProfile = function(opts, cb) {
 
       if (opts.noWallet) {
@@ -172,10 +179,7 @@ angular.module('copayApp.services')
       }
 
       var walletClient = bwcService.getClient();
-      // TODO LANG...
-      // TODO...
-      $log.warn("TODO LANG!")
-      walletClient.seedFromRandomWithMnemonic('livenet');
+      this._seedWallet(walletClient);
 
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
         network: 'livenet'

From 55afc4d9d4f0c5e73f380b4c0a690db14ab90a4e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 27 Aug 2015 12:07:13 -0300
Subject: [PATCH 14/47] refactor ux language handling

---
 public/views/preferences.html             |  2 +-
 public/views/preferencesLanguage.html     |  2 +-
 src/js/controllers/index.js               | 55 +------------
 src/js/controllers/preferences.js         |  3 +-
 src/js/controllers/preferencesLanguage.js |  5 +-
 src/js/routes.js                          | 16 +---
 src/js/services/profileService.js         | 28 ++++---
 src/js/services/uxLanguage.js             | 95 +++++++++++++++++++++++
 8 files changed, 125 insertions(+), 81 deletions(-)
 create mode 100644 src/js/services/uxLanguage.js

diff --git a/public/views/preferences.html b/public/views/preferences.html
index 005df5bd5..b07c2dc35 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -75,7 +75,7 @@
       <span translate>Language</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
-        {{index.defaultLanguageName|translate}}
+        {{preferences.currentLanguageName|translate}}
       </span>
     </li>
     <li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesUnit')">
diff --git a/public/views/preferencesLanguage.html b/public/views/preferencesLanguage.html
index ba6ef1ddd..c06b4b683 100644
--- a/public/views/preferencesLanguage.html
+++ b/public/views/preferencesLanguage.html
@@ -9,7 +9,7 @@
 <div class="content preferences" ng-controller="preferencesLanguageController as prefLang">
   <div class="animated infinite flash text-center m20t text-gray" ng-show="prefLang.loading" translate>Applying changes</div>
   <div ng-show="!prefLang.loading"
-    ng-repeat="lang in index.availableLanguages" 
+    ng-repeat="lang in prefLang.availableLanguages" 
     ng-click="prefLang.save(lang.isoCode)" class="line-b p20 size-14">
     <span>{{lang.name}}</span>
     <i class="fi-check size-16 right" ng-show="index.defaultLanguageIsoCode == lang.isoCode"></i>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 3b9af9078..6fb934e33 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, glideraService, $state) {
+angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService) {
   var self = this;
   self.isCordova = isCordova;
   self.onGoingProcess = {};
@@ -39,35 +39,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   self.tab = 'walletHome';
 
-  self.availableLanguages = [{
-    name: 'English',
-    isoCode: 'en',
-  }, {
-    name: 'Français',
-    isoCode: 'fr',
-  }, {
-    name: 'Italiano',
-    isoCode: 'it',
-  }, {
-    name: 'Deutsch',
-    isoCode: 'de',
-  }, {
-    name: 'Español',
-    isoCode: 'es',
-  }, {
-    name: 'Português',
-    isoCode: 'pt',
-  }, {
-    name: 'Ελληνικά',
-    isoCode: 'el',
-  }, {
-    name: '日本語',
-    isoCode: 'ja',
-  }, {
-    name: 'Pусский',
-    isoCode: 'ru',
-  }];
-
   self.feeOpts = feeService.feeOpts;
 
   self.setOngoingProcess = function(processName, isOn) {
@@ -827,29 +798,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   };
 
   self.setUxLanguage = function() {
-    var userLang = configService.getSync().wallet.settings.defaultLanguage;
-    if (!userLang) {
-      // Auto-detect browser language
-      var androidLang;
-
-      if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
-        userLang = androidLang[1];
-      } else {
-        // works for iOS and Android 4.x
-        userLang = navigator.userLanguage || navigator.language;
-      }
-      userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
-    }
-    if (userLang != gettextCatalog.getCurrentLanguage()) {
-      $log.debug('Setting default language: ' + userLang);
-      gettextCatalog.setCurrentLanguage(userLang);
-      amMoment.changeLocale(userLang);
-    }
-
+    var userLang = uxLanguage.update();
     self.defaultLanguageIsoCode = userLang;
-    self.defaultLanguageName = lodash.result(lodash.find(self.availableLanguages, {
-      'isoCode': self.defaultLanguageIsoCode
-    }), 'name');
+    self.defaultLanguageName = uxLanguage.getName(userLang);
   };
 
   self.initGlidera = function(accessToken) {
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 34130559d..585c47079 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -1,10 +1,11 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesController',
-  function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService) {
+  function($scope, $rootScope, $filter, $timeout, $modal, $log, lodash, configService, profileService, uxLanguage) {
     var config = configService.getSync();
     this.unitName = config.wallet.settings.unitName;
     this.bwsurl = config.bws.url;
+    this.currentLanguageName = uxLanguage.getCurrentLanguageName();
     this.selectedAlternative = {
       name: config.wallet.settings.alternativeName,
       isoCode: config.wallet.settings.alternativeIsoCode
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index f966abcc5..c00a8e277 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -1,8 +1,11 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
-  function($scope, $log, $timeout, configService, go) {
+  function($scope, $log, $timeout, configService, go, uxLanguage) {
 
+    this.availableLanguages = uxLanguage.getLanguages();
+
+console.log('[preferencesLanguage.js.7]', this.availableLanguages); //TODO
     this.save = function(newLang) {
 
       var opts = {
diff --git a/src/js/routes.js b/src/js/routes.js
index 2487cd4fe..e12f4ea71 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -463,22 +463,10 @@ angular
         needProfile: false
       });
   })
-  .run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService, $timeout, nodeWebkit) {
+  .run(function($rootScope, $state, $log, uriHandler, isCordova, profileService, $timeout, nodeWebkit, uxLanguage) {
     FastClick.attach(document.body);
 
-    // Auto-detect browser language
-    var userLang, androidLang;
-
-    if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
-      userLang = androidLang[1];
-    } else {
-      // works for iOS and Android 4.x
-      userLang = navigator.userLanguage || navigator.language;
-    }
-
-    userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
-    gettextCatalog.setCurrentLanguage(userLang);
-    amMoment.changeLocale(userLang);
+    uxLanguage.init();
 
     // Register URI handler, not for mobileApp
     if (!isCordova) {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 05e5fbd34..9044b8107 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger, uxLanguage) {
 
     var root = {};
 
@@ -165,11 +165,20 @@ angular.module('copayApp.services')
       });
     };
 
-    root._seedWallet = function(walletClient) {
-      var config = configService.getSync().wallet.settings;
-console.log('[profileService.js.169:config:]',config); //TODO
-asdd;
-      walletClient.seedFromRandomWithMnemonic('livenet',null, mnemonicLang);
+    root._seedWallet = function(walletClient, network) {
+      var lang = uxLanguage.getCurrentLanguage();
+
+      try {
+        walletClient.seedFromRandomWithMnemonic(network, null, lang);
+      } catch (e) {
+        $log.info('Error creating seed: ' + e.message);
+        if (e.message.indexOf('language') > 0) {
+          $log.info('Using default language for mnemonic');
+          walletClient.seedFromRandomWithMnemonic(network);
+        } else {
+          throw (e);
+        }
+      }
     };
 
     root._createNewProfile = function(opts, cb) {
@@ -179,7 +188,7 @@ asdd;
       }
 
       var walletClient = bwcService.getClient();
-      this._seedWallet(walletClient);
+      root._seedWallet(walletClient, 'livenet');
 
       walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
         network: 'livenet'
@@ -209,10 +218,7 @@ asdd;
           return cb(gettext('Could not create using the specified extended public key'));
         }
       }
-      // TODO LANG...
-      // TODO...
-      $log.warn("TODO LANG!")
-      walletClient.seedFromRandomWithMnemonic(opts.networkName);
+      root._seedWallet(walletClient, opts.networkName);
 
       walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
         network: opts.networkName
diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js
new file mode 100644
index 000000000..e0cb59ac0
--- /dev/null
+++ b/src/js/services/uxLanguage.js
@@ -0,0 +1,95 @@
+'use strict';
+angular.module('copayApp.services')
+  .factory('uxLanguage', function languageService($log, lodash, gettextCatalog, amMoment, configService) {
+    var root = {};
+
+    root.availableLanguages = [{
+      name: 'English',
+      isoCode: 'en',
+    }, {
+      name: 'Français',
+      isoCode: 'fr',
+    }, {
+      name: 'Italiano',
+      isoCode: 'it',
+    }, {
+      name: 'Deutsch',
+      isoCode: 'de',
+    }, {
+      name: 'Español',
+      isoCode: 'es',
+    }, {
+      name: 'Português',
+      isoCode: 'pt',
+    }, {
+      name: 'Ελληνικά',
+      isoCode: 'el',
+    }, {
+      name: '日本語',
+      isoCode: 'ja',
+    }, {
+      name: 'Pусский',
+      isoCode: 'ru',
+    }];
+
+    root.currentLanguage = null;
+
+    root._detect = function() {
+      // Auto-detect browser language
+      var userLang, androidLang;
+
+      if (navigator && navigator.userAgent && (androidLang = navigator.userAgent.match(/android.*\W(\w\w)-(\w\w)\W/i))) {
+        userLang = androidLang[1];
+      } else {
+        // works for iOS and Android 4.x
+        userLang = navigator.userLanguage || navigator.language;
+      }
+      userLang = userLang ? (userLang.split('-', 1)[0] || 'en') : 'en';
+
+      return userLang;
+    };
+
+    root._set = function(lang) {
+      $log.debug('Setting default language: ' + lang);
+      gettextCatalog.setCurrentLanguage(lang);
+      amMoment.changeLocale(lang);
+      root.currentLanguage = lang;
+    };
+
+    root.getCurrentLanguage = function() {
+      return root.currentLanguage;
+    };
+
+    root.getCurrentLanguageName = function() {
+      return root.getName(root.currentLanguage);
+    };
+
+    root.getLanguages = function() {
+      return root.availableLanguages;
+    };
+
+    root.init = function() {
+      root._set(root._detect());
+    };
+
+    root.update = function() {
+      var userLang = configService.getSync().wallet.settings.defaultLanguage;
+
+      if (!userLang) {
+        userLang = root._detect();
+      }
+
+      if (userLang != gettextCatalog.getCurrentLanguage()) {
+        root._set(userLang);
+      }
+      return userLang;
+    };
+
+    root.getName = function(lang) {
+      return lodash.result(lodash.find(root.availableLanguages, {
+        'isoCode': lang
+      }), 'name');
+    };
+
+    return root;
+  });

From bd4513d1e61cc74ec9939a501fada51ad4d74423 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 31 Aug 2015 15:01:48 -0300
Subject: [PATCH 15/47] add No private key to non multisig wallets

---
 public/views/walletHome.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 50b4db9a7..b690a50a4 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -133,9 +133,9 @@
               <p class="m0">
               {{(index.alias || index.walletName)}}
               </p>
-              <div class="size-12 text-gray" ng-if="index.network != 'livenet'">
-                Testnet
-                <span ng-if="!index.canSign"> - <span translate>No Private key</span></span>
+              <div class="size-12 text-gray">
+                <span ng-if="index.network != 'livenet'"> Testnet </span>
+                <span ng-if="!index.canSign" translate>No Private key</span>
               </div>
             </div>
           </div>

From ab78588a9faf6726ed1d8b1ee5ab1a3ad3ed8f3a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 31 Aug 2015 18:10:46 -0300
Subject: [PATCH 16/47] WIP: performance  in chrome

---
 bower.json                        |  2 +-
 public/views/create.html          |  2 +-
 src/js/controllers/create.js      |  2 +-
 src/js/controllers/import.js      |  1 -
 src/js/controllers/splash.js      | 10 +++++++++-
 src/js/services/profileService.js | 10 +++++++---
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index d9ad490ab..4a2bf2acf 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "ng-lodash": "~0.2.0",
     "angular-moment": "0.10.1",
     "moment": "2.10.3",
-    "angular-bitcore-wallet-client": "0.1.2",
+    "angular-bitcore-wallet-client": "0.1.4",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/public/views/create.html b/public/views/create.html
index 20fe87eea..8f50e33ca 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -117,7 +117,7 @@
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
             <label for="ext-master" class="m10t">
-              <span translate>Master extended private key</span>
+              <span translate>Backup Words (BIP39 seed)</span>
               <small translate>If not given, a secure key will be generated</small>
               <input id="ext-master"
               type="text"
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 668d8dec2..6bbb16c7d 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -57,7 +57,7 @@ angular.module('copayApp.controllers').controller('createController',
         m: $scope.requiredCopayers,
         n: $scope.totalCopayers,
         name: form.walletName.$modelValue,
-        extendedPrivateKey: form.privateKey.$modelValue,
+        mnemonic: form.privateKey.$modelValue,
         myName: $scope.totalCopayers > 1 ? form.myName.$modelValue : null,
         networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet',
       };
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 0f94e9574..3fdf55067 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -68,7 +68,6 @@ angular.module('copayApp.controllers').controller('importController',
         profileService.importWalletMnemonic(words, {
           passphrase: passphrase,
         }, function(err, ret) {
-  console.log('[import.js.70:err:]',err, ret); //TODO
           self.loading = false;
           if (err) {
             self.error = err;
diff --git a/src/js/controllers/splash.js b/src/js/controllers/splash.js
index b957be3f9..3b26e5b7f 100644
--- a/src/js/controllers/splash.js
+++ b/src/js/controllers/splash.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('splashController',
-  function($scope, $timeout, $log, profileService, storageService, go) {
+  function($scope, $timeout, $log, profileService, storageService, go, bwcService) {
     storageService.getCopayDisclaimerFlag(function(err, val) {
       if (!val) go.path('disclaimer');
 
@@ -29,4 +29,12 @@ angular.module('copayApp.controllers').controller('splashController',
         });
       }, 100);
     };
+
+console.log('[splash.js.32]'); //TODO
+      var a = bwcService.getClient();
+
+console.log('[splash.js.34]'); //TODO
+a.seedFromMnemonic('glare benefit approve speak post afford spot cancel argue cushion unaware kitchen');
+console.log("LISTO", a.credentials);
+ 
   });
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 9044b8107..710a9f40a 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -168,8 +168,11 @@ angular.module('copayApp.services')
     root._seedWallet = function(walletClient, network) {
       var lang = uxLanguage.getCurrentLanguage();
 
+console.log('[profileService.js.170]'); //TODO
       try {
         walletClient.seedFromRandomWithMnemonic(network, null, lang);
+
+console.log('[profileService.js.174]'); //TODO
       } catch (e) {
         $log.info('Error creating seed: ' + e.message);
         if (e.message.indexOf('language') > 0) {
@@ -205,11 +208,12 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       $log.debug('Creating Wallet:', opts);
 
-      if (opts.extendedPrivateKey) {
+      if (opts.mnemonic) {
         try {
-          walletClient.seedFromExtendedPrivateKey(opts.extendedPrivateKey);
+          walletClient.seedFromMnemonic(opts.mnemonic);
         } catch (ex) {
-          return cb(gettext('Could not create using the specified extended private key'));
+          $log.info(ex);
+          return cb(gettext('Could not create: Invalid Backup Words'));
         }
       } else if (opts.extendedPublicKey) {
         try {

From 452d9e1bda624257e7c5c9fa82a24577b3ceb745 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 2 Sep 2015 15:56:00 -0300
Subject: [PATCH 17/47] create/join using mnemonic working

---
 public/views/backup.html          |  45 +++++++--
 public/views/create.html          |   4 +-
 public/views/import.html          |  24 +++--
 public/views/join.html            |   7 +-
 public/views/walletHome.html      |  36 +++----
 src/js/controllers/import.js      |  38 ++++---
 src/js/controllers/splash.js      |   8 --
 src/js/services/bwsError.js       |  15 +++
 src/js/services/profileService.js | 163 ++++++++++++++----------------
 9 files changed, 188 insertions(+), 152 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index ef8b0f3ee..0401c83eb 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -7,16 +7,42 @@
 
 
 <div class="content p20v" ng-controller="wordsController as wordsC">
-  <div class="row">
+  <div class="row"  ng-show="index.n==1">
     <div class="m10t columns size-14 text-gray" translate>
       <span translate>
-        In order to restore your Copay wallet you will need these 12 backup words. 
+        You will need these backup words to restore this personal wallet.
       </span>
       <span translate class="text-bold">
-        Write them down and keep them somethere safe
+        Write them down and keep them somewhere safe.
       </span>
     </div>
   </div>
+  <div class="row" ng-show="(index.n>1 && index.m != index.n )">
+    <div class="m10t columns size-14 text-gray" translate>
+      <span translate>
+        To restore this {{index.m}}-{{index.n}} shared wallet you will need:
+      </span>:
+<ol class="m10t columns size-14 text-gray">
+  <li> Your backup words and access to the wallet service where your wallet is registered 
+  <li> <b>OR</b> the backup words of <b>all</b>  copayers in the wallet
+  <li> <b>OR</b> 1 wallet export file and the remaining quorum of backup words (e.g. in a 3-5 wallet: 1 wallet export file + 2 backup words of any of the other copayers).
+</ol>
+      </span>
+    </div>
+  </div>
+  <div class="row" ng-show="(index.n>1 && index.m == index.n )">
+    <div class="m10t columns size-14 text-gray" translate>
+      <span translate>
+        To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
+      </span>:
+<ol class="m10t columns size-14 text-gray">
+  <li> Your backup words and access to the wallet service where wallet is registered 
+  <li> <b>OR</b> the backups words of <b>all</b> copayers in the wallet
+</ol>
+      </span>
+    </div>
+  </div>
+ 
   <div class="row m20t" ng-show="!wordsC.mywords">
     <div class="columns size-14 text-gray" translate>
         The backup words had been deleted from this device
@@ -37,10 +63,11 @@
     </div>
 
     <div class="row enable_text_select" ng-show="show"  >
-        <span class="m10" ng-repeat="word in wordsC.mywords">
-          {{word}}
-        </span>
-        <div class="m10 text-center">
+        <div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
+">
+          <span class="m10r" ng-repeat="word in wordsC.mywords">{{word}} </span> 
+        </div>
+        <div class="m10 text-center columns">
           <div class="m10 size-14 text-gray" translate>
             <span translate>
               Once you have wrote your backup words, it is recommended to delete them from this device.
@@ -54,7 +81,9 @@
           </button>
         </div>
     </div>
-    <div class="row m20t">
+
+    <!-- hide this in multisig just to show less text -->
+    <div class="row m20t"  ng-show="index.n==1">
       <div class="columns size-14 text-gray" translate>
         You can safely install your backup on another device and use your wallet from multiple devices at the same time.  <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
             <span translate>Learn more about Copay backups</span>
diff --git a/public/views/create.html b/public/views/create.html
index 8f50e33ca..84d5f6112 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -118,10 +118,10 @@
             </label>
             <label for="ext-master" class="m10t">
               <span translate>Backup Words (BIP39 seed)</span>
-              <small translate>If not given, a secure key will be generated</small>
+              <small translate>If not given, a random secure key will be generated</small>
               <input id="ext-master"
               type="text"
-              placeholder="{{'BIP32 master extended private key'|translate}}"
+              placeholder="{{'Backup words'|translate}}"
               name="privateKey" ng-model="privateKey">
             </label>
           </div>
diff --git a/public/views/import.html b/public/views/import.html
index 74507f5eb..ec2eeaf0d 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -20,21 +20,21 @@
 
   <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
     <div class="row">
-      <div class="tab-container small-4 medium-4 large-4">
+      <div class="tab-container small-6 medium-6 large-6">
       <a href
         ng-class="{'selected': type =='12'}"
         ng-click="import.setType('12')" translate>12 Words Backup</a>
       </div>
-      <div class="tab-container small-4 medium-4 large-4">
+      <div class="tab-container small-6 medium-6 large-6">
       <a href
         ng-class="{'selected': type=='file'}"
         ng-click="import.setType('file')" translate>File/Text Backup</a>
       </div>
-      <div class="tab-container small-4 medium-4 large-4">
-      <a href
-        ng-class="{'selected': type=='qr'}"
-        ng-click="import.setType('qr')" translate>QR Code</a>
-      </div>
+      <!-- <div class="tab&#45;container small&#45;4 medium&#45;4 large&#45;4"> -->
+      <!-- <a href -->
+      <!--   ng&#45;class="{'selected': type=='qr'}" -->
+      <!--   ng&#45;click="import.setType('qr')" translate>QR Code</a> -->
+      <!-- </div> -->
  
     </div>
  
@@ -55,7 +55,7 @@
               <label for="words">
                 <span translate>Type the 12 backup words here</span>:
               </label>
-              <textarea class="form-control" name="words" ng-model="import.words" rows="5"></textarea>
+              <textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
             </div>
 
           <div class="m10t oh" ng-init="hideAdv=true">
@@ -69,12 +69,18 @@
           </div>
           <div ng-hide="hideAdv" class="row">
             <div class="large-12 columns">
-              <label for="passphrase" class="line-b oh"><span translate>Passphrase</span>  <small translate>Mnemonics could required a passphrase to be imported</small>
+             <label for="passphrase" class="line-b oh"><span translate>Passphrase</span>  <small translate>Mnemonics could required a passphrase to be imported</small>
               <div class="input">
                 <input type="password" class="form-control" placeholder="{{'Your backup passhrase'|translate}}"
                 name="passphrase" ng-model="import.passphrase">
               </div>
               </label>
+              <label for="network-name" class="line-b oh">
+                <span translate>Testnet</span>
+                <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
+              </label>
+  
+ 
             </div>
           </div>
 
diff --git a/public/views/join.html b/public/views/join.html
index e42f615f8..c298755d4 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -99,11 +99,12 @@
               </label>
             </div>         
             <div class="large-12 columns">
-              <label for="ext-master">{{'Master extended private key'|translate}}
-              <small translate>If not given, a secure key will be generated</small>
+              <label for="ext-master"> 
+              <span translate>Backup Words (BIP39 seed)</span>
+              <small translate>If not given, a random secure key will be generated</small>
                 <input id="ext-master"
                 type="text"
-                placeholder="{{'BIP32 master extended private key'|translate}}"
+                placeholder="{{'Backup words'|translate}}"
                 name="privateKey" ng-model="privateKey">
               </label>
             </div>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index b690a50a4..c5772a71e 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -215,16 +215,14 @@
           <!-- Address-->
           <div class="large-12 columns">
             <h2 class="text-center m10t" translate>My Bitcoin address</h2>
-            <div >
+            <div>
+              <div class="box-notification" ng-show="home.addrError">
+                <span class="text-warning">
+                  {{home.addrError|translate}}
+                </span>
+              </div>
 
-            <div class="box-notification" ng-show="home.addrError">
-              <span class="text-warning">
-                {{home.addrError|translate}}
-              </span>
-            </div>
-
-
-              <div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])">
+              <div class="text-center" ng-click="home.copyAddress(home.addr[index.walletId])" ng-show="home.addr[index.walletId] || home.generatingAddress">
                 <qrcode size="220" data="bitcoin:{{home.addr[index.walletId]}}"></qrcode>
                 <div  ng-show="home.generatingAddress" style="position:relative; top:-226px; height:0px">
                   <div style="height:220px; width:220px; margin:auto; background: url(img/qr.png) white">
@@ -246,15 +244,17 @@
               </div>
             </div>
 
-            <div class="m10t text-center" ng-show="index.isCordova">
-              <span class="button outline dark-gray tiny round"
-                ng-click="home.shareAddress(home.addr[index.walletId])">
-                <i class="fi-share"></i>
-                <span translate>Share address</span>
-              </span>
-            </div>
-            <div class="line-t size-12" translate>
-              Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.
+            <div ng-show="home.addr[index.walletId]">
+              <div class="m10t text-center" ng-show="index.isCordova">
+                <span class="button outline dark-gray tiny round"
+                  ng-click="home.shareAddress(home.addr[index.walletId])">
+                  <i class="fi-share"></i>
+                  <span translate>Share address</span>
+                </span>
+              </div>
+              <div class="line-t size-12" translate>
+                Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 3fdf55067..c8d77aae3 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -18,6 +18,7 @@ angular.module('copayApp.controllers').controller('importController',
 
     this.setType = function(type) {
       $scope.type = type;
+      this.error = null;
       $timeout(function() {
         $rootScope.$apply();
       });
@@ -63,11 +64,8 @@ angular.module('copayApp.controllers').controller('importController',
     var _importMnemonic = function(words, passphrase, opts) {
       self.loading = true;
 
-      console.log('[import.js.64:opts:]', opts); //TODO
       $timeout(function() {
-        profileService.importWalletMnemonic(words, {
-          passphrase: passphrase,
-        }, function(err, ret) {
+        profileService.importWalletMnemonic(words, opts, function(err, ret) {
           self.loading = false;
           if (err) {
             self.error = err;
@@ -83,13 +81,13 @@ angular.module('copayApp.controllers').controller('importController',
       }, 100);
     };
 
-// {
-//         network: opts.network,
-//         m: opts.m,
-//         n: opts.n,
-//         publicKeyRing: opts.publicKeyRing,
-//       },
-//
+    // {
+    //         network: opts.network,
+    //         m: opts.m,
+    //         n: opts.n,
+    //         publicKeyRing: opts.publicKeyRing,
+    //       },
+    //
     $scope.getFile = function() {
       // If we use onloadend, we need to check the readyState.
       reader.onloadend = function(evt) {
@@ -144,18 +142,28 @@ angular.module('copayApp.controllers').controller('importController',
 
       var passphrase = form.passphrase.$modelValue;
       var words = form.words.$modelValue;
+      this.error = null;
 
-      if (!words || words.split(' ').map(function(v) {
-        return lodash.trim(v);
-      }).length != 12) {
-        this.error = gettext('Please input 12 backup words');
+      if (!words) {
+        this.error = gettext('Please enter the backup words');
+      } else {
+        var wordList = words.split(/ /).filter(function(v){ return v.length>0; });
+        if (wordList.length != 12)
+          this.error = gettext('Please enter 12 backup words');
+        else 
+          words = wordList.join(' ');
+      }
+
+      if (this.error) {
         $timeout(function() {
           $scope.$apply();
         });
         return;
       }
 
+
       opts.passphrase = form.passphrase.$modelValue || null;
+      opts.networkName = form.isTestnet.$modelValue ? 'testnet' : 'livenet';
 
       _importMnemonic(words, passphrase, opts);
     };
diff --git a/src/js/controllers/splash.js b/src/js/controllers/splash.js
index 3b26e5b7f..87ab843ed 100644
--- a/src/js/controllers/splash.js
+++ b/src/js/controllers/splash.js
@@ -29,12 +29,4 @@ angular.module('copayApp.controllers').controller('splashController',
         });
       }, 100);
     };
-
-console.log('[splash.js.32]'); //TODO
-      var a = bwcService.getClient();
-
-console.log('[splash.js.34]'); //TODO
-a.seedFromMnemonic('glare benefit approve speak post afford spot cancel argue cushion unaware kitchen');
-console.log("LISTO", a.credentials);
- 
   });
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index f91c3b541..7791c075a 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -84,6 +84,21 @@ angular.module('copayApp.services')
           case 'WALLET_NOT_FOUND': 
             body = gettextCatalog.getString('Wallet not found');
             break;
+          case 'SERVER_COMPROMISED': 
+            body = gettextCatalog.getString('Server response could not be verified');
+            break;
+          case 'WALLET_DOES_NOT_EXIST': 
+            body = gettextCatalog.getString('This wallet is not registed at the wallet service. Please create it from "Create Wallet" using adding for backup words');
+            break;
+          case 'INVALID_BACKUP': 
+            body = gettextCatalog.getString('Backup words are invalid');
+            break;
+ 
+ 
+          default:
+            $log.warn('Unknown error type:', err.code);
+            body = err.code + ':' + err.message;
+            break;
         }
       }
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 710a9f40a..b47cb312c 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -146,7 +146,7 @@ angular.module('copayApp.services')
               return cb(err);
             }
             if (!profile) {
-              // Migration??
+              // Migration?? 
               storageService.tryToMigrate(function(err, migratedProfile) {
                 if (err) return cb(err);
                 if (!migratedProfile)
@@ -165,52 +165,14 @@ angular.module('copayApp.services')
       });
     };
 
-    root._seedWallet = function(walletClient, network) {
-      var lang = uxLanguage.getCurrentLanguage();
-
-console.log('[profileService.js.170]'); //TODO
-      try {
-        walletClient.seedFromRandomWithMnemonic(network, null, lang);
-
-console.log('[profileService.js.174]'); //TODO
-      } catch (e) {
-        $log.info('Error creating seed: ' + e.message);
-        if (e.message.indexOf('language') > 0) {
-          $log.info('Using default language for mnemonic');
-          walletClient.seedFromRandomWithMnemonic(network);
-        } else {
-          throw (e);
-        }
-      }
-    };
-
-    root._createNewProfile = function(opts, cb) {
-
-      if (opts.noWallet) {
-        return cb(null, Profile.create());
-      }
-
+    root._seedWallet = function(opts, cb) {
+      opts = opts || {};
       var walletClient = bwcService.getClient();
-      root._seedWallet(walletClient, 'livenet');
-
-      walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
-        network: 'livenet'
-      }, function(err) {
-        if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
-        var p = Profile.create({
-          credentials: [JSON.parse(walletClient.export())],
-        });
-        return cb(null, p);
-      })
-    };
-
-    root.createWallet = function(opts, cb) {
-      var walletClient = bwcService.getClient();
-      $log.debug('Creating Wallet:', opts);
+      var network = opts.networkName || 'livenet';
 
       if (opts.mnemonic) {
         try {
-          walletClient.seedFromMnemonic(opts.mnemonic);
+          walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
         } catch (ex) {
           $log.info(ex);
           return cb(gettext('Could not create: Invalid Backup Words'));
@@ -221,41 +183,69 @@ console.log('[profileService.js.174]'); //TODO
         } catch (ex) {
           return cb(gettext('Could not create using the specified extended public key'));
         }
+      } else {
+        var lang = uxLanguage.getCurrentLanguage();
+        try {
+          walletClient.seedFromRandomWithMnemonic(network, opts.passphrase, lang);
+        } catch (e) {
+          $log.info('Error creating seed: ' + e.message);
+          if (e.message.indexOf('language') > 0) {
+            $log.info('Using default language for mnemonic');
+            walletClient.seedFromRandomWithMnemonic(network,  opts.passphrase);
+          } else {
+            return cb(e);
+          }
+        }
       }
-      root._seedWallet(walletClient, opts.networkName);
+      return cb(null, walletClient);
+    };
 
-      walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
-        network: opts.networkName
-      }, function(err, secret) {
-        if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
+    root._createNewProfile = function(opts, cb) {
 
-        root.profile.credentials.push(JSON.parse(walletClient.export()));
-        root.setWalletClients();
+      if (opts.noWallet) {
+        return cb(null, Profile.create());
+      }
 
-        root.setAndStoreFocus(walletClient.credentials.walletId, function() {
-          storageService.storeProfile(root.profile, function(err) {
-            return cb(null, secret);
+      root._seedWallet({}, function(err, walletClient) {
+        if (err) return cb(err);
+
+        walletClient.createWallet('Personal Wallet', 'me', 1, 1, {
+          network: 'livenet'
+        }, function(err) {
+          if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
+          var p = Profile.create({
+            credentials: [JSON.parse(walletClient.export())],
           });
+          return cb(null, p);
         });
       })
     };
 
+    root.createWallet = function(opts, cb) {
+      $log.debug('Creating Wallet:', opts);
+      root._seedWallet(opts, function(err, walletClient) {
+        if (err) return cb(err);
+
+        walletClient.createWallet(opts.name, opts.myName || 'me', opts.m, opts.n, {
+          network: opts.networkName
+        }, function(err, secret) {
+          if (err) return bwsError.cb(err, gettext('Error creating wallet'), cb);
+
+          root.profile.credentials.push(JSON.parse(walletClient.export()));
+          root.setWalletClients();
+
+          root.setAndStoreFocus(walletClient.credentials.walletId, function() {
+            storageService.storeProfile(root.profile, function(err) {
+              return cb(null, secret);
+            });
+          });
+        })
+      });
+    };
+
     root.joinWallet = function(opts, cb) {
       var walletClient = bwcService.getClient();
       $log.debug('Joining Wallet:', opts);
-      if (opts.extendedPrivateKey) {
-        try {
-          walletClient.seedFromExtendedPrivateKey(opts.extendedPrivateKey);
-        } catch (ex) {
-          return cb(gettext('Could not join using the specified extended private key'));
-        }
-      } else if (opts.extendedPublicKey) {
-        try {
-          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex);
-        } catch (ex) {
-          return cb(gettext('Could not create using the specified extended public key'));
-        }
-      }      
 
       try {
         var walletData = this.getUtils().fromSecret(opts.secret);
@@ -269,18 +259,24 @@ console.log('[profileService.js.174]'); //TODO
       } catch (ex) {
         return cb(gettext('Bad wallet invitation'));
       }
+      opts.networkName = walletData.network;
+      $log.debug('Joining Wallet:', opts);
 
-      walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) {
-        if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb);
+      root._seedWallet(opts, function(err, walletClient) {
+        if (err) return cb(err);
 
-        root.profile.credentials.push(JSON.parse(walletClient.export()));
-        root.setWalletClients();
+        walletClient.joinWallet(opts.secret, opts.myName || 'me', function(err) {
+          if (err) return bwsError.cb(err, gettext('Could not join wallet'), cb);
 
-        root.setAndStoreFocus(walletClient.credentials.walletId, function() {
-          storageService.storeProfile(root.profile, function(err) {
-            return cb(null, opts.secret);
+          root.profile.credentials.push(JSON.parse(walletClient.export()));
+          root.setWalletClients();
+
+          root.setAndStoreFocus(walletClient.credentials.walletId, function() {
+            storageService.storeProfile(root.profile, function(err) {
+              return cb();
+            });
           });
-        });
+        })
       })
     };
 
@@ -351,9 +347,13 @@ console.log('[profileService.js.174]'); //TODO
       var walletClient = bwcService.getClient();
       $log.debug('Importing Wallet Mnemonic');
 
+console.log('[profileService.js.340]', words, opts); //TODO
       walletClient.importFromMnemonic(words, {
+        network: opts.networkName,
         passphrase: opts.passphrase,
       }, function(err) {
+console.log('[profileService.js.342:err:]',err); //TODO
+console.log('[profileService.js.341:walletClient:]',walletClient.credentials.credentials); //TODO
         if (err)
           return bwsError.cb(err, gettext('Could not import'), cb);
 
@@ -361,21 +361,6 @@ console.log('[profileService.js.174]'); //TODO
       });
     };
 
-
-    root.importWalletMnemonicEx = function(words, opts, cb) {
-      var walletClient = bwcService.getClient();
-      $log.debug('Importing Wallet Mnemonic EX', opts);
-
-      walletClient.importFromMnemonic(words, opts,
-        function(err) {
-          if (err)
-            return bwsError.cb(err, gettext('Could not import'), cb);
-
-          root._addWalletClient(walletClient, cb);
-        });
-    };
-
-
     root.create = function(opts, cb) {
       $log.info('Creating profile');
       configService.get(function(err) {

From 142a6bd03ae4c0bb0930fe76e9271922bbc56899 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 2 Sep 2015 17:11:59 -0300
Subject: [PATCH 18/47] add scan after create/join with mnemonics

---
 backupRecovery.md                 | 59 +++++++++++++++++++++++++++++++
 src/js/controllers/create.js      |  8 +++--
 src/js/controllers/import.js      |  3 +-
 src/js/controllers/index.js       |  2 +-
 src/js/controllers/join.js        |  9 ++++-
 src/js/services/profileService.js |  5 +--
 6 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 backupRecovery.md

diff --git a/backupRecovery.md b/backupRecovery.md
new file mode 100644
index 000000000..5634f4b72
--- /dev/null
+++ b/backupRecovery.md
@@ -0,0 +1,59 @@
+
+
+# Copay Mnemonic Notes
+
+## Definitions
+
+### Backup Formats:
+ * Backup Words: 12 words mnemonic created as backup in Copay (from version v1.2)
+ * Backup File: Exported file from Copay, containing an AES encrypted JSON (see #export-format).
+
+### Backup recovery cases
+ * Case 1: Lost of device holding the wallet
+ * Case 2: Change to a new Bitcore Wallet Service (BWS)
+ * Case 3: Lost device + new Bitcore Wallet Service
+
+### Wallet Recovery Scope
+ * Partial Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive coins.
+ * Full Recovery: All the features of Partial Recovery + Wallet Name, Copayer Names are recovered, Past Spend proposal metadata (who signed, and notes) are recoved.
+      
+## Wallet Restore Scenarios
+
+### Non multisig wallets
+
+  Case 1: From both Backup Words and Backup file, full recovery is possible.
+    - Enter the backup words or file at 'Import wallet' in a new device.
+    
+  Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
+    - Point to the new server
+    - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
+    - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
+    
+  Case 3: From both Backup Words and Backup file, partial recovery is possible.
+    (Using Backup Words)
+    - Enter the Backup Words at 'Import Wallet'
+      If the error "This wallet is not registered at the wallet service" appear:
+      - Go to 'Create Wallet', and enter the Backup Words at 'Advanced Options'
+    (Using Backup File)
+    - Enter the Backup File at 'Import Wallet'
+ 
+
+### Multisig wallets
+
+  Case 1: From both Backup Words and Backup file, full recovery is possible.
+    - Enter the backup words or file at 'Import wallet' in a new device.
+   
+  Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
+    - Point to the new server
+    - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
+    - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
+    
+  Case 3: Partial recovery is possible using:
+
+    A) All the Backup Words of the copayers of the wallet or 
+    - Enter Backup Words at Create or Join Wallet ( at the Advanced option sections). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
+    - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their Backup Words at Join -> Advanced Options -> Backup Words.
+    
+    B) One File Backup and a quorum of Backup Words of the other members.
+      - Using the File Backup, import the wallet.
+      - Ask other copayers to import the wallet using the their Backup words.
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 6bbb16c7d..e6941c631 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -87,7 +87,7 @@ angular.module('copayApp.controllers').controller('createController',
 
     this._create = function (opts) {
       $timeout(function() {
-        profileService.createWallet(opts, function(err, secret) {
+        profileService.createWallet(opts, function(err, secret, walletId) {
           self.loading = false;
           if (err) {
             if (err == "Error creating wallet" && opts.extendedPublicKey) {
@@ -100,7 +100,11 @@ angular.module('copayApp.controllers').controller('createController',
             });
           }
           else {
-            go.walletHome();
+            if (opts.mnemonic && opts.n==1) {
+              $rootScope.$emit('Local/WalletImported', walletId);
+            } else {
+              go.walletHome();
+            }
           }
         });
       }, 100);
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index c8d77aae3..6dbc20d0d 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -65,7 +65,7 @@ angular.module('copayApp.controllers').controller('importController',
       self.loading = true;
 
       $timeout(function() {
-        profileService.importWalletMnemonic(words, opts, function(err, ret) {
+        profileService.importWalletMnemonic(words, opts, function(err, walletId) {
           self.loading = false;
           if (err) {
             self.error = err;
@@ -73,7 +73,6 @@ angular.module('copayApp.controllers').controller('importController',
               $scope.$apply();
             });
           }
-          return
           $rootScope.$emit('Local/WalletImported', walletId);
           notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
           go.walletHome();
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 6fb934e33..72b62a98a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -394,7 +394,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   self.updateTxHistory = function(skip) {
     var fc = profileService.focusedClient;
-    if (!fc.isComplete()) return;
+    if (!fc || !fc.isComplete()) return;
     if (!skip) {
       self.txHistory = [];
     }
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 8e338f751..bf1f08914 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -153,6 +153,8 @@ angular.module('copayApp.controllers').controller('joinController',
 
       var opts = {
         secret: form.secret.$modelValue,
+        mnemonic: form.privateKey.$modelValue,
+        myName: form.myName.$modelValue
         extendedPrivateKey: form.privateKey.$modelValue,
         myName: form.myName.$modelValue
       }
@@ -189,7 +191,12 @@ angular.module('copayApp.controllers').controller('joinController',
             return
           }
           $timeout(function() {
-            go.walletHome();
+            var fc = profileService.focusedClient;
+            if (opts.mnemonic && fc.isComplete()) {
+              $rootScope.$emit('Local/WalletImported', fc.credentials.walletId);
+            } else {
+              go.walletHome();
+            }
           }, 2000);
         });
       }, 100);
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index b47cb312c..97cf78172 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -236,7 +236,7 @@ angular.module('copayApp.services')
 
           root.setAndStoreFocus(walletClient.credentials.walletId, function() {
             storageService.storeProfile(root.profile, function(err) {
-              return cb(null, secret);
+              return cb(null, secret, walletClient.credentials.walletId);
             });
           });
         })
@@ -347,13 +347,10 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       $log.debug('Importing Wallet Mnemonic');
 
-console.log('[profileService.js.340]', words, opts); //TODO
       walletClient.importFromMnemonic(words, {
         network: opts.networkName,
         passphrase: opts.passphrase,
       }, function(err) {
-console.log('[profileService.js.342:err:]',err); //TODO
-console.log('[profileService.js.341:walletClient:]',walletClient.credentials.credentials); //TODO
         if (err)
           return bwsError.cb(err, gettext('Could not import'), cb);
 

From 4ac32f13a09fb40f154cf973cf86e81fe0119dde Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 3 Sep 2015 01:49:48 -0300
Subject: [PATCH 19/47] better texts and forms

---
 backupRecovery.md                 | 52 ++++++++++++++++++++-----------
 public/views/create.html          | 38 +++++++++++++++++++---
 public/views/import.html          | 25 +++++++--------
 public/views/join.html            | 45 ++++++++++++++++++++------
 src/css/main.css                  |  7 +++++
 src/js/controllers/create.js      | 14 ++++++++-
 src/js/controllers/import.js      |  4 +--
 src/js/controllers/join.js        | 14 ++++++++-
 src/js/services/bwsError.js       |  2 +-
 src/js/services/profileService.js |  2 +-
 10 files changed, 151 insertions(+), 52 deletions(-)

diff --git a/backupRecovery.md b/backupRecovery.md
index 5634f4b72..3f3c25cf1 100644
--- a/backupRecovery.md
+++ b/backupRecovery.md
@@ -1,12 +1,16 @@
 
 
-# Copay Mnemonic Notes
+# Copay Backup and Restore Notes
+
+## Description
+
+Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the wallet. The private key never leave the device, so for accessing a wallet funds it is necesary to have the device or the backup of the wallet. 
 
 ## Definitions
 
 ### Backup Formats:
- * Backup Words: 12 words mnemonic created as backup in Copay (from version v1.2)
- * Backup File: Exported file from Copay, containing an AES encrypted JSON (see #export-format).
+ * Wallet Seed (WS): 12 words mnemonic backup (available from Copay v1.2+). The 12 words are used as wallet seed, following BIP39 specification. The wallet seed may require a passphrase to recreate the wallet (if that was specified at creation time).
+ * Wallet Backup (WB): Exported data from Copay, containing an AES encrypted JSON with many wallet parameters (like extended Private Key, wallet Name, extended public keys of Copayers, etc. See #export-format). This data can be created from Copay v1.2+ (Settings->Export) and it was the default backup format on previous Copay versions. WB can be a file (standart format for Copay desktop versions) or a text (standart from Copay mobile versions).
 
 ### Backup recovery cases
  * Case 1: Lost of device holding the wallet
@@ -21,39 +25,49 @@
 
 ### Non multisig wallets
 
-  Case 1: From both Backup Words and Backup file, full recovery is possible.
-    - Enter the backup words or file at 'Import wallet' in a new device.
+  Case 1: From both WS and WB, full recovery is possible.
+    - Enter the WS or the WB at 'Import wallet' in a new device.
+    - Wallet access should be restored
     
   Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
     - Point to the new server
     - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
+    - Wallet should be recreated and funds can be acceded
     - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
     
   Case 3: From both Backup Words and Backup file, partial recovery is possible.
-    (Using Backup Words)
-    - Enter the Backup Words at 'Import Wallet'
-      If the error "This wallet is not registered at the wallet service" appear:
-      - Go to 'Create Wallet', and enter the Backup Words at 'Advanced Options'
-    (Using Backup File)
-    - Enter the Backup File at 'Import Wallet'
+    (Using WS)
+    - Enter the WS at 'Import Wallet'
+      If the error "This wallet is not registered at the wallet service" will appear:
+      - Go to 'Create Wallet', and enter the WS at 'Advanced Options'. Select a new name for the restored wallet. Total and required number of copayers should be set to 1.
+      - Wallet should be recreated and funds can be acceded
+      
+    (Using WD)
+    - Enter the WD at 'Import Wallet'
+    - Wallet should be recreated and funds should be accesable 
  
 
 ### Multisig wallets
 
-  Case 1: From both Backup Words and Backup file, full recovery is possible.
-    - Enter the backup words or file at 'Import wallet' in a new device.
+  Case 1: From both WS and WD, full recovery is possible.
+    - Enter WS or WD at 'Import wallet' in a new device.
+    - Wallet access should be restored
    
   Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
     - Point to the new server
     - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
+    - Wallet should be recreated and funds should be accesable 
+    
     - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
     
   Case 3: Partial recovery is possible using:
 
-    A) All the Backup Words of the copayers of the wallet or 
-    - Enter Backup Words at Create or Join Wallet ( at the Advanced option sections). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
-    - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their Backup Words at Join -> Advanced Options -> Backup Words.
+    A) All WS's of the copayers of the wallet 
+    - Enter one WS at Create ( at the Advanced option section). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
+    - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their WS at Join (at -> Advanced Options -> Wallet Seed).
+    - Wallet should be recreated and funds should be accesable 
     
-    B) One File Backup and a quorum of Backup Words of the other members.
-      - Using the File Backup, import the wallet.
-      - Ask other copayers to import the wallet using the their Backup words.
+    B) One WD and a quorum of WS of the other members.
+      - Using the WD, import the wallet.
+      - Ask other copayers to import the wallet using the their WS.
+      - Wallet should be recreated and funds should be accesable 
diff --git a/public/views/create.html b/public/views/create.html
index 84d5f6112..2940c6d59 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -112,21 +112,49 @@
                 </select>
               </label>
             </div>         
-            <label ng-hide="hwLedger" for="network-name" class="line-b oh">
+            <label for="network-name" class="oh">
               <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
-            <label for="ext-master" class="m10t">
-              <span translate>Backup Words (BIP39 seed)</span>
-              <small translate>If not given, a random secure key will be generated</small>
+
+
+            <label for="seed" class="oh">
+              <span translate>Specify the wallet seed</span>
+              <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
+            </label>
+
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the wallet seed</small>
+              <div class="input">
+                <input type="text" class="form-control" 
+                name="createPassphrase" ng-model="createPassphrase">
+              </div>
+            </label>
+ 
+            <label for="ext-master" class="m10t" ng-show="setSeed">
+              <span translate>Wallet Seed</span>
+              <small translate>Enter the 12 words to seed the wallet (BIP39)</small>
               <input id="ext-master"
               type="text"
-              placeholder="{{'Backup words'|translate}}"
+              placeholder="{{'Wallet seed'|translate}}"
               name="privateKey" ng-model="privateKey">
             </label>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>Seed could require a passphrase to be imported</small>
+                <div class="input">
+                  <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
+                </div>
+                </label>
           </div>
         </div>
 
+        <div class="box-notification" ng-show="!setSeed && createPassphrase">
+          <span class="text-warning size-14">
+            <i class="fi-alert"></i>
+            <span translate>
+            WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
+            </span>
+          </span>
+        </div>
+
 
 
         <button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading">
diff --git a/public/views/import.html b/public/views/import.html
index ec2eeaf0d..5c87fb18a 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -23,7 +23,7 @@
       <div class="tab-container small-6 medium-6 large-6">
       <a href
         ng-class="{'selected': type =='12'}"
-        ng-click="import.setType('12')" translate>12 Words Backup</a>
+        ng-click="import.setType('12')" translate>Walled Seed</a>
       </div>
       <div class="tab-container small-6 medium-6 large-6">
       <a href
@@ -53,7 +53,7 @@
 
             <div >
               <label for="words">
-                <span translate>Type the 12 backup words here</span>:
+                <span translate>Type the Wallet Seed (12 words)</span>:
               </label>
               <textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
             </div>
@@ -69,22 +69,21 @@
           </div>
           <div ng-hide="hideAdv" class="row">
             <div class="large-12 columns">
-             <label for="passphrase" class="line-b oh"><span translate>Passphrase</span>  <small translate>Mnemonics could required a passphrase to be imported</small>
-              <div class="input">
-                <input type="password" class="form-control" placeholder="{{'Your backup passhrase'|translate}}"
-                name="passphrase" ng-model="import.passphrase">
-              </div>
-              </label>
-              <label for="network-name" class="line-b oh">
+              <label for="network-name" class=" oh">
                 <span translate>Testnet</span>
                 <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
               </label>
-  
- 
+
+             <label for="passphrase" class="oh line-b"><span translate>Passphrase</span>  <small translate>Wallet Seed could require a passphrase to be imported</small>
+              <div class="input">
+                <input type="password" class="form-control" placeholder="{{'Seed passphrase'|translate}}"
+                name="passphrase" ng-model="import.passphrase">
+              </div>
+              </label>
             </div>
           </div>
 
-            <button translate type="submit" class="button round expand black"
+            <button translate type="submit" class="button round expand black m10t"
               ng-disabled="importForm12.$invalid || import.loading">
               Import
             </button>
@@ -118,7 +117,7 @@
               <textarea class="form-control" name="backupText" ng-model="import.backupText" rows="5"></textarea>
             </div>
 
-            <label for="password"><span translate>Password</span>  <small translate>Required</small>
+            <label for="password"><span translate>Password</span> 
             </label>
             <div class="input">
               <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
diff --git a/public/views/join.html b/public/views/join.html
index c298755d4..c3164197f 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -99,15 +99,42 @@
               </label>
             </div>         
             <div class="large-12 columns">
-              <label for="ext-master"> 
-              <span translate>Backup Words (BIP39 seed)</span>
-              <small translate>If not given, a random secure key will be generated</small>
-                <input id="ext-master"
-                type="text"
-                placeholder="{{'Backup words'|translate}}"
-                name="privateKey" ng-model="privateKey">
-              </label>
-            </div>
+
+            <label for="seed" class="oh">
+              <span translate>Specify the wallet seed</span>
+              <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
+            </label>
+
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the wallet seed</small>
+              <div class="input">
+                <input type="text" class="form-control" 
+                name="createPassphrase" ng-model="createPassphrase">
+              </div>
+            </label>
+ 
+            <label for="ext-master" class="m10t" ng-show="setSeed">
+              <span translate>Wallet Seed</span>
+              <small translate>Enter the 12 words to seed the wallet (BIP39)</small>
+              <input id="ext-master"
+              type="text"
+              placeholder="{{'Wallet seed'|translate}}"
+              name="privateKey" ng-model="privateKey">
+            </label>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>Seed could require a passphrase to be imported</small>
+                <div class="input">
+                  <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
+                </div>
+                </label>
+          </div>
+        </div>
+
+          <div class="box-notification" ng-show="!setSeed && createPassphrase">
+            <span class="text-warning size-14">
+              <i class="fi-alert"></i>
+              <span translate>
+              WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
+              </span>
+            </span>
           </div>
           <button translate type="submit" class="button expand black m0 round" 
             ng-disabled="joinForm.$invalid || join.loading">Join</button>
diff --git a/src/css/main.css b/src/css/main.css
index 965d9c8db..585990545 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -573,6 +573,13 @@ button.radius, .button.radius {
   border-radius: 3px;
 }
 
+
+label small {
+  font-size: 10px;
+  color: #999;
+}
+
+
 label small.has-error {
   font-size: 11px;
 }
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index e6941c631..e77b4dd36 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -57,10 +57,22 @@ angular.module('copayApp.controllers').controller('createController',
         m: $scope.requiredCopayers,
         n: $scope.totalCopayers,
         name: form.walletName.$modelValue,
-        mnemonic: form.privateKey.$modelValue,
         myName: $scope.totalCopayers > 1 ? form.myName.$modelValue : null,
         networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet',
       };
+      var setSeed = form.setSeed.$modelValue;
+      if  (setSeed) {
+        opts.mnemonic = form.privateKey.$modelValue;
+        opts.passphrase = form.passphrase.$modelValue;
+      } else {
+        opts.passphrase = form.createPassphrase.$modelValue;
+      }
+
+      if (setSeed && !opts.mnemonic) {
+        this.error = gettext('Please enter the wallet seed');
+        return;
+      }
+ 
       self.loading = true;
 
       if (form.hwLedger.$modelValue) {
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 6dbc20d0d..591a57a19 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -61,7 +61,7 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
 
-    var _importMnemonic = function(words, passphrase, opts) {
+    var _importMnemonic = function(words, opts) {
       self.loading = true;
 
       $timeout(function() {
@@ -164,6 +164,6 @@ angular.module('copayApp.controllers').controller('importController',
       opts.passphrase = form.passphrase.$modelValue || null;
       opts.networkName = form.isTestnet.$modelValue ? 'testnet' : 'livenet';
 
-      _importMnemonic(words, passphrase, opts);
+      _importMnemonic(words, opts);
     };
   });
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index bf1f08914..337db1446 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -153,11 +153,23 @@ angular.module('copayApp.controllers').controller('joinController',
 
       var opts = {
         secret: form.secret.$modelValue,
-        mnemonic: form.privateKey.$modelValue,
         myName: form.myName.$modelValue
         extendedPrivateKey: form.privateKey.$modelValue,
         myName: form.myName.$modelValue
       }
+      var setSeed = form.setSeed.$modelValue;
+      if  (setSeed) {
+        opts.mnemonic = form.privateKey.$modelValue;
+        opts.passphrase = form.passphrase.$modelValue;
+      } else {
+        opts.passphrase = form.createPassphrase.$modelValue;
+      }
+
+      if (setSeed && !opts.mnemonic) {
+        this.error = gettext('Please enter the wallet seed');
+        return;
+      }
+ 
 
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index 7791c075a..7a5a83ef9 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -91,7 +91,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('This wallet is not registed at the wallet service. Please create it from "Create Wallet" using adding for backup words');
             break;
           case 'INVALID_BACKUP': 
-            body = gettextCatalog.getString('Backup words are invalid');
+            body = gettextCatalog.getString('Wallet seed is invalid');
             break;
  
  
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 97cf78172..ef1ddd292 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -175,7 +175,7 @@ angular.module('copayApp.services')
           walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
         } catch (ex) {
           $log.info(ex);
-          return cb(gettext('Could not create: Invalid Backup Words'));
+          return cb(gettext('Could not create: Invalid wallet seed'));
         }
       } else if (opts.extendedPublicKey) {
         try {

From fdbf9e2675ee75db61cffd8829209b5d50c225b7 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 3 Sep 2015 02:16:38 -0300
Subject: [PATCH 20/47] wallet seed in backup

---
 public/views/backup.html | 78 +++++++++++++++++++++-------------------
 public/views/create.html | 12 +++----
 public/views/export.html |  2 +-
 public/views/join.html   | 30 +++++++++-------
 4 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 0401c83eb..903b3d854 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -7,45 +7,51 @@
 
 
 <div class="content p20v" ng-controller="wordsController as wordsC">
-  <div class="row"  ng-show="index.n==1">
-    <div class="m10t columns size-14 text-gray" translate>
-      <span translate>
-        You will need these backup words to restore this personal wallet.
-      </span>
-      <span translate class="text-bold">
-        Write them down and keep them somewhere safe.
-      </span>
-    </div>
+
+  <div class="row">
+    <h2> Wallet Seed </h2>
   </div>
-  <div class="row" ng-show="(index.n>1 && index.m != index.n )">
-    <div class="m10t columns size-14 text-gray" translate>
-      <span translate>
-        To restore this {{index.m}}-{{index.n}} shared wallet you will need:
-      </span>:
-<ol class="m10t columns size-14 text-gray">
-  <li> Your backup words and access to the wallet service where your wallet is registered 
-  <li> <b>OR</b> the backup words of <b>all</b>  copayers in the wallet
-  <li> <b>OR</b> 1 wallet export file and the remaining quorum of backup words (e.g. in a 3-5 wallet: 1 wallet export file + 2 backup words of any of the other copayers).
-</ol>
-      </span>
+  <div ng-show="wordsC.mywords">
+    <div class="row"  ng-show="index.n==1">
+      <div class="m10t columns size-14 text-gray" translate>
+        <span translate>
+          You need the wallet seed to restore this personal wallet.
+        </span>
+        <span translate class="text-bold">
+          Write it down and keep them somewhere safe.
+        </span>
+      </div>
     </div>
-  </div>
-  <div class="row" ng-show="(index.n>1 && index.m == index.n )">
-    <div class="m10t columns size-14 text-gray" translate>
-      <span translate>
-        To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
-      </span>:
-<ol class="m10t columns size-14 text-gray">
-  <li> Your backup words and access to the wallet service where wallet is registered 
-  <li> <b>OR</b> the backups words of <b>all</b> copayers in the wallet
-</ol>
-      </span>
+    <div class="row" ng-show="(index.n>1 && index.m != index.n )">
+      <div class="m10t columns size-14 text-gray" translate>
+        <span translate>
+          To restore this {{index.m}}-{{index.n}} shared wallet you will need:
+        </span>:
+  <ol class="m10t columns size-14 text-gray">
+    <li> Your wallet seed and access to the wallet service where your wallet is registered 
+    <li> <b>OR</b> the wallet seed of <b>all</b>  copayers in the wallet
+    <li> <b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).
+  </ol>
+        </span>
+      </div>
+    </div>
+    <div class="row" ng-show="(index.n>1 && index.m == index.n )">
+      <div class="m10t columns size-14 text-gray" translate>
+        <span translate>
+          To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
+        </span>:
+  <ol class="m10t columns size-14 text-gray">
+    <li> Your wallet seed and access to the wallet service where wallet is registered 
+    <li> <b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet
+  </ol>
+        </span>
+      </div>
     </div>
   </div>
  
   <div class="row m20t" ng-show="!wordsC.mywords">
     <div class="columns size-14 text-gray" translate>
-        The backup words had been deleted from this device
+        The wallet seed for this wallet is not available on this device. You can still export the wallet to backup it.
     </div>
   </div>
  
@@ -54,8 +60,8 @@
         <div class="m10t oh" ng-init="show=false">
           <a class="button outline light-gray expand tiny" ng-click="show=!show">
             <i class="fi-widget m3r"></i>
-            <span translate ng-hide="show" ng-click="wordsC.done()">Show Backup Words</span>
-            <span translate ng-hide="!show">Hide Backup Words</span>
+            <span translate ng-hide="show" ng-click="wordsC.done()">Show Wallet Seed</span>
+            <span translate ng-hide="!show">Hide Wallet Seed</span>
             <i ng-if="!show" class="icon-arrow-down4"></i>
             <i ng-if="show" class="icon-arrow-up4"></i>
           </a>
@@ -70,7 +76,7 @@
         <div class="m10 text-center columns">
           <div class="m10 size-14 text-gray" translate>
             <span translate>
-              Once you have wrote your backup words, it is recommended to delete them from this device.
+              Once you have copy your wallet seed, it is recommended to delete it from this device.
             </span>
           </div>
           <button class="button outline round dark-gray tiny" ng-click="wordsC.delete()">
@@ -85,7 +91,7 @@
     <!-- hide this in multisig just to show less text -->
     <div class="row m20t"  ng-show="index.n==1">
       <div class="columns size-14 text-gray" translate>
-        You can safely install your backup on another device and use your wallet from multiple devices at the same time.  <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
+        You can safely install your wallet on another device and use it from multiple devices at the same time.  <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
             <span translate>Learn more about Copay backups</span>
         </a>
   
diff --git a/public/views/create.html b/public/views/create.html
index 2940c6d59..d6c964e42 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -117,13 +117,12 @@
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
 
-
             <label for="seed" class="oh">
-              <span translate>Specify the wallet seed</span>
+              <span translate>Specify your wallet's key seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the wallet seed</small>
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
                 <input type="text" class="form-control" 
                 name="createPassphrase" ng-model="createPassphrase">
@@ -131,14 +130,13 @@
             </label>
  
             <label for="ext-master" class="m10t" ng-show="setSeed">
-              <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words to seed the wallet (BIP39)</small>
+              <span translate>Wallet Key Seed</span>
+              <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
-              placeholder="{{'Wallet seed'|translate}}"
               name="privateKey" ng-model="privateKey">
             </label>
-              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>Seed could require a passphrase to be imported</small>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
                 <div class="input">
                   <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
                 </div>
diff --git a/public/views/export.html b/public/views/export.html
index 2196c87f8..eff87a1e9 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -44,7 +44,7 @@
         </div>
 
         <div class="m10 size-14 text-gray" translate>
-          Not including the private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals.
+          WARNING: Not including the private key will allows checking the wallet balance, transactions, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds can not be accesed from a export without the private key</b>.
 
         </div>
       </div>
diff --git a/public/views/join.html b/public/views/join.html
index c3164197f..bb458219c 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -101,11 +101,11 @@
             <div class="large-12 columns">
 
             <label for="seed" class="oh">
-              <span translate>Specify the wallet seed</span>
+              <span translate>Specify your wallet's key seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the wallet seed</small>
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
                 <input type="text" class="form-control" 
                 name="createPassphrase" ng-model="createPassphrase">
@@ -113,14 +113,13 @@
             </label>
  
             <label for="ext-master" class="m10t" ng-show="setSeed">
-              <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words to seed the wallet (BIP39)</small>
+              <span translate>Wallet Key Seed</span>
+              <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
-              placeholder="{{'Wallet seed'|translate}}"
               name="privateKey" ng-model="privateKey">
             </label>
-              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>Seed could require a passphrase to be imported</small>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
                 <div class="input">
                   <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
                 </div>
@@ -128,14 +127,19 @@
           </div>
         </div>
 
-          <div class="box-notification" ng-show="!setSeed && createPassphrase">
-            <span class="text-warning size-14">
-              <i class="fi-alert"></i>
-              <span translate>
-              WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
-              </span>
+        <div class="box-notification" ng-show="!setSeed && createPassphrase">
+          <span class="text-warning size-14">
+            <i class="fi-alert"></i>
+            <span translate>
+            WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase.
             </span>
-          </div>
+          </span>
+        </div>
+
+
+
+
+
           <button translate type="submit" class="button expand black m0 round" 
             ng-disabled="joinForm.$invalid || join.loading">Join</button>
       </form>

From 03e6b2b5c41cd7da017e2c6bd73e05cbd8b1041d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 3 Sep 2015 16:49:46 -0300
Subject: [PATCH 21/47] adds warn if mnemonic is encrypted

---
 bower.json                            |  2 +-
 public/views/backup.html              | 26 +++++++++++++++++++++-----
 public/views/create.html              |  4 ++--
 public/views/includes/walletInfo.html |  6 ++++++
 public/views/join.html                |  4 ++--
 src/js/controllers/backup.js          | 15 +++++++--------
 6 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 public/views/includes/walletInfo.html

diff --git a/bower.json b/bower.json
index 4a2bf2acf..80012eb29 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "ng-lodash": "~0.2.0",
     "angular-moment": "0.10.1",
     "moment": "2.10.3",
-    "angular-bitcore-wallet-client": "0.1.4",
+    "angular-bitcore-wallet-client": "0.2.0",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/public/views/backup.html b/public/views/backup.html
index 903b3d854..6cbade947 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -11,7 +11,7 @@
   <div class="row">
     <h2> Wallet Seed </h2>
   </div>
-  <div ng-show="wordsC.mywords">
+  <div ng-show="wordsC.mnemonicWords">
     <div class="row"  ng-show="index.n==1">
       <div class="m10t columns size-14 text-gray" translate>
         <span translate>
@@ -49,13 +49,13 @@
     </div>
   </div>
  
-  <div class="row m20t" ng-show="!wordsC.mywords">
+  <div class="row m20t" ng-show="!wordsC.mnemonicWords">
     <div class="columns size-14 text-gray" translate>
         The wallet seed for this wallet is not available on this device. You can still export the wallet to backup it.
     </div>
   </div>
  
-  <div ng-show="wordsC.mywords">
+  <div ng-show="wordsC.mnemonicWords">
     <div class="row">
         <div class="m10t oh" ng-init="show=false">
           <a class="button outline light-gray expand tiny" ng-click="show=!show">
@@ -68,11 +68,27 @@
         </div>
     </div>
 
-    <div class="row enable_text_select" ng-show="show"  >
+    <div class="row enable_text_select" ng-show="show">
+
+
         <div class="small-centered p10t p10b large-centered medium-centered large-8 medium-8 small-10 columns enable_text_select" style="border:1px solid gray; background:#eee;
 ">
-          <span class="m10r" ng-repeat="word in wordsC.mywords">{{word}} </span> 
+          <span class="m10r" ng-repeat="word in wordsC.mnemonicWords">{{word}} </span> 
         </div>
+
+        <div class="box-notification large-centered medium-centered small-centered large-8 medium-8 small-10 columns m10t" ng-show="wordsC.mnemonicHasPassphrase">
+          <span class="text-warning size-14">
+            <i class="fi-alert"></i>
+            <span translate>
+            WARNING: This seed was created with a passphrase. To recover this wallet both the mnemonic and passphrase are needed.
+            </span>
+          </span>
+        </div>
+
+
+
+
+
         <div class="m10 text-center columns">
           <div class="m10 size-14 text-gray" translate>
             <span translate>
diff --git a/public/views/create.html b/public/views/create.html
index d6c964e42..982430718 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -118,7 +118,7 @@
             </label>
 
             <label for="seed" class="oh">
-              <span translate>Specify your wallet's key seed</span>
+              <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
@@ -130,7 +130,7 @@
             </label>
  
             <label for="ext-master" class="m10t" ng-show="setSeed">
-              <span translate>Wallet Key Seed</span>
+              <span translate>Wallet Seed</span>
               <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
new file mode 100644
index 000000000..82d074ebf
--- /dev/null
+++ b/public/views/includes/walletInfo.html
@@ -0,0 +1,6 @@
+<span ng-show="index.network != 'livenet'"> Testnet </span>
+<span ng-show="!index.canSign && !index.isPrivKeyExternal" translate>No Private key</span>
+<span ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
+  <span translate>External Private Key:</span>
+  {{index.externalSource}}
+</span>
diff --git a/public/views/join.html b/public/views/join.html
index bb458219c..39e7d873d 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -101,7 +101,7 @@
             <div class="large-12 columns">
 
             <label for="seed" class="oh">
-              <span translate>Specify your wallet's key seed</span>
+              <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
@@ -113,7 +113,7 @@
             </label>
  
             <label for="ext-master" class="m10t" ng-show="setSeed">
-              <span translate>Wallet Key Seed</span>
+              <span translate>Wallet Seed</span>
               <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index 56f71c58f..b2d0bf01a 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -6,13 +6,6 @@ angular.module('copayApp.controllers').controller('wordsController',
     var msg = gettext('Are you to delete the backup words?');
     var successMsg = gettext('Backup words deleted');
 
-    this.getMnemonic = function() {
-      var fc = profileService.focusedClient;
-      var words = fc.getMnemonic();
-      if (!words) return;
-      return words.split(' ');
-    };
-
     this.done = function() {
         $rootScope.$emit('Local/BackupDone');
     };
@@ -30,5 +23,11 @@ angular.module('copayApp.controllers').controller('wordsController',
       });
     };
 
-    this.mywords = this.getMnemonic();
+    var fc = profileService.focusedClient;
+    var words = fc.getMnemonic();
+
+    if (words)
+      this.mnemonicWords = words.split(' ');
+
+    this.mnemonicHasPassphrase = fc.mnemonicHasPassphrase();
   });

From ccbe715b2a33c5e4e9ff535b18bcb19859f29546 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 3 Sep 2015 17:19:46 -0300
Subject: [PATCH 22/47] fix texts

---
 public/views/backup.html |  5 +----
 public/views/export.html | 12 ++++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index 6cbade947..c1394ddc9 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -8,9 +8,6 @@
 
 <div class="content p20v" ng-controller="wordsController as wordsC">
 
-  <div class="row">
-    <h2> Wallet Seed </h2>
-  </div>
   <div ng-show="wordsC.mnemonicWords">
     <div class="row"  ng-show="index.n==1">
       <div class="m10t columns size-14 text-gray" translate>
@@ -51,7 +48,7 @@
  
   <div class="row m20t" ng-show="!wordsC.mnemonicWords">
     <div class="columns size-14 text-gray" translate>
-        The wallet seed for this wallet is not available on this device. You can still export the wallet to backup it.
+        The wallet seed not available on this device. You can still export the wallet to backup it.
     </div>
   </div>
  
diff --git a/public/views/export.html b/public/views/export.html
index eff87a1e9..170e1b95e 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -42,11 +42,15 @@
             <switch id="no-sign" name="noSign" ng-model="noSign" class="green right m5t m10b"></switch>
           </label>
         </div>
+      </div>
 
-        <div class="m10 size-14 text-gray" translate>
-          WARNING: Not including the private key will allows checking the wallet balance, transactions, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds can not be accesed from a export without the private key</b>.
-
-        </div>
+      <div class="box-notification" ng-show="noSign">
+        <span class="text-warning size-14">
+          <i class="fi-alert"></i>
+          <span translate>
+          WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessable from the export</b>.
+          </span>
+        </span>
       </div>
 
 

From fe7a628edd66c467e96e33c5b0ec5306c2f4949a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 10:17:59 -0300
Subject: [PATCH 23/47] updates ledger integration

---
 public/views/create.html          |  10 +-
 public/views/preferences.html     |   7 +-
 public/views/walletHome.html      |   8 +-
 src/js/controllers/create.js      |  26 +-
 src/js/controllers/index.js       |   2 +
 src/js/controllers/join.js        |   2 +-
 src/js/controllers/walletHome.js  |   6 +-
 src/js/services/ledger.js         | 463 ++++++++++++++++--------------
 src/js/services/profileService.js |   4 +-
 9 files changed, 283 insertions(+), 245 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 982430718..f1340cb6b 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -117,7 +117,7 @@
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="seed" class="oh">
+            <label  ng-hide="hwLedger" for="seed" class="oh">
               <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
@@ -129,14 +129,14 @@
               </div>
             </label>
  
-            <label for="ext-master" class="m10t" ng-show="setSeed">
+            <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
               <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
             </label>
-              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
                 <div class="input">
                   <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
                 </div>
@@ -155,11 +155,11 @@
 
 
 
-        <button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading">
+        <button type="submit" class="button round black expand m0" ng-show="totalCopayers != 1" ng-disabled="setupForm.$invalid || create.loading || create.ledger">
           <span translate>Create {{requiredCopayers}}-of-{{totalCopayers}} wallet</span>
         </button>
         
-	<button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading">
+	<button type="submit" class="button round black expand m0" ng-show="totalCopayers == 1" ng-disabled="setupForm.$invalid || create.loading || create.ledger">
           <span translate>Create new wallet</span>
         </button>
       </div>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index b07c2dc35..2bdc0b71e 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -36,19 +36,18 @@
         <span ng-style="{'color':index.backgroundColor}">&block;</span>
       </span>      
     </li>
-
-    <li class="line-b p20"  ng-hide="preferences.externalIndex >= 0">
+    <li class="line-b p20" ng-hide="index.isPrivKeyExternal">
       <span translate>Request Password for Spending Funds</span>
       <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
     </li>
-    <li class="line-b p20" ng-show="preferences.externalIndex >= 0">
+    <li class="line-b p20" ng-show="index.isPrivKeyExternal">
       <span translate>Hardware wallet</span>
       <span class="right text-gray">
         {{preferences.externalSource}} 
         (index {{preferences.externalIndex}})
       </span>
     </li>
-    <li class="line-b p20" ng-click="$root.go('backup')"  ng-show="preferences.externalIndex >= 0">
+    <li class="line-b p20" ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span class="text-warning right" ng-show="index.needsBackup">
         <i class="fi-alert"></i> <span translate> Still not done</span>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index c5772a71e..294a1cd8c 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -123,10 +123,9 @@
               {{(index.alias || index.walletName)}}
               </p>
               <div class="size-12 text-gray">
-                <span translate>Multisignature wallet</span> 
+                <span translate>Multisignature wallet</span>
                 (<span translate>{{index.m}}-of-{{index.n}}</span>)
-                <span ng-if="index.network != 'livenet'">- Testnet</span>
-                <span ng-if="!index.canSign"> - <span translate>No Private key</span></span>
+                <span ng-include="'views/includes/walletInfo.html'"></span>
               </div>
             </div>
             <div ng-show="!index.isShared">
@@ -134,8 +133,7 @@
               {{(index.alias || index.walletName)}}
               </p>
               <div class="size-12 text-gray">
-                <span ng-if="index.network != 'livenet'"> Testnet </span>
-                <span ng-if="!index.canSign" translate>No Private key</span>
+                <span ng-include="'views/includes/walletInfo.html'"></span>
               </div>
             </div>
           </div>
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index e77b4dd36..a210bf5e5 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('createController',
       $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
     };
 
-    this.externalIndexValues = lodash.range(0,20);
+    this.externalIndexValues = lodash.range(0,ledger.MAX_SLOT);
     $scope.externalIndex = 0;
     this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
     $scope.totalCopayers = defaults.wallet.totalCopayers;
@@ -73,24 +73,17 @@ angular.module('copayApp.controllers').controller('createController',
         return;
       }
  
-      self.loading = true;
-
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
-        ledger.getXPubKey($scope.externalIndex, function(data) {
+        ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
           self.ledger = false;
-          if (data.success) {
+          if (err) {
+            self.error = err;
             $scope.$apply();
-            opts.extendedPublicKey = data.xpubkey;
-            opts.externalSource = 'ledger';
-            opts.externalIndex = $scope.externalIndex;
-            self._create(opts);
-          } else {
-            self.loading = false;
-            self.error = data.message;
-            $scope.$apply();
-            $log.debug(data.message);
+            return;
           }
+          opts = lodash.assign(lopts, opts);
+          self._create(opts);
         });
       } else {
         self._create(opts);
@@ -98,6 +91,7 @@ angular.module('copayApp.controllers').controller('createController',
     };
 
     this._create = function (opts) {
+      self.loading = true;
       $timeout(function() {
         profileService.createWallet(opts, function(err, secret, walletId) {
           self.loading = false;
@@ -105,14 +99,14 @@ angular.module('copayApp.controllers').controller('createController',
             if (err == "Error creating wallet" && opts.extendedPublicKey) {
               err = gettext("This xpub index is already used by another wallet. Please select another index.");
             }
-            $log.debug(err);
+            $log.warn(err);
             self.error = err;
             $timeout(function() {
               $rootScope.$apply();
             });
           }
           else {
-            if (opts.mnemonic && opts.n==1) {
+            if ( ( opts.mnemonic && opts.n==1) || otps.externalSource  ) {
               $rootScope.$emit('Local/WalletImported', walletId);
             } else {
               go.walletHome();
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 72b62a98a..a1defdf67 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -101,6 +101,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.walletId = fc.credentials.walletId;
       self.isComplete = fc.isComplete();
       self.canSign = fc.canSign();
+      self.isPrivKeyExternal = fc.isPrivKeyExternal();
+      self.externalSource = fc.getPrivKeyExternalSourceName();
       self.txps = [];
       self.copayers = [];
       self.updateColor();
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 337db1446..9a66b61e2 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -204,7 +204,7 @@ angular.module('copayApp.controllers').controller('joinController',
           }
           $timeout(function() {
             var fc = profileService.focusedClient;
-            if (opts.mnemonic && fc.isComplete()) {
+            if ( ( opts.mnemonic || opts.externalSource )  && fc.isComplete()) {
               $rootScope.$emit('Local/WalletImported', fc.credentials.walletId);
             } else {
               go.walletHome();
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 20f9948bf..fe6af8ef3 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -184,7 +184,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.error = null;
       $scope.copayers = copayers
       $scope.copayerId = fc.credentials.copayerId;
-      $scope.canSign = fc.canSign();
+      $scope.canSign = fc.canSign() || fc.isPrivKeyExternal();
       $scope.loading = null;
       $scope.color = fc.backgroundColor;
 
@@ -244,7 +244,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       $scope.sign = function(txp) {
         var fc = profileService.focusedClient;
 
-        if (!fc.canSign())
+        if (!fc.canSign() && !fc.isPrivKeyExternal())
           return;
 
         if (fc.isPrivKeyEncrypted()) {
@@ -801,7 +801,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
             return self.setSendError(err);
           }
 
-          if (!fc.canSign()) {
+          if (!fc.canSign() &&  !fc.isPrivKeyExternal()) {
             $log.info('No signing proposal: No private key')
             self.setOngoingProcess();
             self.resetForm();
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index 00c31542b..fa05bc8f6 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -1,53 +1,104 @@
 'use strict';
 
 angular.module('copayApp.services')
-  .factory('ledger', function(bwcService) {
+  .factory('ledger', function($log, bwcService, gettext) {
     var root = {};
     var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf";
+    root.MAX_SLOT = 20;
+    root.ENTROPY_INDEX_START = 1000;
 
     root.callbacks = {};
 
     root.hasSession = function() {
-      root._message({ command:"has_session" });
+      root._message({
+        command: "has_session"
+      });
     }
 
-    root.getXPubKey = function(index, callback) {
-      root.callbacks["get_xpubkey"] = callback;
-      root._messageAfterSession({ command:"get_xpubkey", path:root._getPath(index) })
+    root.getEntropySource = function(index, callback) {
+      index = index + root.ENTROPY_INDEX_START;
+      var xpub = root.getXPubKey("m/" + index + "'", function(data) {
+        if (!data.success) {
+          $log.warn(data.message);
+          return callback(data);
+        }
+
+        var b = bwcService.getBitcore();
+        var x = b.HDPublicKey(data.xpubkey);
+        data.entropySource = x.publicKey.toString();
+        return callback(data);
+      });
     };
 
+    root.getXPubKeyForAddresses = function(index, callback) {
+      return root.getXPubKey(root._getPath(index), callback);
+    };
+
+    root.getXPubKey = function(path, callback) {
+      root.callbacks["get_xpubkey"] = callback;
+      root._messageAfterSession({
+        command: "get_xpubkey",
+        path: path
+      })
+    };
+
+
+    root.getInfoForNewWallet = function(slot, callback) {
+      var opts = {};
+      root.getEntropySource(slot, function(data) {
+        if (!data.success) {
+          $log.warn(data.message);
+          return callback(data.message);
+        }
+        opts.entropySource = data.entropySource;
+        root.getXPubKeyForAddresses(slot, function(data) {
+          if (!data.success) {
+            $log.warn(data.message);
+            return callback(data);
+          }
+          opts.extendedPublicKey = data.xpubkey;
+          opts.externalSource = 'ledger';
+          opts.externalIndex = slot;
+          return callback(null, opts);
+        });
+      });
+    };
+
+
     root.signTx = function(txp, index, callback) {
       root.callbacks["sign_p2sh"] = callback;
       var redeemScripts = [];
       var paths = [];
       var tx = bwcService.getUtils().buildTx(txp);
-      for (var i=0; i<tx.inputs.length; i++) {
+      for (var i = 0; i < tx.inputs.length; i++) {
         redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
         paths.push(root._getPath(index) + txp.inputs[i].path.substring(1));
       }
       var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
       var inputs = [];
-      for (var i=0; i<splitTransaction.inputs.length; i++) {
+      for (var i = 0; i < splitTransaction.inputs.length; i++) {
         var input = splitTransaction.inputs[i];
         inputs.push([
           root._reverseBytestring(input.prevout.bytes(0, 32)).toString(),
           root._reverseBytestring(input.prevout.bytes(32)).toString()
         ]);
       }
-      root._messageAfterSession({ 
-        command:"sign_p2sh", 
-        inputs: inputs, 
+      root._messageAfterSession({
+        command: "sign_p2sh",
+        inputs: inputs,
         scripts: redeemScripts,
-        outputs_number: splitTransaction.outputs.length, 
-        outputs_script: splitTransaction.outputScript.toString(), 
-        paths: paths });                   
+        outputs_number: splitTransaction.outputs.length,
+        outputs_script: splitTransaction.outputScript.toString(),
+        paths: paths
+      });
     }
 
     root._message = function(data) {
       chrome.runtime.sendMessage(
-        LEDGER_CHROME_ID, 
-        { request: data }, 
-        function(response) { 
+        LEDGER_CHROME_ID, {
+          request: data
+        },
+        function(response) {
           root._callback(response);
         }
       );
@@ -55,7 +106,9 @@ angular.module('copayApp.services')
 
     root._messageAfterSession = function(data) {
       root._after_session = data;
-      root._message({ command:"launch" });
+      root._message({
+        command: "launch"
+      });
       root._should_poll_session = true;
       root._do_poll_session();
     }
@@ -78,9 +131,12 @@ angular.module('copayApp.services')
         }
       } else {
         root._should_poll_session = false;
-        Object.keys(root.callbacks).forEach(function (key) { 
-          root.callbacks[key]({ success: false, message: "The Ledger Chrome application is not installed" });
-        });       
+        Object.keys(root.callbacks).forEach(function(key) {
+          root.callbacks[key]({
+            success: false,
+            message: gettext("The Ledger Chrome application is not installed"),
+          });
+        });
       }
     }
 
@@ -98,7 +154,7 @@ angular.module('copayApp.services')
       var varint = root._getVarint(transaction, offset);
       var numberInputs = varint[0];
       offset += varint[1];
-      for (var i=0; i<numberInputs; i++) {
+      for (var i = 0; i < numberInputs; i++) {
         var input = {};
         input['prevout'] = transaction.bytes(offset, 36);
         offset += 36;
@@ -109,12 +165,12 @@ angular.module('copayApp.services')
         input['sequence'] = transaction.bytes(offset, 4);
         offset += 4;
         inputs.push(input);
-      }   
+      }
       varint = root._getVarint(transaction, offset);
       var numberOutputs = varint[0];
       offset += varint[1];
       var outputStartOffset = offset;
-      for (var i=0; i<numberOutputs; i++) {
+      for (var i = 0; i < numberOutputs; i++) {
         var output = {};
         output['amount'] = transaction.bytes(offset, 8);
         offset += 8;
@@ -135,20 +191,20 @@ angular.module('copayApp.services')
 
     root._getVarint = function(data, offset) {
       if (data.byteAt(offset) < 0xfd) {
-        return [ data.byteAt(offset), 1 ];
+        return [data.byteAt(offset), 1];
       }
       if (data.byteAt(offset) == 0xfd) {
-        return [ ((data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 3 ];
+        return [((data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 3];
       }
       if (data.byteAt(offset) == 0xfe) {
-        return [ ((data.byteAt(offset + 4) << 24) + (data.byteAt(offset + 3) << 16) + 
-            (data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 5 ];
+        return [((data.byteAt(offset + 4) << 24) + (data.byteAt(offset + 3) << 16) +
+          (data.byteAt(offset + 2) << 8) + data.byteAt(offset + 1)), 5];
       }
     }
 
     root._reverseBytestring = function(x) {
       var res = "";
-      for (var i=x.length - 1; i>=0; i--) {
+      for (var i = x.length - 1; i >= 0; i--) {
         res += Convert.toHexByte(x.byteAt(i));
       }
       return new ByteString(res, GP.HEX);
@@ -157,7 +213,7 @@ angular.module('copayApp.services')
     return root;
   });
 
-var Convert = {}; 
+var Convert = {};
 
 /**
  * Convert a binary string to his hexadecimal representation
@@ -167,9 +223,11 @@ var Convert = {};
  */
 Convert.stringToHex = function(src) {
   var r = "";
-  var hexes = new Array ("0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f");
-  for (var i=0; i<src.length; i++) {r += hexes [src.charCodeAt(i) >> 4] + hexes [src.charCodeAt(i) & 0xf];}
-  return r; 
+  var hexes = new Array("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f");
+  for (var i = 0; i < src.length; i++) {
+    r += hexes[src.charCodeAt(i) >> 4] + hexes[src.charCodeAt(i) & 0xf];
+  }
+  return r;
 }
 
 /**
@@ -180,24 +238,24 @@ Convert.stringToHex = function(src) {
  * @throws {InvalidString} if the string isn't properly formatted
  */
 Convert.hexToBin = function(src) {
-   var result = "";
-   var digits = "0123456789ABCDEF";
-   if ((src.length % 2) != 0) {
-  throw "Invalid string";
-   }
-   src = src.toUpperCase();
-   for (var i=0; i<src.length; i+=2) {
-  var x1 = digits.indexOf(src.charAt(i));
-        if (x1 < 0) {
-    return "";
+  var result = "";
+  var digits = "0123456789ABCDEF";
+  if ((src.length % 2) != 0) {
+    throw "Invalid string";
   }
-  var x2 = digits.indexOf(src.charAt(i + 1));
-  if (x2 < 0) {
-    return "";
+  src = src.toUpperCase();
+  for (var i = 0; i < src.length; i += 2) {
+    var x1 = digits.indexOf(src.charAt(i));
+    if (x1 < 0) {
+      return "";
+    }
+    var x2 = digits.indexOf(src.charAt(i + 1));
+    if (x2 < 0) {
+      return "";
+    }
+    result += String.fromCharCode((x1 << 4) + x2);
   }
-  result += String.fromCharCode((x1 << 4) + x2);
-   }
-   return result;
+  return result;
 }
 
 /**
@@ -212,7 +270,7 @@ Convert.readHexDigit = function(data, offset) {
   if (typeof offset == "undefined") {
     offset = 0;
   }
-  return (digits.indexOf(data.substring(offset, offset + 1).toUpperCase()) << 4) + (digits.indexOf(data.substring(offset + 1, offset + 2).toUpperCase()));  
+  return (digits.indexOf(data.substring(offset, offset + 1).toUpperCase()) << 4) + (digits.indexOf(data.substring(offset + 1, offset + 2).toUpperCase()));
 }
 
 /**
@@ -266,7 +324,7 @@ Convert.toHexShort = function(number) {
  */
 Convert.toHexInt = function(number) {
   return Convert.toHexDigit((number >> 24) & 0xff) + Convert.toHexDigit((number >> 16) & 0xff) +
-       Convert.toHexDigit((number >> 8) & 0xff) + Convert.toHexDigit(number & 0xff);
+    Convert.toHexDigit((number >> 8) & 0xff) + Convert.toHexDigit(number & 0xff);
 }
 
 
@@ -275,209 +333,196 @@ GP.ASCII = 1;
 GP.HEX = 5;
 
 /**
-  * @class GPScript ByteString implementation
-  * @param {String} value initial value
-  * @param {HEX|ASCII} encoding encoding to use
-  * @property {Number} length length of the ByteString
-  * @constructs
-*/
+ * @class GPScript ByteString implementation
+ * @param {String} value initial value
+ * @param {HEX|ASCII} encoding encoding to use
+ * @property {Number} length length of the ByteString
+ * @constructs
+ */
 var ByteString = function(value, encoding) {
-    this.encoding = encoding;
-    this.hasBuffer = (typeof Buffer != 'undefined');
-    if (this.hasBuffer && (value instanceof Buffer)) {
-      this.value = value;
-      this.encoding = GP.HEX;     
+  this.encoding = encoding;
+  this.hasBuffer = (typeof Buffer != 'undefined');
+  if (this.hasBuffer && (value instanceof Buffer)) {
+    this.value = value;
+    this.encoding = GP.HEX;
+  } else {
+    switch (encoding) {
+      case GP.HEX:
+        if (!this.hasBuffer) {
+          this.value = Convert.hexToBin(value);
+        } else {
+          this.value = new Buffer(value, 'hex');
+        }
+        break;
+
+      case GP.ASCII:
+        if (!this.hasBuffer) {
+          this.value = value;
+        } else {
+          this.value = new Buffer(value, 'ascii');
+        }
+        break;
+
+      default:
+        throw "Invalid arguments";
     }
-    else {
-      switch(encoding) {
-        case GP.HEX:
-          if (!this.hasBuffer) {
-            this.value = Convert.hexToBin(value);
-          }
-          else {
-            this.value = new Buffer(value, 'hex'); 
-          }
-          break;
-      
-        case GP.ASCII:
-          if (!this.hasBuffer) {
-            this.value = value;
-          }
-          else {
-            this.value = new Buffer(value, 'ascii'); 
-          }
-          break;
-        
-        default:
-          throw "Invalid arguments"; 
-      }
-    }
-    this.length = this.value.length;
+  }
+  this.length = this.value.length;
 }
 
 /**
  * Retrieve the byte value at the given index
  * @param {Number} index index
  * @returns {Number} byte value
-*/
+ */
 ByteString.prototype.byteAt = function(index) {
-    if (arguments.length < 1) {
-      throw "Argument missing";
-    }   
-    if (typeof index != "number") {
-      throw "Invalid index";
-    }   
-    if ((index < 0) || (index >= this.value.length)) {
-      throw "Invalid index offset";
-    }
-    if (!this.hasBuffer) {
-      return Convert.readHexDigit(Convert.stringToHex(this.value.substring(index, index + 1)));
-    }
-    else {
-      return this.value[index];
-    }
+  if (arguments.length < 1) {
+    throw "Argument missing";
+  }
+  if (typeof index != "number") {
+    throw "Invalid index";
+  }
+  if ((index < 0) || (index >= this.value.length)) {
+    throw "Invalid index offset";
+  }
+  if (!this.hasBuffer) {
+    return Convert.readHexDigit(Convert.stringToHex(this.value.substring(index, index + 1)));
+  } else {
+    return this.value[index];
+  }
 }
-  
+
 /**
  * Retrieve a subset of the ByteString
  * @param {Number} offset offset to start at
  * @param {Number} [count] size of the target ByteString (default : use the remaining length)
- * @returns {ByteString} subset of the original ByteString 
-*/
+ * @returns {ByteString} subset of the original ByteString
+ */
 ByteString.prototype.bytes = function(offset, count) {
-    var result;
-    if (arguments.length < 1) {
-      throw "Argument missing";
-    }
-    if (typeof offset != "number") {
-      throw "Invalid offset";
-    }
-    //if ((offset < 0) || (offset >= this.value.length)) {
-    if (offset < 0) {
-      throw "Invalid offset";
-    }
-    if (typeof count == "number") {
-      if (count < 0) {
-        throw "Invalid count";
-      }
-      if (!this.hasBuffer) {
-        result = new ByteString(this.value.substring(offset, offset + count), GP.ASCII);
-      }
-      else {
-        result = new Buffer(count);
-        this.value.copy(result, 0, offset, offset + count);
-      }
-    }
-    else 
-    if (typeof count == "undefined") {
-      if (!this.hasBuffer) {
-        result = new ByteString(this.value.substring(offset), GP.ASCII);
-      }
-      else {
-        result = new Buffer(this.value.length - offset);
-        this.value.copy(result, 0, offset, this.value.length);
-      }
-    }
-    else {
+  var result;
+  if (arguments.length < 1) {
+    throw "Argument missing";
+  }
+  if (typeof offset != "number") {
+    throw "Invalid offset";
+  }
+  //if ((offset < 0) || (offset >= this.value.length)) {
+  if (offset < 0) {
+    throw "Invalid offset";
+  }
+  if (typeof count == "number") {
+    if (count < 0) {
       throw "Invalid count";
     }
     if (!this.hasBuffer) {
-      result.encoding = this.encoding;
-      return result;      
+      result = new ByteString(this.value.substring(offset, offset + count), GP.ASCII);
+    } else {
+      result = new Buffer(count);
+      this.value.copy(result, 0, offset, offset + count);
     }
-    else {
-      return new ByteString(result, GP.HEX);
+  } else
+  if (typeof count == "undefined") {
+    if (!this.hasBuffer) {
+      result = new ByteString(this.value.substring(offset), GP.ASCII);
+    } else {
+      result = new Buffer(this.value.length - offset);
+      this.value.copy(result, 0, offset, this.value.length);
     }
+  } else {
+    throw "Invalid count";
+  }
+  if (!this.hasBuffer) {
+    result.encoding = this.encoding;
+    return result;
+  } else {
+    return new ByteString(result, GP.HEX);
+  }
 }
 
 /**
  * Appends two ByteString
  * @param {ByteString} target ByteString to append
  * @returns {ByteString} result of the concatenation
-*/
+ */
 ByteString.prototype.concat = function(target) {
-    if (arguments.length < 1) {
-      throw "Not enough arguments";
-    }   
-    if (!(target instanceof ByteString)) {
-      throw "Invalid argument";
-    }
-    if (!this.hasBuffer) {
-      var result = this.value + target.value;
-      var x = new ByteString(result, GP.ASCII);
-      x.encoding = this.encoding;
-      return x;         
-    }
-    else {
-      var result = Buffer.concat([this.value, target.value]);
-      return new ByteString(result, GP.HEX);
-    }
+  if (arguments.length < 1) {
+    throw "Not enough arguments";
+  }
+  if (!(target instanceof ByteString)) {
+    throw "Invalid argument";
+  }
+  if (!this.hasBuffer) {
+    var result = this.value + target.value;
+    var x = new ByteString(result, GP.ASCII);
+    x.encoding = this.encoding;
+    return x;
+  } else {
+    var result = Buffer.concat([this.value, target.value]);
+    return new ByteString(result, GP.HEX);
+  }
 }
-  
+
 /**
  * Check if two ByteString are equal
  * @param {ByteString} target ByteString to check against
  * @returns {Boolean} true if the two ByteString are equal
-*/
+ */
 ByteString.prototype.equals = function(target) {
-    if (arguments.length < 1) {
-      throw "Not enough arguments";
-    }   
-    if (!(target instanceof ByteString)) {
-      throw "Invalid argument";
-    }
-    if (!this.hasBuffer) {
-      return (this.value == target.value);
-    }
-    else {
-      return Buffer.equals(this.value, target.value);
-    }
+  if (arguments.length < 1) {
+    throw "Not enough arguments";
+  }
+  if (!(target instanceof ByteString)) {
+    throw "Invalid argument";
+  }
+  if (!this.hasBuffer) {
+    return (this.value == target.value);
+  } else {
+    return Buffer.equals(this.value, target.value);
+  }
 }
-  
-  
+
+
 /**
  * Convert the ByteString to a String using the given encoding
  * @param {HEX|ASCII|UTF8|BASE64|CN} encoding encoding to use
  * @return {String} converted content
-*/
+ */
 ByteString.prototype.toString = function(encoding) {
-    var targetEncoding = this.encoding;
-    if (arguments.length >= 1) {
-      if (typeof encoding != "number") {
-        throw "Invalid encoding";
-      }
-      switch(encoding) {
-        case GP.HEX:
-        case GP.ASCII:
-          targetEncoding = encoding;
-          break;
-        
-        default:
-          throw "Unsupported arguments";
-      }
-      targetEncoding = encoding;
+  var targetEncoding = this.encoding;
+  if (arguments.length >= 1) {
+    if (typeof encoding != "number") {
+      throw "Invalid encoding";
     }
-    switch(targetEncoding) {
+    switch (encoding) {
       case GP.HEX:
-        if (!this.hasBuffer) {
-          return Convert.stringToHex(this.value);
-        }
-        else {
-          return this.value.toString('hex');
-        }
       case GP.ASCII:
-        if (!this.hasBuffer) {
-          return this.value;
-        }
-        else {
-          return this.value.toString();
-        }
+        targetEncoding = encoding;
+        break;
+
       default:
-        throw "Unsupported";
-    }   
+        throw "Unsupported arguments";
+    }
+    targetEncoding = encoding;
   }
-  
-ByteString.prototype.toStringIE =  function(encoding) {
+  switch (targetEncoding) {
+    case GP.HEX:
+      if (!this.hasBuffer) {
+        return Convert.stringToHex(this.value);
+      } else {
+        return this.value.toString('hex');
+      }
+    case GP.ASCII:
+      if (!this.hasBuffer) {
+        return this.value;
+      } else {
+        return this.value.toString();
+      }
+    default:
+      throw "Unsupported";
+  }
+}
+
+ByteString.prototype.toStringIE = function(encoding) {
   return this.toString(encoding);
 }
 
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index ef1ddd292..33a620a10 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, ledger, uxLanguage) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, uxLanguage, ledger) {
 
     var root = {};
 
@@ -179,7 +179,7 @@ angular.module('copayApp.services')
         }
       } else if (opts.extendedPublicKey) {
         try {
-          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex);
+          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource);
         } catch (ex) {
           return cb(gettext('Could not create using the specified extended public key'));
         }

From 06c76d6351e9c0d94512481e9f532571c19063be Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 12:25:54 -0300
Subject: [PATCH 24/47] fix join

---
 public/views/export.html   | 15 +++++++++++++--
 src/js/controllers/join.js | 23 ++++++++---------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/public/views/export.html b/public/views/export.html
index 170e1b95e..db852af1d 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -35,7 +35,7 @@
       </div>
 
 
-      <div class="row">
+      <div class="row" ng-hide="index.isPrivKeyExternal">
         <div class="large-12 columns">
           <label for="no-sign" class="line-b oh">
             <span translate>Do not include private key</span>
@@ -44,11 +44,22 @@
         </div>
       </div>
 
+
+      <div class="box-notification"  ng-show="index.isPrivKeyExternal">
+        <span class="text-warning size-14">
+          <i class="fi-alert"></i>
+          <span translate>
+          WARNING: The private key of this wallet is not available.  The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessible from the export</b>.
+          </span>
+        </span>
+      </div>
+
+
       <div class="box-notification" ng-show="noSign">
         <span class="text-warning size-14">
           <i class="fi-alert"></i>
           <span translate>
-          WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessable from the export</b>.
+          WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessible from the export</b>.
           </span>
         </span>
       </div>
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 9a66b61e2..6561f4af2 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -153,10 +153,9 @@ angular.module('copayApp.controllers').controller('joinController',
 
       var opts = {
         secret: form.secret.$modelValue,
-        myName: form.myName.$modelValue
-        extendedPrivateKey: form.privateKey.$modelValue,
-        myName: form.myName.$modelValue
+        myName: form.myName.$modelValue,
       }
+
       var setSeed = form.setSeed.$modelValue;
       if  (setSeed) {
         opts.mnemonic = form.privateKey.$modelValue;
@@ -170,23 +169,17 @@ angular.module('copayApp.controllers').controller('joinController',
         return;
       }
  
-
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
-        ledger.getXPubKey($scope.externalIndex, function(data) {
+        ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
           self.ledger = false;
-          $scope.$apply();
-          if (data.success) {
-            opts.extendedPublicKey = data.xpubkey;
-            opts.externalSource = 'ledger';
-            opts.externalIndex = $scope.externalIndex;
-            self._join(opts);
-          } else {
-            self.loading = false;
-            $log.debug(data.message);
-            self.error = data.message;
+          if (err) {
+            self.error = err;
             $scope.$apply();
+            return;
           }
+          opts = lodash.assign(lopts, opts);
+          self._join(opts);
         });
       } else {
         self._join(opts);

From 76bc61cf99e42492a1b82348907e01602d431185 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 13:47:08 -0300
Subject: [PATCH 25/47] use ledger magic number path for entropy source

---
 src/js/services/ledger.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index fa05bc8f6..f25b7c85c 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -5,7 +5,9 @@ angular.module('copayApp.services')
     var root = {};
     var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf";
     root.MAX_SLOT = 20;
-    root.ENTROPY_INDEX_START = 1000;
+
+    // Ledger magic number to get xPub without user confirmation
+    root.ENTROPY_INDEX_PATH = "m/0xb11e'/";
 
     root.callbacks = {};
 
@@ -16,8 +18,8 @@ angular.module('copayApp.services')
     }
 
     root.getEntropySource = function(index, callback) {
-      index = index + root.ENTROPY_INDEX_START;
-      var xpub = root.getXPubKey("m/" + index + "'", function(data) {
+      var path = root.ENTROPY_INDEX_PATH + index + "'";
+      var xpub = root.getXPubKey(path, function(data) {
         if (!data.success) {
           $log.warn(data.message);
           return callback(data);

From a985adf38dd1d2168a386f0932076ecf3376be42 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 13:49:01 -0300
Subject: [PATCH 26/47] rm hardening from magic number

---
 src/js/services/ledger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index f25b7c85c..d34a5f656 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -7,7 +7,7 @@ angular.module('copayApp.services')
     root.MAX_SLOT = 20;
 
     // Ledger magic number to get xPub without user confirmation
-    root.ENTROPY_INDEX_PATH = "m/0xb11e'/";
+    root.ENTROPY_INDEX_PATH = "m/0xb11e/";
 
     root.callbacks = {};
 

From 4d9a477ae5165b18606bd7a1e9facdd9d70ac403 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 21:18:20 -0300
Subject: [PATCH 27/47] import now working with ledger

Signed-off-by: Matias Alejo Garcia <ematiu@gmail.com>
---
 bower.json                        |  2 +-
 public/views/create.html          | 22 +++++------
 public/views/import.html          | 65 ++++++++++++++++++++++++++-----
 public/views/join.html            | 14 +++----
 src/js/controllers/create.js      |  2 +-
 src/js/controllers/import.js      | 54 ++++++++++++++++++++-----
 src/js/controllers/index.js       |  7 +++-
 src/js/controllers/join.js        |  2 +-
 src/js/services/bwsError.js       |  2 +-
 src/js/services/profileService.js | 25 +++++++++++-
 10 files changed, 148 insertions(+), 47 deletions(-)

diff --git a/bower.json b/bower.json
index 80012eb29..cb075503f 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "ng-lodash": "~0.2.0",
     "angular-moment": "0.10.1",
     "moment": "2.10.3",
-    "angular-bitcore-wallet-client": "0.2.0",
+    "angular-bitcore-wallet-client": "0.2.2",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/public/views/create.html b/public/views/create.html
index f1340cb6b..0c495af1a 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -102,27 +102,27 @@
         </div>
         <div ng-hide="hideAdv" class="row">
           <div class="large-12 columns">
-            <label ng-show="create.isChromeApp()" for="hw-ledger" class="line-b oh">
+            <label ng-show="create.isChromeApp()" for="hw-ledger" class="oh">
               <span translate>Use Ledger hardware wallet</span>
               <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
             </label>
-            <div ng-hide="!hwLedger">
-              <label class="line-b oh"><span translate>Select slot number for Ledger key</span>
+            <div ng-show="hwLedger">
+              <label class="oh line-b "><span translate>Select slot number for Ledger key</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
                 </select>
               </label>
             </div>         
-            <label for="network-name" class="oh">
+            <label for="network-name" class="oh" ng-show="!hwLedger">
               <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
             </label>
 
-            <label  ng-hide="hwLedger" for="seed" class="oh">
+            <label  ng-show="!hwLedger" for="seed" class="oh">
               <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
                 <input type="text" class="form-control" 
                 name="createPassphrase" ng-model="createPassphrase">
@@ -136,11 +136,11 @@
               type="text"
               name="privateKey" ng-model="privateKey">
             </label>
-              <label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
-                <div class="input">
-                  <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
-                </div>
-                </label>
+            <label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
+              <div class="input">
+                <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
+              </div>
+            </label>
           </div>
         </div>
 
diff --git a/public/views/import.html b/public/views/import.html
index 5c87fb18a..927cf20c5 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -5,7 +5,7 @@
 </div>
 
 <div class="content p20v" ng-controller="importController as import" ng-init="type='12'">
-  <div class="onGoingProcess" ng-show="import.loading">
+  <div class="onGoingProcess" ng-show="import.loading  && !import.ledger">
     <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
     <div class="spinner">
       <div class="rect1"></div>
@@ -17,9 +17,23 @@
     <span translate>Importing wallet...</span>
     </div>
   </div>
+  <div class="onGoingProcess" ng-show="import.ledger">
+    <div class="onGoingProcess-content" ng-style="{'background-color':'#222'}">
+    <div class="spinner">
+      <div class="rect1"></div>
+      <div class="rect2"></div>
+      <div class="rect3"></div>
+      <div class="rect4"></div>
+      <div class="rect5"></div>
+    </div>
+    <span translate>Connecting to Ledger Wallet...</span>
+    </div>
+  </div>
+
+
 
   <div class="create-tab small-only-text-center" ng-hide="create.hideTabs">
-    <div class="row">
+    <div class="row" ng-show="!index.isChromeApp">
       <div class="tab-container small-6 medium-6 large-6">
       <a href
         ng-class="{'selected': type =='12'}"
@@ -30,14 +44,27 @@
         ng-class="{'selected': type=='file'}"
         ng-click="import.setType('file')" translate>File/Text Backup</a>
       </div>
-      <!-- <div class="tab&#45;container small&#45;4 medium&#45;4 large&#45;4"> -->
-      <!-- <a href -->
-      <!--   ng&#45;class="{'selected': type=='qr'}" -->
-      <!--   ng&#45;click="import.setType('qr')" translate>QR Code</a> -->
-      <!-- </div> -->
+    </div>
+    <div class="row" ng-show="index.isChromeApp">
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type =='12'}"
+        ng-click="import.setType('12')" translate>Walled Seed</a>
+      </div>
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type=='file'}"
+        ng-click="import.setType('file')" translate>File/Text Backup</a>
+      </div>
+      <div class="tab-container small-4 medium-4 large-4">
+      <a href
+        ng-class="{'selected': type=='ledger'}"
+        ng-click="import.setType('ledger')" translate>Ledger</a>
+      </div>
  
     </div>
  
+ 
   </div>
 
  
@@ -139,9 +166,29 @@
       </div>
     </div>
 
-    <div class="row" ng-show="type == 'qr'">
+    <div class="row" ng-show="type == 'ledger'">
       <div class="large-12 columns">
-TODO
+          <form name="importForm3" ng-submit="import.importLedger(importForm3)" novalidate>
+            <div class="box-notification" ng-show="import.error">
+              <span class="text-warning size-14">
+                {{import.error|translate}}
+              </span>
+            </div>
+
+          <div class="large-12 columns">
+            <label class="line-b oh">
+              <span translate>Select slot number for Ledger key</span>
+              <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in import.externalIndexValues">
+              </select>
+            </label>
+            <button translate type="submit" class="button round expand black"
+              ng-disabled="import.loading || import.ledger">
+              Import backup
+            </button>
+          </div>         
+
+          </form>
+ 
       </div>
     </div>
  
diff --git a/public/views/join.html b/public/views/join.html
index 39e7d873d..01ca33775 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -86,7 +86,7 @@
           </a>
           <div ng-show="join.hideAdv" class="row">
             <div class="large-12 columns" ng-show="join.isChromeApp()">
-              <label for="hw-ledger" class="line-b oh">
+              <label for="hw-ledger" class="oh">
                 <span translate>Use Ledger hardware wallet</span>
                 <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
               </label>
@@ -100,26 +100,26 @@
             </div>         
             <div class="large-12 columns">
 
-            <label for="seed" class="oh">
+            <label   ng-show="!hwLedger" for="seed" class="oh">
               <span translate>Specify your wallet seed</span>
               <switch id="seed" name="setSeed" ng-model="setSeed" class="green right m5t m10b"></switch>
             </label>
 
-            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
+            <label for="createPassphrase" class="line-b oh" ng-show="!setSeed && !hwLedger" ><span translate>Seed Passphrase</span>  <small translate>Add an optional passphrase to secure the seed</small>
               <div class="input">
                 <input type="text" class="form-control" 
                 name="createPassphrase" ng-model="createPassphrase">
               </div>
             </label>
  
-            <label for="ext-master" class="m10t" ng-show="setSeed">
+            <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
               <small translate>Enter the 12 words seed (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
             </label>
-              <label for="passphrase" class="line-b oh" ng-show="setSeed"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
+              <label for="passphrase" class="line-b oh" ng-show="setSeed && !hwLedger"><span translate>Seed Passphrase</span>  <small translate>The seed could require a passphrase to be imported</small>
                 <div class="input">
                   <input type="text" class="form-control" name="passphrase" ng-model="passphrase">
                 </div>
@@ -136,10 +136,6 @@
           </span>
         </div>
 
-
-
-
-
           <button translate type="submit" class="button expand black m0 round" 
             ng-disabled="joinForm.$invalid || join.loading">Join</button>
       </form>
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index a210bf5e5..f14e30591 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('createController',
             });
           }
           else {
-            if ( ( opts.mnemonic && opts.n==1) || otps.externalSource  ) {
+            if ( ( opts.mnemonic && opts.n==1) || opts.externalSource  ) {
               $rootScope.$emit('Local/WalletImported', walletId);
             } else {
               go.walletHome();
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 591a57a19..c8c95057d 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -1,12 +1,14 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('importController',
-  function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, isMobile, isCordova, sjcl, gettext, lodash) {
+  function($scope, $rootScope, $location, $timeout, $log, profileService, notification, go, isMobile, isCordova, sjcl, gettext, lodash, ledger) {
 
     var self = this;
 
     this.isSafari = isMobile.Safari();
     this.isCordova = isCordova;
+    this.externalIndexValues = lodash.range(0, ledger.MAX_SLOT);
+    $scope.externalIndex = 0;
     var reader = new FileReader();
 
     window.ignoreMobilePause = true;
@@ -80,13 +82,6 @@ angular.module('copayApp.controllers').controller('importController',
       }, 100);
     };
 
-    // {
-    //         network: opts.network,
-    //         m: opts.m,
-    //         n: opts.n,
-    //         publicKeyRing: opts.publicKeyRing,
-    //       },
-    //
     $scope.getFile = function() {
       // If we use onloadend, we need to check the readyState.
       reader.onloadend = function(evt) {
@@ -146,10 +141,12 @@ angular.module('copayApp.controllers').controller('importController',
       if (!words) {
         this.error = gettext('Please enter the backup words');
       } else {
-        var wordList = words.split(/ /).filter(function(v){ return v.length>0; });
+        var wordList = words.split(/ /).filter(function(v) {
+          return v.length > 0;
+        });
         if (wordList.length != 12)
           this.error = gettext('Please enter 12 backup words');
-        else 
+        else
           words = wordList.join(' ');
       }
 
@@ -166,4 +163,41 @@ angular.module('copayApp.controllers').controller('importController',
 
       _importMnemonic(words, opts);
     };
+
+    this.importLedger = function(form) {
+      var self = this;
+      if (form.$invalid) {
+        this.error = gettext('There is an error in the form');
+        $timeout(function() {
+          $scope.$apply();
+        });
+        return;
+      }
+      self.ledger = true;
+      ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
+        self.ledger = false;
+        if (err) {
+          self.error = err;
+          $scope.$apply();
+          return;
+        }
+        lopts.externalIndex = $scope.externalIndex;
+        lopts.externalSource = 'ledger';
+        self.loading = true;
+        $log.debug('Import opts', lopts);
+        profileService.importExtendedPublicKey(lopts, function(err, walletId) {
+          self.loading = false;
+          if (err) {
+            self.error = err;
+            return $timeout(function() {
+              $scope.$apply();
+            });
+          }
+          $rootScope.$emit('Local/WalletImported', walletId);
+          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
+          go.walletHome();
+        });
+      }, 100);
+    };
+
   });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index a1defdf67..661d30e8a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -3,6 +3,7 @@
 angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, uxLanguage, $state, glideraService) {
   var self = this;
   self.isCordova = isCordova;
+  self.isChromeApp = isChromeApp;
   self.onGoingProcess = {};
   self.limitHistory = 5;
 
@@ -653,16 +654,18 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       return str;
     }
 
+    var step = 6;
+
     function getHistory(skip, cb) {
       skip = skip || 0;
       fc.getTxHistory({
         skip: skip,
-        limit: 100
+        limit: step, 
       }, function(err, txs) {
         if (err) return cb(err);
         if (txs && txs.length > 0) {
           allTxs.push(txs);
-          return getHistory(skip + 100, cb);
+          return getHistory(skip + step, cb);
         } else {
           return cb(null, lodash.flatten(allTxs));
         }
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 6561f4af2..9e875270b 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -4,7 +4,7 @@ angular.module('copayApp.controllers').controller('joinController',
   function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, isChromeApp, $modal, gettext, lodash, ledger) {
 
     var self = this;
-    this.externalIndexValues = lodash.range(0,20);
+    this.externalIndexValues = lodash.range(0,ledger.MAX_SLOT);
     $scope.externalIndex = 0;
 
     this.isChromeApp = function() {
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index 7a5a83ef9..6060415a8 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -25,7 +25,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('Copayer already in this wallet');
             break;
           case 'COPAYER_REGISTERED': 
-            body = gettextCatalog.getString('Copayer already registered');
+            body = gettextCatalog.getString('Wallet already registered');
             break;
           case 'COPAYER_VOTED': 
             body = gettextCatalog.getString('Copayer already voted on this spend proposal');
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 33a620a10..371af925b 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -179,8 +179,9 @@ angular.module('copayApp.services')
         }
       } else if (opts.extendedPublicKey) {
         try {
-          walletClient.seedFromExternalWalletPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource);
+          walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource);
         } catch (ex) {
+          $log.warn(ex);
           return cb(gettext('Could not create using the specified extended public key'));
         }
       } else {
@@ -191,7 +192,7 @@ angular.module('copayApp.services')
           $log.info('Error creating seed: ' + e.message);
           if (e.message.indexOf('language') > 0) {
             $log.info('Using default language for mnemonic');
-            walletClient.seedFromRandomWithMnemonic(network,  opts.passphrase);
+            walletClient.seedFromRandomWithMnemonic(network, opts.passphrase);
           } else {
             return cb(e);
           }
@@ -358,6 +359,26 @@ angular.module('copayApp.services')
       });
     };
 
+    root.importExtendedPublicKey = function(opts, cb) {
+      var walletClient = bwcService.getClient();
+      $log.debug('Importing Wallet XPubKey');
+
+      walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource, function(err) {
+        if (err) {
+
+          // in HW wallets, req key is always the same. They can't addAccess.
+          if (err.code == 'NOT_AUTHORIZED')
+            err.code = 'WALLET_DOES_NOT_EXIST';
+
+          return bwsError.cb(err, gettext('Could not import'), cb);
+        }
+
+        root._addWalletClient(walletClient, cb);
+      });
+    };
+
+
+
     root.create = function(opts, cb) {
       $log.info('Creating profile');
       configService.get(function(err) {

From b712874c17165babcd4076a3e3399e793b6b6c30 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 4 Sep 2015 22:15:50 -0300
Subject: [PATCH 28/47] fix derivation index

---
 public/views/create.html     | 2 +-
 public/views/import.html     | 2 +-
 public/views/join.html       | 2 +-
 src/js/controllers/import.js | 6 +++---
 src/js/services/ledger.js    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 0c495af1a..1a0985e75 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -131,7 +131,7 @@
  
             <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words seed (BIP39)</small>
+              <small translate>Enter the seed words (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
diff --git a/public/views/import.html b/public/views/import.html
index 927cf20c5..7cc75f7c6 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -80,7 +80,7 @@
 
             <div >
               <label for="words">
-                <span translate>Type the Wallet Seed (12 words)</span>:
+                <span translate>Type the Seed Word (usually 12 words)</span>:
               </label>
               <textarea class="form-control" name="words" ng-model="import.words" rows="2"></textarea>
             </div>
diff --git a/public/views/join.html b/public/views/join.html
index 01ca33775..712c39251 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -114,7 +114,7 @@
  
             <label for="ext-master" class="m10t" ng-show="setSeed && !hwLedger">
               <span translate>Wallet Seed</span>
-              <small translate>Enter the 12 words seed (BIP39)</small>
+              <small translate>Enter the seed words (BIP39)</small>
               <input id="ext-master"
               type="text"
               name="privateKey" ng-model="privateKey">
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index c8c95057d..8ffeff5c6 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -139,13 +139,13 @@ angular.module('copayApp.controllers').controller('importController',
       this.error = null;
 
       if (!words) {
-        this.error = gettext('Please enter the backup words');
+        this.error = gettext('Please enter the seed words');
       } else {
         var wordList = words.split(/ /).filter(function(v) {
           return v.length > 0;
         });
-        if (wordList.length != 12)
-          this.error = gettext('Please enter 12 backup words');
+        if ((wordList.length % 3) != 0)
+          this.error = gettext('Wrong number of seed words:') + wordList.length;
         else
           words = wordList.join(' ');
       }
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index d34a5f656..b55cdb872 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -143,7 +143,7 @@ angular.module('copayApp.services')
     }
 
     root._getPath = function(index) {
-      return bwcService.getUtils().PATHS.BASE_ADDRESS_DERIVATION + "/" + index;
+      return "m/" + index + "'/45'";
     }
 
     root._splitTransaction = function(transaction) {

From f1f4e5cfaf05beb753627b75c8496bc42f7b9ad6 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 5 Sep 2015 00:11:14 -0300
Subject: [PATCH 29/47] support xPrivKey seeds

---
 public/views/backup.html          |  4 ++--
 src/js/controllers/create.js      | 32 ++++++++++++++++---------------
 src/js/controllers/import.js      | 27 +++++++++++++++++++++++++-
 src/js/controllers/index.js       | 10 ++++++----
 src/js/controllers/join.js        | 11 ++++++++---
 src/js/services/profileService.js | 23 +++++++++++++++++++++-
 6 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index c1394ddc9..64c5e730b 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -47,8 +47,8 @@
   </div>
  
   <div class="row m20t" ng-show="!wordsC.mnemonicWords">
-    <div class="columns size-14 text-gray" translate>
-        The wallet seed not available on this device. You can still export the wallet to backup it.
+    <div class="columns size-14 text-gray text-center" translate>
+        Wallet seed not available. You can still export it from Advanced &gt; Export .
     </div>
   </div>
  
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index f14e30591..11aff3e46 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -6,7 +6,7 @@ angular.module('copayApp.controllers').controller('createController',
     var self = this;
     var defaults = configService.getDefaults();
     this.isWindowsPhoneApp = isMobile.Windows() && isCordova;
-   
+
     /* For compressed keys, m*73 + n*34 <= 496 */
     var COPAYER_PAIR_LIMITS = {
       1: 1,
@@ -35,7 +35,7 @@ angular.module('copayApp.controllers').controller('createController',
       $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
     };
 
-    this.externalIndexValues = lodash.range(0,ledger.MAX_SLOT);
+    this.externalIndexValues = lodash.range(0, ledger.MAX_SLOT);
     $scope.externalIndex = 0;
     this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
     $scope.totalCopayers = defaults.wallet.totalCopayers;
@@ -61,18 +61,23 @@ angular.module('copayApp.controllers').controller('createController',
         networkName: form.isTestnet.$modelValue ? 'testnet' : 'livenet',
       };
       var setSeed = form.setSeed.$modelValue;
-      if  (setSeed) {
-        opts.mnemonic = form.privateKey.$modelValue;
+      if (setSeed) {
+        var words = form.privateKey.$modelValue;
+        if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
+          opts.extendedPrivateKey = words;
+        } else {
+          opts.mnemonic = words;
+        }
         opts.passphrase = form.passphrase.$modelValue;
       } else {
         opts.passphrase = form.createPassphrase.$modelValue;
       }
 
-      if (setSeed && !opts.mnemonic) {
+      if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
         this.error = gettext('Please enter the wallet seed');
         return;
       }
- 
+
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
         ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
@@ -90,7 +95,7 @@ angular.module('copayApp.controllers').controller('createController',
       }
     };
 
-    this._create = function (opts) {
+    this._create = function(opts) {
       self.loading = true;
       $timeout(function() {
         profileService.createWallet(opts, function(err, secret, walletId) {
@@ -104,9 +109,8 @@ angular.module('copayApp.controllers').controller('createController',
             $timeout(function() {
               $rootScope.$apply();
             });
-          }
-          else {
-            if ( ( opts.mnemonic && opts.n==1) || opts.externalSource  ) {
+          } else {
+            if (opts.n == 1 && (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey)) {
               $rootScope.$emit('Local/WalletImported', walletId);
             } else {
               go.walletHome();
@@ -115,18 +119,16 @@ angular.module('copayApp.controllers').controller('createController',
         });
       }, 100);
     }
-    
+
     this.formFocus = function(what) {
       if (!this.isWindowsPhoneApp) return
 
       if (what && what == 'my-name') {
         this.hideWalletName = true;
         this.hideTabs = true;
-      }
-      else if (what && what == 'wallet-name'){
+      } else if (what && what == 'wallet-name') {
         this.hideTabs = true;
-      }
-      else {
+      } else {
         this.hideWalletName = false;
         this.hideTabs = false;
       }
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 8ffeff5c6..94e0c67af 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -63,11 +63,32 @@ angular.module('copayApp.controllers').controller('importController',
     };
 
 
+    var _importExtendedPrivateKey = function(xPrivKey) {
+      self.loading = true;
+
+      $timeout(function() {
+        profileService.importExtendedPrivateKey(xPrivKey, function(err, walletId) {
+          self.loading = false;
+          if (err) {
+            self.error = err;
+            return $timeout(function() {
+              $scope.$apply();
+            });
+          }
+          $rootScope.$emit('Local/WalletImported', walletId);
+          notification.success(gettext('Success'), gettext('Your wallet has been imported correctly'));
+          go.walletHome();
+        });
+      }, 100);
+    };
+
+
+
     var _importMnemonic = function(words, opts) {
       self.loading = true;
 
       $timeout(function() {
-        profileService.importWalletMnemonic(words, opts, function(err, walletId) {
+        profileService.importMnemonic(words, opts, function(err, walletId) {
           self.loading = false;
           if (err) {
             self.error = err;
@@ -140,7 +161,11 @@ angular.module('copayApp.controllers').controller('importController',
 
       if (!words) {
         this.error = gettext('Please enter the seed words');
+      } else if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
+        return _importExtendedPrivateKey(words)
       } else {
+
+        console.log('[import.js.167]', words.indexOf(' '), words.indexOf('prv')); //TODO
         var wordList = words.split(/ /).filter(function(v) {
           return v.length > 0;
         });
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 661d30e8a..536806f51 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -660,7 +660,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       skip = skip || 0;
       fc.getTxHistory({
         skip: skip,
-        limit: step, 
+        limit: step,
       }, function(err, txs) {
         if (err) return cb(err);
         if (txs && txs.length > 0) {
@@ -737,7 +737,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     });
   };
 
-  self.showErrorPopup = function (msg, cb) {
+  self.showErrorPopup = function(msg, cb) {
     $log.warn('Showing err popup:' + msg);
     self.showAlert = {
       msg: msg,
@@ -1015,7 +1015,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.needsBackup = false;
     storageService.setBackupFlag(walletId, function() {
       addressService.expireAddress(walletId, function(err) {
-        self.startScan(walletId);
+        $timeout(function() {
+          self.startScan(walletId);
+        }, 500);
       });
     });
   });
@@ -1108,7 +1110,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   });
 
   $rootScope.$on('Local/ShowAlert', function(event, msg, cb) {
-    self.showErrorPopup(msg,cb);
+    self.showErrorPopup(msg, cb);
   });
 
   $rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 9e875270b..3f7c0ecce 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -158,13 +158,18 @@ angular.module('copayApp.controllers').controller('joinController',
 
       var setSeed = form.setSeed.$modelValue;
       if  (setSeed) {
-        opts.mnemonic = form.privateKey.$modelValue;
+        var words = form.privateKey.$modelValue;
+        if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
+          opts.extendedPrivateKey = words;
+        } else {
+          opts.mnemonic = words;
+        }
         opts.passphrase = form.passphrase.$modelValue;
       } else {
         opts.passphrase = form.createPassphrase.$modelValue;
       }
 
-      if (setSeed && !opts.mnemonic) {
+      if (setSeed && !opts.mnemonic && !opts.extendedPrivateKey) {
         this.error = gettext('Please enter the wallet seed');
         return;
       }
@@ -197,7 +202,7 @@ angular.module('copayApp.controllers').controller('joinController',
           }
           $timeout(function() {
             var fc = profileService.focusedClient;
-            if ( ( opts.mnemonic || opts.externalSource )  && fc.isComplete()) {
+            if ( fc.isComplete() && (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey)) {
               $rootScope.$emit('Local/WalletImported', fc.credentials.walletId);
             } else {
               go.walletHome();
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 371af925b..3184414cd 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -177,6 +177,13 @@ angular.module('copayApp.services')
           $log.info(ex);
           return cb(gettext('Could not create: Invalid wallet seed'));
         }
+      } else if (opts.extendedPrivateKey) {
+        try {
+          walletClient.seedFromExtendedPrivateKey(opts.extendedPrivateKey);
+        } catch (ex) {
+          $log.warn(ex);
+          return cb(gettext('Could not create using the specified extended private key'));
+        }
       } else if (opts.extendedPublicKey) {
         try {
           walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource);
@@ -344,7 +351,21 @@ angular.module('copayApp.services')
       root._addWalletClient(walletClient, cb);
     };
 
-    root.importWalletMnemonic = function(words, opts, cb) {
+    root.importExtendedPrivateKey = function(xPrivKey, cb) {
+      var walletClient = bwcService.getClient();
+      $log.debug('Importing Wallet xPrivKey');
+
+      walletClient.importFromExtendedPrivateKey(xPrivKey, function(err) {
+        if (err)
+          return bwsError.cb(err, gettext('Could not import'), cb);
+
+        root._addWalletClient(walletClient, cb);
+      });
+    };
+
+
+
+    root.importMnemonic = function(words, opts, cb) {
       var walletClient = bwcService.getClient();
       $log.debug('Importing Wallet Mnemonic');
 

From e395bca072598771b78ca62120487b3a83574b4c Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 5 Sep 2015 01:02:01 -0300
Subject: [PATCH 30/47] add derivation path input in mnemonic

---
 src/js/controllers/import.js      |  6 +++---
 src/js/services/profileService.js | 28 +++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index 94e0c67af..a2e72b905 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -164,12 +164,12 @@ angular.module('copayApp.controllers').controller('importController',
       } else if (words.indexOf(' ') == -1 && words.indexOf('prv') == 1 && words.length > 108) {
         return _importExtendedPrivateKey(words)
       } else {
-
-        console.log('[import.js.167]', words.indexOf(' '), words.indexOf('prv')); //TODO
         var wordList = words.split(/ /).filter(function(v) {
           return v.length > 0;
         });
-        if ((wordList.length % 3) != 0)
+
+        // m/ allows to enter a custom derivation 
+        if ((wordList.length % 3) != 0 && wordList[0].indexOf('m/') != 0)
           this.error = gettext('Wrong number of seed words:') + wordList.length;
         else
           words = wordList.join(' ');
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 3184414cd..4e8d6b024 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -1,6 +1,6 @@
 'use strict';
 angular.module('copayApp.services')
-  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, uxLanguage, ledger) {
+  .factory('profileService', function profileServiceFactory($rootScope, $location, $timeout, $filter, $log, lodash, storageService, bwcService, configService, notificationService, isChromeApp, isCordova, gettext, nodeWebkit, bwsError, uxLanguage, ledger, bitcore) {
 
     var root = {};
 
@@ -170,6 +170,13 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       var network = opts.networkName || 'livenet';
 
+      if (opts.mnemonic && opts.mnemonic.indexOf('m/' != 0)) {
+        var xPrivKey = root._processDerivation(opts.mnemonic, network);
+        if (!xPrivKey) 
+          return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
+        opts.mnemonic = null;
+        opts.extendedPrivateKey = xPrivKey;
+      }
       if (opts.mnemonic) {
         try {
           walletClient.seedFromMnemonic(opts.mnemonic, opts.passphrase, network);
@@ -364,9 +371,28 @@ angular.module('copayApp.services')
     };
 
 
+    root._processDerivation = function(words, network) {
+      var wordList = words.split(/ /).filter(function(v) {
+        return v.length > 0;
+      });
+      var path = wordList.shift();
+      var walletClient = bwcService.getClient();
+      $log.debug('processDerivation', path);
+      walletClient.seedFromMnemonic(wordList.join(' '), null, network);
+      var k = new bitcore.HDPrivateKey(walletClient.credentials.xPrivKey);
+      return k.toString();
+    };
 
     root.importMnemonic = function(words, opts, cb) {
       var walletClient = bwcService.getClient();
+
+      if (words.indexOf('m/') == 0) {
+        var xPrivKey = root._processDerivation(words, opts.networkName);
+        if (!xPrivKey) 
+          return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
+        return root.importExtendedPrivateKey(xPrivKey, cb);
+      }
+
       $log.debug('Importing Wallet Mnemonic');
 
       walletClient.importFromMnemonic(words, {

From 50a46d87c002995214a4f45ecef7d6a15d09946a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 5 Sep 2015 11:22:27 -0300
Subject: [PATCH 31/47] better texts

---
 public/views/create.html    | 7 ++++---
 public/views/import.html    | 5 +++--
 public/views/join.html      | 5 +++--
 src/js/services/bwsError.js | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 1a0985e75..470c169af 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -76,7 +76,7 @@
         </div>
         <div class="row" ng-show="totalCopayers != 1">
           <div class="large-6 medium-6 columns">
-            <label><span translate>Select total number of copayers</span>
+            <label><span translate>Total number of copayers</span>
               <select class="m10t" ng-model="totalCopayers"
                 ng-options="totalCopayers as totalCopayers for totalCopayers in create.TCValues"
                 ng-change="create.setTotalCopayers(totalCopayers)">
@@ -84,7 +84,7 @@
             </label>
           </div>
           <div class="large-6 medium-6 columns">
-            <label><span translate>Select required number of signatures</span>
+            <label><span translate>Required number of signatures</span>
               <select class="m10t" ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in create.RCValues" ng-disabled="totalCopayers == 1">
               </select>
             </label>
@@ -107,10 +107,11 @@
               <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
             </label>
             <div ng-show="hwLedger">
-              <label class="oh line-b "><span translate>Select slot number for Ledger key</span>
+              <label class="oh"><span translate>Ledger Slot</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
                 </select>
               </label>
+              <div class="oh text-gray line-b  size-12   p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
             </div>         
             <label for="network-name" class="oh" ng-show="!hwLedger">
               <span translate>Testnet</span>
diff --git a/public/views/import.html b/public/views/import.html
index 7cc75f7c6..2a4e7453a 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -176,11 +176,12 @@
             </div>
 
           <div class="large-12 columns">
-            <label class="line-b oh">
-              <span translate>Select slot number for Ledger key</span>
+            <label class=" oh">
+              <span translate>Ledger Slot</span>
               <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in import.externalIndexValues">
               </select>
             </label>
+            <div class="oh text-gray line-b  size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot to import</div>
             <button translate type="submit" class="button round expand black"
               ng-disabled="import.loading || import.ledger">
               Import backup
diff --git a/public/views/join.html b/public/views/join.html
index 712c39251..edc5eec0b 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -92,11 +92,12 @@
               </label>
             </div>
             <div class="large-12 columns" ng-hide="!hwLedger">
-              <label class="line-b oh">
-                <span translate>Select slot number for Ledger key</span>
+              <label class="oh">
+                <span translate>Ledger Slot</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in join.externalIndexValues">
                 </select>
               </label>
+              <div class="oh text-gray line-b  size-12  p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
             </div>         
             <div class="large-12 columns">
 
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index 6060415a8..d77c98244 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -88,7 +88,7 @@ angular.module('copayApp.services')
             body = gettextCatalog.getString('Server response could not be verified');
             break;
           case 'WALLET_DOES_NOT_EXIST': 
-            body = gettextCatalog.getString('This wallet is not registed at the wallet service. Please create it from "Create Wallet" using adding for backup words');
+            body = gettextCatalog.getString('Wallet not registed at the Wallet Service. Recreate it from "Create Wallet" using "Advanced Options" to set your seed');
             break;
           case 'INVALID_BACKUP': 
             body = gettextCatalog.getString('Wallet seed is invalid');

From a8032e1e4bb653289ebc9b7054b5b47fc47d940b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Sat, 5 Sep 2015 13:03:46 -0300
Subject: [PATCH 32/47] fix ledger paths

---
 src/js/services/ledger.js         |  8 ++++++--
 src/js/services/profileService.js | 11 ++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index b55cdb872..0af9410d8 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -7,7 +7,7 @@ angular.module('copayApp.services')
     root.MAX_SLOT = 20;
 
     // Ledger magic number to get xPub without user confirmation
-    root.ENTROPY_INDEX_PATH = "m/0xb11e/";
+    root.ENTROPY_INDEX_PATH = "0xb11e/";
 
     root.callbacks = {};
 
@@ -26,6 +26,7 @@ angular.module('copayApp.services')
         }
 
         var b = bwcService.getBitcore();
+
         var x = b.HDPublicKey(data.xpubkey);
         data.entropySource = x.publicKey.toString();
         return callback(data);
@@ -37,6 +38,8 @@ angular.module('copayApp.services')
     };
 
     root.getXPubKey = function(path, callback) {
+
+      $log.debug('Ledger deriving xPub path:', path);
       root.callbacks["get_xpubkey"] = callback;
       root._messageAfterSession({
         command: "get_xpubkey",
@@ -85,6 +88,7 @@ angular.module('copayApp.services')
           root._reverseBytestring(input.prevout.bytes(32)).toString()
         ]);
       }
+      $log.debug('Ledger signing  paths:', paths);
       root._messageAfterSession({
         command: "sign_p2sh",
         inputs: inputs,
@@ -143,7 +147,7 @@ angular.module('copayApp.services')
     }
 
     root._getPath = function(index) {
-      return "m/" + index + "'/45'";
+      return index + "'/45'";
     }
 
     root._splitTransaction = function(transaction) {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 4e8d6b024..46b0ac3da 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -171,7 +171,7 @@ angular.module('copayApp.services')
       var network = opts.networkName || 'livenet';
 
       if (opts.mnemonic && opts.mnemonic.indexOf('m/' != 0)) {
-        var xPrivKey = root._processDerivation(opts.mnemonic, network);
+        var xPrivKey = root._preDerivation(opts.mnemonic, network);
         if (!xPrivKey) 
           return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
         opts.mnemonic = null;
@@ -371,23 +371,24 @@ angular.module('copayApp.services')
     };
 
 
-    root._processDerivation = function(words, network) {
+    root._preDerivation = function(words, network) {
       var wordList = words.split(/ /).filter(function(v) {
         return v.length > 0;
       });
       var path = wordList.shift();
       var walletClient = bwcService.getClient();
-      $log.debug('processDerivation', path);
+      $log.info('preDerivation:', path);
       walletClient.seedFromMnemonic(wordList.join(' '), null, network);
       var k = new bitcore.HDPrivateKey(walletClient.credentials.xPrivKey);
-      return k.toString();
+      var k2 = k.derive(path);
+      return k2.toString();
     };
 
     root.importMnemonic = function(words, opts, cb) {
       var walletClient = bwcService.getClient();
 
       if (words.indexOf('m/') == 0) {
-        var xPrivKey = root._processDerivation(words, opts.networkName);
+        var xPrivKey = root._preDerivation(words, opts.networkName);
         if (!xPrivKey) 
           return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
         return root.importExtendedPrivateKey(xPrivKey, cb);

From 07a75c4976e1296a3b3ab5e766ed2ead3a6bec2a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 8 Sep 2015 00:57:07 -0300
Subject: [PATCH 33/47] handles BWS 500 error

---
 src/js/services/bwsError.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index d77c98244..84959aa63 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -93,11 +93,14 @@ angular.module('copayApp.services')
           case 'INVALID_BACKUP': 
             body = gettextCatalog.getString('Wallet seed is invalid');
             break;
- 
- 
+  
+          case 'ERROR':
+            body = (err.message || err.error);
+            break;
+
           default:
             $log.warn('Unknown error type:', err.code);
-            body = err.code + ':' + err.message;
+            body = err.code + ':' + err.message ;
             break;
         }
       }

From 5d8bfa6e6f38cc9a0952b8eebb6d183dd8d1d218 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 8 Sep 2015 08:47:36 -0300
Subject: [PATCH 34/47] better log message

Signed-off-by: Matias Alejo Garcia <ematiu@gmail.com>
---
 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 536806f51..3a944211f 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -267,7 +267,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       if (!opts.quiet)
         self.setOngoingProcess('updatingStatus', true);
 
-      $log.debug('Updating Status:', fc, tries);
+      $log.debug('Updating Status:', fc.credentials.walletName, tries);
       get(function(err, walletStatus) {
         var currentStatusHash = _walletStatusHash(walletStatus);
         $log.debug('Status update. hash:' + currentStatusHash + ' Try:' + tries);

From 56abc76494517a5ffcf5f1a9619831ef6c822f2e Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 9 Sep 2015 16:51:23 -0300
Subject: [PATCH 35/47] fix service

---
 src/js/controllers/walletHome.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index fe6af8ef3..bbf053bda 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, utilService) {
+angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService) {
 
   var self = this;
   $rootScope.hideMenuBar = false;

From 783b9207bf7b4246a51ce21f203aefc6bf8d636f Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 9 Sep 2015 17:53:05 -0300
Subject: [PATCH 36/47] Fixes translations

---
 i18n/po/template.pot         | 737 +++++++++++++++++++++++++++++------
 public/views/backup.html     |  30 +-
 src/js/controllers/backup.js |   2 +-
 3 files changed, 643 insertions(+), 126 deletions(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index ef2c56325..19a6ee20f 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -4,21 +4,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: \n"
 
+#: public/views/buyGlidera.html
+#: public/views/sellGlidera.html
+msgid "(Enter the amount to get the exchange rate)"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "(possible double spend)"
 msgstr ""
 
 #: src/js/controllers/walletHome.js
-msgid "{{fee}} will be discounted for bitcoin networking fees"
-msgstr ""
-
-#: public/views/copayers.html
-#: public/views/walletHome.html
-msgid "{{index.m}}-of-{{index.n}}"
-msgstr ""
-
-#: public/views/includes/sidebar.html
-msgid "{{item.m}}-of-{{item.n}}"
+msgid "{{fee}} will be deducted for bitcoin networking fees"
 msgstr ""
 
 #: src/js/controllers/importLegacy.js
@@ -30,28 +26,65 @@ msgid "* A payment proposal can be deleted if 1) you are the creator, and no oth
 msgstr ""
 
 #: public/views/backup.html
-msgid "* You can safely install your backup on another device and use your wallet from multiple devices at the same time."
+msgid "<b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers)."
 msgstr ""
 
 #: public/views/backup.html
-msgid "A backup without its private key will allow the user to see the wallet balance, transactions, and create spend proposals. However, it will not be able to approve (sign) proposals."
+msgid "<b>OR</b> the wallet seed of <b>all</b>  copayers in the wallet"
+msgstr ""
+
+#: public/views/backup.html
+msgid "<b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet"
 msgstr ""
 
 #: public/views/splash.html
 msgid "A multisignature bitcoin wallet"
 msgstr ""
 
+#: public/views/buyGlidera.html
+#: public/views/sellGlidera.html
+msgid ""
+"A SMS containing a confirmation code was sent to your phone. <br>\n"
+"            Please, enter the code below"
+msgstr ""
+
+#: public/views/buyGlidera.html
+msgid "A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 4-6 business days."
+msgstr ""
+
+#: public/views/sellGlidera.html
+msgid "A transfer has been initiated to your bank account and should arrive in 4-6 business days."
+msgstr ""
+
 #: public/views/preferences.html
 msgid "About Copay"
 msgstr ""
 
 #: public/views/modals/txp-details.html
+#: src/js/services/confirmDialog.js
 #: src/js/controllers/copayers.js
 #: src/js/controllers/preferencesDelete.js
 #: src/js/controllers/walletHome.js
 msgid "Accept"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Account"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Active"
+msgstr ""
+
+#: public/views/glidera.html
+msgid "Activity"
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "Add an optional passphrase to secure the seed"
+msgstr ""
+
 #: public/views/includes/sidebar.html
 msgid "Add wallet"
 msgstr ""
@@ -62,8 +95,12 @@ msgstr ""
 msgid "Address"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Address Type"
+#: public/views/preferencesGlidera.html
+msgid "Address 1"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Address 2"
 msgstr ""
 
 #: public/views/preferences.html
@@ -94,7 +131,9 @@ msgstr ""
 msgid "Alternative Currency"
 msgstr ""
 
+#: public/views/buyGlidera.html
 #: public/views/paymentUri.html
+#: public/views/sellGlidera.html
 #: public/views/walletHome.html
 #: public/views/includes/output.html
 #: public/views/modals/customized-amount.html
@@ -106,6 +145,8 @@ msgstr ""
 msgid "Amount  below dust threshold"
 msgstr ""
 
+#: public/views/buyGlidera.html
+#: public/views/sellGlidera.html
 #: public/views/walletHome.html
 #: public/views/modals/customized-amount.html
 msgid "Amount in"
@@ -115,6 +156,10 @@ msgstr ""
 msgid "Applying changes"
 msgstr ""
 
+#: src/js/controllers/backup.js
+msgid "Are you sure you want to delete the backup words?"
+msgstr ""
+
 #: src/js/controllers/copayers.js
 #: src/js/controllers/preferencesDelete.js
 msgid "Are you sure you want to delete this wallet?"
@@ -130,6 +175,7 @@ msgid "Average confirmation time: {{fee.nbBlocks * 10}} minutes"
 msgstr ""
 
 #: public/views/includes/topbar.html
+#: public/views/modals/glidera-tx-details.html
 #: public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
 msgid "Back"
@@ -139,33 +185,40 @@ msgstr ""
 msgid "Backup"
 msgstr ""
 
-#: src/js/controllers/backup.js
-msgid "Backup created"
-msgstr ""
-
 #: public/views/walletHome.html
 msgid "Backup now"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "Backup options"
 msgstr ""
 
+#: src/js/controllers/backup.js
+msgid "Backup words deleted"
+msgstr ""
+
 #: src/js/services/profileService.js
 msgid "Bad wallet invitation"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Balance By Address"
+#: public/views/preferencesGlidera.html
+msgid "Bank Account Is Setup"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Bank Account State"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Basic Information State"
 msgstr ""
 
 #: public/views/walletHome.html
 msgid "Before receiving funds, it is highly recommended you backup your wallet keys."
 msgstr ""
 
-#: public/views/create.html
-#: public/views/join.html
-msgid "BIP32 master extended private key"
+#: public/views/preferencesGlidera.html
+msgid "Birth Date"
 msgstr ""
 
 #: public/views/walletHome.html
@@ -184,6 +237,15 @@ msgstr ""
 msgid "Bitcoin URI is NOT valid!"
 msgstr ""
 
+#: public/views/sellGlidera.html
+msgid "Bitcoins will be immediately sent from your wallet to Glidera. Fiat will be deposited in your bank account in 4-6 business days."
+msgstr ""
+
+#: public/views/glidera.html
+#: public/views/modals/glidera-tx-details.html
+msgid "Bought"
+msgstr ""
+
 #: public/views/modals/txp-details.html
 msgid "Broadcast Payment"
 msgstr ""
@@ -200,9 +262,32 @@ msgstr ""
 msgid "Browser unsupported"
 msgstr ""
 
+#: public/views/buyGlidera.html
+#: public/views/preferencesGlidera.html
+msgid "Buy"
+msgstr ""
+
+#: public/views/glidera.html
+msgid "Buy Bitcoin"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Buy/Sell"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Buy/Sell Disabled (pending first transaction)"
+msgstr ""
+
+#: src/js/controllers/buyGlidera.js
+msgid "Buying bitcoin..."
+msgstr ""
+
 #: public/views/copayers.html
 #: public/views/walletHome.html
 #: public/views/modals/confirmation.html
+#: public/views/modals/glidera-confirmation.html
+#: src/js/services/confirmDialog.js
 #: src/js/controllers/copayers.js
 #: src/js/controllers/preferencesDelete.js
 #: src/js/controllers/walletHome.js
@@ -233,6 +318,10 @@ msgstr ""
 msgid "Choose a wallet to send funds"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "City"
+msgstr ""
+
 #: public/views/includes/topbar.html
 #: public/views/modals/advancedSend.html
 #: public/views/modals/copayers.html
@@ -251,6 +340,7 @@ msgstr ""
 msgid "Commit hash"
 msgstr ""
 
+#: src/js/services/confirmDialog.js
 #: src/js/controllers/copayers.js
 #: src/js/controllers/preferencesDelete.js
 #: src/js/controllers/walletHome.js
@@ -261,12 +351,33 @@ msgstr ""
 msgid "Confirmations"
 msgstr ""
 
-#: src/js/services/bwsError.js
-msgid "Copayer already in this wallet"
+#: public/views/glidera.html
+msgid "Connect to Glidera"
+msgstr ""
+
+#: public/views/glidera.html
+msgid "Connect your Glidera account to get started"
+msgstr ""
+
+#: public/views/glidera.html
+#: public/views/glideraUri.html
+#: src/js/controllers/index.js
+msgid "Connecting to Glidera..."
+msgstr ""
+
+#: public/views/create.html
+#: public/views/import.html
+#: public/views/join.html
+msgid "Connecting to Ledger Wallet..."
+msgstr ""
+
+#: public/views/buyGlidera.html
+#: public/views/sellGlidera.html
+msgid "Continue"
 msgstr ""
 
 #: src/js/services/bwsError.js
-msgid "Copayer already registered"
+msgid "Copayer already in this wallet"
 msgstr ""
 
 #: src/js/services/bwsError.js
@@ -281,24 +392,25 @@ msgstr ""
 msgid "Copayers"
 msgstr ""
 
-#: src/js/controllers/backup.js
 #: src/js/controllers/copayers.js
+#: src/js/controllers/export.js
 #: src/js/controllers/walletHome.js
 msgid "Copied to clipboard"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "Copy backup to a safe place"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "Copy this text as it is to a safe place (notepad or email)"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "Copy to clipboard"
 msgstr ""
 
+#: src/js/controllers/sellGlidera.js
 #: src/js/controllers/walletHome.js
 msgid "Could not accept payment"
 msgstr ""
@@ -323,6 +435,14 @@ msgstr ""
 msgid "Could not create using the specified extended private key"
 msgstr ""
 
+#: src/js/services/profileService.js
+msgid "Could not create using the specified extended public key"
+msgstr ""
+
+#: src/js/services/profileService.js
+msgid "Could not create: Invalid wallet seed"
+msgstr ""
+
 #: src/js/controllers/import.js
 msgid "Could not decrypt file, check your password"
 msgstr ""
@@ -339,12 +459,21 @@ msgstr ""
 msgid "Could not fetch transaction history"
 msgstr ""
 
-#: src/js/services/profileService.js
-msgid "Could not import. Check input file and password"
+#: src/js/controllers/buyGlidera.js
+#: src/js/controllers/sellGlidera.js
+msgid "Could not get exchange information. Please, try again."
+msgstr ""
+
+#: src/js/controllers/sellGlidera.js
+msgid "Could not get the destination bitcoin address"
 msgstr ""
 
 #: src/js/services/profileService.js
-msgid "Could not join using the specified extended private key"
+msgid "Could not import"
+msgstr ""
+
+#: src/js/services/profileService.js
+msgid "Could not import. Check input file and password"
 msgstr ""
 
 #: src/js/services/profileService.js
@@ -359,6 +488,11 @@ msgstr ""
 msgid "Could not reject payment"
 msgstr ""
 
+#: src/js/controllers/buyGlidera.js
+#: src/js/controllers/sellGlidera.js
+msgid "Could not send confirmation code to your phone"
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "Could not send payment"
 msgstr ""
@@ -367,6 +501,10 @@ msgstr ""
 msgid "Could not update Wallet"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Country"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "Create"
 msgstr ""
@@ -405,6 +543,31 @@ msgstr ""
 msgid "Current fee rate for this policy: {{fee.feePerKBUnit}}/kiB"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Daily Buy"
+msgstr ""
+
+#: public/views/buyGlidera.html
+msgid "Daily buy limit"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Daily Buy Remaining"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Daily Sell"
+msgstr ""
+
+#: public/views/sellGlidera.html
+msgid "Daily sell limit"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Daily Sell Remaining"
+msgstr ""
+
+#: public/views/modals/glidera-tx-details.html
 #: public/views/modals/tx-details.html
 msgid "Date"
 msgstr ""
@@ -425,15 +588,16 @@ msgstr ""
 msgid "Delete Wallet"
 msgstr ""
 
+#: public/views/backup.html
+msgid "DELETE WORDS"
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "Deleting payment"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Derivation Strategy"
-msgstr ""
-
 #: public/views/modals/customized-amount.html
+#: public/views/modals/glidera-tx-details.html
 #: public/views/modals/paypro.html
 #: public/views/modals/tx-details.html
 #: public/views/modals/txp-details.html
@@ -444,15 +608,15 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: public/views/backup.html
-msgid "Do not include private key in backup"
+#: public/views/export.html
+msgid "Do not include private key"
 msgstr ""
 
 #: public/views/translators.html
 msgid "Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language."
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "Download backup"
 msgstr ""
 
@@ -464,26 +628,39 @@ msgstr ""
 msgid "Economy"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Email"
+msgstr ""
+
 #: public/views/preferencesEmail.html
-msgid "Email for wallet notifications"
+msgid "email for wallet notifications"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Email Is Setup"
 msgstr ""
 
 #: public/views/preferences.html
 msgid "Email Notifications"
 msgstr ""
 
-#: public/views/preferences.html
-msgid "Encrypt Private Key"
+#: src/js/controllers/export.js
+msgid "Encrypted export file saved"
 msgstr ""
 
-#: src/js/controllers/backup.js
-msgid "Encrypted backup file saved"
+#: public/views/create.html
+#: public/views/join.html
+msgid "Enter the seed words (BIP39)"
 msgstr ""
 
 #: public/views/includes/password.html
 msgid "Enter your password"
 msgstr ""
 
+#: src/js/controllers/sellGlidera.js
+msgid "Error"
+msgstr ""
+
 #: src/js/controllers/index.js
 msgid "Error at Wallet Service"
 msgstr ""
@@ -501,12 +678,17 @@ msgstr ""
 msgid "Expires"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Extended Public Keys"
+#: public/views/preferences.html
+#: public/views/preferencesAdvanced.html
+msgid "Export"
 msgstr ""
 
-#: public/views/backup.html
-msgid "Failed to create backup"
+#: public/views/includes/walletInfo.html
+msgid "External Private Key:"
+msgstr ""
+
+#: public/views/export.html
+msgid "Failed to export"
 msgstr ""
 
 #: src/js/controllers/importLegacy.js
@@ -530,11 +712,27 @@ msgstr ""
 msgid "Fee policy for this transaction"
 msgstr ""
 
+#: public/views/modals/glidera-tx-details.html
+msgid "Fees"
+msgstr ""
+
 #. Get information of payment if using Payment Protocol
 #: src/js/controllers/walletHome.js
 msgid "Fetching Payment Information"
 msgstr ""
 
+#: public/views/buyGlidera.html
+msgid "Fiat will be immediately withdrawn from your bank account. The bitcoins will be purchased and deposited to your wallet ({{index.walletName}}) in 2-4 business days."
+msgstr ""
+
+#: public/views/import.html
+msgid "File/Text Backup"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "First Name"
+msgstr ""
+
 #: public/views/translators.html
 msgid "French"
 msgstr ""
@@ -571,11 +769,24 @@ msgstr ""
 msgid "Getting address for wallet {{selectedWalletName}} ..."
 msgstr ""
 
+#: src/js/controllers/index.js
+msgid "Getting Glidera Email..."
+msgstr ""
+
+#: src/js/controllers/index.js
+msgid "Getting Glidera Personal Information..."
+msgstr ""
+
+#: src/js/controllers/index.js
+msgid "Getting Glidera transactions..."
+msgstr ""
+
 #: public/views/preferences.html
 msgid "Global settings"
 msgstr ""
 
 #: public/views/disclaimer.html
+#: public/views/glidera.html
 msgid "Go back"
 msgstr ""
 
@@ -583,17 +794,25 @@ msgstr ""
 msgid "Greek"
 msgstr ""
 
+#: public/views/preferences.html
+msgid "Hardware wallet"
+msgstr ""
+
 #: public/views/import.html
 msgid "Have a Backup from Copay v0.9?"
 msgstr ""
 
-#: public/views/backup.html
 #: public/views/create.html
+#: public/views/import.html
 #: public/views/join.html
 #: public/views/walletHome.html
 msgid "Hide advanced options"
 msgstr ""
 
+#: public/views/backup.html
+msgid "Hide Wallet Seed"
+msgstr ""
+
 #: src/js/controllers/index.js
 msgid "History"
 msgstr ""
@@ -606,11 +825,7 @@ msgstr ""
 msgid "I affirm that I have read, understood, and agree with these terms."
 msgstr ""
 
-#: public/views/create.html
-#: public/views/join.html
-msgid "If not given, a secure key will be generated"
-msgstr ""
-
+#: public/views/import.html
 #: public/views/importLegacy.html
 msgid "Import"
 msgstr ""
@@ -697,15 +912,42 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Last Wallet Addresses"
+#: public/views/preferencesGlidera.html
+msgid "Last Name"
+msgstr ""
+
+#: public/views/backup.html
+msgid "Learn more about Copay backups"
 msgstr ""
 
 #: public/views/importLegacy.html
 msgid "Learn more about Wallet Migration"
 msgstr ""
 
-#: src/js/routes.js
+#: public/views/import.html
+msgid "Ledger"
+msgstr ""
+
+#: public/views/create.html
+#: public/views/import.html
+#: public/views/join.html
+msgid "Ledger Slot"
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet"
+msgstr ""
+
+#: public/views/import.html
+msgid "Ledger supports up to 20 Copay wallets simultaneously. Select which slot to import"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Limits"
+msgstr ""
+
+#: src/js/controllers/disclaimer.js
 msgid "Loading..."
 msgstr ""
 
@@ -725,11 +967,6 @@ msgstr ""
 msgid "Make a payment to"
 msgstr ""
 
-#: public/views/create.html
-#: public/views/join.html
-msgid "Master extended private key"
-msgstr ""
-
 #: public/views/includes/copayers.html
 #: public/views/modals/copayers.html
 #: public/views/modals/tx-details.html
@@ -749,6 +986,34 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Middle Name"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Monthly Buy"
+msgstr ""
+
+#: public/views/buyGlidera.html
+msgid "Monthly buy limit"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Monthly Buy Remaining"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Monthly Sell"
+msgstr ""
+
+#: public/views/sellGlidera.html
+msgid "Monthly sell limit"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Monthly Sell Remaining"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "More"
 msgstr ""
@@ -777,7 +1042,11 @@ msgstr ""
 msgid "New Payment Proposal"
 msgstr ""
 
-#: public/views/walletHome.html
+#: public/views/glidera.html
+msgid "No activity in your account"
+msgstr ""
+
+#: public/views/includes/walletInfo.html
 msgid "No Private key"
 msgstr ""
 
@@ -805,8 +1074,27 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time."
+#: public/views/preferencesGlidera.html
+msgid "Occupation"
+msgstr ""
+
+#: public/views/copayers.html
+#: public/views/walletHome.html
+#: public/views/includes/sidebar.html
+msgid "of"
+msgstr ""
+
+#: public/views/includes/alert.html
+#: public/views/includes/password.html
+msgid "OK"
+msgstr ""
+
+#: public/views/modals/tx-status.html
+msgid "OKAY"
+msgstr ""
+
+#: public/views/backup.html
+msgid "Once you have copy your wallet seed, it is recommended to delete it from this device."
 msgstr ""
 
 #: public/views/walletHome.html
@@ -819,12 +1107,12 @@ msgid "Participants"
 msgstr ""
 
 #: public/views/import.html
-#: public/views/importLegacy.html
-msgid "Password"
+msgid "Passphrase"
 msgstr ""
 
-#: public/views/includes/password.html
-msgid "Password cannot be recovered. Be sure to write it down"
+#: public/views/import.html
+#: public/views/importLegacy.html
+msgid "Password"
 msgstr ""
 
 #: src/js/services/profileService.js
@@ -839,6 +1127,10 @@ msgstr ""
 msgid "Paste invitation here"
 msgstr ""
 
+#: public/views/glidera.html
+msgid "Paste the authorization code here"
+msgstr ""
+
 #: public/views/import.html
 msgid "Paste the backup plain text code"
 msgstr ""
@@ -924,15 +1216,40 @@ msgstr ""
 msgid "Permanently delete this wallet. THIS ACTION CANNOT BE REVERSED"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Permissions"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Personal Information"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Personal Information State"
+msgstr ""
+
 #: public/views/create.html
 msgid "Personal Wallet"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Phone Is Setup"
+msgstr ""
+
 #: src/js/controllers/create.js
 #: src/js/controllers/join.js
 msgid "Please enter the required fields"
 msgstr ""
 
+#: src/js/controllers/import.js
+msgid "Please enter the seed words"
+msgstr ""
+
+#: src/js/controllers/create.js
+#: src/js/controllers/join.js
+msgid "Please enter the wallet seed"
+msgstr ""
+
 #: src/js/services/bwsError.js
 msgid "Please upgrade Copay to perform this action"
 msgstr ""
@@ -945,18 +1262,27 @@ msgstr ""
 msgid "Portuguese"
 msgstr ""
 
+#: public/views/glidera.html
 #: public/views/walletHome.html
 msgid "Preferences"
 msgstr ""
 
-#: src/js/controllers/backup.js
+#: src/js/controllers/export.js
 msgid "Preparing backup..."
 msgstr ""
 
+#: public/views/modals/glidera-tx-details.html
+msgid "Price"
+msgstr ""
+
 #: src/js/services/feeService.js
 msgid "Priority"
 msgstr ""
 
+#: public/views/buyGlidera.html
+msgid "Purchase initiated"
+msgstr ""
+
 #: public/views/modals/customized-amount.html
 msgid "QR Code"
 msgstr ""
@@ -1003,7 +1329,7 @@ msgstr ""
 msgid "Release Information"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 #: public/views/includes/password.html
 msgid "Repeat password"
 msgstr ""
@@ -1013,19 +1339,42 @@ msgstr ""
 msgid "Request a specific amount"
 msgstr ""
 
-#: public/views/import.html
+#: public/views/preferences.html
+msgid "Request Password for Spending Funds"
+msgstr ""
+
+#: src/js/controllers/walletHome.js
+msgid "Requesting Ledger Wallet to sign"
+msgstr ""
+
 #: public/views/join.html
 msgid "Required"
 msgstr ""
 
+#: public/views/create.html
+msgid "Required number of signatures"
+msgstr ""
+
 #: public/views/splash.html
 msgid "Retrying..."
 msgstr ""
 
+#: public/views/modals/glidera-confirmation.html
+msgid "Revoke Glidera Token"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Revoke Token"
+msgstr ""
+
 #: public/views/translators.html
 msgid "Russian"
 msgstr ""
 
+#: public/views/sellGlidera.html
+msgid "Sale initiated"
+msgstr ""
+
 #: public/views/preferencesAlias.html
 #: public/views/preferencesBwsUrl.html
 #: public/views/preferencesEmail.html
@@ -1056,6 +1405,15 @@ msgstr ""
 msgid "See it on the blockchain"
 msgstr ""
 
+#: public/views/import.html
+msgid "Seed passphrase"
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "Seed Passphrase"
+msgstr ""
+
 #: public/views/import.html
 msgid "Select a backup file"
 msgstr ""
@@ -1064,12 +1422,17 @@ msgstr ""
 msgid "Select a wallet"
 msgstr ""
 
-#: public/views/create.html
-msgid "Select required number of signatures"
+#: public/views/preferencesGlidera.html
+#: public/views/sellGlidera.html
+msgid "Sell"
 msgstr ""
 
-#: public/views/create.html
-msgid "Select total number of copayers"
+#: public/views/glidera.html
+msgid "Sell Bitcoin"
+msgstr ""
+
+#: src/js/controllers/sellGlidera.js
+msgid "Selling Bitcoin..."
 msgstr ""
 
 #: public/views/walletHome.html
@@ -1082,15 +1445,16 @@ msgstr ""
 msgid "Send All"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Send all by email"
-msgstr ""
-
-#: public/views/backup.html
+#: public/views/export.html
 #: public/views/preferencesLogs.html
 msgid "Send by email"
 msgstr ""
 
+#: src/js/controllers/buyGlidera.js
+#: src/js/controllers/sellGlidera.js
+msgid "Sending 2FA code..."
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "Sent"
 msgstr ""
@@ -1099,6 +1463,10 @@ msgstr ""
 msgid "Server"
 msgstr ""
 
+#: src/js/services/bwsError.js
+msgid "Server response could not be verified"
+msgstr ""
+
 #: public/views/preferencesAbout.html
 msgid "Session log"
 msgstr ""
@@ -1107,12 +1475,12 @@ msgstr ""
 msgid "SET"
 msgstr ""
 
-#: public/views/includes/password.html
-msgid "Set up a password"
+#: public/views/export.html
+msgid "Set up a Export Password"
 msgstr ""
 
-#: public/views/backup.html
-msgid "Set up a Password for your backup"
+#: public/views/includes/password.html
+msgid "Set up a password"
 msgstr ""
 
 #: public/views/preferencesEmail.html
@@ -1124,7 +1492,6 @@ msgid "settings"
 msgstr ""
 
 #: public/views/walletHome.html
-#: public/views/modals/customized-amount.html
 msgid "Share address"
 msgstr ""
 
@@ -1144,13 +1511,17 @@ msgstr ""
 msgid "Shared Wallet"
 msgstr ""
 
-#: public/views/backup.html
 #: public/views/create.html
+#: public/views/import.html
 #: public/views/join.html
 #: public/views/walletHome.html
 msgid "Show advanced options"
 msgstr ""
 
+#: public/views/backup.html
+msgid "Show Wallet Seed"
+msgstr ""
+
 #: src/js/services/bwsError.js
 msgid "Signatures rejected by server"
 msgstr ""
@@ -1167,10 +1538,20 @@ msgstr ""
 msgid "SKIP BACKUP"
 msgstr ""
 
+#: public/views/glidera.html
+#: public/views/modals/glidera-tx-details.html
+msgid "Sold"
+msgstr ""
+
 #: public/views/translators.html
 msgid "Spanish"
 msgstr ""
 
+#: public/views/create.html
+#: public/views/join.html
+msgid "Specify your wallet seed"
+msgstr ""
+
 #: src/js/services/bwsError.js
 msgid "Spend proposal is not accepted"
 msgstr ""
@@ -1179,7 +1560,24 @@ msgstr ""
 msgid "Spend proposal not found"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "State"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "Status"
+msgstr ""
+
+#: public/views/preferences.html
+msgid "Still not done"
+msgstr ""
+
+#: public/views/modals/glidera-tx-details.html
+msgid "Subtotal"
+msgstr ""
+
 #: src/js/controllers/copayers.js
+#: src/js/controllers/export.js
 #: src/js/controllers/import.js
 #: src/js/controllers/preferencesDelete.js
 msgid "Success"
@@ -1195,9 +1593,14 @@ msgid "Terms of Use"
 msgstr ""
 
 #: public/views/create.html
+#: public/views/import.html
 msgid "Testnet"
 msgstr ""
 
+#: src/js/services/ledger.js
+msgid "The Ledger Chrome application is not installed"
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "The payment was created but could not be completed. Please try again from home screen"
 msgstr ""
@@ -1214,8 +1617,13 @@ msgstr ""
 msgid "The payment was signed but could not be broadcasted. Please try again from home screen"
 msgstr ""
 
-#: public/views/backup.html
-msgid "The private key for this wallet is encrypted. Exporting a backup will keep the private key encrypted in the backup archive."
+#: public/views/export.html
+msgid "The private key for this wallet is encrypted. Exporting  keep the private key encrypted in the export archive."
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "The seed could require a passphrase to be imported"
 msgstr ""
 
 #: public/views/disclaimer.html
@@ -1226,6 +1634,10 @@ msgstr ""
 msgid "The spend proposal is not pending"
 msgstr ""
 
+#: src/js/controllers/sellGlidera.js
+msgid "The transaction could not be signed"
+msgstr ""
+
 #: src/js/controllers/copayers.js
 #: src/js/controllers/preferencesDelete.js
 msgid "The wallet \"{{walletName}}\" was deleted"
@@ -1239,6 +1651,11 @@ msgstr ""
 msgid "There is an error in the form"
 msgstr ""
 
+#: public/views/buyGlidera.html
+#: public/views/sellGlidera.html
+msgid "This operation was disabled because you have a pending first transaction"
+msgstr ""
+
 #: public/views/modals/tx-details.html
 msgid "This transaction has become invalid; possibly due to a double spend attempt."
 msgstr ""
@@ -1247,6 +1664,10 @@ msgstr ""
 msgid "This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information."
 msgstr ""
 
+#: src/js/controllers/create.js
+msgid "This xpub index is already used by another wallet. Please select another index."
+msgstr ""
+
 #: public/views/modals/txp-details.html
 msgid "Time"
 msgstr ""
@@ -1259,10 +1680,19 @@ msgstr ""
 msgid "To"
 msgstr ""
 
+#: public/views/backup.html
+msgid "To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need"
+msgstr ""
+
+#: public/views/backup.html
+msgid "To restore this {{index.m}}-{{index.n}} shared wallet you will need"
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "too long!"
 msgstr ""
 
+#: public/views/modals/glidera-tx-details.html
 #: public/views/modals/txp-details.html
 msgid "Total"
 msgstr ""
@@ -1271,6 +1701,11 @@ msgstr ""
 msgid "Total Locked Balance"
 msgstr ""
 
+#: public/views/create.html
+msgid "Total number of copayers"
+msgstr ""
+
+#: public/views/modals/glidera-tx-details.html
 #: public/views/modals/tx-details.html
 msgid "Transaction"
 msgstr ""
@@ -1279,6 +1714,10 @@ msgstr ""
 msgid "Transaction already broadcasted"
 msgstr ""
 
+#: public/views/preferencesGlidera.html
+msgid "Transaction History"
+msgstr ""
+
 #: public/views/translators.html
 msgid "Translation Credits"
 msgstr ""
@@ -1287,6 +1726,10 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
+#: public/views/import.html
+msgid "Type the Seed Word (usually 12 words)"
+msgstr ""
+
 #: src/js/controllers/walletHome.js
 msgid "Unable to send transaction proposal"
 msgstr ""
@@ -1312,6 +1755,11 @@ msgstr ""
 msgid "Updating Wallet..."
 msgstr ""
 
+#: public/views/create.html
+#: public/views/join.html
+msgid "Use Ledger hardware wallet"
+msgstr ""
+
 #: public/views/preferences.html
 #: public/views/walletHome.html
 msgid "Use Unconfirmed Funds"
@@ -1321,7 +1769,7 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: public/views/backup.html
+#: public/views/export.html
 msgid "View backup"
 msgstr ""
 
@@ -1333,6 +1781,10 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
+#: public/views/import.html
+msgid "Walled Seed"
+msgstr ""
+
 #: public/views/preferences.html
 msgid "Wallet Alias"
 msgstr ""
@@ -1346,23 +1798,14 @@ msgstr ""
 msgid "Wallet Already Imported:"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Wallet Configuration (m-n)"
-msgstr ""
-
-#: public/views/preferencesInformation.html
-msgid "Wallet Id"
+#: src/js/services/bwsError.js
+msgid "Wallet already registered"
 msgstr ""
 
 #: public/views/copayers.html
 msgid "Wallet incomplete and broken"
 msgstr ""
 
-#: public/views/preferencesAdvanced.html
-#: public/views/preferencesInformation.html
-msgid "Wallet Information"
-msgstr ""
-
 #: public/views/join.html
 msgid "Wallet Invitation"
 msgstr ""
@@ -1383,16 +1826,29 @@ msgstr ""
 msgid "Wallet name"
 msgstr ""
 
-#: public/views/preferencesInformation.html
-msgid "Wallet Name (at creation)"
-msgstr ""
-
-#: public/views/preferencesInformation.html
-msgid "Wallet Network"
+#: src/js/services/bwsError.js
+msgid "Wallet not found"
 msgstr ""
 
 #: src/js/services/bwsError.js
-msgid "Wallet not found"
+msgid "Wallet not registed at the Wallet Service. Recreate it from \"Create Wallet\" using \"Advanced Options\" to set your seed"
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "Wallet Seed"
+msgstr ""
+
+#: public/views/import.html
+msgid "Wallet Seed could require a passphrase to be imported"
+msgstr ""
+
+#: src/js/services/bwsError.js
+msgid "Wallet seed is invalid"
+msgstr ""
+
+#: public/views/backup.html
+msgid "Wallet seed not available. You can still export it from Advanced &gt; Export."
 msgstr ""
 
 #: src/js/services/bwsError.js
@@ -1403,6 +1859,23 @@ msgstr ""
 msgid "WARNING: Backup needed"
 msgstr ""
 
+#: public/views/export.html
+msgid "WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessible from the export</b>."
+msgstr ""
+
+#: public/views/create.html
+#: public/views/join.html
+msgid "WARNING: Passphrase cannot be recovered. <b>Be sure to write it down</b>. The wallet can not be restored without the passphrase."
+msgstr ""
+
+#: public/views/export.html
+msgid "WARNING: The private key of this wallet is not available.  The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so <b>funds will not be accessible from the export</b>."
+msgstr ""
+
+#: public/views/backup.html
+msgid "WARNING: This seed was created with a passphrase. To recover this wallet both the mnemonic and passphrase are needed."
+msgstr ""
+
 #: public/views/modals/txp-details.html
 msgid "Warning: this transaction has unconfirmed inputs"
 msgstr ""
@@ -1419,23 +1892,51 @@ msgstr ""
 msgid "WELCOME TO COPAY"
 msgstr ""
 
+#: public/views/backup.html
+msgid "Write it down and keep them somewhere safe."
+msgstr ""
+
+#: src/js/controllers/import.js
+msgid "Wrong number of seed words:"
+msgstr ""
+
 #: src/js/services/profileService.js
 msgid "Wrong password"
 msgstr ""
 
 #: public/views/modals/confirmation.html
+#: public/views/modals/glidera-confirmation.html
 msgid "Yes"
 msgstr ""
 
+#: public/views/glidera.html
+msgid "You can buy and sell Bitcoin with a US bank account directly in Copay."
+msgstr ""
+
+#: public/views/backup.html
+msgid "You can safely install your wallet on another device and use it from multiple devices at the same time."
+msgstr ""
+
 #: public/views/walletHome.html
 msgid "You do not have a wallet"
 msgstr ""
 
 #: public/views/backup.html
+msgid "You need the wallet seed to restore this personal wallet."
+msgstr ""
+
 #: public/views/import.html
 msgid "Your backup password"
 msgstr ""
 
+#: public/views/export.html
+msgid "Your export password"
+msgstr ""
+
+#: public/views/glidera.html
+msgid "Your Glidera account is not ready to transact. Please, verify it at"
+msgstr ""
+
 #: public/views/create.html
 #: public/views/join.html
 msgid "Your nickname"
@@ -1452,3 +1953,19 @@ msgstr ""
 #: src/js/controllers/import.js
 msgid "Your wallet has been imported correctly"
 msgstr ""
+
+#: public/views/includes/password.html
+msgid "Your wallet key will be encrypted. Password cannot be recovered. Be sure to write it down"
+msgstr ""
+
+#: public/views/backup.html
+msgid "Your wallet seed and access to the wallet service where wallet is registered"
+msgstr ""
+
+#: public/views/backup.html
+msgid "Your wallet seed and access to the wallet service where your wallet is registered"
+msgstr ""
+
+#: public/views/preferencesGlidera.html
+msgid "ZIP Code"
+msgstr ""
diff --git a/public/views/backup.html b/public/views/backup.html
index 64c5e730b..81b588697 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -10,7 +10,7 @@
 
   <div ng-show="wordsC.mnemonicWords">
     <div class="row"  ng-show="index.n==1">
-      <div class="m10t columns size-14 text-gray" translate>
+      <div class="m10t columns size-14 text-gray">
         <span translate>
           You need the wallet seed to restore this personal wallet.
         </span>
@@ -20,26 +20,26 @@
       </div>
     </div>
     <div class="row" ng-show="(index.n>1 && index.m != index.n )">
-      <div class="m10t columns size-14 text-gray" translate>
+      <div class="m10t columns size-14 text-gray">
         <span translate>
-          To restore this {{index.m}}-{{index.n}} shared wallet you will need:
+          To restore this {{index.m}}-{{index.n}} shared wallet you will need
         </span>:
   <ol class="m10t columns size-14 text-gray">
-    <li> Your wallet seed and access to the wallet service where your wallet is registered 
-    <li> <b>OR</b> the wallet seed of <b>all</b>  copayers in the wallet
-    <li> <b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).
+    <li translate>Your wallet seed and access to the wallet service where your wallet is registered</li>
+    <li translate><b>OR</b> the wallet seed of <b>all</b>  copayers in the wallet</li>
+    <li translate><b>OR</b> 1 wallet export file and the remaining quorum of wallet seeds (e.g. in a 3-5 wallet: 1 wallet export file + 2 wallet seeds of any of the other copayers).</li>
   </ol>
         </span>
       </div>
     </div>
     <div class="row" ng-show="(index.n>1 && index.m == index.n )">
-      <div class="m10t columns size-14 text-gray" translate>
+      <div class="m10t columns size-14 text-gray">
         <span translate>
           To restore this {{index.m}}-{{index.n}} <b>shared</b> wallet you will need
         </span>:
   <ol class="m10t columns size-14 text-gray">
-    <li> Your wallet seed and access to the wallet service where wallet is registered 
-    <li> <b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet
+    <li translate> Your wallet seed and access to the wallet service where wallet is registered</li>
+    <li translate><b>OR</b> the wallet seeds of <b>all</b> copayers in the wallet</li>
   </ol>
         </span>
       </div>
@@ -48,7 +48,7 @@
  
   <div class="row m20t" ng-show="!wordsC.mnemonicWords">
     <div class="columns size-14 text-gray text-center" translate>
-        Wallet seed not available. You can still export it from Advanced &gt; Export .
+        Wallet seed not available. You can still export it from Advanced &gt; Export.
     </div>
   </div>
  
@@ -87,7 +87,7 @@
 
 
         <div class="m10 text-center columns">
-          <div class="m10 size-14 text-gray" translate>
+          <div class="m10 size-14 text-gray">
             <span translate>
               Once you have copy your wallet seed, it is recommended to delete it from this device.
             </span>
@@ -103,11 +103,11 @@
 
     <!-- hide this in multisig just to show less text -->
     <div class="row m20t"  ng-show="index.n==1">
-      <div class="columns size-14 text-gray" translate>
-        You can safely install your wallet on another device and use it from multiple devices at the same time.  <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')">
-            <span translate>Learn more about Copay backups</span>
+      <div class="columns size-14 text-gray">
+        <span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span> 
+        <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay#backups')" translate>
+          Learn more about Copay backups
         </a>
-  
       </div>
     </div>
 
diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index b2d0bf01a..adb576f71 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -3,7 +3,7 @@
 angular.module('copayApp.controllers').controller('wordsController',
   function($rootScope, $scope, $timeout, profileService, go, gettext, confirmDialog, notification) {
 
-    var msg = gettext('Are you to delete the backup words?');
+    var msg = gettext('Are you sure you want to delete the backup words?');
     var successMsg = gettext('Backup words deleted');
 
     this.done = function() {

From 896f6cb6fb9939c082440624a043e7d91d597729 Mon Sep 17 00:00:00 2001
From: Kirvx <Kirvx@tutanota.com>
Date: Thu, 10 Sep 2015 17:04:12 +0200
Subject: [PATCH 37/47] Update template.pot

---
 i18n/po/template.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/po/template.pot b/i18n/po/template.pot
index 19a6ee20f..0f16e3df8 100644
--- a/i18n/po/template.pot
+++ b/i18n/po/template.pot
@@ -1618,7 +1618,7 @@ msgid "The payment was signed but could not be broadcasted. Please try again fro
 msgstr ""
 
 #: public/views/export.html
-msgid "The private key for this wallet is encrypted. Exporting  keep the private key encrypted in the export archive."
+msgid "The private key for this wallet is encrypted. Exporting keep the private key encrypted in the export archive."
 msgstr ""
 
 #: public/views/create.html

From 619e743af06ef2f9f103eb5c9f14d9937baa2dec Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Thu, 10 Sep 2015 12:07:15 -0300
Subject: [PATCH 38/47] fix space in text

---
 public/views/export.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/views/export.html b/public/views/export.html
index db852af1d..e6bb9c34b 100644
--- a/public/views/export.html
+++ b/public/views/export.html
@@ -16,7 +16,7 @@
 
       <div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
         <i class="fi-alert size-12"></i>
-        <span translate> The private key for this wallet is encrypted. Exporting  keep the private key encrypted in the export archive.</span>
+        <span translate> The private key for this wallet is encrypted. Exporting keep the private key encrypted in the export archive.</span>
 
       </div>
 

From c4964c1929d997cbaccba5864e674b71b3cae91f Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 11 Sep 2015 11:37:34 -0300
Subject: [PATCH 39/47] fix preDerivation

---
 src/js/services/bwsError.js       | 2 +-
 src/js/services/profileService.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index 84959aa63..f598946e5 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -100,7 +100,7 @@ angular.module('copayApp.services')
 
           default:
             $log.warn('Unknown error type:', err.code);
-            body = err.code + ':' + err.message ;
+            body =  err.message  || err.code;
             break;
         }
       }
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 46b0ac3da..21bdf377e 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -170,7 +170,7 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       var network = opts.networkName || 'livenet';
 
-      if (opts.mnemonic && opts.mnemonic.indexOf('m/' != 0)) {
+      if (opts.mnemonic && opts.mnemonic.indexOf('m/') == 0) {
         var xPrivKey = root._preDerivation(opts.mnemonic, network);
         if (!xPrivKey) 
           return bwsError.cb('Bad derivation', gettext('Could not import'), cb);

From 78e6120e55a518edf01c496379a8232aa92e340d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 11 Sep 2015 15:43:42 -0300
Subject: [PATCH 40/47] WIP: ledger P2PKH

---
 public/views/create.html          |  4 +-
 public/views/import.html          |  4 +-
 public/views/join.html            |  4 +-
 public/views/preferences.html     |  2 +-
 src/js/controllers/create.js      |  5 +--
 src/js/controllers/import.js      |  5 +--
 src/js/controllers/join.js        |  5 +--
 src/js/controllers/preferences.js |  3 +-
 src/js/controllers/walletHome.js  |  6 ++-
 src/js/services/ledger.js         | 64 ++++++++++++++++++++++++-------
 src/js/services/profileService.js |  4 +-
 11 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/public/views/create.html b/public/views/create.html
index 470c169af..1ff6ce48e 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -106,13 +106,15 @@
               <span translate>Use Ledger hardware wallet</span>
               <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
             </label>
+<!-- account
             <div ng-show="hwLedger">
               <label class="oh"><span translate>Ledger Slot</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
                 </select>
               </label>
               <div class="oh text-gray line-b  size-12   p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
-            </div>         
+            </div> 
+-->        
             <label for="network-name" class="oh" ng-show="!hwLedger">
               <span translate>Testnet</span>
               <switch id="network-name" name="isTestnet" ng-model="isTestnet" class="green right m5t m10b"></switch>
diff --git a/public/views/import.html b/public/views/import.html
index 2a4e7453a..77a40a858 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -174,20 +174,20 @@
                 {{import.error|translate}}
               </span>
             </div>
-
           <div class="large-12 columns">
+<!-- TODO: account
             <label class=" oh">
               <span translate>Ledger Slot</span>
               <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in import.externalIndexValues">
               </select>
             </label>
             <div class="oh text-gray line-b  size-12 p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot to import</div>
+-->
             <button translate type="submit" class="button round expand black"
               ng-disabled="import.loading || import.ledger">
               Import backup
             </button>
           </div>         
-
           </form>
  
       </div>
diff --git a/public/views/join.html b/public/views/join.html
index edc5eec0b..d7c2dbd49 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -91,6 +91,7 @@
                 <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" class="green right m5t m10b"></switch>
               </label>
             </div>
+<!-- TODO account
             <div class="large-12 columns" ng-hide="!hwLedger">
               <label class="oh">
                 <span translate>Ledger Slot</span>
@@ -98,7 +99,8 @@
                 </select>
               </label>
               <div class="oh text-gray line-b  size-12  p10b m20b"><span translate>Ledger supports up to 20 Copay wallets simultaneously. Select which slot should be used to host this wallet</div>
-            </div>         
+            </div>  
+-->       
             <div class="large-12 columns">
 
             <label   ng-show="!hwLedger" for="seed" class="oh">
diff --git a/public/views/preferences.html b/public/views/preferences.html
index 2bdc0b71e..5fd408ad8 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -44,7 +44,7 @@
       <span translate>Hardware wallet</span>
       <span class="right text-gray">
         {{preferences.externalSource}} 
-        (index {{preferences.externalIndex}})
+        <!-- (Accont {{preferences.externalAccount}}) -->
       </span>
     </li>
     <li class="line-b p20" ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 11aff3e46..e4fced207 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -35,8 +35,6 @@ angular.module('copayApp.controllers').controller('createController',
       $scope.requiredCopayers = Math.min(parseInt(n / 2 + 1), maxReq);
     };
 
-    this.externalIndexValues = lodash.range(0, ledger.MAX_SLOT);
-    $scope.externalIndex = 0;
     this.TCValues = lodash.range(2, defaults.limits.totalCopayers + 1);
     $scope.totalCopayers = defaults.wallet.totalCopayers;
 
@@ -80,7 +78,8 @@ angular.module('copayApp.controllers').controller('createController',
 
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
-        ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
+        // TODO : account 
+        ledger.getInfoForNewWallet(0, function(err, lopts) {
           self.ledger = false;
           if (err) {
             self.error = err;
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index a2e72b905..7d95c1d60 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -7,8 +7,6 @@ angular.module('copayApp.controllers').controller('importController',
 
     this.isSafari = isMobile.Safari();
     this.isCordova = isCordova;
-    this.externalIndexValues = lodash.range(0, ledger.MAX_SLOT);
-    $scope.externalIndex = 0;
     var reader = new FileReader();
 
     window.ignoreMobilePause = true;
@@ -199,7 +197,8 @@ angular.module('copayApp.controllers').controller('importController',
         return;
       }
       self.ledger = true;
-      ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
+      // TODO account
+      ledger.getInfoForNewWallet(0, function(err, lopts) {
         self.ledger = false;
         if (err) {
           self.error = err;
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 3f7c0ecce..e40faafd9 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -4,8 +4,6 @@ angular.module('copayApp.controllers').controller('joinController',
   function($scope, $rootScope, $timeout, go, isMobile, notification, profileService, isCordova, isChromeApp, $modal, gettext, lodash, ledger) {
 
     var self = this;
-    this.externalIndexValues = lodash.range(0,ledger.MAX_SLOT);
-    $scope.externalIndex = 0;
 
     this.isChromeApp = function() {
       return isChromeApp;
@@ -176,7 +174,8 @@ angular.module('copayApp.controllers').controller('joinController',
  
       if (form.hwLedger.$modelValue) {
         self.ledger = true;
-        ledger.getInfoForNewWallet($scope.externalIndex, function(err, lopts) {
+        // TODO account
+        ledger.getInfoForNewWallet(0, function(err, lopts) {
           self.ledger = false;
           if (err) {
             self.error = err;
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 585c47079..ea9abe04f 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -17,7 +17,8 @@ angular.module('copayApp.controllers').controller('preferencesController',
     if (fc) {
       $scope.encrypt = fc.hasPrivKeyEncrypted();
       this.externalSource = fc.getPrivKeyExternalSourceName() == 'ledger' ? "Ledger" : null;
-      this.externalIndex = fc.getExternalIndex();
+      // TODO externalAccount
+      //this.externalIndex = fc.getExternalIndex();
     }
 
     var unwatchSpendUnconfirmed = $scope.$watch('spendUnconfirmed', function(newVal, oldVal) {
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index bbf053bda..49c2f603c 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -264,7 +264,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
             self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
             $scope.loading = true;
             $scope.error = null;
-            ledger.signTx(txp, fc.getExternalIndex(), function(result) {
+            // TODO account
+            ledger.signTx(txp, 0, function(result) {
               if (result.success) {
                 txp.signatures = [];
                 for (var i=0; i<result.signatures.length; i++) {
@@ -836,7 +837,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       if (fc.getPrivKeyExternalSourceName() == 'ledger') {
         $log.debug('Requesting Ledger Chrome app to sign the transaction');
         self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
-        ledger.signTx(txp, fc.getExternalIndex(), function(result) {
+        // TODO account
+        ledger.signTx(txp, 0, function(result) {
           if (result.success) {
             txp.signatures = [];
             for (var i=0; i<result.signatures.length; i++) {
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index 0af9410d8..5482aa863 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -4,7 +4,6 @@ angular.module('copayApp.services')
   .factory('ledger', function($log, bwcService, gettext) {
     var root = {};
     var LEDGER_CHROME_ID = "kkdpmhnladdopljabkgpacgpliggeeaf";
-    root.MAX_SLOT = 20;
 
     // Ledger magic number to get xPub without user confirmation
     root.ENTROPY_INDEX_PATH = "0xb11e/";
@@ -17,8 +16,8 @@ angular.module('copayApp.services')
       });
     }
 
-    root.getEntropySource = function(index, callback) {
-      var path = root.ENTROPY_INDEX_PATH + index + "'";
+    root.getEntropySource = function(account, callback) {
+      var path = root.ENTROPY_INDEX_PATH + account + "'";
       var xpub = root.getXPubKey(path, function(data) {
         if (!data.success) {
           $log.warn(data.message);
@@ -33,8 +32,8 @@ angular.module('copayApp.services')
       });
     };
 
-    root.getXPubKeyForAddresses = function(index, callback) {
-      return root.getXPubKey(root._getPath(index), callback);
+    root.getXPubKeyForAddresses = function(account, callback) {
+      return root.getXPubKey(root._getPath(account), callback);
     };
 
     root.getXPubKey = function(path, callback) {
@@ -48,36 +47,37 @@ angular.module('copayApp.services')
     };
 
 
-    root.getInfoForNewWallet = function(slot, callback) {
+    root.getInfoForNewWallet = function(account, callback) {
       var opts = {};
-      root.getEntropySource(slot, function(data) {
+      root.getEntropySource(account, function(data) {
         if (!data.success) {
           $log.warn(data.message);
           return callback(data.message);
         }
         opts.entropySource = data.entropySource;
-        root.getXPubKeyForAddresses(slot, function(data) {
+        root.getXPubKeyForAddresses(account, function(data) {
           if (!data.success) {
             $log.warn(data.message);
             return callback(data);
           }
           opts.extendedPublicKey = data.xpubkey;
           opts.externalSource = 'ledger';
-          opts.externalIndex = slot;
+          opts.externalIndex = account;
           return callback(null, opts);
         });
       });
     };
 
 
-    root.signTx = function(txp, index, callback) {
+
+    root._signP2PKH = function(txp, account, callback) {
       root.callbacks["sign_p2sh"] = callback;
       var redeemScripts = [];
       var paths = [];
       var tx = bwcService.getUtils().buildTx(txp);
       for (var i = 0; i < tx.inputs.length; i++) {
         redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
-        paths.push(root._getPath(index) + txp.inputs[i].path.substring(1));
+        paths.push(root._getPath(account) + txp.inputs[i].path.substring(1));
       }
       var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
       var inputs = [];
@@ -97,6 +97,44 @@ angular.module('copayApp.services')
         outputs_script: splitTransaction.outputScript.toString(),
         paths: paths
       });
+    };
+
+    root._signP2SH = function(txp, account, callback) {
+      root.callbacks["sign_p2sh"] = callback;
+      var redeemScripts = [];
+      var paths = [];
+      var tx = bwcService.getUtils().buildTx(txp);
+      for (var i = 0; i < tx.inputs.length; i++) {
+        redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
+        paths.push(root._getPath(account) + txp.inputs[i].path.substring(1));
+      }
+      var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
+      var inputs = [];
+      for (var i = 0; i < splitTransaction.inputs.length; i++) {
+        var input = splitTransaction.inputs[i];
+        inputs.push([
+          root._reverseBytestring(input.prevout.bytes(0, 32)).toString(),
+          root._reverseBytestring(input.prevout.bytes(32)).toString()
+        ]);
+      }
+      $log.debug('Ledger signing  paths:', paths);
+      root._messageAfterSession({
+        command: "sign_p2sh",
+        inputs: inputs,
+        scripts: redeemScripts,
+        outputs_number: splitTransaction.outputs.length,
+        outputs_script: splitTransaction.outputScript.toString(),
+        paths: paths
+      });
+    };
+
+    root.signTx = function(txp, account, callback) {
+      console.log('[ledger.js.72:txp:]', txp, account); //TODO
+      if (txp.addressType == 'P2PKH') {
+        root._signP2PKH(txp, account, callback);
+      } else {
+        root._signP2SH(txp, account, callback);
+      }
     }
 
     root._message = function(data) {
@@ -146,8 +184,8 @@ angular.module('copayApp.services')
       }
     }
 
-    root._getPath = function(index) {
-      return index + "'/45'";
+    root._getPath = function(account) {
+      return "44'/0'/" + account + "'";
     }
 
     root._splitTransaction = function(transaction) {
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 21bdf377e..95e400440 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -193,7 +193,7 @@ angular.module('copayApp.services')
         }
       } else if (opts.extendedPublicKey) {
         try {
-          walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource);
+          walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource);
         } catch (ex) {
           $log.warn(ex);
           return cb(gettext('Could not create using the specified extended public key'));
@@ -411,7 +411,7 @@ angular.module('copayApp.services')
       var walletClient = bwcService.getClient();
       $log.debug('Importing Wallet XPubKey');
 
-      walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.externalIndex, opts.entropySource, function(err) {
+      walletClient.importFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource, function(err) {
         if (err) {
 
           // in HW wallets, req key is always the same. They can't addAccess.

From 7d4fee4aef07527db577cee0ba43f38c61a48215 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 09:46:45 -0300
Subject: [PATCH 41/47] refactor ledger signature, restrict ledger to m-n, n>1

---
 bower.json                            |  2 +-
 public/views/create.html              |  4 +-
 public/views/includes/walletInfo.html |  4 +-
 src/js/controllers/create.js          | 12 ++---
 src/js/controllers/walletHome.js      | 78 ++++++---------------------
 src/js/services/ledger.js             | 36 ++-----------
 src/js/services/profileService.js     | 36 ++++++++++++-
 7 files changed, 64 insertions(+), 108 deletions(-)

diff --git a/bower.json b/bower.json
index cb075503f..a029fe195 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "ng-lodash": "~0.2.0",
     "angular-moment": "0.10.1",
     "moment": "2.10.3",
-    "angular-bitcore-wallet-client": "0.2.2",
+    "angular-bitcore-wallet-client": "0.3.0",
     "angular-ui-router": "~0.2.13",
     "qrcode-decoder-js": "*",
     "fastclick": "*",
diff --git a/public/views/create.html b/public/views/create.html
index 1ff6ce48e..f6d7ff43f 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -102,11 +102,11 @@
         </div>
         <div ng-hide="hideAdv" class="row">
           <div class="large-12 columns">
-            <label ng-show="create.isChromeApp()" for="hw-ledger" class="oh">
+            <label ng-show="create.isChromeApp() && totalCopayers > 1 " for="hw-ledger" class="oh">
               <span translate>Use Ledger hardware wallet</span>
               <switch id="hw-ledger" name="hwLedger" ng-model="hwLedger" ng-change="isTestnet=false" class="green right m5t m10b"></switch>
             </label>
-<!-- account
+<!-- TODO account
             <div ng-show="hwLedger">
               <label class="oh"><span translate>Ledger Slot</span>
                 <select class="m10t" ng-model="externalIndex" ng-options="externalIndex as externalIndex for externalIndex in create.externalIndexValues">
diff --git a/public/views/includes/walletInfo.html b/public/views/includes/walletInfo.html
index 82d074ebf..e1439551b 100644
--- a/public/views/includes/walletInfo.html
+++ b/public/views/includes/walletInfo.html
@@ -1,6 +1,6 @@
 <span ng-show="index.network != 'livenet'"> Testnet </span>
 <span ng-show="!index.canSign && !index.isPrivKeyExternal" translate>No Private key</span>
-<span ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
+<div ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
   <span translate>External Private Key:</span>
   {{index.externalSource}}
-</span>
+</div>
diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index e4fced207..5ff9f8d07 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -100,21 +100,21 @@ angular.module('copayApp.controllers').controller('createController',
         profileService.createWallet(opts, function(err, secret, walletId) {
           self.loading = false;
           if (err) {
-            if (err == "Error creating wallet" && opts.extendedPublicKey) {
-              err = gettext("This xpub index is already used by another wallet. Please select another index.");
-            }
             $log.warn(err);
             self.error = err;
             $timeout(function() {
               $rootScope.$apply();
             });
-          } else {
-            if (opts.n == 1 && (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey)) {
+            return;
+          } 
+          if (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey) {
+            if (opts.n == 1) {
               $rootScope.$emit('Local/WalletImported', walletId);
             } else {
-              go.walletHome();
+              $rootScope.$emit('Local/BackupDone', walletId);
             }
           }
+          go.walletHome();
         });
       }, 100);
     }
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 49c2f603c..5acd92c6a 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -173,7 +173,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     });
   };
 
-  var GLIDERA_LOCK_TIME = 6 * 60 * 60 ;
+  var GLIDERA_LOCK_TIME = 6 * 60 * 60;
   // isGlidera flag is a security mesure so glidera status is not
   // only determined by the tx.message
   this.openTxpModal = function(tx, copayers, isGlidera) {
@@ -192,7 +192,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       if (tx.message === 'Glidera transaction' && isGlidera) {
         tx.isGlidera = true;
         if (tx.canBeRemoved) {
-          tx.canBeRemoved = (Date.now()/1000 - (tx.ts || tx.createdOn)) > GLIDERA_LOCK_TIME;
+          tx.canBeRemoved = (Date.now() / 1000 - (tx.ts || tx.createdOn)) > GLIDERA_LOCK_TIME;
         }
       }
       $scope.tx = tx;
@@ -257,41 +257,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
           });
           return;
         };
+        self._setOngoingForSigning();
 
-        if (fc.isPrivKeyExternal()) {
-          if (fc.getPrivKeyExternalSourceName() == 'ledger') {
-            $log.debug('Requesting Ledger Chrome app to sign the transaction');
-            self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
-            $scope.loading = true;
-            $scope.error = null;
-            // TODO account
-            ledger.signTx(txp, 0, function(result) {
-              if (result.success) {
-                txp.signatures = [];
-                for (var i=0; i<result.signatures.length; i++) {
-                  txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
-                }
-                $scope._doSign(txp);
-              } else {
-                $scope.loading = false;
-                $scope.error = result.message;
-                self.setOngoingProcess();
-                $scope.$digest();
-              }
-            });
-          }
-        } else {
-          $scope._doSign(txp);
-        }
-      };
-
-      $scope._doSign = function(txp) {
-        self.setOngoingProcess(gettext('Signing payment'));
         $scope.loading = true;
         $scope.error = null;
         $timeout(function() {
-          fc.signTxProposal(txp, function(err, txpsi) {
-            profileService.lockFC();
+          profileService.signTxProposal(txp, function(err, txpsi) {
             self.setOngoingProcess();
             if (err) {
               $scope.$emit('UpdateTx');
@@ -802,7 +773,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
             return self.setSendError(err);
           }
 
-          if (!fc.canSign() &&  !fc.isPrivKeyExternal()) {
+          if (!fc.canSign() && !fc.isPrivKeyExternal()) {
             $log.info('No signing proposal: No private key')
             self.setOngoingProcess();
             self.resetForm();
@@ -814,7 +785,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
 
           self.signAndBroadcast(txp, function(err) {
             self.setOngoingProcess();
-            profileService.lockFC();
             self.resetForm();
             if (err) {
               self.error = err.message ? err.message : gettext('The payment was created but could not be completed. Please try again from home screen');
@@ -829,37 +799,21 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     }, 100);
   };
 
+  this._setOngoingForSigning = function() {
+    var fc = profileService.focusedClient;
+
+    if (fc.isPrivKeyExternal() && fc.getPrivKeyExternalSourceName() == 'ledger') {
+      self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
+    } else {
+      self.setOngoingProcess(gettext('Signing payment'));
+    }
+  };
 
   this.signAndBroadcast = function(txp, cb) {
     var fc = profileService.focusedClient;
 
-    if (fc.isPrivKeyExternal()) {
-      if (fc.getPrivKeyExternalSourceName() == 'ledger') {
-        $log.debug('Requesting Ledger Chrome app to sign the transaction');
-        self.setOngoingProcess(gettext('Requesting Ledger Wallet to sign'));
-        // TODO account
-        ledger.signTx(txp, 0, function(result) {
-          if (result.success) {
-            txp.signatures = [];
-            for (var i=0; i<result.signatures.length; i++) {
-              txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
-            }
-            self._doSignAndBroadcast(txp, cb);
-          } else {
-            return cb(result);
-          }
-        });
-      }
-    } else {
-      self._doSignAndBroadcast(txp, cb);
-    }
-  };
-
-  this._doSignAndBroadcast = function(txp, cb) {
-    var fc = profileService.focusedClient;
-    self.setOngoingProcess(gettext('Signing transaction'));
-    fc.signTxProposal(txp, function(err, signedTx) {
-      profileService.lockFC();
+    this._setOngoingForSigning();
+    profileService.signTxProposal(txp, function(err, signedTx) {
       self.setOngoingProcess();
       if (err) {
         err.message = bwsError.msg(err, gettextCatalog.getString('The payment was created but could not be signed. Please try again from home screen'));
diff --git a/src/js/services/ledger.js b/src/js/services/ledger.js
index 5482aa863..e646e06dd 100644
--- a/src/js/services/ledger.js
+++ b/src/js/services/ledger.js
@@ -68,37 +68,6 @@ angular.module('copayApp.services')
       });
     };
 
-
-
-    root._signP2PKH = function(txp, account, callback) {
-      root.callbacks["sign_p2sh"] = callback;
-      var redeemScripts = [];
-      var paths = [];
-      var tx = bwcService.getUtils().buildTx(txp);
-      for (var i = 0; i < tx.inputs.length; i++) {
-        redeemScripts.push(new ByteString(tx.inputs[i].redeemScript.toBuffer().toString('hex'), GP.HEX).toString());
-        paths.push(root._getPath(account) + txp.inputs[i].path.substring(1));
-      }
-      var splitTransaction = root._splitTransaction(new ByteString(tx.toString(), GP.HEX));
-      var inputs = [];
-      for (var i = 0; i < splitTransaction.inputs.length; i++) {
-        var input = splitTransaction.inputs[i];
-        inputs.push([
-          root._reverseBytestring(input.prevout.bytes(0, 32)).toString(),
-          root._reverseBytestring(input.prevout.bytes(32)).toString()
-        ]);
-      }
-      $log.debug('Ledger signing  paths:', paths);
-      root._messageAfterSession({
-        command: "sign_p2sh",
-        inputs: inputs,
-        scripts: redeemScripts,
-        outputs_number: splitTransaction.outputs.length,
-        outputs_script: splitTransaction.outputScript.toString(),
-        paths: paths
-      });
-    };
-
     root._signP2SH = function(txp, account, callback) {
       root.callbacks["sign_p2sh"] = callback;
       var redeemScripts = [];
@@ -129,9 +98,10 @@ angular.module('copayApp.services')
     };
 
     root.signTx = function(txp, account, callback) {
-      console.log('[ledger.js.72:txp:]', txp, account); //TODO
       if (txp.addressType == 'P2PKH') {
-        root._signP2PKH(txp, account, callback);
+        var msg = 'P2PKH wallets are not supported with ledger';
+        $log.error(msg);
+        return callback(msg);
       } else {
         root._signP2SH(txp, account, callback);
       }
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 95e400440..0ad490325 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -195,7 +195,7 @@ angular.module('copayApp.services')
         try {
           walletClient.seedFromExtendedPublicKey(opts.extendedPublicKey, opts.externalSource, opts.entropySource);
         } catch (ex) {
-          $log.warn(ex);
+          $log.warn("Creating wallet from Extended Public Key Arg:", ex, opts);
           return cb(gettext('Could not create using the specified extended public key'));
         }
       } else {
@@ -483,7 +483,7 @@ angular.module('copayApp.services')
       $log.debug('Encrypting private key for', fc.credentials.walletName);
 
       fc.setPrivateKeyEncryption(password);
-      fc.lock();
+      root.lockFC();
       root.updateCredentialsFC(function() {
         $log.debug('Wallet encrypted');
         return cb();
@@ -562,7 +562,39 @@ angular.module('copayApp.services')
       return lodash.sortBy(ret, 'name');
     };
 
+    root._signWithLedger = function(txp,cb) {
+      var fc = root.focusedClient;
+      $log.info('Requesting Ledger Chrome app to sign the transaction');
 
+      ledger.signTx(txp, 0, function(result) {
+        if (!result.success) 
+          return cb(result);
+
+        txp.signatures = [];
+        for (var i=0; i<result.signatures.length; i++) {
+          txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
+        return fc.signTxProposal(txp, cb);
+        }
+      });
+    };
+
+    root.signTxProposal = function(txp, cb) {
+      var fc = root.focusedClient;
+
+      if (fc.isPrivKeyExternal()) {
+        if (fc.getPrivKeyExternalSourceName() != 'ledger') {
+          var msg = 'Unsupported External Key:' + fc.getPrivKeyExternalSourceName();
+          $log.error(msg);
+          return cb(msg);
+        }
+        return root._signWithLedger(txp,cb);
+      } else {
+        return fc.signTxProposal(txp, function(err, signedTxp) {
+          root.lockFC();
+          return cb(err, signedTxp);
+        });
+      }
+    };
 
     return root;
   });

From 7d7a533bd5b9b71b2394f7aced5e0a0e1aa51396 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 10:12:45 -0300
Subject: [PATCH 42/47] fixes backup flag in ledger

---
 src/js/controllers/create.js |  2 --
 src/js/controllers/index.js  | 11 ++++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index 5ff9f8d07..60181be9f 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -110,8 +110,6 @@ angular.module('copayApp.controllers').controller('createController',
           if (opts.mnemonic || opts.externalSource || opts.extendedPrivateKey) {
             if (opts.n == 1) {
               $rootScope.$emit('Local/WalletImported', walletId);
-            } else {
-              $rootScope.$emit('Local/BackupDone', walletId);
             }
           }
           go.walletHome();
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 3a944211f..dffc4733a 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -110,10 +110,15 @@ angular.module('copayApp.controllers').controller('indexController', function($r
       self.updateAlias();
       self.initGlidera();
 
-      storageService.getBackupFlag(self.walletId, function(err, val) {
-        self.needsBackup = self.network == 'testnet' ? false : !val;
+      if (fc.isPrivKeyExternal()) {
+        self.needsBackup = false;
         self.openWallet();
-      });
+      } else {
+        storageService.getBackupFlag(self.walletId, function(err, val) {
+          self.needsBackup = self.network == 'testnet' ? false : !val;
+          self.openWallet();
+        });
+      }
     });
   };
 

From a313222675ee0b2c05cd342f8bc77effdcc6cd41 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 11:09:36 -0300
Subject: [PATCH 43/47] add description to backup recovery doc

---
 backupRecovery.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backupRecovery.md b/backupRecovery.md
index 3f3c25cf1..f45545fa1 100644
--- a/backupRecovery.md
+++ b/backupRecovery.md
@@ -63,11 +63,13 @@ Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the
   Case 3: Partial recovery is possible using:
 
     A) All WS's of the copayers of the wallet 
-    - Enter one WS at Create ( at the Advanced option section). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
-    - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their WS at Join (at -> Advanced Options -> Wallet Seed).
-    - Wallet should be recreated and funds should be accesable 
+      - Enter one WS at Create ( at the Advanced option section). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
+      - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their WS at Join (at -> Advanced Options -> Wallet Seed).
+      - Wallet should be recreated and funds should be accesable 
     
     B) One WD and a quorum of WS of the other members.
       - Using the WD, import the wallet.
       - Ask other copayers to import the wallet using the their WS.
       - Wallet should be recreated and funds should be accesable 
+      
+      In this case, Copayers will not be able to decrypt the 'notes' field on the new Spend Proposals, because the shared secret stored at the WD is not longer known by other copayers.

From 9dc2c402427284733207f581de3e50d588003982 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 12:12:24 -0300
Subject: [PATCH 44/47] fix signing multiple inputs with ledger

---
 src/js/controllers/walletHome.js  | 10 +++++++++-
 src/js/services/bwsError.js       |  2 ++
 src/js/services/profileService.js | 17 ++++++++---------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 5acd92c6a..897978036 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -740,9 +740,17 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       return;
     };
 
+    var comment = form.comment.$modelValue;
+
+    // ToDo: use a credential's (or fc's) function for this
+    if (comment && !fc.credentials.sharedEncryptingKey) {
+      var msg = 'Could not add message to imported wallet without shared encrypting key';
+      $log.warn(msg);
+      return self.setSendError(gettext(msg));
+    }
+
     self.setOngoingProcess(gettext('Creating transaction'));
     $timeout(function() {
-      var comment = form.comment.$modelValue;
       var paypro = self._paypro;
       var address, amount;
 
diff --git a/src/js/services/bwsError.js b/src/js/services/bwsError.js
index f598946e5..a8727caab 100644
--- a/src/js/services/bwsError.js
+++ b/src/js/services/bwsError.js
@@ -103,6 +103,8 @@ angular.module('copayApp.services')
             body =  err.message  || err.code;
             break;
         }
+      } else {
+        body = gettextCatalog.getString(err);
       }
 
       var msg = prefix + ( body ? ': ' + body  : '');
diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js
index 0ad490325..5e2ab7df7 100644
--- a/src/js/services/profileService.js
+++ b/src/js/services/profileService.js
@@ -172,7 +172,7 @@ angular.module('copayApp.services')
 
       if (opts.mnemonic && opts.mnemonic.indexOf('m/') == 0) {
         var xPrivKey = root._preDerivation(opts.mnemonic, network);
-        if (!xPrivKey) 
+        if (!xPrivKey)
           return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
         opts.mnemonic = null;
         opts.extendedPrivateKey = xPrivKey;
@@ -389,7 +389,7 @@ angular.module('copayApp.services')
 
       if (words.indexOf('m/') == 0) {
         var xPrivKey = root._preDerivation(words, opts.networkName);
-        if (!xPrivKey) 
+        if (!xPrivKey)
           return bwsError.cb('Bad derivation', gettext('Could not import'), cb);
         return root.importExtendedPrivateKey(xPrivKey, cb);
       }
@@ -562,19 +562,18 @@ angular.module('copayApp.services')
       return lodash.sortBy(ret, 'name');
     };
 
-    root._signWithLedger = function(txp,cb) {
+    root._signWithLedger = function(txp, cb) {
       var fc = root.focusedClient;
       $log.info('Requesting Ledger Chrome app to sign the transaction');
 
       ledger.signTx(txp, 0, function(result) {
-        if (!result.success) 
+        if (!result.success)
           return cb(result);
 
-        txp.signatures = [];
-        for (var i=0; i<result.signatures.length; i++) {
-          txp.signatures.push(result.signatures[i].substring(0, result.signatures[i].length - 2));
+        txp.signatures = lodash.map(result.signatures, function(s) {
+          return s.substring(0, s.length - 2);
+        });
         return fc.signTxProposal(txp, cb);
-        }
       });
     };
 
@@ -587,7 +586,7 @@ angular.module('copayApp.services')
           $log.error(msg);
           return cb(msg);
         }
-        return root._signWithLedger(txp,cb);
+        return root._signWithLedger(txp, cb);
       } else {
         return fc.signTxProposal(txp, function(err, signedTxp) {
           root.lockFC();

From ce263e9a6edd774e3ab62f6599a765a9b351951b Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 12:19:52 -0300
Subject: [PATCH 45/47] hide note fields if ! sharedEncryptedKey

---
 public/views/walletHome.html     | 2 +-
 src/js/controllers/walletHome.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 294a1cd8c..9ffdb5f3f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -373,7 +373,7 @@
                 </div>
               </div>
             </div>
-            <div class="row">
+            <div class="row" ng-hide="home.hideNote">
               <div class="large-12 columns">
                 <label for="comment"><span translate>Note</span>
                   <small translate ng-hide="!sendForm.comment.$pristine">optional</small>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 897978036..e55c207ee 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -679,6 +679,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         enumerable: true,
         configurable: true
       });
+
+    var fc = profileService.focusedClient;
+    // ToDo: use a credential's (or fc's) function for this
+    this.hideNote = !fc.credentials.sharedEncryptingKey;
   };
 
   this.setSendError = function(err) {

From 12a69ac1adcfca9da527a6292ab3ff10a4285c4d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 14 Sep 2015 12:22:31 -0300
Subject: [PATCH 46/47] update doc

---
 backupRecovery.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backupRecovery.md b/backupRecovery.md
index f45545fa1..6baa78a14 100644
--- a/backupRecovery.md
+++ b/backupRecovery.md
@@ -18,8 +18,8 @@ Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the
  * Case 3: Lost device + new Bitcore Wallet Service
 
 ### Wallet Recovery Scope
- * Partial Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive coins.
- * Full Recovery: All the features of Partial Recovery + Wallet Name, Copayer Names are recovered, Past Spend proposal metadata (who signed, and notes) are recoved.
+ * Basic Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive coins.
+ * Full Recovery: All the features of Basic Recovery + Wallet Name, Copayer Names are recovered, Past Spend proposal metadata (who signed, and notes) are recoved.
       
 ## Wallet Restore Scenarios
 
@@ -29,13 +29,13 @@ Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the
     - Enter the WS or the WB at 'Import wallet' in a new device.
     - Wallet access should be restored
     
-  Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
+  Case 2: Basic recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
     - Point to the new server
     - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
     - Wallet should be recreated and funds can be acceded
     - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
     
-  Case 3: From both Backup Words and Backup file, partial recovery is possible.
+  Case 3: From both Backup Words and Backup file, basic recovery is possible.
     (Using WS)
     - Enter the WS at 'Import Wallet'
       If the error "This wallet is not registered at the wallet service" will appear:
@@ -53,14 +53,14 @@ Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the
     - Enter WS or WD at 'Import wallet' in a new device.
     - Wallet access should be restored
    
-  Case 2: Partial recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
+  Case 2: Basic recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
     - Point to the new server
     - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
     - Wallet should be recreated and funds should be accesable 
     
     - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
     
-  Case 3: Partial recovery is possible using:
+  Case 3: Basic recovery is possible using:
 
     A) All WS's of the copayers of the wallet 
       - Enter one WS at Create ( at the Advanced option section). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.

From 568abc2cbbcf928f7075d67c46edd423dc079a25 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Mon, 14 Sep 2015 12:26:00 -0300
Subject: [PATCH 47/47] small fixes to restore instructions

Conflicts:
	backupRecovery.md
---
 backupRecovery.md | 51 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/backupRecovery.md b/backupRecovery.md
index 6baa78a14..b1febd553 100644
--- a/backupRecovery.md
+++ b/backupRecovery.md
@@ -4,72 +4,71 @@
 
 ## Description
 
-Copay is a Multisig HD Wallet. Copay apps hold the extended private keys for the wallet. The private key never leave the device, so for accessing a wallet funds it is necesary to have the device or the backup of the wallet. 
+Copay is a Multisig HD Wallet. Copay app holds the extended private keys for the wallet. The private key never leaves the device, so for accessing a wallet funds it is necesary to have the device or a backup of the wallet. 
 
 ## Definitions
 
 ### Backup Formats:
- * Wallet Seed (WS): 12 words mnemonic backup (available from Copay v1.2+). The 12 words are used as wallet seed, following BIP39 specification. The wallet seed may require a passphrase to recreate the wallet (if that was specified at creation time).
- * Wallet Backup (WB): Exported data from Copay, containing an AES encrypted JSON with many wallet parameters (like extended Private Key, wallet Name, extended public keys of Copayers, etc. See #export-format). This data can be created from Copay v1.2+ (Settings->Export) and it was the default backup format on previous Copay versions. WB can be a file (standart format for Copay desktop versions) or a text (standart from Copay mobile versions).
+ * Wallet Seed (WS): 12 words mnemonic backup (available from Copay v1.2+). The 12 words are used as wallet seed, following BIP39 specification. The wallet seed may require a passphrase to recreate the wallet (if one was specified at creation time).
+ * Wallet Backup (WB): Exported data from Copay, containing an AES encrypted JSON with many wallet parameters (like extended private key, wallet name, extended public keys of copayers, etc. See #export-format). This data can be created from Copay v1.2+ (Settings -> Export) and it was the default backup format on previous Copay versions. WB can be a file (standard format for Copay desktop versions) or a text (standard for Copay mobile versions).
 
 ### Backup recovery cases
- * Case 1: Lost of device holding the wallet
+ * Case 1: Loss of device holding the wallet
  * Case 2: Change to a new Bitcore Wallet Service (BWS)
  * Case 3: Lost device + new Bitcore Wallet Service
 
 ### Wallet Recovery Scope
- * Basic Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive coins.
- * Full Recovery: All the features of Basic Recovery + Wallet Name, Copayer Names are recovered, Past Spend proposal metadata (who signed, and notes) are recoved.
+* Basic Recovery: Wallet access is restored. It is possible to see wallet balance and past transactions. It is possible to send and receive payments.
+ * Full Recovery: All the features of Partial Recovery + wallet name, copayer names are recovered, past payment proposal metadata (who signed, and notes) are recoved.
       
 ## Wallet Restore Scenarios
 
-### Non multisig wallets
+### Non-multisig wallets
 
   Case 1: From both WS and WB, full recovery is possible.
     - Enter the WS or the WB at 'Import wallet' in a new device.
-    - Wallet access should be restored
+    - Wallet access should be restored.
     
-  Case 2: Basic recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
-    - Point to the new server
-    - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
-    - Wallet should be recreated and funds can be acceded
-    - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
+  Case 2: Basic recovery is possible using the device where the wallet is installed, pointing to the new server (Recreate wallet feature).
+    - Point to the new server (Settings -> Bitcore Wallet Service).
+    - If the wallet is not registered at the new Wallet service, a 'Recreate' button will appear at wallet's home. Click it to recreate the wallet.
+    - Wallet should be recreated and access to funds should be restored.
+    - If the wallet existed, it may be necessary to rescan Wallet's addresses for funds (from Settings -> Advanced -> Scan Addresses for Funds)
     
   Case 3: From both Backup Words and Backup file, basic recovery is possible.
     (Using WS)
     - Enter the WS at 'Import Wallet'
-      If the error "This wallet is not registered at the wallet service" will appear:
+      If the error "This wallet is not registered at the wallet service" appears:
       - Go to 'Create Wallet', and enter the WS at 'Advanced Options'. Select a new name for the restored wallet. Total and required number of copayers should be set to 1.
-      - Wallet should be recreated and funds can be acceded
+      - Wallet should be recreated and access to funds should be restored.
       
     (Using WD)
     - Enter the WD at 'Import Wallet'
-    - Wallet should be recreated and funds should be accesable 
+    - Wallet should be recreated and access to funds should be restored.
  
 
 ### Multisig wallets
 
   Case 1: From both WS and WD, full recovery is possible.
     - Enter WS or WD at 'Import wallet' in a new device.
-    - Wallet access should be restored
+    - Wallet access should be restored.
    
   Case 2: Basic recovery is possible using the device where the wallet is installed, pointing the the new server (Recreate Wallet feature).
-    - Point to the new server
-    - If the wallet is not registered at the new Wallet service, a "Recreate" buttom will appear at wallet's home. Click it to recreate the wallet.
-    - Wallet should be recreated and funds should be accesable 
-    
-    - If the wallet existed, it could be needed to rescan Wallet's addresses for fund (from Settings -> Advanced -> Scan Addresses for Funds)
+    - Point to the new server (Settings -> Bitcore Wallet Service).
+    - If the wallet is not registered at the new Wallet service, a 'Recreate' button will appear at wallet's home. Click it to recreate the wallet.
+    - Wallet should be recreated and access to funds should be restored.
+    - If the wallet existed, it may be necessary to rescan Wallet's addresses for funds (from Settings -> Advanced -> Scan Addresses for Funds)
     
   Case 3: Basic recovery is possible using:
 
-    A) All WS's of the copayers of the wallet 
-      - Enter one WS at Create ( at the Advanced option section). Note that the wallet's configuration (M-N and network paramenters) need to be entered and need to match the parameters that where enterered when the wallet was created. Name and Nickname of Copayers need to be entered also, but there is no need for them to match the original wallet setup.
+    A) WS of all copayers in the wallet 
+      - Enter one WS at Create (at the Advanced option section). Note that the wallet configuration (M-of-N and network paramenters) needs to match the parameters that where entered when the wallet was first created. Wallet name and copayer nicknames need to be entered also, but there is no need for them to match the original wallet setup.
       - Ask other copayers to join the wallet using the given invitation code. All copayers need to enter their WS at Join (at -> Advanced Options -> Wallet Seed).
-      - Wallet should be recreated and funds should be accesable 
+      - Wallet should be recreated and access to funds should be restored.
     
     B) One WD and a quorum of WS of the other members.
       - Using the WD, import the wallet.
-      - Ask other copayers to import the wallet using the their WS.
+      - Ask other copayers to import the wallet using their WS.
       - Wallet should be recreated and funds should be accesable 
       
       In this case, Copayers will not be able to decrypt the 'notes' field on the new Spend Proposals, because the shared secret stored at the WD is not longer known by other copayers.