Browse Source

chore: rename variables and import order

pull/6034/head
Johnson Towoju 3 weeks ago
parent
commit
5fd4148f51
  1. 17
      apps/client/src/app/pages/portfolio/fire/fire-page.component.ts

17
apps/client/src/app/pages/portfolio/fire/fire-page.component.ts

@ -2,9 +2,9 @@ import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { import {
FireCalculation,
FireWealth, FireWealth,
User, User
FireCalculation
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator'; import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator';
@ -38,6 +38,7 @@ import { takeUntil } from 'rxjs/operators';
}) })
export class GfFirePageComponent implements OnDestroy, OnInit { export class GfFirePageComponent implements OnDestroy, OnInit {
public deviceType: string; public deviceType: string;
public fireCalculation: FireCalculation;
public fireWealth: FireWealth; public fireWealth: FireWealth;
public hasImpersonationId: boolean; public hasImpersonationId: boolean;
public hasPermissionToUpdateUserSettings: boolean; public hasPermissionToUpdateUserSettings: boolean;
@ -47,10 +48,8 @@ export class GfFirePageComponent implements OnDestroy, OnInit {
public user: User; public user: User;
public withdrawalRatePerMonth: Big; public withdrawalRatePerMonth: Big;
public withdrawalRatePerYear: Big; public withdrawalRatePerYear: Big;
public withdrawalRatePerMonthProjected: Big;
public projectedWithdrawalRatePerMonth: Big; public withdrawalRatePerYearProjected: Big;
public projectedWithdrawalRatePerYear: Big;
public fireCalculation: FireCalculation;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -246,12 +245,12 @@ export class GfFirePageComponent implements OnDestroy, OnInit {
this.user?.settings?.safeWithdrawalRate && this.user?.settings?.safeWithdrawalRate &&
this.fireCalculation.projectedTotalAmount this.fireCalculation.projectedTotalAmount
) { ) {
this.projectedWithdrawalRatePerYear = new Big( this.withdrawalRatePerYearProjected = new Big(
this.fireCalculation.projectedTotalAmount this.fireCalculation.projectedTotalAmount
).mul(this.user.settings.safeWithdrawalRate); ).mul(this.user.settings.safeWithdrawalRate);
this.projectedWithdrawalRatePerMonth = this.withdrawalRatePerMonthProjected =
this.projectedWithdrawalRatePerYear.div(12); this.withdrawalRatePerYearProjected.div(12);
} }
} }
} }

Loading…
Cancel
Save