From 7a171f65bc3df29f3d6c3fb6c3ab35e33aeafb82 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Tue, 12 Apr 2022 17:58:47 +0200 Subject: [PATCH] Minor fix --- .../fire-calculator/fire-calculator.component.stories.ts | 2 +- .../src/lib/fire-calculator/fire-calculator.component.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts index cce5727a8..6a451d20b 100644 --- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts +++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.stories.ts @@ -7,8 +7,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { baseCurrency, locale } from '@ghostfolio/common/config'; import { Meta, Story, moduleMetadata } from '@storybook/angular'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { GfValueModule } from '../value'; +import { GfValueModule } from '../value'; import { FireCalculatorComponent } from './fire-calculator.component'; import { FireCalculatorService } from './fire-calculator.service'; diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts index 12bdf2bc3..b8c2c6141 100644 --- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts +++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts @@ -12,6 +12,7 @@ import { } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/common/config'; +import { transformTickToAbbreviation } from '@ghostfolio/common/helper'; import { BarController, BarElement, @@ -20,10 +21,10 @@ import { LinearScale, Tooltip } from 'chart.js'; +import { isNumber } from 'lodash'; +import { Subject, takeUntil } from 'rxjs'; import { FireCalculatorService } from './fire-calculator.service'; -import { Subject, takeUntil } from 'rxjs'; -import { transformTickToAbbreviation } from '@ghostfolio/common/helper'; @Component({ selector: 'gf-fire-calculator', @@ -84,7 +85,7 @@ export class FireCalculatorComponent } public ngAfterViewInit() { - if (this.fireWealth && this.fireWealth >= 0) { + if (isNumber(this.fireWealth) && this.fireWealth >= 0) { setTimeout(() => { // Wait for the chartCanvas this.calculatorForm.patchValue({ @@ -98,7 +99,7 @@ export class FireCalculatorComponent } public ngOnChanges() { - if (this.fireWealth && this.fireWealth >= 0) { + if (isNumber(this.fireWealth) && this.fireWealth >= 0) { setTimeout(() => { // Wait for the chartCanvas this.calculatorForm.patchValue({