revert to two-line instruction

mozilla-mobile · Dec 27, 2023 · 13a206f · 13a206f
1 parent 1d9f9eb
commit 13a206f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/translations/strings.yaml b/src/translations/strings.yaml
@@ -706,15 +706,12 @@ inAppAuth:
     value: "To finish setting up your Mozilla account, create a password in your account settings:"
     comment: User has tried to log in using an SSO-linked account that does not have a password. The user needs to log in to their Mozilla Account to set a password before proceeding.
   ssoInstructionLine2:
-    value: 1. Go to your <a href="open-account">Mozilla account settings</a>.
+    value: 1. Go to <a href="open-account">Change password</a> in your Mozilla account settings.
     comment: User has tried to log in using an SSO-linked account that does not have a password. The user needs to log in to their Mozilla Account to set a password before proceeding. Do not remove or translate the markup '<a href="open-account">'.
   ssoInstructionLine3:
-    value: 2. Find the password setting, under “Security”.
+    value: 2. Create a password.
     comment: User has tried to log in using an SSO-linked account that does not have a password. The user needs to log in to their Mozilla Account to set a password before proceeding.
   ssoInstructionLine4:
-    value: 3. Create a password.
-    comment: User has tried to log in using an SSO-linked account that does not have a password. The user needs to log in to their Mozilla Account to set a password before proceeding.
-  ssoInstructionLine5:
     value: When your password is created, return to this screen and continue to sign in to Mozilla VPN.
     comment: User has tried to log in using an SSO-linked account that does not have a password. The user needs to log in to their Mozilla Account to set a password before proceeding.
   stubAccountVerificationHeader:

diff --git a/src/ui/authenticationInApp/ViewAuthenticationSsoAccount.qml b/src/ui/authenticationInApp/ViewAuthenticationSsoAccount.qml
@@ -21,6 +21,7 @@ MZInAppAuthenticationThirdParty {
     flickContentHeight: col.implicitHeight
 
     _description: ColumnLayout {
+
         MZTextBlock {
           id: ssoInstructionLine1
           text: MZI18n.InAppAuthSsoInstructionLine1
@@ -56,16 +57,6 @@ MZInAppAuthenticationThirdParty {
           id: ssoInstructionLine4
           text: MZI18n.InAppAuthSsoInstructionLine4
 
-          Layout.fillWidth: true
-          Layout.leftMargin: MZTheme.theme.vSpacing / 2
-          font.pixelSize: MZTheme.theme.fontSize
-          lineHeight: MZTheme.theme.labelLineHeight
-        }
-
-        MZTextBlock {
-          id: ssoInstructionLine5
-          text: MZI18n.InAppAuthSsoInstructionLine5
-
           Layout.fillWidth: true
           font.pixelSize: MZTheme.theme.fontSize
           lineHeight: MZTheme.theme.labelLineHeight