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

Merge pull request #6768 from gabrielbazan7/fix/windowsIcons

Browse source 
Windows Phone: icons fix
This commit is contained in:
Gustavo Maximiliano Cortez 2017-09-20 15:54:32 -04:00 • committed by GitHub
commit 132cb02d01
14 changed files with 25 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/tab-send.js
View file

@ -77,6 +77,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
name: v.name,
recipientType: 'wallet',
coin: v.coin,
network: v.network,
getAddress: function(cb) {
walletService.getAddress(v, false, cb);
},

8
www/views/cashScan.html
View file

@ -23,9 +23,7 @@
</div>
<div ng-repeat="wallet in wallets track by $index" class="item wallet supported">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div class="wallet-content">
<div>{{wallet.name || wallet.id}}</div>
<div class="balanced">{{wallet.bchBalance || ('Checking...' | translate)}} </div>
@ -45,9 +43,7 @@
</div>
<div ng-repeat="wallet in nonBIP44Wallets track by $index" class="item item-sub item-icon-left item-big-icon-left item-button-right wallet">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': walletDisabled}" class="bg wallet"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<span class="text-disabled">{{wallet.name || wallet.id}}</span>
</div>

4
www/views/confirm.html
View file

@ -64,9 +64,7 @@
<a class="item item-icon-right" ng-hide="!wallet" ng-click="showWalletSelector()">
<span class="label" translate>From</span>
<div class="wallet" ng-if="wallet">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div>{{wallet.name}}</div>
</div>
<div class="wallet" ng-if="!wallet">

4
www/views/customAmount.html
View file

@ -38,9 +38,7 @@
</div>
<div class="item single-line">
<div class="wallet">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg">
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
{{wallet.name}}
</div>
<div class="label" translate>Receive in</div>

3
www/views/includes/walletIcon.html Normal file
View file

@ -0,0 +1,3 @@
<img ng-if="wallet.network == 'testnet'" src="img/icon-wallet-testnet.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
<img ng-if="wallet.network != 'testnet' && wallet.coin == 'btc'" src="img/icon-btc.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
<img ng-if="wallet.network != 'testnet' && wallet.coin != 'btc'" src="img/icon-bch.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>

5
www/views/includes/walletItem.html
View file

@ -1,7 +1,5 @@
<div class="wallet-item">
<i class="icon big-icon-svg circle">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
</i>
<i class="icon big-icon-svg circle" ng-include="'views/includes/walletIcon.html'"></i>
<div class="name">
{{wallet.name || wallet.id}}
<span class="size-12 text-light" ng-show="wallet.n > 1">
@ -12,4 +10,3 @@
</span>
</div>
</div>

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

@ -2,31 +2,29 @@
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<div class="header">{{title}}</div>
<a
ng-repeat="w in wallets track by $index"
ng-repeat="wallet in wallets track by $index"
class="item item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="selectWallet(w)"
ng-click="selectWallet(wallet)"
>
<i class="icon big-icon-svg">
<img ng-src="img/{{w.network == 'testnet' ? 'icon-wallet-testnet' : (w.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !w.color}" ng-style="{'background-color': w.color}" class="bg">
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div class="wallet-inner">
<div class="wallet-details">
<div class="wallet-name">
{{w.name}}
{{wallet.name}}
</div>
<p class="wallet-balance">
<span ng-if="!w.isComplete()" class="assertive" translate>
<span ng-if="!wallet.isComplete()" class="assertive" translate>
Incomplete
</span>
<span ng-if="w.isComplete()">
<span ng-if="!w.balanceHidden">{{w.status.availableBalanceStr}}</span>
<span ng-if="w.balanceHidden" translate>[Balance Hidden]</span>
<span ng-if="wallet.isComplete()">
<span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
<span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
</span>
</span>
&nbsp;
</p>
</div>
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === w">
<img class="check" src="img/icon-check-selected.svg" ng-show="selectedWallet === wallet">
</div>
</a>
</action-sheet>

4
www/views/modals/txp-details.html
View file

@ -73,9 +73,7 @@
<div class="item">
<span class="label" translate>From</span>
<div class="wallet">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div>{{wallet.name}}</div>
</div>
</div>

4
www/views/paperWallet.html
View file

@ -23,9 +23,7 @@
</div>
<div class="list card" ng-click="showWalletSelector()" ng-if="wallets[0]">
<a ng-if="wallet" class="item item-sub item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<span>
{{wallet.name || wallet.id}}
</span>

4
www/views/tab-home.html
View file

@ -80,9 +80,7 @@
<a ng-repeat="wallet in wallets track by $index"
class="item item-sub item-icon-left item-big-icon-left item-icon-right wallet"
ng-click="openWallet(wallet)">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<span>
{{wallet.name || wallet.id}}
</span>

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

@ -62,9 +62,7 @@
<div class="wallet-selector" ng-click="showWalletSelector()" ng-if="wallets[0] && wallet">
<a ng-if="wallet" class="item item-sub item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg wallet"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<span>
{{wallet.name || wallet.id}}
</span>

4
www/views/tab-send.html
View file

@ -68,9 +68,7 @@
</div>
<div class="list">
<a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.recipientType == 'wallet'" ng-click="goToAmount(item)">
<i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'">
<img ng-src="img/{{item.network == 'testnet' ? 'icon-wallet-testnet' : (item.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !item.color}" ng-style="{'background-color': item.color}" class="bg"/>
</i>
<i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'" ng-init="wallet = item" ng-include="'views/includes/walletIcon.html'"></i>
{{item.name}}
<i class="icon bp-arrow-right"></i>
</a>

4
www/views/tab-settings.html
View file

@ -109,9 +109,7 @@
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': item.id})"
ng-repeat="item in wallets track by $index">
<i class="icon big-icon-svg circle">
<img ng-src="img/{{item.network == 'testnet' ? 'icon-wallet-testnet' : (item.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !item.color}" ng-style="{'background-color': item.color}" class="bg"/>
</i>
<i class="icon big-icon-svg circle" ng-init="wallet = item" ng-include="'views/includes/walletIcon.html'"></i>
<span>
{{item.name || item.id}}
<span class="size-12 text-light" ng-show="item.n > 1">

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

@ -52,9 +52,7 @@
<span class="label" ng-if="btx.action === 'sent'" translate>From</span>
<span class="label" ng-if="btx.action !== 'sent'" translate>To</span>
<div class="wallet">
<i class="icon big-icon-svg">
<img ng-src="img/{{wallet.network == 'testnet' ? 'icon-wallet-testnet' : (wallet.coin == 'btc' ? 'icon-btc' : 'icon-bch')}}.svg" ng-class="{'wallet-background-color-default': !wallet.color}" ng-style="{'background-color': wallet.color}" class="bg"/>
</i>
<i class="icon big-icon-svg" ng-include="'views/includes/walletIcon.html'"></i>
<div>{{wallet.name}}</div>
</div>
</div>