Merge pull request #136 from AbstractSDK/adair/fixAccountAddress

Make useAccountAddress return just address
AbstractSDK · Oct 31, 2024 · 4be6f4d · 4be6f4d
2 parents 4198b24 + 34c2fba
commit 4be6f4d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/packages/core/src/actions/account/public/get-account-address-from-registry.ts b/packages/core/src/actions/account/public/get-account-address-from-registry.ts
@@ -27,7 +27,5 @@ export async function getAccountAddressFromRegistry({
     throw new Error(`Account not found: ${accountId}`)
   }
 
-  return {
-    account: accounts[0],
-  }
+  return accounts[0]
 }
diff --git a/packages/core/src/actions/account/public/get-account-query-client-from-api.ts b/packages/core/src/actions/account/public/get-account-query-client-from-api.ts
@@ -13,7 +13,7 @@ export async function getAccountQueryClientFromApi({
   cosmWasmClient,
   apiUrl,
 }: GetAccountQueryClientFromApiParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient,
     apiUrl,

diff --git a/packages/core/src/actions/account/wallet/deposit.ts b/packages/core/src/actions/account/wallet/deposit.ts
@@ -21,7 +21,7 @@ export async function deposit({
   fee,
   memo,
 }: DepositParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient: signingCosmWasmClient,
     apiUrl,

diff --git a/packages/core/src/actions/account/wallet/execute-on-module.ts b/packages/core/src/actions/account/wallet/execute-on-module.ts
@@ -44,7 +44,7 @@ export async function executeOnModule({
   memo,
   funds,
 }: ExecuteOnModuleParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient: signingCosmWasmClient,
     apiUrl,

diff --git a/packages/core/src/actions/account/wallet/execute.ts b/packages/core/src/actions/account/wallet/execute.ts
@@ -45,7 +45,7 @@ export async function execute({
   fee,
   memo,
 }: ExecuteParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient: signingCosmWasmClient,
     apiUrl,

diff --git a/packages/core/src/actions/account/wallet/get-account-client-from-api.ts b/packages/core/src/actions/account/wallet/get-account-client-from-api.ts
@@ -10,7 +10,7 @@ export async function getAccountClientFromApi({
   apiUrl,
   sender,
 }: GetAccountClientFromApiParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient: signingCosmWasmClient,
     apiUrl,

diff --git a/packages/core/src/actions/account/wallet/withdraw.ts b/packages/core/src/actions/account/wallet/withdraw.ts
@@ -21,7 +21,7 @@ export async function withdraw({
   assets,
   recipient,
 }: WithdrawParameters) {
-  const { account } = await getAccountAddressFromApi({
+  const account = await getAccountAddressFromApi({
     accountId,
     cosmWasmClient: signingCosmWasmClient,
     apiUrl,

diff --git a/packages/react/src/hooks/account/public/use-account-address-from-api.ts b/packages/react/src/hooks/account/public/use-account-address-from-api.ts
@@ -70,3 +70,5 @@ export function useAccountAddressFromApi<TData = QueryData>({
 
   return useQuery({ queryKey, queryFn, ...query, enabled })
 }
+
+export const useAccountAddress = useAccountAddressFromApi
Original file line number	Diff line number	Diff line change
Expand Up		@@ -70,3 +70,5 @@ export function useAccountAddressFromApi<TData = QueryData>({

		return useQuery({ queryKey, queryFn, ...query, enabled })
		}

		export const useAccountAddress = useAccountAddressFromApi