fix(chat): stabilize message identities

src/stores/chat/machine/unlock-flow.ts

@@ -45,12 +45,12 @@ const markUnlockHistoryFailedAction = sendMachineSetup.assign(() => ({
 const markUnlockMessageStartedAction = sendMachineSetup.assign(
   ({ event }) => {
     if (event.type !== "ChatUnlockMessageRequested") return {};
-    const remoteMessageId =
-      event.remoteMessageId ?? (event.lockType ? undefined : event.messageId);
     return {
       unlockingMessage: {
-        displayMessageId: event.messageId,
-        ...(remoteMessageId ? { messageId: remoteMessageId } : {}),
+        displayMessageId: event.displayMessageId,
+        ...(event.remoteMessageId
+          ? { messageId: event.remoteMessageId }
+          : {}),
         kind: event.kind,
         ...(event.lockType ? { lockType: event.lockType } : {}),
         ...(event.clientLockId
@@ -90,8 +90,7 @@ const requestUnlockPaymentFromOutputAction = sendMachineSetup.assign(
       unlockMessageError: output.response.reason,
       unlockPaywallRequest: shouldOpenPaywall
         ? {
-            displayMessageId:
-              output.response.messageId || output.displayMessageId,
+            displayMessageId: output.displayMessageId,
             ...(output.response.messageId || output.request.messageId
               ? {
                   messageId:
@@ -105,7 +104,8 @@ const requestUnlockPaymentFromOutputAction = sendMachineSetup.assign(
             ...(output.request.clientLockId
               ? { clientLockId: output.request.clientLockId }
               : {}),
-            ...(context.promotion?.message.id === output.displayMessageId
+            ...(context.promotion?.message.displayId ===
+              output.displayMessageId
               ? { promotion: context.promotion.session }
               : {}),
             reason: output.response.reason,
@@ -130,7 +130,8 @@ const requestUnlockPaymentFromErrorAction = sendMachineSetup.assign(
       unlockPaywallRequest: request
         ? {
             ...request,
-            ...(context.promotion?.message.id === request.displayMessageId
+            ...(context.promotion?.message.displayId ===
+              request.displayMessageId
               ? { promotion: context.promotion.session }
               : {}),
             reason: "unlock_failed",