Merge branch 'rmp-v2' into v6.1-rc

app/views/messaging/Messaging.js

@@ -75,14 +75,15 @@ export class Messaging extends Component {
 	}
 
 	render() {
-		// this will clear the notifications badge when the user is on this screen
-		/*if (this.props.navigation.isFocused()) {
-			this.props.setLatestTimeStamp(new Date().getTime())
-		}*/
-		const { messages, nextTimestamp } = this.props.messages
+		const { messages, nextTimestamp, unreadMessages } = this.props.messages
 		const { updateMessages } = this.props
 		const filteredData = checkData(messages)
 
+		// this will clear the notifications badge when the user is on this screen
+		if (this.props.navigation.isFocused() && unreadMessages) {
+			this.props.setLatestTimeStamp(new Date().getTime())
+		}
+
 		let isLoading = false
 		if (this.props.myMessagesStatus) isLoading = true
 
@@ -135,6 +136,7 @@ const mapStateToProps = (state, props) => (
 		messages: state.messages,
 		myMessagesStatus: state.requestStatuses.GET_MESSAGES,
 		myMessagesError: state.requestErrors.GET_MESSAGES,
+		unreadMessages: state.unreadMessages
 	}
 )