merge

components/Stake.tsx

@@ -27,7 +27,7 @@ const Stake = () => {
 
   return (
     <>
-      <div className="grid grid-cols-3 rounded-t-2xl border-2 border-b-0 border-th-fgd-1 bg-th-bkg-1">
+      <div className="grid grid-cols-2 rounded-t-2xl border-2 border-b-0 border-th-fgd-1 bg-th-bkg-1">
         {STAKEABLE_TOKENS.map((token) => (
           <TokenButton
             key={token}

components/StakeForm.tsx

@@ -97,7 +97,7 @@ function StakeForm({ token: selectedToken }: StakeFormProps) {
     leveragedAPY,
     estimatedNetAPY,
   } = useBankRates(selectedToken, leverage)
-  const leverageMax = useLeverageMax(selectedToken)
+  const leverageMax = useLeverageMax(selectedToken) * 0.98 // Multiplied by 0.975 becuase you cant actually get to the end of the inifinite geometric series?
 
   const stakeBank = useMemo(() => {
     return group?.banksMapByName.get(selectedToken)?.[0]

components/UnstakeForm.tsx

@@ -330,7 +330,7 @@ function UnstakeForm({ token: selectedToken }: UnstakeFormProps) {
                             </span>
                           </div>
                           <div className="flex justify-between">
-                            <p className="text-th-fgd-4">SOL borrowed</p>
+                            <p className="text-th-fgd-4">USDC borrowed</p>
                             {borrowBank ? (
                               <span
                                 className={`font-bold ${borrowed > 0.001

components/WithdrawForm.tsx

@@ -329,7 +329,7 @@ import {
                           </span>
                         </div>
                         <div className="flex justify-between">
-                          <p className="text-th-fgd-4">SOL borrowed</p>
+                          <p className="text-th-fgd-4">USDC borrowed</p>
                           {borrowBank ? (
                             <span
                               className={`font-bold ${

hooks/useStakeRates.ts

@@ -23,7 +23,6 @@ const fetchRates = async () => {
   const jitoRange = getPriceRangeFromPeriod(jitoPrices, PERIOD.DAYS_30)
   const bsolRange = getPriceRangeFromPeriod(bsolPrices, PERIOD.DAYS_30)
   const lidoRange = getPriceRangeFromPeriod(lidoPrices, PERIOD.DAYS_30)
-  const jlpRange = getPriceRangeFromPeriod(lidoPrices, PERIOD.DAYS_30)
 
   const rateData: Record<string, number> = {}
   rateData.jlp = 12 * (jlpPricesPrice[jlpPricesPrice.length - 1] - jlpPricesPrice[0]) / jlpPricesPrice[0]

utils/transactions.ts

@@ -726,8 +726,8 @@ const deserializeJupiterIxAndAlt = async (
 }
 
 const fetchJupiterRoutes = async (
-  inputMint = 'So11111111111111111111111111111111111111112',
-  outputMint = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
+  inputMint: string,
+  outputMint: string,
   amount = 0,
   slippage = 50,
   swapMode = 'ExactIn',