homeflowjs 0.13.63 → 0.13.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homeflowjs",
-  "version": "0.13.63",
+  "version": "0.13.64",
   "sideEffects": [
     "modal/**/*",
     "user/default-profile/**/*",

package/properties/properties-display/properties-display.component.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useMemo } from 'react';
 import { connect, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 
@@ -73,10 +73,24 @@ const PropertiesDisplay = ({
   const insertsAvailable = Array.isArray(inserts) && inserts.length > 0;
   const insertsFrequency =
     insertsAvailable && inserts[0]?.frequency > 0 ? inserts[0].frequency : null;
-  const insertsIndexMap =
-    insertsAvailable && inserts.some((insert) => insert?.index >= 0)
-      ? inserts.reduce((acc, { index }) => [...acc, index], [])
+  
+  const { propertiesInsertsMap, insertablePropertiesIDList } = useMemo(() => {
+    const propertiesLength = properties.length;
+    const validInserts = insertsAvailable
+      ? inserts.filter(({ index }) => index >= 0 && index < propertiesLength)
       : null;
+    if (validInserts) {
+      const propertiesInsertsMap = new Map();
+      for (const insert of validInserts) {
+        const property = properties[insert.index];
+        propertiesInsertsMap.set(property.property_id, insert);
+      };
+      const insertablePropertiesIDList = Array.from(propertiesInsertsMap.keys());
+
+      return { propertiesInsertsMap, insertablePropertiesIDList };
+    }
+    return {};
+  }, [properties]);
   
   const items = propertiesByPage(properties, propertiesPagination).map((page, i) => (
     <ConditionalWrapper
@@ -96,15 +110,18 @@ const PropertiesDisplay = ({
          * TODO: Allow for multiple inserts
          * This code only allows one insert from the inserts array to be show at a time
          */
-        if (insertsFrequency && (index % insertsFrequency) === 0 && index !== 0) {
+        if (insertsFrequency && index % insertsFrequency === 0 && index !== 0) {
           return (
             <React.Fragment key={property.property_id}>
               {inserts[0].component}
               <Item property={property} {...other} />
             </React.Fragment>
           );
-        } else if (insertsIndexMap && insertsIndexMap.includes(index)) {
-          const findResult = inserts.find(insert => insert?.index === index);
+        } else if (
+          insertablePropertiesIDList?.length &&
+          insertablePropertiesIDList.includes(property.property_id)
+        ) {
+          const findResult = propertiesInsertsMap.get(property.property_id);
           if (findResult) {
             return (
               <React.Fragment key={property.property_id}>
@@ -113,7 +130,7 @@ const PropertiesDisplay = ({
               </React.Fragment>
             );
           }
-        }
+        }        
 
         return (
           <Item