Revert "Revert "Scan handling""

This reverts commit 641091e7d9.
2016-10-26 14:00:43 -04:00 · 2016-10-26 14:00:43 -04:00 · 22d4a92f7d
commit 22d4a92f7d
parent 1f64c5adaa
25 changed files with 511 additions and 129 deletions
--- a/src/js/routes.js
+++ b/src/js/routes.js
@ -269,13 +269,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
        }
      })
      .state('tabs.send.confirm', {
-        url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
+        url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description',
        views: {
          'tab-send@tabs': {
            controller: 'confirmController',
            templateUrl: 'views/confirm.html'
          }
-        }
+        },
+        params: { paypro: null }
      })
      .state('tabs.send.addressbook', {
        url: '/addressbook/add/:fromSendTab/:addressbookEntry',