Merge branch 'main' into feature/network-detection-switching

Author: sheyman546

.detoxrc.js

@@ -18,13 +18,13 @@ module.exports = {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/SubTrackr.app',
       build:
-        'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'ios.release': {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/SubTrackr.app',
       build:
-        'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'android.debug': {
       type: 'android.apk',

.eslintrc.json

@@ -11,10 +11,32 @@
   },
   "rules": {
     "prettier/prettier": "error",
-    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_",
+        "destructuredArrayIgnorePattern": "^_"
+      }
+    ],
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-explicit-any": "warn",
-    "no-console": ["warn", { "allow": ["warn", "error"] }]
+    "no-console": ["warn", { "allow": ["warn", "error"] }],
+    "import/no-unresolved": [
+      "error",
+      {
+        "ignore": [
+          "@sentry/react-native",
+          "bcryptjs",
+          "expo-image",
+          "expo-linking",
+          "expo-local-authentication",
+          "react-native-performance",
+          "../../backend/services/shared/monitoring"
+        ]
+      }
+    ]
   },
   "ignorePatterns": [
     "node_modules/",

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: '20'
-  RUST_VERSION: '1.85'
+  RUST_VERSION: '1.88'
 
 jobs:
   commitlint:
@@ -39,7 +39,7 @@ jobs:
         run: npm ci --legacy-peer-deps
 
       - name: Validate PR commits
-        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.sha }} --verbose
+        run: npx commitlint --from=origin/${{ github.event.pull_request.base.ref }} --to=HEAD --verbose
 
   # ─────────────────────────────────────────────────────────
   # TypeScript / React Native Checks
@@ -50,6 +50,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -69,7 +71,30 @@ jobs:
         run: npm ci --legacy-peer-deps
 
       - name: Check formatting (Prettier)
+        id: prettier-check
         run: npm run format:check
+        continue-on-error: true
+
+      - name: Auto-fix formatting issues
+        if: steps.prettier-check.outcome == 'failure'
+        run: |
+          echo "Formatting inconsistencies detected. Executing auto-fixer..."
+          npm run format:write || npx prettier --write "src/**/*.{ts,tsx,js,json,md}"
+
+      - name: Commit and Push formatting fixes
+        if: steps.prettier-check.outcome == 'failure'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'chore: automated code formatting fixes via CI pipeline'
+          commit_user_name: 'github-actions[bot]'
+          commit_user_email: 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Enforce strict layout check
+        if: steps.prettier-check.outcome == 'failure'
+        run: |
+          echo "❌ Code styles were inconsistent. Automated modifications have been pushed to your branch."
+          echo "Please pull latest changes locally or wait for the subsequent workflow run execution pass."
+          exit 1
 
       - name: Run ESLint
         run: npm run lint
@@ -201,6 +226,19 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci --legacy-peer-deps
 
+      - name: Patch metro exports for @expo/cli compatibility
+        run: |
+          node -e "
+            const fs=require('fs');
+            const p='node_modules/metro/package.json';
+            if(!fs.existsSync(p)) process.exit(0);
+            const m=JSON.parse(fs.readFileSync(p,'utf8'));
+            if(!m.exports||m.exports['./src/lib/TerminalReporter']) process.exit(0);
+            m.exports['./src/lib/TerminalReporter']='./src/lib/TerminalReporter.js';
+            fs.writeFileSync(p,JSON.stringify(m,null,2));
+            console.log('Patched metro exports to add ./src/lib/TerminalReporter');
+          "
+
       - name: Run Expo export
         run: npm run build
         env:
@@ -265,9 +303,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -293,9 +331,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -321,9 +359,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/cargo/registry/index/
+            ~/cargo/registry/cache/
+            ~/cargo/git/db/
             contracts/target/
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('contracts/Cargo.lock') }}
           restore-keys: |
@@ -339,15 +377,47 @@ jobs:
   load-test:
     name: k6 Load Test
     runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        scenario: [subscription, billing, contract]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run k6 Load Test
-        uses: grafana/k6-action@v0.5.1
+      - name: Prepare reports directory
+        run: mkdir -p load-tests/reports
+
+      - name: Install k6
+        run: |
+          sudo gpg -k
+          sudo gpg --no-default-keyring --keyring /usr/share/keyrings/k6-archive-keyring.gpg \
+            --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747E3415A3642D57D77C6C491D6AC1D69
+          echo "deb [signed-by=/usr/share/keyrings/k6-archive-keyring.gpg] https://dl.k6.io/deb stable main" \
+            | sudo tee /etc/apt/sources.list.d/k6.list
+          sudo apt-get update
+          sudo apt-get install -y k6
+
+      - name: Run k6 Load Test (${{ matrix.scenario }})
+        run: k6 run load-tests/run.js --env SCENARIO=${{ matrix.scenario }} --quiet
+
+      - name: Rename report for this scenario
+        if: always()
+        run: |
+          for ext in json md html; do
+            if [ -f "load-tests/reports/summary.$ext" ]; then
+              mv "load-tests/reports/summary.$ext" "load-tests/reports/${{ matrix.scenario }}.$ext"
+            fi
+          done
+
+      - name: Upload load test report
+        if: always()
+        uses: actions/upload-artifact@v4
         with:
