...
 
Commits (2)
......@@ -105,8 +105,7 @@ sessionService.onLogin(async () => {
NavigationService.navigate(sessionService.initialScreen);
// check onboarding progress and navigate if necessary
// commenting this to prevent that the app navigates to onboarding after login
stores.onboarding.getProgress();
stores.onboarding.getProgress(sessionService.initialScreen !== 'OnboardingScreenNew');
// check update
if (Platform.OS !== 'ios' && !GOOGLE_PLAY_STORE) {
......@@ -206,7 +205,6 @@ export default class App extends Component<Props, State> {
*/
async componentDidMount() {
try {
// load app setting before start
const results = await Promise.all([settingsStore.init(), await Linking.getInitialURL()]);
......
......@@ -7,7 +7,7 @@ import { MINDS_FEATURES } from '../../../src/config/Config';
describe('Feature service', () => {
it('should return features', async () => {
let features = {"crypto": false}
let features = { crypto: false, 'onboarding-december-2019': true };
expect(service.features).toEqual(features);
expect(service.has('crypto')).toEqual(false);
});
......
import deleteUser from './helpers/deleteUser';
import sleep from '../src/common/helpers/sleep';
describe('Register Flow', () => {
describe.skip('Register Flow', () => {
const username = 'e2euser' + ((Math.random() * 0xffffff) << 0).toString(16);
const password = process.env.loginPass;
......
{
"versions": [
{
"version": "3.15.0",
"href": "https://cdn-assets.minds.com/mobile/Minds-stable-3-15-0.apk",
"sourceHref": "https://gitlab.com/minds/mobile-native/commits/v3.15.0",
"changelog": [
"New login and register screens",
"Bug fixes"
],
"unstable": false,
"hashes": [
{
"type": "md5",
"value": "0b41d23037645b7f3eb033c1f617da6a"
},
{
"type": "sha256",
"value": "f069afcaef9527921fff54194734b62da77756610228a7590a98e29d6f159462"
},
{
"type": "sha512",
"value": "0e6606c99855e173ddc1e62d716684a920e7cec4433bdce8495e0216fa3c0e61cb5ff1abd9dd5cb265764f81bfb6518a37764a645f02350083cc44cb19c60f43"
}
]
},
{
"version": "3.14.0",
"timestamp": 1576783681,
......
......@@ -39,6 +39,7 @@ export const CODE_PUSH_TOKEN = '';
*/
export const MINDS_FEATURES = {
crypto: Platform.OS === 'ios' ? false : true,
'onboarding-december-2019': true,
};
/**
......
......@@ -124,13 +124,14 @@ export default class OnboardingScreenNew extends Component {
steps.push({component: <ChannelSetupStepNew ref={r => this.channelSetup = r} onNext={this.onNext} onBack={this.onBack}/> });
}
if (!completed_items.some(r => r == 'suggested_groups')) {
steps.push({component: <SuggestedGroupsStepNew onNext={this.onNext} onBack={this.onBack}/>});
}
if (!completed_items.some(r => r == 'suggested_channels')) {
steps.push({component: <SuggestedChannelsStepNew onNext={this.onNext} onBack={this.onBack}/>});
}
// TODO: enable group and channel selectors
// if (!completed_items.some(r => r == 'suggested_groups')) {
// steps.push({component: <SuggestedGroupsStepNew onNext={this.onNext} onBack={this.onBack}/>});
// }
// if (!completed_items.some(r => r == 'suggested_channels')) {
// steps.push({component: <SuggestedChannelsStepNew onNext={this.onNext} onBack={this.onBack}/>});
// }
return (
<SafeAreaView style={[CS.flexContainer, CS.backgroundThemePrimary]}>
......
......@@ -39,13 +39,13 @@ class OnboardingStore {
/**
* Get progress
*/
async getProgress() {
async getProgress(navigate = true) {
logService.info('[OnboardingStore] getting onboarding progress');
let onboarding = featuresService.has('onboarding-december-2019') ? 'OnboardingScreenNew' : 'OnboardingScreen';
try {
const progress = await onboardingService.getProgress();
this.setProgress(progress);
if (progress && progress.show_onboarding) {
if (progress && progress.show_onboarding && navigate) {
NavigationService.push(onboarding);
}
return progress;
......