From 5457d052c720e921e4305cf7e9b44500a0bc0f81 Mon Sep 17 00:00:00 2001
From: Guillermo Bescos <g.bescos@yahoo.com>
Date: Wed, 24 May 2023 11:32:34 -0500
Subject: [PATCH 1/2] Make proposer server url a serverside prop

---
 .../xc_admin/packages/proposer_server/src/index.ts   |  2 +-
 .../components/PermissionDepermissionKey.tsx         |  4 +++-
 .../xc_admin_frontend/components/tabs/General.tsx    |  6 ++++--
 .../packages/xc_admin_frontend/pages/index.tsx       | 12 ++++++++++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/governance/xc_admin/packages/proposer_server/src/index.ts b/governance/xc_admin/packages/proposer_server/src/index.ts
index 7e299d2e43..23508de096 100644
--- a/governance/xc_admin/packages/proposer_server/src/index.ts
+++ b/governance/xc_admin/packages/proposer_server/src/index.ts
@@ -20,7 +20,7 @@ import { getPythClusterApiUrl, PythCluster } from "@pythnetwork/client";
 import SquadsMesh from "@sqds/mesh";
 import NodeWallet from "@coral-xyz/anchor/dist/cjs/nodewallet";
 
-const PORT: number = Number(process.env.PORT ?? "3000");
+const PORT: number = Number(process.env.PORT ?? "4000");
 const KEYPAIR: Keypair = Keypair.fromSecretKey(
   Uint8Array.from(JSON.parse(fs.readFileSync(envOrErr("WALLET"), "ascii")))
 );
diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
index fb32fae8d5..2965caab09 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
@@ -31,10 +31,12 @@ const PermissionDepermissionKey = ({
   isPermission,
   pythProgramClient,
   squads,
+  PROPOSER_SERVER_URL,
 }: {
   isPermission: boolean
   pythProgramClient?: Program<PythOracle>
   squads?: SquadsMesh
+  PROPOSER_SERVER_URL: string
 }) => {
   const [publisherKey, setPublisherKey] = useState(
     'JTmFx5zX9mM94itfk2nQcJnQQDPjcv4UPD7SYj6xDCV'
@@ -105,7 +107,7 @@ const PermissionDepermissionKey = ({
       setIsSubmitButtonLoading(true)
       try {
         const response = await axios.post(
-          process.env.NEXT_PUBLIC_PROPOSER_SERVER_URL + '/api/propose',
+          PROPOSER_SERVER_URL + '/api/propose',
           { instructions, cluster }
         )
         const { proposalPubkey } = response.data
diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index 53a6a77722..3c8d532281 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -25,7 +25,7 @@ import Spinner from '../common/Spinner'
 import Loadbar from '../loaders/Loadbar'
 import PermissionDepermissionKey from '../PermissionDepermissionKey'
 
-const General = () => {
+const General = ({ PROPOSER_SERVER_URL }: { PROPOSER_SERVER_URL: string }) => {
   const [data, setData] = useState<any>({})
   const [dataChanges, setDataChanges] = useState<Record<string, any>>()
   const [existingSymbols, setExistingSymbols] = useState<Set<string>>(new Set())
@@ -466,7 +466,7 @@ const General = () => {
       setIsSendProposalButtonLoading(true)
       try {
         const response = await axios.post(
-          process.env.NEXT_PUBLIC_PROPOSER_SERVER_URL + '/api/propose',
+          PROPOSER_SERVER_URL + '/api/propose',
           { instructions, cluster }
         )
         const { proposalPubkey } = response.data
@@ -767,11 +767,13 @@ const General = () => {
             isPermission={true}
             pythProgramClient={pythProgramClient}
             squads={proposeSquads}
+            PROPOSER_SERVER_URL={PROPOSER_SERVER_URL}
           />
           <PermissionDepermissionKey
             isPermission={false}
             pythProgramClient={pythProgramClient}
             squads={proposeSquads}
+            PROPOSER_SERVER_URL={PROPOSER_SERVER_URL}
           />
         </div>
         <div className="relative mt-6">
diff --git a/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx b/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
index 3797f7cf89..7395ea1295 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
@@ -46,8 +46,11 @@ export const getServerSideProps: GetServerSideProps = async () => {
       )
     : {}
 
+  const PROPOSER_SERVER_URL =
+    process.env.PROPOSER_SERVER_URL || 'http://localhost:4000'
   return {
     props: {
+      PROPOSER_SERVER_URL,
       publisherKeyToNameMapping,
       multisigSignerKeyToNameMapping,
     },
@@ -77,7 +80,12 @@ const DEFAULT_TAB = 'general'
 const Home: NextPage<{
   publisherKeyToNameMapping: Record<string, Record<string, string>>
   multisigSignerKeyToNameMapping: Record<string, string>
-}> = ({ publisherKeyToNameMapping, multisigSignerKeyToNameMapping }) => {
+  PROPOSER_SERVER_URL: string
+}> = ({
+  publisherKeyToNameMapping,
+  multisigSignerKeyToNameMapping,
+  PROPOSER_SERVER_URL,
+}) => {
   const [currentTabIndex, setCurrentTabIndex] = useState(0)
   const tabInfoArray = Object.values(TAB_INFO)
   const anchorWallet = useAnchorWallet()
@@ -143,7 +151,7 @@ const Home: NextPage<{
           </div>
           {tabInfoArray[currentTabIndex].queryString ===
           TAB_INFO.General.queryString ? (
-            <General />
+            <General PROPOSER_SERVER_URL={PROPOSER_SERVER_URL} />
           ) : tabInfoArray[currentTabIndex].queryString ===
             TAB_INFO.UpdatePermissions.queryString ? (
             <UpdatePermissions />

From fae6efdb3ec132add39d7313b71da55a38671d01 Mon Sep 17 00:00:00 2001
From: Guillermo Bescos <g.bescos@yahoo.com>
Date: Wed, 24 May 2023 14:27:00 -0500
Subject: [PATCH 2/2] Make low caps

---
 .../components/PermissionDepermissionKey.tsx       | 12 ++++++------
 .../xc_admin_frontend/components/tabs/General.tsx  | 14 +++++++-------
 .../packages/xc_admin_frontend/pages/index.tsx     | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
index 2965caab09..9b39bbbcc4 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx
@@ -31,12 +31,12 @@ const PermissionDepermissionKey = ({
   isPermission,
   pythProgramClient,
   squads,
-  PROPOSER_SERVER_URL,
+  proposerServerUrl,
 }: {
   isPermission: boolean
   pythProgramClient?: Program<PythOracle>
   squads?: SquadsMesh
-  PROPOSER_SERVER_URL: string
+  proposerServerUrl: string
 }) => {
   const [publisherKey, setPublisherKey] = useState(
     'JTmFx5zX9mM94itfk2nQcJnQQDPjcv4UPD7SYj6xDCV'
@@ -106,10 +106,10 @@ const PermissionDepermissionKey = ({
       }
       setIsSubmitButtonLoading(true)
       try {
-        const response = await axios.post(
-          PROPOSER_SERVER_URL + '/api/propose',
-          { instructions, cluster }
-        )
+        const response = await axios.post(proposerServerUrl + '/api/propose', {
+          instructions,
+          cluster,
+        })
         const { proposalPubkey } = response.data
         toast.success(`Proposal sent! 🚀 Proposal Pubkey: ${proposalPubkey}`)
         setIsSubmitButtonLoading(false)
diff --git a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
index 3c8d532281..73303d40bd 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx
@@ -25,7 +25,7 @@ import Spinner from '../common/Spinner'
 import Loadbar from '../loaders/Loadbar'
 import PermissionDepermissionKey from '../PermissionDepermissionKey'
 
-const General = ({ PROPOSER_SERVER_URL }: { PROPOSER_SERVER_URL: string }) => {
+const General = ({ proposerServerUrl }: { proposerServerUrl: string }) => {
   const [data, setData] = useState<any>({})
   const [dataChanges, setDataChanges] = useState<Record<string, any>>()
   const [existingSymbols, setExistingSymbols] = useState<Set<string>>(new Set())
@@ -465,10 +465,10 @@ const General = ({ PROPOSER_SERVER_URL }: { PROPOSER_SERVER_URL: string }) => {
 
       setIsSendProposalButtonLoading(true)
       try {
-        const response = await axios.post(
-          PROPOSER_SERVER_URL + '/api/propose',
-          { instructions, cluster }
-        )
+        const response = await axios.post(proposerServerUrl + '/api/propose', {
+          instructions,
+          cluster,
+        })
         const { proposalPubkey } = response.data
         toast.success(`Proposal sent! 🚀 Proposal Pubkey: ${proposalPubkey}`)
         setIsSendProposalButtonLoading(false)
@@ -767,13 +767,13 @@ const General = ({ PROPOSER_SERVER_URL }: { PROPOSER_SERVER_URL: string }) => {
             isPermission={true}
             pythProgramClient={pythProgramClient}
             squads={proposeSquads}
-            PROPOSER_SERVER_URL={PROPOSER_SERVER_URL}
+            proposerServerUrl={proposerServerUrl}
           />
           <PermissionDepermissionKey
             isPermission={false}
             pythProgramClient={pythProgramClient}
             squads={proposeSquads}
-            PROPOSER_SERVER_URL={PROPOSER_SERVER_URL}
+            proposerServerUrl={proposerServerUrl}
           />
         </div>
         <div className="relative mt-6">
diff --git a/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx b/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
index 7395ea1295..9f557f5901 100644
--- a/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
+++ b/governance/xc_admin/packages/xc_admin_frontend/pages/index.tsx
@@ -46,11 +46,11 @@ export const getServerSideProps: GetServerSideProps = async () => {
       )
     : {}
 
-  const PROPOSER_SERVER_URL =
+  const proposerServerUrl =
     process.env.PROPOSER_SERVER_URL || 'http://localhost:4000'
   return {
     props: {
-      PROPOSER_SERVER_URL,
+      proposerServerUrl,
       publisherKeyToNameMapping,
       multisigSignerKeyToNameMapping,
     },
@@ -80,11 +80,11 @@ const DEFAULT_TAB = 'general'
 const Home: NextPage<{
   publisherKeyToNameMapping: Record<string, Record<string, string>>
   multisigSignerKeyToNameMapping: Record<string, string>
-  PROPOSER_SERVER_URL: string
+  proposerServerUrl: string
 }> = ({
   publisherKeyToNameMapping,
   multisigSignerKeyToNameMapping,
-  PROPOSER_SERVER_URL,
+  proposerServerUrl,
 }) => {
   const [currentTabIndex, setCurrentTabIndex] = useState(0)
   const tabInfoArray = Object.values(TAB_INFO)
@@ -151,7 +151,7 @@ const Home: NextPage<{
           </div>
           {tabInfoArray[currentTabIndex].queryString ===
           TAB_INFO.General.queryString ? (
-            <General PROPOSER_SERVER_URL={PROPOSER_SERVER_URL} />
+            <General proposerServerUrl={proposerServerUrl} />
           ) : tabInfoArray[currentTabIndex].queryString ===
             TAB_INFO.UpdatePermissions.queryString ? (
             <UpdatePermissions />