diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa7432b0..18618c739 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ 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). ## [Unreleased] +## [[v3.1.7](https://github.com/multiversx/mx-sdk-dapp/pull/1358)] - 2025-01-14 + +- [Fixed double rendering](https://github.com/multiversx/mx-sdk-dapp/pull/1357) ## [[v3.1.7-alpha.0](https://github.com/multiversx/mx-sdk-dapp/pull/1356)] - 2025-01-13 diff --git a/package.json b/package.json index a985b76da..b22dad392 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-dapp", - "version": "3.1.7-alpha.0", + "version": "3.1.7", "description": "A library to hold the main logic for a dapp on the MultiversX blockchain", "author": "MultiversX", "license": "GPL-3.0-or-later", @@ -161,7 +161,7 @@ "@metamask/providers": "16.0.0", "@multiversx/sdk-dapp-utils": "1.0.0", "@multiversx/sdk-extension-provider": "4.0.0", - "@multiversx/sdk-hw-provider": "7.1.0-beta.0", + "@multiversx/sdk-hw-provider": "7.0.0", "@multiversx/sdk-metamask-provider": "1.0.0", "@multiversx/sdk-native-auth-client": "1.0.9", "@multiversx/sdk-opera-provider": "1.0.0-alpha.1", diff --git a/src/wrappers/AuthenticatedRoutesWrapper/AuthenticatedRoutesWrapper.tsx b/src/wrappers/AuthenticatedRoutesWrapper/AuthenticatedRoutesWrapper.tsx index d679a25ee..87add9d49 100644 --- a/src/wrappers/AuthenticatedRoutesWrapper/AuthenticatedRoutesWrapper.tsx +++ b/src/wrappers/AuthenticatedRoutesWrapper/AuthenticatedRoutesWrapper.tsx @@ -1,6 +1,8 @@ import React, { ReactNode, useEffect } from 'react'; +import BigNumber from 'bignumber.js'; import { useSelector } from 'reduxStore/DappProviderContext'; import { + accountSelector, isAccountLoadingSelector, isLoggedInSelector, walletLoginSelector @@ -29,6 +31,7 @@ export const AuthenticatedRoutesWrapper = ({ const searchParamAddress = getSearchParamAddress(); const isLoggedIn = useSelector(isLoggedInSelector); const isAccountLoading = useSelector(isAccountLoadingSelector); + const account = useSelector(accountSelector); const walletLogin = useSelector(walletLoginSelector); const isWebviewLogin = Boolean(getWebviewToken()); @@ -63,8 +66,10 @@ export const AuthenticatedRoutesWrapper = ({ }, [shouldRedirect, unlockRoute]); const isValidWalletLoginAttempt = walletLogin != null && searchParamAddress; + const isBalanceReady = !new BigNumber(account.balance).isNaN(); - if (isAccountLoading || isValidWalletLoginAttempt) { + + if ((isAccountLoading && !isBalanceReady) || isValidWalletLoginAttempt) { return null; } diff --git a/yarn.lock b/yarn.lock index 51a1a9a5f..85b9c5951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2200,7 +2200,7 @@ rxjs "6" semver "^7.3.5" -"@ledgerhq/devices@8.4.4", "@ledgerhq/devices@^8.4.4": +"@ledgerhq/devices@^8.0.7", "@ledgerhq/devices@^8.3.0", "@ledgerhq/devices@^8.4.4": version "8.4.4" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.4.tgz#0d195c1650fe57da2fad7f0d9074a0190947cd6f" integrity sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A== @@ -2215,7 +2215,7 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.6.tgz#f89c82c91c2930f34bc3e0d86a27ec7b6e6e4f5f" integrity sha512-D+r2B09vaRO06wfGoss+rNgwqWSoK0bCtsaJWzlD2hv1zxTtucqVtSztbRFypIqxWTCb3ix5Nh2dWHEJVTp2Xw== -"@ledgerhq/errors@^6.12.6", "@ledgerhq/errors@^6.19.1": +"@ledgerhq/errors@^6.12.6", "@ledgerhq/errors@^6.14.0", "@ledgerhq/errors@^6.16.4", "@ledgerhq/errors@^6.19.1": version "6.19.1" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.19.1.tgz#d9ac45ad4ff839e468b8f63766e665537aaede58" integrity sha512-75yK7Nnit/Gp7gdrJAz0ipp31CCgncRp+evWt6QawQEtQKYEDfGo10QywgrrBBixeRxwnMy1DP6g2oCWRf1bjw== @@ -2228,38 +2228,47 @@ "@ledgerhq/hw-transport" "^6.28.6" "@ledgerhq/logs" "^6.10.1" -"@ledgerhq/hw-transport-web-ble@6.29.4": - version "6.29.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-web-ble/-/hw-transport-web-ble-6.29.4.tgz#53807f804c55c6423bc3936fe4f440549e839625" - integrity sha512-OJyp6CryvyFlg1L9uifo5hYYdDt+WPw8/0ijBixYhYmGvlRz2W6/F2c5rG/zBQWcNnNydPOLjLJM0vR070RfCw== +"@ledgerhq/hw-transport-web-ble@6.28.6": + version "6.28.6" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-web-ble/-/hw-transport-web-ble-6.28.6.tgz#f1f5361983b2f4ead0f716f326b5881809b97066" + integrity sha512-SsseU5T4ePhdvFdwUOsF207gyMgiHyymvRAV66/hpHCd0+m/81kV8nZneeD3Z1pG0XPG+tPlF90r7nLwtUoiXw== dependencies: - "@ledgerhq/devices" "^8.4.4" - "@ledgerhq/errors" "^6.19.1" - "@ledgerhq/hw-transport" "^6.31.4" + "@ledgerhq/devices" "^8.3.0" + "@ledgerhq/errors" "^6.16.4" + "@ledgerhq/hw-transport" "^6.30.6" "@ledgerhq/logs" "^6.12.0" rxjs "^7.8.1" -"@ledgerhq/hw-transport-webhid@6.30.0": - version "6.30.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.30.0.tgz#cd86b0055eb77276892024abbd38e6ed2471b59e" - integrity sha512-HoTzjmYwO7+TVwK+GNbglRepUoDywBL6vjhKnhGqJSUPqAqJJyEXcnKnFDBMN7Phqm55O+YHDYfpcHGBNg5XlQ== +"@ledgerhq/hw-transport-webhid@6.28.6": + version "6.28.6" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.28.6.tgz#94562750136d869774cb56304573a1875ca6375f" + integrity sha512-npU1mgL97KovpTUgcdORoOZ7eVFgwCA7zt0MpgUGUMRNJWDgCFsJslx7KrVXlCGOg87gLfDojreIre502I5pYg== dependencies: - "@ledgerhq/devices" "8.4.4" - "@ledgerhq/errors" "^6.19.1" - "@ledgerhq/hw-transport" "^6.31.4" + "@ledgerhq/devices" "^8.3.0" + "@ledgerhq/errors" "^6.16.4" + "@ledgerhq/hw-transport" "^6.30.6" "@ledgerhq/logs" "^6.12.0" -"@ledgerhq/hw-transport-webusb@6.29.4": - version "6.29.4" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.29.4.tgz#5926421b8db4b474c7aba4851f21ddd4ad4bcc70" - integrity sha512-HoGF1LlBT9HEGBQy2XeCHrFdv/FEOZU0+J+yfKcgAQIAiASr2MLvdzwoJbUS8h6Gn+vc+/BjzBSO3JNn7Loqbg== +"@ledgerhq/hw-transport-webusb@6.28.6": + version "6.28.6" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.28.6.tgz#c17c193578da112ef76769e4ce72129d40d87faa" + integrity sha512-rzICsvhcFcL4wSAvRPe+b9EEWB8cxj6yWy3FZdfs7ufi/0muNpFXWckWv1TC34em55sGXu2cMcwMKXg/O/Lc0Q== dependencies: - "@ledgerhq/devices" "^8.4.4" - "@ledgerhq/errors" "^6.19.1" - "@ledgerhq/hw-transport" "^6.31.4" + "@ledgerhq/devices" "^8.3.0" + "@ledgerhq/errors" "^6.16.4" + "@ledgerhq/hw-transport" "^6.30.6" "@ledgerhq/logs" "^6.12.0" -"@ledgerhq/hw-transport@6.31.4", "@ledgerhq/hw-transport@^6.28.6", "@ledgerhq/hw-transport@^6.31.4": +"@ledgerhq/hw-transport@6.28.8": + version "6.28.8" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.8.tgz#f99a5c71c5c09591e9bfb1b970c42aafbe81351f" + integrity sha512-XxQVl4htd018u/M66r0iu5nlHi+J6QfdPsORzDF6N39jaz+tMqItb7tUlXM/isggcuS5lc7GJo7NOuJ8rvHZaQ== + dependencies: + "@ledgerhq/devices" "^8.0.7" + "@ledgerhq/errors" "^6.14.0" + events "^3.3.0" + +"@ledgerhq/hw-transport@^6.28.6", "@ledgerhq/hw-transport@^6.30.6": version "6.31.4" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz#9b23a6de4a4caaa5c24b149c2dea8adde46f0eb1" integrity sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A== @@ -2477,17 +2486,17 @@ resolved "https://registry.yarnpkg.com/@multiversx/sdk-extension-provider/-/sdk-extension-provider-4.0.0.tgz#77a7d45bf09ae22e569267270f17ac01c5f97d17" integrity sha512-zFt4jUS7tu+MlDPou9wmzoW1dcvQuz0nBEYY75ynt82wC7aYjSDhsYh3U4DKtj5TgmyoOSZ31CLJN0wcoNYVaw== -"@multiversx/sdk-hw-provider@7.1.0-beta.0": - version "7.1.0-beta.0" - resolved "https://registry.yarnpkg.com/@multiversx/sdk-hw-provider/-/sdk-hw-provider-7.1.0-beta.0.tgz#97b33954705a4097c6df6ec03aa59946f2987aac" - integrity sha512-ZzOOFBiN0efJ9fHh7T60CHYstm6hTQkuAYkwQxTpR5Nh+AqnXuLq6lzEltcBrV+6x1t9AlZwEFwLmR+4luN4ag== +"@multiversx/sdk-hw-provider@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@multiversx/sdk-hw-provider/-/sdk-hw-provider-7.0.0.tgz#dafb239179949e23a75805c7cd386d618b1855cd" + integrity sha512-ZRGp5q985v5wvjnSZw+uvEXKGwe5YORuULhYMVoh63cPtGhyHIxl7H9D190KtSV0/LJfTcVUDDrtKoepOoKuVA== dependencies: "@ledgerhq/devices" "8.0.3" "@ledgerhq/errors" "6.12.6" - "@ledgerhq/hw-transport" "6.31.4" - "@ledgerhq/hw-transport-web-ble" "6.29.4" - "@ledgerhq/hw-transport-webhid" "6.30.0" - "@ledgerhq/hw-transport-webusb" "6.29.4" + "@ledgerhq/hw-transport" "6.28.8" + "@ledgerhq/hw-transport-web-ble" "6.28.6" + "@ledgerhq/hw-transport-webhid" "6.28.6" + "@ledgerhq/hw-transport-webusb" "6.28.6" buffer "6.0.3" platform "1.3.6"