@bytebrand/fe-ui-core 4.8.30 → 4.8.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.8.30",
+  "version": "4.8.32",
   "description": "UI components for the auto.de project",
   "main": "index.ts",
   "module": "dist/common.js",

package/source/components/VehicleSmallCard/VehicleData/VehicleInfo/VehicleInfo.tsx

@@ -1,6 +1,7 @@
 /* tslint:disable */
 import * as React from 'react';
 import classnames from 'classnames';
+import _get from 'lodash/get';
 import styles from './VehicleInfo.styl';
 import PriceRating from '../../../PriceRating/PriceRating';
 import { Visible, Hidden } from 'react-grid-system';
@@ -43,7 +44,8 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
     consumption,
     location,
     offer,
-    engineData
+    engineData,
+    leasing
   } = props;
   const firstRegistrationDate = regDate && regDate !== 0 ? regDate : 'N/A';
 
@@ -149,7 +151,12 @@ const VehicleInfo: React.FC<IVehicleInfoProps> = (props) => {
       ),
         ...routeObj,
         className: wrapClasses,
-        onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
+        onClick: () => localStorage.setItem(
+          'activeTabCDP',
+          _get(leasing, 'isActive', false)
+            ? t('vehicleProps:title.leasing')
+            : t('vehicleProps:title.financing')
+        ),
         href: url,
         target,
         rel

package/source/components/VehicleSmallCard/VehicleSmallCard.tsx

@@ -280,7 +280,12 @@ const VehicleSmallCard: FunctionComponent<IVehicleSmallCardProps> = (props) => {
           target,
           rel,
           className: `${styles.redirectClassLink} ${styles.gridAreaTitle}`,
-          onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
+          onClick: () => localStorage.setItem(
+            'activeTabCDP',
+            _get(price, 'leasing.isActive', false)
+              ? t('vehicleProps:title.leasing')
+              : t('vehicleProps:title.financing')
+          ),
           href: url
         })}
 
@@ -333,7 +338,12 @@ const VehicleSmallCard: FunctionComponent<IVehicleSmallCardProps> = (props) => {
           target,
           rel,
           className: `${styles.redirectClassLink} ${styles.gridAreaImage}`,
-          onClick: () => localStorage.setItem('activeTabCDP', t('vehicleProps:title.financing')),
+          onClick: () => localStorage.setItem(
+            'activeTabCDP',
+            _get(price, 'leasing.isActive', false)
+              ? t('vehicleProps:title.leasing')
+              : t('vehicleProps:title.financing')
+          ),
           href: url
         })}
         <VehicleInfo {...vehicleInfoProps} />

package/source/framework/types/types.ts

@@ -115,6 +115,7 @@ export interface IVehicleInfo {
   url?: string;
   target?: string;
   rel?: string;
+  leasing?: ILeasing;
 }
 
 export interface IVehicleTitleProps {

package/source/framework/vehiclesProps/decoratedLightProps.tsx

@@ -143,7 +143,9 @@ const getDecoratedLightProps = (
           ? t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit })
           : t('vehicleProps:value.na');
 
-        const consumptionPowerCombinedContent = t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit });
+        const consumptionPowerCombinedContent = Number.isFinite(consumptionPowerCombined)
+          ? t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
 
         const co2Value = Number.isFinite(co2)
           ? t('vehicleProps:value.co2Combined', { co2: co2.toLocaleString(language) })
@@ -233,8 +235,12 @@ const getDecoratedLightProps = (
 
         const consumptionPowerCombinedContent = t('vehicleProps:value.consumptionPowerCombined', { consumption: consumptionPowerCombined.toLocaleString(language), unit: translatedUnit });
         const consumptionCombinedContent = t('vehicleProps:value.consumptionCombined', { consumption: consumptionCombined.toLocaleString(language), unit: translatedUnit });        
-        const wltpWeightedPowerCombinedContent = t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit });
-        const wltpWeightedCombinedContent = t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit });
+        const wltpWeightedPowerCombinedContent = Number.isFinite(wltpWeightedPowerCombined)
+          ? t('vehicleProps:value.wltpWeightedPowerCombined', { consumption: wltpWeightedPowerCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
+        const wltpWeightedCombinedContent = Number.isFinite(wltpWeightedCombined)
+          ? t('vehicleProps:value.wltpWeightedCombined', { consumption: wltpWeightedCombined.toLocaleString(language), unit: translatedUnit })
+          : null;
         const wltpConsumptionPowerCombinedContent = wltpConsumptionPowerCombined
           ? t('vehicleProps:value.wltpPowerCombined', { consumption: wltpConsumptionPowerCombined.toLocaleString(language), unit: translatedUnit })
           : null;