Skip to content

[FIX] Read receipts on tablet #2297

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 7 commits into from
Jul 17, 2020
Merged

[FIX] Read receipts on tablet #2297

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c138b07
fixes not working read receipts on tablet (#2295)
phriedrich Jul 16, 2020
4c91a59
fixing last commit it to make it work on both tablet and phone
phriedrich Jul 16, 2020
c89760e
Merge branch 'develop' into read_receipts_tablet_fix
djorkaeffalexandre Jul 17, 2020
2df6e2c
fix missing close button on tablet's modal view
phriedrich Jul 17, 2020
844ffe2
Update app/views/ReadReceiptView/index.js
djorkaeffalexandre Jul 17, 2020
132f5a8
remove unnecessary param
djorkaeffalexandre Jul 17, 2020
13e61d1
Merge branch 'develop' into read_receipts_tablet_fix
diegolmello Jul 17, 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
9 changes: 8 additions & 1 deletion app/containers/MessageActions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,14 @@ const MessageActions = React.memo(forwardRef(({
hideActionSheet();
};

const handleReadReceipt = message => Navigation.navigate('ReadReceiptsView', { messageId: message.id });
const handleReadReceipt = (message) => {
if (isMasterDetail) {
const params = { messageId: message.id, showCloseModal: true };
Navigation.navigate('ModalStackNavigator', { screen: 'ReadReceiptsView', params });
} else {
Navigation.navigate('ReadReceiptsView', { messageId: message.id });
}
};

const handleToggleTranslation = async(message) => {
try {
Expand Down
2 changes: 1 addition & 1 deletion app/stacks/MasterDetailStack/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ const ModalStackNavigator = React.memo(({ navigation }) => {
<ModalStack.Screen
name='ReadReceiptsView'
component={ReadReceiptsView}
options={ReadReceiptsView.navigationOptions}
options={props => ReadReceiptsView.navigationOptions({ ...props, isMasterDetail: true })}
/>
<ModalStack.Screen
name='SettingsView'
Expand Down
11 changes: 9 additions & 2 deletions app/views/ReadReceiptView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { connect } from 'react-redux';
import Avatar from '../../containers/Avatar';
import styles from './styles';
import ActivityIndicator from '../../containers/ActivityIndicator';
import { CloseModalButton } from '../../containers/HeaderButton';
import I18n from '../../i18n';
import RocketChat from '../../lib/rocketchat';
import StatusBar from '../../containers/StatusBar';
Expand All @@ -17,8 +18,14 @@ import { getUserSelector } from '../../selectors/login';
import SafeAreaView from '../../containers/SafeAreaView';

class ReadReceiptView extends React.Component {
static navigationOptions = {
title: I18n.t('Read_Receipt')
static navigationOptions = ({ navigation, isMasterDetail }) => {
const options = {
title: I18n.t('Read_Receipt')
};
if (isMasterDetail) {
options.headerLeft = () => <CloseModalButton navigation={navigation} testID='readreceipt-view-close' />;
Comment thread
djorkaeffalexandre marked this conversation as resolved.
Outdated
}
return options;
}

static propTypes = {
Expand Down