From 4e1dfcaeec43098f1fc2f0e21362f37004bb8ba6 Mon Sep 17 00:00:00 2001
From: Andy Pixley <3723676+pixman20@users.noreply.github.com>
Date: Tue, 12 Aug 2025 13:11:13 -0400
Subject: [PATCH] [BRE-1074] Adding debug info for failing to find release
 (#5673)

---
 .github/workflows/publish-store.yml       | 3 ++-
 fastlane/Fastfile                         | 4 ++++
 fastlane/patches/supply_custom_promote.rb | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-store.yml b/.github/workflows/publish-store.yml
index 0135c94c8e..348766de2c 100644
--- a/.github/workflows/publish-store.yml
+++ b/.github/workflows/publish-store.yml
@@ -147,7 +147,8 @@ jobs:
 
             bundle exec fastlane updateReleaseNotes \
               releaseNotes:"$RELEASE_NOTES" \
-              versionCode:"$VERSION_CODE"
+              versionCode:"$VERSION_CODE" \
+              packageName:"$PACKAGE_NAME"
 
             bundle exec fastlane promoteToProduction \
               versionCode:"$VERSION_CODE" \
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 01a21d9e37..6447dd4387 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -387,9 +387,13 @@ platform :android do
     pw_manager_locales = ["ca", "cs-CZ", "da-DK", "de-DE", "en-US", "es-ES", "et", "fr-FR", "hr", "hu-HU", "id", "it-IT", "iw-IL", "ja-JP", "nl-NL", "pl-PL", "pt-BR", "pt-PT", "ro", "ru-RU", "sk", "sv-SE", "tr-TR", "uk", "vi", "zh-CN", "zh-TW"]
     if options[:packageName] == "com.bitwarden.authenticator"
       locales = auth_locales
+    elsif options[:packageName] == "com.x8bit.bitwarden" || options[:packageName] == "com.x8bit.bitwarden.beta"
+      locales = pw_manager_locales
     else
+      UI.important "Unexpected package name: #{options[:packageName]}, using default locales"
       locales = pw_manager_locales
     end
+
     locales.each do |locale|
       dir = "metadata/android/#{locale}/changelogs"
       FileUtils.mkdir_p(dir)
diff --git a/fastlane/patches/supply_custom_promote.rb b/fastlane/patches/supply_custom_promote.rb
index e684dbc56a..47ecbdd91e 100644
--- a/fastlane/patches/supply_custom_promote.rb
+++ b/fastlane/patches/supply_custom_promote.rb
@@ -26,7 +26,6 @@ module Supply
       end
 
       releases = track_from.releases
-      UI.message("Track contents: #{track_from.to_json}")
 
       version_code = Supply.config[:version_code].to_s
       if !Supply.config[:skip_release_verification]
@@ -79,6 +78,8 @@ module Supply
         release.user_fraction = nil
       end
 
+      UI.message("Promoting release with version: #{release.name} (#{release.version_codes.first})")
+
       if track_to
         # Its okay to set releases to an array containing the newest release
         # Google Play will keep previous releases there this release is a partial rollout