diff --git a/frontend/src/app/address/address.page.html b/frontend/src/app/address/address.page.html index b1c91f8..c1ee5bf 100644 --- a/frontend/src/app/address/address.page.html +++ b/frontend/src/app/address/address.page.html @@ -46,17 +46,35 @@ (click)="goToCoin(color['colorId'])" >{{ color['colorId'] | formatColorId }} - {{ color['balanced'] }} - {{ color['received'] }} - {{ color['sent'] }} - {{ color['count'] }} + {{ color['balanced'] }} + {{ color['received'] }} + {{ color['sent'] }} + {{ color['count'] }} - {{ color['colorId'] | formatColorId }} - {{ color['balanced'] | asTpc }} - {{ color['received'] | asTpc }} - {{ color['sent'] | asTpc }} - {{ color['count'] }} + {{ color['colorId'] | formatColorId }} + {{ color['balanced'] | asTpc }} + {{ color['received'] | asTpc }} + {{ color['sent'] | asTpc }} + {{ color['count'] }} @@ -99,7 +117,7 @@ -
@@ -115,9 +133,10 @@ > - - - + + {{ input.prevout?.value }} COIN - + {{ input.prevout?.value | asTpc}} TPC - - + Color ID: {{ input.prevout?.colorId | formatColorId }} @@ -168,7 +194,9 @@ - Color ID: {{ output.colorId | formatColorId }} diff --git a/frontend/src/app/address/address.page.ts b/frontend/src/app/address/address.page.ts index 9cef317..701b48b 100644 --- a/frontend/src/app/address/address.page.ts +++ b/frontend/src/app/address/address.page.ts @@ -96,6 +96,9 @@ export class AddressPage implements OnInit { } isColored(colorId) { - return colorId !== '000000000000000000000000000000000000000000000000000000000000000000'; + return ( + colorId !== + '000000000000000000000000000000000000000000000000000000000000000000' + ); } } diff --git a/frontend/src/app/block/block.page.html b/frontend/src/app/block/block.page.html index 1c0cb65..8ac7b92 100644 --- a/frontend/src/app/block/block.page.html +++ b/frontend/src/app/block/block.page.html @@ -169,18 +169,19 @@ size="8" class="ion-no-margin text-primary cursor-pointer" (click)="goToAddress(input.prevout.scriptpubkey_uncolored_address)" - >{{ input.prevout.scriptpubkey_uncolored_address }}{{ input.prevout.scriptpubkey_uncolored_address + }} + > {{ input.prevout.value }} COIN + >COIN @@ -189,8 +190,13 @@ - - + Color ID: {{ input.prevout.colorId | formatColorId }} @@ -241,7 +247,9 @@ - Color ID: {{ vout.colorId | formatColorId }} diff --git a/frontend/src/app/blocks/blocks.page.scss b/frontend/src/app/blocks/blocks.page.scss index b41fef1..a26d8f2 100644 --- a/frontend/src/app/blocks/blocks.page.scss +++ b/frontend/src/app/blocks/blocks.page.scss @@ -21,7 +21,6 @@ ion-content { } } - .display-none-max-md { @media (max-width: 768px) { display: none; diff --git a/frontend/src/app/color/color.page.html b/frontend/src/app/color/color.page.html index 94f8429..c7588b1 100644 --- a/frontend/src/app/color/color.page.html +++ b/frontend/src/app/color/color.page.html @@ -77,7 +77,9 @@

Transactions

- + {{ input.prevout?.value }} Transactions >COIN - + {{ input.prevout?.value }} COIN - + {{ input.prevout?.value | asTpc}} TPC
- - + Color ID: {{ input.prevout.colorId | formatColorId }} @@ -117,7 +128,9 @@

Transactions

OUT
- + {{ output.value }} Transactions >COIN - + {{ output.value }} COIN @@ -136,7 +151,9 @@

Transactions

- Color ID: {{ output.colorId | formatColorId }} diff --git a/frontend/src/app/colors/colors.page.scss b/frontend/src/app/colors/colors.page.scss index 031e2ba..48bebe1 100644 --- a/frontend/src/app/colors/colors.page.scss +++ b/frontend/src/app/colors/colors.page.scss @@ -24,4 +24,3 @@ ion-content { font-size: 14px; color: #aaaaaa; } - diff --git a/frontend/src/app/modules/sharePipe.module.ts b/frontend/src/app/modules/sharePipe.module.ts index a61591e..f48e200 100644 --- a/frontend/src/app/modules/sharePipe.module.ts +++ b/frontend/src/app/modules/sharePipe.module.ts @@ -5,7 +5,12 @@ import { AsTpcPipe } from '../pipes/as-tpc.pipe'; import { DateFormatPipe } from '../pipes/date-format.pipe'; import { FormatColorIdPipe } from '../pipes/format-color-id.pipe'; @NgModule({ - declarations: [MomentFromNowPipe, AsTpcPipe, DateFormatPipe, FormatColorIdPipe], + declarations: [ + MomentFromNowPipe, + AsTpcPipe, + DateFormatPipe, + FormatColorIdPipe + ], imports: [CommonModule], exports: [MomentFromNowPipe, AsTpcPipe, DateFormatPipe, FormatColorIdPipe] }) diff --git a/frontend/src/app/pipes/format-color-id.pipe.ts b/frontend/src/app/pipes/format-color-id.pipe.ts index 9ed33a2..02ca751 100644 --- a/frontend/src/app/pipes/format-color-id.pipe.ts +++ b/frontend/src/app/pipes/format-color-id.pipe.ts @@ -8,7 +8,10 @@ import { Injectable } from '@angular/core'; }) export class FormatColorIdPipe implements PipeTransform { transform(colorId: any, ...args: any[]): any { - if (colorId === '000000000000000000000000000000000000000000000000000000000000000000') { + if ( + colorId === + '000000000000000000000000000000000000000000000000000000000000000000' + ) { return '(TPC)'; } else { return colorId; diff --git a/frontend/src/app/transaction/transaction.page.html b/frontend/src/app/transaction/transaction.page.html index 53ec77f..6c0ab3f 100644 --- a/frontend/src/app/transaction/transaction.page.html +++ b/frontend/src/app/transaction/transaction.page.html @@ -99,7 +99,8 @@ size="8" class="ion-no-margin link-color cursor-pointer" (click)="goToAddress(vin.prevout.scriptpubkey_uncolored_address)" - >{{ vin.prevout.scriptpubkey_uncolored_address }}{{ vin.prevout.scriptpubkey_uncolored_address + }} - - + Color ID: {{ vin.prevout.colorId | formatColorId }} @@ -236,8 +242,13 @@ - - + Color ID: {{ vout.colorId | formatColorId }} diff --git a/frontend/src/global.scss b/frontend/src/global.scss index 77a5d21..e9a6173 100644 --- a/frontend/src/global.scss +++ b/frontend/src/global.scss @@ -103,4 +103,4 @@ ion-toast { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; -} \ No newline at end of file +}