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

better wallet info, fix bug on export for r-o wallets

This commit is contained in:
Matias Alejo Garcia 2015-11-07 11:06:12 -03:00
parent ea0e55b3b8
commit 3346d0bb53
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/views/export.html
View File

@ -45,7 +45,7 @@
</form>
<h4></h4>
<ul class="no-bullet m0" ng-hide="index.isPrivKeyExternal">
<ul class="no-bullet m0" ng-show="index.canSign">
<li>
<switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
<span translate>Do not include private key</span>
@ -53,7 +53,7 @@
</ul>
<div class="box-notification" ng-show="index.isPrivKeyExternal">
<div class="box-notification" ng-show="!index.canSign">
<span class="text-warning size-14">
<i class="fi-alert"></i>
<span translate>

18
public/views/includes/walletInfo.html
View File

@ -1,9 +1,9 @@
<span ng-show="index.network != 'livenet'"> Testnet </span>
<img ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/">
<div ng-show="index.isPrivKeyExternal" style="text-transform: capitalize">
<span translate>External Private Key:</span>
{{index.externalSource}}
<span>(<span translate>Account</span>:
#{{index.account || 0}})
</span>
</div>
<span ng-show="index.isShared"><span translate>{{index.m}}-of-{{index.n}}</span></span>
<img style="height:1em" ng-show="index.isShared" src="img/icon-users.svg">
<img style="height:1em" ng-show="index.network != 'livenet'" src="img/icon-testnet.svg">
<img style="height:1em" ng-show="!index.canSign && !index.isPrivKeyExternal" src="img/icon-view.svg">
<img style="height:1em" ng-show="index.isPrivKeyEncrypted" src="img/icon-lock.svg">
<img style="height:1em" ng-show="index.externalSource == 'trezor'" src="img/icon-trezor.svg">
<span style="height:1em" ng-show="index.account"><span translate>Account</span>: #{{index.account || 0}} </span>

8
public/views/preferences.html
View File

@ -62,12 +62,12 @@
<div translate>Advanced</div>
</li>
</ul>
<div ng-show="!index.noFocusedWallet && (!index.isPrivKeyExternal || preferences.touchidAvailable)">
<h4 translate>
<div ng-show="!index.noFocusedWallet && index.canSign">
<h4 translate ng-show="index.canSign">
Spending Restrictions
</h4>
<ul class="no-bullet m0 ">
<li ng-show="!index.isPrivKeyExternal">
<ul class="no-bullet m0">
<li>
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
<div translate>Request Password</div>
</li>

2
public/views/walletHome.html
View File

@ -123,8 +123,6 @@
{{(index.alias || index.walletName)}}
</p>
<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>
</div>
</div>

2
src/js/controllers/index.js
View File

@ -108,6 +108,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.isComplete = fc.isComplete();
self.canSign = fc.canSign();
self.isPrivKeyExternal = fc.isPrivKeyExternal();
self.isPrivKeyEncrypted = fc.isPrivKeyEncrypted();
self.externalSource = fc.getPrivKeyExternalSourceName();
self.account = fc.credentials.account;
@ -781,7 +782,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.getConfirmedTxs(function(err, txsFromLocal) {
if (err) return cb(err);
var endingTxid = txsFromLocal[0] ? txsFromLocal[0].txid : null;
console.log('[index.js.791:endingTxid:]', endingTxid); //TODO
function getNewTxs(newTxs, skip, i_cb) {