fix: npe issues

Portkey-Wallet · Jan 24, 2025 · 19fcfc1 · 19fcfc1
1 parent 0085e1a
commit 19fcfc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/EoaServer.Application/Token/TokenAppService.cs b/src/EoaServer.Application/Token/TokenAppService.cs
@@ -144,14 +144,14 @@ public async Task<List<GetTokenListDto>> GetTokenListAsync(GetTokenListRequestDt
         {
             var chainIndexerToken =
                 await _aelfScanDataProvider.GetTokenListAsync(chainId, input.Symbol);
-            if (chainIndexerToken != null)
+            if (chainIndexerToken != null && !chainIndexerToken.List.IsNullOrEmpty())
             {
                 indexerTokens.AddRange(chainIndexerToken.List);
             }
         }
 
         var userTokensDto = await _userTokenProvider.GetUserTokenInfoListAsync(
-            CurrentUser.GetId(),
+            CurrentUser.IsAuthenticated ? CurrentUser.GetId() : Guid.Empty,
             input.ChainIds.Count == 1 ? input.ChainIds.First() : string.Empty,
             string.Empty);
 

diff --git a/src/EoaServer.Application/UserAssets/UserAssetsAppService.cs b/src/EoaServer.Application/UserAssets/UserAssetsAppService.cs
@@ -68,6 +68,7 @@ public async Task<GetTokenDto> GetTokenAsync(GetTokenRequestDto requestDto)
         foreach (var addressInfo in requestDto.AddressInfos)
         {
             var chainTokenList = await _aelfScanDataProvider.GetAddressTokenAssetsAsync(addressInfo.ChainId, addressInfo.Address);
+            if (chainTokenList == null || chainTokenList.List.IsNullOrEmpty()) continue;
             tokenList.AssetInUsd += chainTokenList.AssetInUsd;
             tokenList.AssetInElf += chainTokenList.AssetInElf;
             tokenList.Total += chainTokenList.Total;
@@ -113,7 +114,7 @@ public async Task<GetNftCollectionsDto> GetNFTCollectionsAsync(GetNftCollections
         foreach (var addressInfo in requestDto.AddressInfos)
         {
             var chainTokenList = await _aelfScanDataProvider.GetAddressNftListAsync(addressInfo.ChainId, addressInfo.Address);
-            if (chainTokenList != null)
+            if (chainTokenList != null && !chainTokenList.List.IsNullOrEmpty())
             {
                 nftList.Total += chainTokenList.Total;
                 nftList.List.AddRange(chainTokenList.List);
@@ -417,7 +418,7 @@ private async Task<List<AddressNftInfoDto>> GetUserCollectionItemsAsync(List<Add
         {
             // get all NFT for TotalNftItemCount
             var chainTokenList = await _aelfScanDataProvider.GetAddressNftListAsync(addressInfo.ChainId, addressInfo.Address);
-            if (chainTokenList != null)
+            if (chainTokenList != null && !chainTokenList.List.IsNullOrEmpty())
             {
                 nftList.AddRange(chainTokenList.List);
             }