martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-11 19:19:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

using configured date/time format

Browse Source
This commit is contained in:
balzack 2023-10-03 18:09:01 -07:00
parent 4e0b47072a
commit bfca12a170
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mobile/src/context/useProfileContext.hook.js
View File

@ -12,6 +12,8 @@ export function useProfileContext() {
identity: {},
server: null,
imageUrl: null,
monthLast: false,
timeFull: false,
});
const store = useContext(StoreContext);

2
app/mobile/src/session/channels/Channels.styled.js
View File

@ -225,7 +225,7 @@ export const styles = StyleSheet.create({
input: {
backgroundColor: Colors.inputBase,
borderRadius: 8,
minHeight: 48,
minHeight: 40,
maxHeight: 128,
paddingLeft: 8,
},

29
app/mobile/src/session/conversation/topicItem/useTopicItem.hook.js
View File

@ -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 {

2
app/mobile/src/session/profile/Profile.styled.js
View File

@ -332,7 +332,7 @@ export const styles = StyleSheet.create({
input: {
backgroundColor: Colors.inputBase,
borderRadius: 8,
minHeight: 48,
minHeight: 40,
maxHeight: 128,
paddingLeft: 8,
},