Merge remote-tracking branch 'origin/stripe_v2/frontend' into stripe_v2/final

app/views/api/v1/accounts/conversations/assignments/create.json.jbuilder

@@ -1,4 +0,0 @@
-json.payload do
-  json.assignee @conversation.assignee
-  json.conversation_id @conversation.display_id
-end

app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder

@@ -1,4 +1,5 @@
 json.id webhook.id
+json.name webhook.name
 json.url webhook.url
 json.account_id webhook.account_id
 json.subscriptions webhook.subscriptions

app/views/api/v1/conversations/partials/_conversation.json.jbuilder

@@ -7,10 +7,16 @@ json.meta do
     json.partial! 'api/v1/models/contact', formats: [:json], resource: conversation.contact
   end
   json.channel conversation.inbox.try(:channel_type)
-  if conversation.assignee&.account
+  if conversation.assigned_entity.is_a?(AgentBot)
     json.assignee do
-      json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assignee
+      json.partial! 'api/v1/models/agent_bot_slim', formats: [:json], resource: conversation.assigned_entity
     end
+    json.assignee_type 'AgentBot'
+  elsif conversation.assigned_entity&.account
+    json.assignee do
+      json.partial! 'api/v1/models/agent', formats: [:json], resource: conversation.assigned_entity
+    end
+    json.assignee_type 'User'
   end
   if conversation.team.present?
     json.team do

app/views/api/v1/models/_agent_bot_slim.json.jbuilder

@@ -0,0 +1,6 @@
+json.id resource.id
+json.name resource.name
+json.description resource.description
+json.thumbnail resource.avatar_url
+json.outgoing_url resource.outgoing_url unless resource.system_bot?
+json.bot_type resource.bot_type

app/views/api/v1/models/_inbox.json.jbuilder

@@ -74,8 +74,9 @@ end
 
 if resource.email?
   ## Email Channel Attributes
-  json.forward_to_email resource.channel.try(:forward_to_email)
   json.email resource.channel.try(:email)
+  json.forwarding_enabled ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
+  json.forward_to_email resource.channel.try(:forward_to_email) if ENV.fetch('MAILER_INBOUND_EMAIL_DOMAIN', '').present?
 
   ## IMAP
   if Current.account_user&.administrator?