From b362145b5135a5750de313a4881842dc86f6ef5e Mon Sep 17 00:00:00 2001
From: 0xoscario <33234035+0xoscario@users.noreply.github.com>
Date: Mon, 24 Feb 2025 06:33:01 -0800
Subject: [PATCH 1/2] Fix farm list with undefined token

---
 src/hooks/v3/useV3Farms.ts              |   8 +-
 src/pages/FarmPage/V3/AllMerklFarms.tsx |   4 +-
 src/pages/FarmPage/V3/MerklFarmCard.tsx | 166 +++++++++++++-----------
 3 files changed, 92 insertions(+), 86 deletions(-)

diff --git a/src/hooks/v3/useV3Farms.ts b/src/hooks/v3/useV3Farms.ts
index 307c540f1..195f74fe1 100644
--- a/src/hooks/v3/useV3Farms.ts
+++ b/src/hooks/v3/useV3Farms.ts
@@ -651,10 +651,10 @@ export const useGetMerklRewards = (
               ...reasons,
               [breakdown.reason]: {
                 unclaimed: ((reasons as any)[breakdown.reason] as any)
-                ? ((reasons as any)[breakdown.reason] as any).unclaimed +
-                  BigInt(breakdown.amount) -
-                  BigInt(breakdown.claimed)
-                : BigInt(breakdown.amount) - BigInt(breakdown.claimed),
+                  ? ((reasons as any)[breakdown.reason] as any).unclaimed +
+                    BigInt(breakdown.amount) -
+                    BigInt(breakdown.claimed)
+                  : BigInt(breakdown.amount) - BigInt(breakdown.claimed),
               },
             };
           },
