fix(toolbar): disable call button when in call (#3299)

Satellite-im · May 25, 2022 · 3c3337d · 3c3337d
1 parent d14325a
commit 3c3337d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/components/views/navigation/toolbar/Toolbar.html b/components/views/navigation/toolbar/Toolbar.html
@@ -64,7 +64,7 @@
         data-cy="toolbar-enable-audio"
         :data-tooltip="enableRTC ? $t('controls.call') : $t('controls.not_connected')"
         v-if="server"
-        @click="() => call(['audio'])"
+        @click="handleCall"
       >
         <phone-call-icon size="1x" class="control-icon" />
       </div>
@@ -81,7 +81,7 @@
           ${!enableRTC || webrtc.activeCall ? 'disabled' : ''}`"
           :data-tooltip="enableRTC ? $t('controls.call') : $t('controls.not_connected')"
           v-if="server"
-          @click="() => call(['audio'])"
+          @click="handleCall"
         >
           <phone-call-icon size="1x" class="control-icon" color="grey" />
         </div>

diff --git a/components/views/navigation/toolbar/Toolbar.less b/components/views/navigation/toolbar/Toolbar.less
@@ -52,9 +52,8 @@
     }
     .disabled {
       &:extend(.font-muted);
-      &,
-      svg {
-        cursor: not-allowed !important;
+      & {
+        cursor: not-allowed;
       }
     }
   }

diff --git a/components/views/navigation/toolbar/Toolbar.vue b/components/views/navigation/toolbar/Toolbar.vue
@@ -203,6 +203,12 @@ export default Vue.extend({
         kinds,
       })
     },
+    handleCall() {
+      if (!this.enableRTC || this.webrtc.activeCall) {
+        return
+      }
+      this.call(['audio'])
+    },
   },
 })
 </script>