From d73c8a2ef08ca714e3ebc7ed36987af326fe4ce1 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams@intersectmbo.org>
Date: Sun, 2 Feb 2025 19:26:00 +0000
Subject: [PATCH 01/22] chore: init v1.1

---
 src/package-lock.json | 4 ++--
 src/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index cb26b2a..9f5ee9a 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "council-toolkit-app",
-  "version": "1.0",
+  "version": "1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "council-toolkit-app",
-      "version": "1.0",
+      "version": "1.1",
       "dependencies": {
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
diff --git a/src/package.json b/src/package.json
index b1fc565..c36c83b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "council-toolkit-app",
-  "version": "1.0",
+  "version": "1.1",
   "private": true,
   "scripts": {
     "dev": "next dev",

From c7b7f234a822fe080f42956cb45d0a7b997c4751 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams@intersectmbo.org>
Date: Mon, 27 Jan 2025 10:26:25 +0000
Subject: [PATCH 02/22] chore: adjust workflow to run less

---
 .github/workflows/build-and-lint.yml  | 3 ---
 .github/workflows/deploy-to-pages.yml | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml
index 3a36790..0693d93 100644
--- a/.github/workflows/build-and-lint.yml
+++ b/.github/workflows/build-and-lint.yml
@@ -4,9 +4,6 @@ on:
   push:
     branches:
       - '**'
-  pull_request:
-    branches:
-      - main
 
 jobs:
   build-and-lint:
diff --git a/.github/workflows/deploy-to-pages.yml b/.github/workflows/deploy-to-pages.yml
index 4f1c1b5..a771eb2 100644
--- a/.github/workflows/deploy-to-pages.yml
+++ b/.github/workflows/deploy-to-pages.yml
@@ -1,7 +1,7 @@
 name: Deploy to GitHub Pages
 
 on:
-  workflow_dispatch:
+    workflow_dispatch:
 
 jobs:
   build-and-deploy:
@@ -26,7 +26,7 @@ jobs:
         run: |
           npm install
           npm run build
-        working-directory: src
+        working-directory: ./src
 
       # Step 4: Deploy to GitHub Pages
       - name: Deploy to GitHub Pages

From 34de4d580b9c8954dbebf26a7ca0f43973bfdc28 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams@intersectmbo.org>
Date: Sun, 2 Feb 2025 19:31:52 +0000
Subject: [PATCH 03/22] fix package lock versioning

---
 src/package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/package-lock.json b/src/package-lock.json
index 9f5ee9a..0561574 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "council-toolkit-app",
-  "version": "1",
+  "version": "1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

From 88abfd0252c1b254db117247eee2f900e9cc4bd4 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Mon, 3 Feb 2025 10:52:17 +0000
Subject: [PATCH 04/22] Fix logo import

---
 src/app/page.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index fdeaaa7..f5810ac 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -29,9 +29,9 @@ export default function Home() {
           alignItems: "center",
           justifyContent: "flex-start",
         }}>
-          <svg width="150" height="35" viewBox="0 0 609 215" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M12.5 66.4V142.5H0V66.4H12.5ZM100.9 142.5H88.5L50.9 85.7V214.7H38.4V66.3H50.9L88.5 123V0H101L100.9 142.5ZM173.1 66.4V76.6H152.8V142.5H140.3V76.6H120V66.4H173.1ZM204.8 76.5V98.8H231.1V109H204.8V132.3H234.4V142.5H192.3V66.3H234.4V76.5H204.8ZM297 142.5L279.5 112.1H270V142.5H257.5V66.4H283.8C289.6 66.4 294.6 67.4 298.6 69.5C302.6 71.5 305.7 74.3 307.7 77.7C309.7 81.1 310.7 85 310.7 89.2C310.7 94.2 309.3 98.7 306.4 102.7C303.5 106.8 299.1 109.5 293.1 111L311.9 142.5H297ZM270 102.1H283.8C288.5 102.1 292 100.9 294.4 98.6C296.8 96.3 298 93.1 298 89.2C298 85.3 296.8 82.2 294.5 80C292.2 77.8 288.6 76.7 283.9 76.7H270V102.1ZM344.3 140.6C340.2 138.8 337 136.3 334.7 133C332.4 129.7 331.2 125.9 331.2 121.5H344.6C344.9 124.8 346.2 127.5 348.5 129.6C350.8 131.7 354 132.8 358.2 132.8C362.4 132.8 365.9 131.8 368.3 129.7C370.7 127.6 371.9 124.9 371.9 121.6C371.9 119 371.1 117 369.7 115.4C368.2 113.8 366.3 112.6 364.1 111.7C361.9 110.8 358.8 109.9 354.9 108.9C349.9 107.6 345.9 106.3 342.8 104.9C339.7 103.6 337 101.5 334.9 98.6C332.7 95.8 331.6 92 331.6 87.2C331.6 82.8 332.7 79 334.9 75.7C337.1 72.4 340.2 69.9 344.1 68.1C348 66.3 352.6 65.5 357.8 65.5C365.2 65.5 371.2 67.3 375.9 71C380.6 74.7 383.2 79.7 383.7 86.2H369.9C369.7 83.4 368.4 81 366 79.1C363.6 77.2 360.4 76.1 356.5 76.1C352.9 76.1 350 77 347.7 78.8C345.4 80.6 344.3 83.2 344.3 86.7C344.3 89 345 90.9 346.4 92.5C347.8 94 349.6 95.2 351.8 96.1C354 97 357 97.9 360.8 98.9C365.8 100.3 369.9 101.7 373.1 103.1C376.3 104.5 379 106.6 381.2 109.5C383.4 112.4 384.5 116.2 384.5 121.1C384.5 125 383.5 128.6 381.4 132C379.3 135.4 376.3 138.2 372.3 140.3C368.3 142.4 363.6 143.4 358.2 143.4C353 143.3 348.4 142.4 344.3 140.6ZM420.1 76.5V98.8H446.4V109H420.1V132.3H449.7V142.5H407.7V66.3H449.7V76.5H420.1ZM471.9 84.3C475.4 78.4 480.1 73.8 486 70.5C492 67.2 498.5 65.5 505.5 65.5C513.6 65.5 520.8 67.5 527.1 71.5C533.4 75.5 538.1 81 541 88.3H526C524 84.3 521.3 81.3 517.8 79.3C514.3 77.3 510.2 76.3 505.7 76.3C500.7 76.3 496.2 77.4 492.2 79.7C488.2 82 485.2 85.2 483 89.4C480.8 93.6 479.7 98.6 479.7 104.2C479.7 109.8 480.8 114.8 483 119C485.2 123.2 488.3 126.5 492.2 128.8C496.1 131.1 500.6 132.2 505.7 132.2C510.3 132.2 514.3 131.2 517.8 129.2C521.3 127.2 524 124.2 526 120.2H541C538.2 127.5 533.6 133.1 527.3 137.1C521 141.1 513.8 143 505.7 143C498.6 143 492 141.3 486.1 138C480.2 134.7 475.5 130.1 472 124.2C468.5 118.3 466.8 111.6 466.8 104.2C466.8 96.8 468.5 90.2 471.9 84.3ZM609 66.4V76.6H588.7V142.5H576.2V76.6H555.8V66.4H609Z" fill="#F5F3EB" />
-          </svg>
+          
+          <img style={{width: '15%', height: 'auto', paddingLeft: '10px'}} src="/images/Logo.svg" alt="Logo" />
+      
         </Box>
         <Typography variant="h4" component="h1" fontWeight="bold" textTransform="uppercase" mb={3} textAlign="center" paddingTop={2}>
           Intersect Council Toolkit

From fa60fc88c8c6f94003d2db4993bb384649e76c4f Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Mon, 3 Feb 2025 11:19:04 +0000
Subject: [PATCH 05/22] Fix to pass linter

---
 src/app/page.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index f5810ac..c92df0f 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,6 +1,7 @@
 import { Wallet } from "./components/wallet";
 import { TransactionButton } from "./components/transaction";
 import { Container, Typography, Box } from "@mui/material";
+import Image from "next/image";
 
 
 export default function Home() {
@@ -30,7 +31,7 @@ export default function Home() {
           justifyContent: "flex-start",
         }}>
           
-          <img style={{width: '15%', height: 'auto', paddingLeft: '10px'}} src="/images/Logo.svg" alt="Logo" />
+          <Image src="/images/Logo.svg" alt="Logo" width={100} height={100} style={{ paddingLeft: 10 }}/>
       
         </Box>
         <Typography variant="h4" component="h1" fontWeight="bold" textTransform="uppercase" mb={3} textAlign="center" paddingTop={2}>

From 6a60221307eb40af313f66cf78f06bb664db4c64 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Mon, 3 Feb 2025 14:40:59 +0000
Subject: [PATCH 06/22] Add ipfs gateway

---
 src/app/components/transaction.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 992ae6e..c09083d 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -6,6 +6,11 @@ import { BlockfrostProvider, deserializeAddress } from "@meshsdk/core";
 import { Button, TextField, Box, Typography, Container, Table, TableBody, TableCell, TableContainer, TableRow, Paper } from "@mui/material";
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
+import dotevn from "dotenv";
+
+dotevn.config();
+
+const NEXT_PUBLIC_REST_IPFS_GATEWAY=process.env.NEXT_PUBLIC_REST_IPFS_GATEWAY;
 
 // Function to decode an unasigned transaction
 const decodeTransaction = (unsignedTransactionHex: string) => {
@@ -308,7 +313,7 @@ export const TransactionButton = () => {
                 </TableRow>
                 <TableRow>
                 <TableCell sx={{ fontWeight: "bold" }}>Metadata Anchor URL</TableCell>
-                <TableCell><a href={metadataAnchorURL} target="_blank">{metadataAnchorURL}</a></TableCell>
+                <TableCell><a href={'https://'+ NEXT_PUBLIC_REST_IPFS_GATEWAY + metadataAnchorURL?.slice(7)} target="_blank">{metadataAnchorURL}</a></TableCell>
                 </TableRow>
                 <TableRow>
                 <TableCell sx={{ fontWeight: "bold" }}>Metadata Anchor Hash</TableCell>

From 99c202e2d8618fd301cfc4156b48aff4653dc75b Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Mon, 3 Feb 2025 15:28:24 +0000
Subject: [PATCH 07/22] Check if anchor url is https/http

---
 src/app/components/transaction.tsx | 164 ++++++++++++++++++++---------
 1 file changed, 116 insertions(+), 48 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index c09083d..a1e980e 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -7,6 +7,7 @@ import { Button, TextField, Box, Typography, Container, Table, TableBody, TableC
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
+import { Underline } from "lucide-react";
 
 dotevn.config();
 
@@ -235,7 +236,6 @@ export const TransactionButton = () => {
   }, [signature,unsignedTransaction]);
 
   return (
-
     <Container maxWidth="md" sx={{ mt: 4 }}>
       {/* Transaction Input & Button */}
       <Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>
@@ -245,7 +245,8 @@ export const TransactionButton = () => {
           variant="outlined"
           fullWidth
           value={unsignedTransactionHex}
-          onChange={(e) => {setUnsignedTransactionHex(e.target.value);
+          onChange={(e) => {
+            setUnsignedTransactionHex(e.target.value);
             setIsPartOfSigners(false);
             setIsOneVote(false);
             setHasCertificates(true);
@@ -253,8 +254,8 @@ export const TransactionButton = () => {
             setHasICCCredentials(false);
             setIsInOutputPlutusData(false);
             setVoteResult("");
-            setVoteID("")
-            }}
+            setVoteID("");
+          }}
         />
         <Button
           variant="contained"
@@ -268,62 +269,128 @@ export const TransactionButton = () => {
 
       {/* Transaction Details */}
       <Box sx={{ mt: 3 }}>
-        <Typography variant="h6" sx={{ mb: 2 }}>Transaction Details</Typography>
-        
-       {unsignedTransaction && <Box display="flex" flexWrap="wrap" gap={2}>
-  
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Wallet needs to sign?:{isPartOfSigners ? "✅" : "❌"}
-          </Typography>
-
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Signing one vote?:{isOneVote ? "✅" : "❌"}
-          </Typography>
-
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Has no certificates?:{hasCertificates ? "❌":"✅"}
-          </Typography>
-
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Is the transaction in the same network?:{isSameNetwork ? "✅" : "❌"}
-          </Typography>
-
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Has Intersect CC credentials?:{hasICCCredentials ? "✅" : "❌"}
-          </Typography>
-
-          <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
-            Is stake credential in plutus data?:{isInOutputPlutusData ? "✅" : "❌"}
-          </Typography>
+        <Typography variant="h6" sx={{ mb: 2 }}>
+          Transaction Details
+        </Typography>
 
-        </Box>}
-        <Typography variant="h6" sx={{ mt: 3 }}>Voting Details</Typography>
-        {unsignedTransaction && <TableContainer sx={{ mb: 3 }}>
+        {unsignedTransaction && (
+          <Box display="flex" flexWrap="wrap" gap={2}>
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Wallet needs to sign?:{isPartOfSigners ? "✅" : "❌"}
+            </Typography>
+
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Signing one vote?:{isOneVote ? "✅" : "❌"}
+            </Typography>
+
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Has no certificates?:{hasCertificates ? "❌" : "✅"}
+            </Typography>
+
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Is the transaction in the same network?:
+              {isSameNetwork ? "✅" : "❌"}
+            </Typography>
+
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Has Intersect CC credentials?:{hasICCCredentials ? "✅" : "❌"}
+            </Typography>
+
+            <Typography
+              display="flex"
+              flexDirection="column"
+              width="45%"
+              variant="body1"
+              fontWeight="bold"
+            >
+              Is stake credential in plutus data?:
+              {isInOutputPlutusData ? "✅" : "❌"}
+            </Typography>
+          </Box>
+        )}
+        <Typography variant="h6" sx={{ mt: 3 }}>
+          Voting Details
+        </Typography>
+        {unsignedTransaction && (
+          <TableContainer sx={{ mb: 3 }}>
             <Table sx={{ mt: 3 }}>
               <TableBody>
                 <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>Governance Action ID </TableCell>
+                  <TableCell sx={{ fontWeight: "bold" }}>
+                    Governance Action ID{" "}
+                  </TableCell>
                   <TableCell>
-                      <a href={`${cardanoscan}${voteID}`} target="_blank">{voteID}</a>
+                    <a href={`${cardanoscan}${voteID}`} target="_blank">
+                      {voteID}
+                    </a>
                   </TableCell>
                 </TableRow>
                 <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>Vote Choice </TableCell>
+                  <TableCell sx={{ fontWeight: "bold" }}>
+                    Vote Choice{" "}
+                  </TableCell>
                   <TableCell>{voteResult}</TableCell>
                 </TableRow>
                 <TableRow>
-                <TableCell sx={{ fontWeight: "bold" }}>Metadata Anchor URL</TableCell>
-                <TableCell><a href={'https://'+ NEXT_PUBLIC_REST_IPFS_GATEWAY + metadataAnchorURL?.slice(7)} target="_blank">{metadataAnchorURL}</a></TableCell>
+                  <TableCell sx={{ fontWeight: "bold" }}>
+                    Metadata Anchor URL
+                  </TableCell>
+                  <TableCell>
+                    <a
+                      href={
+                        metadataAnchorURL?.startsWith("https://") || metadataAnchorURL?.startsWith("http://")
+                        ? metadataAnchorURL
+                        : metadataAnchorURL?.startsWith("ipfs")
+                        ? "https://" + NEXT_PUBLIC_REST_IPFS_GATEWAY + metadataAnchorURL?.slice(7)
+                        : "https://" + metadataAnchorURL
+                      }
+                      target="_blank"
+                      style={{ color: "blue", textDecoration: "underline" }}
+                    >
+                      {metadataAnchorURL}
+                    </a>
+                  </TableCell>
                 </TableRow>
                 <TableRow>
-                <TableCell sx={{ fontWeight: "bold" }}>Metadata Anchor Hash</TableCell>
-                <TableCell>{metadataAnchorHash}</TableCell>
+                  <TableCell sx={{ fontWeight: "bold" }}>
+                    Metadata Anchor Hash
+                  </TableCell>
+                  <TableCell>{metadataAnchorHash}</TableCell>
                 </TableRow>
               </TableBody>
             </Table>
           </TableContainer>
-
-        }
+        )}
         <Box
           sx={{
             backgroundColor: "#f5f5f5",
@@ -335,8 +402,11 @@ export const TransactionButton = () => {
             boxShadow: 1,
           }}
         >
-          {unsignedTransactionHex && <ReactJsonPretty data={unsignedTransaction ? unsignedTransaction.to_json() : {}} />}
-          
+          {unsignedTransactionHex && (
+            <ReactJsonPretty
+              data={unsignedTransaction ? unsignedTransaction.to_json() : {}}
+            />
+          )}
         </Box>
       </Box>
 
@@ -355,7 +425,7 @@ export const TransactionButton = () => {
 
       {/* Signature Display */}
       {signature && (
-        <Box id='signature' sx={{ mt: 3 }}  >
+        <Box id="signature" sx={{ mt: 3 }}>
           <Typography variant="h6">Signature</Typography>
           <Box
             sx={{
@@ -385,7 +455,5 @@ export const TransactionButton = () => {
         </Typography>
       )}
     </Container>
-
-
   );
 };
\ No newline at end of file

From 93ea143fd21577cad3b224cec6cf87d72b3d4374 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 12:16:56 +0000
Subject: [PATCH 08/22] Change vete choice label

---
 src/app/components/transaction.tsx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index a1e980e..2cac663 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -38,7 +38,7 @@ export const TransactionButton = () => {
   const [isSameNetwork, setIsSameNetwork] = useState(false);
   const [hasICCCredentials, setHasICCCredentials] = useState(false);
   const [isInOutputPlutusData , setIsInOutputPlutusData] = useState(false); 
-  const [voteResult, setVoteResult] = useState<string>();
+  const [voteChoice, setvoteChoice] = useState<string>();
   const [voteID, setVoteID] = useState<string>();
   const [cardanoscan, setCardanoscan] = useState<string>();
   const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>();
@@ -53,7 +53,7 @@ export const TransactionButton = () => {
       setIsSameNetwork(false);
       setHasICCCredentials(false);
       setIsInOutputPlutusData(false);
-      setVoteResult("");
+      setvoteChoice("");
       setVoteID("");
       setMessage("Please connect your wallet first.");
       return;
@@ -99,11 +99,19 @@ export const TransactionButton = () => {
     
       if(votesNumber === 1){
         setIsOneVote(true);
-        setVoteResult(votes?.[0].voting_procedure.vote);
+        
         setVoteID(votes?.[0].action_id.transaction_id);
         setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
         setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
-        console.log("Transaction has one vote set to:",voteResult);
+        console.log("Transaction has one vote set to:",voteChoice);
+
+        if (votes?.[0].voting_procedure.vote==='Yes'){
+          setvoteChoice('Constitutional');
+        }else if (votes?.[0].voting_procedure.vote==='No'){
+          setvoteChoice('Unconstitutional');
+        }else{
+          setvoteChoice('Abstain');
+        }
       }else if (!votesNumber){
         throw new Error("Transaction has no votes.");
       }else{
@@ -253,7 +261,7 @@ export const TransactionButton = () => {
             setIsSameNetwork(false);
             setHasICCCredentials(false);
             setIsInOutputPlutusData(false);
-            setVoteResult("");
+            setvoteChoice("");
             setVoteID("");
           }}
         />
@@ -359,7 +367,7 @@ export const TransactionButton = () => {
                   <TableCell sx={{ fontWeight: "bold" }}>
                     Vote Choice{" "}
                   </TableCell>
-                  <TableCell>{voteResult}</TableCell>
+                  <TableCell>{voteChoice}</TableCell>
                 </TableRow>
                 <TableRow>
                   <TableCell sx={{ fontWeight: "bold" }}>

From e48efae555165ebc0562ef36d3054652ac98a49f Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 12:28:29 +0000
Subject: [PATCH 09/22] Remove payment cred + rename stake cred to voter key
 hash

---
 src/app/components/wallet.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/components/wallet.tsx b/src/app/components/wallet.tsx
index 0a69486..f2542f3 100644
--- a/src/app/components/wallet.tsx
+++ b/src/app/components/wallet.tsx
@@ -39,7 +39,7 @@ export const Wallet = () => {
           const networkId = await wallet.getNetworkId();
 
           setPaymentCred(deserializeAddress(changeAddress).pubKeyHash);
-
+          //stake key used for vote signing 
           setStakeCred(deserializeAddress(changeAddress).stakeCredentialHash);
 
           setWalletNetwork(networkId === 0 ? "Testnet" : networkId === 1 ? "Mainnet" : "unknown");
@@ -75,11 +75,7 @@ export const Wallet = () => {
             <Table>
               <TableBody>
                 <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>Payment Credential</TableCell>
-                  <TableCell>{paymentCred || "Not Available"}</TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>Stake Credential</TableCell>
+                  <TableCell sx={{ fontWeight: "bold" }}>Voter Key Hash</TableCell>
                   <TableCell>{stakeCred || "Not Available"}</TableCell>
                 </TableRow>
                 <TableRow>

From 950666e65b2f54c0ddf41959f0d0b52c10246826 Mon Sep 17 00:00:00 2001
From: Ryan Williams <ryan.williams@intersectmbo.org>
Date: Thu, 6 Feb 2025 13:13:56 +0000
Subject: [PATCH 10/22] feat(#44): convert GA IDs to bech32

---
 src/app/components/transaction.tsx | 27 +++++++++++++++++++--------
 src/package-lock.json              | 14 ++++++++++++++
 src/package.json                   |  1 +
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 2cac663..0dfc8e5 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -25,6 +25,18 @@ const decodeTransaction = (unsignedTransactionHex: string) => {
   }
 };
 
+// convert basic GA ID to Bech32 as per CIP129 standard
+// https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129
+const convertGAToBech = (gaTxHash : string, gaTxIndex : number) => {
+  const bech32 = require('bech32-buffer');
+
+  // convert value index value to hex
+  const indexHex = gaTxIndex.toString(16).padStart(2, '0');
+
+  // return bech32 encoded GA ID
+  return bech32.encode("gov_action", Buffer.from(gaTxHash+indexHex, 'hex')).toString();
+}
+
 
 export const TransactionButton = () => {
   const [message, setMessage] = useState("");
@@ -96,13 +108,12 @@ export const TransactionButton = () => {
       //one vote 
       const votes=voting_procedures?.[0]?.votes;
       const votesNumber = votes?.length;
-    
-      if(votesNumber === 1){
+
+      if(votes && votesNumber === 1){
         setIsOneVote(true);
-        
-        setVoteID(votes?.[0].action_id.transaction_id);
-        setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
-        setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
+        setVoteID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
+        setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);
+        setMetadataAnchorHash(votes[0].voting_procedure.anchor?.anchor_data_hash);
         console.log("Transaction has one vote set to:",voteChoice);
 
         if (votes?.[0].voting_procedure.vote==='Yes'){
@@ -194,9 +205,9 @@ export const TransactionButton = () => {
 
       //********************************************Voting Details *********************************************************************/
       if (transactionNetworkID === 0) {
-        setCardanoscan("https://preprod.cardanoscan.io/transaction/");
+        setCardanoscan("https://preprod.cardanoscan.io/govAction/");
       } else if (transactionNetworkID === 1) {
-        setCardanoscan("https://cardanoscan.io/transaction/");
+        setCardanoscan("https://cardanoscan.io/govAction/");
       }
 
       
diff --git a/src/package-lock.json b/src/package-lock.json
index 0561574..8ab292a 100644
--- a/src/package-lock.json
+++ b/src/package-lock.json
@@ -14,6 +14,7 @@
         "@meshsdk/core": "^1.7.13",
         "@meshsdk/react": "^1.7.13",
         "@mui/material": "^6.3.1",
+        "bech32-buffer": "^0.2.1",
         "dotenv": "^16.4.7",
         "lucide-react": "^0.462.0",
         "next": "^15.0.3",
@@ -3921,6 +3922,14 @@
       "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
       "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
     },
+    "node_modules/bech32-buffer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/bech32-buffer/-/bech32-buffer-0.2.1.tgz",
+      "integrity": "sha512-fCG1TyZuCN48Sdw97p/IR39fvqpFlWDVpG7qnuU1Uc3+Xtc/0uqAp8U7bMW/bGuVF5CcNVIXwxQsWwUr6un6FQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/bencode": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/bencode/-/bencode-4.0.0.tgz",
@@ -16814,6 +16823,11 @@
       "resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
       "integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
     },
+    "bech32-buffer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/bech32-buffer/-/bech32-buffer-0.2.1.tgz",
+      "integrity": "sha512-fCG1TyZuCN48Sdw97p/IR39fvqpFlWDVpG7qnuU1Uc3+Xtc/0uqAp8U7bMW/bGuVF5CcNVIXwxQsWwUr6un6FQ=="
+    },
     "bencode": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/bencode/-/bencode-4.0.0.tgz",
diff --git a/src/package.json b/src/package.json
index c36c83b..791d824 100644
--- a/src/package.json
+++ b/src/package.json
@@ -16,6 +16,7 @@
     "@meshsdk/core": "^1.7.13",
     "@meshsdk/react": "^1.7.13",
     "@mui/material": "^6.3.1",
+    "bech32-buffer": "^0.2.1",
     "dotenv": "^16.4.7",
     "lucide-react": "^0.462.0",
     "next": "^15.0.3",

From 596008a64f6a0e7a08b0cc29c7e5ad5c89d560d5 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Wed, 5 Feb 2025 15:53:33 +0000
Subject: [PATCH 11/22] Refactor - Add functions for tx validation checks

---
 src/app/components/transaction.tsx |  16 +-
 src/app/utils/transactionUtils.ts  | 271 +++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+), 12 deletions(-)
 create mode 100644 src/app/utils/transactionUtils.ts

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 0dfc8e5..4cca892 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -8,22 +8,14 @@ import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
 import { Underline } from "lucide-react";
+import {decodeHextoTx} from "../utils/transactionUtils";
 
 dotevn.config();
 
 const NEXT_PUBLIC_REST_IPFS_GATEWAY=process.env.NEXT_PUBLIC_REST_IPFS_GATEWAY;
 
 // Function to decode an unasigned transaction
-const decodeTransaction = (unsignedTransactionHex: string) => {
-  try {
-    const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
-    console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
-    return unsignedTransaction;
-  } catch (error) {
-    console.error("Error decoding transaction:", error);
-    return null;
-  }
-};
+
 
 // convert basic GA ID to Bech32 as per CIP129 standard
 // https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129
@@ -75,7 +67,7 @@ export const TransactionButton = () => {
     console.log("Connected wallet network ID:", network);
     console.log("isPartOfSigners:", isPartOfSigners);
 
-    const unsignedTransaction = decodeTransaction(unsignedTransactionHex);
+    const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
     setUnsignedTransaction(unsignedTransaction);
 
     console.log("unsignedTransaction:", unsignedTransaction);
@@ -225,7 +217,7 @@ export const TransactionButton = () => {
         const signedTx = await wallet.signTx(unsignedTransactionHex, true);
         console.log("Transaction signed successfully:", signedTx);
 
-        const signature = await decodeTransaction(signedTx);
+        const signature = await decodeHextoTx(signedTx);
         setsignature(signature?.witness_set().vkeys()?.get(0)?.signature()?.to_hex() || '');
         console.log("signature:", signature?.witness_set().vkeys()?.get(0).signature().to_hex());
         
diff --git a/src/app/utils/transactionUtils.ts b/src/app/utils/transactionUtils.ts
new file mode 100644
index 0000000..2089851
--- /dev/null
+++ b/src/app/utils/transactionUtils.ts
@@ -0,0 +1,271 @@
+import * as CLS from "@emurgo/cardano-serialization-lib-browser";
+import { deserializeAddress } from "@meshsdk/core";
+
+/**
+ * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
+ * @param unsignedTransactionHex hex string of the unsigned transaction.
+ * @returns {CLS.Transaction} the decoded transaction object, or null if the decoding fails.
+ */
+
+export const decodeHextoTx = (unsignedTransactionHex: string) => {
+    try {
+      const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
+      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
+      return unsignedTransaction;
+    } catch (error) {
+      console.error("Error decoding transaction:", error);
+      return null;
+    }
+  };
+
+/**
+ * Checks if the given stake credential is part of the required signers of the transaction.
+ * @param transactionBody the body of the transaction to check.
+ * @param stakeCred the stake credential to check.
+ * @returns {boolean} true if the stake credential is part of the required signers, false otherwise.
+ */
+export const checkIfPartOfSigners = async (transactionBody: any, stakeCred: string) => {
+    
+    if (!transactionBody) {
+        throw new Error("Transaction body is null.");
+    }
+    //wallet needs to sign
+    // Check if signer part of plutus output data
+    const requiredSigners = transactionBody.required_signers();
+
+    if (!requiredSigners || requiredSigners.len() === 0) {
+        console.log("No required signers in the transaction.");
+
+    } else if (requiredSigners?.to_json().includes(stakeCred)) {
+        console.log("Required signers in the transaction:", requiredSigners?.to_json());
+        return true;
+    }else{
+        console.log("Not part of the required signers.");
+        return false;
+    }
+
+}
+
+/**
+ * Checks if the transaction has one vote set.
+ * @param transactionBody the body of the transaction to check.
+ * @returns {boolean} true if the transaction has one vote set, false otherwise.
+ */
+const checkIfOneVoteOnTX = (transactionBody: any) => {
+    //one vote 
+    const voting_procedures = transactionBody.to_js_value().voting_procedures;
+    const votes = voting_procedures?.[0]?.votes;
+    const votesNumber = votes?.length;
+    const voteResult = votes?.[0]?.voting_procedure?.vote;
+    let hasOneVote = false;
+
+    if (votesNumber === 1) {
+        console.log("Transaction has one vote set to:", voteResult);
+        hasOneVote = true;
+    } else if (!votesNumber) {
+        throw new Error("Transaction has no votes.");
+    } else {
+        throw new Error("You are signing more than one vote. Number of votes: " + votesNumber);
+    }
+
+    return hasOneVote;
+};
+
+/**
+ * Checks if the transaction has certificates.
+ * @param transactionBody the body of the transaction to check.
+ * @returns {boolean} true if the transaction has certificates, false otherwise.
+ */
+const checkIfHasCertificates = (transactionBody: any) => {
+
+    const certificates = transactionBody?.certs();
+    let hasCertificates = true;
+
+    console.log("certificates:", certificates);
+
+    if (!certificates) {
+      console.log("No certificates in the transaction.");
+      hasCertificates = false;
+    }
+
+    return hasCertificates;
+
+};
+
+/**
+ * Checks if the transaction is on the same network as the wallet.
+ * @param transactionBody The body of the transaction to check.
+ * @param walletNetworkID The network ID of the wallet.
+ * @returns {boolean} True if the transaction is on the same network, false otherwise.
+ */
+const checkIfSameNetwork = (transactionBody: any, walletNetworkID: number): boolean => {
+  // Determine the network ID from the transaction's first output address
+  const transactionNetworkID = transactionBody
+    .outputs()
+    .get(0)
+    .address()
+    .to_bech32()
+    .startsWith("addr_test1") ? 0 : 1;
+  
+  console.log("transactionNetwork:", transactionNetworkID);
+
+  // Compare the transaction network ID with the wallet network ID
+  return walletNetworkID === transactionNetworkID;
+};
+
+
+// export const checkTransaction = async (transaction: CLS.Transaction, wallet: any , connected: boolean) => {
+
+
+//     if (!connected) {
+//         setIsPartOfSigners(false);
+//         setIsOneVote(false);
+//         setHasCertificates(true);
+//         setIsSameNetwork(false);
+//         setHasICCCredentials(false);
+//         setIsInOutputPlutusData(false);
+//         setVoteResult("");
+//         setVoteID("");
+//         setMessage("Please connect your wallet first.");
+//         return;
+//     }
+
+//     const network = await wallet.getNetworkId();
+//     console.log("Connected wallet network ID:", network);
+//     console.log("isPartOfSigners:", isPartOfSigners);
+
+//     const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
+//     setUnsignedTransaction(unsignedTransaction);
+
+//     console.log("unsignedTransaction:", unsignedTransaction);
+
+//     const changeAddress = await wallet.getChangeAddress();
+//     const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
+
+//     console.log("Stake Credential:", stakeCred);
+
+//     //**************************************Transaction Validation Checks****************************************
+
+//     const transactionBody = unsignedTransaction?.body();
+//     const voting_procedures = transactionBody?.to_js_value().voting_procedures;
+
+//     try {
+//         if (!transactionBody) {
+//             throw new Error("Transaction body is null.");
+//         }
+//         //wallet needs to sign
+//         // Check if signer part of plutus output data
+//         const requiredSigners = transactionBody.required_signers();
+//         if (!requiredSigners || requiredSigners.len() === 0) {
+//             console.log("No required signers in the transaction.");
+
+//         } else if (requiredSigners?.to_json().includes(stakeCred)) {
+//             console.log("Required signers in the transaction:", requiredSigners?.to_json());
+//             setIsPartOfSigners(true);
+//         }
+
+//         //one vote 
+//         const votes = voting_procedures?.[0]?.votes;
+//         const votesNumber = votes?.length;
+
+//         if (votesNumber === 1) {
+//             setIsOneVote(true);
+//             setVoteResult(votes?.[0].voting_procedure.vote);
+//             setVoteID(votes?.[0].action_id.transaction_id);
+//             setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
+//             setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
+//             console.log("Transaction has one vote set to:", voteResult);
+//         } else if (!votesNumber) {
+//             throw new Error("Transaction has no votes.");
+//         } else {
+//             //throw new Error("You are signing more than one vote. Number of votes: "+ votesNumber);
+//         }
+
+//         // Check to see if the transactions has any certificates in it
+//         const certificates = transactionBody?.certs();
+//         console.log("certificates:", certificates);
+//         if (!certificates) {
+//             console.log("No certificates in the transaction.");
+//             setHasCertificates(false);
+//         }
+
+//         //Same network
+//         const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
+//         console.log('transactionNetwork:', transactionNetworkID);
+//         if (network === transactionNetworkID) {
+//             setIsSameNetwork(true);
+//         }
+
+
+//         //Is Intersect CC credential
+//         const voterJSON = voting_procedures?.[0]?.voter;
+//         console.log("voterJSON:", voterJSON);
+//         let script;
+//         // Function to check if the voterJSON has ConstitutionalCommitteeHotCred to avoid type error
+//         function isConstitutionalCommitteeHotCred(voter: CLS.VoterJSON): voter is { ConstitutionalCommitteeHotCred: { Script: string } } {
+//             return (voter as { ConstitutionalCommitteeHotCred: any }).ConstitutionalCommitteeHotCred !== undefined;
+//         }
+
+//         if (voterJSON && isConstitutionalCommitteeHotCred(voterJSON)) {
+//             // If it has ConstitutionalCommitteeHotCred, extract the Script hex
+//             const credType = voterJSON.ConstitutionalCommitteeHotCred;
+//             script = credType.Script;
+//             console.log("ConstitutionalCommitteeHotCred Script:", script);
+
+//         }
+//         //If in Testnet and scrit matches preview ICC credential ; else if in mainnet and script matches mainnet ICC credential
+//         if (network === 0 && script === "4f00984fa72e265b8ff8ffce4405da562cd3d6b16a4a38de3372eeea") {
+//             console.log("Intersect CC Credential found in testnet");
+//             setHasICCCredentials(true);
+//         } else if (network === 1 && script === "85c47dd4b9a2e70e88965d91dd69be182d5605b23bb5250b1c94bf64") {
+//             console.log("Intersect CC Credential found in mainnet");
+//             setHasICCCredentials(true);
+//         } else {
+//             console.error("Incorrect Intersect CC Credentials");
+//         }
+//         //check if signer is in plutus data
+//         const plutusScripts = transactionBody?.outputs().to_js_value();
+//         console.log("plutusScripts:", plutusScripts);
+//         console.log("stakeCred:", stakeCred);
+
+//         if (Array.isArray(plutusScripts) && stakeCred) {
+
+//             const regex = new RegExp(stakeCred);
+
+//             plutusScripts.forEach((output, index) => {
+//                 if (output.plutus_data && typeof output.plutus_data === 'object' && 'Data' in output.plutus_data) {
+//                     const plutusData = output.plutus_data.Data;
+//                     console.log("plutusData:", plutusData);
+
+//                     if (regex.test(plutusData)) {
+//                         console.log(`Stake credential found in output for address ${output.address}`);
+//                         setIsInOutputPlutusData(true);
+//                     }
+//                 } else if (!output.plutus_data) {
+//                     console.log(`No plutus data found in output`);
+//                 } else {
+//                     console.log(`Stake credential not found on plutus script data for address ${output.address}`);
+//                 }
+//             });
+
+//         } else {
+//             console.error("Transaction outputs are not available ");
+//         }
+
+
+//         //for future add context of some of the 
+
+//         //********************************************Voting Details *********************************************************************/
+//         if (transactionNetworkID === 0) {
+//             setCardanoscan("https://preprod.cardanoscan.io/transaction/");
+//         } else if (transactionNetworkID === 1) {
+//             setCardanoscan("https://cardanoscan.io/transaction/");
+//         }
+
+
+//     }
+//     catch (error) {
+//         console.error("Error validating transaction:", error);
+//     }
+
+// };

From 8bbacf05985a5daf83f0639dd9cdb00b071df8b3 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Wed, 5 Feb 2025 17:34:30 +0000
Subject: [PATCH 12/22] Add mosular validity functions

---
 src/app/components/transaction.tsx      | 101 ++-------
 src/app/components/validationChecks.tsx |   0
 src/app/utils/transactionUtils.ts       | 271 ------------------------
 src/app/utils/txInfoUtils.ts            |   0
 src/app/utils/txValidationUtils.ts      | 179 ++++++++++++++++
 5 files changed, 198 insertions(+), 353 deletions(-)
 create mode 100644 src/app/components/validationChecks.tsx
 delete mode 100644 src/app/utils/transactionUtils.ts
 create mode 100644 src/app/utils/txInfoUtils.ts
 create mode 100644 src/app/utils/txValidationUtils.ts

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 4cca892..2a999f4 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -8,7 +8,7 @@ import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
 import { Underline } from "lucide-react";
-import {decodeHextoTx} from "../utils/transactionUtils";
+import * as txValidationUtils from "../utils/txValidationUtils";
 
 dotevn.config();
 
@@ -64,17 +64,16 @@ export const TransactionButton = () => {
     }
     
     const network = await wallet.getNetworkId();
-    console.log("Connected wallet network ID:", network);
-    console.log("isPartOfSigners:", isPartOfSigners);
+   
 
-    const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
+    const unsignedTransaction = txValidationUtils.decodeHextoTx(unsignedTransactionHex);
     setUnsignedTransaction(unsignedTransaction);
-
-    console.log("unsignedTransaction:", unsignedTransaction);
-
     const changeAddress = await wallet.getChangeAddress();
     const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
 
+    console.log("Connected wallet network ID:", network);
+    console.log("isPartOfSigners:", isPartOfSigners);
+    console.log("unsignedTransaction:", unsignedTransaction);
     console.log("Stake Credential:", stakeCred);
 
     //**************************************Transaction Validation Checks****************************************
@@ -86,16 +85,12 @@ export const TransactionButton = () => {
       if (!transactionBody) {
         throw new Error("Transaction body is null.");
       }
+      setmetadataAnchorURL(voting_procedures?.[0]?.votes?.[0].voting_procedure.anchor?.anchor_url);
+      setMetadataAnchorHash(voting_procedures?.[0]?.votes?.[0].voting_procedure.anchor?.anchor_data_hash);
       //wallet needs to sign
-      // Check if signer part of plutus output data
-      const requiredSigners = transactionBody.required_signers();
-      if (!requiredSigners || requiredSigners.len() === 0) {
-        console.log("No required signers in the transaction.");
-  
-      } else if (requiredSigners?.to_json().includes(stakeCred) ) {
-        console.log("Required signers in the transaction:", requiredSigners?.to_json());
-        setIsPartOfSigners(true);
-      } 
+      txValidationUtils.isPartOfSigners(transactionBody, stakeCred).then((result) => {
+        setIsPartOfSigners(result);
+      })
 
       //one vote 
       const votes=voting_procedures?.[0]?.votes;
@@ -122,80 +117,22 @@ export const TransactionButton = () => {
       }
       
       // Check to see if the transactions has any certificates in it
-      const certificates = transactionBody?.certs();
-      console.log("certificates:", certificates);
-      if (!certificates) {
-        console.log("No certificates in the transaction.");
-        setHasCertificates(false);
-      }
-
+      setHasCertificates(txValidationUtils.hasCertificates(transactionBody));
       //Same network
-      const transactionNetworkID= transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1")?0:1;
-      console.log('transactionNetwork:',transactionNetworkID);
-      if (network === transactionNetworkID ) {
-        setIsSameNetwork(true);
-      }
-      
-      
+      setIsSameNetwork(txValidationUtils.isSameNetwork(transactionBody, network));
       //Is Intersect CC credential
-      const voterJSON = voting_procedures?.[0]?.voter;
-      console.log("voterJSON:", voterJSON);
-      let script;
-      // Function to check if the voterJSON has ConstitutionalCommitteeHotCred to avoid type error
-      function isConstitutionalCommitteeHotCred(voter: CLS.VoterJSON): voter is { ConstitutionalCommitteeHotCred: { Script: string } } {
-        return (voter as { ConstitutionalCommitteeHotCred: any }).ConstitutionalCommitteeHotCred !== undefined;
-      }
-
-      if (voterJSON && isConstitutionalCommitteeHotCred(voterJSON)) {
-        // If it has ConstitutionalCommitteeHotCred, extract the Script hex
-        const credType = voterJSON.ConstitutionalCommitteeHotCred;
-        script = credType.Script;
-        console.log("ConstitutionalCommitteeHotCred Script:", script);
-        
-      }
+      
       //If in Testnet and scrit matches preview ICC credential ; else if in mainnet and script matches mainnet ICC credential
-      if (network === 0 && script === "4f00984fa72e265b8ff8ffce4405da562cd3d6b16a4a38de3372eeea") {
-        console.log("Intersect CC Credential found in testnet");
-        setHasICCCredentials(true);
-      } else if (network === 1 && script === "85c47dd4b9a2e70e88965d91dd69be182d5605b23bb5250b1c94bf64") {
-        console.log("Intersect CC Credential found in mainnet");
-        setHasICCCredentials(true);
-      } else {
-        console.error("Incorrect Intersect CC Credentials");
-      }
-      //check if signer is in plutus data
-      const plutusScripts = transactionBody?.outputs().to_js_value();
-      console.log("plutusScripts:", plutusScripts);
-      console.log("stakeCred:", stakeCred);
+      setHasICCCredentials( txValidationUtils.hasValidICCCredentials(transactionBody, network));
+      console.log("hasICCCredentials:", hasICCCredentials,txValidationUtils.hasValidICCCredentials(transactionBody, network));
       
-      if (Array.isArray(plutusScripts) && stakeCred) {
-
-        const regex = new RegExp(stakeCred);
-        
-        plutusScripts.forEach((output, index) => {
-          if (output.plutus_data && typeof output.plutus_data === 'object' && 'Data' in output.plutus_data) {
-            const plutusData = output.plutus_data.Data;
-            console.log("plutusData:", plutusData);
-
-            if (regex.test(plutusData)) {
-              console.log(`Stake credential found in output for address ${output.address}`);
-              setIsInOutputPlutusData(true);
-            }
-          } else if (!output.plutus_data) {
-            console.log(`No plutus data found in output`);
-          } else {
-            console.log(`Stake credential not found on plutus script data for address ${output.address}`);
-          }
-        });
-
-      } else {
-        console.error("Transaction outputs are not available ");
-      }
+      //check if signer is in plutus data
       
 
       //for future add context of some of the 
 
       //********************************************Voting Details *********************************************************************/
+      const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
       if (transactionNetworkID === 0) {
         setCardanoscan("https://preprod.cardanoscan.io/govAction/");
       } else if (transactionNetworkID === 1) {
@@ -217,7 +154,7 @@ export const TransactionButton = () => {
         const signedTx = await wallet.signTx(unsignedTransactionHex, true);
         console.log("Transaction signed successfully:", signedTx);
 
-        const signature = await decodeHextoTx(signedTx);
+        const signature = await txValidationUtils.decodeHextoTx(signedTx);
         setsignature(signature?.witness_set().vkeys()?.get(0)?.signature()?.to_hex() || '');
         console.log("signature:", signature?.witness_set().vkeys()?.get(0).signature().to_hex());
         
diff --git a/src/app/components/validationChecks.tsx b/src/app/components/validationChecks.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/utils/transactionUtils.ts b/src/app/utils/transactionUtils.ts
deleted file mode 100644
index 2089851..0000000
--- a/src/app/utils/transactionUtils.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-import * as CLS from "@emurgo/cardano-serialization-lib-browser";
-import { deserializeAddress } from "@meshsdk/core";
-
-/**
- * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
- * @param unsignedTransactionHex hex string of the unsigned transaction.
- * @returns {CLS.Transaction} the decoded transaction object, or null if the decoding fails.
- */
-
-export const decodeHextoTx = (unsignedTransactionHex: string) => {
-    try {
-      const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
-      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
-      return unsignedTransaction;
-    } catch (error) {
-      console.error("Error decoding transaction:", error);
-      return null;
-    }
-  };
-
-/**
- * Checks if the given stake credential is part of the required signers of the transaction.
- * @param transactionBody the body of the transaction to check.
- * @param stakeCred the stake credential to check.
- * @returns {boolean} true if the stake credential is part of the required signers, false otherwise.
- */
-export const checkIfPartOfSigners = async (transactionBody: any, stakeCred: string) => {
-    
-    if (!transactionBody) {
-        throw new Error("Transaction body is null.");
-    }
-    //wallet needs to sign
-    // Check if signer part of plutus output data
-    const requiredSigners = transactionBody.required_signers();
-
-    if (!requiredSigners || requiredSigners.len() === 0) {
-        console.log("No required signers in the transaction.");
-
-    } else if (requiredSigners?.to_json().includes(stakeCred)) {
-        console.log("Required signers in the transaction:", requiredSigners?.to_json());
-        return true;
-    }else{
-        console.log("Not part of the required signers.");
-        return false;
-    }
-
-}
-
-/**
- * Checks if the transaction has one vote set.
- * @param transactionBody the body of the transaction to check.
- * @returns {boolean} true if the transaction has one vote set, false otherwise.
- */
-const checkIfOneVoteOnTX = (transactionBody: any) => {
-    //one vote 
-    const voting_procedures = transactionBody.to_js_value().voting_procedures;
-    const votes = voting_procedures?.[0]?.votes;
-    const votesNumber = votes?.length;
-    const voteResult = votes?.[0]?.voting_procedure?.vote;
-    let hasOneVote = false;
-
-    if (votesNumber === 1) {
-        console.log("Transaction has one vote set to:", voteResult);
-        hasOneVote = true;
-    } else if (!votesNumber) {
-        throw new Error("Transaction has no votes.");
-    } else {
-        throw new Error("You are signing more than one vote. Number of votes: " + votesNumber);
-    }
-
-    return hasOneVote;
-};
-
-/**
- * Checks if the transaction has certificates.
- * @param transactionBody the body of the transaction to check.
- * @returns {boolean} true if the transaction has certificates, false otherwise.
- */
-const checkIfHasCertificates = (transactionBody: any) => {
-
-    const certificates = transactionBody?.certs();
-    let hasCertificates = true;
-
-    console.log("certificates:", certificates);
-
-    if (!certificates) {
-      console.log("No certificates in the transaction.");
-      hasCertificates = false;
-    }
-
-    return hasCertificates;
-
-};
-
-/**
- * Checks if the transaction is on the same network as the wallet.
- * @param transactionBody The body of the transaction to check.
- * @param walletNetworkID The network ID of the wallet.
- * @returns {boolean} True if the transaction is on the same network, false otherwise.
- */
-const checkIfSameNetwork = (transactionBody: any, walletNetworkID: number): boolean => {
-  // Determine the network ID from the transaction's first output address
-  const transactionNetworkID = transactionBody
-    .outputs()
-    .get(0)
-    .address()
-    .to_bech32()
-    .startsWith("addr_test1") ? 0 : 1;
-  
-  console.log("transactionNetwork:", transactionNetworkID);
-
-  // Compare the transaction network ID with the wallet network ID
-  return walletNetworkID === transactionNetworkID;
-};
-
-
-// export const checkTransaction = async (transaction: CLS.Transaction, wallet: any , connected: boolean) => {
-
-
-//     if (!connected) {
-//         setIsPartOfSigners(false);
-//         setIsOneVote(false);
-//         setHasCertificates(true);
-//         setIsSameNetwork(false);
-//         setHasICCCredentials(false);
-//         setIsInOutputPlutusData(false);
-//         setVoteResult("");
-//         setVoteID("");
-//         setMessage("Please connect your wallet first.");
-//         return;
-//     }
-
-//     const network = await wallet.getNetworkId();
-//     console.log("Connected wallet network ID:", network);
-//     console.log("isPartOfSigners:", isPartOfSigners);
-
-//     const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
-//     setUnsignedTransaction(unsignedTransaction);
-
-//     console.log("unsignedTransaction:", unsignedTransaction);
-
-//     const changeAddress = await wallet.getChangeAddress();
-//     const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
-
-//     console.log("Stake Credential:", stakeCred);
-
-//     //**************************************Transaction Validation Checks****************************************
-
-//     const transactionBody = unsignedTransaction?.body();
-//     const voting_procedures = transactionBody?.to_js_value().voting_procedures;
-
-//     try {
-//         if (!transactionBody) {
-//             throw new Error("Transaction body is null.");
-//         }
-//         //wallet needs to sign
-//         // Check if signer part of plutus output data
-//         const requiredSigners = transactionBody.required_signers();
-//         if (!requiredSigners || requiredSigners.len() === 0) {
-//             console.log("No required signers in the transaction.");
-
-//         } else if (requiredSigners?.to_json().includes(stakeCred)) {
-//             console.log("Required signers in the transaction:", requiredSigners?.to_json());
-//             setIsPartOfSigners(true);
-//         }
-
-//         //one vote 
-//         const votes = voting_procedures?.[0]?.votes;
-//         const votesNumber = votes?.length;
-
-//         if (votesNumber === 1) {
-//             setIsOneVote(true);
-//             setVoteResult(votes?.[0].voting_procedure.vote);
-//             setVoteID(votes?.[0].action_id.transaction_id);
-//             setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
-//             setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
-//             console.log("Transaction has one vote set to:", voteResult);
-//         } else if (!votesNumber) {
-//             throw new Error("Transaction has no votes.");
-//         } else {
-//             //throw new Error("You are signing more than one vote. Number of votes: "+ votesNumber);
-//         }
-
-//         // Check to see if the transactions has any certificates in it
-//         const certificates = transactionBody?.certs();
-//         console.log("certificates:", certificates);
-//         if (!certificates) {
-//             console.log("No certificates in the transaction.");
-//             setHasCertificates(false);
-//         }
-
-//         //Same network
-//         const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
-//         console.log('transactionNetwork:', transactionNetworkID);
-//         if (network === transactionNetworkID) {
-//             setIsSameNetwork(true);
-//         }
-
-
-//         //Is Intersect CC credential
-//         const voterJSON = voting_procedures?.[0]?.voter;
-//         console.log("voterJSON:", voterJSON);
-//         let script;
-//         // Function to check if the voterJSON has ConstitutionalCommitteeHotCred to avoid type error
-//         function isConstitutionalCommitteeHotCred(voter: CLS.VoterJSON): voter is { ConstitutionalCommitteeHotCred: { Script: string } } {
-//             return (voter as { ConstitutionalCommitteeHotCred: any }).ConstitutionalCommitteeHotCred !== undefined;
-//         }
-
-//         if (voterJSON && isConstitutionalCommitteeHotCred(voterJSON)) {
-//             // If it has ConstitutionalCommitteeHotCred, extract the Script hex
-//             const credType = voterJSON.ConstitutionalCommitteeHotCred;
-//             script = credType.Script;
-//             console.log("ConstitutionalCommitteeHotCred Script:", script);
-
-//         }
-//         //If in Testnet and scrit matches preview ICC credential ; else if in mainnet and script matches mainnet ICC credential
-//         if (network === 0 && script === "4f00984fa72e265b8ff8ffce4405da562cd3d6b16a4a38de3372eeea") {
-//             console.log("Intersect CC Credential found in testnet");
-//             setHasICCCredentials(true);
-//         } else if (network === 1 && script === "85c47dd4b9a2e70e88965d91dd69be182d5605b23bb5250b1c94bf64") {
-//             console.log("Intersect CC Credential found in mainnet");
-//             setHasICCCredentials(true);
-//         } else {
-//             console.error("Incorrect Intersect CC Credentials");
-//         }
-//         //check if signer is in plutus data
-//         const plutusScripts = transactionBody?.outputs().to_js_value();
-//         console.log("plutusScripts:", plutusScripts);
-//         console.log("stakeCred:", stakeCred);
-
-//         if (Array.isArray(plutusScripts) && stakeCred) {
-
-//             const regex = new RegExp(stakeCred);
-
-//             plutusScripts.forEach((output, index) => {
-//                 if (output.plutus_data && typeof output.plutus_data === 'object' && 'Data' in output.plutus_data) {
-//                     const plutusData = output.plutus_data.Data;
-//                     console.log("plutusData:", plutusData);
-
-//                     if (regex.test(plutusData)) {
-//                         console.log(`Stake credential found in output for address ${output.address}`);
-//                         setIsInOutputPlutusData(true);
-//                     }
-//                 } else if (!output.plutus_data) {
-//                     console.log(`No plutus data found in output`);
-//                 } else {
-//                     console.log(`Stake credential not found on plutus script data for address ${output.address}`);
-//                 }
-//             });
-
-//         } else {
-//             console.error("Transaction outputs are not available ");
-//         }
-
-
-//         //for future add context of some of the 
-
-//         //********************************************Voting Details *********************************************************************/
-//         if (transactionNetworkID === 0) {
-//             setCardanoscan("https://preprod.cardanoscan.io/transaction/");
-//         } else if (transactionNetworkID === 1) {
-//             setCardanoscan("https://cardanoscan.io/transaction/");
-//         }
-
-
-//     }
-//     catch (error) {
-//         console.error("Error validating transaction:", error);
-//     }
-
-// };
diff --git a/src/app/utils/txInfoUtils.ts b/src/app/utils/txInfoUtils.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/utils/txValidationUtils.ts b/src/app/utils/txValidationUtils.ts
new file mode 100644
index 0000000..a70e818
--- /dev/null
+++ b/src/app/utils/txValidationUtils.ts
@@ -0,0 +1,179 @@
+import * as CLS from "@emurgo/cardano-serialization-lib-browser";
+import { deserializeAddress } from "@meshsdk/core";
+
+/**
+ * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
+ * @param unsignedTransactionHex hex string of the unsigned transaction.
+ * @returns {CLS.Transaction} the decoded transaction object, or null if the decoding fails.
+ */
+
+export const decodeHextoTx = (unsignedTransactionHex: string) => {
+    console.log("decodeHextoTx");
+    try {
+      const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
+      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
+      return unsignedTransaction;
+    } catch (error) {
+      console.error("Error decoding transaction:", error);
+      return null;
+    }
+  };
+
+/**
+ * Checks if the given stake credential is part of the required signers of the transaction.
+ * @param transactionBody the body of the transaction to check.
+ * @param stakeCred the stake credential to check.
+ * @returns {boolean} true if the stake credential is part of the required signers, false otherwise.
+ */
+export const isPartOfSigners = async (transactionBody: any, stakeCred: string)  => {
+    console.log("isPartOfSigners");
+    
+    if (!transactionBody) {
+        throw new Error("Transaction body is null.");
+    }
+    //wallet needs to sign
+    // Check if signer part of plutus output data
+    const requiredSigners = transactionBody.required_signers();
+
+    if (!requiredSigners || requiredSigners.len() === 0) {
+        console.log("No required signers in the transaction.");
+
+    } else if (requiredSigners?.to_json().includes(stakeCred)) {
+        console.log("Required signers in the transaction:", requiredSigners?.to_json());
+        return true;
+    }else{
+        console.log("Not part of the required signers.");
+    }
+    return false;
+}
+
+/**
+ * Checks if the transaction has one vote set.
+ * @param transactionBody the body of the transaction to check.
+ * @returns {boolean} true if the transaction has one vote set, false otherwise.
+ */
+export const hasOneVoteOnTransaction = (transactionBody: any): boolean => {
+    console.log("hasOneVoteOnTransaction");
+    const votingProcedure = transactionBody.to_js_value().voting_procedures?.[0];
+    const votes = votingProcedure?.votes;
+    const voteCount = votes?.length;
+
+    if (voteCount === 1) {
+        return true;
+    }
+
+    else if (voteCount === 0) {
+        throw new Error("Transaction has no votes.");
+    }
+
+    throw new Error(`You are signing more than one vote. Number of votes: ${voteCount}`);
+};
+
+/**
+ * Checks if the transaction has certificates.
+ * @param transactionBody the body of the transaction to check.
+ * @returns {boolean} true if the transaction has certificates, false otherwise.
+ */
+export const hasCertificates = (transactionBody: any) =>{
+    console.log("hasCertificates");
+
+    const certificates = transactionBody?.certs();
+    let hasCertificates = true;
+
+    console.log("certificates:", certificates);
+
+    if (!certificates) {
+      console.log("No certificates in the transaction.");
+      hasCertificates = false;
+    }
+
+    return hasCertificates;
+
+};
+
+/**
+ * Checks if the transaction is on the same network as the wallet.
+ * @param transactionBody The body of the transaction to check.
+ * @param walletNetworkID The network ID of the wallet.
+ * @returns {boolean} True if the transaction is on the same network, false otherwise.
+ */
+export const isSameNetwork = (transactionBody: any, walletNetworkID: number): boolean => {
+    console.log("isSameNetwork");
+  // Determine the network ID from the transaction's first output address
+  const transactionNetworkID = transactionBody
+    .outputs()
+    .get(0)
+    .address()
+    .to_bech32()
+    .startsWith("addr_test1") ? 0 : 1;
+  
+  console.log("transactionNetwork:", transactionNetworkID);
+
+  // Compare the transaction network ID with the wallet network ID
+  return walletNetworkID === transactionNetworkID;
+};
+
+/**
+ * Checks if the transaction has valid Intersect Constitutional Committee (ICC) credentials.
+ * @param transactionBody The body of the transaction to check.
+ * @param walletNetworkID The network ID of the wallet.
+ * @returns {boolean} True if the transaction has valid ICC credentials, false otherwise.
+ */
+export const hasValidICCCredentials = (transactionBody: any, walletNetworkID: number): boolean => {
+    console.log("hasValidICCCredentials");
+  const voter = transactionBody.to_js_value().voting_procedures?.[0].voter;
+  console.log("voter:", voter);
+
+  if (!voter) {
+    return false;
+  }
+
+  const credentialType = voter.ConstitutionalCommitteeHotCred;
+  const scriptHex = credentialType?.Script;
+
+  if (!scriptHex) {
+    return false;
+  }
+
+  const expectedScripts = {
+    [0]: "4f00984fa72e265b8ff8ffce4405da562cd3d6b16a4a38de3372eeea",
+    [1]: "85c47dd4b9a2e70e88965d91dd69be182d5605b23bb5250b1c94bf64",
+  };
+  if (expectedScripts[walletNetworkID as 0 | 1] === scriptHex) {
+    console.log('Intersect CC Credential found in', walletNetworkID===0 ? 'testnet' : 'mainnet');
+  }
+  else {
+    console.error("Incorrect Intersect CC Credentials");
+  }
+  return expectedScripts[walletNetworkID as 0 | 1] === scriptHex;
+};
+
+/**
+ * Checks if the given stake credential is part of the plutus data of the transaction.
+ * @param transactionBody The body of the transaction to check.
+ * @param stakeCredential The stake credential to check.
+ * @returns {boolean} True if the stake credential is part of the plutus data, false otherwise.
+ */
+export const isSignerInPlutusData = (transactionBody: any, stakeCredential: string): boolean => {
+    console.log('isSignerInPlutusData Function');
+    const outputs = transactionBody?.outputs().to_js_value();
+    console.log("outputs:", outputs);
+
+    if (!Array.isArray(outputs) || !stakeCredential) {
+        console.error("Transaction outputs are not available or stake credential is missing.");
+        return false;
+    }
+
+    const stakeCredRegex = new RegExp(stakeCredential);
+
+    for (const output of outputs) {
+        const plutusData = output.plutus_data?.Data;
+        
+        if (plutusData && stakeCredRegex.test(plutusData)) {
+            return true;
+        }
+    }
+
+    return false;
+};
+

From 09520e2b1d9235585d1b6873b0af6eed06bcd092 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Wed, 5 Feb 2025 17:58:21 +0000
Subject: [PATCH 13/22] Refactor validation checks UI

---
 src/app/components/transaction.tsx      | 82 ++++++-------------------
 src/app/components/validationChecks.tsx | 49 +++++++++++++++
 2 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 2a999f4..3f7b2f4 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -9,6 +9,7 @@ import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
 import { Underline } from "lucide-react";
 import * as txValidationUtils from "../utils/txValidationUtils";
+import { TransactionChecks } from "./validationChecks";
 
 dotevn.config();
 
@@ -133,6 +134,14 @@ export const TransactionButton = () => {
 
       //********************************************Voting Details *********************************************************************/
       const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
+      const votes=voting_procedures?.[0]?.votes;
+      const votesNumber = votes?.length;
+    
+      setVoteResult(votes?.[0].voting_procedure.vote);
+      setVoteID(votes?.[0].action_id.transaction_id);
+      setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
+      setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
+
       if (transactionNetworkID === 0) {
         setCardanoscan("https://preprod.cardanoscan.io/govAction/");
       } else if (transactionNetworkID === 1) {
@@ -218,73 +227,18 @@ export const TransactionButton = () => {
       {/* Transaction Details */}
       <Box sx={{ mt: 3 }}>
         <Typography variant="h6" sx={{ mb: 2 }}>
-          Transaction Details
+          Transaction Validation Checks
         </Typography>
 
         {unsignedTransaction && (
-          <Box display="flex" flexWrap="wrap" gap={2}>
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Wallet needs to sign?:{isPartOfSigners ? "✅" : "❌"}
-            </Typography>
-
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Signing one vote?:{isOneVote ? "✅" : "❌"}
-            </Typography>
-
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Has no certificates?:{hasCertificates ? "❌" : "✅"}
-            </Typography>
-
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Is the transaction in the same network?:
-              {isSameNetwork ? "✅" : "❌"}
-            </Typography>
-
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Has Intersect CC credentials?:{hasICCCredentials ? "✅" : "❌"}
-            </Typography>
-
-            <Typography
-              display="flex"
-              flexDirection="column"
-              width="45%"
-              variant="body1"
-              fontWeight="bold"
-            >
-              Is stake credential in plutus data?:
-              {isInOutputPlutusData ? "✅" : "❌"}
-            </Typography>
-          </Box>
+            <TransactionChecks
+            isPartOfSigners={isPartOfSigners}
+            isOneVote={isOneVote}
+            hasCertificates={hasCertificates}
+            isSameNetwork={isSameNetwork}
+            hasICCCredentials={hasICCCredentials}
+            isInOutputPlutusData={isInOutputPlutusData}
+          />
         )}
         <Typography variant="h6" sx={{ mt: 3 }}>
           Voting Details
diff --git a/src/app/components/validationChecks.tsx b/src/app/components/validationChecks.tsx
index e69de29..af52c70 100644
--- a/src/app/components/validationChecks.tsx
+++ b/src/app/components/validationChecks.tsx
@@ -0,0 +1,49 @@
+import { Box, Typography } from "@mui/material";
+
+interface TransactionChecksProps {
+  isPartOfSigners: boolean;
+  isOneVote: boolean;
+  hasCertificates: boolean;
+  isSameNetwork: boolean;
+  hasICCCredentials: boolean;
+  isInOutputPlutusData: boolean;
+}
+
+export const TransactionChecks = ({
+  isPartOfSigners,
+  isOneVote,
+  hasCertificates,
+  isSameNetwork,
+  hasICCCredentials,
+  isInOutputPlutusData,
+}: TransactionChecksProps) => {
+  return (
+
+      <Box display="flex" flexWrap="wrap" gap={2}>
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Wallet needs to sign?: {isPartOfSigners ? "✅" : "❌"}
+        </Typography>
+
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Signing one vote?: {isOneVote ? "✅" : "❌"}
+        </Typography>
+
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Has no certificates?: {hasCertificates ? "❌" : "✅"}
+        </Typography>
+
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Is the transaction in the same network?: {isSameNetwork ? "✅" : "❌"}
+        </Typography>
+
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Has Intersect CC credentials?: {hasICCCredentials ? "✅" : "❌"}
+        </Typography>
+
+        <Typography display="flex" flexDirection="column" width="45%" variant="body1" fontWeight="bold">
+          Is stake credential in plutus data?: {isInOutputPlutusData ? "✅" : "❌"}
+        </Typography>
+      </Box>
+  
+  );
+};

From fda054b394746c918168b81d1ef9544a4987aeb8 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 12:07:06 +0000
Subject: [PATCH 14/22] new additions

---
 src/app/components/transaction.tsx | 21 +++++----------------
 src/app/utils/txInfoUtils.ts       |  0
 src/app/utils/txUtils.ts           | 21 +++++++++++++++++++++
 src/app/utils/txValidationUtils.ts | 21 ---------------------
 4 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 src/app/utils/txInfoUtils.ts
 create mode 100644 src/app/utils/txUtils.ts

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 3f7b2f4..55266e6 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -10,6 +10,7 @@ import dotevn from "dotenv";
 import { Underline } from "lucide-react";
 import * as txValidationUtils from "../utils/txValidationUtils";
 import { TransactionChecks } from "./validationChecks";
+import { decodeHextoTx } from "../utils/txUtils";
 
 dotevn.config();
 
@@ -65,9 +66,7 @@ export const TransactionButton = () => {
     }
     
     const network = await wallet.getNetworkId();
-   
-
-    const unsignedTransaction = txValidationUtils.decodeHextoTx(unsignedTransactionHex);
+    const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
     setUnsignedTransaction(unsignedTransaction);
     const changeAddress = await wallet.getChangeAddress();
     const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
@@ -81,13 +80,11 @@ export const TransactionButton = () => {
 
     const transactionBody = unsignedTransaction?.body();
     const voting_procedures= transactionBody?.to_js_value().voting_procedures;
-  
+
     try{
       if (!transactionBody) {
         throw new Error("Transaction body is null.");
       }
-      setmetadataAnchorURL(voting_procedures?.[0]?.votes?.[0].voting_procedure.anchor?.anchor_url);
-      setMetadataAnchorHash(voting_procedures?.[0]?.votes?.[0].voting_procedure.anchor?.anchor_data_hash);
       //wallet needs to sign
       txValidationUtils.isPartOfSigners(transactionBody, stakeCred).then((result) => {
         setIsPartOfSigners(result);
@@ -122,20 +119,13 @@ export const TransactionButton = () => {
       //Same network
       setIsSameNetwork(txValidationUtils.isSameNetwork(transactionBody, network));
       //Is Intersect CC credential
-      
-      //If in Testnet and scrit matches preview ICC credential ; else if in mainnet and script matches mainnet ICC credential
       setHasICCCredentials( txValidationUtils.hasValidICCCredentials(transactionBody, network));
-      console.log("hasICCCredentials:", hasICCCredentials,txValidationUtils.hasValidICCCredentials(transactionBody, network));
-      
       //check if signer is in plutus data
-      
-
-      //for future add context of some of the 
+      setIsInOutputPlutusData(txValidationUtils.isSignerInPlutusData(transactionBody, stakeCred));
 
       //********************************************Voting Details *********************************************************************/
       const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
       const votes=voting_procedures?.[0]?.votes;
-      const votesNumber = votes?.length;
     
       setVoteResult(votes?.[0].voting_procedure.vote);
       setVoteID(votes?.[0].action_id.transaction_id);
@@ -148,7 +138,6 @@ export const TransactionButton = () => {
         setCardanoscan("https://cardanoscan.io/govAction/");
       }
 
-      
     }
     catch (error) {
       console.error("Error validating transaction:", error);
@@ -163,7 +152,7 @@ export const TransactionButton = () => {
         const signedTx = await wallet.signTx(unsignedTransactionHex, true);
         console.log("Transaction signed successfully:", signedTx);
 
-        const signature = await txValidationUtils.decodeHextoTx(signedTx);
+        const signature = await decodeHextoTx(signedTx);
         setsignature(signature?.witness_set().vkeys()?.get(0)?.signature()?.to_hex() || '');
         console.log("signature:", signature?.witness_set().vkeys()?.get(0).signature().to_hex());
         
diff --git a/src/app/utils/txInfoUtils.ts b/src/app/utils/txInfoUtils.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/utils/txUtils.ts b/src/app/utils/txUtils.ts
new file mode 100644
index 0000000..e7a0546
--- /dev/null
+++ b/src/app/utils/txUtils.ts
@@ -0,0 +1,21 @@
+import * as CLS from "@emurgo/cardano-serialization-lib-browser";
+import { deserializeAddress } from "@meshsdk/core";
+
+/**
+ * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
+ * @param unsignedTransactionHex hex string of the unsigned transaction.
+ * @returns {CLS.Transaction} the decoded transaction object, or null if the decoding fails.
+ */
+
+export const decodeHextoTx = (unsignedTransactionHex: string) => {
+    console.log("decodeHextoTx");
+    try {
+      const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
+      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
+      return unsignedTransaction;
+    } catch (error) {
+      console.error("Error decoding transaction:", error);
+      return null;
+    }
+  };
+
diff --git a/src/app/utils/txValidationUtils.ts b/src/app/utils/txValidationUtils.ts
index a70e818..2eb5c71 100644
--- a/src/app/utils/txValidationUtils.ts
+++ b/src/app/utils/txValidationUtils.ts
@@ -1,24 +1,3 @@
-import * as CLS from "@emurgo/cardano-serialization-lib-browser";
-import { deserializeAddress } from "@meshsdk/core";
-
-/**
- * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
- * @param unsignedTransactionHex hex string of the unsigned transaction.
- * @returns {CLS.Transaction} the decoded transaction object, or null if the decoding fails.
- */
-
-export const decodeHextoTx = (unsignedTransactionHex: string) => {
-    console.log("decodeHextoTx");
-    try {
-      const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
-      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
-      return unsignedTransaction;
-    } catch (error) {
-      console.error("Error decoding transaction:", error);
-      return null;
-    }
-  };
-
 /**
  * Checks if the given stake credential is part of the required signers of the transaction.
  * @param transactionBody the body of the transaction to check.

From 606d9ec599ed40100358829321424d757fb2541a Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 13:29:36 +0000
Subject: [PATCH 15/22] Cleaning up merge colflicts

---
 src/app/components/transaction.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 55266e6..c2e6dd7 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -125,9 +125,9 @@ export const TransactionButton = () => {
 
       //********************************************Voting Details *********************************************************************/
       const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
-      const votes=voting_procedures?.[0]?.votes;
+      // const votes=voting_procedures?.[0]?.votes;
     
-      setVoteResult(votes?.[0].voting_procedure.vote);
+      // setvoteChoice(votes?.[0].voting_procedure.vote);
       setVoteID(votes?.[0].action_id.transaction_id);
       setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
       setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);

From 4b947c477967b827d207486bd23c2dd5ddd3925d Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 16:01:23 +0000
Subject: [PATCH 16/22] Refactoring merge changes

---
 src/app/components/transaction.tsx | 48 ++++++------------------------
 src/app/utils/txUtils.ts           | 13 +++++++-
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index c2e6dd7..650792c 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -7,29 +7,14 @@ import { Button, TextField, Box, Typography, Container, Table, TableBody, TableC
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
-import { Underline } from "lucide-react";
 import * as txValidationUtils from "../utils/txValidationUtils";
 import { TransactionChecks } from "./validationChecks";
-import { decodeHextoTx } from "../utils/txUtils";
+import { decodeHextoTx,convertGAToBech } from "../utils/txUtils";
 
 dotevn.config();
 
 const NEXT_PUBLIC_REST_IPFS_GATEWAY=process.env.NEXT_PUBLIC_REST_IPFS_GATEWAY;
 
-// Function to decode an unasigned transaction
-
-
-// convert basic GA ID to Bech32 as per CIP129 standard
-// https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129
-const convertGAToBech = (gaTxHash : string, gaTxIndex : number) => {
-  const bech32 = require('bech32-buffer');
-
-  // convert value index value to hex
-  const indexHex = gaTxIndex.toString(16).padStart(2, '0');
-
-  // return bech32 encoded GA ID
-  return bech32.encode("gov_action", Buffer.from(gaTxHash+indexHex, 'hex')).toString();
-}
 
 
 export const TransactionButton = () => {
@@ -94,26 +79,17 @@ export const TransactionButton = () => {
       const votes=voting_procedures?.[0]?.votes;
       const votesNumber = votes?.length;
 
-      if(votes && votesNumber === 1){
-        setIsOneVote(true);
+      //Check to see if the transaction has one vote
+      const hasOneVote = await txValidationUtils.hasOneVoteOnTransaction(transactionBody);
+      setIsOneVote(hasOneVote);
+
+      if (votes && hasOneVote) {
+        const vote = voting_procedures[0].votes[0].voting_procedure.vote;
+        setvoteChoice(vote === 'Yes' ? 'Constitutional' : vote === 'No' ? 'Unconstitutional' : 'Abstain');
         setVoteID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
         setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);
         setMetadataAnchorHash(votes[0].voting_procedure.anchor?.anchor_data_hash);
-        console.log("Transaction has one vote set to:",voteChoice);
-
-        if (votes?.[0].voting_procedure.vote==='Yes'){
-          setvoteChoice('Constitutional');
-        }else if (votes?.[0].voting_procedure.vote==='No'){
-          setvoteChoice('Unconstitutional');
-        }else{
-          setvoteChoice('Abstain');
-        }
-      }else if (!votesNumber){
-        throw new Error("Transaction has no votes.");
-      }else{
-        //throw new Error("You are signing more than one vote. Number of votes: "+ votesNumber);
       }
-      
       // Check to see if the transactions has any certificates in it
       setHasCertificates(txValidationUtils.hasCertificates(transactionBody));
       //Same network
@@ -125,13 +101,7 @@ export const TransactionButton = () => {
 
       //********************************************Voting Details *********************************************************************/
       const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
-      // const votes=voting_procedures?.[0]?.votes;
-    
-      // setvoteChoice(votes?.[0].voting_procedure.vote);
-      setVoteID(votes?.[0].action_id.transaction_id);
-      setmetadataAnchorURL(votes?.[0].voting_procedure.anchor?.anchor_url);
-      setMetadataAnchorHash(votes?.[0].voting_procedure.anchor?.anchor_data_hash);
-
+      
       if (transactionNetworkID === 0) {
         setCardanoscan("https://preprod.cardanoscan.io/govAction/");
       } else if (transactionNetworkID === 1) {
diff --git a/src/app/utils/txUtils.ts b/src/app/utils/txUtils.ts
index e7a0546..b666bda 100644
--- a/src/app/utils/txUtils.ts
+++ b/src/app/utils/txUtils.ts
@@ -11,7 +11,6 @@ export const decodeHextoTx = (unsignedTransactionHex: string) => {
     console.log("decodeHextoTx");
     try {
       const unsignedTransaction = CLS.Transaction.from_hex(unsignedTransactionHex);
-      console.log("signers list", unsignedTransaction.body().required_signers()?.to_json());
       return unsignedTransaction;
     } catch (error) {
       console.error("Error decoding transaction:", error);
@@ -19,3 +18,15 @@ export const decodeHextoTx = (unsignedTransactionHex: string) => {
     }
   };
 
+
+// convert basic GA ID to Bech32 as per CIP129 standard
+// https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129
+export const convertGAToBech = (gaTxHash : string, gaTxIndex : number) => {
+  const bech32 = require('bech32-buffer');
+
+  // convert value index value to hex
+  const indexHex = gaTxIndex.toString(16).padStart(2, '0');
+
+  // return bech32 encoded GA ID
+  return bech32.encode("gov_action", Buffer.from(gaTxHash+indexHex, 'hex')).toString();
+}

From 2804d3a4ea977b7b145b7e4af3c8b8d8982c073a Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 16:30:34 +0000
Subject: [PATCH 17/22] Improve code readability and handle null values safely

---
 src/app/components/transaction.tsx | 47 +++++++++++++-----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 650792c..890ab4e 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -35,7 +35,6 @@ export const TransactionButton = () => {
   const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>();
   const [metadataAnchorHash, setMetadataAnchorHash] = useState<string>();
 
-
   const checkTransaction = async () => {
     if (!connected) {
       setIsPartOfSigners(false);
@@ -46,45 +45,41 @@ export const TransactionButton = () => {
       setIsInOutputPlutusData(false);
       setvoteChoice("");
       setVoteID("");
-      setMessage("Please connect your wallet first.");
-      return;
+      return setMessage("Please connect your wallet first.");
     }
-    
-    const network = await wallet.getNetworkId();
-    const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
-    setUnsignedTransaction(unsignedTransaction);
-    const changeAddress = await wallet.getChangeAddress();
-    const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
+    try{
+      const network = await wallet.getNetworkId();
+      const unsignedTransaction = decodeHextoTx(unsignedTransactionHex);
+      setUnsignedTransaction(unsignedTransaction);
+      if (!unsignedTransaction) throw new Error("Invalid transaction format.");
 
-    console.log("Connected wallet network ID:", network);
-    console.log("isPartOfSigners:", isPartOfSigners);
-    console.log("unsignedTransaction:", unsignedTransaction);
-    console.log("Stake Credential:", stakeCred);
+      const changeAddress = await wallet.getChangeAddress();
+      const stakeCred = deserializeAddress(changeAddress).stakeCredentialHash;
 
-    //**************************************Transaction Validation Checks****************************************
+      console.log("Connected wallet network ID:", network);
+      console.log("unsignedTransaction:", unsignedTransaction);
+      console.log("Stake Credential:", stakeCred);
 
-    const transactionBody = unsignedTransaction?.body();
-    const voting_procedures= transactionBody?.to_js_value().voting_procedures;
+      //**************************************Transaction Validation Checks****************************************
+
+      const transactionBody = unsignedTransaction.body();
+      if (!transactionBody) throw new Error("Transaction body is null.");
+      const voting_procedures= transactionBody.to_js_value().voting_procedures;
+      if (!voting_procedures) throw new Error("Transaction has no voting procedures.");
+      const votes=voting_procedures[0].votes;
+      const hasOneVote = txValidationUtils.hasOneVoteOnTransaction(transactionBody);
+      const vote = voting_procedures[0].votes[0].voting_procedure.vote;
 
-    try{
-      if (!transactionBody) {
-        throw new Error("Transaction body is null.");
-      }
       //wallet needs to sign
       txValidationUtils.isPartOfSigners(transactionBody, stakeCred).then((result) => {
         setIsPartOfSigners(result);
       })
 
-      //one vote 
-      const votes=voting_procedures?.[0]?.votes;
-      const votesNumber = votes?.length;
-
       //Check to see if the transaction has one vote
-      const hasOneVote = await txValidationUtils.hasOneVoteOnTransaction(transactionBody);
       setIsOneVote(hasOneVote);
 
       if (votes && hasOneVote) {
-        const vote = voting_procedures[0].votes[0].voting_procedure.vote;
+        
         setvoteChoice(vote === 'Yes' ? 'Constitutional' : vote === 'No' ? 'Unconstitutional' : 'Abstain');
         setVoteID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
         setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);

From 72b5015a7ab6056d8dbae57817cc7c829e81994c Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 16:52:12 +0000
Subject: [PATCH 18/22] Group validation check variables

---
 src/app/components/transaction.tsx | 87 ++++++++++++++----------------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 890ab4e..c97271f 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -23,26 +23,33 @@ export const TransactionButton = () => {
   const [unsignedTransaction, setUnsignedTransaction] = useState<CLS.Transaction | null>(null);
   const { wallet, connected, name, connect, disconnect } = useWallet();
   const [signature, setsignature] = useState<string>("");
-  const [isPartOfSigners, setIsPartOfSigners] = useState(false);
-  const [isOneVote, setIsOneVote] = useState(false);
-  const [hasCertificates, setHasCertificates] = useState(true);
-  const [isSameNetwork, setIsSameNetwork] = useState(false);
-  const [hasICCCredentials, setHasICCCredentials] = useState(false);
-  const [isInOutputPlutusData , setIsInOutputPlutusData] = useState(false); 
   const [voteChoice, setvoteChoice] = useState<string>();
   const [voteID, setVoteID] = useState<string>();
   const [cardanoscan, setCardanoscan] = useState<string>();
   const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>();
   const [metadataAnchorHash, setMetadataAnchorHash] = useState<string>();
-
+  const [validationState, setValidationState] = useState({
+    isPartOfSigners: false,
+    isOneVote: false,
+    hasCertificates: true,
+    isSameNetwork: false,
+    hasICCCredentials: false,
+    isInOutputPlutusData: false,
+  });
+  const resetValidationState = () => {
+    setValidationState((prev) => ({
+      ...prev,
+      isPartOfSigners: false,
+      isOneVote: false,
+      hasCertificates: true,
+      isSameNetwork: false,
+      hasICCCredentials: false,
+      isInOutputPlutusData: false,
+    }));
+  };
   const checkTransaction = async () => {
     if (!connected) {
-      setIsPartOfSigners(false);
-      setIsOneVote(false);
-      setHasCertificates(true);
-      setIsSameNetwork(false);
-      setHasICCCredentials(false);
-      setIsInOutputPlutusData(false);
+      resetValidationState();
       setvoteChoice("");
       setVoteID("");
       return setMessage("Please connect your wallet first.");
@@ -70,14 +77,18 @@ export const TransactionButton = () => {
       const hasOneVote = txValidationUtils.hasOneVoteOnTransaction(transactionBody);
       const vote = voting_procedures[0].votes[0].voting_procedure.vote;
 
-      //wallet needs to sign
-      txValidationUtils.isPartOfSigners(transactionBody, stakeCred).then((result) => {
-        setIsPartOfSigners(result);
-      })
-
-      //Check to see if the transaction has one vote
-      setIsOneVote(hasOneVote);
-
+      setValidationState({
+        isPartOfSigners: await txValidationUtils.isPartOfSigners(transactionBody, stakeCred),
+        isOneVote: hasOneVote,
+        hasCertificates: txValidationUtils.hasCertificates(transactionBody),
+        isSameNetwork: txValidationUtils.isSameNetwork(transactionBody, network),
+        hasICCCredentials: txValidationUtils.hasValidICCCredentials(transactionBody, network),
+        isInOutputPlutusData: txValidationUtils.isSignerInPlutusData(transactionBody, stakeCred),
+      });
+  
+      //********************************************Voting Details *********************************************************************/
+      const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
+      
       if (votes && hasOneVote) {
         
         setvoteChoice(vote === 'Yes' ? 'Constitutional' : vote === 'No' ? 'Unconstitutional' : 'Abstain');
@@ -85,18 +96,7 @@ export const TransactionButton = () => {
         setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);
         setMetadataAnchorHash(votes[0].voting_procedure.anchor?.anchor_data_hash);
       }
-      // Check to see if the transactions has any certificates in it
-      setHasCertificates(txValidationUtils.hasCertificates(transactionBody));
-      //Same network
-      setIsSameNetwork(txValidationUtils.isSameNetwork(transactionBody, network));
-      //Is Intersect CC credential
-      setHasICCCredentials( txValidationUtils.hasValidICCCredentials(transactionBody, network));
-      //check if signer is in plutus data
-      setIsInOutputPlutusData(txValidationUtils.isSignerInPlutusData(transactionBody, stakeCred));
 
-      //********************************************Voting Details *********************************************************************/
-      const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
-      
       if (transactionNetworkID === 0) {
         setCardanoscan("https://preprod.cardanoscan.io/govAction/");
       } else if (transactionNetworkID === 1) {
@@ -111,9 +111,9 @@ export const TransactionButton = () => {
   };
  
   const signTransaction = async () => {
-    console.log("isPartOfSigners:", isPartOfSigners);
+    console.log("isPartOfSigners:", validationState.isPartOfSigners);
     try {
-      if (isPartOfSigners) {
+      if (validationState.isPartOfSigners) {
         const signedTx = await wallet.signTx(unsignedTransactionHex, true);
         console.log("Transaction signed successfully:", signedTx);
 
@@ -158,12 +158,7 @@ export const TransactionButton = () => {
           value={unsignedTransactionHex}
           onChange={(e) => {
             setUnsignedTransactionHex(e.target.value);
-            setIsPartOfSigners(false);
-            setIsOneVote(false);
-            setHasCertificates(true);
-            setIsSameNetwork(false);
-            setHasICCCredentials(false);
-            setIsInOutputPlutusData(false);
+            resetValidationState();
             setvoteChoice("");
             setVoteID("");
           }}
@@ -186,12 +181,12 @@ export const TransactionButton = () => {
 
         {unsignedTransaction && (
             <TransactionChecks
-            isPartOfSigners={isPartOfSigners}
-            isOneVote={isOneVote}
-            hasCertificates={hasCertificates}
-            isSameNetwork={isSameNetwork}
-            hasICCCredentials={hasICCCredentials}
-            isInOutputPlutusData={isInOutputPlutusData}
+            isPartOfSigners={validationState.isPartOfSigners}
+            isOneVote={validationState.isOneVote}
+            hasCertificates={validationState.hasCertificates}
+            isSameNetwork={validationState.isSameNetwork}
+            hasICCCredentials={validationState.hasICCCredentials}
+            isInOutputPlutusData={validationState.isInOutputPlutusData}
           />
         )}
         <Typography variant="h6" sx={{ mt: 3 }}>

From 40e7055f08e73091429073c7a8bcdb15f847f308 Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 16:59:36 +0000
Subject: [PATCH 19/22] Rename variable for better readability

---
 src/app/components/transaction.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index c97271f..0bd08ff 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -24,7 +24,7 @@ export const TransactionButton = () => {
   const { wallet, connected, name, connect, disconnect } = useWallet();
   const [signature, setsignature] = useState<string>("");
   const [voteChoice, setvoteChoice] = useState<string>();
-  const [voteID, setVoteID] = useState<string>();
+  const [govActionID, setgovActionID] = useState<string>();
   const [cardanoscan, setCardanoscan] = useState<string>();
   const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>();
   const [metadataAnchorHash, setMetadataAnchorHash] = useState<string>();
@@ -51,7 +51,7 @@ export const TransactionButton = () => {
     if (!connected) {
       resetValidationState();
       setvoteChoice("");
-      setVoteID("");
+      setgovActionID("");
       return setMessage("Please connect your wallet first.");
     }
     try{
@@ -92,7 +92,7 @@ export const TransactionButton = () => {
       if (votes && hasOneVote) {
         
         setvoteChoice(vote === 'Yes' ? 'Constitutional' : vote === 'No' ? 'Unconstitutional' : 'Abstain');
-        setVoteID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
+        setgovActionID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
         setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);
         setMetadataAnchorHash(votes[0].voting_procedure.anchor?.anchor_data_hash);
       }
@@ -160,7 +160,7 @@ export const TransactionButton = () => {
             setUnsignedTransactionHex(e.target.value);
             resetValidationState();
             setvoteChoice("");
-            setVoteID("");
+            setgovActionID("");
           }}
         />
         <Button
@@ -201,8 +201,8 @@ export const TransactionButton = () => {
                     Governance Action ID{" "}
                   </TableCell>
                   <TableCell>
-                    <a href={`${cardanoscan}${voteID}`} target="_blank">
-                      {voteID}
+                    <a href={`${cardanoscan}${govActionID}`} target="_blank">
+                      {govActionID}
                     </a>
                   </TableCell>
                 </TableRow>

From 5747c34a36d58c49853b695666d7940cfc56ffbb Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Thu, 6 Feb 2025 18:34:11 +0000
Subject: [PATCH 20/22] Refactoring logic into modular functions

---
 src/app/components/transaction.tsx | 44 ++++++++++--------------------
 src/app/utils/txUtils.ts           | 33 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 0bd08ff..635c1a0 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -3,13 +3,13 @@
 import { useState,useEffect } from "react";
 import { useWallet } from "@meshsdk/react";
 import { BlockfrostProvider, deserializeAddress } from "@meshsdk/core";
-import { Button, TextField, Box, Typography, Container, Table, TableBody, TableCell, TableContainer, TableRow, Paper } from "@mui/material";
+import { Button, TextField, Box, Typography, Container, Table, TableBody, TableCell, TableContainer, TableRow, Paper, Link } from "@mui/material";
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
 import dotevn from "dotenv";
 import * as txValidationUtils from "../utils/txValidationUtils";
 import { TransactionChecks } from "./validationChecks";
-import { decodeHextoTx,convertGAToBech } from "../utils/txUtils";
+import { decodeHextoTx,convertGAToBech,getCardanoScanURL,openInNewTab } from "../utils/txUtils";
 
 dotevn.config();
 
@@ -89,20 +89,19 @@ export const TransactionButton = () => {
       //********************************************Voting Details *********************************************************************/
       const transactionNetworkID = transactionBody.outputs().get(0).address().to_bech32().startsWith("addr_test1") ? 0 : 1;
       
+      
       if (votes && hasOneVote) {
         
+        const govActionID = convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index);
         setvoteChoice(vote === 'Yes' ? 'Constitutional' : vote === 'No' ? 'Unconstitutional' : 'Abstain');
-        setgovActionID(convertGAToBech(votes[0].action_id.transaction_id, votes[0].action_id.index));
-        setmetadataAnchorURL(votes[0].voting_procedure.anchor?.anchor_url);
-        setMetadataAnchorHash(votes[0].voting_procedure.anchor?.anchor_data_hash);
-      }
-
-      if (transactionNetworkID === 0) {
-        setCardanoscan("https://preprod.cardanoscan.io/govAction/");
-      } else if (transactionNetworkID === 1) {
-        setCardanoscan("https://cardanoscan.io/govAction/");
+        setgovActionID(govActionID);
+        if(!votes[0].voting_procedure.anchor) throw new Error("Vote has no anchor.");
+        setmetadataAnchorURL(votes[0].voting_procedure.anchor.anchor_url);
+        setMetadataAnchorHash(votes[0].voting_procedure.anchor.anchor_data_hash);
+        setCardanoscan(getCardanoScanURL(govActionID,transactionNetworkID));
       }
 
+      
     }
     catch (error) {
       console.error("Error validating transaction:", error);
@@ -180,13 +179,7 @@ export const TransactionButton = () => {
         </Typography>
 
         {unsignedTransaction && (
-            <TransactionChecks
-            isPartOfSigners={validationState.isPartOfSigners}
-            isOneVote={validationState.isOneVote}
-            hasCertificates={validationState.hasCertificates}
-            isSameNetwork={validationState.isSameNetwork}
-            hasICCCredentials={validationState.hasICCCredentials}
-            isInOutputPlutusData={validationState.isInOutputPlutusData}
+            <TransactionChecks {...validationState}
           />
         )}
         <Typography variant="h6" sx={{ mt: 3 }}>
@@ -201,7 +194,7 @@ export const TransactionButton = () => {
                     Governance Action ID{" "}
                   </TableCell>
                   <TableCell>
-                    <a href={`${cardanoscan}${govActionID}`} target="_blank">
+                    <a href={`${cardanoscan}`} target="_blank">
                       {govActionID}
                     </a>
                   </TableCell>
@@ -217,19 +210,12 @@ export const TransactionButton = () => {
                     Metadata Anchor URL
                   </TableCell>
                   <TableCell>
-                    <a
-                      href={
-                        metadataAnchorURL?.startsWith("https://") || metadataAnchorURL?.startsWith("http://")
-                        ? metadataAnchorURL
-                        : metadataAnchorURL?.startsWith("ipfs")
-                        ? "https://" + NEXT_PUBLIC_REST_IPFS_GATEWAY + metadataAnchorURL?.slice(7)
-                        : "https://" + metadataAnchorURL
-                      }
-                      target="_blank"
+                    <Link
+                      onClick={() => openInNewTab(metadataAnchorURL||"")}
                       style={{ color: "blue", textDecoration: "underline" }}
                     >
                       {metadataAnchorURL}
-                    </a>
+                    </Link>
                   </TableCell>
                 </TableRow>
                 <TableRow>
diff --git a/src/app/utils/txUtils.ts b/src/app/utils/txUtils.ts
index b666bda..f3d3ba5 100644
--- a/src/app/utils/txUtils.ts
+++ b/src/app/utils/txUtils.ts
@@ -1,5 +1,8 @@
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import { deserializeAddress } from "@meshsdk/core";
+import dotevn from "dotenv";
+dotevn.config();
+const NEXT_PUBLIC_REST_IPFS_GATEWAY=process.env.NEXT_PUBLIC_REST_IPFS_GATEWAY;
 
 /**
  * Decodes a transaction from a hex string to a CardanoSerializationLib Transaction object.
@@ -30,3 +33,33 @@ export const convertGAToBech = (gaTxHash : string, gaTxIndex : number) => {
   // return bech32 encoded GA ID
   return bech32.encode("gov_action", Buffer.from(gaTxHash+indexHex, 'hex')).toString();
 }
+
+/**
+ * Get the CardanoScan URL for a given Bech32 string which can be an address or a gov id.
+ * @param bech32 Bech32 string.
+ * @param txNetworkID Network ID of the transaction.
+ * @returns URL of the CardanoScan page.
+ */
+export const getCardanoScanURL = (bech32String: string, networkID: number): string => {
+  const baseURL = networkID === 0 ? "https://preprod.cardanoscan.io/" : "https://cardanoscan.io/";
+  const isAddress = bech32String.startsWith("addr");
+  const isGovAction = bech32String.startsWith("gov_action");
+  if (isAddress) {
+    return `${baseURL}address/${bech32String}`;
+  } else if (isGovAction) {
+    console.log('CardanoScan URL:'+`${baseURL}govAction/${bech32String}`);
+    return `${baseURL}govAction/${bech32String}`;
+  }
+  return "";
+};
+
+export const openInNewTab = (url: string) => {
+  // Ensure the URL is absolute
+  const fullUrl =
+    url.startsWith("http://") || url.startsWith("https://")
+      ? url
+      : url.startsWith("ipfs")
+      ? "https://" + NEXT_PUBLIC_REST_IPFS_GATEWAY + url?.slice(7)
+      : "https://" + url;
+  window.open(fullUrl, "_blank", "noopener,noreferrer");
+};
\ No newline at end of file

From 60fefb16cd0516c2877271b6ceaa892fc2ef8b9b Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Fri, 7 Feb 2025 18:02:29 +0000
Subject: [PATCH 21/22] Split voting detalis from transaction file

---
 src/app/components/transaction.tsx   | 70 +++++++---------------------
 src/app/components/votingDetails.tsx | 62 ++++++++++++++++++++++++
 src/app/page.tsx                     |  3 ++
 3 files changed, 81 insertions(+), 54 deletions(-)
 create mode 100644 src/app/components/votingDetails.tsx

diff --git a/src/app/components/transaction.tsx b/src/app/components/transaction.tsx
index 635c1a0..b6f9a02 100644
--- a/src/app/components/transaction.tsx
+++ b/src/app/components/transaction.tsx
@@ -2,19 +2,14 @@
 
 import { useState,useEffect } from "react";
 import { useWallet } from "@meshsdk/react";
-import { BlockfrostProvider, deserializeAddress } from "@meshsdk/core";
+import { deserializeAddress } from "@meshsdk/core";
 import { Button, TextField, Box, Typography, Container, Table, TableBody, TableCell, TableContainer, TableRow, Paper, Link } from "@mui/material";
 import * as CLS from "@emurgo/cardano-serialization-lib-browser";
 import ReactJsonPretty from 'react-json-pretty';
-import dotevn from "dotenv";
 import * as txValidationUtils from "../utils/txValidationUtils";
 import { TransactionChecks } from "./validationChecks";
-import { decodeHextoTx,convertGAToBech,getCardanoScanURL,openInNewTab } from "../utils/txUtils";
-
-dotevn.config();
-
-const NEXT_PUBLIC_REST_IPFS_GATEWAY=process.env.NEXT_PUBLIC_REST_IPFS_GATEWAY;
-
+import { decodeHextoTx,convertGAToBech,getCardanoScanURL} from "../utils/txUtils";
+import { VotingDetails } from "./votingDetails";
 
 
 export const TransactionButton = () => {
@@ -23,11 +18,11 @@ export const TransactionButton = () => {
   const [unsignedTransaction, setUnsignedTransaction] = useState<CLS.Transaction | null>(null);
   const { wallet, connected, name, connect, disconnect } = useWallet();
   const [signature, setsignature] = useState<string>("");
-  const [voteChoice, setvoteChoice] = useState<string>();
-  const [govActionID, setgovActionID] = useState<string>();
-  const [cardanoscan, setCardanoscan] = useState<string>();
-  const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>();
-  const [metadataAnchorHash, setMetadataAnchorHash] = useState<string>();
+  const [voteChoice, setvoteChoice] = useState<string>("");
+  const [govActionID, setgovActionID] = useState<string>("");
+  const [cardanoscan, setCardanoscan] = useState<string>("");
+  const [metadataAnchorURL, setmetadataAnchorURL] = useState<string>("");
+  const [metadataAnchorHash, setMetadataAnchorHash] = useState<string>("");
   const [validationState, setValidationState] = useState({
     isPartOfSigners: false,
     isOneVote: false,
@@ -186,47 +181,13 @@ export const TransactionButton = () => {
           Voting Details
         </Typography>
         {unsignedTransaction && (
-          <TableContainer sx={{ mb: 3 }}>
-            <Table sx={{ mt: 3 }}>
-              <TableBody>
-                <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>
-                    Governance Action ID{" "}
-                  </TableCell>
-                  <TableCell>
-                    <a href={`${cardanoscan}`} target="_blank">
-                      {govActionID}
-                    </a>
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>
-                    Vote Choice{" "}
-                  </TableCell>
-                  <TableCell>{voteChoice}</TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>
-                    Metadata Anchor URL
-                  </TableCell>
-                  <TableCell>
-                    <Link
-                      onClick={() => openInNewTab(metadataAnchorURL||"")}
-                      style={{ color: "blue", textDecoration: "underline" }}
-                    >
-                      {metadataAnchorURL}
-                    </Link>
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell sx={{ fontWeight: "bold" }}>
-                    Metadata Anchor Hash
-                  </TableCell>
-                  <TableCell>{metadataAnchorHash}</TableCell>
-                </TableRow>
-              </TableBody>
-            </Table>
-          </TableContainer>
+          <VotingDetails
+            govActionID={govActionID}
+            voteChoice={voteChoice}
+            cardanoscan={cardanoscan}
+            metadataAnchorURL={metadataAnchorURL}
+            metadataAnchorHash={metadataAnchorHash}
+          />
         )}
         <Box
           sx={{
@@ -291,6 +252,7 @@ export const TransactionButton = () => {
           {message}
         </Typography>
       )}
+     
     </Container>
   );
 };
\ No newline at end of file
diff --git a/src/app/components/votingDetails.tsx b/src/app/components/votingDetails.tsx
new file mode 100644
index 0000000..9bcd29a
--- /dev/null
+++ b/src/app/components/votingDetails.tsx
@@ -0,0 +1,62 @@
+import {Table, TableBody, TableCell, TableContainer, TableRow, Paper, Link } from "@mui/material";
+import { openInNewTab } from "../utils/txUtils";
+
+interface VotingDetailsProps {
+    govActionID: string;
+    voteChoice: string;
+    cardanoscan: string;   
+    metadataAnchorURL: string;
+    metadataAnchorHash: string;
+}
+
+export const VotingDetails = ({ 
+    govActionID, 
+    voteChoice, 
+    cardanoscan, 
+    metadataAnchorURL, 
+    metadataAnchorHash 
+}: VotingDetailsProps) => {
+    return (
+        <TableContainer sx={{ mb: 3 }}>
+<Table sx={{ mt: 3 }}>
+  <TableBody>
+    <TableRow>
+      <TableCell sx={{ fontWeight: "bold" }}>
+        Governance Action ID{" "}
+      </TableCell>
+      <TableCell >
+        <a href={`${cardanoscan}`} target="_blank" style={{ color: 'blue', textDecoration: 'underline' }}>
+          {govActionID}
+        </a>
+      </TableCell>
+    </TableRow>
+    <TableRow>
+      <TableCell sx={{ fontWeight: "bold" }}>
+        Vote Choice{" "}
+      </TableCell>
+      <TableCell>{voteChoice}</TableCell>
+    </TableRow>
+    <TableRow>
+      <TableCell sx={{ fontWeight: "bold" }}>
+        Metadata Anchor URL
+      </TableCell>
+      <TableCell>
+        <Link
+          onClick={() => openInNewTab(metadataAnchorURL||"")}
+          style={{ color: "blue", textDecoration: "underline" }}
+        >
+          {metadataAnchorURL}
+        </Link>
+      </TableCell>
+    </TableRow>
+    <TableRow>
+      <TableCell sx={{ fontWeight: "bold" }}>
+        Metadata Anchor Hash
+      </TableCell>
+      <TableCell>{metadataAnchorHash}</TableCell>
+    </TableRow>
+  </TableBody>
+</Table>
+</TableContainer>
+    );
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index c92df0f..d746f63 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -41,8 +41,11 @@ export default function Home() {
         <Box display="flex" flexDirection="column" alignItems="center" width="100%">
           <Wallet />
           <TransactionButton />
+          
         </Box>
+        <Typography sx={{ alignSelf: "center-end", mt: "auto"}}>Version 1.1 - IntersectMBO</Typography>
       </Container>
+      
     </Box>
   );
 }

From 8b2ea7e3b8c49539727e7b68b3b793cca094156f Mon Sep 17 00:00:00 2001
From: Elena Bardho <ebardho17@epoka.edu.al>
Date: Fri, 7 Feb 2025 18:15:56 +0000
Subject: [PATCH 22/22] Fix bg from re-rendering

---
 src/app/globals.css | 11 +++++++++++
 src/app/page.tsx    | 13 +------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index b5c61c9..a24ed5e 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -1,3 +1,14 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+.background-container {
+    background-image: url('/background.png');
+    background-size: cover;
+    background-position: center;
+    min-height: 100vh;
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    padding: 2rem;
+  }
\ No newline at end of file
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d746f63..4ebf61e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,18 +6,7 @@ import Image from "next/image";
 
 export default function Home() {
   return (
-    <Box
-      sx={{
-        backgroundImage: 'url(/background.png)',  
-        backgroundSize: 'cover',  
-        backgroundPosition: 'center',  
-        minHeight: '100vh',  
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'flex-start',
-        padding: 2,
-      }}
-    >
+    <Box className="background-container">
 
 
       <Container maxWidth="md" sx={{ display: "flex",  backgroundColor: "white", flexDirection: "column", alignItems: "center", justifyContent: "flex-start", minHeight: "100vh" , padding: 2}}>