BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3137 from cmgustavo/fix/txp-modal02 

Fix/txp modal02
This commit is contained in:
Matias Alejo Garcia 2015-09-04 12:31:35 -03:00
parent b1b0fb929a 56b5d878ea
commit 326c699286
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/views/modals/txp-details.html
View File

@ -104,13 +104,12 @@
</li>
</ul>
</div>
<div class="box-notification" ng-show="error">
<div class="box-notification m20t" ng-show="error">
<span class="text-warning size-14">
{{error|translate}}
</span>
</div>
<div class="row column m20t text-center text-warning" ng-if="tx.removed" translate>
The payment was removed by creator
</div>
@ -133,14 +132,14 @@
</div>
</div>
<div class="text-center text-gray m20b" ng-show="tx.status != 'pending'">
<div class="m10t"
<div class="text-center text-gray m20t" ng-show="tx.status != 'pending'">
<div class="m10t size-12"
ng-show="tx.status=='accepted'" translate>
Payment accepted...
</div>
<div class="m10t"
<div
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"
ng-click="broadcast(tx)"
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
@ -157,11 +156,11 @@
</div>
</div>
<div class="row column m20t" ng-if="tx.canBeRemoved">
<div class="text-gray size-12 text-center m20b" show="tx.canBeRemoved" translate>
<div class="row columns text-center m20t" ng-if="tx.canBeRemoved">
<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.
</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">
<i class="fi-trash size-14 m5r"></i>
<span translate>Delete Payment Proposal</span>

8
src/js/controllers/walletHome.js
View File

@ -192,12 +192,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.getShortNetworkName = function() {
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() {
fc.getTx($scope.tx.id, function(err, tx) {
if (err) {
if (err.code && err.code == 'BADREQUEST' &&
if (err.code && err.code == 'TX_NOT_FOUND' &&
(eventName == 'transactionProposalRemoved' || eventName == 'TxProposalRemoved')) {
$scope.tx.removed = true;
$scope.tx.canBeRemoved = false;
@ -255,6 +255,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
profileService.lockFC();
self.setOngoingProcess();
if (err) {
$scope.$emit('UpdateTx');
$scope.loading = false;
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not accept payment'));
$scope.$digest();
@ -268,6 +269,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess();
$scope.loading = false;
if (err) {
$scope.$emit('UpdateTx');
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not broadcast payment'));
$scope.$digest();
} else {
@ -297,6 +299,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
self.setOngoingProcess();
$scope.loading = false;
if (err) {
$scope.$emit('UpdateTx');
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not reject payment'));
$scope.$digest();
} else {
@ -318,6 +321,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
// Hacky: request tries to parse an empty response
if (err && !(err.message && err.message.match(/Unexpected/))) {
$scope.$emit('UpdateTx');
$scope.error = bwsError.msg(err, gettextCatalog.getString('Could not delete payment proposal'));
$scope.$digest();
return;