`;
- html += `
${ago}${dirLabel}${err}
`;
+ html += `
${iso} (${ago})${dirLabel}${err}
`;
html += `
${dot}${addrStr}${amountStr}
`;
html += `
`;
i++;
diff --git a/src/popup/views/addressToken.js b/src/popup/views/addressToken.js
index 8ecbd60..693807f 100644
--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -9,6 +9,8 @@ const {
escapeHtml,
truncateMiddle,
balanceLine,
+ isoDate,
+ timeAgo,
} = require("./helpers");
const { state, currentAddress, saveState } = require("../../shared/state");
const {
@@ -38,41 +40,6 @@ function etherscanAddressLink(address) {
return `https://etherscan.io/address/${address}`;
}
-function isoDate(timestamp) {
- const d = new Date(timestamp * 1000);
- const pad = (n) => String(n).padStart(2, "0");
- return (
- d.getFullYear() +
- "-" +
- pad(d.getMonth() + 1) +
- "-" +
- pad(d.getDate()) +
- " " +
- pad(d.getHours()) +
- ":" +
- pad(d.getMinutes()) +
- ":" +
- pad(d.getSeconds())
- );
-}
-
-function timeAgo(timestamp) {
- const seconds = Math.floor(Date.now() / 1000 - timestamp);
- if (seconds < 60) return seconds + " seconds ago";
- const minutes = Math.floor(seconds / 60);
- if (minutes < 60)
- return minutes + " minute" + (minutes !== 1 ? "s" : "") + " ago";
- const hours = Math.floor(minutes / 60);
- if (hours < 24) return hours + " hour" + (hours !== 1 ? "s" : "") + " ago";
- const days = Math.floor(hours / 24);
- if (days < 30) return days + " day" + (days !== 1 ? "s" : "") + " ago";
- const months = Math.floor(days / 30);
- if (months < 12)
- return months + " month" + (months !== 1 ? "s" : "") + " ago";
- const years = Math.floor(days / 365);
- return years + " year" + (years !== 1 ? "s" : "") + " ago";
-}
-
let loadedTxs = [];
let ensNameMap = new Map();
let currentSymbol = null;
@@ -225,7 +192,7 @@ function renderTransactions(txs) {
const ago = escapeHtml(timeAgo(tx.timestamp));
const iso = escapeHtml(isoDate(tx.timestamp));
html += ``;
- html += `
${ago}${dirLabel}${err}
`;
+ html += `
${iso} (${ago})${dirLabel}${err}
`;
html += `
${dot}${addrStr}${amountStr}
`;
html += `
`;
i++;
diff --git a/src/popup/views/helpers.js b/src/popup/views/helpers.js
index fcaa8c3..c5377fe 100644
--- a/src/popup/views/helpers.js
+++ b/src/popup/views/helpers.js
@@ -93,7 +93,7 @@ function balanceLine(symbol, amount, price, tokenId) {
`