Merge branch 'main' into fix/issue-116-timestamp-timezone
All checks were successful
check / check (push) Successful in 22s
All checks were successful
check / check (push) Successful in 22s
This commit is contained in:
@@ -185,7 +185,7 @@
|
|||||||
<!-- active address headline -->
|
<!-- active address headline -->
|
||||||
<div
|
<div
|
||||||
id="total-value"
|
id="total-value"
|
||||||
class="text-2xl font-bold min-h-[2rem]"
|
class="text-2xl font-bold min-h-[2rem] text-fg"
|
||||||
></div>
|
></div>
|
||||||
<div
|
<div
|
||||||
id="total-value-sub"
|
id="total-value-sub"
|
||||||
@@ -824,7 +824,7 @@
|
|||||||
<div class="bg-well p-3 mx-1 mb-3">
|
<div class="bg-well p-3 mx-1 mb-3">
|
||||||
<h3 class="font-bold mb-1">Display</h3>
|
<h3 class="font-bold mb-1">Display</h3>
|
||||||
<label
|
<label
|
||||||
class="text-xs flex items-center gap-1 cursor-pointer"
|
class="text-xs flex items-center gap-1 cursor-pointer mb-2"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
@@ -832,6 +832,17 @@
|
|||||||
/>
|
/>
|
||||||
Show tracked tokens with zero balance
|
Show tracked tokens with zero balance
|
||||||
</label>
|
</label>
|
||||||
|
<div class="text-xs flex items-center gap-1">
|
||||||
|
<label for="settings-theme">Theme:</label>
|
||||||
|
<select
|
||||||
|
id="settings-theme"
|
||||||
|
class="border border-border p-1 bg-bg text-fg text-xs cursor-pointer"
|
||||||
|
>
|
||||||
|
<option value="system">System</option>
|
||||||
|
<option value="light">Light</option>
|
||||||
|
<option value="dark">Dark</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="bg-well p-3 mx-1 mb-3">
|
<div class="bg-well p-3 mx-1 mb-3">
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const { state, saveState, loadState } = require("../shared/state");
|
|||||||
const { refreshPrices } = require("../shared/prices");
|
const { refreshPrices } = require("../shared/prices");
|
||||||
const { refreshBalances } = require("../shared/balances");
|
const { refreshBalances } = require("../shared/balances");
|
||||||
const { $, showView } = require("./views/helpers");
|
const { $, showView } = require("./views/helpers");
|
||||||
|
const { applyTheme } = require("./theme");
|
||||||
|
|
||||||
const home = require("./views/home");
|
const home = require("./views/home");
|
||||||
const welcome = require("./views/welcome");
|
const welcome = require("./views/welcome");
|
||||||
@@ -176,6 +177,7 @@ async function init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await loadState();
|
await loadState();
|
||||||
|
applyTheme(state.theme);
|
||||||
|
|
||||||
// Auto-default active address
|
// Auto-default active address
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -15,6 +15,18 @@
|
|||||||
--color-section: #dddddd;
|
--color-section: #dddddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html.dark {
|
||||||
|
--color-bg: #000000;
|
||||||
|
--color-fg: #ffffff;
|
||||||
|
--color-muted: #aaaaaa;
|
||||||
|
--color-border: #ffffff;
|
||||||
|
--color-border-light: #444444;
|
||||||
|
--color-hover: #222222;
|
||||||
|
--color-well: #1a1a1a;
|
||||||
|
--color-danger-well: #2a0a0a;
|
||||||
|
--color-section: #2a2a2a;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
width: 396px;
|
width: 396px;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|||||||
33
src/popup/theme.js
Normal file
33
src/popup/theme.js
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
// Theme management: applies light/dark class to <html> based on preference.
|
||||||
|
|
||||||
|
let mediaQuery = null;
|
||||||
|
let mediaHandler = null;
|
||||||
|
|
||||||
|
function applyTheme(theme) {
|
||||||
|
// Clean up previous system listener
|
||||||
|
if (mediaQuery && mediaHandler) {
|
||||||
|
mediaQuery.removeEventListener("change", mediaHandler);
|
||||||
|
mediaHandler = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (theme === "dark") {
|
||||||
|
document.documentElement.classList.add("dark");
|
||||||
|
} else if (theme === "light") {
|
||||||
|
document.documentElement.classList.remove("dark");
|
||||||
|
} else {
|
||||||
|
// system
|
||||||
|
mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
||||||
|
const update = () => {
|
||||||
|
if (mediaQuery.matches) {
|
||||||
|
document.documentElement.classList.add("dark");
|
||||||
|
} else {
|
||||||
|
document.documentElement.classList.remove("dark");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
mediaHandler = update;
|
||||||
|
mediaQuery.addEventListener("change", update);
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { applyTheme };
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
const { $, showView, showFlash, escapeHtml } = require("./helpers");
|
const { $, showView, showFlash, escapeHtml } = require("./helpers");
|
||||||
|
const { applyTheme } = require("../theme");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
|
const { ETHEREUM_MAINNET_CHAIN_ID } = require("../../shared/constants");
|
||||||
const { log, debugFetch } = require("../../shared/log");
|
const { log, debugFetch } = require("../../shared/log");
|
||||||
@@ -214,6 +215,13 @@ function init(ctx) {
|
|||||||
await saveState();
|
await saveState();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("settings-theme").value = state.theme;
|
||||||
|
$("settings-theme").addEventListener("change", async () => {
|
||||||
|
state.theme = $("settings-theme").value;
|
||||||
|
await saveState();
|
||||||
|
applyTheme(state.theme);
|
||||||
|
});
|
||||||
|
|
||||||
$("settings-hide-low-holders").checked = state.hideLowHolderTokens;
|
$("settings-hide-low-holders").checked = state.hideLowHolderTokens;
|
||||||
$("settings-hide-low-holders").addEventListener("change", async () => {
|
$("settings-hide-low-holders").addEventListener("change", async () => {
|
||||||
state.hideLowHolderTokens = $("settings-hide-low-holders").checked;
|
state.hideLowHolderTokens = $("settings-hide-low-holders").checked;
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ const DEFAULT_STATE = {
|
|||||||
utcTimestamps: false,
|
utcTimestamps: false,
|
||||||
fraudContracts: [],
|
fraudContracts: [],
|
||||||
tokenHolderCache: {},
|
tokenHolderCache: {},
|
||||||
|
theme: "system",
|
||||||
};
|
};
|
||||||
|
|
||||||
const state = {
|
const state = {
|
||||||
@@ -57,6 +58,7 @@ async function saveState() {
|
|||||||
utcTimestamps: state.utcTimestamps,
|
utcTimestamps: state.utcTimestamps,
|
||||||
fraudContracts: state.fraudContracts,
|
fraudContracts: state.fraudContracts,
|
||||||
tokenHolderCache: state.tokenHolderCache,
|
tokenHolderCache: state.tokenHolderCache,
|
||||||
|
theme: state.theme,
|
||||||
currentView: state.currentView,
|
currentView: state.currentView,
|
||||||
selectedWallet: state.selectedWallet,
|
selectedWallet: state.selectedWallet,
|
||||||
selectedAddress: state.selectedAddress,
|
selectedAddress: state.selectedAddress,
|
||||||
@@ -114,6 +116,7 @@ async function loadState() {
|
|||||||
saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
|
saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
|
||||||
state.fraudContracts = saved.fraudContracts || [];
|
state.fraudContracts = saved.fraudContracts || [];
|
||||||
state.tokenHolderCache = saved.tokenHolderCache || {};
|
state.tokenHolderCache = saved.tokenHolderCache || {};
|
||||||
|
state.theme = saved.theme || "system";
|
||||||
state.currentView = saved.currentView || null;
|
state.currentView = saved.currentView || null;
|
||||||
state.selectedWallet =
|
state.selectedWallet =
|
||||||
saved.selectedWallet !== undefined ? saved.selectedWallet : null;
|
saved.selectedWallet !== undefined ? saved.selectedWallet : null;
|
||||||
|
|||||||
Reference in New Issue
Block a user