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] 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();
   });