From c02f2a1eda66246ed76e91a6d12f440bc1c581c3 Mon Sep 17 00:00:00 2001
From: DS Boyce <260543580+ds-boyce@users.noreply.github.com>
Date: Mon, 8 Jun 2026 03:51:11 -0700
Subject: [PATCH] Fix alignment of error screen (#10763)

---
 src/components/Error.tsx                      | 21 +++++++------------
 src/components/Lists.tsx                      |  2 --
 src/screens/Messages/Conversation.tsx         |  1 -
 .../Messages/ConversationSettings/index.tsx   |  1 -
 src/screens/Messages/JoinRequests.tsx         |  1 -
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/components/Error.tsx b/src/components/Error.tsx
index 77aacdb451..190165a2df 100644
--- a/src/components/Error.tsx
+++ b/src/components/Error.tsx
@@ -1,12 +1,10 @@
 import {View} from 'react-native'
-import {msg} from '@lingui/core/macro'
-import {useLingui} from '@lingui/react'
-import {Trans} from '@lingui/react/macro'
+import {Trans, useLingui} from '@lingui/react/macro'
 
 import {useGoBack} from '#/lib/hooks/useGoBack'
-import {CenteredView} from '#/view/com/util/Views'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
+import * as Layout from '#/components/Layout'
 import {Text} from '#/components/Typography'
 
 export function Error({
@@ -15,22 +13,20 @@ export function Error({
   onRetry,
   onGoBack,
   hideBackButton,
-  sideBorders = true,
 }: {
   title?: string
   message?: string
   onRetry?: () => unknown
   onGoBack?: () => unknown
   hideBackButton?: boolean
-  sideBorders?: boolean
 }) {
-  const {_} = useLingui()
+  const {t: l} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const goBack = useGoBack(onGoBack)
 
   return (
-    <CenteredView
+    <Layout.Center
       style={[
         a.h_full_vh,
         a.align_center,
@@ -38,8 +34,7 @@ export function Error({
         !gtMobile && a.justify_between,
         t.atoms.border_contrast_low,
         {paddingTop: 175, paddingBottom: 110},
-      ]}
-      sideBorders={sideBorders}>
+      ]}>
       <View style={[a.w_full, a.align_center, a.gap_lg]}>
         <Text style={[a.font_semi_bold, a.text_3xl]}>{title}</Text>
         <Text
@@ -58,7 +53,7 @@ export function Error({
           <Button
             variant="solid"
             color="primary"
-            label={_(msg`Press to retry`)}
+            label={l`Press to retry`}
             onPress={onRetry}
             size="large">
             <ButtonText>
@@ -70,7 +65,7 @@ export function Error({
           <Button
             variant="solid"
             color={onRetry ? 'secondary' : 'primary'}
-            label={_(msg`Return to previous page`)}
+            label={l`Return to previous page`}
             onPress={goBack}
             size="large">
             <ButtonText>
@@ -79,6 +74,6 @@ export function Error({
           </Button>
         )}
       </View>
-    </CenteredView>
+    </Layout.Center>
   )
 }
diff --git a/src/components/Lists.tsx b/src/components/Lists.tsx
index e1008300ad..d0cb34215f 100644
--- a/src/components/Lists.tsx
+++ b/src/components/Lists.tsx
@@ -185,7 +185,6 @@ let ListMaybePlaceholder = ({
         message={errorMessage ?? _(msg`Something went wrong!`)}
         onRetry={onRetry}
         onGoBack={onGoBack}
-        sideBorders={sideBorders}
         hideBackButton={hideBackButton}
       />
     )
@@ -226,7 +225,6 @@ let ListMaybePlaceholder = ({
         onRetry={onRetry}
         onGoBack={onGoBack}
         hideBackButton={hideBackButton}
-        sideBorders={sideBorders}
       />
     )
   }
diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx
index b269046534..36adb63e7a 100644
--- a/src/screens/Messages/Conversation.tsx
+++ b/src/screens/Messages/Conversation.tsx
@@ -137,7 +137,6 @@ function Inner({convoId}: {convoId: string}) {
           title={l`Something went wrong`}
           message={l`We couldn't load this conversation`}
           onRetry={() => convoState.error.retry()}
-          sideBorders={false}
         />
       </>
     )
diff --git a/src/screens/Messages/ConversationSettings/index.tsx b/src/screens/Messages/ConversationSettings/index.tsx
index 5e4ad91424..fbc4ffcc63 100644
--- a/src/screens/Messages/ConversationSettings/index.tsx
+++ b/src/screens/Messages/ConversationSettings/index.tsx
@@ -112,7 +112,6 @@ function SettingsInner() {
         title={l`Something went wrong`}
         message={l`We couldn’t load this conversation’s settings`}
         onRetry={() => convoState.error.retry()}
-        sideBorders={false}
       />
     )
   }
diff --git a/src/screens/Messages/JoinRequests.tsx b/src/screens/Messages/JoinRequests.tsx
index 98952aee34..5198cd7f19 100644
--- a/src/screens/Messages/JoinRequests.tsx
+++ b/src/screens/Messages/JoinRequests.tsx
@@ -87,7 +87,6 @@ function JoinRequestsInner() {
           title={l`Something went wrong`}
           message={l`We couldn’t load this conversation’s join requests`}
           onRetry={() => convoState.error.retry()}
-          sideBorders={false}
         />
       </>
     )