From a601962e0dd982e253b9c4bc7ed4f73aa36b8829 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Thu, 5 Feb 2026 11:17:05 -0800
Subject: [PATCH 1/2] RD-T39 Working on electron build

---
 app.config.ts    |  2 ++
 electron/main.js | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app.config.ts b/app.config.ts
index 9ceec78..3c48b8a 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -88,6 +88,8 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   web: {
     favicon: './assets/favicon.png',
     bundler: 'metro',
+    output: 'static',
+    baseUrl: './',
   },
   plugins: [
     [
diff --git a/electron/main.js b/electron/main.js
index f064c2c..c87d16d 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -19,12 +19,14 @@ function createWindow() {
 
     // In development, load the local Expo web server
     // In production, load the built index.html
-    const startUrl = isDev
-        ? 'http://localhost:8081'
-        : `file://${path.join(__dirname, '../dist/index.html')}`;
-
-    console.log('Loading URL:', startUrl);
-    mainWindow.loadURL(startUrl);
+    if (isDev) {
+        console.log('Loading dev URL: http://localhost:8081');
+        mainWindow.loadURL('http://localhost:8081');
+    } else {
+        const indexPath = path.join(__dirname, '../dist/index.html');
+        console.log('Loading file:', indexPath);
+        mainWindow.loadFile(indexPath);
+    }
 
     if (isDev) {
         mainWindow.webContents.openDevTools();

From ec7b402660b40df60b17709d5e8e77770d0a9da4 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Thu, 5 Feb 2026 11:50:57 -0800
Subject: [PATCH 2/2] RD-T39 PR#90 Fixes

---
 app.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.config.ts b/app.config.ts
index 3c48b8a..1a8d7af 100644
--- a/app.config.ts
+++ b/app.config.ts
@@ -61,6 +61,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   },
   experiments: {
     typedRoutes: true,
+    baseUrl: '/',
   },
   android: {
     version: packageJSON.version,
@@ -89,7 +90,6 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     favicon: './assets/favicon.png',
     bundler: 'metro',
     output: 'static',
-    baseUrl: './',
   },
   plugins: [
     [