@bytebrand/fe-ui-core 4.2.206 → 4.2.208

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/fe-ui-core",
-  "version": "4.2.206",
+  "version": "4.2.208",
   "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/VehicleDetailedSidebar/VehicleDetailedSidebar.tsx

@@ -147,7 +147,7 @@ const VehicleDetailedSidebar: FunctionComponent<IVehicleDetailedSidebarProps> =
 
   return (
     <>
-      {isFetching ? <div className={styles.detailedInfo}>
+      {!isFetching ? <div className={styles.detailedInfo}>
           <Title {...titleProps} />
           <Price {...priceProps} />
           <Price {...priceProps} isSticky={true} />
@@ -174,7 +174,7 @@ const VehicleDetailedSidebar: FunctionComponent<IVehicleDetailedSidebarProps> =
           {props.children}
         </div> : <div className={styles.skeletonInfoContainer}><Skeleton /></div>
       }
-      {isFetching ? <div>{isAlternativeType &&
+      {!isFetching ? <div>{isAlternativeType &&
           <DealerInfo
             t={t}
             infoSections={infoSections}
@@ -186,7 +186,7 @@ const VehicleDetailedSidebar: FunctionComponent<IVehicleDetailedSidebarProps> =
           />}
         </div> : <div className={styles.skeletonInfoContainer}><Skeleton /></div>
       }
-      {isFetching ? <Hidden xs sm md>
+      {!isFetching ? <Hidden xs sm md>
           <div className={`${styles.detailedInfo} ${styles.highlights}`}>{carLoaded && <Properties {...propertiesProps} />}</div>
         </Hidden> : <div className={styles.skeletonInfoContainer}><Skeleton /></div>
       }