Merge branch 'develop' into feat/email-forwarding

app/javascript/dashboard/i18n/locale/en/generalSettings.json

@@ -70,7 +70,7 @@
       },
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Inactivity duration for resolution",
-        "HELP": "Duration after a ticket should auto resolve if there is no activity",
+        "HELP": "Duration after a conversation should auto resolve if there is no activity",
         "PLACEHOLDER": "30",
         "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)",
         "API": {

app/javascript/dashboard/routes/dashboard/settings/account/components/AutoResolve.vue

@@ -85,7 +85,6 @@ const toggleAutoResolve = async () => {
           <!-- allow 10 mins to 999 days -->
           <DurationInput
             v-model="duration"
-            :disabled="!isEnabled"
             min="10"
             max="1439856"
             class="w-full"
@@ -101,7 +100,6 @@ const toggleAutoResolve = async () => {
         <TextArea
           v-model="message"
           class="w-full"
-          :disabled="!isEnabled"
           :placeholder="
             t('GENERAL_SETTINGS.FORM.AUTO_RESOLVE_DURATION.MESSAGE_PLACEHOLDER')
           "