status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-03-02 15:31:04 +00:00
Code Issues Projects Releases Wiki Activity

fix(BC): Fixing the chains parsing on accepted connections

Browse Source 
+ Fixing crash due to exception raised in the Qt slot execution
This commit is contained in:
Alex Jbanca 2024-11-28 15:18:59 +02:00 committed by Alex Jbanca
parent 3673723a0c
commit 845fd4a445
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/modules/shared_modules/connector/controller.nim
View File

@ -113,7 +113,7 @@ QtObject:
proc parseSingleUInt(chainIDsString: string): uint =
try:
let chainIds = parseJson(chainIDsString)
if chainIds.kind == JArray and chainIds.len == 1 and chainIds[0].kind == JInt:
if chainIds.kind == JArray and chainIds.len > 0 and chainIds[0].kind == JInt:
return uint(chainIds[0].getInt())
else:
raise newException(ValueError, "Invalid JSON array format")
@ -121,9 +121,14 @@ QtObject:
raise newException(ValueError, "Failed to parse JSON")
proc approveConnection*(self: Controller, requestId: string, account: string, chainIDString: string): bool {.slot.} =
let chainId = parseSingleUInt(chainIDString)
result = self.service.approveDappConnect(requestId, account, chainId)
self.approveConnectResponse(requestId, not result)
try:
let chainId = parseSingleUInt(chainIDString)
result = self.service.approveDappConnect(requestId, account, chainId)
self.approveConnectResponse(requestId, not result)
except ValueError:
echo "Failed to parse chain ID"
self.approveConnectResponse(requestId, true)
proc rejectConnection*(self: Controller, requestId: string): bool {.slot.} =
result = self.service.rejectDappConnect(requestId)