Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed0e8c75e2 | ||
|
|
eb012b9eb3 |
@@ -632,8 +632,9 @@ function isExtensionSender(sender) {
|
|||||||
// had refused.
|
// had refused.
|
||||||
//
|
//
|
||||||
// TX and sign approvals do not decide here. They stay pending across a
|
// TX and sign approvals do not decide here. They stay pending across a
|
||||||
// disconnect — the user can reopen the toolbar popup — and are rejected by the
|
// disconnect. When their window closes, the windows.onRemoved listener below
|
||||||
// windows.onRemoved listener below.
|
// rejects them, unless an approved attempt is still running, in which case
|
||||||
|
// that attempt answers the page.
|
||||||
runtime.onConnect.addListener((port) => {
|
runtime.onConnect.addListener((port) => {
|
||||||
if (port.name.startsWith("approval:")) {
|
if (port.name.startsWith("approval:")) {
|
||||||
const id = port.name.split(":")[1];
|
const id = port.name.split(":")[1];
|
||||||
@@ -661,7 +662,9 @@ runtime.onConnect.addListener((port) => {
|
|||||||
const approval = pendingApprovals[id];
|
const approval = pendingApprovals[id];
|
||||||
if (approval) {
|
if (approval) {
|
||||||
if (approval.type === "tx" || approval.type === "sign") {
|
if (approval.type === "tx" || approval.type === "sign") {
|
||||||
// Keep pending — user can reopen the toolbar popup
|
// When its window closes, windows.onRemoved rejects it,
|
||||||
|
// unless an approved attempt is still running, in which
|
||||||
|
// case that attempt answers the page.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
settleApproval(id, { approved: false, remember: false });
|
settleApproval(id, { approved: false, remember: false });
|
||||||
|
|||||||
+12
-8
@@ -7,9 +7,10 @@
|
|||||||
<link rel="stylesheet" href="styles.css" />
|
<link rel="stylesheet" href="styles.css" />
|
||||||
</head>
|
</head>
|
||||||
<!-- Chrome gives extension pages a stylesheet of its own that sets the
|
<!-- Chrome gives extension pages a stylesheet of its own that sets the
|
||||||
font on body, and a Tailwind class beats it only when marked
|
font and its size on body, and a Tailwind class beats it only when
|
||||||
important: hence font-mono! rather than font-mono. -->
|
marked important: hence font-mono! and text-sm! rather than
|
||||||
<body class="bg-bg text-fg font-mono! text-sm">
|
font-mono and text-sm. -->
|
||||||
|
<body class="bg-bg text-fg font-mono! text-sm!">
|
||||||
<div id="app" class="p-2 pr-5 overflow-x-hidden">
|
<div id="app" class="p-2 pr-5 overflow-x-hidden">
|
||||||
<!-- ============ GLOBAL TITLE BAR ============ -->
|
<!-- ============ GLOBAL TITLE BAR ============ -->
|
||||||
<div
|
<div
|
||||||
@@ -87,11 +88,14 @@
|
|||||||
|
|
||||||
<!-- Mnemonic form section -->
|
<!-- Mnemonic form section -->
|
||||||
<div id="add-wallet-section-mnemonic">
|
<div id="add-wallet-section-mnemonic">
|
||||||
<p class="mb-2">
|
<!-- The die button shares the instruction's row: on a row
|
||||||
Enter your 12 or 24 word recovery phrase below, or click
|
of its own it pushes Import below the fold at
|
||||||
the button to roll the die for a new one.
|
360x600. -->
|
||||||
</p>
|
<div class="mb-2 flex justify-between items-start gap-2">
|
||||||
<div class="mb-1 flex justify-end">
|
<p>
|
||||||
|
Enter your 12 or 24 word recovery phrase below, or
|
||||||
|
click the button to roll the die for a new one.
|
||||||
|
</p>
|
||||||
<button
|
<button
|
||||||
id="btn-generate-phrase"
|
id="btn-generate-phrase"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
||||||
|
|||||||
@@ -128,6 +128,18 @@ step("the popup is drawn in the monospace font it declares", async (env) => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The same check as the Chrome suite's (#456), so both browsers are held to
|
||||||
|
// the same size.
|
||||||
|
step("the popup's text is drawn at the 14px text-sm declares", async (env) => {
|
||||||
|
const size = await env.driver.execute(
|
||||||
|
"return getComputedStyle(document.body).fontSize;",
|
||||||
|
);
|
||||||
|
assert(
|
||||||
|
size === "14px",
|
||||||
|
"the popup's text is drawn at " + size + ", not at the 14px of text-sm",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
// The recovery screen (#361): the Chrome suite's four cases, run before any
|
// The recovery screen (#361): the Chrome suite's four cases, run before any
|
||||||
// wallet exists for the same reason. With no wallet nothing saves on a timer,
|
// wallet exists for the same reason. With no wallet nothing saves on a timer,
|
||||||
// so no save can write a good record over the unreadable one. The last of them
|
// so no save can write a good record over the unreadable one. The last of them
|
||||||
|
|||||||
@@ -113,6 +113,18 @@ test("the popup is drawn in the monospace font it declares (#418)", async (env)
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The same stylesheet sets the size on body to 75%, which would draw the
|
||||||
|
// popup at 12px.
|
||||||
|
test("the popup's text is drawn at the 14px text-sm declares (#456)", async (env) => {
|
||||||
|
const size = await env.page.evaluate(
|
||||||
|
() => getComputedStyle(document.body).fontSize,
|
||||||
|
);
|
||||||
|
assert(
|
||||||
|
size === "14px",
|
||||||
|
"the popup's text is drawn at " + size + ", not at the 14px of text-sm",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
// The empirical half of #182. The manifest change is only a claim about
|
// The empirical half of #182. The manifest change is only a claim about
|
||||||
// what the CSP permits; this is the observation. Two things have to hold
|
// what the CSP permits; this is the observation. Two things have to hold
|
||||||
// together, and the run covers both: the popup realm compiles WASM (here),
|
// together, and the run covers both: the popup realm compiles WASM (here),
|
||||||
|
|||||||
Reference in New Issue
Block a user