diff --git a/app/mobile/src/context/useProfileContext.hook.js b/app/mobile/src/context/useProfileContext.hook.js index 05c07b85..21293ce5 100644 --- a/app/mobile/src/context/useProfileContext.hook.js +++ b/app/mobile/src/context/useProfileContext.hook.js @@ -12,6 +12,8 @@ export function useProfileContext() { identity: {}, server: null, imageUrl: null, + monthLast: false, + timeFull: false, }); const store = useContext(StoreContext); diff --git a/app/mobile/src/session/channels/Channels.styled.js b/app/mobile/src/session/channels/Channels.styled.js index b0ea5acc..22b842bb 100644 --- a/app/mobile/src/session/channels/Channels.styled.js +++ b/app/mobile/src/session/channels/Channels.styled.js @@ -225,7 +225,7 @@ export const styles = StyleSheet.create({ input: { backgroundColor: Colors.inputBase, borderRadius: 8, - minHeight: 48, + minHeight: 40, maxHeight: 128, paddingLeft: 8, }, diff --git a/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js b/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js index fb5d3b33..685be8ab 100644 --- a/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js +++ b/app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js @@ -36,6 +36,8 @@ export function useTopicItem(item, hosting, remove, contentKey) { deletable: false, assets: [], sharing: false, + monthLast: false, + timeFull: false, }); const conversation = useContext(ConversationContext); @@ -103,7 +105,7 @@ export function useTopicItem(item, hosting, remove, contentKey) { const { guid, created, dataType, data, status, transform } = detail || {}; let name, nameSet, known, logo; - const identity = profile.state?.identity; + const { identity, imageUrl, monthLast, timeFull } = profile.state || {}; if (guid === identity.guid) { known = true; if (identity.name) { @@ -114,7 +116,7 @@ export function useTopicItem(item, hosting, remove, contentKey) { name = identity.node ? `${identity.handle}/${identity.node}` : identity.handle; nameSet = false; } - const img = profile.state.imageUrl; + const img = imageUrl; if (img) { logo = img; } @@ -224,20 +226,35 @@ export function useTopicItem(item, hosting, remove, contentKey) { const now = new Date(); const offset = now.getTime() - date.getTime(); if(offset < 86400000) { - timestamp = moment(date).format('h:mma'); + if (timeFull) { + timestamp = moment(date).format('H:mm'); + } + else { + timestamp = moment(date).format('h:mma'); + } } else if (offset < 31449600000) { - timestamp = moment(date).format('M/DD'); + if (monthLast) { + timestamp = moment(date).format('DD/M'); + } + else { + timestamp = moment(date).format('M/DD'); + } } else { - timestamp = moment(date).format('M/DD/YYYY'); + if (monthLast) { + timestamp = moment(date).format('DD/M/YYYY'); + } + else { + timestamp = moment(date).format('M/DD/YYYY'); + } } const editable = guid === identity?.guid && parsed; const deletable = editable || hosting; updateState({ logo, name, nameSet, known, sealed, message, clickable, fontSize, fontColor, timestamp, transform, status, assets, deletable, editable, editData: parsed, editMessage: message, editType: dataType }); - }, [conversation.state, card.state, account.state, item, contentKey]); + }, [conversation.state, card.state, account.state, profile.state, item, contentKey]); const unsealTopic = async (topicId, revision, topicDetail) => { try { diff --git a/app/mobile/src/session/profile/Profile.styled.js b/app/mobile/src/session/profile/Profile.styled.js index 2b298c3f..0a6798f4 100644 --- a/app/mobile/src/session/profile/Profile.styled.js +++ b/app/mobile/src/session/profile/Profile.styled.js @@ -332,7 +332,7 @@ export const styles = StyleSheet.create({ input: { backgroundColor: Colors.inputBase, borderRadius: 8, - minHeight: 48, + minHeight: 40, maxHeight: 128, paddingLeft: 8, },