Merge develop into feat/voice-channel
- Resolved merge conflicts in Vue components - Updated color scheme to use new n-slate tokens - Preserved voice channel functionality including isPrivateNoteOnly - Removed files that were deleted in develop - Fixed ESLint errors in App.vue - Fixed SCSS imports in CollaboratorsPage.vue - Fixed duplicate voice channel entries in ChannelList and ChannelItem - Moved voice channel to end of channel list - Integrated with new component structure
This commit is contained in:
@@ -55,9 +55,14 @@ export default {
|
||||
'telegram',
|
||||
'line',
|
||||
'instagram',
|
||||
'voice',
|
||||
].includes(key);
|
||||
},
|
||||
isComingSoon() {
|
||||
const { key } = this.channel;
|
||||
// Show "Coming Soon" only if the channel is marked as coming soon
|
||||
// and the corresponding feature flag is not enabled yet.
|
||||
return ['voice'].includes(key) && !this.isActive;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
getChannelThumbnail() {
|
||||
@@ -80,6 +85,7 @@ export default {
|
||||
:class="{ inactive: !isActive }"
|
||||
:title="channel.name"
|
||||
:src="getChannelThumbnail()"
|
||||
:is-coming-soon="isComingSoon"
|
||||
@click="onItemClick"
|
||||
/>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user