Browse Source

Task/move currency removal from cryptocurrency names to general availability (#7650)

* Move currency removal from cryptocurrency names to general availability

* Update changelog
pull/7653/head^2
Thomas Kaul 11 hours ago
committed by GitHub
parent
commit
0a07db8261
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 18
      apps/api/src/services/data-provider/data-provider.service.ts
  3. 15
      libs/common/src/lib/helper.ts

1
CHANGELOG.md

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Moved the improved symbol lookup results by removing the currency from the name of cryptocurrencies from experimental to general availability
- Upgraded `ng-extract-i18n-merge` from `3.3.0` to `3.4.0` - Upgraded `ng-extract-i18n-merge` from `3.3.0` to `3.4.0`
### Fixed ### Fixed

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

@ -17,6 +17,7 @@ import { CreateOrderDto } from '@ghostfolio/common/dtos';
import { SubscriptionType } from '@ghostfolio/common/enums'; import { SubscriptionType } from '@ghostfolio/common/enums';
import { import {
DATE_FORMAT, DATE_FORMAT,
formatAssetProfileName,
getAssetProfileIdentifier, getAssetProfileIdentifier,
getCurrencyFromSymbol, getCurrencyFromSymbol,
getStartOfUtcDate, getStartOfUtcDate,
@ -125,7 +126,11 @@ export class DataProviderService implements OnModuleInit {
symbol, symbol,
dataSource: DataSource[dataSource] dataSource: DataSource[dataSource]
}) })
] = { ...assetProfile, symbol }; ] = {
...assetProfile,
symbol,
name: formatAssetProfileName(assetProfile)
};
} }
}) })
); );
@ -897,16 +902,7 @@ export class DataProviderService implements OnModuleInit {
lookupItem.dataProviderInfo.isPremium = false; lookupItem.dataProviderInfo.isPremium = false;
} }
if ( lookupItem.name = formatAssetProfileName(lookupItem);
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; return lookupItem;
}) })

15
libs/common/src/lib/helper.ts

@ -261,6 +261,21 @@ export function extractNumberFromString({
} }
} }
export function formatAssetProfileName({
assetSubClass,
name
}: {
assetSubClass?: AssetSubClass;
name?: string;
}) {
if (assetSubClass === 'CRYPTOCURRENCY') {
// Remove DEFAULT_CURRENCY at the end of cryptocurrency names
return name?.replace(new RegExp(` ${DEFAULT_CURRENCY}$`), '');
}
return name;
}
export function formatMonthAndYear({ export function formatMonthAndYear({
date, date,
locale locale

Loading…
Cancel
Save