@mezo-org/passport 0.4.0-dev.16 → 0.4.0-dev.18
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/AccountAssets.d.ts +1 -2
- package/dist/src/components/Dropdown/AccountAssets.d.ts.map +1 -1
- package/dist/src/components/Dropdown/AccountAssets.js +1 -2
- package/dist/src/components/Dropdown/AccountAssets.js.map +1 -1
- package/dist/src/components/Dropdown/AccountBalance.d.ts +1 -1
- package/dist/src/components/Dropdown/AccountBalance.d.ts.map +1 -1
- package/dist/src/components/Dropdown/AccountBalance.js +1 -3
- package/dist/src/components/Dropdown/AccountBalance.js.map +1 -1
- package/dist/src/components/Dropdown/WelcomeBlock.d.ts +1 -1
- package/dist/src/components/Dropdown/WelcomeBlock.d.ts.map +1 -1
- package/dist/src/components/Dropdown/WelcomeBlock.js +1 -2
- package/dist/src/components/Dropdown/WelcomeBlock.js.map +1 -1
- package/dist/src/hooks/useDropdownData.d.ts +3 -4
- package/dist/src/hooks/useDropdownData.d.ts.map +1 -1
- package/dist/src/hooks/useDropdownData.js +10 -6
- package/dist/src/hooks/useDropdownData.js.map +1 -1
- package/dist/src/utils/numbers.d.ts.map +1 -1
- package/dist/src/utils/numbers.js +2 -2
- package/dist/src/utils/numbers.js.map +1 -1
- package/dist/src/utils/numbers.test.js +2 -12
- package/dist/src/utils/numbers.test.js.map +1 -1
- package/package.json +2 -2
- package/src/components/Dropdown/AccountAssets.tsx +2 -4
- package/src/components/Dropdown/AccountBalance.tsx +2 -5
- package/src/components/Dropdown/WelcomeBlock.tsx +2 -3
- package/src/hooks/useDropdownData.ts +26 -10
- package/src/utils/numbers.test.ts +3 -15
- package/src/utils/numbers.ts +2 -2
- package/dist/src/hooks/useUpdatePassport.d.ts +0 -17
- package/dist/src/hooks/useUpdatePassport.d.ts.map +0 -1
- package/dist/src/hooks/useUpdatePassport.js +0 -29
- package/dist/src/hooks/useUpdatePassport.js.map +0 -1
|
@@ -4,9 +4,8 @@ type AccountAssetsProps = {
|
|
|
4
4
|
label: string | React.ReactNode;
|
|
5
5
|
assets: {
|
|
6
6
|
type: CryptoAssetKey;
|
|
7
|
-
decimals: number;
|
|
8
7
|
balance: string;
|
|
9
|
-
balanceInUsd:
|
|
8
|
+
balanceInUsd: string;
|
|
10
9
|
}[];
|
|
11
10
|
};
|
|
12
11
|
export default function AccountAssets(props: AccountAssetsProps): React.JSX.Element | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountAssets.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountAssets.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAkB,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,cAAc,EAAkB,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"AccountAssets.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountAssets.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAkB,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,cAAc,EAAkB,MAAM,0BAA0B,CAAA;AAEzE,KAAK,kBAAkB,GAAG;IACxB,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,SAAS,CAAA;IAC/B,MAAM,EAAE;QACN,IAAI,EAAE,cAAc,CAAA;QACpB,OAAO,EAAE,MAAM,CAAA;QACf,YAAY,EAAE,MAAM,CAAA;KACrB,EAAE,CAAA;CACJ,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,KAAK,EAAE,kBAAkB,4BAyF9D"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Block, LabelSmall, ParagraphSmall, useStyletron, } from "@mezo-org/mezo-clay";
|
|
2
2
|
import React, { useMemo } from "react";
|
|
3
3
|
import { getCryptoAsset } from "../../utils/cryptoAssets";
|
|
4
|
-
import { formatUsd } from "../../utils/currency";
|
|
5
4
|
export default function AccountAssets(props) {
|
|
6
5
|
const { label, assets } = props;
|
|
7
6
|
const [, theme] = useStyletron();
|
|
@@ -39,6 +38,6 @@ export default function AccountAssets(props) {
|
|
|
39
38
|
React.createElement(ParagraphSmall, { margin: 0, color: theme.colors.gray500 }, asset.symbol)),
|
|
40
39
|
React.createElement(Block, { display: "flex", alignItems: "end", flexDirection: "column" },
|
|
41
40
|
React.createElement(LabelSmall, { margin: 0 }, asset.balance),
|
|
42
|
-
React.createElement(ParagraphSmall, { margin: 0, color: theme.colors.gray500 },
|
|
41
|
+
React.createElement(ParagraphSmall, { margin: 0, color: theme.colors.gray500 }, asset.balanceInUsd))))))));
|
|
43
42
|
}
|
|
44
43
|
//# sourceMappingURL=AccountAssets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountAssets.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountAssets.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,UAAU,EACV,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAkB,cAAc,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"AccountAssets.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountAssets.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountBalance.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountBalance.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"AccountBalance.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountBalance.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,mBAAmB,qBAsBhE"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { Block, HeadingSmall, ParagraphSmall, useStyletron, } from "@mezo-org/mezo-clay";
|
|
2
2
|
import React from "react";
|
|
3
|
-
import { formatUsd } from "../../utils/currency";
|
|
4
3
|
export default function AccountBalance(props) {
|
|
5
4
|
const { amount } = props;
|
|
6
|
-
const formattedUsdBalance = formatUsd(amount);
|
|
7
5
|
const [, theme] = useStyletron();
|
|
8
6
|
return (React.createElement(Block, { padding: theme.sizing.scale500, overrides: {
|
|
9
7
|
Block: {
|
|
@@ -13,6 +11,6 @@ export default function AccountBalance(props) {
|
|
|
13
11
|
},
|
|
14
12
|
} },
|
|
15
13
|
React.createElement(ParagraphSmall, { margin: 0, color: theme.colors.gray800 }, "Available balance"),
|
|
16
|
-
React.createElement(HeadingSmall, { margin: 0 },
|
|
14
|
+
React.createElement(HeadingSmall, { margin: 0 }, amount)));
|
|
17
15
|
}
|
|
18
16
|
//# sourceMappingURL=AccountBalance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountBalance.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountBalance.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"AccountBalance.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/AccountBalance.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AAMzB,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAA0B;IAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IAExB,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAC9B,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,YAAY,EAAE,aAAa,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE;iBAC5D;aACF;SACF;QAED,oBAAC,cAAc,IAAC,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,wBAErC;QACjB,oBAAC,YAAY,IAAC,MAAM,EAAE,CAAC,IAAG,MAAM,CAAgB,CAC1C,CACT,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WelcomeBlock.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/WelcomeBlock.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"WelcomeBlock.d.ts","sourceRoot":"","sources":["../../../../src/components/Dropdown/WelcomeBlock.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,KAAK,iBAAiB,GAAG;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAK,EAAE,iBAAiB,qBAyE5D"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Block, HeadingSmall, LabelSmall, Mats, useStyletron, } from "@mezo-org/mezo-clay";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import DefaultAvatar from "../../assets/DefaultAvatar";
|
|
4
|
-
import { formatNumberToCompactString } from "../../utils/numbers";
|
|
5
4
|
const DOT_DELIMITER_REGEX = /(?=\.)/;
|
|
6
5
|
export default function WelcomeBlock(props) {
|
|
7
6
|
const { mezoId, matsBalance } = props;
|
|
@@ -39,6 +38,6 @@ export default function WelcomeBlock(props) {
|
|
|
39
38
|
},
|
|
40
39
|
} },
|
|
41
40
|
React.createElement(Mats, { color: theme.colors.contentPrimary, size: theme.sizing.scale600 }),
|
|
42
|
-
|
|
41
|
+
matsBalance))));
|
|
43
42
|
}
|
|
44
43
|
//# sourceMappingURL=WelcomeBlock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WelcomeBlock.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/WelcomeBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,UAAU,EACV,IAAI,EACJ,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"WelcomeBlock.js","sourceRoot":"","sources":["../../../../src/components/Dropdown/WelcomeBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,UAAU,EACV,IAAI,EACJ,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,4BAA4B,CAAA;AAEtD,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAOpC,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAwB;IAC3D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;IAErC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC5D,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,IAAI,EACrC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACnC,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;iBAC3B;aACF;SACF;QAED,oBAAC,KAAK,IACJ,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC9B,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,KAAK,EAAE;wBACL,YAAY,EAAE,MAAM;qBACrB;iBACF;aACF,GACD;QAEF,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,aAAa,EAAC,QAAQ,EACtB,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,KAAK,EAAE;wBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;qBAC3B;iBACF;aACF;YAED,oBAAC,YAAY,IAAC,EAAE,EAAC,MAAM;gBACrB,oBAAC,KAAK,IAAC,EAAE,EAAC,MAAM,IAAE,IAAI,CAAS;gBAC/B,oBAAC,KAAK,IAAC,EAAE,EAAC,MAAM,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,IACzC,UAAU,CACL,CACK;YAEf,oBAAC,UAAU,IACT,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,eAAe,EACnC,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,KAAK,EAAE;4BACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;yBAC3B;qBACF;iBACF;gBAED,oBAAC,IAAI,IACH,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc,EAClC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,GAC3B;gBACD,WAAW,CACD,CACP,CACF,CACT,CAAA;AACH,CAAC"}
|
|
@@ -9,8 +9,7 @@ import { CryptoAssetKey } from "../utils/cryptoAssets";
|
|
|
9
9
|
declare function formatCryptoAsset(type: CryptoAssetKey, balance: bigint, btcUsdConversionRate: number): {
|
|
10
10
|
type: CryptoAssetKey;
|
|
11
11
|
balance: string;
|
|
12
|
-
balanceInUsd:
|
|
13
|
-
decimals: number;
|
|
12
|
+
balanceInUsd: string;
|
|
14
13
|
};
|
|
15
14
|
export type DropdownCryptoAsset<T = CryptoAssetKey> = {
|
|
16
15
|
type: T;
|
|
@@ -21,10 +20,10 @@ export type DropdownData = {
|
|
|
21
20
|
mezoId: string;
|
|
22
21
|
address: string;
|
|
23
22
|
walletType: "bitcoin" | "evm";
|
|
24
|
-
totalBalanceInUsd:
|
|
23
|
+
totalBalanceInUsd: string;
|
|
25
24
|
formattedNativeAssets: DropdownDetailedCryptoAsset[];
|
|
26
25
|
matsnet: {
|
|
27
|
-
mats:
|
|
26
|
+
mats: string;
|
|
28
27
|
formattedAssets: DropdownDetailedCryptoAsset[];
|
|
29
28
|
};
|
|
30
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDropdownData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAIf,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"useDropdownData.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAIf,MAAM,uBAAuB,CAAA;AAU9B;;;;;;GAMG;AACH,iBAAS,iBAAiB,CACxB,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,MAAM,EACf,oBAAoB,EAAE,MAAM;;;;EAyB7B;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,cAAc,IAAI;IACpD,IAAI,EAAE,CAAC,CAAA;IACP,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,2BAA2B,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAEvE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,SAAS,GAAG,KAAK,CAAA;IAC7B,iBAAiB,EAAE,MAAM,CAAA;IACzB,qBAAqB,EAAE,2BAA2B,EAAE,CAAA;IACpD,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAA;QACZ,eAAe,EAAE,2BAA2B,EAAE,CAAA;KAC/C,CAAA;CACF,CAAA;AAED,KAAK,sBAAsB,GAAG;IAE5B,eAAe,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACvC,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAA;CACtC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,OAAO,CAAC,EAAE,sBAAsB,GAC/B,YAAY,GAAG,IAAI,CA4DrB"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { useBitcoinAccount } from "@mezo-org/orangekit";
|
|
2
2
|
import { useGetCurrentAccount } from ".";
|
|
3
3
|
import { getCryptoAsset, isBitcoinLikeCryptoAsset, isUsdLikeCryptoAsset, } from "../utils/cryptoAssets";
|
|
4
|
-
import { fromFixedPoint, fromFixedPointToString } from "../utils/numbers";
|
|
4
|
+
import { formatNumberToCompactString, fromFixedPoint, fromFixedPointToString, } from "../utils/numbers";
|
|
5
5
|
import { useAssetsUsdConversion } from "./useAssetsUSDConversion";
|
|
6
6
|
import useWalletAccount from "./useWalletAccount";
|
|
7
|
+
import { formatUsd } from "../utils/currency";
|
|
7
8
|
/**
|
|
8
9
|
* Formats crypto asset to balance details (balance in USD and decimals)
|
|
9
10
|
* @param type The type of crypto asset
|
|
@@ -23,9 +24,8 @@ function formatCryptoAsset(type, balance, btcUsdConversionRate) {
|
|
|
23
24
|
}
|
|
24
25
|
return {
|
|
25
26
|
type,
|
|
26
|
-
balance: fromFixedPointToString(balance, decimals),
|
|
27
|
-
balanceInUsd,
|
|
28
|
-
decimals,
|
|
27
|
+
balance: fromFixedPointToString(balance, decimals, isUsdLikeCryptoAsset(type) ? 2 : 4),
|
|
28
|
+
balanceInUsd: formatUsd(balanceInUsd),
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
@@ -56,8 +56,12 @@ export default function useDropdownData(options) {
|
|
|
56
56
|
: evmNativeAssets;
|
|
57
57
|
const btcUsdConversionRate = Number(assetsUsdConversion?.btcUsd ?? 0);
|
|
58
58
|
const formattedNativeAssets = nativeAssets.map((asset) => formatCryptoAsset(asset.type, asset.balance, btcUsdConversionRate));
|
|
59
|
-
const totalBalanceInUsd =
|
|
60
|
-
|
|
59
|
+
const totalBalanceInUsd = formatUsd(nativeAssets.reduce((sum, value) => {
|
|
60
|
+
const { decimals } = getCryptoAsset(value.type);
|
|
61
|
+
return (sum +
|
|
62
|
+
fromFixedPoint(value.balance * BigInt(btcUsdConversionRate), decimals));
|
|
63
|
+
}, 0));
|
|
64
|
+
const matsBalance = formatNumberToCompactString(passportAccount.mats.totalMats, 2);
|
|
61
65
|
const matsnetFormattedAssets = matsnetAssets.map((asset) => formatCryptoAsset(asset.type, asset.balance, btcUsdConversionRate));
|
|
62
66
|
return {
|
|
63
67
|
mezoId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDropdownData.js","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAA;AACxC,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,
|
|
1
|
+
{"version":3,"file":"useDropdownData.js","sourceRoot":"","sources":["../../../src/hooks/useDropdownData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numbers.d.ts","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,QAAQ,SAAI,GACX,MAAM,CAMR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,eAAe,SAAI,UAYpB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,SAAI,GAAG,MAAM,CAEzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,SAAI,GAClB,MAAM,CAUR;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,MAAM,GAAG,MAAM,GAAG,MAAM,EAChC,iBAAa,EACb,wBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"numbers.d.ts","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,QAAQ,SAAI,GACX,MAAM,CAMR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,eAAe,SAAI,UAYpB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,SAAI,GAAG,MAAM,CAEzE;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,SAAI,GAClB,MAAM,CAUR;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GACjC,QAAQ,MAAM,GAAG,MAAM,GAAG,MAAM,EAChC,iBAAa,EACb,wBAAmB,EACnB,qBAAmB,WA0BpB,CAAA"}
|
|
@@ -24,7 +24,7 @@ export function formatNumberToLocaleString(value, desiredDecimals = 0) {
|
|
|
24
24
|
return "0";
|
|
25
25
|
if (number === 0)
|
|
26
26
|
return `0.${"0".repeat(desiredDecimals)}`;
|
|
27
|
-
return number.toLocaleString("
|
|
27
|
+
return number.toLocaleString("en-US", {
|
|
28
28
|
minimumFractionDigits: desiredDecimals,
|
|
29
29
|
maximumFractionDigits: desiredDecimals,
|
|
30
30
|
});
|
|
@@ -65,7 +65,7 @@ export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals =
|
|
|
65
65
|
* @returns The formatted number as a string.
|
|
66
66
|
* @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L57-L87
|
|
67
67
|
*/
|
|
68
|
-
export const fromFixedPointToString = (amount, decimals = 18, desiredDecimals = 4, withRoundUp =
|
|
68
|
+
export const fromFixedPointToString = (amount, decimals = 18, desiredDecimals = 4, withRoundUp = false) => {
|
|
69
69
|
const fixedPoint = BigInt(amount);
|
|
70
70
|
if (fixedPoint === 0n) {
|
|
71
71
|
return `0.${"0".repeat(desiredDecimals)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CACzC,KAAsB,EACtB,QAAQ,GAAG,CAAC;IAEZ,OAAO,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE;QACnC,QAAQ,EAAE,SAAS;QACnB,cAAc,EAAE,OAAO;QACvB,qBAAqB,EAAE,QAA2B;KACnD,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,KAAsB,EACtB,eAAe,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAEpE,IAAI,MAAM,KAAK,CAAC,IAAI,eAAe,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IAErD,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAA;IAE3D,OAAO,MAAM,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CACzC,KAAsB,EACtB,QAAQ,GAAG,CAAC;IAEZ,OAAO,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE;QACnC,QAAQ,EAAE,SAAS;QACnB,cAAc,EAAE,OAAO;QACvB,qBAAqB,EAAE,QAA2B;KACnD,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,KAAsB,EACtB,eAAe,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAEpE,IAAI,MAAM,KAAK,CAAC,IAAI,eAAe,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IAErD,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAA;IAE3D,OAAO,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE;QACpC,qBAAqB,EAAE,eAAe;QACtC,qBAAqB,EAAE,eAAe;KACvC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,eAAe,GAAG,CAAC;IAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,eAAe,CAAA;AAC1E,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAC5B,UAAkB,EAClB,kBAA0B,EAC1B,eAAe,GAAG,CAAC;IAEnB,MAAM,+BAA+B,GACnC,UAAU;QACV,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,kBAAkB,GAAG,eAAe,CAAC,CAAC,CAAA;IAElE,MAAM,eAAe,GACnB,MAAM,CAAC,+BAA+B,CAAC;QACvC,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAA;IAErD,OAAO,eAAe,CAAA;AACxB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,MAAgC,EAChC,QAAQ,GAAG,EAAE,EACb,eAAe,GAAG,CAAC,EACnB,WAAW,GAAG,KAAK,EACnB,EAAE;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IAEjC,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACtB,OAAO,KAAK,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAA;IAC3C,CAAC;IAED,MAAM,eAAe,GAAG,cAAc,CACpC,UAAU,EACV,QAAQ;IACR,+DAA+D;IAC/D,wDAAwD;IACxD,WAAW,CAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CACpD,CAAA;IAED,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;IAExE,IAAI,kBAAkB,GAAG,eAAe,EAAE,CAAC;QACzC,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC,eAAe,GAAG,CAAC,CAAC,GAAG,CAAA;IACjD,CAAC;IAED,MAAM,oBAAoB,GAAG,WAAW;QACtC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,EAAE,IAAI,eAAe,CAAC,GAAG,EAAE,IAAI,eAAe;QAC5E,CAAC,CAAC,eAAe,CAAA;IACnB,OAAO,0BAA0B,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAA;AAC1E,CAAC,CAAA"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { formatNumberToCompactString, fromFixedPoint, roundUpNumber, } from "./numbers";
|
|
2
|
-
import { formatNumberToLocaleString } from "./numbers";
|
|
3
|
-
import { fromFixedPointToString } from "./numbers";
|
|
1
|
+
import { formatNumberToCompactString, fromFixedPoint, roundUpNumber, formatNumberToLocaleString, fromFixedPointToString, } from "./numbers";
|
|
4
2
|
describe("formatNumberToCompactString", () => {
|
|
5
3
|
it("formats number less than 1000 with decimals", () => {
|
|
6
4
|
expect(formatNumberToCompactString(123.456789, 2)).toBe("123.46");
|
|
@@ -95,14 +93,6 @@ describe("formatNumberToLocaleString", () => {
|
|
|
95
93
|
it("defaults to 0 decimals if not passed", () => {
|
|
96
94
|
expect(formatNumberToLocaleString(1234.567)).toBe("1,235"); // rounds up by default
|
|
97
95
|
});
|
|
98
|
-
it("respects locale formatting", () => {
|
|
99
|
-
const val = 1234567.89;
|
|
100
|
-
const formatted = val.toLocaleString("default", {
|
|
101
|
-
minimumFractionDigits: 2,
|
|
102
|
-
maximumFractionDigits: 2,
|
|
103
|
-
});
|
|
104
|
-
expect(formatNumberToLocaleString(val, 2)).toBe(formatted);
|
|
105
|
-
});
|
|
106
96
|
});
|
|
107
97
|
describe("fromFixedPointToString", () => {
|
|
108
98
|
const toFixedPoint = (num) => BigInt(Math.round(num * 1e18));
|
|
@@ -169,7 +159,7 @@ describe("fromFixedPointToString", () => {
|
|
|
169
159
|
describe("high values", () => {
|
|
170
160
|
it("formats 1_000_000.123456789 correctly", () => {
|
|
171
161
|
const big = toFixedPoint(1_000_000.123456789);
|
|
172
|
-
expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.
|
|
162
|
+
expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.123456");
|
|
173
163
|
});
|
|
174
164
|
it("formats 1e12 ETH", () => {
|
|
175
165
|
const big = BigInt("1000000000000000000000000000000");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,cAAc,EACd,aAAa,
|
|
1
|
+
{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}
|
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.18",
|
|
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.4.3"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@mezo-org/mezo-clay": "0.1.0-dev.
|
|
40
|
+
"@mezo-org/mezo-clay": "0.1.0-dev.25",
|
|
41
41
|
"@mezo-org/orangekit": "1.0.0-beta.40-dev.1",
|
|
42
42
|
"@mezo-org/sign-in-with-wallet": "1.0.0-beta.8"
|
|
43
43
|
},
|
|
@@ -6,15 +6,13 @@ import {
|
|
|
6
6
|
} from "@mezo-org/mezo-clay"
|
|
7
7
|
import React, { useMemo } from "react"
|
|
8
8
|
import { CryptoAssetKey, getCryptoAsset } from "../../utils/cryptoAssets"
|
|
9
|
-
import { formatUsd } from "../../utils/currency"
|
|
10
9
|
|
|
11
10
|
type AccountAssetsProps = {
|
|
12
11
|
label: string | React.ReactNode
|
|
13
12
|
assets: {
|
|
14
13
|
type: CryptoAssetKey
|
|
15
|
-
decimals: number
|
|
16
14
|
balance: string
|
|
17
|
-
balanceInUsd:
|
|
15
|
+
balanceInUsd: string
|
|
18
16
|
}[]
|
|
19
17
|
}
|
|
20
18
|
|
|
@@ -99,7 +97,7 @@ export default function AccountAssets(props: AccountAssetsProps) {
|
|
|
99
97
|
<Block display="flex" alignItems="end" flexDirection="column">
|
|
100
98
|
<LabelSmall margin={0}>{asset.balance}</LabelSmall>
|
|
101
99
|
<ParagraphSmall margin={0} color={theme.colors.gray500}>
|
|
102
|
-
{
|
|
100
|
+
{asset.balanceInUsd}
|
|
103
101
|
</ParagraphSmall>
|
|
104
102
|
</Block>
|
|
105
103
|
</Block>
|
|
@@ -5,17 +5,14 @@ import {
|
|
|
5
5
|
useStyletron,
|
|
6
6
|
} from "@mezo-org/mezo-clay"
|
|
7
7
|
import React from "react"
|
|
8
|
-
import { formatUsd } from "../../utils/currency"
|
|
9
8
|
|
|
10
9
|
type AccountBalanceProps = {
|
|
11
|
-
amount:
|
|
10
|
+
amount: string
|
|
12
11
|
}
|
|
13
12
|
|
|
14
13
|
export default function AccountBalance(props: AccountBalanceProps) {
|
|
15
14
|
const { amount } = props
|
|
16
15
|
|
|
17
|
-
const formattedUsdBalance = formatUsd(amount)
|
|
18
|
-
|
|
19
16
|
const [, theme] = useStyletron()
|
|
20
17
|
|
|
21
18
|
return (
|
|
@@ -32,7 +29,7 @@ export default function AccountBalance(props: AccountBalanceProps) {
|
|
|
32
29
|
<ParagraphSmall margin={0} color={theme.colors.gray800}>
|
|
33
30
|
Available balance
|
|
34
31
|
</ParagraphSmall>
|
|
35
|
-
<HeadingSmall margin={0}>{
|
|
32
|
+
<HeadingSmall margin={0}>{amount}</HeadingSmall>
|
|
36
33
|
</Block>
|
|
37
34
|
)
|
|
38
35
|
}
|
|
@@ -7,13 +7,12 @@ import {
|
|
|
7
7
|
} from "@mezo-org/mezo-clay"
|
|
8
8
|
import React from "react"
|
|
9
9
|
import DefaultAvatar from "../../assets/DefaultAvatar"
|
|
10
|
-
import { formatNumberToCompactString } from "../../utils/numbers"
|
|
11
10
|
|
|
12
11
|
const DOT_DELIMITER_REGEX = /(?=\.)/
|
|
13
12
|
|
|
14
13
|
type WelcomeBlockProps = {
|
|
15
14
|
mezoId: string
|
|
16
|
-
matsBalance:
|
|
15
|
+
matsBalance: string
|
|
17
16
|
}
|
|
18
17
|
|
|
19
18
|
export default function WelcomeBlock(props: WelcomeBlockProps) {
|
|
@@ -84,7 +83,7 @@ export default function WelcomeBlock(props: WelcomeBlockProps) {
|
|
|
84
83
|
color={theme.colors.contentPrimary}
|
|
85
84
|
size={theme.sizing.scale600}
|
|
86
85
|
/>
|
|
87
|
-
{
|
|
86
|
+
{matsBalance}
|
|
88
87
|
</LabelSmall>
|
|
89
88
|
</Block>
|
|
90
89
|
</Block>
|
|
@@ -6,9 +6,14 @@ import {
|
|
|
6
6
|
isBitcoinLikeCryptoAsset,
|
|
7
7
|
isUsdLikeCryptoAsset,
|
|
8
8
|
} from "../utils/cryptoAssets"
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
formatNumberToCompactString,
|
|
11
|
+
fromFixedPoint,
|
|
12
|
+
fromFixedPointToString,
|
|
13
|
+
} from "../utils/numbers"
|
|
10
14
|
import { useAssetsUsdConversion } from "./useAssetsUSDConversion"
|
|
11
15
|
import useWalletAccount from "./useWalletAccount"
|
|
16
|
+
import { formatUsd } from "../utils/currency"
|
|
12
17
|
|
|
13
18
|
/**
|
|
14
19
|
* Formats crypto asset to balance details (balance in USD and decimals)
|
|
@@ -38,9 +43,12 @@ function formatCryptoAsset(
|
|
|
38
43
|
|
|
39
44
|
return {
|
|
40
45
|
type,
|
|
41
|
-
balance: fromFixedPointToString(
|
|
42
|
-
|
|
43
|
-
|
|
46
|
+
balance: fromFixedPointToString(
|
|
47
|
+
balance,
|
|
48
|
+
decimals,
|
|
49
|
+
isUsdLikeCryptoAsset(type) ? 2 : 4,
|
|
50
|
+
),
|
|
51
|
+
balanceInUsd: formatUsd(balanceInUsd),
|
|
44
52
|
}
|
|
45
53
|
}
|
|
46
54
|
|
|
@@ -55,10 +63,10 @@ export type DropdownData = {
|
|
|
55
63
|
mezoId: string
|
|
56
64
|
address: string
|
|
57
65
|
walletType: "bitcoin" | "evm"
|
|
58
|
-
totalBalanceInUsd:
|
|
66
|
+
totalBalanceInUsd: string
|
|
59
67
|
formattedNativeAssets: DropdownDetailedCryptoAsset[]
|
|
60
68
|
matsnet: {
|
|
61
|
-
mats:
|
|
69
|
+
mats: string
|
|
62
70
|
formattedAssets: DropdownDetailedCryptoAsset[]
|
|
63
71
|
}
|
|
64
72
|
}
|
|
@@ -109,12 +117,20 @@ export default function useDropdownData(
|
|
|
109
117
|
formatCryptoAsset(asset.type, asset.balance, btcUsdConversionRate),
|
|
110
118
|
)
|
|
111
119
|
|
|
112
|
-
const totalBalanceInUsd =
|
|
113
|
-
(sum, value) =>
|
|
114
|
-
|
|
120
|
+
const totalBalanceInUsd = formatUsd(
|
|
121
|
+
nativeAssets.reduce((sum, value) => {
|
|
122
|
+
const { decimals } = getCryptoAsset(value.type)
|
|
123
|
+
return (
|
|
124
|
+
sum +
|
|
125
|
+
fromFixedPoint(value.balance * BigInt(btcUsdConversionRate), decimals)
|
|
126
|
+
)
|
|
127
|
+
}, 0),
|
|
115
128
|
)
|
|
116
129
|
|
|
117
|
-
const matsBalance =
|
|
130
|
+
const matsBalance = formatNumberToCompactString(
|
|
131
|
+
passportAccount.mats.totalMats,
|
|
132
|
+
2,
|
|
133
|
+
)
|
|
118
134
|
|
|
119
135
|
const matsnetFormattedAssets = matsnetAssets.map((asset) =>
|
|
120
136
|
formatCryptoAsset(asset.type, asset.balance, btcUsdConversionRate),
|
|
@@ -2,12 +2,10 @@ import {
|
|
|
2
2
|
formatNumberToCompactString,
|
|
3
3
|
fromFixedPoint,
|
|
4
4
|
roundUpNumber,
|
|
5
|
+
formatNumberToLocaleString,
|
|
6
|
+
fromFixedPointToString,
|
|
5
7
|
} from "./numbers"
|
|
6
8
|
|
|
7
|
-
import { formatNumberToLocaleString } from "./numbers"
|
|
8
|
-
|
|
9
|
-
import { fromFixedPointToString } from "./numbers"
|
|
10
|
-
|
|
11
9
|
describe("formatNumberToCompactString", () => {
|
|
12
10
|
it("formats number less than 1000 with decimals", () => {
|
|
13
11
|
expect(formatNumberToCompactString(123.456789, 2)).toBe("123.46")
|
|
@@ -130,16 +128,6 @@ describe("formatNumberToLocaleString", () => {
|
|
|
130
128
|
it("defaults to 0 decimals if not passed", () => {
|
|
131
129
|
expect(formatNumberToLocaleString(1234.567)).toBe("1,235") // rounds up by default
|
|
132
130
|
})
|
|
133
|
-
|
|
134
|
-
it("respects locale formatting", () => {
|
|
135
|
-
const val = 1234567.89
|
|
136
|
-
const formatted = val.toLocaleString("default", {
|
|
137
|
-
minimumFractionDigits: 2,
|
|
138
|
-
maximumFractionDigits: 2,
|
|
139
|
-
})
|
|
140
|
-
|
|
141
|
-
expect(formatNumberToLocaleString(val, 2)).toBe(formatted)
|
|
142
|
-
})
|
|
143
131
|
})
|
|
144
132
|
|
|
145
133
|
describe("fromFixedPointToString", () => {
|
|
@@ -221,7 +209,7 @@ describe("fromFixedPointToString", () => {
|
|
|
221
209
|
describe("high values", () => {
|
|
222
210
|
it("formats 1_000_000.123456789 correctly", () => {
|
|
223
211
|
const big = toFixedPoint(1_000_000.123456789)
|
|
224
|
-
expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.
|
|
212
|
+
expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.123456")
|
|
225
213
|
})
|
|
226
214
|
|
|
227
215
|
it("formats 1e12 ETH", () => {
|
package/src/utils/numbers.ts
CHANGED
|
@@ -35,7 +35,7 @@ export function formatNumberToLocaleString(
|
|
|
35
35
|
|
|
36
36
|
if (number === 0) return `0.${"0".repeat(desiredDecimals)}`
|
|
37
37
|
|
|
38
|
-
return number.toLocaleString("
|
|
38
|
+
return number.toLocaleString("en-US", {
|
|
39
39
|
minimumFractionDigits: desiredDecimals,
|
|
40
40
|
maximumFractionDigits: desiredDecimals,
|
|
41
41
|
})
|
|
@@ -91,7 +91,7 @@ export const fromFixedPointToString = (
|
|
|
91
91
|
amount: number | string | bigint,
|
|
92
92
|
decimals = 18,
|
|
93
93
|
desiredDecimals = 4,
|
|
94
|
-
withRoundUp =
|
|
94
|
+
withRoundUp = false,
|
|
95
95
|
) => {
|
|
96
96
|
const fixedPoint = BigInt(amount)
|
|
97
97
|
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Hook to update the passport using query invalidation mechanism.
|
|
3
|
-
* By calling the update function, the latest data will be refetched as soon as possible.
|
|
4
|
-
*
|
|
5
|
-
* @example
|
|
6
|
-
* const { updateCurrentAccount, updateUsdConversion } = useUpdatePassport()
|
|
7
|
-
*
|
|
8
|
-
* // Call this function to update the current account
|
|
9
|
-
* const handleUpdateCurrentAccount = async () => {
|
|
10
|
-
* await updateCurrentAccount()
|
|
11
|
-
* }
|
|
12
|
-
*/
|
|
13
|
-
export declare function useUpdatePassport(): {
|
|
14
|
-
updateCurrentAccount: () => Promise<void>;
|
|
15
|
-
updateUsdConversion: () => Promise<void>;
|
|
16
|
-
};
|
|
17
|
-
//# sourceMappingURL=useUpdatePassport.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useUpdatePassport.d.ts","sourceRoot":"","sources":["../../../src/hooks/useUpdatePassport.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB;;;EAuBhC"}
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { useQueryClient } from "@tanstack/react-query";
|
|
2
|
-
import { useCallback } from "react";
|
|
3
|
-
import { QUERY_KEYS } from "./constants";
|
|
4
|
-
/**
|
|
5
|
-
* Hook to update the passport using query invalidation mechanism.
|
|
6
|
-
* By calling the update function, the latest data will be refetched as soon as possible.
|
|
7
|
-
*
|
|
8
|
-
* @example
|
|
9
|
-
* const { updateCurrentAccount, updateUsdConversion } = useUpdatePassport()
|
|
10
|
-
*
|
|
11
|
-
* // Call this function to update the current account
|
|
12
|
-
* const handleUpdateCurrentAccount = async () => {
|
|
13
|
-
* await updateCurrentAccount()
|
|
14
|
-
* }
|
|
15
|
-
*/
|
|
16
|
-
export function useUpdatePassport() {
|
|
17
|
-
const queryClient = useQueryClient();
|
|
18
|
-
const updateCurrentAccount = useCallback(() => queryClient.invalidateQueries({
|
|
19
|
-
queryKey: [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT],
|
|
20
|
-
}), [queryClient]);
|
|
21
|
-
const updateUsdConversion = useCallback(() => queryClient.invalidateQueries({
|
|
22
|
-
queryKey: [QUERY_KEYS.ASSETS_USD_CONVERSION],
|
|
23
|
-
}), [queryClient]);
|
|
24
|
-
return {
|
|
25
|
-
updateCurrentAccount,
|
|
26
|
-
updateUsdConversion,
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
//# sourceMappingURL=useUpdatePassport.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useUpdatePassport.js","sourceRoot":"","sources":["../../../src/hooks/useUpdatePassport.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;AAExC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IAEpC,MAAM,oBAAoB,GAAG,WAAW,CACtC,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,mBAAmB,GAAG,WAAW,CACrC,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,oBAAoB;QACpB,mBAAmB;KACpB,CAAA;AACH,CAAC"}
|