From 0405785fcbd4c01381dd658e63a55dbc90a70e58 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 21 Oct 2023 10:00:03 +0200
Subject: [PATCH] Change features to general availability

* Fees on account level
* Interest on account level
* Search for a holding
---
 apps/api/src/app/user/user.service.ts                  |  8 ++++----
 .../create-or-update-activity-dialog.html              | 10 ++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index a176c43f3..91490528e 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -164,10 +164,10 @@ export class UserService {
     let currentPermissions = getPermissions(user.role);
 
     if (!(user.Settings.settings as UserSettings).isExperimentalFeatures) {
-      currentPermissions = without(
-        currentPermissions,
-        permissions.accessAssistant
-      );
+      // currentPermissions = without(
+      //   currentPermissions,
+      //   permissions.xyz
+      // );
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
index 4e600b110..c28f87d93 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
@@ -21,10 +21,7 @@
               >Stocks, ETFs, bonds, cryptocurrencies, commodities</small
             >
           </mat-option>
-          <mat-option
-            *ngIf="data.user?.settings?.isExperimentalFeatures"
-            value="FEE"
-          >
+          <mat-option value="FEE">
             <span><b>{{ typesTranslationMap['FEE'] }}</b></span>
             <small class="d-block line-height-1 text-muted text-nowrap" i18n
               >One-time fee, annual account fees</small
@@ -36,10 +33,7 @@
               >Distribution of corporate earnings</small
             >
           </mat-option>
-          <mat-option
-            *ngIf="data.user?.settings?.isExperimentalFeatures"
-            value="INTEREST"
-          >
+          <mat-option value="INTEREST">
             <span><b>{{ typesTranslationMap['INTEREST'] }}</b></span>
             <small class="d-block line-height-1 text-muted text-nowrap" i18n
               >Revenue for lending out money</small