status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-16 16:47:24 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): Properly return token id value (#11792)

Browse Source
This commit is contained in:
Cuteivist 2023-08-04 14:24:28 +02:00 committed by GitHub
parent 44a59f6740
commit f8dd1dc811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/modules/main/wallet_section/activity/entry.nim
View File

@ -299,9 +299,16 @@ QtObject:
error "getTokenID: ActivityEntry is not a transaction" error "getTokenID: ActivityEntry is not a transaction"
return "" return ""
var tokenId: Option[TokenID]
if self.isInTransactionType(): if self.isInTransactionType():
return if self.metadata.tokenIn.isSome(): $self.metadata.tokenIn.unsafeGet().tokenId else: "" if self.metadata.tokenIn.isSome():
return if self.metadata.tokenOut.isSome(): $self.metadata.tokenOut.unsafeGet().tokenId else: "" tokenId = self.metadata.tokenIn.unsafeGet().tokenId
elif self.metadata.tokenOut.isSome():
tokenId = self.metadata.tokenOut.unsafeGet().tokenId
if tokenId.isSome():
return $stint.fromHex(UInt256, string(tokenId.unsafeGet()))
return ""
QtProperty[string] tokenID: QtProperty[string] tokenID:
read = getTokenID read = getTokenID

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 078f71a23582e4ffe5e52f75317db0b1ad756542 Subproject commit 1f510eae70f00c6daab8eed7395b7fbf4332755e