3rd step enhancement send flow

src/js/controllers/addressbookView.js

@@ -21,28 +21,22 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f
   });
 
   $scope.sendTo = function() {
-    $ionicHistory.removeBackView();
-    sendFlowService.clear();
-    $state.go('tabs.send');
-    $timeout(function() {
-      var to = '';
-      if ($scope.addressbookEntry.coin == 'bch') {
-        var a = 'bitcoincash:' + $scope.addressbookEntry.address;
-        to = bitcoinCashJsService.readAddress(a).legacy;
-      } else {
-        to = $scope.addressbookEntry.address;
-      }
+    var to = '';
+    if ($scope.addressbookEntry.coin == 'bch') {
+      var a = 'bitcoincash:' + $scope.addressbookEntry.address;
+      to = bitcoinCashJsService.readAddress(a).legacy;
+    } else {
+      to = $scope.addressbookEntry.address;
+    }
 
-      var stateParams = {
-        toAddress: to,
-        toName: $scope.addressbookEntry.name,
-        toEmail: $scope.addressbookEntry.email,
-        coin: $scope.addressbookEntry.coin
-      };
+    var stateParams = {
+      toAddress: to,
+      toName: $scope.addressbookEntry.name,
+      toEmail: $scope.addressbookEntry.email,
+      coin: $scope.addressbookEntry.coin
+    };
 
-      sendFlowService.pushState(stateParams);
-      $state.transitionTo('tabs.send.origin');
-    }, 100);
+    sendFlowService.start(stateParams);
   };
 
   $scope.remove = function(addressbookEntry) {

src/js/controllers/shapeshift.js

@@ -62,18 +62,7 @@ angular.module('copayApp.controllers').controller('shapeshiftController', functi
         id: 'shapeshift'
       }
     };
-
-    // Starting new send flow, so ensure everything is reset
-    sendFlowService.clear();
-    $state.go('tabs.home').then(function() {
-      $ionicHistory.clearHistory();
-      $state.go('tabs.send').then(function() {
-        $timeout(function () {
-          sendFlowService.pushState(stateParams);
-          $state.transitionTo('tabs.send.origin');
-        }, 60);
-      });
-    });
+    sendFlowService.start(stateParams);
   }
 
   function showMyAddress() {

src/js/controllers/tab-home.js

@@ -122,8 +122,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
     };
 
     $scope.startFreshSend = function() {
-      sendFlowService.clear();
-      $state.go('tabs.send');
+      sendFlowService.start();
     }
 
     $scope.openExternalLink = function() {

src/js/controllers/tabsController.js

@@ -27,7 +27,6 @@ angular.module('copayApp.controllers').controller('tabsController', function($ro
   };
 
   $scope.chooseScanner = function() {
-    sendFlowService.clear();
     var isWindowsPhoneApp = platformInfo.isCordova && platformInfo.isWP;
 
     if (!isWindowsPhoneApp) {

src/js/controllers/walletDetails.js

@@ -378,8 +378,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   });
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
-    sendFlowService.clear();
-
     configService.whenAvailable(function (config) {
       $scope.selectedPriceDisplay = config.wallet.settings.priceDisplay;
 
@@ -477,15 +475,15 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   }
 
   $scope.goToSend = function() {
-    sendFlowService.startSend({
+    sendFlowService.start({
       fromWalletId: $scope.wallet.id
     });
     
     // Go home first so that the Home tab works properly
-    $state.go('tabs.home').then(function () {
+    /*$state.go('tabs.home').then(function () {
       $ionicHistory.clearHistory();
       $state.go('tabs.send');
-    });
+    });*/
     
   };
   $scope.goToReceive = function() {