Only show terms once and restore to onboarding education if the user …

…didn't go far enough

packages/mobile/src/account/actions.ts

@@ -3,6 +3,7 @@ import { PaymentRequest } from 'src/account/types'
 
 // TODO(Rossy): Remove the _ACTION suffix from these actions for consistency with other other names
 export enum Actions {
+  CHOOSE_CREATE_ACCOUNT = 'ACCOUNT/CHOOSE_CREATE',
   CHOOSE_RESTORE_ACCOUNT = 'ACCOUNT/CHOOSE_RESTORE',
   CANCEL_CREATE_OR_RESTORE_ACCOUNT = 'ACCOUNT/CANCEL_CREATE_OR_RESTORE_ACCOUNT',
   SET_NAME = 'ACCOUNT/SET_NAME',
@@ -29,6 +30,9 @@ export enum Actions {
   MIGRATE_ACCOUNT_BIP39 = 'MIGRATE_ACCOUNT_BIP39',
 }
 
+export interface ChooseCreateAccountAction {
+  type: Actions.CHOOSE_CREATE_ACCOUNT
+}
 export interface ChooseRestoreAccountAction {
   type: Actions.CHOOSE_RESTORE_ACCOUNT
 }
@@ -137,6 +141,7 @@ export interface MigrateAccount {
 }
 
 export type ActionTypes =
+  | ChooseCreateAccountAction
   | ChooseRestoreAccountAction
   | CancelCreateOrRestoreAccountAction
   | SetNameAction
@@ -162,6 +167,12 @@ export type ActionTypes =
   | AcceptTermsAction
   | MigrateAccount
 
+export function chooseCreateAccount(): ChooseCreateAccountAction {
+  return {
+    type: Actions.CHOOSE_CREATE_ACCOUNT,
+  }
+}
+
 export function chooseRestoreAccount(): ChooseRestoreAccountAction {
   return {
     type: Actions.CHOOSE_RESTORE_ACCOUNT,

packages/mobile/src/account/reducer.ts

@@ -85,6 +85,11 @@ export const reducer = (
         dismissedGetVerified: false,
       }
     }
+    case Actions.CHOOSE_CREATE_ACCOUNT:
+      return {
+        ...state,
+        isRestoringAccount: false,
+      }
     case Actions.CHOOSE_RESTORE_ACCOUNT:
       return {
         ...state,

packages/mobile/src/navigator/Navigator.tsx

@@ -483,12 +483,9 @@ export function MainStackScreen() {
 
     if (!language) {
       initialRoute = Screens.Language
-    } else if (!e164Number) {
+    } else if (!e164Number || !acceptedTerms || pincodeType === PincodeType.Unset) {
+      // User didn't go far enough in onboarding, start again from education
       initialRoute = Screens.OnboardingEducationScreen
-    } else if (!acceptedTerms) {
-      initialRoute = Screens.RegulatoryTerms
-    } else if (pincodeType === PincodeType.Unset) {
-      initialRoute = Screens.PincodeSet
     } else if (!redeemComplete && !account) {
       initialRoute = isRestoringAccount ? Screens.ImportWallet : Screens.EnterInviteCode
     } else if (!hasSeenVerificationNux) {

packages/mobile/src/onboarding/registration/NameAndNumber.test.tsx

@@ -3,7 +3,6 @@ import 'react-native'
 import { fireEvent, render } from 'react-native-testing-library'
 import { Provider } from 'react-redux'
 import * as renderer from 'react-test-renderer'
-import { PincodeType } from 'src/account/reducer'
 import { ErrorMessages } from 'src/app/ErrorMessages'
 import { Screens } from 'src/navigator/Screens'
 import NameAndNumber, {
@@ -40,7 +39,6 @@ describe('NameAndNumberScreen', () => {
     const wrapper = render(
       <Provider store={store}>
         <NameAndNumberClass
-          acceptedTerms={false}
           showError={showErrorMock}
           hideAlert={jest.fn()}
           setPromptForno={jest.fn()}
@@ -49,7 +47,6 @@ describe('NameAndNumberScreen', () => {
           cachedName={''}
           cachedNumber={''}
           cachedCountryCallingCode={'+1'}
-          pincodeType={PincodeType.Unset}
           {...getMockI18nProps()}
           {...mockScreenProps}
         />
@@ -64,7 +61,6 @@ describe('NameAndNumberScreen', () => {
     const wrapper = render(
       <Provider store={createMockStore()}>
         <NameAndNumberClass
-          acceptedTerms={false}
           showError={jest.fn()}
           hideAlert={jest.fn()}
           setPromptForno={jest.fn()}
@@ -73,7 +69,6 @@ describe('NameAndNumberScreen', () => {
           cachedName={''}
           cachedNumber={''}
           cachedCountryCallingCode={''}
-          pincodeType={PincodeType.Unset}
           {...getMockI18nProps()}
           {...mockScreenProps}
         />
@@ -88,7 +83,6 @@ describe('NameAndNumberScreen', () => {
     const wrapper = render(
       <Provider store={createMockStore()}>
         <NameAndNumberClass
-          acceptedTerms={false}
           showError={error}
           hideAlert={jest.fn()}
           setPhoneNumber={jest.fn()}
@@ -97,7 +91,6 @@ describe('NameAndNumberScreen', () => {
           cachedName={''}
           cachedNumber={''}
           cachedCountryCallingCode={''}
-          pincodeType={PincodeType.Unset}
           {...getMockI18nProps()}
           {...mockScreenProps}
         />

packages/mobile/src/onboarding/registration/NameAndNumber.tsx

@@ -13,7 +13,6 @@ import * as RNLocalize from 'react-native-localize'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { connect } from 'react-redux'
 import { setName, setPhoneNumber, setPromptForno } from 'src/account/actions'
-import { PincodeType } from 'src/account/reducer'
 import { hideAlert, showError } from 'src/alert/actions'
 import { OnboardingEvents } from 'src/analytics/Events'
 import ValoraAnalytics from 'src/analytics/ValoraAnalytics'
@@ -30,8 +29,6 @@ interface StateProps {
   cachedName: string | null
   cachedNumber: string | null
   cachedCountryCallingCode: string | null
-  pincodeType: PincodeType
-  acceptedTerms: boolean
 }
 
 interface DispatchProps {
@@ -67,8 +64,6 @@ const mapStateToProps = (state: RootState): StateProps => {
     cachedName: state.account.name,
     cachedNumber: state.account.e164PhoneNumber,
     cachedCountryCallingCode: state.account.defaultCountryCode,
-    pincodeType: state.account.pincodeType,
-    acceptedTerms: state.account.acceptedTerms,
   }
 }
 

packages/mobile/src/onboarding/welcome/Welcome.test.tsx

@@ -18,7 +18,15 @@ describe('Welcome', () => {
     fireEvent.press(getByTestId('CreateAccountButton'))
     jest.runAllTimers()
     expect(navigate).toHaveBeenCalledWith(Screens.RegulatoryTerms)
-    expect(store.getActions()).toMatchInlineSnapshot(`Array []`)
+    expect(store.getActions()).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "type": "ACCOUNT/CHOOSE_CREATE",
+        },
+      ]
+    `)
+
+    store.clearActions()
 
     fireEvent.press(getByTestId('RestoreAccountButton'))
     jest.runAllTimers()

packages/mobile/src/onboarding/welcome/Welcome.tsx

@@ -7,25 +7,32 @@ import { useTranslation } from 'react-i18next'
 import { Image, StyleSheet, Text, View } from 'react-native'
 import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useDispatch } from 'react-redux'
-import { chooseRestoreAccount } from 'src/account/actions'
+import { chooseCreateAccount, chooseRestoreAccount } from 'src/account/actions'
 import { Namespaces } from 'src/i18n'
 import Logo, { LogoTypes } from 'src/icons/Logo.v2'
 import { welcomeBackground } from 'src/images/Images'
 import { nuxNavigationOptions } from 'src/navigator/Headers.v2'
 import { navigate } from 'src/navigator/NavigationService'
 import { Screens } from 'src/navigator/Screens'
 import LanguageButton from 'src/onboarding/LanguageButton'
+import useSelector from 'src/redux/useSelector'
 
 export default function Welcome() {
   const { t } = useTranslation(Namespaces.onboarding)
   const dispatch = useDispatch()
+  const acceptedTerms = useSelector((state) => state.account.acceptedTerms)
   const insets = useSafeAreaInsets()
 
   const navigateNext = () => {
-    navigate(Screens.RegulatoryTerms)
+    if (!acceptedTerms) {
+      navigate(Screens.RegulatoryTerms)
+    } else {
+      navigate(Screens.NameAndNumber)
+    }
   }
 
   const onPressCreateAccount = () => {
+    dispatch(chooseCreateAccount())
     navigateNext()
   }