fixed minor identation issue, fixed the naming of the setting under t…

…he translations to show the description
RocketChat · Oct 3, 2023 · d090dbe · d090dbe
1 parent aff1d43
commit d090dbe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
@@ -310,8 +310,7 @@ export const useQuickActions = (): {
 	const canCloseRoom = usePermission('close-livechat-room');
 	const canCloseOthersRoom = usePermission('close-others-livechat-room');
 	const allowManualOnHoldUponAgentEngagement = useSetting('Livechat_allow_manual_on_hold_upon_agent_engagement_only');
-	const canPlaceChatOnHold = !room.onHold && room.u && manualOnHoldAllowed &&
-							   (allowManualOnHoldUponAgentEngagement ? !(room as any).lastMessage?.token : true);
+	const canPlaceChatOnHold = !room.onHold && room.u && manualOnHoldAllowed && (!allowManualOnHoldUponAgentEngagement || !(room as any).lastMessage?.token);
 	const hasPermissionButtons = (id: string): boolean => {
 		switch (id) {
 			case QuickActionsEnum.MoveQueue:

diff --git a/apps/meteor/ee/app/livechat-enterprise/server/settings.ts b/apps/meteor/ee/app/livechat-enterprise/server/settings.ts
@@ -209,7 +209,6 @@ export const createSettings = async (): Promise<void> => {
         enableQuery: { _id: 'Livechat_allow_manual_on_hold', value: true },
     });
 
-
 	await settingsRegistry.add('Livechat_auto_transfer_chat_timeout', 0, {
 		type: 'int',
 		group: 'Omnichannel',

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3052,7 +3052,7 @@
   "Livechat_Agents": "Agents",
   "Livechat_allow_manual_on_hold": "Allow agents to manually place chat On Hold",
   "Livechat_allow_manual_on_hold_upon_agent_engagement_only": "Allow agents to manually place chat On Hold, provided the agent has sent the last message",
-  "Livechat_allow_manual_on_hold__upon_agent_engagement_only_Description": "If enabled, the agent will get a new option to place a chat On Hold, provided the agent has sent the last message, otherwise Agents are able to place chats onHold irrespective",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only_Description": "If enabled, the agent will get a new option to place a chat On Hold, provided the agent has sent the last message, otherwise Agents are able to place chats onHold irrespective",
   "Livechat_AllowedDomainsList": "Livechat Allowed Domains",
   "Livechat_Appearance": "Livechat Appearance",
   "Livechat_auto_close_on_hold_chats_custom_message": "Custom message for closed chats in On Hold queue",

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2629,7 +2629,7 @@
   "Livechat_Agents": "Agentes",
   "Livechat_allow_manual_on_hold": "Permitir que agentes coloquem a conversa em espera manualmente",
   "Livechat_allow_manual_on_hold_upon_agent_engagement_only": "Permitir que agentes coloquem a conversa em espera manualmente, sempre que o agente tenha enviado a última mensagem",
-  "Livechat_allow_manual_on_hold__upon_agent_engagement_only_Description": "Se habilitado, o agente terá uma nova opção para colocar a conversa em espera, desde que o agente tenha enviado a última mensagem. Caso contrário poderá sempre colocar a conversa em espera.",
+  "Livechat_allow_manual_on_hold_upon_agent_engagement_only_Description": "Se habilitado, o agente terá uma nova opção para colocar a conversa em espera, desde que o agente tenha enviado a última mensagem. Caso contrário poderá sempre colocar a conversa em espera.",
   "Livechat_AllowedDomainsList": "Domínios permitidos em Livechat",
   "Livechat_Appearance": "Aparência do livechat",
   "Livechat_auto_close_on_hold_chats_custom_message": "Mensagem personalizada para conversas encerradas na fila em espera",