mirror of https://github.com/BTCPrivate/copay.git
Fix slide to pay for desktop after click on registered uri
This commit is contained in:
parent
6ce01155d4
commit
00b193a47f
|
@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
var cachedTxp = {};
|
var cachedTxp = {};
|
||||||
var isChromeApp = platformInfo.isChromeApp;
|
var isChromeApp = platformInfo.isChromeApp;
|
||||||
var countDown = null;
|
var countDown = null;
|
||||||
|
$scope.isCordova = platformInfo.isCordova;
|
||||||
$ionicConfig.views.swipeBackEnabled(false);
|
$ionicConfig.views.swipeBackEnabled(false);
|
||||||
|
|
||||||
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
$scope.$on("$ionicView.beforeEnter", function(event, data) {
|
||||||
|
@ -30,9 +31,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
|
||||||
$log.error('Bad params at amount');
|
$log.error('Bad params at amount');
|
||||||
throw ('bad params');
|
throw ('bad params');
|
||||||
}
|
}
|
||||||
$scope.isCordova = platformInfo.isCordova;
|
|
||||||
$scope.hasClick = platformInfo.hasClick;
|
|
||||||
$scope.data = {};
|
|
||||||
|
|
||||||
var config = configService.getSync().wallet;
|
var config = configService.getSync().wallet;
|
||||||
$scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
|
$scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
</ion-nav-back-button>
|
</ion-nav-back-button>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds && !noMatchingWallet}">
|
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds && !noMatchingWallet}">
|
||||||
<div class="list">
|
<div class="list">
|
||||||
<div class="item head">
|
<div class="item head">
|
||||||
<div class="sending-label">
|
<div class="sending-label">
|
||||||
|
@ -79,13 +79,13 @@
|
||||||
</div>
|
</div>
|
||||||
<click-to-accept
|
<click-to-accept
|
||||||
ng-click="approve(statusChangeHandler)"
|
ng-click="approve(statusChangeHandler)"
|
||||||
ng-if="hasClick && wallets[0]"
|
ng-if="!isCordova && wallets[0]"
|
||||||
click-send-status="sendStatus">
|
click-send-status="sendStatus">
|
||||||
Click to pay
|
Click to pay
|
||||||
</click-to-accept>
|
</click-to-accept>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
<slide-to-accept
|
<slide-to-accept
|
||||||
ng-if="!hasClick && wallets[0]"
|
ng-if="isCordova && wallets[0]"
|
||||||
slide-on-confirm="onConfirm()"
|
slide-on-confirm="onConfirm()"
|
||||||
slide-send-status="sendStatus">
|
slide-send-status="sendStatus">
|
||||||
Slide to pay
|
Slide to pay
|
||||||
|
|
Loading…
Reference in New Issue