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

Bitpay Card: uses common widget for selecting wallet. Minor fixes

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-29 17:01:34 -03:00
commit 6e1b7ec620
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
6 changed files with 61 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/views/amount.html
View file

@ -30,10 +30,10 @@
</div>
<div class="item item-text-wrap item-button-right">
<div class="item item-text-wrap item-button-right">
<button class="button black" ng-click="toggleAlternative()" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</button>
<button class="button transform-none" ng-click="toggleAlternative()" ng-show="!showAlternativeAmount">{{unitName}}</button>
<a class="postfix" ng-click="toggleAlternative()" ng-show="showAlternativeAmount">{{alternativeIsoCode}}</a>
<a class="postfix" ng-click="toggleAlternative()" ng-show="!showAlternativeAmount">{{unitName}}</a>
<div class="text-light text-black m15b" ng-class="{'size-28': smallFont, 'size-36': !smallFont}"> <span> {{amount || "0.00" }}</div>
<div class="text-light text-black" ng-class="{'size-16': smallFont, 'size-17': !smallFont}" ng-show="!showAlternativeAmount">

36
public/views/bitpayCard.html
View file

@ -15,7 +15,7 @@
<ion-content ng-controller="bitpayCardController as bitpayCard" ng-init="bitpayCard.init()">
<div class="text-center size-12" ng-show="network == 'testnet'">
<div class="box-notification warning" ng-show="network == 'testnet'">
Sandbox version. Only for testing purpose
</div>
@ -31,7 +31,7 @@
<span ng-show="!bitpayCard.bitpayCardTwoFactorPending">Login to your account</span>
<span ng-show="bitpayCard.bitpayCardTwoFactorPending">2-Step Verification</span>
</h4>
<div class="m10b size-12"
<div class="box-notification error"
ng-show="bitpayCard.error"
ng-click="bitpayCard.error = null">
{{bitpayCard.error}}
@ -63,7 +63,7 @@
</label>
</div>
<input class="button button-block button-positive"
<input class="button button-block"
type="submit"
ng-disabled="!authenticateForm.$valid || bitpayCard.authenticating"
value="Login">
@ -90,7 +90,7 @@
</label>
</div>
<input class="button button-block button-positive"
<input class="button button-block"
type="submit"
ng-disabled="!authenticate2FAForm.$valid || bitpayCard.authenticating"
value="Login">
@ -121,7 +121,7 @@
<option value="all">All Activity</option>
</select>
<div class="m20v size-12 text-center text-warning"
<div class="box-notification error"
ng-show="bitpayCard.error">
{{bitpayCard.error}}
</div>
@ -176,7 +176,7 @@
</div>
<div ng-show="bitpayCard.bitpayCardAuthenticated && !bitpayCard.visaCardActivated && addFunds">
<div class="m10b box-notification size-12 text-warning"
<div class="box-notification error"
ng-show="bitpayCard.error"
ng-click="bitpayCard.error = null">
{{bitpayCard.error}}
@ -199,25 +199,11 @@
ng-model="fiat"
autocomplete="off"
required>
<a class="postfix button black">USD</a>
<a class="postfix">USD</a>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Add From Copay Wallet</span>
<input
type="text"
id="address"
name="address"
ng-disabled="bitpayCard.selectedWalletId"
ng-attr-placeholder="{{'Choose your source wallet'}}"
ng-model="bitpayCard.selectedWalletName" required>
<a
class="postfix size-12 m0 text-gray"
ng-style="{'color': '#293C92'}"
on-tap="openWalletsModal(bitpayCard.allWallets)">
<i class="icon-wallet size-18"></i>
</a>
</label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
<p class="size-12 text-warning" ng-show="bitpayCard.isMultisigWallet">
@ -234,8 +220,8 @@
</button>
</div>
<div class="col">
<button class="button button-block button-positive"
ng-disabled="!bitpayCard.selectedWalletId || !fiat"
<button class="button button-block"
ng-disabled="!fiat"
type="submit">
Send
</button>

2
public/views/buyAmazon.html
View file

@ -50,7 +50,7 @@
max="500"
ng-model="fiat"
autocomplete="off" ignore-mouse-wheel required>
<a class="postfix">USD</a>
</label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>