new address and copay address working in receive / send / scan
This commit is contained in:
parent
14fecbf1ac
commit
205f70dd8c
7 changed files with 63 additions and 13 deletions
|
|
@ -25,7 +25,7 @@
|
|||
<img src="img/contact-placeholder.svg" class="bg"/>
|
||||
</i>
|
||||
</span>
|
||||
<span class="m10l">{{toName || toAddress}}</span>
|
||||
<span class="m10l">{{toName || displayAddress || toAddress}}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
<span class="payment-proposal-to" ng-if="!recipientType">
|
||||
<i class="icon icon-svg abs-v-center icon-bitcoinlogoplain"></i>
|
||||
|
||||
<div copy-to-clipboard="tx.toAddress" ng-if="!tx.paypro" class="ellipsis">
|
||||
<contact ng-if="tx.toAddress && !tx.toName" address="{{tx.toAddress}}"></contact>
|
||||
<div copy-to-clipboard="tx.displayAddress" ng-if="!tx.paypro" class="ellipsis">
|
||||
<contact ng-if="tx.displayAddress && !tx.toName" address="{{tx.displayAddress}}"></contact>
|
||||
<span class="m15l size-14" ng-if="tx.toName">{{tx.toName}}</span>
|
||||
</div>
|
||||
|
||||
|
|
@ -50,15 +50,15 @@
|
|||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-class="{'wallet-background-color-default': !toColor}" ng-style="{'background-color': toColor}" class="bg"/>
|
||||
</i>
|
||||
<div copy-to-clipboard="tx.toAddress" class="ellipsis">
|
||||
<contact ng-if="tx.toAddress && !tx.toName" address="{{tx.toAddress}}"></contact>
|
||||
<div copy-to-clipboard="tx.displayAddress" class="ellipsis">
|
||||
<contact ng-if="tx.displayAddress && !tx.toName" address="{{tx.displayAddress}}"></contact>
|
||||
<span ng-if="tx.toName" class="wallet-name">{{tx.toName}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="recipientType == 'contact' && !isChromeApp" class="gravatar-contact toggle" ng-click="toggleAddress()">
|
||||
<gravatar class="send-gravatar" name="{{tx.toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
|
||||
<span ng-if="tx.toName && !showAddress">{{tx.toName}}</span>
|
||||
<span ng-if="tx.toName && showAddress">{{tx.toAddress}}</span>
|
||||
<span ng-if="tx.toName && showAddress">{{tx.displayAddress}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue