Merge pull request #1590 from bancorprotocol/issue-#1589

Find all strategies from one token
bancorprotocol · Dec 16, 2024 · c6633d4 · c6633d4
2 parents 27bb2d7 + 4b97255
commit c6633d4
Show file tree

Hide file tree

Showing 133 changed files with 765 additions and 378 deletions.
diff --git a/...screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png b/...screenshots/simulator/recurring/Recurring_limit_limit/simulator-input-price.png
diff --git a/...shots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png b/...shots/simulator/recurring/Recurring_limit_limit/simulator-results-animation.png
diff --git a/...enshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png b/...enshots/simulator/recurring/Recurring_limit_limit/simulator-results-summary.png
diff --git a/...shots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png b/...shots/simulator/recurring/Recurring_limit_range/simulator-results-animation.png
diff --git a/...enshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png b/...enshots/simulator/recurring/Recurring_limit_range/simulator-results-summary.png
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/form.png
diff --git a/...shots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png b/...shots/simulator/recurring/Recurring_range_limit/simulator-results-animation.png
diff --git a/...enshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png b/...enshots/simulator/recurring/Recurring_range_limit/simulator-results-summary.png
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png b/e2e/screenshots/simulator/recurring/Recurring_range_range/form.png
diff --git a/...shots/simulator/recurring/Recurring_range_range/simulator-results-animation.png b/...shots/simulator/recurring/Recurring_range_range/simulator-results-animation.png
diff --git a/...enshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png b/...enshots/simulator/recurring/Recurring_range_range/simulator-results-summary.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/deposit/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/duplicate/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/editPrices/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/withdraw/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/deposit/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/editPrices/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/undercut/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/withdraw/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/deposit/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/duplicate/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/editPrices/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/undercut/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_limit/withdraw/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/deposit/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/duplicate/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/editPrices/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/undercut/form.png
diff --git a/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png b/e2e/screenshots/strategy/disposable/Disposable_sell_range/withdraw/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/deposit/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/duplicate/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/editPrices/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/undercut/form.png
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/duplicate/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/editPrices/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/renew/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/undercut/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/withdraw/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/duplicate/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/editPrices/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/undercut/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/withdraw/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/deposit/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/duplicate/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/editPrices/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/undercut/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/withdraw/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/deposit/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/editPrices/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/renew/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/undercut/form.png
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/withdraw/form.png
diff --git a/index.html b/index.html
@@ -18,6 +18,10 @@
   <meta name="twitter:title" content="Carbon DeFi - Automated trading strategies">
   <meta name="twitter:description" content="Carbon DeFi is an advanced onchain trading protocol enabling automated limit orders, efficiently adjustable w/ custom price ranges, grid trading like recurring orders, works like a DEX trading bot.">
   <meta name="twitter:image" content="https://framerusercontent.com/images/7YeuJPKg50bkh0m7b1yRwhCNIoE.png">
+
+  <!-- Preload fonts that are the most likely to be used quickly -->
+  <link rel="preload" href="assets/font/title/medium.woff2" as="font" type="font/woff2"/>
+  <link rel="preload" href="assets/font/text/medium.woff2" as="font" type="font/woff2"/>
 </head>
 
 <body>

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@babel/core": "^7.0.0-0",
-    "@bancor/carbon-sdk": "0.0.99-DEV",
+    "@bancor/carbon-sdk": "0.0.103-DEV",
     "@cloudflare/workers-types": "^4.20230717.0",
     "@ethersproject/abi": "^5.0.0",
     "@ethersproject/bytes": "^5.0.0",

