Merge branch 'develop' into feat/captain-toggle-updates

We will revert this later, for now it's only a stop-gap solution, until we figure out how to toggle this correctly

app/javascript/dashboard/routes/dashboard/captain/captain.routes.js

@@ -1,4 +1,4 @@
-// import { FEATURE_FLAGS } from 'dashboard/featureFlags';
+import { FEATURE_FLAGS } from 'dashboard/featureFlags';
 import { frontendURL } from '../../../helper/URLHelper';
 import AssistantIndex from './assistants/Index.vue';
 import AssistantInboxesIndex from './assistants/inboxes/Index.vue';
@@ -12,6 +12,7 @@ export const routes = [
     name: 'captain_assistants_index',
     meta: {
       permissions: ['administrator', 'agent'],
+      featureFlag: FEATURE_FLAGS.CAPTAIN,
     },
   },
   {
@@ -22,6 +23,7 @@ export const routes = [
     name: 'captain_assistants_inboxes_index',
     meta: {
       permissions: ['administrator', 'agent'],
+      featureFlag: FEATURE_FLAGS.CAPTAIN,
     },
   },
   {
@@ -30,6 +32,7 @@ export const routes = [
     name: 'captain_documents_index',
     meta: {
       permissions: ['administrator', 'agent'],
+      featureFlag: FEATURE_FLAGS.CAPTAIN,
     },
   },
   {
@@ -38,6 +41,7 @@ export const routes = [
     name: 'captain_responses_index',
     meta: {
       permissions: ['administrator', 'agent'],
+      featureFlag: FEATURE_FLAGS.CAPTAIN,
     },
   },
 ];

app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue

@@ -148,18 +148,6 @@ onMounted(fetchAccountDetails);
             />
           </div>
         </BillingCard>
-        <BillingCard
-          v-else
-          :title="$t('BILLING_SETTINGS.CAPTAIN.TITLE')"
-          :description="$t('BILLING_SETTINGS.CAPTAIN.UPGRADE')"
-        >
-          <template #action>
-            <ButtonV4 sm solid slate @click="onClickBillingPortal">
-              {{ $t('CAPTAIN.PAYWALL.UPGRADE_NOW') }}
-            </ButtonV4>
-          </template>
-        </BillingCard>
-
         <BillingHeader
           class="px-1 mt-5"
           :title="$t('BILLING_SETTINGS.CHAT_WITH_US.TITLE')"