decentraland-dapps 13.3.0 → 13.3.1
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/.github/workflows/build-test-publish.yml +2 -2
- package/dist/containers/ChainCheck/ChainCheck.js +1 -3
- package/dist/containers/ChainCheck/ChainCheck.js.map +1 -1
- package/dist/containers/ChainProvider/ChainProvider.container.d.ts +1 -1
- package/dist/containers/ChainProvider/ChainProvider.container.js +13 -6
- package/dist/containers/ChainProvider/ChainProvider.container.js.map +1 -1
- package/dist/containers/ChainProvider/ChainProvider.types.d.ts +5 -1
- package/dist/containers/Navbar/Navbar.container.js +1 -0
- package/dist/containers/Navbar/Navbar.container.js.map +1 -1
- package/dist/containers/Navbar/Navbar.js +3 -4
- package/dist/containers/Navbar/Navbar.js.map +1 -1
- package/dist/containers/Navbar/Navbar.types.d.ts +2 -1
- package/dist/containers/NetworkCheck/NetworkCheck.d.ts +2 -2
- package/dist/containers/NetworkCheck/NetworkCheck.js +3 -4
- package/dist/containers/NetworkCheck/NetworkCheck.js.map +1 -1
- package/dist/modules/wallet/sagas.js +2 -1
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils.d.ts +1 -1
- package/dist/modules/wallet/utils.js +4 -5
- package/dist/modules/wallet/utils.js.map +1 -1
- package/dist/providers/WalletProvider/WalletProvider.container.js +1 -0
- package/dist/providers/WalletProvider/WalletProvider.container.js.map +1 -1
- package/dist/providers/WalletProvider/WalletProvider.js +4 -4
- package/dist/providers/WalletProvider/WalletProvider.js.map +1 -1
- package/dist/providers/WalletProvider/WalletProvider.types.d.ts +2 -1
- package/package.json +1 -1
|
@@ -10,9 +10,9 @@ jobs:
|
|
|
10
10
|
- uses: actions/checkout@v3
|
|
11
11
|
- uses: actions/setup-node@v3
|
|
12
12
|
with:
|
|
13
|
-
node-version: '
|
|
13
|
+
node-version: '16'
|
|
14
14
|
- name: Install dependencies
|
|
15
|
-
run: npm ci
|
|
15
|
+
run: npm ci --legacy-peer-deps #TODO: remove this flag once we get rid of tslint
|
|
16
16
|
- name: Build
|
|
17
17
|
run: npm run build
|
|
18
18
|
- name: Test
|
|
@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const react_1 = __importDefault(require("react"));
|
|
7
7
|
const Popup_1 = require("decentraland-ui/dist/components/Popup/Popup");
|
|
8
8
|
const utils_1 = require("../../modules/translation/utils");
|
|
9
|
-
const eth_1 = require("../../lib/eth");
|
|
10
|
-
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
11
9
|
const ChainProvider_1 = __importDefault(require("../ChainProvider"));
|
|
12
10
|
class ChainCheck extends react_1.default.PureComponent {
|
|
13
11
|
render() {
|
|
@@ -15,7 +13,7 @@ class ChainCheck extends react_1.default.PureComponent {
|
|
|
15
13
|
return (react_1.default.createElement(ChainProvider_1.default, null, data => {
|
|
16
14
|
const isEnabled = data.isSupported || data.chainId === chainId;
|
|
17
15
|
return (react_1.default.createElement(Popup_1.Popup, { disabled: isEnabled, position: "top center", content: react_1.default.createElement(utils_1.T, { id: "@dapps.button.network_not_supported", values: {
|
|
18
|
-
expectedChainName:
|
|
16
|
+
expectedChainName: react_1.default.createElement("b", null, data.appChainName)
|
|
19
17
|
} }), trigger: children(isEnabled) }));
|
|
20
18
|
}));
|
|
21
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChainCheck.js","sourceRoot":"","sources":["../../../src/containers/ChainCheck/ChainCheck.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,uEAAmE;AACnE,2DAAmD;
|
|
1
|
+
{"version":3,"file":"ChainCheck.js","sourceRoot":"","sources":["../../../src/containers/ChainCheck/ChainCheck.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,uEAAmE;AACnE,2DAAmD;AAEnD,qEAA4C;AAE5C,MAAqB,UAAW,SAAQ,eAAK,CAAC,aAAoB;IAChE,MAAM;QACJ,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QACxC,OAAO,CACL,8BAAC,uBAAa,QACX,IAAI,CAAC,EAAE;YACN,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,CAAA;YAC9D,OAAO,CACL,8BAAC,aAAK,IACJ,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAC,YAAY,EACrB,OAAO,EACL,8BAAC,SAAC,IACA,EAAE,EAAC,qCAAqC,EACxC,MAAM,EAAE;wBACN,iBAAiB,EAAE,yCAAI,IAAI,CAAC,YAAY,CAAK;qBAC9C,GACD,EAEJ,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,GAC5B,CACH,CAAA;QACH,CAAC,CACa,CACjB,CAAA;IACH,CAAC;CACF;AA1BD,6BA0BC"}
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
import ChainProvider from './ChainProvider';
|
|
3
3
|
declare const _default: import("react-redux").ConnectedComponent<typeof ChainProvider, import("react-redux").Omit<import("react").ClassAttributes<ChainProvider> & import("./ChainProvider.types").ChainData & {
|
|
4
4
|
children: (data: import("./ChainProvider.types").ChainData) => import("react").ReactNode;
|
|
5
|
-
}, "network" | "chainId" | "isConnected" | "isSupported" | "isPartiallySupported" | "isUnsupported">>;
|
|
5
|
+
}, "network" | "chainId" | "chainName" | "appChainId" | "appChainName" | "appNetwork" | "isConnected" | "isSupported" | "isPartiallySupported" | "isUnsupported">>;
|
|
6
6
|
export default _default;
|
|
@@ -4,24 +4,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const react_redux_1 = require("react-redux");
|
|
7
|
+
const schemas_1 = require("@dcl/schemas");
|
|
7
8
|
const selectors_1 = require("../../modules/wallet/selectors");
|
|
8
9
|
const chainConfiguration_1 = require("../../lib/chainConfiguration");
|
|
9
|
-
const eth_1 = require("../../lib/eth");
|
|
10
10
|
const ChainProvider_1 = __importDefault(require("./ChainProvider"));
|
|
11
11
|
const mapState = (state) => {
|
|
12
12
|
const chainId = selectors_1.getChainId(state) || null;
|
|
13
|
+
const chainName = chainId ? schemas_1.getChainName(chainId) : null;
|
|
13
14
|
const network = chainId && chainConfiguration_1.getChainConfiguration(chainId).network;
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
15
|
+
const appChainId = selectors_1.getAppChainId(state);
|
|
16
|
+
const appConfig = chainConfiguration_1.getChainConfiguration(appChainId);
|
|
17
|
+
const appChainName = schemas_1.getChainName(appChainId);
|
|
18
|
+
const appNetwork = appConfig.network;
|
|
19
|
+
const isConnected = !!chainId && !!appConfig;
|
|
20
|
+
const isSupported = isConnected && chainId === appChainId;
|
|
18
21
|
const isPartiallySupported = isConnected &&
|
|
19
22
|
!isSupported &&
|
|
20
|
-
Object.values(
|
|
23
|
+
Object.values(appConfig.networkMapping).some(mappedChainId => mappedChainId === chainId);
|
|
21
24
|
const isUnsupported = isConnected && !isSupported && !isPartiallySupported;
|
|
22
25
|
return {
|
|
23
26
|
chainId,
|
|
27
|
+
chainName,
|
|
24
28
|
network,
|
|
29
|
+
appChainId,
|
|
30
|
+
appChainName,
|
|
31
|
+
appNetwork,
|
|
25
32
|
isConnected,
|
|
26
33
|
isSupported,
|
|
27
34
|
isPartiallySupported,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChainProvider.container.js","sourceRoot":"","sources":["../../../src/containers/ChainProvider/ChainProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"ChainProvider.container.js","sourceRoot":"","sources":["../../../src/containers/ChainProvider/ChainProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,0CAA2C;AAC3C,8DAA0E;AAC1E,qEAAoE;AAMpE,oEAA2C;AAE3C,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE;IAC7C,MAAM,OAAO,GAAG,sBAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAA;IACzC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,sBAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACxD,MAAM,OAAO,GAAG,OAAO,IAAI,0CAAqB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;IACjE,MAAM,UAAU,GAAG,yBAAa,CAAC,KAAK,CAAC,CAAA;IACvC,MAAM,SAAS,GAAG,0CAAqB,CAAC,UAAU,CAAC,CAAA;IACnD,MAAM,YAAY,GAAG,sBAAY,CAAC,UAAU,CAAE,CAAA;IAC9C,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAA;IACpC,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,CAAA;IAC5C,MAAM,WAAW,GAAG,WAAW,IAAI,OAAO,KAAK,UAAU,CAAA;IACzD,MAAM,oBAAoB,GACxB,WAAW;QACX,CAAC,WAAW;QACZ,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,IAAI,CAC1C,aAAa,CAAC,EAAE,CAAC,aAAa,KAAK,OAAO,CAC3C,CAAA;IACH,MAAM,aAAa,GAAG,WAAW,IAAI,CAAC,WAAW,IAAI,CAAC,oBAAoB,CAAA;IAC1E,OAAO;QACL,OAAO;QACP,SAAS;QACT,OAAO;QACP,UAAU;QACV,YAAY;QACZ,UAAU;QACV,WAAW;QACX,WAAW;QACX,oBAAoB;QACpB,aAAa;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,SAAsB,EAAoB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;AAEtE,kBAAe,qBAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,uBAAa,CAAC,CAAA"}
|
|
@@ -4,7 +4,11 @@ import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
|
4
4
|
import { Network } from '@dcl/schemas/dist/dapps/network';
|
|
5
5
|
export declare type ChainData = {
|
|
6
6
|
chainId: ChainId | null;
|
|
7
|
+
chainName: string | null;
|
|
7
8
|
network: Network | null;
|
|
9
|
+
appChainId: ChainId;
|
|
10
|
+
appChainName: string;
|
|
11
|
+
appNetwork: Network;
|
|
8
12
|
isConnected: boolean;
|
|
9
13
|
isSupported: boolean;
|
|
10
14
|
isPartiallySupported: boolean;
|
|
@@ -13,6 +17,6 @@ export declare type ChainData = {
|
|
|
13
17
|
export declare type Props = ChainData & {
|
|
14
18
|
children: (data: ChainData) => React.ReactNode;
|
|
15
19
|
};
|
|
16
|
-
export declare type MapStateProps = Pick<Props, 'chainId' | 'network' | 'isConnected' | 'isSupported' | 'isPartiallySupported' | 'isUnsupported'>;
|
|
20
|
+
export declare type MapStateProps = Pick<Props, 'chainId' | 'chainName' | 'network' | 'appChainId' | 'appChainName' | 'appNetwork' | 'isConnected' | 'isSupported' | 'isPartiallySupported' | 'isUnsupported'>;
|
|
17
21
|
export declare type MapDispatchProps = {};
|
|
18
22
|
export declare type MapDispatch = Dispatch;
|
|
@@ -15,6 +15,7 @@ const mapState = (state) => ({
|
|
|
15
15
|
isConnected: selectors_1.isConnected(state),
|
|
16
16
|
isConnecting: selectors_1.isConnecting(state),
|
|
17
17
|
hasTranslations: selectors_2.isEnabled(state),
|
|
18
|
+
appChainId: selectors_1.getAppChainId(state),
|
|
18
19
|
hasAcceptedNetworkPartialSupport: selectors_1.hasAcceptedNetworkPartialSupport(state)
|
|
19
20
|
});
|
|
20
21
|
const mapDispatch = (dispatch) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navbar.container.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.container.tsx"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"Navbar.container.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.container.tsx"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,8DAQuC;AACvC,mEAA+D;AAC/D,0DAIqC;AAGrC,sDAA6B;AAE7B,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE,CAAC,CAAC;IAC/C,OAAO,EAAE,sBAAU,CAAC,KAAK,CAAC;IAC1B,IAAI,EAAE,mBAAO,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,sBAAU,CAAC,KAAK,CAAC;IAC1B,WAAW,EAAE,uBAAW,CAAC,KAAK,CAAC;IAC/B,YAAY,EAAE,wBAAY,CAAC,KAAK,CAAC;IACjC,eAAe,EAAE,qBAAS,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,yBAAa,CAAC,KAAK,CAAC;IAChC,gCAAgC,EAAE,4CAAgC,CAAC,KAAK,CAAC;CAC1E,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,QAAsB,EAAoB,EAAE,CAAC,CAAC;IACjE,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,8BAAoB,CAAC,OAAO,CAAC,CAAC;IACnE,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,0BAAgB,EAAE,CAAC;IAC7C,6BAA6B,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,qCAA2B,EAAE,CAAC;CAC7E,CAAC,CAAA;AAEF,MAAM,UAAU,GAAG,CACjB,UAAyB,EACzB,aAA+B,EAC/B,QAAqB,EACR,EAAE,CAAC,+CACb,UAAU,GACV,aAAa,GACb,QAAQ,EACX,CAAA;AAEF,kBAAe,qBAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,gBAAM,CAAQ,CAAA"}
|
|
@@ -27,7 +27,6 @@ const Button_1 = require("decentraland-ui/dist/components/Button/Button");
|
|
|
27
27
|
const ModalNavigation_1 = require("decentraland-ui/dist/components/ModalNavigation/ModalNavigation");
|
|
28
28
|
const Navbar_1 = require("decentraland-ui/dist/components/Navbar/Navbar");
|
|
29
29
|
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
30
|
-
const eth_1 = require("../../lib/eth");
|
|
31
30
|
const utils_1 = require("../../modules/translation/utils");
|
|
32
31
|
const Modal_1 = __importDefault(require("../../containers/Modal"));
|
|
33
32
|
const ChainProvider_1 = __importDefault(require("../ChainProvider"));
|
|
@@ -55,15 +54,15 @@ class Navbar extends React.PureComponent {
|
|
|
55
54
|
};
|
|
56
55
|
};
|
|
57
56
|
this.handleSwitchNetwork = () => {
|
|
58
|
-
this.props.onSwitchNetwork(
|
|
57
|
+
this.props.onSwitchNetwork(this.props.appChainId);
|
|
59
58
|
};
|
|
60
59
|
this.handleSignOut = () => {
|
|
61
60
|
this.props.onSignOut();
|
|
62
61
|
};
|
|
63
62
|
}
|
|
64
63
|
render() {
|
|
65
|
-
const { hasAcceptedNetworkPartialSupport, onAcceptNetworkPartialSupport } = this.props;
|
|
66
|
-
const expectedChainName = chain_id_1.getChainName(
|
|
64
|
+
const { appChainId, hasAcceptedNetworkPartialSupport, onAcceptNetworkPartialSupport } = this.props;
|
|
65
|
+
const expectedChainName = chain_id_1.getChainName(appChainId);
|
|
67
66
|
return (React.createElement(React.Fragment, null,
|
|
68
67
|
React.createElement(Navbar_1.Navbar, Object.assign({}, this.props, { i18n: this.getTranslations() })),
|
|
69
68
|
React.createElement(ChainProvider_1.default, null, ({ chainId, isUnsupported, isPartiallySupported }) => isUnsupported ? (React.createElement(Modal_1.default, { open: true, size: "tiny" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA8B;AAE9B,0EAAsE;AACtE,qGAAiG;AACjG,0EAGsD;AACtD,+DAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,13 @@ import { NavbarProps as NavbarComponentProps } from 'decentraland-ui/dist/compon
|
|
|
4
4
|
import { acceptNetworkPartialSupport, AcceptNetworkPartialSupportAction, disconnectWallet, switchNetworkRequest, SwitchNetworkRequestAction } from '../../modules/wallet/actions';
|
|
5
5
|
export declare type NavbarProps = NavbarComponentProps & {
|
|
6
6
|
chainId?: ChainId;
|
|
7
|
+
appChainId: ChainId;
|
|
7
8
|
hasTranslations?: boolean;
|
|
8
9
|
onSwitchNetwork: typeof switchNetworkRequest;
|
|
9
10
|
onSignOut: typeof disconnectWallet;
|
|
10
11
|
hasAcceptedNetworkPartialSupport: boolean;
|
|
11
12
|
onAcceptNetworkPartialSupport: typeof acceptNetworkPartialSupport;
|
|
12
13
|
};
|
|
13
|
-
export declare type MapStateProps = Pick<NavbarProps, 'mana' | 'address' | 'isConnected' | 'isConnecting' | 'hasTranslations' | 'chainId' | 'hasAcceptedNetworkPartialSupport'>;
|
|
14
|
+
export declare type MapStateProps = Pick<NavbarProps, 'mana' | 'address' | 'isConnected' | 'isConnecting' | 'hasTranslations' | 'chainId' | 'appChainId' | 'hasAcceptedNetworkPartialSupport'>;
|
|
14
15
|
export declare type MapDispatchProps = Pick<NavbarProps, 'onSwitchNetwork' | 'onSignOut' | 'onAcceptNetworkPartialSupport'>;
|
|
15
16
|
export declare type MapDispatch = Dispatch<SwitchNetworkRequestAction | AcceptNetworkPartialSupportAction>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Props } from './NetworkCheck.types';
|
|
3
|
-
export default class
|
|
4
|
-
getChainId: () => import("@dcl/schemas
|
|
3
|
+
export default class NetworkCheck extends React.PureComponent<Props> {
|
|
4
|
+
getChainId: () => import("@dcl/schemas").ChainId | null;
|
|
5
5
|
render(): JSX.Element;
|
|
6
6
|
}
|
|
@@ -7,9 +7,8 @@ const react_1 = __importDefault(require("react"));
|
|
|
7
7
|
const Popup_1 = require("decentraland-ui/dist/components/Popup/Popup");
|
|
8
8
|
const utils_1 = require("../../modules/translation/utils");
|
|
9
9
|
const eth_1 = require("../../lib/eth");
|
|
10
|
-
const chain_id_1 = require("@dcl/schemas/dist/dapps/chain-id");
|
|
11
10
|
const ChainProvider_1 = __importDefault(require("../ChainProvider"));
|
|
12
|
-
class
|
|
11
|
+
class NetworkCheck extends react_1.default.PureComponent {
|
|
13
12
|
constructor() {
|
|
14
13
|
super(...arguments);
|
|
15
14
|
this.getChainId = () => {
|
|
@@ -27,10 +26,10 @@ class ChainCheck extends react_1.default.PureComponent {
|
|
|
27
26
|
return (react_1.default.createElement(ChainProvider_1.default, null, data => {
|
|
28
27
|
const isEnabled = data.isSupported || data.chainId === this.getChainId();
|
|
29
28
|
return (react_1.default.createElement(Popup_1.Popup, { disabled: isEnabled, position: "top center", content: react_1.default.createElement(utils_1.T, { id: "@dapps.button.network_not_supported", values: {
|
|
30
|
-
expectedChainName:
|
|
29
|
+
expectedChainName: react_1.default.createElement("b", null, data.appChainName)
|
|
31
30
|
} }), trigger: children(isEnabled) }));
|
|
32
31
|
}));
|
|
33
32
|
}
|
|
34
33
|
}
|
|
35
|
-
exports.default =
|
|
34
|
+
exports.default = NetworkCheck;
|
|
36
35
|
//# sourceMappingURL=NetworkCheck.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NetworkCheck.js","sourceRoot":"","sources":["../../../src/containers/NetworkCheck/NetworkCheck.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,uEAAmE;AACnE,2DAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"NetworkCheck.js","sourceRoot":"","sources":["../../../src/containers/NetworkCheck/NetworkCheck.tsx"],"names":[],"mappings":";;;;;AAAA,kDAAyB;AACzB,uEAAmE;AACnE,2DAAmD;AACnD,uCAAmD;AAEnD,qEAA4C;AAE5C,MAAqB,YAAa,SAAQ,eAAK,CAAC,aAAoB;IAApE;;QACE,eAAU,GAAG,GAAG,EAAE;YAChB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YAC9B,IAAI;gBACF,OAAO,yBAAmB,CAAC,OAAO,CAAC,CAAA;aACpC;YAAC,WAAM;gBACN,OAAO,IAAI,CAAA;aACZ;QACH,CAAC,CAAA;IA2BH,CAAC;IA1BC,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC/B,OAAO,CACL,8BAAC,uBAAa,QACX,IAAI,CAAC,EAAE;YACN,MAAM,SAAS,GACb,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,UAAU,EAAE,CAAA;YACxD,OAAO,CACL,8BAAC,aAAK,IACJ,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAC,YAAY,EACrB,OAAO,EACL,8BAAC,SAAC,IACA,EAAE,EAAC,qCAAqC,EACxC,MAAM,EAAE;wBACN,iBAAiB,EAAE,yCAAI,IAAI,CAAC,YAAY,CAAK;qBAC9C,GACD,EAEJ,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,GAC5B,CACH,CAAA;QACH,CAAC,CACa,CACjB,CAAA;IACH,CAAC;CACF;AAnCD,+BAmCC"}
|
|
@@ -106,7 +106,8 @@ function* handleDisconnectWallet(_action) {
|
|
|
106
106
|
}
|
|
107
107
|
function* handleFetchWalletRequest(_action) {
|
|
108
108
|
try {
|
|
109
|
-
const
|
|
109
|
+
const appChainId = yield effects_1.select(selectors_1.getAppChainId);
|
|
110
|
+
const wallet = yield effects_1.call(utils_1.buildWallet, appChainId);
|
|
110
111
|
yield effects_1.put(actions_1.fetchWalletSuccess(wallet));
|
|
111
112
|
}
|
|
112
113
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D,+DAA2D;AAC3D,uCAIsB;AACtB,uCA+BkB;AAClB,mCAMgB;AAEhB,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAU2B;AAC3B,+DAA0D;AAC1D,+DAA2D;AAC3D,uCAIsB;AACtB,uCA+BkB;AAClB,mCAMgB;AAEhB,2CAAwD;AAExD,6DAA6D;AAC7D,MAAM,QAAQ,GAAI,MAAc,CAAC,QAAyC,CAAA;AAE1E,IAAI,oBAA2D,CAAA;AAC/D,IAAI,wBAAkB,EAAE,EAAE;IACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC3B,oBAAoB,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QACxC,IAAI;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACtD,QAAQ,CAAC,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE,CACnC,CAAA;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;SAC3B;IACH,CAAC,CAAA;CACF;AAED,iCAAiC;AACjC,IAAI,QAAiB,CAAA;AACrB,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA,CAAC,aAAa;AAC/C,IAAI,OAAO,GAAG,KAAK,CAAA;AAEnB,QAAe,CAAC,CAAC,UAAU;IACzB,MAAM,cAAI,CAAC,oBAAoB,CAAC,CAAA;IAChC,MAAM,aAAG,CAAC;QACR,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,+BAAqB,EAAE,yBAAyB,CAAC;QAC3D,mBAAS,CAAC,+BAAqB,EAAE,yBAAyB,CAAC;QAC3D,mBAAS,CAAC,8BAAoB,EAAE,wBAAwB,CAAC;QACzD,mBAAS,CAAC,2BAAiB,EAAE,sBAAsB,CAAC;QACpD,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,gCAAsB,EAAE,0BAA0B,CAAC;QAC7D,mBAAS,CAAC,gCAAsB,EAAE,yBAAyB,CAAC;KAC7D,CAAC,CAAA;AACJ,CAAC;AAZD,gCAYC;AAED,QAAQ,CAAC,CAAC,oBAAoB;IAC5B,MAAM,aAAG,CAAC,uBAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;AACpC,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,IAAI;QACF,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;QAC/B,MAAM,EACJ,OAAO,EACP,OAAO,EACR,GAGG,MAAM,cAAI,CAAC;YACb,OAAO,EAAE,cAAI,CAAC,8BAAoB,CAAC;YACnC,OAAO,EAAE,cAAI,CAAC,8BAAoB,CAAC;SACpC,CAAC,CAAA;QACF,IAAI,OAAO,EAAE;YACX,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;SACxD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,OAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SACxC;KACF;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,0BAAgB,EAAE,CAAC,CAAA;QAC7B,MAAM,aAAG,CAAC,8BAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC/C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,MAAiC;IACnE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IACvC,IAAI;QACF,MAAM,OAAO,GAAW,MAAM,cAAI,CAAC,GAAS,EAAE;YAC5C,IAAI,wBAAkB,EAAE,EAAE;gBACxB,MAAM,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;aAClD;YAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,iCAAU,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YACpE,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;SACtD;QACD,MAAM,aAAG,CAAC,6BAAmB,CAAC,YAAY,CAAC,CAAC,CAAA;KAC7C;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,0BAAgB,EAAE,CAAC,CAAA;QAC7B,MAAM,aAAG,CAAC,6BAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC9C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,OAAkC;IACpE,MAAM,aAAG,CAAC,8BAAoB,EAAE,CAAC,CAAA;AACnC,CAAC;AAED,QAAQ,CAAC,CAAC,sBAAsB,CAAC,OAA+B;IAC9D,IAAI;QACF,MAAM,cAAI,CAAC,GAAG,EAAE,CAAC,iCAAU,CAAC,UAAU,EAAE,CAAC,CAAA;KAC1C;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;KACrB;IACD,+BAA+B;IAC/B,OAAO,GAAG,KAAK,CAAA;AACjB,CAAC;AAED,QAAQ,CAAC,CAAC,wBAAwB,CAAC,OAAiC;IAClE,IAAI;QACF,MAAM,UAAU,GAAY,MAAM,gBAAM,CAAC,yBAAa,CAAC,CAAA;QACvD,MAAM,MAAM,GAAW,MAAM,cAAI,CAAC,mBAAW,EAAE,UAAU,CAAC,CAAA;QAC1D,MAAM,aAAG,CAAC,4BAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;KACtC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,aAAG,CAAC,4BAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;KAC7C;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,uBAAuB;IACvB,IAAI,CAAC,OAAO,IAAI,aAAa,GAAG,CAAC,EAAE;QACjC,OAAO,GAAG,IAAI,CAAA;QACd,OAAO,OAAO,EAAE;YACd,MAAM,eAAK,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,iBAAiB,GAAY,MAAM,gBAAM,CAAC,uBAAW,CAAC,CAAA;YAC5D,IAAI,iBAAiB,EAAE;gBACrB,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;aAChC;SACF;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B,CAAC,MAAkC;IACrE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IAClC,MAAM,QAAQ,GAAoB,MAAM,cAAI,CAAC,0BAAoB,CAAC,CAAA;IAClE,IAAI;QACF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;SAC1C;QACD,MAAM,cAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE;YAChC,MAAM,EAAE,4BAA4B;YACpC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;SACnD,CAAC,CAAA;QACF,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;KACzC;IAAC,OAAO,WAAW,EAAE;QACpB,2EAA2E;QAC3E,IAAI,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,IAAI,EAAE;YACzC,IAAI;gBACF,MAAM,cAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE;oBAChC,MAAM,EAAE,yBAAyB;oBACjC,MAAM,EAAE,CAAC,qCAA6B,CAAC,OAAO,CAAC,CAAC;iBACjD,CAAC,CAAA;gBACF,MAAM,UAAU,GAAW,MAAM,cAAI,CAAC,0BAAkB,EAAE,QAAQ,CAAC,CAAA;gBACnE,IAAI,OAAO,KAAK,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE;oBACxC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;iBAC/D;gBACD,MAAM,aAAG,CAAC,8BAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;gBACxC,OAAM;aACP;YAAC,OAAO,QAAQ,EAAE;gBACjB,MAAM,aAAG,CACP,8BAAoB,CAClB,OAAO,EACP,yBAAyB,QAAQ,CAAC,OAAO,EAAE,CAC5C,CACF,CAAA;gBACD,OAAM;aACP;SACF;QACD,MAAM,aAAG,CACP,8BAAoB,CAClB,OAAO,EACP,4BAA4B,WAAW,CAAC,OAAO,EAAE,CAClD,CACF,CAAA;KACF;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,OAAmC;IACrE,MAAM,aAAG,CAAC,4BAAkB,EAAE,CAAC,CAAA;AACjC,CAAC;AAED,SAAgB,gBAAgB,CAAC,OAA4B;IAC3D,IAAI,oBAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACpC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;KACpC;SAAM;QACL,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,QAAQ,uBAAuB,MAAM,CAAC,MAAM,CACtE,kBAAO,CACR,EAAE,CACJ,CAAA;KACF;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,OAAO,CAAC,IAAI,CACV,6HAA6H,CAC9H,CAAA;KACF;IAED,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;KACtC;IAED,IAAI,OAAO,CAAC,oBAAoB,EAAE;QAChC,6BAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;KACpD;SAAM;QACL,OAAO,CAAC,IAAI,CACV,iFAAiF,6BAAqB,EAAE,IAAI,CAC7G,CAAA;KACF;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AA9BD,4CA8BC"}
|
|
@@ -8,7 +8,7 @@ import { AddEthereumChainParameters, Wallet } from './types';
|
|
|
8
8
|
export declare const getTransactionsApiUrl: () => string;
|
|
9
9
|
export declare const setTransactionsApiUrl: (url: string) => string;
|
|
10
10
|
export declare function fetchManaBalance(chainId: ChainId, address: string): Promise<number>;
|
|
11
|
-
export declare function buildWallet(): Promise<Wallet>;
|
|
11
|
+
export declare function buildWallet(appChainId: ChainId): Promise<Wallet>;
|
|
12
12
|
export declare function getTargetNetworkProvider(chainId: ChainId): Promise<ethers.providers.Web3Provider>;
|
|
13
13
|
export declare enum TransactionEventType {
|
|
14
14
|
ERROR = "error",
|
|
@@ -36,7 +36,7 @@ function fetchManaBalance(chainId, address) {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
exports.fetchManaBalance = fetchManaBalance;
|
|
39
|
-
function buildWallet() {
|
|
39
|
+
function buildWallet(appChainId) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
const provider = yield eth_1.getConnectedProvider();
|
|
42
42
|
if (!provider) {
|
|
@@ -52,11 +52,10 @@ function buildWallet() {
|
|
|
52
52
|
const address = accounts[0].toString();
|
|
53
53
|
const { chainId } = yield eth.getNetwork();
|
|
54
54
|
const chainConfig = chainConfiguration_1.getChainConfiguration(chainId);
|
|
55
|
-
const
|
|
56
|
-
const expectedChainConfig = chainConfiguration_1.getChainConfiguration(expectedChainId);
|
|
55
|
+
const appChainConfig = chainConfiguration_1.getChainConfiguration(appChainId);
|
|
57
56
|
const networks = {};
|
|
58
|
-
for (const network of Object.keys(
|
|
59
|
-
const networkChainId =
|
|
57
|
+
for (const network of Object.keys(appChainConfig.networkMapping)) {
|
|
58
|
+
const networkChainId = appChainConfig.networkMapping[network];
|
|
60
59
|
networks[network] = {
|
|
61
60
|
chainId: networkChainId,
|
|
62
61
|
mana: yield fetchManaBalance(networkChainId, address)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAqC;AACrC,mCAA+B;AAE/B,yEAKkC;AAClC,+DAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/modules/wallet/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const WalletProvider_1 = __importDefault(require("./WalletProvider"));
|
|
|
10
10
|
const mapState = (state) => ({
|
|
11
11
|
address: selectors_1.getAddress(state),
|
|
12
12
|
chainId: selectors_1.getChainId(state),
|
|
13
|
+
appChainId: selectors_1.getAppChainId(state),
|
|
13
14
|
isConnected: selectors_1.isConnected(state),
|
|
14
15
|
isConnecting: selectors_1.isConnecting(state)
|
|
15
16
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.container.js","sourceRoot":"","sources":["../../../src/providers/WalletProvider/WalletProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"WalletProvider.container.js","sourceRoot":"","sources":["../../../src/providers/WalletProvider/WalletProvider.container.ts"],"names":[],"mappings":";;;;;AAAA,6CAAqC;AACrC,8DAMuC;AACvC,0DAIqC;AAMrC,sEAA6C;AAE7C,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE,CAAC,CAAC;IAC/C,OAAO,EAAE,sBAAU,CAAC,KAAK,CAAC;IAC1B,OAAO,EAAE,sBAAU,CAAC,KAAK,CAAC;IAC1B,UAAU,EAAE,yBAAa,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,uBAAW,CAAC,KAAK,CAAC;IAC/B,YAAY,EAAE,wBAAY,CAAC,KAAK,CAAC;CAClC,CAAC,CAAA;AAEF,MAAM,WAAW,GAAG,CAAC,QAAqB,EAAoB,EAAE,CAAC,CAAC;IAChE,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,8BAAoB,EAAE,CAAC;IACjD,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,uBAAa,CAAC,OAAO,CAAC,CAAC;IAC5D,eAAe,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,uBAAa,CAAC,OAAO,CAAC,CAAC;CAC7D,CAAC,CAAA;AAEF,kBAAe,qBAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,wBAAc,CAAQ,CAAA"}
|
|
@@ -19,9 +19,9 @@ class WalletProvider extends react_1.default.PureComponent {
|
|
|
19
19
|
constructor() {
|
|
20
20
|
super(...arguments);
|
|
21
21
|
this.handleChangeAccount = () => __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const { isConnected, isConnecting, address, onChangeAccount } = this.props;
|
|
22
|
+
const { isConnected, isConnecting, address, onChangeAccount, appChainId } = this.props;
|
|
23
23
|
try {
|
|
24
|
-
const wallet = yield utils_1.buildWallet();
|
|
24
|
+
const wallet = yield utils_1.buildWallet(appChainId);
|
|
25
25
|
if (isConnected && !isConnecting && wallet.address !== address) {
|
|
26
26
|
onChangeAccount(wallet);
|
|
27
27
|
}
|
|
@@ -31,9 +31,9 @@ class WalletProvider extends react_1.default.PureComponent {
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
this.handleChangeNetwork = () => __awaiter(this, void 0, void 0, function* () {
|
|
34
|
-
const { isConnected, isConnecting, chainId, onChangeNetwork } = this.props;
|
|
34
|
+
const { isConnected, isConnecting, chainId, onChangeNetwork, appChainId } = this.props;
|
|
35
35
|
try {
|
|
36
|
-
const wallet = yield utils_1.buildWallet();
|
|
36
|
+
const wallet = yield utils_1.buildWallet(appChainId);
|
|
37
37
|
if (isConnected && !isConnecting && wallet.chainId !== chainId) {
|
|
38
38
|
onChangeNetwork(wallet);
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/providers/WalletProvider/WalletProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,uCAAoD;AACpD,sDAAwD;AAUxD,MAAqB,cAAe,SAAQ,eAAK,CAAC,aAAoB;IAAtE;;QACE,wBAAmB,GAAG,GAAS,EAAE;YAC/B,MAAM,
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/providers/WalletProvider/WalletProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { connectWalletRequest, ConnectWalletRequestAction, changeAccount, change
|
|
|
6
6
|
export declare type Props = {
|
|
7
7
|
address?: string;
|
|
8
8
|
chainId?: ChainId;
|
|
9
|
+
appChainId: ChainId;
|
|
9
10
|
isConnected: boolean;
|
|
10
11
|
isConnecting: boolean;
|
|
11
12
|
children: React.ReactNode;
|
|
@@ -13,7 +14,7 @@ export declare type Props = {
|
|
|
13
14
|
onChangeAccount: typeof changeAccount;
|
|
14
15
|
onChangeNetwork: typeof changeNetwork;
|
|
15
16
|
};
|
|
16
|
-
export declare type MapStateProps = Pick<Props, 'address' | 'chainId' | 'isConnected' | 'isConnecting'>;
|
|
17
|
+
export declare type MapStateProps = Pick<Props, 'address' | 'chainId' | 'appChainId' | 'isConnected' | 'isConnecting'>;
|
|
17
18
|
export declare type MapDispatchProps = Pick<Props, 'address' | 'chainId' | 'onConnect' | 'onChangeAccount' | 'onChangeNetwork'>;
|
|
18
19
|
export declare type MapDispatch = Dispatch<ConnectWalletRequestAction | ChangeAccountAction | ChangeNetworkAction>;
|
|
19
20
|
export declare type EventType = 'accountsChanged' | 'chainChanged' | 'networkChanged';
|