fix: provide account id leverage to other hooks

Author: dalechyn

.changeset/swift-buttons-hug.md

@@ -0,0 +1,5 @@
+---
+"@abstract-money/react": patch
+---
+
+Provide account id leverage to other wallet account hooks

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

@@ -0,0 +1,22 @@
+import { AccountId } from '@abstract-money/core'
+import { MutationOptions } from '@tanstack/react-query'
+
+export function parseParameters<
+  TOptions extends Omit<MutationOptions<any, any, any, any>, 'mutationFn'>,
+  TResult extends {
+    accountId: AccountId | undefined
+    options: TOptions | undefined
+    passesAccountId: boolean
+  },
+>(
+  arg1: { accountId: AccountId | undefined } | TOptions | undefined,
+  arg2: TOptions | undefined,
+) {
+  if (Object.hasOwnProperty.call(arg1, 'accountId'))
+    return { ...arg1, options: arg2, passesAccountId: true } as TResult
+  return {
+    accountId: undefined,
+    options: arg1,
+    passesAccountId: false,
+  } as TResult
+}

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

@@ -1,35 +1,15 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
 import {
-  MutationOptions,
   UseMutationOptions,
   UseMutationResult,
   useMutation,
 } from '@tanstack/react-query'
 import { useAccountId, useConfig } from '../../../contexts'
+import { parseParameters } from '../utils'
 
 type DepositMutation = Parameters<AccountWalletClient['deposit']>[0]
 
-function parseParameters<
-  TOptions extends Omit<MutationOptions<any, any, any, any>, 'mutationFn'>,
-  TResult extends {
-    accountId: AccountId | undefined
-    options: TOptions | undefined
-    passesAccountId: boolean
-  },
->(
-  arg1: { accountId: AccountId | undefined } | TOptions | undefined,
-  arg2: TOptions | undefined,
-) {
-  if (Object.hasOwnProperty.call(arg1, 'accountId'))
-    return { ...arg1, options: arg2, passesAccountId: true } as TResult
-  return {
-    accountId: undefined,
-    options: arg1,
-    passesAccountId: false,
-  } as TResult
-}
-
 export function useDeposit(
   { accountId }: { accountId: AccountId | undefined },
   options?: Omit<

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

@@ -1,7 +1,12 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
-import { UseMutationOptions, useMutation } from '@tanstack/react-query'
-import { useConfig } from '../../../contexts'
+import {
+  UseMutationOptions,
+  UseMutationResult,
+  useMutation,
+} from '@tanstack/react-query'
+import { useAccountId, useConfig } from '../../../contexts'
+import { parseParameters } from '../utils'
 
 type ExecuteMutation = Parameters<AccountWalletClient['execute']>[0]
 
@@ -11,7 +16,27 @@ export function useExecute(
     UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
     'mutationFn'
   >,
+): UseMutationResult<DeliverTxResponse, unknown, ExecuteMutation>
+export function useExecute(
+  options?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
+    'mutationFn'
+  >,
+): UseMutationResult<DeliverTxResponse, unknown, ExecuteMutation>
+export function useExecute(
+  arg1?:
+    | { accountId: AccountId | undefined }
+    | Omit<
+        UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
+        'mutationFn'
+      >,
+  arg2?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, ExecuteMutation>,
+    'mutationFn'
+  >,
 ) {
+  const { accountId: accountIdParameter, options } = parseParameters(arg1, arg2)
+  const { accountId } = useAccountId({ accountId: accountIdParameter })
   const config = useConfig()
   const accountWalletClient = config.useAccountWalletClient({
     chainName: accountId?.chainName,

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

@@ -1,18 +1,46 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
 import { DeliverTxResponse } from '@cosmjs/stargate'
-import { UseMutationOptions, useMutation } from '@tanstack/react-query'
-import { useConfig } from '../../../contexts'
+import {
+  UseMutationOptions,
+  UseMutationResult,
+  useMutation,
+} from '@tanstack/react-query'
+import { useAccountId, useConfig } from '../../../contexts'
+import { parseParameters } from '../utils'
 
 type WithdrawMutation = Parameters<AccountWalletClient['withdraw']>[0]
 
+export function useWithdraw(
+  { accountId }: { accountId: AccountId | undefined },
+  options?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+    'mutationFn'
+  >,
+): UseMutationResult<DeliverTxResponse, unknown, WithdrawMutation>
+export function useWithdraw(
+  options?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+    'mutationFn'
+  >,
+): UseMutationResult<DeliverTxResponse, unknown, WithdrawMutation>
 /**
  * Hook to withdraw to an Account.
  * @param options withdraw options.
  */
 export function useWithdraw(
-  { accountId }: { accountId: AccountId | undefined },
-  options?: UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+  arg1?:
+    | { accountId: AccountId | undefined }
+    | Omit<
+        UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+        'mutationFn'
+      >,
+  arg2?: Omit<
+    UseMutationOptions<DeliverTxResponse, unknown, WithdrawMutation>,
+    'mutationFn'
+  >,
 ) {
+  const { accountId: accountIdParameter, options } = parseParameters(arg1, arg2)
+  const { accountId } = useAccountId({ accountId: accountIdParameter })
   const config = useConfig()
   const accountWalletClient = config.useAccountWalletClient({
     chainName: accountId?.chainName,