diff --git a/src/pages/FarmPage/V3/AllMerklFarms.tsx b/src/pages/FarmPage/V3/AllMerklFarms.tsx
index 5844609b9..31e116df3 100644
--- a/src/pages/FarmPage/V3/AllMerklFarms.tsx
+++ b/src/pages/FarmPage/V3/AllMerklFarms.tsx
@@ -482,9 +482,7 @@ const AllMerklFarms: React.FC<Props> = ({
               )
             ) : v3Farms.length > 0 ? (
               v3Farms.map((farm, ind) => (
-                <Box key={ind} pb={2}>
-                  <MerklFarmCard farm={farm} />
-                </Box>
+                <MerklFarmCard key={ind} farm={farm} />
               ))
             ) : (
               <Box
diff --git a/src/pages/FarmPage/V3/MerklFarmCard.tsx b/src/pages/FarmPage/V3/MerklFarmCard.tsx
index ab621773b..7a8fb5abb 100644
--- a/src/pages/FarmPage/V3/MerklFarmCard.tsx
+++ b/src/pages/FarmPage/V3/MerklFarmCard.tsx
@@ -49,92 +49,100 @@ export const MerklFarmCard: React.FC<Props> = ({ farm }) => {
   const token1 = getTokenFromAddress(farm.token1, chainId, tokenMap, []);
 
   return (
-    <Box width='100%' borderRadius={16} className='bg-secondary1'>
-      <Box padding={2} className='flex items-center flex-wrap'>
-        <Box
-          width={isMobile ? '100%' : '90%'}
-          className='flex items-center flex-wrap'
-        >
-          <Box
-            width={isMobile ? '80%' : '30%'}
-            className='flex items-center'
-            gridGap={12}
-          >
-            <DoubleCurrencyLogo
-              currency0={token0}
-              currency1={token1}
-              size={24}
-            />
-            <Box className='flex items-center' gridGap={4}>
-              <p>
-                {token0?.symbol}/{token1?.symbol}
-              </p>
-              {(farm?.ammName ?? '').toLowerCase() === 'quickswapuni' &&
-                !!farm?.poolFee && (
-                  <Box className='farmAPRTitleWrapper bg-textSecondary'>
-                    <span className='text-gray32'>{farm.poolFee}%</span>
+    <>
+      {token0 && token1 && (
+        <Box pb={2}>
+          <Box width='100%' borderRadius={16} className='bg-secondary1'>
+            <Box padding={2} className='flex items-center flex-wrap'>
+              <Box
+                width={isMobile ? '100%' : '90%'}
+                className='flex items-center flex-wrap'
+              >
+                <Box
+                  width={isMobile ? '80%' : '30%'}
+                  className='flex items-center'
+                  gridGap={12}
+                >
+                  <DoubleCurrencyLogo
+                    currency0={token0}
+                    currency1={token1}
+                    size={24}
+                  />
+                  <Box className='flex items-center' gridGap={4}>
+                    <p>
+                      {token0?.symbol}/{token1?.symbol}
+                    </p>
+                    {(farm?.ammName ?? '').toLowerCase() === 'quickswapuni' &&
+                      !!farm?.poolFee && (
+                        <Box className='farmAPRTitleWrapper bg-textSecondary'>
+                          <span className='text-gray32'>{farm.poolFee}%</span>
+                        </Box>
+                      )}
                   </Box>
-                )}
-            </Box>
-          </Box>
-          <Box
-            my={2}
-            width={isMobile ? '100%' : '20%'}
-            className='flex items-center justify-between'
-          >
-            {isMobile && <p>{t('tvl')}</p>}
-            <p>${formatNumber(farm.tvl)}</p>
-          </Box>
-          <Box
-            width={isMobile ? '100%' : '20%'}
-            className='flex items-center justify-between'
-          >
-            {isMobile && <p>{t('apr')}</p>}
-            <Box className={isMobile ? 'flex flex-col items-end' : ''}>
-              <small>{t('upTo')}</small>
-              <Box className='flex'>
-                <MerklFarmAPRTooltip
-                  farms={farm.alm}
-                  token0={farm.token0}
-                  token1={farm.token1}
+                </Box>
+                <Box
+                  my={2}
+                  width={isMobile ? '100%' : '20%'}
+                  className='flex items-center justify-between'
+                >
+                  {isMobile && <p>{t('tvl')}</p>}
+                  <p>${formatNumber(farm.tvl)}</p>
+                </Box>
+                <Box
+                  width={isMobile ? '100%' : '20%'}
+                  className='flex items-center justify-between'
+                >
+                  {isMobile && <p>{t('apr')}</p>}
+                  <Box className={isMobile ? 'flex flex-col items-end' : ''}>
+                    <small>{t('upTo')}</small>
+                    <Box className='flex'>
+                      <MerklFarmAPRTooltip
+                        farms={farm.alm}
+                        token0={farm.token0}
+                        token1={farm.token1}
+                      >
+                        <Box className='farmCardAPR' gridGap={4}>
+                          <p>{formatNumber(farm.apr)}%</p>
+                          <img src={APRHover} width={16} />
+                        </Box>
+                      </MerklFarmAPRTooltip>
+                    </Box>
+                  </Box>
+                </Box>
+                <Box
+                  width={isMobile ? '100%' : '30%'}
+                  my={2}
+                  className={
+                    isMobile ? 'flex items-center justify-between' : ''
+                  }
                 >
-                  <Box className='farmCardAPR' gridGap={4}>
-                    <p>{formatNumber(farm.apr)}%</p>
-                    <img src={APRHover} width={16} />
+                  {isMobile && <p>{t('rewards')}</p>}
+                  <Box className={isMobile ? 'flex flex-col items-end' : ''}>
+                    <p>
+                      {formatNumber(farm.dailyAmount)} {farm.symbolRewardToken}{' '}
+                      <small className='text-secondary'>{t('daily')}</small>
+                    </p>
                   </Box>
-                </MerklFarmAPRTooltip>
+                </Box>
+              </Box>
+              <Box width={isMobile ? '100%' : '10%'} mt={0}>
+                <Button
+                  className='farmCardButton'
+                  disabled={!farm.pool}
+                  onClick={() => {
+                    if (farm.pool) {
+                      redirectWithPool(farm.pool);
+                    }
+                  }}
+                >
+                  {t('view')}
+                </Button>
               </Box>
             </Box>
           </Box>
-          <Box
-            width={isMobile ? '100%' : '30%'}
-            my={2}
-            className={isMobile ? 'flex items-center justify-between' : ''}
-          >
-            {isMobile && <p>{t('rewards')}</p>}
-            <Box className={isMobile ? 'flex flex-col items-end' : ''}>
-              <p>
-                {formatNumber(farm.dailyAmount)} {farm.symbolRewardToken}{' '}
-                <small className='text-secondary'>{t('daily')}</small>
-              </p>
-            </Box>
-          </Box>
-        </Box>
-        <Box width={isMobile ? '100%' : '10%'} mt={0}>
-          <Button
-            className='farmCardButton'
-            disabled={!farm.pool}
-            onClick={() => {
-              if (farm.pool) {
-                redirectWithPool(farm.pool);
-              }
-            }}
-          >
-            {t('view')}
-          </Button>
         </Box>
-      </Box>
-    </Box>
+      )}
+    </>
   );
 };
 

From 67e5a71680040330b81cabb10d98bb7fb99a7f95 Mon Sep 17 00:00:00 2001
From: brianshattuck <ubi.eng827@gmail.com>
Date: Mon, 24 Feb 2025 14:17:29 -0800
Subject: [PATCH 2/2] show error message when closing an order on perps page

---
 src/pages/PerpsPage/ClosePositionButton.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/PerpsPage/ClosePositionButton.tsx b/src/pages/PerpsPage/ClosePositionButton.tsx
index e17f6337e..ebe81cf25 100644
--- a/src/pages/PerpsPage/ClosePositionButton.tsx
+++ b/src/pages/PerpsPage/ClosePositionButton.tsx
@@ -23,6 +23,7 @@ export const ClosePositionButton: React.FC<{
   };
   const [loading, setLoading] = useState(false);
   const { onSubmit, helper } = useOrderEntry(order, { watchOrderbook: true });
+  const [error, setError] = useState('');
 
   const { data: orderValidation } = useQuery({
     queryKey: ['orderly-order-validation', order],
@@ -143,6 +144,11 @@ export const ClosePositionButton: React.FC<{
                 </Box>
               </Box>
             )}
+            {error && (
+              <Box mt={2}>
+                <p className='text-error'>{error}</p>
+              </Box>
+            )}
             <Box mt={2} className='flex' gridGap={12}>
               <Button
                 className='perpsConfirmButton'
@@ -150,13 +156,15 @@ export const ClosePositionButton: React.FC<{
                 onClick={async () => {
                   try {
                     setLoading(true);
+                    setError('');
                     await onSubmit(order);
                     setLoading(false);
                     handleClose();
                     if (afterClose) {
                       afterClose();
                     }
-                  } catch {
+                  } catch (e) {
+                    setError(JSON.stringify(e));
                     setLoading(false);
                   }
                 }}