fix: receive last transaction in AirGap when signing

src/background/controller/provider/controller.ts

@@ -56,6 +56,7 @@ import eventBus from '@/eventBus';
 import { StatsData } from '../../service/notification';
 import { customTestnetService } from '@/background/service/customTestnet';
 import { sendTransaction } from 'viem/actions';
+import { SIGN_TIMEOUT } from '@/constant/timeout';
 // import { customTestnetService } from '@/background/service/customTestnet';
 
 const reportSignText = (params: {
@@ -440,7 +441,7 @@ class ProviderController extends BaseController {
     const chainItem = findChainByEnum(chain);
 
     // wait ui
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, SIGN_TIMEOUT));
 
     const statsData: StatsData = {
       signed: false,
@@ -777,7 +778,7 @@ class ProviderController extends BaseController {
     if (!data.params) return;
 
     // wait ui
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, SIGN_TIMEOUT));
 
     const currentAccount = preferenceService.getCurrentAccount()!;
     try {
@@ -822,7 +823,7 @@ class ProviderController extends BaseController {
     }
 
     // wait ui
-    await new Promise((r) => setTimeout(r, 100));
+    await new Promise((r) => setTimeout(r, SIGN_TIMEOUT));
 
     return keyringService.signTypedMessage(
       keyring,

src/background/service/keyring/eth-keystone-keyring.ts

@@ -47,13 +47,12 @@ export default class KeystoneKeyring extends MetaMaskKeyring {
   constructor() {
     super();
 
-    this.getMemStore().subscribe((data) => {
-      const request = data.sign?.request;
-      this.getInteraction().on(AcquireMemeStoreData, () => {
-        if (request) {
-          this.getInteraction().emit(MemStoreDataReady, request);
-        }
-      });
+    this.getInteraction().on(AcquireMemeStoreData, () => {
+      const request = this.getMemStore().getState().sign?.request;
+
+      if (request) {
+        this.getInteraction().emit(MemStoreDataReady, request);
+      }
     });
   }
 

src/constant/timeout.ts

@@ -0,0 +1,5 @@
+/**
+ * When calling signatures, it is not possible to receive event messages in time, 
+ if the UI has not been initialized
+ */
+export const SIGN_TIMEOUT = 100;

src/ui/views/Approval/components/QRHardWareWaiting/QRHardWareWaiting.tsx

@@ -25,6 +25,7 @@ import {
   KeystoneWiredWaiting,
 } from './KeystoneWaiting';
 import clsx from 'clsx';
+import { SIGN_TIMEOUT } from '@/constant/timeout';
 
 const KEYSTONE_TYPE = HARDWARE_KEYRING_TYPES.Keystone.type;
 enum QRHARDWARE_STATUS {
@@ -95,18 +96,18 @@ const QRHardWareWaiting = ({ params }) => {
       params.isGnosis ? true : approval?.data.approvalType !== 'SignTx'
     );
 
-    let currentSignId = null;
-    if (account.brandName === WALLET_BRAND_TYPES.KEYSTONE) {
-      currentSignId = await wallet.requestKeyring(
-        KEYSTONE_TYPE,
-        'exportCurrentSignRequestIdIfExist',
-        null
-      );
-    }
-
     eventBus.addEventListener(
       EVENTS.QRHARDWARE.ACQUIRE_MEMSTORE_SUCCEED,
-      ({ request }) => {
+      async ({ request }) => {
+        let currentSignId = null;
+        if (account.brandName === WALLET_BRAND_TYPES.KEYSTONE) {
+          currentSignId = await wallet.requestKeyring(
+            KEYSTONE_TYPE,
+            'exportCurrentSignRequestIdIfExist',
+            null
+          );
+        }
+
         if (currentSignId) {
           if (currentSignId === request.requestId) {
             setSignPayload(request);
@@ -147,7 +148,10 @@ const QRHardWareWaiting = ({ params }) => {
         // rejectApproval(data.errorMsg);
       }
     });
-    await wallet.acquireKeystoneMemStoreData();
+    // Wait for the keyring to have called the signature method
+    setTimeout(() => {
+      wallet.acquireKeystoneMemStoreData();
+    }, SIGN_TIMEOUT);
   }, []);
 
   React.useEffect(() => {