From 94bc617e59c03c2f6d9733cafe057b8cf4941122 Mon Sep 17 00:00:00 2001
From: Andrew Taran <andrew.taran@consensys.net>
Date: Wed, 8 Jul 2026 20:19:42 +0200
Subject: [PATCH] chore: extend and fix eslint rules

---
 eslint.config.mjs                       |  4 ++--
 packages/sample-snap/src/index.test.tsx | 23 ++++++++++++-----------
 packages/sample-snap/src/index.tsx      | 14 +++++++-------
 packages/sample-snap/tsconfig.json      |  3 ++-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index d117e9f7..d0114ddf 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -127,7 +127,7 @@ const config = createConfig([
     },
   },
   {
-    files: ['**/*.ts'],
+    files: ['**/*.{ts,tsx}'],
     extends: [typescript],
     languageOptions: {
       parserOptions: {
@@ -168,7 +168,7 @@ const config = createConfig([
     },
   },
   {
-    files: ['**/*.test.{js,ts}', '**/tests/**/*.{js,ts}'],
+    files: ['**/*.test.{js,ts,tsx}', '**/tests/**/*.{js,ts,tsx}'],
     extends: [jest],
     rules: {
       // TODO: Upgrade these from warning to error in shared config
diff --git a/packages/sample-snap/src/index.test.tsx b/packages/sample-snap/src/index.test.tsx
index beb201cd..977751c8 100644
--- a/packages/sample-snap/src/index.test.tsx
+++ b/packages/sample-snap/src/index.test.tsx
@@ -1,15 +1,14 @@
-import { expect } from '@jest/globals';
 import type { SnapConfirmationInterface } from '@metamask/snaps-jest';
 import { installSnap } from '@metamask/snaps-jest';
-import { Box, Text, Bold } from '@metamask/snaps-sdk/jsx';
+import { Box, Text as SnapText, Bold } from '@metamask/snaps-sdk/jsx';
 
 describe('onRpcRequest', () => {
   describe('hello', () => {
     it('shows a confirmation dialog', async () => {
-      const { request } = await installSnap();
+      const snap = await installSnap();
 
       const origin = 'Jest';
-      const response = request({
+      const response = snap.request({
         method: 'hello',
         origin,
       });
@@ -18,14 +17,16 @@ describe('onRpcRequest', () => {
       expect(ui.type).toBe('confirmation');
       expect(ui).toRender(
         <Box>
-          <Text>
+          <SnapText>
             Hello, <Bold>{origin}</Bold>!
-          </Text>
-          <Text>This custom confirmation is just for display purposes.</Text>
-          <Text>
+          </SnapText>
+          <SnapText>
+            This custom confirmation is just for display purposes.
+          </SnapText>
+          <SnapText>
             But you can edit the snap source code to make it do something, if
             you want to!
-          </Text>
+          </SnapText>
         </Box>,
       );
 
@@ -36,9 +37,9 @@ describe('onRpcRequest', () => {
   });
 
   it('throws an error if the requested method does not exist', async () => {
-    const { request } = await installSnap();
+    const snap = await installSnap();
 
-    const response = await request({
+    const response = await snap.request({
       method: 'foo',
     });
 
diff --git a/packages/sample-snap/src/index.tsx b/packages/sample-snap/src/index.tsx
index 250f258e..bc6e520b 100644
--- a/packages/sample-snap/src/index.tsx
+++ b/packages/sample-snap/src/index.tsx
@@ -1,5 +1,5 @@
 import type { OnRpcRequestHandler } from '@metamask/snaps-sdk';
-import { Box, Text, Bold } from '@metamask/snaps-sdk/jsx';
+import { Box, Text as SnapText, Bold } from '@metamask/snaps-sdk/jsx';
 
 /**
  * Handle incoming JSON-RPC requests, sent through `wallet_invokeSnap`.
@@ -23,16 +23,16 @@ export const onRpcRequest: OnRpcRequestHandler = async ({
           type: 'confirmation',
           content: (
             <Box>
-              <Text>
+              <SnapText>
                 Hello, <Bold>{origin}</Bold>!
-              </Text>
-              <Text>
+              </SnapText>
+              <SnapText>
                 This custom confirmation is just for display purposes.
-              </Text>
-              <Text>
+              </SnapText>
+              <SnapText>
                 But you can edit the snap source code to make it do something,
                 if you want to!
-              </Text>
+              </SnapText>
             </Box>
           ),
         },
diff --git a/packages/sample-snap/tsconfig.json b/packages/sample-snap/tsconfig.json
index ef0c834a..9db7529d 100644
--- a/packages/sample-snap/tsconfig.json
+++ b/packages/sample-snap/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "baseUrl": "./",
     "jsx": "react-jsx",
-    "jsxImportSource": "@metamask/snaps-sdk"
+    "jsxImportSource": "@metamask/snaps-sdk",
+    "types": ["jest"]
   },
   "include": ["**/*.ts", "**/*.tsx"]
 }