rename squads to walletsquads

Author: guibescos

governance/xc_admin/packages/xc_admin_frontend/components/PermissionDepermissionKey.tsx

@@ -37,12 +37,12 @@ const assetTypes = [
 const PermissionDepermissionKey = ({
   isPermission,
   pythProgramClient,
-  squads,
+  readOnlySquads,
   proposerServerUrl,
 }: {
   isPermission: boolean
   pythProgramClient?: Program<PythOracle>
-  squads?: SquadsMesh
+  readOnlySquads: SquadsMesh
   proposerServerUrl: string
 }) => {
   const [publisherKey, setPublisherKey] = useState(
@@ -74,9 +74,9 @@ const PermissionDepermissionKey = ({
   }
 
   const handleSubmitButton = async () => {
-    if (pythProgramClient && squads) {
+    if (pythProgramClient) {
       const instructions: TransactionInstruction[] = []
-      const multisigAuthority = squads.getAuthorityPDA(
+      const multisigAuthority = readOnlySquads.getAuthorityPDA(
         PRICE_FEED_MULTISIG[getMultisigCluster(cluster)],
         1
       )

governance/xc_admin/packages/xc_admin_frontend/components/tabs/General.tsx

@@ -899,13 +899,13 @@ const General = ({ proposerServerUrl }: { proposerServerUrl: string }) => {
           <PermissionDepermissionKey
             isPermission={true}
             pythProgramClient={pythProgramClient}
-            squads={readOnlySquads}
+            readOnlySquads={readOnlySquads}
             proposerServerUrl={proposerServerUrl}
           />
           <PermissionDepermissionKey
             isPermission={false}
             pythProgramClient={pythProgramClient}
-            squads={readOnlySquads}
+            readOnlySquads={readOnlySquads}
             proposerServerUrl={proposerServerUrl}
           />
         </div>

governance/xc_admin/packages/xc_admin_frontend/components/tabs/Proposals/Proposal.tsx

@@ -179,7 +179,7 @@ export const Proposal = ({
       : contextCluster
 
   const {
-    squads,
+    walletSquads: squads,
     isLoading: isMultisigLoading,
     refreshData,
     readOnlySquads,

governance/xc_admin/packages/xc_admin_frontend/components/tabs/UpdatePermissions.tsx

@@ -110,7 +110,7 @@ const UpdatePermissions = () => {
   const [isSendProposalButtonLoading, setIsSendProposalButtonLoading] =
     useState(false)
   const { cluster } = useContext(ClusterContext)
-  const { isLoading: isMultisigLoading, squads } = useMultisigContext()
+  const { isLoading: isMultisigLoading, walletSquads } = useMultisigContext()
   const { rawConfig, dataIsLoading, connection } = usePythContext()
   const { connected } = useWallet()
   const [pythProgramClient, setPythProgramClient] =
@@ -239,12 +239,12 @@ const UpdatePermissions = () => {
   }
 
   const handleSendProposalButtonClick = () => {
-    if (pythProgramClient && finalPubkeyChanges && squads) {
+    if (pythProgramClient && finalPubkeyChanges && walletSquads) {
       const programDataAccount = PublicKey.findProgramAddressSync(
         [pythProgramClient?.programId.toBuffer()],
         BPF_UPGRADABLE_LOADER
       )[0]
-      const multisigAuthority = squads.getAuthorityPDA(
+      const multisigAuthority = walletSquads.getAuthorityPDA(
         UPGRADE_MULTISIG[getMultisigCluster(cluster)],
         1
       )
@@ -267,9 +267,9 @@ const UpdatePermissions = () => {
             setIsSendProposalButtonLoading(true)
             try {
               const vault = new MultisigVault(
-                squads.wallet as Wallet,
+                walletSquads.wallet as Wallet,
                 getMultisigCluster(cluster),
-                squads,
+                walletSquads,
                 UPGRADE_MULTISIG[getMultisigCluster(cluster)]
               )
 
@@ -335,17 +335,17 @@ const UpdatePermissions = () => {
 
   // create anchor wallet when connected
   useEffect(() => {
-    if (connected && squads && connection) {
+    if (connected && walletSquads && connection) {
       const provider = new AnchorProvider(
         connection,
-        squads.wallet as Wallet,
+        walletSquads.wallet as Wallet,
         AnchorProvider.defaultOptions()
       )
       setPythProgramClient(
         pythOracleProgram(getPythProgramKeyForCluster(cluster), provider)
       )
     }
-  }, [connection, connected, cluster, squads])
+  }, [connection, connected, cluster, walletSquads])
 
   return (
     <div className="relative">

governance/xc_admin/packages/xc_admin_frontend/contexts/MultisigContext.tsx

@@ -22,7 +22,7 @@ export const MultisigContextProvider: React.FC<
 > = ({ children }) => {
   const {
     isLoading,
-    squads,
+    walletSquads,
     upgradeMultisigAccount,
     priceFeedMultisigAccount,
     upgradeMultisigProposals,
@@ -39,13 +39,13 @@ export const MultisigContextProvider: React.FC<
       upgradeMultisigProposals,
       priceFeedMultisigProposals,
       isLoading,
-      squads,
+      walletSquads,
       refreshData,
       connection,
       readOnlySquads,
     }),
     [
-      squads,
+      walletSquads,
       isLoading,
       upgradeMultisigAccount,
       priceFeedMultisigAccount,

governance/xc_admin/packages/xc_admin_frontend/hooks/useMultisig.ts

@@ -15,7 +15,7 @@ import { deriveWsUrl, pythClusterApiUrls } from '../utils/pythClusterApiUrl'
 
 export interface MultisigHookData {
   isLoading: boolean
-  squads: SquadsMesh | undefined
+  walletSquads: SquadsMesh | undefined
   readOnlySquads: SquadsMesh
   upgradeMultisigAccount: MultisigAccount | undefined
   priceFeedMultisigAccount: MultisigAccount | undefined
@@ -26,10 +26,10 @@ export interface MultisigHookData {
 }
 
 const getSortedProposals = async (
-  squads: SquadsMesh,
+  readOnlySquads: SquadsMesh,
   vault: PublicKey
 ): Promise<TransactionAccount[]> => {
-  const proposals = await getProposals(squads, vault)
+  const proposals = await getProposals(readOnlySquads, vault)
   return proposals.sort((a, b) => b.transactionIndex - a.transactionIndex)
 }
 
@@ -71,7 +71,7 @@ export const useMultisig = (): MultisigHookData => {
     })
   }, [connection])
 
-  const squads = useMemo(() => {
+  const walletSquads = useMemo(() => {
     if (!wallet) return undefined
     return new SquadsMesh({
       connection,
@@ -143,7 +143,7 @@ export const useMultisig = (): MultisigHookData => {
 
   return {
     isLoading,
-    squads,
+    walletSquads,
     readOnlySquads,
     upgradeMultisigAccount,
     priceFeedMultisigAccount,