Merge remote-tracking branch 'origin/master' into chore/bump-next-13-4

Author: matthewlilley

.changeset/big-panthers-sip.md

@@ -0,0 +1,5 @@
+---
+'@sushiswap/chain': patch
+---
+
+additional chains

.changeset/real-vans-occur.md

@@ -21,6 +21,7 @@ export const SUPPORTED_CHAINS = [
   ChainId.BOBA,
   ChainId.BOBA_AVAX,
   ChainId.ARBITRUM_NOVA,
+  ChainId.THUNDERCORE,
 ] as const
 
 export type SupportedChainIds = typeof SUPPORTED_CHAINS

apps/_root/app/partner/config.ts

@@ -62,7 +62,7 @@ export const Search: FC = () => {
 
   const { data: tokenList } = useQuery<TokenList>(
     ['https://token-list.sushi.com'],
-    () => fetch(`https://token-list.sushi.com`).then((response) => response.json()),
+    () => fetch('https://token-list.sushi.com').then((response) => response.json()),
     {
       enabled: debouncedQuery.length > 2 && !isAddress(debouncedQuery),
     }
@@ -241,13 +241,15 @@ const Row: FC<{ currency: Type; onClick?(): void; isNetwork?: boolean }> = ({
   )
 
   if (onClick) {
-    return <button onClick={onClick}>{content}</button>
+    return (
+      <button type="button" onClick={onClick}>
+        {content}
+      </button>
+    )
   }
 
   return (
-    <a
-      href={`https://www.sushi.com/swap?token1=${currency.wrapped.address}&token0=0x0000000000000000000000000000000000000000&chainId=${currency.chainId}`}
-    >
+    <a href={`https://www.sushi.com/swap?token0=NATIVE&token1=${currency.wrapped.address}&chainId=${currency.chainId}`}>
       {content}
     </a>
   )

apps/_root/components/Hero/Search.tsx

@@ -37,6 +37,7 @@ export function didUserReject(error: any): boolean {
  * @param error - An error from the ethers provider
  */
 export function swapErrorToUserReadableMessage(error: any): string {
+  if (!error) return ''
   if (didUserReject(error)) {
     return 'Transaction rejected'
   }

apps/_root/lib/swap/swapErrorToUserReadableMessage.ts

@@ -149,12 +149,9 @@ export const TradeReviewDialogCrossChain: FC = () => {
                     `Swap ${token0?.symbol} for ${token1?.symbol}`
                   )}
                 </Button>
-                <Collapsible open={!!error}>
-                  <div className="scroll bg-red/20 text-red-700 dark:bg-black/20 p-2 px-3 rounded-lg border border-slate-200/10 text-[10px] break-all max-h-[80px] overflow-y-auto">
-                    {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
-                    {/* @ts-ignore */}
+                <Collapsible open={Boolean(error)}>
+                  <div className="scroll bg-red/10 text-red-700 p-2 px-3 rounded-lg break-all">
                     {swapErrorToUserReadableMessage(error)}
-                    {/* <code>{error ? ('data' in error ? error?.data?.message : error.message) : ''}</code> */}
                   </div>
                 </Collapsible>
               </div>

apps/_root/ui/swap/trade/TradeReviewDialogCrossChain.tsx

@@ -191,12 +191,9 @@ export const TradeReviewDialogSameChain: FC = () => {
                     `Swap ${token0?.symbol} for ${token1?.symbol}`
                   )}
                 </Button>
-                <Collapsible open={!!error}>
-                  <div className="scroll bg-red/20 text-red-700 dark:bg-black/20 p-2 px-3 rounded-lg border border-slate-200/10 text-[10px] break-all max-h-[80px] overflow-y-auto">
-                    {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
-                    {/* @ts-ignore */}
+                <Collapsible open={Boolean(error)}>
+                  <div className="scroll bg-red/10 text-red-700 p-2 px-3 rounded-lg break-all">
                     {swapErrorToUserReadableMessage(error)}
-                    {/* <code>{error ? ('data' in error ? error?.data?.message : error.message) : ''}</code> */}
                   </div>
                 </Collapsible>
               </div>

apps/_root/ui/swap/trade/TradeReviewDialogSameChain.tsx

@@ -7,7 +7,6 @@ import { useSwapActions, useSwapState } from '../trade/TradeProvider'
 import { ArrowRightIcon, ChevronDownIcon } from '@heroicons/react/24/outline'
 import { STARGATE_SUPPORTED_CHAIN_IDS } from '@sushiswap/stargate'
 import { classNames } from '@sushiswap/ui'
-import { SwapChainId } from '../../../types'
 
 export const ChainSelectors: FC<{ open: boolean }> = ({ open }) => {
   const { network0, network1 } = useSwapState()

apps/_root/ui/swap/widget/ChainSelectors.tsx

@@ -26,6 +26,7 @@ export const AMM_ENABLED_NETWORKS = [
   ChainId.BOBA,
   ChainId.BOBA_AVAX,
   ChainId.BOBA_BNB,
+  ChainId.THUNDERCORE
 ]
 
 export const SUPPORTED_CHAIN_IDS = Array.from(new Set([...AMM_ENABLED_NETWORKS, ...TRIDENT_ENABLED_NETWORKS]))

apps/analytics/config.ts

@@ -6,7 +6,6 @@ import { Address } from 'wagmi'
 import { BigNumber } from '@ethersproject/bignumber'
 
 interface ConcentratedLiquidityHarvestButton {
-  poolAddress: string | undefined
   account: Address | undefined
   enabled?: boolean
   chainId: ChainId
@@ -15,15 +14,13 @@ interface ConcentratedLiquidityHarvestButton {
 
 export const ConcentratedLiquidityHarvestButton: FC<ConcentratedLiquidityHarvestButton> = ({
   account,
-  poolAddress,
   chainId,
   enabled,
   children,
 }) => {
   const { data: rewards } = useAngleRewards({
     chainId,
     account,
-    poolAddress,
   })
 
   const args = useMemo(() => {

apps/earn/components/ConcentratedLiquidityHarvestButton.tsx

@@ -136,7 +136,7 @@ export const SelectPricesWidget: FC<SelectPricesWidget> = ({
             )}
           </div>
         )}
-        <div className="flex flex-col">
+        <div className="flex flex-col gap-3">
           <div className="flex items-center justify-between gap-2">
             <div className="flex justify-end lg:hidden">
               {isLoading || !pool || !token0 || !token1 ? (
@@ -291,10 +291,11 @@ export const PriceBlock: FC<PriceBlockProps> = ({
         'flex flex-col gap-2 w-full bg-gray-100 dark:bg-white/[0.04] rounded-lg p-3'
       )}
     >
-      <p className="text-sm font-medium text-gray-600 dark:text-slate-400 text-slate-600">{label}</p>
+      <p className="text-sm font-medium text-gray-600 dark:text-slate-400">{label}</p>
       <div className="flex items-center justify-between">
         <div className="flex flex-col">
           <Input.Numeric
+            variant="unstyled"
             testdata-id={`${id}-input`}
             value={localValue}
             onUserInput={setLocalValue}