Skip to content

Commit 5b6e4dd

Browse files
B0Y3R-AVAB0Y3R-AVA
authored
Boyer/fix copy and explorer link on optimistic txs (#3507)
1 parent 5b9af49 commit 5b6e4dd

File tree

5 files changed

+57
-40
lines changed

5 files changed

+57
-40
lines changed

‎packages/core-mobile/app/new/common/hooks/send/useEVMSend.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ const useEVMSend: SendAdapterEVM = ({
6363
toAddress: addressToSend,
6464
amount: amount?.toSubUnit(),
6565
context: {
66-
[RequestContext.NON_CONTRACT_RECIPIENT_ADDRESS]: addressToSend
66+
[RequestContext.NON_CONTRACT_RECIPIENT_ADDRESS]: addressToSend,
67+
[RequestContext.SHOULD_RETRY]: !isGaslessBlocked
6768
}
6869
})
6970
} finally {
@@ -77,7 +78,8 @@ const useEVMSend: SendAdapterEVM = ({
7778
provider,
7879
setIsSending,
7980
request,
80-
amount
81+
amount,
82+
isGaslessBlocked
8183
])
8284

8385
const handleError = useCallback(

‎packages/core-mobile/app/new/features/approval/screens/ApprovalScreen/ApprovalScreen.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,13 @@ const ApprovalScreen = ({
185185
signingData.type !== RpcMethod.ETH_SEND_TRANSACTION
186186
)
187187
return
188+
189+
// Skip validation if gasless is enabled and available
190+
if (gaslessEnabled && shouldShowGaslessSwitch) {
191+
setAmountError(undefined)
192+
return
193+
}
194+
188195
const ethSendTx = signingData.data
189196

190197
try {
@@ -207,7 +214,15 @@ const ApprovalScreen = ({
207214
setAmountError(SendErrorMessage.UNKNOWN_ERROR)
208215
}
209216
}
210-
}, [signingData, network, maxFeePerGas, nativeToken, gasLimit])
217+
}, [
218+
signingData,
219+
network?.networkToken,
220+
nativeToken,
221+
gaslessEnabled,
222+
shouldShowGaslessSwitch,
223+
gasLimit,
224+
maxFeePerGas
225+
])
211226

