Skip to content

[FIX] Handle TypeErrors on navigationRef and draftMessage due to null properties #2232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 2 commits into from
Jul 2, 2020
Merged

[FIX] Handle TypeErrors on navigationRef and draftMessage due to null properties #2232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0a89dc
Check for null before using navigationRef and draftMessage
youssef-md Jul 1, 2020
9fded8b
Merge branch 'develop' into fix.handle-null-properties
diegolmello Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/AppContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const App = React.memo(({ root, isMasterDetail }) => {
const navTheme = navigationTheme(theme);

React.useEffect(() => {
const state = Navigation.navigationRef.current.getRootState();
const state = Navigation.navigationRef.current?.getRootState();
const currentRouteName = getActiveRouteName(state);
Navigation.routeNameRef.current = currentRouteName;
setCurrentScreen(currentRouteName);
Expand Down
2 changes: 1 addition & 1 deletion app/containers/InAppNotification/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const INAPP_NOTIFICATION_EMITTER = 'NotificationInApp';
const InAppNotification = memo(() => {
const show = (notification) => {
const { payload } = notification;
const state = Navigation.navigationRef.current.getRootState();
const state = Navigation.navigationRef.current?.getRootState();
const route = getActiveRoute(state);
if (payload.rid) {
if (route?.name === 'RoomView' && route.params?.rid === payload.rid) {
Expand Down
2 changes: 1 addition & 1 deletion app/containers/MessageBox/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class MessageBox extends Component {
console.log('Messagebox.didMount: Thread not found');
}
} else if (!sharing) {
msg = this.room.draftMessage;
msg = this.room?.draftMessage;
}
} catch (e) {
log(e);
Expand Down
2 changes: 1 addition & 1 deletion app/share.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class Root extends React.Component {
this.setState({ root: 'outside' });
}

const state = Navigation.navigationRef.current.getRootState();
const state = Navigation.navigationRef.current?.getRootState();
const currentRouteName = getActiveRouteName(state);
Navigation.routeNameRef.current = currentRouteName;
setCurrentScreen(currentRouteName);
Expand Down