From e1b55c45b7762362caaca5400509f1d8e9379b2f Mon Sep 17 00:00:00 2001 From: Gabriel Henriques Date: Mon, 4 Jan 2021 13:12:09 -0300 Subject: [PATCH 1/5] change return button --- ee/client/omnichannel/cannedResponses/CannedResponseAdd.js | 2 +- .../omnichannel/cannedResponses/CannedResponseDetails.js | 4 ++-- ee/client/omnichannel/cannedResponses/CannedResponseEdit.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js index 4fa64dffc3d45..e18a50e0e484c 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js @@ -30,7 +30,7 @@ const CannedResponseEdit = ({ onSave, onReturn, onClose }) => { return - + {t('New_Canned_Response')} diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js b/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js index 937d163a76183..585c86fa402f0 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Box, Margins, ButtonGroup, Button, Icon, ActionButton } from '@rocket.chat/fuselage'; +import { Box, Margins, ButtonGroup, Button, Icon } from '@rocket.chat/fuselage'; import { css } from '@rocket.chat/css-in-js'; import { useTranslation } from '../../../../client/contexts/TranslationContext'; @@ -13,7 +13,7 @@ export const CannedResponseDetails = ({ response: { shortcut, text, scope }, onE return - + !{shortcut} diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js index 71f524ac68208..107cf3891c729 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js @@ -31,7 +31,7 @@ const CannedResponseEdit = ({ response, onSave, onReturn, onClose }) => { return - + {t('Edit_Canned_Responses')} From 9aab1ed4e5a7d2f7778b46c76036858fb1aaf4fb Mon Sep 17 00:00:00 2001 From: Gabriel Henriques Date: Mon, 4 Jan 2021 14:16:53 -0300 Subject: [PATCH 2/5] Lint --- ee/client/omnichannel/cannedResponses/CannedResponseAdd.js | 2 +- ee/client/omnichannel/cannedResponses/CannedResponseEdit.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js index e18a50e0e484c..c415bb8650c0e 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ButtonGroup, Button, ActionButton } from '@rocket.chat/fuselage'; +import { ButtonGroup, Button } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useTranslation } from '../../../../client/contexts/TranslationContext'; diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js index 107cf3891c729..7208e72064086 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { ButtonGroup, Button, ActionButton } from '@rocket.chat/fuselage'; +import { ButtonGroup, Button } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useTranslation } from '../../../../client/contexts/TranslationContext'; From db1e7857b36cd457d2f3b4404703e9575c50b9e1 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 4 Jan 2021 19:49:37 -0300 Subject: [PATCH 3/5] Update CannedResponseAdd.js --- ee/client/omnichannel/cannedResponses/CannedResponseAdd.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js index c415bb8650c0e..2e36fa464a010 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseAdd.js @@ -30,7 +30,7 @@ const CannedResponseEdit = ({ onSave, onReturn, onClose }) => { return - + {t('New_Canned_Response')} From 20125142b4f91c360b98d51edb242c5521ada36e Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 4 Jan 2021 19:49:53 -0300 Subject: [PATCH 4/5] Update CannedResponseDetails.js --- ee/client/omnichannel/cannedResponses/CannedResponseDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js b/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js index 585c86fa402f0..c4f372939a267 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseDetails.js @@ -13,7 +13,7 @@ export const CannedResponseDetails = ({ response: { shortcut, text, scope }, onE return - + !{shortcut} From 07b30f94e0db2666cf31f06670e27b8cb52dcc30 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 4 Jan 2021 19:50:09 -0300 Subject: [PATCH 5/5] Update CannedResponseEdit.js --- ee/client/omnichannel/cannedResponses/CannedResponseEdit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js index 7208e72064086..ceb107f5f184a 100644 --- a/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js +++ b/ee/client/omnichannel/cannedResponses/CannedResponseEdit.js @@ -31,7 +31,7 @@ const CannedResponseEdit = ({ response, onSave, onReturn, onClose }) => { return - + {t('Edit_Canned_Responses')}