Skip to content

Commit

Permalink
Merge pull request #13385 from nextcloud/backport/13316/stable30
Browse files Browse the repository at this point in the history
  • Loading branch information
Antreesy authored Sep 25, 2024
2 parents 8bba020 + cbe01db commit bc303c5
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions src/views/MainView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
<LobbyScreen v-if="isInLobby" />
<template v-else>
<TopBar :is-in-call="isInCall" />
<TransitionWrapper name="fade">
<ChatView v-if="!isInCall" />
<CallView v-else :token="token" />
</TransitionWrapper>
<CallView v-if="isInCall" :token="token" />
<ChatView v-else />
<PollViewer />
</template>
</div>
Expand All @@ -23,7 +21,6 @@ import ChatView from '../components/ChatView.vue'
import LobbyScreen from '../components/LobbyScreen.vue'
import PollViewer from '../components/PollViewer/PollViewer.vue'
import TopBar from '../components/TopBar/TopBar.vue'
import TransitionWrapper from '../components/UIShared/TransitionWrapper.vue'
import { useIsInCall } from '../composables/useIsInCall.js'
Expand All @@ -35,7 +32,6 @@ export default {
LobbyScreen,
PollViewer,
TopBar,
TransitionWrapper,
},
props: {
Expand Down

0 comments on commit bc303c5

Please sign in to comment.