From 1b38a4229254e1c91ba00189440cba4ac9cdc180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Mon, 30 Nov 2015 18:57:18 -0300
Subject: [PATCH] refactor

---
 src/js/routes.js      | 45 +++++++++++++++----------------------------
 src/js/services/go.js | 14 +++-----------
 2 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/src/js/routes.js b/src/js/routes.js
index cd9b73558..60db0e35d 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -466,38 +466,23 @@ angular
         url: '/cordova/:status/:isHome',
         views: {
           'main': {
-            controller: function($rootScope, $state, $log, $stateParams, $timeout, go, isCordova, storageService) {
-
-              if ($stateParams.status == "pause")
-                return;
-
-              storageService.getProfile(function(err, profile) {
-
-                //for compatibility
-                storageService.getCopayDisclaimerFlag(function(err, val) {
-
-                  $log.debug('### State: ', $stateParams.status);
-                  switch ($stateParams.status) {
-                    case 'resume':
-                      $rootScope.$emit('Local/Resume');
-                      break;
-                    case 'backbutton':
-                      var shouldExit = $stateParams.isHome == 'true' || !profile.agreeDisclaimer || !val;
-                      if (isCordova && shouldExit && !$rootScope.modalOpened) {
-                        return navigator.app.exitApp();
-                      } else {
-                        $rootScope.$emit('closeModal');
-                      }
-                      break;
-                  };
-
-                  if (profile.agreeDisclaimer || val) {
-                    go.walletHome(true);
+            controller: function($rootScope, $state, $stateParams, $timeout, go, isCordova) {
+              switch ($stateParams.status) {
+                case 'resume':
+                  $rootScope.$emit('Local/Resume');
+                  break;
+                case 'backbutton':
+                  if (isCordova && $stateParams.isHome == 'true' && !$rootScope.modalOpened) {
+                    navigator.app.exitApp();
                   } else {
-                    $state.transitionTo('disclaimer');
+                    $rootScope.$emit('closeModal');
                   }
-                });
-              });
+                  break;
+              };
+              $timeout(function() {
+                $rootScope.$emit('Local/SetTab', 'walletHome', true);
+              }, 100);
+              go.walletHome();
             }
           }
         },
diff --git a/src/js/services/go.js b/src/js/services/go.js
index 0ae7fa993..73c51493f 100644
--- a/src/js/services/go.js
+++ b/src/js/services/go.js
@@ -57,17 +57,9 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
     if (fc && !fc.isComplete()) {
       root.path('copayers');
     } else {
-      if (delayed) {
-        $timeout(function() {
-          root.path('walletHome', function() {
-            $rootScope.$emit('Local/SetTab', 'walletHome', true);
-          });
-        }, 100);
-      } else {
-        root.path('walletHome', function() {
-          $rootScope.$emit('Local/SetTab', 'walletHome', true);
-        });
-      }
+      root.path('walletHome', function() {
+        $rootScope.$emit('Local/SetTab', 'walletHome', true);
+      });
     }
   };