Fix Merge conflicts with PR 22043 #22073
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…re (#22043) * [EE] Fix Forwarding Department not working with Waiting queue feature * add waiting queue feature enabled check * Refactor * Fix forwarding of agents not working * Apply suggestions from code review Co-authored-by: Renato Becker <[email protected]> * Handle transfer api response properly on client + refactor * Avoid passing unnecessary params * Remove throw error. * Improve throw message logic. * Fix on-hold queue. Methods have been removed in another PR. * Remove all subscription from a chat placed on-hold. Co-authored-by: Renato Becker <[email protected]>
murtaza98
commented
May 19, 2021
| throw new Meteor.Error('inquiry-not-found', 'Error! No inquiry found for this room', { method: 'livechat:resumeOnHold' }); | ||
| } | ||
|
|
||
| const { servedBy: { _id: agentId, username } } = room; |
Contributor
Author
There was a problem hiding this comment.
FYI: The conflict was over here
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes (including videos or screenshots)
Issue(s)
Steps to test or reproduce
Further comments