fix activity and proposals transitions

public/views/tab-home.html

@@ -7,7 +7,7 @@
 
 
     <div class="list card" ng-hide="!txps[0]">
-      <a class="item item-icon-right item-heading" ui-sref="proposals" translate>
+      <a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
         Payment Proposals
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
 
@@ -20,7 +20,7 @@
     </div>
 
     <div class="list card">
-      <a class="item item-icon-right item-heading" ui-sref="activity" translate>
+      <a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
         Recent Activity
         <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
       </a>

src/js/routes.js

@@ -143,14 +143,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         url: '/uri-coinbase/:url',
         templateUrl: 'views/coinbaseUri.html'
       })
-      .state('activity', {
-        url: '/activity',
-        templateUrl: 'views/activity.html'
-      })
-      .state('proposals', {
-        url: '/proposals',
-        templateUrl: 'views/proposals.html'
-      })
 
     /*
      *
@@ -170,6 +162,22 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           txpId: null,
         },
       })
+      .state('tabs.activity', {
+        url: '/activity',
+        views: {
+          'tab-home': {
+            templateUrl: 'views/activity.html',
+          }
+        }
+      })
+      .state('tabs.proposals', {
+        url: '/proposals',
+        views: {
+          'tab-home': {
+            templateUrl: 'views/proposals.html',
+          }
+        }
+      })
 
     /*
      *