Add improvements based on PR comments

Author: iangmaia

fastlane/lanes/release.rb

@@ -10,27 +10,32 @@
   # - Freezes the GitHub milestone and enables the GitHub branch protection for the new branch
   #
   # @param [Boolean] skip_confirm (default: false) If true, avoids any interactive prompt
-  # @param [String] version (optional) The version number for the release from the release tool. If not provided, uses the calculated version.
+  # @param [String] version (optional) The version to use for the new release version to code freeze for.
+  #                 Typically auto-provided by ReleasesV2. If nil, computes the new version based on current one.
   #
   lane :code_freeze do |skip_confirm: false, version: nil|
     ensure_git_status_clean
 
     # Check out the up-to-date default branch, the designated starting point for the code freeze
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
-    # Use provided version from release tool, or fall back to calculated version
-    calculated_version = release_version_next
+    # Use provided version from release tool, or fall back to computed version
+    computed_version = release_version_next
     provided_version = version
-    release_version = provided_version || calculated_version
-
-    # Warn if provided version differs from calculated version
-    if provided_version && provided_version != calculated_version
-      warning_message = "⚠️ Version mismatch: Release tool version is '#{provided_version}' but calculated version is '#{calculated_version}'. Using '#{provided_version}' from release tool."
+    new_version = provided_version || computed_version
+
+    # Warn if provided version differs from computed version
+    if provided_version && provided_version != computed_version
+      warning_message = <<~WARNING
+        ⚠️ Version mismatch: The explicitly-provided version was '#{provided_version}' while new computed version would have been '#{computed_version}'.
+        If this is unexpected, you might want to investigate the discrepency.
+        Continuing with the explicitly-provided verison '#{provided_version}'.
+      WARNING
       UI.important(warning_message)
       buildkite_annotate(style: 'warning', context: 'code-freeze-version-mismatch', message: warning_message) if is_ci
     end
 
-    release_branch_name = compute_release_branch_name(options: { version: version, skip_confirm: skip_confirm }, version: release_version)
+    release_branch_name = compute_release_branch_name(options: { version: version, skip_confirm: skip_confirm }, version: new_version)
     ensure_branch_does_not_exist!(release_branch_name)
 
     # The `release_version_next` is used as the `new internal release version` value because the external and internal
@@ -40,7 +45,7 @@
       • New release branch from #{DEFAULT_BRANCH}: #{release_branch_name}
 
       • Current release version and build code: #{release_version_current} (#{build_code_current}).
-      • New release version and build code: #{release_version} (#{build_code_code_freeze}).
+      • New release version and build code: #{new_version} (#{build_code_code_freeze}).
     MESSAGE
 
     UI.important(message)
@@ -61,8 +66,6 @@
 
     commit_version_and_build_files
 
-    new_version = release_version_current
-
     release_notes_source_path = File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt')
     extract_release_notes_for_version(
       version: new_version,