Skip to content

Commit 5073dfe

Browse files
committed
Revert "oct-1043: pending transaction loader - filter"
This reverts commit d1c6714.
1 parent 7dea9fa commit 5073dfe

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

client/src/components/Earn/EarnBoxGlmLock/EarnBoxGlmLock.tsx

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,9 @@ const EarnBoxGlmLock: FC<EarnBoxGlmLockProps> = ({ classNameBox }) => {
2424
keyPrefix: 'components.dedicated.boxGlmLock',
2525
});
2626
const { isConnected } = useAccount();
27-
const { isAppWaitingForTransactionToBeIndexed, transactionsPending } = useTransactionLocalStore(
28-
state => ({
29-
isAppWaitingForTransactionToBeIndexed: state.data.isAppWaitingForTransactionToBeIndexed,
30-
transactionsPending: state.data.transactionsPending,
31-
}),
32-
);
33-
34-
const isPendingLockingOrUnlockingTransaction =
35-
isAppWaitingForTransactionToBeIndexed &&
36-
!!transactionsPending?.filter(
37-
({ type, isFinalized }) => (type === 'lock' || 'unlock') && !isFinalized,
38-
).length;
27+
const { isAppWaitingForTransactionToBeIndexed } = useTransactionLocalStore(state => ({
28+
isAppWaitingForTransactionToBeIndexed: state.data.isAppWaitingForTransactionToBeIndexed,
29+
}));
3930

4031
const [isModalGlmLockOpen, setIsModalGlmLockOpen] = useState<boolean>(false);
4132
const { data: estimatedEffectiveDeposit, isFetching: isFetchingEstimatedEffectiveDeposit } =
@@ -52,7 +43,7 @@ const EarnBoxGlmLock: FC<EarnBoxGlmLockProps> = ({ classNameBox }) => {
5243
doubleValueProps: {
5344
cryptoCurrency: 'golem',
5445
dataTest: 'BoxGlmLock__Section--current__DoubleValue',
55-
isFetching: isFetchingDepositValue || isPendingLockingOrUnlockingTransaction,
46+
isFetching: isFetchingDepositValue || isAppWaitingForTransactionToBeIndexed,
5647
valueCrypto: depositsValue,
5748
},
5849
isDisabled: isPreLaunch && !isConnected,
@@ -64,7 +55,7 @@ const EarnBoxGlmLock: FC<EarnBoxGlmLockProps> = ({ classNameBox }) => {
6455
coinPricesServerDowntimeText: '...',
6556
cryptoCurrency: 'golem',
6657
dataTest: 'BoxGlmLock__Section--effective__DoubleValue',
67-
isFetching: isFetchingEstimatedEffectiveDeposit || isPendingLockingOrUnlockingTransaction,
58+
isFetching: isFetchingEstimatedEffectiveDeposit || isAppWaitingForTransactionToBeIndexed,
6859
valueCrypto: estimatedEffectiveDeposit,
6960
},
7061
isDisabled: isPreLaunch && !isConnected,

client/src/components/Earn/EarnBoxPersonalAllocation/EarnBoxPersonalAllocation.tsx

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,9 @@ const EarnBoxPersonalAllocation: FC<EarnBoxPersonalAllocationProps> = ({ classNa
3737
const { data: isPatronMode } = useIsPatronMode();
3838
const { data: totalPatronDonations, isFetching: isFetchingTotalPatronDonations } =
3939
useTotalPatronDonations({ isEnabledAdditional: !!isPatronMode });
40-
const { isAppWaitingForTransactionToBeIndexed, transactionsPending } = useTransactionLocalStore(
41-
state => ({
42-
isAppWaitingForTransactionToBeIndexed: state.data.isAppWaitingForTransactionToBeIndexed,
43-
transactionsPending: state.data.transactionsPending,
44-
}),
45-
);
46-
47-
const isPendingWithdrawalTransaction =
48-
isAppWaitingForTransactionToBeIndexed &&
49-
!!transactionsPending?.filter(({ type, isFinalized }) => type === 'withdrawal' && !isFinalized)
50-
.length;
40+
const { isAppWaitingForTransactionToBeIndexed } = useTransactionLocalStore(state => ({
41+
isAppWaitingForTransactionToBeIndexed: state.data.isAppWaitingForTransactionToBeIndexed,
42+
}));
5143

5244
const isPreLaunch = getIsPreLaunch(currentEpoch);
5345
const isProjectAdminMode = useIsProjectAdminMode();
@@ -99,9 +91,7 @@ const EarnBoxPersonalAllocation: FC<EarnBoxPersonalAllocationProps> = ({ classNa
9991
coinPricesServerDowntimeText: !isProjectAdminMode ? '...' : undefined,
10092
cryptoCurrency: 'ethereum',
10193
dataTest: 'BoxPersonalAllocation__Section--availableNow__DoubleValue',
102-
isFetching: isPatronMode
103-
? isFetchingTotalPatronDonations
104-
: isFetchingWithdrawals || isPendingWithdrawalTransaction,
94+
isFetching: isPatronMode ? isFetchingTotalPatronDonations : isFetchingWithdrawals,
10595
valueCrypto: isPatronMode ? totalPatronDonations?.value : withdrawals?.sums.available,
10696
},
10797
label: isPatronMode && !isProjectAdminMode ? t('allTime') : i18n.t('common.availableNow'),

0 commit comments

Comments
 (0)