mirror of https://github.com/BTCPrivate/copay.git
better wallet info, fix bug on export for r-o wallets
This commit is contained in:
parent
ea0e55b3b8
commit
3346d0bb53
|
@ -45,7 +45,7 @@
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<h4></h4>
|
<h4></h4>
|
||||||
<ul class="no-bullet m0" ng-hide="index.isPrivKeyExternal">
|
<ul class="no-bullet m0" ng-show="index.canSign">
|
||||||
<li>
|
<li>
|
||||||
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
|
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
|
||||||
<span translate>Do not include private key</span>
|
<span translate>Do not include private key</span>
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
<div class="box-notification" ng-show="index.isPrivKeyExternal">
|
<div class="box-notification" ng-show="!index.canSign">
|
||||||
<span class="text-warning size-14">
|
<span class="text-warning size-14">
|
||||||
<i class="fi-alert"></i>
|
<i class="fi-alert"></i>
|
||||||
<span translate>
|
<span translate>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<span ng-show="index.network != 'livenet'"> Testnet </span>
|
|
||||||
<img ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/">
|
<span ng-show="index.isShared"><span translate>{{index.m}}-of-{{index.n}}</span></span>
|
||||||
<div ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
|
<img style="height:1em" ng-show="index.isShared" src="img/icon-users.svg">
|
||||||
<span translate>External Private Key:</span>
|
<img style="height:1em" ng-show="index.network != 'livenet'" src="img/icon-testnet.svg">
|
||||||
{{index.externalSource}}
|
<img style="height:1em" ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-view.svg">
|
||||||
<span>(<span translate>Account</span>:
|
<img style="height:1em" ng-show="index.isPrivKeyEncrypted" src="img/icon-lock.svg">
|
||||||
#{{index.account || 0}})
|
|
||||||
</span>
|
<img style="height:1em" ng-show="index.externalSource == 'trezor'" src="img/icon-trezor.svg">
|
||||||
</div>
|
<span style="height:1em" ng-show="index.account"><span translate>Account</span>: #{{index.account || 0}} </span>
|
||||||
|
|
|
@ -62,12 +62,12 @@
|
||||||
<div translate>Advanced</div>
|
<div translate>Advanced</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div ng-show="!index.noFocusedWallet && (!index.isPrivKeyExternal || preferences.touchidAvailable)">
|
<div ng-show="!index.noFocusedWallet && index.canSign">
|
||||||
<h4 translate>
|
<h4 translate ng-show="index.canSign">
|
||||||
Spending Restrictions
|
Spending Restrictions
|
||||||
</h4>
|
</h4>
|
||||||
<ul class="no-bullet m0 ">
|
<ul class="no-bullet m0">
|
||||||
<li ng-show="!index.isPrivKeyExternal">
|
<li>
|
||||||
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
|
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
|
||||||
<div translate>Request Password</div>
|
<div translate>Request Password</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -123,8 +123,6 @@
|
||||||
{{(index.alias || index.walletName)}}
|
{{(index.alias || index.walletName)}}
|
||||||
</p>
|
</p>
|
||||||
<div class="size-12 text-gray">
|
<div class="size-12 text-gray">
|
||||||
<span translate>Multisignature wallet</span>
|
|
||||||
(<span translate>{{index.m}}-of-{{index.n}}</span>)
|
|
||||||
<span ng-include="'views/includes/walletInfo.html'"></span>
|
<span ng-include="'views/includes/walletInfo.html'"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -108,6 +108,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.isComplete = fc.isComplete();
|
self.isComplete = fc.isComplete();
|
||||||
self.canSign = fc.canSign();
|
self.canSign = fc.canSign();
|
||||||
self.isPrivKeyExternal = fc.isPrivKeyExternal();
|
self.isPrivKeyExternal = fc.isPrivKeyExternal();
|
||||||
|
self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
|
||||||
self.externalSource = fc.getPrivKeyExternalSourceName();
|
self.externalSource = fc.getPrivKeyExternalSourceName();
|
||||||
self.account = fc.credentials.account;
|
self.account = fc.credentials.account;
|
||||||
|
|
||||||
|
@ -781,7 +782,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
|
||||||
self.getConfirmedTxs(function(err, txsFromLocal) {
|
self.getConfirmedTxs(function(err, txsFromLocal) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
var endingTxid = txsFromLocal[0] ? txsFromLocal[0].txid : null;
|
var endingTxid = txsFromLocal[0] ? txsFromLocal[0].txid : null;
|
||||||
console.log('[index.js.791:endingTxid:]', endingTxid); //TODO
|
|
||||||
|
|
||||||
function getNewTxs(newTxs, skip, i_cb) {
|
function getNewTxs(newTxs, skip, i_cb) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue