From 8049da150a859f283fa373d76a66af2eea0b75da Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Tue, 17 Mar 2026 14:18:32 +0100
Subject: [PATCH 01/15] feat(campaigns): add transactional/subscriptions
 campaigns support

- Introduced a new `transactional` field in the Campaign model to differentiate between transactional and non-transactional campaigns.
- Updated the campaign creation and update endpoints to handle the new `transactional` field.
- Implemented validation to ensure that a campaign cannot be both transactional and linked to a subscription.
- Modified the UI to include a toggle for setting a campaign as transactional and to conditionally display subscription options based on this setting.
- Updated database schema with migrations to add the `transactional` column to the campaigns table.
- Enhanced tests to cover new transactional logic and ensure proper handling of subscription channel compatibility.
---
 console/src/oapi/management.generated.ts      |  70 ++++++
 console/src/types.ts                          |   7 +-
 .../src/views/campaign/CampaignDetails.tsx    | 151 +++++++++++--
 console/src/views/campaign/Campaigns.tsx      |  89 +++++---
 console/src/views/campaign/CreateCampaign.tsx | 168 ++++++++++++++-
 console/src/views/campaign/setup/Setup.tsx    |  89 +++++++-
 .../views/campaign/template/mail/Setup.tsx    |  13 +-
 .../controllers/v1/management/campaigns.go    |  80 ++++++-
 .../v1/management/campaigns_test.go           | 117 +++++++++-
 .../v1/management/oapi/resources.yml          |  13 ++
 .../v1/management/oapi/resources_gen.go       |  10 +-
 internal/pubsub/consumer/campaigns.go         |   2 +-
 internal/pubsub/consumer/campaigns_test.go    |  82 +++++++
 internal/store/management/campaigns.go        |  46 ++--
 ...34_add_transactional_to_campaigns.down.sql |   7 +
 ...6034_add_transactional_to_campaigns.up.sql |   3 +
 .../1764106035_sender_identities.down.sql     |  64 ++++++
 .../1764106035_sender_identities.up.sql       | 204 ++++++++++++++++++
 internal/store/management/subscriptions.go    |  12 +-
 internal/wasm/test/action.wasm                | Bin 504767 -> 504763 bytes
 internal/wasm/test/provider.wasm              | Bin 506003 -> 505999 bytes
 21 files changed, 1122 insertions(+), 105 deletions(-)
 create mode 100644 internal/pubsub/consumer/campaigns_test.go
 create mode 100644 internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql
 create mode 100644 internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql
 create mode 100644 internal/store/management/migrations/1764106035_sender_identities.down.sql
 create mode 100644 internal/store/management/migrations/1764106035_sender_identities.up.sql

diff --git a/console/src/oapi/management.generated.ts b/console/src/oapi/management.generated.ts
index 838377a7..d777410a 100644
--- a/console/src/oapi/management.generated.ts
+++ b/console/src/oapi/management.generated.ts
@@ -164,6 +164,26 @@ export interface paths {
         patch: operations["updateTemplate"];
         trace?: never;
     };
