decentraland-dapps 18.3.0 → 18.4.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/modules/toast/toasts/index.d.ts +3 -0
- package/dist/modules/toast/toasts/index.js +17 -0
- package/dist/modules/toast/toasts/index.js.map +1 -0
- package/dist/modules/translation/defaults/en.json +4 -0
- package/dist/modules/translation/defaults/zh.json +4 -0
- package/dist/modules/wallet/sagas.d.ts +1 -0
- package/dist/modules/wallet/sagas.js +14 -2
- package/dist/modules/wallet/sagas.js.map +1 -1
- package/dist/modules/wallet/utils/switchProviderChainId.js +8 -2
- package/dist/modules/wallet/utils/switchProviderChainId.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { getNetwork } from '@dcl/schemas/dist/dapps/chain-id';
|
|
3
|
+
import { ToastType } from 'decentraland-ui';
|
|
4
|
+
import { getNetworkName } from 'decentraland-ui/dist/lib/network';
|
|
5
|
+
import { t } from '../../translation/utils';
|
|
6
|
+
export function getSwitchChainErrorToast(chainId) {
|
|
7
|
+
return {
|
|
8
|
+
type: ToastType.ERROR,
|
|
9
|
+
title: t('@dapps.toasts.switch_network_error.title'),
|
|
10
|
+
body: (React.createElement("div", null, t('@dapps.toasts.switch_network_error.body', {
|
|
11
|
+
network: getNetworkName(getNetwork(chainId))
|
|
12
|
+
}))),
|
|
13
|
+
closable: true,
|
|
14
|
+
timeout: 30000
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/toast/toasts/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAW,UAAU,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,OAAO,EAAE,CAAC,EAAE,MAAM,yBAAyB,CAAA;AAE3C,MAAM,UAAU,wBAAwB,CAAC,OAAgB;IACvD,OAAO;QACL,IAAI,EAAE,SAAS,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,0CAA0C,CAAC;QACpD,IAAI,EAAE,CACJ,iCACG,CAAC,CAAC,yCAAyC,EAAE;YAC5C,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;SAC7C,CAAC,CACE,CACP;QACD,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,KAAK;KACf,CAAA;AACH,CAAC"}
|
|
@@ -210,6 +210,10 @@
|
|
|
210
210
|
"body": "Polygon Network <a>gas prices</a> are too high! Please wait and try again later, or switch your Network to Polygon and pay for the gas fee with MATIC."
|
|
211
211
|
}
|
|
212
212
|
},
|
|
213
|
+
"switch_network_error": {
|
|
214
|
+
"title": "Network switch error",
|
|
215
|
+
"body": "There was an error switching to {network}."
|
|
216
|
+
},
|
|
213
217
|
"switch_network": "Switch to {network}",
|
|
214
218
|
"learn_more": "Learn more"
|
|
215
219
|
},
|
|
@@ -210,6 +210,10 @@
|
|
|
210
210
|
"body": "多边形网络 <a>费用价格</a> 太高!请稍后重试,或将您的网络切换到 Polygon 并使用 MATIC 支付费用。"
|
|
211
211
|
}
|
|
212
212
|
},
|
|
213
|
+
"switch_network_error": {
|
|
214
|
+
"title": "网络交换机错误",
|
|
215
|
+
"body": "切换到 {network} 时出错。"
|
|
216
|
+
},
|
|
213
217
|
"switch_network": "切换到 {network}",
|
|
214
218
|
"learn_more": "了解更多"
|
|
215
219
|
},
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CreateWalletOptions, ProviderType } from './types';
|
|
2
|
+
export declare const SWITCH_NETWORK_TIMEOUT = 10000;
|
|
2
3
|
export declare function getAccount(providerType: ProviderType): Promise<string | null>;
|
|
3
4
|
export declare function walletSaga(): Generator<import("redux-saga/effects").ForkEffect<void> | import("redux-saga/effects").AllEffect<import("redux-saga/effects").ForkEffect<never>>, void, unknown>;
|
|
4
5
|
export declare function createWalletSaga(options: CreateWalletOptions): typeof walletSaga;
|
|
@@ -3,6 +3,8 @@ 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
5
|
import { connectWalletSuccess, connectWalletFailure, CONNECT_WALLET_REQUEST, enableWalletFailure, enableWalletSuccess, connectWalletRequest, ENABLE_WALLET_REQUEST, ENABLE_WALLET_SUCCESS, DISCONNECT_WALLET, FETCH_WALLET_REQUEST, fetchWalletSuccess, fetchWalletFailure, fetchWalletRequest, FETCH_WALLET_SUCCESS, FETCH_WALLET_FAILURE, CONNECT_WALLET_SUCCESS, SWITCH_NETWORK_REQUEST, switchNetworkSuccess, switchNetworkFailure, SWITCH_NETWORK_SUCCESS, setAppChainId } from './actions';
|
|
6
|
+
import { showToast } from '../toast';
|
|
7
|
+
import { getSwitchChainErrorToast } from '../toast/toasts';
|
|
6
8
|
import { getTransactionsApiUrl, setTransactionsApiUrl } from './utils';
|
|
7
9
|
import { switchProviderChainId } from './utils/switchProviderChainId';
|
|
8
10
|
import { buildWallet } from './utils/buildWallet';
|
|
@@ -10,6 +12,7 @@ import { ProviderType } from './types';
|
|
|
10
12
|
import { getAppChainId, isConnected } from './selectors';
|
|
11
13
|
// Patch Samsung's Cucumber provider send to support promises
|
|
12
14
|
const provider = window.ethereum;
|
|
15
|
+
export const SWITCH_NETWORK_TIMEOUT = 10000; // 10 seconds
|
|
13
16
|
let cucumberProviderSend;
|
|
14
17
|
if (isCucumberProvider()) {
|
|
15
18
|
const _send = provider.send;
|
|
@@ -126,8 +129,17 @@ function* handleSwitchNetworkRequest(action) {
|
|
|
126
129
|
}
|
|
127
130
|
else {
|
|
128
131
|
try {
|
|
129
|
-
yield
|
|
130
|
-
|
|
132
|
+
const { timeout } = yield race({
|
|
133
|
+
switched: call(switchProviderChainId, provider, chainId),
|
|
134
|
+
timeout: delay(SWITCH_NETWORK_TIMEOUT) // 10 seconds timeout
|
|
135
|
+
});
|
|
136
|
+
if (timeout) {
|
|
137
|
+
yield put(switchNetworkFailure(chainId, 'Error switching network: Operation timed out'));
|
|
138
|
+
yield put(showToast(getSwitchChainErrorToast(chainId)));
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
yield put(switchNetworkSuccess(chainId));
|
|
142
|
+
}
|
|
131
143
|
}
|
|
132
144
|
catch (switchError) {
|
|
133
145
|
yield put(switchNetworkFailure(chainId, switchError.message));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sagas.js","sourceRoot":"","sources":["../../../src/modules/wallet/sagas.ts"],"names":[],"mappings":"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
|
|
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,iBAAiB,EACjB,oBAAoB,EAEpB,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,EAGpB,sBAAsB,EACtB,sBAAsB,EAEtB,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EAEtB,aAAa,EACd,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAuB,YAAY,EAAU,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAExD,6DAA6D;AAC7D,MAAM,QAAQ,GAAI,MAAc,CAAC,QAAyC,CAAA;AAE1E,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAA,CAAC,aAAa;AAEzD,IAAI,oBAA2D,CAAA;AAC/D,IAAI,kBAAkB,EAAE,EAAE,CAAC;IACzB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC3B,oBAAoB,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QACxC,IAAI,CAAC;YACH,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CACtD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CACnC,CAAA;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAA0B;IACzD,IAAI,kBAAkB,EAAE,EAAE,CAAC;QACzB,MAAM,oBAAoB,CAAC,qBAAqB,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,UAAU,CAAC,OAAO,CAC1C,YAAY,KAAK,YAAY,CAAC,cAAc;QAC1C,CAAC,CAAC,YAAY,CAAC,iBAAiB;QAChC,CAAC,CAAC,YAAY,EAChB,cAAc,EAAE,CACjB,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,iCAAiC;AACjC,IAAI,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA,CAAC,aAAa;AAC/C,IAAI,OAAO,GAAG,KAAK,CAAA;AAEnB,MAAM,SAAS,CAAC,CAAC,UAAU;IACzB,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAChC,MAAM,GAAG,CAAC;QACR,SAAS,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;QAC7D,SAAS,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;QAC3D,SAAS,CAAC,qBAAqB,EAAE,yBAAyB,CAAC;QAC3D,SAAS,CAAC,oBAAoB,EAAE,wBAAwB,CAAC;QACzD,SAAS,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;QACpD,SAAS,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;QAC7D,SAAS,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;QAC7D,SAAS,CAAC,sBAAsB,EAAE,0BAA0B,CAAC;KAC9D,CAAC,CAAA;AACJ,CAAC;AAED,QAAQ,CAAC,CAAC,oBAAoB;IAC5B,oEAAoE;IACpE,MAAM,GAAG,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAA;QAC/B,MAAM,EACJ,OAAO,EACP,OAAO,EACR,GAGG,MAAM,IAAI,CAAC;YACb,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,CAAC;SACpC,CAAC,CAAA;QACF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,OAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACzC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAChD,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,MAAiC;IACnE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IACvC,IAAI,CAAC;QACH,MAAM,OAAO,GAAW,MAAM,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;QAE5D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACvD,CAAC;QACD,MAAM,GAAG,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,yBAAyB,CAAC,OAAkC;IACpE,MAAM,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAA;AACnC,CAAC;AAED,QAAQ,CAAC,CAAC,sBAAsB,CAAC,OAA+B;IAC9D,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;IACD,+BAA+B;IAC/B,OAAO,GAAG,KAAK,CAAA;AACjB,CAAC;AAED,QAAQ,CAAC,CAAC,wBAAwB,CAAC,OAAiC;IAClE,IAAI,CAAC;QACH,MAAM,UAAU,GAAY,MAAM,MAAM,CAAC,aAAa,CAAC,CAAA;QACvD,MAAM,MAAM,GAAW,MAAM,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAC1D,MAAM,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAA;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9C,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B;IAClC,uBAAuB;IACvB,IAAI,CAAC,OAAO,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,GAAG,IAAI,CAAA;QACd,OAAO,OAAO,EAAE,CAAC;YACf,MAAM,KAAK,CAAC,aAAa,CAAC,CAAA;YAC1B,MAAM,iBAAiB,GAAY,MAAM,MAAM,CAAC,WAAW,CAAC,CAAA;YAC5D,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B,CAAC,MAAkC;IACrE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;IAClC,MAAM,QAAQ,GAAoB,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAElE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,GAAG,CACP,oBAAoB,CAClB,OAAO,EACP,iDAAiD,CAClD,CACF,CAAA;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC;gBAC7B,QAAQ,EAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,EAAE,OAAO,CAAC;gBACxD,OAAO,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC,qBAAqB;aAC7D,CAAC,CAAA;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,GAAG,CACP,oBAAoB,CAClB,OAAO,EACP,8CAA8C,CAC/C,CACF,CAAA;gBACD,MAAM,GAAG,CAAC,SAAS,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACzD,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAA;YAC1C,CAAC;QACH,CAAC;QAAC,OAAO,WAAW,EAAE,CAAC;YACrB,MAAM,GAAG,CAAC,oBAAoB,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;AACH,CAAC;AAED,QAAQ,CAAC,CAAC,0BAA0B,CAAC,OAAmC;IACtE,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAA4B;IAC3D,IAAI,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC1C,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,CAAC,QAAQ,uBAAuB,MAAM,CAAC,MAAM,CACtE,OAAO,CACR,EAAE,CACJ,CAAA;IACH,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CACV,6HAA6H,CAC9H,CAAA;IACH,CAAC;IAED,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1B,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IACvC,CAAC;IAED,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;QACjC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;IACrD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CACV,iFAAiF,qBAAqB,EAAE,IAAI,CAC7G,CAAA;IACH,CAAC;IAED,OAAO,UAAU,CAAA;AACnB,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { connection } from 'decentraland-connect';
|
|
2
|
+
import { ProviderType } from '@dcl/schemas';
|
|
1
3
|
import { getProviderChainId } from './getProviderChainId';
|
|
2
|
-
import { getAddEthereumChainParameters } from
|
|
4
|
+
import { getAddEthereumChainParameters } from './getAddEthereumChainParameters';
|
|
3
5
|
import { JsonRPCInvalidResponseError } from './JsonRPCInvalidResponseError';
|
|
4
6
|
/**
|
|
5
7
|
* Change the provider's chain to a provided chain.
|
|
@@ -17,8 +19,12 @@ export async function switchProviderChainId(provider, chainId) {
|
|
|
17
19
|
return chainId;
|
|
18
20
|
}
|
|
19
21
|
catch (switchError) {
|
|
22
|
+
const isMetamaskDesktopError = switchError?.code === 4902;
|
|
23
|
+
const isWalletConnectError = switchError?.code === 5000 &&
|
|
24
|
+
connection.getConnectionData()?.providerType ===
|
|
25
|
+
ProviderType.WALLET_CONNECT_V2;
|
|
20
26
|
// This error code indicates that the chain has not been added to MetaMask.
|
|
21
|
-
if (provider &&
|
|
27
|
+
if (provider && (isMetamaskDesktopError || isWalletConnectError)) {
|
|
22
28
|
try {
|
|
23
29
|
await provider.request({
|
|
24
30
|
method: 'wallet_addEthereumChain',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchProviderChainId.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/switchProviderChainId.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"switchProviderChainId.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/switchProviderChainId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E;;;;;;GAMG;AAEH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,OAAO,CAAC;YACrB,MAAM,EAAE,4BAA4B;YACpC,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;SACnD,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAAC,OAAO,WAAW,EAAE,CAAC;QACrB,MAAM,sBAAsB,GAAG,WAAW,EAAE,IAAI,KAAK,IAAI,CAAC;QAC1D,MAAM,oBAAoB,GACxB,WAAW,EAAE,IAAI,KAAK,IAAI;YAC1B,UAAU,CAAC,iBAAiB,EAAE,EAAE,YAAY;gBAC1C,YAAY,CAAC,iBAAiB,CAAC;QACnC,2EAA2E;QAC3E,IAAI,QAAQ,IAAI,CAAC,sBAAsB,IAAI,oBAAoB,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACrB,MAAM,EAAE,yBAAyB;oBACjC,MAAM,EAAE,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC;iBACjD,CAAC,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAEtD,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;YAAC,OAAO,QAAQ,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC,CAAC,2HAA2H;aACxH,IAAI,WAAW,EAAE,OAAO,KAAK,qCAAqC,EAAE,CAAC;YACxE,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC7D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "18.
|
|
3
|
+
"version": "18.4.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"decentraland-connect": "^6.2.0",
|
|
24
24
|
"decentraland-crypto-fetch": "^2.0.1",
|
|
25
25
|
"decentraland-transactions": "^2.0.3",
|
|
26
|
-
"decentraland-ui": "^5.7.
|
|
26
|
+
"decentraland-ui": "^5.7.1",
|
|
27
27
|
"ethers": "^5.6.8",
|
|
28
28
|
"events": "^3.3.0",
|
|
29
29
|
"flat": "^5.0.2",
|