diff --git a/frontend/app/components/Session_/Player/Controls/Controls.js b/frontend/app/components/Session_/Player/Controls/Controls.js
index 04f8c03cc..0c0eb28e2 100644
--- a/frontend/app/components/Session_/Player/Controls/Controls.js
+++ b/frontend/app/components/Session_/Player/Controls/Controls.js
@@ -366,6 +366,7 @@ export default class Controls extends React.Component {
{ !live &&
}
+ {/* ! TEMP DISABLED !
{!live && (
- )}
+ )} */}
toggleBottomTools(CONSOLE) }
diff --git a/frontend/app/components/shared/SharePopup/SessionCopyLink/SessionCopyLink.tsx b/frontend/app/components/shared/SharePopup/SessionCopyLink/SessionCopyLink.tsx
index 296b411ab..21445a788 100644
--- a/frontend/app/components/shared/SharePopup/SessionCopyLink/SessionCopyLink.tsx
+++ b/frontend/app/components/shared/SharePopup/SessionCopyLink/SessionCopyLink.tsx
@@ -20,12 +20,12 @@ function SessionCopyLink({ content = '', time }: Props) {
return (
-
- { copied &&
Copied to Clipboard
}
+
+ { copied &&
Copied
}
)
}
export default connectPlayer(state => ({
time: state.time,
-}))(SessionCopyLink);
\ No newline at end of file
+}))(SessionCopyLink);
diff --git a/frontend/app/components/shared/SharePopup/SharePopup.js b/frontend/app/components/shared/SharePopup/SharePopup.js
index 609c5dcf1..2e253f1eb 100644
--- a/frontend/app/components/shared/SharePopup/SharePopup.js
+++ b/frontend/app/components/shared/SharePopup/SharePopup.js
@@ -2,7 +2,7 @@ import React from 'react';
import { connect } from 'react-redux';
import { toast } from 'react-toastify';
import withRequest from 'HOCs/withRequest';
-import { Popup, Icon } from 'UI';
+import { Popup, Dropdown, Icon, Button } from 'UI';
import { pause } from 'Player';
import styles from './sharePopup.module.css';
import IntegrateSlackButton from '../IntegrateSlackButton/IntegrateSlackButton';
@@ -15,7 +15,7 @@ import { Tooltip } from 'react-tippy';
tenantId: state.getIn([ 'user', 'account', 'tenantId' ]),
}))
@withRequest({
- endpoint: ({ id, entity }, integrationId) =>
+ endpoint: ({ id, entity }, integrationId) =>
`/integrations/slack/notify/${ integrationId }/${entity}/${ id }`,
method: "POST",
})
@@ -38,12 +38,12 @@ export default class SharePopup extends React.PureComponent {
}, 100)
}
- handleClose = () => {
+ handleClose = () => {
this.setState({ isOpen: false, comment: '' });
}
handleSuccess = () => {
- toast.success('Your comment is shared.');
+ toast.success('Sent to Slack.');
this.handleClose();
}
@@ -60,10 +60,10 @@ export default class SharePopup extends React.PureComponent {
interactive
// onOpen={ this.handleOpen }
// onClose={ this.handleClose }
- content={
+ content={
-
{ 'Comment' }
+
Share this session link to Slack
{ options.length === 0 ?
<>
@@ -72,7 +72,7 @@ export default class SharePopup extends React.PureComponent {
{ showCopyLink && (
-
+
)}
>
@@ -87,32 +87,34 @@ export default class SharePopup extends React.PureComponent {
resize="none"
onChange={ this.editMessage }
value={ comment }
- placeholder="Type here..."
+ placeholder="Add Message (Optional)"
className="p-4"
/>
-
+
+
+ { loading ? 'Sending...' : 'Send' }
+
+
-
+
-
+
}
diff --git a/frontend/app/components/shared/SharePopup/sharePopup.module.css b/frontend/app/components/shared/SharePopup/sharePopup.module.css
index c28285457..706eba808 100644
--- a/frontend/app/components/shared/SharePopup/sharePopup.module.css
+++ b/frontend/app/components/shared/SharePopup/sharePopup.module.css
@@ -85,14 +85,13 @@ $iconsize: 30px;
.shareButton {
display: flex;
align-items: center;
- box-shadow: 0px 1px 3px 0 $gray-light;
border: solid thin transparent;
padding: 10px 15px;
border-radius: 3px;
cursor: pointer;
- color: $teal;
+ background: $main;
+ color: white;
&:hover {
- background-color: $active-blue;
- border-color: $active-blue-border;
+ box-shadow: 0px 1px 3px 0 $gray-light;
}
-}
\ No newline at end of file
+}
diff --git a/frontend/app/svg/icons/integrations/slack-bw.svg b/frontend/app/svg/icons/integrations/slack-bw.svg
new file mode 100644
index 000000000..a486d5d96
--- /dev/null
+++ b/frontend/app/svg/icons/integrations/slack-bw.svg
@@ -0,0 +1,3 @@
+