Merge sprint 19.
# Conflicts: # src/js/controllers/tab-home.js
This commit is contained in:
commit
0bb4de9bd1
49 changed files with 4115 additions and 3815 deletions
|
|
@ -71,7 +71,6 @@
|
|||
<div class="list card">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<div translate>Bitcoin Core (BTC)</div>
|
||||
<div translate class="subtitle">Slow transactions with high fees</div>
|
||||
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||
</div>
|
||||
<div>
|
||||
|
|
@ -90,9 +89,11 @@
|
|||
<div class="ng-hide list card" ng-show="showServices && (walletsBch[0] || walletsBtc[0])" ng-include="'views/includes/services.html'"></div>
|
||||
|
||||
<div class="list card card-banner">
|
||||
<a ng-click="openStore()">
|
||||
<img class="card-banner__img" src="img/banner-store.png"/>
|
||||
<ion-spinner ng-if="bannerIsLoading"></ion-spinner>
|
||||
<a ng-if="!bannerIsLoading" ng-click="openBannerUrl()">
|
||||
<img class="card-banner__img" ng-src="{{bannerImageUrl}}"/>
|
||||
</a>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="ng-hide list card" ng-show="nextStepsItems.length>0 && !isWindowsPhoneApp" ng-include="'views/includes/community.html'"></div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue