Merge branch 'main' into feature/migrate-open-page-and-value-component-to-standalone

CHANGELOG.md

@@ -9,7 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the usability of the _Cancel_ / _Close_ buttons in the create watchlist item dialog
+- Refactored the `fireWealth` from `number` type to a structured object in the summary of the portfolio details endpoint
 - Refactored the _Open Startup_ (`/open`) page to standalone
+- Refactored the symbol pipe to standalone
+
+### Fixed
+
+- Handled an exception in the get asset profile functionality of the _Financial Modeling Prep_ service
 
 ## 2.205.0 - 2025-10-01
 

apps/api/src/app/portfolio/portfolio.controller.ts

@@ -195,7 +195,6 @@ export class PortfolioController {
         'excludedAccountsAndActivities',
         'fees',
         'filteredValueInBaseCurrency',
-        'fireWealth',
         'grossPerformance',
         'grossPerformanceWithCurrencyEffect',
         'interest',

apps/api/src/app/portfolio/portfolio.service.ts

@@ -2092,9 +2092,13 @@ export class PortfolioService {
       filteredValueInPercentage: netWorth
         ? filteredValueInBaseCurrency.div(netWorth).toNumber()
         : undefined,
-      fireWealth: new Big(currentValueInBaseCurrency)
+      fireWealth: {
-        .minus(emergencyFundHoldingsValueInBaseCurrency)
+        today: {
-        .toNumber(),
+          valueInBaseCurrency: new Big(currentValueInBaseCurrency)
+            .minus(emergencyFundHoldingsValueInBaseCurrency)
+            .toNumber()
+        }
+      },
       grossPerformance: new Big(netPerformance).plus(fees).toNumber(),
       grossPerformanceWithCurrencyEffect: new Big(
         netPerformanceWithCurrencyEffect

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -161,7 +161,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
             }
           ).then((res) => res.json());
 
-          if (etfInformation.website) {
+          if (etfInformation?.website) {
             response.url = etfInformation.website;
           }
 

apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -79,7 +79,7 @@ import { CreateAssetProfileDialogParams } from './create-asset-profile-dialog/in
     CommonModule,
     GfActivitiesFilterComponent,
     GfPremiumIndicatorComponent,
-    GfSymbolModule,
+    GfSymbolPipe,
     GfValueComponent,
     IonIcon,
     MatButtonModule,

apps/client/src/app/components/home-watchlist/create-watchlist-item-dialog/create-watchlist-item-dialog.html

@@ -12,7 +12,13 @@
     </mat-form-field>
   </div>
   <div class="d-flex justify-content-end" mat-dialog-actions>
-    <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
+    <button mat-button type="button" (click)="onCancel()">
+      @if (createWatchlistItemForm.dirty) {
+        <ng-container i18n>Cancel</ng-container>
+      } @else {
+        <ng-container i18n>Close</ng-container>
+      }
+    </button>
     <button
       color="primary"
       mat-flat-button

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@@ -5,7 +5,7 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interf
 import { GfDialogFooterComponent } from '@ghostfolio/client/components/dialog-footer/dialog-footer.component';
 import { GfDialogHeaderComponent } from '@ghostfolio/client/components/dialog-header/dialog-header.component';
 import { GfFileDropModule } from '@ghostfolio/client/directives/file-drop/file-drop.module';
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImportActivitiesService } from '@ghostfolio/client/services/import-activities.service';
 import { PortfolioPosition } from '@ghostfolio/common/interfaces';
@@ -63,7 +63,7 @@ import { ImportActivitiesDialogParams } from './interfaces/interfaces';
     GfDialogFooterComponent,
     GfDialogHeaderComponent,
     GfFileDropModule,
-    GfSymbolModule,
+    GfSymbolPipe,
     IonIcon,
     MatButtonModule,
     MatDialogModule,

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

@@ -1,7 +1,7 @@
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { User } from '@ghostfolio/common/interfaces';
+import { FireWealth, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
@@ -29,7 +29,7 @@ import { takeUntil } from 'rxjs/operators';
 })
 export class GfFirePageComponent implements OnDestroy, OnInit {
   public deviceType: string;
-  public fireWealth: Big;
+  public fireWealth: FireWealth;
   public hasImpersonationId: boolean;
   public hasPermissionToUpdateUserSettings: boolean;
   public isLoading = false;
@@ -55,17 +55,24 @@ export class GfFirePageComponent implements OnDestroy, OnInit {
       .fetchPortfolioDetails()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ summary }) => {
-        this.fireWealth = summary.fireWealth
+        this.fireWealth = {
-          ? new Big(summary.fireWealth)
+          today: {
-          : new Big(0);
+            valueInBaseCurrency: summary.fireWealth
-
+              ? summary.fireWealth.today.valueInBaseCurrency
+              : 0
+          }
+        };
         if (this.user.subscription?.type === 'Basic') {
-          this.fireWealth = new Big(10000);
+          this.fireWealth = {
+            today: {
+              valueInBaseCurrency: 10000
+            }
+          };
         }
 
-        this.withdrawalRatePerYear = this.fireWealth.mul(
+        this.withdrawalRatePerYear = Big(
-          this.user.settings.safeWithdrawalRate
+          this.fireWealth.today.valueInBaseCurrency
-        );
+        ).mul(this.user.settings.safeWithdrawalRate);
 
         this.withdrawalRatePerMonth = this.withdrawalRatePerYear.div(12);
 

apps/client/src/app/pages/portfolio/fire/fire-page.html

@@ -14,7 +14,7 @@
           [colorScheme]="user?.settings?.colorScheme"
           [currency]="user?.settings?.baseCurrency"
           [deviceType]="deviceType"
-          [fireWealth]="fireWealth?.toNumber()"
+          [fireWealth]="fireWealth?.today.valueInBaseCurrency"
           [hasPermissionToUpdateUserSettings]="
             !hasImpersonationId && hasPermissionToUpdateUserSettings
           "
@@ -100,7 +100,7 @@
             [isCurrency]="true"
             [locale]="user?.settings?.locale"
             [unit]="user?.settings?.baseCurrency"
-            [value]="fireWealth?.toNumber()"
+            [value]="fireWealth?.today.valueInBaseCurrency"
           />
         </span>
         <ng-container>&nbsp;</ng-container>

apps/client/src/app/pipes/symbol/symbol.module.ts

@@ -1,9 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { SymbolPipe } from './symbol.pipe';
-
-@NgModule({
-  declarations: [SymbolPipe],
-  exports: [SymbolPipe]
-})
-export class GfSymbolModule {}

apps/client/src/app/pipes/symbol/symbol.pipe.ts

@@ -3,10 +3,9 @@ import { prettifySymbol } from '@ghostfolio/common/helper';
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: 'gfSymbol',
+  name: 'gfSymbol'
-  standalone: false
 })
