@bytebrand/fe-ui-core 4.2.207 → 4.2.209

package/package.json

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

package/source/components/UserDashboardPage/sections/OrderStatusSection/OrderStatusCar.tsx

@@ -30,6 +30,7 @@ interface IOrderStatusCar {
   additionalOrderInfoProps?: any;
   wonStatus?: string;
   transformedDeliveryDate?: string | null;
+  delivery?: boolean;
 }
 
 const OrderStatusCar = ({
@@ -49,7 +50,8 @@ const OrderStatusCar = ({
   onClick,
   additionalOrderInfoProps,
   wonStatus,
-  transformedDeliveryDate
+  transformedDeliveryDate,
+  delivery
 }: IOrderStatusCar) => {
   const ref = useRef(null);
   const [activeStep, setActiveStep] = useState(0); // 0 - when we have no active steps
@@ -58,7 +60,7 @@ const OrderStatusCar = ({
     { icon: 'orderReceivedDashboard', selector: 'selector_status_order_received' },
     { icon: 'preparaionDashboard', selector: 'selector_status_preparation' },
     { icon: 'registrationDashboard', selector: 'selector_status_registration' },
-    selfPickup ? { icon: 'pickupDashboard', selector: 'selector_status_pick_up' }
+    selfPickup || !delivery ? { icon: 'pickupDashboard', selector: 'selector_status_pick_up' }
     : { icon: 'deliveryDashboard', selector: 'selector_status_delivery' },
     { icon: 'handingOverDashboard', selector: 'selector_status_handing_over' }
   ];

package/source/components/UserDashboardPage/sections/OrderStatusSection/OrderStatusSection.tsx

@@ -155,7 +155,10 @@ const OrderStatusSection = ({
               paymentProtectionInsuranceCost,
               wonStatus,
               warranty,
-              deliveryDate
+              deliveryDate,
+              isLicensePlateFee,
+              delivery,
+              extrasSumCost
             } = orderedCar;
 
             const transformedDeliveryDate = !!deliveryDate ? `${t('MyOrderPage:deliveredOn')} ${fromUTCToDateString(deliveryDate)}` : null;
@@ -170,9 +173,10 @@ const OrderStatusSection = ({
               carPriceData: [
                 ...currentSalesPrice ? [getDataPriceItem(currentSalesPriceWithWarranty, carPriceWithWarrantyTitle(warranty))] : [],
                 ...preparationCost ? [getDataPriceItem(preparationCost, t('MyOrderPage:preparationCost'))] : [],
-                ...registrationCost ? [getDataPriceItem(registrationCost, t('MyOrderPage:vehicleRegistration'))] : [],
-                ...licensePlateCost ? [getDataPriceItem(licensePlateCost, t('MyOrderPage:licensePlates'))] : [],
-                ...transportationCost ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
+                ...extrasSumCost ? [getDataPriceItem(extrasSumCost, t('MyOrderPage:extrasSumCost'))] : [],
+                ...registrationCost && registration ? [getDataPriceItem(registrationCost, t('MyOrderPage:vehicleRegistration'))] : [],
+                ...licensePlateCost && isLicensePlateFee ? [getDataPriceItem(licensePlateCost, t('MyOrderPage:licensePlates'))] : [],
+                ...transportationCost && delivery ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
                 ...paymentProtectionInsuranceCost ? [getDataPriceItem(paymentProtectionInsuranceCost, t('MyOrderPage:paymentProtectionInsuranceCost'))]: [],
                 ...firstRate ? [getDataPriceItem(firstRate, t('MyOrderPage:firstRate'))] : [],
                 ...buyingType !== 'buy' ? [
@@ -217,7 +221,8 @@ const OrderStatusSection = ({
               onClick: () => onDetailsClick(_id),
               additionalOrderInfoProps,
               wonStatus,
-              transformedDeliveryDate
+              transformedDeliveryDate,
+              delivery
             };
   
             const title = <span>

package/source/components/_common/Button/Button.tsx

@@ -15,6 +15,7 @@ export interface IButtonProps {
   color?: variantColor;
   children?: any;
   variant?: variantType;
+  getRef?: (ref: HTMLButtonElement) => void;
 
   disabled?: boolean;
   loading?: boolean;
@@ -25,7 +26,7 @@ export interface IButtonProps {
   onMouseLeave?: (event: React.MouseEvent<HTMLButtonElement>) => void;
 }
 
-const Button: React.FC<IButtonProps> = ({ className, color, onClick, onMouseEnter, onMouseLeave, variant, loading, disabled, children  }: IButtonProps) => {
+const Button: React.FC<IButtonProps> = ({ getRef, className, color, onClick, onMouseEnter, onMouseLeave, variant, loading, disabled, children  }: IButtonProps) => {
   const onHandlerClick = (event: React.MouseEvent<HTMLButtonElement>) => {
     event.stopPropagation();
     event.nativeEvent.stopImmediatePropagation();
@@ -52,6 +53,7 @@ const Button: React.FC<IButtonProps> = ({ className, color, onClick, onMouseEnte
     onClick: onHandlerClick,
     onMouseEnter: onHandlerMouseEnter,
     onMouseLeave: onHandlerMouseLeave,
+    ref:getRef,
     disabled: disabled || loading
   };
 
@@ -69,7 +71,7 @@ Button.defaultProps = {
   buttonType: 'button',
 
   onClick: () => { },
-
+  getRef: () => { },
   onMouseEnter: () => { },
   onMouseLeave: () => { }
 };

package/source/components/_common/OfferRequestButtonWrapper/OfferRequestButtonWrapper.tsx

@@ -23,13 +23,17 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
   const dealerId = _get(car, 'metaData.ownerId') || null;
   const carId = _get(car, '_id', '');
   const onAutoDeIdClick = () => {
-    btnEl.current.onClick();
+    btnEl.current?.click();
   };
 
   const controlsContainerClassName = classnames(
     styles.controlsContainer,
     controlsClassContainer
   );
+
+  const getRef = (ref: HTMLButtonElement): void => {
+    btnEl.current = ref;
+  };
   return (
     <>
       <div className={controlsContainerClassName}>
@@ -42,7 +46,7 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
             isLoading: boolean,
             isSale: boolean,
             isAlternative: boolean
-            ) => {
+          ) => {
             const { metaData } = car;
             const isAlternativeType = !!metaData && !!metaData.type;
             const offerButtonClassName = classnames(
@@ -63,10 +67,10 @@ const OfferRequestBtnWrapper: React.FunctionComponent<IOfferRequestButtonWrapper
 
             return (
               <StyledButton
-                refs={btnEl}
                 className={offerButtonClassName}
                 onClick={onClick}
                 loading={isLoading}
+                getRef={getRef}
               >
                 {isOfferRequested
                   ? null