From 136d890b1f3989731f39e77c93c93798169c4f1a Mon Sep 17 00:00:00 2001 From: JelianRadoev Date: Tue, 2 Jul 2019 16:25:48 +0300 Subject: [PATCH 1/5] NY-7639 Add a share via e-mail --- src/assets/languages/Modals/ShareModal.en.json | 4 +++- src/componets/Modals/ShareModal/ShareModal.js | 7 +++++-- src/componets/Modals/ShareModal/ShareModal.styles.js | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/assets/languages/Modals/ShareModal.en.json b/src/assets/languages/Modals/ShareModal.en.json index 126924e09..ff3c6ec47 100644 --- a/src/assets/languages/Modals/ShareModal.en.json +++ b/src/assets/languages/Modals/ShareModal.en.json @@ -1,4 +1,6 @@ { "close": "Close", - "share": "Share" + "share": "Share", + "mailSubject": "Share media from NYNJA Web client", + "mailBody": "" } \ No newline at end of file diff --git a/src/componets/Modals/ShareModal/ShareModal.js b/src/componets/Modals/ShareModal/ShareModal.js index 71056f53e..64727d1ee 100644 --- a/src/componets/Modals/ShareModal/ShareModal.js +++ b/src/componets/Modals/ShareModal/ShareModal.js @@ -6,8 +6,8 @@ import stylesFunc from './ShareModal.styles'; import { addTranslationForLanguage, getTranslate } from 'react-localize-redux'; import * as Translation from '../../../assets/languages/Modals/ShareModal.en.json'; import { - FacebookShareButton, FacebookIcon, TwitterShareButton, - TwitterIcon, LinkedinShareButton, LinkedinIcon + FacebookShareButton, FacebookIcon, TwitterShareButton, EmailShareButton, + TwitterIcon, LinkedinShareButton, LinkedinIcon, EmailIcon, } from 'react-share'; const styles = theme => (stylesFunc(theme)); @@ -47,6 +47,9 @@ class ShareModal extends Component { + + +
-- GitLab From 21b2454da1f5d035c17fc0784288bde261bc984f Mon Sep 17 00:00:00 2001 From: JelianRadoev Date: Tue, 2 Jul 2019 18:27:29 +0300 Subject: [PATCH 3/5] NY-7638 Keep the selection color in the storage area --- .../ChatFeaturesMenu/ChatFeaturesMenu.js | 68 +++++++++---------- .../ChatFeaturesMenu.styles.js | 5 +- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js index 0c08bae22..11a446abe 100644 --- a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js +++ b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.js @@ -14,7 +14,8 @@ class ChatFeaturesMenu extends Component { super(props); this.state = { isRightSlideExpand: false, - openContactsDialog: false + openContactsDialog: false, + storageType: null, }; } @@ -39,29 +40,33 @@ class ChatFeaturesMenu extends Component { this.setState({ openContactsDialog: true }); } - // isExtensionValid(filename) { - // const partials = filename.split('.'); - // const extension = partials.pop(); + handleStorageClick = (type) => { + const { onStorageItemClick } = this.props; - // } + this.setState({ storageType: type }); + onStorageItemClick(type); + } - render() { - // add localization - const { - classes, router, isGroup, data, expandChatFeature, onStorageItemClick, translate, isBanned - } = this.props; + handleActive = (name) => { + const { classes } = this.props; + const { storageType } = this.state; - const { openContactsDialog } = this.state; + if (storageType && storageType === name) { + return classes.activeLi; + } - const { activeDialogId } = data; + return ''; + } + render() { + const { classes, isGroup, data, expandChatFeature, translate, isBanned } = this.props; + const { openContactsDialog } = this.state; - console.log('[TEMP] data', data) - const { isRightSlideExpand } = this.state; + const { activeDialogId } = data; + const storageItemsStyle = `${classes.rightMenuItem} right-menu-btn ${expandChatFeature ? 'expanded' : ''}`; const groupCallDisabled = data && data.callData && !!data.callData.conferenceId || (!isGroup && (!this.props.data.activeDialogId || (this.props.data.activeDialogId === data.phoneId))); - return (
@@ -88,10 +93,6 @@ class ChatFeaturesMenu extends Component { {translate('shareContact')} - {/* */}
@@ -107,61 +108,60 @@ class ChatFeaturesMenu extends Component {
- {/* ----------------------- */}
diff --git a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js index 675791925..870219c33 100644 --- a/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js +++ b/src/componets/ChatFeaturesMenu/ChatFeaturesMenu.styles.js @@ -194,5 +194,8 @@ export default theme => ({ '&.show': { transform: 'translateX(-388px)' } - } + }, + activeLi: { + background: '#D00000', + }, }); -- GitLab From 37ca4e915c71781e3f5d9c007e9b1bea7a5b1efc Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Tue, 2 Jul 2019 20:26:23 +0300 Subject: [PATCH 4/5] Release notes update: 0.11.4 --- lib/releaseNotes/releaseNotes.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/releaseNotes/releaseNotes.json b/lib/releaseNotes/releaseNotes.json index 5b29d4096..14054f8ab 100644 --- a/lib/releaseNotes/releaseNotes.json +++ b/lib/releaseNotes/releaseNotes.json @@ -17,6 +17,11 @@ "Much improved download/preview file UX" ] }, + "0.11.4": { + "content": [ + "Updated the 'Next' button label on the home page" + ] + }, "0.11.3": { "content": [ "P2P calls connectivity improvements" -- GitLab From 882931717f62e495217d2e0c21de0e22f7d2669f Mon Sep 17 00:00:00 2001 From: vgashevski Date: Wed, 3 Jul 2019 13:49:09 +0300 Subject: [PATCH 5/5] Add google auth 'clientId' for production env --- src/core/configs/OAuth.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/configs/OAuth.config.js b/src/core/configs/OAuth.config.js index 05c2d7c41..03d8e8373 100644 --- a/src/core/configs/OAuth.config.js +++ b/src/core/configs/OAuth.config.js @@ -29,12 +29,12 @@ function getGoogleClientId() { } const host = location.hostname; - if (host.indexOf('dev-eu') > -1) { + if (host.indexOf('dev-eu') > -1 || host.indexOf('localhost') > -1) { return devClientId; // Nynja - Dev } else if (host.indexOf('staging') > -1) { return '356439445563-b43hv9nsggo40huimfh04eprnq4pug28.apps.googleusercontent.com'; // Nynja - Staging } else { - return devClientId; + return '188439221106-h1nesdg8asc6hmn924tm1hggvsf9t5s2.apps.googleusercontent.com'; // Nynja - Production } } -- GitLab