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

Merge pull request #6697 from cmgustavo/ref/wallet-details-03

Browse source 
Adds recreate/retry buttons
This commit is contained in:
Javier Donadío 2017-09-04 11:54:55 -03:00 • committed by GitHub
commit 244da69e46
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sass/views/walletDetails.scss
View file

@ -223,7 +223,6 @@
} }
&__error { &__error {
cursor: pointer;
font-size: 14px; font-size: 14px;
padding: 35px 20px; padding: 35px 20px;
} }
@ -268,6 +267,17 @@
font-size: 20px; font-size: 20px;
color: #fff; color: #fff;
width:95%; width:95%;
.actions{
float: right;
a {
color: white;
font-size: 14px;
cursor: pointer;
padding: 5px;
line-height: 16px;
}
}
} }
.wallet-not-backed-up-warning { .wallet-not-backed-up-warning {

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

@ -1,4 +1,8 @@
<div class="actions" ng-show="(walletNotRegistered || updateStatusError) && !(updatingStatus || updatingTxHistory)">
<a ng-show="walletNotRegistered" ng-click="recreate()" translate>Tap to recreate</a>
<a ng-show="updateStatusError" ng-click="updateAll(true)" translate>Tap to retry</a>
</div>
<ion-spinner class="spinner-dark recent right" icon="crescent" ng-show="(updatingStatus || updatingTxHistory) && <ion-spinner class="spinner-dark recent right" icon="crescent" ng-show="(updatingStatus || updatingTxHistory) &&
!walletNotRegistered && !updateStatusError && !updateTxHistoryError"></ion-spinner> !walletNotRegistered && !updateStatusError && !updateTxHistoryError"></ion-spinner>

4
www/views/walletDetails.html
View file

@ -21,11 +21,11 @@
ng-class="{collapsible: amountIsCollapsible, 'wallet-background-color-default': !wallet.color, 'no-alternative': wallet.network != 'livenet'}" ng-class="{collapsible: amountIsCollapsible, 'wallet-background-color-default': !wallet.color, 'no-alternative': wallet.network != 'livenet'}"
> >
<div class="amount__error" ng-style="{opacity: altAmountOpacity}" ng-show="updateStatusError" ng-click="updateAll(true)"> <div class="amount__error" ng-style="{opacity: altAmountOpacity}" ng-show="updateStatusError">
<span>{{updateStatusError}}</span> <span>{{updateStatusError}}</span>
</div> </div>
<div class="amount__error" ng-style="{opacity: altAmountOpacity}" ng-show="walletNotRegistered" ng-click="recreate()"> <div class="amount__error" ng-style="{opacity: altAmountOpacity}" ng-show="walletNotRegistered">
<span translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span> <span translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
</div> </div>