update token inputs to v2

BeanstalkFarms · Jan 29, 2024 · cf4f7b2 · cf4f7b2
1 parent 24bdd5a
commit cf4f7b2
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 60 deletions.
diff --git a/projects/sdk/src/lib/swap/Swap.ts b/projects/sdk/src/lib/swap/Swap.ts
@@ -36,13 +36,17 @@ export class Swap {
 
     for (let i = 0; i < route.length; i++) {
       if (route.getStep(i - 1)) {
-        if (route.getStep(i - 1).from === "BEAN" && route.getStep(i - 1).to === "WETH" &&
-            route.getStep(i).from === "WETH" && route.getStep(i).to === "ETH") {
-              useAdvancedFarm = true;
-              break;
-        };
-      };
-    };
+        if (
+          route.getStep(i - 1).from === "BEAN" &&
+          route.getStep(i - 1).to === "WETH" &&
+          route.getStep(i).from === "WETH" &&
+          route.getStep(i).to === "ETH"
+        ) {
+          useAdvancedFarm = true;
+          break;
+        }
+      }
+    }
 
     if (useAdvancedFarm) {
       workflow = Swap.sdk.farm.createAdvancedFarm(`Swap ${tokenIn.symbol}->${tokenOut.symbol}`);
@@ -81,7 +85,7 @@ export class Swap {
       }
     }
 
-    const op = new SwapOperation(Swap.sdk, tokenIn, tokenOut, workflow, route);
+    const op = new SwapOperation(Swap.sdk, tokenIn, tokenOut, workflow, route, _from, _to);
 
     return op;
   }

diff --git a/projects/sdk/src/lib/swap/SwapOperation.ts b/projects/sdk/src/lib/swap/SwapOperation.ts
@@ -4,7 +4,7 @@ import { TokenValue } from "src/TokenValue";
 import { Token } from "src/classes/Token";
 import { BeanstalkSDK } from "src/lib/BeanstalkSDK";
 import { Route } from "src/classes/Router";
