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

Merge pull request #4433 from cmgustavo/bug/spinner-glidera-coinbase-modals-02

Browse source 
Fix: modal choose wallet. Sell in Coinbase and Glidera. Spinner
This commit is contained in:
Matias Alejo Garcia 2016-06-17 09:26:17 -03:00 • committed by GitHub
commit ff74376bc5
11 changed files with 93 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/views/modals/coinbase-tx-details.html
View file

@ -85,14 +85,13 @@
</li>
</ul>
<div class="row m20t p20t line-t" ng-show="tx.status == 'error'">
<div class="row m20t" ng-show="tx.status == 'error'">
<div class="columns">
<p class="text-center size-12 text-gray">
This action will remove the transaction.
</p>
<button class="button outline round dark-gray expand tiny"
ng-click="remove();"
ng-disabled="loading">
ng-click="remove()">
<i class="fi-x"></i>
Remove
</button>

17
public/views/modals/wallets.html
View file

@ -11,8 +11,11 @@
</h1>
</ion-header-bar>
<ion-content class="m20t" overflow-scroll="true">
<div class="modal-content m20t">
<ion-content overflow-scroll="true">
<div class="modal-content">
<div class="box-notification text-center size-12 text-warning m10t" ng-show="error">
<i class="fi-error"></i> {{error}}
</div>
<div ng-show="type == 'SELL'">
<h4 class="title m0 oh">
<div class="left">
@ -29,12 +32,18 @@
</div>
<ul class="no-bullet">
<li class="line-b" ng-repeat="w in wallets">
<a ng-click="selectWallet(w.id, w.name)" class="db oh">
<a ng-click="selectWallet(w.id)" class="db oh">
<div class="avatar-wallet"
ng-style="{'background-color':w.color}">
<i class="icon-wallet size-21"></i>
</div>
<div class="ellipsis name-wallet text-bold">{{w.name || w.id}}</div>
<div class="ellipsis name-wallet text-bold">
{{w.name || w.id}}
<span class="has-error right text-light size-12" ng-show="errorSelectedWallet[w.id]">
<i class="icon-close-circle size-14"></i>
<span class="vm">{{errorSelectedWallet[w.id]}}</span>
</span>
</div>
<div class="size-12">{{w.m}} of {{w.n}}
<span ng-show="w.network=='testnet'">[Testnet]</span>
</div>

4
public/views/sellCoinbase.html
View file

@ -94,7 +94,7 @@
</div>
<div class="input m20t">
<a href class="button black expand round"
ng-disabled=" (!amount && !fiat)"
ng-disabled=" (!amount && !fiat) || !sell.sellPrice.amount"
ng-style="{'background-color': '#2b71b1'}"
ng-click="showPriceSensitivity = true">Continue</a>
</div>
@ -124,7 +124,7 @@
</div>
<div class="columns large-6 medium-6 small-6">
<input class="button black expand round"
ng-disabled="(!amount && !fiat)"
ng-disabled="(!amount && !fiat) || !sell.sellPrice.amount"
ng-style="{'background-color': '#2b71b1'}"
type="submit" value="Confirm">
</div>