diff --git a/README.md b/README.md
index 17d4e7f5e..152660fb7 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ Customer engagement suite, an open-source alternative to Intercom, Zendesk, Sale
-
diff --git a/app/javascript/dashboard/components/buttons/ResolveAction.vue b/app/javascript/dashboard/components/buttons/ResolveAction.vue
index 1d80defeb..84e33cc42 100644
--- a/app/javascript/dashboard/components/buttons/ResolveAction.vue
+++ b/app/javascript/dashboard/components/buttons/ResolveAction.vue
@@ -48,7 +48,7 @@
v-on-clickaway="closeDropdown"
class="dropdown-pane dropdown-pane--open"
>
-
+
[
+ {
+ icon: 'mail-inbox',
+ key: 'inboxView',
+ label: 'INBOX_VIEW',
+ featureFlag: FEATURE_FLAGS.INBOX_VIEW,
+ toState: frontendURL(`accounts/${accountId}/inbox-view`),
+ toStateName: 'inbox_view',
+ roles: ['administrator', 'agent'],
+ },
{
icon: 'chat',
key: 'conversations',
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
index 444285657..3ea6d39bf 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/settings.js
@@ -160,7 +160,7 @@ const settings = accountId => ({
beta: true,
},
{
- icon: 'key',
+ icon: 'document-list-clock',
label: 'SLA',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/sla/list`),
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index dad5c9c0b..2ad77452d 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"
/>
-
+