decentraland-dapps 28.2.1 → 28.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.
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ProviderType } from '@dcl/schemas/dist/dapps/provider-type';
|
|
2
2
|
export function isWeb2Wallet(wallet) {
|
|
3
|
-
return wallet.providerType === ProviderType.MAGIC ||
|
|
3
|
+
return (wallet.providerType === ProviderType.MAGIC ||
|
|
4
|
+
wallet.providerType === ProviderType.MAGIC_TEST ||
|
|
5
|
+
wallet.providerType === ProviderType.THIRDWEB);
|
|
4
6
|
}
|
|
5
7
|
//# sourceMappingURL=providerChecks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerChecks.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/providerChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAGpE,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,MAAM,CAAC,YAAY,KAAK,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"providerChecks.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/providerChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAGpE,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,CACL,MAAM,CAAC,YAAY,KAAK,YAAY,CAAC,KAAK;QAC1C,MAAM,CAAC,YAAY,KAAK,YAAY,CAAC,UAAU;QAC/C,MAAM,CAAC,YAAY,KAAK,YAAY,CAAC,QAAQ,CAC9C,CAAA;AACH,CAAC"}
|
|
@@ -39,8 +39,8 @@ export async function sendTransaction(...args) {
|
|
|
39
39
|
// If the connected provider is in the target network, use it to sign and send the tx
|
|
40
40
|
if (chainId === contract.chainId) {
|
|
41
41
|
const signer = targetNetworkProvider.getSigner();
|
|
42
|
-
//
|
|
43
|
-
if (connectedProvider.isMagic) {
|
|
42
|
+
// On web2 wallets (Magic/Thirdweb), prompt the user to accept or reject the transaction via the Web2TransactionModal
|
|
43
|
+
if (connectedProvider.isMagic || connectedProvider.isThirdweb) {
|
|
44
44
|
let transactionGasPrice = BigNumber.from(0);
|
|
45
45
|
try {
|
|
46
46
|
// Compute the cost of the transaction
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendTransaction.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/sendTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,QAAQ,EAAwB,MAAM,0BAA0B,CAAA;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAgB,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAwB,oBAAoB,EAAE,MAAM,SAAS,CAAA;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAA;AAE9C,MAAM,yBAAyB,GAAG,GAAG,EAAE;IACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,iBAAiB,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;YACjE,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAA;QACD,MAAM,cAAc,GAAG,GAAG,EAAE;YAC1B,iBAAiB,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;YACjE,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAA;QAChD,CAAC,CAAA;QACD,iBAAiB,CAAC,WAAW,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;QAC1E,iBAAiB,CAAC,WAAW,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAC5E,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAyBD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAG,IAAW;IAClD,MAAM,CAAC,QAAQ,EAAE,2CAA2C,EAAE,GAAG,iBAAiB,CAAC,GAAG,IAAgD,CAAA;IAEtI,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,EAAE,CAAA;QACtD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;QAC3C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,CAAA;QAE3D,MAAM,qBAAqB,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE9E,MAAM,gBAAgB,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAA;QAE5F,gCAAgC;QAChC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,2CAA2C,KAAK,UAAU;YACzF,CAAC,CAAC,2CAA2C,CAAC,gBAAgB,CAAC,mBAAmB,CAAC;YACnF,CAAC,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,2CAA2C,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAA;QAE5G,qFAAqF;QACrF,IAAI,OAAO,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,EAAE,CAAA;YAChD,
|
|
1
|
+
{"version":3,"file":"sendTransaction.js","sourceRoot":"","sources":["../../../../src/modules/wallet/utils/sendTransaction.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decentraland-dapps",
|
|
3
|
-
"version": "28.
|
|
3
|
+
"version": "28.4.0",
|
|
4
4
|
"description": "Common modules for Decentraland dApps",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.js",
|
|
@@ -47,11 +47,11 @@
|
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"@dcl/crypto": "^3.3.1",
|
|
50
|
-
"@dcl/schemas": "^
|
|
50
|
+
"@dcl/schemas": "^25.1.0",
|
|
51
51
|
"@dcl/ui-env": "^2.0.0",
|
|
52
52
|
"decentraland-connect": "^12.0.0",
|
|
53
53
|
"decentraland-ui": "^7.1.0",
|
|
54
|
-
"decentraland-ui2": "^1.3.
|
|
54
|
+
"decentraland-ui2": "^1.3.10",
|
|
55
55
|
"ethers": "^5.7.2",
|
|
56
56
|
"history": "^4.10.1",
|
|
57
57
|
"react": "^18.0.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@dcl/crypto": "^3.3.1",
|
|
66
66
|
"@dcl/eslint-config": "^3.1.0",
|
|
67
|
-
"@dcl/schemas": "^
|
|
67
|
+
"@dcl/schemas": "^25.1.0",
|
|
68
68
|
"@dcl/ui-env": "^2.0.0",
|
|
69
69
|
"@swc/core": "1.10.7",
|
|
70
70
|
"@swc/jest": "0.2.37",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"@typescript-eslint/parser": "8.52.0",
|
|
89
89
|
"decentraland-connect": "^12.0.0",
|
|
90
90
|
"decentraland-ui": "^7.1.0",
|
|
91
|
-
"decentraland-ui2": "1.3.
|
|
91
|
+
"decentraland-ui2": "1.3.10",
|
|
92
92
|
"eslint": "9.39.2",
|
|
93
93
|
"eslint-config-prettier": "10.1.8",
|
|
94
94
|
"eslint-import-resolver-typescript": "4.4.4",
|