From 2f5a4e4ff3882dd9e49c5a0afb487d1366b33dec Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 22 Jul 2025 18:31:03 -0500
Subject: [PATCH] Use existing EXPO_PUBLIC_BUNDLE_IDENTIFIER short commit has
 as Sentry dist value

---
 patches/@sentry+react-native+6.14.0.patch | 2 +-
 src/logger/sentry/setup/index.ts          | 4 ++--
 webpack.config.js                         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/@sentry+react-native+6.14.0.patch b/patches/@sentry+react-native+6.14.0.patch
index 2291c598c6..ca4ab38d13 100644
--- a/patches/@sentry+react-native+6.14.0.patch
+++ b/patches/@sentry+react-native+6.14.0.patch
@@ -7,7 +7,7 @@ index c282ade..8777755 100755
    const isHermes = assets.find(asset => asset.endsWith('.hbc'));
    const windowsCallback = process.platform === "win32" ? 'node ' : '';
 -  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')}`, {
-+  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')} --dist ${process.env.SENTRY_DIST}`, {
++  execSync(`${windowsCallback}${sentryCliBin} sourcemaps upload ${isHermes ? '--debug-id-reference' : ''} ${assets.join(' ')} --dist ${process.env.EXPO_PUBLIC_BUNDLE_IDENTIFIER}`, {
      env: {
        ...process.env,
        [SENTRY_PROJECT]: sentryProject,
diff --git a/src/logger/sentry/setup/index.ts b/src/logger/sentry/setup/index.ts
index ee8b6be078..f2fb152d36 100644
--- a/src/logger/sentry/setup/index.ts
+++ b/src/logger/sentry/setup/index.ts
@@ -16,9 +16,9 @@ import * as env from '#/env'
 const release = pkgJson.version
 
 /**
- * The latest deployed commit hash
+ * The latest deployed short commit hash
  */
-const dist = env.SENTRY_DIST || 'dev'
+const dist = env.BUNDLE_IDENTIFIER || 'dev'
 
 init({
   enabled: !env.IS_DEV && !!env.SENTRY_DSN,
diff --git a/webpack.config.js b/webpack.config.js
index 2eaf024c48..419149d443 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -55,7 +55,7 @@ module.exports = async function (env, argv) {
         release: {
           // env is undefined for Render.com builds, fall back
           name: version,
-          dist: process.env.SENTRY_DIST || 'dev',
+          dist: process.env.EXPO_PUBLIC_BUNDLE_IDENTIFIER || 'dev',
         },
       }),
     )