SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pr feedback: rename svg; remove unnecessary go to login screen logic; refactor save/getOnboardingViewed value function

Browse Source
This commit is contained in:
Pablo Velez Vidal
2022-11-16 15:01:06 +01:00
parent 6e3ed08163
commit bdbbd2cb36
11 changed files with 49 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/init/launch.ts
View File

@@ -10,7 +10,7 @@ import LocalConfig from '@assets/config.json';
import {Screens, DeepLink, Events, Launch, PushNotification} from '@constants';
import DatabaseManager from '@database/manager';
import {getActiveServerUrl, getServerCredentials, removeServerCredentials} from '@init/credentials';
import {onboadingViewedValue} from '@queries/app/global';
import {getOnboardingViewed} from '@queries/app/global';
import {getThemeForCurrentTeam} from '@queries/servers/preference';
import {getCurrentUserId} from '@queries/servers/system';
import {queryMyTeams} from '@queries/servers/team';
@@ -68,7 +68,6 @@ const launchAppFromNotification = async (notification: NotificationWithData) =>
* @returns a redirection to a screen, either onboarding, add_server, login or home depending on the scenario
*/
const launchApp = async (props: LaunchProps, resetNavigation = true) => {
const onboardingViewed = LocalConfig.ShowOnboarding ? await onboadingViewedValue() : false;
let serverUrl: string | undefined;
switch (props?.launchType) {
case Launch.DeepLink:
@@ -107,10 +106,6 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => {
hasCurrentUser = Boolean(currentUserId);
}
if (LocalConfig.ShowOnboarding && !onboardingViewed) {
return resetToOnboarding({...props, goToLoginServerUrl: serverUrl});
}
let launchType = props.launchType;
if (!hasCurrentUser) {
// migrating from v1
@@ -140,7 +135,9 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => {
}
}
if (!LocalConfig.ShowOnboarding || onboardingViewed) {
const onboardingViewed = LocalConfig.ShowOnboarding ? await getOnboardingViewed() : false;
if (onboardingViewed) {
return launchToServer(props, resetNavigation);
}
return resetToOnboarding(props);