| Timestamp | -Type | -Amount (ꜩ) | -Status | -
|---|
| {{ transaction.timestamp | date:'yyyy-MM-dd HH:mm:ss' }} | - -{{ transaction.type }} | -
- | Txn Hash |
+ Block |
+ Date |
+ Type |
+ Counterparty |
+ Amount (ꜩ) |
+ Status |
+ |
| + + {{ transaction.hash | truncate: '4':'true'}} + + | + + ++ + {{ transaction.block | truncate: '4':'true'}} + + | + + ++ + + {{ transaction.timestamp | timeAgo }} + + | + + ++ {{ getType(transaction) }} + | + + +
+
+
+ From
+ + + {{ getCounterparty(transaction) }} + + |
+
+
+
+ |
-
- - {{ getStatus(transaction) }} + + + | + {{ getStatus(transaction) }} |
|---|
Wallet not configured! -
\ No newline at end of file + + + \ No newline at end of file diff --git a/src/app/components/activity/activity.component.scss b/src/app/components/activity/activity.component.scss index d3d52363b..022214e48 100644 --- a/src/app/components/activity/activity.component.scss +++ b/src/app/components/activity/activity.component.scss @@ -12,6 +12,40 @@ .mono { font-family: "Courier New", Courier, monospace; } + +.table-row { + line-height: 1.2; //original at 1.5 +} +.table-cell { + vertical-align: middle; + padding: 10px; +} + +.row-hash { + font-weight: normal; +} +.transaction { + //font-weight: bold; +} + +.counterparty { + //word-wrap: break-word; +} + +.received { + background-color: #5cb85c; // rgb(0, 110, 9); +} + +.sent { + background-color: rgb(221, 21, 21); +} + +.amount { + text-align: right; +} +.smallText { + font-size: 80%; +} @media(min-width:768px) { #page-wrapper { position: inherit; diff --git a/src/app/components/activity/activity.component.ts b/src/app/components/activity/activity.component.ts index 22b1b7800..c016de234 100644 --- a/src/app/components/activity/activity.component.ts +++ b/src/app/components/activity/activity.component.ts @@ -1,31 +1,64 @@ import { Component, Input, OnInit, AfterViewInit, SimpleChange } from '@angular/core'; import { WalletService } from '../../services/wallet.service'; -import { MessageService } from '../../services/message.service'; +import { Constants } from '../../constants'; @Component({ - selector: 'app-activity', - templateUrl: './activity.component.html', - styleUrls: ['./activity.component.scss'] + selector: 'app-activity', + templateUrl: './activity.component.html', + styleUrls: ['./activity.component.scss'] }) export class ActivityComponent implements OnInit { - accounts = null; - @Input() activePkh: string; - constructor( - private walletService: WalletService, - private messageService: MessageService - ) { } + accounts = null; + CONSTANTS = new Constants(); + @Input() activePkh: string; + constructor( + private walletService: WalletService + ) {} - ngOnInit() { if (this.walletService.wallet) { this.init(); } } - init() { - this.accounts = this.walletService.wallet.accounts; - } - getStatus(transaction: any): string { - if (transaction.failed) { - return 'Failed'; - } else if (transaction.block === 'prevalidation') { - return 'Unconfirmed'; - } else { - return 'Confirmed'; + ngOnInit() { if (this.walletService.wallet) { this.init(); } } + init() { + this.accounts = this.walletService.wallet.accounts; + console.log('transaction', this.accounts[0].activities); + } + getStatus(transaction: any): string { + if (transaction.failed) { + return 'Failed'; + } else if (transaction.block === 'prevalidation') { + return 'Unconfirmed'; + } else { + return 'Confirmed'; + } + } + + getType(transaction: any): string { + if (transaction.type !== 'transaction') { + return transaction.type; + } else { + let operationType = ''; + if (transaction.amount > 0) { + operationType = 'received'; + } else { + operationType = 'sent'; + } + return operationType; + } + } + + getCounterparty(transaction: any): string { + console.log('transaction - getCounterparty', transaction); + let counterparty = ''; + + // Checks for delegation as destination is stored in transaction.destination.tz + if (transaction.type === 'delegation') { + return transaction.destination.tz; + } + + if (this.activePkh === transaction.source) { + counterparty = transaction.destination; // to + } else { + counterparty = transaction.source; // from + } + + return counterparty; } - } } diff --git a/src/app/components/backup/backup.component.html b/src/app/components/backup/backup.component.html index 956a63b9b..e83aeb7ba 100644 --- a/src/app/components/backup/backup.component.html +++ b/src/app/components/backup/backup.component.html @@ -44,7 +44,7 @@Your funding of a new account have successfully been broadcasted to the network
+Your delegation operation has been broadcasted successfully to the network
Your unsigned transaction have successfully been created
+Your unsigned transaction have been created successfully
on a path of self-discovery
-
{{ this.walletService.walletTypePrint() }}
- [ Betanet ]
+
{{ this.walletService.walletTypePrint() }}
+
[ {{ CONSTANTS.NET.NAME }} ]
- Track a wallet from its public key hash -
+Track a wallet from its public key hash
Your funding of a new account have successfully been broadcasted to the network
+Your funding of a new account has been broadcasted successfully to the network
Your unsigned transaction have successfully been created
+Your unsigned transaction has been created successfully
Operation failed!
{{ sendResponse.payload.msg }}
When you create a new wallet, a new Tezos seed is generated. Your Tezos seed is the master key of all your wallet and any value inside it.
Make sure to back it up, write it down, and keep it incredibly safe!
-**Do not lose it!** It cannot be recovered if you lose it.
-**Do not share it!** Your funds will be stolen if you use the seed on a malicious/phishing site.
-**Make a backup!** Secure it like the millions it may be worth one day.
+**Do not lose it!** It cannot be recovered if you lose it.
+**Do not share it!** Your funds will be stolen if you use the seed on a malicious/phishing site.
+**Make a backup!** Secure it like the millions it may be worth one day.
@@ -99,7 +99,7 @@Your public key hash: {{ getPkh() }}
Your wallet is now set up and ready to use.
-Please download your Encrypted Keystore File..
+Please download your Encrypted Keystore File.
diff --git a/src/app/components/new-wallet/new-wallet.component.ts b/src/app/components/new-wallet/new-wallet.component.ts index fd688a2d8..f1e541eae 100644 --- a/src/app/components/new-wallet/new-wallet.component.ts +++ b/src/app/components/new-wallet/new-wallet.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit, Input, Query, HostListener } from '@angular/core'; -import { WalletService } from '../../services/wallet.service'; -import { MessageService } from '../../services/message.service'; -import { ChangeDetectorRef } from '@angular/core'; +import { Component, OnInit, Input, HostListener } from '@angular/core'; + import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/fromEvent'; -import * as bip39 from 'bip39'; +import * as rnd from 'randomatic'; + +import { WalletService } from '../../services/wallet.service'; +import { MessageService } from '../../services/message.service'; import { ExportService } from '../../services/export.service'; import { ImportService } from '../../services/import.service'; -import * as rnd from 'randomatic'; + @Component({ selector: 'app-new-wallet', @@ -63,11 +64,12 @@ export class NewWalletComponent implements OnInit { console.log('Out of range'); } } - constructor(private walletService: WalletService, + constructor( + private walletService: WalletService, private messageService: MessageService, private exportService: ExportService, - private importService: ImportService, - private cdRef: ChangeDetectorRef) { } + private importService: ImportService + ) { } ngOnInit() { // rnd() only to create an offset for better visualisation. diff --git a/src/app/components/offline-signing/offline-signing.component.html b/src/app/components/offline-signing/offline-signing.component.html index 4f62ceec5..53bb37fdb 100644 --- a/src/app/components/offline-signing/offline-signing.component.html +++ b/src/app/components/offline-signing/offline-signing.component.html @@ -10,13 +10,24 @@{{ decodeOutput }}
+
+ Wallet appear to be online. Are you really sure you want to proceed with the signature process?
+
+
+ {{ decodeUnsignedOutput }}