Merge pull request #1435 from DA0-DA0/development

Deploy fixes

apps/dapp/pages/dao/[address]/[[...slug]].tsx

@@ -27,7 +27,7 @@ import {
   useDaoInfoContext,
   useDaoNavHelpers,
 } from '@dao-dao/stateless'
-import { ActionKey, DaoPageMode } from '@dao-dao/types'
+import { ActionKey, DaoPageMode, DaoTabId } from '@dao-dao/types'
 import {
   SITE_URL,
   getDaoPath,
@@ -150,12 +150,16 @@ const InnerDaoHome = () => {
     useFollowingDaos(daoInfo.chainId)
   const following = isFollowing(daoInfo.coreAddress)
 
-  const tabs = useDaoTabs()
-  const firstTabId = tabs[0].id
+  const loadingTabs = useDaoTabs()
+  // Just a type-check because some tabs are loaded at the beginning.
+  const tabs = loadingTabs.loading ? undefined : loadingTabs.data
+  // Default to proposals tab for type-check, but should never happen as some
+  // tabs are loaded at the beginning.
+  const firstTabId = tabs?.[0].id || DaoTabId.Proposals
 
   // Pre-fetch tabs.
   useEffect(() => {
-    tabs.forEach((tab) => {
+    tabs?.forEach((tab) => {
       router.prefetch(getDaoPath(daoInfo.coreAddress, tab.id))
     })
   }, [daoInfo.coreAddress, getDaoPath, router, tabs])
@@ -171,7 +175,7 @@ const InnerDaoHome = () => {
   }, [daoInfo.coreAddress, getDaoPath, router, slug.length, firstTabId])
 
   const tabId =
-    slug.length > 0 && tabs.some(({ id }) => id === slug[0])
+    slug.length > 0 && tabs?.some(({ id }) => id === slug[0])
       ? slug[0]
       : // If tab is invalid, default to first tab.
         firstTabId
@@ -197,7 +201,7 @@ const InnerDaoHome = () => {
       onSelectTabId={onSelectTabId}
       rightSidebarContent={<ProfileDaoHomeCard />}
       selectedTabId={tabId}
-      tabs={tabs}
+      tabs={tabs || []}
     />
   )
 }

apps/sda/pages/[address]/[[...slug]].tsx

@@ -16,20 +16,24 @@ import {
   useDaoInfoContext,
   useDaoNavHelpers,
 } from '@dao-dao/stateless'
-import { DaoPageMode } from '@dao-dao/types'
+import { DaoPageMode, DaoTabId } from '@dao-dao/types'
 import { SITE_URL, getDaoPath } from '@dao-dao/utils'
 
 const DaoHomePage: NextPage = () => {
   const router = useRouter()
   const { coreAddress } = useDaoInfoContext()
   const { getDaoPath } = useDaoNavHelpers()
 
-  const tabs = useDaoTabs()
-  const firstTabId = tabs[0].id
+  const loadingTabs = useDaoTabs()
+  // Just a type-check because some tabs are loaded at the beginning.
+  const tabs = loadingTabs.loading ? undefined : loadingTabs.data
+  // Default to proposals tab for type-check, but should never happen as some
+  // tabs are loaded at the beginning.
+  const firstTabId = tabs?.[0].id || DaoTabId.Proposals
 
   // Pre-fetch tabs.
   useEffect(() => {
-    tabs.forEach((tab) => {
+    tabs?.forEach((tab) => {
       router.prefetch(getDaoPath(coreAddress, tab.id))
     })
   }, [coreAddress, getDaoPath, router, tabs])
@@ -45,15 +49,15 @@ const DaoHomePage: NextPage = () => {
   }, [coreAddress, getDaoPath, router, slug.length, firstTabId])
 
   const selectedTabId =
-    slug.length > 0 && tabs.some(({ id }) => id === slug[0])
+    slug.length > 0 && tabs?.some(({ id }) => id === slug[0])
       ? slug[0]
       : // If tab is invalid, default to first tab.
         firstTabId
 
   return (
     <DaoSdaWrappedTab
       SuspenseLoader={SuspenseLoader}
-      allTabs={tabs}
+      allTabs={tabs || []}
       rightSidebarContent={<ProfileDaoHomeCard />}
       tabId={selectedTabId}
     />

packages/i18n/locales/en/translation.json

@@ -307,6 +307,7 @@
     "counterpartyBalanceInsufficient": "The counterparty's balance of {{amount}} ${{tokenSymbol}} is insufficient. They may be unable to complete this swap.",
     "daoAccountNotFound": "The DAO account could not be found for this chain.",
     "daoAndSubDaosAlreadyOnV2": "This DAO (and all of its SubDAOs, if it has any) have already been upgraded.",
+    "daoCreationIncomplete": "DAO creation is incomplete. Ensure all required fields have been filled out.",
     "daoFeatureUnsupported": "{{name}} does not support {{feature}} yet.",
     "daoIsInactive_absolute_one": "This DAO is inactive. Proposals cannot be created until {{count}} token is staked.",
     "daoIsInactive_absolute_other": "This DAO is inactive. Proposals cannot be created until {{count}} tokens are staked.",
@@ -605,6 +606,7 @@
     "tokenAddress": "Token address",
     "tokenContractAddressTitle": "Token contract address",
     "tokenDefinition": "Token definition",
+    "tokenIdentifier": "Token identifier",
     "tokenInfo": "Token info",
     "tokenInstructions": "Token instructions",
     "tokenSwapCreateInstructions": "In this step, you will create the token swap. This creation step describes how many funds each party needs to send for the swap to complete. <2>No funds will be transferred at this time.</2>",
@@ -1438,7 +1440,6 @@
     "timeRemaining": "Time remaining",
     "title": "Title",
     "token": "Token",
-    "tokenIdentifier": "Token identifier",
     "tokenSwap": "Token Swap",
     "topAbsolute": "Top {{count}}",
     "topPercent": "Top {{percent}}%",

packages/stateful/command/contexts/generic/dao.tsx

@@ -39,7 +39,9 @@ export const makeGenericDaoContext: CommandModalContextMaker<{
     const { t } = useTranslation()
     const { getDaoPath, getDaoProposalPath, router } = useDaoNavHelpers()
     const { coreVersion } = useDaoInfoContext()
-    const tabs = useDaoTabs()
+    const loadingTabs = useDaoTabs({
+      suspendWhileLoadingOverride: false,
+    })
 
     const { isFollowing, setFollowing, setUnfollowing, updatingFollowing } =
       useFollowingDaos(chainId)
@@ -72,7 +74,9 @@ export const makeGenericDaoContext: CommandModalContextMaker<{
     const routes = [
       daoPageHref,
       createProposalHref,
-      ...tabs.map(({ id }) => getDaoPath(coreAddress, id)),
+      ...(loadingTabs.loading
+        ? []
+        : loadingTabs.data.map(({ id }) => getDaoPath(coreAddress, id))),
     ]
     useDeepCompareEffect(() => {
       routes.forEach((url) => router.prefetch(url))
@@ -153,16 +157,19 @@ export const makeGenericDaoContext: CommandModalContextMaker<{
           setNavigatingToHref(href)
         }
       },
-      items: tabs.map(({ id, label, Icon }) => {
-        const href = getDaoPath(coreAddress, id)
-
-        return {
-          name: label,
-          Icon,
-          href,
-          loading: navigatingToHref === href,
+      loading: loadingTabs.loading || loadingTabs.updating,
+      items: (loadingTabs.loading ? [] : loadingTabs.data).map(
+        ({ id, label, Icon }) => {
+          const href = getDaoPath(coreAddress, id)
+
+          return {
+            name: label,
+            Icon,
+            href,
+            loading: navigatingToHref === href,
+          }
         }
-      }),
+      ),
     }
 
     const subDaosSection: CommandModalContextSection<CommandModalDaoInfo> = {
@@ -174,7 +181,7 @@ export const makeGenericDaoContext: CommandModalContextMaker<{
             dao,
           })
         ),
-      loading: subDaosLoading.loading,
+      loading: subDaosLoading.loading || subDaosLoading.updating,
       items: subDaosLoading.loading
         ? []
         : subDaosLoading.data.map(

packages/stateful/components/SdaLayout.tsx

@@ -54,15 +54,15 @@ export const SdaLayout = ({ children }: { children: ReactNode }) => {
     daoCreatedCardPropsAtom
   )
 
-  const tabs = useDaoTabs()
+  const loadingTabs = useDaoTabs()
 
   return (
     <StatelessSdaLayout
       connect={connect}
       connectWalletButton={<ConnectWallet variant="secondary" />}
       connected={isWalletConnected}
       navigationProps={{
-        tabs,
+        tabs: loadingTabs.loading ? [] : loadingTabs.data,
         LinkWrapper,
         version: '2.0',
         compact,