From c9af66c83f5d41bbdb907e78e3d5688395a8aad7 Mon Sep 17 00:00:00 2001
From: Ekkasit Samathimankong <ekkasit.samathimankong@tandem.org.nz>
Date: Wed, 18 Feb 2026 20:51:07 +0000
Subject: [PATCH 1/3] fix: use userId instead of id in findOrFetchUser Prisma
 where clause

---
 apis/api-users/src/schema/user/findOrFetchUser.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apis/api-users/src/schema/user/findOrFetchUser.ts b/apis/api-users/src/schema/user/findOrFetchUser.ts
index 5ff8a2089e5..5097a1a75c4 100644
--- a/apis/api-users/src/schema/user/findOrFetchUser.ts
+++ b/apis/api-users/src/schema/user/findOrFetchUser.ts
@@ -19,7 +19,7 @@ export async function findOrFetchUser(
   if (existingUser != null && existingUser.emailVerified == null) {
     const user = await prisma.user.update({
       where: {
-        id: userId
+        userId
       },
       data: {
         emailVerified: false
@@ -86,7 +86,7 @@ export async function findOrFetchUser(
     do {
       user = await prisma.user.update({
         where: {
-          id: userId
+          userId
         },
         data
       })

From 0fdaa58428d9a58c23c625b6d8df4b0c5cefe510 Mon Sep 17 00:00:00 2001
From: Ekkasit Samathimankong <ekkasit.samathimankong@tandem.org.nz>
Date: Thu, 19 Feb 2026 21:49:27 +0000
Subject: [PATCH 2/3] fix: use plain iframe for YouTube videos in Instagram
 Android WebView

Video.js with videojs-youtube plugin fails to play YouTube videos in
Instagram's Android in-app browser due to YouTube IFrame API restrictions.
Detect Instagram Android WebView and render a plain <iframe> embed instead.
---
 .../BackgroundVideo/BackgroundVideo.tsx       | 28 ++++++++++++++++++-
 .../ui/src/components/Video/Video.tsx         | 25 ++++++++++++++++-
 .../ui/src/libs/deviceUtils/deviceUtils.ts    | 11 ++++++++
 libs/shared/ui/src/libs/deviceUtils/index.ts  |  1 +
 4 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx b/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
index a9426352805..83aabf713c8 100644
--- a/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
+++ b/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
@@ -1,9 +1,10 @@
 import Box from '@mui/material/Box'
 import { styled } from '@mui/material/styles'
-import { CSSProperties, ReactElement, useEffect, useRef } from 'react'
+import { CSSProperties, ReactElement, useEffect, useRef, useState } from 'react'
 import videojs from 'video.js'
 import Player from 'video.js/dist/types/player'
 
+import { isInstagramAndroidWebView } from '@core/shared/ui/deviceUtils'
 import { defaultBackgroundVideoJsOptions } from '@core/shared/ui/defaultVideoJsOptions'
 
 import {
@@ -36,6 +37,11 @@ export function BackgroundVideo({
   const videoRef = useRef<HTMLVideoElement>(null)
   const playerRef = useRef<Player | null>(null)
   const isYouTube = source === VideoBlockSource.youTube
+  const [inAppBrowser, setInAppBrowser] = useState(false)
+
+  useEffect(() => {
+    setInAppBrowser(isInstagramAndroidWebView())
+  }, [])
 
   // Initiate Video
   useEffect(() => {
@@ -136,6 +142,26 @@ export function BackgroundVideo({
     }
   }
 
+  if (inAppBrowser && isYouTube && videoId != null) {
+    return (
+      <Box
+        height="100%"
+        width="100%"
+        minHeight="-webkit-fill-available"
+        overflow="hidden"
+        position="absolute"
+        data-testid="CardContainedBackgroundVideo"
+      >
+        <iframe
+          src={`https://www.youtube.com/embed/${videoId}?start=${startAt ?? 0}&end=${endAt ?? 0}&autoplay=1&mute=1&loop=1&playsinline=1&controls=0`}
+          allow="accelerometer; autoplay; encrypted-media"
+          style={{ width: '100%', height: '100%', border: 'none', pointerEvents: 'none' }}
+          title="Background video"
+        />
+      </Box>
+    )
+  }
+
   return (
     <Box
       height="100%"
diff --git a/libs/journeys/ui/src/components/Video/Video.tsx b/libs/journeys/ui/src/components/Video/Video.tsx
index dd847bed905..2f813799485 100644
--- a/libs/journeys/ui/src/components/Video/Video.tsx
+++ b/libs/journeys/ui/src/components/Video/Video.tsx
@@ -13,6 +13,7 @@ import {
 } from 'react'
 import { use100vh } from 'react-div-100vh'
 
+import { isInstagramAndroidWebView } from '@core/shared/ui/deviceUtils'
 import { NextImage } from '@core/shared/ui/NextImage'
 
 import {
@@ -74,6 +75,11 @@ export function Video({
   const [player, setPlayer] = useState<VideoJsPlayer>()
   const [showPoster, setShowPoster] = useState(true)
   const [activeStep, setActiveStep] = useState(false)
+  const [inAppBrowser, setInAppBrowser] = useState(false)
+
+  useEffect(() => {
+    setInAppBrowser(isInstagramAndroidWebView())
+  }, [])
 
   const { blockHistory } = useBlocks()
   const { variant, journey } = useJourney()
@@ -220,7 +226,24 @@ export function Video({
           />
         )}
 
-      {videoId != null ? (
+      {videoId != null && inAppBrowser && source === VideoBlockSource.youTube ? (
+        <Box
+          data-testid="in-app-browser-youtube-fallback"
+          sx={{
+            width: '100%',
+            height: '100%',
+            position: 'relative'
+          }}
+        >
+          <iframe
+            src={`https://www.youtube.com/embed/${videoId}?start=${effectiveStartAt}&end=${effectiveEndAt}&autoplay=0&playsinline=1`}
+            allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen"
+            allowFullScreen
+            style={{ width: '100%', height: '100%', border: 'none' }}
+            title={title ?? 'YouTube video'}
+          />
+        </Box>
+      ) : videoId != null ? (
         <>
           <Box
             height={{
diff --git a/libs/shared/ui/src/libs/deviceUtils/deviceUtils.ts b/libs/shared/ui/src/libs/deviceUtils/deviceUtils.ts
index be9ae758a37..04990838031 100644
--- a/libs/shared/ui/src/libs/deviceUtils/deviceUtils.ts
+++ b/libs/shared/ui/src/libs/deviceUtils/deviceUtils.ts
@@ -60,6 +60,17 @@ export function isIOSTouchScreen(): boolean {
   )
 }
 
+export function isInstagramAndroidWebView(): boolean {
+  if (
+    typeof navigator === 'undefined' ||
+    typeof navigator.userAgent === 'undefined'
+  )
+    return false
+
+  const ua = navigator.userAgent
+  return /Android/i.test(ua) && /Instagram/i.test(ua)
+}
+
 // TODO: should only resort to user agent sniffing as a last resport
 export function isMobile(): boolean {
   if (
diff --git a/libs/shared/ui/src/libs/deviceUtils/index.ts b/libs/shared/ui/src/libs/deviceUtils/index.ts
index 9185d219227..797d17fdbb2 100644
--- a/libs/shared/ui/src/libs/deviceUtils/index.ts
+++ b/libs/shared/ui/src/libs/deviceUtils/index.ts
@@ -1,5 +1,6 @@
 export {
   hasTouchScreen,
+  isInstagramAndroidWebView,
   isIPhone,
   isMobile,
   isIOS,

From 46a4fd5ca27cdb977d38620e7bedcc6fd4613ad1 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Thu, 19 Feb 2026 22:55:41 +0000
Subject: [PATCH 3/3] fix: lint issues

---
 .../ContainedCover/BackgroundVideo/BackgroundVideo.tsx   | 9 +++++++--
 libs/journeys/ui/src/components/Video/Video.tsx          | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx b/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
index 83aabf713c8..b7d6954c988 100644
--- a/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
+++ b/libs/journeys/ui/src/components/Card/ContainedCover/BackgroundVideo/BackgroundVideo.tsx
@@ -4,8 +4,8 @@ import { CSSProperties, ReactElement, useEffect, useRef, useState } from 'react'
 import videojs from 'video.js'
 import Player from 'video.js/dist/types/player'
 
-import { isInstagramAndroidWebView } from '@core/shared/ui/deviceUtils'
 import { defaultBackgroundVideoJsOptions } from '@core/shared/ui/defaultVideoJsOptions'
+import { isInstagramAndroidWebView } from '@core/shared/ui/deviceUtils'
 
 import {
   VideoBlockObjectFit,
@@ -155,7 +155,12 @@ export function BackgroundVideo({
         <iframe
           src={`https://www.youtube.com/embed/${videoId}?start=${startAt ?? 0}&end=${endAt ?? 0}&autoplay=1&mute=1&loop=1&playsinline=1&controls=0`}
           allow="accelerometer; autoplay; encrypted-media"
-          style={{ width: '100%', height: '100%', border: 'none', pointerEvents: 'none' }}
+          style={{
+            width: '100%',
+            height: '100%',
+            border: 'none',
+            pointerEvents: 'none'
+          }}
           title="Background video"
         />
       </Box>
diff --git a/libs/journeys/ui/src/components/Video/Video.tsx b/libs/journeys/ui/src/components/Video/Video.tsx
index 2f813799485..8727830190c 100644
--- a/libs/journeys/ui/src/components/Video/Video.tsx
+++ b/libs/journeys/ui/src/components/Video/Video.tsx
@@ -226,7 +226,9 @@ export function Video({
           />
         )}
 
-      {videoId != null && inAppBrowser && source === VideoBlockSource.youTube ? (
+      {videoId != null &&
+      inAppBrowser &&
+      source === VideoBlockSource.youTube ? (
         <Box
           data-testid="in-app-browser-youtube-fallback"
           sx={{