status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

name utils import due to conflict

This commit is contained in:
Iuri Matias 2021-09-11 08:08:21 -04:00
parent 63f557d4af
commit 17f8abb250
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/chat/views/sticker_pack_list.nim
View File

@ -1,6 +1,6 @@
import NimQml, Tables, sequtils, sugar import NimQml, Tables, sequtils, sugar
import status/chat/stickers, ./sticker_list import status/chat/stickers, ./sticker_list
import status/utils import status/utils as status_utils
import status/types/[sticker] import status/types/[sticker]
type type
@ -55,9 +55,9 @@ QtObject:
of StickerPackRoles.Id: result = newQVariant(stickerPack.id) of StickerPackRoles.Id: result = newQVariant(stickerPack.id)
of StickerPackRoles.Name: result = newQVariant(stickerPack.name) of StickerPackRoles.Name: result = newQVariant(stickerPack.name)
of StickerPackRoles.Price: result = newQVariant(stickerPack.price.wei2Eth) of StickerPackRoles.Price: result = newQVariant(stickerPack.price.wei2Eth)
of StickerPackRoles.Preview: result = newQVariant(decodeContentHash(stickerPack.preview)) of StickerPackRoles.Preview: result = newQVariant(status_utils.decodeContentHash(stickerPack.preview))
of StickerPackRoles.Stickers: result = newQVariant(packInfo.stickers) of StickerPackRoles.Stickers: result = newQVariant(packInfo.stickers)
of StickerPackRoles.Thumbnail: result = newQVariant(decodeContentHash(stickerPack.thumbnail)) of StickerPackRoles.Thumbnail: result = newQVariant(status_utils.decodeContentHash(stickerPack.thumbnail))
of StickerPackRoles.Installed: result = newQVariant(packInfo.installed) of StickerPackRoles.Installed: result = newQVariant(packInfo.installed)
of StickerPackRoles.Bought: result = newQVariant(packInfo.bought) of StickerPackRoles.Bought: result = newQVariant(packInfo.bought)
of StickerPackRoles.Pending: result = newQVariant(packInfo.pending) of StickerPackRoles.Pending: result = newQVariant(packInfo.pending)
@ -76,7 +76,6 @@ QtObject:
StickerPackRoles.Pending.int: "pending" StickerPackRoles.Pending.int: "pending"
}.toTable }.toTable
proc findIndexById*(self: StickerPackList, packId: int, mustBeInstalled: bool = false): int {.slot.} = proc findIndexById*(self: StickerPackList, packId: int, mustBeInstalled: bool = false): int {.slot.} =
result = -1 result = -1
var idx = -1 var idx = -1
@ -119,8 +118,6 @@ QtObject:
self.dataChanged(topLeft, bottomRight, @[StickerPackRoles.Installed.int, StickerPackRoles.Pending.int]) self.dataChanged(topLeft, bottomRight, @[StickerPackRoles.Installed.int, StickerPackRoles.Pending.int])
proc getStickers*(self: StickerPackList): QVariant {.slot.} = proc getStickers*(self: StickerPackList): QVariant {.slot.} =
let packInfo = self.packs[self.packIdToRetrieve] let packInfo = self.packs[self.packIdToRetrieve]
result = newQVariant(packInfo.stickers) result = newQVariant(packInfo.stickers)
@ -135,13 +132,9 @@ QtObject:
of "author": result = stickerPack.author of "author": result = stickerPack.author
of "name": result = stickerPack.name of "name": result = stickerPack.name
of "price": result = $stickerPack.price.wei2Eth of "price": result = $stickerPack.price.wei2Eth
of "preview": result = decodeContentHash(stickerPack.preview) of "preview": result = status_utils.decodeContentHash(stickerPack.preview)
of "thumbnail": result = decodeContentHash(stickerPack.thumbnail) of "thumbnail": result = status_utils.decodeContentHash(stickerPack.thumbnail)
of "installed": result = $packInfo.installed of "installed": result = $packInfo.installed
of "bought": result = $packInfo.bought of "bought": result = $packInfo.bought
of "pending": result = $packInfo.pending of "pending": result = $packInfo.pending
else: result = "" else: result = ""