Changes between 2.8.7 and 2.9.0

.cursor/rules/project-rules.mdc

@@ -42,7 +42,7 @@ pnpm add <package-name>
 ## Directory Structure
 
 - **`src/background`**: Contains the code for the extension's background script.
-    - **`service/`**: Houses various services that run in the background, like API calls and wallet logic. See [userWallet.ts](mdc:src/background/service/userWallet.ts).
+    - **`service/`**: Houses various services that run in the background, like API calls and wallet logic. See [userWallet.ts](mdc:src/core/service/userWallet.ts).
     - **`utils/`**: Utilities for the background script.
 - **`src/ui`**: Contains all UI-related code.
     - **`components/`**: Shared, reusable React components. See [FRWProfile.tsx](mdc:src/ui/components/FRWProfile.tsx).
@@ -64,7 +64,7 @@ To maintain consistency, please adhere to the following naming conventions for n
 
 - **Flow Interaction**: The [@onflow/fcl](mdc:https:/github.com/onflow/fcl-js) library is used for all interactions with the Flow blockchain.
 - **State Management**: The application uses a combination of React hooks, and data cache storage using chrome storage.
-- **Firebase**: Used for remote configuration. See [firebaseConfig.ts](mdc:src/background/utils/firebaseConfig.ts).
+- **Firebase**: Used for remote configuration. See [firebaseConfig.ts](mdc:src/core/utils/firebaseConfig.ts).
 - **Internationalization (i18n)**: Text is managed in [messages.json](mdc:src/messages.json) and loaded via `i18n.ts`.
 
 ## Data Caching
@@ -89,7 +89,7 @@ The extension uses a custom stale-while-revalidate caching system designed for t
 - **`docs/cache-data-model.md`**: The primary documentation for this system.
 - **`src/shared/utils/cache-data-keys.ts`**: Defines keys and data types for temporary session data.
 - **`src/shared/utils/user-data-keys.ts`**: Defines keys and data types for persistent user data.
-- **`src/background/utils/data-cache.ts`**: Contains the core logic for the caching mechanism, including `registerRefreshListener` for single items and `registerBatchRefreshListener` for batching multiple requests.
+- **`src/core/utils/data-cache.ts`**: Contains the core logic for the caching mechanism, including `registerRefreshListener` for single items and `registerBatchRefreshListener` for batching multiple requests.
 
 ### Implementation Pattern
 

.github/workflows/build.yml

@@ -2,6 +2,7 @@ name: Extension Build
 
 on:
   push:
+  workflow_dispatch:
 
 jobs:
   determine-env:
@@ -121,23 +122,23 @@ jobs:
           EOF
           }
 
-          # Always create .env.pro
-          create_env_file ".env.pro"
+          # Always create .env.pro in extension directory
+          create_env_file "apps/extension/.env.pro"
 
           # Create .env.dev if environment is development
           if [[ "${{ needs.determine-env.outputs.env_name }}" == "development" || "${{ needs.determine-env.outputs.env_name }}" == "staging" ]]; then
-            create_env_file ".env.dev"
+            create_env_file "apps/extension/.env.dev"
           fi
 
       - name: Run tests
-        run: pnpm test
+        run: pnpm -F flow-wallet-extension test:run
 
       - name: Build
         run: |
           if [[ "${{ needs.determine-env.outputs.env_name }}" == "development" || "${{ needs.determine-env.outputs.env_name }}" == "staging" ]]; then
-            pnpm run build:dev-ci
+            pnpm -F flow-wallet-extension build:dev-ci
           else
-            pnpm run build:ci
+            pnpm -F flow-wallet-extension build:ci
           fi
         env:
           CI: true
@@ -151,12 +152,12 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: extension-build
-          path: dist/
+          path: apps/extension/dist/
 
       - name: Check build size
         run: |
           echo "Build size:"
-          du -sh dist/
+          du -sh apps/extension/dist/
 
   test:
     needs: [determine-env, build]
@@ -185,11 +186,11 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: extension-build
-          path: dist/
+          path: apps/extension/dist/
 
       - name: Create .env.test file
         run: |
-          cat << EOF > .env.test
+          cat << EOF > apps/extension/.env.test
           # Test secrets
           TEST_PASSWORD="${{ secrets.TEST_PASSWORD }}"
           TEST_SEED_PHRASE_RECEIVER="${{ secrets.TEST_SEED_PHRASE_RECEIVER }}"
@@ -212,31 +213,80 @@ jobs:
       - name: Install Playwright Browsers
         run: pnpm playwright install --with-deps chromium
       - name: Run Playwright tests
-        run: pnpm test:e2e
+        run: pnpm -F flow-wallet-extension test:e2e
         env:
           CI: true
           HEADLESS: true
       - name: Sanitize Playwright Report
         if: always()
