Revert "feat: add error management to the collectibles"

This reverts commit 9eaf0a2d90.

src/app/wallet/view.nim

@@ -285,79 +285,37 @@ QtObject:
       $(%*{
         "address": address,
         "collectibleType": status_collectibles.CRYPTOKITTY,
-        "collectiblesOrError": status_collectibles.getCryptoKitties(address)
+        "collectibles": status_collectibles.getCryptoKitties(address)
       })
     spawnAndSend(self, "setCollectiblesResult") do:
       $(%*{
         "address": address,
         "collectibleType": status_collectibles.KUDO,
-        "collectiblesOrError": status_collectibles.getKudos(address)
+        "collectibles": status_collectibles.getKudos(address)
       })
     spawnAndSend(self, "setCollectiblesResult") do:
       $(%*{
         "address": address,
         "collectibleType": status_collectibles.ETHERMON,
-        "collectiblesOrError": status_collectibles.getEthermons(address)
+        "collectibles": status_collectibles.getEthermons(address)
       })
 
   proc setCollectiblesResult(self: WalletView, collectiblesJSON: string) {.slot.} =
     let collectibleData = parseJson(collectiblesJSON)
     let address = collectibleData["address"].getStr
     
-    var collectibles: JSONNode
-    try:
-      collectibles = parseJson(collectibleData["collectiblesOrError"].getStr)
-    except Exception as e:
-      # We failed parsing, this means the result is an error string
-      self.currentCollectiblesLists.setErrorByType(
-        collectibleData["collectibleType"].getStr,
-        $collectibleData["collectiblesOrError"]
-      )
-      return
-
     # TODO Add the collectibleData to the Wallet account
     # let index = self.accounts.getAccountindexByAddress(address)
     # if index == -1: return
     # self.accounts.getAccount(index).collectiblesLists = collectiblesList
     if address == self.currentAccount.address:
       # Add CollectibleListJSON to the right list
+      # TODO check if instead we need to set an error
       self.currentCollectiblesLists.setCollectiblesJSONByType(
         collectibleData["collectibleType"].getStr,
-        $collectibles
+        $collectibleData["collectibles"]
       )
 
-  proc reloadCollectible*(self: WalletView, collectibleType: string) {.slot.} =
-    let address = self.currentAccount.address
-    # TODO find a cooler way to do this
-    case collectibleType:
-      of CRYPTOKITTY:
-        spawnAndSend(self, "setCollectiblesResult") do:
-          $(%*{
-            "address": address,
-            "collectibleType": status_collectibles.CRYPTOKITTY,
-            "collectiblesOrError": status_collectibles.getCryptoKitties(address)
-          })
-      of KUDO:
-        spawnAndSend(self, "setCollectiblesResult") do:
-          $(%*{
-            "address": address,
-            "collectibleType": status_collectibles.KUDO,
-            "collectiblesOrError": status_collectibles.getKudos(address)
-          })
-      of ETHERMON:
-        spawnAndSend(self, "setCollectiblesResult") do:
-          $(%*{
-            "address": address,
-            "collectibleType": status_collectibles.ETHERMON,
-            "collectiblesOrError": status_collectibles.getEthermons(address)
-          })
-      else:
-        error "Unrecognized collectible"
-        return
-
-    self.currentCollectiblesLists.setLoadingByType(collectibleType, 1)
-
-
   proc loadingTrxHistory*(self: WalletView, isLoading: bool) {.signal.}
 
   proc loadTransactionsForAccount*(self: WalletView, address: string) {.slot.} =

src/app/wallet/views/collectibles_list.nim

@@ -27,41 +27,13 @@ QtObject:
     result.collectibleLists = @[]
     result.setup
 
-  proc setLoadingByType*(self: CollectiblesList, collectibleType: string, loading: int) =
-    var i = 0
-    for collectibleList in self.collectibleLists:
-      if collectibleList.collectibleType == collectibleType:
-        collectibleList.loading = loading
-        let topLeft = self.createIndex(i, 0, nil)
-        let bottomRight = self.createIndex(i, 0, nil)
-        self.dataChanged(topLeft, bottomRight, @[CollectiblesRoles.Loading.int])
-        break
-      i = i + 1
-
   proc setCollectiblesJSONByType*(self: CollectiblesList, collectibleType: string, collectiblesJSON: string) =
