From 8d56a8e8fcfdd3d7172b5e1f6b1362d6eca5f398 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 13 Apr 2023 11:35:49 +0100
Subject: [PATCH 1/5] Fix #978 issue with builds not building.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9487319..ca31832 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build",
+    "build": "NODE_OPTIONS=--max-old-space-size=16384 vite build",
     "serve": "vite preview",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook",

From 323dba620d4a01e9ac14a42a275048e8890f8195 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:47:05 +0100
Subject: [PATCH 2/5] Add a range of data-testid tags to be able to cleanly
 identify parts of the application.

---
 src/home/JoinExistingCallModal.tsx | 2 +-
 src/home/UnauthenticatedView.tsx   | 4 +++-
 src/icons/VideoMuted.svg           | 2 +-
 src/room/LobbyView.tsx             | 1 +
 src/room/VideoPreview.tsx          | 2 +-
 src/video-grid/VideoTile.tsx       | 5 +++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/home/JoinExistingCallModal.tsx b/src/home/JoinExistingCallModal.tsx
index 0beae60..02d7cd2 100644
--- a/src/home/JoinExistingCallModal.tsx
+++ b/src/home/JoinExistingCallModal.tsx
@@ -43,7 +43,7 @@ export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) {
         <p>{t("This call already exists, would you like to join?")}</p>
         <FieldRow rightAlign className={styles.buttons}>
           <Button onPress={onClose}>{t("No")}</Button>
-          <Button onPress={onJoin}>{t("Yes, join call")}</Button>
+          <Button onPress={onJoin} data-testid="home_joinExistingRoom">{t("Yes, join call")}</Button>
         </FieldRow>
       </ModalContent>
     </Modal>
diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx
index c31637b..be20d70 100644
--- a/src/home/UnauthenticatedView.tsx
+++ b/src/home/UnauthenticatedView.tsx
@@ -142,6 +142,7 @@ export const UnauthenticatedView: FC = () => {
                 type="text"
                 required
                 autoComplete="off"
+                data-testid="home_callName"
               />
             </FieldRow>
             <FieldRow>
@@ -152,6 +153,7 @@ export const UnauthenticatedView: FC = () => {
                 placeholder={t("Display name")}
                 type="text"
                 required
+                data-testid="home_displayName"
                 autoComplete="off"
               />
             </FieldRow>
@@ -171,7 +173,7 @@ export const UnauthenticatedView: FC = () => {
                 <ErrorMessage error={error} />
               </FieldRow>
             )}
-            <Button type="submit" size="lg" disabled={loading}>
+            <Button type="submit" size="lg" disabled={loading} data-testid="home_go">
               {loading ? t("Loading…") : t("Go")}
             </Button>
             <div id={recaptchaId} />
diff --git a/src/icons/VideoMuted.svg b/src/icons/VideoMuted.svg
index 188ed08..20ecf0f 100644
--- a/src/icons/VideoMuted.svg
+++ b/src/icons/VideoMuted.svg
@@ -1,4 +1,4 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg data-testid="videoTile_muted" width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0.20333 0.963373C0.474437 0.690007 0.913989 0.690007 1.1851 0.963373L11.5983 11.4633C11.8694 11.7367 11.8694 12.1799 11.5983 12.4533C11.3272 12.7267 10.8876 12.7267 10.6165 12.4533L0.20333 1.95332C-0.0677768 1.67995 -0.0677768 1.23674 0.20333 0.963373Z" fill="white"/>
 <path d="M0.418261 3.63429C0.226267 3.95219 0.115674 4.32557 0.115674 4.725V9.85832C0.115674 11.0181 1.0481 11.9583 2.19831 11.9583H8.65411L0.447396 3.66596C0.437225 3.65568 0.427513 3.64511 0.418261 3.63429Z" fill="white"/>
 <path d="M9.95036 4.725V8.33212L4.30219 2.625H7.86772C9.01793 2.625 9.95036 3.5652 9.95036 4.725Z" fill="white"/>
diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx
index a1a6961..2e726cc 100644
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -137,6 +137,7 @@ export function LobbyView({
               size="lg"
               disabled={state !== GroupCallState.LocalCallFeedInitialized}
               onPress={onEnter}
+              data-testid="lobby_joinCall"
             >
               Join call now
             </Button>
diff --git a/src/room/VideoPreview.tsx b/src/room/VideoPreview.tsx
index 0e92cc5..6325bda 100644
--- a/src/room/VideoPreview.tsx
+++ b/src/room/VideoPreview.tsx
@@ -64,7 +64,7 @@ export function VideoPreview({
 
   return (
     <div className={styles.preview} ref={previewRef}>
-      <video ref={videoRef} muted playsInline disablePictureInPicture />
+      <video ref={videoRef} muted playsInline disablePictureInPicture data-testid="preview_video" />
       {state === GroupCallState.LocalCallFeedUninitialized && (
         <Body fontWeight="semiBold" className={styles.cameraPermissions}>
           {t("Camera/microphone permissions needed to join the call.")}
diff --git a/src/video-grid/VideoTile.tsx b/src/video-grid/VideoTile.tsx
index eea617f..804a036 100644
--- a/src/video-grid/VideoTile.tsx
+++ b/src/video-grid/VideoTile.tsx
@@ -154,6 +154,7 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
           "--tileHeight": height?.to((h) => `${h}px`),
         }}
         ref={ref as ForwardedRef<HTMLDivElement>}
+        data-testid='videoTile'
         {...rest}
       >
         {toolbarButtons.length > 0 && !maximised && (
@@ -180,10 +181,10 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
                 audioMuted && !videoMuted && !speaking && <MicMutedIcon />
               }
               {videoMuted && <VideoMutedIcon />}
-              <span title={caption}>{caption}</span>
+              <span data-testid="videoTile_caption" title={caption}>{caption}</span>
             </div>
           ))}
-        <video ref={mediaRef} playsInline disablePictureInPicture />
+        <video data-testid="videoTile_video" ref={mediaRef} playsInline disablePictureInPicture />
       </animated.div>
     );
   }

From 4e8146bc9cda07cc0765156662797e9ebe06e1e2 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Tue, 25 Apr 2023 16:42:27 +0100
Subject: [PATCH 3/5] Add screenshare tags

---
 src/room/InCallView.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index b3fdaa3..198edb2 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -383,11 +383,13 @@ export function InCallView({
         key="1"
         muted={microphoneMuted}
         onPress={toggleMicrophoneMuted}
+        data-testid="incall_mute"
       />,
       <VideoButton
         key="2"
         muted={localVideoMuted}
         onPress={toggleLocalVideoMuted}
+        data-testid="incall_videomute"
       />
     );
 
@@ -398,6 +400,7 @@ export function InCallView({
             key="3"
             enabled={isScreensharing}
             onPress={toggleScreensharing}
+            data-testid="incall_screenshare"
           />
         );
       }

From 2318f2c4a002f040fcab3f90df02710758afd007 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Tue, 2 May 2023 17:33:56 +0100
Subject: [PATCH 4/5] prettier -w

---
 src/home/JoinExistingCallModal.tsx |  4 +++-
 src/home/UnauthenticatedView.tsx   |  7 ++++++-
 src/room/VideoPreview.tsx          |  8 +++++++-
 src/video-grid/VideoTile.tsx       | 13 ++++++++++---
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/home/JoinExistingCallModal.tsx b/src/home/JoinExistingCallModal.tsx
index 02d7cd2..078d317 100644
--- a/src/home/JoinExistingCallModal.tsx
+++ b/src/home/JoinExistingCallModal.tsx
@@ -43,7 +43,9 @@ export function JoinExistingCallModal({ onJoin, onClose, ...rest }: Props) {
         <p>{t("This call already exists, would you like to join?")}</p>
         <FieldRow rightAlign className={styles.buttons}>
           <Button onPress={onClose}>{t("No")}</Button>
-          <Button onPress={onJoin} data-testid="home_joinExistingRoom">{t("Yes, join call")}</Button>
+          <Button onPress={onJoin} data-testid="home_joinExistingRoom">
+            {t("Yes, join call")}
+          </Button>
         </FieldRow>
       </ModalContent>
     </Modal>
diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx
index be20d70..4d4f5ce 100644
--- a/src/home/UnauthenticatedView.tsx
+++ b/src/home/UnauthenticatedView.tsx
@@ -173,7 +173,12 @@ export const UnauthenticatedView: FC = () => {
                 <ErrorMessage error={error} />
               </FieldRow>
             )}
-            <Button type="submit" size="lg" disabled={loading} data-testid="home_go">
+            <Button
+              type="submit"
+              size="lg"
+              disabled={loading}
+              data-testid="home_go"
+            >
               {loading ? t("Loading…") : t("Go")}
             </Button>
             <div id={recaptchaId} />
diff --git a/src/room/VideoPreview.tsx b/src/room/VideoPreview.tsx
index 6325bda..aaf9df5 100644
--- a/src/room/VideoPreview.tsx
+++ b/src/room/VideoPreview.tsx
@@ -64,7 +64,13 @@ export function VideoPreview({
 
   return (
     <div className={styles.preview} ref={previewRef}>
-      <video ref={videoRef} muted playsInline disablePictureInPicture data-testid="preview_video" />
+      <video
+        ref={videoRef}
+        muted
+        playsInline
+        disablePictureInPicture
+        data-testid="preview_video"
+      />
       {state === GroupCallState.LocalCallFeedUninitialized && (
         <Body fontWeight="semiBold" className={styles.cameraPermissions}>
           {t("Camera/microphone permissions needed to join the call.")}
diff --git a/src/video-grid/VideoTile.tsx b/src/video-grid/VideoTile.tsx
index 804a036..e3d26ad 100644
--- a/src/video-grid/VideoTile.tsx
+++ b/src/video-grid/VideoTile.tsx
@@ -154,7 +154,7 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
           "--tileHeight": height?.to((h) => `${h}px`),
         }}
         ref={ref as ForwardedRef<HTMLDivElement>}
-        data-testid='videoTile'
+        data-testid="videoTile"
         {...rest}
       >
         {toolbarButtons.length > 0 && !maximised && (
@@ -181,10 +181,17 @@ export const VideoTile = forwardRef<HTMLElement, Props>(
                 audioMuted && !videoMuted && !speaking && <MicMutedIcon />
               }
               {videoMuted && <VideoMutedIcon />}
-              <span data-testid="videoTile_caption" title={caption}>{caption}</span>
+              <span data-testid="videoTile_caption" title={caption}>
+                {caption}
+              </span>
             </div>
           ))}
-        <video data-testid="videoTile_video" ref={mediaRef} playsInline disablePictureInPicture />
+        <video
+          data-testid="videoTile_video"
+          ref={mediaRef}
+          playsInline
+          disablePictureInPicture
+        />
       </animated.div>
     );
   }

From 9c8692d99e3a0574e413fbede5ef5242409bba3c Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Wed, 3 May 2023 12:57:03 +0100
Subject: [PATCH 5/5] Remove NODE_OPTIONS from GHA commands, as defaulted in
 package.json now.

---
 .github/workflows/build.yaml   | 3 ---
 .github/workflows/publish.yaml | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ba27e26..eee1406 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,9 +23,6 @@ jobs:
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          # This appears to be necessary to stop Vite from OOMing
-          # https://github.com/vitejs/vite/issues/2433
-          NODE_OPTIONS: "--max-old-space-size=16384"
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 3558797..f49980d 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -40,9 +40,6 @@ jobs:
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           VITE_APP_VERSION: ${{ github.event.release.tag_name }}
-          # This appears to be necessary to stop Vite from OOMing
-          # https://github.com/vitejs/vite/issues/2433
-          NODE_OPTIONS: "--max-old-space-size=16384"
 
       - name: Create Tarball
         env: