mirror of https://github.com/BTCPrivate/copay.git
Fix address list from receive section. Fix response when delete a wallet.
This commit is contained in:
parent
1c7a48e827
commit
174c6cb3de
|
@ -616,11 +616,6 @@ ul.tx-copayers {
|
|||
.ma { margin: 0 auto;}
|
||||
.tu {text-transform: uppercase;}
|
||||
|
||||
.small {
|
||||
font-size: 60%;
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
.line-dashed-setuph-v {
|
||||
border-left: 1px dashed #415970;
|
||||
}
|
||||
|
@ -850,6 +845,7 @@ input[type=number]::-webkit-outer-spin-button {
|
|||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
padding-top: 3px;
|
||||
}
|
||||
|
||||
ul.pagination li.current a {
|
||||
|
|
|
@ -33,17 +33,15 @@ angular.module('copayApp.controllers').controller('CopayersController',
|
|||
};
|
||||
|
||||
$scope.deleteWallet = function() {
|
||||
$scope.loading = true;
|
||||
$rootScope.starting = true;
|
||||
$timeout(function() {
|
||||
identityService.deleteWallet(w, function(err) {
|
||||
$rootScope.starting = false;
|
||||
if (err) {
|
||||
$scope.loading = null;
|
||||
$scope.error = err.message || err;
|
||||
copay.logger.warn(err);
|
||||
$timeout(function() {
|
||||
$scope.$digest();
|
||||
});
|
||||
$timeout(function () { $scope.$digest(); });
|
||||
} else {
|
||||
$scope.loading = false;
|
||||
if ($rootScope.wallet) {
|
||||
go.walletHome();
|
||||
}
|
||||
|
@ -52,6 +50,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
|
|||
});
|
||||
}
|
||||
});
|
||||
}, 100);
|
||||
};
|
||||
|
||||
$scope.copySecret = function(secret) {
|
||||
|
|
|
@ -119,14 +119,14 @@ angular.module('copayApp.controllers').controller('MoreController',
|
|||
|
||||
$scope.deleteWallet = function() {
|
||||
$scope.loading = true;
|
||||
$timeout(function() {
|
||||
identityService.deleteWallet(w, function(err) {
|
||||
$scope.loading = false;
|
||||
if (err) {
|
||||
$scope.loading = null;
|
||||
$scope.error = err.message || err;
|
||||
copay.logger.warn(err);
|
||||
$timeout(function () { $scope.$digest(); });
|
||||
} else {
|
||||
$scope.loading = false;
|
||||
if ($rootScope.wallet) {
|
||||
go.walletHome();
|
||||
}
|
||||
|
@ -135,6 +135,7 @@ angular.module('copayApp.controllers').controller('MoreController',
|
|||
});
|
||||
}
|
||||
});
|
||||
}, 100);
|
||||
};
|
||||
|
||||
$scope.copyText = function(text) {
|
||||
|
|
|
@ -60,7 +60,7 @@ angular.module('copayApp.controllers').controller('ReceiveController',
|
|||
|
||||
$modal.open({
|
||||
templateUrl: 'views/modals/qr-address.html',
|
||||
windowClass: 'tiny',
|
||||
windowClass: 'small',
|
||||
controller: ModalInstanceCtrl,
|
||||
resolve: {
|
||||
address: function() {
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
<div ng-controller="CopayersController" ng-init="init()">
|
||||
<div ng-show="$root.starting">
|
||||
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Deleting'"></div>
|
||||
</div>
|
||||
|
||||
<div class="!$root.starting">
|
||||
<div class="row">
|
||||
<div class="large-12 medium-12 small-12 columns">
|
||||
<h1>Share this secret with your copayers</h1>
|
||||
|
@ -80,6 +85,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="extra-margin-bottom"></div>
|
||||
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="left" tooltip="ID: {{copayer.peerId}}" tooltip-placement="bottom">
|
||||
<small class="text-gray" ng-show="copayer.index == 0">
|
||||
<span class="size-12" ng-show="copayer.index == 0">
|
||||
<i class="fi-check m5r"></i> {{'Me'|translate}}
|
||||
</small>
|
||||
<small class="text-gray" ng-show="copayer.index > 0">
|
||||
</span>
|
||||
<span class="size-12 text-gray" ng-show="copayer.index > 0">
|
||||
<i class="fi-check m5r"></i> {{copayer.nick}}
|
||||
</small>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
|
@ -27,8 +27,8 @@
|
|||
ng-repeat="(addr, info) in addressBook"
|
||||
ng-class="{'addressbook-disabled': info.hidden}">
|
||||
<td ng-click="copyToSend(addr)">
|
||||
<b>{{info.label}}</b>
|
||||
<div class="small address-size">{{::addr}}</div>
|
||||
<b>{{info.label}}</b><br>
|
||||
<small class="address-size">{{::addr}}</small>
|
||||
</td>
|
||||
<td class="show-for-large-up" ng-click="copyToSend(addr)" ng-show="$root.wallet.isShared()">{{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}}</td>
|
||||
<td ng-click="copyToSend(addr)" class="show-for-large-up"><time>{{::info.createdTs | amCalendar}}</time></td>
|
||||
|
|
|
@ -4,14 +4,18 @@
|
|||
<div class="modal-mobile text-center" ng-init="addr = address.address">
|
||||
<qrcode size="220" data="{{addr}}"></qrcode>
|
||||
|
||||
<div class="m10t"
|
||||
<div class="m20t"
|
||||
ng-init="label = $root.wallet.addressBook[addr].label">
|
||||
<div class="size-12">
|
||||
{{addr}} <small class="label" ng-show="address.isChange">change</small>
|
||||
{{addr}}
|
||||
</div>
|
||||
<b class="db m5t" ng-show="label">
|
||||
<div class="m5t size-10 text-secondary" ng-show="address.isChange" translate>change</div>
|
||||
<div class="m10t" ng-show="label">
|
||||
({{label}})
|
||||
</b>
|
||||
</div>
|
||||
<div class="m5t" ng-show="address.balance && address.balance > 0">
|
||||
<b>{{address.balance}} {{$root.wallet.settings.unitName}}</b>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center m10t" ng-if="isCordova">
|
||||
<button class="primary expand" ng-click="copyAddress(addr)">
|
||||
|
|
|
@ -33,17 +33,14 @@
|
|||
<div ng-repeat="addr in addresses" ng-click="openAddressModal(addr)" class="pointer">
|
||||
<div class="panel">
|
||||
<div class="row">
|
||||
<div class="large-7 medium-7 small-9 columns">
|
||||
<contact class="ellipsis" address="{{::addr.address}}">
|
||||
<div class="large-3 medium-4 small-5 columns">
|
||||
<contact class="size-12 ellipsis" address="{{::addr.address}}"></contact>
|
||||
</div>
|
||||
<div class="large-1 medium-2 small-3 columns text-right">
|
||||
<small translate class="label" ng-show="::addr.isChange">change</small>
|
||||
<div class="large-1 medium-1 small-2 columns">
|
||||
<span translate class="text-secondary size-10" ng-show="::addr.isChange">change</span>
|
||||
</div>
|
||||
<div class="large-4 medium-3 small-12 columns text-right">
|
||||
<span ng-show="$root.updatingBalance">
|
||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||
</span>
|
||||
<span class="size-14" ng-show="!$root.updatingBalance">
|
||||
<div class="large-8 medium-7 small-5 columns text-right">
|
||||
<span class="size-12" ng-show="!$root.updatingBalance">
|
||||
<b>{{addr.balance || '0'}} {{$root.wallet.settings.unitName}}</b>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -39,23 +39,23 @@
|
|||
<input type="text" ng-model="insightTestnet" class="form-control" name="insightTestnet" valid-url required>
|
||||
</div>
|
||||
|
||||
<div translate class="small text-gray">
|
||||
<small translate class="text-gray">
|
||||
Insight API server is open-source software. You can run your own instances, check
|
||||
<a href
|
||||
ng-click="$root.openExternalLink('https://insight.is')">Insight API Homepage</a>
|
||||
</div>
|
||||
</small>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend translate>Storage</legend>
|
||||
<label for="insightTestnet">Read and Store Profiles:</label>
|
||||
<select class="form-control" ng-model="selectedStorage" ng-options="o.name for o in availableStorages" required>
|
||||
</select>
|
||||
<div translate class="small text-gray">
|
||||
<small translate class="text-gray">
|
||||
Wallets and profiles are stored encrypted using your password as a key. You can store the encrypted data locally, on this device, or remotely on the cloud (Insight Server).
|
||||
<a href
|
||||
ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/master/js/plugins')">
|
||||
More pluggins are welcomed!</a>
|
||||
</div>
|
||||
</small>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend translate>Language</legend>
|
||||
|
@ -66,9 +66,9 @@
|
|||
<legend translate>Log level</legend>
|
||||
<select class="form-control" ng-model="selectedLogLevel" ng-options="o.name for o in availableLogLevels" required>
|
||||
</select>
|
||||
<div translate class="small text-gray">
|
||||
<small translate class="text-gray">
|
||||
Log level shows information on the console. This is useful to find bugs and to help users. 'debug' is the most verbose level while 'fatal' only shows unexpected errors
|
||||
</div>
|
||||
</small>
|
||||
</fieldset>
|
||||
<button translate type="submit" class="button primary radius expand m0" ng-disabled="settingsForm.$invalid || loading" ng-click="save()">
|
||||
Save
|
||||
|
|
Loading…
Reference in New Issue