decentraland-dapps 19.12.0 → 21.0.0
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/containers/Navbar/Navbar.container.js +4 -3
- package/dist/containers/Navbar/Navbar.container.js.map +1 -1
- package/dist/containers/Navbar/Navbar.js +3 -6
- package/dist/containers/Navbar/Navbar.js.map +1 -1
- package/dist/containers/Navbar/Navbar.types.d.ts +3 -3
- package/dist/containers/Navbar/constants.d.ts +1 -0
- package/dist/containers/Navbar/constants.js +1 -0
- package/dist/containers/Navbar/constants.js.map +1 -1
- package/dist/lib/chainConfiguration.js.map +1 -1
- package/dist/lib/eth.js +9 -4
- package/dist/lib/eth.js.map +1 -1
- package/dist/modules/identity/sagas.js +2 -2
- package/dist/modules/identity/sagas.js.map +1 -1
- package/dist/modules/translation/defaults/en.json +2 -3
- package/dist/modules/translation/defaults/es.json +2 -3
- package/dist/modules/translation/defaults/fr.json +2 -3
- package/dist/modules/translation/defaults/ja.json +2 -3
- package/dist/modules/translation/defaults/ko.json +2 -3
- package/dist/modules/translation/defaults/zh.json +2 -3
- package/dist/modules/wallet/actions.d.ts +11 -3
- package/dist/modules/wallet/actions.js +6 -2
- package/dist/modules/wallet/actions.js.map +1 -1
- package/dist/modules/wallet/reducer.d.ts +2 -2
- package/dist/modules/wallet/reducer.js +5 -3
- package/dist/modules/wallet/reducer.js.map +1 -1
- package/dist/modules/wallet/sagas.js +7 -5
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/selectors.d.ts +1 -0
- package/dist/modules/wallet/selectors.js +2 -1
- package/dist/modules/wallet/selectors.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { connect } from 'react-redux';
|
|
2
|
-
import { isConnected, isConnecting, getAddress, getChainId, getAppChainId, getManaBalances, isSwitchingNetwork } from '../../modules/wallet/selectors';
|
|
2
|
+
import { isConnected, isConnecting, getAddress, getChainId, getAppChainId, getManaBalances, isSwitchingNetwork, isDisconnecting } from '../../modules/wallet/selectors';
|
|
3
3
|
import { getData as getProfiles } from '../../modules/profile/selectors';
|
|
4
4
|
import { getError as getWalletError } from '../../modules/wallet/selectors';
|
|
5
5
|
import { getLocale } from '../../modules/translation/selectors';
|
|
6
|
-
import {
|
|
6
|
+
import { disconnectWalletRequest, switchNetworkRequest } from '../../modules/wallet/actions';
|
|
7
7
|
import Navbar from './Navbar';
|
|
8
8
|
const mapState = (state) => {
|
|
9
9
|
const address = getAddress(state);
|
|
@@ -15,6 +15,7 @@ const mapState = (state) => {
|
|
|
15
15
|
address: getAddress(state),
|
|
16
16
|
locale: getLocale(state),
|
|
17
17
|
isSignedIn: isConnected(state),
|
|
18
|
+
isDisconnecting: isDisconnecting(state),
|
|
18
19
|
isSigningIn: isConnecting(state),
|
|
19
20
|
appChainId: getAppChainId(state),
|
|
20
21
|
isSwitchingNetwork: isSwitchingNetwork(state),
|
|
@@ -23,7 +24,7 @@ const mapState = (state) => {
|
|
|
23
24
|
};
|
|
24
25
|
const mapDispatch = (dispatch) => ({
|
|
25
26
|
onSwitchNetwork: (chainId, fromChainId) => dispatch(switchNetworkRequest(chainId, fromChainId)),
|
|
26
|
-
onSignOut: () => dispatch(
|
|
27
|
+
onSignOut: () => dispatch(disconnectWalletRequest())
|
|
27
28
|
});
|
|
28
29
|
const mergeProps = (stateProps, dispatchProps, ownProps) => ({
|
|
29
30
|
...stateProps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navbar.container.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.container.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EACL,WAAW,EACX,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,EACb,eAAe,EACf,kBAAkB,
|
|
1
|
+
{"version":3,"file":"Navbar.container.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.container.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EACL,WAAW,EACX,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,eAAe,EAChB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,iCAAiC,CAAA;AACxE,OAAO,EAAE,QAAQ,IAAI,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAC/D,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,8BAA8B,CAAA;AAGrC,OAAO,MAAM,MAAM,UAAU,CAAA;AAG7B,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAiB,EAAE;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACjE,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAChD,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC;QAC1B,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC;QAC1B,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC;QACxB,UAAU,EAAE,WAAW,CAAC,KAAK,CAAC;QAC9B,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC;QACvC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;QAChC,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC;QAChC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC;QAC7C,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC;KACnC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,QAAsB,EAAoB,EAAE,CAAC,CAAC;IACjE,eAAe,EAAE,CAAC,OAAgB,EAAE,WAAoB,EAAE,EAAE,CAC1D,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,SAAS,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,CAAC;CACrD,CAAC,CAAA;AAEF,MAAM,UAAU,GAAG,CACjB,UAAyB,EACzB,aAA+B,EAC/B,QAAqB,EACR,EAAE,CAAC,CAAC;IACjB,GAAG,UAAU;IACb,GAAG,aAAa;IAChB,GAAG,QAAQ;CACZ,CAAC,CAAA;AAEF,eAAe,OAAO,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,MAAM,CAAQ,CAAA"}
|
|
@@ -9,7 +9,7 @@ import { getAvailableChains } from '../../lib/chainConfiguration';
|
|
|
9
9
|
import { getConnectedProviderType } from '../../lib';
|
|
10
10
|
import { getBaseUrl } from '../../lib/utils';
|
|
11
11
|
import ChainProvider from '../ChainProvider';
|
|
12
|
-
import { DROPDOWN_MENU_BALANCE_CLICK_EVENT, DROPDOWN_MENU_DISPLAY_EVENT, DROPDOWN_MENU_SIGN_OUT_EVENT } from './constants';
|
|
12
|
+
import { CHANGE_NETWORK, DROPDOWN_MENU_BALANCE_CLICK_EVENT, DROPDOWN_MENU_DISPLAY_EVENT, DROPDOWN_MENU_ITEM_CLICK_EVENT, DROPDOWN_MENU_SIGN_OUT_EVENT } from './constants';
|
|
13
13
|
import { NAVBAR_CLICK_EVENT } from './constants';
|
|
14
14
|
import useNotifications from '../../hooks/useNotifications';
|
|
15
15
|
const BASE_URL = getBaseUrl();
|
|
@@ -29,7 +29,7 @@ const Navbar = ({ appChainId, isSwitchingNetwork, withNotifications, withChainSe
|
|
|
29
29
|
const handleSwitchChain = useCallback((chainId) => {
|
|
30
30
|
setChainSelected(chainId);
|
|
31
31
|
props.onSwitchNetwork(chainId, props.chainId);
|
|
32
|
-
analytics.track(
|
|
32
|
+
analytics.track(CHANGE_NETWORK, {
|
|
33
33
|
from_chain_id: props.chainId,
|
|
34
34
|
to_chain_id: chainId
|
|
35
35
|
});
|
|
@@ -45,10 +45,7 @@ const Navbar = ({ appChainId, isSwitchingNetwork, withNotifications, withChainSe
|
|
|
45
45
|
analytics.track(NAVBAR_CLICK_EVENT, options);
|
|
46
46
|
}, [analytics]);
|
|
47
47
|
const handleClickUserMenuItem = useCallback((_e, options) => {
|
|
48
|
-
analytics.track(
|
|
49
|
-
url: options.url,
|
|
50
|
-
trackingId: options.trackingId
|
|
51
|
-
});
|
|
48
|
+
analytics.track(DROPDOWN_MENU_ITEM_CLICK_EVENT, options);
|
|
52
49
|
}, [analytics]);
|
|
53
50
|
const handleClickOpen = useCallback((_e, track_uuid) => {
|
|
54
51
|
analytics.track(DROPDOWN_MENU_DISPLAY_EVENT, { track_uuid });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC/D,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,+CAA+C,CAAA;AAEzF,OAAO,EAAW,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,CAAC,EAAE,MAAM,2BAA2B,CAAA;AAC7C,OAAO,uBAAuB,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,aAAa,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EACL,iCAAiC,EACjC,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,gBAAgB,MAAM,8BAA8B,CAAA;AAE3D,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;AAE7B,MAAM,MAAM,GAA0B,CAAC,EACrC,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,QAAQ,EACR,OAAO,GAAG,+BAA+B,EACzC,yBAAyB,GAAG,IAAI,EAChC,WAAW,EACX,GAAG,KAAK,EACI,EAAE,EAAE;IAChB,MAAM,iBAAiB,GAAG,YAAY,CAAC,UAAU,CAAC,CAAA;IAClD,MAAM,SAAS,GAAG,YAAY,EAAE,CAAA;IAEhC,MAAM,EACJ,WAAW,EACX,yBAAyB,EACzB,cAAc,EACd,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACpB,GAAG,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,IAAI,KAAK,CAAC,CAAA;IAE1D,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC3C,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAChD,SAAS,CACV,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAW,IAAI,aAAa,IAAI,iBAAiB,EAAE,CAAC;YACtD,gBAAgB,CAAC,SAAS,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAEnD,MAAM,iBAAiB,GAAG,WAAW,CACnC,CAAC,OAAgB,EAAE,EAAE;QACnB,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACzB,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QAC7C,SAAS,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Navbar.js","sourceRoot":"","sources":["../../../src/containers/Navbar/Navbar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Dispatch } from 'redux';
|
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
import { AuthIdentity } from '@dcl/crypto';
|
|
4
4
|
import { NavbarProps as NavbarComponentProps } from 'decentraland-ui/dist/components/Navbar/Navbar.types';
|
|
5
|
-
import {
|
|
5
|
+
import { disconnectWalletRequest, switchNetworkRequest, SwitchNetworkRequestAction } from '../../modules/wallet/actions';
|
|
6
6
|
export type NavbarProps = NavbarComponentProps & {
|
|
7
7
|
withChainSelector?: boolean;
|
|
8
8
|
chainId?: ChainId;
|
|
@@ -15,9 +15,9 @@ export type NavbarProps = NavbarComponentProps & {
|
|
|
15
15
|
locale: string;
|
|
16
16
|
walletError: string | null;
|
|
17
17
|
onSwitchNetwork: typeof switchNetworkRequest;
|
|
18
|
-
onSignOut: typeof
|
|
18
|
+
onSignOut: typeof disconnectWalletRequest;
|
|
19
19
|
onSignIn: () => void;
|
|
20
20
|
};
|
|
21
|
-
export type MapStateProps = Pick<NavbarProps, 'manaBalances' | 'address' | 'isSignedIn' | 'isSigningIn' | 'chainId' | 'appChainId' | 'isSwitchingNetwork' | 'avatar' | 'locale' | 'walletError'>;
|
|
21
|
+
export type MapStateProps = Pick<NavbarProps, 'manaBalances' | 'address' | 'isSignedIn' | 'isDisconnecting' | 'isSigningIn' | 'chainId' | 'appChainId' | 'isSwitchingNetwork' | 'avatar' | 'locale' | 'walletError'>;
|
|
22
22
|
export type MapDispatchProps = Pick<NavbarProps, 'onSwitchNetwork' | 'onSignOut'>;
|
|
23
23
|
export type MapDispatch = Dispatch<SwitchNetworkRequestAction>;
|
|
@@ -5,3 +5,4 @@ export declare const DROPDOWN_MENU_DISPLAY_EVENT = "Unified Dropdown Menu Displa
|
|
|
5
5
|
export declare const DROPDOWN_MENU_BALANCE_CLICK_EVENT = "Unified Dropdown Menu Balance Click";
|
|
6
6
|
export declare const DROPDOWN_MENU_SIGN_OUT_EVENT = "Unified Dropdown Menu Sign Out";
|
|
7
7
|
export declare const DROPDOWN_MENU_SIGN_IN_EVENT = "Unified Dropdown Menu Sign In";
|
|
8
|
+
export declare const CHANGE_NETWORK = "Change Network";
|
|
@@ -5,4 +5,5 @@ export const DROPDOWN_MENU_DISPLAY_EVENT = 'Unified Dropdown Menu Display';
|
|
|
5
5
|
export const DROPDOWN_MENU_BALANCE_CLICK_EVENT = 'Unified Dropdown Menu Balance Click';
|
|
6
6
|
export const DROPDOWN_MENU_SIGN_OUT_EVENT = 'Unified Dropdown Menu Sign Out';
|
|
7
7
|
export const DROPDOWN_MENU_SIGN_IN_EVENT = 'Unified Dropdown Menu Sign In';
|
|
8
|
+
export const CHANGE_NETWORK = 'Change Network';
|
|
8
9
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/containers/Navbar/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAA;AACnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAA;AAEjD,MAAM,CAAC,MAAM,8BAA8B,GAAG,kCAAkC,CAAA;AAChF,MAAM,CAAC,MAAM,2BAA2B,GAAG,+BAA+B,CAAA;AAC1E,MAAM,CAAC,MAAM,iCAAiC,GAC5C,qCAAqC,CAAA;AACvC,MAAM,CAAC,MAAM,4BAA4B,GAAG,gCAAgC,CAAA;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAAG,+BAA+B,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/containers/Navbar/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAA;AACnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,CAAA;AAEjD,MAAM,CAAC,MAAM,8BAA8B,GAAG,kCAAkC,CAAA;AAChF,MAAM,CAAC,MAAM,2BAA2B,GAAG,+BAA+B,CAAA;AAC1E,MAAM,CAAC,MAAM,iCAAiC,GAC5C,qCAAqC,CAAA;AACvC,MAAM,CAAC,MAAM,4BAA4B,GAAG,gCAAgC,CAAA;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAAG,+BAA+B,CAAA;AAC1E,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chainConfiguration.js","sourceRoot":"","sources":["../../src/lib/chainConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,UAAU,EACV,iBAAiB,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"chainConfiguration.js","sourceRoot":"","sources":["../../src/lib/chainConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,UAAU,EACV,iBAAiB,EAClB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,QAAQ,GAAiC,UAAU,CACvD,YAAY,CAAC,OAAO,CACd,CAAA;AAWR,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,OAAO;QACL,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;QAC5B,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;QACzB,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC;KAC3C,CAAA;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,GAAG,CAAC,WAAW,CAAA;IAC1C,OAAO,KAAK;QACV,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC;QAChD,CAAC,CAAC;YACE,OAAO,CAAC,gBAAgB;YACxB,OAAO,CAAC,aAAa;YACrB,OAAO,CAAC,gBAAgB;YACxB,OAAO,CAAC,gBAAgB;YACxB,OAAO,CAAC,cAAc;YACtB,OAAO,CAAC,iBAAiB;YACzB,OAAO,CAAC,WAAW;SACpB,CAAA;AACP,CAAC"}
|
package/dist/lib/eth.js
CHANGED
|
@@ -44,11 +44,16 @@ export async function getNetworkWeb3Provider(chainId) {
|
|
|
44
44
|
}
|
|
45
45
|
export async function getConnectedProvider() {
|
|
46
46
|
try {
|
|
47
|
-
|
|
48
|
-
return provider ? provider : null;
|
|
47
|
+
return await connection.getProvider();
|
|
49
48
|
}
|
|
50
|
-
catch (
|
|
51
|
-
|
|
49
|
+
catch (_e) {
|
|
50
|
+
try {
|
|
51
|
+
const { provider } = await connection.tryPreviousConnection();
|
|
52
|
+
return provider;
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
52
57
|
}
|
|
53
58
|
}
|
|
54
59
|
export async function getSigner() {
|
package/dist/lib/eth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAWlC;;GAEG;AACH,IAAI,UAAmB,CAAA;AAEvB;;GAEG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,UAAU,CAAA;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,WAAoB;IACjD,UAAU,GAAG,WAAW,CAAA;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAgB;IACvD;;;MAGE;IACF,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;IACtD,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,gBAAgB,GAAG,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAC9D,iBAAiB,CAClB;aACE,SAAS,EAAE;aACX,UAAU,EAAE,CAAA;QACf,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAA;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AACjE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAAgB;IAC3D,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,IAAI,CAAC;QACH,
|
|
1
|
+
{"version":3,"file":"eth.js","sourceRoot":"","sources":["../../src/lib/eth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { takeLatest, call, put } from 'redux-saga/effects';
|
|
2
2
|
import { localStorageGetIdentity, localStorageClearIdentity } from '@dcl/single-sign-on-client';
|
|
3
|
-
import { CONNECT_WALLET_SUCCESS,
|
|
3
|
+
import { CONNECT_WALLET_SUCCESS, DISCONNECT_WALLET_SUCCESS } from '../wallet/actions';
|
|
4
4
|
import { GENERATE_IDENTITY_REQUEST, generateIdentitySuccess } from './actions';
|
|
5
5
|
// Persist the address of the connected wallet.
|
|
6
6
|
// This is a workaround for when the user disconnects as there is no selector that provides the address at that point
|
|
@@ -10,7 +10,7 @@ export function createIdentitySaga(options) {
|
|
|
10
10
|
function* identitySaga() {
|
|
11
11
|
yield takeLatest(GENERATE_IDENTITY_REQUEST, handleGetIdentity);
|
|
12
12
|
yield takeLatest(CONNECT_WALLET_SUCCESS, handleConnectWalletSuccess);
|
|
13
|
-
yield takeLatest(
|
|
13
|
+
yield takeLatest(DISCONNECT_WALLET_SUCCESS, handleDisconnect);
|
|
14
14
|
}
|
|
15
15
|
const { authURL } = options;
|
|
16
16
|
dappAuthURL = authURL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/identity/sagas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAE1D,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/identity/sagas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAE1D,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,4BAA4B,CAAA;AACnC,OAAO,EACL,sBAAsB,EACtB,yBAAyB,EAE1B,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EACL,yBAAyB,EAEzB,uBAAuB,EACxB,MAAM,WAAW,CAAA;AAOlB,+CAA+C;AAC/C,qHAAqH;AACrH,IAAI,UAAU,GAAkB,IAAI,CAAA;AACpC,IAAI,WAAW,GAAkB,IAAI,CAAA;AAErC,MAAM,UAAU,kBAAkB,CAAC,OAA2B;IAC5D,QAAQ,CAAC,CAAC,YAAY;QACpB,MAAM,UAAU,CAAC,yBAAyB,EAAE,iBAAiB,CAAC,CAAA;QAC9D,MAAM,UAAU,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAA;QACpE,MAAM,UAAU,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,CAAA;IAC/D,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;IAC3B,WAAW,GAAG,OAAO,CAAA;IAErB,QAAQ,CAAC,CAAC,iBAAiB,CAAC,MAAqC;QAC/D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;QAClC,MAAM,QAAQ,GAAwB,uBAAuB,CAAC,OAAO,CAAC,CAAA;QACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,QAAQ,CAAC,OAAO,CACrB,GAAG,OAAO,qBAAqB,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CACtD,CAAA;YACD,OAAM;QACR,CAAC;QACD,MAAM,GAAG,CAAC,uBAAuB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,QAAQ,CAAC,CAAC,0BAA0B,CAAC,MAAkC;QACrE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAA;QAE7C,MAAM,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QAElC,MAAM,QAAQ,GAAwB,uBAAuB,CAAC,OAAO,CAAC,CAAA;QACtE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,CAAC,QAAQ,CAAC,OAAO,CACrB,GAAG,OAAO,qBAAqB,kBAAkB,CAC/C,MAAM,CAAC,QAAQ,CAAC,IAAI,CACrB,EAAE,CACJ,CAAA;QACH,CAAC;IACH,CAAC;IAED,QAAQ,CAAC,CAAC,gBAAgB,CAAC,OAAsC;QAC/D,IAAI,UAAU,EAAE,CAAC;YACf,yBAAyB,CAAC,UAAU,CAAC,CAAA;QACvC,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,SAAS,CAAC,CAAC,qBAAqB;IACpC,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAwB,uBAAuB,CAAC,UAAU,CAAC,CAAA;IACzE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,CAAC,QAAQ,CAAC,OAAO,CACrB,GAAG,WAAW,qBAAqB,kBAAkB,CACnD,MAAM,CAAC,QAAQ,CAAC,IAAI,CACrB,EAAE,CACJ,CAAA;QACD,OAAM;IACR,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAsB;IAClD,UAAU,GAAG,OAAO,CAAA;AACtB,CAAC"}
|
|
@@ -175,16 +175,15 @@
|
|
|
175
175
|
},
|
|
176
176
|
"user_menu": {
|
|
177
177
|
"guest": "Unnamed",
|
|
178
|
-
"settings": "Account Settings",
|
|
179
178
|
"my_lists": "My Lists",
|
|
180
179
|
"my_assets": "My Assets",
|
|
181
|
-
"account": "Account",
|
|
180
|
+
"account": "Account Settings",
|
|
182
181
|
"activity": "Activity",
|
|
183
182
|
"profile": "Profile",
|
|
184
183
|
"view_profile": "View Profile",
|
|
185
184
|
"sign_in": "Sign In",
|
|
186
185
|
"sign_out": "Sign out",
|
|
187
|
-
"
|
|
186
|
+
"marketplace_authorizations": "Marketplace Authorizations",
|
|
188
187
|
"jump_in": "Jump In"
|
|
189
188
|
},
|
|
190
189
|
"toasts": {
|
|
@@ -175,16 +175,15 @@
|
|
|
175
175
|
},
|
|
176
176
|
"user_menu": {
|
|
177
177
|
"guest": "Sin nombre",
|
|
178
|
-
"settings": "Configuración de la cuenta",
|
|
179
178
|
"my_lists": "Mis listas",
|
|
180
179
|
"my_assets": "Mis activos",
|
|
181
|
-
"account": "
|
|
180
|
+
"account": "Configuración de la cuenta",
|
|
182
181
|
"activity": "Actividad",
|
|
183
182
|
"profile": "Perfil",
|
|
184
183
|
"view_profile": "Ver perfil",
|
|
185
184
|
"sign_in": "Iniciar sesión",
|
|
186
185
|
"sign_out": "Cerrar sesión",
|
|
187
|
-
"
|
|
186
|
+
"marketplace_authorizations": "Autorizaciones de Marketplace",
|
|
188
187
|
"jump_in": "Entrar"
|
|
189
188
|
},
|
|
190
189
|
"toasts": {
|
|
@@ -101,16 +101,15 @@
|
|
|
101
101
|
},
|
|
102
102
|
"user_menu": {
|
|
103
103
|
"guest": "Anonyme",
|
|
104
|
-
"settings": "Paramètres du compte",
|
|
105
104
|
"my_lists": "Mes listes",
|
|
106
105
|
"my_assets": "Mes actifs",
|
|
107
|
-
"account": "
|
|
106
|
+
"account": "Paramètres du compte",
|
|
108
107
|
"activity": "Activité",
|
|
109
108
|
"profile": "Profil",
|
|
110
109
|
"view_profile": "Voir le profil",
|
|
111
110
|
"sign_in": "Sign In",
|
|
112
111
|
"sign_out": "Sign out",
|
|
113
|
-
"
|
|
112
|
+
"marketplace_authorizations": "Autorisations de la Marketplace",
|
|
114
113
|
"jump_in": "Jump In"
|
|
115
114
|
},
|
|
116
115
|
"toasts": {
|
|
@@ -101,16 +101,15 @@
|
|
|
101
101
|
},
|
|
102
102
|
"user_menu": {
|
|
103
103
|
"guest": "名前なし",
|
|
104
|
-
"settings": "「アカウント設定",
|
|
105
104
|
"my_lists": "マイ・リスト",
|
|
106
105
|
"my_assets": "マイ資産",
|
|
107
|
-
"account": "
|
|
106
|
+
"account": "「アカウント設定",
|
|
108
107
|
"activity": "「アクティビティ",
|
|
109
108
|
"profile": "「プロフィール",
|
|
110
109
|
"view_profile": "「プロフィールを見る",
|
|
111
110
|
"sign_in": "「サインイン",
|
|
112
111
|
"sign_out": "「サインアウト",
|
|
113
|
-
"
|
|
112
|
+
"marketplace_authorizations": "マーケットプレイスの承認",
|
|
114
113
|
"jump_in": "ジャンプイン"
|
|
115
114
|
},
|
|
116
115
|
"toasts": {
|
|
@@ -101,16 +101,15 @@
|
|
|
101
101
|
},
|
|
102
102
|
"user_menu": {
|
|
103
103
|
"guest": "이름이 없습니다",
|
|
104
|
-
"settings": "계정 설정",
|
|
105
104
|
"my_lists": "내 목록",
|
|
106
105
|
"my_assets": "내 자산",
|
|
107
|
-
"account": "계정",
|
|
106
|
+
"account": "계정 설정",
|
|
108
107
|
"activity": "활동",
|
|
109
108
|
"profile": "프로필",
|
|
110
109
|
"view_profile": "프로필 보기",
|
|
111
110
|
"sign_in": "로그인",
|
|
112
111
|
"sign_out": "로그아웃",
|
|
113
|
-
"
|
|
112
|
+
"marketplace_authorizations": "마켓플레이스의 승인",
|
|
114
113
|
"jump_in": "점프 인"
|
|
115
114
|
},
|
|
116
115
|
"toasts": {
|
|
@@ -175,16 +175,15 @@
|
|
|
175
175
|
},
|
|
176
176
|
"user_menu": {
|
|
177
177
|
"guest": "未命名",
|
|
178
|
-
"settings": "账户设置",
|
|
179
178
|
"my_lists": "我的列表",
|
|
180
179
|
"my_assets": "我的资产",
|
|
181
|
-
"account": "
|
|
180
|
+
"account": "账户设置",
|
|
182
181
|
"activity": "活动",
|
|
183
182
|
"profile": "配置文件",
|
|
184
183
|
"view_profile": "查看简介",
|
|
185
184
|
"sign_in": "登录",
|
|
186
185
|
"sign_out": "签出",
|
|
187
|
-
"
|
|
186
|
+
"marketplace_authorizations": "市场的授权",
|
|
188
187
|
"jump_in": "跳入"
|
|
189
188
|
},
|
|
190
189
|
"toasts": {
|
|
@@ -39,9 +39,17 @@ export declare const changeNetwork: (wallet: Wallet) => import("typesafe-actions
|
|
|
39
39
|
wallet: Wallet;
|
|
40
40
|
}>;
|
|
41
41
|
export type ChangeNetworkAction = ReturnType<typeof changeNetwork>;
|
|
42
|
-
export declare const
|
|
43
|
-
export declare const
|
|
44
|
-
export
|
|
42
|
+
export declare const DISCONNECT_WALLET_REQUEST = "[Request] Disconnect Wallet";
|
|
43
|
+
export declare const DISCONNECT_WALLET_SUCCESS = "[Success] Disconnect Wallet";
|
|
44
|
+
export declare const DISCONNECT_WALLET_FAILURE = "[Failure] Disconnect Wallet";
|
|
45
|
+
export declare const disconnectWalletRequest: () => import("typesafe-actions/dist/types").EmptyAction<"[Request] Disconnect Wallet">;
|
|
46
|
+
export declare const disconnectWalletSuccess: () => import("typesafe-actions/dist/types").EmptyAction<"[Success] Disconnect Wallet">;
|
|
47
|
+
export declare const disconnectWalletFailure: (error: string) => import("typesafe-actions/dist/types").PayloadAction<"[Failure] Disconnect Wallet", {
|
|
48
|
+
error: string;
|
|
49
|
+
}>;
|
|
50
|
+
export type DisconnectWalletRequestAction = ReturnType<typeof disconnectWalletRequest>;
|
|
51
|
+
export type DisconnectWalletSuccessAction = ReturnType<typeof disconnectWalletSuccess>;
|
|
52
|
+
export type DisconnectWalletFailureAction = ReturnType<typeof disconnectWalletFailure>;
|
|
45
53
|
export declare const FETCH_WALLET_REQUEST = "[Request] Fetch Wallet";
|
|
46
54
|
export declare const FETCH_WALLET_SUCCESS = "[Success] Fetch Wallet";
|
|
47
55
|
export declare const FETCH_WALLET_FAILURE = "[Failure] Fetch Wallet";
|
|
@@ -15,8 +15,12 @@ export const CHANGE_ACCOUNT = 'Change Account';
|
|
|
15
15
|
export const changeAccount = (wallet) => action(CHANGE_ACCOUNT, { wallet });
|
|
16
16
|
export const CHANGE_NETWORK = 'Change Network';
|
|
17
17
|
export const changeNetwork = (wallet) => action(CHANGE_NETWORK, { wallet });
|
|
18
|
-
export const
|
|
19
|
-
export const
|
|
18
|
+
export const DISCONNECT_WALLET_REQUEST = '[Request] Disconnect Wallet';
|
|
19
|
+
export const DISCONNECT_WALLET_SUCCESS = '[Success] Disconnect Wallet';
|
|
20
|
+
export const DISCONNECT_WALLET_FAILURE = '[Failure] Disconnect Wallet';
|
|
21
|
+
export const disconnectWalletRequest = () => action(DISCONNECT_WALLET_REQUEST);
|
|
22
|
+
export const disconnectWalletSuccess = () => action(DISCONNECT_WALLET_SUCCESS);
|
|
23
|
+
export const disconnectWalletFailure = (error) => action(DISCONNECT_WALLET_FAILURE, { error });
|
|
20
24
|
export const FETCH_WALLET_REQUEST = '[Request] Fetch Wallet';
|
|
21
25
|
export const FETCH_WALLET_SUCCESS = '[Success] Fetch Wallet';
|
|
22
26
|
export const FETCH_WALLET_FAILURE = '[Failure] Fetch Wallet';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/wallet/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAKzC,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAChE,MAAM,CAAC,MAAM,sBAAsB,GAAG,0BAA0B,CAAA;AAEhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAA;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,EAAE,CACrD,MAAM,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;AAC5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAa,EAAE,EAAE,CACpD,MAAM,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;AAM3C,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAA;AAC9D,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAA;AAC9D,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAA;AAE9D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,YAA0B,EAAE,EAAE,CAChE,MAAM,CAAC,qBAAqB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,YAA0B,EAAE,EAAE,CAChE,MAAM,CAAC,qBAAqB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE,CACnD,MAAM,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAA;AAM1C,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAA;AAC9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CAC9C,MAAM,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;AAGpC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAA;AAC9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE,CAC9C,MAAM,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;AAGpC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/modules/wallet/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LoadingState } from '../loading/reducer';
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
import { Wallet } from './types';
|
|
4
|
-
import { ConnectWalletRequestAction, ConnectWalletSuccessAction, ConnectWalletFailureAction,
|
|
4
|
+
import { ConnectWalletRequestAction, ConnectWalletSuccessAction, ConnectWalletFailureAction, ChangeAccountAction, ChangeNetworkAction, EnableWalletRequestAction, EnableWalletSuccessAction, EnableWalletFailureAction, FetchWalletRequestAction, FetchWalletSuccessAction, FetchWalletFailureAction, SetAppChainIdAction, SwitchNetworkRequestAction, SwitchNetworkSuccessAction, SwitchNetworkFailureAction, DisconnectWalletSuccessAction, DisconnectWalletFailureAction, DisconnectWalletRequestAction } from './actions';
|
|
5
5
|
export type WalletState = {
|
|
6
6
|
data: Wallet | null;
|
|
7
7
|
loading: LoadingState;
|
|
@@ -9,5 +9,5 @@ export type WalletState = {
|
|
|
9
9
|
appChainId: ChainId | null;
|
|
10
10
|
};
|
|
11
11
|
export declare const INITIAL_STATE: WalletState;
|
|
12
|
-
export type WalletReducerAction = ConnectWalletRequestAction | ConnectWalletSuccessAction | ConnectWalletFailureAction | SwitchNetworkRequestAction | SwitchNetworkSuccessAction | SwitchNetworkFailureAction | EnableWalletRequestAction | EnableWalletSuccessAction | EnableWalletFailureAction |
|
|
12
|
+
export type WalletReducerAction = ConnectWalletRequestAction | ConnectWalletSuccessAction | ConnectWalletFailureAction | SwitchNetworkRequestAction | SwitchNetworkSuccessAction | SwitchNetworkFailureAction | EnableWalletRequestAction | EnableWalletSuccessAction | EnableWalletFailureAction | DisconnectWalletRequestAction | DisconnectWalletSuccessAction | DisconnectWalletFailureAction | ChangeAccountAction | ChangeNetworkAction | FetchWalletRequestAction | FetchWalletSuccessAction | FetchWalletFailureAction | SetAppChainIdAction;
|
|
13
13
|
export declare function walletReducer(state: WalletState | undefined, action: WalletReducerAction): WalletState;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { loadingReducer } from '../loading/reducer';
|
|
2
|
-
import { CONNECT_WALLET_REQUEST, CONNECT_WALLET_SUCCESS, CONNECT_WALLET_FAILURE,
|
|
2
|
+
import { CONNECT_WALLET_REQUEST, CONNECT_WALLET_SUCCESS, CONNECT_WALLET_FAILURE, CHANGE_ACCOUNT, CHANGE_NETWORK, ENABLE_WALLET_REQUEST, ENABLE_WALLET_SUCCESS, ENABLE_WALLET_FAILURE, FETCH_WALLET_REQUEST, FETCH_WALLET_SUCCESS, FETCH_WALLET_FAILURE, SET_APP_CHAIN_ID, SWITCH_NETWORK_REQUEST, SWITCH_NETWORK_SUCCESS, SWITCH_NETWORK_FAILURE, DISCONNECT_WALLET_SUCCESS, DISCONNECT_WALLET_REQUEST, DISCONNECT_WALLET_FAILURE } from './actions';
|
|
3
3
|
export const INITIAL_STATE = {
|
|
4
4
|
data: null,
|
|
5
5
|
loading: [],
|
|
@@ -10,6 +10,7 @@ export function walletReducer(state = INITIAL_STATE, action) {
|
|
|
10
10
|
switch (action.type) {
|
|
11
11
|
case FETCH_WALLET_REQUEST:
|
|
12
12
|
case ENABLE_WALLET_REQUEST:
|
|
13
|
+
case DISCONNECT_WALLET_REQUEST:
|
|
13
14
|
case CONNECT_WALLET_REQUEST: {
|
|
14
15
|
return {
|
|
15
16
|
...state,
|
|
@@ -40,6 +41,7 @@ export function walletReducer(state = INITIAL_STATE, action) {
|
|
|
40
41
|
error: null
|
|
41
42
|
};
|
|
42
43
|
}
|
|
44
|
+
case DISCONNECT_WALLET_FAILURE:
|
|
43
45
|
case FETCH_WALLET_FAILURE: {
|
|
44
46
|
return {
|
|
45
47
|
...state,
|
|
@@ -47,7 +49,6 @@ export function walletReducer(state = INITIAL_STATE, action) {
|
|
|
47
49
|
};
|
|
48
50
|
}
|
|
49
51
|
case SWITCH_NETWORK_FAILURE: {
|
|
50
|
-
console.log('action.payload.error: ', action.payload.error);
|
|
51
52
|
return {
|
|
52
53
|
...state,
|
|
53
54
|
error: action.payload.error,
|
|
@@ -77,9 +78,10 @@ export function walletReducer(state = INITIAL_STATE, action) {
|
|
|
77
78
|
data: action.payload.wallet
|
|
78
79
|
};
|
|
79
80
|
}
|
|
80
|
-
case
|
|
81
|
+
case DISCONNECT_WALLET_SUCCESS: {
|
|
81
82
|
return {
|
|
82
83
|
...state,
|
|
84
|
+
loading: loadingReducer(state.loading, action),
|
|
83
85
|
error: null,
|
|
84
86
|
data: null
|
|
85
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducer.js","sourceRoot":"","sources":["../../../src/modules/wallet/reducer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgB,MAAM,oBAAoB,CAAA;AAGjE,OAAO,EAIL,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"reducer.js","sourceRoot":"","sources":["../../../src/modules/wallet/reducer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { put, call, all, takeEvery, race, take, delay, select, fork } from 'redu
|
|
|
2
2
|
import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
3
|
import { connection } from 'decentraland-connect';
|
|
4
4
|
import { _getAppChainId, getConnectedProvider, isCucumberProvider, isValidChainId, _setAppChainId } from '../../lib/eth';
|
|
5
|
-
import { connectWalletSuccess, connectWalletFailure, CONNECT_WALLET_REQUEST, enableWalletFailure, enableWalletSuccess, connectWalletRequest, ENABLE_WALLET_REQUEST, ENABLE_WALLET_SUCCESS,
|
|
5
|
+
import { connectWalletSuccess, connectWalletFailure, CONNECT_WALLET_REQUEST, enableWalletFailure, enableWalletSuccess, connectWalletRequest, ENABLE_WALLET_REQUEST, ENABLE_WALLET_SUCCESS, DISCONNECT_WALLET_REQUEST, FETCH_WALLET_REQUEST, fetchWalletSuccess, fetchWalletFailure, fetchWalletRequest, FETCH_WALLET_SUCCESS, FETCH_WALLET_FAILURE, CONNECT_WALLET_SUCCESS, SWITCH_NETWORK_REQUEST, switchNetworkSuccess, switchNetworkFailure, SWITCH_NETWORK_SUCCESS, setAppChainId, disconnectWalletSuccess, disconnectWalletFailure } from './actions';
|
|
6
6
|
import { showToast } from '../toast';
|
|
7
7
|
import { getSwitchChainErrorToast } from '../toast/toasts';
|
|
8
8
|
import { getTransactionsApiUrl, setTransactionsApiUrl } from './utils';
|
|
@@ -10,6 +10,7 @@ import { switchProviderChainId } from './utils/switchProviderChainId';
|
|
|
10
10
|
import { buildWallet } from './utils/buildWallet';
|
|
11
11
|
import { ProviderType } from './types';
|
|
12
12
|
import { getAppChainId, isConnected } from './selectors';
|
|
13
|
+
import { isErrorWithMessage } from '../../lib';
|
|
13
14
|
// Patch Samsung's Cucumber provider send to support promises
|
|
14
15
|
const provider = window.ethereum;
|
|
15
16
|
export const SWITCH_NETWORK_TIMEOUT = 10000; // 10 seconds
|
|
@@ -44,7 +45,7 @@ export function* walletSaga() {
|
|
|
44
45
|
takeEvery(ENABLE_WALLET_REQUEST, handleEnableWalletRequest),
|
|
45
46
|
takeEvery(ENABLE_WALLET_SUCCESS, handleEnableWalletSuccess),
|
|
46
47
|
takeEvery(FETCH_WALLET_REQUEST, handleFetchWalletRequest),
|
|
47
|
-
takeEvery(
|
|
48
|
+
takeEvery(DISCONNECT_WALLET_REQUEST, handleDisconnectWalletRequest),
|
|
48
49
|
takeEvery(CONNECT_WALLET_SUCCESS, handleConnectWalletSuccess),
|
|
49
50
|
takeEvery(SWITCH_NETWORK_REQUEST, handleSwitchNetworkRequest),
|
|
50
51
|
takeEvery(SWITCH_NETWORK_SUCCESS, handleSwitchNetworkSuccess)
|
|
@@ -88,12 +89,13 @@ function* handleEnableWalletRequest(action) {
|
|
|
88
89
|
function* handleEnableWalletSuccess(_action) {
|
|
89
90
|
yield put(connectWalletRequest());
|
|
90
91
|
}
|
|
91
|
-
function*
|
|
92
|
+
function* handleDisconnectWalletRequest(_action) {
|
|
92
93
|
try {
|
|
93
|
-
yield call(
|
|
94
|
+
yield call([connection, 'disconnect']);
|
|
95
|
+
yield put(disconnectWalletSuccess());
|
|
94
96
|
}
|
|
95
97
|
catch (error) {
|
|
96
|
-
|
|
98
|
+
yield put(disconnectWalletFailure(isErrorWithMessage(error) ? error.message : 'Error disconnecting wallet'));
|
|
97
99
|
}
|
|
98
100
|
// stop polling wallet balances
|
|
99
101
|
polling = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,IAAI,EACJ,GAAG,EACH,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,MAAM,EACN,IAAI,EACL,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,cAAc,EACd,cAAc,EACf,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EAEtB,mBAAmB,EACnB,mBAAmB,EAEnB,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EAErB,
|
|
1
|
+
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare const getError: (state: any) => string | null;
|
|
|
8
8
|
export declare const isConnected: (state: any) => boolean;
|
|
9
9
|
export declare const isConnecting: (state: any) => boolean;
|
|
10
10
|
export declare const isEnabling: (state: any) => boolean;
|
|
11
|
+
export declare const isDisconnecting: (state: any) => boolean;
|
|
11
12
|
export declare const getAddress: (state: any) => string | undefined;
|
|
12
13
|
export declare const getChainId: (state: any) => ChainId | undefined;
|
|
13
14
|
export declare const getProviderType: (state: any) => import("@dcl/schemas").ProviderType | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Network } from '@dcl/schemas/dist/dapps/network';
|
|
2
2
|
import { isLoadingType } from '../loading/selectors';
|
|
3
|
-
import { CONNECT_WALLET_REQUEST, ENABLE_WALLET_REQUEST, SWITCH_NETWORK_REQUEST } from './actions';
|
|
3
|
+
import { CONNECT_WALLET_REQUEST, DISCONNECT_WALLET_REQUEST, ENABLE_WALLET_REQUEST, SWITCH_NETWORK_REQUEST } from './actions';
|
|
4
4
|
export const getState = state => state.wallet;
|
|
5
5
|
export const getData = (state) => getState(state).data;
|
|
6
6
|
export const getLoading = (state) => getState(state).loading;
|
|
@@ -8,6 +8,7 @@ export const getError = (state) => getState(state).error;
|
|
|
8
8
|
export const isConnected = (state) => getData(state) !== null;
|
|
9
9
|
export const isConnecting = (state) => isLoadingType(getLoading(state), CONNECT_WALLET_REQUEST);
|
|
10
10
|
export const isEnabling = (state) => isLoadingType(getLoading(state), ENABLE_WALLET_REQUEST);
|
|
11
|
+
export const isDisconnecting = (state) => isLoadingType(getLoading(state), DISCONNECT_WALLET_REQUEST);
|
|
11
12
|
export const getAddress = (state) => isConnected(state) ? getData(state).address : undefined;
|
|
12
13
|
export const getChainId = (state) => isConnected(state) ? getData(state).chainId : undefined;
|
|
13
14
|
export const getProviderType = (state) => isConnected(state) ? getData(state).providerType : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../src/modules/wallet/selectors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,WAAW,CAAA;AAGlB,MAAM,CAAC,MAAM,QAAQ,GAAgC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAA;AAC1E,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAA;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAA;AACjE,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAA;AAClE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CACzC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,sBAAsB,CAAC,CAAA;AAC1D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CACvC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,qBAAqB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"selectors.js","sourceRoot":"","sources":["../../../src/modules/wallet/selectors.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "21.0.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -21,10 +21,10 @@
|
|
|
21
21
|
"axios": "^0.21.1",
|
|
22
22
|
"date-fns": "^1.29.0",
|
|
23
23
|
"dcl-catalyst-client": "^21.1.0",
|
|
24
|
-
"decentraland-connect": "^
|
|
24
|
+
"decentraland-connect": "^7.0.0",
|
|
25
25
|
"decentraland-crypto-fetch": "^2.0.1",
|
|
26
26
|
"decentraland-transactions": "^2.6.0",
|
|
27
|
-
"decentraland-ui": "^
|
|
27
|
+
"decentraland-ui": "^6.1.1",
|
|
28
28
|
"ethers": "^5.6.8",
|
|
29
29
|
"events": "^3.3.0",
|
|
30
30
|
"flat": "^5.0.2",
|