From a06e54bd78a1da6e0556adf7f43c3a8d3608e52a Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Tue, 8 Sep 2020 11:08:17 +0700 Subject: [PATCH] renamed messagesSetMessages to messagesSet --- src/redux/auth/sagas.ts | 4 ++-- src/redux/messages/actions.ts | 2 +- src/redux/messages/handlers.ts | 4 ++-- src/redux/messages/sagas.ts | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/redux/auth/sagas.ts b/src/redux/auth/sagas.ts index 7e4d4da1..89c75b15 100644 --- a/src/redux/auth/sagas.ts +++ b/src/redux/auth/sagas.ts @@ -57,7 +57,7 @@ import { selectModal } from '~/redux/modal/selectors'; import { IModalState } from '~/redux/modal'; import { DIALOGS } from '~/redux/modal/constants'; import { ERRORS } from '~/constants/errors'; -import { messagesSetMessages } from '~/redux/messages/actions'; +import { messagesSet } from '~/redux/messages/actions'; export function* reqWrapper(requestAction, props = {}): ReturnType { const access = yield select(selectToken); @@ -155,7 +155,7 @@ function* loadProfile({ username }: ReturnType) { } yield put(authSetProfile({ is_loading: false, user })); - yield put(messagesSetMessages({ messages: [] })); + yield put(messagesSet({ messages: [] })); return true; } diff --git a/src/redux/messages/actions.ts b/src/redux/messages/actions.ts index 471d68aa..1679d571 100644 --- a/src/redux/messages/actions.ts +++ b/src/redux/messages/actions.ts @@ -18,7 +18,7 @@ export const messagesDeleteMessage = (id: IMessage['id']) => ({ id, }); -export const messagesSetMessages = (messages: Partial) => ({ +export const messagesSet = (messages: Partial) => ({ type: MESSAGES_ACTIONS.SET_MESSAGES, messages, }); diff --git a/src/redux/messages/handlers.ts b/src/redux/messages/handlers.ts index c97e2802..3730e564 100644 --- a/src/redux/messages/handlers.ts +++ b/src/redux/messages/handlers.ts @@ -1,10 +1,10 @@ import { MESSAGES_ACTIONS } from '~/redux/messages/constants'; import { IMessagesState } from '~/redux/messages'; -import { messagesSetMessages } from '~/redux/messages/actions'; +import { messagesSet } from '~/redux/messages/actions'; const setMessages = ( state: IMessagesState, - { messages }: ReturnType + { messages }: ReturnType ): IMessagesState => ({ ...state, ...messages, diff --git a/src/redux/messages/sagas.ts b/src/redux/messages/sagas.ts index 03e188d4..4cc9b5d8 100644 --- a/src/redux/messages/sagas.ts +++ b/src/redux/messages/sagas.ts @@ -5,7 +5,7 @@ import { apiAuthGetUserMessages, apiAuthSendMessage } from '~/redux/auth/api'; import { ERRORS } from '~/constants/errors'; import { IMessageNotification } from '~/redux/types'; import { reqWrapper } from '~/redux/auth/sagas'; -import { messagesGetMessages, messagesSendMessage, messagesSetMessages, } from '~/redux/messages/actions'; +import { messagesGetMessages, messagesSendMessage, messagesSet } from '~/redux/messages/actions'; import { MESSAGES_ACTIONS } from '~/redux/messages/constants'; import { selectMessages } from '~/redux/messages/selectors'; @@ -13,7 +13,7 @@ function* getMessages({ username }: ReturnType) { const { messages }: ReturnType = yield select(selectMessages); yield put( - messagesSetMessages({ + messagesSet({ is_loading_messages: true, messages: messages && @@ -28,14 +28,14 @@ function* getMessages({ username }: ReturnType) { if (error || !data.messages) { return yield put( - messagesSetMessages({ + messagesSet({ is_loading_messages: false, messages_error: ERRORS.EMPTY_RESPONSE, }) ); } - yield put(messagesSetMessages({ is_loading_messages: false, messages: data.messages })); + yield put(messagesSet({ is_loading_messages: false, messages: data.messages })); const { notifications } = yield select(selectAuthUpdates); @@ -58,7 +58,7 @@ function* sendMessage({ message, onSuccess }: ReturnType = yield select(selectAuthProfile); if (user.username !== username) { - return yield put(messagesSetMessages({ is_sending_messages: false })); + return yield put(messagesSet({ is_sending_messages: false })); } const { messages }: ReturnType = yield select(selectMessages); yield put( - messagesSetMessages({ + messagesSet({ is_sending_messages: false, messages: [data.message, ...messages], })