Skip to content

Commit 017689c

Browse files
micahrigganmicahriggan
authored
Merge pull request bitpay#1638 from SonicWizard/feature/insight-address
Feature/insight address
2 parents 4e54a62 + 36ceaac commit 017689c

File tree

13 files changed

+14122
-11379
lines changed

13 files changed

+14122
-11379
lines changed

‎packages/bitcore-lib-cash/package-lock.json

Lines changed: 1684 additions & 1683 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-lib/package-lock.json

Lines changed: 1921 additions & 1920 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-mnemonic/package-lock.json

Lines changed: 3607 additions & 2309 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-node/package-lock.json

Lines changed: 2181 additions & 744 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-p2p-cash/package-lock.json

Lines changed: 1953 additions & 1951 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-p2p/package-lock.json

Lines changed: 1964 additions & 1962 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bitcore-wallet-client/package-lock.json

Lines changed: 792 additions & 791 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/insight/app/src/components/transaction/transaction.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<div>
7676
<div class="ellipsis">
7777
<p>
78-
<a (click)="goToAddress(vout.address)">{{ vout.address }}</a>
78+
<a (click)="goToAddress(vout.address)">{{ getAddress(vout) }}</a>
7979
</p>
8080
</div>
8181
<div *ngIf="expanded">

‎packages/insight/app/src/components/transaction/transaction.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
22
import { Input } from '@angular/core';
33
import { NavController } from 'ionic-angular';
44
import { CurrencyProvider } from '../../providers/currency/currency';
5-
import { TxsProvider } from '../../providers/transactions/transactions';
5+
import { TxsProvider, ApiInput } from '../../providers/transactions/transactions';
66

77
/**
88
* Generated class for the TransactionComponent component.
@@ -43,12 +43,12 @@ export class TransactionComponent {
4343
});
4444
}
4545

46-
public getAddress(vout: any): string {
47-
if (vout.scriptPubKey && vout.scriptPubKey.addresses) {
48-
return vout.scriptPubKey.addresses[0];
49-
} else {
46+
public getAddress(vout: ApiInput): string {
47+
if (vout.address === 'false') {
5048
return 'Unparsed address';
5149
}
50+
51+
return vout.address;
5252
}
5353

5454
public goToTx(txId: string): void {

‎packages/insight/app/src/pages/address/address.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ <h2>Summary</h2>
1616
<ion-item>
1717
Total Received
1818
<ion-note item-end>
19-
{{ currency.getConvertedNumber(address.totalReceived) | number:'1.0-8' }} {{ currency.currencySymbol }}
19+
{{ currencyProvider.getConvertedNumber(address.totalReceived) | number:'1.0-8' }} {{ currencyProvider.currencySymbol }}
2020
</ion-note>
2121
</ion-item>
2222
<ion-item>
2323
Total Sent
2424
<ion-note item-end>
25-
{{ currency.getConvertedNumber(address.totalSent) | number:'1.0-8' }} {{ currency.currencySymbol }}
25+
{{ currencyProvider.getConvertedNumber(address.totalSent) | number:'1.0-8' }} {{ currencyProvider.currencySymbol }}
2626
</ion-note>
2727
</ion-item>
2828
<ion-item>
2929
Final Balance
3030
<ion-note item-end>
31-
{{ currency.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currency.currencySymbol }}
31+
{{ currencyProvider.getConvertedNumber(address.balance) | number:'1.0-8' }} {{ currencyProvider.currencySymbol }}
3232
</ion-note>
3333
</ion-item>
3434
<ion-item>

‎packages/insight/app/src/pages/address/address.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ export class AddressPage {
2929
public navCtrl: NavController,
3030
public navParams: NavParams,
3131
private http: Http,
32-
private api: ApiProvider,
33-
public currency: CurrencyProvider,
34-
public transaction: TxsProvider
32+
private apiProvider: ApiProvider,
33+
public currencyProvider: CurrencyProvider,
34+
public txProvider: TxsProvider
3535
) {
3636
this.addrStr = navParams.get('addrStr');
3737
}
3838

3939
public ionViewDidLoad(): void {
40-
this.http.get(this.api.apiPrefix + '/address/' + this.addrStr).subscribe(
40+
let url: string = this.apiProvider.apiPrefix + '/address/' + this.addrStr;
41+
this.http.get(url).subscribe(
4142
data => {
4243
let apiCoin: ApiInput[] = data.json() as ApiInput[];
4344
let add: (prev: number, cur: number) => number = (prev, cur) => prev + cur;

‎packages/insight/app/src/pages/transaction/transaction.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ export class TransactionPage {
3636
data => {
3737
this.tx = data.tx;
3838
this.loading = false;
39-
this.txProvider.getCoins(this.txId).subscribe(coinData => {
40-
this.tx.inputs = coinData.inputs;
41-
this.tx.outputs = coinData.outputs;
42-
});
39+
// Be aware that the tx component is loading data into the tx object
4340
},
4441
err => {
4542
console.log('err is', err);

‎packages/insight/app/src/providers/transactions/transactions.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'rxjs/add/operator/map';
44
import { ApiProvider } from '../../providers/api/api';
55
import { Observable } from 'rxjs/Observable';
66
import { CurrencyProvider } from '../../providers/currency/currency';
7-
import { ApiBlock, BlocksProvider } from '../blocks/blocks';
7+
import { BlocksProvider } from '../blocks/blocks';
88

99
/*
1010
Generated class for the TxsProvider provider.
@@ -41,7 +41,10 @@ export type ApiInput = {
4141
coinbase: boolean;
4242
vout: number;
4343
address: string;
44-
script: string;
44+
script: {
45+
asm: string;
46+
type: string
47+
};
4548
spentTxid: string;
4649
value: number;
4750
};

0 commit comments

Comments
 (0)