Skip to content

Commit

Permalink
[EE] Improve Forwarding Department behaviour with Waiting queue featu…
Browse files Browse the repository at this point in the history
…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 <renato.augusto.becker@gmail.com>

* 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 <renato.augusto.becker@gmail.com>
  • Loading branch information
2 people authored and murtaza98 committed May 19, 2021
1 parent 09e46c3 commit 00415ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions client/components/GenericModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Button, ButtonGroup, Icon, Modal, ButtonProps } from '@rocket.chat/fuselage';
import React, { FC } from 'react';
import { Box, Button, ButtonGroup, Icon, Modal } from '@rocket.chat/fuselage';
import React, { FC, ComponentProps } from 'react';

import { useTranslation } from '../contexts/TranslationContext';
import { withDoNotAskAgain, RequiredModalProps } from './withDoNotAskAgain';
Expand All @@ -24,7 +24,7 @@ const iconMap = {
success: 'check',
};

const getButtonProps = (variant: VariantType): ButtonProps => {
const getButtonProps = (variant: VariantType): ComponentProps<typeof Button> => {
switch (variant) {
case 'danger':
return { primary: true, danger: true };
Expand Down
6 changes: 3 additions & 3 deletions client/components/Page/PageScrollableContent.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Box, ScrollableProps } from '@rocket.chat/fuselage';
import React, { forwardRef } from 'react';
import { Box, Scrollable } from '@rocket.chat/fuselage';
import React, { forwardRef, ComponentProps } from 'react';

import ScrollableContentWrapper, { CustomScrollbarsProps } from '../ScrollableContentWrapper';

type PageScrollableContentProps = {
onScrollContent?: ScrollableProps['onScrollContent'];
onScrollContent?: ComponentProps<typeof Scrollable>['onScrollContent'];
};

const PageScrollableContent = forwardRef<HTMLElement, PageScrollableContentProps>(
Expand Down

0 comments on commit 00415ab

Please sign in to comment.