Skip to content

Commit

Permalink
Merge pull request #146 from multiversx/development
Browse files Browse the repository at this point in the history
xAlias login (#145)
  • Loading branch information
arhtudormorar authored Oct 27, 2023
2 parents 862d6b0 + 76f8d0e commit fd8cc70
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@fortawesome/free-solid-svg-icons": "6.4.0",
"@fortawesome/react-fontawesome": "0.2.0",
"@multiversx/sdk-core": "12.11.0",
"@multiversx/sdk-dapp": "2.22.5",
"@multiversx/sdk-dapp": "2.23.0",
"@multiversx/sdk-network-providers": "2.0.0",
"axios": "0.24.0",
"classnames": "2.3.2",
Expand Down
1 change: 1 addition & 0 deletions src/components/sdkDappComponents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export { TransactionsTable } from '@multiversx/sdk-dapp/UI/TransactionsTable/Tra
export { TransactionsToastList } from '@multiversx/sdk-dapp/UI/TransactionsToastList/TransactionsToastList';
export { WalletConnectLoginButton } from '@multiversx/sdk-dapp/UI/walletConnect/WalletConnectLoginButton/WalletConnectLoginButton';
export { WebWalletLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/WebWalletLoginButton/WebWalletLoginButton';
export { XaliasLoginButton } from '@multiversx/sdk-dapp/UI/webWallet/XaliasLoginButton/XaliasLoginButton';
export { AuthenticatedRoutesWrapper } from '@multiversx/sdk-dapp/wrappers/AuthenticatedRoutesWrapper/AuthenticatedRoutesWrapper';
export { AxiosInterceptorContext } from '@multiversx/sdk-dapp/wrappers/AxiosInterceptorContext/AxiosInterceptorContext';
export { DappProvider } from '@multiversx/sdk-dapp/wrappers/DappProvider/DappProvider';
Expand Down
8 changes: 7 additions & 1 deletion src/pages/Unlock/Unlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
LedgerLoginButton,
OperaWalletLoginButton,
WalletConnectLoginButton,
WebWalletLoginButton
WebWalletLoginButton,
XaliasLoginButton
} from 'components/sdkDappComponents';
import { nativeAuth } from 'config';
import { RouteNamesEnum } from 'localConstants';
Expand Down Expand Up @@ -61,6 +62,11 @@ export const Unlock = () => {
data-testid='webWalletLoginBtn'
{...commonProps}
/>
<XaliasLoginButton
loginButtonText='xAlias'
data-testid='xAliasLoginBtn'
{...commonProps}
/>
</div>
</div>
</div>
Expand Down
15 changes: 5 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
dependencies:
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"

"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13":
Expand Down Expand Up @@ -932,10 +932,10 @@
keccak "3.0.2"
protobufjs "7.2.4"

"@multiversx/sdk-dapp@2.22.5":
version "2.22.5"
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp/-/sdk-dapp-2.22.5.tgz#51d3022bac9e19adc9d016fd1d7e6f4bcc4a0def"
integrity sha512-ll8X9mlIGJQaJ0MNIw6tKFfV0IJ0Zf9DEuO8FpR6HHeFze3c1b/u8PobuiNBUjRdBWEV+K98mN+TNWkheGhdjg==
"@multiversx/sdk-dapp@2.23.0":
version "2.23.0"
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp/-/sdk-dapp-2.23.0.tgz#8b901a3d11d1fab0dd4dc178e50f54fc69951412"
integrity sha512-prydWmVUzYF2JkHjAFCeQRGcRreBAt9l8oV8GcEWEegFNlNzIQ0O3CHeUx5FPCMdbGcvqPvlxFMsv+j9n9GETA==
dependencies:
"@multiversx/sdk-core" "12.6.0"
"@multiversx/sdk-extension-provider" "3.0.0"
Expand Down Expand Up @@ -1811,11 +1811,6 @@
resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz#48c46eab21e0730921986ce742563ae83fe7fe34"
integrity sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==

"@vitejs/plugin-basic-ssl@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz#48c46eab21e0730921986ce742563ae83fe7fe34"
integrity sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==

"@vitejs/[email protected]":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.1.0.tgz#e4f56f46fd737c5d386bb1f1ade86ba275fe09bd"
Expand Down

0 comments on commit fd8cc70

Please sign in to comment.