diff --git a/src/App.tsx b/src/App.tsx
@@ -50,7 +50,7 @@ export const App = () => {
     <>
       <NotificationAlerts />
       <MainMenu />
-      <main className="mb-16 mt-80 grid flex-grow">
+      <main className="mb-16 grid flex-grow">
         <MainContent />
       </main>
       <Footer />

diff --git a/src/components/activity/useActivityQuery.tsx b/src/components/activity/useActivityQuery.tsx
@@ -82,7 +82,7 @@ export const useActivityQuery = (
   params: QueryActivityParams = {},
   config: ActivityQueryConfig = {}
 ) => {
-  const { tokensMap, isPending, importToken } = useTokens();
+  const { tokensMap, isPending, importTokens } = useTokens();
   const { Token } = useContract();
   const validParams = isValidParams(params);
 
@@ -100,7 +100,7 @@ export const useActivityQuery = (
       return fetchTokenData(Token, address);
     });
     const tokens = await Promise.all(getTokens);
-    tokens.forEach((data) => importToken(data));
+    importTokens(tokens);
   };
 
   return useQuery({

diff --git a/src/components/common/PairLogoName.tsx b/src/components/common/PairLogoName.tsx
@@ -1,18 +1,36 @@
 import { TokensOverlap } from 'components/common/tokensOverlap';
 import { WarningWithTooltip } from 'components/common/WarningWithTooltip/WarningWithTooltip';
 import { TradePair } from 'libs/modals/modals/ModalTradeTokenList';
-import { FC } from 'react';
+import { Token } from 'libs/tokens';
+import { FC, memo } from 'react';
+import { TokenLogo } from './imager/Imager';
 
 const suspiciousTokenTooltipMsg =
   'This token is not part of any known token list. Always conduct your own research before trading.';
 
-interface Props {
+interface TokenProps {
+  token: Token;
+}
+export const _TokenLogoName: FC<TokenProps> = ({ token }) => {
+  return (
+    <>
+      <TokenLogo token={token} size={30} />
+      {token.symbol}
+      {token.isSuspicious && (
+        <WarningWithTooltip tooltipContent={suspiciousTokenTooltipMsg} />
+      )}
+    </>
+  );
+};
+export const TokenLogoName = memo(_TokenLogoName, (a, b) => {
+  return a.token.address === b.token.address;
+});
+
+interface PairProps {
   pair: TradePair;
 }
 
-export const PairLogoName: FC<Props> = ({
-  pair: { baseToken, quoteToken },
-}) => {
+const _PairLogoName: FC<PairProps> = ({ pair: { baseToken, quoteToken } }) => {
   return (
     <>
       <TokensOverlap tokens={[baseToken, quoteToken]} size={30} />
@@ -30,3 +48,9 @@ export const PairLogoName: FC<Props> = ({
     </>
   );
 };
+export const PairLogoName = memo(_PairLogoName, (a, b) => {
+  return (
+    a.pair.baseToken.address === b.pair.baseToken.address &&
+    a.pair.quoteToken.address === b.pair.quoteToken.address
+  );
+});
diff --git a/src/components/common/Toaster/Toaster.tsx b/src/components/common/Toaster/Toaster.tsx
@@ -8,7 +8,7 @@ export const Toaster: FC = () => {
   return (
     <ul
       id="toaster"
-      className="fixed bottom-16 right-16 z-10 flex min-w-[250px] flex-col gap-8"
+      className="fixed bottom-16 right-24 z-10 flex min-w-[250px] flex-col gap-8"
     >
       {toaster.toasts.map((toast) => (
         <ToastItem key={toast.id} {...toast} />

diff --git a/src/components/common/imager/Imager.tsx b/src/components/common/imager/Imager.tsx
@@ -65,7 +65,6 @@ export const Imager = ({
   ...props
 }: ImageProps) => {
   const { source } = useImager(src, fallbackSrc);
-
   return (
     <img
       {...props}
@@ -90,7 +89,7 @@ export const TokenLogo = ({ token, size, className }: TokenLogoProps) => {
       src={token.logoURI}
       alt={token.name ?? token.symbol}
       title={token.symbol}
-      className={className}
+      className={cn(className, 'border border-black bg-black')}
     />
   );
 };

diff --git a/src/components/core/menu/mainMenu/MainMenu.tsx b/src/components/core/menu/mainMenu/MainMenu.tsx
@@ -4,7 +4,7 @@ import { MainMenuRight } from 'components/core/menu/mainMenu/MainMenuRight';
 
 export const MainMenu: FC = () => {
   return (
-    <header className="fixed top-0 z-40 w-full" data-testid="main-menu">
+    <header className="sticky top-0 z-40 w-full" data-testid="main-menu">
       <div className="main-menu">
         <MainMenuLeft />
         <MainMenuRight />

diff --git a/src/components/debug/DebugTransferNFT.tsx b/src/components/debug/DebugTransferNFT.tsx
@@ -3,7 +3,7 @@ import { Button } from 'components/common/button';
 import { Input, InputUserAccount, Label } from 'components/common/inputField';
 import { useWagmi } from 'libs/wagmi';
 import { QueryKey, useQueryClient } from 'libs/queries';
-import { useContract } from 'hooks/useContract';
+import { useVoucher } from 'hooks/useContract';
 
 export const DebugTransferNFT = () => {
   const { user } = useWagmi();
@@ -13,7 +13,7 @@ export const DebugTransferNFT = () => {
   const [isSuccess, setIsSuccess] = useState(false);
   const [isError, setIsError] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-  const { Voucher } = useContract();
+  const { data: Voucher } = useVoucher();
 
   const handleOnClick = async () => {
     setIsSuccess(false);
@@ -25,12 +25,12 @@ export const DebugTransferNFT = () => {
     setIsLoading(true);
 
     try {
-      const tx = await Voucher.write.transferFrom(
+      const tx = await Voucher?.write.transferFrom(
         user,
         inputRecipient,
         inputId
       );
-      await tx.wait();
+      await tx?.wait();
       await cache.invalidateQueries({ queryKey: QueryKey.strategies(user) });
       setIsSuccess(true);
     } catch (e) {

diff --git a/src/components/explorer/ExplorerSearch.tsx b/src/components/explorer/ExplorerSearch.tsx
@@ -94,13 +94,6 @@ export const _ExplorerSearch: FC = () => {
     setSearch,
   };
 
-  const suggestionProps = {
-    pairMap: pairs.map,
-    nameMap: pairs.names,
-    search,
-    setSearch,
-  };
-
   return (
     <div className="relative">
       <form
@@ -136,9 +129,7 @@ export const _ExplorerSearch: FC = () => {
           </div>
           <div role="separator" className="h-20 w-1 bg-white/40"></div>
           <div className="flex w-full flex-grow items-center md:relative">
-            {type === 'token-pair' && (
-              <ExplorerSearchSuggestions {...suggestionProps} />
-            )}
+            {type === 'token-pair' && <ExplorerSearchSuggestions />}
             {type === 'wallet' && <ExplorerSearchInput {...inputProps} />}
           </div>
         </div>

diff --git a/src/components/explorer/ExplorerSearchDropdownButton.tsx b/src/components/explorer/ExplorerSearchDropdownButton.tsx
@@ -26,7 +26,7 @@ export const ExplorerSearchDropdownButton = forwardRef<
       {type === 'token-pair' && (
         <>
           <IconTokenPair className="size-18 text-primary" />
-          <span className="hidden md:inline">Token Pair</span>
+          <span className="hidden md:inline">Token / Pair</span>
         </>
       )}
       <IconChevron className="size-16 text-white/40" />

diff --git a/src/components/explorer/ExplorerSearchDropdownItems.tsx b/src/components/explorer/ExplorerSearchDropdownItems.tsx
@@ -18,7 +18,7 @@ export const ExplorerSearchDropdownItems: FC<Props> = ({ setSearch }) => {
     },
     {
       type: 'token-pair' as const,
-      label: 'Token Pair',
+      label: 'Token / Pair',
       active: currentType === 'token-pair',
     },
   ];
@@ -36,7 +36,7 @@ export const ExplorerSearchDropdownItems: FC<Props> = ({ setSearch }) => {
             active && 'flex items-center justify-between'
           )}
         >
-          <span> {label}</span>
+          <span>{label}</span>
           <IconCheck className={cn('w-14', !active && 'hidden')} />
         </Link>
       ))}