Handle the case where user enters a username instead of email

Author: JorgeMucientes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.material.icons.Icons.Filled
 import androidx.compose.material.icons.filled.Clear
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.dimensionResource
@@ -47,7 +46,6 @@ fun JetpackActivationWPComEmailScreen(viewModel: JetpackActivationWPComEmailView
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun JetpackActivationWPComEmailScreen(
     viewState: JetpackActivationWPComEmailViewModel.ViewState,
@@ -115,6 +113,11 @@ fun JetpackActivationWPComEmailScreen(
                         }
                     )
                 )
+                Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.minor_100)))
+                Text(
+                    style = MaterialTheme.typography.caption,
+                    text = stringResource(id = R.string.login_jetpack_connection_create_account)
+                )
             }
 
             Spacer(modifier = Modifier.weight(1f))

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/wpcom/JetpackActivationWPComEmailViewModel.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.woocommerce.android.OnChangedException
+import com.woocommerce.android.R
 import com.woocommerce.android.analytics.AnalyticsEvent.JETPACK_SETUP_LOGIN_FLOW
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
@@ -23,7 +24,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import org.wordpress.android.fluxc.store.AccountStore.AuthOptionsError
 import org.wordpress.android.fluxc.store.AccountStore.AuthOptionsErrorType
-import org.wordpress.android.login.R
 import javax.inject.Inject
 
 @HiltViewModel
@@ -93,9 +93,7 @@ class JetpackActivationWPComEmailViewModel @Inject constructor(
             onSuccess = {
                 if (it.isPasswordless) {
                     triggerEvent(
-                        ShowMagicLinkScreen(
-                            emailOrUsername, navArgs.jetpackStatus, isNewWpComAccount = false
-                        )
+                        ShowMagicLinkScreen(emailOrUsername, navArgs.jetpackStatus, isNewWpComAccount = false)
                     )
                 } else {
                     triggerEvent(ShowPasswordScreen(emailOrUsername, navArgs.jetpackStatus))
@@ -106,16 +104,20 @@ class JetpackActivationWPComEmailViewModel @Inject constructor(
 
                 when (failure?.type) {
                     AuthOptionsErrorType.UNKNOWN_USER -> {
-                        if (FeatureFlag.JETPACK_FLOW_ACCOUNT_CREATION.isEnabled() &&
-                            StringUtils.isValidEmail(emailOrUsername)
-                        ) {
-                            triggerEvent(
-                                ShowMagicLinkScreen(
-                                    emailOrUsername, navArgs.jetpackStatus, isNewWpComAccount = true
+                        when {
+                            !StringUtils.isValidEmail(emailOrUsername) ->
+                                errorMessage.value = R.string.username_not_registered_wpcom
+
+                            FeatureFlag.JETPACK_FLOW_ACCOUNT_CREATION.isEnabled() ->
+                                triggerEvent(
+                                    ShowMagicLinkScreen(
+                                        emailOrUsername,
+                                        navArgs.jetpackStatus,
+                                        isNewWpComAccount = true
+                                    )
                                 )
-                            )
-                        } else {
-                            errorMessage.value = R.string.email_not_registered_wpcom
+
+                            else -> errorMessage.value = R.string.email_not_registered_wpcom
                         }
                     }
 

WooCommerce/src/main/res/values/strings.xml

@@ -365,6 +365,8 @@
     <string name="login_site_credentials_fetching_site">Fetching site…</string>
     <string name="login_site_credentials_web_authorization_connection_rejected">Unable to login because application password creation is not approved.</string>
     <string name="login_app_login_malformed_link">We couldn\'t process your app login request</string>
+    <string name="login_jetpack_connection_create_account">If you don\'t have an account, we\'ll use this email to create one.</string>
+
     <!--
         My Store View
     -->
@@ -3428,6 +3430,7 @@
     <string name="login_magic_link_button">Log in with magic link</string>
 
     <string name="email_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this email address.</string>
+    <string name="username_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this username address. You can enter an email to create a new account</string>
     <string name="login_magic_links_label">We\'ll email you a link that\'ll log you in instantly, no password needed.</string>
     <string name="login_get_link_by_email">Get a login link by email</string>
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>