mirror of https://github.com/BTCPrivate/copay.git
Fix: styles for scan and paper wallet
This commit is contained in:
parent
f5ee79cc44
commit
246c3fb917
|
@ -212,7 +212,7 @@
|
|||
</ion-list>
|
||||
</div>
|
||||
|
||||
<div class="card" *ngIf="showBitPayCard && bitpayCardItems && bitpayCardItems[0]">
|
||||
<div class="card" *ngIf="showBitPayCard && bitpayCardItems && bitpayCardItems[0] && wallets &&wallets[0]">
|
||||
<ion-item-divider>
|
||||
<div class="title" item-start>
|
||||
<span>BitPay Visa
|
||||
|
@ -236,7 +236,7 @@
|
|||
</ion-list>
|
||||
</div>
|
||||
|
||||
<div class="card" *ngIf="homeIntegrations && homeIntegrations.length>0">
|
||||
<div class="card" *ngIf="homeIntegrations && homeIntegrations.length>0 && wallets &&wallets[0]">
|
||||
<ion-item-divider (click)="hideHomeIntegrations = !hideHomeIntegrations">
|
||||
<div class="title" item-start translate>Services</div>
|
||||
<div item-end>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
<div *ngIf="noMatchingWallet">
|
||||
<div class="message" *ngIf="noMatchingWallet">
|
||||
<span translate>No wallets available to receive funds</span>
|
||||
</div>
|
||||
<div *ngIf="!noMatchingWallet">
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
page-paper-wallet {
|
||||
.message {
|
||||
text-align: center;
|
||||
background: color($colors, warning);
|
||||
color: white;
|
||||
}
|
||||
.title {
|
||||
padding: 10px;
|
||||
}
|
||||
|
|
|
@ -74,7 +74,11 @@ export class PaperWalletPage {
|
|||
if (!this.isPkEncrypted) this.scanFunds();
|
||||
else {
|
||||
let message = this.translate.instant('Private key encrypted. Enter password');
|
||||
this.popupProvider.ionicPrompt(null, message, null).then((res) => {
|
||||
let opts = {
|
||||
type: 'password',
|
||||
enableBackdropDismiss: false
|
||||
}
|
||||
this.popupProvider.ionicPrompt(null, message, opts).then((res) => {
|
||||
this.passphrase = res;
|
||||
this.scanFunds();
|
||||
});
|
||||
|
@ -176,7 +180,7 @@ export class PaperWalletPage {
|
|||
|
||||
public showWallets(): void {
|
||||
let id = this.wallet ? this.wallet.credentials.walletId : null;
|
||||
this.events.publish('showWalletsSelectorEvent', this.wallets, id, 'Select a wallet');
|
||||
this.events.publish('showWalletsSelectorEvent', this.wallets, id, 'Transfer to');
|
||||
this.events.subscribe('selectWalletEvent', (wallet: any) => {
|
||||
if (!_.isEmpty(wallet)) this.onWalletSelect(wallet);
|
||||
this.events.unsubscribe('selectWalletEvent');
|
||||
|
|
|
@ -6,13 +6,17 @@
|
|||
|
||||
<ion-content class="back-transparent" no-bounce>
|
||||
<div class="page-scan-has-problems" *ngIf="(currentState == scannerStates.unauthorized || currentState == scannerStates.denied || currentState == scannerStates.unavailable) && !notSupportedMessage">
|
||||
<div class="header" padding>
|
||||
<div class="image-container">
|
||||
<img src="assets/img/ico-receive.svg" />
|
||||
<div class="header-container">
|
||||
<div>
|
||||
<div class="header" padding>
|
||||
<div class="image-container">
|
||||
<img src="assets/img/ico-receive.svg" />
|
||||
</div>
|
||||
<div class="title" padding translate>Scan QR Codes</div>
|
||||
</div>
|
||||
<div class="subtitle" translate>You can scan bitcoin addresses, payment requests, paper wallets, and more.</div>
|
||||
</div>
|
||||
<div class="title" padding translate>Scan QR Codes</div>
|
||||
</div>
|
||||
<div class="subtitle" translate>You can scan bitcoin addresses, payment requests, paper wallets, and more.</div>
|
||||
<div class="body">
|
||||
<div padding>
|
||||
<div *ngIf="currentState == scannerStates.unauthorized" translate>Enable the camera to get started.</div>
|
||||
|
@ -20,9 +24,12 @@
|
|||
<div *ngIf="currentState == scannerStates.unavailable" translate>Please connect a camera to get started.</div>
|
||||
</div>
|
||||
<div>
|
||||
<button ion-button outline *ngIf="currentState == scannerStates.unauthorized" (click)="authorize()" translate>Allow Camera Access</button>
|
||||
<button ion-button outline *ngIf="currentState == scannerStates.denied && canOpenSettings" (click)="openSettings()" translate>Open Settings</button>
|
||||
<button ion-button outline *ngIf="currentState == scannerStates.unavailable" (click)="attemptToReactivate()" translate>Retry Camera</button>
|
||||
<button ion-button outline class="button-standard" *ngIf="currentState == scannerStates.unauthorized" (click)="authorize()"
|
||||
translate>Allow Camera Access</button>
|
||||
<button ion-button outline class="button-standard" *ngIf="currentState == scannerStates.denied && canOpenSettings" (click)="openSettings()"
|
||||
translate>Open Settings</button>
|
||||
<button ion-button outline class="button-standard" *ngIf="currentState == scannerStates.unavailable" (click)="attemptToReactivate()"
|
||||
translate>Retry Camera</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -16,33 +16,41 @@ page-scan {
|
|||
.page-scan-has-problems {
|
||||
height: 100%;
|
||||
background-color: $toolbar-background;
|
||||
.header {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
.image-container {
|
||||
background: #fff;
|
||||
padding: 1rem;
|
||||
width: 5rem;
|
||||
margin: auto;
|
||||
border-radius: 0.5rem;
|
||||
img {
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
.header-container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 223px;
|
||||
height: 60%;
|
||||
.header {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
.image-container {
|
||||
background: #fff;
|
||||
padding: 1rem;
|
||||
width: 5rem;
|
||||
margin: auto;
|
||||
border-radius: 0.5rem;
|
||||
img {
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
margin-bottom: -0.5rem;
|
||||
}
|
||||
}
|
||||
.title {
|
||||
color: #fff;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
}
|
||||
.title {
|
||||
color: #fff;
|
||||
font-size: 1.2em;
|
||||
.subtitle {
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
max-width: 300px;
|
||||
font-size: 0.9em;
|
||||
opacity: .6;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
.subtitle {
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
max-width: 300px;
|
||||
font-size: 0.9em;
|
||||
opacity: .6;
|
||||
color: #fff;
|
||||
}
|
||||
.body {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
|
|
|
@ -64,11 +64,13 @@ export class PopupProvider {
|
|||
let placeholder = opts && opts.placeholder ? opts.placeholder : null;
|
||||
let inputType = opts && opts.type ? opts.type : 'text';
|
||||
let cssClass = opts.useDanger ? "alertDanger" : null;
|
||||
let enableBackdropDismiss = !!opts.enableBackdropDismiss;
|
||||
|
||||
let prompt = this.alertCtrl.create({
|
||||
title,
|
||||
message,
|
||||
cssClass,
|
||||
enableBackdropDismiss,
|
||||
inputs: [
|
||||
{
|
||||
value: defaultText,
|
||||
|
|
Loading…
Reference in New Issue