From 88a994e9ed493e296b70d6b6c80ff83e22b5c59f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 14 Sep 2026 16:17:38 -0400
Subject: [PATCH] Move beta disclaimer into SignalLoginViewDetailsScreen.

---
 .../signal/appsettings/account/AccountSettingsScreen.kt  | 9 ---------
 .../appsettings/account/AccountSettingsScreenTest.kt     | 1 -
 .../SignalLoginViewDetailsScreenTest.kt                  | 7 +++++++
 .../viewdetails/SignalLoginViewDetailsScreen.kt          | 9 ++++++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt
index 45f8b93366..e726c3eb75 100644
--- a/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt
+++ b/feature/app-settings/src/main/java/org/signal/appsettings/account/AccountSettingsScreen.kt
@@ -68,7 +68,6 @@ import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.Texts
 import org.signal.core.ui.compose.theme.SignalTheme
-import org.signal.signallogin.beta.SignalLoginBetaDisclaimer
 import org.signal.signallogin.beta.SignalLoginBetaTag
 import org.signal.core.ui.R as CoreUiR
 
@@ -129,14 +128,6 @@ fun AccountSettingsScreen(
           )
         }
 
-        item {
-          SignalLoginBetaDisclaimer(
-            modifier = Modifier
-              .padding(horizontal = dimensionResource(CoreUiR.dimen.gutter))
-              .padding(bottom = 12.dp)
-          )
-        }
-
         item {
           SignalLoginCard(
             onClick = { onEvent(AccountSettingsEvent.AccountAndRecoveryClicked) }
diff --git a/feature/app-settings/src/test/java/org/signal/appsettings/account/AccountSettingsScreenTest.kt b/feature/app-settings/src/test/java/org/signal/appsettings/account/AccountSettingsScreenTest.kt
index 56c9f20c2e..169a160d48 100644
--- a/feature/app-settings/src/test/java/org/signal/appsettings/account/AccountSettingsScreenTest.kt
+++ b/feature/app-settings/src/test/java/org/signal/appsettings/account/AccountSettingsScreenTest.kt
@@ -333,7 +333,6 @@ class AccountSettingsScreenTest {
     setContent(createState(signalLogin = signalLogin()))
 
     composeTestRule.onNodeWithTag(SignalLoginTestTags.BETA_TAG).assertIsDisplayed()
-    composeTestRule.onNodeWithTag(SignalLoginTestTags.BETA_DISCLAIMER).assertIsDisplayed()
   }
 
   @Test
diff --git a/feature/registration/src/test/java/org/signal/registration/screens/signallogindetails/SignalLoginViewDetailsScreenTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/signallogindetails/SignalLoginViewDetailsScreenTest.kt
index cf9948de1a..d591adb93e 100644
--- a/feature/registration/src/test/java/org/signal/registration/screens/signallogindetails/SignalLoginViewDetailsScreenTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/screens/signallogindetails/SignalLoginViewDetailsScreenTest.kt
@@ -50,6 +50,13 @@ class SignalLoginViewDetailsScreenTest {
     composeTestRule.onNodeWithTag(SignalLoginTestTags.BETA_TAG).assertIsDisplayed()
   }
 
+  @Test
+  fun `when the screen is displayed, the beta disclaimer is shown`() {
+    setContent()
+
+    composeTestRule.onNodeWithTag(SignalLoginTestTags.BETA_DISCLAIMER).assertIsDisplayed()
+  }
+
   @Test
   fun `when the account key copy button is clicked, CopyAccountIdClicked is emitted`() {
     setContent()
diff --git a/lib/signal-login/src/main/java/org/signal/signallogin/viewdetails/SignalLoginViewDetailsScreen.kt b/lib/signal-login/src/main/java/org/signal/signallogin/viewdetails/SignalLoginViewDetailsScreen.kt
index f55061577a..23671d94c8 100644
--- a/lib/signal-login/src/main/java/org/signal/signallogin/viewdetails/SignalLoginViewDetailsScreen.kt
+++ b/lib/signal-login/src/main/java/org/signal/signallogin/viewdetails/SignalLoginViewDetailsScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -38,8 +39,10 @@ import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.signallogin.R
 import org.signal.signallogin.SignalLoginTestTags
+import org.signal.signallogin.beta.SignalLoginBetaDisclaimer
 import org.signal.signallogin.beta.SignalLoginBetaTag
 import org.signal.signallogin.details.SignalLoginKeyDetails
+import org.signal.core.ui.R as CoreUiR
 
 /** Size of the miniature credential card artwork shown at the top of the screen, from the design. */
 private val MINI_CARD_WIDTH = 175.dp
@@ -78,10 +81,14 @@ fun SignalLoginViewDetailsScreen(
           .fillMaxWidth()
           .verticalScroll(rememberScrollState())
       ) {
+        SignalLoginBetaDisclaimer(
+          modifier = Modifier.padding(horizontal = dimensionResource(CoreUiR.dimen.gutter), vertical = 12.dp)
+        )
+
         MiniCard(
           modifier = Modifier
             .align(Alignment.CenterHorizontally)
-            .padding(top = 20.dp)
+            .padding(top = 8.dp)
         )
 
         Spacer(modifier = Modifier.height(16.dp))