@mezo-org/passport 0.4.0-dev.21 → 0.4.0-dev.22
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/Root/AccountOtherAssets.d.ts.map +1 -1
- package/dist/src/components/Dropdown/Root/AccountOtherAssets.js +7 -6
- package/dist/src/components/Dropdown/Root/AccountOtherAssets.js.map +1 -1
- package/dist/src/hooks/useDropdownData.d.ts +1 -1
- package/dist/src/hooks/useDropdownData.d.ts.map +1 -1
- package/dist/src/hooks/useDropdownData.js +25 -12
- package/dist/src/hooks/useDropdownData.js.map +1 -1
- package/dist/src/hooks/useRefreshPassport.d.ts +2 -0
- package/dist/src/hooks/useRefreshPassport.d.ts.map +1 -1
- package/dist/src/hooks/useRefreshPassport.js +6 -0
- package/dist/src/hooks/useRefreshPassport.js.map +1 -1
- package/dist/src/hooks/useTokensBalances.d.ts +1 -1
- package/dist/src/hooks/useWalletAccount.d.ts +2 -2
- package/dist/src/hooks/useWalletAccount.d.ts.map +1 -1
- package/dist/src/utils/cryptoAssets.js +1 -1
- package/dist/src/utils/cryptoAssets.js.map +1 -1
- package/dist/src/utils/cryptoAssets.test.js +4 -4
- package/dist/src/utils/cryptoAssets.test.js.map +1 -1
- package/package.json +2 -2
- package/src/components/Dropdown/Root/AccountOtherAssets.tsx +7 -2
- package/src/hooks/useDropdownData.ts +42 -28
- package/src/hooks/useRefreshPassport.ts +6 -0
- package/src/hooks/useWalletAccount.ts +2 -2
- package/src/utils/cryptoAssets.test.ts +4 -4
- package/src/utils/cryptoAssets.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountOtherAssets.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountOtherAssets.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAKtC,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,
|
|
1
|
+
{"version":3,"file":"AccountOtherAssets.d.ts","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountOtherAssets.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAKtC,KAAK,uBAAuB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,qBAwDxE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useMemo } from "react";
|
|
2
|
-
import { Block, useStyletron } from "@mezo-org/mezo-clay";
|
|
2
|
+
import { Block, useStyletron, CoinsStacked02 } from "@mezo-org/mezo-clay";
|
|
3
3
|
import ListingItem from "../ListingItem";
|
|
4
4
|
import { formatUsd } from "../../../utils/currency";
|
|
5
5
|
export default function AccountOtherAssets(props) {
|
|
@@ -21,11 +21,7 @@ export default function AccountOtherAssets(props) {
|
|
|
21
21
|
},
|
|
22
22
|
},
|
|
23
23
|
} },
|
|
24
|
-
React.createElement(ListingItem
|
|
25
|
-
// TODO: Implement icon in Clay
|
|
26
|
-
, {
|
|
27
|
-
// TODO: Implement icon in Clay
|
|
28
|
-
label: label, value: formattedAssetsUsdTotal, overrides: {
|
|
24
|
+
React.createElement(ListingItem, { icon: CoinsStacked02, label: label, value: formattedAssetsUsdTotal, overrides: {
|
|
29
25
|
Root: {
|
|
30
26
|
props: {
|
|
31
27
|
$as: "button",
|
|
@@ -37,6 +33,11 @@ export default function AccountOtherAssets(props) {
|
|
|
37
33
|
cursor: "pointer",
|
|
38
34
|
},
|
|
39
35
|
},
|
|
36
|
+
ArtworkContainer: {
|
|
37
|
+
style: {
|
|
38
|
+
stroke: theme.colors.contentPrimary,
|
|
39
|
+
},
|
|
40
|
+
},
|
|
40
41
|
Content: {
|
|
41
42
|
style: {
|
|
42
43
|
minHeight: theme.sizing.scale1200,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountOtherAssets.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountOtherAssets.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"AccountOtherAssets.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/AccountOtherAssets.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,WAAW,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAQnD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,KAA8B;IACvE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAEtD,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,iBAAiB,CAAA;QAC/C,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,cAAc,CAAA;QAC5C,OAAO,GAAG,WAAW,cAAc,CAAA;IACrC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjB,MAAM,uBAAuB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAA;IAEzD,OAAO,CACL,oBAAC,KAAK,kBACQ,KAAK,EACjB,EAAE,EAAC,IAAI,EACP,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,SAAS,EAAE,MAAM;oBACjB,SAAS,EAAE,aAAa,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE;iBAC7D;aACF;SACF;QAED,oBAAC,WAAW,IACV,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,uBAAuB,EAC9B,SAAS,EAAE;gBACT,IAAI,EAAE;oBACJ,KAAK,EAAE;wBACL,GAAG,EAAE,QAAQ;wBACb,OAAO;qBACR;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,CAAC;wBACT,OAAO,EAAE,CAAC;wBACV,MAAM,EAAE,SAAS;qBAClB;iBACF;gBACD,gBAAgB,EAAE;oBAChB,KAAK,EAAE;wBACL,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc;qBACpC;iBACF;gBACD,OAAO,EAAE;oBACP,KAAK,EAAE;wBACL,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS;qBAClC;iBACF;aACF,GACD,CACI,CACT,CAAA;AACH,CAAC"}
|
|
@@ -11,7 +11,7 @@ export type DropdownCryptoAsset<T = CryptoAssetKey> = {
|
|
|
11
11
|
export default function useDropdownData(): {
|
|
12
12
|
mezoId: string | undefined;
|
|
13
13
|
matsBalance: number;
|
|
14
|
-
accountAddress: string | undefined;
|
|
14
|
+
accountAddress: `0x${string}` | undefined;
|
|
15
15
|
walletAddress: string | undefined;
|
|
16
16
|
walletType: "bitcoin" | "evm";
|
|
17
17
|
usdTotalBalance: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDropdownData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAGf,MAAM,uBAAuB,CAAA;AAO9B,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,cAAc,IAAI;IACpD,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;
|
|
1
|
+
{"version":3,"file":"useDropdownData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAGf,MAAM,uBAAuB,CAAA;AAO9B,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,cAAc,IAAI;IACpD,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AASD;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoFtC"}
|
|
@@ -6,20 +6,28 @@ import useAssetsConversionRates from "./useAssetsConversionRates";
|
|
|
6
6
|
import useWalletAccount from "./useWalletAccount";
|
|
7
7
|
import { useTokensBalances } from "./useTokensBalances";
|
|
8
8
|
import { useBorrowData } from "./useBorrowData";
|
|
9
|
+
const DEFAULT_ASSET_DATA = {
|
|
10
|
+
rawBalance: 0n,
|
|
11
|
+
formattedBalance: "0.0000",
|
|
12
|
+
usdBalance: 0,
|
|
13
|
+
formattedUsdBalance: "$0.00",
|
|
14
|
+
};
|
|
9
15
|
/**
|
|
10
16
|
* Aggregates dropdown data for Dropdown component.
|
|
11
17
|
* @returns Dropdown data.
|
|
12
18
|
* @dev This hook is for internal use only.
|
|
13
19
|
*/
|
|
14
20
|
export default function useDropdownData() {
|
|
15
|
-
const { data: btcBalance } = useBalance();
|
|
16
21
|
const { walletAddress, accountAddress, networkFamily: walletType, } = useWalletAccount();
|
|
22
|
+
const { data: btcBalance } = useBalance({
|
|
23
|
+
address: accountAddress,
|
|
24
|
+
});
|
|
17
25
|
const { data: passportAccount } = useGetCurrentAccount();
|
|
18
26
|
const { data: assetsConversionRates } = useAssetsConversionRates();
|
|
19
27
|
const { data: tokensBalances } = useTokensBalances();
|
|
20
28
|
const { data: debt } = useBorrowData();
|
|
21
29
|
const mezoId = passportAccount?.mezoId;
|
|
22
|
-
const detailedAssets =
|
|
30
|
+
const detailedAssets = [
|
|
23
31
|
["BTC", btcBalance?.value ?? 0n],
|
|
24
32
|
...Object.entries(tokensBalances ?? {}),
|
|
25
33
|
].map((asset) => {
|
|
@@ -30,19 +38,24 @@ export default function useDropdownData() {
|
|
|
30
38
|
if (type === "mT") {
|
|
31
39
|
usdConversionRate = assetsConversionRates?.usd.t;
|
|
32
40
|
}
|
|
33
|
-
return
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}));
|
|
41
|
+
return mapCryptoAssetToDetails(type, balance, usdConversionRate || 1);
|
|
42
|
+
});
|
|
43
|
+
const btcData = detailedAssets.find(({ type }) => type === "BTC");
|
|
44
|
+
const musdData = detailedAssets.find(({ type }) => type === "MUSD");
|
|
45
|
+
const otherAssetsData = detailedAssets.filter(({ type }) => !["BTC", "MUSD"].includes(type));
|
|
46
|
+
const otherAssetsCount = otherAssetsData.filter((asset) => asset.rawBalance !== 0n).length;
|
|
38
47
|
const assets = {
|
|
39
|
-
btc:
|
|
40
|
-
|
|
48
|
+
btc: btcData || {
|
|
49
|
+
type: "BTC",
|
|
50
|
+
...DEFAULT_ASSET_DATA,
|
|
51
|
+
},
|
|
52
|
+
musd: musdData || {
|
|
53
|
+
type: "mUSD",
|
|
54
|
+
...DEFAULT_ASSET_DATA,
|
|
55
|
+
},
|
|
41
56
|
};
|
|
42
|
-
const otherAssetsData = Object.values(detailedAssets).filter((asset) => !["BTC", "MUSD"].includes(asset.type));
|
|
43
|
-
const otherAssetsCount = otherAssetsData.length;
|
|
44
57
|
const otherAssetsUsdTotal = otherAssetsData.reduce((sum, { usdBalance }) => sum + usdBalance, 0);
|
|
45
|
-
const usdTotalBalance =
|
|
58
|
+
const usdTotalBalance = detailedAssets.reduce((sum, { usdBalance }) => sum + usdBalance, 0);
|
|
46
59
|
const matsBalance = passportAccount?.mats.totalMats || 0;
|
|
47
60
|
const usdCollateral = fromFixedPoint((debt?.collateral ?? 0n) * BigInt(assetsConversionRates?.usd.btc ?? 0), 18);
|
|
48
61
|
const usdTroveDebt = fromFixedPoint(debt?.troveDebt ?? 0n, 18);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDropdownData.js","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAA;AACxC,OAAO,EAEL,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,wBAAwB,MAAM,4BAA4B,CAAA;AACjE,OAAO,gBAAgB,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAO/C
|
|
1
|
+
{"version":3,"file":"useDropdownData.js","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,5 +13,7 @@
|
|
|
13
13
|
export declare function useRefreshPassport(): {
|
|
14
14
|
refreshCurrentAccount: () => Promise<void>;
|
|
15
15
|
refreshUsdConversion: () => Promise<void>;
|
|
16
|
+
refreshBorrowData: () => Promise<void>;
|
|
17
|
+
refreshTokensBalances: () => Promise<void>;
|
|
16
18
|
};
|
|
17
19
|
//# sourceMappingURL=useRefreshPassport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRefreshPassport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRefreshPassport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useRefreshPassport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRefreshPassport.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB;;;;;EA2BjC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { useQueryClient } from "@tanstack/react-query";
|
|
2
2
|
import { useCallback } from "react";
|
|
3
3
|
import { QUERY_KEYS } from "./constants";
|
|
4
|
+
import { useInvalidateTokensBalances } from "./useTokensBalances";
|
|
5
|
+
import { useInvalidateBorrowData } from "./useBorrowData";
|
|
4
6
|
/**
|
|
5
7
|
* Hook to refresh the passport using query invalidation mechanism.
|
|
6
8
|
* By calling the refresh function, the latest data will be refetched as soon as possible.
|
|
@@ -15,6 +17,8 @@ import { QUERY_KEYS } from "./constants";
|
|
|
15
17
|
*/
|
|
16
18
|
export function useRefreshPassport() {
|
|
17
19
|
const queryClient = useQueryClient();
|
|
20
|
+
const { invalidateBorrowData } = useInvalidateBorrowData();
|
|
21
|
+
const { invalidateTokenBalances } = useInvalidateTokensBalances();
|
|
18
22
|
const refreshCurrentAccount = useCallback(() => queryClient.invalidateQueries({
|
|
19
23
|
queryKey: [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT],
|
|
20
24
|
}), [queryClient]);
|
|
@@ -24,6 +28,8 @@ export function useRefreshPassport() {
|
|
|
24
28
|
return {
|
|
25
29
|
refreshCurrentAccount,
|
|
26
30
|
refreshUsdConversion,
|
|
31
|
+
refreshBorrowData: invalidateBorrowData,
|
|
32
|
+
refreshTokensBalances: invalidateTokenBalances,
|
|
27
33
|
};
|
|
28
34
|
}
|
|
29
35
|
//# sourceMappingURL=useRefreshPassport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRefreshPassport.js","sourceRoot":"","sources":["../../../src/hooks/useRefreshPassport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"useRefreshPassport.js","sourceRoot":"","sources":["../../../src/hooks/useRefreshPassport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAA;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAA;AAEzD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,kBAAkB;IAChC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,EAAE,oBAAoB,EAAE,GAAG,uBAAuB,EAAE,CAAA;IAC1D,MAAM,EAAE,uBAAuB,EAAE,GAAG,2BAA2B,EAAE,CAAA;IAEjE,MAAM,qBAAqB,GAAG,WAAW,CACvC,GAAG,EAAE,CACH,WAAW,CAAC,iBAAiB,CAAC;QAC5B,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;KACnD,CAAC,EACJ,CAAC,WAAW,CAAC,CACd,CAAA;IAED,MAAM,oBAAoB,GAAG,WAAW,CACtC,GAAG,EAAE,CACH,WAAW,CAAC,iBAAiB,CAAC;QAC5B,QAAQ,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC;KAC7C,CAAC,EACJ,CAAC,WAAW,CAAC,CACd,CAAA;IAED,OAAO;QACL,qBAAqB;QACrB,oBAAoB;QACpB,iBAAiB,EAAE,oBAAoB;QACvC,qBAAqB,EAAE,uBAAuB;KAC/C,CAAA;AACH,CAAC"}
|
|
@@ -39,7 +39,7 @@ export declare function useTokensBalances<T extends MezoChainToken[]>(options?:
|
|
|
39
39
|
readonly type: "function";
|
|
40
40
|
}];
|
|
41
41
|
functionName: string;
|
|
42
|
-
args: string[];
|
|
42
|
+
args: `0x${string}`[];
|
|
43
43
|
chainId: 31611 | undefined;
|
|
44
44
|
}[], true, Record<T[number], bigint>>;
|
|
45
45
|
/**
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Address } from "viem";
|
|
2
2
|
import { Connector } from "wagmi";
|
|
3
3
|
type UseWalletAccountReturn = {
|
|
4
|
-
accountAddress?:
|
|
5
|
-
walletAddress?: string
|
|
4
|
+
accountAddress?: Address;
|
|
5
|
+
walletAddress?: string;
|
|
6
6
|
isConnected: boolean;
|
|
7
7
|
networkFamily: "bitcoin" | "evm";
|
|
8
8
|
connector?: Connector;
|
|
@@ -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,cAAc,CAAC,EAAE,
|
|
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;AAMD,MAAM,CAAC,OAAO,UAAU,gBAAgB,IAAI,sBAAsB,CAmCjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoAssets.js","sourceRoot":"","sources":["../../../src/utils/cryptoAssets.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,SAAS,EAET,YAAY,EACZ,gBAAgB,GACjB,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EACL,sBAAsB,EACtB,cAAc,EACd,iBAAiB,GAClB,MAAM,WAAW,CAAA;AAWlB,wCAAwC;AAExC,MAAM,aAAa,GAAwC;IACzD,GAAG,EAAE;QACH,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"cryptoAssets.js","sourceRoot":"","sources":["../../../src/utils/cryptoAssets.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,21 +2,21 @@ import { BitcoinCircle, EthCircle, MUsdCircle02 } from "@mezo-org/mezo-clay";
|
|
|
2
2
|
import { getCryptoAsset, isBitcoinLikeCryptoAsset, isUsdLikeCryptoAsset, } from "./cryptoAssets";
|
|
3
3
|
// FIXME: Test fails if run in full suite (pnpm test) but works when run in isolation (pnpm test cryptoAssets)
|
|
4
4
|
describe("getCryptoAsset", () => {
|
|
5
|
-
it("returns the correct asset for '
|
|
5
|
+
it("returns the correct asset for 'BTC (mBTC)'", () => {
|
|
6
6
|
const asset = getCryptoAsset("BTC");
|
|
7
7
|
expect(asset.name).toBe("Bitcoin");
|
|
8
8
|
expect(asset.symbol).toBe("BTC");
|
|
9
|
-
expect(asset.decimals).toBe(
|
|
9
|
+
expect(asset.decimals).toBe(18);
|
|
10
10
|
expect(asset.icon).toBe(BitcoinCircle);
|
|
11
11
|
});
|
|
12
|
-
it("returns the correct asset for '
|
|
12
|
+
it("returns the correct asset for 'ETH'", () => {
|
|
13
13
|
const asset = getCryptoAsset("ETH");
|
|
14
14
|
expect(asset.name).toBe("Ethereum");
|
|
15
15
|
expect(asset.symbol).toBe("ETH");
|
|
16
16
|
expect(asset.decimals).toBe(18);
|
|
17
17
|
expect(asset.icon).toBe(EthCircle);
|
|
18
18
|
});
|
|
19
|
-
it("returns the correct asset for '
|
|
19
|
+
it("returns the correct asset for 'MUSD'", () => {
|
|
20
20
|
const asset = getCryptoAsset("MUSD");
|
|
21
21
|
expect(asset.name).toBe("MUSD");
|
|
22
22
|
expect(asset.symbol).toBe("MUSD");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoAssets.test.js","sourceRoot":"","sources":["../../../src/utils/cryptoAssets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,gBAAgB,CAAA;AAEvB,8GAA8G;AAE9G,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"cryptoAssets.test.js","sourceRoot":"","sources":["../../../src/utils/cryptoAssets.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,gBAAgB,CAAA;AAEvB,8GAA8G;AAE9G,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;QACnC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;QACnC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAChC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;QACpC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,KAAK,GAAG;QACZ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACnC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;QAClC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClC,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE;QACrC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QACnC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QAChC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;QACnC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;QACnC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;QACnC,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE;QACtC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;KACnC,CAAA;IAED,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACpC,EAAE,CAAC,WAAW,QAAQ,QAAQ,KAAK,EAAE,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,wBAAwB,CAAC,KAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC1E,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,MAAM,KAAK,GAAG;QACZ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE;QACpC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QACjC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;QACnC,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE;QACtC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE;QACpC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QAChC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;QAClC,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE;QACvC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;KAClC,CAAA;IAED,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACpC,EAAE,CAAC,WAAW,QAAQ,QAAQ,KAAK,EAAE,EAAE,GAAG,EAAE;YAC1C,MAAM,CAAC,oBAAoB,CAAC,KAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACtE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mezo-org/passport",
|
|
3
|
-
"version": "0.4.0-dev.
|
|
3
|
+
"version": "0.4.0-dev.22",
|
|
4
4
|
"main": "dist/src/index.js",
|
|
5
5
|
"license": "GPL-3.0-only",
|
|
6
6
|
"scripts": {
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"typescript": "^5.8.2"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@mezo-org/mezo-clay": "0.1.0-dev.
|
|
40
|
+
"@mezo-org/mezo-clay": "0.1.0-dev.27",
|
|
41
41
|
"@mezo-org/mezod-contracts": "^1.0.0",
|
|
42
42
|
"@mezo-org/orangekit": "1.0.0-beta.40-dev.2",
|
|
43
43
|
"@mezo-org/sign-in-with-wallet": "1.0.0-beta.8",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { useMemo } from "react"
|
|
2
|
-
import { Block, useStyletron } from "@mezo-org/mezo-clay"
|
|
2
|
+
import { Block, useStyletron, CoinsStacked02 } from "@mezo-org/mezo-clay"
|
|
3
3
|
import ListingItem from "../ListingItem"
|
|
4
4
|
import { formatUsd } from "../../../utils/currency"
|
|
5
5
|
|
|
@@ -36,7 +36,7 @@ export default function AccountOtherAssets(props: AccountOtherAssetsProps) {
|
|
|
36
36
|
}}
|
|
37
37
|
>
|
|
38
38
|
<ListingItem
|
|
39
|
-
|
|
39
|
+
icon={CoinsStacked02}
|
|
40
40
|
label={label}
|
|
41
41
|
value={formattedAssetsUsdTotal}
|
|
42
42
|
overrides={{
|
|
@@ -51,6 +51,11 @@ export default function AccountOtherAssets(props: AccountOtherAssetsProps) {
|
|
|
51
51
|
cursor: "pointer",
|
|
52
52
|
},
|
|
53
53
|
},
|
|
54
|
+
ArtworkContainer: {
|
|
55
|
+
style: {
|
|
56
|
+
stroke: theme.colors.contentPrimary,
|
|
57
|
+
},
|
|
58
|
+
},
|
|
54
59
|
Content: {
|
|
55
60
|
style: {
|
|
56
61
|
minHeight: theme.sizing.scale1200,
|
|
@@ -16,62 +16,76 @@ export type DropdownCryptoAsset<T = CryptoAssetKey> = {
|
|
|
16
16
|
balance: bigint
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
+
const DEFAULT_ASSET_DATA = {
|
|
20
|
+
rawBalance: 0n,
|
|
21
|
+
formattedBalance: "0.0000",
|
|
22
|
+
usdBalance: 0,
|
|
23
|
+
formattedUsdBalance: "$0.00",
|
|
24
|
+
}
|
|
25
|
+
|
|
19
26
|
/**
|
|
20
27
|
* Aggregates dropdown data for Dropdown component.
|
|
21
28
|
* @returns Dropdown data.
|
|
22
29
|
* @dev This hook is for internal use only.
|
|
23
30
|
*/
|
|
24
31
|
export default function useDropdownData() {
|
|
25
|
-
const { data: btcBalance } = useBalance()
|
|
26
32
|
const {
|
|
27
33
|
walletAddress,
|
|
28
34
|
accountAddress,
|
|
29
35
|
networkFamily: walletType,
|
|
30
36
|
} = useWalletAccount()
|
|
37
|
+
const { data: btcBalance } = useBalance({
|
|
38
|
+
address: accountAddress,
|
|
39
|
+
})
|
|
31
40
|
const { data: passportAccount } = useGetCurrentAccount()
|
|
32
41
|
const { data: assetsConversionRates } = useAssetsConversionRates()
|
|
33
42
|
const { data: tokensBalances } = useTokensBalances()
|
|
34
43
|
const { data: debt } = useBorrowData()
|
|
35
44
|
const mezoId = passportAccount?.mezoId
|
|
36
45
|
|
|
37
|
-
const detailedAssets =
|
|
38
|
-
[
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
]
|
|
42
|
-
const [type, balance] = asset as [CryptoAssetKey, bigint]
|
|
46
|
+
const detailedAssets = [
|
|
47
|
+
["BTC", btcBalance?.value ?? 0n],
|
|
48
|
+
...Object.entries(tokensBalances ?? {}),
|
|
49
|
+
].map((asset) => {
|
|
50
|
+
const [type, balance] = asset as [CryptoAssetKey, bigint]
|
|
43
51
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
52
|
+
let usdConversionRate: number | undefined
|
|
53
|
+
if (isBitcoinLikeCryptoAsset(type))
|
|
54
|
+
usdConversionRate = assetsConversionRates?.usd.btc
|
|
55
|
+
if (type === "mT") {
|
|
56
|
+
usdConversionRate = assetsConversionRates?.usd.t
|
|
57
|
+
}
|
|
50
58
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
mapCryptoAssetToDetails(type, balance, usdConversionRate || 1),
|
|
54
|
-
]
|
|
55
|
-
}),
|
|
56
|
-
) as Record<CryptoAssetKey, ReturnType<typeof mapCryptoAssetToDetails>>
|
|
57
|
-
|
|
58
|
-
const assets = {
|
|
59
|
-
btc: detailedAssets.BTC,
|
|
60
|
-
musd: detailedAssets.MUSD,
|
|
61
|
-
}
|
|
59
|
+
return mapCryptoAssetToDetails(type, balance, usdConversionRate || 1)
|
|
60
|
+
})
|
|
62
61
|
|
|
63
|
-
const
|
|
64
|
-
|
|
62
|
+
const btcData = detailedAssets.find(({ type }) => type === "BTC")!
|
|
63
|
+
const musdData = detailedAssets.find(({ type }) => type === "MUSD")!
|
|
64
|
+
const otherAssetsData = detailedAssets.filter(
|
|
65
|
+
({ type }) => !["BTC", "MUSD"].includes(type),
|
|
65
66
|
)
|
|
66
67
|
|
|
67
|
-
const otherAssetsCount = otherAssetsData.
|
|
68
|
+
const otherAssetsCount = otherAssetsData.filter(
|
|
69
|
+
(asset) => asset.rawBalance !== 0n,
|
|
70
|
+
).length
|
|
71
|
+
|
|
72
|
+
const assets = {
|
|
73
|
+
btc: btcData || {
|
|
74
|
+
type: "BTC",
|
|
75
|
+
...DEFAULT_ASSET_DATA,
|
|
76
|
+
},
|
|
77
|
+
musd: musdData || {
|
|
78
|
+
type: "mUSD",
|
|
79
|
+
...DEFAULT_ASSET_DATA,
|
|
80
|
+
},
|
|
81
|
+
}
|
|
68
82
|
|
|
69
83
|
const otherAssetsUsdTotal = otherAssetsData.reduce(
|
|
70
84
|
(sum, { usdBalance }) => sum + usdBalance,
|
|
71
85
|
0,
|
|
72
86
|
)
|
|
73
87
|
|
|
74
|
-
const usdTotalBalance =
|
|
88
|
+
const usdTotalBalance = detailedAssets.reduce(
|
|
75
89
|
(sum, { usdBalance }) => sum + usdBalance,
|
|
76
90
|
0,
|
|
77
91
|
)
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { useQueryClient } from "@tanstack/react-query"
|
|
2
2
|
import { useCallback } from "react"
|
|
3
3
|
import { QUERY_KEYS } from "./constants"
|
|
4
|
+
import { useInvalidateTokensBalances } from "./useTokensBalances"
|
|
5
|
+
import { useInvalidateBorrowData } from "./useBorrowData"
|
|
4
6
|
|
|
5
7
|
/**
|
|
6
8
|
* Hook to refresh the passport using query invalidation mechanism.
|
|
@@ -16,6 +18,8 @@ import { QUERY_KEYS } from "./constants"
|
|
|
16
18
|
*/
|
|
17
19
|
export function useRefreshPassport() {
|
|
18
20
|
const queryClient = useQueryClient()
|
|
21
|
+
const { invalidateBorrowData } = useInvalidateBorrowData()
|
|
22
|
+
const { invalidateTokenBalances } = useInvalidateTokensBalances()
|
|
19
23
|
|
|
20
24
|
const refreshCurrentAccount = useCallback(
|
|
21
25
|
() =>
|
|
@@ -36,5 +40,7 @@ export function useRefreshPassport() {
|
|
|
36
40
|
return {
|
|
37
41
|
refreshCurrentAccount,
|
|
38
42
|
refreshUsdConversion,
|
|
43
|
+
refreshBorrowData: invalidateBorrowData,
|
|
44
|
+
refreshTokensBalances: invalidateTokenBalances,
|
|
39
45
|
}
|
|
40
46
|
}
|
|
@@ -5,8 +5,8 @@ import { Address } from "viem"
|
|
|
5
5
|
import { Connector, useAccount } from "wagmi"
|
|
6
6
|
|
|
7
7
|
type UseWalletAccountReturn = {
|
|
8
|
-
accountAddress?:
|
|
9
|
-
walletAddress?: string
|
|
8
|
+
accountAddress?: Address
|
|
9
|
+
walletAddress?: string
|
|
10
10
|
isConnected: boolean
|
|
11
11
|
networkFamily: "bitcoin" | "evm"
|
|
12
12
|
connector?: Connector
|
|
@@ -9,15 +9,15 @@ import {
|
|
|
9
9
|
// FIXME: Test fails if run in full suite (pnpm test) but works when run in isolation (pnpm test cryptoAssets)
|
|
10
10
|
|
|
11
11
|
describe("getCryptoAsset", () => {
|
|
12
|
-
it("returns the correct asset for '
|
|
12
|
+
it("returns the correct asset for 'BTC (mBTC)'", () => {
|
|
13
13
|
const asset = getCryptoAsset("BTC")
|
|
14
14
|
expect(asset.name).toBe("Bitcoin")
|
|
15
15
|
expect(asset.symbol).toBe("BTC")
|
|
16
|
-
expect(asset.decimals).toBe(
|
|
16
|
+
expect(asset.decimals).toBe(18)
|
|
17
17
|
expect(asset.icon).toBe(BitcoinCircle)
|
|
18
18
|
})
|
|
19
19
|
|
|
20
|
-
it("returns the correct asset for '
|
|
20
|
+
it("returns the correct asset for 'ETH'", () => {
|
|
21
21
|
const asset = getCryptoAsset("ETH")
|
|
22
22
|
expect(asset.name).toBe("Ethereum")
|
|
23
23
|
expect(asset.symbol).toBe("ETH")
|
|
@@ -25,7 +25,7 @@ describe("getCryptoAsset", () => {
|
|
|
25
25
|
expect(asset.icon).toBe(EthCircle)
|
|
26
26
|
})
|
|
27
27
|
|
|
28
|
-
it("returns the correct asset for '
|
|
28
|
+
it("returns the correct asset for 'MUSD'", () => {
|
|
29
29
|
const asset = getCryptoAsset("MUSD")
|
|
30
30
|
expect(asset.name).toBe("MUSD")
|
|
31
31
|
expect(asset.symbol).toBe("MUSD")
|