From 557df5c5c9dcd57db8fe1dad4e35e7b626ea2f58 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 13 Mar 2025 10:34:20 +0530
Subject: [PATCH] fix: Wrong copy with teams multi-select dropdown (#11075)

---
 app/javascript/dashboard/assets/scss/widgets/_base.scss  | 2 +-
 app/javascript/dashboard/components/ui/Wizard.vue        | 2 +-
 .../routes/dashboard/conversation/ConversationAction.vue | 2 +-
 .../dashboard/routes/dashboard/settings/Wrapper.vue      | 9 ++++-----
 .../routes/dashboard/settings/inbox/Settings.vue         | 2 +-
 .../routes/dashboard/settings/macros/MacroProperties.vue | 4 +---
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_base.scss b/app/javascript/dashboard/assets/scss/widgets/_base.scss
index 9367e8b2d..a8da23f3b 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_base.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_base.scss
@@ -82,7 +82,7 @@ input[type='url']:not(.reset-base) {
 }
 
 input[type='file'] {
-  @apply bg-white dark:bg-n-solid-1 leading-[1.15] mb-4;
+  @apply bg-n-background leading-[1.15] mb-4;
 }
 
 // Select
diff --git a/app/javascript/dashboard/components/ui/Wizard.vue b/app/javascript/dashboard/components/ui/Wizard.vue
index 19bf08bcd..b974e68f3 100644
--- a/app/javascript/dashboard/components/ui/Wizard.vue
+++ b/app/javascript/dashboard/components/ui/Wizard.vue
@@ -97,7 +97,7 @@ export default {
     }
 
     .step {
-      @apply bg-slate-75 dark:bg-slate-600 rounded-2xl font-medium w-4 left-4 leading-4 z-[999] absolute text-center text-white dark:text-white text-xxs top-5;
+      @apply bg-slate-75 dark:bg-slate-600 rounded-2xl font-medium w-4 left-4 leading-4 z-10 absolute text-center text-white dark:text-white text-xxs top-5;
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
index cae0dd3a3..6f7c58ec5 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationAction.vue
@@ -251,7 +251,7 @@ export default {
           $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.NO_RESULTS.TEAM')
         "
         :input-placeholder="
-          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.INPUT')
+          $t('AGENT_MGMT.MULTI_SELECTOR.SEARCH.PLACEHOLDER.TEAM')
         "
         @select="onClickAssignTeam"
       />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index 2c34cbce0..f5ba2b4eb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -22,10 +22,8 @@ const showNewButton = computed(
 </script>
 
 <template>
-  <div
-    class="flex flex-1 h-full justify-between flex-col m-0 bg-n-background overflow-auto"
-  >
-    <div class="max-w-6xl mx-auto w-full h-full">
+  <div class="flex flex-1 flex-col m-0 bg-n-background overflow-auto">
+    <div class="max-w-6xl mx-auto w-full flex flex-col flex-1">
       <SettingsHeader
         button-route="new"
         :icon="icon"
@@ -35,9 +33,10 @@ const showNewButton = computed(
         :back-url="backUrl"
         :show-new-button="showNewButton"
         :show-sidemenu-icon="showSidemenuIcon"
+        class="sticky top-0 z-20"
       />
 
-      <router-view v-slot="{ Component }" class="px-5">
+      <router-view v-slot="{ Component }" class="px-5 flex-1 overflow-hidden">
         <component :is="Component" v-if="!keepAlive" :key="$route.fullPath" />
         <keep-alive v-else>
           <component :is="Component" :key="$route.fullPath" />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index fa7c9baec..1018ec6dd 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -360,7 +360,7 @@ export default {
 
 <template>
   <div
-    class="flex-grow flex-shrink w-full min-w-0 pl-0 pr-0 overflow-auto settings bg-n-solid-1"
+    class="flex-grow flex-shrink w-full min-w-0 pl-0 pr-0 overflow-auto settings"
   >
     <SettingIntroBanner
       :header-image="inbox.avatarUrl"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
index d1e250147..4fde45403 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/macros/MacroProperties.vue
@@ -29,9 +29,7 @@ export default {
 </script>
 
 <template>
-  <div
-    class="p-3 bg-white dark:bg-slate-900 h-[calc(100vh-3.5rem)] flex flex-col border-l border-n-weak"
-  >
+  <div class="p-3 bg-n-background h-full flex flex-col">
     <div>
       <woot-input
         :model-value="macroName"