mirror of https://github.com/BTCPrivate/copay.git
rm copayer modal
This commit is contained in:
parent
784031a7c0
commit
0b2ddeb8d4
|
@ -1,28 +0,0 @@
|
|||
<nav class="tab-bar">
|
||||
<section class="left-small">
|
||||
<a ng-click="cancel()" class="p10">
|
||||
<span class="text-close" translate>Close</span>
|
||||
</a>
|
||||
</section>
|
||||
|
||||
<section class="middle tab-bar-section">
|
||||
<h1 class="title ellipsis" ng-style="{'color':color}" translate>
|
||||
Copayers
|
||||
</h1>
|
||||
</section>
|
||||
</nav>
|
||||
|
||||
<div class="modal-content fix-modals-touch">
|
||||
<ul class="no-bullet">
|
||||
<li class="line-b p10" ng-repeat="copayer in copayers">
|
||||
<span class="size-12" ng-show="copayer.id == copayerId">
|
||||
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
|
||||
</span>
|
||||
<span class="size-12 text-gray" ng-show="copayer.id != copayerId">
|
||||
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="extra-margin-bottom"></div>
|
||||
</div>
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
</span>
|
||||
</li>
|
||||
|
||||
|
||||
<li class="line-b p20 oh">
|
||||
<span translate>Wallet Id</span>
|
||||
<span class="right text-gray enable_text_select">
|
||||
|
@ -29,6 +30,8 @@
|
|||
</span>
|
||||
</li>
|
||||
|
||||
|
||||
|
||||
<li class="line-b p20 oh">
|
||||
<span translate>Wallet Network</span>
|
||||
<span class="right text-gray">
|
||||
|
@ -52,6 +55,16 @@
|
|||
</span>
|
||||
</li>
|
||||
|
||||
<h4 class="title m0" translate>Copayers</h4>
|
||||
<li ng-repeat="copayer in index.copayers">
|
||||
<span class="size-12" ng-show="copayer.id == index.copayerId">
|
||||
<i class="icon-contact size-24 m10r"></i> {{copayer.name}} ({{'Me'|translate}}) <i class="fi-check m5 right"></i>
|
||||
</span>
|
||||
<span class="size-12 text-gray" ng-show="copayer.id != index.copayerId">
|
||||
<i class="icon-contact size-24 m10r"></i> {{copayer.name}}<i class="fi-check m5 right"></i>
|
||||
</span>
|
||||
</li>
|
||||
|
||||
<h4 class="title m0" translate>Extended Public Keys</h4>
|
||||
<li ng-repeat="pk in pubKeys">
|
||||
<div class="row collapse">
|
||||
|
|
|
@ -118,7 +118,7 @@
|
|||
</a>
|
||||
</div>
|
||||
<div class="wallet-info">
|
||||
<div ng-show="index.isShared" ng-click="openCopayersModal(index.copayers, index.copayerId)">
|
||||
<div ng-show="index.isShared">
|
||||
<p class="m0">
|
||||
{{(index.alias || index.walletName)}}
|
||||
</p>
|
||||
|
|
|
@ -828,9 +828,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
|||
}
|
||||
self.showAllHistory = function() {
|
||||
self.historyShowShowAll = false;
|
||||
self.txHistory = self.completeHistory;
|
||||
$timeout(function() {
|
||||
$rootScope.$apply();
|
||||
self.txHistory = self.completeHistory;
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -857,7 +857,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
|||
|
||||
self.updateHistory = function() {
|
||||
var fc = profileService.focusedClient;
|
||||
if (!fc.isComplete()) return;
|
||||
if (!fc.isComplete() || self.updatingTxHistory) return;
|
||||
|
||||
$log.debug('Updating Transaction History');
|
||||
self.txHistoryError = false;
|
||||
|
@ -865,9 +865,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
|||
|
||||
$timeout(function() {
|
||||
self.updateLocalTxHistory(function(err) {
|
||||
if (err) self.txHistoryError = true;
|
||||
self.updatingTxHistory = false;
|
||||
self.showWaitingSign = false;
|
||||
|
||||
if (err)
|
||||
self.txHistoryError = true;
|
||||
|
||||
$rootScope.$apply();
|
||||
});
|
||||
});
|
||||
|
|
|
@ -106,36 +106,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
var cancel_msg = gettextCatalog.getString('Cancel');
|
||||
var confirm_msg = gettextCatalog.getString('Confirm');
|
||||
|
||||
$scope.openCopayersModal = function(copayers, copayerId) {
|
||||
$rootScope.modalOpened = true;
|
||||
var fc = profileService.focusedClient;
|
||||
|
||||
var ModalInstanceCtrl = function($scope, $modalInstance) {
|
||||
$scope.copayers = copayers;
|
||||
$scope.copayerId = copayerId;
|
||||
$scope.color = fc.backgroundColor;
|
||||
$scope.cancel = function() {
|
||||
$modalInstance.dismiss('cancel');
|
||||
};
|
||||
};
|
||||
var modalInstance = $modal.open({
|
||||
templateUrl: 'views/modals/copayers.html',
|
||||
windowClass: animationService.modalAnimated.slideUp,
|
||||
controller: ModalInstanceCtrl,
|
||||
});
|
||||
|
||||
var disableCloseModal = $rootScope.$on('closeModal', function() {
|
||||
modalInstance.dismiss('cancel');
|
||||
});
|
||||
|
||||
modalInstance.result.finally(function() {
|
||||
$rootScope.modalOpened = false;
|
||||
disableCloseModal();
|
||||
var m = angular.element(document.getElementsByClassName('reveal-modal'));
|
||||
m.addClass(animationService.modalAnimated.slideOutDown);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.openDestinationAddressModal = function(wallets, address) {
|
||||
$rootScope.modalOpened = true;
|
||||
var fc = profileService.focusedClient;
|
||||
|
|
Loading…
Reference in New Issue