@ -285,7 +285,7 @@ export class ExchangeRateDataService {
'ExchangeRateDataService'
'ExchangeRateDataService'
) ;
) ;
return undefined ;
return aValue ;
}
}
public async toCurrencyAtDate (
public async toCurrencyAtDate (
@ -326,16 +326,10 @@ export class ExchangeRateDataService {
) ;
) ;
}
}
const derivedCurrencyFactor =
this . derivedCurrencyFactors [
` ${ normalizedFromCurrency } ${ normalizedToCurrency } `
] ;
let factor : number ;
let factor : number ;
if ( normalizedFromCurrency === normalizedToCurrency ) {
if ( normalizedFromCurrency === normalizedToCurrency ) {
factor = 1 ;
factor = 1 ;
} else if ( derivedCurrencyFactor ) {
factor = derivedCurrencyFactor ;
} else {
} else {
const dataSource =
const dataSource =
this . dataProviderService . getDataSourceForExchangeRates ( ) ;
this . dataProviderService . getDataSourceForExchangeRates ( ) ;
@ -402,7 +396,7 @@ export class ExchangeRateDataService {
'ExchangeRateDataService'
'ExchangeRateDataService'
) ;
) ;
return undefined ;
return aValue ;
}
}
private async getExchangeRates ( {
private async getExchangeRates ( {
@ -447,20 +441,6 @@ export class ExchangeRateDataService {
return factors ;
return factors ;
}
}
const derivedCurrencyFactor =
this . derivedCurrencyFactors [
` ${ normalizedCurrencyFrom } ${ normalizedCurrencyTo } `
] ;
if ( derivedCurrencyFactor ) {
for ( const date of dates ) {
factors [ format ( date , DATE_FORMAT ) ] =
conversionFactorFrom * derivedCurrencyFactor * conversionFactorTo ;
}
return factors ;
}
const dataSource = this . dataProviderService . getDataSourceForExchangeRates ( ) ;
const dataSource = this . dataProviderService . getDataSourceForExchangeRates ( ) ;
const symbol = ` ${ normalizedCurrencyFrom } ${ normalizedCurrencyTo } ` ;
const symbol = ` ${ normalizedCurrencyFrom } ${ normalizedCurrencyTo } ` ;