Fix issues with sending direct messages from user profile (#6999)
* Clear compose textarea when starting a new direct message Previous behaviour resulted in potentially misdirected direct messages. * Hide search when starting to compose a direct message
This commit is contained in:
parent
3f51c6efaa
commit
4fd71accd4
|
@ -265,7 +265,7 @@ export default function compose(state = initialState, action) {
|
|||
.set('idempotencyKey', uuid());
|
||||
case COMPOSE_DIRECT:
|
||||
return state
|
||||
.update('text', text => `${text}@${action.account.get('acct')} `)
|
||||
.update('text', text => `@${action.account.get('acct')} `)
|
||||
.set('privacy', 'direct')
|
||||
.set('focusDate', new Date())
|
||||
.set('idempotencyKey', uuid());
|
||||
|
|
|
@ -4,7 +4,11 @@ import {
|
|||
SEARCH_FETCH_SUCCESS,
|
||||
SEARCH_SHOW,
|
||||
} from '../actions/search';
|
||||
import { COMPOSE_MENTION, COMPOSE_REPLY } from '../actions/compose';
|
||||
import {
|
||||
COMPOSE_MENTION,
|
||||
COMPOSE_REPLY,
|
||||
COMPOSE_DIRECT,
|
||||
} from '../actions/compose';
|
||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||
|
||||
const initialState = ImmutableMap({
|
||||
|
@ -29,6 +33,7 @@ export default function search(state = initialState, action) {
|
|||
return state.set('hidden', false);
|
||||
case COMPOSE_REPLY:
|
||||
case COMPOSE_MENTION:
|
||||
case COMPOSE_DIRECT:
|
||||
return state.set('hidden', true);
|
||||
case SEARCH_FETCH_SUCCESS:
|
||||
return state.set('results', ImmutableMap({
|
||||
|
|
Loading…
Reference in a new issue