Merge branch 'main' into fix/issue-116-timestamp-timezone

Reviewed-on: #121

src/popup/styles/main.css

@@ -29,6 +29,6 @@ body {
 
 .copy-flash-fade {
     transition:
-        background-color 300ms ease-out,
+        background-color 225ms ease-out,
-        color 300ms ease-out;
+        color 225ms ease-out;
 }

src/popup/views/addressDetail.js

@@ -95,23 +95,23 @@ function show() {
 function isoDate(timestamp) {
     const d = new Date(timestamp * 1000);
     const pad = (n) => String(n).padStart(2, "0");
-    const off = -d.getTimezoneOffset();
+    const offsetMin = -d.getTimezoneOffset();
-    const sign = off >= 0 ? "+" : "-";
+    const sign = offsetMin >= 0 ? "+" : "-";
-    const absOff = Math.abs(off);
+    const absOff = Math.abs(offsetMin);
-    const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
+    const tzStr = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
     return (
         d.getFullYear() +
         "-" +
         pad(d.getMonth() + 1) +
         "-" +
         pad(d.getDate()) +
-        " " +
+        "T" +
         pad(d.getHours()) +
         ":" +
         pad(d.getMinutes()) +
         ":" +
         pad(d.getSeconds()) +
-        tz
+        tzStr
     );
 }
 

src/popup/views/addressToken.js

@@ -48,10 +48,6 @@ function etherscanAddressLink(address) {
 function isoDate(timestamp) {
     const d = new Date(timestamp * 1000);
     const pad = (n) => String(n).padStart(2, "0");
-    const off = -d.getTimezoneOffset();
-    const sign = off >= 0 ? "+" : "-";
-    const absOff = Math.abs(off);
-    const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
     return (
         d.getFullYear() +
         "-" +
@@ -63,8 +59,7 @@ function isoDate(timestamp) {
         ":" +
         pad(d.getMinutes()) +
         ":" +
-        pad(d.getSeconds()) +
+        pad(d.getSeconds())
-        tz
     );
 }
 

src/popup/views/helpers.js

@@ -226,23 +226,23 @@ function formatAddressHtml(address, ensName, maxLen, title) {
 function isoDate(timestamp) {
     const d = new Date(timestamp * 1000);
     const pad = (n) => String(n).padStart(2, "0");
-    const off = -d.getTimezoneOffset();
+    const offsetMin = -d.getTimezoneOffset();
-    const sign = off >= 0 ? "+" : "-";
+    const sign = offsetMin >= 0 ? "+" : "-";
-    const absOff = Math.abs(off);
+    const absOff = Math.abs(offsetMin);
-    const tz = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
+    const tzStr = sign + pad(Math.floor(absOff / 60)) + ":" + pad(absOff % 60);
     return (
         d.getFullYear() +
         "-" +
         pad(d.getMonth() + 1) +
         "-" +
         pad(d.getDate()) +
-        " " +
+        "T" +
         pad(d.getHours()) +
         ":" +
         pad(d.getMinutes()) +
         ":" +
         pad(d.getSeconds()) +
-        tz
+        tzStr
     );
 }
 
@@ -272,8 +272,8 @@ function flashCopyFeedback(el) {
         el.classList.add("copy-flash-fade");
         setTimeout(() => {
             el.classList.remove("copy-flash-fade");
-        }, 350);
+        }, 275);
-    }, 100);
+    }, 75);
 }
 
 module.exports = {

src/shared/uniswap.js

@@ -487,10 +487,7 @@ function decode(data, toAddress) {
         const deadlineDate = new Date(Number(deadline) * 1000);
         details.push({
             label: "Deadline",
-            value: deadlineDate
+            value: deadlineDate.toISOString().replace("T", " ").slice(0, 19),
-                .toISOString()
-                .replace("T", " ")
-                .replace(".000Z", "Z"),
         });
 
         return {