Merge pull request #148 from multiversx/development

Development
multiversx · Jan 10, 2025 · e400593 · e400593
2 parents 7f19867 + 2e585ca
commit e400593
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 17 deletions.
diff --git a/src/hooks/adapter/adapter.ts b/src/hooks/adapter/adapter.ts
@@ -1,5 +1,5 @@
 import { PAGE_SIZE, TRANSACTIONS_TABLE_FIELDS } from 'appConstants';
-import { AccountRolesTypeEnum } from 'types';
+import { AccountRolesTypeEnum, GetAccountType } from 'types';
 import {
   BaseApiType,
   GetBlocksType,
@@ -224,14 +224,8 @@ export const useAdapter = () => {
 
     /* Account */
 
-    getAccount: ({
-      address,
-      ...rest
-    }: {
-      address: string;
-      fields?: string;
-      withGuardianInfo?: boolean;
-    }) => provider({ url: `/accounts/${address}`, params: rest }),
+    getAccount: ({ address, ...rest }: GetAccountType) =>
+      provider({ url: `/accounts/${address}`, params: rest }),
 
     getAccounts: ({
       page,

diff --git a/src/layouts/AccountLayout/AccountLayout.tsx b/src/layouts/AccountLayout/AccountLayout.tsx
@@ -31,15 +31,18 @@ export const AccountLayout = () => {
 
   const fetchBalanceAndCount = () => {
     if (address) {
-      getAccount({ address, withGuardianInfo: true }).then(
-        ({ success, data }) => {
-          if (success && data) {
-            dispatch(setAccount({ isFetched: true, account: data }));
-          }
-
-          setIsDataReady(success);
+      getAccount({
+        address,
+        withGuardianInfo: true,
+        withAssets: true,
+        withTxCount: true
+      }).then(({ success, data }) => {
+        if (success && data) {
+          dispatch(setAccount({ isFetched: true, account: data }));
         }
-      );
+
+        setIsDataReady(success);
+      });
     }
   };
 

diff --git a/src/types/adapter.types.ts b/src/types/adapter.types.ts
@@ -19,13 +19,22 @@ export interface SortableApiType extends BaseApiType {
   order?: SortOrderEnum;
 }
 
+export interface GetAccountType {
+  address: string;
+  withGuardianInfo?: boolean;
+  withTxCount?: boolean;
+  withScrCount?: boolean;
+  withAssets?: boolean;
+}
+
 export interface GetAccountsType extends SortableApiType {
   ownerAddress?: string;
   isSmartContract?: boolean;
   withOwnerAssets?: boolean;
   withDeployInfo?: boolean;
   withTxCount?: boolean;
   withScrCount?: boolean;
+  withAssets?: boolean;
 }
 export interface GetBlocksType extends BaseApiType {
   shard?: number;