+ {{ 'ACCOUNTCOMPONENT.EMPTY' | translate }} +
Wallets created during the ICO need to be activated.
-No private key is required for the activation process.
+{{ 'ACTIVATECOMPONENT.INFO1' | translate }}
+{{ 'ACTIVATECOMPONENT.INFO2' | translate }}
| Txn Hash | -Block | -Date | -Type | -Counterparty | -Amount (ꜩ) | -Status | +{{ 'ACTIVITYCOMPONENT.TXNHASH' | translate }} | +{{ 'ACTIVITYCOMPONENT.BLOCK' | translate }} | +{{ 'ACTIVITYCOMPONENT.DATE' | translate }} | +{{ 'ACTIVITYCOMPONENT.TYPE' | translate }} | +{{ 'ACTIVITYCOMPONENT.COUNTERPARTY' | translate }} | +{{ 'ACTIVITYCOMPONENT.AMOUNT' | translate }} (ꜩ) | +{{ 'ACTIVITYCOMPONENT.STATUS' | translate }} |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -45,10 +45,11 @@ |
-
- From
- @@ -68,6 +69,18 @@ {{ getStatus(transaction) }} |
- Wallet not configured! + {{ 'ACTIVITYCOMPONENT.EMPTY' | translate }}
\ 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 022214e48..c058c55de 100644 --- a/src/app/components/activity/activity.component.scss +++ b/src/app/components/activity/activity.component.scss @@ -43,9 +43,28 @@ .amount { text-align: right; } + .smallText { font-size: 80%; } + +.btn-balance { + color: #6c757d; + padding-right: 0rem; // original 0.5rem; + padding-left: 0rem; // original 0.5rem; +} + +.last-btn-column > td { + background-color: white; + padding-top: 0.25rem; // default at 0.75rem + padding-bottom: 0.25rem; // default at 0.75rem +} + +.show-more { + font-size: 0.9rem; + width: 73px; +} + @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 c016de234..8ae1ae86b 100644 --- a/src/app/components/activity/activity.component.ts +++ b/src/app/components/activity/activity.component.ts @@ -1,6 +1,10 @@ import { Component, Input, OnInit, AfterViewInit, SimpleChange } from '@angular/core'; import { WalletService } from '../../services/wallet.service'; +import { TzscanService } from '../../services/tzscan.service'; + import { Constants } from '../../constants'; +import { TimeAgoPipe } from '../../pipes/time-ago.pipe'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-activity', @@ -10,16 +14,19 @@ import { Constants } from '../../constants'; export class ActivityComponent implements OnInit { accounts = null; CONSTANTS = new Constants(); + @Input() activePkh: string; constructor( - private walletService: WalletService + private walletService: WalletService, + private tzscanService: TzscanService, ) {} ngOnInit() { if (this.walletService.wallet) { this.init(); } } init() { this.accounts = this.walletService.wallet.accounts; - console.log('transaction', this.accounts[0].activities); + console.log('activePkh: ', this.activePkh); } + getStatus(transaction: any): string { if (transaction.failed) { return 'Failed'; @@ -32,7 +39,15 @@ export class ActivityComponent implements OnInit { getType(transaction: any): string { if (transaction.type !== 'transaction') { - return transaction.type; + if (transaction.type === 'delegation') { + if (transaction.destination) { + return 'delegate'; + } else { + return 'undelegate'; + } + } else { + return transaction.type; + } } else { let operationType = ''; if (transaction.amount > 0) { @@ -45,12 +60,16 @@ export class ActivityComponent implements OnInit { } getCounterparty(transaction: any): string { - console.log('transaction - getCounterparty', transaction); + // 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 (transaction.destination) { + return transaction.destination.tz; + } else { + return ''; // User has undelegate + } } if (this.activePkh === transaction.source) { diff --git a/src/app/components/backup/backup.component.html b/src/app/components/backup/backup.component.html index e83aeb7ba..b9878995f 100644 --- a/src/app/components/backup/backup.component.html +++ b/src/app/components/backup/backup.component.html @@ -2,7 +2,7 @@A wallet backup protects your tez against computer or software failure. If you lose the backup and can't - access your wallet for some reasons, your tez are permanently lost!
-It is recommended that you store backups of both forms of your key (the Keystore file version and paper wallet - version) in physically separate, offline environments.
+{{ 'BACKUPCOMPONENT.HEADING1' | translate }}
+{{ 'BACKUPCOMPONENT.HEADING2' | translate }}
This wallet file will contain your private seed encrypted with your password.
-This wallet file will contain your public key.
-This wallet file will contain your public key hash.
+{{ 'BACKUPCOMPONENT.INFOFULLWALLET' | translate }}
+{{ 'BACKUPCOMPONENT.INFOVIEWONLYWALLET' | translate }}
+{{ 'BACKUPCOMPONENT.INFOOBSERVERWALLET' | translate }}
This wallet file will contain your public key (Needed to create unsigned operations).
+{{ 'BACKUPCOMPONENT.INFOVIEWONLYWALLET2' | translate }}
In the bakery, you can easily set different delegates for your accounts.
-Please note that you can't delegate with your identity. You need to create new accounts.
+{{ 'BAKERYCOMPONENT.HEADING' | translate }}
+{{ 'BAKERYCOMPONENT.INFO' | translate }}
+ {{ 'BAKERYCOMPONENT.EMPTY' | translate }} +