anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #69 from Bitcoin-com/fixmemofield

Browse source 
BW-235 & BW-236
This commit is contained in:
Sam Cheng Hung 2018-03-23 09:01:51 +09:00 • committed by GitHub
commit 31b7ad02fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 498 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

1
www/views/includes/walletHistory.html
View file

@ -57,6 +57,7 @@
<span ng-if="btx.action == 'sent' || btx.action == 'moved'">
{{addressbook[btx.addressTo].name || addressbook[btx.addressTo] || 'Sending'|translate}}
</span>
<div ng-if="btx.note.body" class="wallet-details__tx-message ellipsis">{{btx.note.body}}</div>
<span ng-if="btx.action == 'received'" translate>Receiving</span>
</div>
</div>

4
www/views/tx-details.html
View file

@ -106,9 +106,9 @@
</span>
</div>
<div class="item single-line">
<span class="label" translate>
<span class="label flex" translate>
Memo: &emsp;
<input style="display:inline-block;" class="label" type="text" placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" ng-model="btx.note.body" ng-blur="updateNote(btx.note.body)"/>
<textarea elastic placeholder="{{btx.note.body || btx.message || 'Enter text here'}}" ng-model="btx.note.body" ng-blur="updateNote(btx.note.body)"></textarea>
</span>
</div>
<div class="item" ng-if="btx.action != 'received'">