diff --git a/app/mobile/src/session/conversation/Conversation.styled.js b/app/mobile/src/session/conversation/Conversation.styled.js index 401176ff..f1181870 100644 --- a/app/mobile/src/session/conversation/Conversation.styled.js +++ b/app/mobile/src/session/conversation/Conversation.styled.js @@ -50,6 +50,7 @@ export const styles = StyleSheet.create({ }, topics: { paddingBottom: 32, + paddingTop: 8, }, conversation: { flexShrink: 1, diff --git a/app/mobile/src/session/conversation/topicItem/TopicItem.jsx b/app/mobile/src/session/conversation/topicItem/TopicItem.jsx index 92390e70..d50a8cdd 100644 --- a/app/mobile/src/session/conversation/topicItem/TopicItem.jsx +++ b/app/mobile/src/session/conversation/topicItem/TopicItem.jsx @@ -54,82 +54,84 @@ export function TopicItem({ item, focused, focus, hosting }) { } return ( - - - { state.logo && ( - - )} - { !state.logo && ( - - )} - { state.name } - { state.timestamp } - { focused && ( - - { state.deletable && ( - - - + + + + { state.logo && ( + + )} + { !state.logo && ( + + )} + { state.name } + { state.timestamp } + + { state.status === 'confirmed' && ( + <> + { state.transform === 'complete' && state.assets && ( + )} - { state.editable && ( - - - + { state.transform === 'incomplete' && ( + + + )} - - - + { state.transform === 'error' && ( + + + + )} + { state.message && ( + { state.message } + )} + + )} + { state.status !== 'confirmed' && ( + + )} - - { state.status === 'confirmed' && ( - <> - { state.transform === 'complete' && state.assets && ( - + + + + + + + { focused && ( + + { state.deletable && ( + + + )} - { state.transform === 'incomplete' && ( - - - + { state.editable && ( + + + )} - { state.transform === 'error' && ( - - - - )} - { state.message && ( - { state.message } - )} - - )} - { state.status !== 'confirmed' && ( - - + + + )} - - - - - - + ); } diff --git a/app/mobile/src/session/conversation/topicItem/TopicItem.styled.js b/app/mobile/src/session/conversation/topicItem/TopicItem.styled.js index d2990a8d..1ce0d1e7 100644 --- a/app/mobile/src/session/conversation/topicItem/TopicItem.styled.js +++ b/app/mobile/src/session/conversation/topicItem/TopicItem.styled.js @@ -2,12 +2,13 @@ import { StyleSheet } from 'react-native'; import { Colors } from 'constants/Colors'; export const styles = StyleSheet.create({ + wrapper: { + paddingTop: 8, + }, item: { borderTopWidth: 1, borderColor: Colors.white, paddingTop: 8, - paddingBottom: 8, - paddingRight: 16, }, header: { display: 'flex', @@ -45,8 +46,8 @@ export const styles = StyleSheet.create({ }, focused: { position: 'absolute', - top: -16, - right: 0, + top: 0, + right: 16, display: 'flex', flexDirection: 'row', backgroundColor: 'rgba(0, 0, 0, 0.5)', @@ -57,8 +58,13 @@ export const styles = StyleSheet.create({ paddingRight: 8, }, icon: { - paddingLeft: 4, - paddingRight: 4, + paddingLeft: 8, + paddingRight: 8, + }, + message: { + paddingRight: 16, + paddingLeft: 52, + color: Colors.fontColor, }, })