From d9e65d205b6d5c762cec9f708fd91535d74309f1 Mon Sep 17 00:00:00 2001
From: anson <ansonox@gmail.com>
Date: Mon, 22 Sep 2025 18:07:03 +0100
Subject: [PATCH 1/2] fix(e2e): clean up lint workflow

---
 .github/workflows/lint.yml | 33 ++-------------------------------
 e2e/src/e2e.spec.ts        | 13 +++----------
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e1c503280..997e4f41d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,36 +32,7 @@ jobs:
       - name: Install project dependencies
         run: bun install
       
-      - name: Debug Git and Environment
-        run: |
-          echo "Current branch:"
-          git branch --show-current
-          echo "Available branches:"
-          git branch -a
-          echo "Git remotes:"
-          git remote -v
-          echo "Last 3 commits:"
-          git log --oneline -3
-          echo "Git status:"
-          git status
-          echo "NX configuration:"
-          cat nx.json | head -10
-          echo "Prettier configuration:"
-          cat .prettierrc
-          
       - name: Lint
         run: |
-          echo "Running format check..."
-          # Use prettier directly to avoid NX git issues
-          npx prettier --check . || {
-            echo "Format check failed. Running prettier --write to fix issues..."
-            npx prettier --write .
-            echo "Checking again after formatting..."
-            npx prettier --check . || {
-              echo "Still failing after auto-format. Manual intervention needed."
-              exit 1
-            }
-            echo "Auto-formatting successful. All files are now properly formatted."
-            echo "Note: Some files were auto-formatted. Consider committing these changes in your next commit."
-          }
-          echo "Format check passed!"
\ No newline at end of file
+          echo "Running workspace format check..."
+          NX_DAEMON=false bun run format:check
diff --git a/e2e/src/e2e.spec.ts b/e2e/src/e2e.spec.ts
index 66ef13c71..f7c350b53 100644
--- a/e2e/src/e2e.spec.ts
+++ b/e2e/src/e2e.spec.ts
@@ -58,10 +58,7 @@ describe('all', () => {
         createExecuteJsTest(ctx, () => ctx.aliceEoaAuthContext)());
       it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)());
       it('viewPKPsByAuthData', () =>
-        createViewPKPsByAuthDataTest(
-          ctx,
-          ctx.aliceViemAccountAuthData
-        )());
+        createViewPKPsByAuthDataTest(ctx, ctx.aliceViemAccountAuthData)());
       it('pkpEncryptDecrypt', () =>
         createPkpEncryptDecryptTest(ctx, () => ctx.aliceEoaAuthContext)());
       it('encryptDecryptFlow', () =>
@@ -99,13 +96,9 @@ describe('all', () => {
           createPkpSignTest(ctx, () => ctx.alicePkpAuthContext)());
         it('executeJs', () =>
           createExecuteJsTest(ctx, () => ctx.alicePkpAuthContext)());
-        it('viewPKPsByAddress', () =>
-          createViewPKPsByAddressTest(ctx)());
+        it('viewPKPsByAddress', () => createViewPKPsByAddressTest(ctx)());
         it('viewPKPsByAuthData', () =>
-          createViewPKPsByAuthDataTest(
-            ctx,
-            ctx.aliceViemAccountAuthData
-          )());
+          createViewPKPsByAuthDataTest(ctx, ctx.aliceViemAccountAuthData)());
         it('pkpEncryptDecrypt', () =>
           createPkpEncryptDecryptTest(ctx, () => ctx.alicePkpAuthContext)());
         it('encryptDecryptFlow', () =>

From 4dd7f406e69a84e77903b935930e9c6c4297ab35 Mon Sep 17 00:00:00 2001
From: anson <ansonox@gmail.com>
Date: Mon, 22 Sep 2025 19:08:19 +0100
Subject: [PATCH 2/2] fix(e2e,lint): naga and canary-naga are the main branches

---
 .github/workflows/lint.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 997e4f41d..fdadcdbe6 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,9 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - main
-      - develop
+      - naga
+      - canary-naga
 jobs:
   linter:
     runs-on: ubuntu-latest