Stop looking for owned after balance reached ERC721Supply

Author: 0xFirekeeper

Assets/Thirdweb/Core/Scripts/ERC1155.cs

@@ -92,7 +92,6 @@ public async Task<List<NFT>> GetAll(QueryAllParams queryParams = null)
                     start = 0;
                     end = totalCount - 1;
                 }
-                // TODO: Add Multicall
                 List<NFT> allNfts = new List<NFT>();
                 for (int i = start; i <= end; i++)
                     allNfts.Add(await Get(i.ToString()));
@@ -113,7 +112,6 @@ public async Task<List<NFT>> GetOwned(string address = null)
             else
             {
                 string owner = address == null ? await ThirdwebManager.Instance.SDK.wallet.GetAddress() : address;
-                // TODO: Add Multicall
                 int totalCount = await TotalCount();
                 List<NFT> ownedNfts = new List<NFT>();
                 for (int i = 0; i < totalCount; i++)

Assets/Thirdweb/Core/Scripts/ERC721.cs

@@ -113,12 +113,12 @@ public async Task<List<NFT>> GetOwned(string address = null)
             else
             {
                 string owner = address == null ? await ThirdwebManager.Instance.SDK.wallet.GetAddress() : address;
+                var balanceOfOwner = int.Parse(await BalanceOf(owner));
+                List<NFT> ownedNfts = new List<NFT>();
 
                 try
                 {
                     // ERC721Enumerable
-                    var balanceOfOwner = int.Parse(await BalanceOf(owner));
-                    List<NFT> ownedNfts = new List<NFT>();
                     for (int i = 0; i < balanceOfOwner; i++)
                     {
                         var tokenId = await TransactionManager.ThirdwebRead<TokenERC721Contract.TokenOfOwnerByIndexFunction, TokenERC721Contract.TokenOfOwnerByIndexOutputDTO>(
@@ -129,16 +129,17 @@ public async Task<List<NFT>> GetOwned(string address = null)
                     }
                     return ownedNfts;
                 }
-                catch (System.Exception)
+                catch
                 {
                     // ERC721 totalSupply
                     var count = await TotalCount();
-                    List<NFT> ownedNfts = new List<NFT>();
                     for (int i = 0; i < count; i++)
                     {
                         if (await OwnerOf(i.ToString()) == owner)
                         {
                             ownedNfts.Add(await Get(i.ToString()));
+                            if (ownedNfts.Count == balanceOfOwner)
+                                break;
                         }
                     }
                     return ownedNfts;