anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4916 from msalcala11/scanHandling

Browse source 
Scan handling
This commit is contained in:
Matias Alejo Garcia 2016-10-28 11:28:37 -03:00 • committed by GitHub
commit ab1191695b
31 changed files with 575 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/routes.js
View file

@ -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',
@ -884,13 +885,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}
})
.state('tabs.bitpayCard.confirm', {
url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
url: '/confirm/:cardId/:toAddress/:toName/:toAmount/:toEmail/:description',
views: {
'tab-home@tabs': {
controller: 'confirmController',
templateUrl: 'views/confirm.html'
}
}
},
params: { paypro: null }
})
.state('tabs.bitpayCard.preferences', {
url: '/preferences',