Merge branch 'main' into task/upgrade-to-prisma-7

CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Set the active sort column in the accounts table component
+- Deprecated `activities` in the endpoint `GET api/v1/portfolio/holding/:dataSource/:symbol`
+- Moved the admin service to `@ghostfolio/ui/services`
+- Moved the data service to `@ghostfolio/ui/services`
+- Refactored the dividend import
+- Refreshed the cryptocurrencies list
+- Upgraded `prisma` from version `6.19.0` to `7.2.0`
+
+### Fixed
+
+- Fixed the filtering by asset class in the endpoint `GET api/v1/portfolio/holdings`
+
+## 2.228.0 - 2026-01-03
+
 ### Added
 
 - Extended the portfolio holdings to include performance with currency effects for cash positions
@@ -16,7 +32,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Integrated the endpoint to get all platforms (`GET api/v1/platforms`) into the create or update account dialog
 - Extracted the scraper configuration to a dedicated tab in the asset profile details dialog of the admin control panel
 - Improved the language localization for German (`de`)
-- Upgraded `prisma` from version `6.19.0` to `7.2.0`
+- Upgraded `@date-fns/utc` from version `2.1.0` to `2.1.1`
+
+### Fixed
+
+- Improved the table headers’ alignment of the accounts table on mobile
 
 ## 2.227.0 - 2026-01-02
 

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

