thirdweb 5.86.3 → 5.86.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/react/core/hooks/wallets/useAdminWallet.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/ManageWalletScreen.js +5 -4
- package/dist/cjs/react/web/ui/ConnectWallet/screens/ManageWalletScreen.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/wallets/in-app/core/authentication/siwe.js +3 -3
- package/dist/cjs/wallets/in-app/core/authentication/siwe.js.map +1 -1
- package/dist/esm/react/core/hooks/wallets/useAdminWallet.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/ManageWalletScreen.js +5 -4
- package/dist/esm/react/web/ui/ConnectWallet/screens/ManageWalletScreen.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/wallets/in-app/core/authentication/siwe.js +3 -3
- package/dist/esm/wallets/in-app/core/authentication/siwe.js.map +1 -1
- package/dist/types/react/core/hooks/wallets/useAdminWallet.d.ts.map +1 -1
- package/dist/types/react/web/ui/ConnectWallet/screens/ManageWalletScreen.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/react/core/hooks/wallets/useAdminWallet.ts +0 -1
- package/src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx +5 -4
- package/src/version.ts +1 -1
- package/src/wallets/in-app/core/authentication/siwe.ts +3 -3
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAdminWallet.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":";;AASA,
|
1
|
+
{"version":3,"file":"useAdminWallet.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":";;AASA,wCAeC;AAxBD,6DAAuD;AACvD,qEAA+D;AAE/D;;;;;GAKG;AACH,SAAgB,cAAc;IAC5B,MAAM,YAAY,GAAG,IAAA,oCAAe,GAAE,CAAC;IACvC,MAAM,gBAAgB,GAAG,IAAA,4CAAmB,GAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,YAAY,EAAE,eAAe,EAAE,EAAE,CAAC;IACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,+EAA+E;QAC/E,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,sGAAsG;IACtG,OAAO,gBAAgB,CAAC,IAAI,CAC1B,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;QAC3C,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,CACvC,CAAC;AACJ,CAAC"}
|
@@ -20,7 +20,8 @@ const WalletConnectIcon_js_1 = require("../icons/WalletConnectIcon.js");
|
|
20
20
|
* @internal
|
21
21
|
*/
|
22
22
|
function ManageWalletScreen(props) {
|
23
|
-
const
|
23
|
+
const adminWallet = (0, useAdminWallet_js_1.useAdminWallet)();
|
24
|
+
const activeWallet = (0, useActiveWallet_js_1.useActiveWallet)();
|
24
25
|
return ((0, jsx_runtime_1.jsxs)(basic_js_1.Container, { style: {
|
25
26
|
minHeight: "300px",
|
26
27
|
}, children: [(0, jsx_runtime_1.jsx)(basic_js_1.Container, { p: "lg", children: (0, jsx_runtime_1.jsx)(basic_js_1.ModalHeader, { title: props.locale.manageWallet.title, onBack: props.onBack }) }), (0, jsx_runtime_1.jsx)(basic_js_1.Line, {}), (0, jsx_runtime_1.jsxs)(basic_js_1.Container, { px: "sm", scrollY: true, style: {
|
@@ -34,9 +35,9 @@ function ManageWalletScreen(props) {
|
|
34
35
|
props.setScreen("wallet-connect-receiver");
|
35
36
|
}, style: {
|
36
37
|
fontSize: index_js_2.fontSize.sm,
|
37
|
-
}, children: [(0, jsx_runtime_1.jsx)(WalletConnectIcon_js_1.WalletConnectIcon, { size: index_js_2.iconSize.md }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "primaryText", children: props.locale.manageWallet.connectAnApp })] }),
|
38
|
-
(0, index_js_1.isInAppWallet)(
|
39
|
-
!
|
38
|
+
}, children: [(0, jsx_runtime_1.jsx)(WalletConnectIcon_js_1.WalletConnectIcon, { size: index_js_2.iconSize.md }), (0, jsx_runtime_1.jsx)(text_js_1.Text, { color: "primaryText", children: props.locale.manageWallet.connectAnApp })] }), adminWallet &&
|
39
|
+
(0, index_js_1.isInAppWallet)(adminWallet) &&
|
40
|
+
!adminWallet.getConfig()?.hidePrivateKeyExport && ((0, jsx_runtime_1.jsxs)(MenuButton_js_1.MenuButton, { onClick: () => {
|
40
41
|
props.setScreen("private-key");
|
41
42
|
}, style: {
|
42
43
|
fontSize: index_js_2.fontSize.sm,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ManageWalletScreen.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;AAsBb,
|
1
|
+
{"version":3,"file":"ManageWalletScreen.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
@@ -9,10 +9,10 @@ const getLoginPath_js_1 = require("./getLoginPath.js");
|
|
9
9
|
* @internal
|
10
10
|
*/
|
11
11
|
async function siweAuthenticate(args) {
|
12
|
-
const { wallet, chain } = args;
|
12
|
+
const { wallet, chain, client, ecosystem } = args;
|
13
13
|
// only connect if the wallet doesn't already have an account
|
14
|
-
const account = wallet.getAccount() || (await wallet.connect({ client
|
15
|
-
const clientFetch = (0, fetch_js_1.getClientFetch)(
|
14
|
+
const account = wallet.getAccount() || (await wallet.connect({ client, chain }));
|
15
|
+
const clientFetch = (0, fetch_js_1.getClientFetch)(client, ecosystem);
|
16
16
|
const payload = await (async () => {
|
17
17
|
const path = (0, getLoginPath_js_1.getLoginUrl)({
|
18
18
|
authOption: "wallet",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"siwe.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/siwe.ts"],"names":[],"mappings":";;AAcA,4CAqDC;AAnED,uFAA+E;AAI/E,yDAA4D;AAC5D,uDAAsD;AAGtD,uDAAqE;AAGrE;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,IAKtC;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"siwe.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/siwe.ts"],"names":[],"mappings":";;AAcA,4CAqDC;AAnED,uFAA+E;AAI/E,yDAA4D;AAC5D,uDAAsD;AAGtD,uDAAqE;AAGrE;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,IAKtC;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAClD,6DAA6D;IAC7D,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QAChC,MAAM,IAAI,GAAG,IAAA,6BAAW,EAAC;YACvB,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,GAAG,IAAI,YAAY,OAAO,CAAC,OAAO,YAAY,KAAK,CAAC,EAAE,EAAE,CACzD,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAEtE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAwB,CAAC;IACnD,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,wCAAgB,EAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,IAAI,GAAG,IAAA,qCAAmB,EAAC;YAC/B,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,GAAG,IAAI,cAAc,SAAS,YAAY,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACvE;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAA,mBAAS,EAAC;gBACd,SAAS;gBACT,OAAO;aACR,CAAC;SACH,CACF,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAEhE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA+C,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC;IACL,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAdminWallet.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,YAAY,EAAE,eAAe,EAAE,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"useAdminWallet.js","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;GAKG;AACH,MAAM,UAAU,cAAc;IAC5B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,YAAY,EAAE,eAAe,EAAE,EAAE,CAAC;IACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,+EAA+E;QAC/E,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,sGAAsG;IACtG,OAAO,gBAAgB,CAAC,IAAI,CAC1B,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE;QAC3C,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,CACvC,CAAC;AACJ,CAAC"}
|
@@ -17,7 +17,8 @@ import { WalletConnectIcon } from "../icons/WalletConnectIcon.js";
|
|
17
17
|
* @internal
|
18
18
|
*/
|
19
19
|
export function ManageWalletScreen(props) {
|
20
|
-
const
|
20
|
+
const adminWallet = useAdminWallet();
|
21
|
+
const activeWallet = useActiveWallet();
|
21
22
|
return (_jsxs(Container, { style: {
|
22
23
|
minHeight: "300px",
|
23
24
|
}, children: [_jsx(Container, { p: "lg", children: _jsx(ModalHeader, { title: props.locale.manageWallet.title, onBack: props.onBack }) }), _jsx(Line, {}), _jsxs(Container, { px: "sm", scrollY: true, style: {
|
@@ -31,9 +32,9 @@ export function ManageWalletScreen(props) {
|
|
31
32
|
props.setScreen("wallet-connect-receiver");
|
32
33
|
}, style: {
|
33
34
|
fontSize: fontSize.sm,
|
34
|
-
}, children: [_jsx(WalletConnectIcon, { size: iconSize.md }), _jsx(Text, { color: "primaryText", children: props.locale.manageWallet.connectAnApp })] }),
|
35
|
-
isInAppWallet(
|
36
|
-
!
|
35
|
+
}, children: [_jsx(WalletConnectIcon, { size: iconSize.md }), _jsx(Text, { color: "primaryText", children: props.locale.manageWallet.connectAnApp })] }), adminWallet &&
|
36
|
+
isInAppWallet(adminWallet) &&
|
37
|
+
!adminWallet.getConfig()?.hidePrivateKeyExport && (_jsxs(MenuButton, { onClick: () => {
|
37
38
|
props.setScreen("private-key");
|
38
39
|
}, style: {
|
39
40
|
fontSize: fontSize.sm,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ManageWalletScreen.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,oDAAoD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,yCAAyC,CAAC;AAE7E,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIlE;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAOlC;IACC,MAAM,
|
1
|
+
{"version":3,"file":"ManageWalletScreen.js","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = "5.86.
|
1
|
+
export const version = "5.86.5";
|
2
2
|
//# sourceMappingURL=version.js.map
|
@@ -6,10 +6,10 @@ import { getLoginCallbackUrl, getLoginUrl } from "./getLoginPath.js";
|
|
6
6
|
* @internal
|
7
7
|
*/
|
8
8
|
export async function siweAuthenticate(args) {
|
9
|
-
const { wallet, chain } = args;
|
9
|
+
const { wallet, chain, client, ecosystem } = args;
|
10
10
|
// only connect if the wallet doesn't already have an account
|
11
|
-
const account = wallet.getAccount() || (await wallet.connect({ client
|
12
|
-
const clientFetch = getClientFetch(
|
11
|
+
const account = wallet.getAccount() || (await wallet.connect({ client, chain }));
|
12
|
+
const clientFetch = getClientFetch(client, ecosystem);
|
13
13
|
const payload = await (async () => {
|
14
14
|
const path = getLoginUrl({
|
15
15
|
authOption: "wallet",
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"siwe.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/siwe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAKtC;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"siwe.js","sourceRoot":"","sources":["../../../../../../src/wallets/in-app/core/authentication/siwe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAI/E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,IAKtC;IACC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAClD,6DAA6D;IAC7D,MAAM,OAAO,GACX,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QAChC,MAAM,IAAI,GAAG,WAAW,CAAC;YACvB,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,GAAG,IAAI,YAAY,OAAO,CAAC,OAAO,YAAY,KAAK,CAAC,EAAE,EAAE,CACzD,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAEtE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAwB,CAAC;IACnD,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAEnE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QACnC,MAAM,IAAI,GAAG,mBAAmB,CAAC;YAC/B,UAAU,EAAE,QAAQ;YACpB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,GAAG,IAAI,cAAc,SAAS,YAAY,kBAAkB,CAAC,OAAO,CAAC,EAAE,EACvE;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,SAAS,CAAC;gBACd,SAAS;gBACT,OAAO;aACR,CAAC;SACH,CACF,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAEhE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA+C,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC;IACL,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useAdminWallet.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,
|
1
|
+
{"version":3,"file":"useAdminWallet.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/wallets/useAdminWallet.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,uEAe7B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ManageWalletScreen.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAUjH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACtD,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,CAAC,EAAE,iCAAiC,CAAC,cAAc,CAAC,CAAC;CAClE,
|
1
|
+
{"version":3,"file":"ManageWalletScreen.d.ts","sourceRoot":"","sources":["../../../../../../../src/react/web/ui/ConnectWallet/screens/ManageWalletScreen.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAItE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAUjH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE3D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,EAAE,CAAC,MAAM,EAAE,wBAAwB,KAAK,IAAI,CAAC;IACtD,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,CAAC,EAAE,iCAAiC,CAAC,cAAc,CAAC,CAAC;CAClE,8CAwFA"}
|
package/dist/types/version.d.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "5.86.
|
1
|
+
export declare const version = "5.86.5";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
@@ -11,7 +11,6 @@ export function useAdminWallet() {
|
|
11
11
|
const activeWallet = useActiveWallet();
|
12
12
|
const connectedWallets = useConnectedWallets();
|
13
13
|
const adminAccount = activeWallet?.getAdminAccount?.();
|
14
|
-
|
15
14
|
if (!adminAccount) {
|
16
15
|
// If the active wallet doesn't have an admin account, return the active wallet
|
17
16
|
return activeWallet;
|
@@ -28,7 +28,8 @@ export function ManageWalletScreen(props: {
|
|
28
28
|
client: ThirdwebClient;
|
29
29
|
manageWallet?: ConnectButton_detailsModalOptions["manageWallet"];
|
30
30
|
}) {
|
31
|
-
const
|
31
|
+
const adminWallet = useAdminWallet();
|
32
|
+
const activeWallet = useActiveWallet();
|
32
33
|
|
33
34
|
return (
|
34
35
|
<Container
|
@@ -92,9 +93,9 @@ export function ManageWalletScreen(props: {
|
|
92
93
|
</MenuButton>
|
93
94
|
|
94
95
|
{/* Private Key Export (if enabled) */}
|
95
|
-
{
|
96
|
-
isInAppWallet(
|
97
|
-
!
|
96
|
+
{adminWallet &&
|
97
|
+
isInAppWallet(adminWallet) &&
|
98
|
+
!adminWallet.getConfig()?.hidePrivateKeyExport && (
|
98
99
|
<MenuButton
|
99
100
|
onClick={() => {
|
100
101
|
props.setScreen("private-key");
|
package/src/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = "5.86.
|
1
|
+
export const version = "5.86.5";
|
@@ -18,11 +18,11 @@ export async function siweAuthenticate(args: {
|
|
18
18
|
client: ThirdwebClient;
|
19
19
|
ecosystem?: Ecosystem;
|
20
20
|
}): Promise<AuthStoredTokenWithCookieReturnType> {
|
21
|
-
const { wallet, chain } = args;
|
21
|
+
const { wallet, chain, client, ecosystem } = args;
|
22
22
|
// only connect if the wallet doesn't already have an account
|
23
23
|
const account =
|
24
|
-
wallet.getAccount() || (await wallet.connect({ client
|
25
|
-
const clientFetch = getClientFetch(
|
24
|
+
wallet.getAccount() || (await wallet.connect({ client, chain }));
|
25
|
+
const clientFetch = getClientFetch(client, ecosystem);
|
26
26
|
|
27
27
|
const payload = await (async () => {
|
28
28
|
const path = getLoginUrl({
|