🔀 Merge pull request #36 from alexlee-dev/feature/filter

✏️ Change some Array.forEach() to use Array.filter() instead.

src/redux/reducers/world.js

@@ -40,13 +40,9 @@ export default (state = worldDefaultState, action) => {
         const { isHomePlanet, items, location, name } = planet
         const planetContainsItem = items.includes(item)
         if (planetContainsItem) {
-          const itemIndex = items.findIndex(currentItem => item === currentItem)
-          const newItems = Array.from(items)
-          newItems.splice(itemIndex, 1)
-
           const newPlanetObj = {
             isHomePlanet,
-            items: newItems,
+            items: items.filter(currentItem => item !== currentItem),
             location,
             name
           }

src/util.js

@@ -42,11 +42,10 @@ export const generatePlanets = () => {
     planets.push({ isHomePlanet, location, name })
   }
 
-  planets.forEach((planet, i) => {
-    const otherPlanets = [...planets]
-    otherPlanets.splice(i, 1)
-
-    planet.items = generateItems(otherPlanets)
+  planets.forEach(planet => {
+    planet.items = generateItems(
+      planets.filter(currentPlanet => currentPlanet !== planet)
+    )
   })
 
   return planets

src/views/planets.js

@@ -116,12 +116,10 @@ const mapDispatchToProps = dispatch => ({
     dispatch(removeItem(item))
   },
   handleShipTravel: (destination, shipCargo) => {
-    const sellableItems = []
-    shipCargo.forEach(item => {
-      if (item.destination.value === destination.value) {
-        sellableItems.push(item)
-      }
-    })
+    const sellableItems = shipCargo.filter(
+      item => item.destination.value === destination.value
+    )
+
     sellableItems.forEach(item => {
       // * Add the value of this item to the user's cash
       dispatch(addCash(item.value))