New registration: gate phone number discoverability on feature flag

This commit is contained in:
Evan Hahn 2023-03-21 12:20:34 -05:00 committed by GitHub
parent 1eb840737c
commit 9ba0be7ecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions

View File

@ -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

View File

@ -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)