Commit 85ea636d authored by Martin Santangelo's avatar Martin Santangelo Committed by Brian Hatchet
Browse files

Fix onboarding issues in suggested channels and initial registering

parent 6b8e81c2

src/onboarding/OnboardingScreen.js

+4 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ import WelcomeStep from './steps/WelcomeStep'; 
import { CommonStyle as CS } from '../styles/Common';

import { CommonStyle as CS } from '../styles/Common';

import navigationService from '../navigation/NavigationService';

import navigationService from '../navigation/NavigationService';

import i18nService from '../common/services/i18n.service';

import i18nService from '../common/services/i18n.service';

import CenteredLoading from '../common/components/CenteredLoading';





@observer

@observer

@inject('onboarding', 'hashtag')

@inject('onboarding', 'hashtag')
@@ -59,6 +60,9 @@ export default class OnboardingScreen extends Component { 




  render() {

  render() {

    const steps = [];

    const steps = [];

    if (!this.props.onboarding.progress) {

      return <CenteredLoading/>

    }

    const completed_items = this.props.onboarding.progress.completed_items;

    const completed_items = this.props.onboarding.progress.completed_items;





    // if (!completed_items.some(r => r == 'creator_frequency')) {

    // if (!completed_items.some(r => r == 'creator_frequency')) {

src/onboarding/OnboardingService.js

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ class OnboardingService { 
   * Get suggested users

   * Get suggested users

   */

   */

  getSuggestedUsers() {

  getSuggestedUsers() {

    return api.get('api/v2/suggestions', {limit: 12});

    return api.get('api/v2/suggestions/user', {limit: 12});

  }

  }

}

}

src/onboarding/OnboardingStore.js

+8 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,14 @@ class OnboardingStore { 
  }

  }





  async getSuggestedUsers() {

  async getSuggestedUsers() {

    try {

      const users = await onboardingService.getSuggestedUsers();

      const users = await onboardingService.getSuggestedUsers();

    if (users.suggestions) this.suggestedUsers.list.setList({entities: users.suggestions.map(r => UserModel.create(r.entity))});

      if (users.suggestions) {

        this.suggestedUsers.list.setList({entities: users.suggestions.map(r => UserModel.create(r.entity))});

      }

    } catch (err) {

      console.log(err);

    }

  }

  }





  /**

  /**

src/onboarding/steps/SuggestedChannelsStep.js

+2 −3
Original line number Original line Diff line number Diff line
@@ -17,15 +17,14 @@ import i18n from '../../common/services/i18n.service'; 
@observer

@observer

export default class SuggestedChannelsStep extends Component {

export default class SuggestedChannelsStep extends Component {





  componentWillMount() {

  componentDidMount() {

    this.props.onboarding.suggestedUsers.list.clearList();

    this.props.onboarding.suggestedUsers.list.clearList();

    this.props.onboarding.getSuggestedUsers();

    this.props.onboarding.getSuggestedUsers();

  }

  }





  renderUser = (user) => {

  renderUser = (user) => {

    return <DiscoveryUser

    return <DiscoveryUser

      store={this.props.onboarding.suggestedUsers}

      row={{item: user}}

      entity={{item: user}}

      key={user.guid}

      key={user.guid}

    />

    />

  }

  }