From 1232b28f0f62cc719ae4d55c65e689bf2efd2ed6 Mon Sep 17 00:00:00 2001
From: Yemel Jardi <angel.jardi@gmail.com>
Date: Thu, 31 Jul 2014 20:39:08 -0300
Subject: [PATCH 1/2] Fix address QR code, now it use proper bitcoin: schema

---
 views/modals/qr-address.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
index ca80055e5..c7ff73e31 100644
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@@ -1,5 +1,5 @@
 <div class="text-center">
-  <qrcode size="160" data="{{address.address}}"></qrcode>
+  <qrcode size="160" data="bitcoin:{{address.address}}"></qrcode>
   <h4>{{address.address}}</h4>
   <div>
     <span ng-if="$root.updatingBalance">

From 96116c14fdc2fca5cdbaaaecccfd093e83beb1e2 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Thu, 31 Jul 2014 21:58:35 -0300
Subject: [PATCH 2/2] Added invalid message if I paste a wrong wallet secret

---
 css/main.css    |  5 +++++
 views/join.html | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index ff3c5f725..011ef327e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -258,6 +258,11 @@ a:hover {
   margin-bottom: 20px;
 }
 
+.box-setup label small.has-error {
+  font-size: 11px;
+  color: #FFA59B;
+}
+
 .last-transactions {
   margin-bottom: 2rem;
   background-color: #E8EAEF;
diff --git a/views/join.html b/views/join.html
index 179d89f48..dff6317c2 100644
--- a/views/join.html
+++ b/views/join.html
@@ -11,7 +11,15 @@
         <div class="box-setup">
           <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
           <form name="joinForm" ng-submit="join(joinForm)" novalidate>
-            <label for="connectionId"> Wallet Setting </label>
+
+            <label for="connectionId"> Wallet Setting 
+              <small class="has-error" ng-show="joinForm.connectionId.$invalid
+                && !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
+              <small data-options="disable_for_touch:true"
+                ng-show="joinForm.connectionId.$pristine" class="has-tip
+                text-gray" tooltip="Paste wallet secret here" >Required</small>
+            </label>
+
             <input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;">
             <div class="small-2 columns" style="padding:0px;width:15%;" ng-hide="showScanner">
                 <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>