-export class SymbolPipe implements PipeTransform {
+export class GfSymbolPipe implements PipeTransform {
   public transform(aSymbol: string) {
     return prettifySymbol(aSymbol);
   }

libs/common/src/lib/interfaces/fire-wealth.interface.ts

@@ -0,0 +1,3 @@
+export interface FireWealth {
+  today: { valueInBaseCurrency: number };
+}

libs/common/src/lib/interfaces/index.ts

@@ -19,6 +19,7 @@ import type { EnhancedSymbolProfile } from './enhanced-symbol-profile.interface'
 import type { Export } from './export.interface';
 import type { FilterGroup } from './filter-group.interface';
 import type { Filter } from './filter.interface';
+import type { FireWealth } from './fire-wealth.interface';
 import type { HistoricalDataItem } from './historical-data-item.interface';
 import type { HoldingWithParents } from './holding-with-parents.interface';
 import type { Holding } from './holding.interface';
@@ -104,6 +105,7 @@ export {
   Export,
   Filter,
   FilterGroup,
+  FireWealth,
   HistoricalDataItem,
   HistoricalResponse,
   Holding,

libs/common/src/lib/interfaces/portfolio-summary.interface.ts

@@ -1,3 +1,4 @@
+import { FireWealth } from './fire-wealth.interface';
 import { PortfolioPerformance } from './portfolio-performance.interface';
 
 export interface PortfolioSummary extends PortfolioPerformance {
@@ -16,7 +17,7 @@ export interface PortfolioSummary extends PortfolioPerformance {
   fees: number;
   filteredValueInBaseCurrency?: number;
   filteredValueInPercentage?: number;
-  fireWealth: number;
+  fireWealth: FireWealth;
   grossPerformance: number;
   grossPerformanceWithCurrencyEffect: number;
   interest: number;

libs/ui/src/lib/activities-filter/activities-filter.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { Filter, FilterGroup } from '@ghostfolio/common/interfaces';
 
 import { COMMA, ENTER } from '@angular/cdk/keycodes';
@@ -39,7 +39,7 @@ import { translate } from '../i18n';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CommonModule,
-    GfSymbolModule,
+    GfSymbolPipe,
     IonIcon,
     MatAutocompleteModule,
     MatButtonModule,

libs/ui/src/lib/activities-table/activities-table.component.ts

@@ -1,7 +1,7 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type';
 import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import {
   DEFAULT_PAGE_SIZE,
   TAG_ID_EXCLUDE_FROM_ANALYSIS
@@ -73,7 +73,7 @@ import { GfValueComponent } from '../value/value.component';
     GfActivityTypeComponent,
     GfEntityLogoComponent,
     GfNoTransactionsInfoComponent,
-    GfSymbolModule,
+    GfSymbolPipe,
     GfValueComponent,
     IonIcon,
     MatButtonModule,

libs/ui/src/lib/assistant/assistant-list-item/assistant-list-item.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 
 import { FocusableOption } from '@angular/cdk/a11y';
@@ -24,7 +24,7 @@ import {
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [GfSymbolModule, RouterModule],
+  imports: [GfSymbolPipe, RouterModule],
   selector: 'gf-assistant-list-item',
   styleUrls: ['./assistant-list-item.scss'],
   templateUrl: './assistant-list-item.html'

libs/ui/src/lib/assistant/assistant.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
@@ -76,7 +76,7 @@ import {
     FormsModule,
     GfAssistantListItemComponent,
     GfEntityLogoComponent,
-    GfSymbolModule,
+    GfSymbolPipe,
     IonIcon,
     MatButtonModule,
     MatFormFieldModule,

libs/ui/src/lib/holdings-table/holdings-table.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { getLocale } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
@@ -34,7 +34,7 @@ import { GfValueComponent } from '../value/value.component';
   imports: [
     CommonModule,
     GfEntityLogoComponent,
-    GfSymbolModule,
+    GfSymbolPipe,
     GfValueComponent,
     MatButtonModule,
     MatDialogModule,

libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { LookupItem } from '@ghostfolio/common/interfaces';
 
@@ -57,7 +57,7 @@ import { AbstractMatFormField } from '../shared/abstract-mat-form-field';
   imports: [
     FormsModule,
     GfPremiumIndicatorComponent,
-    GfSymbolModule,
+    GfSymbolPipe,
     MatAutocompleteModule,
     MatFormFieldModule,
     MatInputModule,

libs/ui/src/lib/top-holdings/top-holdings.component.ts

@@ -1,4 +1,4 @@
-import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
+import { GfSymbolPipe } from '@ghostfolio/client/pipes/symbol/symbol.pipe';
 import { getLocale } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
@@ -46,7 +46,7 @@ import { GfValueComponent } from '../value/value.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CommonModule,
-    GfSymbolModule,
+    GfSymbolPipe,
     GfValueComponent,
     MatButtonModule,
     MatPaginatorModule,