From 9ae2c6b2987ff933286fe836e926e9f4722f47fb Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Thu, 16 Jan 2025 13:34:19 -0800
Subject: [PATCH] slight improvment on android back flicker

---
 app/client/mobile/src/content/Content.tsx         | 2 +-
 app/client/mobile/src/identity/Identity.styled.ts | 2 +-
 app/client/mobile/src/message/Message.styled.ts   | 4 ++--
 app/client/mobile/src/profile/Profile.styled.ts   | 2 +-
 app/client/mobile/src/settings/Settings.styled.ts | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/client/mobile/src/content/Content.tsx b/app/client/mobile/src/content/Content.tsx
index f8792f24..54874a56 100644
--- a/app/client/mobile/src/content/Content.tsx
+++ b/app/client/mobile/src/content/Content.tsx
@@ -108,7 +108,7 @@ export function Content({openConversation, textCard}: {openConversation: ()=>voi
                 actions.setFocus(item.cardId, item.channelId);
                 openConversation();
               };
-              const Wrap = focused ? Surface : View;
+              const Wrap = (state.layout === 'large' && focused) ? Surface : View;
               return (
                 <Wrap elevation={1}>
                   <Channel
diff --git a/app/client/mobile/src/identity/Identity.styled.ts b/app/client/mobile/src/identity/Identity.styled.ts
index c2b68df6..00b85e38 100644
--- a/app/client/mobile/src/identity/Identity.styled.ts
+++ b/app/client/mobile/src/identity/Identity.styled.ts
@@ -4,7 +4,7 @@ export const styles = StyleSheet.create({
   identity: {
     display: 'flex',
     flexDirection: 'row',
-    alignItems: 'flex-begin',
+    alignItems: 'flex-start',
   },
   identityData: {
     flexGrow: 1,
diff --git a/app/client/mobile/src/message/Message.styled.ts b/app/client/mobile/src/message/Message.styled.ts
index e47f2e06..0f133566 100644
--- a/app/client/mobile/src/message/Message.styled.ts
+++ b/app/client/mobile/src/message/Message.styled.ts
@@ -48,7 +48,7 @@ export const styles = StyleSheet.create({
   content: {
     display: 'flex',
     flexDirection: 'row',
-    alignItems: 'flexStart',
+    alignItems: 'flex-start',
     width: '100%',
     paddingLeft: 8,
     paddingRight: 8,
@@ -69,7 +69,7 @@ export const styles = StyleSheet.create({
   header: {
     display: 'flex',
     flexDirection: 'row',
-    alignItems: 'flexStart',
+    alignItems: 'flex-start',
     width: '100%',
     lineHeight: 16,
     gap: 16,
diff --git a/app/client/mobile/src/profile/Profile.styled.ts b/app/client/mobile/src/profile/Profile.styled.ts
index 76a8b209..629bdfa6 100644
--- a/app/client/mobile/src/profile/Profile.styled.ts
+++ b/app/client/mobile/src/profile/Profile.styled.ts
@@ -106,7 +106,7 @@ export const styles = StyleSheet.create({
     flexShrink: 0,
     width: 32,
     display: 'flex',
-    justifyContent: 'flex-begin',
+    justifyContent: 'flex-start',
     height: '100%',
     backgroundColor: 'transparent',
   },
diff --git a/app/client/mobile/src/settings/Settings.styled.ts b/app/client/mobile/src/settings/Settings.styled.ts
index f4383188..2a031ec7 100644
--- a/app/client/mobile/src/settings/Settings.styled.ts
+++ b/app/client/mobile/src/settings/Settings.styled.ts
@@ -216,7 +216,7 @@ export const styles = StyleSheet.create({
     flexShrink: 0,
     width: 32,
     display: 'flex',
-    justifyContent: 'flex-begin',
+    justifyContent: 'flex-start',
     height: '100%',
     backgroundColor: 'transparent',
   },