Merge pull request #1578 from session-foundation/fix-password-crash

Bilb · web-flow · commit 54303d6b578e · 2025-09-03T05:50:28.000+02:00
fix: crash on password window
diff --git a/ts/state/selectors/modal.ts b/ts/state/selectors/modal.ts
@@ -117,7 +117,7 @@ export function useConversationSettingsModalIsStandalone() {
 }
 
 export function useModalStack() {
-  return useSelector((state: StateType) => state.modals.modalStack);
+  return useSelector((state: StateType) => state.modals?.modalStack ?? []); // that [] is needed for the password window
 }
 
 export function useIsTopModal(modalId: ModalId) {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export function useConversationSettingsModalIsStandalone() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`export function useModalStack() {`
`120`		`- return useSelector((state: StateType) => state.modals.modalStack);`
	`120`	`+ return useSelector((state: StateType) => state.modals?.modalStack ?? []); // that [] is needed for the password window`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`export function useIsTopModal(modalId: ModalId) {`