Skip to content

Commit f369a34

Browse files
Handle the case where user enters an non WP.com user account
1 parent d90f0a1 commit f369a34

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
1010
import com.woocommerce.android.model.JetpackStatus
1111
import com.woocommerce.android.ui.login.WPComLoginRepository
1212
import com.woocommerce.android.util.FeatureFlag
13+
import com.woocommerce.android.util.StringUtils
1314
import com.woocommerce.android.viewmodel.MultiLiveEvent
1415
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
1516
import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
@@ -105,14 +106,17 @@ class JetpackActivationWPComEmailViewModel @Inject constructor(
105106

106107
when (failure?.type) {
107108
AuthOptionsErrorType.UNKNOWN_USER -> {
108-
if (FeatureFlag.JETPACK_FLOW_ACCOUNT_CREATION.isEnabled()) {
109+
if (FeatureFlag.JETPACK_FLOW_ACCOUNT_CREATION.isEnabled() &&
110+
StringUtils.isValidEmail(emailOrUsername)
111+
) {
109112
triggerEvent(
110113
ShowMagicLinkScreen(
111114
emailOrUsername, navArgs.jetpackStatus, isNewWpComAccount = true
112115
)
113116
)
117+
} else {
118+
errorMessage.value = R.string.email_not_registered_wpcom
114119
}
115-
errorMessage.value = R.string.email_not_registered_wpcom
116120
}
117121

118122
AuthOptionsErrorType.EMAIL_LOGIN_NOT_ALLOWED -> {

0 commit comments

Comments
 (0)