Merge pull request #1438 from DA0-DA0/development

Deploy fix making SubDAOs on the right chain

packages/stateful/components/dao/CreateDaoForm.tsx

@@ -7,7 +7,7 @@ import { useEffect, useMemo, useState } from 'react'
 import { SubmitErrorHandler, SubmitHandler, useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
 import { useTranslation } from 'react-i18next'
-import { useRecoilState, useRecoilValue } from 'recoil'
+import { constSelector, useRecoilState, useRecoilValue } from 'recoil'
 
 import { averageColorSelector, walletChainIdAtom } from '@dao-dao/state/recoil'
 import {
@@ -94,7 +94,11 @@ export interface CreateDaoFormProps {
 }
 
 export const CreateDaoForm = (props: CreateDaoFormProps) => {
-  const chainId = useRecoilValue(walletChainIdAtom)
+  const chainId = useRecoilValue(
+    // If parent DAO exists, we're making a SubDAO, so use the parent DAO's
+    // chain ID.
+    props.parentDao ? constSelector(props.parentDao.chainId) : walletChainIdAtom
+  )
   const config = getSupportedChainConfig(chainId)
   if (!config) {
     throw new Error('Unsupported chain.')
@@ -631,7 +635,7 @@ export const InnerCreateDaoForm = ({
         }}
         className="mx-auto max-w-4xl"
         gradient
-        rightNode={<ChainSwitcher />}
+        rightNode={!makingSubDao && <ChainSwitcher />}
       />
 
       {/* No container padding because we want the gradient to expand. Apply px-6 to children instead. */}

packages/stateful/components/dao/CreateSubDao.tsx

@@ -5,12 +5,20 @@ import { CreateDaoForm } from './CreateDaoForm'
 
 // Wrap the CreateDaoForm to create a SubDao for the current DAO.
 export const CreateSubDao = () => {
-  const { coreAddress, coreVersion, name, imageUrl, parentDao, admin } =
-    useDaoInfoContext()
+  const {
+    chainId,
+    coreAddress,
+    coreVersion,
+    name,
+    imageUrl,
+    parentDao,
+    admin,
+  } = useDaoInfoContext()
 
   return (
     <CreateDaoForm
       parentDao={{
+        chainId,
         coreAddress,
         coreVersion,
         name,

packages/stateful/recoil/selectors/dao/cards.ts

@@ -116,6 +116,7 @@ export const daoCardInfoSelector = selectorFamily<
 
               if (coreVersion) {
                 parentDao = {
+                  chainId,
                   coreAddress: admin,
                   coreVersion,
                   name,
@@ -183,6 +184,7 @@ export const daoCardInfoSelector = selectorFamily<
                     false
 
               parentDao = {
+                chainId,
                 coreAddress: admin,
                 coreVersion: adminVersion,
                 name,
@@ -203,6 +205,7 @@ export const daoCardInfoSelector = selectorFamily<
           // Chain module account.
           const chainConfig = getSupportedChainConfig(chainId)
           parentDao = chainConfig && {
+            chainId,
             coreAddress: chainConfig.name,
             coreVersion: ContractVersion.Gov,
             name: getDisplayNameForChainId(chainId),

packages/stateful/recoil/selectors/dao/misc.ts

@@ -304,6 +304,7 @@ export const daoInfoSelector: (param: {
           // Chain module account.
           const chainConfig = getSupportedChainConfig(chainId)
           parentDaoInfo = chainConfig && {
+            chainId,
             coreAddress: chainConfig.name,
             coreVersion: ContractVersion.Gov,
             name: getDisplayNameForChainId(chainId),
@@ -331,6 +332,7 @@ export const daoInfoSelector: (param: {
         polytoneProxies,
         parentDao: parentDaoInfo
           ? {
+              chainId: parentDaoInfo.chainId,
               coreAddress: parentDaoInfo.coreAddress,
               coreVersion: parentDaoInfo.coreVersion,
               name: parentDaoInfo.name,

packages/stateful/server/makeGetDaoStaticProps.ts

@@ -482,6 +482,7 @@ const loadParentDaoInfo = async (
       const chainConfig = getSupportedChainConfig(chainId)
       return chainConfig
         ? {
+            chainId,
             coreAddress: chainConfig.name,
             coreVersion: ContractVersion.Gov,
             name: getDisplayNameForChainId(chainId),
@@ -512,6 +513,7 @@ const loadParentDaoInfo = async (
     ])
 
     return {
+      chainId,
       coreAddress: potentialParentAddress,
       coreVersion: version,
       name: name,

packages/stateless/components/HorizontalScroller.stories.tsx

@@ -30,6 +30,7 @@ const makeFeaturedDao = (): DaoCardInfo => ({
   tokenDecimals: 6,
 
   parentDao: {
+    chainId: CHAIN_ID,
     coreAddress: 'parent',
     coreVersion: ContractVersion.V2Alpha,
     name: 'parent',

packages/stateless/components/dao/DaoCard.stories.tsx

@@ -1,5 +1,6 @@
 import { ComponentMeta, ComponentStory } from '@storybook/react'
 
+import { CHAIN_ID } from '@dao-dao/storybook'
 import { ContractVersion } from '@dao-dao/types'
 
 import { IconButtonLink } from '../icon_buttons'
@@ -19,7 +20,7 @@ const Template: ComponentStory<typeof DaoCard> = (args) => (
 )
 
 export const makeProps = (id = 1): DaoCardProps => ({
-  chainId: 'uni-6',
+  chainId: CHAIN_ID,
   coreAddress: 'daoCoreAddress',
   name: 'Modern DAO',
   description:
@@ -41,6 +42,7 @@ export const makeProps = (id = 1): DaoCardProps => ({
   },
 
   parentDao: {
+    chainId: CHAIN_ID,
     coreAddress: 'parentDaoCoreAddress',
     coreVersion: ContractVersion.V2Alpha,
     name: 'parent',

packages/types/dao.ts

@@ -52,6 +52,7 @@ export type DaoInfo = {
 }
 
 export type DaoParentInfo = {
+  chainId: string
   coreAddress: string
   coreVersion: ContractVersion
   name: string