Skip to content

Commit c1b4787

Browse files
authored
Merge pull request bitpay#2051 from rastajpa/feat/error-messages
[insight-previous] FEAT: Error messages
2 parents 1db6355 + 975cda9 commit c1b4787

File tree

18 files changed

+81
-11
lines changed

18 files changed

+81
-11
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ion-row class="error-message">
2+
<ion-col col-12>
3+
{{ message }}
4+
</ion-col>
5+
</ion-row>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { NgModule } from '@angular/core';
2+
import { IonicModule } from 'ionic-angular';
3+
import { ErrorComponent } from './error';
4+
5+
@NgModule({
6+
declarations: [ErrorComponent],
7+
imports: [IonicModule],
8+
exports: [ErrorComponent]
9+
})
10+
export class ErrorComponentModule {}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
error {
2+
.error-message {
3+
background-color: #f2dede;
4+
border: 1px solid #ebccd1;
5+
color: #a94442;
6+
border-radius: 3px;
7+
margin: 5px;
8+
padding: 5px;
9+
}
10+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component, Input } from '@angular/core';
2+
3+
@Component({
4+
selector: 'error',
5+
templateUrl: 'error.html'
6+
})
7+
export class ErrorComponent {
8+
@Input()
9+
public message: string;
10+
}

packages/insight-previous/src/components/latest-blocks/latest-blocks.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<div>
1+
<error [message]="errorMessage" *ngIf="errorMessage"></error>
2+
<div *ngIf="!errorMessage">
23
<ion-grid class="grid--table">
34

45
<ion-row>

packages/insight-previous/src/components/latest-blocks/latest-blocks.module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@ import { NgModule } from '@angular/core';
22
import { MomentModule } from 'angular2-moment';
33
import { IonicModule } from 'ionic-angular';
44
import { LoaderComponentModule } from '../../components/loader/loader.module';
5+
import { ErrorComponentModule } from '../error/error.module';
56
import { LatestBlocksComponent } from './latest-blocks';
67

78
@NgModule({
89
declarations: [LatestBlocksComponent],
9-
imports: [IonicModule, MomentModule, LoaderComponentModule],
10+
imports: [
11+
IonicModule,
12+
MomentModule,
13+
LoaderComponentModule,
14+
ErrorComponentModule
15+
],
1016
exports: [LatestBlocksComponent]
1117
})
1218
export class LatestBlocksComponentModule {}

packages/insight-previous/src/components/latest-blocks/latest-blocks.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
2525
private reloadInterval: any;
2626

2727
public subscriber: Subscription;
28+
public errorMessage: string;
2829

2930
constructor(
3031
private blocksProvider: BlocksProvider,
@@ -60,6 +61,7 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
6061
this.subscriber.unsubscribe();
6162
clearInterval(this.reloadInterval);
6263
this.logger.error(err._body);
64+
this.errorMessage = err;
6365
this.loading = false;
6466
}
6567
);
@@ -77,6 +79,7 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
7779
},
7880
err => {
7981
this.logger.error(err);
82+
this.errorMessage = err;
8083
this.loading = false;
8184
}
8285
);

packages/insight-previous/src/pages/address/address.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
<loader *ngIf="loading" [type]="'title'"></loader>
99

10-
<div *ngIf="!loading">
10+
<error [message]="errorMessage" *ngIf="!loading && errorMessage "></error>
11+
12+
<div *ngIf="!loading && !errorMessage">
1113
<h1>Address <small>{{ getConvertedNumber(address.balance) | number:'1.0-8' }}
1214
{{ currencyProvider.currencySymbol }}</small></h1>
1315
<p class="ellipsis">{{ address.addrStr }}</p>

packages/insight-previous/src/pages/address/address.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
22
import { QRCodeModule } from 'angular2-qrcode';
33
import { IonicPageModule } from 'ionic-angular';
44
import { CoinListComponentModule } from '../../components/coin-list/coin-list.module';
5+
import { ErrorComponentModule } from '../../components/error/error.module';
56
import { FooterComponentModule } from '../../components/footer/footer.module';
67
import { HeadNavComponentModule } from '../../components/head-nav/head-nav.module';
78
import { LoaderComponentModule } from '../../components/loader/loader.module';
@@ -17,7 +18,8 @@ import { AddressPage } from './address';
1718
FooterComponentModule,
1819
HeadNavComponentModule,
1920
QRCodeModule,
20-
LoaderComponentModule
21+
LoaderComponentModule,
22+
ErrorComponentModule
2123
],
2224
exports: [AddressPage]
2325
})

packages/insight-previous/src/pages/address/address.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export class AddressPage {
2323
private chainNetwork: ChainNetwork;
2424
public address: any = {};
2525
public nroTransactions = 0;
26+
public errorMessage: string;
2627

2728
constructor(
2829
public navParams: NavParams,
@@ -67,6 +68,8 @@ export class AddressPage {
6768
},
6869
err => {
6970
this.logger.error(err);
71+
this.errorMessage = err;
72+
this.loading = false;
7073
}
7174
);
7275
}

0 commit comments

Comments
 (0)