diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html index 2208b37ffb..36aa37c272 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html @@ -90,10 +90,12 @@

{{"labels.heading.Account Overview" | translate}}

[active]="IRC.isActive"> {{"labels.inputs.Interest Rate Chart" | translate }} - - {{"labels.inputs.Transactions" | translate }} - + + + {{"labels.inputs.Transactions" | translate }} + + {{"labels.inputs.Charges" | translate }} diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts index c4b04a1098..f503d3dc56 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts @@ -36,6 +36,7 @@ export class FixedDepositAccountViewComponent implements OnInit { /** Entity Type */ entityType: string; currency: Currency; + showTransactions = false; /** * Fetches fixed deposits account data from `resolve` @@ -54,6 +55,8 @@ export class FixedDepositAccountViewComponent implements OnInit { this.fixedDepositsAccountData = data.fixedDepositsAccountData; this.savingsDatatables = data.savingsDatatables; this.currency = this.fixedDepositsAccountData.currency; + const status: any = data.fixedDepositsAccountData.status; + this.showTransactions = (status.id >= 300); }); if (this.router.url.includes('clients')) { this.entityType = 'Client'; diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html index 433d6960c9..ccefed96b6 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts index 54eb2c5d5f..888f720843 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts @@ -13,9 +13,6 @@ import { ActivatedRoute, Router } from '@angular/router'; }) export class TransactionsTabComponent implements OnInit { - /** Fixed Deposits Account Status */ - status: string; - showTransactionsData = false; /** Transactions Data */ transactionsData: any; /** Columns to be displayed in transactions table. */ @@ -32,8 +29,6 @@ export class TransactionsTabComponent implements OnInit { private router: Router) { this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => { this.transactionsData = data.fixedDepositsAccountData.transactions; - this.status = data.fixedDepositsAccountData.status.value; - this.showTransactionsData = (this.status === 'Active'); }); } diff --git a/src/assets/images/recurring-deposits_account_placeholder.png b/src/assets/images/recurring-deposits_account_placeholder.png index 5bff577f92..658762c028 100644 Binary files a/src/assets/images/recurring-deposits_account_placeholder.png and b/src/assets/images/recurring-deposits_account_placeholder.png differ