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

Merge pull request #435 from gabrielbazan7/fix/sendView

Browse source 
Fix/send view
This commit is contained in:
Gustavo Maximiliano Cortez 2016-10-13 11:12:13 -03:00 • committed by GitHub
commit 5b61a17cb5
5 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,11 +32,10 @@ angular.module('copayApp.controllers').controller('confirmController', function(
throw ('bad params');
}
$scope.isCordova = platformInfo.isCordova;
$scope.hasClick = platformInfo.hasClick;
$scope.data = {};
var config = configService.getSync().wallet;
$scope.feeLevel = config.settings ? config.settings.feeLevel : '';
$scope.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
$scope.toAmount = parseInt($scope.toAmount);
$scope.amountStr = txFormatService.formatAmountStr($scope.toAmount);
@ -274,7 +273,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
txp.message = description;
txp.payProUrl = paypro;
txp.excludeUnconfirmedUtxos = config.spendUnconfirmed ? false : true;
txp.feeLevel = config.settings.feeLevel || 'normal';
txp.feeLevel = config.settings && config.settings.feeLevel ? config.settings.feeLevel : 'normal';
txp.dryRun = dryRun;
walletService.createTx(wallet, txp, function(err, ctxp) {

1
src/js/controllers/modals/txpDetails.js
View file

@ -17,7 +17,6 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
$scope.canSign = $scope.wallet.canSign() || $scope.wallet.isPrivKeyExternal();
$scope.color = $scope.wallet.color;
$scope.data = {};
$scope.hasClick = platformInfo.hasClick;
$scope.displayAmount = getDisplayAmount(tx.amountStr);
$scope.displayUnit = getDisplayUnit(tx.amountStr);
initActionList();

16
src/js/services/platformInfo.js
View file

@ -39,21 +39,5 @@ angular.module('copayApp.services').factory('platformInfo', function($window) {
ret.isChromeApp = $window.chrome && chrome.runtime && chrome.runtime.id && !ret.isNW;
ret.isDevel = !ret.isMobile && !ret.isChromeApp && !ret.isNW;
ret.hasClick = false;
if($window.sessionStorage.getItem('hasClick')) {
ret.hasClick = true;
}
$window.addEventListener('mousedown', function() {
ret.hasClick = true;
$window.sessionStorage.setItem('hasClick', 'true');
});
$window.addEventListener('touchstart', function() {
ret.hasClick = false;
$window.sessionStorage.removeItem('hasClick');
});
return ret;
});

19
www/views/confirm.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds}">
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -42,31 +42,30 @@
</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds">
<span class="label" translate>{{'Add Memo'|translate}}</span>
<span class="item-note">
<a class="item single-line item-icon-right" ng-hide="insuffientFunds" ng-click="showDescriptionPopup()">
<span class="label" translate>Add Memo</span>
<span class="item-note m10l">
{{description}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
<a class="item single-line item-icon-right" ng-hide="insuffientFunds">
<span class="label" translate>Fee</span>
<a class="item single-line" ng-hide="insuffientFunds">
<span class="label" translate>Fee: {{feeLevel}}</span>
<span class="item-note">
{{fee}}
{{fee || '...'}}
</span>
<i class="icon bp-arrow-right"></i>
</a>
</div>
</div>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="hasClick && wallets[0]"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
</ion-content>
<slide-to-accept
ng-if="!hasClick && wallets[0]"
ng-if="isCordova && wallets[0]"
slide-on-confirm="onConfirm()"
slide-send-status="sendStatus">
Slide to pay

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

@ -11,7 +11,7 @@
</button>
</ion-header-bar>
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && isCordova}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -152,7 +152,7 @@
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
ng-if="tx.pendingForUs && canSign && !paymentExpired && !isCordova"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
@ -168,7 +168,7 @@
</ion-content>
<slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
ng-if="tx.pendingForUs && canSign && !paymentExpired && isCordova"
slide-on-confirm="onConfirm()"
slide-send-status="sendStatus">
Slide to accept