Merge remote-tracking branch 'origin/feature/dapp-safe' into feature/…

…2.6.0-union # Conflicts: # src/CAServer.Application.Contracts/Commons/WebsiteInfoHelper.cs
Portkey-Wallet · Dec 2, 2024 · 1b8889e · 1b8889e
2 parents 8ae0740 + daeedb8
commit 1b8889e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/src/CAServer.Application.Contracts/Commons/WebsiteInfoHelper.cs b/src/CAServer.Application.Contracts/Commons/WebsiteInfoHelper.cs
@@ -31,5 +31,6 @@ public static bool WebsiteValild(WebsiteInfoDto info)
         new WebsiteInfoDto { website = "tmrwdao.com", logo = "https://icon.horse/icon/tmrwdao.com/50" },
         new WebsiteInfoDto { website = "ewell.finance", logo = "https://icon.horse/icon/ewell.finance/50" },
         new WebsiteInfoDto { website = "hamster.beangotown11", logo = "https://icon.horse/icon/hamster.beangotown.com/50" },
+        new WebsiteInfoDto { website = "hamster.beangotown11", logo = "https://icon.horse/icon/hamster.beangotown.xyz/50" },
     };
 }
diff --git a/test/CAServer.Application.Tests/CAActivity/Provider/UserContactProviderTests.cs b/test/CAServer.Application.Tests/CAActivity/Provider/UserContactProviderTests.cs
@@ -26,7 +26,7 @@ public async void GetUserContactAsyncTest()
     [Fact]
     public async void GetUserContactListAsyncTest()
     {
-        var result = await _userContactProvider.GetContactByUserNameAsync("123", Guid.NewGuid());
+        var result = await _userContactProvider.GetContactByUserNameAsync("123", Guid.NewGuid(),"");
     }
 
 }
diff --git a/test/CAServer.Application.Tests/CAActivity/UserActivityAppServiceTestsMock.cs b/test/CAServer.Application.Tests/CAActivity/UserActivityAppServiceTestsMock.cs
@@ -236,7 +236,7 @@ private IUserContactProvider GetUserContactProvider()
         var mockUserContactProvider = new Mock<IUserContactProvider>();
 
         mockUserContactProvider.Setup(m =>
-                m.BatchGetUserNameAsync(It.IsAny<List<string>>(), It.IsAny<Guid>(), It.IsAny<string>()))
+                m.BatchGetUserNameAsync(It.IsAny<List<string>>(), It.IsAny<Guid>(), It.IsAny<string>(),It.IsAny<string>()))
             .ReturnsAsync(new List<Tuple<ContactAddress, string, string>>
             {
                 new(new ContactAddress

diff --git a/test/CAServer.Application.Tests/UserAssets/UserAssetsTests.cs b/test/CAServer.Application.Tests/UserAssets/UserAssetsTests.cs
@@ -91,7 +91,8 @@ public IUserAssetsAppService GetMock()
             objectMapper: null,
             nftToFtOptions: null,
             freeMintOptions:null,
-            freeMintProvider:null
+            freeMintProvider:null,
+            httpContextAccessor: null
             );
         return userAssetsAppService;
     }

diff --git a/test/CAServer.Application.Tests/UserAssets/UserAssetsTestsMock.cs b/test/CAServer.Application.Tests/UserAssets/UserAssetsTestsMock.cs
@@ -338,7 +338,7 @@ private IUserContactProvider GetUserContactProvider()
         var mockUserContactProvider = new Mock<IUserContactProvider>();
 
         mockUserContactProvider.Setup(m =>
-                m.BatchGetUserNameAsync(It.IsAny<List<string>>(), It.IsAny<Guid>(), It.IsAny<string>()))
+                m.BatchGetUserNameAsync(It.IsAny<List<string>>(), It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<string>()))
             .ReturnsAsync(new List<Tuple<ContactAddress, string, string>>
             {
                 new(new ContactAddress