Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nicer Activity date format #465

Merged
merged 9 commits into from
Nov 19, 2024
Merged

Nicer Activity date format #465

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
968c5a5
Use a nicer Date format
JSKitty Nov 17, 2024
346a2f1
Remove some old comments
JSKitty Nov 17, 2024
eff6f67
refactor: Simplified date logic + year displayed for <1 year Txs
JSKitty Nov 18, 2024
b048b92
tests: update cypress snapshot
JSKitty Nov 18, 2024
a7b8b18
Merge branch 'master' into nicer-date-format
JSKitty Nov 18, 2024
eacebe3
regenerate snaphost
panleone Nov 18, 2024
edb0c91
fix: check the full date for detecting today's Txs
JSKitty Nov 19, 2024
e8c52f0
Move `fToday` in to non-pending scope
JSKitty Nov 19, 2024
16c31d7
regenerate snaphost again
panleone Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/dashboard/Activity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,17 @@ async function parseTXs(arrTXs) {
for (const cTx of arrTXs) {
const cTxDate = new Date(cTx.time * 1000);

// Check if it was today (same day, month and year)
const fToday =
panleone marked this conversation as resolved.
Show resolved Hide resolved
cTxDate.getDate() === cDate.getDate() &&
cTxDate.getMonth() === cDate.getMonth() &&
cTxDate.getFullYear() === cDate.getFullYear();

// Unconfirmed Txs are simply 'Pending'
let strDate = 'Pending';
if (cTx.blockHeight !== -1) {
// Figure out the most convenient time display for this Tx
if (cTxDate.getDate() === cDate.getDate()) {
if (fToday) {
// TXs made today are displayed by time (02:13 pm)
strDate = cTxDate.toLocaleTimeString(undefined, timeOptions);
} else if (cTxDate.getFullYear() === cDate.getFullYear()) {
Expand Down
Loading