mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #7965 from cmgustavo/v4-53
[v4] polishing coinbase/glidera
This commit is contained in:
commit
b7a3997333
|
@ -1,10 +1,10 @@
|
|||
<ion-header>
|
||||
<ion-navbar>
|
||||
<ion-title>Buy bitcoin</ion-title>
|
||||
<ion-title>Coinbase</ion-title>
|
||||
</ion-navbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content padding>
|
||||
<ion-content>
|
||||
<ion-list *ngIf="buyRequestInfo">
|
||||
<ion-item>
|
||||
<div class="sending-label">
|
||||
|
@ -29,11 +29,11 @@
|
|||
<button ion-item (click)="showWallets()" class="wallets-list">
|
||||
<div>Receive in</div>
|
||||
<div class="wallet">
|
||||
<img *ngIf="network == 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet-testnet.svg"
|
||||
class="icon-wallet" />
|
||||
<img *ngIf="network != 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet.svg"
|
||||
class="icon-wallet" />
|
||||
<span>{{wallet ? wallet.name : '...'}}</span>
|
||||
<ion-icon item-start>
|
||||
<img *ngIf="network == 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet-testnet.svg" class="icon-wallet" />
|
||||
<img *ngIf="network != 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet.svg" class="icon-wallet" />
|
||||
</ion-icon>
|
||||
<div>{{wallet ? wallet.name : '...'}}</div>
|
||||
</div>
|
||||
</button>
|
||||
<ion-item-divider color="light">
|
||||
|
|
|
@ -27,11 +27,9 @@ page-buy-coinbase {
|
|||
display: flex;
|
||||
align-items: center;
|
||||
margin-top: 1rem;
|
||||
img {
|
||||
width: 2.3rem;
|
||||
margin-right: 1.5rem;
|
||||
border-radius: 0.3rem;
|
||||
.icon-wallet {
|
||||
background-color: color($colors, primary);
|
||||
margin-right: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,29 +14,31 @@
|
|||
<ion-content>
|
||||
|
||||
<ion-card>
|
||||
<ion-card-content>
|
||||
<div class="item-img">
|
||||
<ion-card-content text-center>
|
||||
<div>
|
||||
<img src="assets/img/bought.svg" alt="bought" *ngIf="(tx.type == 'buy' || (tx.type == 'send' && tx.to)) && tx.status == 'completed'">
|
||||
<img src="assets/img/bought-pending.svg" alt="bought" *ngIf="(tx.type == 'buy' || (tx.type == 'send' && tx.to)) && tx.status != 'completed'">
|
||||
<img src="assets/img/sold.svg" alt="sold" *ngIf="tx.type == 'sell' && tx.status == 'completed'">
|
||||
<img src="assets/img/sold-pending.svg" alt="sold" *ngIf="(tx.type == 'sell' || (tx.type == 'send' && tx.from)) && tx.status != 'completed'">
|
||||
</div>
|
||||
<div *ngIf="tx.status == 'completed'">
|
||||
<span *ngIf="tx.type == 'buy' || tx.type == 'send'">Bought</span>
|
||||
<span *ngIf="tx.type == 'sell'">Sold</span>
|
||||
<div class="title" padding>
|
||||
<div *ngIf="tx.status == 'completed'">
|
||||
<span *ngIf="tx.type == 'buy' || tx.type == 'send'">Bought</span>
|
||||
<span *ngIf="tx.type == 'sell'">Sold</span>
|
||||
</div>
|
||||
<div *ngIf="tx.type == 'send' && (tx.to || tx.from) && tx.status != 'completed'">
|
||||
<span *ngIf="tx.to">Receiving purchased bitcoin</span>
|
||||
<span *ngIf="tx.from">Sending bitcoin to sell</span>
|
||||
</div>
|
||||
<div *ngIf="(tx.type == 'sell' || tx.type == 'buy') && tx.status != 'completed'">
|
||||
<span *ngIf="tx.type == 'buy'">Buying bitcoin</span>
|
||||
<span *ngIf="tx.type == 'sell'">Selling bitcoin</span>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="tx.type == 'send' && (tx.to || tx.from) && tx.status != 'completed'">
|
||||
<span *ngIf="tx.to">Receiving purchased bitcoin</span>
|
||||
<span *ngIf="tx.from">Sending bitcoin to sell</span>
|
||||
</div>
|
||||
<div *ngIf="(tx.type == 'sell' || tx.type == 'buy') && tx.status != 'completed'">
|
||||
<span *ngIf="tx.type == 'buy'">Buying bitcoin</span>
|
||||
<span *ngIf="tx.type == 'sell'">Selling bitcoin</span>
|
||||
</div>
|
||||
<div>
|
||||
<div class="price">
|
||||
<span *ngIf="tx.type == 'sell' || (tx.type == 'send' && tx.from)">-</span>{{tx.amount.amount.replace('-','')}} {{tx.amount.currency}}
|
||||
</div>
|
||||
<div class="size-12">
|
||||
<div class="alternative-price">
|
||||
<span *ngIf="tx.type == 'sell' || (tx.type == 'send' && tx.from)">-</span>{{tx.native_amount.amount.replace('-','')}} {{tx.native_amount.currency}}
|
||||
</div>
|
||||
</ion-card-content>
|
||||
|
@ -115,4 +117,4 @@
|
|||
</ion-item>
|
||||
|
||||
</ion-list>
|
||||
</ion-content>
|
||||
</ion-content>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
page-glidera-tx-details {
|
||||
page-coinbase-tx-details {
|
||||
ion-card img {
|
||||
width: 90px;
|
||||
margin: 0 auto;
|
||||
|
@ -9,4 +9,8 @@ page-glidera-tx-details {
|
|||
.price {
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.alternative-price {
|
||||
font-size: 12.5px;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
<ion-header>
|
||||
<ion-navbar>
|
||||
<ion-title>Coinbase</ion-title>
|
||||
<ion-buttons *ngIf="accessToken" end>
|
||||
<button ion-button icon-only (click)="updateTransactions()">
|
||||
<ion-icon name="refresh"></ion-icon>
|
||||
</button>
|
||||
</ion-buttons>
|
||||
</ion-navbar>
|
||||
</ion-header>
|
||||
|
||||
|
@ -31,7 +26,7 @@
|
|||
</div>
|
||||
<div *ngIf="accessToken">
|
||||
<div class="main-header">
|
||||
<img margin src="assets/img/coinbase/coinbase-logo-white.svg">
|
||||
<img margin src="assets/img/coinbase/coinbase-logo-white.svg" (click)="updateTransactions()">
|
||||
<ion-spinner *ngIf="loading"></ion-spinner>
|
||||
</div>
|
||||
<ion-list>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<ion-header>
|
||||
<ion-navbar>
|
||||
<ion-title>Sell bitcoin</ion-title>
|
||||
<ion-title>Coinbase</ion-title>
|
||||
</ion-navbar>
|
||||
</ion-header>
|
||||
|
||||
<ion-content padding>
|
||||
<ion-content>
|
||||
<ion-list *ngIf="sellRequestInfo">
|
||||
<ion-item>
|
||||
<div class="selling-label">
|
||||
|
@ -23,11 +23,11 @@
|
|||
<button ion-item (click)="showWallets()" class="wallets-list">
|
||||
<div>From</div>
|
||||
<div class="wallet">
|
||||
<img *ngIf="network == 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet-testnet.svg"
|
||||
class="icon-wallet" />
|
||||
<img *ngIf="network != 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet.svg"
|
||||
class="icon-wallet" />
|
||||
<span>{{wallet ? wallet.name : '...'}}</span>
|
||||
<ion-icon item-start>
|
||||
<img *ngIf="network == 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet-testnet.svg" class="icon-wallet" />
|
||||
<img *ngIf="network != 'testnet'" [ngStyle]="{'background-color': wallet && wallet.color}" src="assets/img/icon-wallet.svg" class="icon-wallet" />
|
||||
</ion-icon>
|
||||
<div>{{wallet ? wallet.name : '...'}}</div>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<ion-header>
|
||||
<ion-navbar>
|
||||
<ion-title>Glidera</ion-title>
|
||||
</ion-navbar>
|
||||
</ion-header>
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
<ion-card>
|
||||
<ion-card-content text-center>
|
||||
<div class="type-logo">
|
||||
<div>
|
||||
<img src="assets/img/glidera/bought.svg" alt="bought" width="20" *ngIf="tx.type == 'BUY' && tx.status == 'COMPLETE'">
|
||||
<img src="assets/img/glidera/bought-pending.svg" alt="bought" width="15" *ngIf="tx.type == 'BUY' && tx.status == 'PROCESSING'">
|
||||
<img src="assets/img/glidera/sold.svg" alt="bought" width="20" *ngIf="tx.type == 'SELL' && tx.status == 'COMPLETE'">
|
||||
|
|
|
@ -1,5 +1,12 @@
|
|||
page-glidera-tx-details {
|
||||
.item-img {
|
||||
width: 40px;
|
||||
ion-card img {
|
||||
width: 90px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
.title {
|
||||
font-size: 22px;
|
||||
}
|
||||
.price {
|
||||
font-size: 12.5px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<ion-header>
|
||||
<ion-navbar>
|
||||
<ion-title>Sell bitcoin</ion-title>
|
||||
<ion-title>Glidera</ion-title>
|
||||
</ion-navbar>
|
||||
</ion-header>
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
<ion-content no-bounce>
|
||||
<ion-list>
|
||||
<ion-item-divider color="light"></ion-item-divider>
|
||||
<button ion-item no-lines (click)="openAddressBookPage()">
|
||||
<ion-icon name="ios-contacts-outline" item-start></ion-icon>
|
||||
{{'Address book' | translate}}
|
||||
|
|
Loading…
Reference in New Issue