From f0088d3e1cd3fed1150a07292bc004af244110b2 Mon Sep 17 00:00:00 2001
From: Ben Durrant <ben.durrant@marketdojo.com>
Date: Fri, 28 Jun 2024 16:23:34 +0100
Subject: [PATCH] golf a few things

---
 packages/toolkit/src/entities/sorted_state_adapter.ts  | 10 ++++------
 .../toolkit/src/entities/unsorted_state_adapter.ts     |  4 +---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/toolkit/src/entities/sorted_state_adapter.ts b/packages/toolkit/src/entities/sorted_state_adapter.ts
index 560d8a8896..0578032764 100644
--- a/packages/toolkit/src/entities/sorted_state_adapter.ts
+++ b/packages/toolkit/src/entities/sorted_state_adapter.ts
@@ -175,7 +175,7 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
       return false
     }
 
-    for (let i = 0; i < a.length && i < b.length; i++) {
+    for (let i = 0; i < a.length; i++) {
       if (a[i] === b[i]) {
         continue
       }
@@ -191,7 +191,7 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
     replacedIds?: boolean,
   ) => void
 
-  const mergeInsertion: MergeFunction = (
+  const mergeFunction: MergeFunction = (
     state,
     addedItems,
     appliedUpdates,
@@ -202,9 +202,9 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
 
     const stateEntities = state.entities as Record<Id, T>
 
-    let ids = currentIds
+    let ids: Iterable<Id> = currentIds
     if (replacedIds) {
-      ids = Array.from(new Set(currentIds))
+      ids = new Set(currentIds)
     }
 
     let sortedEntities: T[] = []
@@ -241,8 +241,6 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
     }
   }
 
-  const mergeFunction: MergeFunction = mergeInsertion
-
   return {
     removeOne,
     removeMany,
diff --git a/packages/toolkit/src/entities/unsorted_state_adapter.ts b/packages/toolkit/src/entities/unsorted_state_adapter.ts
index e2d6c31357..54739ec9d7 100644
--- a/packages/toolkit/src/entities/unsorted_state_adapter.ts
+++ b/packages/toolkit/src/entities/unsorted_state_adapter.ts
@@ -145,9 +145,7 @@ export function createUnsortedStateAdapter<T, Id extends EntityId>(
           // Spreads ignore falsy values, so this works even if there isn't
           // an existing update already at this key
           changes: {
-            ...(updatesPerEntity[update.id]
-              ? updatesPerEntity[update.id].changes
-              : null),
+            ...updatesPerEntity[update.id]?.changes,
             ...update.changes,
           },
         }