Merge branch 'main' of github.com:ghostfolio/ghostfolio

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the symbol lookup results by removing the currency from the name of cryptocurrencies (experimental)
 - Harmonized the data providers management style of the admin control panel
 - Extended the data providers management of the admin control panel by the asset profile count
 - Restricted the permissions of the demo user
@@ -32,7 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded `countup.js` from version `2.8.0` to `2.8.2`
 - Upgraded `nestjs` from version `10.4.15` to `11.0.12`
 - Upgraded `twitter-api-v2` from version `1.14.2` to `1.23.0`
-- Upgraded `yahoo-finance2` from version `2.11.3` to `3.3.2`
+- Upgraded `yahoo-finance2` from version `2.11.3` to `3.3.3`
 
 ### Fixed
 

apps/api/src/services/data-provider/data-provider.service.ts

@@ -663,9 +663,6 @@ export class DataProviderService {
         // Only allow symbols with supported currency
         return currency ? true : false;
       })
-      .sort(({ name: name1 }, { name: name2 }) => {
-        return name1?.toLowerCase().localeCompare(name2?.toLowerCase());
-      })
       .map((lookupItem) => {
         if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
           if (user.subscription.type === 'Premium') {
@@ -679,7 +676,21 @@ export class DataProviderService {
           lookupItem.dataProviderInfo.isPremium = false;
         }
 
+        if (
+          lookupItem.assetSubClass === 'CRYPTOCURRENCY' &&
+          user?.Settings?.settings.isExperimentalFeatures
+        ) {
+          // Remove DEFAULT_CURRENCY at the end of cryptocurrency names
+          lookupItem.name = lookupItem.name.replace(
+            new RegExp(` ${DEFAULT_CURRENCY}$`),
+            ''
+          );
+        }
+
         return lookupItem;
+      })
+      .sort(({ name: name1 }, { name: name2 }) => {
+        return name1?.toLowerCase().localeCompare(name2?.toLowerCase());
       });
 
     return {

apps/client/src/app/components/admin-settings/admin-settings.component.ts

@@ -146,29 +146,35 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
 
         this.dataSource = new MatTableDataSource(filteredProviders);
 
-        this.adminService
-          .fetchGhostfolioDataProviderStatus(
-            settings[PROPERTY_API_KEY_GHOSTFOLIO] as string
-          )
-          .pipe(
-            catchError(() => {
-              this.isGhostfolioApiKeyValid = false;
+        const ghostfolioApiKey = settings[
+          PROPERTY_API_KEY_GHOSTFOLIO
+        ] as string;
+
+        if (ghostfolioApiKey) {
+          this.adminService
+            .fetchGhostfolioDataProviderStatus(ghostfolioApiKey)
+            .pipe(
+              catchError(() => {
+                this.isGhostfolioApiKeyValid = false;
+
+                this.changeDetectorRef.markForCheck();
+
+                return of(null);
+              }),
+              filter((status) => {
+                return status !== null;
+              }),
+              takeUntil(this.unsubscribeSubject)
+            )
+            .subscribe((status) => {
+              this.ghostfolioApiStatus = status;
+              this.isGhostfolioApiKeyValid = true;
 
               this.changeDetectorRef.markForCheck();
-
-              return of(null);
-            }),
-            filter((status) => {
-              return status !== null;
-            }),
-            takeUntil(this.unsubscribeSubject)
-          )
-          .subscribe((status) => {
-            this.ghostfolioApiStatus = status;
-            this.isGhostfolioApiKeyValid = true;
-
-            this.changeDetectorRef.markForCheck();
-          });
+            });
+        } else {
+          this.isGhostfolioApiKeyValid = false;
+        }
 
         this.isLoading = false;
 

package-lock.json

@@ -89,7 +89,7 @@
         "svgmap": "2.12.2",
         "twitter-api-v2": "1.23.0",
         "uuid": "11.1.0",
-        "yahoo-finance2": "3.3.2",
+        "yahoo-finance2": "3.3.3",
         "zone.js": "0.15.0"
       },
       "devDependencies": {
@@ -36091,9 +36091,9 @@
       }
     },
     "node_modules/yahoo-finance2": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/yahoo-finance2/-/yahoo-finance2-3.3.2.tgz",
-      "integrity": "sha512-KJLrcEwG+PFxe7L2iXe1R9icceFChENA+2EdFo/6GYIFVJR4YJD3MrjIsAYfGuzK531EjDLyT4KSlpIkaKhhgw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/yahoo-finance2/-/yahoo-finance2-3.3.3.tgz",
+      "integrity": "sha512-H6BprlpMU5ieW1BszZiv1c/CHs11NFlnyfXp9UeV7uq8W5xf8xK/nIJwQoS9fdWqco0CTt8X7Gfj1xSnWtu0cQ==",
       "license": "MIT",
       "dependencies": {
         "@deno/shim-deno": "~0.18.0",

package.json

@@ -135,7 +135,7 @@
     "svgmap": "2.12.2",
     "twitter-api-v2": "1.23.0",
     "uuid": "11.1.0",
-    "yahoo-finance2": "3.3.2",
+    "yahoo-finance2": "3.3.3",
     "zone.js": "0.15.0"
   },
   "devDependencies": {