Silo Withdraw as X

projects/ui/src/components/Common/Form/FormTxn/AddPlantTxnToggle.tsx

@@ -24,7 +24,7 @@ import useFarmerFormTxnsSummary from '~/hooks/farmer/form-txn/useFarmerFormTxnsS
 import MergeIcon from '~/img/misc/merge-icon.svg';
 
 import { FormTxnsFormState } from '~/components/Common/Form';
-import { FormTxn } from '~/lib/Txn';
+import { FormTxn, PlantAndDoX } from '~/lib/Txn';
 import SiloVestingWarningAlert from '~/components/Silo/SiloVestingWarningAlert';
 
 const sx = {
@@ -51,7 +51,9 @@ const sx = {
  *
  * NOTE: Used within Formik Context
  */
-const AddPlantTxnToggle: React.FC<{}> = () => {
+const AddPlantTxnToggle: React.FC<{
+  plantAndDoX: PlantAndDoX | undefined;
+}> = ({ plantAndDoX }) => {
   /// Local State
   const [open, show, hide] = useToggle();
 
@@ -95,7 +97,7 @@ const AddPlantTxnToggle: React.FC<{}> = () => {
   }, [open, isPlant, isPlanting, show, hide]);
 
   /// If there is nothing to plant or if the preset isn't plant, return nothing
-  if (!isPlant || !plantEnabled) return null;
+  if (!isPlant || !plantEnabled || !plantAndDoX) return null;
 
   return (
     <>

projects/ui/src/components/Common/Form/FormTxnProvider.tsx

@@ -12,7 +12,6 @@ import { useFetchFarmerBalances } from '~/state/farmer/balances/updater';
 import { useFetchFarmerBarn } from '~/state/farmer/barn/updater';
 import { useFetchFarmerField } from '~/state/farmer/field/updater';
 import { useFetchFarmerSilo } from '~/state/farmer/silo/updater';
-import useSeason from '~/hooks/beanstalk/useSeason';
 import {
   FormTxnBundler,
   ClaimFarmStep,
@@ -21,9 +20,9 @@ import {
   MowFarmStep,
   PlantFarmStep,
   RinseFarmStep,
-  PlantAndDoX,
   FormTxn,
 } from '~/lib/Txn';
+import usePlantAndDoX from '~/hooks/farmer/form-txn/usePlantAndDoX';
 
 // -------------------------------------------------------------------------
 
@@ -68,7 +67,6 @@ const useInitFormTxnContext = () => {
   const farmerSilo = useFarmerSilo();
   const farmerField = useFarmerField();
   const farmerBarn = useFarmerFertilizer();
-  const season = useSeason();
 
   /// Refetch functions
   const [refetchFarmerSilo] = useFetchFarmerSilo();
@@ -79,17 +77,11 @@ const useInitFormTxnContext = () => {
 
   /// Helpers
   const getBDV = useBDV();
+  const plantAndDoX = usePlantAndDoX();
 
+  /// Context State
   const [txnBundler, setTxnBundler] = useState(new FormTxnBundler(sdk, {}));
 
-  const plantAndDoX = useMemo(() => {
-    const earnedBeans = sdk.tokens.BEAN.amount(
-      farmerSilo.beans.earned.toString()
-    );
-
-    return new PlantAndDoX(sdk, earnedBeans, season.toNumber());
-  }, [farmerSilo.beans.earned, sdk, season]);
-
   /// On any change, update the txn bundler
   useEffect(() => {
     const { BEAN } = sdk.tokens;
@@ -204,7 +196,7 @@ const useInitFormTxnContext = () => {
     txnBundler,
     plantAndDoX,
     refetch,
-  };
+  } as const;
 };
 
 export const FormTxnBuilderContext = React.createContext<

projects/ui/src/components/Silo/Actions/Convert.tsx

@@ -45,14 +45,14 @@ import WarningAlert from '~/components/Common/Alert/WarningAlert';
 import TokenOutput from '~/components/Common/Form/TokenOutput';
 import TxnAccordion from '~/components/Common/TxnAccordion';
 
-import useFarmerDepositCrateFromPlant from '~/hooks/farmer/useFarmerDepositCrateFromPlant';
 import AdditionalTxnsAccordion from '~/components/Common/Form/FormTxn/AdditionalTxnsAccordion';
 import useFarmerFormTxnsActions from '~/hooks/farmer/form-txn/useFarmerFormTxnActions';
 import useAsyncMemo from '~/hooks/display/useAsyncMemo';
 import AddPlantTxnToggle from '~/components/Common/Form/FormTxn/AddPlantTxnToggle';
 import FormTxnProvider from '~/components/Common/Form/FormTxnProvider';
 import useFormTxnContext from '~/hooks/sdk/useFormTxnContext';
 import { FormTxn, ConvertFarmStep } from '~/lib/Txn';
+import usePlantAndDoX from '~/hooks/farmer/form-txn/usePlantAndDoX';
 
 // -----------------------------------------------------------------------
 
@@ -90,12 +90,14 @@ const ConvertForm: FC<
     /** other */
     sdk: BeanstalkSDK;
     conversion: ConvertDetails;
+    plantAndDoX: ReturnType<typeof usePlantAndDoX>;
   }
 > = ({
   tokenList,
   siloBalances,
   handleQuote,
   currentSeason,
+  plantAndDoX,
   sdk,
   // Formik
   values,
@@ -107,7 +109,7 @@ const ConvertForm: FC<
   const [isTokenSelectVisible, showTokenSelect, hideTokenSelect] = useToggle();
   const getBDV = useBDV();
 
-  const { crate: plantCrate } = useFarmerDepositCrateFromPlant();
+  const plantCrate = plantAndDoX?.crate?.bn;
 
   /// Extract values from form state
   const tokenIn = values.tokens[0].token; // converting from token
@@ -129,9 +131,10 @@ const ConvertForm: FC<
       sdk.tokens.BEAN.equals(tokenIn)
   );
 
-  const totalAmountIn = isUsingPlanted
-    ? (amountIn || ZERO_BN).plus(plantCrate.asBN.amount)
-    : amountIn;
+  const totalAmountIn =
+    isUsingPlanted && plantCrate
+      ? (amountIn || ZERO_BN).plus(plantCrate.amount)
+      : amountIn;
 
   /// Derived form state
   let isReady = false;
@@ -268,7 +271,9 @@ const ConvertForm: FC<
           }
           params={quoteHandlerParams}
         />
-        {!canConvert && tokenOut && maxAmountIn ? null : <AddPlantTxnToggle />}
+        {!canConvert && tokenOut && maxAmountIn ? null : (
+          <AddPlantTxnToggle plantAndDoX={plantAndDoX.plantAction} />
+        )}
 
         {/* User Input: destination token */}
         {depositedAmount.gt(0) ? (
@@ -490,6 +495,9 @@ const ConvertPropProvider: FC<{
         if (!farmerBalances?.deposits) {
           throw new Error('No balances found');
         }
+        const { plantAction } = plantAndDoX;
+
+        const includePlant = !!(isConvertingPlanted && plantAction);
 
         const result = await ConvertFarmStep._handleConversion(
           sdk,
@@ -499,7 +507,7 @@ const ConvertPropProvider: FC<{
           tokenIn.amount(_amountIn.toString()),
           season.toNumber(),
           slippage,
-          isConvertingPlanted ? plantAndDoX : undefined
+          includePlant ? plantAction : undefined
         );
 
         setConversion(result.conversion);
@@ -540,8 +548,11 @@ const ConvertPropProvider: FC<{
           success: 'Convert successful.',
         });
 
+        const { plantAction } = plantAndDoX;
+
         const amountIn = tokenIn.amount(_amountIn.toString()); // amount of from token
-        const isPlanting = values.farmActions.primary?.includes(FormTxn.PLANT);
+        const isPlanting =
+          plantAndDoX && values.farmActions.primary?.includes(FormTxn.PLANT);
 
         const convertTxn = new ConvertFarmStep(
           sdk,
@@ -553,7 +564,7 @@ const ConvertPropProvider: FC<{
         const { getEncoded, minAmountOut } = await convertTxn.handleConversion(
           amountIn,
           slippage,
-          isPlanting ? plantAndDoX : undefined
+          isPlanting ? plantAction : undefined
         );
 
         convertTxn.build(getEncoded, minAmountOut);
@@ -602,17 +613,17 @@ const ConvertPropProvider: FC<{
       }
     },
     [
-      middleware,
-      account,
-      farmerBalances,
       sdk,
       season,
-      plantAndDoX,
+      account,
       txnBundler,
+      middleware,
+      plantAndDoX,
+      initialValues,
+      farmerBalances,
       refetch,
       refetchPools,
       refetchFarmerBalances,
-      initialValues,
     ]
   );
 
@@ -634,6 +645,7 @@ const ConvertPropProvider: FC<{
             currentSeason={season}
             sdk={sdk}
             conversion={conversion}
+            plantAndDoX={plantAndDoX}
             {...formikProps}
           />
         </>

projects/ui/src/components/Silo/Actions/Transfer.tsx

@@ -65,7 +65,7 @@ const TransferForm: FC<
     token: Token;
     siloBalance: TokenSiloBalance | undefined;
     season: BigNumber;
-    plantAndDoX: PlantAndDoX;
+    plantAndDoX: PlantAndDoX | undefined;
   }
 > = ({
   // Formik
@@ -84,7 +84,8 @@ const TransferForm: FC<
   const txnActions = useFarmerFormTxnsActions();
   const isUsingPlant = Boolean(
     values.farmActions.primary?.includes(FormTxn.PLANT) &&
-      BEAN.equals(whitelistedToken)
+      BEAN.equals(whitelistedToken) &&
+      plantAndDoX
   );
 
   // Results
@@ -93,7 +94,7 @@ const TransferForm: FC<
     const deposits = siloBalance?.deposits || [];
 
     if (!isUsingPlant && (amount.lte(0) || !deposits.length)) return null;
-    if (isUsingPlant && plantAndDoX.getAmount().lte(0)) return null;
+    if (isUsingPlant && plantAndDoX?.getAmount().lte(0)) return null;
 
     // FIXME: stems
     return WithdrawFarmStep.calculateWithdraw(
@@ -187,7 +188,7 @@ const TransferForm: FC<
           balanceLabel="Deposited Balance"
           InputProps={InputProps}
         />
-        <AddPlantTxnToggle />
+        <AddPlantTxnToggle plantAndDoX={plantAndDoX} />
         {depositedBalance?.gt(0) && (
           <>
             <FieldWrapper label="Transfer to">
@@ -343,15 +344,19 @@ const TransferPropProvider: FC<{
         const formData = values.tokens[0];
         const primaryActions = values.farmActions.primary;
 
+        const { plantAction } = plantAndDoX;
+
         const isPlanting =
+          plantAndDoX &&
           primaryActions?.includes(FormTxn.PLANT) &&
           sdk.tokens.BEAN.equals(token);
 
         const baseAmount = token.amount((formData?.amount || 0).toString());
 
-        const totalAmount = isPlanting
-          ? baseAmount.add(plantAndDoX.getAmount())
-          : baseAmount;
+        const totalAmount =
+          isPlanting && plantAction
+            ? baseAmount.add(plantAction.getAmount())
+            : baseAmount;
 
         if (totalAmount.lte(0)) throw new Error('Invalid amount.');
 
@@ -363,7 +368,7 @@ const TransferPropProvider: FC<{
           values.to,
           baseAmount,
           season.toNumber(),
-          isPlanting ? plantAndDoX : undefined
+          isPlanting ? plantAction : undefined
         );
 
         if (!transferTxn.withdrawResult) {
@@ -435,7 +440,7 @@ const TransferPropProvider: FC<{
           token={token}
           siloBalance={farmerBalances}
           season={season}
-          plantAndDoX={plantAndDoX}
+          plantAndDoX={plantAndDoX.plantAction}
           {...formikProps}
         />
       )}