From 6eaddf97c3c017856ada2c4ded0510e2932b7705 Mon Sep 17 00:00:00 2001 From: Natalie Bunduwongse Date: Mon, 4 Nov 2024 10:25:41 +1300 Subject: [PATCH] feat: update nft endpoints --- .../Scripts/UI/Inventory/InventoryAssetDetailsView.cs | 4 ++-- Assets/Shared/Scripts/UI/Inventory/InventoryScreen.cs | 4 ++-- Assets/Shared/Scripts/UI/Marketplace/MarketplaceScreen.cs | 6 +++--- Assets/Shared/Scripts/UI/Shop/ShopScreen.cs | 8 +++----- Assets/Shared/Services/ApiService.cs | 2 -- Packages/packages-lock.json | 2 +- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Assets/Shared/Scripts/UI/Inventory/InventoryAssetDetailsView.cs b/Assets/Shared/Scripts/UI/Inventory/InventoryAssetDetailsView.cs index 1499dd64..67962052 100644 --- a/Assets/Shared/Scripts/UI/Inventory/InventoryAssetDetailsView.cs +++ b/Assets/Shared/Scripts/UI/Inventory/InventoryAssetDetailsView.cs @@ -33,7 +33,7 @@ public class InventoryAssetDetailsView : View [SerializeField] private GameObject m_Progress; [SerializeField] private CustomDialog m_CustomDialog; - private StacksApi m_StacksApi = new(new Configuration { BasePath = Config.BASE_URL }); + private MetadataSearchApi m_MetadataSearchApi = new(new Configuration { BasePath = Config.BASE_URL }); private readonly List m_Attributes = new(); private NFTBundle? m_Asset; private string? m_ListingId; @@ -167,7 +167,7 @@ private async UniTask LoadAssetImage() => try { - var result = await m_StacksApi.SearchNFTsAsync( + var result = await m_MetadataSearchApi.SearchNFTsAsync( chainName: Config.CHAIN_NAME, contractAddress: new List { m_Asset.NftWithStack.ContractAddress }, accountAddress: SaveManager.Instance.WalletAddress, diff --git a/Assets/Shared/Scripts/UI/Inventory/InventoryScreen.cs b/Assets/Shared/Scripts/UI/Inventory/InventoryScreen.cs index c9ded90a..f13dfacc 100644 --- a/Assets/Shared/Scripts/UI/Inventory/InventoryScreen.cs +++ b/Assets/Shared/Scripts/UI/Inventory/InventoryScreen.cs @@ -27,7 +27,7 @@ public enum AssetType { Skin, Powerups } [SerializeField] private InfiniteScrollGridView m_ScrollView; [SerializeField] private AddFunds m_AddFunds; - private StacksApi m_StacksApi = new(new Configuration { BasePath = Config.BASE_URL }); + private MetadataSearchApi m_MetadataSearchApi = new(new Configuration { BasePath = Config.BASE_URL }); private AssetType m_Type = AssetType.Skin; private readonly List m_Assets = new(); private bool m_IsLoadingMore; @@ -134,7 +134,7 @@ private async UniTask> GetAssets() var contractAddress = m_Type == AssetType.Skin ? Contract.SKIN : Contract.PACK; - var result = await m_StacksApi.SearchNFTsAsync( + var result = await m_MetadataSearchApi.SearchNFTsAsync( Config.CHAIN_NAME, new List { contractAddress }, SaveManager.Instance.WalletAddress, diff --git a/Assets/Shared/Scripts/UI/Marketplace/MarketplaceScreen.cs b/Assets/Shared/Scripts/UI/Marketplace/MarketplaceScreen.cs index d4e6483b..cc4ee38e 100644 --- a/Assets/Shared/Scripts/UI/Marketplace/MarketplaceScreen.cs +++ b/Assets/Shared/Scripts/UI/Marketplace/MarketplaceScreen.cs @@ -29,7 +29,7 @@ public class MarketplaceScreen : View [SerializeField] private AddFunds m_AddFunds; [SerializeField] private CustomDialog m_CustomDialog; - private StacksApi m_StacksApi = new(new Configuration { BasePath = Config.BASE_URL }); + private MetadataSearchApi m_MetadataSearchApi = new(new Configuration { BasePath = Config.BASE_URL }); private readonly List m_Stacks = new(); private List m_Colours = new(); private List m_Speeds = new(); @@ -79,7 +79,7 @@ private async void OnEnable() /// private async void ConfigureFilters() { - var filtersResponse = await m_StacksApi.ListFiltersAsync( + var filtersResponse = await m_MetadataSearchApi.ListFiltersAsync( chainName: Config.CHAIN_NAME, contractAddress: Contract.SKIN); var filters = filtersResponse.Result.Filters; @@ -198,7 +198,7 @@ private async UniTask> GetStacks() var trait = filters.Count > 0 ? JsonConvert.SerializeObject(filters) : null; // Fetch stacks from the API - var result = await m_StacksApi.SearchStacksAsync( + var result = await m_MetadataSearchApi.SearchStacksAsync( Config.CHAIN_NAME, new List { Contract.SKIN }, traits: trait, diff --git a/Assets/Shared/Scripts/UI/Shop/ShopScreen.cs b/Assets/Shared/Scripts/UI/Shop/ShopScreen.cs index 278f0e8d..ebeec360 100644 --- a/Assets/Shared/Scripts/UI/Shop/ShopScreen.cs +++ b/Assets/Shared/Scripts/UI/Shop/ShopScreen.cs @@ -85,11 +85,9 @@ private void OnCreateItemView(int index, GameObject item) private async void LoadPacks() { var packs = await GetPacks(); - if (packs != null && packs.Count > 0) - { - m_Packs.AddRange(packs); - m_ScrollView.TotalItemCount = m_Packs.Count; - } + if (packs == null || packs.Count <= 0) return; + m_Packs.AddRange(packs); + m_ScrollView.TotalItemCount = m_Packs.Count; } private async UniTask> GetPacks() diff --git a/Assets/Shared/Services/ApiService.cs b/Assets/Shared/Services/ApiService.cs index 88dfa569..861bf420 100644 --- a/Assets/Shared/Services/ApiService.cs +++ b/Assets/Shared/Services/ApiService.cs @@ -13,7 +13,6 @@ public static async UniTask MintCoins(string to, string quantity) { var success = false; var url = $"{Config.SERVER_URL}/mint/token"; - Debug.Log($"MintCoins url: {url}"); #if UNITY_WEBGL var form = new WWWForm(); form.AddField("to", to); @@ -43,7 +42,6 @@ public static async UniTask MintCoins(string to, string quantity) public static async UniTask MintFox(string to) { var url = $"{Config.SERVER_URL}/mint/fox"; - Debug.Log($"MintFox url: {url}"); #if UNITY_WEBGL var form = new WWWForm(); form.AddField("to", to); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 73eb7b42..5b213f77 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,7 +14,7 @@ "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2" }, - "hash": "493055b6a6791a35b3ae53becea94f12420f1703" + "hash": "daf0a1b029979053349efec7c382ef3e0dea27a4" }, "com.immutable.marketplace": { "version": "https://github.com/immutable/unity-immutable-sdk.git?path=/src/Packages/Marketplace",