fix(connect): emit changed event with state change in keepSession

trezor · Nov 6, 2024 · 4cbaf36 · 4cbaf36
1 parent d2f876e
commit 4cbaf36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/packages/connect/src/core/index.ts b/packages/connect/src/core/index.ts
@@ -696,6 +696,15 @@ const onCallDevice = async (
         }
         // Work done
 
+        if (
+            method.keepSession &&
+            method.deviceState &&
+            method.deviceState.sessionId !== device.getState()?.sessionId
+        ) {
+            // if session was changed from the one that was sent, send a device changed event
+            sendCoreMessage(createDeviceMessage(DEVICE.CHANGED, device.toMessageObject()));
+        }
+
         // TODO: This requires a massive refactoring https://github.com/trezor/trezor-suite/issues/5323
         // @ts-expect-error TODO: messageResponse should be assigned from the response of "inner" function
         const response = messageResponse;

diff --git a/suite-common/wallet-core/src/device/deviceReducer.ts b/suite-common/wallet-core/src/device/deviceReducer.ts
@@ -67,7 +67,7 @@ const mergeDeviceState = (
         // state was previously not defined, we can set it
         device.state === undefined ||
         // update sessionId for the same staticSessionId
-        (upcomingState?.sessionId &&
+        (upcomingState &&
             device.state?.staticSessionId === upcomingState.staticSessionId &&
             device.state?.sessionId !== upcomingState.sessionId)
     ) {