Update apex buttons (#593)

* fix apex buttons

* add waitUntilTextDisappears

Author: abenso

package.json

@@ -40,8 +40,8 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.14.0",
     "@grpc/proto-loader": "^0.8.0",
-    "@ledgerhq/hw-transport-http": "^6.30.12",
     "@ledgerhq/errors": "^6.26.0",
+    "@ledgerhq/hw-transport-http": "^6.30.12",
     "axios": "^1.12.2",
     "axios-retry": "^4.5.0",
     "dockerode": "^4.0.9",
@@ -56,7 +56,7 @@
     "@ledgerhq/hw-transport": "^6.31.12",
     "@types/dockerode": "^3.3.44",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^24.6.2",
+    "@types/node": "^24.7.0",
     "@types/pngjs": "^6.0.5",
     "@types/randomstring": "^1.3.0",
     "@zondax/ledger-substrate": "^1.1.2",

pnpm-lock.yaml

@@ -660,6 +660,28 @@ export default class Zemu {
     this.log('Screen changed')
   }
 
+  async waitUntilTextDisappears(text: string, timeout = 5000): Promise<void> {
+    const startTime = Date.now()
+
+    while (true) {
+      if (Date.now() - startTime > timeout) {
+        throw new Error(`Timeout waiting for text "${text}" to disappear (${timeout}ms)`)
+      }
+
+      const events = await this.getEvents()
+
+      const lastIndexWithText = events.findLastIndex((event) => event.text.includes(text))
+
+      // If text was never present, or if there are new events after the text appeared, we're done.
+      if (lastIndexWithText === -1 || lastIndexWithText < events.length - 1) {
+        return
+      }
+
+      // Text is still the most recent thing on screen, keep waiting
+      await Zemu.sleep(50)
+    }
+  }
+
   eventsAreEqual(events1: IEvent[], events2: IEvent[]): boolean {
     if (events1.length !== events2.length) return false
     for (let i = 0; i < events1.length; i++) {

src/Zemu.ts

@@ -73,7 +73,7 @@ export namespace apex_p {
   }
 
   export const rejectButton: IButton = {
-    x: 150,
+    x: 95,
     y: 380,
     delay: 0.25,
     direction: SwipeDirection.NoSwipe,
@@ -87,10 +87,9 @@ export namespace apex_p {
     direction: SwipeDirection.NoSwipe,
   }
 
-  // TODO
   export const approveTapButton: IButton = {
-    x: 205,
-    y: 520,
+    x: 180,
+    y: 290,
     delay: 0.25,
     direction: SwipeDirection.NoSwipe,
   }

src/buttons_apex.ts

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target": "es2022",
+    "lib": ["es2023"],
     "module": "commonjs",
     "moduleResolution": "node",
     "strict": true,

tsconfig.json

@@ -576,12 +576,12 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@^24.6.2":
-  version "24.6.2"
-  resolved "https://registry.npmjs.org/@types/node/-/node-24.6.2.tgz#59b99878b6fed17e698e7d09e51c729c5877736a"
-  integrity sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==
+"@types/node@^24.7.0":
+  version "24.7.0"
+  resolved "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz#a34c9f0d3401db396782e440317dd5d8373c286f"
+  integrity sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==
   dependencies:
-    undici-types "~7.13.0"
+    undici-types "~7.14.0"
 
 "@types/pngjs@^6.0.5":
   version "6.0.5"
@@ -1834,10 +1834,10 @@ undici-types@~7.10.0:
   resolved "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
   integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
 
-undici-types@~7.13.0:
-  version "7.13.0"
-  resolved "https://registry.npmjs.org/undici-types/-/undici-types-7.13.0.tgz#a20ba7c0a2be0c97bd55c308069d29d167466bff"
-  integrity sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==
+undici-types@~7.14.0:
+  version "7.14.0"
+  resolved "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz#4c037b32ca4d7d62fae042174604341588bc0840"
+  integrity sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==
 
 universalify@^2.0.0:
   version "2.0.1"