@xyo-network/react-wallet 2.56.3 → 2.56.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/components/WalletAccountSelect/Select.js +2 -2
- package/dist/cjs/components/WalletAccountSelect/Select.js.map +1 -1
- package/dist/cjs/contexts/Wallet/Provider.js +3 -3
- package/dist/cjs/contexts/Wallet/Provider.js.map +1 -1
- package/dist/cjs/contexts/Wallet/use.js +13 -3
- package/dist/cjs/contexts/Wallet/use.js.map +1 -1
- package/dist/cjs/hooks/useAccount.js +6 -4
- package/dist/cjs/hooks/useAccount.js.map +1 -1
- package/dist/cjs/hooks/useWallet.js +2 -1
- package/dist/cjs/hooks/useWallet.js.map +1 -1
- package/dist/cjs/hooks/useWallets.js +3 -1
- package/dist/cjs/hooks/useWallets.js.map +1 -1
- package/dist/cjs/hooks/useWrapperAccount.js +8 -4
- package/dist/cjs/hooks/useWrapperAccount.js.map +1 -1
- package/dist/docs.json +545 -364
- package/dist/esm/components/WalletAccountSelect/Select.js +2 -2
- package/dist/esm/components/WalletAccountSelect/Select.js.map +1 -1
- package/dist/esm/contexts/Wallet/Provider.js +3 -3
- package/dist/esm/contexts/Wallet/Provider.js.map +1 -1
- package/dist/esm/contexts/Wallet/use.js +11 -3
- package/dist/esm/contexts/Wallet/use.js.map +1 -1
- package/dist/esm/hooks/useAccount.js +3 -2
- package/dist/esm/hooks/useAccount.js.map +1 -1
- package/dist/esm/hooks/useWallet.js +3 -2
- package/dist/esm/hooks/useWallet.js.map +1 -1
- package/dist/esm/hooks/useWallets.js +3 -1
- package/dist/esm/hooks/useWallets.js.map +1 -1
- package/dist/esm/hooks/useWrapperAccount.js +8 -4
- package/dist/esm/hooks/useWrapperAccount.js.map +1 -1
- package/dist/types/components/WalletAccountSelect/WalletInfo.d.ts +1 -1
- package/dist/types/components/WalletAccountSelect/WalletInfo.d.ts.map +1 -1
- package/dist/types/contexts/Wallet/Provider.d.ts +1 -1
- package/dist/types/contexts/Wallet/Provider.d.ts.map +1 -1
- package/dist/types/contexts/Wallet/State.d.ts +3 -3
- package/dist/types/contexts/Wallet/State.d.ts.map +1 -1
- package/dist/types/contexts/Wallet/use.d.ts +5 -4
- package/dist/types/contexts/Wallet/use.d.ts.map +1 -1
- package/dist/types/hooks/useAccount.d.ts +1 -1
- package/dist/types/hooks/useAccount.d.ts.map +1 -1
- package/dist/types/hooks/useWallet.d.ts +2 -2
- package/dist/types/hooks/useWallet.d.ts.map +1 -1
- package/dist/types/hooks/useWallets.d.ts +2 -2
- package/dist/types/hooks/useWallets.d.ts.map +1 -1
- package/dist/types/hooks/useWrapperAccount.d.ts +2 -1
- package/dist/types/hooks/useWrapperAccount.d.ts.map +1 -1
- package/package.json +11 -11
- package/src/components/WalletAccountSelect/Select.tsx +2 -2
- package/src/components/WalletAccountSelect/WalletInfo.tsx +1 -1
- package/src/contexts/Wallet/Provider.tsx +4 -4
- package/src/contexts/Wallet/State.ts +3 -3
- package/src/contexts/Wallet/use.ts +15 -7
- package/src/hooks/{useAccount.tsx → useAccount.ts} +4 -3
- package/src/hooks/{useWallet.tsx → useWallet.ts} +5 -4
- package/src/hooks/{useWallets.tsx → useWallets.ts} +5 -3
- package/src/hooks/{useWrapperAccount.tsx → useWrapperAccount.ts} +14 -6
|
@@ -19,7 +19,7 @@ const WalletAccountSelect = (_a) => {
|
|
|
19
19
|
const Item = () => {
|
|
20
20
|
const [account] = (0, hooks_1.useWallet)({ path: selected.toString(), wallet: coinTypeWallet });
|
|
21
21
|
const customName = account ? addressNames[account.address] : undefined;
|
|
22
|
-
const favorite = account && account.address in addressNames;
|
|
22
|
+
const favorite = !!account && account.address in addressNames;
|
|
23
23
|
return ((0, jsx_runtime_1.jsx)(react_address_render_1.AddressRenderRowBox, { address: account === null || account === void 0 ? void 0 : account.address, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, favorite: favorite, showFavorite: showFavorite }));
|
|
24
24
|
};
|
|
25
25
|
return (0, jsx_runtime_1.jsx)(Item, {});
|
|
@@ -27,7 +27,7 @@ const WalletAccountSelect = (_a) => {
|
|
|
27
27
|
const Item = () => {
|
|
28
28
|
const [account] = (0, hooks_1.useAccount)({ index, wallet: coinTypeWallet });
|
|
29
29
|
const customName = account ? addressNames[account.address] : undefined;
|
|
30
|
-
const favorite = account && account.address in addressNames;
|
|
30
|
+
const favorite = !!account && account.address in addressNames;
|
|
31
31
|
return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, Object.assign({ value: index }, { children: (0, jsx_runtime_1.jsx)(react_address_render_1.AddressRenderRowBox, { address: account === null || account === void 0 ? void 0 : account.address, favorite: favorite, iconOnly: iconOnly, iconSize: iconSize, icons: icons, name: customName, showFavorite: showFavorite }) }), account === null || account === void 0 ? void 0 : account.address));
|
|
32
32
|
};
|
|
33
33
|
return (0, jsx_runtime_1.jsx)(Item, {}, index);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":";;;;;AAAA,4CAAuE;AACvE,uDAA+C;AAC/C,4EAAqG;AAErG,6CAAiD;AACjD,uCAAmD;AASnD,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;IAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;AAC/D,CAAC,CAAA;AAEM,MAAM,mBAAmB,GAAuC,CAAC,EASvE,EAAE,EAAE;QATmE,EACtE,YAAY,GAAG,EAAE,EACjB,QAAQ,EACR,QAAQ,GAAG,EAAE,EACb,KAAK,EACL,WAAW,GAAG,CAAC,EACf,YAAY,GAAG,KAAK,EACpB,IAAI,OAEL,EADI,KAAK,sBAR8D,wFASvE,CADS;IAER,MAAM,EAAE,kBAAkB,GAAG,CAAC,EAAE,qBAAqB,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAgB,GAAE,CAAA;IAC5F,MAAM,QAAQ,GAAG,CAAC,cAAc,IAAI,kBAAkB,KAAK,SAAS,CAAA;IAEpE,OAAO,CACL,2DACG,cAAc,CAAC,CAAC,CAAC,CAChB,uBAAC,uBAAQ,kBACP,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACxB,MAAM,IAAI,GAAa,GAAG,EAAE;oBAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,iBAAS,EAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAA;oBAClF,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBACtE,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,CAAC,OAAO,IAAI,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/components/WalletAccountSelect/Select.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,14 +8,14 @@ const react_1 = require("react");
|
|
|
8
8
|
const Context_1 = require("./Context");
|
|
9
9
|
const lib_1 = require("./lib");
|
|
10
10
|
const WalletProvider = (_a) => {
|
|
11
|
-
var { basePath = lib_1.WalletRootPath, children, defaultActiveAccountIndex = 0, rootWallet } = _a, props = tslib_1.__rest(_a, ["basePath", "children", "defaultActiveAccountIndex", "rootWallet"]);
|
|
11
|
+
var { basePath = lib_1.WalletRootPath, children, defaultActiveAccountIndex = 0, rootWallet = null } = _a, props = tslib_1.__rest(_a, ["basePath", "children", "defaultActiveAccountIndex", "rootWallet"]);
|
|
12
12
|
const [activeAccountIndex, setActiveAccountIndex] = (0, react_1.useState)(defaultActiveAccountIndex);
|
|
13
13
|
(0, react_1.useEffect)(() => {
|
|
14
14
|
if (defaultActiveAccountIndex !== undefined) {
|
|
15
15
|
setActiveAccountIndex(defaultActiveAccountIndex);
|
|
16
16
|
}
|
|
17
17
|
}, [defaultActiveAccountIndex]);
|
|
18
|
-
const [coinTypeWallet] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
18
|
+
const [coinTypeWallet = null] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
19
19
|
// ensure the wallet has the proper base
|
|
20
20
|
if (rootWallet) {
|
|
21
21
|
if (!(rootWallet === null || rootWallet === void 0 ? void 0 : rootWallet.path.includes(basePath))) {
|
|
@@ -31,7 +31,7 @@ const WalletProvider = (_a) => {
|
|
|
31
31
|
return undefined;
|
|
32
32
|
}
|
|
33
33
|
}), [basePath, rootWallet]);
|
|
34
|
-
const [activeAccount] = (0, react_promise_1.usePromise)(() => coinTypeWallet === null || coinTypeWallet === void 0 ? void 0 : coinTypeWallet.derivePath(activeAccountIndex.toString()), [coinTypeWallet, activeAccountIndex]);
|
|
34
|
+
const [activeAccount = null] = (0, react_promise_1.usePromise)(() => coinTypeWallet === null || coinTypeWallet === void 0 ? void 0 : coinTypeWallet.derivePath(activeAccountIndex.toString()), [coinTypeWallet, activeAccountIndex]);
|
|
35
35
|
return ((0, jsx_runtime_1.jsx)(Context_1.WalletContext.Provider, Object.assign({ value: {
|
|
36
36
|
activeAccount,
|
|
37
37
|
activeAccountIndex,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";;;;;AAAA,yDAAkD;AAGlD,iCAA2C;AAE3C,uCAAyC;AACzC,+BAAsC;AAQ/B,MAAM,cAAc,GAAgD,CAAC,EAM3E,EAAE,EAAE;QANuE,EAC1E,QAAQ,GAAG,oBAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,UAAU,
|
|
1
|
+
{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/Provider.tsx"],"names":[],"mappings":";;;;;AAAA,yDAAkD;AAGlD,iCAA2C;AAE3C,uCAAyC;AACzC,+BAAsC;AAQ/B,MAAM,cAAc,GAAgD,CAAC,EAM3E,EAAE,EAAE;QANuE,EAC1E,QAAQ,GAAG,oBAAc,EACzB,QAAQ,EACR,yBAAyB,GAAG,CAAC,EAC7B,UAAU,GAAG,IAAI,OAElB,EADI,KAAK,sBALkE,mEAM3E,CADS;IAER,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,IAAA,gBAAQ,EAAC,yBAAyB,CAAC,CAAA;IAEvF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,yBAAyB,KAAK,SAAS,EAAE;YAC3C,qBAAqB,CAAC,yBAAyB,CAAC,CAAA;SACjD;IACH,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAA;IAE/B,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;QACpD,wCAAwC;QACxC,IAAI,UAAU,EAAE;YACd,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA,EAAE;gBACxC,IAAI;oBACF,OAAO,MAAM,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,QAAQ,CAAC,CAAA,CAAA;iBAC9C;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAA;iBAC1D;aACF;SACF;aAAM;YACL,OAAO,SAAS,CAAA;SACjB;IACH,CAAC,CAAA,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;IAE1B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAG,EAAE,CAAC,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC,CAAA;IAEhJ,OAAO,CACL,uBAAC,uBAAa,CAAC,QAAQ,kBACrB,KAAK,EAAE;YACL,aAAa;YACb,kBAAkB;YAClB,QAAQ;YACR,cAAc;YACd,QAAQ,EAAE,IAAI;YACd,UAAU;YACV,qBAAqB;SACtB,IACG,KAAK,cAER,QAAQ,IACc,CAC1B,CAAA;AACH,CAAC,CAAA;AAhDY,QAAA,cAAc,kBAgD1B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useSelectedWalletAccount = exports.useIndexedWalletFromContext = exports.useRootWallet = exports.useCoinTypeWallet = exports.useWalletContext = void 0;
|
|
3
|
+
exports.useSelectedWalletAccount = exports.useIndexedWalletFromContext = exports.useRootWallet = exports.useCoinTypeWallet = exports.useWalletProvided = exports.useWalletContext = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
4
5
|
const react_promise_1 = require("@xylabs/react-promise");
|
|
5
6
|
const react_shared_1 = require("@xyo-network/react-shared");
|
|
6
7
|
const Context_1 = require("./Context");
|
|
@@ -8,6 +9,10 @@ const useWalletContext = (required = true) => {
|
|
|
8
9
|
return (0, react_shared_1.useContextEx)(Context_1.WalletContext, 'Wallet', required);
|
|
9
10
|
};
|
|
10
11
|
exports.useWalletContext = useWalletContext;
|
|
12
|
+
const useWalletProvided = () => {
|
|
13
|
+
return (0, react_shared_1.useProvided)(Context_1.WalletContext);
|
|
14
|
+
};
|
|
15
|
+
exports.useWalletProvided = useWalletProvided;
|
|
11
16
|
const useCoinTypeWallet = (required = true) => {
|
|
12
17
|
const { coinTypeWallet } = (0, exports.useWalletContext)(required);
|
|
13
18
|
return [coinTypeWallet, undefined];
|
|
@@ -20,7 +25,7 @@ const useRootWallet = (required = true) => {
|
|
|
20
25
|
exports.useRootWallet = useRootWallet;
|
|
21
26
|
const useIndexedWalletFromContext = (index, required = true) => {
|
|
22
27
|
const [coinTypeWallet] = (0, exports.useCoinTypeWallet)(required);
|
|
23
|
-
const [wallet] = (0, react_promise_1.usePromise)(() => coinTypeWallet === null || coinTypeWallet === void 0 ? void 0 : coinTypeWallet.derivePath(index.toString()), [coinTypeWallet, index]);
|
|
28
|
+
const [wallet] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () { var _a; return (_a = (yield (coinTypeWallet === null || coinTypeWallet === void 0 ? void 0 : coinTypeWallet.derivePath(index.toString())))) !== null && _a !== void 0 ? _a : coinTypeWallet; }), [coinTypeWallet, index]);
|
|
24
29
|
return [wallet, undefined];
|
|
25
30
|
};
|
|
26
31
|
exports.useIndexedWalletFromContext = useIndexedWalletFromContext;
|
|
@@ -29,7 +34,12 @@ const useSelectedWalletAccount = (required = true) => {
|
|
|
29
34
|
//we pass in 0 as default since we can not call the hook optionally,
|
|
30
35
|
//we resolve this false result by checking whether activeAccountIndex is defined before returning it
|
|
31
36
|
const [account] = (0, exports.useIndexedWalletFromContext)(activeAccountIndex !== null && activeAccountIndex !== void 0 ? activeAccountIndex : 0, required);
|
|
32
|
-
|
|
37
|
+
if (activeAccountIndex === undefined && account === null) {
|
|
38
|
+
return [null, undefined];
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
return [account, undefined];
|
|
42
|
+
}
|
|
33
43
|
};
|
|
34
44
|
exports.useSelectedWalletAccount = useSelectedWalletAccount;
|
|
35
45
|
//# sourceMappingURL=use.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use.js","sourceRoot":"","sources":["../../../../src/contexts/Wallet/use.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAClD,4DAAqE;AAGrE,uCAAyC;AAElC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAAE,EAAE;IAClD,OAAO,IAAA,2BAAY,EAAC,uBAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AACxD,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAEM,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,OAAO,IAAA,0BAAW,EAAC,uBAAa,CAAC,CAAA;AACnC,CAAC,CAAA;AAFY,QAAA,iBAAiB,qBAE7B;AAEM,MAAM,iBAAiB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAA0D,EAAE;IAC3G,MAAM,EAAE,cAAc,EAAE,GAAG,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAA;IACrD,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;AACpC,CAAC,CAAA;AAHY,QAAA,iBAAiB,qBAG7B;AAEM,MAAM,aAAa,GAAG,CAAC,QAAQ,GAAG,IAAI,EAA0D,EAAE;IACvG,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAA;IACjD,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;AAChC,CAAC,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAEM,MAAM,2BAA2B,GAAG,CAAC,KAAa,EAAE,QAAQ,GAAG,IAAI,EAA0D,EAAE;IACpI,MAAM,CAAC,cAAc,CAAC,GAAG,IAAA,yBAAiB,EAAC,QAAQ,CAAC,CAAA;IACpD,MAAM,CAAC,MAAM,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE,kEAAC,OAAA,MAAA,CAAC,MAAM,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA,CAAC,mCAAI,cAAc,CAAA,GAAA,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAA;IACxI,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAC5B,CAAC,CAAA;AAJY,QAAA,2BAA2B,+BAIvC;AAEM,MAAM,wBAAwB,GAAG,CAAC,QAAQ,GAAG,IAAI,EAA0D,EAAE;IAClH,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAA;IACzD,oEAAoE;IACpE,oGAAoG;IACpG,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,mCAA2B,EAAC,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChF,IAAI,kBAAkB,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE;QACxD,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;KACzB;SAAM;QACL,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;KAC5B;AACH,CAAC,CAAA;AAVY,QAAA,wBAAwB,4BAUpC"}
|
|
@@ -6,6 +6,8 @@ const react_promise_1 = require("@xylabs/react-promise");
|
|
|
6
6
|
const react_1 = require("react");
|
|
7
7
|
const contexts_1 = require("../contexts");
|
|
8
8
|
const useAccount = ({ wallet, account, index, required = false } = {}) => {
|
|
9
|
+
var _a;
|
|
10
|
+
const walletContextProvided = (0, contexts_1.useWalletProvided)();
|
|
9
11
|
const [validationError, setValidationError] = (0, react_1.useState)();
|
|
10
12
|
if (wallet && account && !validationError) {
|
|
11
13
|
setValidationError(Error('useAccount can not have both a wallet and an account in the parameters'));
|
|
@@ -17,14 +19,14 @@ const useAccount = ({ wallet, account, index, required = false } = {}) => {
|
|
|
17
19
|
const [coinTypeWallet] = (0, contexts_1.useCoinTypeWallet)(!wallet && required);
|
|
18
20
|
const { activeAccountIndex } = (0, contexts_1.useWalletContext)(false);
|
|
19
21
|
const [activeAccount] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
20
|
-
var
|
|
22
|
+
var _b, _c, _d;
|
|
21
23
|
try {
|
|
22
24
|
if (!validationError) {
|
|
23
25
|
if (wallet) {
|
|
24
|
-
return yield ((
|
|
26
|
+
return yield ((_b = wallet === null || wallet === void 0 ? void 0 : wallet.derivePath) === null || _b === void 0 ? void 0 : _b.call(wallet, `${index !== null && index !== void 0 ? index : 0}'\0`));
|
|
25
27
|
}
|
|
26
28
|
else if (coinTypeWallet) {
|
|
27
|
-
return yield ((
|
|
29
|
+
return yield ((_c = coinTypeWallet === null || coinTypeWallet === void 0 ? void 0 : coinTypeWallet.derivePath) === null || _c === void 0 ? void 0 : _c.call(coinTypeWallet, `${(_d = index !== null && index !== void 0 ? index : activeAccountIndex) !== null && _d !== void 0 ? _d : 0}'\0`));
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
}
|
|
@@ -38,7 +40,7 @@ const useAccount = ({ wallet, account, index, required = false } = {}) => {
|
|
|
38
40
|
console.error(validationError.message);
|
|
39
41
|
setError(validationError);
|
|
40
42
|
}
|
|
41
|
-
return [error ? undefined : account !== null && account !== void 0 ? account : activeAccount, error];
|
|
43
|
+
return [error ? undefined : ((_a = account !== null && account !== void 0 ? account : activeAccount) !== null && _a !== void 0 ? _a : walletContextProvided) ? null : undefined, error];
|
|
42
44
|
};
|
|
43
45
|
exports.useAccount = useAccount;
|
|
44
46
|
//# sourceMappingURL=useAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.
|
|
1
|
+
{"version":3,"file":"useAccount.js","sourceRoot":"","sources":["../../../src/hooks/useAccount.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAGlD,iCAAgC;AAEhC,0CAAoF;AAS7E,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,GAAG,KAAK,KAAwB,EAAE,EAG7F,EAAE;;IACF,MAAM,qBAAqB,GAAG,IAAA,4BAAiB,GAAE,CAAA;IACjD,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC/D,IAAI,MAAM,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QACzC,kBAAkB,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC,CAAA;KACpG;IAED,IAAI,KAAK,IAAI,OAAO,IAAI,CAAC,eAAe,EAAE;QACxC,kBAAkB,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC,CAAA;KACnG;IAED,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,IAAA,4BAAiB,EAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAA;IAC/D,MAAM,EAAE,kBAAkB,EAAE,GAAG,IAAA,2BAAgB,EAAC,KAAK,CAAC,CAAA;IACtD,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;;QAC5C,IAAI;YACF,IAAI,CAAC,eAAe,EAAE;gBACpB,IAAI,MAAM,EAAE;oBACV,OAAO,MAAM,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,uDAAG,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC,KAAK,CAAC,CAAA,CAAA;iBACtD;qBAAM,IAAI,cAAc,EAAE;oBACzB,OAAO,MAAM,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,UAAU,+DAAG,GAAG,MAAA,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,kBAAkB,mCAAI,CAAC,KAAK,CAAC,CAAA,CAAA;iBACpF;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC5B,QAAQ,CAAC,KAAK,CAAC,CAAA;SAChB;IACH,CAAC,CAAA,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAA;IACxE,IAAI,eAAe,IAAI,CAAC,KAAK,EAAE;QAC7B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QACtC,QAAQ,CAAC,eAAe,CAAC,CAAA;KAC1B;IAED,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,aAAa,mCAAI,qBAAqB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;AAC1G,CAAC,CAAA;AAtCY,QAAA,UAAU,cAsCtB"}
|
|
@@ -7,6 +7,7 @@ const account_1 = require("@xyo-network/account");
|
|
|
7
7
|
const react_1 = require("react");
|
|
8
8
|
const contexts_1 = require("../contexts");
|
|
9
9
|
const useWallet = ({ mnemonic, wallet, path, required = false, seed } = {}) => {
|
|
10
|
+
const walletContextProvided = (0, contexts_1.useWalletProvided)();
|
|
10
11
|
const [error, setError] = (0, react_1.useState)();
|
|
11
12
|
const [contextAccount] = (0, contexts_1.useSelectedWalletAccount)(!wallet && required);
|
|
12
13
|
const [activeAccount] = (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -35,7 +36,7 @@ const useWallet = ({ mnemonic, wallet, path, required = false, seed } = {}) => {
|
|
|
35
36
|
setError(ex);
|
|
36
37
|
}
|
|
37
38
|
}), [mnemonic, contextAccount, seed, path, wallet]);
|
|
38
|
-
return [activeAccount, error];
|
|
39
|
+
return [activeAccount !== null && activeAccount !== void 0 ? activeAccount : (walletContextProvided ? null : activeAccount), error];
|
|
39
40
|
};
|
|
40
41
|
exports.useWallet = useWallet;
|
|
41
42
|
//# sourceMappingURL=useWallet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../../src/hooks/useWallet.
|
|
1
|
+
{"version":3,"file":"useWallet.js","sourceRoot":"","sources":["../../../src/hooks/useWallet.ts"],"names":[],"mappings":";;;;AAAA,yDAAkD;AAClD,kDAA+C;AAG/C,iCAAgC;AAEhC,0CAAyE;AAUlE,MAAM,SAAS,GAAG,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,KAAK,EAAE,IAAI,KAAuB,EAAE,EAGjG,EAAE;IACF,MAAM,qBAAqB,GAAG,IAAA,4BAAiB,GAAE,CAAA;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,GAAS,CAAA;IAC3C,MAAM,CAAC,cAAc,CAAC,GAAG,IAAA,mCAAwB,EAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAA;IACtE,MAAM,CAAC,aAAa,CAAC,GAAG,IAAA,0BAAU,EAAC,GAAS,EAAE;;QAC5C,IAAI;YACF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,EAAE;gBAC7B,IAAI,MAAM,EAAE;oBACV,OAAO,MAAM,CAAA;iBACd;qBAAM,IAAI,QAAQ,EAAE;oBACnB,OAAO,kBAAQ,CAAC,YAAY,CAAC,QAAkB,CAAC,CAAA;iBACjD;qBAAM,IAAI,IAAI,EAAE;oBACf,OAAO,kBAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;iBAC/B;gBACD,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC,EAAE,CAAA;YAEJ,IAAI,IAAI,EAAE;gBACR,OAAO,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,2DAAG,IAAI,CAAC,CAAA;aACtC;iBAAM;gBACL,OAAO,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,MAAM,CAAA;aAC5B;SACF;QAAC,OAAO,EAAE,EAAE;YACX,QAAQ,CAAC,EAAW,CAAC,CAAA;SACtB;IACH,CAAC,CAAA,EAAE,CAAC,QAAQ,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;IAClD,OAAO,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,CAAA;AACjF,CAAC,CAAA;AA9BY,QAAA,SAAS,aA8BrB"}
|
|
@@ -2,11 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useWallets = void 0;
|
|
4
4
|
const react_promise_1 = require("@xylabs/react-promise");
|
|
5
|
+
const contexts_1 = require("../contexts");
|
|
5
6
|
const useWallet_1 = require("./useWallet");
|
|
6
7
|
const useWallets = ({ wallet, paths }) => {
|
|
8
|
+
const walletContextProvided = (0, contexts_1.useWalletProvided)();
|
|
7
9
|
const [foundWallet] = (0, useWallet_1.useWallet)({ wallet });
|
|
8
10
|
const [wallets, error] = (0, react_promise_1.usePromise)(() => (foundWallet ? Promise.all(paths.map((path) => foundWallet.derivePath(path))) : undefined), [foundWallet, paths]);
|
|
9
|
-
return [wallets, error];
|
|
11
|
+
return [wallets !== null && wallets !== void 0 ? wallets : (walletContextProvided ? null : wallets), error];
|
|
10
12
|
};
|
|
11
13
|
exports.useWallets = useWallets;
|
|
12
14
|
//# sourceMappingURL=useWallets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWallets.js","sourceRoot":"","sources":["../../../src/hooks/useWallets.
|
|
1
|
+
{"version":3,"file":"useWallets.js","sourceRoot":"","sources":["../../../src/hooks/useWallets.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AAGlD,0CAA+C;AAC/C,2CAAuC;AAOhC,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,EAAqB,EAA4D,EAAE;IAC3H,MAAM,qBAAqB,GAAG,IAAA,4BAAiB,GAAE,CAAA;IACjD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,qBAAS,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC3C,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,IAAA,0BAAU,EACjC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAChG,CAAC,WAAW,EAAE,KAAK,CAAC,CACrB,CAAA;IACD,OAAO,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;AACrE,CAAC,CAAA;AARY,QAAA,UAAU,cAQtB"}
|
|
@@ -8,22 +8,26 @@ const async_mutex_1 = require("async-mutex");
|
|
|
8
8
|
let globalWrapperWallet = undefined;
|
|
9
9
|
const globalWrapperWalletMutex = new async_mutex_1.Mutex();
|
|
10
10
|
const useWrapperAccount = (account) => {
|
|
11
|
-
|
|
11
|
+
return (0, react_promise_1.usePromise)(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
12
12
|
return yield globalWrapperWalletMutex.runExclusive(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
13
|
+
//if we are expecting to receive a wallet or did receive on, return the override account
|
|
14
|
+
if (account !== undefined) {
|
|
15
|
+
return account;
|
|
16
|
+
}
|
|
13
17
|
if (globalWrapperWallet) {
|
|
14
18
|
return globalWrapperWallet;
|
|
15
19
|
}
|
|
16
20
|
try {
|
|
17
21
|
globalWrapperWallet = yield account_1.HDWallet.random();
|
|
22
|
+
console.log(`Global Wrapper Wallet Creation Success: ${globalWrapperWallet.address}`);
|
|
18
23
|
}
|
|
19
24
|
catch (ex) {
|
|
20
25
|
const error = ex;
|
|
21
|
-
console.error(`Wrapper Wallet Creation Failed: ${error.message}`);
|
|
26
|
+
console.error(`Global Wrapper Wallet Creation Failed: ${error.message}`);
|
|
22
27
|
}
|
|
23
28
|
return globalWrapperWallet;
|
|
24
29
|
}));
|
|
25
|
-
}), []);
|
|
26
|
-
return account !== null && account !== void 0 ? account : wallet;
|
|
30
|
+
}), [account]);
|
|
27
31
|
};
|
|
28
32
|
exports.useWrapperAccount = useWrapperAccount;
|
|
29
33
|
//# sourceMappingURL=useWrapperAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWrapperAccount.js","sourceRoot":"","sources":["../../../src/hooks/useWrapperAccount.
|
|
1
|
+
{"version":3,"file":"useWrapperAccount.js","sourceRoot":"","sources":["../../../src/hooks/useWrapperAccount.ts"],"names":[],"mappings":";;;;AAAA,yDAAyE;AACzE,kDAA+C;AAG/C,6CAAmC;AAEnC,IAAI,mBAAmB,GAA+B,SAAS,CAAA;AAC/D,MAAM,wBAAwB,GAAG,IAAI,mBAAK,EAAE,CAAA;AAErC,MAAM,iBAAiB,GAAG,CAC/B,OAAgC,EACmD,EAAE;IACrF,OAAO,IAAA,0BAAU,EAAC,GAAS,EAAE;QAC3B,OAAO,MAAM,wBAAwB,CAAC,YAAY,CAAC,GAAS,EAAE;YAC5D,wFAAwF;YACxF,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,OAAO,OAAO,CAAA;aACf;YAED,IAAI,mBAAmB,EAAE;gBACvB,OAAO,mBAAmB,CAAA;aAC3B;YAED,IAAI;gBACF,mBAAmB,GAAG,MAAM,kBAAQ,CAAC,MAAM,EAAE,CAAA;gBAC7C,OAAO,CAAC,GAAG,CAAC,2CAA2C,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAA;aACtF;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,CAAC,KAAK,CAAC,0CAA0C,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;aACzE;YACD,OAAO,mBAAmB,CAAA;QAC5B,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC,CAAA,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;AACf,CAAC,CAAA;AAxBY,QAAA,iBAAiB,qBAwB7B"}
|