diff --git a/src/components/Berachain/components/BerachainWidget/DepositWidget/DepositWidget.tsx b/src/components/Berachain/components/BerachainWidget/DepositWidget/DepositWidget.tsx
index 193d6b8ac..a8656dc3c 100644
--- a/src/components/Berachain/components/BerachainWidget/DepositWidget/DepositWidget.tsx
+++ b/src/components/Berachain/components/BerachainWidget/DepositWidget/DepositWidget.tsx
@@ -16,8 +16,6 @@ import {
WalletCardBadge,
} from '@/components/Menus/WalletMenu/WalletCard.style';
import TokenImage from '@/components/Portfolio/TokenImage';
-import CheckIcon from '@mui/icons-material/Check';
-import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import {
useConfig,
useWaitForTransactionReceipt,
@@ -43,10 +41,8 @@ import {
} from '@/components/Navbar/WalletButton.style';
import { useTranslation } from 'react-i18next';
import ConnectButton from '@/components/Navbar/ConnectButton';
-import {
- BerachainDepositInputBackground,
- BerachainWidgetSelection,
-} from '../../BerachainWidgetWip/BerachainWidgetWip.style';
+import { BerachainDepositInputBackground } from '../../BerachainWidgetWip/BerachainWidgetWip.style';
+import { TxConfirmation } from '../TxConfirmation';
interface Image {
url?: string;
@@ -228,7 +224,7 @@ function DepositWidget({
market?.input_token_data.decimals ?? 0,
)
) {
- return `There are not enough positions left in the market. Still available to deposit: ${Intl.NumberFormat(
+ return `Not enough positions left. Still available to deposit: ${Intl.NumberFormat(
'en-US',
{
notation: 'standard',
@@ -473,7 +469,18 @@ function DepositWidget({
{market?.input_token_data.symbol.toUpperCase()} Fillable in Total
*/}
{hasErrorText && (
- {hasErrorText}
+ ({
+ typography: {
+ xs: theme.typography.bodyXSmall,
+ sm: theme.typography.bodySmall,
+ },
+ })}
+ >
+ {hasErrorText}
+
)}
{txHash && (
)}
- {/* {txHash && (
-
-
-
-
-
- Transaction completed
-
-
-
-
-
- )} */}
+ {txHash && (
+
+ )}
);
diff --git a/src/components/Berachain/components/BerachainWidget/TxConfirmation.tsx b/src/components/Berachain/components/BerachainWidget/TxConfirmation.tsx
new file mode 100644
index 000000000..ac5363cfd
--- /dev/null
+++ b/src/components/Berachain/components/BerachainWidget/TxConfirmation.tsx
@@ -0,0 +1,66 @@
+import { alpha, Box, Typography, useTheme } from '@mui/material';
+import CheckIcon from '@mui/icons-material/Check';
+import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+
+export const TxConfirmation = ({ s, link }: { s: string; link: string }) => {
+ const theme = useTheme();
+
+ return (
+
+
+
+
+
+ {s}
+
+
+
+
+
+
+
+ );
+};
diff --git a/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetIncentiveTab.tsx b/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetIncentiveTab.tsx
index 40cd8aca2..a0f36fec0 100644
--- a/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetIncentiveTab.tsx
+++ b/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetIncentiveTab.tsx
@@ -23,6 +23,7 @@ import { useEffect, useMemo, useState } from 'react';
import type { ExtendedChain } from '@lifi/sdk';
import { WithdrawInputTokenRow } from '@/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawInputTokenRow';
import { CustomLoadingButton } from '@/components/Berachain/components/BerachainWidget/LoadingButton.style';
+import { TxConfirmation } from '../TxConfirmation';
export const WithdrawWidgetIncentiveTab = ({
market,
@@ -339,29 +340,26 @@ export const WithdrawWidgetIncentiveTab = ({
>
Claim incentive
- {txHash && (
-
-
- Transaction link
-
-
+ {isTxConfirmed && txHash ? (
+
+ ) : (
+ txHash && (
+
+ )
)}
- {isTxConfirmed && (
+ {/* {isTxConfirmed && (
Transaction successfull!
- )}
+ )} */}
);
};
diff --git a/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetInputTokenTab.tsx b/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetInputTokenTab.tsx
index be4e7d905..66459c8d5 100644
--- a/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetInputTokenTab.tsx
+++ b/src/components/Berachain/components/BerachainWidget/WithdrawWidget/WithdrawWidgetInputTokenTab.tsx
@@ -20,6 +20,7 @@ import type { ChangeEvent } from 'react';
import { useEffect, useState } from 'react';
import { CustomLoadingButton } from '@/components/Berachain/components/BerachainWidget/LoadingButton.style';
import type { ExtendedChain } from '@lifi/sdk';
+import { TxConfirmation } from '../TxConfirmation';
export const WithdrawWidgetInputTokenTab = ({
market,
@@ -317,7 +318,20 @@ export const WithdrawWidgetInputTokenTab = ({
>
Withdraw
- {txHash && (
+ {isTxConfirmed && txHash ? (
+
+ ) : (
+ txHash && (
+
+ )
+ )}
+ {/* {txHash && (
- )}
- {isTxConfirmed && (
+ )} */}
+ {/* {isTxConfirmed && (
Transaction successfull!
- )}
+ )} */}
);
};
diff --git a/src/hooks/useOngoingQuests.ts b/src/hooks/useOngoingQuests.ts
index cca8e229d..afdbbd367 100644
--- a/src/hooks/useOngoingQuests.ts
+++ b/src/hooks/useOngoingQuests.ts
@@ -34,6 +34,8 @@ export const useOngoingQuests = (): UseQuestsProps => {
apiUrl.searchParams.set('sort[0]', 'id:desc');
//filter url
apiUrl.searchParams.set('pagination[pageSize]', '50');
+ // todo: remove this line
+ apiUrl.searchParams.set('filters[Label][$ne]', 'berachain'); // not showing all the berachain markets during boyco
// apiUrl.searchParams.set('filters[Points][$gte]', '0');
const currentDate = new Date(Date.now()).toISOString().split('T')[0];
apiUrl.searchParams.set('filters[StartDate][$lte]', currentDate);