Merge branch 'main' into feature/add-emergency-fund-setup-to-static-portfolio-analysis-rules

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added a new static portfolio analysis rule: Emergency fund setup
 
+### Fixed
+
+- Fixed a link on the features page
+
 ## 2.6.0 - 2023-09-26
 
 ### Added

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

@@ -51,13 +51,13 @@ import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import {
   Account,
+  Type as ActivityType,
   AssetClass,
   DataSource,
   Order,
   Platform,
   Prisma,
-  Tag,
+  Tag
-  Type as ActivityType
 } from '@prisma/client';
 import Big from 'big.js';
 import {

apps/client/src/app/directives/file-drop/file-drop.directive.ts

@@ -1,4 +1,4 @@
-import { Directive, HostListener, Output, EventEmitter } from '@angular/core';
+import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
 
 @Directive({
   selector: '[gfFileDrop]'

apps/client/src/app/pages/features/features-page.component.ts

@@ -15,6 +15,7 @@ export class FeaturesPageComponent implements OnDestroy {
   public hasPermissionForSubscription: boolean;
   public info: InfoItem;
   public routerLinkRegister = ['/' + $localize`register`];
+  public routerLinkResources = ['/' + $localize`resources`];
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();