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

Make the "to"-address field work in new style + BTC transactions fix

Browse source
This commit is contained in:
Sebastiaan Pasma 2018-08-03 13:13:29 +02:00
commit cebe9507f1
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/review.controller.js
View file

@ -531,7 +531,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
if (tx.coin === 'bch') { if (tx.coin === 'bch') {
tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr; tx.displayAddress = bitcoinCashJsService.readAddress(tx.toAddress).cashaddr;
} else { } else {
tx.displayAddress = entry.address; tx.displayAddress = tx.toAddress;
} }
addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact addressbookService.get(tx.coin+tx.toAddress, function(err, addr) { // Check if the recipient is a contact

2
src/js/services/incomingData.js
View file

@ -386,7 +386,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
'notify': $state.current.name == 'tabs.send' ? false : true 'notify': $state.current.name == 'tabs.send' ? false : true
}); });
$timeout(function() { $timeout(function() {
$state.transitionTo('tabs.send.amount', { $state.transitionTo('tabs.send.origin', {
toAddress: toAddress, toAddress: toAddress,
coin: coin, coin: coin,
noPrefix: 1 noPrefix: 1

4
www/views/review.html
View file

@ -48,7 +48,9 @@
<p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p> <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
</div> </div>
<div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address'"> <div class="item-content item-content-compact" ng-init="addressExpanded = false" ng-if="vm.destination.kind === 'address'">
<div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded"><span class="prefix">qz9cq</span><span class="mid">q5pryv9hnqwa8q8mccmynk9uf4vlu5nxer</span><span class="suffix">pzmc</span></div> <div class="address-frame" ng-class="{ 'expanded': addressExpanded }" ng-click="addressExpanded = !addressExpanded">
<span class="prefix">{{vm.destination.address.substring(0,5)}}</span><span class="mid">{{vm.destination.address.substring(5,vm.destination.address.length-4)}}</span><span class="suffix">{{vm.destination.address.substring(vm.destination.address.length-4)}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>