chore: return spendable and actual balance in rpc api getErc20Balance

packages/starknet-snap/src/getErc20TokenBalance.ts

@@ -6,11 +6,7 @@ import { BlockIdentifierEnum } from './utils/constants';
 import { logger } from './utils/logger';
 import { toJson } from './utils/serializer';
 import { getNetworkFromChainId } from './utils/snapUtils';
-import {
-  getBalance,
-  isAccountDeployed,
-  validateAndParseAddress,
-} from './utils/starknetUtils';
+import { getBalance, validateAndParseAddress } from './utils/starknetUtils';
 
 /**
  *
@@ -53,23 +49,26 @@ export async function getErc20TokenBalance(params: ApiParams) {
       `getErc20Balance:\nerc20Address: ${erc20Address}\nuserAddress: ${userAddress}`,
     );
 
-    // For deployed accounts, use the PENDING block to show balance updates as soon as possible,
-    // facilitating concurrent transactions without delays.
-    // For non-deployed accounts, use the LATEST block to avoid displaying non-zero balances
-    // from pending transactions, because confirmed non-zero balance is required for deployment.
-    const blockIdentifier = (await isAccountDeployed(network, userAddress))
-      ? BlockIdentifierEnum.Pending
-      : BlockIdentifierEnum.Latest;
-    const balance = await getBalance(
+    const balanceLatest = await getBalance(
       userAddress,
       erc20Address,
       network,
-      blockIdentifier,
+      BlockIdentifierEnum.Latest,
+    );
+    const balancePending = await getBalance(
+      userAddress,
+      erc20Address,
+      network,
+      BlockIdentifierEnum.Pending,
     );
 
-    logger.log(`getErc20Balance:\nresp: ${toJson(balance)}`);
+    const resp = {
+      balancePending,
+      balanceLatest,
+    };
+    logger.log(`getErc20Balance:\nresp: ${toJson(resp)}`);
 
-    return balance;
+    return resp;
   } catch (error) {
     logger.error(`Problem found:`, error);
     throw error;

packages/starknet-snap/test/src/getErc20TokenBalance.test.ts

@@ -51,7 +51,10 @@ describe('Test function: getErc20TokenBalance', function () {
     };
     apiParams.requestParams = requestObject;
     const result = await getErc20TokenBalance(apiParams);
-    expect(result).to.be.eq('0x64a');
+    expect(result).to.be.eql({
+      balanceLatest: hexAmount,
+      balancePending: hexAmount,
+    });
   });
 
   it('should get ERC-20 token balance with BlockIdentifier pending if the account is deployed', async function () {
@@ -69,7 +72,10 @@ describe('Test function: getErc20TokenBalance', function () {
     };
     apiParams.requestParams = requestObject;
     const result = await getErc20TokenBalance(apiParams);
-    expect(result).to.be.eq('0x64a');
+    expect(result).to.be.eql({
+      balanceLatest: hexAmount,
+      balancePending: hexAmount,
+    });
     expect(stub).to.have.been.calledWith(
       requestObject.userAddress,
       requestObject.tokenAddress,
@@ -93,7 +99,10 @@ describe('Test function: getErc20TokenBalance', function () {
     };
     apiParams.requestParams = requestObject;
     const result = await getErc20TokenBalance(apiParams);
-    expect(result).to.be.eq('0x64a');
+    expect(result).to.be.eql({
+      balanceLatest: hexAmount,
+      balancePending: hexAmount,
+    });
     expect(stub).to.have.been.calledWith(
       requestObject.userAddress,
       requestObject.tokenAddress,

packages/wallet-ui/src/services/useStarkNetSnap.ts

@@ -694,7 +694,7 @@ export const useStarkNetSnap = () => {
           },
         },
       });
-      return response;
+      return response.balanceLatest;
     } catch (err) {
       //eslint-disable-next-line no-console
       console.error(err);