Merge pull request #1222 from multiversx/development

2.36.3

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[v2.36.3]](https://github.com/multiversx/mx-sdk-dapp/pull/1222)] - 2024-08-06
+- [Prevent network update if there are no changes](https://github.com/multiversx/mx-sdk-dapp/pull/1220)
+
 ## [[v2.36.2]](https://github.com/multiversx/mx-sdk-dapp/pull/1219)] - 2024-08-06
 - [Allow signing transactions wihen user balance is zero](https://github.com/multiversx/mx-sdk-dapp/pull/1218)
 - [Prevent setting polling interval when websocket is present](https://github.com/multiversx/mx-sdk-dapp/pull/1217)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "2.36.2",
+  "version": "2.36.3",
   "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

@@ -77,10 +77,10 @@ export function ProviderInitializer() {
   const loginService = useLoginService(
     nativeAuthConfig ? nativeAuthConfig : false
   );
+
   const initializedAccountRef = useRef(false);
   const dispatch = useDispatch();
   const { setLedgerProvider, ledgerData } = useSetLedgerProvider();
-
   useWebViewLogin();
 
   const { callbackRoute, logoutRoute: wcLogoutRoute } = walletConnectLogin
@@ -116,8 +116,12 @@ export function ProviderInitializer() {
   async function refreshNetworkConfig() {
     try {
       const networkConfig = await getNetworkConfigFromApi();
+      const hasDifferentNetworkConfig =
+        networkConfig &&
+        (network.chainId !== networkConfig.erd_chain_id ||
+          network.roundDuration !== networkConfig.erd_round_duration);
 
-      if (networkConfig) {
+      if (hasDifferentNetworkConfig) {
         dispatch(
           updateNetworkConfig({
             chainId: networkConfig.erd_chain_id,

src/utils/account/refreshAccount.tsx

@@ -8,14 +8,18 @@ import { getLatestNonce } from './getLatestNonce';
 const setNewAccount = async () => {
   try {
     const address = await getAddress();
+
     try {
       const account = await getAccount(address);
+
       if (account != null) {
         const accountData = {
           ...account,
           nonce: getLatestNonce(account)
         };
+
         store.dispatch(setAccount(accountData));
+
         return accountData;
       }
     } catch (e) {
@@ -24,30 +28,36 @@ const setNewAccount = async () => {
   } catch (e) {
     console.error('Failed getting address ', e);
   }
+
   return null;
 };
 
 export async function refreshAccount() {
   const provider = getAccountProvider();
+
   if (provider == null) {
     throw 'Provider not initialized';
   }
+
   if (!provider.isInitialized || provider.isInitialized()) {
     return setNewAccount();
-  } else {
-    try {
-      if (!provider.init) {
-        throw 'Current provider does not have init() function';
-      }
+  }
 
-      const initialized = await provider.init();
-      if (!initialized) {
-        return;
-      }
-      return setNewAccount();
-    } catch (e) {
-      console.error('Failed initializing provider ', e);
+  try {
+    if (!provider.init) {
+      throw 'Current provider does not have init() function';
+    }
+
+    const initialized = await provider.init();
+
+    if (!initialized) {
+      return;
     }
+
+    return setNewAccount();
+  } catch (e) {
+    console.error('Failed initializing provider ', e);
   }
+
   return undefined;
 }