From 105e2e58e181d44247fed72552ea10478d43288c Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Mon, 13 Feb 2023 12:25:18 +0900
Subject: [PATCH 1/6] fix urlsIndex not being reset to 0 when changing cluster

---
 .../xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts b/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
index 092c55b698..93d3e37c30 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
+++ b/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
@@ -59,6 +59,11 @@ const usePyth = (): PythHookData => {
     setError(null)
   }, [urlsIndex, cluster])
 
+
+  useEffect(() => {
+    setUrlsIndex(0)
+  }, [cluster])
+
   useEffect(() => {
     let cancelled = false
     const urls = pythClusterApiUrls(cluster)

From cae2580552f154ffd9976f1690abeea35a502f02 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Mon, 13 Feb 2023 12:25:34 +0900
Subject: [PATCH 2/6] fix proposals accept/reject buttons not centered when on
 mobile view

---
 .../packages/xc_admin_frontend/components/tabs/Proposals.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index c80835620c..48ed96dfd0 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -239,7 +239,7 @@ const Proposal = ({
           </div>
         </div>
         {proposalStatus === 'active' ? (
-          <div className="flex items-center justify-between px-8 pt-3">
+          <div className="flex items-center justify-center space-x-8 pt-3">
             <button
               className="action-btn text-base"
               onClick={handleClickApprove}
@@ -432,7 +432,7 @@ const Proposal = ({
                 </div>
                 <div key={`${index}_data`} className="flex justify-between">
                   <div>Data</div>
-                  <div>
+                  <div className='max-w-sm break-all'>
                     {instruction.instruction.data.length > 0
                       ? instruction.instruction.data.toString('hex')
                       : 'No data'}

From 269c2c0cee8167cb271fa55319e4b31a4a48ac73 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Mon, 13 Feb 2023 13:59:14 +0900
Subject: [PATCH 3/6] add verified tag to individual proposals

---
 .../components/tabs/Proposals.tsx                 | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index 48ed96dfd0..e5a2a56f16 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -1,5 +1,4 @@
 import { BN } from '@coral-xyz/anchor'
-import { useWallet } from '@solana/wallet-adapter-react'
 import { AccountMeta, PublicKey } from '@solana/web3.js'
 import { getIxPDA } from '@sqds/mesh'
 import { MultisigAccount, TransactionAccount } from '@sqds/mesh/lib/types'
@@ -114,6 +113,7 @@ const Proposal = ({
   >([])
   const [isProposalInstructionsLoading, setIsProposalInstructionsLoading] =
     useState(false)
+  const [isVerified, setIsVerified] = useState(false)
   const { cluster } = useContext(ClusterContext)
   const { squads, isLoading: isMultisigLoading } = useMultisigContext()
 
@@ -141,6 +141,9 @@ const Proposal = ({
           })
           proposalIxs.push(parsedInstruction)
         }
+        setIsVerified(
+          !proposalIxs.some((ix) => ix instanceof UnrecognizedProgram)
+        )
         setProposalInstructions(proposalIxs)
         setIsProposalInstructionsLoading(false)
       }
@@ -200,7 +203,12 @@ const Proposal = ({
     !isProposalInstructionsLoading ? (
     <div className="grid grid-cols-3 gap-4">
       <div className="col-span-3 my-2 space-y-4 bg-[#1E1B2F] p-4 lg:col-span-2">
-        <h4 className="h4 font-semibold">Info</h4>
+        <div className="flex justify-between">
+          <h4 className="h4 font-semibold">Info</h4>
+          <div className="flex items-center justify-center rounded-full bg-offPurple py-1 px-2 text-xs">
+            {isVerified ? 'Verified' : 'Unverified'}
+          </div>
+        </div>
         <hr className="border-gray-700" />
         <div className="flex justify-between">
           <div>Status</div>
@@ -432,7 +440,7 @@ const Proposal = ({
                 </div>
                 <div key={`${index}_data`} className="flex justify-between">
                   <div>Data</div>
-                  <div className='max-w-sm break-all'>
+                  <div className="max-w-sm break-all">
                     {instruction.instruction.data.length > 0
                       ? instruction.instruction.data.toString('hex')
                       : 'No data'}
@@ -774,7 +782,6 @@ const Proposals = () => {
     priceFeedMultisigProposals,
     isLoading: isMultisigLoading,
   } = useMultisigContext()
-  const { connected } = useWallet()
 
   const handleClickBackToPriceFeeds = () => {
     delete router.query.proposal

From 70f0d729a8f1c68666b337c4c3438e30c4ea10fd Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Mon, 13 Feb 2023 16:21:41 +0900
Subject: [PATCH 4/6] fix pre-commit error

---
 governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts b/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
index 93d3e37c30..65d043acc4 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
+++ b/governance/xc_admin/packages/xc_admin_frontend/hooks/usePyth.ts
@@ -59,7 +59,6 @@ const usePyth = (): PythHookData => {
     setError(null)
   }, [urlsIndex, cluster])
 
-
   useEffect(() => {
     setUrlsIndex(0)
   }, [cluster])

From 7fea97aa357e96df1a2e4fa524e148509759e053 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Mon, 13 Feb 2023 20:08:06 +0900
Subject: [PATCH 5/6] fix color scheme

---
 .../components/common/CopyPubkey.tsx          |  23 +++
 .../components/tabs/Proposals.tsx             | 142 +++++++++---------
 2 files changed, 98 insertions(+), 67 deletions(-)
 create mode 100644 governance/xc_admin/packages/xc_admin_frontend/components/common/CopyPubkey.tsx

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/common/CopyPubkey.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/common/CopyPubkey.tsx
new file mode 100644
index 0000000000..8e556469dd
--- /dev/null
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/common/CopyPubkey.tsx
@@ -0,0 +1,23 @@
+import copy from 'copy-to-clipboard'
+import CopyIcon from '../../images/icons/copy.inline.svg'
+
+const CopyPubkey: React.FC<{
+  pubkey: string
+}> = ({ pubkey }) => {
+  return (
+    <div
+      className="-ml-1 inline-flex cursor-pointer items-center px-1 hover:bg-dark hover:text-white active:bg-darkGray3"
+      onClick={() => {
+        copy(pubkey)
+      }}
+    >
+      <span className="mr-2 hidden xl:block">{pubkey}</span>
+      <span className="mr-2 xl:hidden">
+        {pubkey.slice(0, 6) + '...' + pubkey.slice(-6)}
+      </span>{' '}
+      <CopyIcon className="shrink-0" />
+    </div>
+  )
+}
+
+export default CopyPubkey
diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index e5a2a56f16..5884073def 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -28,6 +28,7 @@ import { useMultisigContext } from '../../contexts/MultisigContext'
 import CopyIcon from '../../images/icons/copy.inline.svg'
 import { capitalizeFirstLetter } from '../../utils/capitalizeFirstLetter'
 import ClusterSwitch from '../ClusterSwitch'
+import CopyPubkey from '../common/CopyPubkey'
 import Loadbar from '../loaders/Loadbar'
 
 const ProposalRow = ({
@@ -68,17 +69,17 @@ const ProposalRow = ({
         <div
           className={
             status === 'active'
-              ? 'text-[#E6DAFE]'
+              ? 'text-[#15AE6E]'
               : status === 'executed'
-              ? 'text-[#1FC3D7]'
+              ? 'text-[#5EA1EC]'
               : status === 'cancelled'
-              ? 'text-[#FFA7A0]'
+              ? 'text-[#B59938]'
               : status === 'rejected'
-              ? 'text-[#F86B86]'
+              ? 'text-[#C3668E]'
               : ''
           }
         >
-          <strong>{status}</strong>
+          {status}
         </div>
       </div>
     </div>
@@ -205,26 +206,44 @@ const Proposal = ({
       <div className="col-span-3 my-2 space-y-4 bg-[#1E1B2F] p-4 lg:col-span-2">
         <div className="flex justify-between">
           <h4 className="h4 font-semibold">Info</h4>
-          <div className="flex items-center justify-center rounded-full bg-offPurple py-1 px-2 text-xs">
+          <div
+            className={`flex items-center justify-center rounded-full py-1 px-2 text-xs ${
+              isVerified ? 'bg-[#187B51]' : 'bg-[#8D2D41]'
+            }`}
+          >
             {isVerified ? 'Verified' : 'Unverified'}
           </div>
         </div>
         <hr className="border-gray-700" />
         <div className="flex justify-between">
           <div>Status</div>
-          <div>{Object.keys(proposal.status)[0]}</div>
+          <div
+            className={
+              proposalStatus === 'active'
+                ? 'text-[#15AE6E]'
+                : proposalStatus === 'executed'
+                ? 'text-[#5EA1EC]'
+                : proposalStatus === 'cancelled'
+                ? 'text-[#B59938]'
+                : proposalStatus === 'rejected'
+                ? 'text-[#C3668E]'
+                : ''
+            }
+          >
+            {proposalStatus}
+          </div>
         </div>
         <div className="flex justify-between">
           <div>Proposal</div>
-          <div>{proposal.publicKey.toBase58()}</div>
+          <CopyPubkey pubkey={proposal.publicKey.toBase58()} />
         </div>
         <div className="flex justify-between">
           <div>Creator</div>
-          <div>{proposal.creator.toBase58()}</div>
+          <CopyPubkey pubkey={proposal.creator.toBase58()} />
         </div>
         <div className="flex justify-between">
           <div>Multisig</div>
-          <div>{proposal.ms.toBase58()}</div>
+          <CopyPubkey pubkey={proposal.ms.toBase58()} />
         </div>
       </div>
       <div className="col-span-3 my-2 space-y-4 bg-[#1E1B2F] p-4 lg:col-span-1">
@@ -346,15 +365,19 @@ const Proposal = ({
                           className="flex justify-between border-t border-beige-300 py-3"
                         >
                           <div>{key}</div>
-                          <div className="max-w-sm break-all">
-                            {instruction.args[key] instanceof PublicKey
-                              ? instruction.args[key].toBase58()
-                              : typeof instruction.args[key] === 'string'
-                              ? instruction.args[key]
-                              : instruction.args[key] instanceof Uint8Array
-                              ? instruction.args[key].toString('hex')
-                              : JSON.stringify(instruction.args[key])}
-                          </div>
+                          {instruction.args[key] instanceof PublicKey ? (
+                            <CopyPubkey
+                              pubkey={instruction.args[key].toBase58()}
+                            />
+                          ) : (
+                            <div className="max-w-sm break-all">
+                              {typeof instruction.args[key] === 'string'
+                                ? instruction.args[key]
+                                : instruction.args[key] instanceof Uint8Array
+                                ? instruction.args[key].toString('hex')
+                                : JSON.stringify(instruction.args[key])}
+                            </div>
+                          )}
                         </div>
                       ))}
                     </div>
@@ -393,32 +416,11 @@ const Proposal = ({
                               {instruction.accounts.named[key].isWritable ? (
                                 <WritableTag />
                               ) : null}
-                              <div
-                                className="-ml-1 inline-flex cursor-pointer items-center px-1 hover:bg-dark hover:text-white active:bg-darkGray3"
-                                onClick={() => {
-                                  copy(
-                                    instruction.accounts.named[
-                                      key
-                                    ].pubkey.toBase58()
-                                  )
-                                }}
-                              >
-                                <span className="mr-2 hidden xl:block">
-                                  {instruction.accounts.named[
-                                    key
-                                  ].pubkey.toBase58()}
-                                </span>
-                                <span className="mr-2 xl:hidden">
-                                  {instruction.accounts.named[key].pubkey
-                                    .toBase58()
-                                    .slice(0, 6) +
-                                    '...' +
-                                    instruction.accounts.named[key].pubkey
-                                      .toBase58()
-                                      .slice(-6)}
-                                </span>{' '}
-                                <CopyIcon className="shrink-0" />
-                              </div>
+                              <CopyPubkey
+                                pubkey={instruction.accounts.named[
+                                  key
+                                ].pubkey.toBase58()}
+                              />
                             </div>
                           </div>
                         </>
@@ -436,7 +438,9 @@ const Proposal = ({
                   className="flex justify-between"
                 >
                   <div>Program ID</div>
-                  <div>{instruction.instruction.programId.toBase58()}</div>
+                  <CopyPubkey
+                    pubkey={instruction.instruction.programId.toBase58()}
+                  />
                 </div>
                 <div key={`${index}_data`} className="flex justify-between">
                   <div>Data</div>
@@ -560,27 +564,31 @@ const Proposal = ({
                                           className="flex justify-between border-t border-beige-300 py-3"
                                         >
                                           <div>{key}</div>
-                                          <div className="max-w-sm break-all">
-                                            {parsedInstruction.args[
-                                              key
-                                            ] instanceof PublicKey
-                                              ? parsedInstruction.args[
-                                                  key
-                                                ].toBase58()
-                                              : typeof parsedInstruction.args[
-                                                  key
-                                                ] === 'string'
-                                              ? parsedInstruction.args[key]
-                                              : parsedInstruction.args[
-                                                  key
-                                                ] instanceof Uint8Array
-                                              ? parsedInstruction.args[
-                                                  key
-                                                ].toString('hex')
-                                              : JSON.stringify(
-                                                  parsedInstruction.args[key]
-                                                )}
-                                          </div>
+                                          {parsedInstruction.args[
+                                            key
+                                          ] instanceof PublicKey ? (
+                                            <CopyPubkey
+                                              pubkey={parsedInstruction.args[
+                                                key
+                                              ].toBase58()}
+                                            />
+                                          ) : (
+                                            <div className="max-w-sm break-all">
+                                              {typeof parsedInstruction.args[
+                                                key
+                                              ] === 'string'
+                                                ? parsedInstruction.args[key]
+                                                : parsedInstruction.args[
+                                                    key
+                                                  ] instanceof Uint8Array
+                                                ? parsedInstruction.args[
+                                                    key
+                                                  ].toString('hex')
+                                                : JSON.stringify(
+                                                    parsedInstruction.args[key]
+                                                  )}
+                                            </div>
+                                          )}
                                         </div>
                                       )
                                     )}

From 2bf006eb50b7cb08f6c63ab892de98e994655517 Mon Sep 17 00:00:00 2001
From: Daniel Chew <cctdaniel@outlook.com>
Date: Tue, 14 Feb 2023 12:12:39 +0900
Subject: [PATCH 6/6] address comments

---
 .../components/tabs/Proposals.tsx             | 88 ++++++++++++-------
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
index 5884073def..701190f1dc 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals.tsx
@@ -65,22 +65,19 @@ const ProposalRow = ({
       }
     >
       <div className="flex justify-between p-4">
-        <div>{proposal.publicKey.toBase58()}</div>
-        <div
-          className={
-            status === 'active'
-              ? 'text-[#15AE6E]'
-              : status === 'executed'
-              ? 'text-[#5EA1EC]'
-              : status === 'cancelled'
-              ? 'text-[#B59938]'
-              : status === 'rejected'
-              ? 'text-[#C3668E]'
-              : ''
-          }
-        >
-          {status}
+        <div>
+          {' '}
+          <span className="mr-2 hidden sm:block">
+            {proposal.publicKey.toBase58()}
+          </span>
+          <span className="mr-2 sm:hidden">
+            {proposal.publicKey.toBase58().slice(0, 6) +
+              '...' +
+              proposal.publicKey.toBase58().slice(-6)}
+          </span>{' '}
         </div>
+
+        <StatusTag proposalStatus={status} />
       </div>
     </div>
   )
@@ -88,7 +85,7 @@ const ProposalRow = ({
 
 const SignerTag = () => {
   return (
-    <div className="flex items-center justify-center rounded-full bg-darkGray4 py-1 px-2 text-xs">
+    <div className="flex items-center justify-center rounded-full bg-[#605D72] py-1 px-2 text-xs">
       Signer
     </div>
   )
@@ -102,6 +99,26 @@ const WritableTag = () => {
   )
 }
 
+const StatusTag = ({ proposalStatus }: { proposalStatus: string }) => {
+  return (
+    <div
+      className={`flex items-center justify-center rounded-full ${
+        proposalStatus === 'active'
+          ? 'bg-[#3C3299]'
+          : proposalStatus === 'executed'
+          ? 'bg-[#1C1E5D]'
+          : proposalStatus === 'cancelled'
+          ? 'bg-[#C4428F]'
+          : proposalStatus === 'rejected'
+          ? 'bg-[#CF6E42]'
+          : 'bg-pythPurple'
+      } py-1 px-2 text-xs`}
+    >
+      {proposalStatus}
+    </div>
+  )
+}
+
 const Proposal = ({
   proposal,
   multisig,
@@ -143,7 +160,28 @@ const Proposal = ({
           proposalIxs.push(parsedInstruction)
         }
         setIsVerified(
-          !proposalIxs.some((ix) => ix instanceof UnrecognizedProgram)
+          proposalIxs.every(
+            (ix) =>
+              ix instanceof PythMultisigInstruction ||
+              (ix instanceof WormholeMultisigInstruction &&
+                ix.name === 'postMessage' &&
+                ix.governanceAction instanceof ExecutePostedVaa &&
+                ix.governanceAction.instructions.every((remoteIx) => {
+                  const innerMultisigParser = MultisigParser.fromCluster(
+                    getRemoteCluster(cluster)
+                  )
+                  const parsedRemoteInstruction =
+                    innerMultisigParser.parseInstruction({
+                      programId: remoteIx.programId,
+                      data: remoteIx.data as Buffer,
+                      keys: remoteIx.keys as AccountMeta[],
+                    })
+                  return (
+                    parsedRemoteInstruction instanceof PythMultisigInstruction
+                  )
+                }) &&
+                ix.governanceAction.targetChainId === 'pythnet')
+          )
         )
         setProposalInstructions(proposalIxs)
         setIsProposalInstructionsLoading(false)
@@ -217,21 +255,7 @@ const Proposal = ({
         <hr className="border-gray-700" />
         <div className="flex justify-between">
           <div>Status</div>
-          <div
-            className={
-              proposalStatus === 'active'
-                ? 'text-[#15AE6E]'
-                : proposalStatus === 'executed'
-                ? 'text-[#5EA1EC]'
-                : proposalStatus === 'cancelled'
-                ? 'text-[#B59938]'
-                : proposalStatus === 'rejected'
-                ? 'text-[#C3668E]'
-                : ''
-            }
-          >
-            {proposalStatus}
-          </div>
+          <StatusTag proposalStatus={proposalStatus} />
         </div>
         <div className="flex justify-between">
           <div>Proposal</div>