Merge origin/release/v0.26 into release/v0.26-to-0.28 (using imerge)

src/features/private/dashboard/organisms/LandlordOverview/index.tsx

@@ -58,27 +58,22 @@ const LandlordOverview: FC<Props> = ({ propertyId }) => {
     [property?.offers_list, listingId]
   );
 
-  const activeOffer = useMemo(
+  const activeOffers = useMemo(
     () =>
-      maxBy(
       offers_list.filter(
         ({ state }) =>
           isAfterOfferStatus(state, Offer_Api_OfferStateEnum.Pending) &&
-            isBeforeOfferStatus(
-              state,
-              Offer_Api_OfferStateEnum.EarlyTermination
-            )
-        ),
-        ({ updated_at_value }) => new Date(updated_at_value).getTime()
+          isBeforeOfferStatus(state, Offer_Api_OfferStateEnum.EarlyTermination)
       ),
     [offers_list]
   );
 
   const filteredOffers = useMemo(
     () =>
-      activeOffer
-        ? offers_list.filter(
-            ({ id, state, updated_at_value }) =>
+      activeOffers.length > 0
+        ? offers_list.filter(({ id, state, updated_at_value }) =>
+            activeOffers.some(
+              (activeOffer) =>
                 id === activeOffer.id ||
                 isAfter(
                   new Date(updated_at_value),
@@ -86,8 +81,9 @@ const LandlordOverview: FC<Props> = ({ propertyId }) => {
                 ) ||
                 state === Offer_Api_OfferStateEnum.Active
             )
+          )
         : offers_list,
-    [activeOffer, offers_list]
+    [activeOffers, offers_list]
   );
 
   const finishedOffers = useMemo(