From c2eefad084abda71910307143a2928fdff8fe395 Mon Sep 17 00:00:00 2001
From: str-mv <strmax20@gmail.com>
Date: Thu, 07 May 2020 10:27:35 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/usetech-llc/nft_parachain


---
--- a/doc/demo_milestone1-2.md
+++ b/doc/demo_milestone1-2.md
@@ -30,6 +30,9 @@
 Before we continue, we need to do some preparations in the UI: Add NFT Data types so that the UI knows how to decode them. Go to [Settings-Developer Tab](https://polkadot.js.org/apps/#/settings/developer) and add following types to the JSON object in there:
 ```
 {
+  "Address": "AccountId",
+  "LookupSource": "AccountId",
+  "Weight": "u32",  
   "NftItemType": {
     "Collection": "u64",
     "Owner": "AccountId",
@@ -43,6 +46,8 @@
 }
 ```
 
+**Note: ** In the future we will likely switch to substrate "2.0.0-alpha.7", in which case Weight type should be `u64`.
+
 #### CreateCollection
 
 Before running test, open [chain state tab](https://polkadot.js.org/apps/#/chainstate) and read `nft`.`nextCollectionId` state variable, which shows how many collections were created so far. If you just started the chain, this should equal 0. 

-- 
gitstuff