From b6689a9e3dd5821f7cfbfc48e4d0b7ef8485537b Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Tue, 15 Aug 2023 20:51:33 +0500
Subject: [PATCH 1/3] feat: update electron builder to generate separate builds

---
 config/electronBuilder.config.js | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
index da87c93ee367..4423be7aefe9 100644
--- a/config/electronBuilder.config.js
+++ b/config/electronBuilder.config.js
@@ -21,6 +21,24 @@ const macIcon = {
     adhoc: './desktop/icon-adhoc.png',
 };
 
+const appIds = {
+    production: 'com.expensifyreactnative.chat',
+    staging: 'com.expensifyreactnative.staging.chat',
+    adhoc: 'com.expensifyreactnative.adhoc.chat',
+};
+
+const productNames = {
+    production: 'New Expensify',
+    staging: 'New Expensify Staging',
+    adhoc: 'New Expensify AdHoc',
+};
+
+const artifactNames = {
+    production: 'NewExpensify.dmg',
+    staging: 'NewExpensifyStaging.dmg',
+    adhoc: 'NewExpensifyAdHoc.dmg',
+};
+
 const isCorrectElectronEnv = ['production', 'staging', 'adhoc'].includes(process.env.ELECTRON_ENV);
 
 if (!isCorrectElectronEnv) {
@@ -32,8 +50,8 @@ if (!isCorrectElectronEnv) {
  * It can be used to create local builds of the same, by omitting the `--publish` flag
  */
 module.exports = {
-    appId: 'com.expensifyreactnative.chat',
-    productName: 'New Expensify',
+    appId: appIds[process.env.ELECTRON_ENV],
+    productName: productNames[process.env.ELECTRON_ENV],
     extraMetadata: {
         version,
     },
@@ -46,8 +64,8 @@ module.exports = {
         type: 'distribution',
     },
     dmg: {
-        title: 'New Expensify',
-        artifactName: 'NewExpensify.dmg',
+        title: productNames[process.env.ELECTRON_ENV],
+        artifactName: artifactNames[process.env.ELECTRON_ENV],
         internetEnabled: true,
     },
     publish: [
@@ -65,7 +83,7 @@ module.exports = {
         output: 'desktop-build',
     },
     protocols: {
-        name: 'New Expensify',
+        name: productNames[process.env.ELECTRON_ENV],
         schemes: ['new-expensify'],
     },
 };

From 938695699fb201f3cd9547ccdfc2ee2bde51ba49 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Tue, 15 Aug 2023 21:58:02 +0500
Subject: [PATCH 2/3] fix: update name of staging artifact

---
 config/electronBuilder.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
index 4423be7aefe9..a5478dbd8f78 100644
--- a/config/electronBuilder.config.js
+++ b/config/electronBuilder.config.js
@@ -23,19 +23,19 @@ const macIcon = {
 
 const appIds = {
     production: 'com.expensifyreactnative.chat',
-    staging: 'com.expensifyreactnative.staging.chat',
+    staging: 'com.expensifyreactnative.dev.chat',
     adhoc: 'com.expensifyreactnative.adhoc.chat',
 };
 
 const productNames = {
     production: 'New Expensify',
-    staging: 'New Expensify Staging',
+    staging: 'New Expensify Dev',
     adhoc: 'New Expensify AdHoc',
 };
 
 const artifactNames = {
     production: 'NewExpensify.dmg',
-    staging: 'NewExpensifyStaging.dmg',
+    staging: 'NewExpensifyDev.dmg',
     adhoc: 'NewExpensifyAdHoc.dmg',
 };
 

From f6292352d895613fee052fcffe5e5d192ab858ca Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Wed, 13 Sep 2023 01:18:53 +0500
Subject: [PATCH 3/3] fix: update desktop link in testbuild.yml file

---
 .github/workflows/testBuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index fd8118895679..d8e4855ed7ed 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -340,6 +340,6 @@ jobs:
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
           ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
-          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
+          DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensifyAdHoc.dmg
           IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com