@bosonprotocol/react-kit 0.34.0-alpha.20 → 0.34.0-alpha.21
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/components/config/ConfigContext.d.ts +2 -1
- package/dist/cjs/components/config/ConfigContext.d.ts.map +1 -1
- package/dist/cjs/components/config/ConfigContext.js.map +1 -1
- package/dist/cjs/components/config/ConfigProvider.d.ts.map +1 -1
- package/dist/cjs/components/config/ConfigProvider.js +4 -1
- package/dist/cjs/components/config/ConfigProvider.js.map +1 -1
- package/dist/cjs/components/magicLink/MagicProvider.js +1 -1
- package/dist/cjs/components/magicLink/MagicProvider.js.map +1 -1
- package/dist/cjs/components/magicLink/UserContext.d.ts.map +1 -1
- package/dist/cjs/components/magicLink/UserContext.js +10 -2
- package/dist/cjs/components/magicLink/UserContext.js.map +1 -1
- package/dist/cjs/components/wallet/ConnectButton.d.ts.map +1 -1
- package/dist/cjs/components/wallet/ConnectButton.js +3 -2
- package/dist/cjs/components/wallet/ConnectButton.js.map +1 -1
- package/dist/cjs/components/wallet2/walletModal/index.d.ts +7 -2
- package/dist/cjs/components/wallet2/walletModal/index.d.ts.map +1 -1
- package/dist/cjs/components/wallet2/walletModal/index.js +1 -1
- package/dist/cjs/components/wallet2/walletModal/index.js.map +1 -1
- package/dist/cjs/hooks/connection/connection.d.ts.map +1 -1
- package/dist/cjs/hooks/connection/connection.js +41 -12
- package/dist/cjs/hooks/connection/connection.js.map +1 -1
- package/dist/cjs/hooks/magic.d.ts +4 -4
- package/dist/cjs/hooks/magic.d.ts.map +1 -1
- package/dist/cjs/hooks/magic.js +9 -6
- package/dist/cjs/hooks/magic.js.map +1 -1
- package/dist/esm/components/config/ConfigContext.d.ts +2 -1
- package/dist/esm/components/config/ConfigContext.d.ts.map +1 -1
- package/dist/esm/components/config/ConfigContext.js.map +1 -1
- package/dist/esm/components/config/ConfigProvider.d.ts.map +1 -1
- package/dist/esm/components/config/ConfigProvider.js +4 -1
- package/dist/esm/components/config/ConfigProvider.js.map +1 -1
- package/dist/esm/components/magicLink/MagicProvider.js +1 -1
- package/dist/esm/components/magicLink/MagicProvider.js.map +1 -1
- package/dist/esm/components/magicLink/UserContext.d.ts.map +1 -1
- package/dist/esm/components/magicLink/UserContext.js +10 -2
- package/dist/esm/components/magicLink/UserContext.js.map +1 -1
- package/dist/esm/components/wallet/ConnectButton.d.ts.map +1 -1
- package/dist/esm/components/wallet/ConnectButton.js +4 -3
- package/dist/esm/components/wallet/ConnectButton.js.map +1 -1
- package/dist/esm/components/wallet2/walletModal/index.d.ts +7 -2
- package/dist/esm/components/wallet2/walletModal/index.d.ts.map +1 -1
- package/dist/esm/components/wallet2/walletModal/index.js +1 -1
- package/dist/esm/components/wallet2/walletModal/index.js.map +1 -1
- package/dist/esm/hooks/connection/connection.d.ts.map +1 -1
- package/dist/esm/hooks/connection/connection.js +41 -12
- package/dist/esm/hooks/connection/connection.js.map +1 -1
- package/dist/esm/hooks/magic.d.ts +4 -4
- package/dist/esm/hooks/magic.d.ts.map +1 -1
- package/dist/esm/hooks/magic.js +9 -6
- package/dist/esm/hooks/magic.js.map +1 -1
- package/package.json +5 -5
- package/src/components/config/ConfigContext.ts +2 -1
- package/src/components/config/ConfigProvider.tsx +5 -2
- package/src/components/magicLink/MagicProvider.tsx +1 -1
- package/src/components/magicLink/UserContext.tsx +10 -3
- package/src/components/wallet/ConnectButton.tsx +12 -9
- package/src/components/wallet2/walletModal/index.tsx +7 -3
- package/src/hooks/connection/connection.ts +42 -12
- package/src/hooks/magic.ts +9 -6
- package/src/stories/widgets/Commit.stories.tsx +2 -1
|
@@ -9,7 +9,7 @@ import ThemedButton, { bosonButtonThemes } from "../ui/ThemedButton";
|
|
|
9
9
|
import { useBreakpoints } from "../../hooks/useBreakpoints";
|
|
10
10
|
import { saveItemInStorage } from "../../hooks/storage/useBosonLocalStorage";
|
|
11
11
|
import { SignOut, Wallet } from "phosphor-react";
|
|
12
|
-
import { useIsMagicLoggedIn } from "../../hooks";
|
|
12
|
+
import { useConfigContext, useIsMagicLoggedIn } from "../../hooks";
|
|
13
13
|
import { useAccount, useChainId } from "../../hooks/connection/connection";
|
|
14
14
|
import { useDisconnect } from "../../hooks/connection/useDisconnect";
|
|
15
15
|
import { MagicLoginButton } from "../magicLink/Login";
|
|
@@ -56,6 +56,7 @@ const iconProps = {
|
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
58
|
export default function ConnectButton({ navigationBarPosition = "", showAddress = true, showChangeWallet, ...rest }) {
|
|
59
|
+
const { withMagicLink } = useConfigContext();
|
|
59
60
|
const { isLteXS, isLteS } = useBreakpoints();
|
|
60
61
|
const isSideBar = ["left", "right"].includes(navigationBarPosition);
|
|
61
62
|
const buttonPadding = isSideBar ? "0.75rem 1rem" : "";
|
|
@@ -77,12 +78,12 @@ export default function ConnectButton({ navigationBarPosition = "", showAddress
|
|
|
77
78
|
// reset the tag o undefined
|
|
78
79
|
Sentry.setTag("wallet_address", undefined);
|
|
79
80
|
return (React.createElement(React.Fragment, null,
|
|
80
|
-
React.createElement(MagicLoginButton, { buttonProps: {
|
|
81
|
+
withMagicLink && (React.createElement(MagicLoginButton, { buttonProps: {
|
|
81
82
|
size: isLteXS ? "small" : "regular",
|
|
82
83
|
theme: bosonButtonThemes({
|
|
83
84
|
withBosonStyle: false
|
|
84
85
|
})["primary"]
|
|
85
|
-
} }),
|
|
86
|
+
} })),
|
|
86
87
|
React.createElement(Button, { onClick: () => {
|
|
87
88
|
saveItemInStorage("isConnectWalletFromCommit", false);
|
|
88
89
|
openConnectModal();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectButton.js","sourceRoot":"","sources":["../../../../src/components/wallet/ConnectButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAa,aAAa,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,aAAa,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAC1D,OAAO,cAAc,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,YAAY,EAAE,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ConnectButton.js","sourceRoot":"","sources":["../../../../src/components/wallet/ConnectButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,17 @@ import { OptionProps } from "./Option";
|
|
|
5
5
|
import { MagicLoginButtonProps } from "../../magicLink/Login";
|
|
6
6
|
export type WalletModalProps = {
|
|
7
7
|
PrivacyPolicy: React.FC;
|
|
8
|
-
magicLoginButtonProps: MagicLoginButtonProps;
|
|
9
8
|
optionProps: Pick<OptionProps, "color" | "hoverFocusBackgroundColor" | "hoverColor" | "backgroundColor" | "borderRadius" | "onOptionClick"> & {
|
|
10
9
|
iconBorderRadius: CSSProperties["borderRadius"];
|
|
11
10
|
};
|
|
12
11
|
withMagicLogin?: boolean;
|
|
13
12
|
connectionErrorProps: ConnectionErrorViewProps;
|
|
14
|
-
}
|
|
13
|
+
} & ({
|
|
14
|
+
withMagicLogin: true;
|
|
15
|
+
magicLoginButtonProps: MagicLoginButtonProps;
|
|
16
|
+
} | {
|
|
17
|
+
withMagicLogin?: false;
|
|
18
|
+
magicLoginButtonProps?: undefined;
|
|
19
|
+
});
|
|
15
20
|
export declare function WalletModal({ PrivacyPolicy, magicLoginButtonProps, optionProps, withMagicLogin, connectionErrorProps }: WalletModalProps): JSX.Element;
|
|
16
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/wallet2/walletModal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI1D,OAA4B,EAC1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAU,WAAW,EAAE,MAAM,UAAU,CAAC;AAK/C,OAAO,EAAoB,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AA0BhF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IACxB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/wallet2/walletModal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI1D,OAA4B,EAC1B,wBAAwB,EACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAU,WAAW,EAAE,MAAM,UAAU,CAAC;AAK/C,OAAO,EAAoB,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AA0BhF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IACxB,WAAW,EAAE,IAAI,CACf,WAAW,EACT,OAAO,GACP,2BAA2B,GAC3B,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,eAAe,CAClB,GAAG;QAAE,gBAAgB,EAAE,aAAa,CAAC,cAAc,CAAC,CAAA;KAAE,CAAC;IACxD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,EAAE,wBAAwB,CAAC;CAChD,GAAG,CACA;IAAE,cAAc,EAAE,IAAI,CAAC;IAAC,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,GACtE;IAAE,cAAc,CAAC,EAAE,KAAK,CAAC;IAAC,qBAAqB,CAAC,EAAE,SAAS,CAAA;CAAE,CAChE,CAAC;AACF,wBAAgB,WAAW,CAAC,EAC1B,aAAa,EACb,qBAAqB,EACrB,WAAW,EACX,cAAqB,EACrB,oBAAoB,EACrB,EAAE,gBAAgB,eAuDlB"}
|
|
@@ -56,7 +56,7 @@ export function WalletModal({ PrivacyPolicy, magicLoginButtonProps, optionProps,
|
|
|
56
56
|
React.createElement(OptionGrid, { "data-testid": "option-grid", "$borderRadius": optionProps.borderRadius }, connections
|
|
57
57
|
.filter((connection) => connection.shouldDisplay())
|
|
58
58
|
.map((connection) => (React.createElement(Option, { ...optionProps, borderRadius: optionProps.iconBorderRadius, key: connection.getName(), connection: connection })))),
|
|
59
|
-
withMagicLogin && React.createElement(MagicLoginButton, { ...magicLoginButtonProps }),
|
|
59
|
+
withMagicLogin && magicLoginButtonProps && (React.createElement(MagicLoginButton, { ...magicLoginButtonProps })),
|
|
60
60
|
React.createElement(PrivacyPolicy, null)))));
|
|
61
61
|
}
|
|
62
62
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/wallet2/walletModal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,MAAyB,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,mBAEN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAe,MAAM,UAAU,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,gBAAgB;;;;CAInB,CAAC;AAEF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAkD;;;;mBAI5D,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa;;IAEnD,UAAU,CAAC,CAAC;;;CAGf,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/wallet2/walletModal/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,MAAyB,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,mBAEN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAe,MAAM,UAAU,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,gBAAgB;;;;CAInB,CAAC;AAEF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAkD;;;;mBAI5D,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa;;IAEnD,UAAU,CAAC,CAAC;;;CAGf,CAAC;AAmBF,MAAM,UAAU,WAAW,CAAC,EAC1B,aAAa,EACb,qBAAqB,EACrB,WAAW,EACX,cAAc,GAAG,IAAI,EACrB,oBAAoB,EACH;IACjB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IACtC,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,CAAC;IACrC,MAAM,cAAc,GAAG,cAAc,EAAE,CAAC;IACxC,MAAM,EAAE,eAAe,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAEjD,wHAAwH;IACxH,SAAS,CAAC,GAAG,EAAE;QACb,IACE,OAAO;YACP,gBAAgB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;YACtD,SAAS,KAAK,cAAc,CAAC,iBAAiB,CAAC,SAAS,EACxD;YACA,cAAc,CAAC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SAC9D;IACH,CAAC,EAAE;QACD,OAAO;QACP,cAAc,CAAC,iBAAiB,CAAC,SAAS;QAC1C,SAAS;QACT,MAAM,CAAC,OAAO;KACf,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAClD,OAAO,CACL,oBAAC,OAAO,mBAAa,cAAc;QACjC,oBAAC,IAAI,IAAC,cAAc,EAAC,eAAe,EAAC,YAAY,EAAC,MAAM,uBAEjD;QACN,eAAe,CAAC,MAAM,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CACnD,oBAAC,mBAAmB,OAAK,oBAAoB,GAAI,CAClD,CAAC,CAAC,CAAC,CACF,oBAAC,UAAU,YAAM,MAAM;YACrB,oBAAC,UAAU,mBACG,aAAa,mBACV,WAAW,CAAC,YAAY,IAEtC,WAAW;iBACT,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;iBAClD,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CACnB,oBAAC,MAAM,OACD,WAAW,EACf,YAAY,EAAE,WAAW,CAAC,gBAAgB,EAC1C,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,EACzB,UAAU,EAAE,UAAU,GACtB,CACH,CAAC,CACO;YACZ,cAAc,IAAI,qBAAqB,IAAI,CAC1C,oBAAC,gBAAgB,OAAK,qBAAqB,GAAI,CAChD;YACD,oBAAC,aAAa,OAAG,CACN,CACd,CACO,CACX,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/hooks/connection/connection.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAG3C,wBAAgB,UAAU;;EAyCzB;AAED,wBAAgB,UAAU,IAAI,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../../src/hooks/connection/connection.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAG3C,wBAAgB,UAAU;;EAyCzB;AAED,wBAAgB,UAAU,IAAI,MAAM,GAAG,SAAS,CA4C/C;AAED,wBAAgB,0BAA0B,IAAI,OAAO,CAKpD;AAED,wBAAgB,WAAW,IACvB,SAAS,CAAC,eAAe,GACzB,SAAS,CAAC,gBAAgB,CA8B7B;AAED,wBAAgB,SAAS,IAAI,MAAM,GAAG,SAAS,CAmD9C;AAED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,UAAU,CAClB,WAAW,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CACxD,CAAC,CAAC,CAAC,EACJ,OAAO,GAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAuB,yFAUnD"}
|
|
@@ -46,26 +46,36 @@ export function useAccount() {
|
|
|
46
46
|
}
|
|
47
47
|
export function useChainId() {
|
|
48
48
|
const { chainId: web3ReactChainId } = useWeb3ReactWrapper() || {};
|
|
49
|
-
const { withExternalConnectionProps, externalConnectedChainId, withWeb3React } = useConfigContext();
|
|
49
|
+
const { withExternalConnectionProps, externalConnectedChainId, withWeb3React, withMagicLink } = useConfigContext();
|
|
50
50
|
const externalSigner = useExternalSigner();
|
|
51
51
|
const { data: externalSignerChainId } = useExternalSignerChainId();
|
|
52
|
-
const magicChainId = useMagicChainId();
|
|
53
52
|
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
54
53
|
let networkChainId;
|
|
54
|
+
let magicChainId;
|
|
55
55
|
let error;
|
|
56
|
+
let magicError;
|
|
56
57
|
try {
|
|
57
58
|
networkChainId = useNetwork().chain?.id;
|
|
58
59
|
}
|
|
59
60
|
catch (wagmiError) {
|
|
60
61
|
error = wagmiError; // error if the provider is not there
|
|
61
62
|
}
|
|
63
|
+
try {
|
|
64
|
+
magicChainId = useMagicChainId();
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
magicError = error; // error if the provider is not there
|
|
68
|
+
}
|
|
69
|
+
if (!withExternalConnectionProps && magicError && withMagicLink) {
|
|
70
|
+
throw magicError;
|
|
71
|
+
}
|
|
62
72
|
if (externalConnectedChainId) {
|
|
63
73
|
return externalConnectedChainId;
|
|
64
74
|
}
|
|
65
75
|
if (externalSigner) {
|
|
66
76
|
return externalSignerChainId;
|
|
67
77
|
}
|
|
68
|
-
if (isMagicLoggedIn) {
|
|
78
|
+
if (isMagicLoggedIn && withMagicLink) {
|
|
69
79
|
return magicChainId;
|
|
70
80
|
}
|
|
71
81
|
if (web3ReactChainId) {
|
|
@@ -83,9 +93,9 @@ export function useIsConnectedToWrongChain() {
|
|
|
83
93
|
return connectedToWrongChain;
|
|
84
94
|
}
|
|
85
95
|
export function useProvider() {
|
|
86
|
-
const { withExternalConnectionProps, withWeb3React } = useConfigContext();
|
|
96
|
+
const { withExternalConnectionProps, withWeb3React, withMagicLink } = useConfigContext();
|
|
87
97
|
const { provider: web3Provider } = useWeb3ReactWrapper() || {};
|
|
88
|
-
let provider;
|
|
98
|
+
let provider, magicProvider;
|
|
89
99
|
let error;
|
|
90
100
|
try {
|
|
91
101
|
provider = useEthersProvider();
|
|
@@ -93,19 +103,29 @@ export function useProvider() {
|
|
|
93
103
|
catch (wagmiError) {
|
|
94
104
|
error = wagmiError; // error if the provider is not there
|
|
95
105
|
}
|
|
96
|
-
const magicProvider = useMagicProvider();
|
|
97
|
-
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
98
106
|
if (!withExternalConnectionProps && error && !withWeb3React) {
|
|
99
107
|
throw error;
|
|
100
108
|
}
|
|
109
|
+
try {
|
|
110
|
+
magicProvider = useMagicProvider();
|
|
111
|
+
}
|
|
112
|
+
catch (magicError) {
|
|
113
|
+
error = magicError; // error if the provider is not there
|
|
114
|
+
}
|
|
115
|
+
if (!withExternalConnectionProps && error && withMagicLink) {
|
|
116
|
+
throw error;
|
|
117
|
+
}
|
|
118
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
119
|
+
const magicLinkProvider = magicProvider; // it should always be not null at this point
|
|
120
|
+
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
101
121
|
return isMagicLoggedIn
|
|
102
|
-
?
|
|
122
|
+
? magicLinkProvider ?? web3Provider ?? provider
|
|
103
123
|
: withWeb3React
|
|
104
|
-
? web3Provider ??
|
|
105
|
-
: provider ??
|
|
124
|
+
? web3Provider ?? magicLinkProvider ?? provider
|
|
125
|
+
: provider ?? magicLinkProvider ?? web3Provider;
|
|
106
126
|
}
|
|
107
127
|
export function useSigner() {
|
|
108
|
-
const { withExternalConnectionProps, externalConnectedSigner, withWeb3React } = useConfigContext();
|
|
128
|
+
const { withExternalConnectionProps, externalConnectedSigner, withWeb3React, withMagicLink } = useConfigContext();
|
|
109
129
|
let wagmiSigner, error;
|
|
110
130
|
try {
|
|
111
131
|
const ethersSigner = useEthersSigner();
|
|
@@ -114,8 +134,14 @@ export function useSigner() {
|
|
|
114
134
|
catch (wagmiError) {
|
|
115
135
|
error = wagmiError; // error if the provider is not there
|
|
116
136
|
}
|
|
137
|
+
let magicProvider, magicError;
|
|
138
|
+
try {
|
|
139
|
+
magicProvider = useMagicProvider();
|
|
140
|
+
}
|
|
141
|
+
catch (err) {
|
|
142
|
+
magicError = err; // error if the provider is not there
|
|
143
|
+
}
|
|
117
144
|
const { externalSigner } = useExternalSigner() ?? {};
|
|
118
|
-
const magicProvider = useMagicProvider();
|
|
119
145
|
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
120
146
|
const { provider: web3Provider } = useWeb3ReactWrapper() || {};
|
|
121
147
|
const signer = useMemo(() => {
|
|
@@ -140,6 +166,9 @@ export function useSigner() {
|
|
|
140
166
|
if (!withExternalConnectionProps && error && !withWeb3React) {
|
|
141
167
|
throw error;
|
|
142
168
|
}
|
|
169
|
+
if (!withExternalConnectionProps && magicError && withMagicLink) {
|
|
170
|
+
throw magicError;
|
|
171
|
+
}
|
|
143
172
|
return signer;
|
|
144
173
|
}
|
|
145
174
|
export function useBalance(blockTag, options = { enabled: false }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../src/hooks/connection/connection.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,iDAAiD;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,MAAM,UAAU,UAAU;IACxB,IAAI,YAAuC,EAAE,KAAc,CAAC;IAC5D,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,EAAE,IAAI,EAAE,CAAC;IAClE,MAAM,EACJ,2BAA2B,EAC3B,wBAAwB,EACxB,aAAa,EACd,GAAG,gBAAgB,EAAE,CAAC;IACvB,IAAI;QACF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;QAC/C,YAAY,GAAG,OAAO,CAAC;KACxB;IAAC,OAAO,GAAG,EAAE;QACZ,KAAK,GAAG,GAAG,CAAC;KACb;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAC3B,MAAM,EAAE,sBAAsB,EAAE,GAAG,iBAAiB,EAAE,IAAI,EAAE,CAAC;IAC7D,MAAM,EAAE,aAAa,EAAE,qBAAqB,EAAE,GAAG,gBAAgB,CAC/D,sBAAsB,CACvB,CAAC;IACF,MAAM,OAAO,GAAG,OAAO,CACrB,GAAG,EAAE,CAAC,CAAC;QACL,OAAO,EACL,wBAAwB;YACxB,qBAAqB;YACrB,YAAY;YACZ,gBAAgB;YAChB,IAAI;KACP,CAAC,EACF;QACE,YAAY;QACZ,IAAI;QACJ,gBAAgB;QAChB,qBAAqB;QACrB,wBAAwB;KACzB,CACF,CAAC;IACF,IAAI,CAAC,2BAA2B,IAAI,KAAK,IAAI,CAAC,aAAa,EAAE;QAC3D,MAAM,KAAK,CAAC;KACb;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,EAAE,IAAI,EAAE,CAAC;IAClE,MAAM,EACJ,2BAA2B,EAC3B,wBAAwB,EACxB,aAAa,EACd,GAAG,gBAAgB,EAAE,CAAC;IACvB,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;IAC3C,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,GAAG,wBAAwB,EAAE,CAAC;IACnE,MAAM,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../../src/hooks/connection/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export declare const useMagic: () => import("@magic-sdk/provider").SDKBase & {
|
|
1
|
+
export declare const useMagic: () => (import("@magic-sdk/provider").SDKBase & {
|
|
2
2
|
[x: string]: Omit<import("magic-sdk").Extension<string>, "name" | "init" | "config" | "compat">;
|
|
3
3
|
} & {
|
|
4
4
|
uuid: string;
|
|
5
|
-
};
|
|
5
|
+
}) | undefined;
|
|
6
6
|
export declare const useWalletInfo: () => import("react-query").UseQueryResult<import("magic-sdk").WalletInfo | undefined, unknown>;
|
|
7
|
-
export declare function useMagicProvider(): import("@ethersproject/providers").Web3Provider;
|
|
8
|
-
export declare function useMagicChainId(): number;
|
|
7
|
+
export declare function useMagicProvider(): import("@ethersproject/providers").Web3Provider | undefined;
|
|
8
|
+
export declare function useMagicChainId(): number | undefined;
|
|
9
9
|
export declare function useIsMagicLoggedIn(): boolean;
|
|
10
10
|
//# sourceMappingURL=magic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magic.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"magic.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,QAAQ;;;;cAOpB,CAAC;AAEF,eAAO,MAAM,aAAa,iGASzB,CAAC;AAEF,wBAAgB,gBAAgB,gEAO/B;AAED,wBAAgB,eAAe,uBAG9B;AAED,wBAAgB,kBAAkB,YAIjC"}
|
package/dist/esm/hooks/magic.js
CHANGED
|
@@ -2,12 +2,14 @@ import { useContext } from "react";
|
|
|
2
2
|
import { useQuery } from "react-query";
|
|
3
3
|
import { MagicContext } from "../components/magicLink/MagicContext";
|
|
4
4
|
import { useUser } from "../components/magicLink/UserContext";
|
|
5
|
+
import { useConfigContext } from "../components/config/ConfigContext";
|
|
5
6
|
export const useMagic = () => {
|
|
7
|
+
const { withMagicLink } = useConfigContext();
|
|
6
8
|
const context = useContext(MagicContext);
|
|
7
|
-
if (!context) {
|
|
9
|
+
if (!context && withMagicLink) {
|
|
8
10
|
throw new Error("useMagic must be used within MagicContext");
|
|
9
11
|
}
|
|
10
|
-
return context
|
|
12
|
+
return context?.magic;
|
|
11
13
|
};
|
|
12
14
|
export const useWalletInfo = () => {
|
|
13
15
|
const magic = useMagic();
|
|
@@ -20,19 +22,20 @@ export const useWalletInfo = () => {
|
|
|
20
22
|
});
|
|
21
23
|
};
|
|
22
24
|
export function useMagicProvider() {
|
|
25
|
+
const { withMagicLink } = useConfigContext();
|
|
23
26
|
const context = useContext(MagicContext);
|
|
24
|
-
if (!context) {
|
|
27
|
+
if (!context && withMagicLink) {
|
|
25
28
|
throw new Error("useMagic must be used within MagicContext");
|
|
26
29
|
}
|
|
27
|
-
return context
|
|
30
|
+
return context?.magicProvider;
|
|
28
31
|
}
|
|
29
32
|
export function useMagicChainId() {
|
|
30
33
|
const magicProvider = useMagicProvider();
|
|
31
34
|
return magicProvider?._network?.chainId;
|
|
32
35
|
}
|
|
33
36
|
export function useIsMagicLoggedIn() {
|
|
34
|
-
const
|
|
35
|
-
const isMagicLoggedIn = !!user;
|
|
37
|
+
const userContext = useUser();
|
|
38
|
+
const isMagicLoggedIn = !!userContext?.user;
|
|
36
39
|
return isMagicLoggedIn;
|
|
37
40
|
}
|
|
38
41
|
//# sourceMappingURL=magic.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magic.js","sourceRoot":"","sources":["../../../src/hooks/magic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"magic.js","sourceRoot":"","sources":["../../../src/hooks/magic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,IAAI,aAAa,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;IACD,OAAO,OAAO,EAAE,KAAK,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,QAAQ,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE;QACvD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO;SACR;QACD,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAChD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,aAAa,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IACzC,IAAI,CAAC,OAAO,IAAI,aAAa,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;IACD,OAAO,OAAO,EAAE,aAAa,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,OAAO,aAAa,EAAE,QAAQ,EAAE,OAAO,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,WAAW,GAAG,OAAO,EAAE,CAAC;IAC9B,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,EAAE,IAAI,CAAC;IAC5C,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bosonprotocol/react-kit",
|
|
3
3
|
"description": "React toolkit with smart components and hooks for building on top of the Boson Protocol.",
|
|
4
|
-
"version": "0.34.0-alpha.
|
|
4
|
+
"version": "0.34.0-alpha.21",
|
|
5
5
|
"main": "./dist/cjs/index.js",
|
|
6
6
|
"module": "./dist/esm/index.js",
|
|
7
7
|
"types": "./dist/cjs/index.d.ts",
|
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
"license": "Apache-2.0",
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@bosonprotocol/chat-sdk": "^1.3.1-alpha.9",
|
|
18
|
-
"@bosonprotocol/core-sdk": "^1.41.0-alpha.
|
|
19
|
-
"@bosonprotocol/ethers-sdk": "^1.15.0-alpha.
|
|
20
|
-
"@bosonprotocol/ipfs-storage": "^1.12.0-alpha.
|
|
18
|
+
"@bosonprotocol/core-sdk": "^1.41.0-alpha.23",
|
|
19
|
+
"@bosonprotocol/ethers-sdk": "^1.15.0-alpha.9",
|
|
20
|
+
"@bosonprotocol/ipfs-storage": "^1.12.0-alpha.21",
|
|
21
21
|
"@davatar/react": "1.11.1",
|
|
22
22
|
"@ethersproject/units": "5.6.0",
|
|
23
23
|
"@glidejs/glide": "3.6.0",
|
|
@@ -188,5 +188,5 @@
|
|
|
188
188
|
"overrides": {
|
|
189
189
|
"typescript": "^5.1.6"
|
|
190
190
|
},
|
|
191
|
-
"gitHead": "
|
|
191
|
+
"gitHead": "ebc52c8e171d0ac50a9f38301acf2f160fbeebd4"
|
|
192
192
|
}
|
|
@@ -11,7 +11,7 @@ export type ConfigContextProps = {
|
|
|
11
11
|
symbol: "$" | string;
|
|
12
12
|
};
|
|
13
13
|
usePendingTransactions?: boolean;
|
|
14
|
-
magicLinkKey
|
|
14
|
+
magicLinkKey?: string;
|
|
15
15
|
infuraKey: string;
|
|
16
16
|
supportedChains: number[];
|
|
17
17
|
externalConnectedChainId?: number;
|
|
@@ -20,6 +20,7 @@ export type ConfigContextProps = {
|
|
|
20
20
|
withExternalConnectionProps?: boolean;
|
|
21
21
|
withWeb3React: boolean;
|
|
22
22
|
withCustomReduxContext?: boolean;
|
|
23
|
+
withMagicLink?: boolean;
|
|
23
24
|
};
|
|
24
25
|
|
|
25
26
|
export const ConfigContext = createContext<
|
|
@@ -48,6 +48,9 @@ export function ConfigProvider({
|
|
|
48
48
|
const Web3ProviderComponent = useMemo(() => {
|
|
49
49
|
return rest.withWeb3React ? InnerWeb3Provider : Fragment;
|
|
50
50
|
}, [rest.withWeb3React]);
|
|
51
|
+
const MagicLinkProvider = useMemo(() => {
|
|
52
|
+
return rest.withMagicLink ? MagicProvider : Fragment;
|
|
53
|
+
}, [rest.withMagicLink]);
|
|
51
54
|
return (
|
|
52
55
|
<EnvironmentProvider
|
|
53
56
|
envName={rest.envName}
|
|
@@ -56,13 +59,13 @@ export function ConfigProvider({
|
|
|
56
59
|
>
|
|
57
60
|
<InnerConfigProvider {...rest}>
|
|
58
61
|
<Web3ProviderComponent>
|
|
59
|
-
<
|
|
62
|
+
<MagicLinkProvider>
|
|
60
63
|
<WalletConnectionProvider
|
|
61
64
|
walletConnectProjectId={walletConnectProjectId}
|
|
62
65
|
>
|
|
63
66
|
<SyncCurrentConfigId>{children}</SyncCurrentConfigId>
|
|
64
67
|
</WalletConnectionProvider>
|
|
65
|
-
</
|
|
68
|
+
</MagicLinkProvider>
|
|
66
69
|
</Web3ProviderComponent>
|
|
67
70
|
</InnerConfigProvider>
|
|
68
71
|
</EnvironmentProvider>
|
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import React, { useContext } from "react";
|
|
2
|
+
import { useConfigContext } from "../config/ConfigContext";
|
|
2
3
|
|
|
3
4
|
export const UserContext = React.createContext<{
|
|
4
5
|
user: string | undefined;
|
|
5
6
|
setUser: React.Dispatch<React.SetStateAction<string | undefined>>;
|
|
6
7
|
} | null>(null);
|
|
7
|
-
|
|
8
|
+
const emptyUserContext = {
|
|
9
|
+
user: "",
|
|
10
|
+
setUser: () => {
|
|
11
|
+
//
|
|
12
|
+
}
|
|
13
|
+
};
|
|
8
14
|
export const useUser = () => {
|
|
15
|
+
const { withMagicLink } = useConfigContext();
|
|
9
16
|
const value = useContext(UserContext);
|
|
10
|
-
if (!value) {
|
|
17
|
+
if (!value && withMagicLink) {
|
|
11
18
|
throw new Error(`useUser must be used under a UserProvider`);
|
|
12
19
|
}
|
|
13
|
-
return value;
|
|
20
|
+
return value || emptyUserContext;
|
|
14
21
|
};
|
|
@@ -10,7 +10,7 @@ import ThemedButton, { bosonButtonThemes } from "../ui/ThemedButton";
|
|
|
10
10
|
import { useBreakpoints } from "../../hooks/useBreakpoints";
|
|
11
11
|
import { saveItemInStorage } from "../../hooks/storage/useBosonLocalStorage";
|
|
12
12
|
import { SignOut, Wallet } from "phosphor-react";
|
|
13
|
-
import { useIsMagicLoggedIn } from "../../hooks";
|
|
13
|
+
import { useConfigContext, useIsMagicLoggedIn } from "../../hooks";
|
|
14
14
|
import { useAccount, useChainId } from "../../hooks/connection/connection";
|
|
15
15
|
import { useDisconnect } from "../../hooks/connection/useDisconnect";
|
|
16
16
|
import { MagicLoginButton } from "../magicLink/Login";
|
|
@@ -79,6 +79,7 @@ export default function ConnectButton({
|
|
|
79
79
|
showChangeWallet,
|
|
80
80
|
...rest
|
|
81
81
|
}: Props) {
|
|
82
|
+
const { withMagicLink } = useConfigContext();
|
|
82
83
|
const { isLteXS, isLteS } = useBreakpoints();
|
|
83
84
|
const isSideBar = ["left", "right"].includes(navigationBarPosition);
|
|
84
85
|
const buttonPadding = isSideBar ? "0.75rem 1rem" : "";
|
|
@@ -120,14 +121,16 @@ export default function ConnectButton({
|
|
|
120
121
|
|
|
121
122
|
return (
|
|
122
123
|
<>
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
124
|
+
{withMagicLink && (
|
|
125
|
+
<MagicLoginButton
|
|
126
|
+
buttonProps={{
|
|
127
|
+
size: isLteXS ? "small" : "regular",
|
|
128
|
+
theme: bosonButtonThemes({
|
|
129
|
+
withBosonStyle: false
|
|
130
|
+
})["primary"]
|
|
131
|
+
}}
|
|
132
|
+
/>
|
|
133
|
+
)}
|
|
131
134
|
<Button
|
|
132
135
|
onClick={() => {
|
|
133
136
|
saveItemInStorage(
|
|
@@ -41,7 +41,6 @@ const OptionGrid = styled.div<{ $borderRadius: CSSProperties["borderRadius"] }>`
|
|
|
41
41
|
|
|
42
42
|
export type WalletModalProps = {
|
|
43
43
|
PrivacyPolicy: React.FC;
|
|
44
|
-
magicLoginButtonProps: MagicLoginButtonProps;
|
|
45
44
|
optionProps: Pick<
|
|
46
45
|
OptionProps,
|
|
47
46
|
| "color"
|
|
@@ -53,7 +52,10 @@ export type WalletModalProps = {
|
|
|
53
52
|
> & { iconBorderRadius: CSSProperties["borderRadius"] };
|
|
54
53
|
withMagicLogin?: boolean;
|
|
55
54
|
connectionErrorProps: ConnectionErrorViewProps;
|
|
56
|
-
}
|
|
55
|
+
} & (
|
|
56
|
+
| { withMagicLogin: true; magicLoginButtonProps: MagicLoginButtonProps }
|
|
57
|
+
| { withMagicLogin?: false; magicLoginButtonProps?: undefined }
|
|
58
|
+
);
|
|
57
59
|
export function WalletModal({
|
|
58
60
|
PrivacyPolicy,
|
|
59
61
|
magicLoginButtonProps,
|
|
@@ -107,7 +109,9 @@ export function WalletModal({
|
|
|
107
109
|
/>
|
|
108
110
|
))}
|
|
109
111
|
</OptionGrid>
|
|
110
|
-
{withMagicLogin &&
|
|
112
|
+
{withMagicLogin && magicLoginButtonProps && (
|
|
113
|
+
<MagicLoginButton {...magicLoginButtonProps} />
|
|
114
|
+
)}
|
|
111
115
|
<PrivacyPolicy />
|
|
112
116
|
</AutoColumn>
|
|
113
117
|
)}
|
|
@@ -67,26 +67,36 @@ export function useChainId(): number | undefined {
|
|
|
67
67
|
const {
|
|
68
68
|
withExternalConnectionProps,
|
|
69
69
|
externalConnectedChainId,
|
|
70
|
-
withWeb3React
|
|
70
|
+
withWeb3React,
|
|
71
|
+
withMagicLink
|
|
71
72
|
} = useConfigContext();
|
|
72
73
|
const externalSigner = useExternalSigner();
|
|
73
74
|
const { data: externalSignerChainId } = useExternalSignerChainId();
|
|
74
|
-
const magicChainId = useMagicChainId();
|
|
75
75
|
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
76
76
|
let networkChainId: number | undefined;
|
|
77
|
+
let magicChainId: number | undefined;
|
|
77
78
|
let error: unknown;
|
|
79
|
+
let magicError: unknown;
|
|
78
80
|
try {
|
|
79
81
|
networkChainId = useNetwork().chain?.id;
|
|
80
82
|
} catch (wagmiError) {
|
|
81
83
|
error = wagmiError; // error if the provider is not there
|
|
82
84
|
}
|
|
85
|
+
try {
|
|
86
|
+
magicChainId = useMagicChainId();
|
|
87
|
+
} catch (error) {
|
|
88
|
+
magicError = error; // error if the provider is not there
|
|
89
|
+
}
|
|
90
|
+
if (!withExternalConnectionProps && magicError && withMagicLink) {
|
|
91
|
+
throw magicError;
|
|
92
|
+
}
|
|
83
93
|
if (externalConnectedChainId) {
|
|
84
94
|
return externalConnectedChainId;
|
|
85
95
|
}
|
|
86
96
|
if (externalSigner) {
|
|
87
97
|
return externalSignerChainId;
|
|
88
98
|
}
|
|
89
|
-
if (isMagicLoggedIn) {
|
|
99
|
+
if (isMagicLoggedIn && withMagicLink) {
|
|
90
100
|
return magicChainId;
|
|
91
101
|
}
|
|
92
102
|
if (web3ReactChainId) {
|
|
@@ -108,32 +118,43 @@ export function useIsConnectedToWrongChain(): boolean {
|
|
|
108
118
|
export function useProvider():
|
|
109
119
|
| providers.JsonRpcProvider
|
|
110
120
|
| providers.FallbackProvider {
|
|
111
|
-
const { withExternalConnectionProps, withWeb3React } =
|
|
121
|
+
const { withExternalConnectionProps, withWeb3React, withMagicLink } =
|
|
122
|
+
useConfigContext();
|
|
112
123
|
const { provider: web3Provider } = useWeb3ReactWrapper() || {};
|
|
113
|
-
let provider;
|
|
124
|
+
let provider, magicProvider;
|
|
114
125
|
let error: unknown;
|
|
115
126
|
try {
|
|
116
127
|
provider = useEthersProvider();
|
|
117
128
|
} catch (wagmiError) {
|
|
118
129
|
error = wagmiError; // error if the provider is not there
|
|
119
130
|
}
|
|
120
|
-
const magicProvider = useMagicProvider();
|
|
121
|
-
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
122
131
|
if (!withExternalConnectionProps && error && !withWeb3React) {
|
|
123
132
|
throw error;
|
|
124
133
|
}
|
|
134
|
+
try {
|
|
135
|
+
magicProvider = useMagicProvider();
|
|
136
|
+
} catch (magicError) {
|
|
137
|
+
error = magicError; // error if the provider is not there
|
|
138
|
+
}
|
|
139
|
+
if (!withExternalConnectionProps && error && withMagicLink) {
|
|
140
|
+
throw error;
|
|
141
|
+
}
|
|
142
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
143
|
+
const magicLinkProvider = magicProvider!; // it should always be not null at this point
|
|
144
|
+
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
125
145
|
return isMagicLoggedIn
|
|
126
|
-
?
|
|
146
|
+
? magicLinkProvider ?? web3Provider ?? provider
|
|
127
147
|
: withWeb3React
|
|
128
|
-
? web3Provider ??
|
|
129
|
-
: provider ??
|
|
148
|
+
? web3Provider ?? magicLinkProvider ?? provider
|
|
149
|
+
: provider ?? magicLinkProvider ?? web3Provider;
|
|
130
150
|
}
|
|
131
151
|
|
|
132
152
|
export function useSigner(): Signer | undefined {
|
|
133
153
|
const {
|
|
134
154
|
withExternalConnectionProps,
|
|
135
155
|
externalConnectedSigner,
|
|
136
|
-
withWeb3React
|
|
156
|
+
withWeb3React,
|
|
157
|
+
withMagicLink
|
|
137
158
|
} = useConfigContext();
|
|
138
159
|
let wagmiSigner: ReturnType<typeof useEthersSigner>, error: unknown;
|
|
139
160
|
try {
|
|
@@ -142,8 +163,14 @@ export function useSigner(): Signer | undefined {
|
|
|
142
163
|
} catch (wagmiError) {
|
|
143
164
|
error = wagmiError; // error if the provider is not there
|
|
144
165
|
}
|
|
166
|
+
let magicProvider: providers.Web3Provider | undefined, magicError: unknown;
|
|
167
|
+
|
|
168
|
+
try {
|
|
169
|
+
magicProvider = useMagicProvider();
|
|
170
|
+
} catch (err) {
|
|
171
|
+
magicError = err; // error if the provider is not there
|
|
172
|
+
}
|
|
145
173
|
const { externalSigner } = useExternalSigner() ?? {};
|
|
146
|
-
const magicProvider = useMagicProvider();
|
|
147
174
|
const isMagicLoggedIn = useIsMagicLoggedIn();
|
|
148
175
|
const { provider: web3Provider } = useWeb3ReactWrapper() || {};
|
|
149
176
|
|
|
@@ -169,6 +196,9 @@ export function useSigner(): Signer | undefined {
|
|
|
169
196
|
if (!withExternalConnectionProps && error && !withWeb3React) {
|
|
170
197
|
throw error;
|
|
171
198
|
}
|
|
199
|
+
if (!withExternalConnectionProps && magicError && withMagicLink) {
|
|
200
|
+
throw magicError;
|
|
201
|
+
}
|
|
172
202
|
return signer;
|
|
173
203
|
}
|
|
174
204
|
|