mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #3137 from cmgustavo/fix/txp-modal02
Fix/txp modal02
This commit is contained in:
commit
326c699286
|
@ -104,13 +104,12 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-notification" ng-show="error">
|
<div class="box-notification m20t" ng-show="error">
|
||||||
<span class="text-warning size-14">
|
<span class="text-warning size-14">
|
||||||
{{error|translate}}
|
{{error|translate}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
|
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
|
||||||
The payment was removed by creator
|
The payment was removed by creator
|
||||||
</div>
|
</div>
|
||||||
|
@ -133,14 +132,14 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="text-center text-gray m20b" ng-show="tx.status != 'pending'">
|
<div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
|
||||||
<div class="m10t"
|
<div class="m10t size-12"
|
||||||
ng-show="tx.status=='accepted'" translate>
|
ng-show="tx.status=='accepted'" translate>
|
||||||
Payment accepted...
|
Payment accepted...
|
||||||
</div>
|
</div>
|
||||||
<div class="m10t"
|
<div
|
||||||
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
|
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
|
||||||
<div translate>But not broadcasted. Try to send manually</div>
|
<div class="m10b size-12" translate>But not broadcasted. Try to send manually</div>
|
||||||
<button class="primary round"
|
<button class="primary round"
|
||||||
ng-click="broadcast(tx)"
|
ng-click="broadcast(tx)"
|
||||||
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
|
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
|
||||||
|
@ -157,11 +156,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row column m20t" ng-if="tx.canBeRemoved">
|
<div class="row columns text-center m20t" ng-if="tx.canBeRemoved">
|
||||||
<div class="text-gray size-12 text-center m20b" show="tx.canBeRemoved" translate>
|
<div class="text-gray size-12 m20b" show="tx.canBeRemoved" translate>
|
||||||
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
|
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
|
||||||
</div>
|
</div>
|
||||||
<button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
|
<button class="tiny round outline dark-gray warning" ng-click="remove(tx)"
|
||||||
ng-disabled="loading" ng-show="tx.canBeRemoved">
|
ng-disabled="loading" ng-show="tx.canBeRemoved">
|
||||||
<i class="fi-trash size-14 m5r"></i>
|
<i class="fi-trash size-14 m5r"></i>
|
||||||
<span translate>Delete Payment Proposal</span>
|
<span translate>Delete Payment Proposal</span>
|
||||||
|
|
|
@ -192,12 +192,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
$scope.getShortNetworkName = function() {
|
$scope.getShortNetworkName = function() {
|
||||||
return fc.credentials.networkName.substring(0, 4);
|
return fc.credentials.networkName.substring(0, 4);
|
||||||
};
|
};
|
||||||
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], function(eventName) {
|
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx', 'UpdateTx'], function(eventName) {
|
||||||
$rootScope.$on(eventName, function() {
|
$rootScope.$on(eventName, function() {
|
||||||
fc.getTx($scope.tx.id, function(err, tx) {
|
fc.getTx($scope.tx.id, function(err, tx) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
||||||
if (err.code && err.code == 'BADREQUEST' &&
|
if (err.code && err.code == 'TX_NOT_FOUND' &&
|
||||||
(eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
|
(eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
|
||||||
$scope.tx.removed = true;
|
$scope.tx.removed = true;
|
||||||
$scope.tx.canBeRemoved = false;
|
$scope.tx.canBeRemoved = false;
|
||||||
|
@ -255,6 +255,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
profileService.lockFC();
|
profileService.lockFC();
|
||||||
self.setOngoingProcess();
|
self.setOngoingProcess();
|
||||||
if (err) {
|
if (err) {
|
||||||
|
$scope.$emit('UpdateTx');
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
|
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
|
@ -268,6 +269,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
self.setOngoingProcess();
|
self.setOngoingProcess();
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
if (err) {
|
if (err) {
|
||||||
|
$scope.$emit('UpdateTx');
|
||||||
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
|
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
} else {
|
} else {
|
||||||
|
@ -297,6 +299,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
self.setOngoingProcess();
|
self.setOngoingProcess();
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
if (err) {
|
if (err) {
|
||||||
|
$scope.$emit('UpdateTx');
|
||||||
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not reject payment'));
|
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not reject payment'));
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
} else {
|
} else {
|
||||||
|
@ -318,6 +321,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
|
|
||||||
// Hacky: request tries to parse an empty response
|
// Hacky: request tries to parse an empty response
|
||||||
if (err && !(err.message && err.message.match(/Unexpected/))) {
|
if (err && !(err.message && err.message.match(/Unexpected/))) {
|
||||||
|
$scope.$emit('UpdateTx');
|
||||||
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not delete payment proposal'));
|
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not delete payment proposal'));
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue