Develop to Main

.env.sample

@@ -0,0 +1,29 @@
+# DFX Services - Environment Configuration
+# Copy this file to .env and adjust values as needed
+#
+# IMPORTANT: Never commit .env to git!
+
+# === App Configuration ===
+PORT=3001
+REACT_APP_PUBLIC_URL=http://localhost:3001
+
+# API URL - uncomment ONE of these:
+REACT_APP_API_URL=http://localhost:3000          # Local API
+# REACT_APP_API_URL=https://dev.api.dfx.swiss    # Dev API
+# REACT_APP_API_URL=https://api.dfx.swiss        # Production API
+
+# === E2E Test Configuration ===
+# These are only needed when running Playwright tests
+
+# Test wallet mnemonic (NEVER use for real funds!)
+TEST_SEED="your twelve word test seed phrase here"
+
+# Test IBAN for sell/refund operations
+TEST_IBAN=CH9300762011623852957
+
+# Test email for mail login flow
+TEST_EMAIL=your-test-email@example.com
+
+# === Widget Build (optional) ===
+# BUILD_PATH=./widget
+# GENERATE_SOURCEMAP=false

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Code Owners for DFXswiss/services
+# These users must approve all pull requests to protected branches
+
+# Default owners for everything in the repo
+* @davidleomay @TaprootFreak

.github/workflows/dev.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: '16.x'
+  NODE_VERSION: '20.x'
   AZURE_ACCOUNT_NAME: 'stdfxsrvdev'
   AZURE_CDN_PROFILE: 'cdnp-dfx-srv-dev'
   AZURE_CDN_ENDPOINT: 'cdne-dfx-srv-dev'
@@ -47,9 +47,7 @@ jobs:
       - name: Build code
         env:
           REACT_APP_BUILD_ID: ${{ github.run_number }}-${{ github.run_id }}
-        run: |
-          echo "REACT_APP_BUILD_ID=$REACT_APP_BUILD_ID" >> .env.dev
-          npm run build:dev
+        run: npm run build:dev
 
       - name: Build widget
         run: |
