From 5dc668f5915780c14d73017d31a24a8e2d466cba Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 22 Sep 2020 14:09:47 +1000
Subject: [PATCH 1/2] disable microphone for now (waiting refactor branch to be
 merged)

---
 background.html               |  2 +-
 js/views/conversation_view.js | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/background.html b/background.html
index afc272271..4cbc7da19 100644
--- a/background.html
+++ b/background.html
@@ -105,7 +105,7 @@
                       <button class='paperclip thumbnail' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                       <input type='file' class='file-input' multiple='multiple'>
                     </div>
-                    <div class='capture-audio'>
+                    <div class='capture-audio' style='display:none' >
                       <button class='microphone' {{#disable-inputs}} disabled="disabled" {{/disable-inputs}}></button>
                     </div>
                     <div class='send-message-container'>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index eb57925da..c48842988 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -725,16 +725,17 @@
     },
 
     async toggleMicrophone() {
-      const allowMicrophone = await window.getMediaPermissions();
-      if (
-        !allowMicrophone ||
-        this.$('.send-message').val().length > 0 ||
-        this.fileInput.hasFiles()
-      ) {
+      // FIXME audric hide microphone for now until refactor branch is merged
+      // const allowMicrophone = await window.getMediaPermissions();
+      // if (
+      //   !allowMicrophone ||
+      //   this.$('.send-message').val().length > 0 ||
+      //   this.fileInput.hasFiles()
+      // ) {
         this.$('.capture-audio').hide();
-      } else {
-        this.$('.capture-audio').show();
-      }
+      // } else {
+      //   this.$('.capture-audio').show();
+      // }
     },
     captureAudio(e) {
       e.preventDefault();

From e669324acc8fd554ed05e3ff380c0a0848e47f73 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 22 Sep 2020 16:03:32 +1000
Subject: [PATCH 2/2] lint

---
 js/views/conversation_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index c48842988..0c109e480 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -732,7 +732,7 @@
       //   this.$('.send-message').val().length > 0 ||
       //   this.fileInput.hasFiles()
       // ) {
-        this.$('.capture-audio').hide();
+      this.$('.capture-audio').hide();
       // } else {
       //   this.$('.capture-audio').show();
       // }