Skip to content

Commit 93f3be2

Browse files
committed
refactor(livechat): remove uneeded await on store.setState
1 parent fd4d58f commit 93f3be2

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

packages/livechat/src/components/FilesDropTarget/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const FilesDropTarget = ({
9393
filteredFiles = filteredFiles.slice(0, 1);
9494
}
9595

96-
filteredFiles.length && onUpload(filteredFiles);
96+
if (filteredFiles.length) onUpload(filteredFiles);
9797
};
9898

9999
return (

packages/livechat/src/lib/hooks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ const api = {
202202

203203
clearWidgetData: async () => {
204204
const { minimized, visible, undocked, expanded, businessUnit, ...initial } = initialState();
205-
await store.setState(initial);
205+
store.setState(initial);
206206
},
207207

208208
setAgent: (agent: StoreState['defaultAgent']) => {

packages/livechat/src/lib/triggerActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const sendMessageAction = async (_: string, action: ILivechatSendMessageA
3232
}
3333

3434
if (agent && '_id' in agent) {
35-
await store.setState({ agent });
35+
store.setState({ agent });
3636
parentCall('callback', 'assign-agent', normalizeAgent(agent));
3737
}
3838

@@ -98,7 +98,7 @@ export const sendMessageExternalServiceAction = async (
9898
);
9999

100100
if (agent && '_id' in agent) {
101-
await store.setState({ agent });
101+
store.setState({ agent });
102102
parentCall('callback', 'assign-agent', normalizeAgent(agent));
103103
}
104104

packages/livechat/src/lib/triggerUtils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { ILivechatAgent, ILivechatTrigger, ILivechatTriggerAction, ILivechatTriggerType, Serialized } from '@rocket.chat/core-typings';
22

33
import { Livechat } from '../api';
4+
import { processUnread } from './main';
45
import type { Agent } from '../definitions/agents';
56
import { upsert } from '../helpers/upsert';
67
import store from '../store';
7-
import { processUnread } from './main';
88

99
type AgentPromise = { username: string } | Serialized<ILivechatAgent> | null;
1010

@@ -75,7 +75,7 @@ export const getAgent = async (triggerAction: ILivechatTriggerAction): Promise<A
7575
};
7676

7777
export const upsertMessage = async (message: Record<string, unknown>) => {
78-
await store.setState({
78+
store.setState({
7979
messages: upsert(
8080
store.state.messages,
8181
message,
@@ -89,12 +89,12 @@ export const upsertMessage = async (message: Record<string, unknown>) => {
8989

9090
export const removeMessage = async (messageId: string) => {
9191
const { messages } = store.state;
92-
await store.setState({ messages: messages.filter(({ _id }) => _id !== messageId) });
92+
store.setState({ messages: messages.filter(({ _id }) => _id !== messageId) });
9393
};
9494

9595
export const removeTriggerMessage = async (messageId: string) => {
9696
const { renderedTriggers } = store.state;
97-
await store.setState({ renderedTriggers: renderedTriggers.filter(({ _id }) => _id !== messageId) });
97+
store.setState({ renderedTriggers: renderedTriggers.filter(({ _id }) => _id !== messageId) });
9898
};
9999

100100
export const hasTriggerCondition = (conditionName: ILivechatTriggerType) => (trigger: ILivechatTrigger) => {

packages/livechat/src/routes/GDPRAgreement/container.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const GDPRContainer: FunctionalComponent<{ t: TFunction }> = ({ ref, t }) => {
1111
const { config: { messages: { dataProcessingConsentText: consentText = '' } = {} } = {}, dispatch } = useContext(StoreContext);
1212

1313
const handleAgree = async () => {
14-
await dispatch({ gdpr: { accepted: true } });
14+
dispatch({ gdpr: { accepted: true } });
1515
route('/');
1616
};
1717

packages/livechat/src/routes/LeaveMessage/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const LeaveMessage: FunctionalComponent<{ path: string }> = () => {
5858
message,
5959
};
6060

61-
await dispatch({ loading: true });
61+
dispatch({ loading: true });
6262

6363
try {
6464
// TODO: Remove intersection after ts refactor of parseOfflineMessage
@@ -73,10 +73,10 @@ const LeaveMessage: FunctionalComponent<{ path: string }> = () => {
7373
const errorMessage = (error as { error: string })?.error;
7474
console.error(errorMessage);
7575
const alert = { id: createToken(), children: errorMessage, error: true, timeout: 5000 };
76-
await dispatch({ alerts: (alerts.push(alert), alerts) });
76+
dispatch({ alerts: (alerts.push(alert), alerts) });
7777
return false;
7878
} finally {
79-
await dispatch({ loading: false });
79+
dispatch({ loading: false });
8080
}
8181
};
8282

packages/livechat/src/routes/Register/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const Register: FunctionalComponent<{ path: string }> = () => {
9393

9494
try {
9595
const { visitor: user } = await Livechat.grantVisitor({ visitor: { ...fields, token } });
96-
await dispatch({
96+
dispatch({
9797
user,
9898
...(user.contactManager && { agent: user.contactManager }),
9999
} as Omit<StoreState['user'], 'ts'>);

packages/livechat/src/routes/SwitchDepartment/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ const SwitchDepartment = (_: SwitchDepartmentProps) => {
6363

6464
if (!room) {
6565
const { visitor: user } = await Livechat.grantVisitor({ visitor: { department, token } });
66-
await dispatch({
66+
dispatch({
6767
user: user as StoreState['user'],
6868
alerts: (alerts.push({ id: createToken(), children: t('department_switched'), success: true }), alerts),
6969
});
7070
route('/');
7171
return;
7272
}
7373

74-
await dispatch({ loading: true });
74+
dispatch({ loading: true });
7575
try {
7676
const { _id: rid } = room;
7777
const result = await Livechat.transferChat({ rid, department });
@@ -81,7 +81,7 @@ const SwitchDepartment = (_: SwitchDepartmentProps) => {
8181
throw t('no_available_agents_to_transfer');
8282
}
8383

84-
await dispatch({ iframe: { ...iframe, guest: { ...guest, department } }, loading: false } as Pick<StoreState, 'iframe' | 'loading'>);
84+
dispatch({ iframe: { ...iframe, guest: { ...guest, department } }, loading: false } as Pick<StoreState, 'iframe' | 'loading'>);
8585
await loadConfig();
8686

8787
await ModalManager.alert({
@@ -91,11 +91,11 @@ const SwitchDepartment = (_: SwitchDepartmentProps) => {
9191
route('/');
9292
} catch (error) {
9393
console.error(error);
94-
await dispatch({
94+
dispatch({
9595
alerts: (alerts.push({ id: createToken(), children: t('no_available_agents_to_transfer'), warning: true }), alerts),
9696
});
9797
} finally {
98-
await dispatch({ loading: false });
98+
dispatch({ loading: false });
9999
}
100100
};
101101

0 commit comments

Comments
 (0)