diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue index dad5c9c0b..1b080ae33 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue @@ -8,7 +8,7 @@ :chat="currentChat" :is-inbox-view="isInboxView" :is-contact-panel-open="isContactPanelOpen" - :show-back-button="isOnExpandedLayout" + :show-back-button="isOnExpandedLayout && !isInboxView" @contact-panel-toggle="onToggleContactPanel" />
-
+
@@ -51,8 +49,6 @@ import InboxList from './InboxList.vue'; import InboxItemHeader from './components/InboxItemHeader.vue'; import ConversationBox from 'dashboard/components/widgets/conversation/ConversationBox.vue'; import uiSettingsMixin from 'dashboard/mixins/uiSettings'; -import resizeListenerMixin from 'shared/mixins/resizeListenerMixin'; -import wootConstants from 'dashboard/constants/globals'; import { FEATURE_FLAGS } from 'dashboard/featureFlags'; import { BUS_EVENTS } from 'shared/constants/busEvents'; import { INBOX_EVENTS } from 'dashboard/helper/AnalyticsHelper/events'; @@ -63,7 +59,7 @@ export default { InboxItemHeader, ConversationBox, }, - mixins: [uiSettingsMixin, resizeListenerMixin], + mixins: [uiSettingsMixin], props: { inboxId: { type: [String, Number], @@ -74,11 +70,6 @@ export default { default: 0, }, }, - data() { - return { - isOnExpandedLayout: false, - }; - }, computed: { ...mapGetters({ currentAccountId: 'getCurrentAccountId', @@ -100,9 +91,6 @@ export default { FEATURE_FLAGS.INBOX_VIEW ); }, - showConversationList() { - return this.isOnExpandedLayout ? !this.notificationId : true; - }, isFetchingInitialData() { return this.uiFlags.isFetching && !this.notifications.length; }, @@ -146,17 +134,8 @@ export default { }); } this.$store.dispatch('agents/get'); - this.handleResize(); }, methods: { - handleResize() { - const { SMALL_SCREEN_BREAKPOINT } = wootConstants; - if (window.innerWidth <= SMALL_SCREEN_BREAKPOINT) { - this.isOnExpandedLayout = true; - } else { - this.isOnExpandedLayout = false; - } - }, async fetchConversationById() { if (!this.notificationId || !this.conversationId) return; this.$store.dispatch('clearSelectedState'); diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue index 99b642cbf..c1b3ab045 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/components/InboxItemHeader.vue @@ -2,6 +2,16 @@
+ + {{ $t('INBOX.ACTION_HEADER.BACK') }} + {{ $t('INBOX.ACTION_HEADER.SNOOZE') }} @@ -25,6 +36,7 @@ size="small" color-scheme="secondary" variant="hollow" + class="[&>span]:hidden md:[&>span]:inline-flex" @click="deleteNotification" > {{ $t('INBOX.ACTION_HEADER.DELETE') }} @@ -140,6 +152,9 @@ export default { onClickPrev() { this.$emit('prev'); }, + onClickGoToInboxList() { + this.$router.push({ name: 'inbox_view' }); + }, }, }; diff --git a/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue index 46ff0c3bc..e361f39df 100644 --- a/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue +++ b/app/javascript/dashboard/routes/dashboard/inbox/components/PaginationButton.vue @@ -19,7 +19,7 @@ />
- + {{ totalLength <= 1 ? '1' : currentIndex }} / - + {{ totalLength }}