Merge 54d8ba4 into 9b6df8a

particl · Jul 3, 2017 · fee22ea · fee22ea
2 parents 9b6df8a + 54d8ba4
commit fee22ea
Show file tree

Hide file tree

Showing 8 changed files with 406 additions and 128 deletions.
diff --git a/src/app/overview/overview.component.html b/src/app/overview/overview.component.html
@@ -27,6 +27,7 @@
         </ul>
       </app-header>
       <transaction-table
+        amountOfTxsToDisplay=5
         [displayHeader]="false"
         [displayInternalHeader]="true"
         [displayPagination]="false"

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
@@ -14,7 +14,8 @@ import { TableComponent } from './table/table.component';
 @NgModule({
   imports: [
     CommonModule,
-    AccordionModule
+    AccordionModule,
+    PaginationModule.forRoot()
   ],
   declarations: [
     HeaderComponent,

diff --git a/src/app/wallet/history/history.component.html b/src/app/wallet/history/history.component.html
@@ -19,7 +19,7 @@
   <transaction-table
     [displayHeader]="false"
     [displayInternalHeader]="true"
-    [displayPagination]="false"
+    [displayPagination]="true"
     [displayCategory]="true"
     [displaySenderAddress]="true"
     [displayDate]="true"

diff --git a/src/app/wallet/history/history.component.spec.ts b/src/app/wallet/history/history.component.spec.ts
@@ -5,6 +5,10 @@ import { HistoryComponent } from './history.component';
 import { SharedModule } from '../../shared/shared.module';
 import { WalletModule } from '../../wallet/wallet.module';
 
+import { ElectronService } from 'ngx-electron';
+import { AppService } from '../../app.service';
+import { RPCService } from '../../core/rpc/rpc.service';
+
 describe('HistoryComponent', () => {
   let component: HistoryComponent;
   let fixture: ComponentFixture<HistoryComponent>;
@@ -15,6 +19,11 @@ describe('HistoryComponent', () => {
         SharedModule,
         WalletModule.forRoot()
       ],
+      providers: [
+        AppService,
+        ElectronService,
+        RPCService
+      ]
     })
     .compileComponents();
   }));

diff --git a/src/app/wallet/shared/transaction-table/transaction-table.component.html b/src/app/wallet/shared/transaction-table/transaction-table.component.html
@@ -22,14 +22,14 @@
         Send
         <span class="icon fa fa-arrow-right color-red"></span>
       </span>
-      <span *ngSwitchCase="'received'" class="inline-tag text-uppercase">
+      <span *ngSwitchCase="'receive'" class="inline-tag text-uppercase">
         Received
         <span class="icon fa fa-arrow-left color-green"></span>
       </span>
     </td>
     <td *ngIf="displaySenderAddress">
       <span class="inline-header">Address</span>
-      <span>{{ tx.address }}</span>
+      <span>{{ tx.getAddress() }}</span>
     </td>
     <td *ngIf="displayDate">
       <span class="inline-header"><span class="icon fa fa-clock-o"></span></span>
@@ -50,7 +50,7 @@
     </td>
     <td *ngIf="displayAmount">
       <span class="inline-header">Amount</span>
-      <span>{{ tx.amount }} PART</span>
+      <span>{{ tx.getAmount() }} PART</span>
     </td>
   </tr>
 </app-table>

diff --git a/src/app/wallet/shared/transaction-table/transaction-table.component.ts b/src/app/wallet/shared/transaction-table/transaction-table.component.ts
@@ -6,14 +6,16 @@ import { TransactionService } from '../transaction.service';
 @Component({
   selector: 'transaction-table',
   templateUrl: './transaction-table.component.html',
-  styleUrls: ['./transaction-table.component.scss']
+  styleUrls: ['./transaction-table.component.scss'],
+  providers: [TransactionService]
 })
 export class TransactionsTableComponent implements OnInit {
   /* Determines what fields are displayed in the Transaction Table. */
     /* header and utils */
   @Input() displayHeader: boolean = true;
   @Input() displayInternalHeader: boolean = false;
   @Input() displayPagination: boolean = false;
+  @Input() amountOfTxsToDisplay: number = 10;
 
     /* actual fields */
   @Input() displayCategory: boolean = true;
@@ -27,11 +29,12 @@ export class TransactionsTableComponent implements OnInit {
   @Input() displayBlockHash: boolean = false;
   @Input() displayBlockIndex: boolean = false;
 
+
   constructor(public txService: TransactionService) {
-    // make life easy in component html
   }
 
   ngOnInit() {
+    this.txService.postConstructor(this.amountOfTxsToDisplay);
   }
 
   public pageChanged(event: any): void {