simplify onboarding model function naming

zio/stable
Ansh Nanda 2023-08-28 18:47:56 -07:00
parent a231fdf64e
commit bcef7400db
4 changed files with 11 additions and 6 deletions

View File

@ -47,7 +47,12 @@ export class OnboardingModel {
}
}
nextScreenName(currentScreenName?: OnboardingStep) {
/**
* Returns the name of the next screen in the onboarding process based on the current step or screen name provided.
* @param {OnboardingStep} [currentScreenName]
* @returns name of next screen in the onboarding process
*/
next(currentScreenName?: OnboardingStep) {
if (currentScreenName === 'Welcome' || this.step === 'Welcome') {
track('Onboarding:Begin')
this.step = 'RecommendedFeeds'
@ -78,7 +83,7 @@ export class OnboardingModel {
return this.step === 'Home'
}
get isRemaining() {
get isActive() {
return !this.isComplete
}
}

View File

@ -125,7 +125,7 @@ export const RecommendedFeeds = observer(({navigation}: Props) => {
const store = useStores()
const next = () => {
const nextScreenName = store.onboarding.nextScreenName('RecommendedFeeds')
const nextScreenName = store.onboarding.next('RecommendedFeeds')
if (nextScreenName) {
navigation.navigate(nextScreenName)
}

View File

@ -25,7 +25,7 @@ export const Welcome = observer(({navigation}: Props) => {
}, [store.shell.minimalShellMode, store])
const next = () => {
const nextScreenName = store.onboarding.nextScreenName('Welcome')
const nextScreenName = store.onboarding.next('Welcome')
if (nextScreenName) {
navigation.navigate(nextScreenName)
}

View File

@ -41,10 +41,10 @@ export const HomeScreen = withAuthRequired(
>([])
React.useEffect(() => {
if (store.onboarding.isRemaining) {
if (store.onboarding.isActive) {
navigation.navigate('Welcome')
}
}, [store.onboarding.isRemaining, navigation])
}, [store.onboarding.isActive, navigation])
React.useEffect(() => {
const {pinned} = store.me.savedFeeds