diff --git a/app/javascript/gabsocial/actions/compose.js b/app/javascript/gabsocial/actions/compose.js index 74a94f8c..f476da49 100644 --- a/app/javascript/gabsocial/actions/compose.js +++ b/app/javascript/gabsocial/actions/compose.js @@ -100,12 +100,7 @@ export function changeCompose(text, markdown, replyId, isStandalone, caretPositi dispatch({ type: COMPOSE_REPLY, status: status, - }) - dispatch({ - type: COMPOSE_CHANGE, text: text, - markdown: markdown, - caretPosition: caretPosition, }) } else if (existingText.length > 0 && text.trim().length > 0) { dispatch(openModal('CONFIRM', { diff --git a/app/javascript/gabsocial/reducers/compose.js b/app/javascript/gabsocial/reducers/compose.js index 04ba1966..f7b05035 100644 --- a/app/javascript/gabsocial/reducers/compose.js +++ b/app/javascript/gabsocial/reducers/compose.js @@ -264,7 +264,6 @@ export default function compose(state = initialState, action) { return state.withMutations(map => { map.set('in_reply_to', action.status.get('id')); map.set('quote_of_id', null); - map.set('text', statusToTextMentions(state, action.status)); map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy'))); map.set('focusDate', new Date()); map.set('caretPosition', null); @@ -272,6 +271,11 @@ export default function compose(state = initialState, action) { map.set('idempotencyKey', uuid()); map.set('spoiler', false); map.set('spoiler_text', ''); + if (action.text) { + map.set('text', `${statusToTextMentions(state, action.status)}${action.text}`); + } else { + map.set('text', statusToTextMentions(state, action.status)); + } }); case COMPOSE_QUOTE: return state.withMutations(map => {