From fc8f9b63dea967e55667d2a3bd2211bc07ffac96 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 11 Feb 2026 14:13:58 +0100
Subject: [PATCH 1/3] Allow copying link to CAPTCHA on registration page

---
 .../InstallScreenCaptchaStep.dom.tsx          | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx b/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
index 4b9fed19b..81e670f40 100644
--- a/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
+++ b/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React, { type ReactElement, useState, useCallback } from 'react';
+import copyText from 'copy-text-to-clipboard';
 
 import { Button, ButtonVariant } from '../Button.dom.js';
 import { TitlebarDragArea } from '../TitlebarDragArea.dom.js';
@@ -30,6 +31,7 @@ export function InstallScreenCaptchaStep({
 }: Props): ReactElement {
   const [isWaitingForCaptcha, setIsWaitingForCaptcha] = useState(false);
   const [captchaError, setCaptchaError] = useState<string | null>(null);
+  const [isCopied, setIsCopied] = useState(false);
 
   const handleOpenCaptcha = useCallback(async () => {
     setIsWaitingForCaptcha(true);
@@ -49,6 +51,12 @@ export function InstallScreenCaptchaStep({
     }
   }, [requestCaptcha, onCaptchaComplete]);
 
+  const handleCopyUrl = useCallback(() => {
+    copyText(CAPTCHA_URL);
+    setIsCopied(true);
+    setTimeout(() => setIsCopied(false), 2000);
+  }, []);
+
   return (
     <div className="module-InstallScreenCaptchaStep">
       <TitlebarDragArea />
@@ -74,7 +82,7 @@ export function InstallScreenCaptchaStep({
           <div className="module-InstallScreenCaptchaStep__waiting">
             <Spinner size="36px" svgSize="normal" />
             <span className="module-InstallScreenCaptchaStep__waiting-text">
-              Complete the captcha in your browser, then click &quot;Open
+              Complete the CAPTCHA in your browser, then click &quot;Open
               Signal&quot;
             </span>
           </div>
@@ -86,7 +94,14 @@ export function InstallScreenCaptchaStep({
             variant={ButtonVariant.Primary}
             disabled={isSubmitting || isWaitingForCaptcha}
           >
-            {isWaitingForCaptcha ? 'Waiting for captcha...' : 'Open Captcha'}
+            {isWaitingForCaptcha ? 'Waiting for captcha...' : 'Open CAPTCHA'}
+          </Button>
+          <Button
+            onClick={handleCopyUrl}
+            variant={ButtonVariant.Details}
+            disabled={isSubmitting || isWaitingForCaptcha}
+          >
+            {isCopied ? 'Copied!' : 'Copy URL'}
           </Button>
           <Button
             onClick={onBack}

From bdfd98ac04f21ee1a342f4ccc181bfd7c9374a41 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 11 Feb 2026 14:40:50 +0100
Subject: [PATCH 2/3] On registration screen, allow copying CAPTCHA URL, and
 update text

---
 .../InstallScreenProfileNameStep.scss         |  2 +-
 .../InstallScreenCaptchaStep.dom.tsx          | 34 +++++++++++++------
 .../InstallScreenProfileNameStep.dom.tsx      |  7 ++--
 .../InstallScreenVerificationCodeStep.dom.tsx |  2 +-
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/stylesheets/components/InstallScreenProfileNameStep.scss b/stylesheets/components/InstallScreenProfileNameStep.scss
index 13fbe0727..a4b0c1d4c 100644
--- a/stylesheets/components/InstallScreenProfileNameStep.scss
+++ b/stylesheets/components/InstallScreenProfileNameStep.scss
@@ -29,7 +29,7 @@
     background: variables.$color-white;
     border-radius: 16px;
     padding: 48px;
-    max-width: 420px;
+    max-width: 520px;
     width: 100%;
     box-shadow: 0 4px 24px rgba(0, 0, 0, 0.15);
     text-align: center;
diff --git a/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx b/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
index 81e670f40..5eaf7ed26 100644
--- a/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
+++ b/ts/components/installScreen/InstallScreenCaptchaStep.dom.tsx
@@ -33,14 +33,16 @@ export function InstallScreenCaptchaStep({
   const [captchaError, setCaptchaError] = useState<string | null>(null);
   const [isCopied, setIsCopied] = useState(false);
 
-  const handleOpenCaptcha = useCallback(async () => {
+  // Shared function to start waiting for captcha and register handler
+  const startWaitingForCaptcha = useCallback(async () => {
+    if (isWaitingForCaptcha) {
+      // Already waiting, don't start another handler
+      return;
+    }
+
     setIsWaitingForCaptcha(true);
     setCaptchaError(null);
 
-    // Open the captcha URL in external browser
-    // This will be intercepted by Electron's will-navigate handler
-    document.location.href = CAPTCHA_URL;
-
     try {
       // Wait for the captcha token to come back via the signalcaptcha:// URL
       const token = await requestCaptcha();
@@ -49,13 +51,25 @@ export function InstallScreenCaptchaStep({
       setCaptchaError('Failed to complete captcha. Please try again.');
       setIsWaitingForCaptcha(false);
     }
-  }, [requestCaptcha, onCaptchaComplete]);
+  }, [isWaitingForCaptcha, requestCaptcha, onCaptchaComplete]);
+
+  const handleOpenCaptcha = useCallback(async () => {
+    // Open the captcha URL in external browser
+    // This will be intercepted by Electron's will-navigate handler
+    document.location.href = CAPTCHA_URL;
 
-  const handleCopyUrl = useCallback(() => {
+    // Start waiting for the captcha response
+    await startWaitingForCaptcha();
+  }, [startWaitingForCaptcha]);
+
+  const handleCopyUrl = useCallback(async () => {
     copyText(CAPTCHA_URL);
     setIsCopied(true);
     setTimeout(() => setIsCopied(false), 2000);
-  }, []);
+
+    // Also start waiting for the captcha response
+    await startWaitingForCaptcha();
+  }, [startWaitingForCaptcha]);
 
   return (
     <div className="module-InstallScreenCaptchaStep">
@@ -94,12 +108,12 @@ export function InstallScreenCaptchaStep({
             variant={ButtonVariant.Primary}
             disabled={isSubmitting || isWaitingForCaptcha}
           >
-            {isWaitingForCaptcha ? 'Waiting for captcha...' : 'Open CAPTCHA'}
+            {isWaitingForCaptcha ? 'Waiting for CAPTCHA...' : 'Open CAPTCHA'}
           </Button>
           <Button
             onClick={handleCopyUrl}
             variant={ButtonVariant.Details}
-            disabled={isSubmitting || isWaitingForCaptcha}
+            disabled={isSubmitting}
           >
             {isCopied ? 'Copied!' : 'Copy URL'}
           </Button>
diff --git a/ts/components/installScreen/InstallScreenProfileNameStep.dom.tsx b/ts/components/installScreen/InstallScreenProfileNameStep.dom.tsx
index 1e6f6c15c..68dcd98fa 100644
--- a/ts/components/installScreen/InstallScreenProfileNameStep.dom.tsx
+++ b/ts/components/installScreen/InstallScreenProfileNameStep.dom.tsx
@@ -42,11 +42,12 @@ export function InstallScreenProfileNameStep({
 
       <div className="module-InstallScreenProfileNameStep__card">
         <h1 className="module-InstallScreenProfileNameStep__title">
-          Set up your profile
+          Set up your Observer Vault profile
         </h1>
         <p className="module-InstallScreenProfileNameStep__description">
-          Enter your name to complete registration. This is how you&apos;ll
-          appear to others.
+          Enter a name for your Observer Vault&apos;s Signal account. If
+          you&apos;re not sure what to use, just set the first name to
+          &quot;Observer Vault&quot;.
         </p>
 
         <form
diff --git a/ts/components/installScreen/InstallScreenVerificationCodeStep.dom.tsx b/ts/components/installScreen/InstallScreenVerificationCodeStep.dom.tsx
index 134fae1b9..e2f5d0ca0 100644
--- a/ts/components/installScreen/InstallScreenVerificationCodeStep.dom.tsx
+++ b/ts/components/installScreen/InstallScreenVerificationCodeStep.dom.tsx
@@ -103,7 +103,7 @@ export function InstallScreenVerificationCodeStep({
           Enter verification code
         </h1>
         <p className="module-InstallScreenVerificationCodeStep__description">
-          We sent a code to <strong>{phoneNumber}</strong>
+          Signal sent a code to <strong>{phoneNumber}</strong>
         </p>
 
         {error && (

From ee14982947333d2f500da9a77cb9d242e4653a74 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Wed, 11 Feb 2026 14:46:20 +0100
Subject: [PATCH 3/3] Fix startup error when disabling stories in settings

---
 ts/util/stories.preload.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ts/util/stories.preload.ts b/ts/util/stories.preload.ts
index e698145f7..36ed2af89 100644
--- a/ts/util/stories.preload.ts
+++ b/ts/util/stories.preload.ts
@@ -8,8 +8,18 @@ export const getStoriesDisabled = (): boolean =>
 
 export const setStoriesDisabled = async (value: boolean): Promise<void> => {
   await itemStorage.put('hasStoriesDisabled', value);
-  const account = window.ConversationController.getOurConversationOrThrow();
-  account.captureChange('hasStoriesDisabled');
+
+  // Only update the conversation if it exists and the controller is ready
+  try {
+    const account = window.ConversationController.getOurConversation();
+    if (account) {
+      account.captureChange('hasStoriesDisabled');
+    }
+  } catch (error) {
+    // ConversationController may not be ready yet (e.g., during app startup)
+    // The setting is still saved to storage, so it will be applied when ready
+  }
+
   onHasStoriesDisabledChange(value);
 };