-import { AdvancedFarmWorkflow } from "../farm";
+import { AdvancedFarmWorkflow, FarmFromMode, FarmToMode } from "../farm";
 
 type PathSegment = {
   from: string;
@@ -18,8 +18,10 @@ export class SwapOperation {
     sdk: BeanstalkSDK,
     readonly tokenIn: Token,
     readonly tokenOut: Token,
-    private readonly workflow: AdvancedFarmWorkflow|Workflow,
-    private readonly route: Route
+    private readonly workflow: AdvancedFarmWorkflow | Workflow,
+    private readonly route: Route,
+    readonly from?: FarmFromMode,
+    readonly to?: FarmToMode
   ) {
     SwapOperation.sdk = sdk;
     sdk.debug(`new SwapOperation(): ${this.getDisplay()}`);

diff --git a/projects/ui/src/components/Chop/Actions/Chop.tsx b/projects/ui/src/components/Chop/Actions/Chop.tsx
@@ -58,6 +58,7 @@ import TransactionToast from '~/components/Common/TxnToast';
 import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import useSdk from '~/hooks/sdk';
 import useBDV from '~/hooks/beanstalk/useBDV';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 type ChopFormValues = FormState & {
   destination: FarmToMode | undefined;
@@ -76,7 +77,11 @@ const ChopForm: FC<
   const unripeUnderlying = useUnripeUnderlyingMap();
   const [quote, setQuote] = useState<BigNumber>(new BigNumber(0));
   const [quoteBdv, setQuoteBdv] = useState<BigNumber>(new BigNumber(0));
-
+  const [balanceFromIn, setBalanceFromIn] = useState<BalanceFrom>(
+    values.destination === FarmToMode.EXTERNAL
+      ? BalanceFrom.EXTERNAL
+      : BalanceFrom.INTERNAL
+  );
   /// Derived values
   const state = values.tokens[0];
   const inputToken = state.token;
@@ -147,6 +152,14 @@ const ChopForm: FC<
 
   const isSubmittable = quote?.gt(0) && values.destination;
 
+  const changeDestination = (v) => {
+    setBalanceFromIn(v);
+    setFieldValue(
+      'destination',
+      v === BalanceFrom.EXTERNAL ? FarmToMode.EXTERNAL : FarmToMode.INTERNAL
+    );
+  };
+
   return (
     <Form autoComplete="off">
       <TokenSelectDialog
@@ -157,6 +170,9 @@ const ChopForm: FC<
         balances={balances}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
+        balanceFrom={balanceFromIn}
+        setBalanceFrom={changeDestination}
+        balanceFromOptions={[BalanceFrom.INTERNAL, BalanceFrom.EXTERNAL]}
       />
       <Stack gap={1}>
         <TokenInputField
@@ -167,7 +183,11 @@ const ChopForm: FC<
           fullWidth
           InputProps={{
             endAdornment: (
-              <TokenAdornment token={inputToken} onClick={showTokenSelect} />
+              <TokenAdornment
+                balanceFrom={balanceFromIn}
+                token={inputToken}
+                onClick={showTokenSelect}
+              />
             ),
           }}
         />

diff --git a/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx b/projects/ui/src/components/Market/PodsV2/Actions/Buy/CreateOrder.tsx
@@ -56,6 +56,7 @@ import { QuoteHandlerWithParams } from '~/hooks/ledger/useQuoteWithParams';
 
 import FormTxnProvider from '~/components/Common/Form/FormTxnProvider';
 import useFormTxnContext from '~/hooks/sdk/useFormTxnContext';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 export type CreateOrderFormValues = {
   placeInLine: BigNumber | null;
@@ -175,6 +176,7 @@ const CreateOrderV2Form: FC<
         selected={values.tokens}
         handleSubmit={handleSelectTokens}
         balances={balances}
+        balanceFrom={BalanceFrom.TOTAL}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
       />
@@ -223,6 +225,7 @@ const CreateOrderV2Form: FC<
                     ? balances.eth
                     : balances[state.token.address] || ZERO_BN
                 }
+                balanceFrom={BalanceFrom.TOTAL}
                 state={state}
                 params={quoteHandlerParams}
                 showTokenSelect={handleOpen}

diff --git a/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx b/projects/ui/src/components/Market/PodsV2/Actions/Buy/FillListingForm.tsx
@@ -47,6 +47,7 @@ import useFormMiddleware from '~/hooks/ledger/useFormMiddleware';
 import TokenOutput from '~/components/Common/Form/TokenOutput';
 import useSdk from '~/hooks/sdk';
 import useAccount from '~/hooks/ledger/useAccount';
+import { BalanceFrom } from '~/components/Common/Form/BalanceFromRow';
 
 export type FillListingFormValues = FormState & {
   settings: SlippageSettingsFragment;
@@ -197,6 +198,7 @@ const FillListingV2Form: FC<
         balances={balances}
         tokenList={Object.values(erc20TokenMap)}
         mode={TokenSelectMode.SINGLE}
+        balanceFrom={BalanceFrom.TOTAL}
       />
       <Stack gap={1}>
         <TokenQuoteProvider
@@ -212,6 +214,7 @@ const FillListingV2Form: FC<
           state={values.tokens[0]}
           showTokenSelect={handleOpen}
           handleQuote={handleQuote}
+          balanceFrom={BalanceFrom.TOTAL}
           size="small"
         />
         {isReady ? (
@@ -412,7 +415,8 @@ const FillListingForm: FC<{
           finalFromMode = optimizeFromMode(amountBeans, balances[Bean.address]);
           farm = sdk.farm.create();
           tokenInNew = sdk.tokens.BEAN; // FIXME
-        } else { /// Swap to BEAN and buy
+        } else {
+          /// Swap to BEAN and buy
           // Require a quote
           if (!formData.amountOut)
             throw new Error(`No quote available for ${formData.token.symbol}`);
@@ -497,7 +501,7 @@ const FillListingForm: FC<{
       balances,
       sdk,
       beanstalk.interface,
-      account
+      account,
     ]
   );