@w3ux/react-connect-kit 3.2.19 → 3.2.20
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.
|
@@ -1,51 +1,25 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { createSafeContext } from '@w3ux/hooks';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { accounts$, connectExtension as doConnectExtension, getReconnectSync, reconnectExtensions, reconnectSync$, resetAccounts, unsubAll, } from '@w3ux/observables-connect/accounts';
|
|
4
|
+
import { initialisedExtensions$ } from '@w3ux/observables-connect/extensions';
|
|
5
5
|
import { formatAccountSs58 } from '@w3ux/utils';
|
|
6
6
|
import { useEffect, useState } from 'react';
|
|
7
7
|
import { combineLatest } from 'rxjs';
|
|
8
8
|
import { useExtensions } from '../ExtensionsProvider';
|
|
9
9
|
export const [ExtensionAccountsContext, useExtensionAccounts] = createSafeContext();
|
|
10
10
|
export const ExtensionAccountsProvider = ({ children, ss58, dappName, }) => {
|
|
11
|
-
const {
|
|
11
|
+
const { gettingExtensions } = useExtensions();
|
|
12
12
|
const [extensionAccounts, setExtensionAccounts] = useState([]);
|
|
13
13
|
const [extensionsInitialised, setExtensionsInitialised] = useState([]);
|
|
14
14
|
const [extensionsSynced, setExtensionsSynced] = useState('unsynced');
|
|
15
|
-
const
|
|
16
|
-
if (
|
|
17
|
-
const { connected } = await connectExtensions(dappName, [id]);
|
|
18
|
-
if (connected.size === 0) {
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
const { extension } = connected.get(id);
|
|
22
|
-
if (!extensionHasFeature(id, 'subscribeAccounts')) {
|
|
23
|
-
const accounts = await extension.accounts.get();
|
|
24
|
-
processExtensionAccounts({
|
|
25
|
-
source: id,
|
|
26
|
-
ss58,
|
|
27
|
-
}, extension.signer, accounts);
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
const unsub = extension.accounts.subscribe((accounts) => {
|
|
31
|
-
processExtensionAccounts({
|
|
32
|
-
source: id,
|
|
33
|
-
ss58,
|
|
34
|
-
}, extension.signer, accounts);
|
|
35
|
-
});
|
|
36
|
-
addUnsub(id, unsub);
|
|
37
|
-
}
|
|
38
|
-
return true;
|
|
39
|
-
}
|
|
40
|
-
return false;
|
|
41
|
-
};
|
|
42
|
-
const handleSyncExtensionAccounts = async () => {
|
|
43
|
-
if (!gettingExtensions && _reconnectSync.getValue() === 'unsynced') {
|
|
15
|
+
const handleInitialConnect = async () => {
|
|
16
|
+
if (!gettingExtensions && getReconnectSync() === 'unsynced') {
|
|
44
17
|
unsubAll();
|
|
45
18
|
resetAccounts();
|
|
46
19
|
await reconnectExtensions(dappName, ss58);
|
|
47
20
|
}
|
|
48
21
|
};
|
|
22
|
+
const connectExtension = async (id) => await doConnectExtension(dappName, ss58, id);
|
|
49
23
|
const getExtensionAccounts = (ss58Prefix) => extensionAccounts
|
|
50
24
|
.map((account) => {
|
|
51
25
|
const formattedAddress = formatAccountSs58(account.address, ss58Prefix);
|
|
@@ -59,9 +33,9 @@ export const ExtensionAccountsProvider = ({ children, ss58, dappName, }) => {
|
|
|
59
33
|
})
|
|
60
34
|
.filter((account) => account !== null);
|
|
61
35
|
useEffect(() => {
|
|
62
|
-
|
|
36
|
+
handleInitialConnect();
|
|
63
37
|
return () => unsubAll();
|
|
64
|
-
}, [
|
|
38
|
+
}, [gettingExtensions]);
|
|
65
39
|
useEffect(() => {
|
|
66
40
|
const sub = combineLatest([
|
|
67
41
|
initialisedExtensions$,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/ExtensionAccountsProvider/index.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EACL,
|
|
1
|
+
{"version":3,"sources":["../src/ExtensionAccountsProvider/index.tsx"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/* @license Copyright 2024 w3ux authors & contributors\nSPDX-License-Identifier: GPL-3.0-only */\n\nimport { createSafeContext } from '@w3ux/hooks'\nimport {\n accounts$,\n connectExtension as doConnectExtension,\n getReconnectSync,\n reconnectExtensions,\n reconnectSync$,\n resetAccounts,\n unsubAll,\n} from '@w3ux/observables-connect/accounts'\nimport { initialisedExtensions$ } from '@w3ux/observables-connect/extensions'\nimport type { ImportedAccount, Sync } from '@w3ux/types'\nimport { formatAccountSs58 } from '@w3ux/utils'\nimport { useEffect, useState } from 'react'\nimport { combineLatest } from 'rxjs'\nimport { useExtensions } from '../ExtensionsProvider'\nimport type {\n ExtensionAccountsContextInterface,\n ExtensionAccountsProviderProps,\n} from './types'\n\nexport const [ExtensionAccountsContext, useExtensionAccounts] =\n createSafeContext<ExtensionAccountsContextInterface>()\n\nexport const ExtensionAccountsProvider = ({\n children,\n ss58,\n dappName,\n}: ExtensionAccountsProviderProps) => {\n const { gettingExtensions } = useExtensions()\n\n // Store connected extension accounts\n const [extensionAccounts, setExtensionAccounts] = useState<ImportedAccount[]>(\n []\n )\n // Stores initialised extensions\n const [extensionsInitialised, setExtensionsInitialised] = useState<string[]>(\n []\n )\n // Store whether previously enabled extensions have been re-connected\n const [extensionsSynced, setExtensionsSynced] = useState<Sync>('unsynced')\n\n // Handle initial connection to previously enabled extensions\n const handleInitialConnect = async () => {\n if (!gettingExtensions && getReconnectSync() === 'unsynced') {\n // Defensive: unsubscribe from all accounts and reset state\n unsubAll()\n resetAccounts()\n await reconnectExtensions(dappName, ss58)\n }\n }\n\n // Connects to a single extension and processes its accounts\n const connectExtension = async (id: string): Promise<boolean> =>\n await doConnectExtension(dappName, ss58, id)\n\n // Get extension accounts, formatted by a provided ss58 prefix\n const getExtensionAccounts = (ss58Prefix: number): ImportedAccount[] =>\n extensionAccounts\n .map((account) => {\n const formattedAddress = formatAccountSs58(account.address, ss58Prefix)\n if (!formattedAddress) {\n return null\n }\n return {\n ...account,\n address: formattedAddress,\n }\n })\n .filter((account) => account !== null)\n\n // Initialise extension accounts sync\n useEffect(() => {\n handleInitialConnect()\n return () => unsubAll()\n }, [gettingExtensions])\n\n // Subscribes to observables and updates state\n useEffect(() => {\n const sub = combineLatest([\n initialisedExtensions$,\n accounts$,\n reconnectSync$,\n ]).subscribe(([initialised, accounts, sync]) => {\n setExtensionsInitialised(initialised)\n setExtensionAccounts(accounts)\n setExtensionsSynced(sync)\n })\n return () => {\n sub.unsubscribe()\n }\n }, [])\n\n return (\n <ExtensionAccountsContext.Provider\n value={{\n extensionsInitialised,\n connectExtension,\n extensionsSynced,\n getExtensionAccounts,\n }}\n >\n {children}\n </ExtensionAccountsContext.Provider>\n )\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@w3ux/react-connect-kit",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.20",
|
|
4
4
|
"license": "GPL-3.0-only",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@w3ux/extension-assets": "^2.2.0",
|
|
7
7
|
"@w3ux/hooks": "^2.1.0",
|
|
8
|
-
"@w3ux/observables-connect": "0.9.
|
|
8
|
+
"@w3ux/observables-connect": "0.9.27",
|
|
9
9
|
"@w3ux/utils": "^2.0.8"
|
|
10
10
|
},
|
|
11
11
|
"type": "module",
|