-    var i = 0
     for collectibleList in self.collectibleLists:
       if collectibleList.collectibleType == collectibleType:
         collectibleList.collectiblesJSON = collectiblesJSON
         collectibleList.loading = 0
-        collectibleList.error = ""
+        self.forceUpdate()
-        let topLeft = self.createIndex(i, 0, nil)
-        let bottomRight = self.createIndex(i, 0, nil)
-        self.dataChanged(topLeft, bottomRight, @[CollectiblesRoles.Loading.int, CollectiblesRoles.CollectiblesJSON.int, CollectiblesRoles.Error.int])
         break
-      i = i + 1
-
-  proc setErrorByType*(self: CollectiblesList, collectibleType: string, error: string) =
-    var i = 0
-    for collectibleList in self.collectibleLists:
-      if collectibleList.collectibleType == collectibleType:
-        collectibleList.error = error
-        collectibleList.loading = 0
-        let topLeft = self.createIndex(i, 0, nil)
-        let bottomRight = self.createIndex(i, 0, nil)
-        self.dataChanged(topLeft, bottomRight, @[CollectiblesRoles.Loading.int, CollectiblesRoles.Error.int])
-        break
-      i = i + 1
 
   method rowCount(self: CollectiblesList, index: QModelIndex = nil): int =
     return self.collectibleLists.len

src/status/wallet/collectibles.nim

@@ -58,9 +58,8 @@ proc tokensOfOwnerByIndex(contract: Contract, address: EthAddress): seq[int] =
     result.add(token)
     index = index + 1
 
-proc getCryptoKitties*(address: EthAddress): string =
+proc getCryptoKitties*(address: EthAddress): seq[Collectible] =
-  var cryptokitties: seq[Collectible]
+  result = @[]
-  cryptokitties = @[]
   try:
     # TODO handle testnet -- does this API exist in testnet??
     # TODO handle offset (recursive method?)
@@ -81,7 +80,7 @@ proc getCryptoKitties*(address: EthAddress): string =
           finalId = $id
         if (not (name.kind == JNull)):
           finalName = $name
-        cryptokitties.add(Collectible(id: finalId,
+        result.add(Collectible(id: finalId,
         name: finalName,
         image: kitty["image_url_png"].str,
         collectibleType: CRYPTOKITTY,
@@ -91,25 +90,21 @@ proc getCryptoKitties*(address: EthAddress): string =
         error "Error with this individual cat", msg = e2.msg, cat = kitty
   except Exception as e:
     error "Error getting Cryptokitties", msg = e.msg
-    return e.msg
-  
-  return $(%*cryptokitties)
 
-proc getCryptoKitties*(address: string): string =
+proc getCryptoKitties*(address: string): seq[Collectible] =
   let eth_address = parseAddress(address)
   result = getCryptoKitties(eth_address)
 
-proc getEthermons*(address: EthAddress): string =
+proc getEthermons*(address: EthAddress): seq[Collectible] =
+  result = @[]
   try:
-    var ethermons: seq[Collectible]
-    ethermons = @[]
     let contract = getContract("ethermon")
     if contract == nil: return
 
     let tokens = tokensOfOwnerByIndex(contract, address)
 
     if (tokens.len == 0):
-      return $(%*ethermons)
+      return result
 
     let tokensJoined = strutils.join(tokens, ",")
     let url = fmt"https://www.ethermon.io/api/monster/get_data?monster_ids={tokensJoined}"
@@ -121,40 +116,36 @@ proc getEthermons*(address: EthAddress): string =
     var i = 0
     for monsterKey in json.keys(monsters):
       let monster = monsters[monsterKey]
-      ethermons.add(Collectible(id: $tokens[i],
+      result.add(Collectible(id: $tokens[i],
       name: monster["class_name"].str,
       image: monster["image"].str,
       collectibleType: ETHERMON,
       description: "",
       externalUrl: ""))
       i = i + 1
-        
-    return $(%*ethermons)
   except Exception as e:
     error "Error getting Ethermons", msg = e.msg
-    result = e.msg
 
-proc getEthermons*(address: string): string =
+proc getEthermons*(address: string): seq[Collectible] =
   let eth_address = parseAddress(address)
   result = getEthermons(eth_address)
 
-proc getKudos*(address: EthAddress): string =
+proc getKudos*(address: EthAddress): seq[Collectible] =
+  result = @[]
   try:
-    var kudos: seq[Collectible]
-    kudos = @[]
     let contract = getContract("kudos")
     if contract == nil: return
     
     let tokens = tokensOfOwnerByIndex(contract, address)
 
     if (tokens.len == 0):
-      return $(%*kudos)
+      return result
 
     for token in tokens:
       let url =  getTokenUri(contract, token.u256)
 
       if (url == ""):
-        return  $(%*kudos)
+        return result
 
       let client = newHttpClient()
       client.headers = newHttpHeaders({ "Content-Type": "application/json" })
@@ -162,18 +153,15 @@ proc getKudos*(address: EthAddress): string =
       let response = client.request(url)
       let kudo = parseJson(response.body)
 
-      kudos.add(Collectible(id: $token,
+      result.add(Collectible(id: $token,
       name: kudo["name"].str,
       image: kudo["image"].str,
       collectibleType: KUDO,
       description: kudo["description"].str,
       externalUrl: kudo["external_url"].str))
-
-      return $(%*kudos)
   except Exception as e:
     error "Error getting Kudos", msg = e.msg
-    result = e.msg
 
-proc getKudos*(address: string): string =
+proc getKudos*(address: string): seq[Collectible] =
   let eth_address = parseAddress(address)
   result = getKudos(eth_address)

ui/app/AppLayouts/Wallet/CollectiblesTab.qml

@@ -60,13 +60,6 @@ Item {
             }
         }
     }
-
-    Connections {
-        target: walletModel.collectiblesLists
-        onDataChanged: {
-            checkCollectiblesVisibility()
-        }
-    }
 }
 
 /*##^##

ui/app/AppLayouts/Wallet/components/collectiblesComponents/CollectiblesContainer.qml

@@ -6,21 +6,14 @@ import "../../../../../shared"
 Item {
     property url collectibleIconSource: "../../../../img/collectibles/CryptoKitties.png"
     property string collectibleName: "CryptoKitties"
+    property string collectibleType: "cryptokitty"
     property bool collectiblesOpened: false
     property var collectiblesModal
     property string buttonText: "View in Cryptokitties"
     property var getLink: function () {}
     property var collectibles: {
-        if (error) {
-            return []
-        }
-
         try {
-            var result = JSON.parse(collectiblesJSON)
+            return JSON.parse(collectiblesJSON)
-            if (typeof result === "string") {
-                return JSON.parse(result)
-            }
-            return result
         } catch (e) {
             console.error('Error parsing collectibles for:', collectibleName)
             console.error('JSON:', collectiblesJSON)
@@ -29,7 +22,7 @@ Item {
         }
     }
     // Adding active instead of just using visible, because visible counts as false when the parent is not visible
-    property bool active: !!loading || !!error || collectibles.length > 0
+    property bool active: !!loading || collectibles.length > 0
 
     id: root
     visible: active
@@ -51,6 +44,7 @@ Item {
         id: collectiblesContent
         visible: root.collectiblesOpened
         collectiblesModal: root.collectiblesModal
+        collectibleType: root.collectibleType
         buttonText: root.buttonText
         getLink: root.getLink
         anchors.top: collectiblesHeader.bottom

ui/app/AppLayouts/Wallet/components/collectiblesComponents/CollectiblesContent.qml

@@ -7,101 +7,55 @@ import "../../../../../shared"
 
 ScrollView {
     readonly property int imageSize: 164
+    property string collectibleType: "cryptokitty"
     property var collectiblesModal
     property string buttonText: "View in Cryptokitties"
     property var getLink: function () {}
     property var collectibles: []
 
     id: root
-    height: visible ? contentLoader.item.height : 0
+    height: visible ? contentRow.height : 0
     width: parent.width
     ScrollBar.vertical.policy: ScrollBar.AlwaysOff
     ScrollBar.horizontal.policy: ScrollBar.AsNeeded
     clip: true
 
-    Loader {
+    Row {
-        id: contentLoader
+        id: contentRow
-        active: true
+        bottomPadding: Style.current.padding
-        width: parent.width
+        spacing: Style.current.padding
-        height: root.imageSize
-        sourceComponent: !!error ? errorComponent : collectiblesContentComponent
-    }
 
-    Component {
+        Repeater {
-        id: errorComponent
+            model: collectibles
 
-        Item  {
+            Rectangle {
-            width: parent.width
+                radius: 16
-            height: root.imageSize
+                border.width: 1
+                border.color: Style.current.border
+                color: Style.current.background
+                width: collectibleImage.width
+                height: collectibleImage.height
 
-            Item {
+                Image {
-                anchors.verticalCenter: parent.verticalCenter
+                    id: collectibleImage
-                anchors.horizontalCenter: parent.horizontalCenter
+                    width: root.imageSize
-                height: childrenRect.height
+                    height: root.imageSize
-                width: somethingWentWrongText.width
+                    source: modelData.image
-
+                    fillMode: Image.PreserveAspectCrop
-                StyledText {
-                    id: somethingWentWrongText
-                    text: qsTr("Something went wrong")
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: Style.current.secondaryText
-                    font.pixelSize: 13
                 }
 
-                StyledButton {
+                MouseArea {
-                    label: qsTr("Reload")
+                    cursorShape: Qt.PointingHandCursor
-                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.fill: parent
-                    anchors.top: somethingWentWrongText.bottom
-                    anchors.topMargin: Style.current.halfPadding
                     onClicked: {
-                        walletModel.reloadCollectible(collectibleType)
+                        collectiblesModal.openModal({
-                    }
+                                                   name: modelData.name,
-                }
+                                                   id: modelData.id,
-            }
+                                                   description: modelData.description,
-        }
+                                                   buttonText: root.buttonText,
-
+                                                   link: root.getLink(modelData.id, modelData.externalUrl),
-    }
+                                                   image: modelData.image
-
+                                               })
-    Component {
-        id: collectiblesContentComponent
-
-        Row {
-            id: contentRow
-            bottomPadding: Style.current.padding
-            spacing: Style.current.padding
-
-            Repeater {
-                model: collectibles
-
-                Rectangle {
-                    radius: 16
-                    border.width: 1
-                    border.color: Style.current.border
-                    color: Style.current.background
-                    width: collectibleImage.width
-                    height: collectibleImage.height
-
-                    Image {
-                        id: collectibleImage
-                        width: root.imageSize
-                        height: root.imageSize
-                        source: modelData.image
-                        fillMode: Image.PreserveAspectCrop
-                    }
-
-                    MouseArea {
-                        cursorShape: Qt.PointingHandCursor
-                        anchors.fill: parent
-                        onClicked: {
-                            collectiblesModal.openModal({
-                                                       name: modelData.name,
-                                                       id: modelData.id,
-                                                       description: modelData.description,
-                                                       buttonText: root.buttonText,
-                                                       link: root.getLink(modelData.id, modelData.externalUrl),
-                                                       image: modelData.image
-                                                   })
-                        }
                     }
                 }
             }

ui/app/AppLayouts/Wallet/components/collectiblesComponents/CollectiblesHeader.qml

@@ -60,7 +60,7 @@ Rectangle {
             StyledText {
                 id: numberCollectibleText
                 color: Style.current.secondaryText
-                text: !!error ? "-" : collectibleHeader.collectiblesQty
+                text: collectibleHeader.collectiblesQty
                 font.pixelSize: 15
                 anchors.verticalCenter: parent.verticalCenter
             }