From 657c2b830ce60cd88462a89e38de4cf5060d951f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 1 Sep 2016 15:21:18 -0300
Subject: [PATCH] remove main tabs from import view in onboarding flow

---
 public/views/import.html                      | 36 +++++++++++++------
 public/views/onboarding/welcome.html          |  2 +-
 .../onboarding/welcomeController.js           |  2 +-
 src/js/controllers/tabsController.js          | 36 +++++++++++--------
 src/js/routes.js                              | 36 +++++++++++++++++++
 5 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/public/views/import.html b/public/views/import.html
index 79d347ebd..17e6187aa 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -1,17 +1,33 @@
-<ion-view >
+<ion-view ng-controller="tabsController" ng-init="importInit()">
   <ion-tabs class="tabs-striped tabs-color-positive tabs-color-active-positive tabs-top">
 
-    <ion-tab title="Recovery Phrare" ui-sref="tabs.import.phrase">
-      <ion-nav-view name="tab-import-phrase"></ion-nav-view>
-    </ion-tab>
+    <div ng-if="!fromOnboarding">
+      <ion-tab title="Recovery Phrase" ui-sref="tabs.import.phrase">
+        <ion-nav-view name="tab-import-phrase"></ion-nav-view>
+      </ion-tab>
 
-    <ion-tab title="File/Text" ui-sref="tabs.import.file">
-      <ion-nav-view name="tab-import-file"></ion-nav-view>
-    </ion-tab>
+      <ion-tab title="File/Text" ui-sref="tabs.import.file">
+        <ion-nav-view name="tab-import-file"></ion-nav-view>
+      </ion-tab>
 
-    <ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
-      <ion-nav-view name="tab-import-hardware"></ion-nav-view>
-    </ion-tab>
+      <ion-tab title="Hardware Wallet" ui-sref="tabs.import.hardware">
+        <ion-nav-view name="tab-import-hardware"></ion-nav-view>
+      </ion-tab>
+    </div>
+
+    <div ng-if="fromOnboarding">
+      <ion-tab title="Recovery Phrase" ui-sref="onboarding.import.phrase">
+        <ion-nav-view name="tab-import-phrase"></ion-nav-view>
+      </ion-tab>
+
+      <ion-tab title="File/Text" ui-sref="onboarding.import.file">
+        <ion-nav-view name="tab-import-file"></ion-nav-view>
+      </ion-tab>
+
+      <ion-tab title="Hardware Wallet" ui-sref="onboarding.import.hardware">
+        <ion-nav-view name="tab-import-hardware"></ion-nav-view>
+      </ion-tab>
+    </div>
 
   </ion-tabs>
 </ion-view>
diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html
index 20dd432b6..05459b33d 100644
--- a/public/views/onboarding/welcome.html
+++ b/public/views/onboarding/welcome.html
@@ -14,7 +14,7 @@
         <button class="button button-block get-started col col-75" href ui-sref="onboarding.tour" translate>Get started</button>
       </div>
       <div class="row">
-        <button class="button button-block restore col col-75" translate href ui-sref="tabs.import({'fromOnboarding':true})">Restore</button>
+        <button class="button button-block restore col col-75" translate href ui-sref="onboarding.import.phrase({'fromOnboarding':true})">Restore</button>
       </div>
   </ion-content>
 </ion-view>
diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index 921086c98..f08a5b5eb 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -3,7 +3,7 @@
 angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
 
   $scope.goImport = function(code) {
-    $state.go('tabs.import', {
+    $state.go('onboarding.import.phrase', {
       fromOnboarding: true,
       code: code
     });
diff --git a/src/js/controllers/tabsController.js b/src/js/controllers/tabsController.js
index b9114db36..ccd1b1e88 100644
--- a/src/js/controllers/tabsController.js
+++ b/src/js/controllers/tabsController.js
@@ -1,21 +1,27 @@
-
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $ionicModal, incomingData) {
+angular.module('copayApp.controllers').controller('tabsController', function($log, $scope, $stateParams, $ionicModal, $timeout, incomingData) {
 
-    $scope.onScan = function(data) {
-console.log('[tabsController.js.6:data:]',data); //TODO
-      if (!incomingData.redir(data)) {
-        $ionicPopup.alert({
-          title: 'Invalid data',
-        });
-      }
+  $scope.onScan = function(data) {
+    if (!incomingData.redir(data)) {
+      $ionicPopup.alert({
+        title: 'Invalid data',
+      });
     }
+  }
 
-    $scope.setScanFn = function(scanFn) {
-      $scope.scan = function() {
-        $log.debug('Scanning...');
-        scanFn();
-      };
+  $scope.setScanFn = function(scanFn) {
+    $scope.scan = function() {
+      $log.debug('Scanning...');
+      scanFn();
     };
-  });
+  };
+
+  $scope.importInit = function() {
+    $scope.fromOnboarding = $stateParams.fromOnboarding;
+    $timeout(function() {
+      $scope.$apply();
+    }, 1);
+  }
+
+});
diff --git a/src/js/routes.js b/src/js/routes.js
index 15ed20d90..e70269936 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -631,6 +631,42 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('onboarding.import', {
+        url: '/import/:fromOnboarding',
+        abstract: true,
+        views: {
+          'onboarding': {
+            templateUrl: 'views/import.html'
+          },
+        },
+        params: {
+          code: null
+        },
+      })
+      .state('onboarding.import.phrase', {
+        url: '/tab-import-phrase',
+        views: {
+          'tab-import-phrase': {
+            templateUrl: 'views/tab-import-phrase.html',
+          },
+        }
+      })
+      .state('onboarding.import.file', {
+        url: '/tab-import-file',
+        views: {
+          'tab-import-file': {
+            templateUrl: 'views/tab-import-file.html',
+          },
+        }
+      })
+      .state('onboarding.import.hardware', {
+        url: '/tab-import-hardware',
+        views: {
+          'tab-import-hardware': {
+            templateUrl: 'views/tab-import-hardware.html',
+          },
+        }
+      })
 
     /*
      *