Skip to content

Commit 0451eec

Browse files
authored
Merge pull request #8074 from woocommerce/issue/8061-account-mismatch-layout
Login: Fix layout issue on account mismatch error screen
2 parents 7e9e0d5 + 1c78848 commit 0451eec

File tree

5 files changed

+137
-107
lines changed

5 files changed

+137
-107
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
11.2
44
-----
55
- [*] The survey at the end of the login onboarding flow is no longer available. [https://github.com/woocommerce/woocommerce-ios/pull/8062]
6+
- [*] Fixed layout issues on the Account Mismatch error screen. [https://github.com/woocommerce/woocommerce-ios/pull/8074]
67
- [*] The Accept Payments Easily banner has been removed from the order list [https://github.com/woocommerce/woocommerce-ios/pull/8078]
78

89
11.1

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,13 @@ private extension ULAccountMismatchViewController {
116116
func configureSignedInAsLabel() {
117117
singedInAsLabel.applySecondaryBodyStyle()
118118
singedInAsLabel.text = viewModel.signedInText
119+
singedInAsLabel.numberOfLines = 0
119120
}
120121

121122
func configureWrongAccountLabel() {
122123
wrongAccountLabel.applySecondaryBodyStyle()
123124
wrongAccountLabel.text = viewModel.logOutTitle
125+
wrongAccountLabel.numberOfLines = 0
124126
}
125127

126128
func configureLogOutButton() {
@@ -160,6 +162,7 @@ private extension ULAccountMismatchViewController {
160162
extraInfoButton.applyLinkButtonStyle()
161163
extraInfoButton.contentEdgeInsets = Constants.extraInfoCustomInsets
162164
extraInfoButton.setTitle(viewModel.auxiliaryButtonTitle, for: .normal)
165+
extraInfoButton.titleLabel?.numberOfLines = 0
163166
extraInfoButton.on(.touchUpInside) { [weak self] _ in
164167
self?.didTapAuxiliaryButton()
165168
}
@@ -183,6 +186,7 @@ private extension ULAccountMismatchViewController {
183186
secondaryButton.isPrimary = false
184187
secondaryButton.isHidden = viewModel.isSecondaryButtonHidden
185188
secondaryButton.setTitle(viewModel.secondaryButtonTitle, for: .normal)
189+
secondaryButton.titleLabel?.numberOfLines = 0
186190
secondaryButton.on(.touchUpInside) { [weak self] _ in
187191
self?.didTapSecondaryButton()
188192
}

0 commit comments

Comments
 (0)