diff --git a/src/js/controllers/bitpayCard.js b/src/js/controllers/bitpayCard.js
index 97f1ef402..80d15b697 100644
--- a/src/js/controllers/bitpayCard.js
+++ b/src/js/controllers/bitpayCard.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, configService, profileService, walletService, ongoingProcess, moment, popupService, gettextCatalog, bwcError, $ionicHistory) {
+angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) {
 
   var self = this;
   $scope.dateRange = 'last30Days';
diff --git a/src/js/controllers/bitpayCardIntro.js b/src/js/controllers/bitpayCardIntro.js
index f56f0360c..e2a6dd533 100644
--- a/src/js/controllers/bitpayCardIntro.js
+++ b/src/js/controllers/bitpayCardIntro.js
@@ -1,5 +1,5 @@
 'use strict';
-angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $timeout, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) {
+angular.module('copayApp.controllers').controller('bitpayCardIntroController', function($scope, $log, $state, $ionicHistory, storageService, externalLinkService, bitpayCardService, gettextCatalog, popupService) {
 
   var checkOtp = function(obj, cb) {
     if (obj.otp) {
@@ -41,12 +41,11 @@ angular.module('copayApp.controllers').controller('bitpayCardIntroController', f
                 $ionicHistory.nextViewOptions({
                   disableAnimate: true
                 });
-                $state.go('tabs.home');
-                if (data.cards[0]) {
-                  $timeout(function() {
+                $state.go('tabs.home').then(function() {
+                  if (data.cards[0]) {
                     $state.transitionTo('tabs.bitpayCard', {id: data.cards[0].id});
-                  }, 100);
-                }
+                  }
+                });
               });
             }
           });
diff --git a/src/js/services/bitpayCardService.js b/src/js/services/bitpayCardService.js
index 36b8f97ad..4b5c5b96f 100644
--- a/src/js/services/bitpayCardService.js
+++ b/src/js/services/bitpayCardService.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, $window, lodash, storageService, bitauthService, platformInfo) {
+angular.module('copayApp.services').factory('bitpayCardService', function($http, $log, lodash, storageService, bitauthService, platformInfo) {
   var root = {};
   var BITPAY_CARD_NETWORK = 'livenet';
   var BITPAY_CARD_API_URL = BITPAY_CARD_NETWORK == 'livenet' ? 'https://bitpay.com' : 'https://test.bitpay.com';
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index c48157052..bb0f3a66d 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.services').factory('incomingData', function($log, $ionicModal, $state, $window, $timeout, bitcore, lodash) {
+angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, bitcore, lodash) {
 
   var root = {};
 
@@ -45,10 +45,9 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
     // data extensions for Payment Protocol with non-backwards-compatible request
     if ((/^bitcoin:\?r=[\w+]/).exec(data)) {
       data = decodeURIComponent(data.replace('bitcoin:?r=', ''));
-      $state.go('tabs.send');
-      $timeout(function() {
+      $state.go('tabs.send').then(function() {
         $state.transitionTo('tabs.send.confirm', {paypro: data});
-      }, 100);
+      });
       return true;
     }
 
@@ -63,8 +62,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
 
       var amount = parsed.amount ?  parsed.amount : '';
 
-      $state.go('tabs.send');
-      $timeout(function() {
+      $state.go('tabs.send').then(function() {
         if (parsed.r) {
           $state.transitionTo('tabs.send.confirm', {paypro: parsed.r});
         } else {
@@ -74,31 +72,28 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
             $state.transitionTo('tabs.send.amount', {toAddress: addr});
           }
         }
-      }, 100);
+      });
       return true;
 
     // Plain URL
     } else if (/^https?:\/\//.test(data)) {
       var currentState = $state.current.name;
       if (lodash.indexOf(ignoreState, currentState) != -1) return false;
-      $state.go('tabs.send');
-      $timeout(function() {
+      $state.go('tabs.send').then(function() {
         $state.transitionTo('tabs.send.confirm', {paypro: data});
-      }, 100);
+      });
       return true;
 
     // Plain Address
     } else if (bitcore.Address.isValid(data, 'livenet')) {
-      $state.go('tabs.send');
-      $timeout(function() {
+      $state.go('tabs.send').then(function() {
         $state.transitionTo('tabs.send.amount', {toAddress: data});
-      }, 100);
+      });
       return true;
     } else if (bitcore.Address.isValid(data, 'testnet')) {
-      $state.go('tabs.send');
-      $timeout(function() {
+      $state.go('tabs.send').then(function() {
         $state.transitionTo('tabs.send.amount', {toAddress: data});
-      }, 100);
+      });
       return true;
 
     // Protocol
@@ -112,30 +107,27 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni
       var secret = getParameterByName('secret', data);
       var email = getParameterByName('email', data);
       var otp = getParameterByName('otp', data);
-      $state.go('tabs.home');
-      $timeout(function() {
+      $state.go('tabs.home').then(function() {
         $state.transitionTo('tabs.bitpayCardIntro', {
           secret: secret,
           email: email,
           otp: otp
         });
-      }, 100);
+      });
       return true;
 
     // Join
     } else if (data && data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
-      $state.go('tabs.home');
-      $timeout(function() {
+      $state.go('tabs.home').then(function() {
         $state.transitionTo('tabs.add.join', {url: data});
-      }, 100);
+      });
       return true;
 
     // Old join
     } else if (data && data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) {
-      $state.go('tabs.home');
-      $timeout(function() {
+      $state.go('tabs.home').then(function() {
         $state.transitionTo('tabs.add.join', {url: data});
-      }, 100);
+      });
       return true;
     }