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

Merge pull request #6533 from JDonadio/ref/testnet-logo

Browse source 
Remove testnet fiat amount - fix apply in update wallet function
This commit is contained in:
Gustavo Maximiliano Cortez 2017-08-09 10:17:07 -03:00 • committed by GitHub
commit a5fe5da1cc
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/walletDetails.js
View file

@ -184,7 +184,9 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
}
$scope.completeTxHistory = txHistory;
$scope.showHistory();
$scope.$apply();
$timeout(function() {
$scope.$apply();
});
return cb();
});
});

13
www/img/icon-text-testnet-white.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="57px" height="16px" viewBox="0 0 57 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>Group 2 Copy</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group-2-Copy">
<rect id="Rectangle" stroke="#FBFBFB" x="0.5" y="0.5" width="56" height="15" rx="2"></rect>
<path d="M9.75390625,4.55761719 L7.41601562,4.55761719 L7.41601562,13 L5.48144531,13 L5.48144531,4.55761719 L3.20507812,4.55761719 L3.20507812,3.046875 L9.75390625,3.046875 L9.75390625,4.55761719 Z M15.6669922,8.60449219 L12.625,8.60449219 L12.625,11.4960938 L16.2685547,11.4960938 L16.2685547,13 L10.6972656,13 L10.6972656,3.046875 L16.2548828,3.046875 L16.2548828,4.55761719 L12.625,4.55761719 L12.625,7.10058594 L15.6669922,7.10058594 L15.6669922,8.60449219 Z M21.8808594,10.4160156 C21.8808594,10.0195293 21.7794606,9.7062186 21.5766602,9.47607422 C21.3738597,9.24592984 21.0104193,9.02148547 20.4863281,8.80273438 C19.4654897,8.44270653 18.6975937,8.03483301 18.1826172,7.57910156 C17.6676407,7.12337012 17.4101562,6.48535566 17.4101562,5.66503906 C17.4101562,4.84927978 17.7040986,4.18506116 18.2919922,3.67236328 C18.8798858,3.15966541 19.6295527,2.90332031 20.5410156,2.90332031 C21.5071663,2.90332031 22.2841767,3.17675508 22.8720703,3.72363281 C23.4599639,4.27051055 23.7447918,5.00422717 23.7265625,5.92480469 L23.7128906,5.96582031 L21.8398438,5.96582031 C21.8398438,5.45084378 21.7247733,5.06005993 21.4946289,4.79345703 C21.2644845,4.52685414 20.9352235,4.39355469 20.5068359,4.39355469 C20.1376935,4.39355469 19.850587,4.51546102 19.6455078,4.75927734 C19.4404287,5.00309367 19.3378906,5.30728984 19.3378906,5.671875 C19.3378906,6.00911627 19.4541004,6.28710828 19.6865234,6.50585938 C19.9189465,6.72461047 20.3177055,6.96386589 20.8828125,7.22363281 C21.8444058,7.54264482 22.5724259,7.9459611 23.0668945,8.43359375 C23.5613631,8.9212264 23.8085938,9.57746983 23.8085938,10.4023438 C23.8085938,11.2545616 23.5192086,11.9244767 22.9404297,12.4121094 C22.3616508,12.899742 21.5937548,13.1435547 20.6367188,13.1435547 C19.6933547,13.1435547 18.8867221,12.8803737 18.2167969,12.3540039 C17.5468717,11.8276341 17.2233072,11.0266981 17.2460938,9.95117188 L17.2597656,9.91015625 L19.1396484,9.91015625 C19.1396484,10.5345083 19.266112,10.9833971 19.519043,11.2568359 C19.7719739,11.5302748 20.1445288,11.6669922 20.6367188,11.6669922 C21.0514344,11.6669922 21.3624664,11.553061 21.5698242,11.3251953 C21.777182,11.0973296 21.8808594,10.7942727 21.8808594,10.4160156 Z M31.0478516,4.55761719 L28.7099609,4.55761719 L28.7099609,13 L26.7753906,13 L26.7753906,4.55761719 L24.4990234,4.55761719 L24.4990234,3.046875 L31.0478516,3.046875 L31.0478516,4.55761719 Z M39.0458984,13 L37.1181641,13 L33.9599609,6.64941406 L33.9189453,6.65625 L33.9189453,13 L31.9912109,13 L31.9912109,3.046875 L33.9189453,3.046875 L37.0771484,9.40429688 L37.1181641,9.39746094 L37.1181641,3.046875 L39.0458984,3.046875 L39.0458984,13 Z M45.546875,8.60449219 L42.5048828,8.60449219 L42.5048828,11.4960938 L46.1484375,11.4960938 L46.1484375,13 L40.5771484,13 L40.5771484,3.046875 L46.1347656,3.046875 L46.1347656,4.55761719 L42.5048828,4.55761719 L42.5048828,7.10058594 L45.546875,7.10058594 L45.546875,8.60449219 Z M53.3603516,4.55761719 L51.0224609,4.55761719 L51.0224609,13 L49.0878906,13 L49.0878906,4.55761719 L46.8115234,4.55761719 L46.8115234,3.046875 L53.3603516,3.046875 L53.3603516,4.55761719 Z" id="TESTNET" fill="#FFFFFF"></path>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

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

@ -4,6 +4,7 @@
<div>
<span ng-show="wallet.status.wallet.singleAddress" class="size-12"><span translate>Auditable</span></span>
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.network != 'livenet'" src="img/icon-testnet-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.network != 'livenet'" src="img/icon-text-testnet-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" src="img/icon-read-only-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.getPrivKeyExternalSourceName() == 'trezor'" src="img/icon-trezor-white.svg">

7
www/views/walletDetails.html
View file

@ -45,9 +45,8 @@
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div
class="size-14 amount-alternative"
ng-if="status.totalBalanceAlternative"
ng-style="{opacity: altAmountOpacity}"
>
ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'"
ng-style="{opacity: altAmountOpacity}">
{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}
</div>
</div>
@ -119,7 +118,7 @@
<div ng-click='updateAll(true)' ng-show="!updateStatusError && !wallet.balanceHidden" on-hold="hideToggle()" ng-style="{'transform': amountScale}">
<strong class="size-36">{{status.totalBalanceStr}}</strong>
<div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
<div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative && wallet.network == 'livenet'">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
</div>
<div ng-if="!wallet.balanceHidden && showBalanceButton" ng-style="{'opacity': altAmountOpacity, 'transform': amountScale}">