Push notifications

app/lib/createStore.js

@@ -7,7 +7,6 @@ import reducers from '../reducers';
 import sagas from '../sagas';
 
 const createStore = __DEV__ ? Reactotron.createStore : reduxCreateStore;
-// const createStore = reduxCreateStore;
 let sagaMiddleware;
 let enhancers;
 

app/lib/rocketchat.js

@@ -175,8 +175,8 @@ const RocketChat = {
 			this.ddp.on('disconnected', () => console.log('disconnected'));
 
 			this.ddp.on('logged', protectedFunction((user) => {
-				this.getRooms().catch(e => log('logged getRooms', e));
 				this.loginSuccess(user);
+				this.getRooms().catch(e => log('logged getRooms', e));
 			}));
 			this.ddp.once('logged', protectedFunction(({ id }) => {
 				this.subscribeRooms(id);

app/push.js

@@ -1,16 +1,19 @@
 import PushNotification from 'react-native-push-notification';
 import { AsyncStorage } from 'react-native';
 import EJSON from 'ejson';
-import { goRoom } from './containers/routes/NavigationService';
+
+import { NavigationActions } from './Navigation';
 
 const handleNotification = (notification) => {
-	if (!notification.userInteraction) {
-		return;
+	if (notification.userInteraction) {
+		const {
+			rid, name, sender, type
+		} = EJSON.parse(notification.ejson || notification.data.ejson);
+		NavigationActions.push({
+			screen: 'RoomView',
+			passProps: { rid, name: type === 'd' ? sender.username : name }
+		});
 	}
-	const {
-		rid, name, sender, type
-	} = EJSON.parse(notification.ejson || notification.data.ejson);
-	return rid && goRoom({ rid, name: type === 'd' ? sender.username : name });
 };
 PushNotification.configure({
 

app/views/ForgotPasswordView.js

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Text, View, SafeAreaView, ScrollView } from 'react-native';
 import { connect } from 'react-redux';
-import { Navigation } from 'react-native-navigation';
 
 import LoggedView from './View';
 import { forgotPasswordInit, forgotPasswordRequest } from '../actions/login';

index.android.js

@@ -0,0 +1,9 @@
+import 'babel-polyfill';
+import 'regenerator-runtime/runtime';
+
+import './app/ReactotronConfig';
+import './app/push';
+
+const { start } = require('./app/index');
+
+start();

index.js

@@ -1,16 +1,9 @@
 import 'babel-polyfill';
 import 'regenerator-runtime/runtime';
-// import { AppRegistry, UIManager } from 'react-native';
 
 import './app/ReactotronConfig';
-// import './app/push';
-// import RocketChat from './app/index';
+import './app/push';
 
-// UIManager.setLayoutAnimationEnabledExperimental(true);
-
-// AppRegistry.registerComponent('RocketChatRN', () => RocketChat);
-
-// require('./playground/index');
 const { start } = require('./app/index');
 
 start();