212227
const handleFeesChange = useCallback((fees: Eip1559Fees) => {
213228
setGasLimit(fees.gasLimit)

‎packages/core-mobile/app/vmModule/ApprovalController/ApprovalController.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ApprovalController implements VmModuleApprovalController {
4545
onTransactionPending({
4646
txHash: _txHash,
4747
request,
48-
explorerLink
48+
explorerLink: _explorerLink
4949
}: {
5050
txHash: string
5151
request: RpcRequest
@@ -62,7 +62,7 @@ class ApprovalController implements VmModuleApprovalController {
6262
request.context?.[RequestContext.CONFETTI_DISABLED]
6363

6464
transactionSnackbar.success({
65-
explorerLink
65+
message: 'Transaction sent'
6666
})
6767

6868
if (!confettiDisabled) {

‎packages/core-mobile/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@
2424
"appium:smokeAndroid": "IS_SMOKE=true PLATFORM=android wdio run ./e2e-appium/wdio.conf.ts --mochaOpts.grep='\\[(s|S)moke\\]'"
2525
},
2626
"dependencies": {
27-
"@avalabs/avalanche-module": "3.1.2",
27+
"@avalabs/avalanche-module": "3.1.3",
2828
"@avalabs/avalanchejs": "5.1.0-alpha.2",
29-
"@avalabs/bitcoin-module": "3.1.2",
29+
"@avalabs/bitcoin-module": "3.1.3",
3030
"@avalabs/bridge-unified": "4.3.0",
3131
"@avalabs/core-bridge-sdk": "3.1.0-alpha.69",
3232
"@avalabs/core-chains-sdk": "3.1.0-alpha.69",
3333
"@avalabs/core-coingecko-sdk": "3.1.0-alpha.69",
3434
"@avalabs/core-gasless-sdk": "3.1.0-alpha.69",
3535
"@avalabs/core-utils-sdk": "3.1.0-alpha.69",
3636
"@avalabs/core-wallets-sdk": "3.1.0-alpha.69",
37-
"@avalabs/evm-module": "3.1.2",
37+
"@avalabs/evm-module": "3.1.3",
3838
"@avalabs/glacier-sdk": "3.1.0-alpha.69",
3939
"@avalabs/k2-alpine": "workspace:*",
40-
"@avalabs/svm-module": "3.1.2",
40+
"@avalabs/svm-module": "3.1.3",
4141
"@avalabs/types": "3.1.0-alpha.71",
42-
"@avalabs/vm-module-types": "3.1.2",
42+
"@avalabs/vm-module-types": "3.1.3",
4343
"@babel/runtime": "7.25.7",
4444
"@bitcoinerlab/secp256k1": "1.2.0",
4545
"@blockaid/client": "0.48.0",

‎yarn.lock‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,9 @@ __metadata:
336336
languageName: node
337337
linkType: hard
338338

339-
"@avalabs/avalanche-module@npm:3.1.2":
340-
version: 3.1.2
341-
resolution: "@avalabs/avalanche-module@npm:3.1.2"
339+
"@avalabs/avalanche-module@npm:3.1.3":
340+
version: 3.1.3
341+
resolution: "@avalabs/avalanche-module@npm:3.1.3"
342342
dependencies:
343343
"@avalabs/avalanchejs": 5.1.0-alpha.2
344344
"@avalabs/core-chains-sdk": 3.1.0-alpha.72
@@ -348,12 +348,12 @@ __metadata:
348348
"@avalabs/core-wallets-sdk": 3.1.0-alpha.72
349349
"@avalabs/glacier-sdk": 3.1.0-alpha.72
350350
"@avalabs/types": 3.1.0-alpha.72
351-
"@avalabs/vm-module-types": 3.1.2
351+
"@avalabs/vm-module-types": 3.1.3
352352
"@metamask/rpc-errors": 6.3.0
353353
big.js: 6.2.1
354354
bn.js: 5.2.1
355355
zod: 3.23.8
356-
checksum: c4b37fa6a93a397a737071495b21d35d06d004b54db23cda88d5d548c9a5c1d1a0466a82f1a62410a23ce773a380a0518e089e6ba6e1e71879eb9eddcc260dda
356+
checksum: a44f35cd293d3d341d5309e933a368c95517392da7322b01d96eae2638bce89ea4f3aacc01d427690db295903c019717cd19692ddd163e70ba8b93441f89a440
357357
languageName: node
358358
linkType: hard
359359

@@ -370,20 +370,20 @@ __metadata:
370370
languageName: node
371371
linkType: hard
372372

373-
"@avalabs/bitcoin-module@npm:3.1.2":
374-
version: 3.1.2
375-
resolution: "@avalabs/bitcoin-module@npm:3.1.2"
373+
"@avalabs/bitcoin-module@npm:3.1.3":
374+
version: 3.1.3
375+
resolution: "@avalabs/bitcoin-module@npm:3.1.3"
376376
dependencies:
377377
"@avalabs/core-coingecko-sdk": 3.1.0-alpha.72
378378
"@avalabs/core-utils-sdk": 3.1.0-alpha.72
379379
"@avalabs/core-wallets-sdk": 3.1.0-alpha.72
380-
"@avalabs/vm-module-types": 3.1.2
380+
"@avalabs/vm-module-types": 3.1.3
381381
"@metamask/rpc-errors": 6.3.0
382382
big.js: 6.2.1
383383
bitcoinjs-lib: 5.2.0
384384
bn.js: 5.2.1
385385
zod: 3.23.8
386-
checksum: edfcbae2fc5cae006566a28d2b626e8a77e7ee8bcbecb6918d5f178af09aa89627a3638a0b906c24106b589330bbf0489d815b66638e4364f64acd07d07312c2
386+
checksum: 3bc40ecb438153146ede2ac6dc9347b6ea20bb5c0fcd99a3573790f8e361f01c79e18b6445262a92eeabbb38e0087e5fa787fe5d2013d4870464f39c28acf49c
387387
languageName: node
388388
linkType: hard
389389

@@ -488,23 +488,23 @@ __metadata:
488488
version: 0.0.0-use.local
489489
resolution: "@avalabs/core-mobile@workspace:packages/core-mobile"
490490
dependencies:
491-
"@avalabs/avalanche-module": 3.1.2
491+
"@avalabs/avalanche-module": 3.1.3
492492
"@avalabs/avalanchejs": 5.1.0-alpha.2
493-
"@avalabs/bitcoin-module": 3.1.2
493+
"@avalabs/bitcoin-module": 3.1.3
494494
"@avalabs/bridge-unified": 4.3.0
495495
"@avalabs/core-bridge-sdk": 3.1.0-alpha.69
496496
"@avalabs/core-chains-sdk": 3.1.0-alpha.69
497497
"@avalabs/core-coingecko-sdk": 3.1.0-alpha.69
498498
"@avalabs/core-gasless-sdk": 3.1.0-alpha.69
499499
"@avalabs/core-utils-sdk": 3.1.0-alpha.69
500500
"@avalabs/core-wallets-sdk": 3.1.0-alpha.69
501-
"@avalabs/evm-module": 3.1.2
501+
"@avalabs/evm-module": 3.1.3
502502
"@avalabs/glacier-sdk": 3.1.0-alpha.69
503503
"@avalabs/k2-alpine": "workspace:*"
504-
"@avalabs/svm-module": 3.1.2
504+
"@avalabs/svm-module": 3.1.3
505505
"@avalabs/tsconfig-mobile": "workspace:*"
506506
"@avalabs/types": 3.1.0-alpha.71
507-
"@avalabs/vm-module-types": 3.1.2
507+
"@avalabs/vm-module-types": 3.1.3
508508
"@babel/core": 7.28.0
509509
"@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6
510510
"@babel/plugin-syntax-object-rest-spread": 7.8.3
@@ -894,9 +894,9 @@ __metadata:
894894
languageName: node
895895
linkType: hard
896896

897-
"@avalabs/evm-module@npm:3.1.2":
898-
version: 3.1.2
899-
resolution: "@avalabs/evm-module@npm:3.1.2"
897+
"@avalabs/evm-module@npm:3.1.3":
898+
version: 3.1.3
899+
resolution: "@avalabs/evm-module@npm:3.1.3"
900900
dependencies:
901901
"@avalabs/core-chains-sdk": 3.1.0-alpha.72
902902
"@avalabs/core-coingecko-sdk": 3.1.0-alpha.72
@@ -905,7 +905,7 @@ __metadata:
905905
"@avalabs/core-wallets-sdk": 3.1.0-alpha.72
906906
"@avalabs/glacier-sdk": 3.1.0-alpha.72
907907
"@avalabs/types": 3.1.0-alpha.72
908-
"@avalabs/vm-module-types": 3.1.2
908+
"@avalabs/vm-module-types": 3.1.3
909909
"@blockaid/client": 0.48.0
910910
"@metamask/rpc-errors": 6.3.0
911911
"@openzeppelin/contracts": 4.9.6
@@ -915,7 +915,7 @@ __metadata:
915915
zod: 3.23.8
916916
peerDependencies:
917917
ethers: 6.13.5
918-
checksum: 6a7437d4c6b0c4f8cb62ec3d084e7bae4cf1669b2661ffc7dac22940fee01acc05e60491d7528ef270afa25214ab045a5523d629e81235d76fc247f2202105e4
918+
checksum: b8ddfe376a21f3def024e3b9476b139d5ae1048108df570bd3077b5a5680a64abc7dc1ba38da22de9a1af742c456097e4951cd3a28e945d057ad2cec8faa92c4
919919
languageName: node
920920
linkType: hard
921921

@@ -1028,15 +1028,15 @@ __metadata:
10281028
languageName: unknown
10291029
linkType: soft
10301030

1031-
"@avalabs/svm-module@npm:3.1.2":
1032-
version: 3.1.2
1033-
resolution: "@avalabs/svm-module@npm:3.1.2"
1031+
"@avalabs/svm-module@npm:3.1.3":
1032+
version: 3.1.3
1033+
resolution: "@avalabs/svm-module@npm:3.1.3"
10341034
dependencies:
10351035
"@avalabs/core-chains-sdk": 3.1.0-alpha.72
10361036
"@avalabs/core-coingecko-sdk": 3.1.0-alpha.72
10371037
"@avalabs/core-utils-sdk": 3.1.0-alpha.72
10381038
"@avalabs/core-wallets-sdk": 3.1.0-alpha.72
1039-
"@avalabs/vm-module-types": 3.1.2
1039+
"@avalabs/vm-module-types": 3.1.3
10401040
"@blockaid/client": 0.48.0
10411041
"@metamask/rpc-errors": 6.3.0
10421042
"@scure/base": 1.2.4
@@ -1047,7 +1047,7 @@ __metadata:
10471047
"@wallet-standard/base": 1.1.0
10481048
"@wallet-standard/features": 1.1.0
10491049
zod: 3.23.8
1050-
checksum: 32a421aab09a34f726657c94375721613e04feb2655b06c88594bb0fa9b78655d8a094729d3ff43375a9c4ac23ec523d5f1880fe303f22a59b4ad97c6e90a4dd
1050+
checksum: 807ee9f3c97ac194293f693e0f9a2e09d845653f241692a684f7b013b25632259f27a83692c7ffb4624f70d13a75274da61b088b1106471b09bb02cf3f10d398
10511051
languageName: node
10521052
linkType: hard
10531053

@@ -1064,9 +1064,9 @@ __metadata:
10641064
languageName: node
10651065
linkType: hard
10661066

1067-
"@avalabs/vm-module-types@npm:3.1.2":
1068-
version: 3.1.2
1069-
resolution: "@avalabs/vm-module-types@npm:3.1.2"
1067+
"@avalabs/vm-module-types@npm:3.1.3":
1068+
version: 3.1.3
1069+
resolution: "@avalabs/vm-module-types@npm:3.1.3"
10701070
dependencies:
10711071
"@avalabs/core-wallets-sdk": 3.1.0-alpha.72
10721072
"@avalabs/glacier-sdk": 3.1.0-alpha.72
@@ -1077,7 +1077,7 @@ __metadata:
10771077
zod: 3.23.8
10781078
peerDependencies:
10791079
ethers: 6.13.5
1080-
checksum: 611992af56d3c11fdbf9b1459314538d08af911b8d874c97f1c991b20f2267383092927bc5ad18bfd4ff85d5a231b62cf7b4b312740ab5efa4e8bf0ff94813ff
1080+
checksum: 119884fc463fabe019277b5c20c1f6931ee65f9cb5b345754527bdf14ada4dd875f679659f26afe757ea65a4d48ef44c455b6a521ee45ba868f775ef85ee1955
10811081
languageName: node
10821082
linkType: hard
10831083

@@ -34242,7 +34242,7 @@ react-native-webview@ava-labs/react-native-webview:
3424234242
peerDependencies:
3424334243
react: "*"
3424434244
react-native: "*"
34245-
checksum: e08d1254d04f3074970b63cdf0a363d6b189009270d457e868a26ef534addd69b320b85bef2a22e4eddb79006751bded431b56aaf2baf41976a6d0a5a2a2b91e
34245+
checksum: 57322e733d20b38881da9514a1ebb03a24a2457ed59683e4f714630c2a0ab29eb9981ad9acb02d7b7b32d7a0f5c02791146fc23c13a39c8254f7d0437844dcb4
3424634246
languageName: node
3424734247
linkType: hard
3424834248

0 commit comments

Comments
 (0)