1 files changed, 16 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
index 614ed1a89..cf5345078 100644
--- a/app/assets/javascripts/components/actions/compose.jsx
+++ b/app/assets/javascripts/components/actions/compose.jsx
@@ -5,6 +5,8 @@ export const COMPOSE_SUBMIT         = 'COMPOSE_SUBMIT';
 export const COMPOSE_SUBMIT_REQUEST = 'COMPOSE_SUBMIT_REQUEST';
 export const COMPOSE_SUBMIT_SUCCESS = 'COMPOSE_SUBMIT_SUCCESS';
 export const COMPOSE_SUBMIT_FAIL    = 'COMPOSE_SUBMIT_FAIL';
+export const COMPOSE_REPLY          = 'COMPOSE_REPLY';
+export const COMPOSE_REPLY_CANCEL   = 'COMPOSE_REPLY_CANCEL';
 
 export function changeCompose(text) {
   return {
@@ -13,13 +15,26 @@ export function changeCompose(text) {
   };
 }
 
+export function replyCompose(payload) {
+  return {
+    type: COMPOSE_REPLY,
+    payload: payload
+  };
+}
+
+export function cancelReplyCompose() {
+  return {
+    type: COMPOSE_REPLY_CANCEL
+  };
+}
+
 export function submitCompose() {
   return function (dispatch, getState) {
     dispatch(submitComposeRequest());
 
     api(getState).post('/api/statuses', {
       status: getState().getIn(['compose', 'text'], ''),
-      in_reply_to_id: getState().getIn(['compose', 'in_reply_to_id'], null)
+      in_reply_to_id: getState().getIn(['compose', 'in_reply_to', 'id'], null)
     }).then(function (response) {
       dispatch(submitComposeSuccess(response.data));
     }).catch(function (error) {