Skip to content

Commit 5d57f5d

Browse files
authored
Merge pull request #2708 from Chia-Network/checkpoint/main_from_release_2.5.5_4969c3b9186cf1db87a79ad0486b51327f8375dc
checkpoint: into main from release/2.5.5 @ 4969c3b
2 parents efdd1f3 + 605bbaf commit 5d57f5d

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

package-lock.json

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core/src/components/SandboxedIframe/SandboxedIframe.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ function SandboxedIframe(props: SandboxIframeProps) {
5050
base-uri 'none';
5151
connect-src 'none';
5252
font-src 'none';
53-
frame-src 'none';
54-
frame-ancestors 'none';
53+
frame-src 'none';
5554
img-src cache:;
5655
media-src cache:;
5756
object-src 'none';
@@ -69,12 +68,17 @@ function SandboxedIframe(props: SandboxIframeProps) {
6968
return iframeContent;
7069
}, [children]);
7170

71+
// generate a unique key when content changes - electron do not rerender iframe when srcDocHTML changes
72+
// eslint-disable-next-line react-hooks/exhaustive-deps -- We want to regenerate key when srcDocHTML changes
73+
const uniqueKey = useMemo(() => crypto.randomUUID(), [srcDocHTML]);
74+
7275
const isVisible = hideUntilLoaded ? loaded : true;
7376

7477
return (
7578
<StyledIframe
7679
sandbox=""
7780
srcDoc={srcDocHTML}
81+
key={uniqueKey}
7882
height={height}
7983
width={width}
8084
frameBorder="0"

packages/gui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@rehooks/local-storage": "2.4.4",
5555
"@walletconnect/sign-client": "2.10.0",
5656
"@walletconnect/utils": "2.10.0",
57-
"axios": "^1.7.4",
57+
"axios": "1.11.0",
5858
"bech32": "2.0.0",
5959
"bignumber.js": "9.1.1",
6060
"byte-size": "8.1.1",

0 commit comments

Comments
 (0)