BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8261 from gabrielbazan7/fix/ui16 

FIX: wallet information and wallet details view
This commit is contained in:
Gabriel Masclef 2018-03-16 17:42:18 -03:00 committed by GitHub
parent 7b6b47fe3e 3c0c1d5be2
commit f5ee79cc44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/directives/copy-to-clipboard/copy-to-clipboard.ts
View File

@ -54,6 +54,7 @@ export class CopyToClipboard {
let showSuccess = this.toastCtrl.create({
message: 'Copied to clipboard',
duration: 1000,
position: 'top'
});
showSuccess.present();
}

31
src/pages/integrations/shapeshift/shapeshift-details/shapeshift-details.html
View File

@ -57,12 +57,14 @@
<ion-item>
{{'Address' | translate}}
<ion-note item-end text-wrap>
<span *ngIf="!ssData.address">...</span>
<span *ngIf="ssData.address" copy-to-clipboard="{{ssData.address}}">
{{ ssData.address }}
</span>
</ion-note>
<div padding-top>
<ion-note text-wrap>
<span *ngIf="!ssData.address">...</span>
<span *ngIf="ssData.address" copy-to-clipboard="{{ssData.address}}">
{{ ssData.address }}
</span>
</ion-note>
</div>
</ion-item>
<ion-item *ngIf="ssData.incomingCoin">
@ -76,12 +78,14 @@
<ion-item>
{{'Address' | translate}}
<ion-note item-end text-wrap>
<span *ngIf="!ssData.withdrawal">...</span>
<span *ngIf="ssData.withdrawal" copy-to-clipboard="{{ssData.withdrawal}}">
{{ ssData.withdrawal }}
</span>
</ion-note>
<div padding-top>
<ion-note text-wrap>
<span *ngIf="!ssData.withdrawal">...</span>
<span *ngIf="ssData.withdrawal" copy-to-clipboard="{{ssData.withdrawal}}">
{{ ssData.withdrawal }}
</span>
</ion-note>
</div>
</ion-item>
<ion-item *ngIf="ssData.outgoingCoin">
@ -96,10 +100,9 @@
<button ion-item detail-none *ngIf="ssData.transaction" (click)="openTransaction(ssData.transaction)" translate>
See transaction
</button>
<ion-item-divider></ion-item-divider>
<button class="assertive" ion-item detail-none (click)="remove()" translate>
Remove
</button>
</ion-list>
</ion-content>
</ion-content>

14
src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.html
View File

@ -20,9 +20,11 @@
</ion-item>
<ion-item copy-to-clipboard="{{walletId}}">
<span translate>Wallet Id</span>
<ion-note item-end>
{{walletId}}
</ion-note>
<div padding-top>
<ion-note text-wrap>
{{walletId}}
</ion-note>
</div>
</ion-item>
<ion-item>
<span translate>Wallet Configuration (m-n)</span>
@ -70,8 +72,10 @@
<ion-item-divider>{{'Extended Public Keys' | translate}}</ion-item-divider>
<ion-item *ngFor="let pk of pubKeys; let i=index" copy-to-clipboard="{{pk}}">
<span translate>Copayer {{i}}</span>
<div text-wrap class="pkStyle">
{{pk}}
<div padding-top>
<ion-note text-wrap>
{{pk}}
</ion-note>
</div>
<span *ngIf="$index == 0">({{basePath}})</span>
</ion-item>

4
src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.scss
View File

@ -1,6 +1,2 @@
page-wallet-information{
.pkStyle{
color: color($colors, grey);
padding-top: 10px;
}
}

23
src/pages/wallet-details/wallet-details.html
View File

@ -16,15 +16,18 @@
</div>
<div class="balance-hidden" *ngIf="!updateStatusError && wallet.balanceHidden && !wallet.scanning">
<strong translate>[Balance Hidden]</strong>
<div class="amount-alternative" translate>
<span class="title" translate>[Balance Hidden]</span>
<div translate>
Tap and hold to show
</div>
</div>
</div>
<div class="balance-scanning" *ngIf="!updateStatusError && wallet.scanning">
<strong translate>[Scanning Funds]</strong>
<span class="title" translate>[Scanning Funds]</span>
<div translate>
Please wait...
</div>
</div>
<div class="balance-spendable" (click)="openBalanceDetails()" *ngIf="!wallet.balanceHidden && !wallet.scanning && showBalanceButton && wallet.status">
@ -40,12 +43,12 @@
</div>
<div class="balance-error" *ngIf="updateStatusError" (tap)="updateAll(true)">
<span>{{updateStatusError}}.</span>
<strong>Tap to retry</strong>
<span class="title">Tap to retry</span>
<div>{{updateStatusError}}.</div>
</div>
<div class="balance-error" *ngIf="walletNotRegistered" (tap)="recreate()">
<span translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</span>
<strong>Tap to recreate</strong>
<span class="title">Tap to recreate</span>
<div translate>This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.</div>
</div>
</div>
@ -138,7 +141,8 @@
</div>
<div *ngIf="tx.confirmations > 0">
<span *ngIf="tx.customData && tx.customData.service">
<img class="icon-services" src="assets/img/shapeshift/icon-shapeshift.svg" *ngIf="tx.customData.service == 'shapeshift'" width="40">
<img class="icon-services" src="assets/img/shapeshift/icon-shapeshift.svg" *ngIf="tx.customData.service == 'shapeshift'"
width="40">
<img class="icon-services" src="assets/img/amazon/icon-amazon.svg" *ngIf="tx.customData.service == 'amazon'" width="40">
<img class="icon-services" src="assets/img/mercado-libre/icon-ml.svg" *ngIf="tx.customData.service == 'mercadolibre'" width="40">
<img class="icon-services" src="assets/img/bitpay-card/icon-bitpay.svg" *ngIf="tx.customData.service == 'debitcard'" width="40">
@ -182,6 +186,7 @@
<ion-note item-end text-end>
<div class="amount">
<span *ngIf=" tx.action == 'sent'">–</span>
<span [ngClass]="{'received': tx.action == 'received'}" *ngIf="tx.action != 'invalid'">{{tx.amount | satToUnit: wallet.coin}}</span>
<span class="double-spend" *ngIf="tx.action == 'invalid'" translate>(possible double spend)</span>
</div>
@ -197,4 +202,4 @@
<ion-infinite-scroll (ionInfinite)="loadHistory($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>
</ion-content>

23
src/pages/wallet-details/wallet-details.scss
View File

@ -35,13 +35,18 @@ page-wallet-details {
font-weight: 400;
}
.balance-hidden {
cursor: pointer;
padding-top: 5rem;
font-size: 20px;
font-weight: 500;
.title {
cursor: pointer;
font-size: 20px;
font-weight: 500;
}
}
.balance-error {
padding: 15% 1rem 0 1rem;
.title {
cursor: pointer;
font-size: 20px;
font-weight: 500;
}
}
.balance-spendable {
margin-top: 5px;
@ -53,8 +58,10 @@ page-wallet-details {
}
}
.balance-scanning {
font-size: 20px;
padding-top: 6rem;
.title {
font-size: 20px;
font-weight: 500;
}
}
.tx-history {
img {
@ -69,7 +76,7 @@ page-wallet-details {
.amount {
color: color($colors, dark);
.received {
color: color($colors, primary);
color: color($colors, success);
}
}
.date {

2
src/providers/popup/popup.ts
View File

@ -68,7 +68,7 @@ export class PopupProvider {
let prompt = this.alertCtrl.create({
title,
message,
cssClass: cssClass,
cssClass,
inputs: [
{
value: defaultText,