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

Displaying fiat amounts in wallet selector in Receive tab.

Browse source
This commit is contained in:
Brendon Duncan 2018-05-24 14:36:51 -07:00
commit 05a8952f87
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/directives/walletSelector.js
View file

@ -2,6 +2,9 @@
angular.module('copayApp.directives') angular.module('copayApp.directives')
.directive('walletSelector', function($rootScope, $timeout, configService) { .directive('walletSelector', function($rootScope, $timeout, configService) {
console.log("walletSelector");
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'views/includes/walletSelector.html', templateUrl: 'views/includes/walletSelector.html',
@ -11,7 +14,8 @@ angular.module('copayApp.directives')
show: '=walletSelectorShow', show: '=walletSelectorShow',
wallets: '=walletSelectorWallets', wallets: '=walletSelectorWallets',
selectedWallet: '=walletSelectorSelectedWallet', selectedWallet: '=walletSelectorSelectedWallet',
onSelect: '=walletSelectorOnSelect' onSelect: '=walletSelectorOnSelect',
displayBalanceAsFiat : '=walletSelectorDisplayBalanceAsFiat'
}, },
link: function(scope, element, attrs) { link: function(scope, element, attrs) {
scope.hide = function() { scope.hide = function() {

9
www/views/includes/walletSelector.html
View file

@ -2,7 +2,8 @@
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()"> <img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<span ng-repeat="wallet in wallets track by $index" <span ng-repeat="wallet in wallets track by $index"
ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)"></span> ng-init="wallet.coin == 'btc' ? walletsBtc.push(wallet) : walletsBch.push(wallet)">
</span>
<div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div> <div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
@ -26,7 +27,8 @@
Incomplete Incomplete
</span> </span>
<span ng-if="wallet.isComplete()"> <span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span> <span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
<span ng-if="(!displayBalanceAsFiat) && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span> <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span> </span>
</span> </span>
@ -57,7 +59,8 @@
Incomplete Incomplete
</span> </span>
<span ng-if="wallet.isComplete()"> <span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span> <span ng-if="displayBalanceAsFiat && !wallet.balanceHidden">{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}}</span>
<span ng-if="(!displayBalanceAsFiat) && !wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span> <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span> </span>
</span> </span>

3
www/views/tab-receive.html
View file

@ -114,6 +114,7 @@
wallet-selector-wallets="wallets" wallet-selector-wallets="wallets"
wallet-selector-selected-wallet="wallet" wallet-selector-selected-wallet="wallet"
wallet-selector-show="showWallets" wallet-selector-show="showWallets"
wallet-selector-on-select="onWalletSelect"> wallet-selector-on-select="onWalletSelect"
wallet-selector-display-balance-as-fiat="displayBalanceAsFiat">
</wallet-selector> </wallet-selector>
</ion-view> </ion-view>