Skip to content

[FIX] Status text not being updated on sidebar #3041

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 4 commits into from
Apr 7, 2021
Merged

[FIX] Status text not being updated on sidebar #3041

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c4eb6c
Update StatusView.js
gerzonc Apr 7, 2021
76d80c6
Minor tweak
gerzonc Apr 7, 2021
6fb83ea
Minor tweaks
gerzonc Apr 7, 2021
cf83769
Merge branch 'develop' into fix.status-not-shown
diegolmello Apr 7, 2021
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
19 changes: 12 additions & 7 deletions app/views/StatusView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import { LISTENER } from '../containers/Toast';
import { withTheme } from '../theme';
import { getUserSelector } from '../selectors/login';
import * as HeaderButton from '../containers/HeaderButton';
import store from '../lib/createStore';
import { setUser } from '../actions/login';
import { setUser as setUserAction } from '../actions/login';
import SafeAreaView from '../containers/SafeAreaView';

const STATUS = [{
Expand Down Expand Up @@ -58,7 +57,8 @@ class StatusView extends React.Component {
}),
theme: PropTypes.string,
navigation: PropTypes.object,
isMasterDetail: PropTypes.bool
isMasterDetail: PropTypes.bool,
setUser: PropTypes.func
}

constructor(props) {
Expand Down Expand Up @@ -103,14 +103,15 @@ class StatusView extends React.Component {

setCustomStatus = async() => {
const { statusText } = this.state;
const { user } = this.props;
const { user, setUser } = this.props;

this.setState({ loading: true });

try {
const result = await RocketChat.setUserStatus(user.status, statusText);
if (result.success) {
logEvent(events.STATUS_CUSTOM);
setUser({ statusText });
EventEmitter.emit(LISTENER, { message: I18n.t('Status_saved_successfully') });
} else {
logEvent(events.STATUS_CUSTOM_F);
Expand Down Expand Up @@ -154,7 +155,7 @@ class StatusView extends React.Component {

renderItem = ({ item }) => {
const { statusText } = this.state;
const { user } = this.props;
const { user, setUser } = this.props;
const { id, name } = item;
return (
<List.Item
Expand All @@ -165,7 +166,7 @@ class StatusView extends React.Component {
try {
const result = await RocketChat.setUserStatus(item.id, statusText);
if (result.success) {
store.dispatch(setUser({ status: item.id }));
setUser({ status: item.id });
}
} catch (e) {
logEvent(events.SET_STATUS_FAIL);
Expand Down Expand Up @@ -202,4 +203,8 @@ const mapStateToProps = state => ({
isMasterDetail: state.app.isMasterDetail
});

export default connect(mapStateToProps)(withTheme(StatusView));
const mapDispatchToProps = dispatch => ({
setUser: user => dispatch(setUserAction(user))
});

export default connect(mapStateToProps, mapDispatchToProps)(withTheme(StatusView));