From 2599f8240dc043c95cc5474be80d6d6404cc3c2d Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 25 Aug 2016 16:23:23 -0300
Subject: [PATCH] fix activity view

---
 public/views/activity.html | 34 +++++++++++++++++++---------------
 public/views/tab-home.html |  4 ++--
 src/sass/main.scss         |  4 ++++
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/public/views/activity.html b/public/views/activity.html
index 2885b2fb5..d10d45479 100644
--- a/public/views/activity.html
+++ b/public/views/activity.html
@@ -2,30 +2,34 @@
 <ion-view>
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Recent Activity</ion-nav-title>
+    <ion-nav-buttons side="primary">
+      <button class="button no-border" ui-sref="tabs.home">
+        <span translate>Close</span>
+      </button>
+    </ion-nav-buttons>
   </ion-nav-bar>
   <ion-content class="padding" ng-controller="activityController" ng-init="init()">
 
     <div ng-if="fetchingNotifications" class="updatingHistory">
-        <div  class="row" >
-            <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
-        </div>
-        <div  class="row" >
-          <div  class="col" translate>Updating activity. Please stand by.</div>
-        </div>
+      <div class="text-center">
+        <ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
+        <div translate>Updating activity. Please stand by</div>
       </div>
     </div>
 
     <div ng-if="!fetchingNotifications">
-      <div class="list card" ng-if="!fetchingNotifications">
-        <ul>
-          <li ng-repeat="x in notifications" class="item item-icon-left" ng-click="x.action()">
-            <span ng-include="'views/includes/walletActivity.html'"></span>
-          </li>
+      <div class="list card">
+        <div class="item item-icon-left" ng-repeat="x in notifications" ng-click="x.action()">
+          <span ng-include="'views/includes/walletActivity.html'"></span>
+        </div>
 
-          <li  class="item"  ng-show="!notifications[0]">
-            No recent activity
-          </li>
-        </ul>
+        <a class="item text-center" ui-sref="activity" ng-show="notificationsMore">
+          <span translate>More</span> ({{notificationsMore}})
+        </a>
+
+        <div class="item" ng-show="!notifications[0]">
+          <span translate>No recent activity</span>
+        </div>
       </div>
     </div>
   </ion-content>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index d56eeafe3..70dd9d2e7 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -34,8 +34,8 @@
       <div class="col col-80">
         <h3 translate>Wallets</h3>
       </div>
-      <div class="col text-right padding" ui-sref="add.main">
-        <i class="size-24 icon ion-ios-plus-outline"></i>
+      <div class="col text-right" ui-sref="add.main">
+        <i class="size-32 icon ion-ios-plus-empty"></i>
       </div>
     </div>
 
diff --git a/src/sass/main.scss b/src/sass/main.scss
index efb92a3eb..3095f9eb8 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -525,6 +525,10 @@ ul.wallet-selection.wallets {
   font-size: 28px;
 }
 
+.size-32 {
+  font-size: 32px;
+}
+
 .size-36 {
   font-size: 36px;
 }