Merge pull request #1011 from multiversx/development

2.26.6
multiversx · Jan 5, 2024 · 1ba099f · 1ba099f
2 parents fd1ff0b + c930ac1
commit 1ba099f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+## [[v2.26.6]](https://github.com/multiversx/mx-sdk-dapp/pull/1011)] - 2024-01-05
+- [Add custom request option for WC button](https://github.com/multiversx/mx-sdk-dapp/pull/1010)
+
 ## [[v2.26.5]](https://github.com/multiversx/mx-sdk-dapp/pull/1009)] - 2024-01-04
 - [Fixed provider initialised check](https://github.com/multiversx/mx-sdk-dapp/pull/1008)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@multiversx/sdk-dapp",
-  "version": "2.26.5",
+  "version": "2.26.6",
   "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/walletConnect/WalletConnectLoginButton/WalletConnectLoginButton.tsx b/src/UI/walletConnect/WalletConnectLoginButton/WalletConnectLoginButton.tsx
@@ -30,7 +30,8 @@ export const WalletConnectLoginButton = ({
   showScamPhishingAlert,
   title = 'Login with the xPortal App',
   token,
-  wrapContentInsideModal = true
+  wrapContentInsideModal = true,
+  customRequestMethods = []
 }: WalletConnectLoginButtonPropsType) => {
   const {
     disabledConnectButton,
@@ -84,6 +85,7 @@ export const WalletConnectLoginButton = ({
         title={title}
         token={token}
         wrapContentInsideModal={wrapContentInsideModal}
+        customRequestMethods={customRequestMethods}
       />
     </>
   );

diff --git a/src/UI/walletConnect/WalletConnectLoginButton/types.ts b/src/UI/walletConnect/WalletConnectLoginButton/types.ts
@@ -25,4 +25,5 @@ export interface WalletConnectLoginButtonPropsType
   showScamPhishingAlert?: boolean;
   title?: string;
   wrapContentInsideModal?: boolean;
+  customRequestMethods?: Array<string>;
 }
diff --git a/src/UI/walletConnect/WalletConnectLoginContainer/WalletConnectLoginContainer.tsx b/src/UI/walletConnect/WalletConnectLoginContainer/WalletConnectLoginContainer.tsx
@@ -19,7 +19,8 @@ const WalletConnectLoginContainerComponent = (
     showLoginModal,
     token,
     wrapContentInsideModal,
-    styles
+    styles,
+    customRequestMethods
   } = props;
 
   const canLoginRef = useRef<boolean>(true);
@@ -30,7 +31,8 @@ const WalletConnectLoginContainerComponent = (
     nativeAuth,
     onLoginRedirect,
     logoutRoute,
-    canLoginRef
+    canLoginRef,
+    customRequestMethods
   });
 
   const onCloseModal = async () => {

diff --git a/...nnect/WalletConnectLoginContainer/WalletConnectLoginContent/WalletConnectLoginContent.tsx b/...nnect/WalletConnectLoginContainer/WalletConnectLoginContent/WalletConnectLoginContent.tsx
@@ -29,7 +29,8 @@ const WalletConnectLoginContentComponent = ({
   token,
   canLoginRef,
   globalStyles,
-  styles
+  styles,
+  customRequestMethods = []
 }: WalletConnectLoginModalPropsType & WithStylesImportType) => {
   const [
     initLoginWithWalletConnectV2,
@@ -47,7 +48,8 @@ const WalletConnectLoginContentComponent = ({
     nativeAuth,
     onLoginRedirect,
     logoutRoute,
-    canLoginRef
+    canLoginRef,
+    customRequestMethods
   });
 
   const [qrCodeSvg, setQrCodeSvg] = useState<string>('');

diff --git a/src/UI/walletConnect/WalletConnectLoginContainer/types.ts b/src/UI/walletConnect/WalletConnectLoginContainer/types.ts
@@ -21,4 +21,5 @@ export interface WalletConnectLoginModalPropsType
   title?: string;
   wrapContentInsideModal?: boolean;
   canLoginRef?: MutableRefObject<boolean>;
+  customRequestMethods?: Array<string>;
 }
diff --git a/src/hooks/login/useWalletConnectV2Login.ts b/src/hooks/login/useWalletConnectV2Login.ts
@@ -45,6 +45,7 @@ export enum WalletConnectV2Error {
 export interface InitWalletConnectV2Type extends OnProviderLoginType {
   logoutRoute?: string;
   canLoginRef?: MutableRefObject<boolean>;
+  customRequestMethods?: Array<string>;
 }
 
 export interface WalletConnectV2LoginHookCustomStateType {
@@ -68,7 +69,8 @@ export const useWalletConnectV2Login = ({
   nativeAuth,
   onLoginRedirect,
   logoutRoute: providerLogoutRoute,
-  canLoginRef: parentCanLoginRef
+  canLoginRef: parentCanLoginRef,
+  customRequestMethods = []
 }: InitWalletConnectV2Type): WalletConnectV2LoginHookReturnType => {
   const dispatch = useDispatch();
   const hasNativeAuth = nativeAuth != null;
@@ -97,7 +99,8 @@ export const useWalletConnectV2Login = ({
 
   const logoutRoute = providerLogoutRoute ?? dappLogoutRoute ?? '/';
   const dappMethods: string[] = [
-    WalletConnectOptionalMethodsEnum.CANCEL_ACTION
+    WalletConnectOptionalMethodsEnum.CANCEL_ACTION,
+    ...customRequestMethods
   ];
   if (tokenToSign) {
     dappMethods.push(WalletConnectOptionalMethodsEnum.SIGN_LOGIN_TOKEN);