refactor(chat): consolidate unlock state

2026-07-16 19:49:08 +08:00
parent b5990bca8b
commit acabf165cd
7 changed files with 152 additions and 110 deletions
@@ -86,10 +86,11 @@ function selectChatState(state: ChatSnapshot): SelectedChatState {
    isLoadingMoreHistory: state.context.isLoadingMoreHistory,
    unlockHistoryPromptVisible: state.context.unlockHistoryPromptVisible,
    lockedHistoryCount: state.context.lockedHistoryCount,
-    isUnlockingHistory: state.context.isUnlockingHistory,
+    isUnlockingHistory: state.matches({ userSession: "unlockingHistory" }),
    unlockHistoryError: state.context.unlockHistoryError,
-    isUnlockingMessage: state.context.isUnlockingMessage,
-    unlockingMessageId: state.context.unlockingMessageId,
+    isUnlockingMessage: state.matches({ userSession: "unlockingMessage" }),
+    unlockingMessageId:
+      state.context.unlockingMessage?.displayMessageId ?? null,
    unlockMessageError: state.context.unlockMessageError,
    unlockPaywallRequest: state.context.unlockPaywallRequest,
  };