diff --git a/app/containers/ThreadDetails.tsx b/app/containers/ThreadDetails.tsx index 76a9f23e1..fd49c2846 100644 --- a/app/containers/ThreadDetails.tsx +++ b/app/containers/ThreadDetails.tsx @@ -93,21 +93,12 @@ const ThreadDetails = ({ item, user, badgeColor, toggleFollowThread, thread, tim - {thread ? ( - - - - {replies} - - - ) : ( - - - - {time} - - - )} + + + + {thread ? replies : time} + + {thread ? ( diff --git a/app/views/RoomActionsView/index.js b/app/views/RoomActionsView/index.js index c1abcb1ca..5d085d850 100644 --- a/app/views/RoomActionsView/index.js +++ b/app/views/RoomActionsView/index.js @@ -74,7 +74,6 @@ class RoomActionsView extends React.Component { const member = props.route.params?.member; this.rid = props.route.params?.rid; this.t = props.route.params?.t; - this.navToRoomInfo = props.route.params?.navToRoomInfo; this.state = { room: room || { rid: this.rid, t: this.t }, membersCount: 0, diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index 2aa61e504..2b5ff0bc5 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -439,12 +439,19 @@ class RoomView extends React.Component { navigation.navigate('ModalStackNavigator', { screen: screen ?? 'RoomActionsView', params: { - rid: this.rid, t: this.t, room, member, showCloseModal: !!screen, navToRoomInfo: navParam => this.navToRoomInfo(navParam) + rid: this.rid, + t: this.t, + room, + member, + showCloseModal: !!screen } }); } else { navigation.push('RoomActionsView', { - rid: this.rid, t: this.t, room, member, navToRoomInfo: navParam => this.navToRoomInfo(navParam) + rid: this.rid, + t: this.t, + room, + member }); } };