fix: use UTC for fromNow() (#3105)

This commit is contained in:
Vlad Stan 2025-04-17 10:05:05 +03:00 committed by GitHub
parent b48489ef32
commit d89bd7409d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions

File diff suppressed because one or more lines are too long

View File

@ -450,7 +450,7 @@ window.AdminPageLogic = {
.catch(LNbits.utils.notifyApiError) .catch(LNbits.utils.notifyApiError)
}, },
formatDate(date) { formatDate(date) {
return moment(date * 1000).fromNow() return moment.utc(date * 1000).fromNow()
}, },
sendTestEmail() { sendTestEmail() {
LNbits.api LNbits.api

View File

@ -253,12 +253,12 @@ window.LNbits = {
} }
obj.date = Quasar.date.formatDate(new Date(obj.time), window.dateFormat) obj.date = Quasar.date.formatDate(new Date(obj.time), window.dateFormat)
obj.dateFrom = moment(obj.date).fromNow() obj.dateFrom = moment.utc(obj.date).fromNow()
obj.expirydate = Quasar.date.formatDate( obj.expirydate = Quasar.date.formatDate(
new Date(obj.expiry), new Date(obj.expiry),
window.dateFormat window.dateFormat
) )
obj.expirydateFrom = moment(obj.expirydate).fromNow() obj.expirydateFrom = moment.utc(obj.expirydate).fromNow()
obj.msat = obj.amount obj.msat = obj.amount
obj.sat = obj.msat / 1000 obj.sat = obj.msat / 1000
obj.tag = obj.extra?.tag obj.tag = obj.extra?.tag

View File

@ -600,7 +600,7 @@ window.app.component('lnbits-date', {
return LNbits.utils.formatDate(this.ts) return LNbits.utils.formatDate(this.ts)
}, },
dateFrom() { dateFrom() {
return moment(this.date).fromNow() return moment.utc(this.date).fromNow()
} }
}, },
template: ` template: `

View File

@ -148,7 +148,7 @@ window.PaymentsPageLogic = {
if (p.extra && p.extra.tag) { if (p.extra && p.extra.tag) {
p.tag = p.extra.tag p.tag = p.extra.tag
} }
p.timeFrom = moment(p.created_at).fromNow() p.timeFrom = moment.utc(p.created_at).fromNow()
p.outgoing = p.amount < 0 p.outgoing = p.amount < 0
p.amount = p.amount =
new Intl.NumberFormat(window.LOCALE).format(p.amount / 1000) + new Intl.NumberFormat(window.LOCALE).format(p.amount / 1000) +

View File

@ -449,8 +449,8 @@ window.WalletPageLogic = {
createdDate, createdDate,
'YYYY-MM-DDTHH:mm:ss.SSSZ' 'YYYY-MM-DDTHH:mm:ss.SSSZ'
) )
cleanInvoice.expireDateFrom = moment(expireDate).fromNow() cleanInvoice.expireDateFrom = moment.utc(expireDate).fromNow()
cleanInvoice.createdDateFrom = moment(createdDate).fromNow() cleanInvoice.createdDateFrom = moment.utc(createdDate).fromNow()
cleanInvoice.expired = false // TODO cleanInvoice.expired = false // TODO
} }