@mezo-org/passport 0.4.0-dev.84 → 0.5.0
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/src/components/Dropdown/Dropdown.js +2 -2
- package/dist/src/components/Dropdown/Dropdown.js.map +1 -1
- package/dist/src/components/Dropdown/Receive/Receive.js +6 -6
- package/dist/src/components/Dropdown/Receive/Receive.js.map +1 -1
- package/dist/src/components/Dropdown/Root/AccountAddressActions.js +2 -2
- package/dist/src/components/Dropdown/Root/AccountAddressActions.js.map +1 -1
- package/dist/src/components/Dropdown/Root/WalletAddress.d.ts.map +1 -1
- package/dist/src/components/Dropdown/Root/WalletAddress.js +1 -2
- package/dist/src/components/Dropdown/Root/WalletAddress.js.map +1 -1
- package/dist/src/config.d.ts +1 -0
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +9 -1
- package/dist/src/config.js.map +1 -1
- package/dist/src/hooks/useAuthenticateWithWallet.d.ts.map +1 -1
- package/dist/src/hooks/useAuthenticateWithWallet.js +5 -5
- package/dist/src/hooks/useAuthenticateWithWallet.js.map +1 -1
- package/dist/src/hooks/useBorrowData.js +4 -4
- package/dist/src/hooks/useBorrowData.js.map +1 -1
- package/dist/src/hooks/useCreateAccount.js +2 -2
- package/dist/src/hooks/useCreateAccount.js.map +1 -1
- package/dist/src/hooks/useLinkAccount.js +2 -2
- package/dist/src/hooks/useLinkAccount.js.map +1 -1
- package/dist/src/hooks/useTokensBalances.js +5 -5
- package/dist/src/hooks/useTokensBalances.js.map +1 -1
- package/dist/src/hooks/useWalletAccount.d.ts +6 -8
- package/dist/src/hooks/useWalletAccount.d.ts.map +1 -1
- package/dist/src/hooks/useWalletAccount.js +6 -8
- package/dist/src/hooks/useWalletAccount.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Dropdown/Dropdown.tsx +2 -2
- package/src/components/Dropdown/Receive/Receive.tsx +6 -6
- package/src/components/Dropdown/Root/AccountAddressActions.tsx +2 -2
- package/src/components/Dropdown/Root/WalletAddress.tsx +1 -4
- package/src/config.ts +11 -1
- package/src/hooks/useAuthenticateWithWallet.ts +7 -14
- package/src/hooks/useBorrowData.ts +4 -4
- package/src/hooks/useCreateAccount.ts +2 -2
- package/src/hooks/useLinkAccount.ts +2 -2
- package/src/hooks/useTokensBalances.ts +5 -5
- package/src/hooks/useWalletAccount.ts +12 -16
|
@@ -15,10 +15,10 @@ import { useWatchTransferEventsForAllTokens } from "../../hooks/useWatchTransfer
|
|
|
15
15
|
export function Dropdown(props) {
|
|
16
16
|
const { placement = "bottomRight", animateOutTime = 120, onSignIn, onSignOut, overrides, triggerProps, onOtherAssetsClick, ...restProps } = props;
|
|
17
17
|
const [, theme] = useStyletron();
|
|
18
|
-
const
|
|
18
|
+
const walletAccount = useWalletAccount();
|
|
19
19
|
useWatchTransferEventsForAllTokens();
|
|
20
20
|
const { openConnectModal } = useConnectModal();
|
|
21
|
-
if (!
|
|
21
|
+
if (!walletAccount?.isConnected) {
|
|
22
22
|
return (React.createElement(DisconnectedTrigger
|
|
23
23
|
// If connect wallet flow is not provided it fallbacks to RainbowKit's
|
|
24
24
|
// connect modal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/Dropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEf,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;AACtD,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,gBAAgB,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAA;AAiBvF;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAoB;IAC3C,MAAM,EACJ,SAAS,GAAG,aAAa,EACzB,cAAc,GAAG,GAAG,EACpB,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,GAAG,SAAS,EACb,GAAG,KAAK,CAAA;IAET,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,MAAM,
|
|
1
|
+
{"version":3,"file":"Dropdown.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/Dropdown.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEf,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;AACtD,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,mBAAmB,MAAM,uBAAuB,CAAA;AACvD,OAAO,gBAAgB,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,kCAAkC,EAAE,MAAM,oCAAoC,CAAA;AAiBvF;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAoB;IAC3C,MAAM,EACJ,SAAS,GAAG,aAAa,EACzB,cAAc,GAAG,GAAG,EACpB,QAAQ,EACR,SAAS,EACT,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,GAAG,SAAS,EACb,GAAG,KAAK,CAAA;IAET,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,kCAAkC,EAAE,CAAA;IAEpC,MAAM,EAAE,gBAAgB,EAAE,GAAG,eAAe,EAAE,CAAA;IAE9C,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;QAChC,OAAO,CACL,oBAAC,mBAAmB;QAClB,sEAAsE;QACtE,gBAAgB;;YADhB,sEAAsE;YACtE,gBAAgB;YAChB,OAAO,EAAE,QAAQ,IAAI,gBAAgB,KACjC,YAAY,EAAE,SAAS,cAGP,CACvB,CAAA;IACH,CAAC;IAED,OAAO,CACL,oBAAC,eAAe,IACd,OAAO,EACL,oBAAC,OAAO,IACN,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,kBAAkB,GACtC,EAEJ,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE;YACT,GAAG,SAAS;YACZ,IAAI,EAAE;gBACJ,GAAG,SAAS,EAAE,IAAI;gBAClB,KAAK,EAAE;oBACL,KAAK,EAAE,OAAO;oBACd,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS;oBACrC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;oBACnC,QAAQ,EAAE,QAAQ;oBAClB,GAAG,SAAS,EAAE,IAAI,EAAE,KAAK;iBAC1B;aACF;SACF,KACG,SAAS;QAEb,oBAAC,gBAAgB,IACf,MAAM,EAAE,oBAAC,aAAa,OAAG,KACrB,YAAY,EAAE,QAAQ,GAC1B,CACc,CACnB,CAAA;AACH,CAAC"}
|
|
@@ -8,22 +8,22 @@ import { usePassportContext } from "../../../hooks/usePassportContext";
|
|
|
8
8
|
import useWalletAccount from "../../../hooks/useWalletAccount";
|
|
9
9
|
function Receive() {
|
|
10
10
|
const { environment } = usePassportContext();
|
|
11
|
-
const
|
|
11
|
+
const walletAccount = useWalletAccount();
|
|
12
12
|
const [, theme] = useStyletron();
|
|
13
13
|
const [, copy] = useCopyToClipboard();
|
|
14
14
|
const [isCopiedMessageVisible, setIsCopiedMessageVisible] = useState(false);
|
|
15
15
|
const handleCopyAddress = () => {
|
|
16
|
-
copy(
|
|
16
|
+
copy(walletAccount.accountAddress);
|
|
17
17
|
setIsCopiedMessageVisible(true);
|
|
18
18
|
setTimeout(() => {
|
|
19
19
|
setIsCopiedMessageVisible(false);
|
|
20
20
|
}, 2000);
|
|
21
21
|
};
|
|
22
|
-
const blockExplorerUrl = getAddressExplorerUrl(
|
|
22
|
+
const blockExplorerUrl = getAddressExplorerUrl(walletAccount.accountAddress, "mezo", environment === "testnet");
|
|
23
23
|
return (React.createElement(NestedViewLayout, null,
|
|
24
24
|
React.createElement(LabelLarge, null, "Your Mezo Address"),
|
|
25
|
-
React.createElement(ParagraphSmall, { marginTop: 0, marginBottom: theme.sizing.scale800, color: theme.colors.contentTertiary },
|
|
26
|
-
React.createElement(Block, { as: QRCodeSVG, value:
|
|
25
|
+
React.createElement(ParagraphSmall, { marginTop: 0, marginBottom: theme.sizing.scale800, color: theme.colors.contentTertiary }, walletAccount.networkFamily === "bitcoin" ? (React.createElement(React.Fragment, null, "Mezo automatically created a smart account that's fully controlled by your connected Bitcoin wallet. Use this address to receive assets on Mezo.")) : (React.createElement(React.Fragment, null, "Your connected wallet address is your Mezo address. Use this address to receive assets on Mezo."))),
|
|
26
|
+
React.createElement(Block, { as: QRCodeSVG, value: walletAccount.accountAddress, flex: 1, overrides: {
|
|
27
27
|
Block: {
|
|
28
28
|
style: {
|
|
29
29
|
aspectRatio: 1,
|
|
@@ -50,7 +50,7 @@ function Receive() {
|
|
|
50
50
|
},
|
|
51
51
|
},
|
|
52
52
|
} }),
|
|
53
|
-
React.createElement(MonoLabelXSmall, null,
|
|
53
|
+
React.createElement(MonoLabelXSmall, null, walletAccount.accountAddress)),
|
|
54
54
|
React.createElement(Button, { onClick: handleCopyAddress, size: "medium", overrides: {
|
|
55
55
|
BaseButton: {
|
|
56
56
|
style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Receive.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Receive/Receive.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,gBAAgB,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,gBAAgB,MAAM,iCAAiC,CAAA;AAE9D,SAAS,OAAO;IACd,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAE5C,MAAM,
|
|
1
|
+
{"version":3,"file":"Receive.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Receive/Receive.tsx"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,8 @@ export default function AccountAddressActions(props) {
|
|
|
28
28
|
const { environment } = usePassportContext();
|
|
29
29
|
const setDropdownView = useDropdownStore((state) => state.setView);
|
|
30
30
|
const handleReceiveClick = () => setDropdownView(DropdownView.RECEIVE);
|
|
31
|
-
const
|
|
32
|
-
const blockExplorerUrl = getAddressExplorerUrl(
|
|
31
|
+
const walletAccount = useWalletAccount();
|
|
32
|
+
const blockExplorerUrl = getAddressExplorerUrl(walletAccount.accountAddress, "mezo", environment === "testnet");
|
|
33
33
|
return (React.createElement(Block, { display: "flex", alignItems: "center", backgroundColor: "transparent", padding: `0 ${theme.sizing.scale600} ${theme.sizing.scale800}`, overrides: mergeOverrides({
|
|
34
34
|
Block: {
|
|
35
35
|
style: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountAddressActions.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountAddressActions.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,EAEL,MAAM,EAEN,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,gBAAgB,EAAE,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC9E,OAAO,gBAAgB,MAAM,iCAAiC,CAAA;AAE9D,MAAM,uBAAuB,GAAG,EAAE,CAAA;AAElC,MAAM,iBAAiB,GAAyB;IAC9C,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,SAAS,EAAE;QACT,UAAU,EAAE;YACV,KAAK,EAAE;gBACL,IAAI,EAAE,CAAC;aACR;SACF;QACD,aAAa,EAAE;YACb,KAAK,EAAE;gBACL,MAAM,EAAE,cAAc;aACvB;SACF;KACF;CACF,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,KAAiB;IAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAA;IAEzC,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAChC,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClE,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAEtE,MAAM,
|
|
1
|
+
{"version":3,"file":"AccountAddressActions.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountAddressActions.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,KAAK,EAEL,MAAM,EAEN,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,gBAAgB,EAAE,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC9E,OAAO,gBAAgB,MAAM,iCAAiC,CAAA;AAE9D,MAAM,uBAAuB,GAAG,EAAE,CAAA;AAElC,MAAM,iBAAiB,GAAyB;IAC9C,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,SAAS,EAAE;QACT,UAAU,EAAE;YACV,KAAK,EAAE;gBACL,IAAI,EAAE,CAAC;aACR;SACF;QACD,aAAa,EAAE;YACb,KAAK,EAAE;gBACL,MAAM,EAAE,cAAc;aACvB;SACF;KACF;CACF,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,KAAiB;IAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAA;IAEzC,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAChC,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAClE,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;IAEtE,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,gBAAgB,GAAG,qBAAqB,CAC5C,aAAa,CAAC,cAAe,EAC7B,MAAM,EACN,WAAW,KAAK,SAAS,CAC1B,CAAA;IAED,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,eAAe,EAAC,aAAa,EAC7B,OAAO,EAAE,KAAK,KAAK,CAAC,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAC9D,SAAS,EAAE,cAAc,CACvB;YACE,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;iBAC3B;aACF;SACF,EACD,SAAS,CACV,KACG,SAAS;QAEb,oBAAC,MAAM,IACL,OAAO,EAAE,kBAAkB,EAC3B,aAAa,EACX,oBAAC,eAAe,IACd,IAAI,EAAE,uBAAuB,EAC7B,SAAS,EAAE;oBACT,GAAG,EAAE;wBACH,KAAK,EAAE;4BACL,SAAS,EAAE,gBAAgB;yBAC5B;qBACF;iBACF,GACD,KAEA,iBAAiB,cAGd;QAET,oBAAC,MAAM,WACD,GAAG,EACP,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAC,QAAQ,KACX,iBAAiB,qBAGd,CACH,CACT,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletAddress.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WalletAddress.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAOX,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"WalletAddress.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WalletAddress.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAOX,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,UAAU,qBAyGtD"}
|
|
@@ -6,12 +6,11 @@ import { getAddressExplorerUrl, trimAddress } from "../../../utils/address";
|
|
|
6
6
|
import useWalletAccount from "../../../hooks/useWalletAccount";
|
|
7
7
|
export default function WalletAddress(props) {
|
|
8
8
|
const { overrides, ...restProps } = props;
|
|
9
|
-
const {
|
|
9
|
+
const { walletAddress, networkFamily } = useWalletAccount();
|
|
10
10
|
const { environment = "mainnet" } = usePassportContext();
|
|
11
11
|
const [, theme] = useStyletron();
|
|
12
12
|
const [, copy] = useCopyToClipboard();
|
|
13
13
|
const [isCopiedMessageVisible, setIsCopiedMessageVisible] = useState(false);
|
|
14
|
-
const { walletAddress, networkFamily } = data;
|
|
15
14
|
const handleCopyAddress = () => {
|
|
16
15
|
copy(walletAddress);
|
|
17
16
|
setIsCopiedMessageVisible(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletAddress.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WalletAddress.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,KAAK,EAEL,SAAS,EACT,WAAW,EACX,WAAW,EACX,cAAc,EACd,eAAe,EACf,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAC3E,OAAO,gBAAgB,MAAM,iCAAiC,CAAA;AAE9D,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAiB;IACrD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"WalletAddress.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WalletAddress.tsx"],"names":[],"mappings":"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"}
|
package/dist/src/config.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export declare const xverseWalletMezoTestnet: import("@mezo-org/orangekit").Crea
|
|
|
20
20
|
export declare const unisatWalletMezoMainnet: import("@mezo-org/orangekit").CreateWalletFn;
|
|
21
21
|
export declare const okxWalletMezoMainnet: import("@mezo-org/orangekit").CreateWalletFn;
|
|
22
22
|
export declare const xverseWalletMezoMainnet: import("@mezo-org/orangekit").CreateWalletFn;
|
|
23
|
+
export declare const preconfiguredWalletConnectWallet: (projectId: string) => import("@rainbow-me/rainbowkit").Wallet;
|
|
23
24
|
export declare function getDefaultWallets(network?: "mainnet" | "testnet"): WalletList;
|
|
24
25
|
export declare function getConfig(config: GetDefaultConfigParameters): Config;
|
|
25
26
|
/**
|
package/dist/src/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EACL,MAAM,EAEN,sBAAsB,EAGvB,MAAM,OAAO,CAAA;AAEd,OAAO,EAAY,WAAW,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAA;AAGhF,KAAK,qBAAqB,GAAG,IAAI,CAC/B,sBAAsB,EACtB,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,CAC9D,CAAA;AACD,KAAK,0BAA0B,GAAG,qBAAqB,GAAG;IACxD,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACnC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,UAAU,CAAA;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAA;CACxD,CAAA;AAOD,eAAO,MAAM,aAAa,EAAE,QAAQ,CAClC,IAAI,CACF,0BAA0B,EACxB,YAAY,GACZ,wBAAwB,GACxB,QAAQ,GACR,gCAAgC,CACnC,CAMF,CAAA;AAYD,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AACD,eAAO,MAAM,oBAAoB,8CAA2C,CAAA;AAC5E,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AAED,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AACD,eAAO,MAAM,oBAAoB,8CAA2C,CAAA;AAC5E,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,SAAS,GAAG,SAAqB,GACzC,UAAU,CAsBZ;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,0BAA0B,GAAG,MAAM,CAiBpE;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB;IAG5B,CAAC,WAAW,CAAC,EAAE,CAAC,oCAA6C;IAC7D,CAAC,WAAW,CAAC,EAAE,CAAC,oCAA6C;EAE/D,CAAA"}
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAoB,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EACL,MAAM,EAEN,sBAAsB,EAGvB,MAAM,OAAO,CAAA;AAEd,OAAO,EAAY,WAAW,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAA;AAGhF,KAAK,qBAAqB,GAAG,IAAI,CAC/B,sBAAsB,EACtB,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,CAC9D,CAAA;AACD,KAAK,0BAA0B,GAAG,qBAAqB,GAAG;IACxD,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACnC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,UAAU,CAAA;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,YAAY,CAAC,CAAA;CACxD,CAAA;AAOD,eAAO,MAAM,aAAa,EAAE,QAAQ,CAClC,IAAI,CACF,0BAA0B,EACxB,YAAY,GACZ,wBAAwB,GACxB,QAAQ,GACR,gCAAgC,CACnC,CAMF,CAAA;AAYD,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AACD,eAAO,MAAM,oBAAoB,8CAA2C,CAAA;AAC5E,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AAED,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AACD,eAAO,MAAM,oBAAoB,8CAA2C,CAAA;AAC5E,eAAO,MAAM,uBAAuB,8CAEnC,CAAA;AAED,eAAO,MAAM,gCAAgC,GAAI,WAAW,MAAM,4CAQ9D,CAAA;AAEJ,wBAAgB,iBAAiB,CAC/B,OAAO,GAAE,SAAS,GAAG,SAAqB,GACzC,UAAU,CAsBZ;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,0BAA0B,GAAG,MAAM,CAiBpE;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB;IAG5B,CAAC,WAAW,CAAC,EAAE,CAAC,oCAA6C;IAC7D,CAAC,WAAW,CAAC,EAAE,CAAC,oCAA6C;EAE/D,CAAA"}
|
package/dist/src/config.js
CHANGED
|
@@ -27,6 +27,14 @@ export const xverseWalletMezoTestnet = getXverseWallet(bitcoinWalletTestnetConfi
|
|
|
27
27
|
export const unisatWalletMezoMainnet = getUnisatWallet(bitcoinWalletMainnetConfig);
|
|
28
28
|
export const okxWalletMezoMainnet = getOKXWallet(bitcoinWalletMainnetConfig);
|
|
29
29
|
export const xverseWalletMezoMainnet = getXverseWallet(bitcoinWalletMainnetConfig);
|
|
30
|
+
export const preconfiguredWalletConnectWallet = (projectId) => walletConnectWallet({
|
|
31
|
+
projectId,
|
|
32
|
+
options: {
|
|
33
|
+
qrModalOptions: {
|
|
34
|
+
enableExplorer: false,
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
});
|
|
30
38
|
export function getDefaultWallets(network = "mainnet") {
|
|
31
39
|
return [
|
|
32
40
|
{
|
|
@@ -45,7 +53,7 @@ export function getDefaultWallets(network = "mainnet") {
|
|
|
45
53
|
},
|
|
46
54
|
{
|
|
47
55
|
groupName: "Ethereum",
|
|
48
|
-
wallets: [
|
|
56
|
+
wallets: [({ projectId }) => preconfiguredWalletConnectWallet(projectId)],
|
|
49
57
|
},
|
|
50
58
|
];
|
|
51
59
|
}
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,gBAAgB,EAAc,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAEL,YAAY,EAEZ,IAAI,EACJ,SAAS,GACV,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAkBzE,MAAM,UAAU,GAAG;IACjB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;IACrD,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;CACR,CAAA;AAE/C,MAAM,CAAC,MAAM,aAAa,GAQtB;IACF,UAAU;IACV,sBAAsB,EAAE,EAAE;IAC1B,MAAM,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,8BAA8B,EAAE,IAAI;CACrC,CAAA;AAED,MAAM,0BAA0B,GAAG;IACjC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;IACnC,OAAO,EAAE,QAAQ,CAAC,OAAO;CAC1B,CAAA;AAED,MAAM,0BAA0B,GAAG;IACjC,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;IACnC,OAAO,EAAE,QAAQ,CAAC,OAAO;CAC1B,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,eAAe,CACpD,0BAA0B,CAC3B,CAAA;AACD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC,0BAA0B,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,uBAAuB,GAAG,eAAe,CACpD,0BAA0B,CAC3B,CAAA;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,eAAe,CACpD,0BAA0B,CAC3B,CAAA;AACD,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC,0BAA0B,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,uBAAuB,GAAG,eAAe,CACpD,0BAA0B,CAC3B,CAAA;AAED,MAAM,UAAU,iBAAiB,CAC/B,UAAiC,SAAS;IAE1C,OAAO;QACL;YACE,SAAS,EAAE,SAAS;YACpB,OAAO,EACL,OAAO,KAAK,SAAS;gBACnB,CAAC,CAAC;oBACE,uBAAuB;oBACvB,oBAAoB;oBACpB,uBAAuB;iBACxB;gBACH,CAAC,CAAC;oBACE,uBAAuB;oBACvB,oBAAoB;oBACpB,uBAAuB;iBACxB;SACR;QACD;YACE,SAAS,EAAE,UAAU;YACrB,OAAO,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,eAAe,EAEhB,MAAM,uBAAuB,CAAA;AAS9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGrC,iBAAS,yBAAyB,CAChC,mBAAmB,UAAQ,EAC3B,eAAe,GAAE,IAAI,CACnB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC,EACrD,YAAY,GAAG,aAAa,CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,eAAe,EAEhB,MAAM,uBAAuB,CAAA;AAS9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGrC,iBAAS,yBAAyB,CAChC,mBAAmB,UAAQ,EAC3B,eAAe,GAAE,IAAI,CACnB,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC,EACrD,YAAY,GAAG,aAAa,CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyFP;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAA"}
|
|
@@ -7,25 +7,25 @@ import { createSignInWithWalletMessage, verifyDomainInSignInWithWalletMessage, }
|
|
|
7
7
|
import { useGetAccountByAddress } from "./useGetAccountByAddress";
|
|
8
8
|
import useWalletAccount from "./useWalletAccount";
|
|
9
9
|
function useAuthenticateWithWallet(shouldCreateAccount = false, mutationOptions = {}) {
|
|
10
|
-
const
|
|
10
|
+
const walletAccount = useWalletAccount();
|
|
11
11
|
const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce();
|
|
12
12
|
const { createSessionAsync } = useCreateSession();
|
|
13
13
|
const { createAccountAsync } = useCreateAccount();
|
|
14
14
|
const { signMessageAsync } = useSignMessage();
|
|
15
|
-
const { refetch: getAccountByAddress } = useGetAccountByAddress(walletAddress, {
|
|
15
|
+
const { refetch: getAccountByAddress } = useGetAccountByAddress(walletAccount.walletAddress, {
|
|
16
16
|
enabled: false,
|
|
17
17
|
retry: false,
|
|
18
18
|
});
|
|
19
19
|
const { mutate, mutateAsync, ...signInMutationRestParameters } = useMutation({
|
|
20
20
|
mutationFn: async (chainId) => {
|
|
21
|
-
if (!walletAddress) {
|
|
21
|
+
if (!walletAccount.walletAddress) {
|
|
22
22
|
throw new Error("Sign in error: Wallet not connected!");
|
|
23
23
|
}
|
|
24
24
|
const nonce = await ensureNoSessionAndFetchNonce();
|
|
25
|
-
const messageResult = createSignInWithWalletMessage(walletAddress, nonce, networkFamily, chainId ??
|
|
25
|
+
const messageResult = createSignInWithWalletMessage(walletAccount.walletAddress, nonce, walletAccount.networkFamily, chainId ?? walletAccount.chainId);
|
|
26
26
|
const signatureResult = await signMessageAsync({
|
|
27
27
|
message: messageResult,
|
|
28
|
-
connector,
|
|
28
|
+
connector: walletAccount.connector,
|
|
29
29
|
});
|
|
30
30
|
await verifyDomainInSignInWithWalletMessage(messageResult, signatureResult, nonce);
|
|
31
31
|
if (shouldCreateAccount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAGL,WAAW,GACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAA;AACnF,OAAO,EACL,6BAA6B,EAC7B,qCAAqC,GACtC,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AAEjD,SAAS,yBAAyB,CAChC,mBAAmB,GAAG,KAAK,EAC3B,kBAGI,EAAE;IAEN,MAAM,
|
|
1
|
+
{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ const PRICE_FEED_ABI = [
|
|
|
99
99
|
*/
|
|
100
100
|
export function useBorrowData(queryOptions = {}) {
|
|
101
101
|
const { environment = "mainnet" } = usePassportContext();
|
|
102
|
-
const
|
|
102
|
+
const walletAccount = useWalletAccount();
|
|
103
103
|
const contractAddress = useMemo(() => {
|
|
104
104
|
if (environment === "mainnet") {
|
|
105
105
|
return {
|
|
@@ -121,8 +121,8 @@ export function useBorrowData(queryOptions = {}) {
|
|
|
121
121
|
abi: TROVE_MANAGER_ABI,
|
|
122
122
|
address: contractAddress.troveManager,
|
|
123
123
|
functionName: "getEntireDebtAndColl",
|
|
124
|
-
args:
|
|
125
|
-
? [
|
|
124
|
+
args: walletAccount.accountAddress
|
|
125
|
+
? [walletAccount.accountAddress]
|
|
126
126
|
: ["0x"],
|
|
127
127
|
chainId,
|
|
128
128
|
},
|
|
@@ -140,7 +140,7 @@ export function useBorrowData(queryOptions = {}) {
|
|
|
140
140
|
},
|
|
141
141
|
],
|
|
142
142
|
query: {
|
|
143
|
-
enabled: !!
|
|
143
|
+
enabled: !!walletAccount.accountAddress,
|
|
144
144
|
staleTime: 5 * ONE_MINUTE_MS,
|
|
145
145
|
retry: 1,
|
|
146
146
|
select: (data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBorrowData.js","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EACL,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,MAAM,uBAAuB,GAAG,EAAE,CAAA;AAElC,yEAAyE;AACzE,2EAA2E;AAC3E,8EAA8E;AAC9E,0BAA0B;AAC1B,qEAAqE;AAErE,MAAM,iBAAiB,GAAG;IACxB;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV,MAAM,uBAAuB,GAAG;IAC9B;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV,MAAM,cAAc,GAAG;IACrB;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAA;AAEV;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,YAAY,GAAG,EAAE;IAC7C,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAA;IACxD,MAAM,
|
|
1
|
+
{"version":3,"file":"useBorrowData.js","sourceRoot":"","sources":["../../../src/hooks/useBorrowData.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ export function useCreateAccount(mutationOptions = {}) {
|
|
|
11
11
|
const { mutate, mutateAsync, ...rest } = useMutation({
|
|
12
12
|
mutationFn: async (createAccountMutationFnParameters) => {
|
|
13
13
|
if (createAccountMutationFnParameters.type === "wallet") {
|
|
14
|
-
if (!walletAccount
|
|
14
|
+
if (!walletAccount?.connector) {
|
|
15
15
|
throw new Error("Connector not defined.");
|
|
16
16
|
}
|
|
17
|
-
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(walletAccount.
|
|
17
|
+
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(walletAccount.connector);
|
|
18
18
|
// Creating bitcoin mezo account
|
|
19
19
|
if (bitcoinPublicKey) {
|
|
20
20
|
return authApiClient.createAccount({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCreateAccount.js","sourceRoot":"","sources":["../../../src/hooks/useCreateAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,GAGZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAA;AAEjE,MAAM,UAAU,gBAAgB,CAC9B,kBAGI,EAAE;IAEN,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,mBAAmB,EAAE,GAAG,eAAe,CAAA;IAE9E,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;QACnD,UAAU,EAAE,KAAK,EACf,iCAAuD,EACvD,EAAE;YACF,IAAI,iCAAiC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxD,IAAI,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"useCreateAccount.js","sourceRoot":"","sources":["../../../src/hooks/useCreateAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,GAGZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAA;AAEjE,MAAM,UAAU,gBAAgB,CAC9B,kBAGI,EAAE;IAEN,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,mBAAmB,EAAE,GAAG,eAAe,CAAA;IAE9E,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;QACnD,UAAU,EAAE,KAAK,EACf,iCAAuD,EACvD,EAAE;YACF,IAAI,iCAAiC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxD,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;gBAC3C,CAAC;gBAED,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,aAAa,CAAC,SAAS,CACxB,CAAA;gBAED,gCAAgC;gBAChC,IAAI,gBAAgB,EAAE,CAAC;oBACrB,OAAO,aAAa,CAAC,aAAa,CAAC;wBACjC,GAAG,iCAAiC;wBACpC,gBAAgB;qBACjB,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YAED,4BAA4B;YAC5B,OAAO,aAAa,CAAC,aAAa,CAAC;gBACjC,GAAG,iCAAiC;aACrC,CAAC,CAAA;QACJ,CAAC;QACD,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;YACtC,WAAW,CAAC,YAAY,CAAC;gBACvB,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;aAC/B,CAAC,CAAA;YAEF,IAAI,eAAe;gBAAE,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAChE,CAAC;QACD,GAAG,mBAAmB;KACvB,CAAC,CAAA;IAEF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAA;AAC5E,CAAC"}
|
|
@@ -11,10 +11,10 @@ export function useLinkAccount(mutationOptions = {}) {
|
|
|
11
11
|
const { mutate, mutateAsync, ...rest } = useMutation({
|
|
12
12
|
mutationFn: async (linkAccountMutationFnParameters) => {
|
|
13
13
|
if (linkAccountMutationFnParameters.type === "wallet") {
|
|
14
|
-
if (!walletAccount
|
|
14
|
+
if (!walletAccount?.connector) {
|
|
15
15
|
throw new Error("Connector not defined.");
|
|
16
16
|
}
|
|
17
|
-
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(walletAccount.
|
|
17
|
+
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(walletAccount.connector);
|
|
18
18
|
// Linking bitcoin account
|
|
19
19
|
if (bitcoinPublicKey) {
|
|
20
20
|
return authApiClient.linkAccount({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinkAccount.js","sourceRoot":"","sources":["../../../src/hooks/useLinkAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,GAGZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAA;AAMjE,MAAM,UAAU,cAAc,CAC5B,kBAOI,EAAE;IAEN,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,mBAAmB,EAAE,GAAG,eAAe,CAAA;IAE9E,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;QACnD,UAAU,EAAE,KAAK,EACf,+BAAgE,EAChE,EAAE;YACF,IAAI,+BAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtD,IAAI,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"useLinkAccount.js","sourceRoot":"","sources":["../../../src/hooks/useLinkAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,WAAW,GAGZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gCAAgC,EAAE,MAAM,gBAAgB,CAAA;AAMjE,MAAM,UAAU,cAAc,CAC5B,kBAOI,EAAE;IAEN,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,mBAAmB,EAAE,GAAG,eAAe,CAAA;IAE9E,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;QACnD,UAAU,EAAE,KAAK,EACf,+BAAgE,EAChE,EAAE;YACF,IAAI,+BAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtD,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;gBAC3C,CAAC;gBAED,MAAM,gBAAgB,GAAG,MAAM,gCAAgC,CAC7D,aAAa,CAAC,SAAS,CACxB,CAAA;gBAED,0BAA0B;gBAC1B,IAAI,gBAAgB,EAAE,CAAC;oBACrB,OAAO,aAAa,CAAC,WAAW,CAAC;wBAC/B,GAAG,+BAA+B;wBAClC,gBAAgB;qBACjB,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;YAED,uEAAuE;YACvE,OAAO,aAAa,CAAC,WAAW,CAAC,+BAA+B,CAAC,CAAA;QACnE,CAAC;QACD,SAAS,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;YACtC,WAAW,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAC5D,IAAI,eAAe;gBAAE,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAChE,CAAC;QACD,GAAG,mBAAmB;KACvB,CAAC,CAAA;IAEF,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,CAAA;AACxE,CAAC"}
|
|
@@ -68,22 +68,22 @@ const TOKEN_BALANCES_QUERY_KEY = "passport.tokenBalances";
|
|
|
68
68
|
*/
|
|
69
69
|
export function useTokensBalances(options = {}) {
|
|
70
70
|
const { tokens = BALANCE_TOKENS, ...restQueryOptions } = options;
|
|
71
|
-
const
|
|
71
|
+
const walletAccount = useWalletAccount();
|
|
72
72
|
const config = useConfig();
|
|
73
73
|
const { data: conversionRatesData } = useAssetsConversionRates();
|
|
74
74
|
return useQuery({
|
|
75
75
|
queryKey: [
|
|
76
76
|
TOKEN_BALANCES_QUERY_KEY,
|
|
77
|
-
|
|
77
|
+
walletAccount?.accountAddress,
|
|
78
78
|
options.tokens,
|
|
79
79
|
],
|
|
80
|
-
enabled: !!
|
|
80
|
+
enabled: !!walletAccount?.accountAddress && !!conversionRatesData,
|
|
81
81
|
queryFn: async () => {
|
|
82
82
|
const isMainnet = config.state.chainId === CHAIN_ID.mainnet;
|
|
83
83
|
const contractsMap = isMainnet
|
|
84
84
|
? mainnetTokenContracts
|
|
85
85
|
: testnetTokenContracts;
|
|
86
|
-
const accountAddress =
|
|
86
|
+
const accountAddress = walletAccount?.accountAddress;
|
|
87
87
|
if (!accountAddress) {
|
|
88
88
|
throw new Error("Account address is not available.");
|
|
89
89
|
}
|
|
@@ -118,7 +118,7 @@ export function useTokensBalances(options = {}) {
|
|
|
118
118
|
const token = tokens[index];
|
|
119
119
|
const { decimals, symbol } = getAsset(token);
|
|
120
120
|
if (item.status === "failure") {
|
|
121
|
-
throw new Error(`Failed to fetch balance of ${token} for ${
|
|
121
|
+
throw new Error(`Failed to fetch balance of ${token} for ${walletAccount?.accountAddress}.`);
|
|
122
122
|
}
|
|
123
123
|
const tokenBalance = {
|
|
124
124
|
value: item.result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTokensBalances.js","sourceRoot":"","sources":["../../../src/hooks/useTokensBalances.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAO,WAAW,EAAE,MAAM,MAAM,CAAA;AACvC,OAAO,EACL,QAAQ,EACR,cAAc,GAEf,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,EACL,qBAAqB,EAErB,qBAAqB,GACtB,MAAM,kBAAkB,CAAA;AACzB,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EACL,QAAQ,EACR,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAErD,yEAAyE;AACzE,2EAA2E;AAC3E,8EAA8E;AAC9E,0BAA0B;AAC1B,qEAAqE;AAErE,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACqB,CAAA;AAExB,MAAM,cAAc,GAAqB;IACvC,QAAQ;IACR,MAAM;IACN,OAAO;IACP,UAAU;IACV,QAAQ;IACR,IAAI;IACJ,OAAO;IACP,OAAO;IACP,OAAO;IACP,WAAW;IACX,MAAM;CACP,CAAA;AAqBD,MAAM,wBAAwB,GAAG,wBAAwB,CAAA;AAEzD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,iBAAiB,CAC/B,UAAgD,EAAE;IAElD,MAAM,EAAE,MAAM,GAAG,cAAc,EAAE,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAA;IAEhE,MAAM,
|
|
1
|
+
{"version":3,"file":"useTokensBalances.js","sourceRoot":"","sources":["../../../src/hooks/useTokensBalances.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { Address } from "viem";
|
|
2
2
|
import { Connector } from "wagmi";
|
|
3
3
|
type UseWalletAccountReturn = {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
chainId?: number;
|
|
11
|
-
};
|
|
4
|
+
accountAddress?: Address;
|
|
5
|
+
walletAddress?: string;
|
|
6
|
+
isConnected: boolean;
|
|
7
|
+
networkFamily: "bitcoin" | "evm";
|
|
8
|
+
connector?: Connector;
|
|
9
|
+
chainId?: number;
|
|
12
10
|
};
|
|
13
11
|
export default function useWalletAccount(): UseWalletAccountReturn;
|
|
14
12
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWalletAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWalletAccount.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAE7C,KAAK,sBAAsB,GAAG;IAC5B,
|
|
1
|
+
{"version":3,"file":"useWalletAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useWalletAccount.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAc,MAAM,OAAO,CAAA;AAE7C,KAAK,sBAAsB,GAAG;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,WAAW,EAAE,OAAO,CAAA;IACpB,aAAa,EAAE,SAAS,GAAG,KAAK,CAAA;IAChC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAID,MAAM,CAAC,OAAO,UAAU,gBAAgB,IAAI,sBAAsB,CAmCjE"}
|
|
@@ -19,14 +19,12 @@ export default function useWalletAccount() {
|
|
|
19
19
|
});
|
|
20
20
|
const { address: btcAddress } = btcData || {};
|
|
21
21
|
return {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
chainId,
|
|
29
|
-
},
|
|
22
|
+
accountAddress: evmAddress,
|
|
23
|
+
walletAddress: btcAddress ?? evmAddress,
|
|
24
|
+
isConnected: networkFamily === "bitcoin" ? !!btcAddress : !!evmAddress,
|
|
25
|
+
networkFamily,
|
|
26
|
+
connector,
|
|
27
|
+
chainId,
|
|
30
28
|
};
|
|
31
29
|
}
|
|
32
30
|
//# sourceMappingURL=useWalletAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWalletAccount.js","sourceRoot":"","sources":["../../../src/hooks/useWalletAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAa,UAAU,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"useWalletAccount.js","sourceRoot":"","sources":["../../../src/hooks/useWalletAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAa,UAAU,EAAE,MAAM,OAAO,CAAA;AAW7C,iDAAiD;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACtC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAEhE,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAC3D,CAAC,SAAS,CAAC,CACZ,CAAA;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QACjC,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,eAAe,GACnB,SACD,CAAC,kBAAkB,EAAE,CAAA;YAEtB,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,UAAU,EAAE,CAAA;YAClD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,UAAU,EAAE,CAAA;YAElD,OAAO;gBACL,OAAO;gBACP,OAAO;aACR,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAE7C,OAAO;QACL,cAAc,EAAE,UAAU;QAC1B,aAAa,EAAE,UAAU,IAAI,UAAU;QACvC,WAAW,EAAE,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU;QACtE,aAAa;QACb,SAAS;QACT,OAAO;KACR,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -47,13 +47,13 @@ export function Dropdown(props: DropdownProps) {
|
|
|
47
47
|
|
|
48
48
|
const [, theme] = useStyletron()
|
|
49
49
|
|
|
50
|
-
const
|
|
50
|
+
const walletAccount = useWalletAccount()
|
|
51
51
|
|
|
52
52
|
useWatchTransferEventsForAllTokens()
|
|
53
53
|
|
|
54
54
|
const { openConnectModal } = useConnectModal()
|
|
55
55
|
|
|
56
|
-
if (!
|
|
56
|
+
if (!walletAccount?.isConnected) {
|
|
57
57
|
return (
|
|
58
58
|
<DisconnectedTrigger
|
|
59
59
|
// If connect wallet flow is not provided it fallbacks to RainbowKit's
|
|
@@ -18,7 +18,7 @@ import useWalletAccount from "../../../hooks/useWalletAccount"
|
|
|
18
18
|
function Receive() {
|
|
19
19
|
const { environment } = usePassportContext()
|
|
20
20
|
|
|
21
|
-
const
|
|
21
|
+
const walletAccount = useWalletAccount()
|
|
22
22
|
|
|
23
23
|
const [, theme] = useStyletron()
|
|
24
24
|
|
|
@@ -27,7 +27,7 @@ function Receive() {
|
|
|
27
27
|
const [isCopiedMessageVisible, setIsCopiedMessageVisible] = useState(false)
|
|
28
28
|
|
|
29
29
|
const handleCopyAddress = () => {
|
|
30
|
-
copy(
|
|
30
|
+
copy(walletAccount.accountAddress!)
|
|
31
31
|
setIsCopiedMessageVisible(true)
|
|
32
32
|
|
|
33
33
|
setTimeout(() => {
|
|
@@ -36,7 +36,7 @@ function Receive() {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
const blockExplorerUrl = getAddressExplorerUrl(
|
|
39
|
-
|
|
39
|
+
walletAccount.accountAddress!,
|
|
40
40
|
"mezo",
|
|
41
41
|
environment === "testnet",
|
|
42
42
|
)
|
|
@@ -50,7 +50,7 @@ function Receive() {
|
|
|
50
50
|
marginBottom={theme.sizing.scale800}
|
|
51
51
|
color={theme.colors.contentTertiary}
|
|
52
52
|
>
|
|
53
|
-
{
|
|
53
|
+
{walletAccount.networkFamily === "bitcoin" ? (
|
|
54
54
|
<>
|
|
55
55
|
Mezo automatically created a smart account that's fully
|
|
56
56
|
controlled by your connected Bitcoin wallet. Use this address to
|
|
@@ -66,7 +66,7 @@ function Receive() {
|
|
|
66
66
|
|
|
67
67
|
<Block
|
|
68
68
|
as={QRCodeSVG}
|
|
69
|
-
value={
|
|
69
|
+
value={walletAccount.accountAddress!}
|
|
70
70
|
flex={1}
|
|
71
71
|
overrides={{
|
|
72
72
|
Block: {
|
|
@@ -111,7 +111,7 @@ function Receive() {
|
|
|
111
111
|
}}
|
|
112
112
|
/>
|
|
113
113
|
|
|
114
|
-
<MonoLabelXSmall>{
|
|
114
|
+
<MonoLabelXSmall>{walletAccount.accountAddress}</MonoLabelXSmall>
|
|
115
115
|
</Block>
|
|
116
116
|
|
|
117
117
|
<Button
|
|
@@ -41,10 +41,10 @@ export default function AccountAddressActions(props: BlockProps) {
|
|
|
41
41
|
const setDropdownView = useDropdownStore((state) => state.setView)
|
|
42
42
|
const handleReceiveClick = () => setDropdownView(DropdownView.RECEIVE)
|
|
43
43
|
|
|
44
|
-
const
|
|
44
|
+
const walletAccount = useWalletAccount()
|
|
45
45
|
|
|
46
46
|
const blockExplorerUrl = getAddressExplorerUrl(
|
|
47
|
-
|
|
47
|
+
walletAccount.accountAddress!,
|
|
48
48
|
"mezo",
|
|
49
49
|
environment === "testnet",
|
|
50
50
|
)
|
|
@@ -17,15 +17,12 @@ import useWalletAccount from "../../../hooks/useWalletAccount"
|
|
|
17
17
|
|
|
18
18
|
export default function WalletAddress(props: BlockProps) {
|
|
19
19
|
const { overrides, ...restProps } = props
|
|
20
|
-
|
|
21
|
-
const { data } = useWalletAccount()
|
|
20
|
+
const { walletAddress, networkFamily } = useWalletAccount()
|
|
22
21
|
const { environment = "mainnet" } = usePassportContext()
|
|
23
22
|
const [, theme] = useStyletron()
|
|
24
23
|
const [, copy] = useCopyToClipboard()
|
|
25
24
|
const [isCopiedMessageVisible, setIsCopiedMessageVisible] = useState(false)
|
|
26
25
|
|
|
27
|
-
const { walletAddress, networkFamily } = data
|
|
28
|
-
|
|
29
26
|
const handleCopyAddress = () => {
|
|
30
27
|
copy(walletAddress!)
|
|
31
28
|
setIsCopiedMessageVisible(true)
|
package/src/config.ts
CHANGED
|
@@ -72,6 +72,16 @@ export const xverseWalletMezoMainnet = getXverseWallet(
|
|
|
72
72
|
bitcoinWalletMainnetConfig,
|
|
73
73
|
)
|
|
74
74
|
|
|
75
|
+
export const preconfiguredWalletConnectWallet = (projectId: string) =>
|
|
76
|
+
walletConnectWallet({
|
|
77
|
+
projectId,
|
|
78
|
+
options: {
|
|
79
|
+
qrModalOptions: {
|
|
80
|
+
enableExplorer: false,
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
})
|
|
84
|
+
|
|
75
85
|
export function getDefaultWallets(
|
|
76
86
|
network: "mainnet" | "testnet" = "mainnet",
|
|
77
87
|
): WalletList {
|
|
@@ -93,7 +103,7 @@ export function getDefaultWallets(
|
|
|
93
103
|
},
|
|
94
104
|
{
|
|
95
105
|
groupName: "Ethereum",
|
|
96
|
-
wallets: [
|
|
106
|
+
wallets: [({ projectId }) => preconfiguredWalletConnectWallet(projectId)],
|
|
97
107
|
},
|
|
98
108
|
]
|
|
99
109
|
}
|
|
@@ -22,21 +22,14 @@ function useAuthenticateWithWallet(
|
|
|
22
22
|
"mutationFn" | "mutationKey"
|
|
23
23
|
> = {},
|
|
24
24
|
) {
|
|
25
|
-
const
|
|
26
|
-
data: {
|
|
27
|
-
walletAddress,
|
|
28
|
-
chainId: walletChainId,
|
|
29
|
-
connector,
|
|
30
|
-
networkFamily,
|
|
31
|
-
} = {},
|
|
32
|
-
} = useWalletAccount()
|
|
25
|
+
const walletAccount = useWalletAccount()
|
|
33
26
|
const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce()
|
|
34
27
|
const { createSessionAsync } = useCreateSession()
|
|
35
28
|
const { createAccountAsync } = useCreateAccount()
|
|
36
29
|
const { signMessageAsync } = useSignMessage()
|
|
37
30
|
|
|
38
31
|
const { refetch: getAccountByAddress } = useGetAccountByAddress(
|
|
39
|
-
walletAddress,
|
|
32
|
+
walletAccount.walletAddress,
|
|
40
33
|
{
|
|
41
34
|
enabled: false,
|
|
42
35
|
retry: false,
|
|
@@ -45,21 +38,21 @@ function useAuthenticateWithWallet(
|
|
|
45
38
|
|
|
46
39
|
const { mutate, mutateAsync, ...signInMutationRestParameters } = useMutation({
|
|
47
40
|
mutationFn: async (chainId?: number | void) => {
|
|
48
|
-
if (!walletAddress) {
|
|
41
|
+
if (!walletAccount.walletAddress) {
|
|
49
42
|
throw new Error("Sign in error: Wallet not connected!")
|
|
50
43
|
}
|
|
51
44
|
|
|
52
45
|
const nonce = await ensureNoSessionAndFetchNonce()
|
|
53
46
|
|
|
54
47
|
const messageResult = createSignInWithWalletMessage(
|
|
55
|
-
walletAddress,
|
|
48
|
+
walletAccount.walletAddress,
|
|
56
49
|
nonce,
|
|
57
|
-
networkFamily!,
|
|
58
|
-
chainId ??
|
|
50
|
+
walletAccount.networkFamily!,
|
|
51
|
+
chainId ?? walletAccount.chainId,
|
|
59
52
|
)
|
|
60
53
|
const signatureResult = await signMessageAsync({
|
|
61
54
|
message: messageResult,
|
|
62
|
-
connector,
|
|
55
|
+
connector: walletAccount.connector,
|
|
63
56
|
})
|
|
64
57
|
|
|
65
58
|
await verifyDomainInSignInWithWalletMessage(
|
|
@@ -108,7 +108,7 @@ const PRICE_FEED_ABI = [
|
|
|
108
108
|
*/
|
|
109
109
|
export function useBorrowData(queryOptions = {}) {
|
|
110
110
|
const { environment = "mainnet" } = usePassportContext()
|
|
111
|
-
const
|
|
111
|
+
const walletAccount = useWalletAccount()
|
|
112
112
|
|
|
113
113
|
const contractAddress = useMemo(() => {
|
|
114
114
|
if (environment === "mainnet") {
|
|
@@ -133,8 +133,8 @@ export function useBorrowData(queryOptions = {}) {
|
|
|
133
133
|
abi: TROVE_MANAGER_ABI,
|
|
134
134
|
address: contractAddress.troveManager,
|
|
135
135
|
functionName: "getEntireDebtAndColl",
|
|
136
|
-
args:
|
|
137
|
-
? [
|
|
136
|
+
args: walletAccount.accountAddress
|
|
137
|
+
? [walletAccount.accountAddress]
|
|
138
138
|
: ["0x" as `0x${string}}`],
|
|
139
139
|
chainId,
|
|
140
140
|
},
|
|
@@ -152,7 +152,7 @@ export function useBorrowData(queryOptions = {}) {
|
|
|
152
152
|
},
|
|
153
153
|
],
|
|
154
154
|
query: {
|
|
155
|
-
enabled: !!
|
|
155
|
+
enabled: !!walletAccount.accountAddress,
|
|
156
156
|
staleTime: 5 * ONE_MINUTE_MS,
|
|
157
157
|
retry: 1,
|
|
158
158
|
select: (data) => {
|
|
@@ -27,12 +27,12 @@ export function useCreateAccount(
|
|
|
27
27
|
createAccountMutationFnParameters: CreateAccountRequest,
|
|
28
28
|
) => {
|
|
29
29
|
if (createAccountMutationFnParameters.type === "wallet") {
|
|
30
|
-
if (!walletAccount
|
|
30
|
+
if (!walletAccount?.connector) {
|
|
31
31
|
throw new Error("Connector not defined.")
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(
|
|
35
|
-
walletAccount.
|
|
35
|
+
walletAccount.connector,
|
|
36
36
|
)
|
|
37
37
|
|
|
38
38
|
// Creating bitcoin mezo account
|
|
@@ -35,12 +35,12 @@ export function useLinkAccount(
|
|
|
35
35
|
linkAccountMutationFnParameters: LinkAccountMutationFnParameters,
|
|
36
36
|
) => {
|
|
37
37
|
if (linkAccountMutationFnParameters.type === "wallet") {
|
|
38
|
-
if (!walletAccount
|
|
38
|
+
if (!walletAccount?.connector) {
|
|
39
39
|
throw new Error("Connector not defined.")
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
const bitcoinPublicKey = await getBitcoinPublicKeyFromConnector(
|
|
43
|
-
walletAccount.
|
|
43
|
+
walletAccount.connector,
|
|
44
44
|
)
|
|
45
45
|
|
|
46
46
|
// Linking bitcoin account
|
|
@@ -107,7 +107,7 @@ export function useTokensBalances<T extends MezoChainToken[]>(
|
|
|
107
107
|
) {
|
|
108
108
|
const { tokens = BALANCE_TOKENS, ...restQueryOptions } = options
|
|
109
109
|
|
|
110
|
-
const
|
|
110
|
+
const walletAccount = useWalletAccount()
|
|
111
111
|
|
|
112
112
|
const config = useConfig()
|
|
113
113
|
|
|
@@ -116,17 +116,17 @@ export function useTokensBalances<T extends MezoChainToken[]>(
|
|
|
116
116
|
return useQuery({
|
|
117
117
|
queryKey: [
|
|
118
118
|
TOKEN_BALANCES_QUERY_KEY,
|
|
119
|
-
|
|
119
|
+
walletAccount?.accountAddress,
|
|
120
120
|
options.tokens,
|
|
121
121
|
],
|
|
122
|
-
enabled: !!
|
|
122
|
+
enabled: !!walletAccount?.accountAddress && !!conversionRatesData,
|
|
123
123
|
queryFn: async () => {
|
|
124
124
|
const isMainnet = config.state.chainId === CHAIN_ID.mainnet
|
|
125
125
|
const contractsMap = isMainnet
|
|
126
126
|
? mainnetTokenContracts
|
|
127
127
|
: testnetTokenContracts
|
|
128
128
|
|
|
129
|
-
const accountAddress =
|
|
129
|
+
const accountAddress = walletAccount?.accountAddress
|
|
130
130
|
|
|
131
131
|
if (!accountAddress) {
|
|
132
132
|
throw new Error("Account address is not available.")
|
|
@@ -173,7 +173,7 @@ export function useTokensBalances<T extends MezoChainToken[]>(
|
|
|
173
173
|
|
|
174
174
|
if (item.status === "failure") {
|
|
175
175
|
throw new Error(
|
|
176
|
-
`Failed to fetch balance of ${token} for ${
|
|
176
|
+
`Failed to fetch balance of ${token} for ${walletAccount?.accountAddress}.`,
|
|
177
177
|
)
|
|
178
178
|
}
|
|
179
179
|
|
|
@@ -5,14 +5,12 @@ import { Address } from "viem"
|
|
|
5
5
|
import { Connector, useAccount } from "wagmi"
|
|
6
6
|
|
|
7
7
|
type UseWalletAccountReturn = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
chainId?: number
|
|
15
|
-
}
|
|
8
|
+
accountAddress?: Address
|
|
9
|
+
walletAddress?: string
|
|
10
|
+
isConnected: boolean
|
|
11
|
+
networkFamily: "bitcoin" | "evm"
|
|
12
|
+
connector?: Connector
|
|
13
|
+
chainId?: number
|
|
16
14
|
}
|
|
17
15
|
|
|
18
16
|
// TODO: Invesitgate race conditions and refactor
|
|
@@ -45,13 +43,11 @@ export default function useWalletAccount(): UseWalletAccountReturn {
|
|
|
45
43
|
const { address: btcAddress } = btcData || {}
|
|
46
44
|
|
|
47
45
|
return {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
chainId,
|
|
55
|
-
},
|
|
46
|
+
accountAddress: evmAddress,
|
|
47
|
+
walletAddress: btcAddress ?? evmAddress,
|
|
48
|
+
isConnected: networkFamily === "bitcoin" ? !!btcAddress : !!evmAddress,
|
|
49
|
+
networkFamily,
|
|
50
|
+
connector,
|
|
51
|
+
chainId,
|
|
56
52
|
}
|
|
57
53
|
}
|