Merged with main

src/services/BlockchainService/index.ts

@@ -59,6 +59,13 @@ type AtomicSwapHistoryTargetQuery = AtomicSwapHistoryBaseQuery & {
   expiredRedeem?: 0 | 1
   state?: 'REDEEMED' | 'BEFORE-REDEEM'
 }
+
+type PlatformFees = {
+  assetIn?: string // TODO: return types from main branch
+  assetOut?: string
+  walletAddress?: string | undefined
+  fromWidget?: string | undefined
+}
 class BlockchainService {
   private readonly apiUrl: string;
 
@@ -231,17 +238,16 @@ class BlockchainService {
     { headers: this.basicAuthHeaders }
   );
 
-  getPlatformFees = (
-    { assetIn, assetOut, walletAddress, fromWidget }: {
-      assetIn?: string | undefined,
-      assetOut?: string | undefined,
-      walletAddress?: string | undefined,
-      fromWidget?: string | undefined
-    }
+  getPlatformFees = ({
+    assetIn,
+    assetOut,
+    walletAddress,
+    fromWidget
+  }: PlatformFees
   ) => {
     const url = new URL(`${this.apiUrl}/api/platform-fees`);
 
-    if (assetIn !== undefined) {
+    if (assetIn !== undefined) { // TODO: make same as in main branch
       url.searchParams.append('assetIn', assetIn);
     }
 

src/services/BlockchainService/schemas/atomicHistorySchema.ts

@@ -16,9 +16,9 @@ const baseAtomicHistoryItem = z.object({
   _id: z.string(),
   __v: z.number(),
   asset: z.string(),
-  sender: z.string().refine(ethers.utils.isAddress),
-  secretHash: z.string().refine(ethers.utils.isHexString),
-  receiver: z.string().refine(ethers.utils.isAddress).optional(),
+  sender: z.string().refine(ethers.isAddress),
+  secretHash: z.string().refine(ethers.isHexString),
+  receiver: z.string().refine(ethers.isAddress).optional(),
   secret: z.string().optional(),
 });