From 006bf4c1fadaa001dda10533d4fdfd9964c8c2e4 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 10 Oct 2014 11:42:23 -0300
Subject: [PATCH] fix join

---
 js/models/Wallet.js | 21 +++++++++++++--------
 views/join.html     | 27 +++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 0bd9b8d93..c082db16c 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -837,14 +837,19 @@ Wallet.prototype.getSecret = function() {
  * @return {Object}
  */
 Wallet.decodeSecret = function(secretB) {
-  var secret = Base58Check.decode(secretB);
-  var pubKeyBuf = secret.slice(0, 33);
-  var secretNumber = secret.slice(33, 38);
-  var networkName = secret.slice(38, 39).toString('hex') === '00' ? 'livenet' : 'testnet';
-  return {
-    pubKey: pubKeyBuf.toString('hex'),
-    secretNumber: secretNumber.toString('hex'),
-    networkName: networkName,
+  try {
+    var secret = Base58Check.decode(secretB);
+    var pubKeyBuf = secret.slice(0, 33);
+    var secretNumber = secret.slice(33, 38);
+    var networkName = secret.slice(38, 39).toString('hex') === '00' ? 'livenet' : 'testnet';
+    return {
+      pubKey: pubKeyBuf.toString('hex'),
+      secretNumber: secretNumber.toString('hex'),
+      networkName: networkName,
+    }
+  } catch (e) {
+    log.debug(e.message);
+    return false;
   }
 };
 
diff --git a/views/join.html b/views/join.html
index a96d013d9..b10990e36 100644
--- a/views/join.html
+++ b/views/join.html
@@ -5,10 +5,8 @@
   </div>
 
   <h1>{{'Join Wallet'|translate}}</h1>
-  <div class="row collapse m0">
-    <div class="large-6 columns">
-      <div class="box-setup">
-        <h1 translate class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
+  <div class="row collapse">
+    <div class="large-12 columns">
         <form name="joinForm" ng-submit="join(joinForm)" novalidate>
 
           <label for="connectionId"><span translate>Wallet Secret</span> 
@@ -51,13 +49,15 @@
             </div>
           </div>
 
-          <a class="expand small" ng-click="hideAdv=!hideAdv">
-            <i class="fi-widget m3r"></i>
-            <span translate ng-hide="!hideAdv">Show</span> 
-            <span translate ng-hide="hideAdv">Hide</span> 
-            <span translate>advanced options</span>
-          </a>
-          <div ng-hide="hideAdv" class="m10t">
+          <div class="m10b">
+            <a class="expand small" ng-click="hideAdv=!hideAdv">
+              <i class="fi-widget m3r"></i>
+              <span translate ng-hide="!hideAdv">Show</span> 
+              <span translate ng-hide="hideAdv">Hide</span> 
+              <span translate>advanced options</span>
+            </a>
+          </div>
+          <div ng-hide="hideAdv">
             <p>
               <input type="text" placeholder="BIP32 master extended private key (hex)" name="private" ng-model="$parent.private">
           </div>
@@ -65,12 +65,7 @@
           <div class="text-right">
             <button translate type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading">Join</button>
           </div>
-
-
-
-
         </form>
-      </div>
     </div>
   </div>
   <!-- End !loading -->