fix merge conflicts

spectrum-finance · Oct 4, 2023 · dc9b1f8 · dc9b1f8
1 parent 87c9659
commit dc9b1f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/network/cardano/api/rewards/claimRewards.ts b/src/network/cardano/api/rewards/claimRewards.ts
@@ -42,10 +42,10 @@ import {
 } from '../operations/common/inputSelector';
 import { submitTx } from '../operations/common/submitTxCandidate';
 import {
+  combineRequests,
   RawReward,
   rewardAsset,
   RewardsData,
-  rewardsRequest,
   RewardStatus,
   updateRewards$,
 } from './rewards';
@@ -188,7 +188,7 @@ export const claimRewards = (rewardsData: RewardsData): Observable<TxId> => {
     first(),
     switchMap((addresses) =>
       combineLatest([
-        rewardsRequest(addresses as string[]),
+        combineRequests(addresses as string[]),
         rewardsRequestStatusRequest(addresses as string[]),
       ]),
     ),

diff --git a/src/network/cardano/api/rewards/rewards.ts b/src/network/cardano/api/rewards/rewards.ts
@@ -186,9 +186,9 @@ const requestRewards = (
     catchError(() => of(undefined)),
   );
 
-const combineRequests = (
+export const combineRequests = (
   allAddresses: string[],
-): Observable<RawRewardResponse | undefined> => {
+): Observable<RewardsData | undefined> => {
   const addressesBatch: string[][] = [[]];
 
   for (const address of allAddresses) {
@@ -252,6 +252,7 @@ const combineRequests = (
         { rewards: [], upcoming: { sp0: 0, sp1: 0 } },
       );
     }),
+    map((data) => (data ? buildRewardsData(data) : undefined)),
   );
 };
 
@@ -264,7 +265,6 @@ export const rewards$ = getAddresses().pipe(
     ),
   ),
   switchMap((addresses) => combineRequests(addresses as string[])),
-  map((data) => (data ? buildRewardsData(data) : undefined)),
   publishReplay(1),
   refCount(),
 );