-        run: pnpm tsx build/sanitize-playwright.ts
+        run: cd apps/extension && pnpm tsx build/sanitize-playwright.ts
       - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report
-          path: playwright-report/
+          path: apps/extension/playwright-report/
           retention-days: 30
 
-  deploy-storybook-and-reports:
-    needs: [test] # Depends on the Playwright test job
+  deploy-reports:
+    needs: [test]
     runs-on: ubuntu-latest
-    if: always() # Run even if tests fail to publish what's available
+    if: always()
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+    steps:
+      - name: Download Playwright Report
+        uses: actions/download-artifact@v4
+        with:
+          name: playwright-report
+          path: playwright-report
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: google-github-actions/auth@v2
+        with:
+          token_format: 'access_token'
+          workload_identity_provider: ${{ secrets.WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.SERVICE_ACCOUNT }}
+
+      - name: Setup Google Cloud CLI
+        uses: google-github-actions/setup-gcloud@v1
+        with:
+          project_id: ${{ secrets.PROJECT_ID }}
+
+      - name: Upload reports to GCS
+        run: |
+          RUN_DIR="reports/run-${{ github.run_id }}"
+          gsutil -m cp -r playwright-report/* gs://${{ vars.GCS_BUCKET_NAME }}/$RUN_DIR/
+          echo "REPORT_URL=https://storage.googleapis.com/${{ vars.GCS_BUCKET_NAME }}/$RUN_DIR/index.html" >> $GITHUB_ENV
+
+      - name: Add Job Summary
+        if: always()
+        run: |
+          echo "## 🎭 Playwright Test Results" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### 📊 Report Details" >> $GITHUB_STEP_SUMMARY
+          echo "- **Run ID**: ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Branch**: ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Commit**: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Triggered by**: ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "### 🔗 Links" >> $GITHUB_STEP_SUMMARY
+          echo "- 📋 **[View Full Report](${{ env.REPORT_URL }})**" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "> 💡 **Tip**: Click the report link above to view detailed test results, traces, and screenshots!" >> $GITHUB_STEP_SUMMARY
+
+  deploy-storybook:
+    needs: [build]
+    runs-on: ubuntu-latest
+    if: always()
     strategy:
       matrix:
         node-version: [22.x]
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Fetch all history for tags
+          fetch-depth: 0
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -250,47 +300,12 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Download Playwright Report
-        uses: actions/download-artifact@v4
-        with:
-          name: playwright-report
-          path: playwright-report/ # Download to this path
-
-      - name: Create .nojekyll file
-        run: touch playwright-report/.nojekyll
-
-      - name: Deploy Playwright Report
-        uses: peaceiris/actions-gh-pages@v4
-        if: always() # Deploy even if tests fail
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./playwright-report
-          destination_dir: reports/run-${{ github.run_id }}
-          keep_files: true
-
       - name: Build Storybook
-        run: pnpm build-storybook # Assumes output is storybook-static
+        run: pnpm -F flow-wallet-extension build-storybook
 
       - name: Publish to Chromatic
         uses: chromaui/action@v1
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          storybookBuildDir: storybook-static # Directory with Storybook and reports
-          exitZeroOnChanges: true # Optional: useful for PR checks
-          # workingDir: . # Not needed if storybookBuildDir is set correctly
-
-      - name: Add Job Summary
-        if: always()
-        run: |
-          echo "## 🎭 Playwright Test Results" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### 📊 Report Details" >> $GITHUB_STEP_SUMMARY
-          echo "- **Run ID**: ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Branch**: ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Commit**: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Triggered by**: ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### 🔗 Links" >> $GITHUB_STEP_SUMMARY
-          echo "- 📋 **[View Full Report](https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/reports/run-${{ github.run_id }}/)**" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "> 💡 **Tip**: Click the report link above to view detailed test results, traces, and screenshots!" >> $GITHUB_STEP_SUMMARY
+          storybookBuildDir: apps/extension/storybook-static
+          exitZeroOnChanges: true

.gitignore

@@ -12,29 +12,28 @@ yarn.lock
 .env.pro
 .env.*
 dist.zip
-_raw/manifest.json
-_raw/react-devtools.js
+apps/extension/_raw/manifest.json
+apps/extension/_raw/react-devtools.js
 yarn-error.log
 dist2
-src/background/utils/firebase.config.json
 dist.rar
 dist.7z
+**/firebase.config.json
 .cursorrules
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
+test-results
+playwright-report
+blob-report
+playwright
 dependency-usage.md
 extension-dependencies.md
 emulator-account.pkey
 flow.json
 coverage
 .github-data
-playwright/.auth
 
 **/.claude/settings.local.json
 
 *storybook.log
 storybook-static
 
-/docs-archive/
+docs-archive

.nvmrc

@@ -0,0 +1 @@
+22