Bugfix for issues when missing instruction forms (solana-labs#1392)

dialectlabs · Feb 12, 2023 · 1bf8daa · 1bf8daa
1 parent e93e83d
commit 1bf8daa
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 0 deletions.
diff --git a/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx b/pages/dao/[symbol]/proposal/components/instructions/CloseTokenAccount.tsx
@@ -232,13 +232,15 @@ const CloseTokenAccount = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/ConfigureGateway.tsx
@@ -143,13 +143,15 @@ const ConfigureGatewayPlugin = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/GatewayPlugin/CreateRegistrar.tsx
@@ -196,13 +196,15 @@ const CreateGatewayPluginRegistrar = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddKeyToDID.tsx
@@ -121,13 +121,15 @@ const AddKeyToDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/AddServiceToDID.tsx
@@ -115,13 +115,15 @@ const AddServiceToDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveKeyFromDID.tsx
@@ -106,13 +106,15 @@ const RemoveKeyFromDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx b/pages/dao/[symbol]/proposal/components/instructions/Identity/RemoveServiceFromDID.tsx
@@ -108,13 +108,15 @@ const RemoveServiceFromDID = ({
 
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/ConfigureCollection.tsx
@@ -170,13 +170,15 @@ const ConfigureNftPluginCollection = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/.../[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx b/.../[symbol]/proposal/components/instructions/NftVotingPlugin/CreateMaxVoterWeightRecord.tsx
@@ -106,13 +106,15 @@ const CreateNftPluginMaxVoterWeightRecord = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/NftVotingPlugin/CreateRegistrar.tsx
@@ -114,13 +114,15 @@ const CreateNftPluginRegistrar = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx b/pages/dao/[symbol]/proposal/components/instructions/Vsr/CreateRegistrar.tsx
@@ -128,13 +128,15 @@ const CreateVsrRegistrar = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }

diff --git a/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx b/pages/dao/[symbol]/proposal/components/instructions/Vsr/VotingMintConfig.tsx
@@ -270,13 +270,15 @@ const VotingMintConfig = ({
   ]
   return (
     <>
+      {form && (
       <InstructionForm
         outerForm={form}
         setForm={setForm}
         inputs={inputs}
         setFormErrors={setFormErrors}
         formErrors={formErrors}
       ></InstructionForm>
+      )}
     </>
   )
 }