fix: history details

wwWallet · Jan 14, 2025 · 08acb5c · 08acb5c
1 parent 91c6a11
commit 08acb5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/components/History/HistoryList.js b/src/components/History/HistoryList.js
@@ -4,7 +4,7 @@ import useScreenType from '../../hooks/useScreenType';
 import { formatDate } from '../../functions/DateFormat';
 import { H3 } from '../Shared/Heading';
 import HistoryDetailPopup from '../Popups/HistoryDetailPopup';
-import { fromBase64 } from '../../util';
+import { extractPresentations } from '../../pages/History/HistoryDetail';
 
 const HistoryList = ({ credentialId = null, history, title = '', limit = null }) => {
 
@@ -22,17 +22,6 @@ const HistoryList = ({ credentialId = null, history, title = '', limit = null })
 	}, [history, credentialId, limit]);
 
 	const handleHistoryItemClick = async (item) => {
-		const extractPresentations = (item) => {
-			if (item.presentation.startsWith("b64:") && (new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", "")))).includes("[")) {
-				return JSON.parse(new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", ""))));
-			}
-			else if (item.presentation.startsWith("b64:")) {
-				return [ new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", ""))) ];
-			}
-			else {
-				return [ item.presentation ];
-			}
-		}
 		setMatchingCredentials(extractPresentations(item));
 		if (screenType === 'mobile') {
 			navigate(`/history/${item.id}`);

diff --git a/src/pages/History/HistoryDetail.js b/src/pages/History/HistoryDetail.js
@@ -19,6 +19,18 @@ import useFetchPresentations from '../../hooks/useFetchPresentations';
 import HistoryDetailContent from '../../components/History/HistoryDetailContent';
 import { H1 } from '../../components/Shared/Heading';
 
+export const extractPresentations = (item) => {
+	if (item.presentation.startsWith("b64:") && (new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", "")))).includes("[")) {
+		return JSON.parse(new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", ""))));
+	}
+	else if (item.presentation.startsWith("b64:")) {
+		return [ new TextDecoder().decode(fromBase64(item.presentation.replace("b64:", ""))) ];
+	}
+	else {
+		return [ item.presentation ];
+	}
+}
+
 const HistoryDetail = () => {
 	const { historyId } = useParams();
 	const { api } = useContext(SessionContext);
@@ -29,7 +41,7 @@ const HistoryDetail = () => {
 
 	useEffect(() => {
 		if (history.length > 0) {
-			setMatchingCredentials(history[0].startsWith("b64:") ? JSON.parse(new TextDecoder().decode(fromBase64(history[0].replace("b64:", "")))) : [ history[0] ] );
+			setMatchingCredentials(extractPresentations(history[0]));
 		}
 	}, [history]);