v3.0.16

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [[v3.0.16](https://github.com/multiversx/mx-sdk-dapp/pull/1318)] - 2024-11-26
+
+- [Updated provider initializer to use useGetAccountFromApi](https://github.com/multiversx/mx-sdk-dapp/pull/1317)
+
 ## [Unreleased]
 
 ## [[v3.0.15](https://github.com/multiversx/mx-sdk-dapp/pull/1316)] - 2024-11-25

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",

src/components/ProviderInitializer/ProviderInitializer.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import { getNetworkConfigFromApi } from 'apiCalls';
+import { getNetworkConfigFromApi, useGetAccountFromApi } from 'apiCalls';
 import { useLoginService } from 'hooks/login/useLoginService';
 import { useWalletConnectV2Login } from 'hooks/login/useWalletConnectV2Login';
 import { useWebViewLogin } from 'hooks/login/useWebViewLogin';
@@ -41,7 +41,6 @@ import { decodeNativeAuthToken } from 'services/nativeAuth/helpers';
 import { LoginMethodsEnum } from 'types/enums.types';
 import {
   getAddress,
-  getAccount,
   getLatestNonce,
   newWalletProvider,
   emptyProvider,
@@ -79,6 +78,11 @@ export function ProviderInitializer() {
   const loginService = useLoginService(
     nativeAuthConfig ? nativeAuthConfig : false
   );
+  const {
+    data: account,
+    isLoading: isAccountLoading,
+    error: accountError
+  } = useGetAccountFromApi(address);
 
   const initializedAccountRef = useRef(false);
   const dispatch = useDispatch();
@@ -107,8 +111,8 @@ export function ProviderInitializer() {
   }, [tokenLogin?.nativeAuthToken, address]);
 
   useEffect(() => {
-    fetchAccount();
-  }, [address, network]);
+    setupAccount();
+  }, [account, isAccountLoading]);
 
   useEffect(() => {
     // prevent balance double fetching by handling ledgerAccount data separately
@@ -173,8 +177,17 @@ export function ProviderInitializer() {
     }
   }
 
-  async function fetchAccount() {
-    dispatch(setIsAccountLoading(true));
+  async function setupAccount() {
+    if (isAccountLoading) {
+      dispatch(setIsAccountLoading(true));
+      return;
+    }
+
+    if (accountError) {
+      dispatch(setAccountLoadingError('Failed getting account'));
+      console.error('Failed getting account ', accountError);
+      return;
+    }
 
     if (initializedAccountRef.current) {
       // account was recently initialized, skip refetching
@@ -183,26 +196,17 @@ export function ProviderInitializer() {
       return;
     }
 
-    if (address) {
-      try {
-        const account = await getAccount(address);
-
-        if (account) {
-          dispatch(
-            setAccount({
-              ...account,
-              address,
-              nonce: account.nonce.valueOf()
-            })
-          );
-        } else if (!isLoggedIn) {
-          // Clear the address and publicKey if account is not found
-          dispatch(setAddress(''));
-        }
-      } catch (e) {
-        dispatch(setAccountLoadingError('Failed getting account'));
-        console.error('Failed getting account ', e);
-      }
+    if (account) {
+      dispatch(
+        setAccount({
+          ...account,
+          address,
+          nonce: account.nonce.valueOf()
+        })
+      );
+    } else if (!isLoggedIn) {
+      // Clear the address and publicKey if account is not found
+      dispatch(setAddress(''));
     }
 
     dispatch(setIsAccountLoading(false));