@@ -88,7 +88,7 @@ export function useUserPositionsTotalShares(
88
88
const lcdClient = useLcdClient ( ) ;
89
89
const selectedPoolDeposits = useUserDeposits ( poolDepositFilter ) || [ ] ;
90
90
91
- return useQueries ( {
91
+ const { data } = useQueries ( {
92
92
queries : [
93
93
...selectedPoolDeposits . flatMap (
94
94
( { pairID : { token0, token1 } = { } , centerTickIndex, fee } ) => {
@@ -107,7 +107,15 @@ export function useUserPositionsTotalShares(
107
107
}
108
108
) ,
109
109
] ,
110
+ combine ( results ) {
111
+ return {
112
+ data : results . map ( ( result ) => result . data ) ,
113
+ pending : results . some ( ( result ) => result . isPending ) ,
114
+ } ;
115
+ } ,
110
116
} ) ;
117
+
118
+ return data ;
111
119
}
112
120
113
121
// select a single token pair of user shares
@@ -135,7 +143,7 @@ export function useUserPositionsTotalReserves(
135
143
const lcdClient = useLcdClient ( ) ;
136
144
const selectedPoolDeposits = useUserDeposits ( poolDepositFilter ) || [ ] ;
137
145
138
- return useQueries ( {
146
+ const { data } = useQueries ( {
139
147
queries : [
140
148
...selectedPoolDeposits . flatMap (
141
149
( {
@@ -175,7 +183,15 @@ export function useUserPositionsTotalReserves(
175
183
}
176
184
) ,
177
185
] ,
186
+ combine ( results ) {
187
+ return {
188
+ data : results . map ( ( result ) => result . data ) ,
189
+ pending : results . some ( ( result ) => result . isPending ) ,
190
+ } ;
191
+ } ,
178
192
} ) ;
193
+
194
+ return data ;
179
195
}
180
196
181
197
export interface ShareValueContext {
@@ -209,15 +225,17 @@ export function useUserPositionsContext(
209
225
return useMemo < UserPositionDepositContext [ ] > ( ( ) => {
210
226
return ( selectedPoolDeposits || [ ] ) . flatMap < UserPositionDepositContext > (
211
227
( deposit ) => {
212
- const totalSharesResponse = userPositionsTotalShares . find (
213
- ( { data } ) => {
214
- return ! ! data ;
215
- }
216
- ) ;
228
+ const totalSharesResponse =
229
+ userPositionsTotalShares ?. find (
230
+ // todo: FIX
231
+ ( data ) => {
232
+ return ! ! data ;
233
+ }
234
+ ) ?? undefined ;
217
235
218
236
// find the upper and lower reserves that match this position
219
- const lowerReserveResponse = userPositionsTotalReserves . find (
220
- ( { data } ) => {
237
+ const lowerReserveResponse =
238
+ userPositionsTotalReserves ?. find ( ( data ) => {
221
239
return (
222
240
data ?. poolReserves ?. tokenIn === deposit . pairID ?. token0 &&
223
241
data ?. poolReserves ?. pairID ?. token0 === deposit . pairID ?. token0 &&
@@ -226,10 +244,9 @@ export function useUserPositionsContext(
226
244
deposit . lowerTickIndex . toString ( ) &&
227
245
data ?. poolReserves ?. fee . toString ( ) === deposit . fee . toString ( )
228
246
) ;
229
- }
230
- ) ;
231
- const upperReserveResponse = userPositionsTotalReserves . find (
232
- ( { data } ) => {
247
+ } ) ?? undefined ;
248
+ const upperReserveResponse =
249
+ userPositionsTotalReserves ?. find ( ( data ) => {
233
250
return (
234
251
data ?. poolReserves ?. tokenIn === deposit . pairID ?. token1 &&
235
252
data ?. poolReserves ?. pairID ?. token0 === deposit . pairID ?. token0 &&
@@ -238,8 +255,7 @@ export function useUserPositionsContext(
238
255
deposit . upperTickIndex . toString ( ) &&
239
256
data ?. poolReserves ?. fee . toString ( ) === deposit . fee . toString ( )
240
257
) ;
241
- }
242
- ) ;
258
+ } ) ?? undefined ;
243
259
const token0 = allTokens . find (
244
260
( token ) => token . address === deposit . pairID . token0
245
261
) ;
@@ -252,38 +268,36 @@ export function useUserPositionsContext(
252
268
const token0Context : ShareValueContext | undefined = deposit &&
253
269
totalSharesResponse &&
254
270
lowerReserveResponse && {
255
- token : lowerReserveResponse . data ?. poolReserves ?. tokenIn ?? '' ,
271
+ token : lowerReserveResponse . poolReserves ?. tokenIn ?? '' ,
256
272
tickIndex : new BigNumber (
257
- lowerReserveResponse . data ?. poolReserves ?. tickIndex . toString ( ) ??
258
- 0
273
+ lowerReserveResponse . poolReserves ?. tickIndex . toString ( ) ?? 0
259
274
) ,
260
275
userShares : new BigNumber ( deposit . sharesOwned ) ,
261
276
dexTotalShares : new BigNumber (
262
- totalSharesResponse ?. data ? .amount ?. amount ?? 0
277
+ totalSharesResponse . amount ?. amount ?? 0
263
278
) ,
264
279
// start with empty value, will be filled in next step
265
280
userReserves : new BigNumber ( 0 ) ,
266
281
dexTotalReserves : new BigNumber (
267
- lowerReserveResponse . data ?. poolReserves ?. reserves ?? 0
282
+ lowerReserveResponse . poolReserves ?. reserves ?? 0
268
283
) ,
269
284
} ;
270
285
271
286
const token1Context : ShareValueContext | undefined = deposit &&
272
287
totalSharesResponse &&
273
288
upperReserveResponse && {
274
- token : upperReserveResponse . data ?. poolReserves ?. tokenIn ?? '' ,
289
+ token : upperReserveResponse . poolReserves ?. tokenIn ?? '' ,
275
290
tickIndex : new BigNumber (
276
- upperReserveResponse . data ?. poolReserves ?. tickIndex . toString ( ) ??
277
- 0
291
+ upperReserveResponse . poolReserves ?. tickIndex . toString ( ) ?? 0
278
292
) ,
279
293
userShares : new BigNumber ( deposit . sharesOwned ) ,
280
294
dexTotalShares : new BigNumber (
281
- totalSharesResponse ?. data ?. amount ?. amount ?? 0
295
+ totalSharesResponse ?. amount ?. amount ?? 0
282
296
) ,
283
297
// start with empty value, will be filled in next step
284
298
userReserves : new BigNumber ( 0 ) ,
285
299
dexTotalReserves : new BigNumber (
286
- upperReserveResponse . data ?. poolReserves ?. reserves ?? 0
300
+ upperReserveResponse . poolReserves ?. reserves ?? 0
287
301
) ,
288
302
} ;
289
303
return [
0 commit comments