@@ -63,8 +61,8 @@ jobs:
           cp ./widget/static/js/main.*.js ./build/widget/$version
           cp ./widget/static/css/main.*.css ./build/widget/$version.css
           cp ./widget/$version-chunks/*.chunk.js ./build/widget/$version-chunks
-          cp ./widget/$version-chunks/*.chunk.css ./build/widget/$version-chunks || true
-          cp ./widget/$version-chunks/*.module.wasm ./build/widget/$version-chunks
+          cp ./widget/$version-chunks/*.chunk.css ./build/widget/$version-chunks
+          cp ./widget/$version-chunks/*.wasm ./build/widget/$version-chunks
 
           sed -i "s|main-widget.css|https://dev.app.dfx.swiss/widget/$version.css|g" "./build/widget/$version"
 
@@ -82,7 +80,7 @@ jobs:
               --overwrite
 
             # Upload entry points with no-cache (must revalidate on every request)
-            for file in index.html manifest.json asset-manifest.json robots.txt custom-service-worker.js; do
+            for file in index.html manifest.json asset-manifest.json robots.txt; do
               if [ -f "./build/$file" ]; then
                 az storage blob upload \
                   --account-name ${{ env.AZURE_ACCOUNT_NAME }} \

.github/workflows/pr.yml

@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: '16.x'
+  NODE_VERSION: '20.x'
 
 jobs:
   build:
@@ -37,6 +37,4 @@ jobs:
       - name: Build code
         env:
           REACT_APP_BUILD_ID: ${{ github.run_number }}-${{ github.run_id }}
-        run: |
-          echo "REACT_APP_BUILD_ID=$REACT_APP_BUILD_ID" >> .env.dev
-          npm run build:dev
+        run: npm run build:dev

.github/workflows/prd.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: '16.x'
+  NODE_VERSION: '20.x'
   AZURE_ACCOUNT_NAME: 'stdfxsrvprd'
   AZURE_CDN_PROFILE: 'cdnp-dfx-srv-prd'
   AZURE_CDN_ENDPOINT: 'cdne-dfx-srv-prd'
@@ -50,9 +50,7 @@ jobs:
       - name: Build code
         env:
           REACT_APP_BUILD_ID: ${{ github.run_number }}-${{ github.run_id }}
-        run: |
-          echo "REACT_APP_BUILD_ID=$REACT_APP_BUILD_ID" >> .env.prd
-          npm run build
+        run: npm run build
 
       - name: Build widget
         run: |
@@ -69,8 +67,8 @@ jobs:
           cp ./widget/static/js/main.*.js ./build/widget/$version
           cp ./widget/static/css/main.*.css ./build/widget/$version.css
           cp ./widget/$version-chunks/*.chunk.js ./build/widget/$version-chunks
-          cp ./widget/$version-chunks/*.chunk.css ./build/widget/$version-chunks || true
-          cp ./widget/$version-chunks/*.module.wasm ./build/widget/$version-chunks
+          cp ./widget/$version-chunks/*.chunk.css ./build/widget/$version-chunks
+          cp ./widget/$version-chunks/*.wasm ./build/widget/$version-chunks
 
           sed -i "s|main-widget.css|https://app.dfx.swiss/widget/$version.css|g" "./build/widget/$version"
 
@@ -88,7 +86,7 @@ jobs:
               --overwrite
 
             # Upload entry points with no-cache (must revalidate on every request)
-            for file in index.html manifest.json asset-manifest.json robots.txt custom-service-worker.js; do
+            for file in index.html manifest.json asset-manifest.json robots.txt; do
               if [ -f "./build/$file" ]; then
                 az storage blob upload \
                   --account-name ${{ env.AZURE_ACCOUNT_NAME }} \

.gitignore

@@ -11,8 +11,9 @@ dfx.swiss-*.tgz
 playwright-report/
 test-results/
 
-# test environment (contains secrets)
-.env.test
+# environment files (contain secrets)
+.env
+.env.backup
 
 # next.js
 /.next/
@@ -36,8 +37,6 @@ yarn-debug.log*
 yarn-error.log*
 .pnpm-debug.log*
 
-# local env files
-.env*.local
 
 # vercel
 .vercel

README.md

@@ -29,19 +29,29 @@ The services will be available at http://localhost:3001
 
 ### Configuration
 
-The `.env.loc` file is used for local development:
+Copy `.env.sample` to `.env` and adjust as needed:
 
-| Variable | Value | Description |
-|----------|-------|-------------|
+```bash
+cp .env.sample .env
+```
+
+| Variable | Default | Description |
+|----------|---------|-------------|
 | `PORT` | 3001 | Services port |
-| `REACT_APP_API_URL` | http://localhost:3000 | Local API URL |
+| `REACT_APP_API_URL` | http://localhost:3000 | API URL |
+| `TEST_SEED` | - | Test wallet mnemonic (E2E tests) |
+| `TEST_EMAIL` | - | Test email (E2E tests) |
 
 ### NPM Scripts
 
 | Command | Description |
 |---------|-------------|
-| `npm run start` | Start with local config (`.env.loc`) |
+| `npm start` | Start with local API (from `.env`) |
+| `npm run start:dev` | Start with dev API |
 | `npm run build` | Build for production |
+| `npm run build:dev` | Build for dev environment |
+| `npm run test:e2e` | Run E2E tests against dev API |
+| `npm run test:e2e:local` | Run E2E tests against local API |
 
 ## Usage
 

e2e/api-integration.spec.ts

@@ -105,13 +105,6 @@ test.describe('Static Assets', () => {
     expect(response?.status()).toBe(200);
   });
 
-  test('should load service worker', async ({ page }) => {
-    const response = await page.goto('/custom-service-worker.js');
-    expect(response?.status()).toBe(200);
-
-    const contentType = response?.headers()['content-type'];
-    expect(contentType).toContain('javascript');
-  });
 });
 
 test.describe('External Resources', () => {

e2e/api-timing-test.ts

@@ -13,17 +13,17 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-dotenv.config({ path: path.join(__dirname, '../.env.test') });
+dotenv.config({ path: path.join(__dirname, '../.env') });
 
-const API_URL = process.env.API_URL || 'http://localhost:3000';
+const API_URL = process.env.REACT_APP_API_URL || 'http://localhost:3000';
 const TEST_SEED = process.env.TEST_SEED || '';
 
 async function main() {
   console.log('=== API Timing Test ===\n');
   console.log(`API URL: ${API_URL}`);
 
   if (!TEST_SEED) {
-    console.error('ERROR: TEST_SEED not in .env.test');
+    console.error('ERROR: TEST_SEED not in .env');
     process.exit(1);
   }