From 2472b46063280ddea9ce2c02e67c108f241bf6c2 Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Mon, 8 Mar 2021 16:11:08 -0800 Subject: [PATCH 1/2] Add new delete account flow --- .../DeleteAccountConfirmationViewController.swift | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift b/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift index 3938b71f27..22b95335e3 100644 --- a/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift @@ -21,11 +21,6 @@ class DeleteAccountConfirmationViewController: OWSTableViewController2 { phoneNumberTextField.returnKeyType = .done phoneNumberTextField.autocorrectionType = .no phoneNumberTextField.spellCheckingType = .no - phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber( - forCountryCode: countryCode, - callingCode: callingCode, - includeExampleLabel: false - ) phoneNumberTextField.delegate = self phoneNumberTextField.accessibilityIdentifier = "phone_number_textfield" @@ -156,6 +151,12 @@ class DeleteAccountConfirmationViewController: OWSTableViewController2 { phoneNumberTextField.textColor = Theme.primaryTextColor phoneNumberTextField.font = OWSTableItem.accessoryLabelFont + phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber( + forCountryCode: countryCode, + callingCode: callingCode, + includeExampleLabel: false + ) + phoneNumberTextField.setCompressionResistanceHorizontalHigh() phoneNumberTextField.setContentHuggingHorizontalHigh() @@ -324,3 +325,4 @@ extension DeleteAccountConfirmationViewController: UITextFieldDelegate { return false } } + From caa667f77428decafe9cfb897e7c8041a21f14c5 Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Tue, 9 Mar 2021 12:36:27 -0800 Subject: [PATCH 2/2] PR Feedback --- Signal/translations/en.lproj/Localizable.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index f454a6dbb2..c1dc472d60 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1091,7 +1091,7 @@ "DELETE_ACCOUNT_CONFIRMATION_DELETE_FAILED" = "Failed to delete account. Make sure that Wi-Fi or mobile data is turned on, then try again."; /* Description for the 'delete account' confirmation view. */ -"DELETE_ACCOUNT_CONFIRMATION_DESCRIPTION" = "This will delete your account info, profile, and all of your messages. You will also be deleted from all Signal groups."; +"DELETE_ACCOUNT_CONFIRMATION_DESCRIPTION" = "This will delete your account info, profile, and all of your messages."; /* Indicates the work we are doing while deleting the account */ "DELETE_ACCOUNT_CONFIRMATION_IN_PROGRESS" = "Deleting Account..."; @@ -1103,7 +1103,7 @@ "DELETE_ACCOUNT_CONFIRMATION_PHONE_NUMBER_TITLE" = "Phone Number"; /* Section header */ -"DELETE_ACCOUNT_CONFIRMATION_SECTION_TITLE" = "Enter Your Phone Number"; +"DELETE_ACCOUNT_CONFIRMATION_SECTION_TITLE" = "Confirm Your Signal Number"; /* Title for the 'delete account' confirmation view. */ "DELETE_ACCOUNT_CONFIRMATION_TITLE" = "Delete Account";