Merge pull request #242 from multiversx/development

Development
multiversx · Sep 3, 2024 · ef47a1f · ef47a1f
2 parents 890c87b + 03325e0
commit ef47a1f
Show file tree

Hide file tree

Showing 4 changed files with 324 additions and 299 deletions.
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@fortawesome/free-solid-svg-icons": "6.5.1",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@multiversx/sdk-core": "13.2.1",
-    "@multiversx/sdk-dapp": "2.38.4",
+    "@multiversx/sdk-dapp": "2.40.0",
     "@multiversx/sdk-network-providers": "2.4.3",
     "axios": "1.6.5",
     "classnames": "2.3.2",

diff --git a/src/components/sdkDappComponents.ts b/src/components/sdkDappComponents.ts
@@ -24,4 +24,4 @@ export { DappProvider } from '@multiversx/sdk-dapp/wrappers/DappProvider/DappPro
 export { TransactionRow } from '@multiversx/sdk-dapp/UI/TransactionsTable/components/TransactionRow';
 export { ACCOUNTS_ENDPOINT } from '@multiversx/sdk-dapp/apiCalls/endpoints';
 export { ExplorerLink } from '@multiversx/sdk-dapp/UI/ExplorerLink';
-export { MetamaskProxyButton } from '@multiversx/sdk-dapp/UI/metamaskProxy/MetamaskProxyLoginButton/MetamaskProxyButton';
+export { IframeButton } from '@multiversx/sdk-dapp/UI/iframe/IframeLoginButton/IframeButton';
diff --git a/src/pages/Unlock/Unlock.tsx b/src/pages/Unlock/Unlock.tsx
@@ -1,9 +1,10 @@
-import type {
-  ExtensionLoginButtonPropsType,
-  WebWalletLoginButtonPropsType,
-  OperaWalletLoginButtonPropsType,
-  LedgerLoginButtonPropsType,
-  WalletConnectLoginButtonPropsType
+import {
+  type ExtensionLoginButtonPropsType,
+  type WebWalletLoginButtonPropsType,
+  type OperaWalletLoginButtonPropsType,
+  type LedgerLoginButtonPropsType,
+  type WalletConnectLoginButtonPropsType,
+  IframeButton
 } from '@multiversx/sdk-dapp/UI';
 import {
   ExtensionLoginButton,
@@ -12,8 +13,7 @@ import {
   WalletConnectLoginButton,
   WebWalletLoginButton as WebWalletUrlLoginButton,
   XaliasCrossWindowLoginButton,
-  CrossWindowLoginButton,
-  MetamaskProxyButton
+  CrossWindowLoginButton
 } from 'components/sdkDappComponents';
 import { nativeAuth } from 'config';
 import { RouteNamesEnum } from 'localConstants';
@@ -80,8 +80,15 @@ export const Unlock = () => {
             />
             <XaliasLoginWrapper {...commonProps} />
             <WebWalletLoginWrapper {...commonProps} />
-            <MetamaskProxyButton
+            <IframeButton
+              loginButtonText='Passkey Proxy'
+              loginType='passkey'
+              {...commonProps}
+            />
+
+            <IframeButton
               loginButtonText='Metamask Proxy'
+              loginType='metamask'
               {...commonProps}
             />
           </div>