feat: force a user to pass accountId in account hooks

Author: dalechyn

.changeset/silent-suits-yell.md

@@ -0,0 +1,5 @@
+---
+"@abstract-money/react": patch
+---
+
+Force a user to always pass accountId in account related hooks.

packages/react/src/hooks/account/utils.ts

@@ -1,44 +1,25 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
-import {
-  UseMutationOptions,
-  UseMutationResult,
-  useMutation,
-} from '@tanstack/react-query'
-import { useAccountId, useConfig } from '../../../contexts'
-import { parseAccountIdArgs } from '../utils'
+import { UseMutationOptions, useMutation } from '@tanstack/react-query'
+import { useConfig } from '../../../contexts'
 
 type DepositMutation = Parameters<AccountWalletClient['deposit']>[0]
 
-export function useDeposit(
-  options?: Omit<
-    UseMutationOptions<DeliverTxResponse, unknown, DepositMutation>,
-    'mutationFn'
-  >,
-): UseMutationResult<DeliverTxResponse, unknown, DepositMutation>
-export function useDeposit(
-  abstractOptions: { accountId: AccountId | undefined },
-  options?: Omit<
-    UseMutationOptions<DeliverTxResponse, unknown, DepositMutation>,
-    'mutationFn'
-  >,
-): UseMutationResult<DeliverTxResponse, unknown, DepositMutation>
 /**
  * Hook to deposit assets to an Account.
  * @param options deposit options.
  */
 export function useDeposit(
-  arg1:
-    | { accountId: AccountId | undefined }
-    | UseMutationOptions<DeliverTxResponse, unknown, DepositMutation>
-    | undefined,
-  arg2?: UseMutationOptions<DeliverTxResponse, unknown, DepositMutation>,
+  { accountId }: { accountId: AccountId | undefined },
+  options?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, DepositMutation>,
+    'mutationFn'
+  >,
 ) {
-  const { accountId, options } = parseAccountIdArgs(arg1, arg2)
   const config = useConfig()
-  const { accountId: finalAccountId } = useAccountId({ accountId })
   const accountWalletClient = config.useAccountWalletClient({
-    chainName: finalAccountId?.chainName,
+    accountId,
+    chainName: accountId?.chainName,
   })
   return useMutation(({ ...rest }) => {
     if (!accountWalletClient) throw new Error('client is not defined')

packages/react/src/hooks/account/wallet/use-deposit.ts

@@ -1,40 +1,20 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
-import {
-  UseMutationOptions,
-  UseMutationResult,
-  useMutation,
-} from '@tanstack/react-query'
-import { useAccountId, useConfig } from '../../../contexts'
-import { parseAccountIdArgs } from '../utils'
+import { UseMutationOptions, useMutation } from '@tanstack/react-query'
+import { useConfig } from '../../../contexts'
 
 type ExecuteMutation = Parameters<AccountWalletClient['execute']>[0]
 
 export function useExecute(
+  { accountId }: { accountId: AccountId | undefined },
   options?: Omit<
     UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
     'mutationFn'
   >,
-): UseMutationResult<DeliverTxResponse, unknown, ExecuteMutation>
-export function useExecute(
-  abstractOptions: { accountId: AccountId | undefined },
-  options?: Omit<
-    UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
-    'mutationFn'
-  >,
-): UseMutationResult<DeliverTxResponse, unknown, ExecuteMutation>
-export function useExecute(
-  arg1:
-    | { accountId: AccountId | undefined }
-    | UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>
-    | undefined,
-  arg2?: UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
-): UseMutationResult<DeliverTxResponse, unknown, ExecuteMutation> {
-  const { accountId, options } = parseAccountIdArgs(arg1, arg2)
+) {
   const config = useConfig()
-  const { accountId: finalAccountId } = useAccountId({ accountId })
   const accountWalletClient = config.useAccountWalletClient({
-    chainName: finalAccountId?.chainName,
+    chainName: accountId?.chainName,
   })
   return useMutation(({ ...rest }) => {
     if (!accountWalletClient) throw new Error('client is not defined')

packages/react/src/hooks/account/wallet/use-execute.ts

@@ -1,44 +1,21 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
-import {
-  UseMutationOptions,
-  UseMutationResult,
-  useMutation,
-} from '@tanstack/react-query'
-import { useAccountId, useConfig } from '../../../contexts'
-import { parseAccountIdArgs } from '../utils'
+import { UseMutationOptions, useMutation } from '@tanstack/react-query'
+import { useConfig } from '../../../contexts'
 
 type WithdrawMutation = Parameters<AccountWalletClient['withdraw']>[0]
 
-export function useWithdraw(
-  options?: Omit<
-    UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
-    'mutationFn'
-  >,
-): UseMutationResult<DeliverTxResponse, unknown, WithdrawMutation>
-export function useWithdraw(
-  abstractOptions: { accountId: AccountId | undefined },
-  options?: Omit<
-    UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
-    'mutationFn'
-  >,
-): UseMutationResult<DeliverTxResponse, unknown, WithdrawMutation>
 /**
  * Hook to withdraw to an Account.
  * @param options withdraw options.
  */
 export function useWithdraw(
-  arg1:
-    | { accountId: AccountId | undefined }
-    | UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>
-    | undefined,
-  arg2?: UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+  { accountId }: { accountId: AccountId | undefined },
+  options?: UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
 ) {
-  const { accountId, options } = parseAccountIdArgs(arg1, arg2)
   const config = useConfig()
-  const { accountId: finalAccountId } = useAccountId({ accountId })
   const accountWalletClient = config.useAccountWalletClient({
-    chainName: finalAccountId?.chainName,
+    chainName: accountId?.chainName,
   })
   return useMutation(({ ...rest }) => {
     if (!accountWalletClient) throw new Error('client is not defined')