Merge pull request #3259 from javierbitpay/fix/xpub

adding owner copayer base path on the public key list
This commit is contained in:
Matias Alejo Garcia 2015-09-29 15:19:13 -03:00
commit 9e352891bb
2 changed files with 6 additions and 2 deletions

View File

@ -56,9 +56,11 @@
<li class="line-b p10" ng-repeat="pk in pubKeys">
<div class="row">
<div class="small-3 columns">Copayer {{$index}}</div>
<div class="small-9 columns oh enable_text_select text-gray" style="text-overflow:ellipsis">
{{pk}}
<span class="right size-12" ng-if="$index == 0">
({{basePath}})
</span>
</div>
</div>
</li>

View File

@ -5,13 +5,15 @@ angular.module('copayApp.controllers').controller('preferencesInformation',
var fc = profileService.focusedClient;
var c = fc.credentials;
var base = 'xpub'
var base = 'xpub';
var basePath = profileService.getUtils().PATHS.BASE_ADDRESS_DERIVATION[c.derivationStrategy][c.network];
$scope.walletName = c.walletName;
$scope.walletId = c.walletId;
$scope.network = c.network;
$scope.addressType = c.addressType || 'P2SH';
$scope.derivationStrategy = c.derivationStrategy || 'BIP45';
$scope.basePath = basePath;
$scope.M = c.m;
$scope.N = c.n;
$scope.pubKeys = lodash.pluck(c.publicKeyRing, 'xPubKey');