From 6b5b01ab51159cce1f85b5a4eb84d4f875405d09 Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Thu, 23 Jun 2022 07:59:20 -0600
Subject: [PATCH] [FIX] Sort by scope or creation date not working on canned
 responses list (#25475)

<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->

<!-- Your Pull Request name should start with one of the following tags
  [NEW] For new features
  [IMPROVE] For an improvement (performance or little improvements) in existing features
  [FIX] For bug fixes that affect the end-user
  [BREAK] For pull requests including breaking changes
  Chore: For small tasks
  Doc: For documentation
-->

<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
  - I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
  - I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
  - Lint and unit tests pass locally with my changes
  - I have added tests that prove my fix is effective or that my feature works (if applicable)
  - I have added necessary documentation (if applicable)
  - Any dependent changes have been merged and published in downstream modules
-->

## Proposed changes (including videos or screenshots)
<!-- CHANGELOG -->
<!--
  Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
  If it fixes a bug or resolves a feature request, be sure to link to that issue below.
  This description will appear in the release notes if we accept the contribution.
-->

<!-- END CHANGELOG -->

## Issue(s)
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->

## Steps to test or reproduce
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->

## Further comments
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
---
 .../omnichannel/cannedResponses/CannedResponsesRoute.tsx    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
index b0176783716f..e029c5367795 100644
--- a/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
+++ b/apps/meteor/ee/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
@@ -120,7 +120,7 @@ const CannedResponsesRoute: FC = () => {
 				>
 					{t('Shortcut')}
 				</GenericTable.HeaderCell>,
-				<GenericTable.HeaderCell key={'sharing'} direction={sort[1]} active={sort[0] === 'sharing'} onClick={onHeaderClick} sort='sharing'>
+				<GenericTable.HeaderCell key={'sharing'} direction={sort[1]} active={sort[0] === 'scope'} onClick={onHeaderClick} sort='scope'>
 					{t('Sharing')}
 				</GenericTable.HeaderCell>,
 				<GenericTable.HeaderCell
@@ -135,9 +135,9 @@ const CannedResponsesRoute: FC = () => {
 				<GenericTable.HeaderCell
 					key={'createdAt'}
 					direction={sort[1]}
-					active={sort[0] === 'createdAt'}
+					active={sort[0] === '_createdAt'}
 					onClick={onHeaderClick}
-					sort='createdAt'
+					sort='_createdAt'
 				>
 					{t('Created_at')}
 				</GenericTable.HeaderCell>,