fix: check nil shard

status-im · Nov 30, 2023 · 0ff7c33 · 0ff7c33
1 parent 258bde4
commit 0ff7c33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/app_service/service/shared_urls/dto/url_data.nim b/src/app_service/service/shared_urls/dto/url_data.nim
@@ -90,8 +90,8 @@ proc toJsonNode*(communityUrlDataDto: CommunityUrlDataDto): JsonNode =
   jsonObj["membersCount"] = %* communityUrlDataDto.membersCount
   jsonObj["color"] = %* communityUrlDataDto.color
   jsonObj["communityId"] = %* communityUrlDataDto.communityId
-  jsonObj["shardCluster"] = %* communityUrlDataDto.shard.cluster
-  jsonObj["shardIndex"] = %* communityUrlDataDto.shard.index
+  jsonObj["shardCluster"] = %*(if communityUrlDataDto.shard != nil: communityUrlDataDto.shard.cluster else: -1)
+  jsonObj["shardIndex"] = %*(if communityUrlDataDto.shard != nil: communityUrlDataDto.shard.index else: -1)
   return jsonObj
 
 proc `$`*(communityUrlDataDto: CommunityUrlDataDto): string =

diff --git a/ui/imports/shared/popups/ImportCommunityPopup.qml b/ui/imports/shared/popups/ImportCommunityPopup.qml
@@ -46,8 +46,10 @@ StatusDialog {
                 if (!linkData) {
                     return ""
                 }
-                d.shardCluster = linkData.shardCluster
-                d.shardIndex = linkData.shardIndex
+                if (linkData.shardCluster != undefined && linkData.shardIndex != undefined) {
+                    d.shardCluster = linkData.shardCluster
+                    d.shardIndex = linkData.shardIndex
+                }
                 return linkData.communityId
             }
             if (!Utils.isCommunityPublicKey(inputKey))