Merge branch 'feature/ft-image-url' into feature/2.7.1-union

Portkey-Wallet · Dec 25, 2024 · 5da7600 · 5da7600
2 parents 24c9686 + b9dbd54
commit 5da7600
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/CAServer.Application/CAServerApplicationAutoMapperProfile.cs b/src/CAServer.Application/CAServerApplicationAutoMapperProfile.cs
@@ -359,7 +359,9 @@ public CAServerApplicationAutoMapperProfile()
             .ForMember(t => t.Decimals,
                 m => m.MapFrom(f => f.TokenInfo == null ? new decimal() : f.TokenInfo.Decimals))
             .ForMember(t => t.TokenContractAddress,
-                m => m.MapFrom(f => f.TokenInfo == null ? null : f.TokenInfo.TokenContractAddress));
+                m => m.MapFrom(f => f.TokenInfo == null ? null : f.TokenInfo.TokenContractAddress))
+            .ForMember(t => t.ImageUrl,
+                m => m.MapFrom(f => f.TokenInfo == null ? null : f.TokenInfo.ImageUrl));
 
         CreateMap<IndexerSearchTokenNft, NftInfoDto>()
             .ForMember(t => t.ImageUrl,

diff --git a/src/CAServer.Application/UserAssets/UserAssetsAppService.cs b/src/CAServer.Application/UserAssets/UserAssetsAppService.cs
@@ -1022,7 +1022,7 @@ public async Task<SearchUserAssetsDto> SearchUserAssetsAsync(SearchUserAssetsReq
                     tokenInfo.BalanceInUsd = tokenInfo.BalanceInUsd = CalculationHelper
                         .GetBalanceInUsd(price, searchItem.Balance, Convert.ToInt32(tokenInfo.Decimals)).ToString();
 
-                    tokenInfo.ImageUrl = _assetsLibraryProvider.buildSymbolImageUrl(item.Symbol);
+                    tokenInfo.ImageUrl = _assetsLibraryProvider.buildSymbolImageUrl(item.Symbol, tokenInfo.ImageUrl);
 
                     item.TokenInfo = tokenInfo;
                 }

diff --git a/src/CAServer.EntityEventHandler.Core/CAServerEventHandlerAutoMapperProfile.cs b/src/CAServer.EntityEventHandler.Core/CAServerEventHandlerAutoMapperProfile.cs
@@ -55,14 +55,16 @@ public CAServerEventHandlerAutoMapperProfile()
             .ForPath(t => t.Token.Symbol, m => m.MapFrom(u => u.Token.Symbol))
             .ForPath(t => t.Token.ChainId, m => m.MapFrom(u => u.Token.ChainId))
             .ForPath(t => t.Token.Decimals, m => m.MapFrom(u => u.Token.Decimals))
-            .ForPath(t => t.Token.Address, m => m.MapFrom(u => u.Token.Address));
+            .ForPath(t => t.Token.Address, m => m.MapFrom(u => u.Token.Address))
+            .ForPath(t => t.Token.ImageUrl, m => m.MapFrom(u => u.Token.ImageUrl));
 
         CreateMap<UserTokenDeleteEto, UserTokenIndex>()
             .ForPath(t => t.Token.Id, m => m.MapFrom(u => u.Token.Id))
             .ForPath(t => t.Token.Symbol, m => m.MapFrom(u => u.Token.Symbol))
             .ForPath(t => t.Token.ChainId, m => m.MapFrom(u => u.Token.ChainId))
             .ForPath(t => t.Token.Decimals, m => m.MapFrom(u => u.Token.Decimals))
-            .ForPath(t => t.Token.Address, m => m.MapFrom(u => u.Token.Address));
+            .ForPath(t => t.Token.Address, m => m.MapFrom(u => u.Token.Address))
+            .ForPath(t => t.Token.ImageUrl, m => m.MapFrom(u => u.Token.ImageUrl));
         CreateMap<CAHolderGrainDto, CAHolderIndex>();
         CreateMap<UpdateCAHolderEto, CAHolderIndex>();
         CreateMap<DefaultToken, DefaultTokenInfo>();