From 31885541c1b497978abf5b7e4bbd9a7e8b35ad16 Mon Sep 17 00:00:00 2001
From: Mike Allison <dj.mikeallison@gmail.com>
Date: Thu, 26 Mar 2026 22:45:37 +0000
Subject: [PATCH 1/3] refactor: streamline GraphQL schema by removing
 deprecated fields and updating input types

- Removed `cardBlockCreate` and `cardBlockUpdate` mutations from `api-journeys` schema.
- Updated `adminJourney` query to align with modern API structure.
- Refactored `DateTimeFilter` input type for better clarity and usage.
- Adjusted various GraphQL types to ensure consistency across schemas.
- Cleaned up unused imports and types in resolver files to enhance maintainability.
---
 apis/api-gateway/schema.graphql               | 136 +++++++++---------
 apis/api-journeys-modern/schema.graphql       |  10 +-
 .../button/buttonBlockCreate.mutation.ts      |   3 -
 .../button/buttonBlockUpdate.mutation.ts      |   3 -
 .../block/card/cardBlockCreate.mutation.ts    |   3 -
 .../journeyProfileUpdate.mutation.ts          |   3 -
 .../src/schema/userRole/getUserRole.query.ts  |   3 -
 apis/api-journeys/schema.graphql              |  35 +----
 .../api-journeys/src/__generated__/graphql.ts |  38 +++++
 .../src/app/__generated__/graphql.ts          |  15 --
 .../src/app/modules/block/card/card.graphql   |  22 ---
 .../modules/block/card/card.resolver.spec.ts  |  78 +---------
 .../app/modules/block/card/card.resolver.ts   |  49 +------
 .../app/modules/block/icon/icon.resolver.ts   |  32 -----
 .../src/app/modules/journey/journey.graphql   |   1 -
 .../modules/journey/journey.resolver.spec.ts  |  54 -------
 .../app/modules/journey/journey.resolver.ts   |  29 ----
 apis/api-media/schema.graphql                 |  10 +-
 .../__generated__/BlockActionDelete.ts        |   2 +-
 .../__generated__/BlockDelete.ts              |   2 +-
 .../__generated__/BlockDeleteForCoverImage.ts |   2 +-
 .../__generated__/BlockOrderUpdate.ts         |   2 +-
 .../__generated__/CardCtaDelete.ts            |  24 ++--
 .../__generated__/CardFormDelete.ts           |  16 +--
 .../__generated__/CardIntroDelete.ts          |  14 +-
 .../__generated__/CardPollDelete.ts           |  18 +--
 .../__generated__/CardQuoteDelete.ts          |   8 +-
 .../__generated__/CardVideoDelete.ts          |   2 +-
 .../__generated__/CardVideoRestore.ts         |   2 +-
 .../__generated__/CoverBlockDelete.ts         |   2 +-
 .../__generated__/CoverBlockRestore.ts        |   2 +-
 .../__generated__/DuplicatedBlock.ts          |   2 +-
 .../GetStepBlocksWithPosition.ts              |   2 +-
 .../JourneyAiTranslateCreateSubscription.ts   |   2 +-
 .../__generated__/JourneyImageBlockDelete.ts  |   2 +-
 .../__generated__/MenuBlockDelete.ts          |   2 +-
 .../MultiselectWithButtonDelete.ts            |  12 +-
 .../MultiselectWithButtonRestore.ts           |  12 +-
 apps/journeys-admin/__generated__/NewBlock.ts |   2 +-
 .../__generated__/PosterImageBlockDelete.ts   |   2 +-
 .../__generated__/PosterImageBlockRestore.ts  |   2 +-
 .../__generated__/RadioOptionImageDelete.ts   |   2 +-
 .../__generated__/RadioOptionImageRestore.ts  |   2 +-
 .../__generated__/RestoredBlock.ts            |   2 +-
 .../StepBlockCreateFromAction.ts              |   2 +-
 .../StepBlockCreateFromSocialPreview.ts       |   2 +-
 .../StepBlockDeleteFromAction.ts              |   4 +-
 .../StepBlockDeleteFromActionWithoutAction.ts |   4 +-
 .../StepBlockDeleteFromSocialPreview.ts       |   4 +-
 .../__generated__/StepBlockDeleteFromStep.ts  |   2 +-
 .../StepBlockRestoreFromAction.ts             |   2 +-
 .../StepBlockRestoreFromSocialPreview.ts      |   2 +-
 .../__generated__/TestJourney.ts              |   2 +-
 .../TextResponseWithButtonDelete.ts           |   8 +-
 .../__generated__/TranslatedJourney.ts        |   2 +-
 .../__generated__/globalTypes.ts              |   7 +-
 .../JourneyAiTranslateCreateSubscription.ts   |   2 +-
 .../__generated__/TranslatedJourney.ts        |   2 +-
 apps/journeys/__generated__/globalTypes.ts    |   7 +-
 .../JourneyAiTranslateCreateSubscription.ts   |   2 +-
 .../__generated__/TranslatedJourney.ts        |   2 +-
 apps/resources/__generated__/globalTypes.ts   |   9 +-
 .../JourneyAiTranslateCreateSubscription.ts   |   2 +-
 apps/watch/__generated__/TranslatedJourney.ts |   2 +-
 apps/watch/__generated__/globalTypes.ts       |   9 +-
 libs/journeys/ui/__generated__/globalTypes.ts |   7 +-
 .../JourneyAiTranslateCreateSubscription.ts   |   2 +-
 .../__generated__/TranslatedJourney.ts        |   2 +-
 68 files changed, 253 insertions(+), 502 deletions(-)

