Does not unset home screen when updating route on another screen

packages/builder/src/stores/builder/screens.ts

@@ -464,15 +464,20 @@ export class ScreenStore extends BudiStore<ScreenState> {
     }
     await this.patch(patchFn, screen._id)
 
-    // Ensure we don't have more than one home screen for this new role.
-    // This could happen after updating multiple different settings.
+    // Ensure we don't have more than one home screen for this role when
+    // the updated screen is currently marked as home.
     this.store.update(state => {
+      const updatedScreen = state.screens.find(s => s._id === screen._id)
+      if (!updatedScreen?.routing.homeScreen) {
+        return state
+      }
+
       const otherHomeScreens = state.screens.filter(s => {
         return (
-          s.workspaceAppId === screen.workspaceAppId &&
-          s.routing.roleId === screen.routing.roleId &&
+          s.workspaceAppId === updatedScreen.workspaceAppId &&
+          s.routing.roleId === updatedScreen.routing.roleId &&
           s.routing.homeScreen &&
-          s._id !== screen._id
+          s._id !== updatedScreen._id
         )
       })
 

packages/builder/src/stores/builder/tests/screens.test.js

@@ -589,6 +589,45 @@ describe("Screens store", () => {
     expect(bb.store.screens[1].routing.homeScreen).toBe(false)
   })
 
+  it("Does not unset home screen when updating route on another screen", async ({
+    bb,
+  }) => {
+    const existingScreens = Array(3)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    const storeScreens = existingScreens.map(screen => screen.json())
+    storeScreens[1].routing.homeScreen = true
+
+    await bb.screenStore.update(state => ({
+      ...state,
+      screens: storeScreens,
+    }))
+
+    vi.spyOn(bb.screenStore, "patch").mockImplementation(
+      async (patchFn, screenId) => {
+        const target = bb.store.screens.find(screen => screen._id === screenId)
+        patchFn(target)
+
+        await bb.screenStore.replace(screenId, target)
+      }
+    )
+
+    await bb.screenStore.updateSetting(
+      storeScreens[0],
+      "routing.route",
+      "/updated-route"
+    )
+
+    expect(bb.store.screens[0].routing.route).toBe("/updated-route")
+    expect(bb.store.screens[1].routing.homeScreen).toBe(true)
+  })
+
   it("Ensure only one homescreen per role when updating screen setting. Multiple screen roles", async ({
     bb,
   }) => {