From 675bbd94e04c1ce4f33a29ea2dddded5b88948c6 Mon Sep 17 00:00:00 2001
From: Joe McGrath <josephmcg01@gmail.com>
Date: Fri, 3 Jun 2022 15:29:50 +0900
Subject: [PATCH] fix(toggleMute): fix rebase mistakes

---
 components/views/media/actions/Actions.vue            | 11 ++++++++---
 .../views/navigation/sidebar/controls/Controls.vue    |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/components/views/media/actions/Actions.vue b/components/views/media/actions/Actions.vue
index 6a9333c87f..ec8bdfeddb 100644
--- a/components/views/media/actions/Actions.vue
+++ b/components/views/media/actions/Actions.vue
@@ -16,6 +16,7 @@ import {
 import { mapState } from 'vuex'
 import { WebRTCEnum } from '~/libraries/Enums/enums'
 import { Peer2Peer } from '~/libraries/WebRTC/Libp2p'
+import { RootState } from '~/types/store/store'
 const p2p = Peer2Peer.getInstance()
 
 export default Vue.extend({
@@ -34,7 +35,11 @@ export default Vue.extend({
     }
   },
   computed: {
-    ...mapState(['audio', 'video', 'webrtc']),
+    ...mapState({
+      audio: (state) => (state as RootState).audio,
+      video: (state) => (state as RootState).video,
+      webrtc: (state) => (state as RootState).webrtc,
+    }),
     audioMuted(): boolean {
       return this.audio.muted
     },
@@ -51,7 +56,7 @@ export default Vue.extend({
      * @description Toggles mute for outgoing audio
      * @example
      */
-    async toggleMute(kind: WebRTCEnum) {
+    toggleMute(kind: WebRTCEnum) {
       this.isLoading = true
       try {
         if (kind === WebRTCEnum.AUDIO) {
@@ -59,7 +64,7 @@ export default Vue.extend({
         } else if (kind === WebRTCEnum.VIDEO) {
           this.$store.dispatch('video/toggleMute', undefined, { root: true })
         } else {
-          await this.$store.dispatch(
+          this.$store.dispatch(
             'webrtc/toggleMute',
             { kind, peerId: p2p.id },
             { root: true },
diff --git a/components/views/navigation/sidebar/controls/Controls.vue b/components/views/navigation/sidebar/controls/Controls.vue
index 50898c7e17..f535585e4c 100644
--- a/components/views/navigation/sidebar/controls/Controls.vue
+++ b/components/views/navigation/sidebar/controls/Controls.vue
@@ -16,6 +16,7 @@ import { mapState } from 'vuex'
 import { Peer2Peer } from '~/libraries/WebRTC/Libp2p'
 import { PeerMutedState } from '~/store/webrtc/types'
 import { WebRTCEnum } from '~/libraries/Enums/enums'
+import { RootState } from '~/types/store/store'
 const p2p = Peer2Peer.getInstance()
 
 export default Vue.extend({
@@ -33,7 +34,12 @@ export default Vue.extend({
     }
   },
   computed: {
-    ...mapState(['audio', 'video', 'webrtc', 'accounts']),
+    ...mapState({
+      audio: (state) => (state as RootState).audio,
+      video: (state) => (state as RootState).video,
+      webrtc: (state) => (state as RootState).webrtc,
+      accounts: (state) => (state as RootState).accounts,
+    }),
     audioMuted(): boolean {
       return this.audio.muted
     },