From bb290cd29d65ae936b4ef64eee970e6802caa988 Mon Sep 17 00:00:00 2001
From: Bheem <bheem@heftyinnovations.com>
Date: Fri, 19 Jun 2020 12:40:34 +0530
Subject: [PATCH 1/2] handle mic permission model in chat voice message

---
 src/assets/languages/en.json                      | 3 ++-
 src/containers/ChatBottomPanel/ChatBottomPanel.js | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/assets/languages/en.json b/src/assets/languages/en.json
index 88fa53ed7..2e38a5806 100644
--- a/src/assets/languages/en.json
+++ b/src/assets/languages/en.json
@@ -1164,7 +1164,8 @@
   "messageText": "Message text",
   "messageTo": "Message to:",
   "micAllowModal": {
-    "body": "To send voice messages choose \"allow microphone access\" in your browser alert window."
+    "body": "To send voice messages choose \"allow microphone access\" in your browser alert window.",
+    "bodyElectron": "To send voice messages, NYNJA need permission to use your microphone.\n Go to start, then select the Setting gear > Privacy > Microphone"
   },
   "microsoftCalendar": "Microsoft 365 outlook calendar",
   "min": "min",
diff --git a/src/containers/ChatBottomPanel/ChatBottomPanel.js b/src/containers/ChatBottomPanel/ChatBottomPanel.js
index fd4b45f31..700ad65f0 100644
--- a/src/containers/ChatBottomPanel/ChatBottomPanel.js
+++ b/src/containers/ChatBottomPanel/ChatBottomPanel.js
@@ -1115,14 +1115,14 @@ class ChatBottomPanel extends Component {
           </div>
         </div>
         <audio src={this.state.audioSrc} ref={(audio) => { this.audio = audio; }} />
-        {this.state.allowMediaOpen &&
+        {(this.state.allowMediaOpen && navigator.platform.indexOf('Win') > -1) &&
           <Modal open onClose={this.onClose} >
             <Modal.Content className={classes.allowMediaOpenImg} >
               <div style={{ float: 'left', marginRight: '20px' }}>
-                <img src={allowPic} />
+                {(isElectron && isElectron()) ? <img className={classes.dialogImage} src={logo} /> : <img src={allowPic} /> }
               </div>
-              <div style={{ marginTop: '30px' }}>
-                <div>{t('micAllowModal.body')}</div>
+              <div style={{ marginTop: (isElectron && isElectron() ? '5px' : '30px' )}}>
+                <div>{ (isElectron && isElectron()) ? t('micAllowModal.bodyElectron') : t('micAllowModal.body')}</div>
               </div>
             </Modal.Content>
             <Modal.Buttons>
-- 
GitLab


From 8cfeb87bf64ff69b9426b427e0537c0e22f7a169 Mon Sep 17 00:00:00 2001
From: Bheem <bheem@heftyinnovations.com>
Date: Fri, 19 Jun 2020 12:42:56 +0530
Subject: [PATCH 2/2] import nynja logo in chat voice message

---
 src/containers/ChatBottomPanel/ChatBottomPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/containers/ChatBottomPanel/ChatBottomPanel.js b/src/containers/ChatBottomPanel/ChatBottomPanel.js
index 700ad65f0..a393b85a2 100644
--- a/src/containers/ChatBottomPanel/ChatBottomPanel.js
+++ b/src/containers/ChatBottomPanel/ChatBottomPanel.js
@@ -25,6 +25,7 @@ import { p2pSelectors } from '../../core/resource/messages/personal/index';
 import { translateActions, translateSelector } from '../../core/resource/messages/translate/index';
 import { draftActions, draftSelectors } from '../../core/resource/messages/draft/index';
 import CustomEmojiPicker from './CustomEmojiPicker/CustomEmojiPicker';
+import logo from 'Assets/img/popup-logo.svg';
 
 const styles = theme => (stylesFunc(theme));
 const memberIdRegex = /["][0-9]["]/g;
-- 
GitLab