encodeURI for cases when it was not alreay done

th2-net · Apr 23, 2024 · e035dae · e035dae
1 parent 0835687
commit e035dae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/message/message-card/raw/SimpleMessageRaw.tsx b/src/components/message/message-card/raw/SimpleMessageRaw.tsx
@@ -24,7 +24,7 @@ interface Props {
 export default function SimpleMessageRaw({ rawContent }: Props) {
 	const contentRef = React.useRef<HTMLDivElement>(null);
 
-	const humanReadableContent = decodeURIComponent(atob(rawContent));
+	const humanReadableContent = decodeURIComponent(encodeURIComponent(atob(rawContent)));
 	const convertedArr = splitOnReadableParts(humanReadableContent);
 
 	return (

diff --git a/src/helpers/rawFormatter.ts b/src/helpers/rawFormatter.ts
@@ -68,7 +68,9 @@ export function decodeBase64RawContent(rawBase64Content: string): string[][] {
 	const offset = [];
 	const hexadecimal = [];
 	const humanReadable = [];
-	const raw = Uint16Array.from(decodeURIComponent(atob(rawBase64Content)), c => c.charCodeAt(0));
+	const raw = Uint16Array.from(decodeURIComponent(encodeURIComponent(atob(rawBase64Content))), c =>
+		c.charCodeAt(0),
+	);
 	let index = 0;
 	const { length } = raw;
 	while (index < length) {