Update code to properly use the received version as source of truth throughout code freeze

Author: iangmaia

fastlane/Fastfile

@@ -121,18 +121,18 @@ platform :android do
     # Check out the up-to-date default branch, the designated starting point for the code freeze
     Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
-    # If version provided by release tool, use it as source of truth
-    UI.important("Using provided version: #{version}") if version
-
+    # If a new version is passed, use it as source of truth from now on
     new_version = version || release_version_next
     new_release_branch = "release/#{new_version}"
+    new_beta_version = beta_version_next(version_name: new_version)
 
     message = <<-MESSAGE
 
-    Code Freeze:
+      Code Freeze:
       • New release branch from #{DEFAULT_BRANCH}: #{new_release_branch}
+
       • Current release version and build code: #{release_version_current} (#{build_code_current}).
-      • New beta version and build code: #{beta_version_first} (#{build_code_next}).
+      • New beta version and build code: #{new_beta_version} (#{build_code_next}).
 
     MESSAGE
 
@@ -149,7 +149,7 @@ platform :android do
     # Bump the version and build code
     UI.message 'Bumping beta version and build code...'
     VERSION_FILE.write_version(
-      version_name: beta_version_first,
+      version_name: new_beta_version,
       version_code: build_code_next
     )
     commit_version_bump
@@ -1343,29 +1343,16 @@ platform :android do
     VERSION_FORMATTER.release_version(release_version_next)
   end
 
-  # Returns the beta version that is used by the code freeze
-  # It first increments the minor number, which also resets the build number to 0
-  # It then bumps the build number so the -rc-1 can be appended to the code freeze version
-  def beta_version_first
-    # Read the current release version from `version.properties` and parse it into an AppVersion object
-    current_version = VERSION_FORMATTER.parse(VERSION_FILE.read_version_name)
-    # Calculate the next major version number
-    next_version = VERSION_CALCULATOR.next_release_version(version: current_version)
-    # Calculate the next build number
-    beta_version_first = VERSION_CALCULATOR.next_build_number(version: next_version)
-    # Return the formatted release version
-    VERSION_FORMATTER.beta_version(beta_version_first)
-  end
-
   # Returns the beta version of the app in the format `1.2-rc-1`
   #
-  def beta_version_next
+  def beta_version_next(version_name: nil)
+    version_name ||= VERSION_FILE.read_version_name
     # Read the current release version from `version.properties` and parse it into an AppVersion object
-    current_version = VERSION_FORMATTER.parse(VERSION_FILE.read_version_name)
+    current_version = VERSION_FORMATTER.parse(version_name)
     # Calculate the next beta version
-    beta_version_next = VERSION_CALCULATOR.next_build_number(version: current_version)
+    next_beta_version = VERSION_CALCULATOR.next_build_number(version: current_version)
     # Return the formatted release version
-    VERSION_FORMATTER.beta_version(beta_version_next)
+    VERSION_FORMATTER.beta_version(next_beta_version)
   end
 
   # Returns the current build code of the app