Merge pull request #1159 from multiversx/development

v2.31.6
multiversx · Apr 23, 2024 · 51f41cf · 51f41cf
2 parents e601d70 + adcd7da
commit 51f41cf
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ 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]
+## [[v2.31.6]](https://github.com/multiversx/mx-sdk-dapp/pull/1159)] - 2024-04-23
+- [Changed sdk-web-wallet-cross-window-provider imports & upgraded package](https://github.com/multiversx/mx-sdk-dapp/pull/1158)
 
 ## [[v2.31.5]](https://github.com/multiversx/mx-sdk-dapp/pull/1156)] - 2024-04-18
 - [Removed sdk-web-wallet-cross-window-provider with `lit` webcomponents](https://github.com/multiversx/mx-sdk-dapp/pull/1155)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "2.31.5",
+  "version": "2.31.6",
   "description": "A library to hold the main logic for a dapp on the MultiversX blockchain",
   "author": "MultiversX",
   "license": "GPL-3.0-or-later",
@@ -165,7 +165,7 @@
     "@multiversx/sdk-opera-provider": "1.0.0-alpha.1",
     "@multiversx/sdk-wallet": "4.2.0",
     "@multiversx/sdk-wallet-connect-provider": "4.1.2",
-    "@multiversx/sdk-web-wallet-cross-window-provider": "0.0.33",
+    "@multiversx/sdk-web-wallet-cross-window-provider": "0.0.39",
     "@multiversx/sdk-web-wallet-provider": "3.2.1",
     "@multiversx/sdk-webview-provider": "0.0.8",
     "@reduxjs/toolkit": "1.8.2",

diff --git a/...omponents/components/ConfirmAmount/components/ConfirmAmountNftSft/ConfirmAmountNftSft.tsx b/...omponents/components/ConfirmAmount/components/ConfirmAmountNftSft/ConfirmAmountNftSft.tsx
@@ -1,12 +1,12 @@
 import React, { MouseEvent } from 'react';
 import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { safeWindow } from '@multiversx/sdk-web-wallet-cross-window-provider/out/constants';
 import classNames from 'classnames';
 
 import { DataTestIdsEnum } from 'constants/index';
 import { withStyles } from 'hocs/withStyles';
 import { TokenOptionType, useGetNetworkConfig } from 'hooks';
+import { safeWindow } from 'lib/sdkWebWalletCrossWindowProvider';
 import { NftEnumType } from 'types/tokens.types';
 import {
   explorerUrlBuilder,

diff --git a/src/components/ProviderInitializer/helpers/getCrossWindowProvider.ts b/src/components/ProviderInitializer/helpers/getCrossWindowProvider.ts
@@ -1,4 +1,4 @@
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 
 export async function getCrossWindowProvider({
   address,

diff --git a/src/hooks/login/useCrossWindowLogin.ts b/src/hooks/login/useCrossWindowLogin.ts
@@ -1,8 +1,10 @@
 import { useState } from 'react';
-import { safeWindow } from '@multiversx/sdk-web-wallet-cross-window-provider/out/constants';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
 import { processModifiedAccount } from 'components/ProviderInitializer/helpers/processModifiedAccount';
 import { SECOND_LOGIN_ATTEMPT_ERROR } from 'constants/errorsMessages';
+import {
+  CrossWindowProvider,
+  safeWindow
+} from 'lib/sdkWebWalletCrossWindowProvider';
 import { setAccountProvider } from 'providers/accountProvider';
 import { loginAction } from 'reduxStore/commonActions';
 import { useDispatch, useSelector } from 'reduxStore/DappProviderContext';

diff --git a/src/hooks/transactions/useSignTransactions.tsx b/src/hooks/transactions/useSignTransactions.tsx
@@ -7,7 +7,6 @@ import {
 
 import { ExtensionProvider } from '@multiversx/sdk-extension-provider';
 import { MetamaskProvider } from '@multiversx/sdk-metamask-provider/out/metamaskProvider';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
 
 import uniq from 'lodash/uniq';
 import { useGetAccountFromApi } from 'apiCalls/accounts/useGetAccountFromApi';
@@ -23,6 +22,7 @@ import {
 import { useGetAccount } from 'hooks/account';
 import { useGetAccountProvider } from 'hooks/account/useGetAccountProvider';
 import { useParseSignedTransactions } from 'hooks/transactions/useParseSignedTransactions';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { ExperimentalWebviewProvider } from 'providers/experimentalWebViewProvider';
 import { getProviderType } from 'providers/utils';
 

diff --git a/src/hooks/transactions/useSignTransactionsCommonData.tsx b/src/hooks/transactions/useSignTransactionsCommonData.tsx
@@ -3,10 +3,10 @@ import { useEffect, useState } from 'react';
 import { Transaction } from '@multiversx/sdk-core/out';
 import { ExtensionProvider } from '@multiversx/sdk-extension-provider';
 import { MetamaskProvider } from '@multiversx/sdk-metamask-provider/out/metamaskProvider';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
 import { useGetAccount } from 'hooks/account';
 import { useGetAccountProvider } from 'hooks/account/useGetAccountProvider';
 import { useParseSignedTransactions } from 'hooks/transactions/useParseSignedTransactions';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 
 import { ExperimentalWebviewProvider } from 'providers/experimentalWebViewProvider';
 import { useDispatch, useSelector } from 'reduxStore/DappProviderContext';

diff --git a/src/lib/sdkWebWalletCrossWindowProvider.ts b/src/lib/sdkWebWalletCrossWindowProvider.ts
@@ -0,0 +1,11 @@
+export { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
+export {
+  CrossWindowProviderRequestEnums,
+  CrossWindowProviderResponseEnums,
+  ReplyWithPostMessageType,
+  RequestMessageType,
+  ResponseTypeMap,
+  SignMessageStatusEnum,
+  ReplyWithPostMessageObjectType
+} from '@multiversx/sdk-web-wallet-cross-window-provider/out/types';
+export { safeWindow } from '@multiversx/sdk-web-wallet-cross-window-provider/out/constants';
diff --git a/src/providers/accountProvider.ts b/src/providers/accountProvider.ts
@@ -2,8 +2,8 @@ import { ExtensionProvider } from '@multiversx/sdk-extension-provider';
 import { HWProvider } from '@multiversx/sdk-hw-provider';
 import { MetamaskProvider } from '@multiversx/sdk-metamask-provider/out/metamaskProvider';
 import { OperaProvider } from '@multiversx/sdk-opera-provider';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
 import { WalletProvider } from '@multiversx/sdk-web-wallet-provider';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { IDappProvider } from 'types';
 import { WalletConnectV2Provider } from 'utils/walletconnect/__sdkWalletconnectProvider';
 import { emptyProvider } from './utils';

diff --git a/src/providers/utils.ts b/src/providers/utils.ts
@@ -4,9 +4,9 @@ import { HWProvider } from '@multiversx/sdk-hw-provider';
 import { IHWWalletApp } from '@multiversx/sdk-hw-provider/out/interface';
 import { MetamaskProvider } from '@multiversx/sdk-metamask-provider/out/metamaskProvider';
 import { OperaProvider } from '@multiversx/sdk-opera-provider';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
 import { WalletProvider } from '@multiversx/sdk-web-wallet-provider';
 import { LEDGER_CONTRACT_DATA_ENABLED_VALUE } from 'constants/index';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { IDappProvider } from 'types';
 import { LoginMethodsEnum } from 'types/enums.types';
 import {

diff --git a/src/types/crossWindowProvider.types.ts b/src/types/crossWindowProvider.types.ts
@@ -6,7 +6,7 @@ import {
   ResponseTypeMap,
   SignMessageStatusEnum,
   ReplyWithPostMessageObjectType
-} from '@multiversx/sdk-web-wallet-cross-window-provider/out/types';
+} from 'lib/sdkWebWalletCrossWindowProvider';
 
 export {
   CrossWindowProviderRequestEnums,

diff --git a/src/types/enums.types.ts b/src/types/enums.types.ts
@@ -1,7 +1,7 @@
 import {
   CrossWindowProviderRequestEnums,
   CrossWindowProviderResponseEnums
-} from '@multiversx/sdk-web-wallet-cross-window-provider/out/types';
+} from 'lib/sdkWebWalletCrossWindowProvider';
 export { CrossWindowProviderRequestEnums, CrossWindowProviderResponseEnums };
 
 export enum TransactionServerStatusesEnum {

diff --git a/src/utils/account/signMessage.ts b/src/utils/account/signMessage.ts
@@ -1,5 +1,5 @@
 import { SignableMessage, Address } from '@multiversx/sdk-core';
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { getAccountProvider, getProviderType } from 'providers';
 import { LoginMethodsEnum } from 'types';
 import { getAddress } from 'utils/account/getAddress';

diff --git a/src/utils/logout.ts b/src/utils/logout.ts
@@ -1,4 +1,4 @@
-import { CrossWindowProvider } from '@multiversx/sdk-web-wallet-cross-window-provider/out/CrossWindowProvider/CrossWindowProvider';
+import { CrossWindowProvider } from 'lib/sdkWebWalletCrossWindowProvider';
 import { getAccountProvider, getProviderType } from 'providers';
 import { logoutAction } from 'reduxStore/commonActions';
 import { store } from 'reduxStore/store';

diff --git a/yarn.lock b/yarn.lock
@@ -2446,10 +2446,10 @@
     tweetnacl "1.0.3"
     uuid "8.3.2"
 
-"@multiversx/sdk-web-wallet-cross-window-provider@0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-cross-window-provider/-/sdk-web-wallet-cross-window-provider-0.0.33.tgz#798fd76050b24fd1ec4c4788da83667420e9f114"
-  integrity sha512-l2rMzcYji8abySdrrIFkTOPsOYw2UvmlHnJfbU+PpKcwmF0vkwSUIS+XP8FqF00kwDyH2oGHGqZ7aoZRX6wSVw==
+"@multiversx/sdk-web-wallet-cross-window-provider@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-cross-window-provider/-/sdk-web-wallet-cross-window-provider-0.0.39.tgz#b7aef8852bf277371ba361575edde2aa2113e954"
+  integrity sha512-6tlHhYMa7O6Gaxt8UPttgDMhpnar3uKGcOwVHdm5ierE835aIAQsRZqx29pv41fzcsC40JEXQju6wG/j/DG8Og==
   dependencies:
     "@types/jest" "^29.5.11"
     "@types/qs" "6.9.10"