Merge pull request #5204 from gabrielbazan7/feat/amazonMultisig
allow amazon gift card for multisig wallets
This commit is contained in:
commit
158b62b876
2 changed files with 5 additions and 4 deletions
|
|
@ -55,8 +55,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
|||
function setwallets() {
|
||||
$scope.wallets = profileService.getWallets({
|
||||
onlyComplete: true,
|
||||
network: $scope.network,
|
||||
m: $scope.isGiftCard ? 1 : null
|
||||
network: $scope.network
|
||||
});
|
||||
|
||||
if (!$scope.wallets || !$scope.wallets.length) {
|
||||
|
|
|
|||
|
|
@ -164,13 +164,15 @@
|
|||
<click-to-accept
|
||||
ng-click="onConfirm(statusChangeHandler)"
|
||||
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>
|
||||
<slide-to-accept
|
||||
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
|
||||
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-success
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue