Merge pull request #1262 from multiversx/development

v2.40.4
multiversx · Sep 19, 2024 · ddc5db2 · ddc5db2
2 parents 448c29a + bea9278
commit ddc5db2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
+## [[v2.40.4]](https://github.com/multiversx/mx-sdk-dapp/pull/1262)] - 2024-09-19
+- [Fix extension button opening store when extension is installed](https://github.com/multiversx/mx-sdk-dapp/pull/1262)
+
 ## [[v2.40.3]](https://github.com/multiversx/mx-sdk-dapp/pull/1261)] - 2024-09-12
 - [Update passkey provider](https://github.com/multiversx/mx-sdk-dapp/pull/1260)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "2.40.3",
+  "version": "2.40.4",
   "description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",

diff --git a/src/UI/extension/ExtensionLoginButton/ExtensionLoginButton.tsx b/src/UI/extension/ExtensionLoginButton/ExtensionLoginButton.tsx
@@ -23,8 +23,6 @@ export interface ExtensionLoginButtonPropsType
   disabled?: boolean;
 }
 
-const isExtensionAvailable = getIsExtensionAvailable();
-
 const ExtensionLoginButtonComponent: (
   props: ExtensionLoginButtonPropsType & WithStylesImportType
 ) => JSX.Element = ({
@@ -71,7 +69,7 @@ const ExtensionLoginButtonComponent: (
     onInitiateLogin();
   };
 
-  return !isExtensionAvailable ? (
+  return !getIsExtensionAvailable() ? (
     <a
       rel='noreferrer'
       href={isFirefox ? FIREFOX_ADDON_LINK : CHROME_EXTENSION_LINK}

diff --git a/src/utils/platform/getIsExtensionAvailable.ts b/src/utils/platform/getIsExtensionAvailable.ts
@@ -1,5 +1,9 @@
-import { safeWindow } from 'lib/sdkDappUtils';
+type SafeWindowType<T extends Window = Window> = {
+  [K in keyof T]?: T[K];
+};
 
 export const getIsExtensionAvailable = () => {
+  const safeWindow =
+    typeof window !== 'undefined' ? window : ({} as SafeWindowType);
   return Boolean(safeWindow?.elrondWallet);
 };