diff --git a/apis/api-gateway/schema.graphql b/apis/api-gateway/schema.graphql
index b04c0f9cb5f..614b6ad6967 100644
--- a/apis/api-gateway/schema.graphql
+++ b/apis/api-gateway/schema.graphql
@@ -86,12 +86,7 @@ enum join__Graph {
 """
 A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar.
 """
-scalar DateTime @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__type(graph: API_MEDIA)  @join__type(graph: API_LANGUAGES)
-
-input DateTimeFilter @join__type(graph: API_MEDIA)  @join__type(graph: API_LANGUAGES)  {
-  gte: DateTime
-  lte: DateTime
-}
+scalar DateTime @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__type(graph: API_LANGUAGES)  @join__type(graph: API_MEDIA) 
 
 """
 The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
@@ -173,15 +168,6 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   blockRestore is used for redo/undo
   """
   blockRestore(id: ID!) : [Block!]! @join__field(graph: API_JOURNEYS) 
-  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
-  cardBlockUpdate(
-    id: ID!
-    input: CardBlockUpdateInput!
-    """
-    drop this parameter after merging teams
-    """
-    journeyId: ID
-  ): CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   iconBlockCreate(input: IconBlockCreateInput!) : IconBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   iconBlockUpdate(
     id: ID!
@@ -356,7 +342,7 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   Allow current user to update specific allowable fields of their visitor record
   """
   visitorUpdateForCurrentUser(input: VisitorUpdateInput!) : Visitor! @join__field(graph: API_JOURNEYS) 
-  buttonBlockCreate(input: ButtonBlockCreateInput!) : ButtonBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  buttonBlockCreate(input: ButtonBlockCreateInput!) : ButtonBlock! @join__field(graph: API_JOURNEYS_MODERN) 
   buttonBlockUpdate(
     id: ID!
     input: ButtonBlockUpdateInput!
@@ -364,7 +350,16 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
     drop this parameter after merging teams
     """
     journeyId: ID
-  ): ButtonBlock @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  ): ButtonBlock @join__field(graph: API_JOURNEYS_MODERN) 
+  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN) 
+  cardBlockUpdate(
+    id: ID!
+    input: CardBlockUpdateInput!
+    """
+    drop this parameter after merging teams
+    """
+    journeyId: ID
+  ): CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   multiselectBlockCreate(input: MultiselectBlockCreateInput!) : MultiselectBlock! @join__field(graph: API_JOURNEYS_MODERN) 
   multiselectBlockUpdate(
     id: ID!
@@ -418,7 +413,7 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   journeyAiTranslateCreate(input: JourneyAiTranslateInput!) : Journey! @join__field(graph: API_JOURNEYS_MODERN) 
   createJourneyEventsExportLog(input: JourneyEventsExportLogInput!) : JourneyEventsExportLog! @join__field(graph: API_JOURNEYS_MODERN) 
   journeyLanguageAiDetect(input: MutationJourneyLanguageAiDetectInput!) : Boolean! @join__field(graph: API_JOURNEYS_MODERN) 
-  journeyProfileUpdate(input: JourneyProfileUpdateInput!) : JourneyProfile! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  journeyProfileUpdate(input: JourneyProfileUpdateInput!) : JourneyProfile! @join__field(graph: API_JOURNEYS_MODERN) 
   journeyVisitorExportToGoogleSheet(
     journeyId: ID!
     filter: JourneyEventsFilter
@@ -722,7 +717,6 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
   hosts(teamId: ID!) : [Host!]! @join__field(graph: API_JOURNEYS) 
   integrations(teamId: ID!) : [Integration!]! @join__field(graph: API_JOURNEYS) 
   adminJourneysReport(reportType: JourneysReportType!) : PowerBiEmbed @join__field(graph: API_JOURNEYS) 
-  adminJourney(id: ID!, idType: IdType = slug) : Journey! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   journeys(where: JourneysFilter, options: JourneysQueryOptions) : [Journey!]! @join__field(graph: API_JOURNEYS) 
   journey(id: ID!, idType: IdType, options: JourneysQueryOptions) : Journey! @join__field(graph: API_JOURNEYS) 
   journeyCollection(id: ID!) : JourneyCollection! @join__field(graph: API_JOURNEYS) 
@@ -790,6 +784,7 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
   journeySimpleGet(id: ID!) : Json @join__field(graph: API_JOURNEYS_MODERN) 
   googleSheetsSyncs(filter: GoogleSheetsSyncsFilter!) : [GoogleSheetsSync!]! @join__field(graph: API_JOURNEYS_MODERN) 
   integrationGooglePickerToken(integrationId: ID!) : String! @join__field(graph: API_JOURNEYS_MODERN) 
+  adminJourney(id: ID!, idType: IdType = slug) : Journey! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   adminJourneys(
     status: [JourneyStatus!]
     template: Boolean
@@ -849,7 +844,7 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
     """
     status: [JourneyStatus!]
   ): [TemplateFamilyStatsBreakdownResponse!] @join__field(graph: API_JOURNEYS_MODERN) 
-  getUserRole: UserRole @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  getUserRole: UserRole @join__field(graph: API_JOURNEYS_MODERN) 
   language(id: ID!, idType: LanguageIdType = databaseId) : Language @join__field(graph: API_LANGUAGES) 
   languages(offset: Int, limit: Int, where: LanguagesFilter, term: String) : [Language!]! @join__field(graph: API_LANGUAGES) 
   languagesCount(where: LanguagesFilter, term: String) : Int! @join__field(graph: API_LANGUAGES) 
@@ -873,10 +868,10 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
     color: UnsplashColor
     orientation: UnsplashPhotoOrientation
   ): UnsplashQueryResponse! @join__field(graph: API_MEDIA) 
-  bibleBooks(where: BibleBooksFilter): [BibleBook!]! @join__field(graph: API_MEDIA) 
+  bibleBooks(where: BibleBooksFilter) : [BibleBook!]! @join__field(graph: API_MEDIA) 
   bibleCitations(videoId: ID) : [BibleCitation!]! @join__field(graph: API_MEDIA) 
   bibleCitation(id: ID!) : BibleCitation! @join__field(graph: API_MEDIA) 
-  keywords(where: KeywordsFilter): [Keyword!]! @join__field(graph: API_MEDIA) 
+  keywords(where: KeywordsFilter) : [Keyword!]! @join__field(graph: API_MEDIA) 
   getMyMuxVideos(offset: Int, limit: Int) : [MuxVideo!]! @join__field(graph: API_MEDIA) 
   getMyMuxVideo(id: ID!, userGenerated: Boolean) : MuxVideo! @join__field(graph: API_MEDIA) 
   getMuxVideo(id: ID!, userGenerated: Boolean) : MuxVideo @join__field(graph: API_MEDIA) 
@@ -1237,10 +1232,10 @@ type Video @join__type(graph: API_JOURNEYS, key: "id primaryLanguageId", extensi
   images(aspectRatio: ImageAspectRatio) : [CloudflareImage!]! @join__field(graph: API_MEDIA) 
   restrictDownloadPlatforms: [Platform!]! @join__field(graph: API_MEDIA) 
   restrictViewPlatforms: [Platform!]! @join__field(graph: API_MEDIA) 
-  publishedAt: Date @join__field(graph: API_MEDIA)
-  children: [Video!]! @join__field(graph: API_MEDIA)
-  parents: [Video!]! @join__field(graph: API_MEDIA)
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
+  publishedAt: Date @join__field(graph: API_MEDIA) 
+  updatedAt: DateTime! @join__field(graph: API_MEDIA) 
+  children: [Video!]! @join__field(graph: API_MEDIA) 
+  parents: [Video!]! @join__field(graph: API_MEDIA) 
 }
 
 type VideoBlock implements Block @join__type(graph: API_JOURNEYS, key: "id")  @join__type(graph: API_JOURNEYS_MODERN, key: "id")  @join__implements(graph: API_JOURNEYS, interface: "Block")  @join__implements(graph: API_JOURNEYS_MODERN, interface: "Block")  {
@@ -1325,11 +1320,11 @@ type VideoBlock implements Block @join__type(graph: API_JOURNEYS, key: "id")  @j
   subtitleLanguage: Language
   showGeneratedSubtitles: Boolean
   customizable: Boolean
-  mediaVideo: MediaVideo @join__field(graph: API_JOURNEYS_MODERN) 
   """
   Publisher notes for template adapters (e.g. trailer, intro).
   """
-  notes: String @join__field(graph: API_JOURNEYS_MODERN) 
+  notes: String
+  mediaVideo: MediaVideo @join__field(graph: API_JOURNEYS_MODERN) 
 }
 
 """
@@ -1474,14 +1469,14 @@ type MultiselectSubmissionEvent implements Event @join__type(graph: API_JOURNEYS
 
 type Language @join__type(graph: API_JOURNEYS, key: "id", extension: true)  @join__type(graph: API_JOURNEYS_MODERN, key: "id", extension: true)  @join__type(graph: API_LANGUAGES, key: "id")  @join__type(graph: API_MEDIA, key: "id", extension: true)  {
   id: ID!
+  updatedAt: DateTime! @join__field(graph: API_LANGUAGES) 
   bcp47: String @join__field(graph: API_LANGUAGES) 
   iso3: String @join__field(graph: API_LANGUAGES) 
   slug: String @join__field(graph: API_LANGUAGES) 
   name(languageId: ID, primary: Boolean) : [LanguageName!]! @join__field(graph: API_LANGUAGES) 
   countryLanguages: [CountryLanguage!]! @join__field(graph: API_LANGUAGES) 
   audioPreview: AudioPreview @join__field(graph: API_LANGUAGES) 
-  labeledVideoCounts: LabeledVideoCounts! @join__field(graph: API_MEDIA)
-  updatedAt: DateTime! @join__field(graph: API_LANGUAGES)
+  labeledVideoCounts: LabeledVideoCounts! @join__field(graph: API_MEDIA) 
 }
 
 type JourneyViewEvent implements Event @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__implements(graph: API_JOURNEYS, interface: "Event")  @join__implements(graph: API_JOURNEYS_MODERN, interface: "Event")  {
@@ -2596,6 +2591,7 @@ type ContinentName @join__type(graph: API_LANGUAGES)  {
 
 type Country @join__type(graph: API_LANGUAGES, key: "id")  {
   id: ID!
+  updatedAt: DateTime!
   population: Int
   latitude: Float
   longitude: Float
@@ -2607,7 +2603,6 @@ type Country @join__type(graph: API_LANGUAGES, key: "id")  {
   countryLanguages: [CountryLanguage!]!
   languageCount: Int!
   languageHavingMediaCount: Int!
-  updatedAt: DateTime! @join__field(graph: API_LANGUAGES)
 }
 
 type CountryLanguage @join__type(graph: API_LANGUAGES)  {
@@ -2641,13 +2636,13 @@ type ArclightApiKey @join__type(graph: API_MEDIA, key: "key")  {
 
 type BibleBook @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   name(languageId: ID, primary: Boolean) : [BibleBookName!]!
   osisId: String!
   alternateName: String
   paratextAbbreviation: String!
   isNewTestament: Boolean!
   order: Int!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type BibleBookName @join__type(graph: API_MEDIA)  {
@@ -2780,9 +2775,9 @@ type ForeignKeyConstraintErrorLocation @join__type(graph: API_MEDIA)  {
 
 type Keyword @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   value: String!
   language: Language!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type LabeledVideoCounts @join__type(graph: API_MEDIA)  {
@@ -3145,10 +3140,10 @@ type VideoDescription @join__type(graph: API_MEDIA)  {
 
 type VideoEdition @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   name: String
   videoVariants: [VideoVariant!]!
   videoSubtitles: [VideoSubtitle!]!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type VideoImageAlt @join__type(graph: API_MEDIA)  {
@@ -3232,6 +3227,7 @@ type VideoTitle @join__type(graph: API_MEDIA)  {
 
 type VideoVariant @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   """
   master video file
   """
@@ -3260,7 +3256,6 @@ type VideoVariant @join__type(graph: API_MEDIA)  {
   """
   version: Int!
   video: Video
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type VideoVariantDownload @join__type(graph: API_MEDIA)  {
@@ -3926,29 +3921,6 @@ input ButtonBlockSettingsInput @join__type(graph: API_JOURNEYS)  @join__type(gra
   color: String
 }
 
-input CardBlockCreateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
-  id: ID
-  journeyId: ID!
-  parentBlockId: ID!
-  eventLabel: BlockEventLabel
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
-input CardBlockUpdateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
-  parentBlockId: ID
-  eventLabel: BlockEventLabel
-  coverBlockId: ID
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
 input IconBlockCreateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
   """
   ID should be unique Response UUID (Provided for optimistic mutation result matching)
@@ -4761,6 +4733,29 @@ input ButtonClickEventCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
   actionValue: String
 }
 
+input CardBlockCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
+  id: ID
+  journeyId: ID!
+  parentBlockId: ID!
+  eventLabel: BlockEventLabel
+  backgroundColor: String
+  backdropBlur: Int
+  fullscreen: Boolean
+  themeMode: ThemeMode
+  themeName: ThemeName
+}
+
+input CardBlockUpdateInput @join__type(graph: API_JOURNEYS_MODERN)  {
+  parentBlockId: ID
+  eventLabel: BlockEventLabel
+  coverBlockId: ID
+  backgroundColor: String
+  backdropBlur: Int
+  fullscreen: Boolean
+  themeMode: ThemeMode
+  themeName: ThemeName
+}
+
 input ChatActionInput @join__type(graph: API_JOURNEYS_MODERN)  {
   gtmEventName: String
   chatUrl: String!
@@ -5088,22 +5083,19 @@ input VideoBlockUpdateInput @join__type(graph: API_JOURNEYS_MODERN)  {
   notes: String
 }
 
-input LanguagesFilter @join__type(graph: API_LANGUAGES)  {
-  ids: [ID!]
-  bcp47: [String!]
-  iso3: [String!]
-  updatedAt: DateTimeFilter
-}
-
 input CountriesFilter @join__type(graph: API_LANGUAGES)  {
   updatedAt: DateTimeFilter
 }
 
-input KeywordsFilter @join__type(graph: API_MEDIA)  {
-  updatedAt: DateTimeFilter
+input DateTimeFilter @join__type(graph: API_LANGUAGES)  @join__type(graph: API_MEDIA)  {
+  gte: DateTime
+  lte: DateTime
 }
 
-input BibleBooksFilter @join__type(graph: API_MEDIA)  {
+input LanguagesFilter @join__type(graph: API_LANGUAGES)  {
+  ids: [ID!]
+  bcp47: [String!]
+  iso3: [String!]
   updatedAt: DateTimeFilter
 }
 
@@ -5125,6 +5117,10 @@ input MutationAudioPreviewUpdateInput @join__type(graph: API_LANGUAGES)  {
   codec: String
 }
 
+input BibleBooksFilter @join__type(graph: API_MEDIA)  {
+  updatedAt: DateTimeFilter
+}
+
 input CloudflareR2CompleteMultipartInput @join__type(graph: API_MEDIA)  {
   """
   CloudflareR2 id for the asset being uploaded
@@ -5217,6 +5213,10 @@ input ImageInput @join__type(graph: API_MEDIA)  {
   videoId: ID
 }
 
+input KeywordsFilter @join__type(graph: API_MEDIA)  {
+  updatedAt: DateTimeFilter
+}
+
 input MutationBibleCitationCreateInput @join__type(graph: API_MEDIA)  {
   id: ID
   osisId: String!
diff --git a/apis/api-journeys-modern/schema.graphql b/apis/api-journeys-modern/schema.graphql
index eae9d8b31a8..5aaa9ece8e3 100644
--- a/apis/api-journeys-modern/schema.graphql
+++ b/apis/api-journeys-modern/schema.graphql
@@ -1337,15 +1337,15 @@ input MultiselectSubmissionEventCreateInput {
 }
 
 type Mutation {
-  buttonBlockCreate(input: ButtonBlockCreateInput!): ButtonBlock! @override(from: "api-journeys")
+  buttonBlockCreate(input: ButtonBlockCreateInput!): ButtonBlock!
   buttonBlockUpdate(
     id: ID!
     input: ButtonBlockUpdateInput!
 
     """drop this parameter after merging teams"""
     journeyId: ID
-  ): ButtonBlock @override(from: "api-journeys")
-  cardBlockCreate(input: CardBlockCreateInput!): CardBlock! @override(from: "api-journeys")
+  ): ButtonBlock
+  cardBlockCreate(input: CardBlockCreateInput!): CardBlock!
   cardBlockUpdate(
     id: ID!
     input: CardBlockUpdateInput!
@@ -1405,7 +1405,7 @@ type Mutation {
   journeyAiTranslateCreate(input: JourneyAiTranslateInput!): Journey!
   createJourneyEventsExportLog(input: JourneyEventsExportLogInput!): JourneyEventsExportLog!
   journeyLanguageAiDetect(input: MutationJourneyLanguageAiDetectInput!): Boolean!
-  journeyProfileUpdate(input: JourneyProfileUpdateInput!): JourneyProfile! @override(from: "api-journeys")
+  journeyProfileUpdate(input: JourneyProfileUpdateInput!): JourneyProfile!
   journeyVisitorExportToGoogleSheet(
     journeyId: ID!
     filter: JourneyEventsFilter
@@ -1795,7 +1795,7 @@ type Query {
     """
     status: [JourneyStatus!]
   ): [TemplateFamilyStatsBreakdownResponse!]
-  getUserRole: UserRole @override(from: "api-journeys")
+  getUserRole: UserRole
 }
 
 type RadioOptionBlock implements Block
diff --git a/apis/api-journeys-modern/src/schema/block/button/buttonBlockCreate.mutation.ts b/apis/api-journeys-modern/src/schema/block/button/buttonBlockCreate.mutation.ts
index 25798d86476..e1b672d692d 100644
--- a/apis/api-journeys-modern/src/schema/block/button/buttonBlockCreate.mutation.ts
+++ b/apis/api-journeys-modern/src/schema/block/button/buttonBlockCreate.mutation.ts
@@ -17,9 +17,6 @@ builder.mutationField('buttonBlockCreate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: ButtonBlock,
     nullable: false,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       input: t.arg({ type: ButtonBlockCreateInput, required: true })
     },
diff --git a/apis/api-journeys-modern/src/schema/block/button/buttonBlockUpdate.mutation.ts b/apis/api-journeys-modern/src/schema/block/button/buttonBlockUpdate.mutation.ts
index 6d356c4e234..32b5d4a131c 100644
--- a/apis/api-journeys-modern/src/schema/block/button/buttonBlockUpdate.mutation.ts
+++ b/apis/api-journeys-modern/src/schema/block/button/buttonBlockUpdate.mutation.ts
@@ -23,9 +23,6 @@ builder.mutationField('buttonBlockUpdate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: ButtonBlock,
     nullable: true,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       id: t.arg({ type: 'ID', required: true }),
       input: t.arg({ type: ButtonBlockUpdateInput, required: true }),
diff --git a/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts b/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
index 3850fa776d7..5f33714aa27 100644
--- a/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
+++ b/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
@@ -17,9 +17,6 @@ builder.mutationField('cardBlockCreate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: CardBlock,
     nullable: false,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       input: t.arg({ type: CardBlockCreateInput, required: true })
     },
diff --git a/apis/api-journeys-modern/src/schema/journeyProfile/journeyProfileUpdate.mutation.ts b/apis/api-journeys-modern/src/schema/journeyProfile/journeyProfileUpdate.mutation.ts
index 241cd35f306..dad78e04770 100644
--- a/apis/api-journeys-modern/src/schema/journeyProfile/journeyProfileUpdate.mutation.ts
+++ b/apis/api-journeys-modern/src/schema/journeyProfile/journeyProfileUpdate.mutation.ts
@@ -10,9 +10,6 @@ builder.mutationField('journeyProfileUpdate', (t) =>
     .withAuth({ $any: { isAuthenticated: true, isAnonymous: true } })
     .prismaField({
       type: JourneyProfileRef,
-      override: {
-        from: 'api-journeys'
-      },
       nullable: false,
       args: {
         input: t.arg({ type: JourneyProfileUpdateInput, required: true })
diff --git a/apis/api-journeys-modern/src/schema/userRole/getUserRole.query.ts b/apis/api-journeys-modern/src/schema/userRole/getUserRole.query.ts
index f15f2614111..64c38b9b9a5 100644
--- a/apis/api-journeys-modern/src/schema/userRole/getUserRole.query.ts
+++ b/apis/api-journeys-modern/src/schema/userRole/getUserRole.query.ts
@@ -27,9 +27,6 @@ builder.queryField('getUserRole', (t) =>
     .prismaField({
       type: UserRoleRef,
       nullable: true,
-      override: {
-        from: 'api-journeys'
-      },
       resolve: async (query, _parent, _args, context) => {
         return await getUserRoleByUserId(context.user.id)
       }
diff --git a/apis/api-journeys/schema.graphql b/apis/api-journeys/schema.graphql
index 7c8da798e3c..8a31d4c2f11 100644
--- a/apis/api-journeys/schema.graphql
+++ b/apis/api-journeys/schema.graphql
@@ -234,7 +234,6 @@ extend type Query {
   hosts(teamId: ID!): [Host!]!
   integrations(teamId: ID!): [Integration!]!
   adminJourneysReport(reportType: JourneysReportType!): PowerBiEmbed
-  adminJourney(id: ID!, idType: IdType): Journey!
   journeys(where: JourneysFilter, options: JourneysQueryOptions): [Journey!]!
   journey(id: ID!, idType: IdType, options: JourneysQueryOptions): Journey!
   journeyCollection(id: ID!): JourneyCollection!
@@ -339,14 +338,6 @@ type Mutation {
 
   """blockRestore is used for redo/undo"""
   blockRestore(id: ID!): [Block!]!
-  cardBlockCreate(input: CardBlockCreateInput!): CardBlock!
-  cardBlockUpdate(
-    id: ID!
-    input: CardBlockUpdateInput!
-
-    """drop this parameter after merging teams"""
-    journeyId: ID
-  ): CardBlock!
   iconBlockCreate(input: IconBlockCreateInput!): IconBlock!
   iconBlockUpdate(
     id: ID!
@@ -609,29 +600,6 @@ type CardBlock implements Block
   themeName: ThemeName @shareable
 }
 
-input CardBlockCreateInput {
-  id: ID
-  journeyId: ID!
-  parentBlockId: ID!
-  eventLabel: BlockEventLabel
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
-input CardBlockUpdateInput {
-  parentBlockId: ID
-  eventLabel: BlockEventLabel
-  coverBlockId: ID
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
 enum GridDirection {
   columnReverse
   column
@@ -1277,6 +1245,9 @@ type VideoBlock implements Block
   subtitleLanguage: Language @shareable
   showGeneratedSubtitles: Boolean @shareable
   customizable: Boolean @shareable
+
+  """Publisher notes for template adapters (e.g. trailer, intro)."""
+  notes: String
 }
 
 """
diff --git a/apis/api-journeys/src/__generated__/graphql.ts b/apis/api-journeys/src/__generated__/graphql.ts
index e0385f5df7f..ac3a34b5095 100644
--- a/apis/api-journeys/src/__generated__/graphql.ts
+++ b/apis/api-journeys/src/__generated__/graphql.ts
@@ -88,6 +88,7 @@ export type BibleBook = {
   order: Scalars['Int']['output'];
   osisId: Scalars['String']['output'];
   paratextAbbreviation: Scalars['String']['output'];
+  updatedAt: Scalars['DateTime']['output'];
 };
 
 
@@ -103,6 +104,10 @@ export type BibleBookName = {
   value: Scalars['String']['output'];
 };
 
+export type BibleBooksFilter = {
+  updatedAt?: InputMaybe<DateTimeFilter>;
+};
+
 export type BibleCitation = {
   __typename?: 'BibleCitation';
   bibleBook: BibleBook;
@@ -569,6 +574,10 @@ export type ContinentName = {
   value: Scalars['String']['output'];
 };
 
+export type CountriesFilter = {
+  updatedAt?: InputMaybe<DateTimeFilter>;
+};
+
 export type Country = {
   __typename?: 'Country';
   continent: Continent;
@@ -583,6 +592,7 @@ export type Country = {
   longitude?: Maybe<Scalars['Float']['output']>;
   name: Array<CountryName>;
   population?: Maybe<Scalars['Int']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
 };
 
 
@@ -678,6 +688,11 @@ export type CustomDomainVerificationResponse = {
   message: Scalars['String']['output'];
 };
 
+export type DateTimeFilter = {
+  gte?: InputMaybe<Scalars['DateTime']['input']>;
+  lte?: InputMaybe<Scalars['DateTime']['input']>;
+};
+
 export enum DefaultPlatform {
   Android = 'android',
   Ios = 'ios',
@@ -1603,9 +1618,14 @@ export type Keyword = {
   __typename?: 'Keyword';
   id: Scalars['ID']['output'];
   language: Language;
+  updatedAt: Scalars['DateTime']['output'];
   value: Scalars['String']['output'];
 };
 
+export type KeywordsFilter = {
+  updatedAt?: InputMaybe<DateTimeFilter>;
+};
+
 export type LabeledVideoCounts = {
   __typename?: 'LabeledVideoCounts';
   featureFilmCount: Scalars['Int']['output'];
@@ -1623,6 +1643,7 @@ export type Language = {
   labeledVideoCounts: LabeledVideoCounts;
   name: Array<LanguageName>;
   slug?: Maybe<Scalars['String']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
 };
 
 
@@ -1657,6 +1678,7 @@ export type LanguagesFilter = {
   bcp47?: InputMaybe<Array<Scalars['String']['input']>>;
   ids?: InputMaybe<Array<Scalars['ID']['input']>>;
   iso3?: InputMaybe<Array<Scalars['String']['input']>>;
+  updatedAt?: InputMaybe<DateTimeFilter>;
 };
 
 export type LinkAction = Action & {
@@ -3881,6 +3903,11 @@ export type QueryArclightApiKeyByKeyArgs = {
 };
 
 
+export type QueryBibleBooksArgs = {
+  where?: InputMaybe<BibleBooksFilter>;
+};
+
+
 export type QueryBibleCitationArgs = {
   id: Scalars['ID']['input'];
 };
@@ -3914,6 +3941,7 @@ export type QueryCheckVideoVariantsInAlgoliaArgs = {
 export type QueryCountriesArgs = {
   ids?: InputMaybe<Array<Scalars['ID']['input']>>;
   term?: InputMaybe<Scalars['String']['input']>;
+  where?: InputMaybe<CountriesFilter>;
 };
 
 
@@ -4088,6 +4116,11 @@ export type QueryJourneysPlausibleStatsTimeseriesArgs = {
 };
 
 
+export type QueryKeywordsArgs = {
+  where?: InputMaybe<KeywordsFilter>;
+};
+
+
 export type QueryLanguageArgs = {
   id: Scalars['ID']['input'];
   idType?: InputMaybe<LanguageIdType>;
@@ -5292,6 +5325,7 @@ export type Video = {
   studyQuestions: Array<VideoStudyQuestion>;
   subtitles: Array<VideoSubtitle>;
   title: Array<VideoTitle>;
+  updatedAt: Scalars['DateTime']['output'];
   /** @deprecated Use variants instead */
   variant?: Maybe<VideoVariant>;
   variantLanguages: Array<Language>;
@@ -5626,6 +5660,7 @@ export type VideoEdition = {
   __typename?: 'VideoEdition';
   id: Scalars['ID']['output'];
   name?: Maybe<Scalars['String']['output']>;
+  updatedAt: Scalars['DateTime']['output'];
   videoSubtitles: Array<VideoSubtitle>;
   videoVariants: Array<VideoVariant>;
 };
@@ -6010,6 +6045,7 @@ export type VideoVariant = {
   slug: Scalars['String']['output'];
   subtitle: Array<VideoSubtitle>;
   subtitleCount: Scalars['Int']['output'];
+  updatedAt: Scalars['DateTime']['output'];
   /** version control for master video file */
   version: Scalars['Int']['output'];
   video?: Maybe<Video>;
@@ -6099,6 +6135,7 @@ export type VideoVariantDownloadUpdateInput = {
 export type VideoVariantFilter = {
   languageId?: InputMaybe<Scalars['ID']['input']>;
   onlyPublished?: InputMaybe<Scalars['Boolean']['input']>;
+  updatedAt?: InputMaybe<DateTimeFilter>;
 };
 
 export type VideoVariantUpdateInput = {
@@ -6128,6 +6165,7 @@ export type VideosFilter = {
   published?: InputMaybe<Scalars['Boolean']['input']>;
   subtitleLanguageIds?: InputMaybe<Array<Scalars['ID']['input']>>;
   title?: InputMaybe<Scalars['String']['input']>;
+  updatedAt?: InputMaybe<DateTimeFilter>;
 };
 
 /** A visitor with attributes connected to a team. */
diff --git a/apis/api-journeys/src/app/__generated__/graphql.ts b/apis/api-journeys/src/app/__generated__/graphql.ts
index 2ec625671c4..dd4d61398d2 100644
--- a/apis/api-journeys/src/app/__generated__/graphql.ts
+++ b/apis/api-journeys/src/app/__generated__/graphql.ts
@@ -321,17 +321,6 @@ export class ButtonBlockSettingsInput {
     color?: Nullable<string>;
 }
 
-export class CardBlockUpdateInput {
-    parentBlockId?: Nullable<string>;
-    eventLabel?: Nullable<BlockEventLabel>;
-    coverBlockId?: Nullable<string>;
-    backgroundColor?: Nullable<string>;
-    backdropBlur?: Nullable<number>;
-    fullscreen?: Nullable<boolean>;
-    themeMode?: Nullable<ThemeMode>;
-    themeName?: Nullable<ThemeName>;
-}
-
 export class IconBlockCreateInput {
     id?: Nullable<string>;
     parentBlockId: string;
@@ -966,8 +955,6 @@ export abstract class IQuery {
 
     abstract adminJourneysReport(reportType: JourneysReportType): Nullable<PowerBiEmbed> | Promise<Nullable<PowerBiEmbed>>;
 
-    abstract adminJourney(id: string, idType?: Nullable<IdType>): Journey | Promise<Journey>;
-
     abstract journeys(where?: Nullable<JourneysFilter>, options?: Nullable<JourneysQueryOptions>): Journey[] | Promise<Journey[]>;
 
     abstract journey(id: string, idType?: Nullable<IdType>, options?: Nullable<JourneysQueryOptions>): Journey | Promise<Journey>;
@@ -1020,8 +1007,6 @@ export abstract class IMutation {
 
     abstract blockRestore(id: string): Block[] | Promise<Block[]>;
 
-    abstract cardBlockUpdate(id: string, input: CardBlockUpdateInput, journeyId?: Nullable<string>): CardBlock | Promise<CardBlock>;
-
     abstract iconBlockCreate(input: IconBlockCreateInput): IconBlock | Promise<IconBlock>;
 
     abstract iconBlockUpdate(id: string, input: IconBlockUpdateInput, journeyId?: Nullable<string>): IconBlock | Promise<IconBlock>;
diff --git a/apis/api-journeys/src/app/modules/block/card/card.graphql b/apis/api-journeys/src/app/modules/block/card/card.graphql
index 8b7df4d6b0f..0e1d59e3d38 100644
--- a/apis/api-journeys/src/app/modules/block/card/card.graphql
+++ b/apis/api-journeys/src/app/modules/block/card/card.graphql
@@ -35,25 +35,3 @@ type CardBlock implements Block @shareable {
   """
   themeName: ThemeName @shareable
 }
-
-input CardBlockUpdateInput {
-  parentBlockId: ID
-  eventLabel: BlockEventLabel
-  coverBlockId: ID
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
-extend type Mutation {
-  cardBlockUpdate(
-    id: ID!
-    input: CardBlockUpdateInput!
-    """
-    drop this parameter after merging teams
-    """
-    journeyId: ID
-  ): CardBlock!
-}
diff --git a/apis/api-journeys/src/app/modules/block/card/card.resolver.spec.ts b/apis/api-journeys/src/app/modules/block/card/card.resolver.spec.ts
index df98fd79f47..ee034d4eae6 100644
--- a/apis/api-journeys/src/app/modules/block/card/card.resolver.spec.ts
+++ b/apis/api-journeys/src/app/modules/block/card/card.resolver.spec.ts
@@ -1,29 +1,16 @@
 import { Test, TestingModule } from '@nestjs/testing'
-import { DeepMockProxy, mockDeep } from 'jest-mock-extended'
 
-import { Block, Journey, UserTeamRole } from '@core/prisma/journeys/client'
+import { Block } from '@core/prisma/journeys/client'
 
-import {
-  CardBlockUpdateInput,
-  ThemeMode,
-  ThemeName
-} from '../../../__generated__/graphql'
-import { AppAbility, AppCaslFactory } from '../../../lib/casl/caslFactory'
+import { ThemeMode, ThemeName } from '../../../__generated__/graphql'
+import { AppCaslFactory } from '../../../lib/casl/caslFactory'
 import { CaslAuthModule } from '../../../lib/CaslAuthModule'
-import { PrismaService } from '../../../lib/prisma.service'
-import { BlockService } from '../block.service'
 
 import { CardBlockResolver } from './card.resolver'
 
 describe('CardBlockResolver', () => {
-  let resolver: CardBlockResolver,
-    service: DeepMockProxy<BlockService>,
-    prismaService: DeepMockProxy<PrismaService>,
-    ability: AppAbility
+  let resolver: CardBlockResolver
 
-  const journey = {
-    team: { userTeams: [{ userId: 'userId', role: UserTeamRole.manager }] }
-  } as unknown as Journey
   const block = {
     id: 'blockId',
     journeyId: 'journeyId',
@@ -36,68 +23,13 @@ describe('CardBlockResolver', () => {
     themeName: ThemeName.base,
     updatedAt: '2024-10-21T04:32:25.858Z'
   } as unknown as Block
-  const blockWithUserTeam = {
-    ...block,
-    journey
-  }
-  const blockUpdateInput: CardBlockUpdateInput = {
-    parentBlockId: 'parentBlockId',
-    backgroundColor: '#FFF',
-    themeMode: ThemeMode.light,
-    themeName: ThemeName.base,
-    fullscreen: true,
-    coverBlockId: 'coverBlockId'
-  }
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       imports: [CaslAuthModule.register(AppCaslFactory)],
-      providers: [
-        {
-          provide: BlockService,
-          useValue: mockDeep<BlockService>()
-        },
-        CardBlockResolver,
-        {
-          provide: PrismaService,
-          useValue: mockDeep<PrismaService>()
-        }
-      ]
+      providers: [CardBlockResolver]
     }).compile()
     resolver = module.get<CardBlockResolver>(CardBlockResolver)
-    service = module.get<BlockService>(
-      BlockService
-    ) as DeepMockProxy<BlockService>
-    prismaService = module.get<PrismaService>(
-      PrismaService
-    ) as DeepMockProxy<PrismaService>
-    ability = await new AppCaslFactory().createAbility({ id: 'userId' })
-    service.getSiblings.mockResolvedValue([
-      { ...block, action: null },
-      { ...block, action: null }
-    ])
-  })
-
-  describe('cardBlockUpdate', () => {
-    it('updates a CardBlock', async () => {
-      prismaService.block.findUnique.mockResolvedValueOnce(blockWithUserTeam)
-      await resolver.cardBlockUpdate(ability, 'blockId', blockUpdateInput)
-      expect(service.update).toHaveBeenCalledWith('blockId', blockUpdateInput)
-    })
-
-    it('throws error if not found', async () => {
-      prismaService.block.findUnique.mockResolvedValueOnce(null)
-      await expect(
-        resolver.cardBlockUpdate(ability, 'blockId', blockUpdateInput)
-      ).rejects.toThrow('block not found')
-    })
-
-    it('throws error if not authorized', async () => {
-      prismaService.block.findUnique.mockResolvedValueOnce(block)
-      await expect(
-        resolver.cardBlockUpdate(ability, 'blockId', blockUpdateInput)
-      ).rejects.toThrow('user is not allowed to update block')
-    })
   })
 
   describe('fullscreen', () => {
diff --git a/apis/api-journeys/src/app/modules/block/card/card.resolver.ts b/apis/api-journeys/src/app/modules/block/card/card.resolver.ts
index fdf8ea36ff4..1acae630c7b 100644
--- a/apis/api-journeys/src/app/modules/block/card/card.resolver.ts
+++ b/apis/api-journeys/src/app/modules/block/card/card.resolver.ts
@@ -1,56 +1,9 @@
-import { subject } from '@casl/ability'
-import { UseGuards } from '@nestjs/common'
-import { Args, Mutation, Parent, ResolveField, Resolver } from '@nestjs/graphql'
-import { GraphQLError } from 'graphql'
+import { Parent, ResolveField, Resolver } from '@nestjs/graphql'
 
 import { Block } from '@core/prisma/journeys/client'
 
-import { CardBlockUpdateInput } from '../../../__generated__/graphql'
-import { Action, AppAbility } from '../../../lib/casl/caslFactory'
-import { AppCaslGuard } from '../../../lib/casl/caslGuard'
-import { CaslAbility } from '../../../lib/CaslAuthModule'
-import { PrismaService } from '../../../lib/prisma.service'
-import { BlockService } from '../block.service'
-
 @Resolver('CardBlock')
 export class CardBlockResolver {
-  constructor(
-    private readonly blockService: BlockService,
-    private readonly prismaService: PrismaService
-  ) {}
-
-  @Mutation()
-  @UseGuards(AppCaslGuard)
-  async cardBlockUpdate(
-    @CaslAbility() ability: AppAbility,
-    @Args('id') id: string,
-    @Args('input') input: CardBlockUpdateInput
-  ): Promise<Block> {
-    const block = await this.prismaService.block.findUnique({
-      where: { id },
-      include: {
-        action: true,
-        journey: {
-          include: {
-            team: { include: { userTeams: true } },
-            userJourneys: true
-          }
-        }
-      }
-    })
-    if (block == null)
-      throw new GraphQLError('block not found', {
-        extensions: { code: 'NOT_FOUND' }
-      })
-    if (!ability.can(Action.Update, subject('Journey', block.journey)))
-      throw new GraphQLError('user is not allowed to update block', {
-        extensions: { code: 'FORBIDDEN' }
-      })
-    return await this.blockService.update(id, {
-      ...input
-    })
-  }
-
   @ResolveField()
   fullscreen(@Parent() card: Block): boolean {
     if (card.fullscreen != null) return card.fullscreen
diff --git a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
index c9fd8ed3084..f1a5173e7c1 100644
--- a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
+++ b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
@@ -14,7 +14,6 @@ import { Action, AppAbility } from '../../../lib/casl/caslFactory'
 import { AppCaslGuard } from '../../../lib/casl/caslGuard'
 import { CaslAbility } from '../../../lib/CaslAuthModule'
 import { PrismaService } from '../../../lib/prisma.service'
-import { INCLUDE_JOURNEY_ACL } from '../../journey/journey.acl'
 import { BlockService } from '../block.service'
 
 @Resolver('IconBlock')
@@ -24,37 +23,6 @@ export class IconBlockResolver {
     private readonly prismaService: PrismaService
   ) {}
 
-  @Mutation()
-  @UseGuards(AppCaslGuard)
-  async iconBlockCreate(
-    @CaslAbility() ability: AppAbility,
-    @Args('input') input: IconBlockCreateInput
-  ): Promise<Block> {
-    return await this.prismaService.$transaction(async (tx) => {
-      const block = await tx.block.create({
-        data: {
-          ...omit(input, 'parentBlockId', 'journeyId'),
-          id: input.id ?? undefined,
-          typename: 'IconBlock',
-          journey: { connect: { id: input.journeyId } },
-          parentBlock: { connect: { id: input.parentBlockId } },
-          // Icons positions are set via parent block props, cannot be ordered.
-          parentOrder: null
-        },
-        include: {
-          action: true,
-          ...INCLUDE_JOURNEY_ACL
-        }
-      })
-      await this.blockService.setJourneyUpdatedAt(tx, block)
-      if (!ability.can(Action.Update, subject('Journey', block.journey)))
-        throw new GraphQLError('user is not allowed to create block', {
-          extensions: { code: 'FORBIDDEN' }
-        })
-      return block
-    })
-  }
-
   @Mutation()
   @UseGuards(AppCaslGuard)
   async iconBlockUpdate(
diff --git a/apis/api-journeys/src/app/modules/journey/journey.graphql b/apis/api-journeys/src/app/modules/journey/journey.graphql
index 00de0b94b25..acbd41ddf58 100644
--- a/apis/api-journeys/src/app/modules/journey/journey.graphql
+++ b/apis/api-journeys/src/app/modules/journey/journey.graphql
@@ -164,7 +164,6 @@ type PowerBiEmbed @shareable {
 
 extend type Query {
   adminJourneysReport(reportType: JourneysReportType!): PowerBiEmbed
-  adminJourney(id: ID!, idType: IdType): Journey!
   journeys(where: JourneysFilter, options: JourneysQueryOptions): [Journey!]!
   journey(id: ID!, idType: IdType, options: JourneysQueryOptions): Journey!
 }
diff --git a/apis/api-journeys/src/app/modules/journey/journey.resolver.spec.ts b/apis/api-journeys/src/app/modules/journey/journey.resolver.spec.ts
index c2d1d06b62a..f60f63f9796 100644
--- a/apis/api-journeys/src/app/modules/journey/journey.resolver.spec.ts
+++ b/apis/api-journeys/src/app/modules/journey/journey.resolver.spec.ts
@@ -366,60 +366,6 @@ describe('JourneyResolver', () => {
     })
   })
 
-  describe('adminJourney', () => {
-    it('returns journey by slug', async () => {
-      prismaService.journey.findUnique.mockResolvedValueOnce(
-        journeyWithUserTeam
-      )
-      expect(
-        await resolver.adminJourney(ability, 'journey-slug', IdType.slug)
-      ).toEqual(journeyWithUserTeam)
-      expect(prismaService.journey.findUnique).toHaveBeenCalledWith({
-        where: {
-          slug: 'journey-slug'
-        },
-        include: {
-          userJourneys: true,
-          team: {
-            include: { userTeams: true }
-          }
-        }
-      })
-    })
-
-    it('returns journey by id', async () => {
-      prismaService.journey.findUnique.mockResolvedValueOnce(
-        journeyWithUserTeam
-      )
-      expect(
-        await resolver.adminJourney(ability, 'journeyId', IdType.databaseId)
-      ).toEqual(journeyWithUserTeam)
-      expect(prismaService.journey.findUnique).toHaveBeenCalledWith({
-        where: { id: 'journeyId' },
-        include: {
-          userJourneys: true,
-          team: {
-            include: { userTeams: true }
-          }
-        }
-      })
-    })
-
-    it('throws error if not found', async () => {
-      prismaService.journey.findUnique.mockResolvedValueOnce(null)
-      await expect(
-        resolver.adminJourney(ability, 'journeyId', IdType.databaseId)
-      ).rejects.toThrow('journey not found')
-    })
-
-    it('throws error if not authorized', async () => {
-      prismaService.journey.findUnique.mockResolvedValueOnce(journey)
-      await expect(
-        resolver.adminJourney(ability, 'journeyId', IdType.databaseId)
-      ).rejects.toThrow('user is not allowed to view journey')
-    })
-  })
-
   describe('journeys', () => {
     it('returns published journeys', async () => {
       prismaService.journey.findMany.mockResolvedValueOnce([journey, journey])
diff --git a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts
index fc4382ce222..1da958e4c91 100644
--- a/apis/api-journeys/src/app/modules/journey/journey.resolver.ts
+++ b/apis/api-journeys/src/app/modules/journey/journey.resolver.ts
@@ -132,35 +132,6 @@ export class JourneyResolver {
     }
   }
 
-  @Query()
-  @UseGuards(AppCaslGuard)
-  async adminJourney(
-    @CaslAbility() ability: AppAbility,
-    @Args('id') id: string,
-    @Args('idType') idType: IdType = IdType.slug
-  ): Promise<Journey> {
-    const filter: Prisma.JourneyWhereUniqueInput =
-      idType === IdType.slug ? { slug: id } : { id }
-    const journey = await this.prismaService.journey.findUnique({
-      where: filter,
-      include: {
-        userJourneys: true,
-        team: {
-          include: { userTeams: true }
-        }
-      }
-    })
-    if (journey == null)
-      throw new GraphQLError('journey not found', {
-        extensions: { code: 'NOT_FOUND' }
-      })
-    if (!ability.can(Action.Read, subject('Journey', journey)))
-      throw new GraphQLError('user is not allowed to view journey', {
-        extensions: { code: 'FORBIDDEN' }
-      })
-    return journey
-  }
-
   @Query()
   async journeys(
     @Args('where') where?: JourneysFilter,
diff --git a/apis/api-media/schema.graphql b/apis/api-media/schema.graphql
index 64137d644c3..6bf3a12117b 100644
--- a/apis/api-media/schema.graphql
+++ b/apis/api-media/schema.graphql
@@ -23,13 +23,13 @@ interface BaseError {
 
 type BibleBook {
   id: ID!
+  updatedAt: DateTime!
   name(languageId: ID, primary: Boolean): [BibleBookName!]!
   osisId: String!
   alternateName: String
   paratextAbbreviation: String!
   isNewTestament: Boolean!
   order: Int!
-  updatedAt: DateTime!
 }
 
 type BibleBookName {
@@ -267,9 +267,9 @@ input ImageInput {
 
 type Keyword {
   id: ID!
+  updatedAt: DateTime!
   value: String!
   language: Language!
-  updatedAt: DateTime!
 }
 
 input KeywordsFilter {
@@ -1135,9 +1135,9 @@ type Video
   restrictDownloadPlatforms: [Platform!]!
   restrictViewPlatforms: [Platform!]!
   publishedAt: Date
+  updatedAt: DateTime!
   children: [Video!]!
   parents: [Video!]!
-  updatedAt: DateTime!
 }
 
 enum VideoBlockSource {
@@ -1168,10 +1168,10 @@ type VideoDescription {
 
 type VideoEdition {
   id: ID!
+  updatedAt: DateTime!
   name: String
   videoVariants: [VideoVariant!]!
   videoSubtitles: [VideoSubtitle!]!
-  updatedAt: DateTime!
 }
 
 input VideoEditionCreateInput {
@@ -1357,6 +1357,7 @@ input VideoUpdateInput {
 
 type VideoVariant {
   id: ID!
+  updatedAt: DateTime!
 
   """master video file"""
   asset: CloudflareR2
@@ -1382,7 +1383,6 @@ type VideoVariant {
   """version control for master video file"""
   version: Int!
   video: Video
-  updatedAt: DateTime!
 }
 
 input VideoVariantCreateInput {
diff --git a/apps/journeys-admin/__generated__/BlockActionDelete.ts b/apps/journeys-admin/__generated__/BlockActionDelete.ts
index c1c65292ad9..7068c5d4487 100644
--- a/apps/journeys-admin/__generated__/BlockActionDelete.ts
+++ b/apps/journeys-admin/__generated__/BlockActionDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface BlockActionDelete_blockDeleteAction {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/BlockDelete.ts b/apps/journeys-admin/__generated__/BlockDelete.ts
index 3f5780bd143..5e13f45200c 100644
--- a/apps/journeys-admin/__generated__/BlockDelete.ts
+++ b/apps/journeys-admin/__generated__/BlockDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface BlockDelete_blockDelete_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/BlockDeleteForCoverImage.ts b/apps/journeys-admin/__generated__/BlockDeleteForCoverImage.ts
index b26898049ba..9c42b22790b 100644
--- a/apps/journeys-admin/__generated__/BlockDeleteForCoverImage.ts
+++ b/apps/journeys-admin/__generated__/BlockDeleteForCoverImage.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface BlockDeleteForCoverImage_blockDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/BlockOrderUpdate.ts b/apps/journeys-admin/__generated__/BlockOrderUpdate.ts
index 6299edf5524..5fcdb723906 100644
--- a/apps/journeys-admin/__generated__/BlockOrderUpdate.ts
+++ b/apps/journeys-admin/__generated__/BlockOrderUpdate.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface BlockOrderUpdate_blockOrderUpdate {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardCtaDelete.ts b/apps/journeys-admin/__generated__/CardCtaDelete.ts
index 72e7cba1fb7..3aaba7de0a9 100644
--- a/apps/journeys-admin/__generated__/CardCtaDelete.ts
+++ b/apps/journeys-admin/__generated__/CardCtaDelete.ts
@@ -48,73 +48,73 @@ export interface CardCtaDelete_cardBlockUpdate {
 }
 
 export interface CardCtaDelete_endIcon3Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_startIcon3Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_button3Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_endIcon2Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_startIcon2Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_button2Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_endIcon1Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_startIcon1Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_button1Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_titleDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_subtitleDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardCtaDelete_imageDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardFormDelete.ts b/apps/journeys-admin/__generated__/CardFormDelete.ts
index 47efb9c216a..46ebca2c007 100644
--- a/apps/journeys-admin/__generated__/CardFormDelete.ts
+++ b/apps/journeys-admin/__generated__/CardFormDelete.ts
@@ -10,49 +10,49 @@ import { CardBlockUpdateInput, ThemeMode, ThemeName, BlockEventLabel } from "./g
 // ====================================================
 
 export interface CardFormDelete_body {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_endIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_startIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_button {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_textResponse {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_title {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_subtitle {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardFormDelete_image {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardIntroDelete.ts b/apps/journeys-admin/__generated__/CardIntroDelete.ts
index 7c7a3044500..812509274d7 100644
--- a/apps/journeys-admin/__generated__/CardIntroDelete.ts
+++ b/apps/journeys-admin/__generated__/CardIntroDelete.ts
@@ -8,43 +8,43 @@
 // ====================================================
 
 export interface CardIntroDelete_video {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_endIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_startIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_button {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_body {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_title {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardIntroDelete_subtitle {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardPollDelete.ts b/apps/journeys-admin/__generated__/CardPollDelete.ts
index 6e9530d07ed..52ef8c44bb6 100644
--- a/apps/journeys-admin/__generated__/CardPollDelete.ts
+++ b/apps/journeys-admin/__generated__/CardPollDelete.ts
@@ -8,55 +8,55 @@
 // ====================================================
 
 export interface CardPollDelete_bodyDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_radioOption4Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_radioOption3Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_radioOption2Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_radioOption1Delete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_radioQuestionDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_titleDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_subtitleDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardPollDelete_imageDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardQuoteDelete.ts b/apps/journeys-admin/__generated__/CardQuoteDelete.ts
index 44928794c50..557159cd56a 100644
--- a/apps/journeys-admin/__generated__/CardQuoteDelete.ts
+++ b/apps/journeys-admin/__generated__/CardQuoteDelete.ts
@@ -48,25 +48,25 @@ export interface CardQuoteDelete_cardBlockUpdate {
 }
 
 export interface CardQuoteDelete_body {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardQuoteDelete_title {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardQuoteDelete_subtitle {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface CardQuoteDelete_image {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CardVideoDelete.ts b/apps/journeys-admin/__generated__/CardVideoDelete.ts
index 72aa688743e..146459f75fc 100644
--- a/apps/journeys-admin/__generated__/CardVideoDelete.ts
+++ b/apps/journeys-admin/__generated__/CardVideoDelete.ts
@@ -10,7 +10,7 @@ import { VideoBlockSource, VideoBlockObjectFit, ContactActionType, BlockEventLab
 // ====================================================
 
 export interface CardVideoDelete_video_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
 }
 
 export interface CardVideoDelete_video_VideoBlock_subtitleLanguage {
diff --git a/apps/journeys-admin/__generated__/CardVideoRestore.ts b/apps/journeys-admin/__generated__/CardVideoRestore.ts
index 69e4b393ac5..7604f965c05 100644
--- a/apps/journeys-admin/__generated__/CardVideoRestore.ts
+++ b/apps/journeys-admin/__generated__/CardVideoRestore.ts
@@ -10,7 +10,7 @@ import { VideoBlockSource, VideoBlockObjectFit, ContactActionType, BlockEventLab
 // ====================================================
 
 export interface CardVideoRestore_video_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
 }
 
 export interface CardVideoRestore_video_VideoBlock_subtitleLanguage {
diff --git a/apps/journeys-admin/__generated__/CoverBlockDelete.ts b/apps/journeys-admin/__generated__/CoverBlockDelete.ts
index 70409364f01..aeb0143797c 100644
--- a/apps/journeys-admin/__generated__/CoverBlockDelete.ts
+++ b/apps/journeys-admin/__generated__/CoverBlockDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface CoverBlockDelete_blockDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/CoverBlockRestore.ts b/apps/journeys-admin/__generated__/CoverBlockRestore.ts
index 6e2e0e97a0e..bd30d1b00a8 100644
--- a/apps/journeys-admin/__generated__/CoverBlockRestore.ts
+++ b/apps/journeys-admin/__generated__/CoverBlockRestore.ts
@@ -10,7 +10,7 @@ import { VideoBlockSource, VideoBlockObjectFit, ContactActionType, BlockEventLab
 // ====================================================
 
 export interface CoverBlockRestore_blockRestore_StepBlock {
-  __typename: "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/DuplicatedBlock.ts b/apps/journeys-admin/__generated__/DuplicatedBlock.ts
index 5c186eece7d..4b1e5da9b1e 100644
--- a/apps/journeys-admin/__generated__/DuplicatedBlock.ts
+++ b/apps/journeys-admin/__generated__/DuplicatedBlock.ts
@@ -8,6 +8,6 @@
 // ====================================================
 
 export interface DuplicatedBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
diff --git a/apps/journeys-admin/__generated__/GetStepBlocksWithPosition.ts b/apps/journeys-admin/__generated__/GetStepBlocksWithPosition.ts
index 268b270907f..0d13c2d354b 100644
--- a/apps/journeys-admin/__generated__/GetStepBlocksWithPosition.ts
+++ b/apps/journeys-admin/__generated__/GetStepBlocksWithPosition.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface GetStepBlocksWithPosition_blocks_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
 }
 
 export interface GetStepBlocksWithPosition_blocks_StepBlock {
diff --git a/apps/journeys-admin/__generated__/JourneyAiTranslateCreateSubscription.ts b/apps/journeys-admin/__generated__/JourneyAiTranslateCreateSubscription.ts
index 43c150f759f..1b763f8029f 100644
--- a/apps/journeys-admin/__generated__/JourneyAiTranslateCreateSubscription.ts
+++ b/apps/journeys-admin/__generated__/JourneyAiTranslateCreateSubscription.ts
@@ -20,7 +20,7 @@ export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSu
 }
 
 export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSubscription_journey_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/JourneyImageBlockDelete.ts b/apps/journeys-admin/__generated__/JourneyImageBlockDelete.ts
index 83675508676..68f5b1fe439 100644
--- a/apps/journeys-admin/__generated__/JourneyImageBlockDelete.ts
+++ b/apps/journeys-admin/__generated__/JourneyImageBlockDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface JourneyImageBlockDelete_blockDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/MenuBlockDelete.ts b/apps/journeys-admin/__generated__/MenuBlockDelete.ts
index d6f7c940634..b99caba6ed0 100644
--- a/apps/journeys-admin/__generated__/MenuBlockDelete.ts
+++ b/apps/journeys-admin/__generated__/MenuBlockDelete.ts
@@ -10,7 +10,7 @@ import { JourneyUpdateInput } from "./globalTypes";
 // ====================================================
 
 export interface MenuBlockDelete_stepDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/MultiselectWithButtonDelete.ts b/apps/journeys-admin/__generated__/MultiselectWithButtonDelete.ts
index dad698d48c4..e1e41083f58 100644
--- a/apps/journeys-admin/__generated__/MultiselectWithButtonDelete.ts
+++ b/apps/journeys-admin/__generated__/MultiselectWithButtonDelete.ts
@@ -8,37 +8,37 @@
 // ====================================================
 
 export interface MultiselectWithButtonDelete_endIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonDelete_startIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonDelete_button {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonDelete_option2 {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonDelete_option1 {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonDelete_multiselect {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/MultiselectWithButtonRestore.ts b/apps/journeys-admin/__generated__/MultiselectWithButtonRestore.ts
index 5c7cb20583e..5f3654eb19c 100644
--- a/apps/journeys-admin/__generated__/MultiselectWithButtonRestore.ts
+++ b/apps/journeys-admin/__generated__/MultiselectWithButtonRestore.ts
@@ -8,42 +8,42 @@
 // ====================================================
 
 export interface MultiselectWithButtonRestore_multiselect {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonRestore_option1 {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonRestore_option2 {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonRestore_button {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonRestore_startIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
 }
 
 export interface MultiselectWithButtonRestore_endIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentBlockId: string | null;
   parentOrder: number | null;
diff --git a/apps/journeys-admin/__generated__/NewBlock.ts b/apps/journeys-admin/__generated__/NewBlock.ts
index 8246552d277..6b8e26663e2 100644
--- a/apps/journeys-admin/__generated__/NewBlock.ts
+++ b/apps/journeys-admin/__generated__/NewBlock.ts
@@ -8,6 +8,6 @@
 // ====================================================
 
 export interface NewBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
diff --git a/apps/journeys-admin/__generated__/PosterImageBlockDelete.ts b/apps/journeys-admin/__generated__/PosterImageBlockDelete.ts
index e7c11d1d91b..a8b2f83083b 100644
--- a/apps/journeys-admin/__generated__/PosterImageBlockDelete.ts
+++ b/apps/journeys-admin/__generated__/PosterImageBlockDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface PosterImageBlockDelete_blockDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/PosterImageBlockRestore.ts b/apps/journeys-admin/__generated__/PosterImageBlockRestore.ts
index ab34e77081d..ade3b91685a 100644
--- a/apps/journeys-admin/__generated__/PosterImageBlockRestore.ts
+++ b/apps/journeys-admin/__generated__/PosterImageBlockRestore.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface PosterImageBlockRestore_blockRestore_StepBlock {
-  __typename: "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/RadioOptionImageDelete.ts b/apps/journeys-admin/__generated__/RadioOptionImageDelete.ts
index cce996ae7ac..4d42f98d723 100644
--- a/apps/journeys-admin/__generated__/RadioOptionImageDelete.ts
+++ b/apps/journeys-admin/__generated__/RadioOptionImageDelete.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface RadioOptionImageDelete_blockDelete {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/RadioOptionImageRestore.ts b/apps/journeys-admin/__generated__/RadioOptionImageRestore.ts
index cc9b867aeb2..77fe7ad59e6 100644
--- a/apps/journeys-admin/__generated__/RadioOptionImageRestore.ts
+++ b/apps/journeys-admin/__generated__/RadioOptionImageRestore.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface RadioOptionImageRestore_blockRestore_StepBlock {
-  __typename: "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/RestoredBlock.ts b/apps/journeys-admin/__generated__/RestoredBlock.ts
index 9443733c242..12cbc2589c9 100644
--- a/apps/journeys-admin/__generated__/RestoredBlock.ts
+++ b/apps/journeys-admin/__generated__/RestoredBlock.ts
@@ -8,6 +8,6 @@
 // ====================================================
 
 export interface RestoredBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
diff --git a/apps/journeys-admin/__generated__/StepBlockCreateFromAction.ts b/apps/journeys-admin/__generated__/StepBlockCreateFromAction.ts
index 2ba925992b8..cd648a5189e 100644
--- a/apps/journeys-admin/__generated__/StepBlockCreateFromAction.ts
+++ b/apps/journeys-admin/__generated__/StepBlockCreateFromAction.ts
@@ -83,7 +83,7 @@ export interface StepBlockCreateFromAction_cardBlockCreate {
 }
 
 export interface StepBlockCreateFromAction_blockUpdateAction_parentBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/StepBlockCreateFromSocialPreview.ts b/apps/journeys-admin/__generated__/StepBlockCreateFromSocialPreview.ts
index b2d04a68f1c..7ed2591872f 100644
--- a/apps/journeys-admin/__generated__/StepBlockCreateFromSocialPreview.ts
+++ b/apps/journeys-admin/__generated__/StepBlockCreateFromSocialPreview.ts
@@ -83,7 +83,7 @@ export interface StepBlockCreateFromSocialPreview_cardBlockCreate {
 }
 
 export interface StepBlockCreateFromSocialPreview_blockOrderUpdate {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/StepBlockDeleteFromAction.ts b/apps/journeys-admin/__generated__/StepBlockDeleteFromAction.ts
index 5fcfbb71628..95a4361ba46 100644
--- a/apps/journeys-admin/__generated__/StepBlockDeleteFromAction.ts
+++ b/apps/journeys-admin/__generated__/StepBlockDeleteFromAction.ts
@@ -10,7 +10,7 @@ import { BlockUpdateActionInput } from "./globalTypes";
 // ====================================================
 
 export interface StepBlockDeleteFromAction_blockDelete_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
@@ -29,7 +29,7 @@ export interface StepBlockDeleteFromAction_blockDelete_StepBlock {
 export type StepBlockDeleteFromAction_blockDelete = StepBlockDeleteFromAction_blockDelete_ImageBlock | StepBlockDeleteFromAction_blockDelete_StepBlock;
 
 export interface StepBlockDeleteFromAction_blockUpdateAction_parentBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/StepBlockDeleteFromActionWithoutAction.ts b/apps/journeys-admin/__generated__/StepBlockDeleteFromActionWithoutAction.ts
index c199b5a02f9..b7bd25336dc 100644
--- a/apps/journeys-admin/__generated__/StepBlockDeleteFromActionWithoutAction.ts
+++ b/apps/journeys-admin/__generated__/StepBlockDeleteFromActionWithoutAction.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface StepBlockDeleteFromActionWithoutAction_blockDelete_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
@@ -27,7 +27,7 @@ export interface StepBlockDeleteFromActionWithoutAction_blockDelete_StepBlock {
 export type StepBlockDeleteFromActionWithoutAction_blockDelete = StepBlockDeleteFromActionWithoutAction_blockDelete_ImageBlock | StepBlockDeleteFromActionWithoutAction_blockDelete_StepBlock;
 
 export interface StepBlockDeleteFromActionWithoutAction_blockDeleteAction_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/StepBlockDeleteFromSocialPreview.ts b/apps/journeys-admin/__generated__/StepBlockDeleteFromSocialPreview.ts
index 13d0080a6d5..6c5743a41f3 100644
--- a/apps/journeys-admin/__generated__/StepBlockDeleteFromSocialPreview.ts
+++ b/apps/journeys-admin/__generated__/StepBlockDeleteFromSocialPreview.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface StepBlockDeleteFromSocialPreview_blockDelete_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
@@ -27,7 +27,7 @@ export interface StepBlockDeleteFromSocialPreview_blockDelete_StepBlock {
 export type StepBlockDeleteFromSocialPreview_blockDelete = StepBlockDeleteFromSocialPreview_blockDelete_ImageBlock | StepBlockDeleteFromSocialPreview_blockDelete_StepBlock;
 
 export interface StepBlockDeleteFromSocialPreview_blockOrderUpdate {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/StepBlockDeleteFromStep.ts b/apps/journeys-admin/__generated__/StepBlockDeleteFromStep.ts
index db916ece92b..89b0159b8c6 100644
--- a/apps/journeys-admin/__generated__/StepBlockDeleteFromStep.ts
+++ b/apps/journeys-admin/__generated__/StepBlockDeleteFromStep.ts
@@ -10,7 +10,7 @@ import { StepBlockUpdateInput } from "./globalTypes";
 // ====================================================
 
 export interface StepBlockDeleteFromStep_blockDelete_ImageBlock {
-  __typename: "ImageBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/StepBlockRestoreFromAction.ts b/apps/journeys-admin/__generated__/StepBlockRestoreFromAction.ts
index 16e45e2c111..5bbcd71a348 100644
--- a/apps/journeys-admin/__generated__/StepBlockRestoreFromAction.ts
+++ b/apps/journeys-admin/__generated__/StepBlockRestoreFromAction.ts
@@ -631,7 +631,7 @@ export interface StepBlockRestoreFromAction_blockRestore_VideoTriggerBlock {
 export type StepBlockRestoreFromAction_blockRestore = StepBlockRestoreFromAction_blockRestore_GridContainerBlock | StepBlockRestoreFromAction_blockRestore_ButtonBlock | StepBlockRestoreFromAction_blockRestore_CardBlock | StepBlockRestoreFromAction_blockRestore_IconBlock | StepBlockRestoreFromAction_blockRestore_ImageBlock | StepBlockRestoreFromAction_blockRestore_MultiselectOptionBlock | StepBlockRestoreFromAction_blockRestore_MultiselectBlock | StepBlockRestoreFromAction_blockRestore_RadioOptionBlock | StepBlockRestoreFromAction_blockRestore_RadioQuestionBlock | StepBlockRestoreFromAction_blockRestore_SignUpBlock | StepBlockRestoreFromAction_blockRestore_SpacerBlock | StepBlockRestoreFromAction_blockRestore_StepBlock | StepBlockRestoreFromAction_blockRestore_TextResponseBlock | StepBlockRestoreFromAction_blockRestore_TypographyBlock | StepBlockRestoreFromAction_blockRestore_VideoBlock | StepBlockRestoreFromAction_blockRestore_VideoTriggerBlock;
 
 export interface StepBlockRestoreFromAction_blockUpdateAction_parentBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/StepBlockRestoreFromSocialPreview.ts b/apps/journeys-admin/__generated__/StepBlockRestoreFromSocialPreview.ts
index c72e0c015e1..b48547248d5 100644
--- a/apps/journeys-admin/__generated__/StepBlockRestoreFromSocialPreview.ts
+++ b/apps/journeys-admin/__generated__/StepBlockRestoreFromSocialPreview.ts
@@ -631,7 +631,7 @@ export interface StepBlockRestoreFromSocialPreview_blockRestore_VideoTriggerBloc
 export type StepBlockRestoreFromSocialPreview_blockRestore = StepBlockRestoreFromSocialPreview_blockRestore_GridContainerBlock | StepBlockRestoreFromSocialPreview_blockRestore_ButtonBlock | StepBlockRestoreFromSocialPreview_blockRestore_CardBlock | StepBlockRestoreFromSocialPreview_blockRestore_IconBlock | StepBlockRestoreFromSocialPreview_blockRestore_ImageBlock | StepBlockRestoreFromSocialPreview_blockRestore_MultiselectOptionBlock | StepBlockRestoreFromSocialPreview_blockRestore_MultiselectBlock | StepBlockRestoreFromSocialPreview_blockRestore_RadioOptionBlock | StepBlockRestoreFromSocialPreview_blockRestore_RadioQuestionBlock | StepBlockRestoreFromSocialPreview_blockRestore_SignUpBlock | StepBlockRestoreFromSocialPreview_blockRestore_SpacerBlock | StepBlockRestoreFromSocialPreview_blockRestore_StepBlock | StepBlockRestoreFromSocialPreview_blockRestore_TextResponseBlock | StepBlockRestoreFromSocialPreview_blockRestore_TypographyBlock | StepBlockRestoreFromSocialPreview_blockRestore_VideoBlock | StepBlockRestoreFromSocialPreview_blockRestore_VideoTriggerBlock;
 
 export interface StepBlockRestoreFromSocialPreview_blockOrderUpdate {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/TestJourney.ts b/apps/journeys-admin/__generated__/TestJourney.ts
index dd05450786d..14c353edcd2 100644
--- a/apps/journeys-admin/__generated__/TestJourney.ts
+++ b/apps/journeys-admin/__generated__/TestJourney.ts
@@ -8,7 +8,7 @@
 // ====================================================
 
 export interface TestJourney_journey_blocks {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/TextResponseWithButtonDelete.ts b/apps/journeys-admin/__generated__/TextResponseWithButtonDelete.ts
index be77b339b9d..9d10d0b941a 100644
--- a/apps/journeys-admin/__generated__/TextResponseWithButtonDelete.ts
+++ b/apps/journeys-admin/__generated__/TextResponseWithButtonDelete.ts
@@ -8,25 +8,25 @@
 // ====================================================
 
 export interface TextResponseWithButtonDelete_endIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface TextResponseWithButtonDelete_startIcon {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface TextResponseWithButtonDelete_button {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
 
 export interface TextResponseWithButtonDelete_textResponse {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioOptionBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "TextResponseBlock" | "TypographyBlock" | "ButtonBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
   parentOrder: number | null;
 }
diff --git a/apps/journeys-admin/__generated__/TranslatedJourney.ts b/apps/journeys-admin/__generated__/TranslatedJourney.ts
index da3f152c073..a315322fa05 100644
--- a/apps/journeys-admin/__generated__/TranslatedJourney.ts
+++ b/apps/journeys-admin/__generated__/TranslatedJourney.ts
@@ -20,7 +20,7 @@ export interface TranslatedJourney_language {
 }
 
 export interface TranslatedJourney_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys-admin/__generated__/globalTypes.ts b/apps/journeys-admin/__generated__/globalTypes.ts
index 53e64f186bc..e3474fe6b6c 100644
--- a/apps/journeys-admin/__generated__/globalTypes.ts
+++ b/apps/journeys-admin/__generated__/globalTypes.ts
@@ -494,6 +494,11 @@ export interface CustomDomainUpdateInput {
   routeAllTeamJourneys?: boolean | null;
 }
 
+export interface DateTimeFilter {
+  gte?: any | null;
+  lte?: any | null;
+}
+
 export interface EmailActionInput {
   gtmEventName?: string | null;
   email: string;
@@ -723,7 +728,7 @@ export interface LanguagesFilter {
   ids?: string[] | null;
   bcp47?: string[] | null;
   iso3?: string[] | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 export interface LinkActionInput {
diff --git a/apps/journeys/__generated__/JourneyAiTranslateCreateSubscription.ts b/apps/journeys/__generated__/JourneyAiTranslateCreateSubscription.ts
index 43c150f759f..1b763f8029f 100644
--- a/apps/journeys/__generated__/JourneyAiTranslateCreateSubscription.ts
+++ b/apps/journeys/__generated__/JourneyAiTranslateCreateSubscription.ts
@@ -20,7 +20,7 @@ export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSu
 }
 
 export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSubscription_journey_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys/__generated__/TranslatedJourney.ts b/apps/journeys/__generated__/TranslatedJourney.ts
index da3f152c073..a315322fa05 100644
--- a/apps/journeys/__generated__/TranslatedJourney.ts
+++ b/apps/journeys/__generated__/TranslatedJourney.ts
@@ -20,7 +20,7 @@ export interface TranslatedJourney_language {
 }
 
 export interface TranslatedJourney_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/journeys/__generated__/globalTypes.ts b/apps/journeys/__generated__/globalTypes.ts
index 7f25b1ca4e2..7c7621e6f75 100644
--- a/apps/journeys/__generated__/globalTypes.ts
+++ b/apps/journeys/__generated__/globalTypes.ts
@@ -292,6 +292,11 @@ export interface ChatOpenEventCreateInput {
   value?: MessagePlatform | null;
 }
 
+export interface DateTimeFilter {
+  gte?: any | null;
+  lte?: any | null;
+}
+
 export interface JourneyProfileUpdateInput {
   lastActiveTeamId?: string | null;
   journeyFlowBackButtonClicked?: boolean | null;
@@ -330,7 +335,7 @@ export interface LanguagesFilter {
   ids?: string[] | null;
   bcp47?: string[] | null;
   iso3?: string[] | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 export interface MultiselectSubmissionEventCreateInput {
diff --git a/apps/resources/__generated__/JourneyAiTranslateCreateSubscription.ts b/apps/resources/__generated__/JourneyAiTranslateCreateSubscription.ts
index 43c150f759f..1b763f8029f 100644
--- a/apps/resources/__generated__/JourneyAiTranslateCreateSubscription.ts
+++ b/apps/resources/__generated__/JourneyAiTranslateCreateSubscription.ts
@@ -20,7 +20,7 @@ export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSu
 }
 
 export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSubscription_journey_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/resources/__generated__/TranslatedJourney.ts b/apps/resources/__generated__/TranslatedJourney.ts
index da3f152c073..a315322fa05 100644
--- a/apps/resources/__generated__/TranslatedJourney.ts
+++ b/apps/resources/__generated__/TranslatedJourney.ts
@@ -20,7 +20,7 @@ export interface TranslatedJourney_language {
 }
 
 export interface TranslatedJourney_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/resources/__generated__/globalTypes.ts b/apps/resources/__generated__/globalTypes.ts
index 2e022a4f4d9..57cc571cd1e 100644
--- a/apps/resources/__generated__/globalTypes.ts
+++ b/apps/resources/__generated__/globalTypes.ts
@@ -298,6 +298,11 @@ export interface ChatOpenEventCreateInput {
   value?: MessagePlatform | null;
 }
 
+export interface DateTimeFilter {
+  gte?: any | null;
+  lte?: any | null;
+}
+
 export interface JourneyProfileUpdateInput {
   lastActiveTeamId?: string | null;
   journeyFlowBackButtonClicked?: boolean | null;
@@ -329,7 +334,7 @@ export interface LanguagesFilter {
   ids?: string[] | null;
   bcp47?: string[] | null;
   iso3?: string[] | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 export interface MultiselectSubmissionEventCreateInput {
@@ -459,7 +464,7 @@ export interface VideosFilter {
   subtitleLanguageIds?: string[] | null;
   published?: boolean | null;
   locked?: boolean | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 //==============================================================
diff --git a/apps/watch/__generated__/JourneyAiTranslateCreateSubscription.ts b/apps/watch/__generated__/JourneyAiTranslateCreateSubscription.ts
index 43c150f759f..1b763f8029f 100644
--- a/apps/watch/__generated__/JourneyAiTranslateCreateSubscription.ts
+++ b/apps/watch/__generated__/JourneyAiTranslateCreateSubscription.ts
@@ -20,7 +20,7 @@ export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSu
 }
 
 export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSubscription_journey_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/watch/__generated__/TranslatedJourney.ts b/apps/watch/__generated__/TranslatedJourney.ts
index da3f152c073..a315322fa05 100644
--- a/apps/watch/__generated__/TranslatedJourney.ts
+++ b/apps/watch/__generated__/TranslatedJourney.ts
@@ -20,7 +20,7 @@ export interface TranslatedJourney_language {
 }
 
 export interface TranslatedJourney_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/apps/watch/__generated__/globalTypes.ts b/apps/watch/__generated__/globalTypes.ts
index 2e022a4f4d9..57cc571cd1e 100644
--- a/apps/watch/__generated__/globalTypes.ts
+++ b/apps/watch/__generated__/globalTypes.ts
@@ -298,6 +298,11 @@ export interface ChatOpenEventCreateInput {
   value?: MessagePlatform | null;
 }
 
+export interface DateTimeFilter {
+  gte?: any | null;
+  lte?: any | null;
+}
+
 export interface JourneyProfileUpdateInput {
   lastActiveTeamId?: string | null;
   journeyFlowBackButtonClicked?: boolean | null;
@@ -329,7 +334,7 @@ export interface LanguagesFilter {
   ids?: string[] | null;
   bcp47?: string[] | null;
   iso3?: string[] | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 export interface MultiselectSubmissionEventCreateInput {
@@ -459,7 +464,7 @@ export interface VideosFilter {
   subtitleLanguageIds?: string[] | null;
   published?: boolean | null;
   locked?: boolean | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 //==============================================================
diff --git a/libs/journeys/ui/__generated__/globalTypes.ts b/libs/journeys/ui/__generated__/globalTypes.ts
index 62ca8e780be..cdfff8331c9 100644
--- a/libs/journeys/ui/__generated__/globalTypes.ts
+++ b/libs/journeys/ui/__generated__/globalTypes.ts
@@ -274,6 +274,11 @@ export interface ChatOpenEventCreateInput {
   value?: MessagePlatform | null;
 }
 
+export interface DateTimeFilter {
+  gte?: any | null;
+  lte?: any | null;
+}
+
 export interface JourneyProfileUpdateInput {
   lastActiveTeamId?: string | null;
   journeyFlowBackButtonClicked?: boolean | null;
@@ -305,7 +310,7 @@ export interface LanguagesFilter {
   ids?: string[] | null;
   bcp47?: string[] | null;
   iso3?: string[] | null;
-  updatedAt?: any | null;
+  updatedAt?: DateTimeFilter | null;
 }
 
 export interface MultiselectSubmissionEventCreateInput {
diff --git a/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/JourneyAiTranslateCreateSubscription.ts b/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/JourneyAiTranslateCreateSubscription.ts
index 43c150f759f..1b763f8029f 100644
--- a/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/JourneyAiTranslateCreateSubscription.ts
+++ b/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/JourneyAiTranslateCreateSubscription.ts
@@ -20,7 +20,7 @@ export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSu
 }
 
 export interface JourneyAiTranslateCreateSubscription_journeyAiTranslateCreateSubscription_journey_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 
diff --git a/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/TranslatedJourney.ts b/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/TranslatedJourney.ts
index da3f152c073..a315322fa05 100644
--- a/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/TranslatedJourney.ts
+++ b/libs/journeys/ui/src/libs/useJourneyAiTranslateSubscription/__generated__/TranslatedJourney.ts
@@ -20,7 +20,7 @@ export interface TranslatedJourney_language {
 }
 
 export interface TranslatedJourney_blocks_ImageBlock {
-  __typename: "ImageBlock" | "StepBlock" | "CardBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
+  __typename: "ImageBlock" | "StepBlock" | "IconBlock" | "RadioQuestionBlock" | "SignUpBlock" | "SpacerBlock" | "CardBlock" | "MultiselectBlock" | "MultiselectOptionBlock" | "VideoBlock" | "GridContainerBlock" | "GridItemBlock" | "VideoTriggerBlock";
   id: string;
 }
 

From 9aa3a7994a0ff124f3e3c477d8b9d21028a5eab5 Mon Sep 17 00:00:00 2001
From: Mike Allison <dj.mikeallison@gmail.com>
Date: Thu, 26 Mar 2026 23:20:02 +0000
Subject: [PATCH 2/3] refactor: update IconBlockCreateInput and related
 mutations for modern API alignment

- Reintroduced `iconBlockCreate` mutation in `api-gateway` and `api-journeys` schemas with updated input type.
- Removed deprecated `iconBlockCreate` definitions from previous locations.
- Ensured consistency in `IconBlockCreateInput` across schemas.
- Cleaned up related resolver files by removing unused imports and tests for the removed mutation.
---
 apis/api-gateway/schema.graphql               | 26 ++++----
 apis/api-journeys/schema.graphql              | 13 ----
 .../src/app/__generated__/graphql.ts          | 11 ----
 .../src/app/modules/block/icon/icon.graphql   | 13 ----
 .../modules/block/icon/icon.resolver.spec.ts  | 63 -------------------
 .../app/modules/block/icon/icon.resolver.ts   |  6 +-
 6 files changed, 14 insertions(+), 118 deletions(-)

diff --git a/apis/api-gateway/schema.graphql b/apis/api-gateway/schema.graphql
index 614b6ad6967..6adda331451 100644
--- a/apis/api-gateway/schema.graphql
+++ b/apis/api-gateway/schema.graphql
@@ -168,7 +168,6 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   blockRestore is used for redo/undo
   """
   blockRestore(id: ID!) : [Block!]! @join__field(graph: API_JOURNEYS) 
-  iconBlockCreate(input: IconBlockCreateInput!) : IconBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   iconBlockUpdate(
     id: ID!
     input: IconBlockUpdateInput!
@@ -360,6 +359,7 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
     """
     journeyId: ID
   ): CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  iconBlockCreate(input: IconBlockCreateInput!) : IconBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   multiselectBlockCreate(input: MultiselectBlockCreateInput!) : MultiselectBlock! @join__field(graph: API_JOURNEYS_MODERN) 
   multiselectBlockUpdate(
     id: ID!
@@ -3921,18 +3921,6 @@ input ButtonBlockSettingsInput @join__type(graph: API_JOURNEYS)  @join__type(gra
   color: String
 }
 
-input IconBlockCreateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
-  """
-  ID should be unique Response UUID (Provided for optimistic mutation result matching)
-  """
-  id: ID
-  parentBlockId: ID!
-  journeyId: ID!
-  name: IconName
-  color: IconColor
-  size: IconSize
-}
-
 input IconBlockUpdateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
   name: IconName
   color: IconColor
@@ -4800,6 +4788,18 @@ input GoogleSheetsSyncsFilter @join__type(graph: API_JOURNEYS_MODERN)  {
   integrationId: ID
 }
 
+input IconBlockCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
+  """
+  ID should be unique Response UUID (Provided for optimistic mutation result matching)
+  """
+  id: ID
+  parentBlockId: ID!
+  journeyId: ID!
+  name: IconName
+  color: IconColor
+  size: IconSize
+}
+
 input IntegrationGoogleCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
   teamId: String!
   code: String!
diff --git a/apis/api-journeys/schema.graphql b/apis/api-journeys/schema.graphql
index 8a31d4c2f11..a613616170d 100644
--- a/apis/api-journeys/schema.graphql
+++ b/apis/api-journeys/schema.graphql
@@ -338,7 +338,6 @@ type Mutation {
 
   """blockRestore is used for redo/undo"""
   blockRestore(id: ID!): [Block!]!
-  iconBlockCreate(input: IconBlockCreateInput!): IconBlock!
   iconBlockUpdate(
     id: ID!
     input: IconBlockUpdateInput!
@@ -707,18 +706,6 @@ type IconBlock implements Block
   size: IconSize @shareable
 }
 
-input IconBlockCreateInput {
-  """
-  ID should be unique Response UUID (Provided for optimistic mutation result matching)
-  """
-  id: ID
-  parentBlockId: ID!
-  journeyId: ID!
-  name: IconName
-  color: IconColor
-  size: IconSize
-}
-
 input IconBlockUpdateInput {
   name: IconName
   color: IconColor
diff --git a/apis/api-journeys/src/app/__generated__/graphql.ts b/apis/api-journeys/src/app/__generated__/graphql.ts
index dd4d61398d2..bc4b177b087 100644
--- a/apis/api-journeys/src/app/__generated__/graphql.ts
+++ b/apis/api-journeys/src/app/__generated__/graphql.ts
@@ -321,15 +321,6 @@ export class ButtonBlockSettingsInput {
     color?: Nullable<string>;
 }
 
-export class IconBlockCreateInput {
-    id?: Nullable<string>;
-    parentBlockId: string;
-    journeyId: string;
-    name?: Nullable<IconName>;
-    color?: Nullable<IconColor>;
-    size?: Nullable<IconSize>;
-}
-
 export class IconBlockUpdateInput {
     name?: Nullable<IconName>;
     color?: Nullable<IconColor>;
@@ -1007,8 +998,6 @@ export abstract class IMutation {
 
     abstract blockRestore(id: string): Block[] | Promise<Block[]>;
 
-    abstract iconBlockCreate(input: IconBlockCreateInput): IconBlock | Promise<IconBlock>;
-
     abstract iconBlockUpdate(id: string, input: IconBlockUpdateInput, journeyId?: Nullable<string>): IconBlock | Promise<IconBlock>;
 
     abstract imageBlockCreate(input: ImageBlockCreateInput): ImageBlock | Promise<ImageBlock>;
diff --git a/apis/api-journeys/src/app/modules/block/icon/icon.graphql b/apis/api-journeys/src/app/modules/block/icon/icon.graphql
index b78ca1fea36..148e9d88d83 100644
--- a/apis/api-journeys/src/app/modules/block/icon/icon.graphql
+++ b/apis/api-journeys/src/app/modules/block/icon/icon.graphql
@@ -60,18 +60,6 @@ type IconBlock implements Block @shareable {
   size: IconSize @shareable
 }
 
-input IconBlockCreateInput {
-  """
-  ID should be unique Response UUID (Provided for optimistic mutation result matching)
-  """
-  id: ID
-  parentBlockId: ID!
-  journeyId: ID!
-  name: IconName
-  color: IconColor
-  size: IconSize
-}
-
 input IconBlockUpdateInput {
   name: IconName
   color: IconColor
@@ -79,7 +67,6 @@ input IconBlockUpdateInput {
 }
 
 extend type Mutation {
-  iconBlockCreate(input: IconBlockCreateInput!): IconBlock!
   iconBlockUpdate(
     id: ID!
     input: IconBlockUpdateInput!
diff --git a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.spec.ts b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.spec.ts
index 92279d51fe0..6bc458d2c14 100644
--- a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.spec.ts
+++ b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.spec.ts
@@ -4,7 +4,6 @@ import { DeepMockProxy, mockDeep } from 'jest-mock-extended'
 import { Block, Journey, UserTeamRole } from '@core/prisma/journeys/client'
 
 import {
-  IconBlockCreateInput,
   IconBlockUpdateInput,
   IconColor,
   IconName,
@@ -41,14 +40,6 @@ describe('Icon', () => {
     ...block,
     journey
   }
-  const blockCreateInput: IconBlockCreateInput = {
-    id: 'blockId',
-    parentBlockId: 'parentBlockId',
-    journeyId: 'journeyId',
-    name: IconName.ArrowForwardRounded,
-    color: IconColor.secondary,
-    size: IconSize.lg
-  }
   const blockUpdateInput: IconBlockUpdateInput = {
     name: IconName.PlayArrowRounded,
     color: IconColor.primary,
@@ -80,60 +71,6 @@ describe('Icon', () => {
     ability = await new AppCaslFactory().createAbility({ id: 'userId' })
   })
 
-  describe('iconBlockCreate', () => {
-    beforeEach(() => {
-      prismaService.$transaction.mockImplementation(
-        async (callback) => await callback(prismaService)
-      )
-    })
-
-    it('creates an IconBlock', async () => {
-      prismaService.block.create.mockResolvedValueOnce(blockWithUserTeam)
-      expect(await resolver.iconBlockCreate(ability, blockCreateInput)).toEqual(
-        blockWithUserTeam
-      )
-      expect(prismaService.block.create).toHaveBeenCalledWith({
-        data: {
-          color: 'secondary',
-          id: 'blockId',
-          journey: { connect: { id: 'journeyId' } },
-          name: 'ArrowForwardRounded',
-          parentBlock: { connect: { id: 'parentBlockId' } },
-          parentOrder: null,
-          size: 'lg',
-          typename: 'IconBlock'
-        },
-        include: {
-          action: true,
-          journey: {
-            include: {
-              team: { include: { userTeams: true } },
-              userJourneys: true
-            }
-          }
-        }
-      })
-    })
-
-    it('should set journey updatedAt when IconBlock is created', async () => {
-      prismaService.block.create.mockResolvedValueOnce(blockWithUserTeam)
-      expect(await resolver.iconBlockCreate(ability, blockCreateInput)).toEqual(
-        blockWithUserTeam
-      )
-      expect(service.setJourneyUpdatedAt).toHaveBeenCalledWith(
-        prismaService,
-        blockWithUserTeam
-      )
-    })
-
-    it('throws error if not authorized', async () => {
-      prismaService.block.create.mockResolvedValueOnce(block)
-      await expect(
-        resolver.iconBlockCreate(ability, blockCreateInput)
-      ).rejects.toThrow('user is not allowed to create block')
-    })
-  })
-
   describe('iconBlockUpdate', () => {
     it('updates a IconBlock', async () => {
       prismaService.block.findUnique.mockResolvedValueOnce(blockWithUserTeam)
diff --git a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
index f1a5173e7c1..f92d0786dfc 100644
--- a/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
+++ b/apis/api-journeys/src/app/modules/block/icon/icon.resolver.ts
@@ -2,14 +2,10 @@ import { subject } from '@casl/ability'
 import { UseGuards } from '@nestjs/common'
 import { Args, Mutation, Resolver } from '@nestjs/graphql'
 import { GraphQLError } from 'graphql'
-import omit from 'lodash/omit'
 
 import { Block } from '@core/prisma/journeys/client'
 
-import {
-  IconBlockCreateInput,
-  IconBlockUpdateInput
-} from '../../../__generated__/graphql'
+import { IconBlockUpdateInput } from '../../../__generated__/graphql'
 import { Action, AppAbility } from '../../../lib/casl/caslFactory'
 import { AppCaslGuard } from '../../../lib/casl/caslGuard'
 import { CaslAbility } from '../../../lib/CaslAuthModule'

From 4936a9639718e8e30bcab9292ba1ab930d388f51 Mon Sep 17 00:00:00 2001
From: Mike Allison <dj.mikeallison@gmail.com>
Date: Fri, 27 Mar 2026 19:12:39 +0000
Subject: [PATCH 3/3] refactor: update cardBlockCreate mutation for API
 journeys modern alignment

- Added an override directive to the cardBlockCreate mutation in both api-gateway and api-journeys-modern schemas to ensure consistency in API behavior.
- Updated the resolver for cardBlockCreate to include the override configuration, enhancing clarity in the mutation's origin.
---
 apis/api-gateway/schema.graphql                                | 2 +-
 apis/api-journeys-modern/schema.graphql                        | 2 +-
 .../src/schema/block/card/cardBlockCreate.mutation.ts          | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apis/api-gateway/schema.graphql b/apis/api-gateway/schema.graphql
index 6adda331451..69562b717ea 100644
--- a/apis/api-gateway/schema.graphql
+++ b/apis/api-gateway/schema.graphql
@@ -350,7 +350,7 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
     """
     journeyId: ID
   ): ButtonBlock @join__field(graph: API_JOURNEYS_MODERN) 
-  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN) 
+  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   cardBlockUpdate(
     id: ID!
     input: CardBlockUpdateInput!
diff --git a/apis/api-journeys-modern/schema.graphql b/apis/api-journeys-modern/schema.graphql
index 5aaa9ece8e3..0a2e75bcab4 100644
--- a/apis/api-journeys-modern/schema.graphql
+++ b/apis/api-journeys-modern/schema.graphql
@@ -1345,7 +1345,7 @@ type Mutation {
     """drop this parameter after merging teams"""
     journeyId: ID
   ): ButtonBlock
-  cardBlockCreate(input: CardBlockCreateInput!): CardBlock!
+  cardBlockCreate(input: CardBlockCreateInput!): CardBlock! @override(from: "api-journeys")
   cardBlockUpdate(
     id: ID!
     input: CardBlockUpdateInput!
diff --git a/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts b/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
index 5f33714aa27..abda9103d95 100644
--- a/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
+++ b/apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts
@@ -20,6 +20,9 @@ builder.mutationField('cardBlockCreate', (t) =>
     args: {
       input: t.arg({ type: CardBlockCreateInput, required: true })
     },
+    override: {
+      from: 'api-journeys'
+    },
     resolve: async (_parent, args, context) => {
       const { input: initialInput } = args
       const input = { ...initialInput }