From 9a80e861397076ab8ab1de957cff05b508430624 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 8 Dec 2015 11:50:28 -0300
Subject: [PATCH 1/3] Fix UI issues

---
 public/views/includes/menu-item.html | 17 +++++++++------
 public/views/walletHome.html         |  6 +++---
 src/css/main.css                     |  1 +
 src/css/mobile.css                   | 32 +++++++++-------------------
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/public/views/includes/menu-item.html b/public/views/includes/menu-item.html
index c3abc8c45..1420a8d53 100644
--- a/public/views/includes/menu-item.html
+++ b/public/views/includes/menu-item.html
@@ -1,11 +1,14 @@
-<a  ng-click="index.setTab(item, false, 0, true)" 
-    ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#4B6178'}" id="menu-{{item.link}}">
-    <i class="size-18 {{item.icon}} db" ng-class="{ 'icon-activity': item.link=='walletHome' }"></i>
-    <div class="size-10 tu" ng-class="{ 'name-activity': item.link=='walletHome' }">
+<a ng-click="index.setTab(item, false, 0, true)" 
+   ng-style="{'color': index.tab == item.link ? index.backgroundColor : '#A5B2BF'}" 
+   id="menu-{{item.link}}">
+    <i class="size-18 {{item.icon}} db"></i>
+    <span class="size-10 tu">
         {{ item.title|translate }}
-        <span class="label activity round" ng-style="{'background-color':index.backgroundColor}" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
+        <span class="label round" 
+          ng-style="{'background-color':index.backgroundColor}" 
+          ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
             {{ index.pendingTxProposalsCountForUs }}
         </span>
-        <span class="menu-activity hide-for-large-only" ng-if="item.link=='walletHome'">
-    </div>
+    </span>
+    <div ng-if="item.link == 'walletHome'" class="menu-wallet-home"></div>
 </a>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index ea2b7c1fb..00ae2b92f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -414,10 +414,10 @@
                 <div class="addressbook-input" ng-show="!sendForm.address.$invalid && _address">
                   {{index.addressbook[_address] || _address}}
                 </div>
-                <a class="postfix button" 
-                ng-style="{'background-color':index.backgroundColor}"
+                <a class="postfix size-12 m0 text-gray" 
+                ng-style="{'color':index.backgroundColor}"
                 ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
-                  <i class="fi-plus size-14 lh"></i>
+                  <i class="icon-wallet size-18"></i>
                 </a>
               </div>
             </div>
diff --git a/src/css/main.css b/src/css/main.css
index 7a60c3093..b5d820417 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1052,6 +1052,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
 .text-success {color: #1ABC9C;}
 .text-spacing {letter-spacing:2px;}
 .text-capitalize {text-transform: capitalize;}
+.text-shadow {text-shadow: 2px 2px 3px rgba(150, 150, 150, 1);}
 
 .payment-uri .panel {
   line-height: 1.4;
diff --git a/src/css/mobile.css b/src/css/mobile.css
index fb3f66b75..44f35d2e1 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -172,8 +172,8 @@ _:-ms-fullscreen, :root .main {
     padding-top: 1rem !important;
 }
 
-.menu-activity {
-  background-image: linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%);
+.menu-wallet-home {
+  background: #fff linear-gradient(-180deg, #F1F3F5 0%, #FFFFFF 30%);
   box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.35);
   width: 100%;
   height: 8rem;
@@ -187,26 +187,6 @@ _:-ms-fullscreen, :root .main {
   z-index: -999;
 }
 
-.icon-activity  {
-  font-size: 30px;
-  position: absolute;
-  display: block;
-  left: 0;
-  right: 0;
-  top: -4px;
-}
-
-.name-activity {
-  margin-top: 18px;
-}
-
-.label.activity {
-  position: absolute;
-  top: 11px;
-  font-size: 9px;
-  padding: 0.15rem 0.25rem;
-}
-
 .amount {
   width: 100%;
   text-align: center;
@@ -298,6 +278,14 @@ ul.copayer-list img {
   display: block;
 }
 
+.bottombar-item a.active span, .bottombar-item a.active i {
+  font-weight: bold;
+}
+
+.bottombar-item a.active .label {
+  text-shadow: none;
+}
+
 .box-founds {
   background-color: #213140;
 }

From c2519ec89a2e07ebab92902f7555418a2d0acef8 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 8 Dec 2015 11:55:07 -0300
Subject: [PATCH 2/3] Fix camera-icon

---
 src/css/mobile.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/css/mobile.css b/src/css/mobile.css
index 44f35d2e1..0d042ad18 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -254,6 +254,7 @@ _:-ms-fullscreen, :root .main {
   top: inherit;
   right: 15px;
   bottom: 45px;
+  line-height: 12px;
 }
 
 .send .camera-icon a {

From f8f74294111205a617c994daabdf95bf17fa1aae Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Tue, 8 Dec 2015 12:14:44 -0300
Subject: [PATCH 3/3] Keep current page after cancel the camera

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

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 00ae2b92f..640486b0d 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -132,7 +132,7 @@
           </div>
         </div>
         <div class="camera-icon" ng-show="index.isComplete">
-          <qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner> 
+          <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner> 
         </div>
       </div> <!-- oh -->
 
@@ -381,7 +381,7 @@
           </a>
         </h4>
         <div class="camera-icon" ng-show="index.isComplete">
-          <qr-scanner on-scan="home.onQrCodeScanned(data)" before-scan="home.openSendScreen()"></qr-scanner> 
+          <qr-scanner on-scan="home.onQrCodeScanned(data)"></qr-scanner> 
         </div>
       </div>
       <div class="box-notification m20t" ng-show="home.error" ng-click="home.resetError()">
@@ -417,7 +417,7 @@
                 <a class="postfix size-12 m0 text-gray" 
                 ng-style="{'color':index.backgroundColor}"
                 ng-click="home.openDestinationAddressModal(index.otherWallets, _address)">
-                  <i class="icon-wallet size-18"></i>
+                  <i class="icon-wallet text-bold size-18"></i>
                 </a>
               </div>
             </div>
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index b6f037f24..a308f6571 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -97,13 +97,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   };
 
   this.onQrCodeScanned = function(data) {
+    if (data) go.send();
     $rootScope.$emit('dataScanned', data);
   };
 
-  this.openSendScreen = function() {
-    go.send();
-  };
-
   rateService.whenAvailable(function() {
     self.isRateAvailable = true;
     $rootScope.$digest();