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

allow amazon gift card for multisig wallets

Browse source
This commit is contained in:
Gabriel Bazán 2016-12-12 13:01:28 -03:00
commit f7678f8d39
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/confirm.js
View file

@ -55,8 +55,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function setwallets() { function setwallets() {
$scope.wallets = profileService.getWallets({ $scope.wallets = profileService.getWallets({
onlyComplete: true, onlyComplete: true,
network: $scope.network, network: $scope.network
m: $scope.isGiftCard ? 1 : null
}); });
if (!$scope.wallets || !$scope.wallets.length) { if (!$scope.wallets || !$scope.wallets.length) {

6
www/views/modals/txp-details.html
View file

@ -164,13 +164,15 @@
<click-to-accept <click-to-accept
ng-click="onConfirm(statusChangeHandler)" ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick" ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus"> click-send-status="sendStatus"
has-wallet-chosen="true">
Click to accept Click to accept
</click-to-accept> </click-to-accept>
<slide-to-accept <slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick" ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
slide-on-confirm="onConfirm()" slide-on-confirm="onConfirm()"
slide-send-status="sendStatus"> slide-send-status="sendStatus"
has-wallet-chosen="true">
Slide to accept Slide to accept
</slide-to-accept> </slide-to-accept>
<slide-to-accept-success <slide-to-accept-success