diff --git a/apps/meteor/client/views/blocks/ModalBlock.js b/apps/meteor/client/views/blocks/ModalBlock.js index 2be3ec19f78..ee25133c023 100644 --- a/apps/meteor/client/views/blocks/ModalBlock.js +++ b/apps/meteor/client/views/blocks/ModalBlock.js @@ -4,6 +4,7 @@ import { UiKitComponent, UiKitModal, modalParser } from '@rocket.chat/fuselage-u import React, { useCallback, useEffect, useMemo, useRef } from 'react'; import { getURL } from '../../../app/utils/lib/getURL'; +import { getButtonStyle } from './getButtonStyle'; import './textParsers'; const focusableElementsString = ` @@ -144,9 +145,13 @@ function ModalBlock({ view, errors, appId, onSubmit, onClose, onCancel }) { - {view.close && } + {view.close && ( + + )} {view.submit && ( - )} diff --git a/apps/meteor/client/views/blocks/getButtonStyle.ts b/apps/meteor/client/views/blocks/getButtonStyle.ts new file mode 100644 index 00000000000..ce98fda0305 --- /dev/null +++ b/apps/meteor/client/views/blocks/getButtonStyle.ts @@ -0,0 +1,5 @@ +import type { IUIKitSurface } from '@rocket.chat/apps-engine/definition/uikit'; + +export const getButtonStyle = (view: IUIKitSurface): { danger: boolean } | { primary: boolean } => { + return view.submit?.style === 'danger' ? { danger: true } : { primary: true }; +}; diff --git a/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx b/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx index 26f9903583c..bf1fcc37c4c 100644 --- a/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx +++ b/apps/meteor/client/views/room/contextualBar/Apps/Apps.tsx @@ -7,6 +7,7 @@ import React from 'react'; import { getURL } from '../../../../../app/utils/lib/getURL'; import VerticalBar from '../../../../components/VerticalBar'; import { modalParser } from '../../../blocks/ModalBlock'; +import { getButtonStyle } from '../../../blocks/getButtonStyle'; type AppsProps = { view: IUIKitSurface; @@ -30,9 +31,13 @@ const Apps = ({ view, onSubmit, onClose, onCancel, appId }: AppsProps): JSX.Elem - {view.close && } + {view.close && ( + + )} {view.submit && ( - )}