diff --git a/src/pages/nutrition/NutrimentCell.tsx b/src/pages/nutrition/NutrimentCell.tsx index 5a0d69b2c..b0d21af66 100644 --- a/src/pages/nutrition/NutrimentCell.tsx +++ b/src/pages/nutrition/NutrimentCell.tsx @@ -34,7 +34,7 @@ function clean(input: undefined | string | null | number): string { if (input == undefined) { return ""; } - return `${input}`.replaceAll(" ", ""); + return `${input}`.replaceAll(" ", "").toLowerCase(); } function getLegendColor(productValue, value, productUnit, unit) { @@ -58,18 +58,15 @@ function getLegendColor(productValue, value, productUnit, unit) { const ratioProduct = getRatio(cleanProductUnit); const ratioInput = getRatio(cleanUnit); - if (ratioProduct === - ratioInput) { - return "red"; - } - else { - const numberProduct = Number.parseFloat(cleanProductValue.match(/(\.|,|\d)+/)[0]) - const numberInput = Number.parseFloat(cleanValue.match(/(\.|,|\d)+/)[0]) - if (ratioProduct * numberProduct === ratioInput * numberInput) { - return 'green' - } - return 'red' + const numberProduct = Number.parseFloat(cleanProductValue.match(/(\.|,|\d)+/)[0]) + const numberInput = Number.parseFloat(cleanValue.match(/(\.|,|\d)+/)[0]) + + + if (ratioProduct * numberProduct === ratioInput * numberInput) { + return 'green' } + return 'red' + // Should never reach that part. return undefined; } @@ -142,7 +139,7 @@ export const NutrimentCell = (props: NutrimentCellProps) => { )} - {isValidUnit(unit, nutrimentId) ? ( + {forcedUnit === undefined && isValidUnit(unit, nutrimentId) ? (