mirror of https://github.com/BTCPrivate/copay.git
modified in tx details
This commit is contained in:
parent
a9c7be1889
commit
5ee310ec50
|
@ -1,6 +1,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, bwcError, gettextCatalog, lodash, walletService, popupService, $ionicHistory) {
|
angular.module('copayApp.controllers').controller('txpDetailsController', function($scope, $rootScope, $timeout, $interval, $log, ongoingProcess, platformInfo, $ionicScrollDelegate, txFormatService, bwcError, gettextCatalog, lodash, walletService, popupService, $ionicHistory, feeService) {
|
||||||
var isGlidera = $scope.isGlidera;
|
var isGlidera = $scope.isGlidera;
|
||||||
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
|
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
|
||||||
var now = Math.floor(Date.now() / 1000);
|
var now = Math.floor(Date.now() / 1000);
|
||||||
|
@ -27,8 +27,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
|
||||||
$scope.tx.feeFiatStr = v;
|
$scope.tx.feeFiatStr = v;
|
||||||
});
|
});
|
||||||
$scope.tx.feeRateStr = ($scope.tx.fee / ($scope.tx.amount + $scope.tx.fee) * 100).toFixed(2) + '%';
|
$scope.tx.feeRateStr = ($scope.tx.fee / ($scope.tx.amount + $scope.tx.fee) * 100).toFixed(2) + '%';
|
||||||
if ($scope.tx.feeLevel == 'superEconomy') $scope.tx.feeLevelStr = gettextCatalog.getString('Super Economy');
|
$scope.tx.feeLevelStr = feeService.feeOpts[$scope.tx.feeLevel];
|
||||||
else $scope.tx.feeLevelStr = $scope.tx.feeLevelStr = $scope.tx.feeLevel.charAt(0).toUpperCase() + $scope.tx.feeLevel.slice(1);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
function applyButtonText() {
|
function applyButtonText() {
|
||||||
|
|
|
@ -11,10 +11,12 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
$scope.wallet = profileService.getWallet(data.stateParams.walletId);
|
$scope.wallet = profileService.getWallet(data.stateParams.walletId);
|
||||||
$scope.color = $scope.wallet.color;
|
$scope.color = $scope.wallet.color;
|
||||||
$scope.copayerId = $scope.wallet.credentials.copayerId;
|
$scope.copayerId = $scope.wallet.credentials.copayerId;
|
||||||
$scope.isShared = $scope.wallet.credentials.n > 1;
|
$scope.isShared = $scope.wallet.credentials.n > 1;
|
||||||
|
|
||||||
txConfirmNotification.checkIfEnabled(txId, function(res) {
|
txConfirmNotification.checkIfEnabled(txId, function(res) {
|
||||||
$scope.txNotification = { value: res };
|
$scope.txNotification = {
|
||||||
|
value: res
|
||||||
|
};
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -24,7 +26,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
listeners = [
|
listeners = [
|
||||||
$rootScope.$on('bwsEvent', function(e, walletId, type, n) {
|
$rootScope.$on('bwsEvent', function(e, walletId, type, n) {
|
||||||
if (type == 'NewBlock' && n && n.data && n.data.network == 'livenet') {
|
if (type == 'NewBlock' && n && n.data && n.data.network == 'livenet') {
|
||||||
updateTxDebounced({hideLoading: true});
|
updateTxDebounced({
|
||||||
|
hideLoading: true
|
||||||
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
@ -108,7 +112,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
|
|
||||||
$scope.btx = txFormatService.processTx(tx);
|
$scope.btx = txFormatService.processTx(tx);
|
||||||
txFormatService.formatAlternativeStr(tx.fees, function(v) {
|
txFormatService.formatAlternativeStr(tx.fees, function(v) {
|
||||||
$scope.feeFiatStr = v;
|
$scope.btx.feeFiatStr = v;
|
||||||
|
$scope.btx.feeRateStr = ($scope.btx.fees / ($scope.btx.amount + $scope.btx.fees) * 100).toFixed(2) + '%';
|
||||||
});
|
});
|
||||||
|
|
||||||
if ($scope.btx.action != 'invalid') {
|
if ($scope.btx.action != 'invalid') {
|
||||||
|
@ -130,7 +135,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
};
|
};
|
||||||
|
|
||||||
var updateTxDebounced = lodash.debounce(updateTx, 5000);
|
var updateTxDebounced = lodash.debounce(updateTx, 5000);
|
||||||
|
|
||||||
$scope.showCommentPopup = function() {
|
$scope.showCommentPopup = function() {
|
||||||
var opts = {};
|
var opts = {};
|
||||||
if ($scope.btx.message) {
|
if ($scope.btx.message) {
|
||||||
|
@ -194,7 +199,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
|
||||||
|
|
||||||
$scope.txConfirmNotificationChange = function() {
|
$scope.txConfirmNotificationChange = function() {
|
||||||
if ($scope.txNotification.value) {
|
if ($scope.txNotification.value) {
|
||||||
txConfirmNotification.subscribe($scope.wallet, { txid: txId });
|
txConfirmNotification.subscribe($scope.wallet, {
|
||||||
|
txid: txId
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
txConfirmNotification.unsubscribe($scope.wallet, txId);
|
txConfirmNotification.unsubscribe($scope.wallet, txId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,11 +77,11 @@
|
||||||
</div>
|
</div>
|
||||||
<i class="icon bp-arrow-right"></i>
|
<i class="icon bp-arrow-right"></i>
|
||||||
</a>
|
</a>
|
||||||
<div class="item single-line" ng-click="toggleFeeFiat = !toggleFeeFiat" ng-if="btx.action != 'received'">
|
<div class="item">
|
||||||
<span class="label" translate>Fee</span>
|
<span class="label" translate>Fee</span>
|
||||||
<span class="item-note">
|
<span class="m10l">{{btx.feeStr || '...'}}</span>
|
||||||
<span ng-if="!toggleFeeFiat">{{btx.feeStr}}</span>
|
<span class="item-note m10l">
|
||||||
<span ng-if="toggleFeeFiat">{{feeFiatStr}}</span>
|
<span>{{btx.feeFiatStr || '...'}} <span class="fee-rate" ng-if="btx.feeRateStr" translate>- {{btx.feeRateStr}} of the transaction</span></span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="item low-fees" ng-if="btx.action == 'received' && btx.lowFees">
|
<div class="item low-fees" ng-if="btx.action == 'received' && btx.lowFees">
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
</div>
|
</div>
|
||||||
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
|
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
|
||||||
class="toggle-unconfirmed"
|
class="toggle-unconfirmed"
|
||||||
ng-model="txNotification.value"
|
ng-model="txNotification.value"
|
||||||
toggle-class="toggle-balanced"
|
toggle-class="toggle-balanced"
|
||||||
ng-change="txConfirmNotificationChange()">
|
ng-change="txConfirmNotificationChange()">
|
||||||
<span class="toggle-label" translate>Notify me if confirmed</span>
|
<span class="toggle-label" translate>Notify me if confirmed</span>
|
||||||
|
|
Loading…
Reference in New Issue