@bytebrand/fe-ui-core 4.2.210 → 4.2.212

package/package.json

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

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

@@ -105,7 +105,7 @@ const OrderStatusCar = ({
             </div>
             <div className={styles.requestId}>{request}</div>
             <div className={styles.carPayment}>
-              {!!transformedDeliveryDate ? transformedDeliveryDate
+              {wonStatus === 'won' && !!transformedDeliveryDate ? transformedDeliveryDate
               : <>
                   {t(`buyingType.${buyingType}`)},&nbsp;
                   {buyingType !== 'buy' && `${t('paybackPeriod', { paybackPeriod })},`}&nbsp;

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

@@ -44,23 +44,21 @@ const OrderStatusSection = ({
     if (!!addressObj) {
       Object.keys(addressObj).forEach((key) => {
         switch (key) {
-          case 'customerFirstname':
-          case 'customerLastname':
+          case 'firstname':
+          case 'lastname':
             addressString = `${addressString} ${addressObj[key]}`;
             break;
-          case 'deliveryPartner':
-          case 'customerStreet':
-          case 'deliveryStreet':
-          case 'customerZip':
-          case 'deliveryZip':
+          case 'partner':
+          case 'street':
+          case 'zip':
+          case 'number':
             if (!!addressString) {
               addressString = `${addressString}, ${addressObj[key]}`;
             } else {
               addressString = `${addressString} ${addressObj[key]}`;
             }
             break;
-          case 'customerCity':
-          case 'deliveryCity':
+          case 'city':
             addressString = `${addressString} ${addressObj[key]}`;
             break;
           default: addressString = `${addressString} ${addressObj[key]}`;
@@ -144,6 +142,7 @@ const OrderStatusSection = ({
               request,
               registration,
               currentSalesPrice,
+              totalPrice,
               deposit,
               preparationCost,
               licensePlateCost,
@@ -168,7 +167,7 @@ const OrderStatusSection = ({
             const additionalOrderData = {
               addressData: [
                 ...customerAddress ? [{ label: t('MyOrderPage:billingAddress'), value: getTransformAddressToString(customerAddress) }] : [],
-                ...deliveryAddress ? [{ label: t('MyOrderPage:vehicleDelivery'), value: getTransformAddressToString(deliveryAddress) }] : []
+                ...deliveryAddress ? [{ label: t('MyOrderPage:vehicleDelivery'), value: selfPickup ? t('MyOrderPage:selfPickup') : getTransformAddressToString(deliveryAddress) }] : []
               ],
               carPriceData: [
                 ...currentSalesPrice ? [getDataPriceItem(currentSalesPriceWithWarranty, carPriceWithWarrantyTitle(warranty))] : [],
@@ -176,7 +175,7 @@ const OrderStatusSection = ({
                 ...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'))] : [],
+                ...!!transportationCost && delivery ? [getDataPriceItem(transportationCost, t('MyOrderPage:delivery'))] : [],
                 ...paymentProtectionInsuranceCost ? [getDataPriceItem(paymentProtectionInsuranceCost, t('MyOrderPage:paymentProtectionInsuranceCost'))]: [],
                 ...firstRate ? [getDataPriceItem(firstRate, t('MyOrderPage:firstRate'))] : [],
                 ...buyingType !== 'buy' ? [
@@ -191,7 +190,7 @@ const OrderStatusSection = ({
               ],
               overallRate: {
                 label: t('MyOrderPage:yourOverallRate'),
-                value: buyingType === 'buy' ? currentSalesPrice : monthlyInstallment
+                value: buyingType === 'buy' ? totalPrice : monthlyInstallment
               }
             };
   
@@ -225,10 +224,11 @@ const OrderStatusSection = ({
               delivery
             };
   
-            const title = <span>
-              {t('orderStatus.title')}:&nbsp;
-              <span className={styles.orderStatus}>{t(`orderStatus.${status}`)}</span>
-            </span>;
+            const title = wonStatus === 'pending' ? <span>
+                {t('orderStatus.title')}:&nbsp;
+                <span className={styles.orderStatus}>{t(`orderStatus.${status}`)}</span>
+              </span>
+              : <span>{t('orderStatus.myOrder')}</span>;
   
             return (
               <DashboardSection key={index} title={title}>

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