fix vsr transition withdraw warning (#1946)

solana-labs · Nov 23, 2023 · 20d0a1a · 20d0a1a · vercel · Nov 23, 2023
1 parent 7d5892c
commit 20d0a1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/components/GovernancePower/GovernancePowerForRole.tsx b/components/GovernancePower/GovernancePowerForRole.tsx
@@ -10,6 +10,8 @@ import VanillaVotingPower from './Vanilla/VanillaVotingPower'
 import { Deposit } from './Vanilla/Deposit'
 import { useUserCommunityTokenOwnerRecord } from '@hooks/queries/tokenOwnerRecord'
 import { ExclamationIcon } from '@heroicons/react/solid'
+import { VSR_PLUGIN_PKS } from '@constants/plugins'
+import { useRealmConfigQuery } from '@hooks/queries/realmConfig'
 
 export default function GovernancePowerForRole({
   role,
@@ -21,10 +23,16 @@ export default function GovernancePowerForRole({
 }) {
   const { connection } = useConnection()
   const realmPk = useSelectedRealmPubkey()
+  const config = useRealmConfigQuery().data?.result
 
   const ownTokenRecord = useUserCommunityTokenOwnerRecord().data?.result
   //if dao transited to use plugin and some users have still deposited tokens they should withdraw before
   //depositing to plugin
+  const isVsr =
+    config?.account?.communityTokenConfig?.voterWeightAddin &&
+    VSR_PLUGIN_PKS.includes(
+      config?.account?.communityTokenConfig?.voterWeightAddin?.toBase58()
+    )
   const didWithdrawFromVanillaSetup =
     !ownTokenRecord ||
     ownTokenRecord.account.governingTokenDepositAmount.isZero()
@@ -52,7 +60,7 @@ export default function GovernancePowerForRole({
           <div>
             <VanillaVotingPower role="community" {...props} />
             <Deposit role="community" />
-            {!didWithdrawFromVanillaSetup && (
+            {isVsr && !didWithdrawFromVanillaSetup && (
               <small className="flex items-center mt-3 text-xs">
                 <ExclamationIcon className="w-5 h-5 mr-2"></ExclamationIcon>
                 Please withdraw your tokens and deposit again to get governance

diff --git a/components/TokenBalance/TokenDeposit.tsx b/components/TokenBalance/TokenDeposit.tsx
@@ -290,9 +290,9 @@ export const TokenDeposit = ({
       ? availableTokens
       : 0
   const isVsr =
-    config?.account.communityTokenConfig.voterWeightAddin &&
+    config?.account?.communityTokenConfig?.voterWeightAddin &&
     VSR_PLUGIN_PKS.includes(
-      config?.account.communityTokenConfig.voterWeightAddin.toBase58()
+      config?.account?.communityTokenConfig?.voterWeightAddin?.toBase58()
     ) &&
     tokenRole === GoverningTokenRole.Community