Fix TXP modal events
This commit is contained in:
parent
736e6c8a9b
commit
30511f9d7a
4 changed files with 20 additions and 11 deletions
|
|
@ -94,7 +94,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="row column m20t" ng-if="tx.couldRemove">
|
<div class="row column m20t" ng-if="tx.couldRemove">
|
||||||
<button class="button expand outline dark-gray m0 expand" ng-click="hideTxInfo = true; remove(tx);"
|
<button class="button expand outline dark-gray m0 expand" ng-click="remove(tx);"
|
||||||
ng-disabled="loading" ng-show="tx.couldRemove">
|
ng-disabled="loading" ng-show="tx.couldRemove">
|
||||||
<i class="fi-x icon-sign x"></i>
|
<i class="fi-x icon-sign x"></i>
|
||||||
<span translate>Remove</span>
|
<span translate>Remove</span>
|
||||||
|
|
@ -106,14 +106,14 @@
|
||||||
|
|
||||||
<div class="row m20t" ng-if="tx.pendingForUs">
|
<div class="row m20t" ng-if="tx.pendingForUs">
|
||||||
<div class="large-5 medium-5 small-6 columns">
|
<div class="large-5 medium-5 small-6 columns">
|
||||||
<button class="button outline dark-gray m0 expand" ng-click="hideTxInfo = true; reject(tx);"
|
<button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
|
||||||
ng-disabled="loading">
|
ng-disabled="loading">
|
||||||
<i class="fi-x"></i>
|
<i class="fi-x"></i>
|
||||||
<span translate>Reject</span>
|
<span translate>Reject</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="large-5 medium-5 small-6 columns text-right">
|
<div class="large-5 medium-5 small-6 columns text-right">
|
||||||
<button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)"
|
<button class="button primary m0 expand" ng-click="sign(tx)"
|
||||||
ng-style="{'background-color':color}"
|
ng-style="{'background-color':color}"
|
||||||
ng-disabled="loading">
|
ng-disabled="loading">
|
||||||
<i class="fi-check"></i>
|
<i class="fi-check"></i>
|
||||||
|
|
@ -122,9 +122,22 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="text-center" ng-show="tx.status != 'pending'">
|
<div class="text-center text-gray" ng-show="tx.status != 'pending'">
|
||||||
<div class="text-success m10t"
|
<div class="m10t"
|
||||||
ng-show="tx.status=='accepted'" translate>
|
ng-show="tx.status=='accepted'" translate>
|
||||||
|
Transaction accepted...
|
||||||
|
</div>
|
||||||
|
<div class="m10t"
|
||||||
|
ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
|
||||||
|
<div translate>But not broadcasted. Try to send manually</div>
|
||||||
|
<button class="primary"
|
||||||
|
ng-click="broadcast(tx)"
|
||||||
|
ng-disabled="loading"> <i class="fi-upload-cloud"></i>
|
||||||
|
<span translate>Broadcast Transaction</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="text-success m10t"
|
||||||
|
ng-show="tx.status=='broadcasted'" translate>
|
||||||
Transaction sent!
|
Transaction sent!
|
||||||
</div>
|
</div>
|
||||||
<div class="text-center text-warning"
|
<div class="text-center text-warning"
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@
|
||||||
body {
|
body {
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
-khtml-user-select: none;
|
-khtml-user-select: none;
|
||||||
-moz-user-select: none;
|
|
||||||
-ms-user-select: none;
|
-ms-user-select: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
@ -17,14 +16,12 @@ body {
|
||||||
input {
|
input {
|
||||||
-webkit-user-select: auto !important;
|
-webkit-user-select: auto !important;
|
||||||
-khtml-user-select: auto !important;
|
-khtml-user-select: auto !important;
|
||||||
-moz-user-select: auto !important;
|
|
||||||
-ms-user-select: auto !important;
|
-ms-user-select: auto !important;
|
||||||
user-select: auto !important;
|
user-select: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
* {
|
* {
|
||||||
-webkit-user-drag: none;
|
-webkit-user-drag: none;
|
||||||
-moz-user-drag: none;
|
|
||||||
-ms-user-drag: none;
|
-ms-user-drag: none;
|
||||||
user-drag: none;
|
user-drag: none;
|
||||||
}
|
}
|
||||||
|
|
@ -36,7 +33,6 @@ body, div, .row {
|
||||||
.enable_text_select {
|
.enable_text_select {
|
||||||
-webkit-user-select: text;
|
-webkit-user-select: text;
|
||||||
-khtml-user-select: text;
|
-khtml-user-select: text;
|
||||||
-moz-user-select: text;
|
|
||||||
-ms-user-select: text;
|
-ms-user-select: text;
|
||||||
user-select: text;
|
user-select: text;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
||||||
return fc.credentials.networkName.substring(0, 4);
|
return fc.credentials.networkName.substring(0, 4);
|
||||||
};
|
};
|
||||||
|
|
||||||
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved'], function(eventName) {
|
lodash.each(['TxProposalRejectedBy', 'TxProposalAcceptedBy', 'transactionProposalRemoved', 'TxProposalRemoved', 'NewOutgoingTx'], 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) {
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
|
||||||
|
|
||||||
// Bitcore wallet service URL
|
// Bitcore wallet service URL
|
||||||
bws: {
|
bws: {
|
||||||
url: 'https://copay.io:3232/bws/api',
|
url: 'https://bws.bitpay.com/bws/api',
|
||||||
},
|
},
|
||||||
|
|
||||||
// insight
|
// insight
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue