Merge pull request #254 from logion-network/feature/merge-items

Show only on-chain collection items
logion-network · Apr 23, 2024 · 562c387 · 562c387
2 parents 05b0830 + 04035be
commit 562c387
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@logion/client",
-  "version": "0.43.0",
+  "version": "0.43.1-1",
   "description": "logion SDK for client applications",
   "main": "dist/index.js",
   "packageManager": "[email protected]",

diff --git a/packages/client/src/LocClient.ts b/packages/client/src/LocClient.ts
@@ -612,11 +612,6 @@ export abstract class LocClient {
         const { locId } = parameters;
         const onchainItems = await this.nodeApi.queries.getCollectionItems(locId);
 
-        const onchainItemsMap: Record<string, CollectionItem> = {};
-        for(const item of onchainItems) {
-            onchainItemsMap[item.id.toHex()] = item;
-        }
-
         try {
             const offchainItems = await this.getOffchainItems({ locId });
 
@@ -625,7 +620,7 @@ export abstract class LocClient {
                 offchainItemsMap[item.itemId] = item;
             }
 
-            return offchainItems.map(item => this.mergeItems(onchainItemsMap[item.itemId], offchainItemsMap[item.itemId]));
+            return onchainItems.map(item => this.mergeItems(item, offchainItemsMap[item.id.toHex()]));
         } catch(e) {
             throw newBackendError(e);
         }

diff --git a/packages/client/src/license/Factory.ts b/packages/client/src/license/Factory.ts
@@ -38,7 +38,8 @@ export class MergedTermsAndConditionsElement {
 
 /**
  * Creates a new Terms and Conditions, based on given type.
- * @param termsAndConditions the Terms and Conditions elements, as stored on the chain.
+ * @param onchainTCs the Terms and Conditions elements, as stored on the chain.
+ * @param offchainTCs the Terms and Conditions elements, as stored on the off-chain backend.
  * @return an array of terms and conditions element
  * @group TermsAndConditions
  */