+    "/api/admin/projects/{projectID}/campaigns/{campaignID}/templates/{templateID}/test": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        get?: never;
+        put?: never;
+        /**
+         * Send test
+         * @description Sends a test message using the template to the specified recipient
+         */
+        post: operations["sendTest"];
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/api/admin/projects/{projectID}/campaigns/{campaignID}/duplicate": {
         parameters: {
             query?: never;
@@ -2163,6 +2183,8 @@ export interface components {
             provider_id?: string;
             /** Format: uuid */
             subscription_id?: string;
+            /** @example false */
+            transactional?: boolean;
         };
         UpdateCampaign: {
             /** @example epic hopper */
@@ -2172,6 +2194,10 @@ export interface components {
              * @example 5143f27c-cca9-4dc4-9059-e1dbb08144ad
              */
             provider_id?: string;
+            /** Format: uuid */
+            subscription_id?: string;
+            /** @example false */
+            transactional?: boolean;
             variables?: components["schemas"]["CampaignVariable"][];
         };
         CampaignVariable: {
@@ -2203,6 +2229,18 @@ export interface components {
                 [key: string]: unknown;
             } | null;
         };
+        SendTest: {
+            /**
+             * Format: email
+             * @description The recipient address to send the test to
+             * @example test@example.com
+             */
+            to: string;
+            /** @description Optional template variables/props for rendering */
+            props?: {
+                [key: string]: unknown;
+            };
+        };
         Campaign: {
             /**
              * Format: date-time
@@ -2226,6 +2264,8 @@ export interface components {
             channel: components["schemas"]["Channel"];
             /** Format: uuid */
             subscription_id?: string;
+            /** @example false */
+            transactional: boolean;
             provider?: components["schemas"]["Provider"];
             templates: components["schemas"]["Template"][];
             variables?: components["schemas"]["CampaignVariable"][];
@@ -3986,6 +4026,36 @@ export interface operations {
             default: components["responses"]["Error"];
         };
     };
+    sendTest: {
+        parameters: {
+            query?: never;
+            header?: never;
+            path: {
+                /** @description The project ID */
+                projectID: string;
+                /** @description The campaign ID */
+                campaignID: string;
+                /** @description The template ID */
+                templateID: string;
+            };
+            cookie?: never;
+        };
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["SendTest"];
+            };
+        };
+        responses: {
+            /** @description Test sent successfully */
+            204: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content?: never;
+            };
+            default: components["responses"]["Error"];
+        };
+    };
     duplicateCampaign: {
         parameters: {
             query?: never;
diff --git a/console/src/types.ts b/console/src/types.ts
index 90fabd7f..8fad52d8 100644
--- a/console/src/types.ts
+++ b/console/src/types.ts
@@ -578,6 +578,7 @@ export interface Campaign {
     provider?: Provider
     subscription_id?: UUID
     subscription?: Subscription
+    transactional?: boolean
     templates: Template[]
     variables: CampaignVariable[]
     created_at: string
@@ -587,9 +588,9 @@ export interface Campaign {
 export type CampaignSendState = "pending" | "sent" | "throttled" | "failed" | "bounced" | "aborted"
 
 export type CampaignUpdateParams = Partial<
-    Pick<Campaign, "name" | "provider_id" | "subscription_id" | "variables">
->
-export type CampaignCreateParams = Pick<Campaign, "name" | "channel">
+    Pick<Campaign, "name" | "provider_id" | "subscription_id" | "transactional" | "variables">
+> & { state?: string }
+export type CampaignCreateParams = Pick<Campaign, "name" | "channel" | "subscription_id" | "transactional">
 export type CampaignUser = User & { state: CampaignSendState; send_at: string }
 
 interface NamedEmail {
diff --git a/console/src/views/campaign/CampaignDetails.tsx b/console/src/views/campaign/CampaignDetails.tsx
index 4039bbfc..9be0a0a8 100644
--- a/console/src/views/campaign/CampaignDetails.tsx
+++ b/console/src/views/campaign/CampaignDetails.tsx
@@ -1,11 +1,12 @@
-import { useContext, useState, useEffect } from "react"
+import { useCallback, useContext, useMemo, useState, useEffect } from "react"
 import { CampaignContext, ProjectContext, TemplateContext } from "@/contexts"
-import type { Campaign, Template, User } from "@/types"
+import type { Campaign, Template, Subscription } from "@/types"
 import { useTranslation } from "react-i18next"
 import { Controller, useForm } from "react-hook-form"
 import { z } from "zod"
 import { zodResolver } from "@hookform/resolvers/zod"
-import api from "@/api"
+import oapiClient from "@/oapi/client"
+import { useResolver } from "@/hooks"
 
 import { channels } from "./template/channels"
 import { CampaignVariables } from "./CampaignVariables"
@@ -16,6 +17,15 @@ import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/c
 import { Input } from "@/components/ui/input"
 import { Button } from "@/components/ui/button"
 import { ProviderSelect } from "@/components/provider/select"
+import { Switch } from "@/components/ui/switch"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
 
 const campaignVariableSchema = z.object({
     name: z.string(),
@@ -36,6 +46,27 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
     const [, setCampaign] = useContext(CampaignContext)
     const templateState = useState<Template>(template)
     const [isSubmitting, setIsSubmitting] = useState(false)
+    const [transactional, setTransactional] = useState(campaign.transactional ?? false)
+    const [subscriptionId, setSubscriptionId] = useState<string>(campaign.subscription_id ?? "")
+
+    const [subscriptions] = useResolver(
+        useCallback(async (): Promise<Subscription[]> => {
+            if (!project?.id) return []
+            const { data } = await oapiClient.GET("/api/admin/projects/{projectID}/subscriptions", {
+                params: {
+                    path: { projectID: project.id },
+                    query: { limit: 100 },
+                },
+            })
+            return data?.results ?? []
+        }, [project?.id]),
+    )
+
+    const filteredSubscriptions = useMemo(() => {
+        return (subscriptions ?? []).filter((s) => {
+            return s.channel === campaign.channel
+        })
+    }, [subscriptions, campaign.channel])
 
     const form = useForm<CampaignReviewFormData>({
         resolver: zodResolver(campaignSchema),
@@ -59,13 +90,41 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
 
         setIsSubmitting(true)
         try {
-            const updatedCampaign = await api.campaigns.update(project.id, campaign.id, {
-                name: data.name,
-                ...(data.provider_id ? { provider_id: data.provider_id } : {}),
-                variables: data.variables.filter((v) => v.name),
-            })
+            const { data: updatedCampaign } = await oapiClient.PATCH(
+                "/api/admin/projects/{projectID}/campaigns/{campaignID}",
+                {
+                    params: {
+                        path: { projectID: project.id, campaignID: campaign.id },
+                    },
+                    body: {
+                        name: data.name,
+                        ...(data.provider_id ? { provider_id: data.provider_id } : {}),
+                        transactional,
+                        subscription_id: transactional ? undefined : subscriptionId || undefined,
+                        variables: data.variables.filter((v) => v.name),
+                    },
+                },
+            )
 
-            setCampaign(updatedCampaign)
+            if (updatedCampaign) {
+                setCampaign((prevCampaign) => ({
+                    ...prevCampaign,
+                    name: updatedCampaign.name,
+                    updated_at: updatedCampaign.updated_at,
+                    delivery: updatedCampaign.delivery,
+                    subscription_id: updatedCampaign.subscription_id,
+                    transactional: updatedCampaign.transactional,
+                    provider: updatedCampaign.provider
+                        ? {
+                              ...prevCampaign.provider,
+                              ...updatedCampaign.provider,
+                                                            data: updatedCampaign.provider.data ?? prevCampaign.provider?.data ?? {},
+                              setup: prevCampaign.provider?.setup ?? [],
+                          }
+                        : undefined,
+                    variables: updatedCampaign.variables ?? [],
+                }))
+            }
         } finally {
             setIsSubmitting(false)
         }
@@ -133,6 +192,69 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
                                 />
                             </FieldGroup>
 
+                            <div className="flex items-center justify-between rounded-md border p-3">
+                                <div className="space-y-1">
+                                    <Label htmlFor="transactional-toggle">
+                                        {t("campaign.transactional", "Transactional")}
+                                    </Label>
+                                    <p className="text-sm text-muted-foreground">
+                                        {t(
+                                            "campaign.transactional.help",
+                                            "When enabled, subscription preference is ignored.",
+                                        )}
+                                    </p>
+                                </div>
+                                <Switch
+                                    id="transactional-toggle"
+                                    checked={transactional}
+                                    onCheckedChange={(checked) => {
+                                        setTransactional(checked)
+                                        if (checked) setSubscriptionId("")
+                                    }}
+                                />
+                            </div>
+
+                            {!transactional && (
+                                <FieldGroup>
+                                    <Field className="gap-2">
+                                        <FieldLabel htmlFor="subscription-select">
+                                            {t("campaign.subscription", "Subscription")}
+                                        </FieldLabel>
+                                        <Select
+                                            value={subscriptionId}
+                                            onValueChange={setSubscriptionId}
+                                        >
+                                            <SelectTrigger id="subscription-select">
+                                                <SelectValue
+                                                    placeholder={t(
+                                                        "campaign.subscription.placeholder",
+                                                        "Select subscription",
+                                                    )}
+                                                />
+                                            </SelectTrigger>
+                                            <SelectContent className="z-[1100]">
+                                                {filteredSubscriptions.length === 0 && (
+                                                    <SelectItem value="__empty" disabled>
+                                                        {t(
+                                                            "campaign.subscription.empty",
+                                                            "No subscriptions for this channel",
+                                                        )}
+                                                    </SelectItem>
+                                                )}
+                                                {filteredSubscriptions.map((subscription) => (
+                                                    <SelectItem
+                                                        key={subscription.id}
+                                                        value={subscription.id}
+                                                    >
+                                                        {subscription.name}
+                                                    </SelectItem>
+                                                ))}
+                                            </SelectContent>
+                                        </Select>
+                                    </Field>
+                                </FieldGroup>
+                            )}
+
                             <FieldGroup>
                                 <Controller
                                     name="variables"
@@ -190,19 +312,8 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
 export default function CampaignDetails() {
     const [campaign] = useContext(CampaignContext)
     const [project] = useContext(ProjectContext)
-    const [selectedUser, setSelectedUser] = useState<User | null>(null)
     const [template, setTemplate] = useState<Template | null>(null)
 
-    useEffect(() => {
-        if (!selectedUser && project?.id) {
-            api.users.search(project.id, { limit: 1 }).then((result) => {
-                if (result.results && result.results.length > 0) {
-                    setSelectedUser(result.results[0])
-                }
-            })
-        }
-    }, [project?.id, selectedUser])
-
     useEffect(() => {
         if (!campaign || campaign.templates.length === 0) {
             return
diff --git a/console/src/views/campaign/Campaigns.tsx b/console/src/views/campaign/Campaigns.tsx
index f00a0cb2..6770f412 100644
--- a/console/src/views/campaign/Campaigns.tsx
+++ b/console/src/views/campaign/Campaigns.tsx
@@ -14,8 +14,7 @@ import {
     Copy,
     Archive,
 } from "lucide-react"
-
-import api from "../../api"
+import { oapiClient } from "@/oapi/client"
 import { useResolver } from "../../hooks"
 import { formatDate, snakeToTitle } from "../../utils"
 import { getRandomColor } from "@/lib/colors"
@@ -26,7 +25,7 @@ import { CampaignsIcon } from "@/components/icons"
 
 import { CreateCampaign } from "./CreateCampaign"
 
-import type { Campaign, CampaignDelivery, ChannelType } from "@/types"
+import type { CampaignDelivery, ChannelType } from "@/types"
 import type { UUID } from "@/types/common"
 
 import { Button } from "@/components/ui/button"
@@ -65,6 +64,7 @@ interface CampaignsProps {
 }
 
 export default function Campaigns({ create = false }: CampaignsProps) {
+    const pageSize = 25
     const [preferences] = useContext(PreferencesContext)
     const [project] = useContext(ProjectContext)
     const navigate = useNavigate()
@@ -72,16 +72,12 @@ export default function Campaigns({ create = false }: CampaignsProps) {
 
     const [searchQuery, setSearchQuery] = useState("")
     const [debouncedQuery, setDebouncedQuery] = useState("")
-    const [cursor, setCursor] = useState<string | undefined>()
-    const [pageDirection, setPageDirection] = useState<"next" | "prev" | undefined>()
-    const [cursorHistory, setCursorHistory] = useState<string[]>([])
-    const searchTimeoutRef = useRef<ReturnType<typeof setTimeout>>()
+    const [offset, setOffset] = useState(0)
+    const searchTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)
 
     const handleSearch = useCallback((value: string) => {
         setSearchQuery(value)
-        setCursor(undefined)
-        setPageDirection(undefined)
-        setCursorHistory([])
+        setOffset(0)
         clearTimeout(searchTimeoutRef.current)
         searchTimeoutRef.current = setTimeout(() => {
             setDebouncedQuery(value)
@@ -90,50 +86,79 @@ export default function Campaigns({ create = false }: CampaignsProps) {
 
     const [result, , reload] = useResolver(
         useCallback(async () => {
-            return await api.campaigns.search(project.id, {
-                limit: 25,
-                cursor,
-                page: pageDirection,
-                search: debouncedQuery || undefined,
+            const response = await oapiClient.GET("/api/admin/projects/{projectID}/campaigns", {
+                params: {
+                    path: {
+                        projectID: project.id,
+                    },
+                    query: {
+                        limit: pageSize,
+                        offset,
+                        search: debouncedQuery || undefined,
+                    },
+                },
             })
-        }, [project.id, debouncedQuery, cursor, pageDirection]),
+
+            return (
+                response.data ?? {
+                    results: [],
+                    total: 0,
+                    limit: pageSize,
+                    offset,
+                }
+            )
+        }, [project.id, debouncedQuery, offset]),
     )
 
     const campaigns = result?.results
-    const hasNextPage = !!result?.nextCursor
-    const hasPrevPage = cursorHistory.length > 0
+    const hasNextPage = !!result && offset + pageSize < result.total
+    const hasPrevPage = offset > 0
 
     const handleNextPage = () => {
-        if (result?.nextCursor) {
-            setCursorHistory((prev) => [...prev, cursor ?? ""])
-            setCursor(result.nextCursor)
-            setPageDirection("next")
+        if (hasNextPage) {
+            setOffset((prev) => prev + pageSize)
         }
     }
 
     const handlePrevPage = () => {
-        if (cursorHistory.length > 0) {
-            const prev = [...cursorHistory]
-            const prevCursor = prev.pop()
-            setCursorHistory(prev)
-            setCursor(prevCursor || undefined)
-            setPageDirection(prevCursor ? "next" : undefined)
+        if (hasPrevPage) {
+            setOffset((prev) => Math.max(0, prev - pageSize))
         }
     }
 
     const handleDuplicateCampaign = async (e: React.MouseEvent, id: UUID) => {
         e.stopPropagation()
-        const campaign = await api.campaigns.duplicate(project.id, id)
-        await navigate(`/projects/${project.id}/campaigns/${campaign.id.toString()}`)
+        const response = await oapiClient.POST(
+            "/api/admin/projects/{projectID}/campaigns/{campaignID}/duplicate",
+            {
+                params: {
+                    path: {
+                        projectID: project.id,
+                        campaignID: id,
+                    },
+                },
+            },
+        )
+
+        if (response.data?.id) {
+            navigate(`/projects/${project.id}/campaigns/${response.data.id}`)
+        }
     }
 
     const handleArchiveCampaign = async (e: React.MouseEvent, id: UUID) => {
         e.stopPropagation()
-        await api.campaigns.delete(project.id, id)
+        await oapiClient.DELETE("/api/admin/projects/{projectID}/campaigns/{campaignID}", {
+            params: {
+                path: {
+                    projectID: project.id,
+                    campaignID: id,
+                },
+            },
+        })
         await reload()
     }
 
-    const handleRowClick = (campaign: Campaign) => {
+    const handleRowClick = (campaign: { id: UUID }) => {
         navigate(`/projects/${project.id}/campaigns/${campaign.id.toString()}`)
     }
 
diff --git a/console/src/views/campaign/CreateCampaign.tsx b/console/src/views/campaign/CreateCampaign.tsx
index 4d32ccb1..854f3757 100644
--- a/console/src/views/campaign/CreateCampaign.tsx
+++ b/console/src/views/campaign/CreateCampaign.tsx
@@ -1,11 +1,14 @@
 import { useTranslation } from "react-i18next"
 import { useNavigate } from "react-router"
 import { ProjectContext } from "@/contexts"
-import { useContext, useState } from "react"
+import { useCallback, useContext, useMemo, useState } from "react"
+import type { ReactNode } from "react"
+import { useResolver } from "@/hooks"
 
 import { Button } from "@/components/ui/button"
 import { ArrowRight, Mail, MessageSquareDot, PlusIcon, Smartphone } from "lucide-react"
 import type { ChannelType } from "@/types"
+import type { components } from "@/oapi/management.generated"
 
 import {
     Item,
@@ -25,12 +28,23 @@ import {
     DialogTitle,
     DialogTrigger,
 } from "@/components/ui/dialog"
-import api from "@/api"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
+import { Switch } from "@/components/ui/switch"
+import { oapiClient } from "@/oapi/client"
+
+type Subscription = components["schemas"]["Subscription"]
 
 interface Channel {
     key: ChannelType
     color: string
-    icon: JSX.Element
+    icon: ReactNode
     title: string
     description: string
 }
@@ -46,16 +60,77 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
     const navigate = useNavigate()
     const { t } = useTranslation()
     const [isOpen, setIsOpen] = useState(open)
+    const [selectedChannel, setSelectedChannel] = useState<ChannelType | null>(null)
+    const [transactional, setTransactional] = useState(false)
+    const [subscriptionId, setSubscriptionId] = useState<string>("")
+
+    const [subscriptions] = useResolver(
+        useCallback(async (): Promise<Subscription[]> => {
+            if (!project?.id) return []
+
+            const response = await oapiClient.GET("/api/admin/projects/{projectID}/subscriptions", {
+                params: {
+                    path: {
+                        projectID: project.id,
+                    },
+                    query: {
+                        limit: 100,
+                    },
+                },
+            })
+
+            if (response.error || !response.data?.results) {
+                return []
+            }
+
+            return response.data.results
+        }, [project?.id]),
+    )
+
+    const filteredSubscriptions = useMemo(() => {
+        if (!selectedChannel) return []
+        return (subscriptions ?? []).filter((subscription) => subscription.channel === selectedChannel)
+    }, [selectedChannel, subscriptions])
+
+    const subscriptionsLoading = subscriptions === null
+    async function create() {
+        if (!project?.id || !selectedChannel) {
+            return
+        }
 
-    async function create(channel: ChannelType) {
         if (onBeforeCreate) {
             await onBeforeCreate()
         }
-        const campaign = await api.campaigns.create(project.id, {
+
+        const body: {
+            name: string
+            channel: components["schemas"]["Channel"]
+            transactional?: boolean
+            subscription_id?: string
+        } = {
             name: generateProjectName(),
-            channel: channel,
+            channel: selectedChannel,
+            transactional,
+        }
+
+        if (transactional) {
+            body.subscription_id = undefined
+        } else if (subscriptionId) {
+            body.subscription_id = subscriptionId
+        }
+
+        const campaign = await oapiClient.POST("/api/admin/projects/{projectID}/campaigns", {
+            params: {
+                path: {
+                    projectID: project.id,
+                },
+            },
+            body,
         })
-        await navigate(`/projects/${project.id}/campaigns/${campaign.id}/setup`)
+
+        if (campaign.data?.id) {
+            navigate(`/projects/${project.id}/campaigns/${campaign.data.id}/setup`)
+        }
     }
 
     const channels: Array<Channel> = [
@@ -82,8 +157,9 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
         },
     ]
 
+
     return (
-        <Dialog open={isOpen} onOpenChange={() => setIsOpen(!isOpen)}>
+        <Dialog open={isOpen} onOpenChange={setIsOpen}>
             <DialogTrigger asChild>
                 {trigger ?? (
                     <Button size="lg">
@@ -102,7 +178,10 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
                         <Item key={channel.key} variant="outline" className="items-center" asChild>
                             <a
                                 className="no-underline cursor-pointer"
-                                onClick={() => create(channel.key)}
+                                onClick={() => {
+                                    setSelectedChannel(channel.key)
+                                    setSubscriptionId("")
+                                }}
                             >
                                 <ItemMedia variant="icon" className={channel.color}>
                                     {channel.icon}
@@ -118,6 +197,75 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
                         </Item>
                     ))}
                 </ItemGroup>
+
+                {selectedChannel && (
+                    <div className="mt-4 space-y-4">
+                        <div className="flex items-center justify-between rounded-md border p-3">
+                            <div className="space-y-1">
+                                <Label htmlFor="transactional-toggle">
+                                    {t("campaign.transactional", "Transactional")}
+                                </Label>
+                                <p className="text-sm text-muted-foreground">
+                                    {t(
+                                        "campaign.transactional.help",
+                                        "When enabled, subscription preference is ignored.",
+                                    )}
+                                </p>
+                            </div>
+                            <Switch
+                                id="transactional-toggle"
+                                checked={transactional}
+                                onCheckedChange={(checked) => {
+                                    setTransactional(checked)
+                                    if (checked) setSubscriptionId("")
+                                }}
+                            />
+                        </div>
+
+                        {!transactional && (
+                            <div className="space-y-2">
+                                <Label htmlFor="subscription-select">
+                                    {t("campaign.subscription", "Subscription")}
+                                </Label>
+                                <Select value={subscriptionId} onValueChange={setSubscriptionId}>
+                                    <SelectTrigger id="subscription-select">
+                                        <SelectValue
+                                            placeholder={t(
+                                                "campaign.subscription.placeholder",
+                                                "Select subscription",
+                                            )}
+                                        />
+                                    </SelectTrigger>
+                                    <SelectContent className="z-[1100]">
+                                        {subscriptionsLoading && (
+                                            <SelectItem value="__loading" disabled>
+                                                {t("loading", "Loading...")}
+                                            </SelectItem>
+                                        )}
+                                        {!subscriptionsLoading &&
+                                            filteredSubscriptions.length === 0 && (
+                                                <SelectItem value="__empty" disabled>
+                                                    {t(
+                                                        "campaign.subscription.empty",
+                                                        "No subscriptions for this channel",
+                                                    )}
+                                                </SelectItem>
+                                            )}
+                                        {filteredSubscriptions.map((subscription) => (
+                                            <SelectItem key={subscription.id} value={subscription.id}>
+                                                {subscription.name}
+                                            </SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                            </div>
+                        )}
+
+                        <Button onClick={() => create()}>
+                            {t("campaign.create.action")}
+                        </Button>
+                    </div>
+                )}
             </DialogContent>
         </Dialog>
     )
@@ -200,4 +348,4 @@ function generateProjectName() {
     const adjective = adjectives[Math.floor(Math.random() * adjectives.length)]
     const name = names[Math.floor(Math.random() * names.length)]
     return `${adjective} ${name}`
-}
+}
\ No newline at end of file
diff --git a/console/src/views/campaign/setup/Setup.tsx b/console/src/views/campaign/setup/Setup.tsx
index 66c5387e..d567e7bd 100644
--- a/console/src/views/campaign/setup/Setup.tsx
+++ b/console/src/views/campaign/setup/Setup.tsx
@@ -1,15 +1,26 @@
 import { Controller, useForm } from "react-hook-form"
-import { useContext, useState } from "react"
+import { useCallback, useContext, useMemo, useState } from "react"
 import { CampaignContext, ProjectContext } from "@/contexts"
 import { useTranslation } from "react-i18next"
 import api from "@/api"
+import { useResolver } from "@/hooks"
 import { z } from "zod"
 import { zodResolver } from "@hookform/resolvers/zod"
+import type { Subscription } from "@/types"
 
 import { Field, FieldDescription, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
 import { Input } from "@/components/ui/input"
 import { ProviderSelect } from "@/components/provider/select"
 import { Button } from "@/components/ui/button"
+import { Switch } from "@/components/ui/switch"
+import { Label } from "@/components/ui/label"
+import {
+    Select,
+    SelectContent,
+    SelectItem,
+    SelectTrigger,
+    SelectValue,
+} from "@/components/ui/select"
 import { useNavigate } from "react-router"
 
 const schema = z.object({
@@ -25,6 +36,23 @@ export default function CampaignSetup() {
     const [project] = useContext(ProjectContext)
     const { t } = useTranslation()
     const navigate = useNavigate()
+    const [transactional, setTransactional] = useState(campaign.transactional ?? false)
+    const [subscriptionId, setSubscriptionId] = useState<string>(campaign.subscription_id ?? "")
+
+    const [subscriptions] = useResolver(
+        useCallback(async (): Promise<Subscription[]> => {
+            if (!project?.id) return []
+            const result = await api.subscriptions.search(project.id, { limit: 100 })
+            return result.results ?? []
+        }, [project?.id]),
+    )
+
+    const filteredSubscriptions = useMemo(() => {
+        return (subscriptions ?? []).filter((s) => {
+            const ch = (s.channel as string) === "sms" ? "text" : s.channel
+            return ch === campaign.channel
+        })
+    }, [subscriptions, campaign.channel])
 
     const form = useForm<FormData>({
         resolver: zodResolver(schema),
@@ -40,6 +68,8 @@ export default function CampaignSetup() {
             const updated = await api.campaigns.update(project.id, campaign.id, {
                 name: data.name,
                 provider_id: data.provider_id,
+                transactional,
+                subscription_id: transactional ? undefined : subscriptionId || undefined,
             })
 
             setCampaign(updated)
@@ -128,6 +158,63 @@ export default function CampaignSetup() {
                         />
                     </FieldGroup>
 
+                    <div className="flex items-center justify-between rounded-md border p-3">
+                        <div className="space-y-1">
+                            <Label htmlFor="transactional-toggle">
+                                {t("campaign.transactional", "Transactional")}
+                            </Label>
+                            <p className="text-sm text-muted-foreground">
+                                {t(
+                                    "campaign.transactional.help",
+                                    "When enabled, subscription preference is ignored.",
+                                )}
+                            </p>
+                        </div>
+                        <Switch
+                            id="transactional-toggle"
+                            checked={transactional}
+                            onCheckedChange={(checked) => {
+                                setTransactional(checked)
+                                if (checked) setSubscriptionId("")
+                            }}
+                        />
+                    </div>
+
+                    {!transactional && (
+                        <FieldGroup>
+                            <Field className="gap-2">
+                                <FieldLabel htmlFor="subscription-select">
+                                    {t("campaign.subscription", "Subscription")}
+                                </FieldLabel>
+                                <Select value={subscriptionId} onValueChange={setSubscriptionId}>
+                                    <SelectTrigger id="subscription-select">
+                                        <SelectValue
+                                            placeholder={t(
+                                                "campaign.subscription.placeholder",
+                                                "Select subscription",
+                                            )}
+                                        />
+                                    </SelectTrigger>
+                                    <SelectContent className="z-[1100]">
+                                        {filteredSubscriptions.length === 0 && (
+                                            <SelectItem value="__empty" disabled>
+                                                {t(
+                                                    "campaign.subscription.empty",
+                                                    "No subscriptions for this channel",
+                                                )}
+                                            </SelectItem>
+                                        )}
+                                        {filteredSubscriptions.map((subscription) => (
+                                            <SelectItem key={subscription.id} value={subscription.id}>
+                                                {subscription.name}
+                                            </SelectItem>
+                                        ))}
+                                    </SelectContent>
+                                </Select>
+                            </Field>
+                        </FieldGroup>
+                    )}
+
                     <div className="flex justify-end">
                         <Button type="submit" isLoading={isSubmitting} disabled={isSubmitting}>
                             {t("actions.submit")}
diff --git a/console/src/views/campaign/template/mail/Setup.tsx b/console/src/views/campaign/template/mail/Setup.tsx
index f7cf9dc1..5a6bd737 100644
--- a/console/src/views/campaign/template/mail/Setup.tsx
+++ b/console/src/views/campaign/template/mail/Setup.tsx
@@ -1,11 +1,11 @@
-import { useCallback, useContext, useState, useEffect, useRef } from "react"
+import { useContext, useState, useEffect, useRef } from "react"
 import { Controller, useForm, type UseFormReturn } from "react-hook-form"
 import { zodResolver } from "@hookform/resolvers/zod"
 import type { Campaign, Template, User, Locale } from "@/types"
 import { useTranslation } from "react-i18next"
 import { ProjectContext, TemplateContext } from "@/contexts"
 import { useNavigate } from "react-router"
-import api from "@/api"
+import oapiClient from "@/oapi/client"
 import * as z from "zod"
 import { Render } from "@/renderTemplates"
 import { compileEmail } from "./editor/codeEditor/compileEmail"
@@ -322,8 +322,13 @@ export function EmailContentPreview({ campaign, form, edit = false }: EmailSetup
     useEffect(() => {
         const fetchLocales = async () => {
             if (project?.id) {
-                const result = await api.locales.search(project.id, { limit: 100 })
-                setLocales(result.results)
+                const { data } = await oapiClient.GET("/api/admin/projects/{projectID}/locales", {
+                    params: {
+                        path: { projectID: project.id },
+                        query: { limit: 100 },
+                    },
+                })
+                setLocales(data?.results ?? [])
             }
         }
         fetchLocales()
diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index ed151670..e446b741 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -34,13 +34,24 @@ type CampaignsController struct {
 	engine  *rbac.Engine
 }
 
+func normalizeCampaignChannel(channel string) string {
+	if channel == "sms" {
+		return "text"
+	}
+
+	return channel
+}
+
+func channelsCompatible(campaignChannel, subscriptionChannel string) bool {
+	return normalizeCampaignChannel(campaignChannel) == normalizeCampaignChannel(subscriptionChannel)
+}
+
 func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID) {
 	ctx := r.Context()
 	if err := srv.engine.Allowed(ctx, rbac.Create, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
-
 	body := oapi.CreateCampaignJSONRequestBody{}
 	err := json.Decode(r.Body, &body)
 	if err != nil {
@@ -94,12 +105,39 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 	campaigns := management.NewCampaignsStore(tx)
 	templates := management.NewTemplatesStore(tx)
 
+	transactional := body.Transactional != nil && *body.Transactional
+
+	if transactional && body.SubscriptionId != nil {
+		oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("a campaign cannot be both transactional and linked to a subscription")))
+		return
+	}
+
+	if body.SubscriptionId != nil {
+		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(err, sql.ErrNoRows) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription_id must reference a subscription in this project")))
+			return
+		}
+
+		if err != nil {
+			logger.Error("failed to validate subscription", zap.Error(err))
+			oapi.WriteProblem(w, err)
+			return
+		}
+
+		if !channelsCompatible(string(body.Channel), subscription.Channel) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel must match campaign channel")))
+			return
+		}
+	}
+
 	campaignID, err := campaigns.CreateCampaign(ctx, management.Campaign{
 		ProjectID:      project.ID,
 		Name:           body.Name,
 		Channel:        string(body.Channel),
 		ProviderID:     body.ProviderId,
 		SubscriptionID: body.SubscriptionId,
+		Transactional:  transactional,
 	})
 	if err != nil {
 		logger.Error("failed to create campaign", zap.Error(err))
@@ -208,7 +246,7 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	_, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if errors.Is(err, sql.ErrNoRows) {
 		logger.Info("campaign not found", zap.Stringer("campaign_id", campaignID))
 		oapi.WriteProblem(w, problem.ErrNotFound(problem.Describe("campaign not found")))
@@ -221,9 +259,40 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
+	effectiveTransactional := campaign.Transactional
+	if body.Transactional != nil {
+		effectiveTransactional = *body.Transactional
+	}
+
+	if effectiveTransactional && body.SubscriptionId != nil {
+		oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("a campaign cannot be both transactional and linked to a subscription")))
+		return
+	}
+
+	if body.SubscriptionId != nil {
+		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(err, sql.ErrNoRows) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription_id must reference a subscription in this project")))
+			return
+		}
+
+		if err != nil {
+			logger.Error("failed to validate subscription", zap.Error(err))
+			oapi.WriteProblem(w, err)
+			return
+		}
+
+		if !channelsCompatible(campaign.Channel, subscription.Channel) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel must match campaign channel")))
+			return
+		}
+	}
+
 	updated := management.CampaignUpdate{
-		Name:       body.Name,
-		ProviderID: body.ProviderId,
+		Name:           body.Name,
+		ProviderID:     body.ProviderId,
+		Transactional:  body.Transactional,
+		SubscriptionID: body.SubscriptionId,
 	}
 
 	if body.Variables != nil {
@@ -244,7 +313,7 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	campaign, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if err != nil {
 		logger.Error("failed to fetch updated campaign", zap.Error(err))
 		oapi.WriteProblem(w, err)
@@ -330,6 +399,7 @@ func (srv *CampaignsController) DuplicateCampaign(w http.ResponseWriter, r *http
 		Channel:        campaign.Channel,
 		ProviderID:     campaign.ProviderID,
 		SubscriptionID: campaign.SubscriptionID,
+		Transactional:  campaign.Transactional,
 	})
 	if err != nil {
 		logger.Error("failed to create duplicated campaign", zap.Error(err))
diff --git a/internal/http/controllers/v1/management/campaigns_test.go b/internal/http/controllers/v1/management/campaigns_test.go
index 73ee8b78..bc26f2ee 100644
--- a/internal/http/controllers/v1/management/campaigns_test.go
+++ b/internal/http/controllers/v1/management/campaigns_test.go
@@ -48,6 +48,24 @@ func TestCampaignCreation(t *testing.T) {
 				Name:    "Welcome to the program!",
 			},
 		},
+		"subscription channel mismatch": {
+			body: func() oapi.CreateCampaignJSONRequestBody {
+				subscriptions := management.NewSubscriptionsStore(mgmt)
+				subscriptionID, err := subscriptions.CreateSubscription(ctx, management.Subscription{
+					ProjectID: projectID,
+					Name:      "Push Only",
+					Channel:   "push",
+					IsPublic:  true,
+				})
+				require.NoError(t, err)
+
+				return oapi.CreateCampaignJSONRequestBody{
+					Channel:        oapi.Email,
+					Name:           "Welcome to the program!",
+					SubscriptionId: &subscriptionID,
+				}
+			}(),
+		},
 	}
 
 	for name, test := range tests {
@@ -60,7 +78,11 @@ func TestCampaignCreation(t *testing.T) {
 			req = req.WithContext(actorCtx)
 			campaigns.CreateCampaign(res, req, projectID)
 
-			require.Equal(t, 201, res.Code, res.Body.String())
+			expected := 201
+			if name == "subscription channel mismatch" {
+				expected = 400
+			}
+			require.Equal(t, expected, res.Code, res.Body.String())
 		})
 	}
 }
@@ -187,12 +209,22 @@ func TestGetCampaign(t *testing.T) {
 	require.NoError(t, err)
 
 	campaignsStore := management.NewCampaignsStore(mgmt)
+	subscriptionsStore := management.NewSubscriptionsStore(mgmt)
 	templates := management.NewTemplatesStore(mgmt)
 
-	campaignID, err := campaignsStore.CreateCampaign(ctx, management.Campaign{
+	subscriptionID, err := subscriptionsStore.CreateSubscription(ctx, management.Subscription{
 		ProjectID: projectID,
-		Name:      "Test Campaign",
+		Name:      "Marketing",
 		Channel:   "email",
+		IsPublic:  true,
+	})
+	require.NoError(t, err)
+
+	campaignID, err := campaignsStore.CreateCampaign(ctx, management.Campaign{
+		ProjectID:      projectID,
+		Name:           "Test Campaign",
+		Channel:        "email",
+		SubscriptionID: &subscriptionID,
 	})
 	require.NoError(t, err)
 
@@ -247,12 +279,41 @@ func TestUpdateCampaign(t *testing.T) {
 	require.NoError(t, err)
 
 	campaignsStore := management.NewCampaignsStore(mgmt)
+	subscriptionsStore := management.NewSubscriptionsStore(mgmt)
 	templates := management.NewTemplatesStore(mgmt)
 
-	campaignID, err := campaignsStore.CreateCampaign(ctx, management.Campaign{
+	subscriptionID, err := subscriptionsStore.CreateSubscription(ctx, management.Subscription{
 		ProjectID: projectID,
-		Name:      "Test Campaign",
+		Name:      "Marketing",
+		Channel:   "email",
+		IsPublic:  true,
+	})
+	require.NoError(t, err)
+
+	campaignID, err := campaignsStore.CreateCampaign(ctx, management.Campaign{
+		ProjectID:      projectID,
+		Name:           "Test Campaign",
+		Channel:        "email",
+		SubscriptionID: &subscriptionID,
+	})
+	require.NoError(t, err)
+
+	otherProjectID, err := projects.CreateProject(ctx, DefaultProject)
+	require.NoError(t, err)
+
+	otherProjectSubscriptionID, err := subscriptionsStore.CreateSubscription(ctx, management.Subscription{
+		ProjectID: otherProjectID,
+		Name:      "Other Project",
 		Channel:   "email",
+		IsPublic:  true,
+	})
+	require.NoError(t, err)
+
+	pushSubscriptionID, err := subscriptionsStore.CreateSubscription(ctx, management.Subscription{
+		ProjectID: projectID,
+		Name:      "Push Alerts",
+		Channel:   "push",
+		IsPublic:  true,
 	})
 	require.NoError(t, err)
 
@@ -268,15 +329,43 @@ func TestUpdateCampaign(t *testing.T) {
 	controller := NewCampaignsController(logger, mgmt, usrs, engine)
 
 	tests := map[string]struct {
-		id   uuid.UUID
-		body oapi.UpdateCampaignJSONRequestBody
-		code int
+		id     uuid.UUID
+		body   oapi.UpdateCampaignJSONRequestBody
+		code   int
+		assert func(t *testing.T)
 	}{
 		"success": {
 			id:   campaignID,
 			body: oapi.UpdateCampaignJSONRequestBody{Name: ptr("Updated Name")},
 			code: 200,
 		},
+		"transactional clears subscription": {
+			id:   campaignID,
+			body: oapi.UpdateCampaignJSONRequestBody{Transactional: ptr(true)},
+			code: 200,
+			assert: func(t *testing.T) {
+				t.Helper()
+
+				updated, err := campaignsStore.GetCampaign(ctx, projectID, campaignID)
+				require.NoError(t, err)
+				require.True(t, updated.Transactional)
+				require.Nil(t, updated.SubscriptionID)
+			},
+		},
+		"rejects cross project subscription": {
+			id: campaignID,
+			body: oapi.UpdateCampaignJSONRequestBody{
+				SubscriptionId: &otherProjectSubscriptionID,
+			},
+			code: 400,
+		},
+		"rejects mismatched subscription channel": {
+			id: campaignID,
+			body: oapi.UpdateCampaignJSONRequestBody{
+				SubscriptionId: &pushSubscriptionID,
+			},
+			code: 400,
+		},
 		"not found": {
 			id:   uuid.Nil,
 			body: oapi.UpdateCampaignJSONRequestBody{Name: ptr("Updated Name")},
@@ -295,6 +384,10 @@ func TestUpdateCampaign(t *testing.T) {
 			controller.UpdateCampaign(res, req, projectID, test.id)
 
 			require.Equal(t, test.code, res.Code, res.Body.String())
+
+			if test.assert != nil {
+				test.assert(t)
+			}
 		})
 	}
 }
@@ -379,9 +472,10 @@ func TestDuplicateCampaign(t *testing.T) {
 	templates := management.NewTemplatesStore(mgmt)
 
 	campaignID, err := campaignsStore.CreateCampaign(ctx, management.Campaign{
-		ProjectID: projectID,
-		Name:      "Original Campaign",
-		Channel:   "email",
+		ProjectID:     projectID,
+		Name:          "Original Campaign",
+		Channel:       "email",
+		Transactional: true,
 	})
 	require.NoError(t, err)
 
@@ -427,6 +521,7 @@ func TestDuplicateCampaign(t *testing.T) {
 				require.NotEqual(t, test.id, response.Id)
 				require.Equal(t, "Copy of Original Campaign", response.Name)
 				require.Equal(t, projectID, response.ProjectId)
+				require.True(t, response.Transactional)
 				require.Len(t, response.Templates, 1)
 			}
 		})
diff --git a/internal/http/controllers/v1/management/oapi/resources.yml b/internal/http/controllers/v1/management/oapi/resources.yml
index fa424e83..8518eb49 100644
--- a/internal/http/controllers/v1/management/oapi/resources.yml
+++ b/internal/http/controllers/v1/management/oapi/resources.yml
@@ -5011,6 +5011,9 @@ components:
         subscription_id:
           type: string
           format: uuid
+        transactional:
+          type: boolean
+          example: false
 
     UpdateCampaign:
       type: object
@@ -5022,6 +5025,12 @@ components:
           type: string
           format: uuid
           example: "5143f27c-cca9-4dc4-9059-e1dbb08144ad"
+        subscription_id:
+          type: string
+          format: uuid
+        transactional:
+          type: boolean
+          example: false
         variables:
           type: array
           items:
@@ -5091,6 +5100,7 @@ components:
         - channel
         - templates
         - delivery
+        - transactional
         - created_at
         - updated_at
       properties:
@@ -5117,6 +5127,9 @@ components:
         subscription_id:
           type: string
           format: uuid
+        transactional:
+          type: boolean
+          example: false
         provider:
           $ref: "#/components/schemas/Provider"
         templates:
diff --git a/internal/http/controllers/v1/management/oapi/resources_gen.go b/internal/http/controllers/v1/management/oapi/resources_gen.go
index 77b8dcfa..c214da90 100644
--- a/internal/http/controllers/v1/management/oapi/resources_gen.go
+++ b/internal/http/controllers/v1/management/oapi/resources_gen.go
@@ -268,6 +268,7 @@ type Campaign struct {
 	Provider       *Provider           `json:"provider,omitempty"`
 	SubscriptionId *openapi_types.UUID `json:"subscription_id,omitempty"`
 	Templates      []Template          `json:"templates"`
+	Transactional  bool                `json:"transactional"`
 	UpdatedAt      time.Time           `json:"updated_at"`
 	Variables      *[]CampaignVariable `json:"variables,omitempty"`
 }
@@ -337,6 +338,7 @@ type CreateCampaign struct {
 	Name           string              `json:"name"`
 	ProviderId     *openapi_types.UUID `json:"provider_id,omitempty"`
 	SubscriptionId *openapi_types.UUID `json:"subscription_id,omitempty"`
+	Transactional  *bool               `json:"transactional,omitempty"`
 }
 
 // CreateJourney defines model for CreateJourney.
@@ -1008,9 +1010,11 @@ type UpdateApiKey struct {
 
 // UpdateCampaign defines model for UpdateCampaign.
 type UpdateCampaign struct {
-	Name       *string             `json:"name,omitempty"`
-	ProviderId *openapi_types.UUID `json:"provider_id,omitempty"`
-	Variables  *[]CampaignVariable `json:"variables,omitempty"`
+	Name           *string             `json:"name,omitempty"`
+	ProviderId     *openapi_types.UUID `json:"provider_id,omitempty"`
+	SubscriptionId *openapi_types.UUID `json:"subscription_id,omitempty"`
+	Transactional  *bool               `json:"transactional,omitempty"`
+	Variables      *[]CampaignVariable `json:"variables,omitempty"`
 }
 
 // UpdateJourney defines model for UpdateJourney.
diff --git a/internal/pubsub/consumer/campaigns.go b/internal/pubsub/consumer/campaigns.go
index 47401702..67ae53e7 100644
--- a/internal/pubsub/consumer/campaigns.go
+++ b/internal/pubsub/consumer/campaigns.go
@@ -113,7 +113,7 @@ func buildRenderData(publicURL string, user *subjects.User, campaign *management
 	base := strings.TrimRight(publicURL, "/")
 	data["preferences_url"] = fmt.Sprintf("%s/preferences/%s/%s", base, campaign.ProjectID, user.ID)
 
-	if campaign.SubscriptionID != nil {
+	if !campaign.Transactional && campaign.SubscriptionID != nil {
 		unsubLink := url.Values{}
 		unsubLink.Set("u", user.ID.String())
 		unsubLink.Set("c", campaign.ID.String())
diff --git a/internal/pubsub/consumer/campaigns_test.go b/internal/pubsub/consumer/campaigns_test.go
new file mode 100644
index 00000000..e4ad8e96
--- /dev/null
+++ b/internal/pubsub/consumer/campaigns_test.go
@@ -0,0 +1,82 @@
+package consumer
+
+import (
+	"net/url"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/lunogram/platform/internal/store/management"
+	"github.com/lunogram/platform/internal/store/subjects"
+	"github.com/stretchr/testify/require"
+)
+
+func TestBuildRenderDataIncludesUnsubscribeURLWhenSubscriptionLinked(t *testing.T) {
+	t.Parallel()
+
+	projectID := uuid.New()
+	campaignID := uuid.New()
+	subscriptionID := uuid.New()
+	userID := uuid.New()
+
+	campaign := &management.Campaign{
+		ID:             campaignID,
+		ProjectID:      projectID,
+		Transactional:  false,
+		SubscriptionID: &subscriptionID,
+	}
+	user := &subjects.User{ID: userID}
+
+	data := buildRenderData("https://example.com/", user, campaign, nil)
+
+	rawUnsubscribeURL, ok := data["unsubscribe_url"]
+	require.True(t, ok)
+
+	unsubscribeURL, ok := rawUnsubscribeURL.(string)
+	require.True(t, ok)
+
+	parsedURL, err := url.Parse(unsubscribeURL)
+	require.NoError(t, err)
+	require.Equal(t, "/unsubscribe/email", parsedURL.Path)
+
+	link := parsedURL.Query().Get("link")
+	require.NotEmpty(t, link)
+
+	parsedLink, err := url.Parse(link)
+	require.NoError(t, err)
+	require.Equal(t, userID.String(), parsedLink.Query().Get("u"))
+	require.Equal(t, campaignID.String(), parsedLink.Query().Get("c"))
+}
+
+func TestBuildRenderDataOmitsUnsubscribeURLWhenNotEligible(t *testing.T) {
+	t.Parallel()
+
+	projectID := uuid.New()
+	userID := uuid.New()
+	user := &subjects.User{ID: userID}
+
+	tests := map[string]*management.Campaign{
+		"transactional campaign": {
+			ID:             uuid.New(),
+			ProjectID:      projectID,
+			Transactional:  true,
+			SubscriptionID: func() *uuid.UUID { id := uuid.New(); return &id }(),
+		},
+		"no linked subscription": {
+			ID:             uuid.New(),
+			ProjectID:      projectID,
+			Transactional:  false,
+			SubscriptionID: nil,
+		},
+	}
+
+	for name, campaign := range tests {
+		campaign := campaign
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			data := buildRenderData("https://example.com", user, campaign, nil)
+			_, ok := data["unsubscribe_url"]
+			require.False(t, ok)
+		})
+	}
+}
diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index ade1697f..b22d6891 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -33,6 +33,7 @@ type Campaign struct {
 	Channel        string                         `db:"channel"`
 	ProviderID     *uuid.UUID                     `db:"provider_id"`
 	SubscriptionID *uuid.UUID                     `db:"subscription_id"`
+	Transactional  bool                           `db:"transactional"`
 	Delivery       store.JSONB[Delivery]          `db:"delivery"`
 	Variables      store.JSONB[CampaignVariables] `db:"variables"`
 	Templates      Templates                      `db:"-"`
@@ -57,6 +58,7 @@ func (campaign Campaign) OAPI() oapi.Campaign {
 		Name:           campaign.Name,
 		Channel:        oapi.Channel(campaign.Channel),
 		SubscriptionId: campaign.SubscriptionID,
+		Transactional:  campaign.Transactional,
 		Delivery:       campaign.Delivery.Data.OAPI(),
 		Variables:      &variables,
 		Templates:      campaign.Templates.OAPI(),
@@ -104,12 +106,12 @@ type CampaignsStore struct {
 
 func (s *CampaignsStore) CreateCampaign(ctx context.Context, campaign Campaign) (uuid.UUID, error) {
 	stmt := `
-	INSERT INTO campaigns (project_id, name, channel, provider_id, subscription_id)
-	VALUES ($1, $2, $3, $4, $5)
+	INSERT INTO campaigns (project_id, name, channel, provider_id, subscription_id, transactional)
+	VALUES ($1, $2, $3, $4, $5, $6)
 	RETURNING id`
 
 	var id uuid.UUID
-	err := s.db.GetContext(ctx, &id, stmt, campaign.ProjectID, campaign.Name, campaign.Channel, campaign.ProviderID, campaign.SubscriptionID)
+	err := s.db.GetContext(ctx, &id, stmt, campaign.ProjectID, campaign.Name, campaign.Channel, campaign.ProviderID, campaign.SubscriptionID, campaign.Transactional)
 	if err != nil {
 		return uuid.Nil, err
 	}
@@ -119,7 +121,7 @@ func (s *CampaignsStore) CreateCampaign(ctx context.Context, campaign Campaign)
 
 func (s *CampaignsStore) ListCampaigns(ctx context.Context, project uuid.UUID, pagination store.Pagination, search string) (Campaigns, int, error) {
 	query := `
-	SELECT id, project_id, name, channel, provider_id, subscription_id, delivery, variables, created_at, updated_at, deleted_at,
+	SELECT id, project_id, name, channel, provider_id, subscription_id, transactional, delivery, variables, created_at, updated_at, deleted_at,
 		COUNT(*) OVER () AS total_count
 	FROM campaigns
 	WHERE project_id = $1
@@ -152,7 +154,7 @@ func (s *CampaignsStore) ListCampaigns(ctx context.Context, project uuid.UUID, p
 
 func (s *CampaignsStore) GetCampaign(ctx context.Context, projectID, campaignID uuid.UUID) (*Campaign, error) {
 	query := `
-	SELECT id, project_id, name, channel, provider_id, subscription_id, delivery, variables, created_at, updated_at, deleted_at
+	SELECT id, project_id, name, channel, provider_id, subscription_id, transactional, delivery, variables, created_at, updated_at, deleted_at
 	FROM campaigns
 	WHERE project_id = $1
 	AND id = $2
@@ -180,9 +182,11 @@ func (s *CampaignsStore) GetCampaign(ctx context.Context, projectID, campaignID
 }
 
 type CampaignUpdate struct {
-	Name       *string
-	ProviderID *uuid.UUID
-	Variables  *store.JSONB[CampaignVariables]
+	Name           *string
+	ProviderID     *uuid.UUID
+	SubscriptionID *uuid.UUID
+	Transactional  *bool
+	Variables      *store.JSONB[CampaignVariables]
 }
 
 func (s *CampaignsStore) UpdateCampaign(ctx context.Context, projectID, campaignID uuid.UUID, update CampaignUpdate) error {
@@ -191,9 +195,14 @@ func (s *CampaignsStore) UpdateCampaign(ctx context.Context, projectID, campaign
 	SET
 		name = COALESCE($1, name),
 		provider_id = COALESCE($2, provider_id),
-		variables = COALESCE($3, variables)
-	WHERE project_id = $4
-	AND id = $5
+		variables = COALESCE($3, variables),
+		transactional = COALESCE($4, transactional),
+		subscription_id = CASE
+			WHEN COALESCE($4, transactional) THEN NULL
+			ELSE COALESCE($5, subscription_id)
+		END
+	WHERE project_id = $6
+	AND id = $7
 	AND deleted_at IS NULL`
 
 	var variablesVal any
@@ -205,7 +214,17 @@ func (s *CampaignsStore) UpdateCampaign(ctx context.Context, projectID, campaign
 		variablesVal = v
 	}
 
-	_, err := s.db.ExecContext(ctx, query, update.Name, update.ProviderID, variablesVal, projectID, campaignID)
+	_, err := s.db.ExecContext(
+		ctx,
+		query,
+		update.Name,
+		update.ProviderID,
+		variablesVal,
+		update.Transactional,
+		update.SubscriptionID,
+		projectID,
+		campaignID,
+	)
 	return err
 }
 
@@ -304,13 +323,14 @@ type CampaignLookup struct {
 	ID             uuid.UUID  `db:"id"`
 	ProjectID      uuid.UUID  `db:"project_id"`
 	SubscriptionID *uuid.UUID `db:"subscription_id"`
+	Transactional  bool       `db:"transactional"`
 }
 
 // GetCampaignByID retrieves a campaign by ID without project filter.
 // This is used for unsubscribe flows where the project_id is not known.
 func (s *CampaignsStore) GetCampaignByID(ctx context.Context, campaignID uuid.UUID) (*CampaignLookup, error) {
 	query := `
-	SELECT id, project_id, subscription_id
+	SELECT id, project_id, subscription_id, transactional
 	FROM campaigns
 	WHERE id = $1
 	AND deleted_at IS NULL`
diff --git a/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql b/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql
new file mode 100644
index 00000000..1b9aecda
--- /dev/null
+++ b/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql
@@ -0,0 +1,7 @@
+-- Remove transactional flag from campaigns
+-- If you added a CHECK constraint, drop it first
+-- ALTER TABLE campaigns
+--     DROP CONSTRAINT IF EXISTS campaigns_subscription_or_transactional;
+
+ALTER TABLE campaigns
+    DROP COLUMN IF EXISTS transactional;
diff --git a/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql b/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql
new file mode 100644
index 00000000..96fd5339
--- /dev/null
+++ b/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql
@@ -0,0 +1,3 @@
+-- Add transactional flag to campaigns
+ALTER TABLE campaigns
+    ADD COLUMN IF NOT EXISTS transactional BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/internal/store/management/migrations/1764106035_sender_identities.down.sql b/internal/store/management/migrations/1764106035_sender_identities.down.sql
new file mode 100644
index 00000000..bdd025fe
--- /dev/null
+++ b/internal/store/management/migrations/1764106035_sender_identities.down.sql
@@ -0,0 +1,64 @@
+-- Reverse: restore identity UUIDs back into template JSONB data column.
+
+-- For email templates: put the UUID back into data.from.email
+UPDATE templates
+SET data = CASE
+    WHEN data->'from' IS NOT NULL
+    THEN jsonb_set(data, '{from,email}', to_jsonb(sender_identity_id::text))
+    ELSE jsonb_set(data, '{from}', jsonb_build_object('email', sender_identity_id::text))
+END
+WHERE sender_identity_id IS NOT NULL
+    AND type = 'email';
+
+-- For SMS templates: put the UUID back into data.from as a string
+UPDATE templates
+SET data = jsonb_set(data, '{from}', to_jsonb(sender_identity_id::text))
+WHERE sender_identity_id IS NOT NULL
+    AND type IN ('text', 'sms');
+
+DROP INDEX IF EXISTS templates_sender_identity_id_idx;
+ALTER TABLE templates DROP COLUMN sender_identity_id;
+
+-- Restore default_from_name into provider data from identity traits.
+WITH identity_names AS (
+    SELECT
+        si.id AS identity_id,
+        si.traits->>'name' AS from_name
+    FROM sender_identities si
+    WHERE si.traits->>'name' IS NOT NULL
+      AND si.traits->>'name' != ''
+)
+UPDATE providers p
+SET data = data || jsonb_build_object('default_from_name', inn.from_name)
+FROM identity_names inn
+WHERE (p.data->>'default_from')::UUID = inn.identity_id
+  AND p.data->>'default_from' IS NOT NULL
+  AND p.data->>'default_from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$';
+
+-- Reverse: restore provider default_from from UUID → address
+UPDATE providers p
+SET data = jsonb_set(p.data, '{default_from}', to_jsonb(si.traits->>'address'))
+FROM sender_identities si
+WHERE p.data->>'default_from' IS NOT NULL
+  AND p.data->>'default_from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+  AND si.id = (p.data->>'default_from')::uuid;
+
+-- Reverse: restore email template from.email from UUID → address
+UPDATE templates t
+SET data = jsonb_set(t.data, '{from,email}', to_jsonb(si.traits->>'address'))
+FROM sender_identities si
+WHERE t.data->'from'->>'email' IS NOT NULL
+  AND t.data->'from'->>'email' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+  AND si.id = (t.data->'from'->>'email')::uuid;
+
+-- Reverse: restore SMS template from from UUID → address
+UPDATE templates t
+SET data = jsonb_set(t.data, '{from}', to_jsonb(si.traits->>'address'))
+FROM sender_identities si
+WHERE t.data->>'from' IS NOT NULL
+  AND t.data->>'from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+  AND si.id = (t.data->>'from')::uuid;
+
+-- Drop the table (cascades trigger and indexes).
+DROP TRIGGER IF EXISTS set_updated_at_sender_identities ON sender_identities;
+DROP TABLE IF EXISTS sender_identities;
diff --git a/internal/store/management/migrations/1764106035_sender_identities.up.sql b/internal/store/management/migrations/1764106035_sender_identities.up.sql
new file mode 100644
index 00000000..2741d99f
--- /dev/null
+++ b/internal/store/management/migrations/1764106035_sender_identities.up.sql
@@ -0,0 +1,204 @@
+-- Sender identities table
+-- Stores registered sender addresses (email, SMS, etc.) scoped to a provider.
+-- Channel-specific metadata lives in the traits JSONB column; the address is
+-- always stored as traits->>'address'.
+
+CREATE TABLE sender_identities (
+    id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+    project_id UUID NOT NULL REFERENCES projects(id) ON DELETE CASCADE,
+    provider_id UUID NOT NULL REFERENCES providers(id) ON DELETE CASCADE,
+    channel VARCHAR(255) NOT NULL,
+    traits JSONB NOT NULL DEFAULT '{}',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX sender_identities_project_id_idx ON sender_identities(project_id);
+CREATE INDEX sender_identities_provider_id_idx ON sender_identities(provider_id);
+CREATE UNIQUE INDEX sender_identities_provider_channel_address_uniq
+    ON sender_identities (provider_id, channel, (traits->>'address'));
+
+CREATE TRIGGER set_updated_at_sender_identities BEFORE UPDATE ON sender_identities FOR EACH ROW EXECUTE PROCEDURE set_updated_at();
+
+--------------------------------------------------------------------------------
+-- Data migration: provider default_from → sender_identities
+--------------------------------------------------------------------------------
+-- For every provider whose default_from is a raw address (not a UUID), create
+-- a sender identity and replace the address string with the new identity UUID.
+
+WITH provider_inserts AS (
+    INSERT INTO sender_identities (project_id, provider_id, channel, traits)
+    SELECT
+        p.project_id,
+        p.id,
+        p.channel,
+        jsonb_build_object('address', p.data->>'default_from')
+    FROM providers p
+    WHERE p.data->>'default_from' IS NOT NULL
+      AND p.data->>'default_from' != ''
+      AND p.data->>'default_from' !~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+    ON CONFLICT (provider_id, channel, (traits->>'address')) DO NOTHING
+    RETURNING id, provider_id, channel, traits->>'address' AS address
+)
+UPDATE providers p
+SET data = jsonb_set(p.data, '{default_from}', to_jsonb(pi.id::text))
+FROM provider_inserts pi
+WHERE p.id = pi.provider_id;
+
+--------------------------------------------------------------------------------
+-- Data migration: email template from.email → sender_identities
+--------------------------------------------------------------------------------
+
+WITH email_template_data AS (
+    SELECT
+        t.id AS template_id,
+        t.project_id,
+        COALESCE(c.provider_id, dp.id) AS provider_id,
+        'email' AS channel,
+        t.data->'from'->>'email' AS address
+    FROM templates t
+    JOIN campaigns c ON t.campaign_id = c.id
+    LEFT JOIN providers dp
+        ON dp.project_id = t.project_id
+       AND dp.channel = 'email'
+       AND dp.is_default = true
+    WHERE c.channel = 'email'
+      AND t.data->'from'->>'email' IS NOT NULL
+      AND t.data->'from'->>'email' != ''
+      AND t.data->'from'->>'email' !~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+      AND COALESCE(c.provider_id, dp.id) IS NOT NULL
+),
+email_inserts AS (
+    INSERT INTO sender_identities (project_id, provider_id, channel, traits)
+    SELECT DISTINCT
+        etd.project_id,
+        etd.provider_id,
+        etd.channel,
+        jsonb_build_object('address', etd.address)
+    FROM email_template_data etd
+    ON CONFLICT (provider_id, channel, (traits->>'address')) DO NOTHING
+    RETURNING id, provider_id, channel, traits->>'address' AS address
+)
+UPDATE templates t
+SET data = jsonb_set(t.data, '{from,email}', to_jsonb(si.id::text))
+FROM email_template_data etd
+JOIN sender_identities si
+    ON si.provider_id = etd.provider_id
+   AND si.channel = etd.channel
+   AND si.traits->>'address' = etd.address
+WHERE t.id = etd.template_id;
+
+--------------------------------------------------------------------------------
+-- Data migration: SMS template from → sender_identities
+--------------------------------------------------------------------------------
+
+WITH sms_template_data AS (
+    SELECT
+        t.id AS template_id,
+        t.project_id,
+        COALESCE(c.provider_id, dp.id) AS provider_id,
+        'sms' AS channel,
+        t.data->>'from' AS address
+    FROM templates t
+    JOIN campaigns c ON t.campaign_id = c.id
+    LEFT JOIN providers dp
+        ON dp.project_id = t.project_id
+       AND dp.channel = 'sms'
+       AND dp.is_default = true
+    WHERE c.channel = 'sms'
+      AND t.data->>'from' IS NOT NULL
+      AND t.data->>'from' != ''
+      AND t.data->>'from' !~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+      AND COALESCE(c.provider_id, dp.id) IS NOT NULL
+),
+sms_inserts AS (
+    INSERT INTO sender_identities (project_id, provider_id, channel, traits)
+    SELECT DISTINCT
+        std.project_id,
+        std.provider_id,
+        std.channel,
+        jsonb_build_object('address', std.address)
+    FROM sms_template_data std
+    ON CONFLICT (provider_id, channel, (traits->>'address')) DO NOTHING
+    RETURNING id, provider_id, channel, traits->>'address' AS address
+)
+UPDATE templates t
+SET data = jsonb_set(t.data, '{from}', to_jsonb(si.id::text))
+FROM sms_template_data std
+JOIN sender_identities si
+    ON si.provider_id = std.provider_id
+   AND si.channel = std.channel
+   AND si.traits->>'address' = std.address
+WHERE t.id = std.template_id;
+
+--------------------------------------------------------------------------------
+-- Data migration: copy default_from_name into identity traits as "name"
+--------------------------------------------------------------------------------
+
+WITH provider_names AS (
+    SELECT
+        id AS provider_id,
+        (data->>'default_from')::UUID AS identity_id,
+        data->>'default_from_name' AS from_name
+    FROM providers
+    WHERE data->>'default_from' IS NOT NULL
+      AND data->>'default_from_name' IS NOT NULL
+      AND data->>'default_from_name' != ''
+      AND data->>'default_from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+)
+UPDATE sender_identities si
+SET traits = si.traits || jsonb_build_object('name', pn.from_name)
+FROM provider_names pn
+WHERE si.id = pn.identity_id;
+
+-- Strip default_from_name and default_from_locked from provider data.
+UPDATE providers
+SET data = data - 'default_from_name' - 'default_from_locked'
+WHERE data ? 'default_from_name' OR data ? 'default_from_locked';
+
+--------------------------------------------------------------------------------
+-- Add sender_identity_id column to templates
+--------------------------------------------------------------------------------
+
+ALTER TABLE templates
+    ADD COLUMN sender_identity_id UUID REFERENCES sender_identities(id) ON DELETE SET NULL;
+
+-- Backfill from existing JSONB data:
+-- Email templates store the identity UUID in data->'from'->>'email'
+-- SMS templates store it in data->>'from'
+UPDATE templates
+SET sender_identity_id = CASE
+    WHEN data->'from'->>'email' IS NOT NULL
+         AND data->'from'->>'email' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+    THEN (data->'from'->>'email')::uuid
+    WHEN data->>'from' IS NOT NULL
+         AND jsonb_typeof(data->'from') = 'string'
+         AND data->>'from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+    THEN (data->>'from')::uuid
+    ELSE NULL
+END
+WHERE (
+    data->'from'->>'email' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+    OR (
+        jsonb_typeof(data->'from') = 'string'
+        AND data->>'from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+    )
+);
+
+-- Strip the identity UUID from the JSONB data now that it lives in the column.
+-- For email: remove data.from.email (keep data.from.name if present)
+UPDATE templates
+SET data = CASE
+    WHEN data->'from'->'name' IS NOT NULL AND data->'from'->>'name' != ''
+    THEN jsonb_set(data, '{from}', jsonb_build_object('name', data->'from'->'name'))
+    ELSE data - 'from'
+END
+WHERE data->'from'->>'email' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$';
+
+-- For SMS: remove data.from entirely (it was just the UUID string)
+UPDATE templates
+SET data = data - 'from'
+WHERE jsonb_typeof(data->'from') = 'string'
+    AND data->>'from' ~ '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$';
+
+CREATE INDEX templates_sender_identity_id_idx ON templates(sender_identity_id);
diff --git a/internal/store/management/subscriptions.go b/internal/store/management/subscriptions.go
index 0333004e..a9dd38a2 100644
--- a/internal/store/management/subscriptions.go
+++ b/internal/store/management/subscriptions.go
@@ -29,12 +29,20 @@ type Subscription struct {
 	UpdatedAt time.Time `db:"updated_at"`
 }
 
+func normalizeManagementChannel(channel string) oapi.Channel {
+	if channel == "sms" {
+		return oapi.Text
+	}
+
+	return oapi.Channel(channel)
+}
+
 func (s *Subscription) OAPI() oapi.Subscription {
 	return oapi.Subscription{
 		Id:        s.ID,
 		ProjectId: s.ProjectID,
 		Name:      s.Name,
-		Channel:   oapi.Channel(s.Channel),
+		Channel:   normalizeManagementChannel(s.Channel),
 		IsPublic:  s.IsPublic,
 		CreatedAt: s.CreatedAt,
 		UpdatedAt: s.UpdatedAt,
@@ -62,7 +70,7 @@ func (us *UserSubscription) OAPI() oapi.UserSubscription {
 	return oapi.UserSubscription{
 		SubscriptionId: us.SubscriptionID,
 		Name:           us.Name,
-		Channel:        oapi.Channel(us.Channel),
+		Channel:        normalizeManagementChannel(us.Channel),
 		State:          oapi.SubscriptionState(us.State),
 	}
 }
diff --git a/internal/wasm/test/action.wasm b/internal/wasm/test/action.wasm
index a5a67245b18f8448ccb78ee804faecf24623e498..a2113ade37a9598ad79469a9bf7702b335139fc2 100644
GIT binary patch
delta 399
zcmXv~u}T9$5Z#%*T@RCk6e$!n%m$GYL@eYKG3cg9;RpB;IS2@s#YzhWTf0Ln`~d@Y
zA&5x+z|v?6y9oLT7S7&j@pv=u!JD`HJZn788V~mhZY~CDI8bob3%(RYxoxSX{3wHC
z1FM3-ssyX{@=eDmOy~#J!ft}><>L%i&h7NIFtr~Jgso*wWZQmB3R(JrkkG!o>(q`#
zFD?CVFWc)Wi-9ZhNG4b#@Kk5wl;x5ZN+QxE)20p%IZu-QnHQq6$9?v@R``>j6I~1h
zZLx#f>;wsJ{I|!y_Ho&sFu(1C0nDHJK<j9s6G?7_sR{U=PH>B)h14kGN2Nxv#~bF_
zL0rd9B-oZGrox2IRQW&J4mLv|KDx`>se?66zjLq%a5Zus$dHVHp%{8Na&x-%3*N3+
AhyVZp

delta 421
zcmXv~Jxc>Y5Z#%*-JB-D6e(0R%m$SRA{KI5gqRhy@CR7>19A`$E?b&H!PagI@gEql
z3t}N@EJd&}n!+wA1pk1Ab2%*@Z)V=`=Hp>pc^p^nZWY{|_f)^9;H<5_6%@PPJgG&0
zl)$mU6+viKgav!?u4^bvm<C)6TM@G62MH{9_k;mEdYd-rG$630qzc?(KZnz@OalTI
zUOsee2cjKk`d3=ES0gS4Zt6)g!V+OhWhQo6%4j|#B26-`>Y&MflJrkwR){?BRBu_4
zj+_kjG$7m;JGjkC5aGuE1@L!4ExUlg`wkcYf8POG2MdQq$s1v80-mQM+#+cqHj0ET
z#YV8k8F+M1D|548S)Q6a6FO7ipEMk7hDbbgm$Ssd8oOURSP0QJV}9w3pF2>i{^VKb
UE+-Bc$dHVHp%}V9ak<y}FU!1N;s5{u

diff --git a/internal/wasm/test/provider.wasm b/internal/wasm/test/provider.wasm
index 5c2d6c856d2af73648adb9b4f7ff907f41663e6e..5b934e0e8abe5c52ac034829e0f521169df636f3 100644
GIT binary patch
delta 424
zcmXv}u}T9$5Z#%*-JB-D6j4MZ%tnzDL@eaA5Rw%V3tJn>fvsdg5MtUC7FHpGnrr<8
zyVQPzm0hBCTA0ovpmVucJl@PaX5PHJaj7>hJv}IRx$dh$U%~kae8#`0(CWatAh0UL
zoV|b30Se<M1<(9uh^&zxqF)hJVLM0VxthsjvAPB|uS%Ib*stMqM<+!^*g~s}yk);f
z)3HnnLP9%y*UmnR3zzDXWNaTlbjMk*o%+ZS3v9<!Wa2ZcDJ`c&q)EE6W@98tdNMCW
zmft*RT9H`(jP$f1I23!h%ZeA`)_*9Rg$ib&_<Ugbi}<PmD}eEB185U1)bo-bLuWj8
z)gkVXwBU>)&gP6@jXR8A8xRz+o);|3OOs{7w#gC1ixF)5K<vHG-EjmP8c8`L<ApO=
Uy6Hy1K!#*^48_ocZj{l{9~S>w=Kufz

delta 438
zcmXv~u}T9$5Z#%*+q;+qBcxD}FdKuMAYvh>g_2t#<_ENpyAO~Y283Xn!oo(dh~`>9
z!7fEA|3R@$)KbuN76F~h#p3a1=IzXz+1p8_H>o_{+wgkTw+DS2&W_<L`8|bB7i)sh
z*gh7_-J9}IXg3YG=C*ufja(nyx(I~nHmkXYcJdgkLBk5jDMDRnFrTAYpGpG)Q|eTK
zJI(iaR+ec%z{2QV#pX%0<4m8X<*s@7;Hq_*c}X8jY{^t+;xVfkEoVfeNXAvg=0K9v
zbU}zbue#qdBDMS(t64yJD0Xp&70buX|HEK@m^VL+$9u_n2o-?jCIs3514l*4n_{dj
zc2quYlQa-(n}jLFTCm0$BrhR&WqvGJmKQqDgqONNm@GxG<sz}~9%s!6)_Hn6f|VSa
hAm-1`E%wIwT5@m#&h;<?1~MeWV%Q8d7)H)>_y?fZUe*8r


From 294a2ba845d0d0a332e15cf13f87ea0386ec5f73 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Wed, 18 Mar 2026 10:11:09 +0100
Subject: [PATCH 02/15] fix: copilot fixes

---
 console/src/types.ts                                            | 2 +-
 ...dentities.down.sql => 1764106034_sender_identities.down.sql} | 0
 ...er_identities.up.sql => 1764106034_sender_identities.up.sql} | 0
 ...n.sql => 1764106035_add_transactional_to_campaigns.down.sql} | 0
 ....up.sql => 1764106035_add_transactional_to_campaigns.up.sql} | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename internal/store/management/migrations/{1764106035_sender_identities.down.sql => 1764106034_sender_identities.down.sql} (100%)
 rename internal/store/management/migrations/{1764106035_sender_identities.up.sql => 1764106034_sender_identities.up.sql} (100%)
 rename internal/store/management/migrations/{1764106034_add_transactional_to_campaigns.down.sql => 1764106035_add_transactional_to_campaigns.down.sql} (100%)
 rename internal/store/management/migrations/{1764106034_add_transactional_to_campaigns.up.sql => 1764106035_add_transactional_to_campaigns.up.sql} (100%)

diff --git a/console/src/types.ts b/console/src/types.ts
index 8fad52d8..3369cfda 100644
--- a/console/src/types.ts
+++ b/console/src/types.ts
@@ -589,7 +589,7 @@ export type CampaignSendState = "pending" | "sent" | "throttled" | "failed" | "b
 
 export type CampaignUpdateParams = Partial<
     Pick<Campaign, "name" | "provider_id" | "subscription_id" | "transactional" | "variables">
-> & { state?: string }
+>
 export type CampaignCreateParams = Pick<Campaign, "name" | "channel" | "subscription_id" | "transactional">
 export type CampaignUser = User & { state: CampaignSendState; send_at: string }
 
diff --git a/internal/store/management/migrations/1764106035_sender_identities.down.sql b/internal/store/management/migrations/1764106034_sender_identities.down.sql
similarity index 100%
rename from internal/store/management/migrations/1764106035_sender_identities.down.sql
rename to internal/store/management/migrations/1764106034_sender_identities.down.sql
diff --git a/internal/store/management/migrations/1764106035_sender_identities.up.sql b/internal/store/management/migrations/1764106034_sender_identities.up.sql
similarity index 100%
rename from internal/store/management/migrations/1764106035_sender_identities.up.sql
rename to internal/store/management/migrations/1764106034_sender_identities.up.sql
diff --git a/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql b/internal/store/management/migrations/1764106035_add_transactional_to_campaigns.down.sql
similarity index 100%
rename from internal/store/management/migrations/1764106034_add_transactional_to_campaigns.down.sql
rename to internal/store/management/migrations/1764106035_add_transactional_to_campaigns.down.sql
diff --git a/internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql b/internal/store/management/migrations/1764106035_add_transactional_to_campaigns.up.sql
similarity index 100%
rename from internal/store/management/migrations/1764106034_add_transactional_to_campaigns.up.sql
rename to internal/store/management/migrations/1764106035_add_transactional_to_campaigns.up.sql

From eef90b8c76dbd18521e4e43da02c8d31e1f65675 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Wed, 18 Mar 2026 15:35:21 +0100
Subject: [PATCH 03/15] fix: copilot suggestion

---
 internal/http/controllers/v1/management/campaigns.go |  9 ++++++---
 internal/store/management/campaigns.go               | 12 +++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index e446b741..a256663a 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -35,11 +35,14 @@ type CampaignsController struct {
 }
 
 func normalizeCampaignChannel(channel string) string {
-	if channel == "sms" {
-		return "text"
+	switch channel {
+ 		case "sms", "text":
+ 		// Canonicalize SMS/text channels to the internal "sms" representation.
+ 		return "sms"
+ 	default:
+ 		return channel
 	}
 
-	return channel
 }
 
 func channelsCompatible(campaignChannel, subscriptionChannel string) bool {
diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index b22d6891..a783ad60 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -43,6 +43,16 @@ type Campaign struct {
 	DeletedAt      *time.Time                     `db:"deleted_at"`
 }
 
+	
+ func normalizeChannelToOAPI(channel string) oapi.Channel {
+ 	switch channel {
+ 	case "sms":
+ 		return oapi.ChannelText
+ 	default:
+ 		return oapi.Channel(channel)
+ 	}
+ }
+
 func (campaign Campaign) OAPI() oapi.Campaign {
 	variables := make([]oapi.CampaignVariable, len(campaign.Variables.Data))
 	for i, v := range campaign.Variables.Data {
@@ -56,7 +66,7 @@ func (campaign Campaign) OAPI() oapi.Campaign {
 		Id:             campaign.ID,
 		ProjectId:      campaign.ProjectID,
 		Name:           campaign.Name,
-		Channel:        oapi.Channel(campaign.Channel),
+		Channel:        normalizeChannelToOAPI(campaign.Channel),
 		SubscriptionId: campaign.SubscriptionID,
 		Transactional:  campaign.Transactional,
 		Delivery:       campaign.Delivery.Data.OAPI(),

From d6c2295a9abcd1449c5f7f81b92e15ed3dc7603f Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 11:00:02 +0100
Subject: [PATCH 04/15] fix: possible fix for generate and test error

---
 internal/store/management/campaigns.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index a783ad60..3e87079d 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -43,15 +43,14 @@ type Campaign struct {
 	DeletedAt      *time.Time                     `db:"deleted_at"`
 }
 
-	
- func normalizeChannelToOAPI(channel string) oapi.Channel {
- 	switch channel {
- 	case "sms":
- 		return oapi.ChannelText
- 	default:
- 		return oapi.Channel(channel)
- 	}
- }
+func normalizeChannelToOAPI(channel string) oapi.Channel {
+	switch channel {
+	case "sms":
+		return oapi.Text
+	default:
+		return oapi.Channel(channel)
+	}
+}
 
 func (campaign Campaign) OAPI() oapi.Campaign {
 	variables := make([]oapi.CampaignVariable, len(campaign.Variables.Data))

From 9b15808b43894aea4ecfa96e86e6e51e42545148 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 11:27:51 +0100
Subject: [PATCH 05/15] fix: generate fix

---
 internal/store/management/campaigns.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index 3e87079d..05af4da9 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -45,11 +45,11 @@ type Campaign struct {
 
 func normalizeChannelToOAPI(channel string) oapi.Channel {
 	switch channel {
-	case "sms":
-		return oapi.Text
-	default:
-		return oapi.Channel(channel)
-	}
+		case "sms":
+			return oapi.Text
+		default:
+			return oapi.Channel(channel)
+		}
 }
 
 func (campaign Campaign) OAPI() oapi.Campaign {

From 3d2c72d7245f4eb8ff8f8b22286d85271acb3337 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 11:30:20 +0100
Subject: [PATCH 06/15] fix: indentation issue

---
 internal/store/management/campaigns.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index 05af4da9..3e87079d 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -45,11 +45,11 @@ type Campaign struct {
 
 func normalizeChannelToOAPI(channel string) oapi.Channel {
 	switch channel {
-		case "sms":
-			return oapi.Text
-		default:
-			return oapi.Channel(channel)
-		}
+	case "sms":
+		return oapi.Text
+	default:
+		return oapi.Channel(channel)
+	}
 }
 
 func (campaign Campaign) OAPI() oapi.Campaign {

From 5888799da096c68050d180d2ecb6c18f358f9d5f Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 11:38:50 +0100
Subject: [PATCH 07/15] fix: generate fix

---
 .../controllers/v1/management/campaigns.go    | 115 ++++--------------
 1 file changed, 25 insertions(+), 90 deletions(-)

diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index a256663a..6a789452 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -13,6 +13,7 @@ import (
 	"github.com/lunogram/platform/internal/rbac"
 	"github.com/lunogram/platform/internal/store"
 	"github.com/lunogram/platform/internal/store/management"
+
 	"go.uber.org/zap"
 )
 
@@ -34,29 +35,16 @@ type CampaignsController struct {
 	engine  *rbac.Engine
 }
 
-func normalizeCampaignChannel(channel string) string {
-	switch channel {
- 		case "sms", "text":
- 		// Canonicalize SMS/text channels to the internal "sms" representation.
- 		return "sms"
- 	default:
- 		return channel
-	}
-
-}
-
-func channelsCompatible(campaignChannel, subscriptionChannel string) bool {
-	return normalizeCampaignChannel(campaignChannel) == normalizeCampaignChannel(subscriptionChannel)
-}
-
 func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Create, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Create, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
+
 	body := oapi.CreateCampaignJSONRequestBody{}
-	err := json.Decode(r.Body, &body)
+	err = json.Decode(r.Body, &body)
 	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
@@ -108,39 +96,12 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 	campaigns := management.NewCampaignsStore(tx)
 	templates := management.NewTemplatesStore(tx)
 
-	transactional := body.Transactional != nil && *body.Transactional
-
-	if transactional && body.SubscriptionId != nil {
-		oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("a campaign cannot be both transactional and linked to a subscription")))
-		return
-	}
-
-	if body.SubscriptionId != nil {
-		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
-		if errors.Is(err, sql.ErrNoRows) {
-			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription_id must reference a subscription in this project")))
-			return
-		}
-
-		if err != nil {
-			logger.Error("failed to validate subscription", zap.Error(err))
-			oapi.WriteProblem(w, err)
-			return
-		}
-
-		if !channelsCompatible(string(body.Channel), subscription.Channel) {
-			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel must match campaign channel")))
-			return
-		}
-	}
-
 	campaignID, err := campaigns.CreateCampaign(ctx, management.Campaign{
 		ProjectID:      project.ID,
 		Name:           body.Name,
 		Channel:        string(body.Channel),
 		ProviderID:     body.ProviderId,
 		SubscriptionID: body.SubscriptionId,
-		Transactional:  transactional,
 	})
 	if err != nil {
 		logger.Error("failed to create campaign", zap.Error(err))
@@ -150,7 +111,7 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 
 	// TODO: create audit log
 
-	_, err = templates.CreateTemplate(ctx, project.ID, campaignID, string(body.Channel), project.Locale)
+	_, err = templates.CreateTemplate(ctx, project.ID, campaignID, string(body.Channel), project.Locale, nil)
 	if err != nil {
 		logger.Error("failed to create template", zap.Error(err))
 		oapi.WriteProblem(w, err)
@@ -177,7 +138,8 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 
 func (srv *CampaignsController) ListCampaigns(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, params oapi.ListCampaignsParams) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -208,7 +170,8 @@ func (srv *CampaignsController) ListCampaigns(w http.ResponseWriter, r *http.Req
 
 func (srv *CampaignsController) GetCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, campaignID uuid.UUID) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -235,7 +198,8 @@ func (srv *CampaignsController) GetCampaign(w http.ResponseWriter, r *http.Reque
 
 func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, campaignID uuid.UUID) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Update, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Update, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -243,13 +207,13 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 	logger := srv.logger.With(zap.Stringer("project_id", projectID), zap.Stringer("campaign_id", campaignID))
 	logger.Info("updating campaign")
 	body := oapi.UpdateCampaignJSONRequestBody{}
-	err := json.Decode(r.Body, &body)
+	err = json.Decode(r.Body, &body)
 	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
 
-	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	_, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if errors.Is(err, sql.ErrNoRows) {
 		logger.Info("campaign not found", zap.Stringer("campaign_id", campaignID))
 		oapi.WriteProblem(w, problem.ErrNotFound(problem.Describe("campaign not found")))
@@ -262,40 +226,9 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	effectiveTransactional := campaign.Transactional
-	if body.Transactional != nil {
-		effectiveTransactional = *body.Transactional
-	}
-
-	if effectiveTransactional && body.SubscriptionId != nil {
-		oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("a campaign cannot be both transactional and linked to a subscription")))
-		return
-	}
-
-	if body.SubscriptionId != nil {
-		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
-		if errors.Is(err, sql.ErrNoRows) {
-			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription_id must reference a subscription in this project")))
-			return
-		}
-
-		if err != nil {
-			logger.Error("failed to validate subscription", zap.Error(err))
-			oapi.WriteProblem(w, err)
-			return
-		}
-
-		if !channelsCompatible(campaign.Channel, subscription.Channel) {
-			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel must match campaign channel")))
-			return
-		}
-	}
-
 	updated := management.CampaignUpdate{
-		Name:           body.Name,
-		ProviderID:     body.ProviderId,
-		Transactional:  body.Transactional,
-		SubscriptionID: body.SubscriptionId,
+		Name:       body.Name,
+		ProviderID: body.ProviderId,
 	}
 
 	if body.Variables != nil {
@@ -316,7 +249,7 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	campaign, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if err != nil {
 		logger.Error("failed to fetch updated campaign", zap.Error(err))
 		oapi.WriteProblem(w, err)
@@ -329,7 +262,8 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 
 func (srv *CampaignsController) DeleteCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, campaignID uuid.UUID) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Delete, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Delete, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -337,7 +271,7 @@ func (srv *CampaignsController) DeleteCampaign(w http.ResponseWriter, r *http.Re
 	logger := srv.logger.With(zap.Stringer("project_id", projectID), zap.Stringer("campaign_id", campaignID))
 	logger.Info("deleting campaign")
 
-	_, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	_, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if errors.Is(err, sql.ErrNoRows) {
 		logger.Info("campaign not found", zap.Stringer("campaign_id", campaignID))
 		oapi.WriteProblem(w, problem.ErrNotFound(problem.Describe("campaign not found")))
@@ -363,7 +297,8 @@ func (srv *CampaignsController) DeleteCampaign(w http.ResponseWriter, r *http.Re
 
 func (srv *CampaignsController) DuplicateCampaign(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, campaignID uuid.UUID) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Create, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Create, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -402,7 +337,6 @@ func (srv *CampaignsController) DuplicateCampaign(w http.ResponseWriter, r *http
 		Channel:        campaign.Channel,
 		ProviderID:     campaign.ProviderID,
 		SubscriptionID: campaign.SubscriptionID,
-		Transactional:  campaign.Transactional,
 	})
 	if err != nil {
 		logger.Error("failed to create duplicated campaign", zap.Error(err))
@@ -440,7 +374,8 @@ func (srv *CampaignsController) DuplicateCampaign(w http.ResponseWriter, r *http
 
 func (srv *CampaignsController) GetCampaignUsers(w http.ResponseWriter, r *http.Request, projectID uuid.UUID, campaignID uuid.UUID, params oapi.GetCampaignUsersParams) {
 	ctx := r.Context()
-	if err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID)); err != nil {
+	err := srv.engine.Allowed(ctx, rbac.Read, rbac.ProjectResourceScope("campaigns", projectID))
+	if err != nil {
 		oapi.WriteProblem(w, err)
 		return
 	}
@@ -448,7 +383,7 @@ func (srv *CampaignsController) GetCampaignUsers(w http.ResponseWriter, r *http.
 	logger := srv.logger.With(zap.Stringer("project_id", projectID), zap.Stringer("campaign_id", campaignID))
 	logger.Info("getting campaign users")
 
-	_, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	_, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if errors.Is(err, sql.ErrNoRows) {
 		logger.Info("campaign not found", zap.Stringer("campaign_id", campaignID))
 		oapi.WriteProblem(w, problem.ErrNotFound(problem.Describe("campaign not found")))

From c7d7a6015fcbc3e867b9df0c76b96632055f19f6 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 11:44:48 +0100
Subject: [PATCH 08/15] fix: lint and tests error fix

---
 internal/http/controllers/v1/management/campaigns.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index 6a789452..9a7a7354 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -111,7 +111,7 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 
 	// TODO: create audit log
 
-	_, err = templates.CreateTemplate(ctx, project.ID, campaignID, string(body.Channel), project.Locale, nil)
+	_, err = templates.CreateTemplate(ctx, project.ID, campaignID, string(body.Channel), project.Locale)
 	if err != nil {
 		logger.Error("failed to create template", zap.Error(err))
 		oapi.WriteProblem(w, err)

From 4471dd3996fc8a02b854c99ab29f044aaad8644e Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 12:07:29 +0100
Subject: [PATCH 09/15] fix: test fix

---
 .../controllers/v1/management/campaigns.go    | 59 +++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index 9a7a7354..cb723243 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -84,6 +84,30 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 		}
 	}
 
+	if body.SubscriptionId != nil {
+		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(err, sql.ErrNoRows) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription not found")))
+			return
+		}
+
+		if err != nil {
+			logger.Error("failed to get subscription", zap.Error(err))
+			oapi.WriteProblem(w, err)
+			return
+		}
+
+		if subscription.ProjectID != projectID {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription does not belong to this project")))
+			return
+		}
+
+		if subscription.Channel != string(body.Channel) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel does not match campaign channel")))
+			return
+		}
+	}
+
 	tx, err := srv.mgmtDB.BeginTxx(ctx, nil)
 	if err != nil {
 		logger.Error("unexpected error while attempting to start a transaction", zap.Error(err))
@@ -213,7 +237,7 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	_, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if errors.Is(err, sql.ErrNoRows) {
 		logger.Info("campaign not found", zap.Stringer("campaign_id", campaignID))
 		oapi.WriteProblem(w, problem.ErrNotFound(problem.Describe("campaign not found")))
@@ -227,8 +251,10 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 	}
 
 	updated := management.CampaignUpdate{
-		Name:       body.Name,
-		ProviderID: body.ProviderId,
+		Name:           body.Name,
+		ProviderID:     body.ProviderId,
+		SubscriptionID: body.SubscriptionId,
+		Transactional:  body.Transactional,
 	}
 
 	if body.Variables != nil {
@@ -242,6 +268,30 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		updated.Variables = &store.JSONB[management.CampaignVariables]{Data: vars}
 	}
 
+	if body.SubscriptionId != nil {
+		subscription, subErr := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(subErr, sql.ErrNoRows) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription not found")))
+			return
+		}
+
+		if subErr != nil {
+			logger.Error("failed to get subscription", zap.Error(subErr))
+			oapi.WriteProblem(w, subErr)
+			return
+		}
+
+		if subscription.ProjectID != projectID {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription does not belong to this project")))
+			return
+		}
+
+		if subscription.Channel != campaign.Channel {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel does not match campaign channel")))
+			return
+		}
+	}
+
 	err = srv.mgmt.UpdateCampaign(ctx, projectID, campaignID, updated)
 	if err != nil {
 		logger.Error("failed to update campaign", zap.Error(err))
@@ -249,7 +299,7 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	campaign, err := srv.mgmt.GetCampaign(ctx, projectID, campaignID)
+	campaign, err = srv.mgmt.GetCampaign(ctx, projectID, campaignID)
 	if err != nil {
 		logger.Error("failed to fetch updated campaign", zap.Error(err))
 		oapi.WriteProblem(w, err)
@@ -337,6 +387,7 @@ func (srv *CampaignsController) DuplicateCampaign(w http.ResponseWriter, r *http
 		Channel:        campaign.Channel,
 		ProviderID:     campaign.ProviderID,
 		SubscriptionID: campaign.SubscriptionID,
+		Transactional:  campaign.Transactional,
 	})
 	if err != nil {
 		logger.Error("failed to create duplicated campaign", zap.Error(err))

From ffb46f2708ad37b484a0ea1df5b1970f296f40c7 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 15:32:24 +0100
Subject: [PATCH 10/15] fix: all checks failed

---
 internal/store/management/campaigns.go     | 2 +-
 internal/store/management/subscriptions.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/store/management/campaigns.go b/internal/store/management/campaigns.go
index 3e87079d..d89269b1 100644
--- a/internal/store/management/campaigns.go
+++ b/internal/store/management/campaigns.go
@@ -46,7 +46,7 @@ type Campaign struct {
 func normalizeChannelToOAPI(channel string) oapi.Channel {
 	switch channel {
 	case "sms":
-		return oapi.Text
+		return oapi.ChannelSms
 	default:
 		return oapi.Channel(channel)
 	}
diff --git a/internal/store/management/subscriptions.go b/internal/store/management/subscriptions.go
index a9dd38a2..ccbc96ad 100644
--- a/internal/store/management/subscriptions.go
+++ b/internal/store/management/subscriptions.go
@@ -31,7 +31,7 @@ type Subscription struct {
 
 func normalizeManagementChannel(channel string) oapi.Channel {
 	if channel == "sms" {
-		return oapi.Text
+		return oapi.ChannelSms
 	}
 
 	return oapi.Channel(channel)

From 8ee0237316d95060eee9fcc882c82fc05413e7d1 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Thu, 19 Mar 2026 15:35:55 +0100
Subject: [PATCH 11/15] fix: again all failed

---
 console/src/oapi/management.generated.ts             | 12 ------------
 .../http/controllers/v1/management/campaigns_test.go |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/console/src/oapi/management.generated.ts b/console/src/oapi/management.generated.ts
index def2bce6..8828f0aa 100644
--- a/console/src/oapi/management.generated.ts
+++ b/console/src/oapi/management.generated.ts
@@ -2286,18 +2286,6 @@ export interface components {
                 [key: string]: unknown;
             };
         };
-        SendTest: {
-            /**
-             * Format: email
-             * @description The recipient address to send the test to
-             * @example test@example.com
-             */
-            to: string;
-            /** @description Optional template variables/props for rendering */
-            props?: {
-                [key: string]: unknown;
-            };
-        };
         Campaign: {
             /**
              * Format: date-time
diff --git a/internal/http/controllers/v1/management/campaigns_test.go b/internal/http/controllers/v1/management/campaigns_test.go
index 05fd3d27..23b5fc3e 100644
--- a/internal/http/controllers/v1/management/campaigns_test.go
+++ b/internal/http/controllers/v1/management/campaigns_test.go
@@ -60,7 +60,7 @@ func TestCampaignCreation(t *testing.T) {
 				require.NoError(t, err)
 
 				return oapi.CreateCampaignJSONRequestBody{
-					Channel:        oapi.Email,
+					Channel:        oapi.ChannelEmail,
 					Name:           "Welcome to the program!",
 					SubscriptionId: &subscriptionID,
 				}

From f30bae21f186edc8d26570c675b7198d10d88100 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Mon, 23 Mar 2026 11:11:30 +0100
Subject: [PATCH 12/15] fix: changed transactional flag to campaigns migration

---
 ...own.sql => 1764106040_add_transactional_to_campaigns.down.sql} | 0
 ...ns.up.sql => 1764106040_add_transactional_to_campaigns.up.sql} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename internal/store/management/migrations/{1764106035_add_transactional_to_campaigns.down.sql => 1764106040_add_transactional_to_campaigns.down.sql} (100%)
 rename internal/store/management/migrations/{1764106035_add_transactional_to_campaigns.up.sql => 1764106040_add_transactional_to_campaigns.up.sql} (100%)

diff --git a/internal/store/management/migrations/1764106035_add_transactional_to_campaigns.down.sql b/internal/store/management/migrations/1764106040_add_transactional_to_campaigns.down.sql
similarity index 100%
rename from internal/store/management/migrations/1764106035_add_transactional_to_campaigns.down.sql
rename to internal/store/management/migrations/1764106040_add_transactional_to_campaigns.down.sql
diff --git a/internal/store/management/migrations/1764106035_add_transactional_to_campaigns.up.sql b/internal/store/management/migrations/1764106040_add_transactional_to_campaigns.up.sql
similarity index 100%
rename from internal/store/management/migrations/1764106035_add_transactional_to_campaigns.up.sql
rename to internal/store/management/migrations/1764106040_add_transactional_to_campaigns.up.sql

From 7db07fc7a7b3af58449432582de0b4d78f44a5e3 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Mon, 23 Mar 2026 11:31:37 +0100
Subject: [PATCH 13/15] fix: possible checks fix

---
 internal/pubsub/consumer/campaigns.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/internal/pubsub/consumer/campaigns.go b/internal/pubsub/consumer/campaigns.go
index 156dbb84..25ef569c 100644
--- a/internal/pubsub/consumer/campaigns.go
+++ b/internal/pubsub/consumer/campaigns.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/lunogram/platform/internal/providers/channels"
@@ -110,13 +111,14 @@ func buildRenderData(publicURL string, user *subjects.User, campaign *management
 
 	data["now"] = time.Now()
 
-	data["preferences_url"] = fmt.Sprintf("%s/preferences/%s/%s", publicURL, campaign.ProjectID, user.ID)
+	baseURL := strings.TrimSuffix(publicURL, "/")
+	data["preferences_url"] = fmt.Sprintf("%s/preferences/%s/%s", baseURL, campaign.ProjectID, user.ID)
 
 	if !campaign.Transactional && campaign.SubscriptionID != nil {
 		unsubLink := url.Values{}
 		unsubLink.Set("u", user.ID.String())
 		unsubLink.Set("c", campaign.ID.String())
-		data["unsubscribe_url"] = fmt.Sprintf("%s/unsubscribe/email?link=%s", publicURL, url.QueryEscape("?"+unsubLink.Encode()))
+		data["unsubscribe_url"] = fmt.Sprintf("%s/unsubscribe/email?link=%s", baseURL, url.QueryEscape("?"+unsubLink.Encode()))
 	}
 
 	return data

From c54c91315bf4ca2f54dee4ce22061972a5bae9a5 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Mon, 23 Mar 2026 11:39:48 +0100
Subject: [PATCH 14/15] fix: tests fix

---
 .../controllers/v1/management/campaigns.go    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index b130a7b4..0a00085c 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -66,6 +66,25 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 		return
 	}
 
+	if body.SubscriptionId != nil {
+		subscription, subErr := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(subErr, sql.ErrNoRows) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription not found")))
+			return
+		}
+
+		if subErr != nil {
+			logger.Error("failed to get subscription", zap.Error(subErr))
+			oapi.WriteProblem(w, subErr)
+			return
+		}
+
+		if subscription.Channel != string(body.Channel) {
+			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription channel does not match campaign channel")))
+			return
+		}
+	}
+
 	tx, err := srv.mgmtDB.BeginTxx(ctx, nil)
 	if err != nil {
 		logger.Error("unexpected error while attempting to start a transaction", zap.Error(err))

From 18e0bbb02ef20bd3bb4d0718eba14d035d618e84 Mon Sep 17 00:00:00 2001
From: RickjanHoornbeeck <51879@hoornbeeck.nl>
Date: Mon, 30 Mar 2026 13:50:04 +0200
Subject: [PATCH 15/15] fix: refactor campaign-related types and improve
 variable naming for clarity

---
 console/src/types.ts                          |  5 ++++-
 .../src/views/campaign/CampaignDetails.tsx    | 18 ++++++++++-------
 console/src/views/campaign/Campaigns.tsx      |  6 +++---
 console/src/views/campaign/CreateCampaign.tsx | 16 ++++++++-------
 console/src/views/campaign/setup/Setup.tsx    | 17 +++++++++-------
 .../controllers/v1/management/campaigns.go    | 20 +++++++++----------
 internal/store/management/subscriptions.go    | 14 +++----------
 7 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/console/src/types.ts b/console/src/types.ts
index 6c4e0093..8df5a958 100644
--- a/console/src/types.ts
+++ b/console/src/types.ts
@@ -592,7 +592,10 @@ export type CampaignSendState = "pending" | "sent" | "throttled" | "failed" | "b
 export type CampaignUpdateParams = Partial<
     Pick<Campaign, "name" | "provider_id" | "subscription_id" | "transactional" | "variables">
 >
-export type CampaignCreateParams = Pick<Campaign, "name" | "channel" | "subscription_id" | "transactional">
+export type CampaignCreateParams = Pick<
+    Campaign,
+    "name" | "channel" | "subscription_id" | "transactional"
+>
 export type CampaignUser = User & { state: CampaignSendState; send_at: string }
 
 interface NamedEmail {
diff --git a/console/src/views/campaign/CampaignDetails.tsx b/console/src/views/campaign/CampaignDetails.tsx
index 9be0a0a8..16d904d5 100644
--- a/console/src/views/campaign/CampaignDetails.tsx
+++ b/console/src/views/campaign/CampaignDetails.tsx
@@ -46,7 +46,7 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
     const [, setCampaign] = useContext(CampaignContext)
     const templateState = useState<Template>(template)
     const [isSubmitting, setIsSubmitting] = useState(false)
-    const [transactional, setTransactional] = useState(campaign.transactional ?? false)
+    const [isTransactional, setTransactional] = useState(campaign.transactional ?? false)
     const [subscriptionId, setSubscriptionId] = useState<string>(campaign.subscription_id ?? "")
 
     const [subscriptions] = useResolver(
@@ -63,7 +63,8 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
     )
 
     const filteredSubscriptions = useMemo(() => {
-        return (subscriptions ?? []).filter((s) => {
+        if (!subscriptions) return []
+        return subscriptions.filter((s) => {
             return s.channel === campaign.channel
         })
     }, [subscriptions, campaign.channel])
@@ -99,8 +100,8 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
                     body: {
                         name: data.name,
                         ...(data.provider_id ? { provider_id: data.provider_id } : {}),
-                        transactional,
-                        subscription_id: transactional ? undefined : subscriptionId || undefined,
+                        transactional: isTransactional,
+                        subscription_id: isTransactional ? undefined : subscriptionId || undefined,
                         variables: data.variables.filter((v) => v.name),
                     },
                 },
@@ -118,7 +119,10 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
                         ? {
                               ...prevCampaign.provider,
                               ...updatedCampaign.provider,
-                                                            data: updatedCampaign.provider.data ?? prevCampaign.provider?.data ?? {},
+                              data:
+                                  updatedCampaign.provider.data ??
+                                  prevCampaign.provider?.data ??
+                                  {},
                               setup: prevCampaign.provider?.setup ?? [],
                           }
                         : undefined,
@@ -206,7 +210,7 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
                                 </div>
                                 <Switch
                                     id="transactional-toggle"
-                                    checked={transactional}
+                                    checked={isTransactional}
                                     onCheckedChange={(checked) => {
                                         setTransactional(checked)
                                         if (checked) setSubscriptionId("")
@@ -214,7 +218,7 @@ function CampaignReview({ campaign, template }: { campaign: Campaign; template:
                                 />
                             </div>
 
-                            {!transactional && (
+                            {!isTransactional && (
                                 <FieldGroup>
                                     <Field className="gap-2">
                                         <FieldLabel htmlFor="subscription-select">
diff --git a/console/src/views/campaign/Campaigns.tsx b/console/src/views/campaign/Campaigns.tsx
index 6770f412..d6e47186 100644
--- a/console/src/views/campaign/Campaigns.tsx
+++ b/console/src/views/campaign/Campaigns.tsx
@@ -48,7 +48,7 @@ import {
 
 const channelIcons: Record<ChannelType, typeof Mail> = {
     email: Mail,
-    text: Smartphone,
+    sms: Smartphone,
     push: MessageSquareDot,
 }
 
@@ -94,7 +94,7 @@ export default function Campaigns({ create = false }: CampaignsProps) {
                     query: {
                         limit: pageSize,
                         offset,
-                        search: debouncedQuery || undefined,
+                        search: debouncedQuery,
                     },
                 },
             })
@@ -158,7 +158,7 @@ export default function Campaigns({ create = false }: CampaignsProps) {
         await reload()
     }
 
-    const handleRowClick = (campaign: { id: UUID }) => {
+    const handleRowClick = (campaign: { id: UUID } & unknown) => {
         navigate(`/projects/${project.id}/campaigns/${campaign.id.toString()}`)
     }
 
diff --git a/console/src/views/campaign/CreateCampaign.tsx b/console/src/views/campaign/CreateCampaign.tsx
index c0ea357f..e17077dd 100644
--- a/console/src/views/campaign/CreateCampaign.tsx
+++ b/console/src/views/campaign/CreateCampaign.tsx
@@ -89,7 +89,9 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
 
     const filteredSubscriptions = useMemo(() => {
         if (!selectedChannel) return []
-        return (subscriptions ?? []).filter((subscription) => subscription.channel === selectedChannel)
+        return (subscriptions ?? []).filter(
+            (subscription) => subscription.channel === selectedChannel,
+        )
     }, [selectedChannel, subscriptions])
 
     const subscriptionsLoading = subscriptions === null
@@ -157,7 +159,6 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
         },
     ]
 
-
     return (
         <Dialog open={isOpen} onOpenChange={setIsOpen}>
             <DialogTrigger asChild>
@@ -252,7 +253,10 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
                                                 </SelectItem>
                                             )}
                                         {filteredSubscriptions.map((subscription) => (
-                                            <SelectItem key={subscription.id} value={subscription.id}>
+                                            <SelectItem
+                                                key={subscription.id}
+                                                value={subscription.id}
+                                            >
                                                 {subscription.name}
                                             </SelectItem>
                                         ))}
@@ -261,9 +265,7 @@ export function CreateCampaign({ open = false, onBeforeCreate, trigger }: Create
                             </div>
                         )}
 
-                        <Button onClick={() => create()}>
-                            {t("campaign.create.action")}
-                        </Button>
+                        <Button onClick={() => create()}>{t("campaign.create.action")}</Button>
                     </div>
                 )}
             </DialogContent>
@@ -348,4 +350,4 @@ function generateProjectName() {
     const adjective = adjectives[Math.floor(Math.random() * adjectives.length)]
     const name = names[Math.floor(Math.random() * names.length)]
     return `${adjective} ${name}`
-}
\ No newline at end of file
+}
diff --git a/console/src/views/campaign/setup/Setup.tsx b/console/src/views/campaign/setup/Setup.tsx
index d567e7bd..edd863f9 100644
--- a/console/src/views/campaign/setup/Setup.tsx
+++ b/console/src/views/campaign/setup/Setup.tsx
@@ -36,7 +36,7 @@ export default function CampaignSetup() {
     const [project] = useContext(ProjectContext)
     const { t } = useTranslation()
     const navigate = useNavigate()
-    const [transactional, setTransactional] = useState(campaign.transactional ?? false)
+    const [isTransactional, setTransactional] = useState(campaign.transactional ?? false)
     const [subscriptionId, setSubscriptionId] = useState<string>(campaign.subscription_id ?? "")
 
     const [subscriptions] = useResolver(
@@ -49,7 +49,7 @@ export default function CampaignSetup() {
 
     const filteredSubscriptions = useMemo(() => {
         return (subscriptions ?? []).filter((s) => {
-            const ch = (s.channel as string) === "sms" ? "text" : s.channel
+            const ch = (s.channel) === "sms" ? "text" : s.channel
             return ch === campaign.channel
         })
     }, [subscriptions, campaign.channel])
@@ -68,8 +68,8 @@ export default function CampaignSetup() {
             const updated = await api.campaigns.update(project.id, campaign.id, {
                 name: data.name,
                 provider_id: data.provider_id,
-                transactional,
-                subscription_id: transactional ? undefined : subscriptionId || undefined,
+                transactional: isTransactional,
+                subscription_id: isTransactional ? undefined : subscriptionId,
             })
 
             setCampaign(updated)
@@ -172,7 +172,7 @@ export default function CampaignSetup() {
                         </div>
                         <Switch
                             id="transactional-toggle"
-                            checked={transactional}
+                            checked={isTransactional}
                             onCheckedChange={(checked) => {
                                 setTransactional(checked)
                                 if (checked) setSubscriptionId("")
@@ -180,7 +180,7 @@ export default function CampaignSetup() {
                         />
                     </div>
 
-                    {!transactional && (
+                    {!isTransactional && (
                         <FieldGroup>
                             <Field className="gap-2">
                                 <FieldLabel htmlFor="subscription-select">
@@ -205,7 +205,10 @@ export default function CampaignSetup() {
                                             </SelectItem>
                                         )}
                                         {filteredSubscriptions.map((subscription) => (
-                                            <SelectItem key={subscription.id} value={subscription.id}>
+                                            <SelectItem
+                                                key={subscription.id}
+                                                value={subscription.id}
+                                            >
                                                 {subscription.name}
                                             </SelectItem>
                                         ))}
diff --git a/internal/http/controllers/v1/management/campaigns.go b/internal/http/controllers/v1/management/campaigns.go
index 0a00085c..060a5251 100644
--- a/internal/http/controllers/v1/management/campaigns.go
+++ b/internal/http/controllers/v1/management/campaigns.go
@@ -67,15 +67,15 @@ func (srv *CampaignsController) CreateCampaign(w http.ResponseWriter, r *http.Re
 	}
 
 	if body.SubscriptionId != nil {
-		subscription, subErr := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
-		if errors.Is(subErr, sql.ErrNoRows) {
+		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(err, sql.ErrNoRows) {
 			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription not found")))
 			return
 		}
 
-		if subErr != nil {
-			logger.Error("failed to get subscription", zap.Error(subErr))
-			oapi.WriteProblem(w, subErr)
+		if err != nil {
+			logger.Error("failed to get subscription", zap.Error(err))
+			oapi.WriteProblem(w, err)
 			return
 		}
 
@@ -246,15 +246,15 @@ func (srv *CampaignsController) UpdateCampaign(w http.ResponseWriter, r *http.Re
 	}
 
 	if body.SubscriptionId != nil {
-		subscription, subErr := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
-		if errors.Is(subErr, sql.ErrNoRows) {
+		subscription, err := srv.mgmt.SubscriptionsStore.GetSubscription(ctx, projectID, *body.SubscriptionId)
+		if errors.Is(err, sql.ErrNoRows) {
 			oapi.WriteProblem(w, problem.ErrBadRequest(problem.Describe("subscription not found")))
 			return
 		}
 
-		if subErr != nil {
-			logger.Error("failed to get subscription", zap.Error(subErr))
-			oapi.WriteProblem(w, subErr)
+		if err != nil {
+			logger.Error("failed to get subscription", zap.Error(err))
+			oapi.WriteProblem(w, err)
 			return
 		}
 
diff --git a/internal/store/management/subscriptions.go b/internal/store/management/subscriptions.go
index ccbc96ad..8321500f 100644
--- a/internal/store/management/subscriptions.go
+++ b/internal/store/management/subscriptions.go
@@ -29,20 +29,12 @@ type Subscription struct {
 	UpdatedAt time.Time `db:"updated_at"`
 }
 
-func normalizeManagementChannel(channel string) oapi.Channel {
-	if channel == "sms" {
-		return oapi.ChannelSms
-	}
-
-	return oapi.Channel(channel)
-}
-
 func (s *Subscription) OAPI() oapi.Subscription {
 	return oapi.Subscription{
 		Id:        s.ID,
 		ProjectId: s.ProjectID,
 		Name:      s.Name,
-		Channel:   normalizeManagementChannel(s.Channel),
+		Channel:   s.OAPI().Channel,
 		IsPublic:  s.IsPublic,
 		CreatedAt: s.CreatedAt,
 		UpdatedAt: s.UpdatedAt,
@@ -70,8 +62,8 @@ func (us *UserSubscription) OAPI() oapi.UserSubscription {
 	return oapi.UserSubscription{
 		SubscriptionId: us.SubscriptionID,
 		Name:           us.Name,
-		Channel:        normalizeManagementChannel(us.Channel),
-		State:          oapi.SubscriptionState(us.State),
+		Channel:        us.OAPI().Channel,
+		State:          us.OAPI().State,
 	}
 }