@@ -103,6 +103,7 @@ export class ImportController {
     const activities = await this.importService.getDividends({
       dataSource,
       symbol,
+      userCurrency: this.request.user.settings.settings.baseCurrency,
       userId: this.request.user.id
     });
 

apps/api/src/app/import/import.module.ts

@@ -6,6 +6,7 @@ import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module'
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';
+import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
@@ -24,6 +25,7 @@ import { ImportService } from './import.service';
   controllers: [ImportController],
   imports: [
     AccountModule,
+    ApiModule,
     CacheModule,
     ConfigurationModule,
     DataGatheringModule,

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

@@ -2,6 +2,7 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
@@ -25,7 +26,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import {
-  AccountWithPlatform,
+  AccountWithValue,
   OrderWithAccount,
   UserWithSettings
 } from '@ghostfolio/common/types';
@@ -43,6 +44,7 @@ import { ImportDataDto } from './import-data.dto';
 export class ImportService {
   public constructor(
     private readonly accountService: AccountService,
+    private readonly apiService: ApiService,
     private readonly configurationService: ConfigurationService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly dataProviderService: DataProviderService,
@@ -57,8 +59,12 @@ export class ImportService {
   public async getDividends({
     dataSource,
     symbol,
+    userCurrency,
     userId
-  }: AssetProfileIdentifier & { userId: string }): Promise<Activity[]> {
+  }: AssetProfileIdentifier & {
+    userCurrency: string;
+    userId: string;
+  }): Promise<Activity[]> {
     try {
       const holding = await this.portfolioService.getHolding({
         dataSource,
@@ -71,36 +77,45 @@ export class ImportService {
         return [];
       }
 
-      const { activities, firstBuyDate, historicalData } = holding;
+      const filters = this.apiService.buildFiltersFromQueryParams({
+        filterByDataSource: dataSource,
+        filterBySymbol: symbol
+      });
 
-      const [[assetProfile], dividends] = await Promise.all([
+      const { firstBuyDate, historicalData } = holding;
-        this.symbolProfileService.getSymbolProfiles([
-          {
-            dataSource,
-            symbol
-          }
-        ]),
-        await this.dataProviderService.getDividends({
-          dataSource,
-          symbol,
-          from: parseDate(firstBuyDate),
-          granularity: 'day',
-          to: new Date()
-        })
-      ]);
 
-      const accounts = activities
+      const [{ accounts }, { activities }, [assetProfile], dividends] =
-        .filter(({ account }) => {
+        await Promise.all([
-          return !!account;
+          this.portfolioService.getAccountsWithAggregations({
-        })
+            filters,
-        .map(({ account }) => {
+            userId,
-          return account;
+            withExcludedAccounts: true
-        });
+          }),
+          this.orderService.getOrders({
+            filters,
+            userCurrency,
+            userId,
+            startDate: parseDate(firstBuyDate)
+          }),
+          this.symbolProfileService.getSymbolProfiles([
+            {
+              dataSource,
+              symbol
+            }
+          ]),
+          await this.dataProviderService.getDividends({
+            dataSource,
+            symbol,
+            from: parseDate(firstBuyDate),
+            granularity: 'day',
+            to: new Date()
+          })
+        ]);
 
       const account = this.isUniqueAccount(accounts) ? accounts[0] : undefined;
 
       return await Promise.all(
-        Object.entries(dividends).map(async ([dateString, { marketPrice }]) => {
+        Object.entries(dividends).map(([dateString, { marketPrice }]) => {
           const quantity =
             historicalData.find((historicalDataItem) => {
               return historicalDataItem.date === dateString;
@@ -695,11 +710,11 @@ export class ImportService {
     );
   }
 
-  private isUniqueAccount(accounts: AccountWithPlatform[]) {
+  private isUniqueAccount(accounts: AccountWithValue[]) {
     const uniqueAccountIds = new Set<string>();
 
-    for (const account of accounts) {
+    for (const { id } of accounts) {
-      uniqueAccountIds.add(account.id);
+      uniqueAccountIds.add(id);
     }
 
     return uniqueAccountIds.size === 1;

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

@@ -329,19 +329,39 @@ export class OrderService {
    * performance tracking based on exchange rate fluctuations.
    *
    * @param cashDetails - The cash balance details.
+   * @param filters - Optional filters to apply.
    * @param userCurrency - The base currency of the user.
    * @param userId - The ID of the user.
    * @returns A response containing the list of synthetic cash activities.
    */
   public async getCashOrders({
     cashDetails,
+    filters = [],
     userCurrency,
     userId
   }: {
     cashDetails: CashDetails;
+    filters?: Filter[];
     userCurrency: string;
     userId: string;
   }): Promise<ActivitiesResponse> {
+    const filtersByAssetClass = filters.filter(({ type }) => {
+      return type === 'ASSET_CLASS';
+    });
+
+    if (
+      filtersByAssetClass.length > 0 &&
+      !filtersByAssetClass.find(({ id }) => {
+        return id === AssetClass.LIQUIDITY;
+      })
+    ) {
+      // If asset class filters are present and none of them is liquidity, return an empty response
+      return {
+        activities: [],
+        count: 0
+      };
+    }
+
     const activities: Activity[] = [];
 
     for (const account of cashDetails.accounts) {
@@ -755,6 +775,7 @@ export class OrderService {
 
     const cashOrders = await this.getCashOrders({
       cashDetails,
+      filters,
       userCurrency,
       userId
     });

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts

@@ -18,6 +18,7 @@ import { HistoricalDataItem } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
 import { DataSource } from '@prisma/client';
+import { Big } from 'big.js';
 import { randomUUID } from 'node:crypto';
 
 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
@@ -207,17 +208,23 @@ describe('PortfolioCalculator', () => {
         userId: userDummyData.id
       });
 
-      const { historicalData } = await portfolioCalculator.computeSnapshot();
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot();
 
-      const historicalData20231231 = historicalData.find(({ date }) => {
+      const historicalData20231231 = portfolioSnapshot.historicalData.find(
-        return date === '2023-12-31';
+        ({ date }) => {
-      });
+          return date === '2023-12-31';
-      const historicalData20240101 = historicalData.find(({ date }) => {
+        }
-        return date === '2024-01-01';
+      );
-      });
+      const historicalData20240101 = portfolioSnapshot.historicalData.find(
-      const historicalData20241231 = historicalData.find(({ date }) => {
+        ({ date }) => {
-        return date === '2024-12-31';
+          return date === '2024-01-01';
-      });
+        }
+      );
+      const historicalData20241231 = portfolioSnapshot.historicalData.find(
+        ({ date }) => {
+          return date === '2024-12-31';
+        }
+      );
 
       /**
        * Investment value with currency effect: 1000 USD * 0.85 = 850 CHF
@@ -285,6 +292,13 @@ describe('PortfolioCalculator', () => {
         value: 1820,
         valueWithCurrencyEffect: 1800
       });
+
+      expect(portfolioSnapshot).toMatchObject({
+        hasErrors: false,
+        totalFeesWithCurrencyEffect: new Big('0'),
+        totalInterestWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0')
+      });
     });
   });
 });

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

@@ -1872,18 +1872,17 @@ export class PortfolioService {
       netPerformanceWithCurrencyEffect
     } = performance;
 
-    const dividendInBaseCurrency =
-      await portfolioCalculator.getDividendInBaseCurrency();
-
     const totalEmergencyFund = this.getTotalEmergencyFund({
       emergencyFundHoldingsValueInBaseCurrency,
       userSettings: user.settings?.settings as UserSettings
     });
 
-    const fees = await portfolioCalculator.getFeesInBaseCurrency();
+    const dateOfFirstActivity = portfolioCalculator.getStartDate();
 
-    const firstOrderDate = portfolioCalculator.getStartDate();
+    const dividendInBaseCurrency =
+      await portfolioCalculator.getDividendInBaseCurrency();
 
+    const fees = await portfolioCalculator.getFeesInBaseCurrency();
     const interest = await portfolioCalculator.getInterestInBaseCurrency();
 
     const liabilities =
@@ -1941,7 +1940,7 @@ export class PortfolioService {
       .minus(liabilities)
       .toNumber();
 
-    const daysInMarket = differenceInDays(new Date(), firstOrderDate);
+    const daysInMarket = differenceInDays(new Date(), dateOfFirstActivity);
 
     const annualizedPerformancePercent = getAnnualizedPerformancePercent({
       daysInMarket,
@@ -1960,6 +1959,7 @@ export class PortfolioService {
       annualizedPerformancePercent,
       annualizedPerformancePercentWithCurrencyEffect,
       cash,
+      dateOfFirstActivity,
       excludedAccountsAndActivities,
       netPerformance,
       netPerformancePercentage,
@@ -1972,7 +1972,6 @@ export class PortfolioService {
       }).length,
       committedFunds: committedFunds.toNumber(),
       currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(),
-      dateOfFirstActivity: firstOrderDate,
       dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
       emergencyFund: {
         assets: emergencyFundHoldingsValueInBaseCurrency,

apps/api/src/assets/cryptocurrencies/cryptocurrencies.json

@@ -22,6 +22,7 @@
   "2015": "2015 coin",
   "2024": "2024",
   "2025": "2025 TOKEN",
+  "2026": "2026",
   "2049": "TOKEN 2049",
   "2192": "LERNITAS",
   "4444": "4444 Meme",
@@ -83,6 +84,7 @@
   "1UP": "Uptrennd",
   "1WO": "1World",
   "2022M": "2022MOON",
+  "2026MEMECLUB": "2026",
   "20EX": "20ex",
   "21BTC": "21.co Wrapped BTC",
   "21X": "21X",
@@ -177,11 +179,13 @@
   "AAI": "AutoAir AI",
   "AAPLX": "Apple xStock",
   "AAPX": "AMPnet",
+  "AARBWBTC": "Aave Arbitrum WBTC",
   "AARDY": "Baby Aardvark",
   "AARK": "Aark",
   "AART": "ALL.ART",
   "AAST": "AASToken",
   "AAT": "Agricultural Trade Chain",
+  "AAVAWBTC": "Aave aWBTC",
   "AAVE": "Aave",
   "AAVEE": "AAVE.e (Avalanche Bride)",
   "AAVEGOTCHIFOMO": "Aavegotchi FOMO",
@@ -295,7 +299,8 @@
   "ADEL": "Akropolis Delphi",
   "ADF": "Art de Finance",
   "ADH": "Adhive",
-  "ADI": "Aditus",
+  "ADI": "ADI",
+  "ADITUS": "Aditus",
   "ADIX": "Adix Token",
   "ADK": "Aidos Kuneen",
   "ADL": "Adel",
@@ -412,6 +417,7 @@
   "AGVC": "AgaveCoin",
   "AGVE": "Agave",
   "AGX": "Agricoin",
+  "AHARWBTC": "Aave Harmony WBTC",
   "AHOO": "Ahoolee",
   "AHT": "AhaToken",
   "AI": "Sleepless",
@@ -626,6 +632,7 @@
   "ALITA": "Alita Network",
   "ALITATOKEN": "Alita Token",
   "ALIX": "AlinX",
+  "ALK": "Alkemi Network DAO Token",
   "ALKI": "Alkimi",
   "ALKIMI": "ALKIMI",
   "ALLBI": "ALL BEST ICO",
@@ -639,6 +646,7 @@
   "ALMANAK": "Almanak",
   "ALMC": "Awkward Look Monkey Club",
   "ALME": "Alita",
+  "ALMEELA": "Almeela",
   "ALMOND": "Almond",
   "ALN": "Aluna",
   "ALNV1": "Aluna v1",
@@ -690,6 +698,7 @@
   "AMAL": "AMAL",
   "AMAPT": "Amnis Finance",
   "AMATEN": "Amaten",
+  "AMATO": "AMATO",
   "AMAZINGTEAM": "AmazingTeamDAO",
   "AMB": "AirDAO",
   "AMBER": "AmberCoin",
@@ -825,6 +834,7 @@
   "AOK": "AOK",
   "AOL": "AOL (America Online)",
   "AOP": "Ark Of Panda",
+  "AOPTWBTC": "Aave Optimism WBTC",
   "AOS": "AOS",
   "AOT": "Age of Tanks",
   "AP": "America Party",
@@ -861,6 +871,7 @@
   "APOL": "Apollo FTW",
   "APOLL": "Apollon Limassol",
   "APOLLO": "Apollo Crypto",
+  "APOLWBTC": "Aave Polygon WBTC",
   "APP": "Moon App",
   "APPA": "Dappad",
   "APPC": "AppCoins",
@@ -914,6 +925,7 @@
   "ARAW": "Araw",
   "ARB": "Arbitrum",
   "ARBI": "Arbipad",
+  "ARBINU": "ArbInu",
   "ARBIT": "Arbit Coin",
   "ARBP": "ARB Protocol",
   "ARBS": "Arbswap",
@@ -1041,6 +1053,7 @@
   "ASBNB": "Astherus Staked BNB",
   "ASC": "All InX SMART CHAIN",
   "ASCEND": "Ascend",
+  "ASCN": "AlphaScan",
   "ASD": "AscendEX Token",
   "ASDEX": "AstraDEX",
   "ASEED": "aUSD SEED (Acala)",
@@ -1133,6 +1146,7 @@
   "ATLA": "Atleta Network",
   "ATLAS": "Star Atlas",
   "ATLASD": "Atlas DEX",
+  "ATLASOFUSA": "Atlas",
   "ATLX": "Atlantis Loans Polygon",
   "ATM": "Atletico de Madrid Fan Token",
   "ATMA": "ATMA",
@@ -1173,6 +1187,7 @@
   "AUCO": "Advanced United Continent",
   "AUCTION": "Bounce",
   "AUDC": "Aussie Digital",
+  "AUDD": "Australian Digital Dollar",
   "AUDF": "Forte AUD",
   "AUDIO": "Audius",
   "AUDM": "Macropod Stablecoin",
@@ -1260,6 +1275,7 @@
   "AWARE": "ChainAware.ai",
   "AWARETOKEN": "AWARE",
   "AWAX": "AWAX",
+  "AWBTC": "Aave interest bearing WBTC",
   "AWC": "Atomic Wallet Coin",
   "AWE": "AWE Network",
   "AWK": "Awkward Monkey Base",
@@ -1302,6 +1318,7 @@
   "AXT": "AIX",
   "AXYS": "Axys",
   "AYA": "Aryacoin",
+  "AYFI": "Aave YFI",
   "AYNI": "Ayni Gold",
   "AZ": "Azbit",
   "AZA": "Kaliza",
@@ -1314,6 +1331,7 @@
   "AZR": "Azure",
   "AZU": "Azultec",
   "AZUKI": "Azuki",
+  "AZUKI2": "AZUKI 2.0",
   "AZUKIDAO": "AzukiDAO",
   "AZUM": "Azuma Coin",
   "AZUR": "Azuro Protocol",
@@ -1535,6 +1553,7 @@
   "BAOM": "Battle of Memes",
   "BAOS": "BaoBaoSol",
   "BAOV1": "BaoToken v1",
+  "BAP3X": "bAP3X",
   "BAR": "FC Barcelona Fan Token",
   "BARA": "Capybara",
   "BARAKATUH": "Barakatuh",
@@ -1678,6 +1697,7 @@
   "BCOINM": "Bomb Crypto (MATIC)",
   "BCOINSOL": "Bomb Crypto (SOL)",
   "BCOINTON": "Bomb Crypto (TON)",
+  "BCONG": "BabyCong",
   "BCOQ": "BLACK COQINU",
   "BCP": "BlockChainPeople",
   "BCPAY": "Bitcashpay",
@@ -1735,6 +1755,7 @@
   "BEATAI": "eBeat AI",
   "BEATLES": "JohnLennonC0IN",
   "BEATS": "Sol Beats",
+  "BEATSWAP": "BeatSwap",
   "BEATTOKEN": "BEAT Token",
   "BEAVER": "beaver",
   "BEB1M": "BeB",
@@ -1851,6 +1872,7 @@
   "BFLOKI": "BurnFloki",
   "BFLY": "Butterfly Protocol",
   "BFM": "BenefitMine",
+  "BFR": "Buffer Token",
   "BFT": "BF Token",
   "BFTB": "Brazil Fan Token",
   "BFTC": "BITS FACTOR",
@@ -2098,6 +2120,7 @@
   "BLACKSALE": "Black Sale",
   "BLACKST": "Black Stallion",
   "BLACKSWAN": "BlackSwan AI",
+  "BLACKWHALE": "The Black Whale",
   "BLADE": "BladeGames",
   "BLADEW": "BladeWarrior",
   "BLAKEBTC": "BlakeBitcoin",
@@ -2143,7 +2166,8 @@
   "BLOB": "B.O.B the Blob",
   "BLOBERC20": "Blob",
   "BLOC": "Blockcloud",
-  "BLOCK": "Blockasset",
+  "BLOCK": "Block",
+  "BLOCKASSET": "Blockasset",
   "BLOCKB": "Block Browser",
   "BLOCKBID": "Blockbid",
   "BLOCKF": "Block Farm Club",
@@ -2218,6 +2242,7 @@
   "BM": "BitMoon",
   "BMAGA": "Baby Maga",
   "BMARS": "Binamars",
+  "BMAX": "BMAX",
   "BMB": "Beamable Network Token",
   "BMBO": "Bamboo Coin",
   "BMC": "Blackmoon Crypto",
@@ -2495,6 +2520,7 @@
   "BOWSC": "BowsCoin",
   "BOWSER": "Bowser",
   "BOX": "DeBoxToken",
+  "BOXABL": "BOXABL",
   "BOXCAT": "BOXCAT",
   "BOXETH": "Cat-in-a-Box Ether",
   "BOXT": "BOX Token",
@@ -2579,6 +2605,7 @@
   "BRETTGOLD": "Brett Gold",
   "BRETTONETH": "Brett ETH",
   "BRETTSUI": "Brett (brettsui.com)",
+  "BREV": "Brevis Token",
   "BREW": "CafeSwap Token",
   "BREWERY": "Brewery Consortium Coin",
   "BREWLABS": "Brewlabs",
@@ -2737,6 +2764,7 @@
   "BTCAS": "BitcoinAsia",
   "BTCAT": "Bitcoin Cat",
   "BTCB": "Bitcoin BEP2",
+  "BTCBAM": "BitCoin Bam",
   "BTCBASE": "Bitcoin on Base",
   "BTCBR": "Bitcoin BR",
   "BTCBRV1": "Bitcoin BR v1",
@@ -3126,7 +3154,8 @@
   "CASPER": "Casper DeFi",
   "CASPERTOKEN": "Casper Token",
   "CASPUR": "Caspur Zoomies",
-  "CAST": "Castello Coin",
+  "CAST": "CAST ORACLES",
+  "CASTELLOCOIN": "Castello Coin",
   "CASTLE": "bitCastle",
   "CAT": "Simon's Cat",
   "CATA": "CATAMOTO",
@@ -3236,6 +3265,7 @@
   "CBX": "CropBytes",
   "CBXRP": "Coinbase Wrapped XRP",
   "CBY": "Carbify",
+  "CBYTE": "CBYTE",
   "CC": "Canton Coin",
   "CC10": "Cryptocurrency Top 10 Tokens Index",
   "CCA": "CCA",
@@ -3310,6 +3340,7 @@
   "CENTRA": "Centra",
   "CENTS": "Centience",
   "CENX": "Centcex",
+  "CEO": "CEO",
   "CEODOGE": "CEO DOGE",
   "CERBER": "CERBEROGE",
   "CERE": "Cere Network",
@@ -3695,7 +3726,8 @@
   "COC": "Coin of the champions",
   "COCAINE": "THE GOOD STUFF",
   "COCK": "Shibacock",
-  "COCO": "COCO COIN",
+  "COCO": "coco",
+  "COCOCOIN": "COCO COIN",
   "COCONUT": "Coconut",
   "COCOR": "Cocoro",
   "COCORO": "Cocoro",
@@ -3726,6 +3758,7 @@
   "COI": "Coinnec",
   "COINAI": "Coinbase AI Agent",
   "COINB": "Coinbidex",
+  "COINBANK": "CoinBank",
   "COINBT": "CoinBot",
   "COINBUCK": "Coinbuck",
   "COINDEALTOKEN": "CoinDeal Token",
@@ -3750,6 +3783,7 @@
   "COLA": "Cola",
   "COLISEUM": "Coliseum",
   "COLL": "Collateral Pay",
+  "COLLAB": "Collab.Land",
   "COLLAR": "PolyPup Finance",
   "COLLAT": "Collaterize",
   "COLLE": "Collective Care",
@@ -3970,6 +4004,7 @@
   "CREPECOIN": "Crepe Coin",
   "CRES": "Cresio",
   "CRESV1": "Cresio v1",
+  "CRETA": "Creta World",
   "CREV": "CryptoRevolution",
   "CREVA": "Creva Coin",
   "CREW": "CREW INU",
@@ -4778,8 +4813,10 @@
   "DINGER": "Dinger Token",
   "DINGO": "Dingocoin",
   "DINNER": "Trump Dinner",
-  "DINO": "DinoLFG",
+  "DINO": "DINO",
+  "DINOLFG": "DinoLFG",
   "DINOS": "Dinosaur Inu",
+  "DINOSOL": "DINOSOL",
   "DINOSWAP": "DinoSwap",
   "DINT": "DinarTether",
   "DINU": "Dogey-Inu",
@@ -4974,6 +5011,7 @@
   "DOGEZILLA": "DogeZilla",
   "DOGEZILLAV1": "DogeZilla v1",
   "DOGG": "Doggo",
+  "DOGGO": "DOGGO",
   "DOGGS": "Doggensnout",
   "DOGGY": "Doggy",
   "DOGGYCOIN": "DOGGY",
@@ -5487,6 +5525,7 @@
   "EGGC": "EggCoin",
   "EGGMAN": "Eggman Inu",
   "EGGP": "Eggplant Finance",
+  "EGGT": "Egg N Partners",
   "EGGY": "EGGY",
   "EGI": "eGame",
   "EGL": "The Eagle Of Truth",
@@ -5711,6 +5750,7 @@
   "EPETS": "Etherpets",
   "EPIC": "Epic Chain",
   "EPICCASH": "Epic Cash",
+  "EPICV1": "Ethernity Chain",
   "EPIK": "EPIK Token",
   "EPIKO": "Epiko",
   "EPIX": "Byepix",
@@ -6140,6 +6180,7 @@
   "FCTC": "FaucetCoin",
   "FCTR": "FactorDAO",
   "FDC": "Fidance",
+  "FDGC": "FINTECH DIGITAL GOLD COIN",
   "FDLS": "FIDELIS",
   "FDM": "Fandom",
   "FDO": "Firdaos",
@@ -6440,7 +6481,9 @@
   "FOFARIO": "Fofar",
   "FOFO": "FOFO",
   "FOFOTOKEN": "FOFO Token",
+  "FOG": "FOGnet",
   "FOGE": "Fat Doge",
+  "FOGV1": "FOGnet v1",
   "FOIN": "Foin",
   "FOL": "Folder Protocol",
   "FOLD": "Manifold Finance",
@@ -6709,6 +6752,7 @@
   "FWB": "Friends With Benefits Pro",
   "FWBV1": "Friends With Benefits Pro v1",
   "FWC": "Qatar 2022",
+  "FWCL": "Legends",
   "FWH": "FigureWifHat",
   "FWOG": "Fwog",
   "FWT": "Freeway Token",
@@ -7042,6 +7086,7 @@
   "GIGASWAP": "GigaSwap",
   "GIGGLE": "Giggle Fund",
   "GIGGLEACADEMY": "Giggle Academy",
+  "GIGL": "GIGGLE PANDA",
   "GIGS": "Climate101",
   "GIGX": "GigXCoin",
   "GIKO": "Giko Cat",
@@ -7558,6 +7603,7 @@
   "HACHIKO": "Hachiko Inu Token",
   "HACHIONB": "Hachi On Base",
   "HACK": "HACK",
+  "HADES": "Hades",
   "HAEDAL": "Haedal Protocol",
   "HAGGIS": "New Born Haggis Pygmy Hippo",
   "HAHA": "Hasaki",
@@ -7772,6 +7818,7 @@
   "HIENS3": "hiENS3",
   "HIENS4": "hiENS4",
   "HIFI": "Hifi Finance",
+  "HIFIDENZA": "hiFIDENZA",
   "HIFLUF": "hiFLUF",
   "HIFRIENDS": "hiFRIENDS",
   "HIGAZERS": "hiGAZERS",
@@ -7811,6 +7858,7 @@
   "HITBTC": "HitBTC Token",
   "HITOP": "Hitop",
   "HIUNDEAD": "hiUNDEAD",
+  "HIVALHALLA": "hiVALHALLA",
   "HIVE": "Hive",
   "HIVP": "HiveSwap",
   "HIX": "HELIX Orange",
@@ -7984,6 +8032,7 @@
   "HSN": "Hyper Speed Network",
   "HSOL": "Helius Staked SOL",
   "HSP": "Horse Power",
+  "HSR": "Hshare",
   "HSS": "Hashshare",
   "HST": "Decision Token",
   "HSUI": "Suicune",
@@ -8005,6 +8054,7 @@
   "HTN": "Hoosat Network",
   "HTO": "Heavenland HTO",
   "HTR": "Hathor",
+  "HTS": "Home3",
   "HTT": "Hello Art",
   "HTX": "HTX",
   "HTZ": "Hertz Network",
@@ -8427,6 +8477,7 @@
   "IQN": "IQeon",
   "IQQ": "Iqoniq",
   "IQT": "IQ Protocol",
+  "IR": "Infrared Governance Token",
   "IRA": "Diligence",
   "IRC": "IRIS",
   "IRENA": "Irena Coin Apps",
@@ -8558,6 +8609,7 @@
   "JAWN": "Long Jawn Silvers",
   "JAWS": "AutoShark",
   "JAY": "Jaypeggers",
+  "JBC": "Japan Brand Coin",
   "JBO": "JBOX",
   "JBOT": "JACKBOT",
   "JBS": "JumBucks Coin",
@@ -8596,6 +8648,7 @@
   "JERRYINUCOM": "Jerry Inu",
   "JES": "Jesus",
   "JESSE": "jesse",
+  "JESSECOIN": "jesse",
   "JEST": "Jester",
   "JESUS": "Jesus Coin",
   "JET": "Jet Protocol",
@@ -8624,6 +8677,7 @@
   "JIM": "Jim",
   "JIN": "JinPeng",
   "JIND": "JINDO INU",
+  "JINDO": "JINDOGE",
   "JINDOGE": "Jindoge",
   "JIO": "JIO Token",
   "JITOSOL": "Jito Staked SOL",
@@ -8865,6 +8919,7 @@
   "KDC": "Klondike Coin",
   "KDG": "Kingdom Game 4.0",
   "KDIA": "KDIA COIN",
+  "KDK": "Kodiak Token",
   "KDOE": "Kudoe",
   "KDOGE": "KingDoge",
   "KDT": "Kenyan Digital Token",
@@ -8926,6 +8981,7 @@
   "KGC": "Krypton Galaxy Coin",
   "KGEN": "KGeN",
   "KGO": "Kiwigo",
+  "KGST": "KGST",
   "KGT": "Kaby Gaming Token",
   "KHAI": "khai",
   "KHEOWZOO": "khaokheowzoo",
@@ -9074,6 +9130,7 @@
   "KNUT": "Knut From Zoo",
   "KNUXX": "Knuxx Bully of ETH",
   "KNW": "Knowledge",
+  "KO": "Kyuzo's Friends",
   "KOAI": "KOI",
   "KOALA": "KOALA",
   "KOBAN": "KOBAN",
@@ -9089,6 +9146,7 @@
   "KOII": "Koii",
   "KOIN": "Koinos",
   "KOINB": "KoinBülteni Token",
+  "KOINDEX": "KOIN",
   "KOINETWORK": "Koi Network",
   "KOIP": "KoiPond",
   "KOJI": "Koji",
@@ -9548,8 +9606,9 @@
   "LIQUIDIUM": "LIQUIDIUM•TOKEN",
   "LIR": "Let it Ride",
   "LIS": "Realis Network",
-  "LISA": "Lisa Simpson",
+  "LISA": "LISA Token",
   "LISAS": "Lisa Simpson",
+  "LISASIMPSONCLUB": "Lisa Simpson",
   "LIST": "KList Protocol",
   "LISTA": "Lista DAO",
   "LISTEN": "Listen",
@@ -9732,6 +9791,7 @@
   "LQT": "Lifty",
   "LQTY": "Liquity",
   "LRC": "Loopring",
+  "LRCV1": "Loopring v1",
   "LRDS": "BLOCKLORDS",
   "LRG": "Largo Coin",
   "LRN": "Loopring [NEO]",
@@ -9950,6 +10010,7 @@
   "MAGICK": "Cosmic Universe Magick",
   "MAGICV": "Magicverse",
   "MAGIK": "Magik Finance",
+  "MAGMA": "MAGMA",
   "MAGN": "Magnate Finance",
   "MAGNE": "Magnetix",
   "MAGNET": "Yield Magnet",
@@ -10198,6 +10259,7 @@
   "MCU": "MediChain",
   "MCUSD": "Moola Celo USD",
   "MCV": "MCV Token",
+  "MCX": "MachiX Token",
   "MD": "MetaDeck",
   "MDA": "Moeda",
   "MDAI": "MindAI",
@@ -10366,6 +10428,7 @@
   "METANIAV1": "METANIAGAMES",
   "METANO": "Metano",
   "METAPK": "Metapocket",
+  "METAPLACE": "Metaplace",
   "METAQ": "MetaQ",
   "METAS": "Metaseer",
   "METAT": "MetaTrace",
@@ -10510,6 +10573,7 @@
   "MIMO": "MIMO Parallel Governance Token",
   "MIN": "MINDOL",
   "MINA": "Mina Protocol",
+  "MINAR": "Miner Arena",
   "MINC": "MinCoin",
   "MIND": "Morpheus Labs",
   "MINDBODY": "Mind Body Soul",
@@ -10911,7 +10975,7 @@
   "MPAA": "MPAA",
   "MPAD": "MultiPad",
   "MPAY": "Menapay",
-  "MPC": "Metaplace",
+  "MPC": "Partisia Blockchain",
   "MPD": "Metapad",
   "MPG": "Max Property Group",
   "MPH": "Morpher",
@@ -11010,6 +11074,7 @@
   "MTHB": "MTHAIBAHT",
   "MTHD": "Method Finance",
   "MTHN": "MTH Network",
+  "MTHT": "MetaHint",
   "MTIK": "MatikaToken",
   "MTIX": "Matrix Token",
   "MTK": "Moya Token",
@@ -11175,6 +11240,7 @@
   "N3": "Network3",
   "N3DR": "NeorderDAO ",
   "N3ON": "N3on",
+  "N4T": "Nobel For Trump",
   "N64": "N64",
   "N7": "Number7",
   "N8V": "NativeCoin",
@@ -11722,6 +11788,7 @@
   "NWIF": "neirowifhat",
   "NWP": "NWPSolution",
   "NWS": "Nodewaves",
+  "NXA": "NEXA Agent",
   "NXC": "Nexium",
   "NXD": "Nexus Dubai",
   "NXDT": "NXD Next",
@@ -11766,7 +11833,8 @@
   "OAS": "Oasis City",
   "OASC": "Oasis City",
   "OASI": "Oasis Metaverse",
-  "OASIS": "Oasis",
+  "OASIS": "OASIS",
+  "OASISPLATFORM": "Oasis",
   "OAT": "OAT Network",
   "OATH": "OATH Protocol",
   "OAX": "Oax",
@@ -11983,12 +12051,14 @@
   "ONUS": "ONUS",
   "ONX": "OnX.finance",
   "OOB": "Oobit",
+  "OOBV1": "Oobit",
   "OOE": "OpenOcean",
   "OOFP": "OOFP",
   "OOGI": "OOGI",
   "OOKI": "Ooki",
   "OOKS": "Onooks",
   "OOM": "OomerBot",
+  "OOOO": "oooo",
   "OOPS": "OOPS",
   "OORC": "Orbit Bridge Klaytn Orbit Chain",
   "OORT": "OORT",
@@ -12838,7 +12908,7 @@
   "PMOON": "Pookimoon",
   "PMPY": "Prometheum Prodigy",
   "PMR": "Pomerium Utility Token",
-  "PMT": "POWER MARKET",
+  "PMT": "Public Masterpiece Token",
   "PMTN": "Peer Mountain",
   "PMX": "Phillip Morris xStock",
   "PNB": "Pink BNB",
@@ -13001,7 +13071,9 @@
   "POUW": "Pouwifhat",
   "POW": "PowBlocks",
   "POWELL": "Jerome Powell",
-  "POWER": "Powerloom Token",
+  "POWER": "Power",
+  "POWERLOOM": "Powerloom Token",
+  "POWERMARKET": "POWER MARKET",
   "POWR": "Power Ledger",
   "POWSCHE": "Powsche",
   "POX": "Monkey Pox",
@@ -13269,6 +13341,7 @@
   "PXL": "PIXEL",
   "PXP": "PointPay",
   "PXT": "Pixer Eternity",
+  "PYBOBO": "Capybobo",
   "PYC": "PayCoin",
   "PYE": "CreamPYE",
   "PYI": "PYRIN",
@@ -13470,6 +13543,7 @@
   "RAIREFLEX": "Rai Reflex Index",
   "RAISE": "Raise Token",
   "RAIT": "Rabbitgame",
+  "RAITOKEN": "RAI",
   "RAIZER": "RAIZER",
   "RAK": "Rake Finance",
   "RAKE": "Rake Coin",
@@ -13497,10 +13571,11 @@
   "RATOTHERAT": "Rato The Rat",
   "RATS": "Rats",
   "RATWIF": "RatWifHat",
-  "RAVE": "Ravendex",
+  "RAVE": "RaveDAO",
   "RAVELOUS": "Ravelous",
   "RAVEN": "Raven Protocol",
   "RAVENCOINC": "Ravencoin Classic",
+  "RAVENDEX": "Ravendex",
   "RAWDOG": "RawDog",
   "RAWG": "RAWG",
   "RAY": "Raydium",
@@ -13810,7 +13885,8 @@
   "RIVUS": "RivusDAO",
   "RIYA": "Etheriya",
   "RIZ": "Rivalz Network",
-  "RIZE": "Rizespor Token",
+  "RIZE": "RIZE",
+  "RIZESPOR": "Rizespor Token",
   "RIZO": "HahaYes",
   "RIZOLOL": "Rizo",
   "RIZZ": "Rizz",
@@ -13856,6 +13932,7 @@
   "RNT": "REAL NIGGER TATE",
   "RNTB": "BitRent",
   "RNX": "ROONEX",
+  "ROA": "ROA CORE",
   "ROAD": "ROAD",
   "ROAM": "Roam Token",
   "ROAR": "Alpha DEX",
@@ -13993,6 +14070,7 @@
   "RTM": "Raptoreum",
   "RTR": "Restore The Republic",
   "RTT": "Restore Truth Token",
+  "RTX": "RateX",
   "RU": "RIFI United",
   "RUBB": "Rubber Ducky Cult",
   "RUBCASH": "RUBCASH",
@@ -14283,7 +14361,7 @@
   "SCOIN": "ShinCoin",
   "SCONE": "Sportcash One",
   "SCOOBY": "Scooby coin",
-  "SCOR": "Scorista",
+  "SCOR": "Scor",
   "SCORE": "Scorecoin",
   "SCOT": "Scotcoin",
   "SCOTT": "Scottish",
@@ -14377,6 +14455,7 @@
   "SELFIEC": "Selfie Cat",
   "SELFT": "SelfToken",
   "SELLC": "Sell Token",
+  "SELO": "SELO+",
   "SEM": "Semux",
   "SEN": "Sentaro",
   "SENA": "Ethena Staked ENA",
@@ -14482,7 +14561,6 @@
   "SHANG": "Shanghai Inu",
   "SHAR": "Shark Cat",
   "SHARBI": "SHARBI",
-  "SHARD": "ShardCoin",
   "SHARDS": "WorldShards",
   "SHARE": "Seigniorage Shares",
   "SHARECHAIN": "ShareChain",
@@ -14580,6 +14658,7 @@
   "SHIRO": "Shiro Neko",
   "SHIROSOL": "Shiro Neko (shirosol.online)",
   "SHIRYOINU": "Shiryo-Inu",
+  "SHISA": "SHISA",
   "SHISHA": "Shisha Coin",
   "SHIT": "I will poop it NFT",
   "SHITC": "Shitcoin",
@@ -14628,9 +14707,11 @@
   "SHUFFLE": "SHUFFLE!",
   "SHVR": "Shivers",
   "SHX": "Stronghold Token",
+  "SHXV1": "Stronghold Token v1",
   "SHY": "Shytoshi Kusama",
   "SHYTCOIN": "ShytCoin",
   "SI": "Siren",
+  "SI14": "Si14",
   "SIACLASSIC": "SiaClassic",
   "SIB": "SibCoin",
   "SIBA": "SibaInu",
@@ -14831,6 +14912,7 @@
   "SMARTLOX": "SmartLOX",
   "SMARTM": "SmartMesh",
   "SMARTMEME": "SmartMEME",
+  "SMARTMFG": "Smart MFG",
   "SMARTNFT": "SmartNFT",
   "SMARTO": "smARTOFGIVING",
   "SMARTSHARE": "Smartshare",
@@ -15040,6 +15122,7 @@
   "SOLNAV": "SOLNAV AI",
   "SOLNIC": "Solnic",
   "SOLO": "Sologenic",
+  "SOLOM": "Solomon",
   "SOLOR": "Solordi",
   "SOLP": "SolPets",
   "SOLPAD": "Solpad Finance",
@@ -15332,6 +15415,7 @@
   "STACS": "STACS Token",
   "STAFIRETH": "StaFi Staked ETH",
   "STAGE": "Stage",
+  "STAI": "StereoAI",
   "STAK": "Jigstack",
   "STAKE": "xDai Chain",
   "STAKEDETH": "StakeHound Staked Ether",
@@ -15422,6 +15506,7 @@
   "STIMA": "STIMA",
   "STING": "Sting",
   "STINJ": "Stride Staked INJ",
+  "STIPS": "Stips",
   "STITCH": "Stitch",
   "STIX": "STIX",
   "STJUNO": "Stride Staked JUNO",
@@ -15597,6 +15682,7 @@
   "SUPERBONK": "SUPER BONK",
   "SUPERC": "SuperCoin",
   "SUPERCAT": "SUPERCAT",
+  "SUPERCYCLE": "Crypto SuperCycle",
   "SUPERDAPP": "SuperDapp",
   "SUPERF": "SUPER FLOKI",
   "SUPERGROK": "SuperGrok",
@@ -15855,6 +15941,7 @@
   "TBILL": "OpenEden T-Bills",
   "TBILLV1": "OpenEden T-Bills v1",
   "TBIS": "TBIS token",
+  "TBK": "TBK Token",
   "TBL": "Tombola",
   "TBLLX": "TBLL xStock",
   "TBR": "Tuebor",
@@ -15902,7 +15989,8 @@
   "TDROP": "ThetaDrop",
   "TDS": "TokenDesk",
   "TDX": "Tidex Token",
-  "TEA": "TeaDAO",
+  "TEA": "TeaFi Token",
+  "TEADAO": "TeaDAO",
   "TEAM": "TeamUP",
   "TEARS": "Liberals Tears",
   "TEC": "TeCoin",
@@ -15933,7 +16021,7 @@
   "TEMM": "TEM MARKET",
   "TEMP": "Tempus",
   "TEMPLE": "TempleDAO",
-  "TEN": "Tokenomy",
+  "TEN": "TEN",
   "TEND": "Tendies",
   "TENDIE": "TendieSwap",
   "TENET": "TENET",
@@ -15947,8 +16035,8 @@
   "TEQ": "Teq Network",
   "TER": "TerraNovaCoin",
   "TERA": "TERA",
+  "TERA2": "Terareum",
   "TERADYNE": "Teradyne",
-  "TERAR": "Terareum",
   "TERAV1": "Terareum v1",
   "TERAWATT": "Terawatt",
   "TERM": "Terminal of Simpson",
@@ -15975,6 +16063,7 @@
   "TETSUO": "Tetsuo Coin",
   "TETU": "TETU",
   "TEVA": "Tevaera",
+  "TEVI": "TEVI Coin",
   "TEW": "Trump in a memes world",
   "TEX": "Terrax",
   "TF47": "Trump Force 47",
@@ -15988,7 +16077,7 @@
   "TFT": "The Famous Token",
   "TFUEL": "Theta Fuel",
   "TGAME": "TrueGame",
-  "TGC": "TigerCoin",
+  "TGC": "TG.Casino",
   "TGCC": "TheGCCcoin",
   "TGPT": "Trading GPT",
   "TGRAM": "TG20 TGram",
@@ -16026,6 +16115,7 @@
   "THEOS": "Theos",
   "THEP": "The Protocol",
   "THEPLAY": "PLAY",
+  "THEREALCHAIN": "REAL",
   "THERESAMAY": "Theresa May Coin",
   "THES": "The Standard Protocol (USDS)",
   "THESTANDARD": "Standard Token",
@@ -16051,6 +16141,7 @@
   "THOR": "THORSwap",
   "THOREUM": "Thoreum V3",
   "THP": "TurboHigh Performance",
+  "THQ": "Theoriq Token",
   "THR": "Thorecoin",
   "THREE": "Three Protocol Token ",
   "THRT": "ThriveToken",
@@ -16078,6 +16169,7 @@
   "TIG": "Tigereum",
   "TIGER": "TIGER",
   "TIGERC": "TigerCash",
+  "TIGERCOIN": "TigerCoin",
   "TIGERCV1": "TigerCash v1",
   "TIGERMOON": "TigerMoon",
   "TIGERSHARK": "Tiger Shark",
@@ -16154,6 +16246,7 @@
   "TME": "Timereum",
   "TMED": "MDsquare",
   "TMFT": "Turkish Motorcycle Federation",
+  "TMG": "T-mac DAO",
   "TMN": "TranslateMe",
   "TMNG": "TMN Global",
   "TMNT": "TMNT",
@@ -16193,6 +16286,7 @@
   "TOKC": "Tokyo Coin",
   "TOKE": "Tokemak",
   "TOKEN": "TokenFi",
+  "TOKENOMY": "Tokenomy",
   "TOKENPLACE": "Tokenplace",
   "TOKENSTARS": "TokenStars",
   "TOKERO": "TOKERO LevelUP Token",
@@ -16312,6 +16406,7 @@
   "TRADE": "Polytrade",
   "TRADEBOT": "TradeBot",
   "TRADECHAIN": "Trade Chain",
+  "TRADETIDE": "Trade Tide Token",
   "TRADEX": "TradeX AI",
   "TRADOOR": "Tradoor",
   "TRAI": "Trackgood AI",
@@ -16361,6 +16456,7 @@
   "TRIAS": "Trias",
   "TRIBE": "Tribe",
   "TRIBETOKEN": "TribeToken",
+  "TRIBEX": "Tribe Token",
   "TRIBL": "Tribal Token",
   "TRICK": "TrickyCoin",
   "TRICKLE": "Trickle",
@@ -16882,6 +16978,7 @@
   "USDI": "Interest Protocol USDi",
   "USDJ": "USDJ",
   "USDK": "USDK",
+  "USDKG": "USDKG",
   "USDL": "Lift Dollar",
   "USDM": "Mountain Protocol",
   "USDMA": "USD mars",
@@ -16946,6 +17043,7 @@
   "UT": "Ulord",
   "UTBAI": "UTB.ai",
   "UTC": "UltraCoin",
+  "UTED": "United",
   "UTG": "UltronGlow",
   "UTH": "Uther",
   "UTHR": "Utherverse Xaeon",
@@ -16998,6 +17096,7 @@
   "VALU": "Value",
   "VALUE": "Value Liquidity",
   "VALYR": "Valyr",
+  "VAM": "Vitalum",
   "VAMPIRE": "Vampire Inu",
   "VAN": "Vanspor Token",
   "VANA": "Vana",
@@ -17206,6 +17305,7 @@
   "VIZ": "VIZ Token",
   "VIZION": "ViZion Protocol",
   "VIZSLASWAP": "VizslaSwap",
+  "VK": "VK Token",
   "VKNF": "VKENAF",
   "VLC": "Volcano Uni",
   "VLDY": "Validity",
@@ -17263,6 +17363,7 @@
   "VON": "Vameon",
   "VONE": "Vone",
   "VONSPEED": "Andrea Von Speed",
+  "VOOI": "VOOI",
   "VOOT": "VootCoin",
   "VOOZ": "Vooz Coin",
   "VOPO": "VOPO",
@@ -17443,6 +17544,7 @@
   "WATCH": "Yieldwatch",
   "WATER": "Waterfall",
   "WATERCOIN": "WATER",
+  "WATLAS": "Wrapped Star Atlas (Portal Bridge)",
   "WATT": "WATTTON",
   "WAVAX": "Wrapped AVAX",
   "WAVES": "Waves",
@@ -17524,6 +17626,7 @@
   "WEBSIM": "The Css God by Virtuals",
   "WEBSS": "Websser",
   "WEC": "Whole Earth Coin",
+  "WECAN": "Wecan Group",
   "WECO": "WECOIN",
   "WED": "Wednesday Inu",
   "WEEBS": "Weebs",
@@ -17561,8 +17664,9 @@
   "WEPC": "World Earn & Play Community",
   "WEPE": "Wall Street Pepe",
   "WERK": "Werk Family",
+  "WESHOWTOKEN": "WeShow Token",
   "WEST": "Waves Enterprise",
-  "WET": "WeShow Token",
+  "WET": "HumidiFi Token",
   "WETH": "WETH",
   "WETHV1": "WETH v1",
   "WETHW": "Wrapped EthereumPoW",
@@ -17617,6 +17721,7 @@
   "WHISKEY": "WHISKEY",
   "WHITE": "WhiteRock",
   "WHITEHEART": "Whiteheart",
+  "WHITEWHALE": "The White Whale",
   "WHL": "WhaleCoin",
   "WHO": "Truwho",
   "WHOLE": "Whole Network",
@@ -17827,6 +17932,7 @@
   "WPP": "Green Energy Token",
   "WPR": "WePower",
   "WQT": "Work Quest",
+  "WR": "White Rat",
   "WRC": "Worldcore",
   "WREACT": "Wrapped REACT",
   "WRK": "BlockWRK",
@@ -18005,6 +18111,7 @@
   "XCHF": "CryptoFranc",
   "XCHNG": "Chainge Finance",
   "XCI": "Cannabis Industry Coin",
+  "XCL": "Xcellar",
   "XCLR": "ClearCoin",
   "XCM": "CoinMetro",
   "XCN": "Onyxcoin",
@@ -18043,7 +18150,8 @@
   "XEC": "eCash",
   "XED": "Exeedme",
   "XEDO": "XedoAI",
-  "XEL": "Xel",
+  "XEL": "XELIS",
+  "XELCOIN": "Xel",
   "XELS": "XELS Coin",
   "XEM": "NEM",
   "XEN": "XEN Crypto",
@@ -18361,13 +18469,15 @@
   "YEAI": "YE AI Agent",
   "YEARN": "YearnTogether",
   "YEC": "Ycash",
-  "YEE": "Yeeco",
+  "YEE": "Yee Token",
+  "YEECO": "Yeeco",
   "YEED": "Yggdrash",
   "YEEHAW": "YEEHAW",
   "YEET": "Yeet",
   "YEETI": "YEETI 液体",
   "YEFI": "YeFi",
   "YEL": "Yel.Finance",
+  "YELLOWWHALE": "The Yellow Whale",
   "YELP": "Yelpro",
   "YEON": "Yeon",
   "YEPE": "Yellow Pepe",

apps/client/src/app/app.component.ts

@@ -4,6 +4,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';
 import { ColorScheme } from '@ghostfolio/common/types';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,
@@ -36,7 +37,6 @@ import { GfFooterComponent } from './components/footer/footer.component';
 import { GfHeaderComponent } from './components/header/header.component';
 import { GfHoldingDetailDialogComponent } from './components/holding-detail-dialog/holding-detail-dialog.component';
 import { HoldingDetailDialogParams } from './components/holding-detail-dialog/interfaces/interfaces';
-import { DataService } from './services/data.service';
 import { ImpersonationStorageService } from './services/impersonation-storage.service';
 import { TokenStorageService } from './services/token-storage.service';
 import { UserService } from './services/user/user.service';

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -1,5 +1,4 @@
 import { GfInvestmentChartComponent } from '@ghostfolio/client/components/investment-chart/investment-chart.component';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { NUMERICAL_PRECISION_THRESHOLD_6_FIGURES } from '@ghostfolio/common/config';
 import { CreateAccountBalanceDto } from '@ghostfolio/common/dtos';
@@ -19,6 +18,7 @@ import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
 import { GfDialogHeaderComponent } from '@ghostfolio/ui/dialog-header';
 import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule } from '@angular/common';

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

@@ -1,4 +1,3 @@
-import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
   DATA_GATHERING_QUEUE_PRIORITY_HIGH,
@@ -9,6 +8,7 @@ import {
 import { getDateWithTimeFormatString } from '@ghostfolio/common/helper';
 import { AdminJobs, User } from '@ghostfolio/common/interfaces';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { AdminService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

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

@@ -1,5 +1,3 @@
-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';
 import {
   DEFAULT_PAGE_SIZE,
@@ -18,6 +16,7 @@ import { GfSymbolPipe } from '@ghostfolio/common/pipes';
 import { GfActivitiesFilterComponent } from '@ghostfolio/ui/activities-filter';
 import { translate } from '@ghostfolio/ui/i18n';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { SelectionModel } from '@angular/cdk/collections';

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

@@ -1,4 +1,3 @@
-import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { ghostfolioScraperApiSymbolPrefix } from '@ghostfolio/common/config';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import {
@@ -11,6 +10,7 @@ import {
   AdminMarketDataItem
 } from '@ghostfolio/common/interfaces';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { AdminService } from '@ghostfolio/ui/services';
 
 import { Injectable } from '@angular/core';
 import { EMPTY, catchError, finalize, forkJoin } from 'rxjs';

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

@@ -1,6 +1,4 @@
 import { AdminMarketDataService } from '@ghostfolio/client/components/admin-market-data/admin-market-data.service';
-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';
 import {
   ASSET_CLASS_MAPPING,
@@ -25,6 +23,7 @@ import { translate } from '@ghostfolio/ui/i18n';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfSymbolAutocompleteComponent } from '@ghostfolio/ui/symbol-autocomplete';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts

@@ -1,10 +1,9 @@
-import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import {
   DEFAULT_CURRENCY,
   ghostfolioPrefix,
   PROPERTY_CURRENCIES
 } from '@ghostfolio/common/config';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfSymbolAutocompleteComponent } from '@ghostfolio/ui/symbol-autocomplete';
 
 import {

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

@@ -1,6 +1,4 @@
-import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
   PROPERTY_COUPONS,
@@ -20,6 +18,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule } from '@angular/common';

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

@@ -1,10 +1,9 @@
-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';
 import { CreatePlatformDto, UpdatePlatformDto } from '@ghostfolio/common/dtos';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

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

@@ -1,8 +1,6 @@
 import { GfAdminPlatformComponent } from '@ghostfolio/client/components/admin-platform/admin-platform.component';
 import { GfAdminTagComponent } from '@ghostfolio/client/components/admin-tag/admin-tag.component';
 import { GfDataProviderStatusComponent } from '@ghostfolio/client/components/data-provider-status/data-provider-status.component';
-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';
 import { PROPERTY_API_KEY_GHOSTFOLIO } from '@ghostfolio/common/config';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
@@ -16,6 +14,7 @@ import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule } from '@angular/common';

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

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { CreateTagDto, UpdateTagDto } from '@ghostfolio/common/dtos';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

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

@@ -1,7 +1,5 @@
 import { UserDetailDialogParams } from '@ghostfolio/client/components/user-detail-dialog/interfaces/interfaces';
 import { GfUserDetailDialogComponent } from '@ghostfolio/client/components/user-detail-dialog/user-detail-dialog.component';
-import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -21,6 +19,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule } from '@angular/common';

apps/client/src/app/components/data-provider-status/data-provider-status.component.ts

@@ -1,4 +1,4 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

apps/client/src/app/components/header/header.component.ts

@@ -1,7 +1,6 @@
 import { LoginWithAccessTokenDialogParams } from '@ghostfolio/client/components/login-with-access-token-dialog/interfaces/interfaces';
 import { GfLoginWithAccessTokenDialogComponent } from '@ghostfolio/client/components/login-with-access-token-dialog/login-with-access-token-dialog.component';
 import { LayoutService } from '@ghostfolio/client/core/layout.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import {
   KEY_STAY_SIGNED_IN,
@@ -18,6 +17,7 @@ import { GfAssistantComponent } from '@ghostfolio/ui/assistant/assistant.compone
 import { GfLogoComponent } from '@ghostfolio/ui/logo';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
   NUMERICAL_PRECISION_THRESHOLD_3_FIGURES,
@@ -26,6 +25,7 @@ import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical
 import { translate } from '@ghostfolio/ui/i18n';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfTagsSelectorComponent } from '@ghostfolio/ui/tags-selector';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 

apps/client/src/app/components/home-holdings/home-holdings.component.ts

@@ -1,4 +1,3 @@
-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 {
@@ -11,6 +10,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types';
 import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfToggleComponent } from '@ghostfolio/ui/toggle';
 import { GfTreemapChartComponent } from '@ghostfolio/ui/treemap-chart';
 

apps/client/src/app/components/home-market/home-market.component.ts

@@ -1,5 +1,4 @@
 import { GfFearAndGreedIndexComponent } from '@ghostfolio/client/components/fear-and-greed-index/fear-and-greed-index.component';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { ghostfolioFearAndGreedIndexSymbol } from '@ghostfolio/common/config';
 import { resetHours } from '@ghostfolio/common/helper';
@@ -12,6 +11,7 @@ import {
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfBenchmarkComponent } from '@ghostfolio/ui/benchmark';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectorRef,

apps/client/src/app/components/home-overview/home-overview.component.ts

@@ -1,6 +1,5 @@
 import { GfPortfolioPerformanceComponent } from '@ghostfolio/client/components/portfolio-performance/portfolio-performance.component';
 import { LayoutService } from '@ghostfolio/client/core/layout.service';
-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 { NUMERICAL_PRECISION_THRESHOLD_6_FIGURES } from '@ghostfolio/common/config';
@@ -13,6 +12,7 @@ import {
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

apps/client/src/app/components/home-summary/home-summary.component.ts

@@ -1,5 +1,4 @@
 import { GfPortfolioSummaryComponent } from '@ghostfolio/client/components/portfolio-summary/portfolio-summary.component';
-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 {
@@ -8,6 +7,7 @@ import {
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectorRef,

apps/client/src/app/components/home-watchlist/home-watchlist.component.ts

@@ -1,4 +1,3 @@
-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 {
@@ -9,6 +8,7 @@ import {
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfBenchmarkComponent } from '@ghostfolio/ui/benchmark';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

apps/client/src/app/components/markets/markets.component.ts

@@ -1,5 +1,4 @@
 import { GfFearAndGreedIndexComponent } from '@ghostfolio/client/components/fear-and-greed-index/fear-and-greed-index.component';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { resetHours } from '@ghostfolio/common/helper';
 import {
@@ -12,6 +11,7 @@ import {
 import { FearAndGreedIndexMode } from '@ghostfolio/common/types';
 import { GfBenchmarkComponent } from '@ghostfolio/ui/benchmark';
 import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfToggleComponent } from '@ghostfolio/ui/toggle';
 
 import {

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts

@@ -1,7 +1,7 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { CreateAccessDto, UpdateAccessDto } from '@ghostfolio/common/dtos';
 import { validateObjectForForm } from '@ghostfolio/common/utils';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

apps/client/src/app/components/user-account-access/user-account-access.component.ts

@@ -1,5 +1,4 @@
 import { GfAccessTableComponent } from '@ghostfolio/client/components/access-table/access-table.component';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { CreateAccessDto } from '@ghostfolio/common/dtos';
@@ -8,6 +7,7 @@ import { Access, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

apps/client/src/app/components/user-account-membership/user-account-membership.component.ts

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import { getDateFormatString } from '@ghostfolio/common/helper';
@@ -8,6 +7,7 @@ import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { GfMembershipCardComponent } from '@ghostfolio/ui/membership-card';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

apps/client/src/app/components/user-account-settings/user-account-settings.component.ts

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import {
   KEY_STAY_SIGNED_IN,
   KEY_TOKEN,
@@ -13,6 +12,7 @@ import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectionStrategy,

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts

@@ -1,7 +1,7 @@
-import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { AdminUserResponse } from '@ghostfolio/common/interfaces';
 import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
 import { GfDialogHeaderComponent } from '@ghostfolio/ui/dialog-header';
+import { AdminService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import {

apps/client/src/app/core/auth.guard.ts

@@ -1,7 +1,7 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { Injectable } from '@angular/core';
 import {

apps/client/src/app/core/http-response.interceptor.ts

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { WebAuthnService } from '@ghostfolio/client/services/web-authn.service';
 import { InfoItem } from '@ghostfolio/common/interfaces';
 import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   HTTP_INTERCEPTORS,

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

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { TabConfiguration, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   ChangeDetectorRef,

apps/client/src/app/pages/about/overview/about-overview-page.component.ts

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

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

@@ -1,6 +1,5 @@
 import { GfAccountDetailDialogComponent } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.component';
 import { AccountDetailDialogParams } from '@ghostfolio/client/components/account-detail-dialog/interfaces/interfaces';
-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 {
@@ -12,6 +11,7 @@ import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfAccountsTableComponent } from '@ghostfolio/ui/accounts-table';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';

apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { CreateAccountDto, UpdateAccountDto } from '@ghostfolio/common/dtos';
 import { validateObjectForForm } from '@ghostfolio/common/utils';
 import { GfCurrencySelectorComponent } from '@ghostfolio/ui/currency-selector';
 import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule, NgClass } from '@angular/common';
 import {

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

@@ -1,5 +1,5 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { Component, CUSTOM_ELEMENTS_SCHEMA, OnDestroy } from '@angular/core';
 import { MatCardModule } from '@angular/material/card';

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

@@ -1,7 +1,7 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { InfoItem } from '@ghostfolio/common/interfaces';
 import { NotificationService } from '@ghostfolio/ui/notifications';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { Component, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';

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

@@ -1,7 +1,7 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { TabConfiguration } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   CUSTOM_ELEMENTS_SCHEMA,

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

@@ -1,9 +1,9 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';

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

@@ -1,10 +1,10 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { Statistics } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { GfCarouselComponent } from '@ghostfolio/ui/carousel';
 import { GfLogoComponent } from '@ghostfolio/ui/logo';
 import { GfLogoCarouselComponent } from '@ghostfolio/ui/logo-carousel';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 import { GfWorldMapChartComponent } from '@ghostfolio/ui/world-map-chart';
 

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

@@ -1,6 +1,6 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { Statistics, User } from '@ghostfolio/common/interfaces';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import {

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

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { IcsService } from '@ghostfolio/client/services/ics/ics.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -12,6 +11,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';

apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@@ -10,6 +10,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { validateObjectForForm } from '@ghostfolio/common/utils';
 import { GfEntityLogoComponent } from '@ghostfolio/ui/entity-logo';
 import { translate } from '@ghostfolio/ui/i18n';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfSymbolAutocompleteComponent } from '@ghostfolio/ui/symbol-autocomplete';
 import { GfTagsSelectorComponent } from '@ghostfolio/ui/tags-selector';
 import { GfValueComponent } from '@ghostfolio/ui/value';
@@ -48,7 +49,6 @@ import { calendarClearOutline, refreshOutline } from 'ionicons/icons';
 import { EMPTY, Subject } from 'rxjs';
 import { catchError, delay, takeUntil } from 'rxjs/operators';
 
-import { DataService } from '../../../../services/data.service';
 import { CreateOrUpdateActivityDialogParams } from './interfaces/interfaces';
 import { ActivityType } from './types/activity-type.type';
 

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

@@ -1,5 +1,4 @@
 import { GfFileDropDirective } from '@ghostfolio/client/directives/file-drop/file-drop.directive';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImportActivitiesService } from '@ghostfolio/client/services/import-activities.service';
 import {
   CreateAccountWithBalancesDto,
@@ -11,6 +10,7 @@ import { GfSymbolPipe } from '@ghostfolio/common/pipes';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
 import { GfDialogHeaderComponent } from '@ghostfolio/ui/dialog-header';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   StepperOrientation,

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

@@ -1,6 +1,5 @@
 import { GfAccountDetailDialogComponent } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.component';
 import { AccountDetailDialogParams } from '@ghostfolio/client/components/account-detail-dialog/interfaces/interfaces';
-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 { MAX_TOP_HOLDINGS, UNKNOWN_KEY } from '@ghostfolio/common/config';
@@ -17,6 +16,7 @@ import { Market, MarketAdvanced } from '@ghostfolio/common/types';
 import { translate } from '@ghostfolio/ui/i18n';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfTopHoldingsComponent } from '@ghostfolio/ui/top-holdings';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 import { GfWorldMapChartComponent } from '@ghostfolio/ui/world-map-chart';

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

@@ -1,6 +1,5 @@
 import { GfBenchmarkComparatorComponent } from '@ghostfolio/client/components/benchmark-comparator/benchmark-comparator.component';
 import { GfInvestmentChartComponent } from '@ghostfolio/client/components/investment-chart/investment-chart.component';
-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 {
@@ -16,6 +15,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { AiPromptMode, GroupBy } from '@ghostfolio/common/types';
 import { translate } from '@ghostfolio/ui/i18n';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfToggleComponent } from '@ghostfolio/ui/toggle';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 

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

@@ -1,4 +1,3 @@
-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 {
@@ -9,6 +8,7 @@ import {
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import { CommonModule, NgStyle } from '@angular/common';

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

@@ -1,5 +1,4 @@
 import { GfRulesComponent } from '@ghostfolio/client/components/rules/rules.component';
-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 { UpdateUserSettingDto } from '@ghostfolio/common/dtos';
@@ -10,6 +9,7 @@ import {
 import { User } from '@ghostfolio/common/interfaces/user.interface';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { NgClass } from '@angular/common';
 import { ChangeDetectorRef, Component } from '@angular/core';

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

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@@ -6,6 +5,7 @@ import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { translate } from '@ghostfolio/ui/i18n';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

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

@@ -1,4 +1,3 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UNKNOWN_KEY } from '@ghostfolio/common/config';
 import { prettifySymbol } from '@ghostfolio/common/helper';
 import {
@@ -11,6 +10,7 @@ import { Market } from '@ghostfolio/common/types';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table/activities-table.component';
 import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table/holdings-table.component';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.component';
+import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 import { GfWorldMapChartComponent } from '@ghostfolio/ui/world-map-chart';
 

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

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
 import { InfoItem, LineChartItem } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfLogoComponent } from '@ghostfolio/ui/logo';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   Component,

apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.component.ts

@@ -1,5 +1,5 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import { TextFieldModule } from '@angular/cdk/text-field';

apps/client/src/app/pages/resources/glossary/resources-glossary.component.ts

@@ -1,7 +1,7 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { InfoItem } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { Component, OnInit } from '@angular/core';
 import { RouterModule } from '@angular/router';

apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts

@@ -1,8 +1,8 @@
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { Product } from '@ghostfolio/common/interfaces';
 import { personalFinanceTools } from '@ghostfolio/common/personal-finance-tools';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { translate } from '@ghostfolio/ui/i18n';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { Component, OnInit } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';

apps/client/src/environments/environment.prod.ts

@@ -1,4 +1,6 @@
-export const environment = {
+import type { GfEnvironment } from '@ghostfolio/ui/environment';
+
+export const environment: GfEnvironment = {
   lastPublish: '{BUILD_TIMESTAMP}',
   production: true,
   stripePublicKey: ''

apps/client/src/environments/environment.ts

@@ -1,8 +1,10 @@
+import type { GfEnvironment } from '@ghostfolio/ui/environment';
+
 // This file can be replaced during build by using the `fileReplacements` array.
 // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
-export const environment = {
+export const environment: GfEnvironment = {
   lastPublish: null,
   production: false,
   stripePublicKey: ''

apps/client/src/main.ts

@@ -1,5 +1,6 @@
 import { InfoResponse } from '@ghostfolio/common/interfaces';
 import { filterGlobalPermissions } from '@ghostfolio/common/permissions';
+import { GF_ENVIRONMENT } from '@ghostfolio/ui/environment';
 import { GfNotificationModule } from '@ghostfolio/ui/notifications';
 
 import { Platform } from '@angular/cdk/platform';
@@ -89,6 +90,10 @@ import { environment } from './environments/environment';
         provide: DateAdapter,
         useClass: CustomDateAdapter
       },
+      {
+        provide: GF_ENVIRONMENT,
+        useValue: environment
+      },
       {
         provide: MAT_DATE_FORMATS,
         useValue: DateFormats

eslint.config.cjs

@@ -28,9 +28,7 @@ module.exports = [
               onlyDependOnLibsWithTags: ['*']
             }
           ],
-          enforceBuildableLibDependency: true,
+          enforceBuildableLibDependency: true
-          // Temporary fix, should be removed eventually
-          ignoredCircularDependencies: [['client', 'ui']]
         }
       ],
       '@typescript-eslint/no-extra-semi': 'error',

libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts

@@ -9,7 +9,9 @@ import {
 import { Tag } from '@prisma/client';
 
 export interface PortfolioHoldingResponse {
+  /** @deprecated */
   activities: Activity[];
+
   activitiesCount: number;
   averagePrice: number;
   dataProviderInfo: DataProviderInfo;

libs/ui/src/lib/accounts-table/accounts-table.component.html

@@ -13,7 +13,14 @@
 }
 
 <div class="overflow-x-auto">
-  <table class="gf-table w-100" mat-table matSort [dataSource]="dataSource">
+  <table
+    class="gf-table w-100"
+    mat-table
+    matSort
+    matSortActive="name"
+    matSortDirection="asc"
+    [dataSource]="dataSource"
+  >
     <ng-container matColumnDef="status">
       <th
         *matHeaderCellDef
@@ -199,7 +206,7 @@
     <ng-container matColumnDef="valueInBaseCurrency">
       <th
         *matHeaderCellDef
-        class="d-lg-none d-xl-none px-1 text-right"
+        class="d-lg-none d-xl-none justify-content-end px-1"
         mat-header-cell
         mat-sort-header
       >

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

@@ -1,11 +1,9 @@
-/* eslint-disable @nx/enforce-module-boundaries */
-import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Filter, PortfolioPosition, User } from '@ghostfolio/common/interfaces';
 import { InternalRoute } from '@ghostfolio/common/routes/interfaces/internal-route.interface';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
 import { AccountWithPlatform, DateRange } from '@ghostfolio/common/types';
+import { AdminService, DataService } from '@ghostfolio/ui/services';
 
 import { FocusKeyManager } from '@angular/cdk/a11y';
 import {

libs/ui/src/lib/benchmark/benchmark-detail-dialog/benchmark-detail-dialog.component.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @nx/enforce-module-boundaries */
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import {
   AdminMarketDataDetails,
@@ -7,6 +5,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { GfDialogFooterComponent } from '@ghostfolio/ui/dialog-footer';
 import { GfDialogHeaderComponent } from '@ghostfolio/ui/dialog-header';
+import { DataService } from '@ghostfolio/ui/services';
 
 import {
   CUSTOM_ELEMENTS_SCHEMA,

libs/ui/src/lib/environment/environment.interface.ts

@@ -0,0 +1,5 @@
+export interface GfEnvironment {
+  lastPublish: string | null;
+  production: boolean;
+  stripePublicKey: string;
+}

libs/ui/src/lib/environment/environment.token.ts

@@ -0,0 +1,7 @@
+import { InjectionToken } from '@angular/core';
+
+import { GfEnvironment } from './environment.interface';
+
+export const GF_ENVIRONMENT = new InjectionToken<GfEnvironment>(
+  'GF_ENVIRONMENT'
+);

libs/ui/src/lib/environment/index.ts

@@ -0,0 +1,2 @@
+export * from './environment.interface';
+export * from './environment.token';

libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor-dialog/historical-market-data-editor-dialog.component.ts

@@ -1,6 +1,4 @@
-/* eslint-disable @nx/enforce-module-boundaries */
+import { AdminService, DataService } from '@ghostfolio/ui/services';
-import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 
 import {
   ChangeDetectionStrategy,

libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @nx/enforce-module-boundaries */
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UpdateMarketDataDto } from '@ghostfolio/common/dtos';
 import {
   DATE_FORMAT,
@@ -7,6 +5,7 @@ import {
   getLocale
 } from '@ghostfolio/common/helper';
 import { LineChartItem, User } from '@ghostfolio/common/interfaces';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { CommonModule } from '@angular/common';
 import {

apps/client/src/app/services/admin.service.ts → libs/ui/src/lib/services/admin.service.ts

@@ -21,22 +21,22 @@ import {
   Filter
 } from '@ghostfolio/common/interfaces';
 import { DateRange } from '@ghostfolio/common/types';
+import { GF_ENVIRONMENT, GfEnvironment } from '@ghostfolio/ui/environment';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { SortDirection } from '@angular/material/sort';
 import { DataSource, MarketData, Platform } from '@prisma/client';
 import { JobStatus } from 'bull';
 
-import { environment } from '../../environments/environment';
-import { DataService } from './data.service';
-
 @Injectable({
   providedIn: 'root'
 })
 export class AdminService {
   public constructor(
     private dataService: DataService,
+    @Inject(GF_ENVIRONMENT) private environment: GfEnvironment,
     private http: HttpClient
   ) {}
 
@@ -124,7 +124,7 @@ export class AdminService {
     });
 
     return this.http.get<DataProviderGhostfolioStatusResponse>(
-      `${environment.production ? 'https://ghostfol.io' : ''}/api/v2/data-providers/ghostfolio/status`,
+      `${this.environment.production ? 'https://ghostfol.io' : ''}/api/v2/data-providers/ghostfolio/status`,
       { headers }
     );
   }
@@ -276,7 +276,7 @@ export class AdminService {
     scraperConfiguration,
     symbol
   }: AssetProfileIdentifier & UpdateAssetProfileDto['scraperConfiguration']) {
-    return this.http.post<any>(
+    return this.http.post<{ price: number }>(
       `/api/v1/admin/market-data/${dataSource}/${symbol}/test`,
       {
         scraperConfiguration

libs/ui/src/lib/services/index.ts

@@ -0,0 +1,2 @@
+export * from './admin.service';
+export * from './data.service';

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

@@ -1,7 +1,6 @@
-/* eslint-disable @nx/enforce-module-boundaries */
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { LookupItem } from '@ghostfolio/common/interfaces';
 import { GfSymbolPipe } from '@ghostfolio/common/pipes';
+import { DataService } from '@ghostfolio/ui/services';
 
 import { FocusMonitor } from '@angular/cdk/a11y';
 import {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ghostfolio",
-  "version": "2.227.0",
+  "version": "2.228.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ghostfolio",
-      "version": "2.227.0",
+      "version": "2.228.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {
@@ -22,7 +22,7 @@
         "@angular/router": "21.0.6",
         "@angular/service-worker": "21.0.6",
         "@codewithdan/observable-store": "2.2.15",
-        "@date-fns/utc": "2.1.0",
+        "@date-fns/utc": "2.1.1",
         "@internationalized/number": "3.6.5",
         "@ionic/angular": "8.7.8",
         "@keyv/redis": "4.4.0",
@@ -126,7 +126,7 @@
         "@types/google-spreadsheet": "3.1.5",
         "@types/jest": "30.0.0",
         "@types/jsonpath": "0.2.4",
-        "@types/lodash": "4.17.20",
+        "@types/lodash": "4.17.21",
         "@types/node": "22.15.17",
         "@types/papaparse": "5.3.7",
         "@types/passport-google-oauth20": "2.0.16",
@@ -3816,9 +3816,9 @@
       }
     },
     "node_modules/@date-fns/utc": {
-      "version": "2.1.0",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@date-fns/utc/-/utc-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@date-fns/utc/-/utc-2.1.1.tgz",
-      "integrity": "sha512-176grgAgU2U303rD2/vcOmNg0kGPbhzckuH1TEP2al7n0AQipZIy9P15usd2TKQCG1g+E1jX/ZVQSzs4sUDwgA==",
+      "integrity": "sha512-SlJDfG6RPeEX8wEVv6ZB3kak4MmbtyiI2qX/5zuKdordbrhB/iaJ58GVMZgJ6P1sJaM1gMgENFYYeg1JWrCFrA==",
       "license": "MIT"
     },
     "node_modules/@deno/shim-deno": {
@@ -12674,9 +12674,9 @@
       }
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.20",
+      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "integrity": "sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==",
       "dev": true,
       "license": "MIT"
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.227.0",
+  "version": "2.228.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",
@@ -66,7 +66,7 @@
     "@angular/router": "21.0.6",
     "@angular/service-worker": "21.0.6",
     "@codewithdan/observable-store": "2.2.15",
-    "@date-fns/utc": "2.1.0",
+    "@date-fns/utc": "2.1.1",
     "@internationalized/number": "3.6.5",
     "@ionic/angular": "8.7.8",
     "@keyv/redis": "4.4.0",
@@ -170,7 +170,7 @@
     "@types/google-spreadsheet": "3.1.5",
     "@types/jest": "30.0.0",
     "@types/jsonpath": "0.2.4",
-    "@types/lodash": "4.17.20",
+    "@types/lodash": "4.17.21",
     "@types/node": "22.15.17",
     "@types/papaparse": "5.3.7",
     "@types/passport-google-oauth20": "2.0.16",