-          filename: load-tests/run.js
-          flags: --env SCENARIO=subscription
+          name: load-test-report-${{ matrix.scenario }}
+          path: load-tests/reports/
+          if-no-files-found: ignore
 
   # ─────────────────────────────────────────────────────────
   # Bundle Size Monitoring
@@ -370,12 +440,24 @@ jobs:
       - name: Install dependencies
         run: npm ci --legacy-peer-deps
 
+      - name: Patch metro exports for @expo/cli compatibility
+        run: |
+          node -e "
+            const fs=require('fs');
+            const p='node_modules/metro/package.json';
+            if(!fs.existsSync(p)) process.exit(0);
+            const m=JSON.parse(fs.readFileSync(p,'utf8'));
+            if(!m.exports||m.exports['./src/lib/TerminalReporter']) process.exit(0);
+            m.exports['./src/lib/TerminalReporter']='./src/lib/TerminalReporter.js';
+            fs.writeFileSync(p,JSON.stringify(m,null,2));
+            console.log('Patched metro exports to add ./src/lib/TerminalReporter');
+          "
+
       - name: Check bundle size (PR)
         if: github.event_name == 'pull_request'
-        uses: andresz1/size-limit-action@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: 'npm run build'
+        run: npx size-limit
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build app
         if: github.event_name != 'pull_request'
@@ -392,6 +474,36 @@ jobs:
           name: bundle-size-report-${{ github.sha }}
           path: bundle-size-report.json
 
+  # ─────────────────────────────────────────────────────────
+  # Performance Monitoring
+  # ─────────────────────────────────────────────────────────
+  performance:
+    name: Performance Budget Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        id: cache-node-modules
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: npm ci --legacy-peer-deps
+
+      - name: Run performance benchmark
+        run: npm run performance:benchmark
+
   # ─────────────────────────────────────────────────────────
   # Merge Protection (only on PRs)
   # ─────────────────────────────────────────────────────────
@@ -413,6 +525,7 @@ jobs:
         rust-build,
         load-test,
         bundle-size,
+        performance,
       ]
     steps:
       - name: All checks passed
@@ -439,6 +552,7 @@ jobs:
         rust-build,
         load-test,
         bundle-size,
+        performance,
       ]
     steps:
       - name: Check for failures
@@ -457,8 +571,9 @@ jobs:
              [ "${{ needs.rust-tests.result }}" != "success" ] || \
              [ "${{ needs.rust-build.result }}" != "success" ] || \
              [ "${{ needs.load-test.result }}" != "success" ] || \
-             [ "${{ needs.bundle-size.result }}" != "success" ]; then
+             [ "${{ needs.bundle-size.result }}" != "success" ] || \
+             [ "${{ needs.performance.result }}" != "success" ]; then
             echo "One or more CI checks failed"
             exit 1
           fi
-          echo "All CI checks passed successfully!"
+          echo "All CI checks passed successfully!"

.github/workflows/e2e-detox.yml

@@ -82,6 +82,20 @@ jobs:
           java-version: '17'
       - name: Expo Prebuild
         run: npx expo prebuild -p android
+      - name: Patch Kotlin 1.9 to 2.1.20 in expo Gradle included builds
+        run: |
+          for f in \
+            node_modules/expo-dev-launcher/expo-dev-launcher-gradle-plugin/build.gradle.kts \
+            node_modules/expo-modules-autolinking/android/expo-gradle-plugin/build.gradle.kts \
+            node_modules/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts \
+            node_modules/expo-modules-core/expo-module-gradle-plugin/build.gradle.kts; do
+            if [ -f "$f" ]; then
+              sed -i 's/version "1\.[0-9][^"]*"/version "2.1.20"/g' "$f"
+              echo "Patched $f: $(grep -E 'version \"[0-9]' $f | head -2)"
+            fi
+          done
+          [ -f android/build.gradle ] && \
+            sed -i 's/kotlinVersion = "1\.[0-9][^"]*"/kotlinVersion = "2.1.20"/' android/build.gradle || true
       - name: Build Detox Android
         run: npm run e2e:build-android
       - name: Detox Android — core lifecycle

.github/workflows/fuzz-test.yml

@@ -43,7 +43,7 @@ jobs:
           components: llvm-tools
 
       - name: Install cargo-fuzz
-        run: cargo install cargo-fuzz --locked
+        run: cargo install --git https://github.com/rust-fuzz/cargo-fuzz cargo-fuzz
 
       - name: Restore seed corpus from cache
         uses: actions/cache@v4