Coinbase connection issues and logout from tab-setting

2016-12-08 13:06:01 -03:00 · 2016-12-08 13:06:01 -03:00 · 539583a2af
commit 539583a2af
parent 1533428fb0
9 changed files with 130 additions and 127 deletions
--- a/src/js/routes.js
+++ b/src/js/routes.js
@ -926,24 +926,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
     *
     */

-      .state('tabs.buyandsell.coinbase', {
-        url: '/coinbase',
-        views: {
-          'tab-home@tabs': {
-            controller: 'coinbaseController',
-            controllerAs: 'coinbase',
-            templateUrl: 'views/coinbase.html'
-          }
-        }
-      })
-      .state('tabs.buyandsell.coinbase.preferences', {
-        url: '/preferences',
+    .state('tabs.buyandsell.coinbase', {
+      url: '/coinbase',
+      views: {
        'tab-home@tabs': {
-          controller: 'preferencesCoinbaseController',
+          controller: 'coinbaseController',
          controllerAs: 'coinbase',
+          templateUrl: 'views/coinbase.html'
+        }
+      }
+    })
+    .state('tabs.preferences.coinbase', {
+      url: '/coinbase',
+      views: {
+        'tab-settings@tabs': {
+          controller: 'preferencesCoinbaseController',
          templateUrl: 'views/preferencesCoinbase.html'
        }
-      })
+      }
+    })
      .state('tabs.buyandsell.coinbase.buy', {
        url: '/buy',
        'tab-home@tabs': {