Merge pull request #1049 from AelinXYZ/staging

merge staging to main
AelinXYZ · Jun 16, 2023 · bd9f783 · bd9f783 · vercel · Jun 16, 2023
2 parents 6ac374f + 37b5cc4
commit bd9f783
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/components/pools/PoolMain.tsx b/src/components/pools/PoolMain.tsx
@@ -75,6 +75,8 @@ const CardWithTitle = styled(BaseCardWithTitle)`
   @media (min-width: ${({ theme }) => theme.themeBreakPoints.desktopStart}) {
     order: 0;
   }
+
+  padding-bottom: 20px;
 `
 
 const ActionsWrapper = styled.div`

diff --git a/src/components/pools/common/Create.tsx b/src/components/pools/common/Create.tsx
@@ -8,6 +8,8 @@ export const WrapperGrid = styled.div`
     display: grid;
     grid-template-columns: 30px 1fr 30px;
   }
+
+  padding: 0px 20px 20px 20px;
 `
 
 export const StepContents = styled.div`

diff --git a/src/components/toast/ToastComponent.tsx b/src/components/toast/ToastComponent.tsx
@@ -57,6 +57,7 @@ const Text = styled.p`
   color: ${({ theme: { colors } }) => colors.textColorLight};
   font-size: 0.8rem;
   margin: 5px 0;
+  overflow-wrap: anywhere;
 `
 
 export const ToastComponent = ({

diff --git a/src/hooks/contracts/useTransaction.tsx b/src/hooks/contracts/useTransaction.tsx
@@ -52,7 +52,11 @@ export default function useTransaction<
         toast.dismiss()
 
         const error = new TransactionError(
-          e.data?.message || e.message || 'Unable to decode revert reason',
+          e.error?.message ||
+            e.reason ||
+            e.data?.message ||
+            e.message ||
+            'Unable to decode revert reason',
           e.data?.code || e.code,
           e.data,
         )
@@ -79,7 +83,11 @@ export default function useTransaction<
         toast.dismiss()
 
         const error = new TransactionError(
-          e.data?.message || e.message || 'Unable to decode revert reason',
+          e.error?.message ||
+            e.reason ||
+            e.data?.message ||
+            e.message ||
+            'Unable to decode revert reason',
           e.data?.code || e.code,
           e.data,
         )

diff --git a/src/utils/stake/getUniswapStakingRewards.ts b/src/utils/stake/getUniswapStakingRewards.ts
@@ -70,9 +70,11 @@ export const getUniswapStakingRewards = async ({
     const aelinRate = rates.aelin.usd
     const ethRate = rates.ethereum.usd
 
+    /*
     const uniswapData: UniswapResponse = await getUniswapPoolAmount()
     const aelinInPool = uniswapData.pair.reserve0
     const ethInPool = uniswapData.pair.reserve1
+    
 
     const uniV2TotalSupplyInWei = new Wei(BigNumber.from(uniV2TotalSupply), BASE_DECIMALS)
     const totalStakedBalanceInWei = new Wei(BigNumber.from(totalStakedBalance), BASE_DECIMALS)
@@ -85,16 +87,18 @@ export const getUniswapStakingRewards = async ({
 
     const uniV2ValueInContract = totalStakedBalanceInWei.toNumber() * uniV2Price
     const rewardsValuePerYear = rewardForDurationInWei.toNumber() * yearProRata * aelinRate
+    */
 
     return {
       decimals: decimals || BASE_DECIMALS,
       symbol: symbol || '',
       userRewards: userRewards || ZERO_BN,
       userStake: userStake || ZERO_BN,
       tokenBalance: tokenBalance || ZERO_BN,
-      ethInPool,
-      aelinInPool,
-      APY: (100 * rewardsValuePerYear) / uniV2ValueInContract,
+      // Temp fix til uniswap v2 subgraph work
+      ethInPool: '0',
+      aelinInPool: '0',
+      APY: 0, // (100 * rewardsValuePerYear) / uniV2ValueInContract,
     }
   } catch (error) {
     console.error('error: ', error)