pot

Author: johnnyd-eth

src/locales/messages.pot

@@ -4499,6 +4499,9 @@ msgstr ""
 msgid "Project contracts"
 msgstr ""
 
+msgid "Chain"
+msgstr ""
+
 msgid "Failed to update project metadata"
 msgstr ""
 

src/packages/v4/components/ProjectDashboard/V4PayRedeemCard/PayProjectModal/hooks/usePayProjectModal/usePayProjectTx.ts

@@ -1,14 +1,14 @@
-import { DEFAULT_METADATA, NATIVE_TOKEN } from 'juice-sdk-core'
+import { DEFAULT_METADATA, NATIVE_TOKEN, readJbDirectoryPrimaryTerminalOf } from 'juice-sdk-core'
 import {
   JBChainId,
   useJBChainId,
   useJBContractContext,
   useJBRulesetContext,
   usePreparePayMetadata,
-  useWriteJbMultiTerminalPay,
+  useWriteJbMultiTerminalPay
 } from 'juice-sdk-react'
 import { useCallback, useContext, useMemo } from 'react'
-import { Address, Hash, parseEther } from 'viem'
+import { Address, Hash, parseEther, zeroAddress } from 'viem'
 
 import { waitForTransactionReceipt } from '@wagmi/core'
 import { TxHistoryContext } from 'contexts/Transaction/TxHistoryContext'
@@ -128,6 +128,11 @@ export const usePayProjectTx = ({
         return
       }
 
+      const terminalAddress = await readJbDirectoryPrimaryTerminalOf(wagmiConfig, {
+        chainId,
+        args: [projectId ?? 0n, NATIVE_TOKEN],
+      })
+
       const { messageString, attachedUrl } = values.message
       const memo = buildPaymentMemo({
         text: messageString,
@@ -158,15 +163,11 @@ export const usePayProjectTx = ({
       //   functionName: 'pay',
       //   args,
       // })
+      
       try {
         const hash = await writePay({
           chainId,
-          address: contracts.primaryNativeTerminal.data, 
-          // v4TODO Q: shouldnt above be:
-          // useReadJbDirectoryPrimaryTerminalOf({
-          //   chainId: selectedChainId,
-          //   args: [projectId, NATIVE_TOKEN],
-          // })   ???
+          address: terminalAddress ?? zeroAddress, 
           args,
           value: weiAmount,
         })

src/packages/v4/hooks/useUsedPayoutLimitOf.ts

@@ -1,10 +1,10 @@
 import { NATIVE_CURRENCY_ID, NATIVE_TOKEN } from 'juice-sdk-core'
 import {
   JBChainId,
-  useJBContractContext,
   useJBRulesetContext,
   useJBTerminalContext,
-  useReadJbTerminalStoreUsedPayoutLimitOf,
+  useReadJbDirectoryPrimaryTerminalOf,
+  useReadJbTerminalStoreUsedPayoutLimitOf
 } from 'juice-sdk-react'
 
 import { zeroAddress } from 'viem'
@@ -17,19 +17,19 @@ export const useUsedPayoutLimitOf = ({
   projectId: bigint | undefined
 }) => {
   const { store } = useJBTerminalContext()
-  const { contracts } = useJBContractContext()
   const { ruleset } = useJBRulesetContext()
 
+  const { data: terminalAddress } = useReadJbDirectoryPrimaryTerminalOf({
+    chainId,
+    args: [projectId ?? 0n, NATIVE_TOKEN],
+  })
+
   const { data: usedPayoutLimit, isLoading } =
     useReadJbTerminalStoreUsedPayoutLimitOf({
       address: store.data ?? undefined,
       chainId,
       args: [
-        contracts.primaryNativeTerminal.data ?? zeroAddress, // v4TODO: should be below?
-        // useReadJbDirectoryPrimaryTerminalOf({
-          //   chainId: selectedChainId,
-          //   args: [projectId, NATIVE_TOKEN],
-          // })  
+        terminalAddress ?? zeroAddress, 
         projectId ?? 0n,
         NATIVE_TOKEN,
         BigInt(ruleset.data?.cycleNumber ?? 0),

src/packages/v4/hooks/useV4BalanceOfNativeTerminal.ts

@@ -1,26 +1,26 @@
 import {
   JBChainId,
-  useJBContractContext,
   useJBTerminalContext,
-  useReadJbTerminalStoreBalanceOf,
+  useReadJbDirectoryPrimaryTerminalOf,
+  useReadJbTerminalStoreBalanceOf
 } from 'juice-sdk-react';
 
 import { NATIVE_TOKEN } from 'juice-sdk-core';
 import { zeroAddress } from 'viem';
 
 export const useV4BalanceOfNativeTerminal = ({ chainId, projectId }: { chainId: JBChainId | undefined, projectId: bigint | undefined }) => {
   const { store } = useJBTerminalContext();
-  const { contracts } = useJBContractContext();
+
+  const { data: terminalAddress } = useReadJbDirectoryPrimaryTerminalOf({
+    chainId,
+    args: [projectId ?? 0n, NATIVE_TOKEN],
+  })
 
   const { data: treasuryBalance, isLoading } = useReadJbTerminalStoreBalanceOf({
     address: store.data ?? undefined,
     chainId,
     args: [
-      contracts.primaryNativeTerminal.data ?? zeroAddress, // is this right, or should be below?
-      // useReadJbDirectoryPrimaryTerminalOf({
-          //   chainId,
-          //   args: [projectId, NATIVE_TOKEN],
-          // }) 
+      terminalAddress ?? zeroAddress,
       projectId ?? 0n,
       NATIVE_TOKEN,
     ],