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

have address type toggle on send and receive for bch

Browse source
This commit is contained in:
Kadir Sekha 2018-01-31 12:23:44 -04:00
commit c239aa5714
3 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/controllers/tx-details.js
View file

@ -117,6 +117,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
}
$scope.btx = txFormatService.processTx($scope.wallet.coin, tx);
$scope.addressDisplayType = 'legacy';
var cashaddrDate = new Date(2018, 0, 15);
var txDate = new Date(($scope.btx.createdOn || $scope.btx.time) * 1000);
@ -132,6 +133,9 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
o.cashAddr = bchAddresses.cashaddr;
});
}
$scope.canToggleAddressType = true;
$scope.addressDisplayType = 'cashAddr';
}
$scope.btx.displayAddress = $scope.btx.addressTo;
@ -245,4 +249,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
}
};
$scope.displayAddress = function(type) {
$scope.addressDisplayType = type;
}
});

7
src/sass/views/includes/txp-details.scss
View file

@ -283,4 +283,11 @@
font-size: 12px;
color: $v-mid-gray;
}
.button-address {
margin-top: 10px;
background: transparent;
border: none;
font-size: 12px;
color: $v-text-accent-color;
}
}

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

@ -39,7 +39,7 @@
<div class="info">
<div class="item" ng-if="btx.action === 'sent'">
<span class="label" translate>To</span>
<span ng-if="btx.cashAddr" class="payment-proposal-to">
<span ng-if="addressDisplayType === 'cashAddr'" class="payment-proposal-to">
<img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<div copy-to-clipboard="btx.cashCopyAddr" class="ellipsis">
@ -47,7 +47,7 @@
<span class="m15l size-14" ng-if="toName">{{toName}}</span>
</div>
</span>
<span class="payment-proposal-to">
<span ng-if="addressDisplayType === 'legacy'" class="payment-proposal-to">
<img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<div copy-to-clipboard="btx.copyAddress" class="ellipsis">
@ -55,6 +55,12 @@
<span class="m15l size-14" ng-if="toName">{{toName}}</span>
</div>
</span>
<button class="address-info button-address" ng-if="canToggleAddressType && addressDisplayType === 'cashAddr'" ng-click="displayAddress('legacy')">
<span translate>Display legacy address</span>
</button>
<button class="address-info button-address" ng-if="canToggleAddressType && addressDisplayType === 'legacy'" ng-click="displayAddress('cashAddr')">
<span translate>Display new style address</span>
</button>
</div>
<div class="item">
@ -65,20 +71,26 @@
<div>{{wallet.name}}</div>
</div>
<div ng-if="btx.action === 'received' || btx.action === 'moved'">
<span ng-repeat="o in btx.outputs" ng-if="o.cashAddr" class="payment-proposal-to">
<span ng-repeat="o in btx.outputs" ng-if="addressDisplayType === 'cashAddr'" class="payment-proposal-to">
<img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<div copy-to-clipboard="'bitcoincash:' + o.cashAddr" class="ellipsis">
<contact address="{{o.cashAddr}}" class="ellipsis" style="display: block;"></contact>
</div>
</span>
<span ng-repeat="o in btx.outputs" class="payment-proposal-to">
<span ng-repeat="o in btx.outputs" ng-if="addressDisplayType === 'legacy'" class="payment-proposal-to">
<img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<div copy-to-clipboard="o.address" class="ellipsis">
<contact address="{{o.address}}" class="ellipsis" style="display: block;"></contact>
</div>
</span>
<button class="address-info button-address" ng-if="canToggleAddressType && addressDisplayType === 'cashAddr'" ng-click="displayAddress('legacy')">
<span translate>Display legacy address</span>
</button>
<button class="address-info button-address" ng-if="canToggleAddressType && addressDisplayType === 'legacy'" ng-click="displayAddress('cashAddr')">
<span translate>Display new style address</span>
</button>
</div>
</div>
<div class="item single-line" ng-if="btx.action != 'received' && isShared">