From a17e2a1a15bf6e8aa0f898f38ba095232464ab50 Mon Sep 17 00:00:00 2001
From: Kristin Aoki <kaoki@edx.org>
Date: Thu, 12 Aug 2021 14:35:11 -0400
Subject: [PATCH] Update unitViaSequenceId to check if id is not block id

---
 src/courseware/CoursewareContainer.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/courseware/CoursewareContainer.jsx b/src/courseware/CoursewareContainer.jsx
index c89dfccc..1439e109 100644
--- a/src/courseware/CoursewareContainer.jsx
+++ b/src/courseware/CoursewareContainer.jsx
@@ -490,7 +490,16 @@ const sectionViaSequenceIdSelector = createSelector(
 const unitViaSequenceIdSelector = createSelector(
   (state) => state.models.units || {},
   (state) => state.courseware.sequenceId,
-  (unitsById, sequenceId) => (unitsById[sequenceId] ? unitsById[sequenceId] : null),
+  (state) => state.models.unitIdHashKeyMap,
+  (unitsById, sequenceId, unitMap) => {
+    if (!unitsById[sequenceId] && Object.keys(unitsById).length > 0 && unitMap) {
+      if (sequenceId in unitMap) {
+        const updatedSequenceId = unitMap[sequenceId];
+        return unitsById[updatedSequenceId];
+      }
+    }
+    return unitsById[sequenceId] ? unitsById[sequenceId] : null;
+  },
 );
 
 const unitIdHashKeyMapSelector = createSelector(