From 25bc0643f817a91971fb758ac58c578f9de50084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 10 Feb 2016 12:34:14 -0300
Subject: [PATCH 1/2] ui refactor

---
 public/views/walletHome.html | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 84045dd38..b27cf818c 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -339,36 +339,35 @@
               <div class="m10t" >
                 <h4 ng-class="{'enable_text_select': !index.isCordova}" class="size-12">
                   {{home.generatingAddress ? '...' : home.addr[index.walletId]}}
-
                 </h4>
               </div>
             </div>
-            <div class="text-center m20b size-12 text-gray">
-              <a ng-click="home.setAddress(true)"
-                 ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
-                Generate new address
-              </a>
-            </div>
-
-            <div ng-show="home.addr[index.walletId]">
-              <div class="line-t size-10 text-gray m10b p10t" 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>
         <div class="row m20t">
+          <div class="small-12 columns" ng-show="index.isCordova && !home.generatingAddress && home.addr[index.walletId]">
+            <span class="button outline light-gray small round expand"
+              ng-click="home.shareAddress(home.addr[index.walletId])">
+              <span translate>Share address</span>
+            </span>
+          </div>
           <div class="small-12 columns" ng-show="!home.generatingAddress && home.addr[index.walletId]">
             <a class="button expand small round m10b" ng-click="home.openCustomizedAmountModal(home.addr[index.walletId])"
             ng-style="{'background-color':index.backgroundColor}">
               <span translate>Request a specific amount</span>
             </a>
           </div>
-          <div class="small-12 columns" ng-show="index.isCordova && !home.generatingAddress && home.addr[index.walletId]">
-            <span class="button outline light-gray small round expand"
-              ng-click="home.shareAddress(home.addr[index.walletId])">
-              <span translate>Share address</span>
-            </span>
+        </div>
+        <div class="row m10t">
+          <div class="large-12 columns">
+            <div ng-show="home.addr[index.walletId]">
+              <div class="line-t size-10 text-gray m10b p10t" translate>
+                Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them. <a ng-click="home.setAddress(true)"
+                 ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
+                Generate new address
+              </a>
+              </div>
+            </div>
           </div>
         </div>
       </div>

From 79651a76b067f31e35eeb6627f4dc56b391f9f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 10 Feb 2016 15:35:08 -0300
Subject: [PATCH 2/2] refactor

---
 public/views/walletHome.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index b27cf818c..a84c7628b 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -358,15 +358,11 @@
             </a>
           </div>
         </div>
-        <div class="row m10t">
+        <div class="row m10t" ng-show="home.addr[index.walletId] && !home.blockUx && !home.generatingAddress" >
           <div class="large-12 columns">
-            <div ng-show="home.addr[index.walletId]">
-              <div class="line-t size-10 text-gray m10b p10t" translate>
-                Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them. <a ng-click="home.setAddress(true)"
-                 ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
-                Generate new address
-              </a>
-              </div>
+            <div class="line-t size-10 text-gray m10b p10t">
+              <span translate> Share this wallet address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.</span>
+              <a ng-click="home.setAddress(true)" translate>Generate new address</a>
             </div>
           </div>
         </div>