From 9ba0be7eccfef32b6111fa86a9b1ca11ffab3cbd Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Tue, 21 Mar 2023 12:20:34 -0500
Subject: [PATCH] New registration: gate phone number discoverability on
 feature flag

---
 .../RegistrationCoordinatorImpl.swift          |  2 +-
 .../RegistrationProfileViewController.swift    | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Signal/Registration/RegistrationCoordinatorImpl.swift b/Signal/Registration/RegistrationCoordinatorImpl.swift
index 845d016143..1e17f5b8c2 100644
--- a/Signal/Registration/RegistrationCoordinatorImpl.swift
+++ b/Signal/Registration/RegistrationCoordinatorImpl.swift
@@ -2141,7 +2141,7 @@ public class RegistrationCoordinatorImpl: RegistrationCoordinator {
             )))
         }
 
-        if !inMemoryState.hasDefinedIsDiscoverableByPhoneNumber {
+        if !inMemoryState.hasDefinedIsDiscoverableByPhoneNumber, FeatureFlags.phoneNumberDiscoverability {
             return .value(.phoneNumberDiscoverability(RegistrationPhoneNumberDiscoverabilityState(
                 e164: accountIdentity.e164,
                 isDiscoverableByPhoneNumber: inMemoryState.isDiscoverableByPhoneNumber
diff --git a/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift b/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift
index 8794cb1ec8..caffa52c41 100644
--- a/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift
+++ b/Signal/src/ViewControllers/Registration/RegistrationProfileViewController.swift
@@ -266,14 +266,7 @@ class RegistrationProfileViewController: OWSViewController {
         scrollView.autoPinEdge(toSuperviewEdge: .top)
         scrollView.autoPinEdge(.bottom, to: .bottom, of: keyboardLayoutGuideViewSafeArea)
 
-        let stackView = UIStackView(arrangedSubviews: [
-            titleLabel,
-            explanationView,
-            avatarContainerView,
-            nameStackView,
-            phoneNumberDisclosureView,
-            UIView.vStretchingSpacer()
-        ])
+        let stackView = UIStackView()
         stackView.axis = .vertical
         stackView.distribution = .fill
         stackView.spacing = 24
@@ -282,6 +275,15 @@ class RegistrationProfileViewController: OWSViewController {
         stackView.autoPinWidth(toWidthOf: scrollView)
         stackView.autoPinHeightToSuperview()
 
+        stackView.addArrangedSubview(titleLabel)
+        stackView.addArrangedSubview(explanationView)
+        stackView.addArrangedSubview(avatarContainerView)
+        stackView.addArrangedSubview(nameStackView)
+        if FeatureFlags.phoneNumberDiscoverability {
+            stackView.addArrangedSubview(phoneNumberDisclosureView)
+        }
+        stackView.addArrangedSubview(UIView.vStretchingSpacer())
+
         scrollView.addSubview(cameraImageWrapperView)
         cameraImageWrapperView.autoPinEdge(.bottom, to: .bottom, of: avatarView)
         cameraImageWrapperView.autoPinEdge(.trailing, to: .trailing, of: avatarView)