more merp

jbx-protocol · Dec 8, 2024 · 94d0ead · 94d0ead
1 parent 30bc3d4
commit 94d0ead
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 46 deletions.
diff --git a/package.json b/package.json
@@ -106,8 +106,8 @@
     "graphql": "^16.8.1",
     "he": "^1.2.0",
     "jsonwebtoken": "^9.0.0",
-    "juice-sdk-core": "^11.5.0-alpha",
-    "juice-sdk-react": "^11.6.0-alpha",
+    "juice-sdk-core": "^11.6.0-alpha",
+    "juice-sdk-react": "^11.7.1-alpha",
     "juicebox-metadata-helper": "0.1.7",
     "less": "4.1.2",
     "lodash": "^4.17.21",

diff --git a/src/hooks/Wallet/hooks/useChainUnsupported.ts b/src/hooks/Wallet/hooks/useChainUnsupported.ts
@@ -1,13 +1,13 @@
 import { useSetChain } from '@web3-onboard/react'
 import { readNetwork } from 'constants/networks'
-import { useCurrentRouteChainId } from 'packages/v4/hooks/useCurrentRouteChainId'
+import { useJBChainId } from 'juice-sdk-react'
 import { useMemo } from 'react'
 
 export function useChainUnsupported() {
   const [{ connectedChain }] = useSetChain()
 
   // get v4 chain id
-  const chainId = useCurrentRouteChainId()
+  const chainId = useJBChainId()
 
   const chainUnsupported = useMemo(() => {
     if (!connectedChain) {

diff --git a/src/packages/v4/contexts/V4SettingsProvider.tsx b/src/packages/v4/contexts/V4SettingsProvider.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'next/router'
 import { Provider } from 'react-redux'
 import store from 'redux/store'
 import { WagmiProvider } from 'wagmi'
-import { chainNameMap } from '../utils/networks'
+import { useCurrentRouteChainId } from '../hooks/useCurrentRouteChainId'
 import { EditCycleFormProvider } from '../views/V4ProjectSettings/EditCyclePage/EditCycleFormContext'
 import { wagmiConfig } from '../wagmiConfig'
 import { V4NftRewardsProvider } from './V4NftRewards/V4NftRewardsProvider'
@@ -16,13 +16,13 @@ export const V4SettingsProvider: React.FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const router = useRouter()
+  const chainId = useCurrentRouteChainId()
 
-  const { projectId: rawProjectId, chainName } = router.query
+  const { projectId: rawProjectId } = router.query
   if (!rawProjectId) return null
 
   const projectId = parseInt(rawProjectId as string)
   const projectIdBigInt = BigInt(projectId)
-  const chainId = chainNameMap[chainName as string]
 
   return (
     <AppWrapper hideNav>
@@ -38,9 +38,7 @@ export const V4SettingsProvider: React.FC<React.PropsWithChildren> = ({
             <V4ProjectMetadataProvider projectId={projectIdBigInt}>
               <Provider store={store}>
                 <TransactionProvider>
-                  <EditCycleFormProvider>
-                    {children}
-                  </EditCycleFormProvider>
+                  <EditCycleFormProvider>{children}</EditCycleFormProvider>
                 </TransactionProvider>
               </Provider>
             </V4ProjectMetadataProvider>

diff --git a/src/packages/v4/hooks/useCurrentRouteChainId.ts b/src/packages/v4/hooks/useCurrentRouteChainId.ts
@@ -4,9 +4,6 @@ import { chainNameMap } from '../utils/networks'
 export function useCurrentRouteChainId() {
   const router = useRouter()
   const { chainName } = router.query
-  if (!chainName) {
-    return undefined
-  }
 
   return chainNameMap[chainName as string]
 }
diff --git a/src/packages/v4/views/V4ProjectDashboard/V4ProjectHeader.tsx b/src/packages/v4/views/V4ProjectDashboard/V4ProjectHeader.tsx
@@ -10,10 +10,10 @@ import { SocialLinkButton } from 'components/Project/ProjectHeader/SocialLinkBut
 // import { Subtitle } from 'components/Project/ProjectHeader/Subtitle'
 import { TruncatedText } from 'components/TruncatedText'
 import useMobile from 'hooks/useMobile'
+import { useJBChainId } from 'juice-sdk-react'
 import Link from 'next/link'
 import { ProjectHeaderPopupMenu } from 'packages/v4/components/ProjectDashboard/components/ProjectHeaderPopupMenu'
 import V4ProjectHandleLink from 'packages/v4/components/V4ProjectHandleLink'
-import { useCurrentRouteChainId } from 'packages/v4/hooks/useCurrentRouteChainId'
 import { useV4WalletHasPermission } from 'packages/v4/hooks/useV4WalletHasPermission'
 import { V4OperatorPermission } from 'packages/v4/models/v4Permissions'
 import { settingsPagePath, v4ProjectRoute } from 'packages/v4/utils/routes'
@@ -25,7 +25,7 @@ export type SocialLink = 'twitter' | 'discord' | 'telegram' | 'website'
 
 export const V4ProjectHeader = ({ className }: { className?: string }) => {
   const socialLinks = useSocialLinks()
-  const chainId = useCurrentRouteChainId()
+  const chainId = useJBChainId()
 
   const {
     title,
@@ -130,11 +130,7 @@ export const V4ProjectHeader = ({ className }: { className?: string }) => {
                 {gnosisSafe && projectId && (
                   <GnosisSafeBadge
                     safe={gnosisSafe}
-                    href={
-                      chainId
-                        ? `${v4ProjectRoute({ projectId, chainId })}/safe`
-                        : undefined
-                    }
+                    href={`${v4ProjectRoute({ projectId, chainId })}/safe`}
                   />
                 )}
               </span>

diff --git a/src/packages/v4/views/V4ProjectDashboard/V4ProjectTabs/V4TokensPanel/V4TokensPanel.tsx b/src/packages/v4/views/V4ProjectDashboard/V4ProjectTabs/V4TokensPanel/V4TokensPanel.tsx
@@ -214,10 +214,14 @@ const ProjectTokenCard = () => {
           {canCreateErc20Token ? (
             <Tooltip title={ISSUE_ERC20_EXPLANATION}>
               <a
-                href={`${v4ProjectRoute({
-                  chainId,
-                  projectId,
-                })}/settings/createerc20`}
+                href={
+                  chainId
+                    ? `${v4ProjectRoute({
+                        chainId,
+                        projectId,
+                      })}/settings/createerc20`
+                    : ''
+                }
               >
                 <Button size="small" icon={<SettingOutlined />} type="link">
                   <span>

diff --git a/src/packages/v4/views/V4ProjectSettings/ProjectSettingsLayout.tsx b/src/packages/v4/views/V4ProjectSettings/ProjectSettingsLayout.tsx
@@ -1,15 +1,14 @@
 import { Cog6ToothIcon, XMarkIcon } from '@heroicons/react/24/solid'
 import { Trans } from '@lingui/macro'
-import { useJBContractContext } from 'juice-sdk-react'
+import { useJBChainId, useJBContractContext } from 'juice-sdk-react'
 import Link from 'next/link'
-import { useCurrentRouteChainId } from 'packages/v4/hooks/useCurrentRouteChainId'
 import { v4ProjectRoute } from 'packages/v4/utils/routes'
 
 export const ProjectSettingsLayout: React.FC<React.PropsWithChildren> = ({
   children,
 }) => {
   const { projectId } = useJBContractContext()
-  const chainId = useCurrentRouteChainId()
+  const chainId = useJBChainId()
 
   return (
     <>
@@ -21,11 +20,7 @@ export const ProjectSettingsLayout: React.FC<React.PropsWithChildren> = ({
           </h1>
 
           <Link
-            href={
-              chainId
-                ? v4ProjectRoute({ projectId: Number(projectId), chainId })
-                : undefined
-            }
+            href={v4ProjectRoute({ projectId: Number(projectId), chainId })}
             className="text-secondary"
           >
             <XMarkIcon className="h-6 w-6" />

diff --git a/src/packages/v4/views/V4ProjectSettings/hooks/useSettingsPagePath.ts b/src/packages/v4/views/V4ProjectSettings/hooks/useSettingsPagePath.ts
@@ -1,13 +1,10 @@
-import { useJBContractContext } from 'juice-sdk-react'
-import { useCurrentRouteChainId } from 'packages/v4/hooks/useCurrentRouteChainId'
+import { useJBChainId, useJBContractContext } from 'juice-sdk-react'
 import { settingsPagePath } from 'packages/v4/utils/routes'
 import { SettingsPageKey } from '../ProjectSettingsDashboard'
+
 export function useSettingsPagePath(key?: SettingsPageKey) {
   const { projectId } = useJBContractContext()
-  const chainId = useCurrentRouteChainId()
-  if (!chainId) {
-    return undefined
-  }
+  const chainId = useJBChainId()
 
   return settingsPagePath({ projectId: Number(projectId), chainId }, key)
 }
diff --git a/yarn.lock b/yarn.lock
@@ -12187,18 +12187,18 @@ jsx-ast-utils@^3.3.5:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-juice-sdk-core@^11.5.0-alpha:
-  version "11.5.0-alpha"
-  resolved "https://registry.yarnpkg.com/juice-sdk-core/-/juice-sdk-core-11.5.0-alpha.tgz#40ae9e4a44a86dc74777842bb18b30ae36373344"
-  integrity sha512-0T/v1OHsG99tO/Zo5pY1tbJzKjh0KB4bEMLAnJSRNOeb6hAKiS77xgcth22uYRRpZc4OLZWFjszR+FC2dAKQUg==
+juice-sdk-core@^11.6.0-alpha:
+  version "11.6.0-alpha"
+  resolved "https://registry.yarnpkg.com/juice-sdk-core/-/juice-sdk-core-11.6.0-alpha.tgz#10f8e5a1a76dcebd04efd7ddb41cac14579b8848"
+  integrity sha512-rQlcDLCklIOWJ7/M9pE2AP1nU8/ca9oOu+MAa1mpCB36zHMg1YHh2dcgJtmda1wDK1I7dnqvcHbVMyYyVf8nqw==
   dependencies:
     bs58 "^5.0.0"
     fpnum "^1.0.0"
 
-juice-sdk-react@^11.6.0-alpha:
-  version "11.6.0-alpha"
-  resolved "https://registry.yarnpkg.com/juice-sdk-react/-/juice-sdk-react-11.6.0-alpha.tgz#5ddc6a42f2586ed3b694bde5b8ad76b9ad788b9c"
-  integrity sha512-9ji5COnA0aaqXQOnqbqpohaOXPE7tTNz9J9FlA2d4jG9wlXjYDJrpCAB42g1p1Ojvel6zsLLzuY7aT25UrYFjg==
+juice-sdk-react@^11.7.1-alpha:
+  version "11.7.1-alpha"
+  resolved "https://registry.yarnpkg.com/juice-sdk-react/-/juice-sdk-react-11.7.1-alpha.tgz#47f34a44adb415738a32d0484718e0a32eab8e3d"
+  integrity sha512-ILWXbLBgN7KXbFA+0bSavPceYrmo0C/FiOpQKA6h0HLXj8Eu4Qrj4GG5jwcegPSQrGjR49vCQhmMMP0KGCXKbQ==
 
 juice@^10.0.0:
   version "10.0.0"